@1agh/maude 1.0.11 → 1.3.0

package/apps/studio/sync/projection.ts

@@ -37,9 +37,11 @@ import {
   applyMetaToDoc,
   cssFromDoc,
   htmlFromDoc,
+  laneValueFromFile,
   mergeSharedMetaIntoLocal,
   metaFromDoc,
   movedToFromDoc,
+  readLaneFromDoc,
   stampAnnotationsEdit,
   stampBodyEdit,
 } from './codec.ts';
@@ -47,8 +49,29 @@ import { type EchoGuard, hashBytes } from './echo-guard.ts';
 import type { SyncJournal } from './journal.ts';
 import { MAX_CSS_BYTES, MAX_HTML_BYTES, MAX_META_BYTES, withinByteCap } from './limits.ts';
 import { ORIGINS } from './origins.ts';
+import { collapseRepeatedModule, collapseRepeatedText } from './repeated-module.ts';
+import type { RevisionBarrier } from './revision-barrier.ts';
+import { repairSeedDuplication } from './seed-repair.ts';
+import { mergeSource } from './source-merge.ts';
+import type { SourceOp } from './source-ops.ts';
+import { saveRecoveryBody } from './source-recovery.ts';
+import { sourceError } from './source-validation.ts';
+import { laneHash } from './transaction-client.ts';
 
 export const PROJECT_FLUSH_MS = 800;
