Files
beardrive/cmd/bdrive/cmds.go
T
872ba702cb fix(log): bdrive log reads as a timeline — newest first by edit time (#BEA-40) (#90)
`bdrive log` sorted by the lamport clock, so the wall-clock stamps it prints
came out non-monotonic — two 06:09:24 rows above a 06:10:00 row. And every op
of one scan is stamped with that scan's commit time, so a 22-file agent run
collapsed onto a single stamp. Neither is readable as a timeline, which is the
whole job of the command.

Two display-only changes:

- `journal.Op` gains `Mtime` (`omitzero`, so old journals and old binaries are
  unaffected), populated on put ops from the `os.FileInfo` the scan already
  holds. Deletes and conflict copies keep their commit time.
- `syncer.DisplayTime` / `SortForDisplay` order by the timestamp that is
  actually printed, ties broken by reversed `journal.Less`. `bdrive log` sorts
  and *then* truncates, so `-n 25` is the 25 newest by that stamp.

`journal.Less`, `Sort`, and `Replay` are untouched — replay order is the
convergence contract, so the sort lives in `syncer`, not in `journal`.
`LogEntries` also keeps returning causal order because `bdrive restore` walks
it to find a file's previous version.

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-07-30 21:49:23 +09:00

342 lines
11 KiB
Go

package main
import (
"fmt"
"time"
"github.com/spf13/cobra"
"github.com/runbear-io/beardrive/internal/config"
"github.com/runbear-io/beardrive/internal/daemon"
"github.com/runbear-io/beardrive/internal/journal"
"github.com/runbear-io/beardrive/internal/store"
"github.com/runbear-io/beardrive/internal/syncer"
)
func syncCmd() *cobra.Command {
var note string
var noteTTL time.Duration
var hookLabel string
var prune bool
c := &cobra.Command{
Use: "sync [folder]",
Short: "Sync a mounted folder with its remote now",
Long: `Run one sync cycle now: journal local changes, pull teammates' changes,
and push.
--prune additionally reconciles the hub against .bdriveignore: anything the
hub still holds that the ignore rules now exclude is removed from the hub
while staying on disk, here and on every teammate's device. That is the
cleanup path for files that synced before the rule was added.
It refuses outright when .bdriveignore narrows the sync scope with "!"
rules (what bdrive scope and init --only write): there, pruning would mean
removing everything outside the scope from the hub, for the whole team.
Drop specific paths with bdrive forget instead. A legacy per-device include
list in .bdrive/config.json is never pruned against either.`,
Example: ` bdrive sync
bdrive sync --prune # also drop hub files that .bdriveignore now excludes`,
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
folder, err := absFolder(args)
if err != nil {
return err
}
// A folder resolves to the mount it is, the mount above it, or the
// mounts below it — a repo root with wiki/ and docs/ mounted syncs
// both, and a session inside a mount syncs its root.
targets := syncTargets(folder)
syncOne := func(target string) error {
// Gate before openSession: hooks fire in every folder on every
// turn, and must never enroll this device or resume a paused
// project — that is `bdrive init`'s job alone.
proj, ok, err := config.LoadProject(target)
if err != nil {
return err
}
if !ok {
return fmt.Errorf("%s is not a beardrive project (run `bdrive init` there first)", target)
}
switch syncBlocked(proj) {
case "init":
return fmt.Errorf("%s is not synced on this device yet (run `bdrive init` there to connect it)", target)
case "paused":
return fmt.Errorf("syncing is paused for %s (run `bdrive init` there to resume)", target)
}
sess, proj, err := openSession(cmd.Context(), target, true)
if err != nil {
return err
}
defer closeSession(sess)
if cmd.Flags().Changed("note") {
// Persist the note so the daemon's own scans stamp it too —
// history then links every change from this working session
// to its context, not just the ones this invocation catches.
// An explicit empty --note clears it. Expires after --note-ttl.
if err := sess.Store.SaveNote(note, noteTTL); err != nil {
return err
}
sess.Note = note
}
sess.Prune = prune
sess.OnProgress = progressReporter()
res, err := sess.Cycle(cmd.Context())
if err != nil {
return err
}
fmt.Printf("synced %s (project %q)\n", target, proj.Volume)
printCycle(res)
return nil
}
if hookLabel != "" {
// Agent-hook mode: event JSON on stdin, silent best-effort
// sync, link-formula context on stdout. Never fails. Only the
// first mount emits context — the JSON contract is one object,
// so a repo with several mounts links through the first.
emit := true
for _, target := range targets {
proj, ok, err := config.LoadProject(target)
if err != nil || !ok || syncBlocked(proj) != "" {
continue
}
if err := runHookSync(cmd, target, hookLabel, emit); err == nil && emit {
emit = false
}
}
return nil
}
if len(targets) == 0 {
return fmt.Errorf("%s is not a beardrive project (run `bdrive init` there first)", folder)
}
if prune {
for _, target := range targets {
if err := pruneSafe(target); err != nil {
return err
}
}
}
for _, target := range targets {
if err := syncOne(target); err != nil {
return err
}
}
return nil
},
}
c.Flags().BoolVar(&prune, "prune", false, "also remove from the hub what .bdriveignore now excludes (files stay on disk everywhere)")
c.Flags().StringVar(&note, "note", "", "session context stamped onto changes (e.g. an agent session id); shown in history; empty clears")
c.Flags().DurationVar(&noteTTL, "note-ttl", 30*time.Minute, "how long the note keeps applying to daemon-committed changes")
c.Flags().StringVar(&hookLabel, "hook", "", "agent-hook mode: read the platform's hook event JSON from stdin, sync with a session note labeled by this value, and emit the project's link-formula context (Claude Code hook JSON) on stdout")
return c
}
// pruneSafe refuses --prune on a mount whose rules narrow the scope. Prune
// removes from the hub everything the shared rules exclude — with "only
// these folders" rules that is everything else the project holds, deleted
// for every teammate on their next sync. Excluding one path is what
// `bdrive forget` is for.
func pruneSafe(folder string) error {
filter, err := syncer.LoadFilter(folder, nil)
if err != nil {
return err
}
if !filter.Negated() {
return nil
}
return fmt.Errorf("%s/.bdriveignore narrows the scope with `!` rules, so --prune would remove\n"+
"everything outside that scope from the hub — for every teammate, not just this device.\n"+
"drop specific paths with `bdrive forget <path>`, or widen the rules first", folder)
}
func statusCmd() *cobra.Command {
return &cobra.Command{
Use: "status [folder]",
Short: "Show mount, sync, and daemon status",
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
mounts, err := config.LoadMounts()
if err != nil {
return err
}
if len(args) > 0 {
folder, err := absFolder(args)
if err != nil {
return err
}
proj, err := mustProject(folder) // also self-heals the registry
if err != nil {
return err
}
mounts = map[string]config.MountInfo{proj.ID: {Path: folder, Volume: proj.Volume, Remote: proj.Remote}}
}
if len(mounts) == 0 {
fmt.Println("no beardrive projects on this device (run `bdrive init` in a folder)")
return nil
}
dev, err := config.LoadDevice()
if err != nil {
return err
}
if settings, _ := config.LoadSettings(); settings.Email != "" {
who := settings.Email
if settings.Name != "" {
who = settings.Name + " <" + settings.Email + ">"
}
fmt.Printf("device: %s (%s) signed in as %s\n\n", dev.Name, dev.ID, who)
} else {
fmt.Printf("device: %s (%s) as %s\n\n", dev.Name, dev.ID, dev.Author)
}
first := true
for id, mi := range mounts {
if !first {
fmt.Println()
}
first = false
folder := mi.Path
if proj, ok, err := config.LoadProject(folder); err == nil && ok {
mi.Volume, mi.Remote = proj.Volume, proj.Remote // folder config wins
} else {
fmt.Printf("%s\n (folder missing — moved or deleted; run `bdrive init` at its new location)\n", folder)
continue
}
fmt.Printf("%s\n", folder)
fmt.Printf(" project: %s (%s)\n", mi.Volume, id)
if mi.Remote != "" {
fmt.Printf(" remote: %s\n", mi.Remote)
} else {
fmt.Printf(" remote: (none — local only)\n")
}
vdir, err := config.VolumeDir(id)
if err != nil {
return err
}
if pid, ok := daemon.Running(vdir); ok {
fmt.Printf(" daemon: running (pid %d)\n", pid)
} else {
fmt.Printf(" daemon: stopped\n")
}
sess, _, err := openSession(cmd.Context(), folder, false)
if err != nil {
continue
}
cache, err := sess.Store.LoadCache(id)
if err == nil {
var total int64
for _, c := range cache {
total += c.Size
}
fmt.Printf(" files: %d (%s)\n", len(cache), humanBytes(total))
}
st, err := sess.Store.LoadSync()
myOps, err2 := sess.Store.DeviceOps(dev.ID)
if err == nil && err2 == nil {
pending := int64(len(myOps)) - st.PushedOps
if pending < 0 {
pending = 0
}
fmt.Printf(" pending: %d local change(s) not yet pushed\n", pending)
switch st.Access {
case store.AccessReadOnly:
fmt.Printf(" access: read-only (pull only) — %d local change(s) stay on this device\n", pending)
case store.AccessNone:
fmt.Printf(" access: no access to this project — sync paused\n")
}
}
}
return nil
},
}
}
func logCmd() *cobra.Command {
var limit int
var pathFilter string
c := &cobra.Command{
Use: "log [folder]",
Short: "Show change history: who changed which file, when, on which device",
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
folder, err := absFolder(args)
if err != nil {
return err
}
sess, _, err := openSession(cmd.Context(), folder, false)
if err != nil {
return err
}
// Limit after the display sort, not before: -n 25 means the 25
// newest by the time shown, not the 25 highest lamport.
entries, err := syncer.LogEntries(sess.Store, pathFilter, 0)
if err != nil {
return err
}
syncer.SortForDisplay(entries)
if limit > 0 && len(entries) > limit {
entries = entries[:limit]
}
out := cmd.OutOrStdout()
if len(entries) == 0 {
fmt.Fprintln(out, "no history yet")
return nil
}
for _, op := range entries {
when := syncer.DisplayTime(op).Local().Format("2006-01-02 15:04:05")
kind := op.Kind
if kind == journal.KindPut {
kind = "put "
} else {
kind = "delete"
}
// Prefer the signed-in account over the git/OS author fallback,
// so team history shows hub identities.
who := op.UserName
if who == "" {
who = op.User
}
if who == "" {
who = op.Author
}
line := fmt.Sprintf("%s %s %-40s %s on %s", when, kind, op.Path, who, op.DeviceName)
if op.Kind == journal.KindPut {
line += fmt.Sprintf(" (%s)", humanBytes(op.Size))
}
if op.Note != "" {
line += " [" + op.Note + "]"
}
fmt.Fprintln(out, line)
}
return nil
},
}
c.Flags().IntVarP(&limit, "limit", "n", 50, "max entries to show (0 = all)")
c.Flags().StringVarP(&pathFilter, "path", "p", "", "only show history for this file or directory")
return c
}
func daemonCmd() *cobra.Command {
c := &cobra.Command{
Use: "daemon",
Short: "Manage the background sync daemon",
Hidden: true,
}
var scanInterval, remoteInterval time.Duration
run := &cobra.Command{
Use: "run <folder>",
Short: "Run the sync daemon in the foreground (internal)",
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
folder, err := absFolder(args)
if err != nil {
return err
}
return daemon.Run(folder, scanInterval, remoteInterval)
},
}
run.Flags().DurationVar(&scanInterval, "scan-interval", 3*time.Second, "local scan interval")
run.Flags().DurationVar(&remoteInterval, "remote-interval", 10*time.Second, "remote sync interval")
c.AddCommand(run)
return c
}