@1agh/maude 0.29.0 → 0.30.0

package/apps/studio/test/sync-agent.test.ts

@@ -11,13 +11,13 @@
 // 100-event stress scenario from the plan without booting a real hub.
 
 import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import * as Y from 'yjs';
 
 import { type CanvasSyncAgent, createCanvasSyncAgent } from '../sync/agent.ts';
-import { applyHtmlToDoc, htmlFromDoc, Y_SYNC_TYPES } from '../sync/codec.ts';
+import { applyHtmlToDoc, htmlFromDoc } from '../sync/codec.ts';
 import { createEchoGuard, hashBytes } from '../sync/echo-guard.ts';
 import { createFsReader } from '../sync/fs-mirror.ts';
 
@@ -303,3 +303,273 @@ describe('CanvasSyncAgent — stress: 100 rapid disk writes converge with no ech
     expect(docUpdates).toBeGreaterThan(0);
   });
 });
+
+// ---------------------------------------------------------------------------
+// DDR-102 — cold-start conflict protocol (journal-gated fast-forward, dual
+// snapshot, newest-wins, comments id-union).
+describe('CanvasSyncAgent — DDR-102 cold-start conflict protocol', () => {
+  interface SnapCall {
+    content: string;
+    reason: string;
+  }
+
+  function makeJournal(initial: Record<string, { bodyHash: string }> = {}) {
+    const entries = new Map(Object.entries(initial));
+    const records: Array<{ slug: string; hashes: Record<string, string | undefined> }> = [];
+    return {
+      journal: {
+        get: (slug: string) => entries.get(slug) ?? null,
+        record: (slug: string, hashes: { bodyHash?: string; cssHash?: string }) => {
+          records.push({ slug, hashes });
+          const prev = entries.get(slug);
+          entries.set(slug, { bodyHash: hashes.bodyHash ?? prev?.bodyHash ?? '' });
+        },
+        invalidateIfHubChanged: () => {},
+        flush: () => {},
+        stop: () => {},
+        size: () => entries.size,
+      },
+      records,
+    };
+  }
+
+  function protocolAgent(extra: {
+    journal?: ReturnType<typeof makeJournal>['journal'];
+    snapshots?: SnapCall[];
+    conflicts?: unknown[];
+  }) {
+    const a = createCanvasSyncAgent({
+      slug: 'screen',
+      doc: docB,
+      paths: paths(),
+      echoGuard: createEchoGuard(),
+      flushMs: 0,
+      journal: extra.journal,
+      snapshot: extra.snapshots
+        ? async (content, reason) => {
+            extra.snapshots?.push({ content, reason });
+            return `ts-${extra.snapshots?.length}`;
+          }
+        : undefined,
+      onConflict: (info) => {
+        extra.conflicts?.push(info);
+      },
+    });
+    a.start();
+    return a;
+  }
+
+  test('journal match → silent fast-forward: hub overwrites disk, NO snapshot, NO conflict', async () => {
+    const { setHtml } = await import('node:fs').then(() => ({ setHtml: writeFileSync }));
+    setHtml(paths().html, '<button>synced-v1</button>');
+    applyHtmlToDoc(docA, '<button>hub-v2</button>');
+
+    const { journal } = makeJournal({
+      screen: { bodyHash: hashBytes('<button>synced-v1</button>') },
+    });
+    const snapshots: SnapCall[] = [];
+    const conflicts: unknown[] = [];
+    agent = protocolAgent({ journal, snapshots, conflicts });
+    await agent.reconcile();
+
+    expect(readFileSync(paths().html, 'utf8')).toBe('<button>hub-v2</button>');
+    expect(snapshots).toHaveLength(0);
+    expect(conflicts).toHaveLength(0);
+  });
+
+  test('diverged + local newer → local wins, BOTH sides snapshotted, conflict recorded', async () => {
+    writeFileSync(paths().html, '<button>local-newer</button>');
+    // Hub doc carries different body with an OLDER bodyEditAt stamp.
+    docA.transact(() => {
+      applyHtmlToDoc(docA, '<button>hub-older</button>');
+      docA.getMap('syncMeta').set('bodyEditAt', Date.now() - 60_000);
+    });
+
+    const { journal } = makeJournal(); // no entry → divergence
+    const snapshots: SnapCall[] = [];
+    const conflicts: Array<{ kind: string; winner?: string; snapshots?: object }> = [];
+    agent = protocolAgent({ journal, snapshots, conflicts });
+    await agent.reconcile();
+
+    // Local body survives on disk AND is pushed up to the hub.
+    expect(readFileSync(paths().html, 'utf8')).toBe('<button>local-newer</button>');
+    expect(htmlFromDoc(docA)).toBe('<button>local-newer</button>');
+    // Dual snapshot: local first, hub second.
+    expect(snapshots.map((s) => s.reason)).toEqual(['pre-sync-local', 'pre-sync-hub']);
+    expect(snapshots[0].content).toBe('<button>local-newer</button>');
+    expect(snapshots[1].content).toBe('<button>hub-older</button>');
+    // Conflict entry carries winner + snapshot refs.
+    expect(conflicts).toHaveLength(1);
+    expect(conflicts[0].kind).toBe('cold-start-diverged');
+    expect(conflicts[0].winner).toBe('local');
+    expect(conflicts[0].snapshots).toBeDefined();
+  });
+
+  test('diverged + hub newer → hub wins, both sides snapshotted', async () => {
+    writeFileSync(paths().html, '<button>local-older</button>');
+    docA.transact(() => {
+      applyHtmlToDoc(docA, '<button>hub-newer</button>');
+      docA.getMap('syncMeta').set('bodyEditAt', Date.now() + 60_000);
+    });
+
+    const { journal } = makeJournal();
+    const snapshots: SnapCall[] = [];
+    const conflicts: Array<{ winner?: string }> = [];
+    agent = protocolAgent({ journal, snapshots, conflicts });
+    await agent.reconcile();
+
+    expect(readFileSync(paths().html, 'utf8')).toBe('<button>hub-newer</button>');
+    expect(snapshots.map((s) => s.reason)).toEqual(['pre-sync-local', 'pre-sync-hub']);
+    expect(conflicts[0].winner).toBe('hub');
+  });
+
+  test('DDR-064 empty-hub guard is bit-identical: seed-local-up, no snapshot, no conflict', async () => {
+    writeFileSync(paths().html, '<button>real-canvas</button>');
+    // docA/docB empty — fresh hub.
+    const { journal } = makeJournal();
+    const snapshots: SnapCall[] = [];
+    const conflicts: unknown[] = [];
+    agent = protocolAgent({ journal, snapshots, conflicts });
+    await agent.reconcile();
+
+    expect(readFileSync(paths().html, 'utf8')).toBe('<button>real-canvas</button>');
+    expect(htmlFromDoc(docA)).toBe('<button>real-canvas</button>');
+    expect(snapshots).toHaveLength(0);
+    expect(conflicts).toHaveLength(0);
+  });
+
+  test('journal checkpoints: doc→disk flush and disk→doc apply both record', async () => {
+    const { journal, records } = makeJournal();
+    agent = createCanvasSyncAgent({
+      slug: 'screen',
+      doc: docB,
+      paths: paths(),
+      echoGuard: createEchoGuard(),
+      flushMs: 0,
+      journal,
+    });
+    agent.start();
+
+    // Hub edit → disk write → checkpoint.
+    applyHtmlToDoc(docA, '<button>from-hub</button>');
+    await agent.flush();
+    expect(records.some((r) => r.hashes.bodyHash === hashBytes('<button>from-hub</button>'))).toBe(
+      true
+    );
+
+    // Local edit → doc apply → checkpoint.
+    const bytes = new TextEncoder().encode('<button>from-disk</button>');
+    agent.applyFromFs({ path: paths().html, bytes, hash: hashBytes(bytes) });
+    expect(records.some((r) => r.hashes.bodyHash === hashBytes(bytes))).toBe(true);
+  });
+
+  test('comments id-union: doc order first, local-only appended, both sides converge', async () => {
+    // Local file has c1 + c3; hub doc has c1 + c2.
+    const localComments = [
+      { id: 'c1', body: 'shared' },
+      { id: 'c3', body: 'local-only' },
+    ];
+    mkdirSync(join(dir, '_comments'), { recursive: true });
+    writeFileSync(paths().comments, `${JSON.stringify(localComments, null, 2)}\n`);
+    docA.transact(() => {
+      docA.getArray('comments').push([
+        { id: 'c1', body: 'shared' },
+        { id: 'c2', body: 'hub-only' },
+      ]);
+    });
+
+    agent = protocolAgent({});
+    await agent.reconcile();
+
+    const expectUnion = [
+      { id: 'c1', body: 'shared' },
+      { id: 'c2', body: 'hub-only' },
+      { id: 'c3', body: 'local-only' },
+    ];
+    // Doc (and the peer) hold the union…
+    expect(docA.getArray('comments').toArray()).toEqual(expectUnion);
+    // …and the disk file was rewritten to the union too.
+    expect(JSON.parse(readFileSync(paths().comments, 'utf8'))).toEqual(expectUnion);
+  });
+
+  test('comments union with empty hub doc keeps + pushes local comments', async () => {
+    const localComments = [{ id: 'c9', body: 'only-local' }];
+    mkdirSync(join(dir, '_comments'), { recursive: true });
+    writeFileSync(paths().comments, `${JSON.stringify(localComments, null, 2)}\n`);
+
+    agent = protocolAgent({});
+    await agent.reconcile();
+
+    expect(docA.getArray('comments').toArray()).toEqual(localComments);
+    expect(JSON.parse(readFileSync(paths().comments, 'utf8'))).toEqual(localComments);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// DDR-102 fail-closed (security review F1): a hub-wins resolution must NEVER
+// overwrite local when the local snapshot didn't land — keep local + push up.
+describe('CanvasSyncAgent — fail-closed on snapshot failure (DDR-102 F1)', () => {
+  function failClosedAgent(
+    snapshotImpl: (content: string, reason: string) => Promise<string | null>,
+    conflicts: unknown[]
+  ) {
+    const a = createCanvasSyncAgent({
+      slug: 'screen',
+      doc: docB,
+      paths: paths(),
+      echoGuard: createEchoGuard(),
+      flushMs: 0,
+      // No journal → every diff is divergence (conflict path).
+      snapshot: snapshotImpl,
+      onConflict: (info) => {
+        conflicts.push(info);
+      },
+    });
+    a.start();
+    return a;
+  }
+
+  test('hub newer BUT local snapshot returns null → REFUSE overwrite, keep local, push up', async () => {
+    writeFileSync(paths().html, '<button>local-work</button>');
+    // Hub doc carries a NEWER stamp so newest-wins would pick hub.
+    docA.transact(() => {
+      applyHtmlToDoc(docA, '<button>hub-stale</button>');
+      docA.getMap('syncMeta').set('bodyEditAt', Date.now() + 60_000);
+    });
+
+    const conflicts: Array<{ winner?: string; snapshotFailed?: boolean }> = [];
+    // Snapshot writer that FAILS (disk full / read-only _history): returns null.
+    agent = failClosedAgent(async () => null, conflicts);
+    await agent.reconcile();
+
+    // Local work survives on disk (NOT overwritten by hub-stale) …
+    expect(readFileSync(paths().html, 'utf8')).toBe('<button>local-work</button>');
+    // … and is pushed UP to the hub (nothing lost on either side).
+    expect(htmlFromDoc(docA)).toBe('<button>local-work</button>');
+    // The conflict is recorded with the degraded-snapshot flag + flipped winner.
+    expect(conflicts).toHaveLength(1);
+    expect(conflicts[0].winner).toBe('local');
+    expect(conflicts[0].snapshotFailed).toBe(true);
+  });
+
+  test('hub newer + local snapshot SUCCEEDS → normal hub-wins (control)', async () => {
+    writeFileSync(paths().html, '<button>local-work</button>');
+    docA.transact(() => {
+      applyHtmlToDoc(docA, '<button>hub-newer</button>');
+      docA.getMap('syncMeta').set('bodyEditAt', Date.now() + 60_000);
+    });
+
+    const conflicts: Array<{ winner?: string; snapshotFailed?: boolean }> = [];
+    // Only the local snapshot succeeds; hub snapshot can fail without changing
+    // the outcome (local is the loser when hub wins).
+    agent = failClosedAgent(
+      async (_c, reason) => (reason === 'pre-sync-local' ? 'ts-local' : null),
+      conflicts
+    );
+    await agent.reconcile();
+
+    expect(readFileSync(paths().html, 'utf8')).toBe('<button>hub-newer</button>');
+    expect(conflicts[0].winner).toBe('hub');
+    expect(conflicts[0].snapshotFailed).toBeUndefined();
+  });
+});

package/apps/studio/test/sync-codec.test.ts

@@ -12,8 +12,10 @@ import {
   applyAnnotationsToDoc,
   applyCommentsToDoc,
   applyHtmlToDoc,
+  bodyEditAtFromDoc,
   commentsFromDoc,
   htmlFromDoc,
+  stampBodyEdit,
   Y_SYNC_TYPES,
 } from '../sync/codec.ts';
 
@@ -163,3 +165,66 @@ describe('Annotations codec', () => {
     expect(doc.getMap<string>(Y_TYPES.annotations).get('svg')).toBe('<svg>x</svg>');
   });
 });
+
+// syncMeta lane — DDR-102. The doc-side body-edit stamp the cold-start
+// newest-wins decision reads. Dedicated Y.Map lane because meta's
+// `last_modified` is in META_LOCAL_KEYS (per-machine, never syncs).
+describe('syncMeta codec (DDR-102)', () => {
+  test('bodyEditAtFromDoc returns null on a fresh doc (older-peer interop)', () => {
+    const doc = new Y.Doc();
+    expect(bodyEditAtFromDoc(doc)).toBeNull();
+  });
+
+  test('stampBodyEdit → bodyEditAtFromDoc round-trip with explicit nowMs', () => {
+    const doc = new Y.Doc();
+    stampBodyEdit(doc, undefined, 1_700_000_000_000);
+    expect(bodyEditAtFromDoc(doc)).toBe(1_700_000_000_000);
+    const by = doc.getMap<unknown>(Y_SYNC_TYPES.syncMeta).get('by');
+    expect(typeof by).toBe('string');
+    expect((by as string).length).toBeGreaterThan(0);
+    expect((by as string).length).toBeLessThanOrEqual(32);
+  });
+
+  test('stampBodyEdit defaults to Date.now()', () => {
+    const doc = new Y.Doc();
+    const before = Date.now();
+    stampBodyEdit(doc);
+    const after = Date.now();
+    const at = bodyEditAtFromDoc(doc);
+    expect(at).not.toBeNull();
+    expect(at as number).toBeGreaterThanOrEqual(before);
+    expect(at as number).toBeLessThanOrEqual(after);
+  });
+
+  test('a hostile/garbage bodyEditAt value reads as null', () => {
+    const doc = new Y.Doc();
+    doc.getMap<unknown>(Y_SYNC_TYPES.syncMeta).set('bodyEditAt', 'not-a-number');
+    expect(bodyEditAtFromDoc(doc)).toBeNull();
+    doc.getMap<unknown>(Y_SYNC_TYPES.syncMeta).set('bodyEditAt', Number.POSITIVE_INFINITY);
+    expect(bodyEditAtFromDoc(doc)).toBeNull();
+  });
+
+  test('body apply + stamp wrapped in one transaction emits ONE update', () => {
+    const doc = new Y.Doc();
+    let updates = 0;
+    doc.on('update', () => {
+      updates++;
+    });
+    const origin = { agent: 'test' };
+    doc.transact(() => {
+      applyHtmlToDoc(doc, '<div>v1</div>', origin);
+      stampBodyEdit(doc, origin, 123);
+    }, origin);
+    expect(updates).toBe(1);
+    expect(htmlFromDoc(doc)).toBe('<div>v1</div>');
+    expect(bodyEditAtFromDoc(doc)).toBe(123);
+  });
+
+  test('the stamp syncs to a peer doc via update exchange', () => {
+    const a = new Y.Doc();
+    const b = new Y.Doc();
+    a.on('update', (u: Uint8Array) => Y.applyUpdate(b, u));
+    stampBodyEdit(a, undefined, 456);
+    expect(bodyEditAtFromDoc(b)).toBe(456);
+  });
+});

package/apps/studio/test/sync-cold-start.test.ts

@@ -0,0 +1,244 @@
+// Cold-start decision matrix — hub-sync cold-start safety (DDR-102).
+//
+// Exhaustive table over (local: absent/empty/clean/diverged) × (doc:
+// empty/same/different) × (journal: absent/match/stale), plus both winner
+// directions and the null-timestamp fallbacks. Mirrors the table style of
+// sync-codec.test.ts: every case is a row with explicit inputs + expected
+// action.
+
+import { describe, expect, test } from 'bun:test';
+
+import { type ColdStartInput, decideColdStart } from '../sync/cold-start.ts';
+import { hashBytes } from '../sync/echo-guard.ts';
+
+const BODY_LOCAL = '<div>local work — a day of mascot edits</div>';
+const BODY_HUB = '<div>hub state</div>';
+
+/** Convenience: build an input with safe defaults, override per case. */
+function input(over: Partial<ColdStartInput>): ColdStartInput {
+  return {
+    localBody: null,
+    docBody: '',
+    journalHash: null,
+    localMtimeMs: null,
+    docBodyEditAtMs: null,
+    ...over,
+  };
+}
+
+describe('decideColdStart — empty/absent sides', () => {
+  test('local absent + doc empty → noop', () => {
+    expect(decideColdStart(input({})).action).toBe('noop');
+  });
+
+  test('local empty-string + doc empty → noop', () => {
+    expect(decideColdStart(input({ localBody: '' })).action).toBe('noop');
+  });
+
+  test('whitespace-only local counts as empty (mirrors the trim guard)', () => {
+    const d = decideColdStart(input({ localBody: '  \n\t ', docBody: BODY_HUB }));
+    expect(d.action).toBe('materialize-hub');
+  });
+
+  test('local absent + doc non-empty → materialize-hub (clean first sync)', () => {
+    const d = decideColdStart(input({ docBody: BODY_HUB }));
+    expect(d.action).toBe('materialize-hub');
+  });
+
+  test('local empty + doc non-empty → materialize-hub', () => {
+    const d = decideColdStart(input({ localBody: '', docBody: BODY_HUB }));
+    expect(d.action).toBe('materialize-hub');
+  });
+
+  test('local non-empty + doc empty → seed-local-up (DDR-064 guard as a named case)', () => {
+    const d = decideColdStart(input({ localBody: BODY_LOCAL, docBody: '' }));
+    expect(d.action).toBe('seed-local-up');
+  });
+
+  test('local non-empty + whitespace-only doc → seed-local-up', () => {
+    const d = decideColdStart(input({ localBody: BODY_LOCAL, docBody: ' \n ' }));
+    expect(d.action).toBe('seed-local-up');
+  });
+
+  test('seed-local-up holds regardless of journal state (stale journal must not block it)', () => {
+    const d = decideColdStart(
+      input({ localBody: BODY_LOCAL, docBody: '', journalHash: 'stale-hash' })
+    );
+    expect(d.action).toBe('seed-local-up');
+  });
+});
+
+describe('decideColdStart — identical sides', () => {
+  test('local == doc → noop (caller records journal)', () => {
+    const d = decideColdStart(input({ localBody: BODY_HUB, docBody: BODY_HUB }));
+    expect(d.action).toBe('noop');
+  });
+
+  test('local == doc with a stale journal is still a noop (content equality wins)', () => {
+    const d = decideColdStart(
+      input({ localBody: BODY_HUB, docBody: BODY_HUB, journalHash: 'stale' })
+    );
+    expect(d.action).toBe('noop');
+  });
+});
+
+describe('decideColdStart — journal-gated fast-forward', () => {
+  test('local ≠ doc, journal matches hash(local) → fast-forward-hub (no conflict)', () => {
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        journalHash: hashBytes(BODY_LOCAL),
+      })
+    );
+    expect(d.action).toBe('fast-forward-hub');
+    expect(d.winner).toBeUndefined();
+  });
+
+  test('journal match overrides timestamps — even a NEWER local mtime fast-forwards', () => {
+    // mtime newer than the doc stamp, but the bytes are exactly what we last
+    // synced (e.g. touch / checkout changed mtime only) → not a conflict.
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        journalHash: hashBytes(BODY_LOCAL),
+        localMtimeMs: 2_000,
+        docBodyEditAtMs: 1_000,
+      })
+    );
+    expect(d.action).toBe('fast-forward-hub');
+  });
+});
+
+describe('decideColdStart — divergence (conflict + newest-wins)', () => {
+  test('journal ABSENT, local newer → conflict, winner=local (the incident shape)', () => {
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        localMtimeMs: 2_000,
+        docBodyEditAtMs: 1_000,
+      })
+    );
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('local');
+  });
+
+  test('journal ABSENT, doc newer → conflict, winner=hub', () => {
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        localMtimeMs: 1_000,
+        docBodyEditAtMs: 2_000,
+      })
+    );
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('hub');
+  });
+
+  test('journal STALE (≠ hash(local)), local newer → conflict, winner=local', () => {
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        journalHash: hashBytes('<div>some older synced state</div>'),
+        localMtimeMs: 5_000,
+        docBodyEditAtMs: 4_000,
+      })
+    );
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('local');
+  });
+
+  test('journal STALE, doc newer → conflict, winner=hub', () => {
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        journalHash: hashBytes('<div>some older synced state</div>'),
+        localMtimeMs: 4_000,
+        docBodyEditAtMs: 5_000,
+      })
+    );
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('hub');
+  });
+
+  test('journal matching hash(DOC) — not local — is still divergence', () => {
+    // The journal proves we once synced what the HUB now holds reverted to;
+    // local moved past it → local is unreconciled work, must conflict.
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        journalHash: hashBytes(BODY_HUB),
+        localMtimeMs: 2_000,
+        docBodyEditAtMs: 1_000,
+      })
+    );
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('local');
+  });
+
+  test('doc stamp NULL (older peer never stamped) → hub-wins fallback', () => {
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        localMtimeMs: 2_000,
+        docBodyEditAtMs: null,
+      })
+    );
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('hub');
+  });
+
+  test('local mtime NULL → hub-wins fallback', () => {
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        localMtimeMs: null,
+        docBodyEditAtMs: 2_000,
+      })
+    );
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('hub');
+  });
+
+  test('both timestamps NULL → hub-wins fallback', () => {
+    const d = decideColdStart(input({ localBody: BODY_LOCAL, docBody: BODY_HUB }));
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('hub');
+  });
+
+  test('timestamps TIED → hub-wins fallback', () => {
+    const d = decideColdStart(
+      input({
+        localBody: BODY_LOCAL,
+        docBody: BODY_HUB,
+        localMtimeMs: 1_000,
+        docBodyEditAtMs: 1_000,
+      })
+    );
+    expect(d.action).toBe('conflict');
+    expect(d.winner).toBe('hub');
+  });
+
+  test('every decision carries a human-readable reason', () => {
+    const cases: ColdStartInput[] = [
+      input({}),
+      input({ docBody: BODY_HUB }),
+      input({ localBody: BODY_LOCAL }),
+      input({ localBody: BODY_HUB, docBody: BODY_HUB }),
+      input({ localBody: BODY_LOCAL, docBody: BODY_HUB, journalHash: hashBytes(BODY_LOCAL) }),
+      input({ localBody: BODY_LOCAL, docBody: BODY_HUB }),
+    ];
+    for (const c of cases) {
+      const d = decideColdStart(c);
+      expect(d.reason.length).toBeGreaterThan(0);
+    }
+  });
+});

