mirror of
https://github.com/runbear-io/beardrive.git
synced 2026-08-25 08:08:08 +02:00
* fix(cli): agent hooks never sync folders this device didn't opt into The turn hooks decided "this folder is managed" from the mere presence of .bdrive/config.json — a file designed to travel with the folder. Two holes: - A config.json arriving via git clone / copied dir made one hook firing silently mint a device identity, register the mount, create a volume store, journal the whole folder, and inject the hub-link formula — on a device that never ran init or login. - `bdrive stop` only killed the daemon: the next agent turn's `bdrive sync --hook` resumed a full sync cycle and kept injecting links, and `stop --forget` was undone within one turn by registry self-heal. Fix: one gate (`syncBlocked`) in the paths all hooks route through — sync/sync --hook/read-log now require the mount to already be enrolled in this device's mounts.json (read without ResolveMount's enrolling self-heal) and not paused. Hook mode exits silently; plain `bdrive sync` errors with a `bdrive init` pointer. New per-device paused marker in the volume dir: set by `bdrive stop`, cleared by `bdrive init` (startSync). Only init enrolls or resumes; folder moves still self-heal since enrollment is keyed by mount id, not path. Docs updated (README, SKILL.md, docs cli reference, CHANGELOG). Tests: hook/read-log no-op + no-enrollment on unenrolled and paused mounts, plain-sync refusals, stop→pause→forget regression, paused marker contract. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: architecture-diagram PRs must show before/after excerpts of changed classes The "Architecture changes" PR section now names exactly what changed and shows Before and After mermaid excerpts scoped to the affected classes and their immediate relationships — never the full diagram (Before = merge base). Convention updated in CLAUDE.md, architecture/README.md, and the pre-PR hook's reminder text. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: add cli-sync architecture diagram; widen diagram convention to the CLI architecture/cli-sync.md draws the CLI and sync engine (cmd/bdrive + internal/{syncer,store,journal,config,daemon,agenthooks}): the Session cycle over Store/journal/remote, and the command layer with the new syncBlocked opt-in gate, paused marker, and enrollment ownership. The pre-PR hook and CLAUDE.md now watch these packages too, so CLI-side structural changes trigger the before/after-excerpt convention the same way server changes do. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: full-coverage architecture diagrams — overview, frontend, agentskills Every application package is now drawn somewhere: overview.md (system diagram — package map, device↔hub↔storage flow, agent surfaces, and the private cloud/ repo as an external seam consumer), webapp-frontend.md (the hub SPA's modules: App/HubApp/VolumeApp/Browser, the in-repo nav/router, api layer, hooks, components), and agentskills added to cli-sync.md. The pre-PR hook now watches all of cmd/, internal Go code, and frontend/src (generated static/ excluded); CLAUDE.md and architecture/README.md state the coverage rule: every code change lands in exactly one detail diagram's scope, web/docs and cloud/ deliberately excluded. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: PR bodies start with a TL;DR — max 5 informal one-liners Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
133 lines
3.7 KiB
Go
133 lines
3.7 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/mattn/go-isatty"
|
|
|
|
"github.com/runbear-io/beardrive/internal/config"
|
|
"github.com/runbear-io/beardrive/internal/remote"
|
|
"github.com/runbear-io/beardrive/internal/store"
|
|
"github.com/runbear-io/beardrive/internal/syncer"
|
|
)
|
|
|
|
// stdinIsTTY is the one answer to "is this an interactive shell?" — used both
|
|
// to decide whether init may prompt and whether login can drive a browser.
|
|
func stdinIsTTY() bool {
|
|
return isatty.IsTerminal(os.Stdin.Fd()) || isatty.IsCygwinTerminal(os.Stdin.Fd())
|
|
}
|
|
|
|
func absFolder(args []string) (string, error) {
|
|
arg := "."
|
|
if len(args) > 0 {
|
|
arg = args[0]
|
|
}
|
|
return filepath.Abs(arg)
|
|
}
|
|
|
|
// mustProject resolves a folder's project settings (from .bdrive/config.json,
|
|
// self-healing the registry when the folder moved).
|
|
func mustProject(folder string) (config.Project, error) {
|
|
proj, found, err := config.ResolveMount(folder)
|
|
if err != nil {
|
|
return proj, err
|
|
}
|
|
if !found {
|
|
return proj, fmt.Errorf("%s is not a beardrive project (run `bdrive init` there first)", folder)
|
|
}
|
|
if proj.Volume == "" {
|
|
proj.Volume = filepath.Base(folder)
|
|
}
|
|
return proj, nil
|
|
}
|
|
|
|
// syncBlocked reports why syncing must not run for a project on this device:
|
|
// "init" when the mount was never enrolled here (.bdrive/config.json travels
|
|
// with the folder — e.g. arrives in a git clone — so its presence alone is
|
|
// not consent to sync; only `bdrive init` enrolls a device), "paused" after
|
|
// `bdrive stop`, "" to proceed. Deliberately reads the registry without
|
|
// ResolveMount's self-heal, which would enroll as a side effect.
|
|
func syncBlocked(proj config.Project) string {
|
|
mounts, err := config.LoadMounts()
|
|
if err != nil {
|
|
return "init"
|
|
}
|
|
if _, enrolled := mounts[proj.ID]; !enrolled {
|
|
return "init"
|
|
}
|
|
if vdir, err := config.VolumeDir(proj.ID); err == nil && store.Paused(vdir) {
|
|
return "paused"
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// openSession builds a syncer session for a project folder. When withRemote
|
|
// is set and the remote is unreachable, it degrades to offline with a warning
|
|
// rather than failing.
|
|
func openSession(ctx context.Context, folder string, withRemote bool) (*syncer.Session, config.Project, error) {
|
|
proj, err := mustProject(folder)
|
|
if err != nil {
|
|
return nil, proj, err
|
|
}
|
|
dev, err := config.LoadDevice()
|
|
if err != nil {
|
|
return nil, proj, err
|
|
}
|
|
vdir, err := config.VolumeDir(proj.ID)
|
|
if err != nil {
|
|
return nil, proj, err
|
|
}
|
|
st, err := store.Open(vdir)
|
|
if err != nil {
|
|
return nil, proj, err
|
|
}
|
|
settings, _ := config.LoadSettings()
|
|
sess := &syncer.Session{Folder: folder, MountID: proj.ID, Store: st, Device: dev, Account: settings}
|
|
if withRemote && proj.Remote != "" {
|
|
be, err := remote.Open(ctx, proj.Remote)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "warning: remote unavailable, working offline: %v\n", err)
|
|
} else {
|
|
sess.Backend = be
|
|
}
|
|
}
|
|
return sess, proj, nil
|
|
}
|
|
|
|
func closeSession(sess *syncer.Session) {
|
|
if sess != nil && sess.Backend != nil {
|
|
sess.Backend.Close()
|
|
}
|
|
}
|
|
|
|
func humanBytes(n int64) string {
|
|
const unit = 1024
|
|
if n < unit {
|
|
return fmt.Sprintf("%d B", n)
|
|
}
|
|
div, exp := int64(unit), 0
|
|
for m := n / unit; m >= unit; m /= unit {
|
|
div *= unit
|
|
exp++
|
|
}
|
|
return fmt.Sprintf("%.1f %cB", float64(n)/float64(div), "KMGTPE"[exp])
|
|
}
|
|
|
|
func printCycle(res *syncer.Result) {
|
|
fmt.Printf(" local changes: %d\n", res.LocalOps)
|
|
fmt.Printf(" pulled changes: %d\n", res.PulledOps)
|
|
if res.Conflicts > 0 {
|
|
fmt.Printf(" conflicts: %d (preserved as *.bdrive-conflict-* files)\n", res.Conflicts)
|
|
}
|
|
fmt.Printf(" files updated: %d\n", res.Materialized)
|
|
switch {
|
|
case res.Offline:
|
|
fmt.Printf(" remote: offline (%v)\n", res.OfflineErr)
|
|
case res.Pushed:
|
|
fmt.Printf(" remote: pushed\n")
|
|
}
|
|
}
|