@cueloop/client 0.1.0-alpha.63 → 0.1.0-alpha.65

package/src/session-controller.ts

@@ -1,8 +1,8 @@
 /**
  * The review-session controller: every daemon round-trip and mutation
- * verb behind one React-free object. It owns connect/autostart/subscribe,
+ * primitive behind one React-free object. It owns connect/autostart/subscribe,
  * the session/inbox/status/error snapshot, optimistic apply, the mutation
- * verbs (cut/edit/annotate/submit/...), and the post-submit completion
+ * primitives (cut/edit/annotate/submit/...), and the post-submit completion
  * lifecycle including the notes-vault export and the herdr return-focus.
  * App subscribes to snapshots and keeps only view state.
  */
@@ -10,32 +10,42 @@
 import { SystemClock, type Clock, type TimerHandle } from "@opentui/core";
 import { DaemonClient, type SessionClient } from "@cueloop/daemon/client";
 import {
+  applyPathView,
+  createBranch,
   cutBlock,
   detectHerdr,
+  labelTip,
+  MAIN_BRANCH,
   makeAnchor,
+  navigateTo,
   newAnnotationId,
   parseBlocks,
   resolveAnchor,
   restoreBlock,
   restoreLine,
   returnPaneFor,
+  switchBranch,
+  viewOfPath,
   type Annotation,
   type ReviewSession,
+  type SessionHistory,
   type VerdictKind,
 } from "@cueloop/schema";
 import { loadBundledExporters, type BundledExporter } from "./integrations";
 import {
   collaboratorAnnotations,
+  mergeFromShare,
   publishShare,
   pullShare,
   pushShare,
+  watchShare,
   shareIdFromLine,
 } from "./share";
 import { buildDisplay, nextWorkBlock, type DisplayBlock } from "./view-plan";