package/apps/studio/test/sync-connection-state.test.ts

@@ -144,3 +144,71 @@ describe('connection monitor', () => {
     expect(changes.length).toBe(before); // no offline transition fired
   });
 });
+
+// DDR-102 — per-doc states + real lastSyncAt.
+describe('connection monitor — per-doc states (DDR-102)', () => {
+  test('noteDocState rolls up into docs counts + rejectedSlugs', () => {
+    const { monitor } = makeMonitor();
+    monitor.noteDocState('ui-a', 'pending');
+    monitor.noteDocState('ui-b', 'connected');
+    monitor.noteDocState('ui-c', 'auth-rejected');
+    monitor.noteDocState('ui-d', 'auth-rejected');
+
+    const snap = monitor.snapshot();
+    expect(snap.docs).toEqual({ synced: 1, pending: 1, rejected: 2 });
+    expect(snap.rejectedSlugs?.sort()).toEqual(['ui-c', 'ui-d']);
+  });
+
+  test('doc state transitions update the rollup (rejected → connected after re-link)', () => {
+    const { monitor, changes } = makeMonitor();
+    monitor.noteDocState('ui-a', 'auth-rejected');
+    expect(monitor.snapshot().docs?.rejected).toBe(1);
+    monitor.noteDocState('ui-a', 'connected');
+    const snap = monitor.snapshot();
+    expect(snap.docs).toEqual({ synced: 1, pending: 0, rejected: 0 });
+    expect(snap.rejectedSlugs).toEqual([]);
+    // Each transition emitted (no-op repeats don't).
+    const emitted = changes.length;
+    monitor.noteDocState('ui-a', 'connected');
+    expect(changes.length).toBe(emitted);
+  });
+
+  test('rejectedSlugs caps at 20 while docs.rejected carries the true count', () => {
+    const { monitor } = makeMonitor();
+    for (let i = 0; i < 25; i++) monitor.noteDocState(`ui-${i}`, 'auth-rejected');
+    const snap = monitor.snapshot();
+    expect(snap.docs?.rejected).toBe(25);
+    expect(snap.rejectedSlugs).toHaveLength(20);
+  });
+
+  test('noteSyncActivity sets lastSyncAt to now and promotes a pending doc', () => {
+    const { clock, monitor } = makeMonitor();
+    monitor.noteDocState('ui-a', 'pending');
+    expect(monitor.snapshot().lastSyncAt).toBeNull();
+
+    clock.advance(5_000);
+    monitor.noteSyncActivity('ui-a');
+    const snap = monitor.snapshot();
+    expect(snap.lastSyncAt).toBe(clock.now());
+    expect(snap.docs?.synced).toBe(1);
+    expect(snap.docs?.pending).toBe(0);
+  });
+
+  test('noteSyncActivity does NOT resurrect an auth-rejected doc', () => {
+    const { monitor } = makeMonitor();
+    monitor.noteDocState('ui-a', 'auth-rejected');
+    monitor.noteSyncActivity('ui-a');
+    expect(monitor.snapshot().docs?.rejected).toBe(1);
+    expect(monitor.snapshot().lastSyncAt).not.toBeNull();
+  });
+
+  test('lastSyncAt advances on repeated activity (real activity, not just transitions)', () => {
+    const { clock, monitor } = makeMonitor();
+    monitor.noteDocState('ui-a', 'connected');
+    monitor.noteSyncActivity('ui-a');
+    const first = monitor.snapshot().lastSyncAt;
+    clock.advance(10_000);
+    monitor.noteSyncActivity('ui-a');
+    expect(monitor.snapshot().lastSyncAt).toBe((first as number) + 10_000);
+  });
+});