+/**
+ * Accepted revisions arrive as whole, validated states — not a keystroke
+ * stream from a peer's editor that the 800 ms debounce exists to coalesce — so
+ * the receiving disk (and the canvas that renders from it) follows almost at
+ * once.
+ */
+export const ACCEPTED_FLUSH_MS = 30;
+/** T24 — how many times one UI operation is re-applied after losing races. */
+export const MAX_OP_REPLAYS = 3;
+/** How long an announced API write may hold the doc→file writer at most. */
+export const LOCAL_WRITE_HOLD_MS = 3_000;
+/** `MAUDE_SYNC_DEBUG=1` — one line per proposal and per disk write (diagnosis). */
+const SYNC_DEBUG = process.env.MAUDE_SYNC_DEBUG === '1';
 export const CIRCUIT_MAX_STRIKES = 3;
 
 export interface ProjectionPaths {
@@ -64,6 +87,13 @@ export interface ProjectionPaths {
   css?: string;
 }
 
+export interface BodyRejection {
+  slug: string;
+  kind: 'body-rejected';
+  reason: 'invalid-source' | 'local-edit' | 'history-failed' | 'merge-budget';
+  snapshotFailed: boolean;
+}
+
 export interface DocProjectionOptions {
   slug: string;
   doc: Y.Doc;
@@ -97,6 +127,77 @@ export interface DocProjectionOptions {
   /** DDR-102 — per-machine sync journal; every successful disk↔doc body/css
    *  traversal checkpoints here (same discipline as the agent). Optional. */
   journal?: SyncJournal;
+  /** Bounded recovery slots, separate from rolling history. */
+  historyDir?: string;
+  onConflict?: (info: BodyRejection) => void;
+  onRecovered?: () => void;
+  /** Runtime waits for cold-start snapshots before allowing any projection. */
+  waitForReconcile?: boolean;
+  /**
+   * ACCEPTED-REVISIONS MODE (DDR-241). While `accepted.on()` holds, a local
+   * change is never written into the shared document: it is PROPOSED with the
+   * value it was derived from, and the document changes only when the hub
+   * publishes the accepted (possibly merged) revision. The file is the
+   * candidate until then; a rejection keeps it and reports a conflict.
+   */
+  accepted?: AcceptedLaneLink;
+  /**
+   * Plan T14 — the revision barrier shared by every projection of this
+   * runtime: a document stamped with a multi-document revision is written to
+   * disk together with the rest of that revision (see revision-barrier.ts).
+   */
+  revisionBarrier?: RevisionBarrier;
+  /** T24 — re-apply a UI operation onto the version that won (sync/source-ops). */
+  replayOp?: (
+    op: SourceOp,
+    head: string
+  ) => { ok: true; source: string } | { ok: false; reason: string };
+  /** T29 — this checkout now holds a document at this accepted revision. */
+  onRevisionApplied?: (revision: number) => void;
+  /** T26 — a lane value of ours was accepted as this action. */
+  onAccepted?: (info: { lane: ProposalLane; value: string; actionId: string }) => void;
+  /**
+   * May a write to the shared document reach the hub right now? When false a
+   * file change is HELD (not imported) and `onWriteBlocked` fires; the runtime
+   * re-delivers it via `retryDeferred()` once the connection is writable or
+   * the project turns out to be in accepted-revisions mode.
+   */
+  canWriteDoc?: () => boolean;
+  onWriteBlocked?: () => void;
+}
+
+export type ProposalLane = 'html' | 'css' | 'meta' | 'annotations' | 'comments';
+export interface ProposalOutcome {
+  status: 'accepted' | 'rejected';
+  code?: string;
+  /** On a base conflict: the hash of the accepted value that won. */
+  head?: string;
+  /** On acceptance: the project action that carries it (T26 — Cmd+Z binds to it). */
+  actionId?: string;
+}
+
+export interface LaneProposal {
+  lane: ProposalLane;
+  content: string;
+  /** The value this edit was derived from — the hub merges three-way from it. */
+  baseContent: string;
+  writeId?: string;
+  transactionId: string;
+  /** An earlier proposal of the same lane this one was authored on top of. */
+  dependsOn?: string[];
+  /**
+   * T16 — a change a TOOL wrote (watcher import, or a cold-start difference):
+   * joins an open AI action instead of going out on its own. A change the
+   * person made through the UI is never stageable.
+   */
+  stageable?: boolean;
+}
+
+export interface AcceptedLaneLink {
+  /** Is the project in accepted-revisions mode right now? */
+  on(): boolean;
+  newTransactionId(): string;
+  propose(p: LaneProposal): Promise<ProposalOutcome>;
 }
 
 export interface DocProjection {
@@ -115,6 +216,58 @@ export interface DocProjection {
   reconcile(): void;
   /** Force the pending doc→file flush immediately. */
   flush(): Promise<void>;
+  /**
+   * Adopt `body` as the shared base before `reconcile()`. A restart that could
+   * not merge a local candidate (cold start) hands the base back here, so the
+   * write stays blocked with a visible conflict and a later save can merge.
+   */
+  adoptBase(body: string): void;
+  /**
+   * Accepted-revisions mode: propose one lane value that did not come through
+   * the watcher (a comment/annotation API write). Resolves with the outcome;
+   * `null` when the projection is not in accepted mode.
+   */
+  proposeLane(
+    lane: ProposalLane,
+    value: string,
+    opts?: { baseContent?: string; writeId?: string; stageable?: boolean }
+  ): Promise<ProposalOutcome> | null;
+  /** Lanes with an unresolved proposal (status surfaces). */
+  pendingCount(): number;
+  /**
+   * T28 — resolve a held source conflict by taking the project's version:
+   * the accepted body returns to disk; the local candidate is already in the
+   * recovery slots. Returns false when nothing is held.
+   */
+  takeAccepted(): boolean;
+  /** T28 — the two sides of a held source conflict (null when none). */
+  conflictSides(): { mine: string | null; theirs: string } | null;
+  /** Re-deliver file changes held while the document was not writable. */
+  retryDeferred(): void;
+  /**
+   * Accepted mode: a privileged API route is about to rewrite the canvas
+   * source (it announces this with `activity:suppress`). Captures the exact
+   * bytes that edit is based on, and holds the doc→file writer until the
+   * edit's own file event has been proposed — so a peer revision landing in
+   * the watcher's quiet window can neither overwrite the edit nor read it as
+   * a conflicting stale local change.
+   */
+  noteLocalWrite(): void;
+  /**
+   * T24 — the API write in flight is this UI operation (see sync/source-ops):
+   * if its proposal loses a race, the operation is re-applied onto the
+   * version that won and proposed again, instead of becoming a conflict.
+   */
+  noteSourceOp(op: SourceOp): void;
+  /** The announced write did not happen (no-op or failure). */
+  cancelLocalWrite(): void;
+  /**
+   * Accepted-revisions cold start: disk differs from the accepted value and
+   * nothing proves what it was derived from. Keep both — block the lane's
+   * writer, report the conflict, and let the next save (based on `base`, the
+   * accepted value shown in the conflict) resolve it.
+   */
+  hold(lane: ProposalLane, base: string, local: string): void;
   /** Stop the doc listener + timers. */
   stop(): void;
   /** Test/inspection — the origin used on file→doc imports. */
@@ -131,6 +284,66 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
   let started = false;
   let stopped = false;
   let dirty = false;
+  let ready = !opts.waitForReconcile;
+  let observedBody = readLocal(paths.html);
+  let rejectedKey: string | null = null;
+  let validationCache: { body: string; error: string | null } | null = null;
+
+  function recovered(): void {
+    if (rejectedKey !== null) opts.onRecovered?.();
+    rejectedKey = null;
+  }
+
+  function validation(body: string): string | null {
+    if (validationCache?.body === body) return validationCache.error;
+    const error = sourceError(paths.html, body);
+    validationCache = { body, error };
+    return error;
+  }
+
+  /** Persist the agreed body beside the journal checkpoint (best-effort). */
+  function rememberBase(body: string): void {
+    if (!opts.historyDir) return;
+    try {
+      saveRecoveryBody(opts.historyDir, paths.html, 'base', body);
+    } catch {
+      /* a restart then falls back to newest-wins — the pre-existing behaviour */
+    }
+  }
+
+  function preserveLocal(body: string | null): void {
+    if (opts.historyDir && body?.trim()) {
+      // An invalid local draft can still contain authored work. Keep its raw
+      // bytes too before accepting a valid remote replacement.
+      saveRecoveryBody(opts.historyDir, paths.html, 'local', body);
+      if (validation(body) === null)
+        saveRecoveryBody(opts.historyDir, paths.html, 'last-valid', body);
+    }
+  }
+
+  function reject(
+    reason: BodyRejection['reason'],
+    local: string | null,
+    incoming: string,
+    file = paths.html
+  ): void {
+    const key = `${file}:${reason}:${hashBytes(local ?? '')}:${hashBytes(incoming)}`;
+    if (key === rejectedKey) return;
+    rejectedKey = key;
+    let snapshotFailed = false;
+    try {
+      if (file === paths.html) preserveLocal(local);
+      if (opts.historyDir) {
+        if (local !== null) saveRecoveryBody(opts.historyDir, file, 'local', local);
+        saveRecoveryBody(opts.historyDir, file, 'incoming', incoming);
+      }
+    } catch {
+      snapshotFailed = true;
+    }
+    console.warn(`[projection/${slug}] source sync blocked (${reason}); local file kept.`);
+    opts.onConflict?.({ slug, kind: 'body-rejected', reason, snapshotFailed });
+  }
+
   let flushTimer: ReturnType<typeof setTimeout> | null = null;
 
   // doc→file last-written hashes (skip redundant writes).
@@ -157,6 +370,9 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
     ) {
       return;
     }
+    // The accepted replica is the hub's to change — a local repair would be a
+    // write the fenced connection drops, leaving this replica diverged.
+    if (!acceptedOn()) repairSeedDuplication(doc, ORIGINS.DISK_PROJECTION);
     scheduleFlush();
   }
 
@@ -167,10 +383,13 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
       return;
     }
     if (flushTimer) clearTimeout(flushTimer);
-    flushTimer = setTimeout(() => {
-      flushTimer = null;
-      void flush();
-    }, flushMs);
+    flushTimer = setTimeout(
+      () => {
+        flushTimer = null;
+        void flush();
+      },
+      acceptedOn() ? Math.min(flushMs, ACCEPTED_FLUSH_MS) : flushMs
+    );
   }
 
   function recordEcho(path: string, value: string): void {
@@ -216,25 +435,84 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
 
   // ----- doc → file (html / css / meta only; room owns comments/annotations)
 
-  function writeHtmlIfChanged(): void {
-    const next = htmlFromDoc(doc);
-    if (next === lastHtml) return;
+  function writeHtmlIfChanged(): boolean {
+    // A proposal for this lane is in flight: the file is our candidate and the
+    // accepted value is about to be republished. Writing the document's
+    // current value now would briefly undo the user's own edit.
+    if (pending.has('html') || localWriteActive()) return false;
+    let next = htmlFromDoc(doc);
+    // The same module written twice or more in a row is a merge of two
+    // independent seeds, never an edit (repeated-module.ts). Keep one copy —
+    // in the shared document too, so every peer and the hub are repaired,
+    // not just this disk. (Accepted revisions: the replica is the hub's; the
+    // import there collapses it instead.)
+    if (!acceptedOn()) {
+      const repeated = collapseRepeatedModule(next);
+      if (repeated) {
+        console.warn(
+          `[projection/${slug}] the shared document held this canvas ${repeated.times}× over${
+            repeated.partialTail ? ' (the last copy cut short)' : ''
+          } — keeping one copy.`
+        );
+        doc.transact(() => {
+          applyHtmlToDoc(doc, repeated.unit, ORIGINS.DISK_PROJECTION);
+          stampBodyEdit(doc, ORIGINS.DISK_PROJECTION);
+        }, ORIGINS.DISK_PROJECTION);
+        next = repeated.unit;
+      }
+    }
+    if (next === lastHtml) return true;
     // Don't clobber a non-empty local body with an empty doc (cold-start before
     // the doc is seeded — the safe-reconcile invariant; full adopt is Phase E).
     if (next === '') {
       lastHtml = next;
-      return;
+      return true;
+    }
+    if (!withinCap(paths.html, next, MAX_HTML_BYTES)) return false;
+    const local = readLocal(paths.html);
+    if (validation(next) !== null) {
+      reject('invalid-source', local, next);
+      return false;
+    }
+    if (local !== observedBody && local !== next) {
+      reject('local-edit', local, next);
+      return false;
+    }
+    try {
+      preserveLocal(local);
+    } catch {
+      reject('history-failed', local, next);
+      return false;
+    }
+    if (SYNC_DEBUG) {
+      console.log(
+        `[projection/${slug}] write html ${hashBytes(next).slice(0, 8)} (disk was ${local === null ? '-' : hashBytes(local).slice(0, 8)})`
+      );
     }
-    if (!withinCap(paths.html, next, MAX_HTML_BYTES)) return;
-    recordEcho(paths.html, next);
     writeAndAnnounce(paths.html, next);
+    recordEcho(paths.html, next);
+    observedBody = next;
+    recovered();
     lastHtml = next;
     opts.journal?.record(slug, { bodyHash: hashBytes(next) }); // DDR-102 checkpoint
+    rememberBase(next);
+    return true;
   }
 
   function writeCssIfChanged(): void {
     if (!paths.css) return;
-    const next = cssFromDoc(doc);
+    if (pending.has('css') || held.has('css')) return;
+    let next = cssFromDoc(doc);
+    if (next !== null && !acceptedOn()) {
+      const repeated = collapseRepeatedText(next);
+      if (repeated) {
+        console.warn(
+          `[projection/${slug}] the shared stylesheet held itself ${repeated.times}× over — keeping one copy.`
+        );
+        applyCssToDoc(doc, repeated.unit, ORIGINS.DISK_PROJECTION);
+        next = repeated.unit;
+      }
+    }
     if (next === lastCss) return;
     lastCss = next;
     if (next === null) return; // doc carries no css yet — nothing to write
@@ -242,10 +520,18 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
     recordEcho(paths.css, next);
     writeAndAnnounce(paths.css, next);
     opts.journal?.record(slug, { cssHash: hashBytes(next) }); // DDR-102 checkpoint
+    if (opts.historyDir) {
+      try {
+        saveRecoveryBody(opts.historyDir, paths.css, 'base', next);
+      } catch {
+        /* the journal hash still covers the common case */
+      }
+    }
   }
 
   function writeMetaIfChanged(): void {
     if (!paths.meta) return;
+    if (pending.has('meta') || held.has('meta')) return;
     const shared = metaFromDoc(doc);
     if (shared === lastMeta) return;
     lastMeta = shared;
@@ -258,8 +544,31 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
     writeAndAnnounce(paths.meta, merged);
   }
 
+  /** The newest multi-document revision this projection has been released for. */
+  let releasedRevision = 0;
+  /**
+   * The first stamp a projection sees is the state it started from (boot, or
+   * a document that arrived by pull) — already whole, never held. Only a
+   * revision that arrives WHILE it runs waits for its cohort.
+   */
+  let seenStamp = false;
+  function observeStamp(stamped: [number, number]): void {
+    seenStamp = true;
+    releasedRevision = Math.max(releasedRevision, stamped[0]);
+    opts.revisionBarrier?.present(stamped[0], stamped[1], slug);
+  }
+
+  /** `[revision, cohort]` the hub stamped on this document (cohort ≥ 1). */
+  function stampedCohort(): [number, number] | null {
+    const meta = doc.getMap('syncMeta');
+    const rev = meta.get('acceptedRevision');
+    const cohort = meta.get('acceptedCohort');
+    if (typeof rev !== 'number') return null;
+    return [rev, typeof cohort === 'number' && cohort > 1 ? cohort : 1];
+  }
+
   async function flush(): Promise<void> {
-    if (!dirty || stopped) return;
+    if (!dirty || stopped || !ready) return;
     // A RETIRED document is write-inert — its canvas moved to a new path in a
     // new document, and materialising this one is how a moved canvas
     // resurrected itself at its old path (see codec stampMovedTo).
@@ -267,15 +576,30 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
       dirty = false;
       return;
     }
+    // T14 — part of a multi-document revision: wait for the rest of it, so
+    // the checkout never shows half an action.
+    const stamped = acceptedOn() && opts.revisionBarrier ? stampedCohort() : null;
+    if (stamped && !seenStamp) observeStamp(stamped);
+    else if (stamped && stamped[1] > 1 && stamped[0] > releasedRevision) {
+      const [rev, cohort] = stamped;
+      const held = opts.revisionBarrier?.arrive(rev, cohort, slug, () => {
+        releasedRevision = Math.max(releasedRevision, rev);
+        dirty = true;
+        void flush();
+      });
+      if (held) return;
+    }
     dirty = false;
     if (flushTimer) {
       clearTimeout(flushTimer);
       flushTimer = null;
     }
     try {
-      writeHtmlIfChanged();
-      writeCssIfChanged();
+      if (writeHtmlIfChanged()) writeCssIfChanged();
       writeMetaIfChanged();
+      const applied = acceptedOn() ? stampedCohort() : null;
+      if (applied && !held.has('html') && !pending.has('html'))
+        opts.onRevisionApplied?.(applied[0]);
     } catch (err) {
       dirty = true;
       console.error(`[projection/${slug}] flush failed:`, err);
@@ -307,6 +631,308 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
     quarantine.delete(path);
   }
 
+  // ----- accepted-revisions mode (DDR-241)
+
+  const acceptedOn = (): boolean => !!opts.accepted?.on();
+  /** Per lane: proposals not yet answered, and the newest one's id + value. */
+  const pending = new Map<ProposalLane, { count: number; lastTx: string; lastValue: string }>();
+  /** Lanes whose last answer was a rejection — the local file is the held candidate. */
+  const held = new Set<ProposalLane>();
+  /** Accepted mode: file events that arrived before the cold start decided. */
+  const deferredBeforeReady = new Map<string, string>();
+  /** Legacy mode: file events held while the connection was not writable. */
+  const heldWhileReadOnly = new Map<string, string>();
+  /** Accepted mode: an API source write announced but not yet seen by the watcher. */
+  let localWrite: { base: string | null; at: number; op?: SourceOp } | null = null;
+  let localWriteTimer: ReturnType<typeof setTimeout> | null = null;
+  const localWriteActive = (): boolean => {
+    if (!localWrite) return false;
+    if (Date.now() - localWrite.at < LOCAL_WRITE_HOLD_MS) return true;
+    localWrite = null;
+    return false;
+  };
+
+  const REJECTION_REASON: Record<string, BodyRejection['reason']> = {
+    'source-invalid': 'invalid-source',
+    capacity: 'merge-budget',
+    // The change could not even be saved to this machine's outbox.
+    'local-persistence': 'history-failed',
+  };
+
+  function laneOfPath(p: string): ProposalLane | null {
+    if (p === paths.html) return 'html';
+    if (paths.css && p === paths.css) return 'css';
+    if (paths.meta && p === paths.meta) return 'meta';
+    if (p === paths.comments) return 'comments';
+    if (p === paths.annotations) return 'annotations';
+    return null;
+  }
+
+  function pathOfLane(lane: ProposalLane): string {
+    if (lane === 'html') return paths.html;
+    if (lane === 'css') return paths.css ?? paths.html;
+    if (lane === 'meta') return paths.meta ?? paths.html;
+    return lane === 'comments' ? paths.comments : paths.annotations;
+  }
+
+  /** The value disk and the accepted replica last agreed on for `lane`. */
+  function agreedValue(lane: ProposalLane): string {
+    if (lane === 'html') return lastHtml ?? htmlFromDoc(doc);
+    if (lane === 'css') return lastCss ?? cssFromDoc(doc) ?? '';
+    return readLaneFromDoc(doc, lane);
+  }
+
+  function onRejected(lane: ProposalLane, local: string, outcome: ProposalOutcome): void {
+    held.add(lane);
+    // The candidate stays on disk: the projection's local-edit guard protects
+    // it (html), `held` blocks the lane writer (css/meta), and the recovery
+    // slots keep the bytes whatever happens next.
+    //
+    // The NEXT save is the resolution, and it is made looking at the version
+    // the conflict reports as incoming — so that version becomes its base.
+    // Keeping the old base would make every resolution that touches the same
+    // region conflict again, forever (there is no way out but typing the
+    // other side's bytes back exactly).
+    const incoming = readLaneFromDoc(doc, lane);
+    if (lane === 'html') {
+      observedBody = null;
+      lastHtml = incoming;
+    } else if (lane === 'css') {
+      lastCss = incoming;
+    }
+    reject(
+      REJECTION_REASON[outcome.code ?? ''] ?? 'local-edit',
+      local,
+      readLaneFromDoc(doc, lane),
+      pathOfLane(lane)
+    );
+  }
+
+  /**
+   * Send one lane proposal. A proposal made while an earlier one of the same
+   * lane is unanswered was authored ON TOP of it: it is based on that value and
+   * DEPENDS on it, so a rejected U1 can never be bypassed by an accepted U2
+   * that silently carries half of it (plan T7/T13).
+   */
+  function submit(
+    lane: ProposalLane,
+    value: string,
+    baseContent: string,
+    local: string,
+    writeId?: string,
+    stageable = false,
+    op?: SourceOp,
+    replays = 0
+  ): Promise<ProposalOutcome> {
+    const link = opts.accepted as AcceptedLaneLink;
+    const prior = pending.get(lane);
+    const transactionId = link.newTransactionId();
+    if (SYNC_DEBUG) {
+      console.log(
+        `[projection/${slug}] propose ${lane} tx=${transactionId.slice(0, 11)} value=${hashBytes(value).slice(0, 8)} base=${hashBytes(baseContent).slice(0, 8)} doc=${hashBytes(readLaneFromDoc(doc, lane)).slice(0, 8)} last=${lastHtml === null ? '-' : hashBytes(lastHtml).slice(0, 8)} via=${new Error().stack?.split('\n')[3]?.trim().slice(0, 60)}`
+      );
+    }
+    pending.set(lane, {
+      count: (prior?.count ?? 0) + 1,
+      lastTx: transactionId,
+      lastValue: value,
+    });
+    const settle = async (outcome: ProposalOutcome): Promise<ProposalOutcome> => {
+      // A rejection can outrun the publication of the version that beat it
+      // (HTTP answer vs. WebSocket update). The conflict must report — and the
+      // resolution be based on — THAT version, so wait briefly for it.
+      if (outcome.status === 'rejected' && outcome.head) await untilLaneHash(lane, outcome.head);
+      const p = pending.get(lane);
+      if (p) {
+        p.count -= 1;
+        if (p.count <= 0) pending.delete(lane);
+      }
+      // T24 — a UI operation that lost a race is re-applied onto the version
+      // that won (same property: the later acceptance wins; everything else
+      // of both people survives) and proposed again, instead of a conflict.
+      if (
+        outcome.status === 'rejected' &&
+        outcome.code === 'base-conflict' &&
+        lane === 'html' &&
+        op &&
+        opts.replayOp &&
+        replays < MAX_OP_REPLAYS &&
+        !pending.has(lane) &&
+        readLocal(paths.html) === local
+      ) {
+        const head = readLaneFromDoc(doc, 'html');
+        const r = opts.replayOp(op, head);
+        if (r.ok && r.source !== head && validation(r.source) === null) {
+          if (SYNC_DEBUG) console.log(`[projection/${slug}] replay ${op.kind} onto the winner`);
+          observedBody = r.source;
+          recordEcho(paths.html, r.source);
+          writeAndAnnounce(paths.html, r.source);
+          return submit('html', r.source, head, r.source, undefined, false, op, replays + 1);
+        }
+      }
+      if (outcome.status === 'accepted') {
+        if (!pending.has(lane)) held.delete(lane);
+        if (lane === 'html') recovered();
+        if (outcome.actionId) {
+          try {
+            opts.onAccepted?.({ lane, value, actionId: outcome.actionId });
+          } catch {
+            /* bookkeeping only */
+          }
+        }
+      } else if (outcome.code === 'discarded') {
+        // T16 — the person discarded an unfinished AI edit: the accepted
+        // version returns to disk (the candidate is in the recovery slots).
+        held.delete(lane);
+        if (lane === 'html') {
+          observedBody = readLocal(paths.html);
+          lastHtml = null;
+        } else if (lane === 'css') {
+          lastCss = null;
+        } else if (lane === 'meta') {
+          lastMeta = null;
+        }
+      } else {
+        onRejected(lane, local, outcome);
+      }
+      scheduleFlush();
+      return outcome;
+    };
+    return link
+      .propose({
+        lane,
+        content: value,
+        baseContent,
+        transactionId,
+        ...(prior ? { dependsOn: [prior.lastTx] } : {}),
+        ...(writeId ? { writeId } : {}),
+        ...(stageable ? { stageable: true } : {}),
+      })
+      .then(settle, (err: unknown) => {
+        const code = (err as { code?: unknown })?.code;
+        if (code === 'stopped') {
+          // The runtime is going away with this proposal unanswered. It is
+          // still in the durable outbox and the next runtime resends it — so
+          // it is neither a failure nor a rejection, and nothing is reported.
+          const p = pending.get(lane);
+          if (p) {
+            p.count -= 1;
+            if (p.count <= 0) pending.delete(lane);
+          }
+          return { status: 'rejected', code: 'stopped' } as ProposalOutcome;
+        }
+        console.error(`[projection/${slug}] proposing ${lane} failed:`, err);
+        return settle({
+          status: 'rejected',
+          code: typeof code === 'string' ? code : 'client-error',
+        });
+      });
+  }
+
+  function untilLaneHash(lane: ProposalLane, head: string, ms = 3_000): Promise<void> {
+    const matches = () => laneHash(readLaneFromDoc(doc, lane)) === head;
+    if (matches()) return Promise.resolve();
+    return new Promise((resolve) => {
+      const done = () => {
+        clearTimeout(timer);
+        doc.off('update', onUpdate);
+        resolve();
+      };
+      const onUpdate = () => {
+        if (matches()) done();
+      };
+      const timer = setTimeout(done, ms);
+      doc.on('update', onUpdate);
+    });
+  }
+
+  /** Accepted-revisions import: propose the file's lane value; never touch the doc. */
+  function proposeFromFs(evt: { path: string; hash: string }, str: string): boolean {
+    const lane = laneOfPath(evt.path);
+    if (!lane) return false;
+    if (SYNC_DEBUG && lane === 'html') {
+      console.log(
+        `[projection/${slug}] fs event html ${hashBytes(str).slice(0, 8)} evt=${evt.hash.slice(0, 8)} doc=${hashBytes(htmlFromDoc(doc)).slice(0, 8)} last=${lastHtml === null ? '-' : hashBytes(lastHtml).slice(0, 8)} held=${held.has('html')} pending=${pending.has('html')}`
+      );
+    }
+    // COMMENTS AND ANNOTATIONS ARE NEVER PROPOSED FROM A FILE EVENT. Their
+    // files have a second writer — the collab room projects the accepted
+    // document onto them — so a file change here is as likely the room
+    // writing a value the document has since moved past as it is an edit.
+    // Proposing that with the current head as its base REPLACES the head:
+    // a deleted shape resurrected by a stale projection (surface run
+    // 2026-09-15, L09 delete). Every edit to these lanes arrives through the
+    // API with the base it was made from (`proposeLane`).
+    if (lane === 'comments' || lane === 'annotations') return false;
+    if (lane === 'html') {
+      if (str === lastHtml && !held.has('html')) return false; // a redelivered projection
+      if (!withinCap(paths.html, str, MAX_HTML_BYTES)) return false;
+      if (validation(str) !== null) {
+        strike(evt.path, evt.hash);
+        reject('invalid-source', str, htmlFromDoc(doc));
+        return false;
+      }
+    } else if (lane === 'css' && str === lastCss && !held.has('css')) {
+      return false;
+    }
+    const value = laneValueFromFile(lane, str);
+    if (value === null) {
+      strike(evt.path, evt.hash);
+      return false;
+    }
+    clearStrike(evt.path);
+    const inFlight = pending.get(lane);
+    // The watcher redelivering what we already proposed is not a new edit.
+    if (inFlight?.lastValue === value) return false;
+    const current = readLaneFromDoc(doc, lane);
+    if (value === current) {
+      if (inFlight) return false;
+      held.delete(lane);
+      if (lane === 'html') {
+        observedBody = str;
+        lastHtml = str;
+        recovered();
+      } else if (lane === 'css') {
+        lastCss = str;
+      }
+      return false;
+    }
+    // NOT "skip a value proposed before": the reader reads the file as it is
+    // NOW, so an event carrying an earlier proposal's bytes after that
+    // proposal was answered is the user going BACK to them (A→B→A, every
+    // undo/redo) — skipping it turned a real edit into a false conflict
+    // (surface run 2026-09-15, L18).
+    if (lane === 'html') {
+      try {
+        preserveLocal(str);
+      } catch {
+        reject('history-failed', str, current);
+        return false;
+      }
+      observedBody = str;
+    }
+    // An API edit announced its base (noteLocalWrite): that is exactly what
+    // it was derived from — better than the last agreed body, which a peer
+    // revision may have advanced inside the watcher's quiet window.
+    const apiBase = lane === 'html' ? (localWrite?.base ?? null) : null;
+    // T16 — a change the person made through the UI announced itself; any
+    // other file change is a tool's, and may belong to an open AI action.
+    const fromUi = localWrite !== null;
+    // T24 — the UI operation this write was, when it said.
+    const op = lane === 'html' ? localWrite?.op : undefined;
+    if (lane === 'html') localWrite = null;
+    void submit(
+      lane,
+      value,
+      inFlight ? inFlight.lastValue : (apiBase ?? agreedValue(lane)),
+      str,
+      undefined,
+      !fromUi,
+      op
+    );
+    return true;
+  }
+
   function applyFromFs(evt: { path: string; bytes: Uint8Array; hash: string }): boolean {
     if (stopped) return false;
     // Write-inert both ways — a local edit to a stale pre-move file must not
@@ -318,25 +944,100 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
     if (isQuarantined(evt.path, evt.hash)) return false;
 
     const str = bytesToString(evt.bytes);
+    if (acceptedOn()) {
+      // Before the cold start has decided, a proposal would race it (and a
+      // brand-new canvas is not in the project yet). Remember the path; the
+      // file is re-read once the decision is made.
+      if (!ready) {
+        deferredBeforeReady.set(evt.path, evt.hash);
+        return false;
+      }
+      return proposeFromFs(evt, str);
+    }
+    // Legacy import: a write the hub would drop must not be made at all.
+    if (opts.canWriteDoc && !opts.canWriteDoc()) {
+      heldWhileReadOnly.set(evt.path, evt.hash);
+      opts.onWriteBlocked?.();
+      return false;
+    }
 
     if (evt.path === paths.html) {
+      // Watchers can deliver the same projection more than once, including
+      // after the one-shot echo token was consumed or expired. These bytes
+      // contain no new local edit; diffing them against a newer remote body
+      // would turn a delayed notification into a rollback of peer work.
+      // Compare only the current baseline, so a deliberate A → B → A edit
+      // still imports after B advances lastHtml.
+      if (str === lastHtml) return false;
+      if (!withinCap(paths.html, str, MAX_HTML_BYTES)) return false;
+      if (validation(str) !== null) {
+        strike(evt.path, evt.hash);
+        reject('invalid-source', str, htmlFromDoc(doc));
+        return false;
+      }
       clearStrike(evt.path);
+      // A PEER CHANGED THE DOC SINCE DISK AND DOC LAST AGREED (`lastHtml`), and
+      // this save was authored against that older body. Importing it as a
+      // whole-file diff against the doc turned every stale byte into an edit
+      // and reverted the peer's work (audit 2026-09-13 P0 #1). Merge from the
+      // shared base instead; what the merge cannot prove independent — or a
+      // merged body that no longer validates — is preserved and blocked, and
+      // the conflict stays until a later save actually resolves it.
+      const current = htmlFromDoc(doc);
+      let next = str;
+      if (lastHtml !== null && current !== lastHtml && current !== str) {
+        const merged = mergeSource(lastHtml, str, current);
+        if (!merged.ok) {
+          reject(merged.reason === 'budget' ? 'merge-budget' : 'local-edit', str, current);
+          return false;
+        }
+        if (validation(merged.merged) !== null) {
+          reject('local-edit', str, current);
+          return false;
+        }
+        next = merged.merged;
+      }
+      try {
+        preserveLocal(str);
+      } catch {
+        reject('history-failed', str, htmlFromDoc(doc));
+        return false;
+      }
       // Body import + syncMeta stamp in ONE transaction (same FILE_IMPORT
       // origin) — peers get a single update carrying the newest-wins stamp.
       let changed = false;
-      doc.transact(() => {
-        changed = applyHtmlToDoc(doc, str, importOrigin);
-        if (changed) stampBodyEdit(doc, importOrigin);
-      }, importOrigin);
-      if (changed) {
-        lastHtml = htmlFromDoc(doc);
+      try {
+        doc.transact(() => {
+          changed = applyHtmlToDoc(doc, next, importOrigin);
+          if (changed) stampBodyEdit(doc, importOrigin);
+        }, importOrigin);
+      } catch {
+        reject('merge-budget', str, htmlFromDoc(doc));
+        return false;
+      }
+      observedBody = str;
+      lastHtml = str;
+      recovered();
+      if (htmlFromDoc(doc) !== str) {
+        // A synchronous peer update can land during the import transaction.
+        // Only bytes actually on disk count as the projection's baseline.
+        scheduleFlush();
+      } else if (changed) {
         opts.journal?.record(slug, { bodyHash: evt.hash }); // DDR-102 checkpoint
+        rememberBase(str);
       }
       return changed;
     }
     if (paths.css && evt.path === paths.css) {
+      let changed: boolean;
+      try {
+        changed = applyCssToDoc(doc, str, importOrigin);
+      } catch {
+        strike(evt.path, evt.hash);
+        reject('merge-budget', str, cssFromDoc(doc) ?? '', paths.css);
+        return false;
+      }
       clearStrike(evt.path);
-      const changed = applyCssToDoc(doc, str, importOrigin);
       if (changed) {
         lastCss = str;
         opts.journal?.record(slug, { cssHash: evt.hash }); // DDR-102 checkpoint
@@ -383,13 +1084,25 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
     if (stopped) return;
     // A retired doc materialises NOTHING (see codec stampMovedTo).
     if (movedToFromDoc(doc) !== null) return;
+    ready = true;
+    if (deferredBeforeReady.size && acceptedOn()) {
+      const owed = [...deferredBeforeReady];
+      deferredBeforeReady.clear();
+      for (const [p, hash] of owed) {
+        const text = readLocal(p);
+        if (text !== null) proposeFromFs({ path: p, hash }, text);
+      }
+    }
     // Materialize the converged doc to disk (html/css/meta). The *IfChanged
     // writers already guard against clobbering non-empty local with empty doc
     // values, so this is safe to run at cold start before the authoritative
     // seed (Phase E) — it only writes what the doc actually holds.
-    writeHtmlIfChanged();
-    writeCssIfChanged();
+    if (writeHtmlIfChanged()) writeCssIfChanged();
     writeMetaIfChanged();
+    // A document that arrives by pull as part of a multi-document revision is
+    // on disk now: the rest of its revision may show.
+    const stamped = acceptedOn() ? stampedCohort() : null;
+    if (stamped && !seenStamp) observeStamp(stamped);
   }
 
   return {
@@ -397,14 +1110,98 @@ export function createDocProjection(opts: DocProjectionOptions): DocProjection {
     importOrigin,
     start() {
       if (started) return;
+      // Snapshot before a provider can replace disk. Failure remains fail-closed
+      // at the write boundary and is surfaced when a write is attempted.
+      try {
+        preserveLocal(observedBody);
+      } catch {
+        /* checked before writes */
+      }
       doc.on('update', onDocUpdate);
       started = true;
     },
     applyFromFs,
     reconcile,
     flush,
+    adoptBase(body: string) {
+      lastHtml = body;
+      observedBody = body;
+    },
+    hold(lane, base, local) {
+      held.add(lane);
+      if (lane === 'html') {
+        lastHtml = base;
+        observedBody = null;
+      } else if (lane === 'css') {
+        lastCss = base;
+      }
+      reject('local-edit', local, readLaneFromDoc(doc, lane), pathOfLane(lane));
+    },
+    takeAccepted() {
+      if (!held.has('html') && rejectedKey === null) return false;
+      held.delete('html');
+      // The local-edit guard compares disk with `observedBody`; declaring the
+      // current disk bytes observed lets the writer replace them.
+      observedBody = readLocal(paths.html);
+      lastHtml = null;
+      dirty = true;
+      void flush();
+      recovered();
+      return true;
+    },
+    conflictSides() {
+      if (!held.has('html') && rejectedKey === null) return null;
+      return { mine: readLocal(paths.html), theirs: htmlFromDoc(doc) };
+    },
+    proposeLane(lane, value, o) {
+      if (!acceptedOn() || stopped) return null;
+      if (lane === 'html') observedBody = value;
+      const inFlight = pending.get(lane);
+      if (inFlight?.lastValue === value) return Promise.resolve({ status: 'accepted' });
+      if (!inFlight && value === readLaneFromDoc(doc, lane)) {
+        held.delete(lane);
+        return Promise.resolve({ status: 'accepted' });
+      }
+      const base = o?.baseContent ?? (inFlight ? inFlight.lastValue : agreedValue(lane));
+      return submit(lane, value, base, value, o?.writeId, o?.stageable === true);
+    },
+    noteSourceOp(op) {
+      if (localWrite) localWrite.op = op;
+    },
+    noteLocalWrite() {
+      if (!acceptedOn() || stopped) return;
+      localWrite = { base: readLocal(paths.html), at: Date.now() };
+      if (localWriteTimer) clearTimeout(localWriteTimer);
+      // The watcher event normally clears this long before; if it never comes
+      // (a write that changed nothing), the writer resumes on its own.
+      localWriteTimer = setTimeout(() => {
+        localWriteTimer = null;
+        scheduleFlush();
+      }, LOCAL_WRITE_HOLD_MS + 10);
+      localWriteTimer.unref?.();
+    },
+    cancelLocalWrite() {
+      localWrite = null;
+      scheduleFlush();
+    },
+    retryDeferred() {
+      if (stopped || heldWhileReadOnly.size === 0) return;
+      if (!acceptedOn() && opts.canWriteDoc && !opts.canWriteDoc()) return;
+      const owed = [...heldWhileReadOnly];
+      heldWhileReadOnly.clear();
+      for (const [p, hash] of owed) {
+        const text = readLocal(p);
+        if (text !== null) applyFromFs({ path: p, bytes: new TextEncoder().encode(text), hash });
+      }
+    },
+    pendingCount() {
+      let n = 0;
+      for (const p of pending.values()) n += p.count;
+      return n;
+    },
     stop() {
       stopped = true;
+      if (localWriteTimer) clearTimeout(localWriteTimer);
       doc.off('update', onDocUpdate);
       if (flushTimer) {
         clearTimeout(flushTimer);