+import { entryTarget, treeRows, type TreeRow } from "./tree-view";
 import { diffRowAnchor, diffRows, type DiffRow } from "./view-diff";
 import {
   changeRejectionForRow,
-  curateDiff,
   hunkRejectionForRow,
   isRowRejected,
   parseFileDiff,
@@ -71,9 +81,12 @@ export type Completion =
 export const DEFAULT_AUTO_CLOSE = 5;
 
 /** How often an open shared plan re-pulls collaborator notes (ADR 0005 stage 2). */
-export const SHARE_POLL_MS = 4000;
+/** Reconnect backoff for a dropped watch stream: doubles from the floor to the cap. */
+export const SHARE_RECONNECT_MIN_MS = 1000;
+export const SHARE_RECONNECT_MAX_MS = 30_000;
 
 /** Shared empty set so "nothing rejected" is a stable identity for renders. */
+const EMPTY_REJECTIONS: HunkRejection[] = [];
 const EMPTY_REJECTED_ROWS: Set<number> = new Set();
 
 /** Shared empty list so "nothing curated out" is a stable identity for renders. */
@@ -131,6 +144,26 @@ export interface ControllerSnapshot {
   walk: { index: number } | null;
 }
 
+export interface ShareTransport {
+  publish: typeof publishShare;
+  pull: typeof pullShare;
+  push: typeof pushShare;
+  watch: typeof watchShare;
+  parseShareId: typeof shareIdFromLine;
+  collaboratorAnnotations: typeof collaboratorAnnotations;
+  mergeFromShare: typeof mergeFromShare;
+}
+
+const DEFAULT_SHARE_TRANSPORT: ShareTransport = {
+  publish: publishShare,
+  pull: pullShare,
+  watch: watchShare,
+  push: pushShare,
+  parseShareId: shareIdFromLine,
+  collaboratorAnnotations,
+  mergeFromShare,
+};
+
 export interface ReviewControllerOptions {
   home?: string;
   sessionId?: string;
@@ -145,6 +178,7 @@ export interface ReviewControllerOptions {
    * renders a decrypted share instead.
    */
   openClient?: () => Promise<SessionClient>;
+  shareTransport?: ShareTransport;
 }
 
 export interface ReviewController {
@@ -188,6 +222,7 @@ export interface ReviewController {
   edit(): void;
   /**
    * Anchor and store an annotation; both plan and diff anchor constructions.
+   * `end` is an offset within `endDisplayIndex` (the same block by default).
    * Returns the minted annotation id so the view can select the new card.
    */
   annotate(
@@ -196,7 +231,13 @@ export interface ReviewController {
     start: number,
     end: number,
     body: string,
+    endDisplayIndex?: number,
   ): string | undefined;
+  /**
+   * Reply to `rootAnnotationId`: the reply shares the root's anchor and names
+   * it in replyTo, so the discussion stays one conversation. Returns the minted id.
+   */
+  reply(rootAnnotationId: string, body: string): string | undefined;
   /** Anchor a prototype comment to a DOM element by its selector. */
   annotatePrototype(selector: string, quote: string, body: string): string | undefined;
   /** Rewrite a stored annotation's body in place (the rail-card edit). */
@@ -214,10 +255,25 @@ export interface ReviewController {
   submit(verdict: VerdictKind, summary: string): void;
   /** Publish the current session as a share; the ssh line lands on the clipboard. */
   share(): void;
+  /** The session tree as rows for the rail's Tree tab, cached per session identity. */
+  treeRows(): TreeRow[];
+  /**
+   * Go to an entry: switch to the branch whose tip it is, or move the current
+   * branch's tip back to it, with an optional branch summary. Owner only.
+   */
+  goToEntry(entryId: string, summary?: string): void;
+  /** Start a branch at the current tip and switch to it. */
+  branch(name: string): void;
+  /** Name the current tip as a checkpoint. */
+  labelTip(label: string): void;
+  /** Copy the current path into a new session and open it. */
+  fork(): void;
+  /** Fork, then share the fork; the current session stays open and unshared. */
+  forkAndShare(): void;
   /** Pull a shared plan's collaborator notes back and union them in (planner only). */
   pullShared(): Promise<void>;
   /** Poll the share for collaborator notes while it is open; returns a stop handle. */
-  startSharePoll(): () => void;
+  startShareSync(): () => void;
   /** Close the review and, inside herdr, bounce focus back to the agent. */
   finishReview(): void;
   dismissCompletion(): void;
@@ -235,6 +291,14 @@ export function createReviewController(options: ReviewControllerOptions): Review
   return new Controller(options);
 }
 
+interface DerivedSessionProjection {
+  display: DisplayBlock[];
+  rows: DiffRow[];
+  files: WalkFile[];
+  models: Map<string, FileDiffMetadata>;
+  tree: TreeRow[];
+}
+
 class Controller implements ReviewController {
   readonly readOnly: boolean;
   private client: SessionClient | null = null;
@@ -254,29 +318,29 @@ class Controller implements ReviewController {
   private editor: string | undefined;
   private exporters: BundledExporter[] = [];
   private readonly clock: Clock;
+  private readonly shareTransport: ShareTransport;
   private countdown: TimerHandle | undefined;
-  private sharePoll: TimerHandle | undefined;
+  private shareReconnect: TimerHandle | undefined;
+  private shareStop: (() => void) | null = null;
   private shareRun: object | null = null;
   /** Projections keyed by session identity so renders reuse one computation. */
   private derivedFor: ReviewSession | null = null;
-  private derived: {
-    display: DisplayBlock[];
-    rows: DiffRow[];
-    files: WalkFile[];
-    /** Per-path parsed diff models, for hunk curation; empty when files absent. */
-    models: Map<string, FileDiffMetadata>;
-  } = {
+  private derived: DerivedSessionProjection = {
     display: [],
     rows: [],
     files: [],
     models: new Map(),
+    tree: [],
   };
-  /** The owner's per-hunk/change reject decisions for the open diff session. */
-  private rejections: HunkRejection[] = [];
+  /** The diff's reject decisions live on the session record; the daemon curates from them. */
+  private get rejections(): HunkRejection[] {
+    return this.snapshot.session?.curation ?? EMPTY_REJECTIONS;
+  }
 
   constructor(private readonly options: ReviewControllerOptions) {
     this.readOnly = options.readOnly ?? false;
     this.clock = options.clock ?? new SystemClock();
+    this.shareTransport = options.shareTransport ?? DEFAULT_SHARE_TRANSPORT;
   }
 
   subscribe = (listener: () => void): (() => void) => {
@@ -324,7 +388,7 @@ class Controller implements ReviewController {
   close(): void {
     this.closed = true;
     this.clearCountdown();
-    this.stopSharePoll();
+    this.stopShareSync();
     this.client?.close();
   }
 
@@ -369,9 +433,16 @@ class Controller implements ReviewController {
       rows,
       files: walkFiles(rows),
       models,
+      tree: session?.history ? treeRows(session.history) : [],
     };
   }
 
+  treeRows(): TreeRow[] {
+    this.ensureDerived();
+
+    return this.derived.tree;
+  }
+
   display(): DisplayBlock[] {
     this.ensureDerived();
 
@@ -402,16 +473,16 @@ class Controller implements ReviewController {
   private async refreshSession(id: string): Promise<void> {
     try {
       if (this.client) this.update({ session: await this.client.sessionGet(id) });
-    } catch (error) {
-      if (!this.closed) this.setStatus(error instanceof Error ? error.message : String(error));
+    } catch (cause) {
+      if (!this.closed) this.setStatus(cause instanceof Error ? cause.message : String(cause));
     }
   }
 
   private async refreshInbox(): Promise<void> {
     try {
       if (this.client) this.update({ inbox: await this.client.sessionList({ status: "pending" }) });
-    } catch (error) {
-      if (!this.closed) this.setStatus(error instanceof Error ? error.message : String(error));
+    } catch (cause) {
+      if (!this.closed) this.setStatus(cause instanceof Error ? cause.message : String(cause));
     }
   }
 
@@ -419,15 +490,30 @@ class Controller implements ReviewController {
   private apply(mutation: Promise<ReviewSession>): void {
     mutation
       .then((session) => this.update({ session }))
-      .catch((error: unknown) =>
-        this.setStatus(String(error instanceof Error ? error.message : error)),
+      .catch((cause: unknown) =>
+        this.setStatus(String(cause instanceof Error ? cause.message : cause)),
       );
   }
 
-  // ── verbs ───────────────────────────────────
+  /**
+   * Show the expected result before the daemon answers, so a second keypress
+   * builds on the first instead of on the stale snapshot. Answers arrive in
+   * request order over the socket and replace the guess with the daemon's copy.
+   */
+  private applyOptimistic(expected: ReviewSession, mutation: Promise<ReviewSession>): void {
+    this.update({ session: expected });
+    mutation
+      .then((session) => this.update({ session }))
+      .catch((cause: unknown) => {
+        // a refused guess must not stay on screen: the daemon's record replaces it
+        this.setStatus(String(cause instanceof Error ? cause.message : cause));
+        void this.refreshSession(expected.id);
+      });
+  }
+
+  // ── primitives ───────────────────────────────────
   open(id: string): void {
     this.locallyViewed.clear();
-    this.rejections = [];
     const cached = this.snapshot.inbox?.find((candidate) => candidate.id === id);
 
     if (cached) this.update({ session: cached });
@@ -438,8 +524,8 @@ class Controller implements ReviewController {
     this.client
       ?.sessionDelete(id)
       .then(() => this.setStatus("plan deleted"))
-      .catch((error: unknown) =>
-        this.setStatus(`delete failed: ${error instanceof Error ? error.message : String(error)}`),
+      .catch((cause: unknown) =>
+        this.setStatus(`delete failed: ${cause instanceof Error ? cause.message : String(cause)}`),
       );
   }
 
@@ -462,7 +548,15 @@ class Controller implements ReviewController {
     if (block.type === "del") {
       this.restoreDelBlock(block, displayIndex);
     } else if (block.work) {
-      this.setWorkingCopy(cutBlock(working, block.work));
+      const workIndex = parseBlocks(working).findIndex(
+        (candidate) => candidate.lineStart === block.work!.lineStart,
+      );
+
+      if (workIndex === -1) return;
+      this.applyOptimistic(
+        { ...session, workingCopy: cutBlock(working, block.work) },
+        this.client!.sessionCutBlock(session.id, workIndex),
+      );
       this.setStatus("block cut - it serializes into the diff");
     }
   }
@@ -477,11 +571,19 @@ class Controller implements ReviewController {
       nextWorkBlock(this.display(), displayIndex),
       working.split("\n").length,
     );
-    // restoreBlock returns undefined when the block structure round-trips to the
-    // submitted revision - the working copy is back to pristine and is dropped
-    const restored = restoreBlock(session.artifact.content, working, block.base, line);
+    const base = session.artifact.content;
+    const baseIndex = parseBlocks(base).findIndex(
+      (candidate) => candidate.lineStart === block.base!.lineStart,
+    );
+
+    if (baseIndex === -1) return;
+    const expected: ReviewSession = {
+      ...session,
+      workingCopy: restoreBlock(base, working, block.base, line),
+    };
 
-    this.setWorkingCopy(restored);
+    if (expected.workingCopy === undefined) delete expected.workingCopy;
+    this.applyOptimistic(expected, this.client!.sessionRestoreBlock(session.id, baseIndex, line));
     this.setStatus(REMOVAL_RESTORED_STATUS);
   }
 
@@ -520,18 +622,18 @@ class Controller implements ReviewController {
     const wholeHunk = (rejection: HunkRejection): boolean => rejectsWholeHunk(rejection, target);
 
     if (this.rejections.some(wholeHunk)) {
-      this.rejections = this.rejections.filter((rejection) => !wholeHunk(rejection));
+      this.curate(this.rejections.filter((rejection) => !wholeHunk(rejection)));
       this.setStatus("hunk restored");
     } else {
       // a whole-hunk reject supersedes any change-level rejects inside it
-      this.rejections = this.rejections.filter(
+      const others = this.rejections.filter(
         (rejection) =>
           !(rejection.path === target.path && rejection.hunkIndex === target.hunkIndex),
       );
-      this.rejections.push(target);
+
+      this.curate([...others, target]);
       this.setStatus("hunk rejected - dropped from the working copy");
     }
-    this.recomputeCuration();
   }
 
   toggleRejectChange(rowIndex: number): void {
@@ -547,24 +649,23 @@ class Controller implements ReviewController {
 
     if (wholeCovers) return this.setStatus("the whole hunk is rejected - restore it first");
     if (this.rejections.some((rejection) => sameRejection(rejection, target))) {
-      this.rejections = this.rejections.filter((rejection) => !sameRejection(rejection, target));
+      this.curate(this.rejections.filter((rejection) => !sameRejection(rejection, target)));
       this.setStatus("change restored");
     } else {
-      this.rejections.push(target);
+      this.curate([...this.rejections, target]);
       this.setStatus("change rejected - dropped from the working copy");
     }
-    this.recomputeCuration();
   }
 
-  /** Recompute the curated patch and push it as the working copy (or clear it). */
-  private recomputeCuration(): void {
-    const files = this.snapshot.session?.artifact.files;
+  /** Hand the daemon the full set of reject decisions; the working copy follows. */
+  private curate(rejections: HunkRejection[]): void {
+    const session = this.snapshot.session;
+
+    if (!session) return;
+    const expected: ReviewSession = { ...session, curation: rejections };
 
-    if (!files) return;
-    // no decisions left = the working copy reverts to the full submitted diff
-    this.setWorkingCopy(this.rejections.length ? curateDiff(files, this.rejections) : undefined);
-    // dimming reads `rejections` directly; a bare update forces the re-read
-    this.update({});
+    if (!rejections.length) delete expected.curation;
+    this.applyOptimistic(expected, this.client!.sessionCurate(session.id, rejections));
   }
 
   rejectedRows(): Set<number> {
@@ -596,9 +697,8 @@ class Controller implements ReviewController {
       const kept = this.rejections.filter((rejection) => curationItemId(rejection) !== id);
 
       if (kept.length === this.rejections.length) return;
-      this.rejections = kept;
+      this.curate(kept);
       this.setStatus(REMOVAL_RESTORED_STATUS);
-      this.recomputeCuration();
 
       return;
     }
@@ -710,6 +810,7 @@ class Controller implements ReviewController {
     start: number,
     end: number,
     body: string,
+    endDisplayIndex: number = displayIndex,
   ): string | undefined {
     const session = this.snapshot.session;
 
@@ -721,10 +822,16 @@ class Controller implements ReviewController {
     } else {
       const display = this.display();
       const workBlocks = display.filter((entry) => entry.work).map((entry) => entry.work!);
-      const workBlockIndex =
-        display.slice(0, displayIndex + 1).filter((entry) => entry.work).length - 1;
-
-      anchor = makeAnchor(workBlocks, workBlockIndex, start, end);
+      const workIndexOf = (index: number): number =>
+        display.slice(0, index + 1).filter((entry) => entry.work).length - 1;
+
+      anchor = makeAnchor(
+        workBlocks,
+        workIndexOf(displayIndex),
+        start,
+        end,
+        workIndexOf(endDisplayIndex),
+      );
     }
     const wire = { id: newAnnotationId(), kind, anchor, body };
     const persisted = this.client!.sessionAnnotate(session.id, wire);
@@ -736,6 +843,28 @@ class Controller implements ReviewController {
     return wire.id;
   }
 
+  reply(rootAnnotationId: string, body: string): string | undefined {
+    const session = this.snapshot.session;
+    const root = session?.annotations.find((annotation) => annotation.id === rootAnnotationId);
+
+    if (!session || !root) return undefined;
+    // a reply to a reply still hangs off the discussion's root comment
+    const wire = {
+      id: newAnnotationId(),
+      kind: "comment",
+      anchor: root.anchor,
+      body,
+      replyTo: root.replyTo ?? root.id,
+    };
+    const persisted = this.client!.sessionAnnotate(session.id, wire);
+
+    this.apply(persisted);
+    this.mirrorAnnotation(persisted, wire);
+    this.setStatus("reply added");
+
+    return wire.id;
+  }
+
   annotatePrototype(selector: string, quote: string, body: string): string | undefined {
     const session = this.snapshot.session;
 
@@ -758,8 +887,16 @@ class Controller implements ReviewController {
     const existing = session.annotations.find((annotation) => annotation.id === id);
 
     if (!existing) return;
-    // the daemon's annotate verb upserts by id: same id + anchor, new body
-    const wire = { id: existing.id, kind: existing.kind, anchor: existing.anchor, body };
+    // the daemon's annotate primitive upserts by id: same id, anchor, and
+    // reply link, new body
+    const wire: Omit<Annotation, "createdAt"> = {
+      id: existing.id,
+      kind: existing.kind,
+      anchor: existing.anchor,
+      body,
+    };
+
+    if (existing.replyTo !== undefined) wire.replyTo = existing.replyTo;
     const persisted = this.client!.sessionAnnotate(session.id, wire);
 
     this.apply(persisted);
@@ -772,10 +909,13 @@ class Controller implements ReviewController {
     persisted: Promise<ReviewSession>,
     annotation: Omit<Annotation, "createdAt">,
   ): void {
-    const shareId = this.snapshot.session?.shareId;
+    const session = this.snapshot.session;
+    const shareId = session?.shareId;
 
     if (!shareId) return;
-    void persisted.then(() => pushShare(shareId, [annotation])).catch(() => {});
+    // the share follows one branch: a note left on another stays the owner's
+    if (session.history && session.history.branch !== (session.shareBranch ?? MAIN_BRANCH)) return;
+    void persisted.then(() => this.shareTransport.push(shareId, [annotation])).catch(() => {});
   }
 
   removeAnnotation(id: string): void {
@@ -823,7 +963,7 @@ class Controller implements ReviewController {
 
     if (!current) return; // already on the end card
     // advancing IS the viewed mark: the step is complete once you move past
-    // it; the daemon verb merges, so only the new path travels
+    // it; the daemon primitive merges, so only the new path travels
     if (!this.viewedSet().has(current.path)) {
       this.locallyViewed.add(current.path);
       this.apply(this.client!.sessionSetViewed(session.id, [current.path]));
@@ -868,12 +1008,12 @@ class Controller implements ReviewController {
         // a remembers the choice. A configured delay overrides; 0 closes now.
         const delay = this.autoClose;
 
-        if (delay === 0) this.finishReview();
-        else if (typeof delay === "number") this.startCounting(delay);
-        else this.startCounting(DEFAULT_AUTO_CLOSE);
+        if (delay === "off") this.startCounting(DEFAULT_AUTO_CLOSE);
+        else if (delay === 0) this.finishReview();
+        else this.startCounting(delay);
       })
-      .catch((error: unknown) =>
-        this.setStatus(String(error instanceof Error ? error.message : error)),
+      .catch((cause: unknown) =>
+        this.setStatus(String(cause instanceof Error ? cause.message : cause)),
       );
   }
 
@@ -882,72 +1022,208 @@ class Controller implements ReviewController {
 
     if (!session) return;
     this.setStatus("sharing…");
-    publishShare(session)
+    this.shareTransport
+      .publish(session)
       .then(async ({ line, copied }) => {
         // Stamp the id back so a later pull knows which share to collect from.
-        const shareId = shareIdFromLine(line);
+        const shareId = this.shareTransport.parseShareId(line);
 
         if (shareId && this.client) await this.client.sessionSetShareId(session.id, shareId);
         this.setStatus("");
         this.showToast(line, copied ? "share link copied" : "share link");
       })
-      .catch((error: unknown) =>
-        this.setStatus(`share failed: ${error instanceof Error ? error.message : String(error)}`),
+      .catch((cause: unknown) =>
+        this.setStatus(`share failed: ${cause instanceof Error ? cause.message : String(cause)}`),
       );
   }
 
+  goToEntry(entryId: string, summary?: string): void {
+    const session = this.snapshot.session;
+
+    if (!session?.history || !this.client) return;
+    const target = entryTarget(session.history, entryId);
+
+    if (target === null) return this.setStatus("that entry is not on any branch");
+    if (target.kind === "here") return this.setStatus("already at the tip");
+    if (target.kind === "switch") {
+      this.moveTree(session, switchBranch(session.history, target.branch), () =>
+        this.client!.sessionSwitch(session.id, target.branch),
+      );
+      this.setStatus(`on branch ${target.branch}`);
+
+      return;
+    }
+    // an entry another branch reaches: the daemon stands on that branch first, in the same request
+    const onBranch = switchBranch(session.history, target.branch);
+    const options = summary === undefined || summary === "" ? {} : { summary };
+    const moved = navigateTo(onBranch, entryId, options);
+    const branch = target.branch === session.history.branch ? undefined : target.branch;
+
+    this.moveTree(session, moved, () =>
+      this.client!.sessionNavigate(session.id, entryId, options.summary, branch),
+    );
+    this.setStatus(
+      options.summary === undefined
+        ? "moved back - later entries stay in the tree"
+        : "moved back with a summary",
+    );
+  }
+
+  branch(name: string): void {
+    const session = this.snapshot.session;
+    const branchName = name.trim();
+
+    if (!session?.history || !this.client) return;
+    if (!branchName) return this.setStatus("a branch needs a name");
+    if (session.history.tips[branchName] !== undefined)
+      return this.setStatus(`branch ${branchName} exists`);
+    this.moveTree(session, createBranch(session.history, branchName), () =>
+      this.client!.sessionBranch(session.id, branchName),
+    );
+    this.setStatus(`on branch ${branchName}`);
+  }
+
+  labelTip(label: string): void {
+    const session = this.snapshot.session;
+    const name = label.trim();
+
+    if (!session?.history || !this.client) return;
+    if (!name) return this.setStatus("a checkpoint needs a name");
+    this.moveTree(session, labelTip(session.history, name), () =>
+      this.client!.sessionLabel(session.id, name),
+    );
+    this.setStatus(`checkpoint ${name}`);
+  }
+
+  fork(): void {
+    const session = this.snapshot.session;
+
+    if (!session || !this.client) return;
+    this.client
+      .sessionFork(session.id)
+      .then((fork) => {
+        this.update({ session: fork });
+        this.showToast(`forked ${session.id} - you are on the fork now`, "fork");
+      })
+      .catch((cause: unknown) =>
+        this.setStatus(`fork failed: ${cause instanceof Error ? cause.message : String(cause)}`),
+      );
+  }
+
+  forkAndShare(): void {
+    const session = this.snapshot.session;
+
+    if (!session || !this.client) return;
+    const client = this.client;
+
+    this.setStatus("forking and sharing…");
+    client
+      .sessionFork(session.id)
+      .then(async (fork) => {
+        const { line, copied } = await this.shareTransport.publish(fork);
+        const shareId = this.shareTransport.parseShareId(line);
+
+        if (shareId) await client.sessionSetShareId(fork.id, shareId);
+        this.setStatus("");
+        this.showToast(line, copied ? "fork shared - link copied" : "fork shared");
+      })
+      .catch((cause: unknown) =>
+        this.setStatus(
+          `fork and share failed: ${cause instanceof Error ? cause.message : String(cause)}`,
+        ),
+      );
+  }
+
+  /**
+   * Show a moved tree at once - the record re-derived from its new path - and
+   * let the daemon's answer replace it. A refused move surfaces as status.
+   */
+  private moveTree(
+    session: ReviewSession,
+    history: SessionHistory,
+    request: () => Promise<ReviewSession>,
+  ): void {
+    const expected: ReviewSession = { ...session, history };
+
+    applyPathView(
+      expected,
+      viewOfPath(history, [...session.annotations, ...(session.shelvedAnnotations ?? [])]),
+    );
+    this.applyOptimistic(expected, request());
+  }
+
   /**
-   * Pull collaborator notes for a shared plan and union them in, awaiting the
-   * merge so a poll never overlaps rounds. The daemon's merge emits
-   * session.updated, so the re-render happens through the normal event path.
-   * Best-effort: a failed refresh is silent and the next tick retries.
+   * Pull collaborator notes for a shared plan and union them in. The daemon's
+   * merge emits session.updated, so the re-render happens through the normal
+   * event path. Best-effort: a failed refresh is silent.
    */
   pullShared(): Promise<void> {
     const session = this.snapshot.session;
 
-    if (!session?.shareId || !this.client) return Promise.resolve();
-    const client = this.client;
+    if (!session?.shareId) return Promise.resolve();
+
+    return this.shareTransport
+      .pull(session.shareId)
+      .then((remote) => this.mergeShared(remote))
+      .catch(() => {});
+  }
+
+  private mergeShared(remote: ReviewSession): Promise<void> {
+    const session = this.snapshot.session;
+
+    if (!session || !this.client) return Promise.resolve();
 
-    return pullShare(session.shareId)
-      .then((remote) =>
-        client.sessionMergeShared(session.id, {
-          annotations: collaboratorAnnotations(remote),
-          participants: remote.participants,
-        }),
-      )
+    return this.client
+      .sessionMergeShared(session.id, this.shareTransport.mergeFromShare(remote))
       .then(() => {})
       .catch(() => {});
   }
 
   /**
-   * Poll the share for collaborator notes while it is open: pull now, then again
-   * every few seconds, each round waiting for the last so slow pulls never stack.
-   * Returns a stop handle the caller runs on leave.
+   * Follow the share live while it is open: one watch stream delivers every
+   * change as it lands; a pull on each (re)connect catches up on anything
+   * missed while the link was down, and a dropped link reconnects with
+   * backoff. Returns a stop handle the caller runs on leave.
    */
-  startSharePoll(): () => void {
-    this.stopSharePoll();
-    // per-run token so a stale run's in-flight pull never re-arms the poll
+  startShareSync(): () => void {
+    this.stopShareSync();
+    // per-run token so a stale run's close never re-arms a newer run
     const run = {};
+    let delay = SHARE_RECONNECT_MIN_MS;
 
     this.shareRun = run;
-    const tick = (): void => {
-      void this.pullShared().finally(() => {
-        if (this.shareRun === run && !this.closed)
-          this.sharePoll = this.clock.setTimeout(tick, SHARE_POLL_MS);
+    const connect = (): void => {
+      const shareId = this.snapshot.session?.shareId;
+
+      if (this.shareRun !== run || this.closed || !shareId) return;
+      void this.pullShared();
+      this.shareStop = this.shareTransport.watch(shareId, {
+        onSession: (remote) => {
+          delay = SHARE_RECONNECT_MIN_MS;
+          void this.mergeShared(remote);
+        },
+        onClose: () => {
+          if (this.shareRun !== run || this.closed) return;
+          this.shareStop = null;
+          this.shareReconnect = this.clock.setTimeout(connect, delay);
+          delay = Math.min(delay * 2, SHARE_RECONNECT_MAX_MS);
+        },
       });
     };
 
-    tick();
+    connect();
 
     return () => {
-      if (this.shareRun === run) this.stopSharePoll();
+      if (this.shareRun === run) this.stopShareSync();
     };
   }
 
-  private stopSharePoll(): void {
+  private stopShareSync(): void {
     this.shareRun = null;
-    if (this.sharePoll !== undefined) this.clock.clearTimeout(this.sharePoll);
-    this.sharePoll = undefined;
+    if (this.shareReconnect !== undefined) this.clock.clearTimeout(this.shareReconnect);
+    this.shareReconnect = undefined;
+    this.shareStop?.();
+    this.shareStop = null;
   }
 
   // ── completion hand-back ────────────────────