Files
beardrive/internal/journal/journal.go
Snow LeeandClaude Fable 5 2d7f2f8bfa feat: auth, move-proof projects, interactive init/login, web history
Authentication (previous phase, now landed together with its follow-ups):
- Email+password+name accounts behind an AuthProvider interface; the OSS
  server ships BuiltinAuth only (file-backed auth.json: bcrypt password
  hashes + SHA-256 token digests, plaintext never stored; server-owned
  /auth/* pages; managed deployments can swap in another provider).
- bdrive login: loopback-callback browser flow (sign-up on the page, the
  terminal finishes itself) with a device-code fallback for headless
  machines; long-lived revocable device tokens in settings.json.
- Password reset via plain SMTP (stdlib) with a log-link fallback when no
  SMTP is configured.

Move-proof projects:
- .bdrive is now a directory; config.json carries a stable mount id.
  The volume store (~/.bdrive/volumes/<mount-id>/) and registry are keyed
  by that id — never the folder path — so renames/moves are free.
- The daemon re-reads the project config each tick and exits cleanly
  (propagating nothing) when its folder vanishes; the registry self-heals
  and the next bdrive command at the new location resumes with zero
  spurious changes.

bdrive init is the front door (mnt/umnt removed; bdrive stop pauses):
- Interactive on a TTY (create new / connect existing project from the
  server's list; whole folder / shared subfolder via the include list),
  full flag bypass (--name/--project/--shared/--yes), never prompts
  without a TTY. Runs the login flow first when there is no session.
  Default server: beardrive.ai (config.DefaultServer).

Web history (revert-ready):
- Hubs now always require auth; journal ops carry the signed-in account
  (user/user_name) alongside the git/OS fallback author.
- File-backed device registry: per-device name, OS, account, and the
  public IP the server observed, joined into history at read time.
- GET /api/p/<id>/history?path=|prefix= (newest first) and
  GET /api/p/<id>/blob?sha= stream any exact version — blobs are retained
  forever, so the next phase's revert is re-putting an old blob.
- UI: History button (file versions or project feed), per-folder history
  shortcut, view/download of any past version.

Tests: auth flows (callback, device-code, reset single-use, persistence,
gating), history API + device registry, folder-move survival, registry
self-heal, ops-carry-account; docs (README/SKILL/CLAUDE) updated.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01R7Q9ZKSZRTdvrSJkYLUmYs
2026-07-08 13:12:49 -07:00

151 lines
4.0 KiB
Go

// Package journal implements beardrive's append-only operation log.
//
// Every change to a volume is recorded as an Op in a per-device JSONL
// journal. Journals are append-only and each device only ever writes its
// own journal, so syncing is conflict-free at the transport level: a sync
// uploads your journal and downloads everyone else's. The merged view of
// a volume is a deterministic replay of the union of all ops ordered by
// (lamport, time, device, seq) — every device converges to the same state.
package journal
import (
"bufio"
"bytes"
"encoding/json"
"fmt"
"os"
"sort"
"time"
)
const (
KindPut = "put"
KindDelete = "delete"
)
// Op is a single journaled file operation.
type Op struct {
Seq int64 `json:"seq"` // per-device sequence number, 1-based
Lamport int64 `json:"lamport"` // logical clock for cross-device ordering
Time time.Time `json:"time"`
Device string `json:"device"`
DeviceName string `json:"device_name,omitempty"`
Author string `json:"author,omitempty"` // OS/git identity (offline fallback)
User string `json:"user,omitempty"` // signed-in account email
UserName string `json:"user_name,omitempty"` // signed-in account display name
Kind string `json:"kind"` // "put" or "delete"
Path string `json:"path"` // slash-separated, relative to volume root
Blob string `json:"blob,omitempty"` // sha256 hex of content (put only)
Size int64 `json:"size,omitempty"`
Mode uint32 `json:"mode,omitempty"` // permission bits
Note string `json:"note,omitempty"` // e.g. "conflict copy of <path>"
}
// Less defines the total order used to replay ops from many devices.
func Less(a, b Op) bool {
if a.Lamport != b.Lamport {
return a.Lamport < b.Lamport
}
if !a.Time.Equal(b.Time) {
return a.Time.Before(b.Time)
}
if a.Device != b.Device {
return a.Device < b.Device
}
return a.Seq < b.Seq
}
func Sort(ops []Op) {
sort.SliceStable(ops, func(i, j int) bool { return Less(ops[i], ops[j]) })
}
// FileState is the resolved state of one path after replay.
type FileState struct {
Blob string
Size int64
Mode uint32
}
// Replay folds a set of ops (from any number of devices) into the
// resulting volume state. Last writer wins per path under the total order.
func Replay(ops []Op) map[string]FileState {
sorted := append([]Op(nil), ops...)
Sort(sorted)
state := make(map[string]FileState)
for _, op := range sorted {
switch op.Kind {
case KindPut:
state[op.Path] = FileState{Blob: op.Blob, Size: op.Size, Mode: op.Mode}
case KindDelete:
delete(state, op.Path)
}
}
return state
}
// Parse decodes a JSONL journal.
func Parse(data []byte) ([]Op, error) {
var ops []Op
sc := bufio.NewScanner(bytes.NewReader(data))
sc.Buffer(make([]byte, 0, 64*1024), 16*1024*1024)
for sc.Scan() {
line := bytes.TrimSpace(sc.Bytes())
if len(line) == 0 {
continue
}
var op Op
if err := json.Unmarshal(line, &op); err != nil {
return nil, fmt.Errorf("parse journal line %d: %w", len(ops)+1, err)
}
ops = append(ops, op)
}
if err := sc.Err(); err != nil {
return nil, err
}
return ops, nil
}
// ReadFile reads a journal file; a missing file is an empty journal.
func ReadFile(path string) ([]Op, error) {
data, err := os.ReadFile(path)
if err != nil {
if os.IsNotExist(err) {
return nil, nil
}
return nil, err
}
return Parse(data)
}
// Marshal encodes ops as JSONL, the journal wire format.
func Marshal(ops []Op) ([]byte, error) {
var buf bytes.Buffer
for _, op := range ops {
b, err := json.Marshal(op)
if err != nil {
return nil, err
}
buf.Write(b)
buf.WriteByte('\n')
}
return buf.Bytes(), nil
}
// Append appends ops to a journal file as JSONL.
func Append(path string, ops []Op) error {
if len(ops) == 0 {
return nil
}
data, err := Marshal(ops)
if err != nil {
return err
}
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
if err != nil {
return err
}
defer f.Close()
_, err = f.Write(data)
return err
}