mixdog 0.9.82 → 0.9.84

package/src/session-runtime/session-turn-api.mjs

@@ -45,7 +45,17 @@ export function createSessionTurnApi(deps) {
     activeToolSurface, applyResolvedCwd, resolveCwdPath, agentStatusState, notificationListeners,
     awaitInitialMcpConnect,
   } = deps;
+  const enqueueRemoteAttachedPrompt = (prompt) => {
+    const attachedSession = getSession();
+    if (!attachedSession?.remoteAttached || !attachedSession.id) return false;
+    try {
+      return Number(mgr.enqueueRemotePendingMessage?.(attachedSession.id, prompt)) > 0;
+    } catch {
+      return false;
+    }
+  };
   return {
+    enqueueRemoteAttachedPrompt,
     getTurnLiveness() {
       const sessionId = getSession()?.id;
       if (!sessionId || typeof mgr.getSessionProgressSnapshot !== 'function') return null;
@@ -65,9 +75,12 @@ export function createSessionTurnApi(deps) {
       // a normal user turn and this surface refreshes from disk.
       const attachedSession = getSession();
       if (attachedSession?.remoteAttached) {
-        try { mgr.enqueueRemotePendingMessage?.(attachedSession.id, prompt); } catch { /* best-effort */ }
+        const delivered = enqueueRemoteAttachedPrompt(prompt);
         return {
-          result: { content: 'Delivered to the live owner of this session — the reply will appear here shortly.' },
+          // This branch is only a race-safe fallback for callers that reached
+          // ask() before the live pipe was ready. Never manufacture an
+          // assistant response: the owner's mirrored transcript is authoritative.
+          result: { content: '', remoteAttached: true, delivered },
           session: attachedSession,
         };
       }
@@ -108,11 +121,9 @@ export function createSessionTurnApi(deps) {
           }
         }
         const session0 = getSession();
-        // Turn-review base: capture the pre-turn worktree tree in the shadow
-        // snapshot repo so the desktop review bar can diff EVERYTHING this
-        // turn changes — subagent and background-job edits included. The wait
-        // is capped so a cold first snapshot never stalls the turn; a late
-        // base still lands through the shared promise.
+        // Turn-review boundary: start a fresh session+turn generation. Lead
+        // patches remain transcript-derived; worker apply_patch diffs bind to
+        // this generation and cannot leak into the next turn/session.
         try { await beginTurnSnapshot(getCurrentCwd(), session0?.id); } catch { /* never blocks a turn */ }
         if (session0.deferredInitialRefreshPending) {
           // FIRST TURN of a FRESH session (session-local gate, NOT the

package/src/standalone/agent-tool.mjs

@@ -59,6 +59,10 @@ import {
 } from './agent-tool/worker-rows.mjs';
 import { resolveAgentTerminalReapMs } from '../session-runtime/config-helpers.mjs';
 import { createWorkerIndex } from './agent-tool/worker-index.mjs';
+import {
+  beginAgentTurnReview,
+  completeAgentTurnReview,
+} from '../runtime/shared/turn-snapshot.mjs';
 // Re-export the static tool descriptor so importers of this facade keep the
 // identical public surface (`import { AGENT_TOOL } from './agent-tool.mjs'`).
 export { AGENT_TOOL };
@@ -91,6 +95,26 @@ export function createStandaloneAgent({
     if (typeof onSubagentEvent !== 'function') return;
     try { onSubagentEvent(phase, { agent_type: agent || null, ...extra }); } catch { /* best-effort */ }
   }
+  function createTurnReviewCollector(session, tag, agent, notifyContext = {}) {
+    const ownerSessionId = clean(
+      notifyContext?.callerSessionId
+      || notifyContext?.sessionId
+      || notifyContext?.routingSessionId
+      || session?.ownerSessionId,
+    );
+    const handle = beginAgentTurnReview(ownerSessionId, session?.id, { tag, agent });
+    const patches = [];
+    return {
+      onToolResult(message) {
+        if (typeof message?.uiDiff === 'string' && message.uiDiff.trim()) {
+          patches.push(message.uiDiff);
+        }
+      },
+      complete() {
+        completeAgentTurnReview(handle, patches);
+      },
+    };
+  }
   const tags = new Map();
   const tagAgents = new Map();
   const tagCwds = new Map();
@@ -869,6 +893,7 @@ export function createStandaloneAgent({
   async function runSpawn(prepared, notifyContext = null, job = null) {
     const { args, tag, session, agent, preset, presetName, workerCwd, prompt, watchdogPolicy } = prepared;
     const watchdog = startProgressIdleWatchdog(session.id, watchdogPolicy, agent);
+    const turnReview = createTurnReviewCollector(session, tag, agent, notifyContext || {});
     let finalStatus = 'idle';
     // SubagentStart: a worker session is about to run its first turn.
     emitSubagentEvent('start', agent, { session_id: session.id, tag });
@@ -907,8 +932,10 @@ export function createStandaloneAgent({
       handoffMsgStart = resolveHandoffMessageStartIndex(mgr.getSession(session.id));
       const result = await mgr.askSession(session.id, prompt, args.context || null, null, workerCwd, null, {
         notifyFn: workerNotifyFn(session.id, notifyContext || {}),
+        onToolResult: (message) => turnReview.onToolResult(message),
         ...(job ? {
           onTerminalResult: (terminalResult) => {
+            turnReview.complete();
             const value = completionValue(terminalResult);
             if (job) job._terminalResultValue = value;
             notifyOwnerAgentCompletionEarly(job, value, notifyContext || {});
@@ -999,6 +1026,7 @@ export function createStandaloneAgent({
       }
       throw error;
     } finally {
+      turnReview.complete();
       watchdog?.stop?.();
       upsertWorkerSessionDeferred(session, tag, {
         agent,
@@ -1056,6 +1084,7 @@ export function createStandaloneAgent({
     const sendAgent = session.agent || normalizeAgentName(args.agent);
     const watchdog = startProgressIdleWatchdog(sessionId, resolveAgentWatchdogPolicy(sendAgent), sendAgent);
     const tag = tagForSession(sessionId);
+    const turnReview = createTurnReviewCollector(session, tag, sendAgent, notifyContext || {});
     let finalStatus = 'idle';
     upsertWorkerSessionDeferred(session, tag, { status: 'running', stage: 'running' });
     let handoffMsgStart = 0;
@@ -1078,8 +1107,10 @@ export function createStandaloneAgent({
       handoffMsgStart = resolveHandoffMessageStartIndex(mgr.getSession(sessionId));
       const result = await mgr.askSession(sessionId, prompt, args.context || null, null, session.cwd || defaultCwd, null, {
         notifyFn: workerNotifyFn(sessionId, notifyContext || {}),
+        onToolResult: (message) => turnReview.onToolResult(message),
         ...(job ? {
           onTerminalResult: (terminalResult) => {
+            turnReview.complete();
             const value = completionValue(terminalResult);
             if (job) job._terminalResultValue = value;
             notifyOwnerAgentCompletionEarly(job, value, notifyContext || {});
@@ -1153,6 +1184,7 @@ export function createStandaloneAgent({
       }
       throw error;
     } finally {
+      turnReview.complete();
       watchdog?.stop?.();
       upsertWorkerSessionDeferred(session, tag, {
         status: finalStatus,

package/src/tui/dist/index.mjs

@@ -29555,6 +29555,8 @@ import { unlinkSync as unlinkSync4 } from "node:fs";
 var MAX_FRAME_PATCHES = 48;
 var MAX_BUFFER_BYTES = 8 * 1024 * 1024;
 var SYNC_REQUEST_MIN_INTERVAL_MS = 500;
+var LIVE_CONNECT_RETRY_MIN_MS = 10;
+var LIVE_CONNECT_RETRY_MAX_MS = 160;
 function liveSharePipePath(sessionId, sessionFilePath) {
   return process.platform === "win32" ? `\\\\.\\pipe\\mixdog-live-${sessionId}` : `${sessionFilePath}.live.sock`;
 }
@@ -29597,9 +29599,13 @@ function createLiveShare({
   onOwnerClosed,
   viewerApply
 }) {
+  let disposed = false;
   let server = null;
   let serverId = "";
   let serverPath = "";
+  let serverRetryTimer = null;
+  let serverRetryId = "";
+  let serverRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
   const sockets = /* @__PURE__ */ new Set();
   let lastItems = null;
   let lastTail = null;
@@ -29735,8 +29741,36 @@ function createLiveShare({
     if (dirty) broadcast(frame);
   };
   listeners.add(onPublish);
+  const clearServerRetry = () => {
+    if (serverRetryTimer) clearTimeout(serverRetryTimer);
+    serverRetryTimer = null;
+    serverRetryId = "";
+  };
+  const scheduleServerRetry = (id) => {
+    const target = String(id || "");
+    if (disposed || !target || server || serverRetryTimer || String(ownerSessionId() || "") !== target) return;
+    const delay2 = serverRetryDelayMs;
+    serverRetryDelayMs = Math.min(LIVE_CONNECT_RETRY_MAX_MS, Math.max(
+      LIVE_CONNECT_RETRY_MIN_MS,
+      serverRetryDelayMs * 2
+    ));
+    serverRetryId = target;
+    serverRetryTimer = setTimeout(() => {
+      serverRetryTimer = null;
+      serverRetryId = "";
+      if (disposed || server || String(ownerSessionId() || "") !== target) return;
+      startServer2(target);
+    }, delay2);
+    serverRetryTimer.unref?.();
+  };
   const stopServer = () => {
-    if (!server) return;
+    clearServerRetry();
+    serverRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
+    if (!server) {
+      serverId = "";
+      serverPath = "";
+      return;
+    }
     try {
       broadcast({ t: "close" });
     } catch {
@@ -29764,6 +29798,8 @@ function createLiveShare({
     serverPath = "";
   };
   const startServer2 = (id) => {
+    if (disposed || server || !id) return;
+    clearServerRetry();
     const path4 = socketPathFor(id);
     const next = createServer((socket) => {
       socket.setNoDelay?.(true);
@@ -29813,12 +29849,18 @@ function createLiveShare({
         server = null;
         serverId = "";
         serverPath = "";
+        scheduleServerRetry(id);
       }
       try {
         next.close();
       } catch {
       }
     });
+    next.on("listening", () => {
+      if (server !== next) return;
+      clearServerRetry();
+      serverRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
+    });
     if (process.platform !== "win32") {
       try {
         unlinkSync4(path4);
@@ -29834,6 +29876,7 @@ function createLiveShare({
       server = null;
       serverId = "";
       serverPath = "";
+      scheduleServerRetry(id);
     }
   };
   let client = null;
@@ -29841,15 +29884,19 @@ function createLiveShare({
   let clientUp = false;
   let clientSyncedId = "";
   let lastSyncRequestAt = 0;
+  let clientRetryTimer = null;
+  let clientRetryId = "";
+  let clientRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
   const viewerSyncWaiters = /* @__PURE__ */ new Set();
   const settleViewerSync = (id, synced) => {
     for (const waiter of [...viewerSyncWaiters]) {
       if (waiter.id === id) waiter.finish(synced);
     }
   };
-  const waitForViewerSync = (id, timeoutMs = 750) => {
+  const waitForViewerSync = (id, timeoutMs = 1500) => {
     const target = String(id || "");
     if (!target) return Promise.resolve(false);
+    ensureShare();
     if (clientUp && clientId === target && clientSyncedId === target) {
       return Promise.resolve(true);
     }
@@ -29920,6 +29967,28 @@ function createLiveShare({
     } catch {
     }
   };
+  const clearClientRetry = () => {
+    if (clientRetryTimer) clearTimeout(clientRetryTimer);
+    clientRetryTimer = null;
+    clientRetryId = "";
+  };
+  const scheduleClientRetry = (id) => {
+    const target = String(id || "");
+    if (disposed || !target || client || clientRetryTimer || String(viewerSessionId() || "") !== target) return;
+    const delay2 = clientRetryDelayMs;
+    clientRetryDelayMs = Math.min(LIVE_CONNECT_RETRY_MAX_MS, Math.max(
+      LIVE_CONNECT_RETRY_MIN_MS,
+      clientRetryDelayMs * 2
+    ));
+    clientRetryId = target;
+    clientRetryTimer = setTimeout(() => {
+      clientRetryTimer = null;
+      clientRetryId = "";
+      if (disposed || client || String(viewerSessionId() || "") !== target) return;
+      startClient(target);
+    }, delay2);
+    clientRetryTimer.unref?.();
+  };
   const applyViewerFrame = (frame, socket) => {
     if (frame.t === "full") {
       viewerApply.replaceItems(Array.isArray(frame.items) ? frame.items : []);
@@ -29954,6 +30023,8 @@ function createLiveShare({
     if ("live" in frame) applyLiveState(frame.live);
   };
   const stopClient = () => {
+    clearClientRetry();
+    clientRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
     const closing = client;
     const closingId = clientId;
     const wasUp = clientUp;
@@ -29971,10 +30042,13 @@ function createLiveShare({
     if (wasUp) clearMirroredLiveState();
   };
   const startClient = (id) => {
+    if (disposed || client || !id) return;
+    clearClientRetry();
     let socket;
     try {
       socket = connect(socketPathFor(id));
     } catch {
+      scheduleClientRetry(id);
       return;
     }
     client = socket;
@@ -29983,14 +30057,19 @@ function createLiveShare({
     clientSyncedId = "";
     socket.setNoDelay?.(true);
     socket.on("connect", () => {
-      if (client === socket) clientUp = true;
+      if (client !== socket) return;
+      clientUp = true;
+      clearClientRetry();
+      clientRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
     });
     const down = (ownerClosed) => {
       const wasUp = clientUp && client === socket;
-      if (client === socket) {
+      const wasCurrent = client === socket;
+      if (wasCurrent) {
         client = null;
         clientId = "";
         clientUp = false;
+        clientSyncedId = "";
       }
       try {
         socket.destroy();
@@ -29998,6 +30077,7 @@ function createLiveShare({
       }
       if (wasUp) clearMirroredLiveState();
       if (wasUp) onOwnerClosed?.(id, ownerClosed);
+      if (wasCurrent) scheduleClientRetry(id);
     };
     socket.on("error", () => down(false));
     socket.on("close", () => down(false));
@@ -30019,17 +30099,21 @@ function createLiveShare({
       }
     }, () => down(false));
   };
+  const ensureShare = () => {
+    if (disposed) return;
+    const ownerId = String(ownerSessionId() || "");
+    const attachId = ownerId ? "" : String(viewerSessionId() || "");
+    if (serverRetryId && serverRetryId !== ownerId) clearServerRetry();
+    if (!ownerId && serverRetryTimer) clearServerRetry();
+    if (serverId && serverId !== ownerId) stopServer();
+    if (ownerId && !server && !serverRetryTimer) startServer2(ownerId);
+    if (clientRetryId && clientRetryId !== attachId) clearClientRetry();
+    if (!attachId && clientRetryTimer) clearClientRetry();
+    if (clientId && clientId !== attachId) stopClient();
+    if (attachId && !client && !clientRetryTimer) startClient(attachId);
+  };
   return {
-    // Reconciles both legs against the current session role; called from the
-    // engine share tick (also serves as the reconnect/retry cadence).
-    ensure() {
-      const ownerId = String(ownerSessionId() || "");
-      const attachId = ownerId ? "" : String(viewerSessionId() || "");
-      if (serverId && serverId !== ownerId) stopServer();
-      if (ownerId && !server) startServer2(ownerId);
-      if (clientId && clientId !== attachId) stopClient();
-      if (attachId && !client) startClient(attachId);
-    },
+    ensure: ensureShare,
     viewerConnected: () => clientUp,
     waitForViewerSync,
     sendSubmit(text) {
@@ -30051,9 +30135,11 @@ function createLiveShare({
       }
     },
     dispose() {
+      disposed = true;
       listeners.delete(onPublish);
       stopServer();
       stopClient();
+      for (const waiter of [...viewerSyncWaiters]) waiter.finish(false);
     }
   };
 }
@@ -31198,6 +31284,7 @@ async function createEngineSession({
       const timer2 = setTimeout(() => {
         if (flags.disposed || !state.sessionRemoteAttached) return;
         if (String(state.sessionId || "") !== id) return;
+        if (liveShare.viewerConnected()) return;
         void Promise.resolve(api.resume(id, { quiet: true })).catch(() => {
         });
       }, 1500);
@@ -31223,9 +31310,15 @@ async function createEngineSession({
   if (typeof api.submit === "function") {
     const baseSubmit = api.submit;
     api.submit = (prompt, options = {}) => {
-      if (state.sessionRemoteAttached && liveShare.viewerConnected()) {
+      if (state.sessionRemoteAttached) {
         const text = String(promptDisplayText(prompt, options) || "").trim();
+        if (!text) return false;
+        try {
+          liveShare.ensure();
+        } catch {
+        }
         if (text && liveShare.sendSubmit(text)) return true;
+        return runtime.enqueueRemoteAttachedPrompt?.(prompt) === true;
       }
       return baseSubmit(prompt, options);
     };
@@ -31258,6 +31351,7 @@ async function createEngineSession({
       return result;
     };
   }
+  reconcileLiveShareNow();
   let spoolWatcher = null;
   let spoolDebounce = null;
   try {

package/src/tui/engine/live-share.mjs

@@ -23,6 +23,11 @@ const MAX_BUFFER_BYTES = 8 * 1024 * 1024;
 // Desync-recovery `sync` requests are throttled so a corrupt stream cannot
 // make the owner serialize full transcripts every frame.
 const SYNC_REQUEST_MIN_INTERVAL_MS = 500;
+// Session entry is latency-sensitive: the owner pipe can be a few event-loop
+// turns behind the viewer resume. Retry locally instead of waiting for the
+// coarse 3s engine safety tick.
+const LIVE_CONNECT_RETRY_MIN_MS = 10;
+const LIVE_CONNECT_RETRY_MAX_MS = 160;
 
 export function liveSharePipePath(sessionId, sessionFilePath) {
   return process.platform === 'win32'
@@ -66,10 +71,14 @@ export function createLiveShare({
   onOwnerClosed,
   viewerApply,
 }) {
+  let disposed = false;
   // ---- owner: pipe server + delta publisher ----
   let server = null;
   let serverId = '';
   let serverPath = '';
+  let serverRetryTimer = null;
+  let serverRetryId = '';
+  let serverRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
   const sockets = new Set();
   let lastItems = null;
   let lastTail = null;
@@ -206,8 +215,38 @@ export function createLiveShare({
   };
   listeners.add(onPublish);
 
+  const clearServerRetry = () => {
+    if (serverRetryTimer) clearTimeout(serverRetryTimer);
+    serverRetryTimer = null;
+    serverRetryId = '';
+  };
+
+  const scheduleServerRetry = (id) => {
+    const target = String(id || '');
+    if (disposed || !target || server || serverRetryTimer || String(ownerSessionId() || '') !== target) return;
+    const delay = serverRetryDelayMs;
+    serverRetryDelayMs = Math.min(LIVE_CONNECT_RETRY_MAX_MS, Math.max(
+      LIVE_CONNECT_RETRY_MIN_MS,
+      serverRetryDelayMs * 2,
+    ));
+    serverRetryId = target;
+    serverRetryTimer = setTimeout(() => {
+      serverRetryTimer = null;
+      serverRetryId = '';
+      if (disposed || server || String(ownerSessionId() || '') !== target) return;
+      startServer(target);
+    }, delay);
+    serverRetryTimer.unref?.();
+  };
+
   const stopServer = () => {
-    if (!server) return;
+    clearServerRetry();
+    serverRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
+    if (!server) {
+      serverId = '';
+      serverPath = '';
+      return;
+    }
     try { broadcast({ t: 'close' }); } catch { /* sockets closing anyway */ }
     for (const socket of sockets) {
       try { socket.destroy(); } catch { /* already gone */ }
@@ -224,6 +263,8 @@ export function createLiveShare({
   };
 
   const startServer = (id) => {
+    if (disposed || server || !id) return;
+    clearServerRetry();
     const path = socketPathFor(id);
     const next = createServer((socket) => {
       socket.setNoDelay?.(true);
@@ -257,11 +298,21 @@ export function createLiveShare({
       }
     });
     next.on('error', () => {
-      // EADDRINUSE (another live owner) or a transient listen failure: give
-      // up quietly; the next ensure() tick retries.
-      if (server === next) { server = null; serverId = ''; serverPath = ''; }
+      // EADDRINUSE (another live owner) or a transient listen failure: retry
+      // with a short bounded backoff while this surface still owns the id.
+      if (server === next) {
+        server = null;
+        serverId = '';
+        serverPath = '';
+        scheduleServerRetry(id);
+      }
       try { next.close(); } catch { /* already closed */ }
     });
+    next.on('listening', () => {
+      if (server !== next) return;
+      clearServerRetry();
+      serverRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
+    });
     if (process.platform !== 'win32') {
       try { unlinkSync(path); } catch { /* no stale socket */ }
     }
@@ -272,6 +323,7 @@ export function createLiveShare({
       server = null;
       serverId = '';
       serverPath = '';
+      scheduleServerRetry(id);
     }
   };
 
@@ -281,6 +333,9 @@ export function createLiveShare({
   let clientUp = false;
   let clientSyncedId = '';
   let lastSyncRequestAt = 0;
+  let clientRetryTimer = null;
+  let clientRetryId = '';
+  let clientRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
   const viewerSyncWaiters = new Set();
 
   const settleViewerSync = (id, synced) => {
@@ -289,9 +344,10 @@ export function createLiveShare({
     }
   };
 
-  const waitForViewerSync = (id, timeoutMs = 750) => {
+  const waitForViewerSync = (id, timeoutMs = 1500) => {
     const target = String(id || '');
     if (!target) return Promise.resolve(false);
+    ensureShare();
     if (clientUp && clientId === target && clientSyncedId === target) {
       return Promise.resolve(true);
     }
@@ -363,6 +419,30 @@ export function createLiveShare({
     } catch { /* viewer store already disposed */ }
   };
 
+  const clearClientRetry = () => {
+    if (clientRetryTimer) clearTimeout(clientRetryTimer);
+    clientRetryTimer = null;
+    clientRetryId = '';
+  };
+
+  const scheduleClientRetry = (id) => {
+    const target = String(id || '');
+    if (disposed || !target || client || clientRetryTimer || String(viewerSessionId() || '') !== target) return;
+    const delay = clientRetryDelayMs;
+    clientRetryDelayMs = Math.min(LIVE_CONNECT_RETRY_MAX_MS, Math.max(
+      LIVE_CONNECT_RETRY_MIN_MS,
+      clientRetryDelayMs * 2,
+    ));
+    clientRetryId = target;
+    clientRetryTimer = setTimeout(() => {
+      clientRetryTimer = null;
+      clientRetryId = '';
+      if (disposed || client || String(viewerSessionId() || '') !== target) return;
+      startClient(target);
+    }, delay);
+    clientRetryTimer.unref?.();
+  };
+
   const applyViewerFrame = (frame, socket) => {
     if (frame.t === 'full') {
       viewerApply.replaceItems(Array.isArray(frame.items) ? frame.items : []);
@@ -400,6 +480,8 @@ export function createLiveShare({
   };
 
   const stopClient = () => {
+    clearClientRetry();
+    clientRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
     const closing = client;
     const closingId = clientId;
     const wasUp = clientUp;
@@ -422,22 +504,39 @@ export function createLiveShare({
   };
 
   const startClient = (id) => {
+    if (disposed || client || !id) return;
+    clearClientRetry();
     let socket;
-    try { socket = connect(socketPathFor(id)); } catch { return; }
+    try { socket = connect(socketPathFor(id)); } catch {
+      scheduleClientRetry(id);
+      return;
+    }
     client = socket;
     clientId = id;
     clientUp = false;
     clientSyncedId = '';
     socket.setNoDelay?.(true);
-    socket.on('connect', () => { if (client === socket) clientUp = true; });
+    socket.on('connect', () => {
+      if (client !== socket) return;
+      clientUp = true;
+      clearClientRetry();
+      clientRetryDelayMs = LIVE_CONNECT_RETRY_MIN_MS;
+    });
     const down = (ownerClosed) => {
       const wasUp = clientUp && client === socket;
-      if (client === socket) { client = null; clientId = ''; clientUp = false; }
+      const wasCurrent = client === socket;
+      if (wasCurrent) {
+        client = null;
+        clientId = '';
+        clientUp = false;
+        clientSyncedId = '';
+      }
       try { socket.destroy(); } catch { /* already gone */ }
       if (wasUp) clearMirroredLiveState();
       // A live link that dropped means the owner ended or crashed: nudge the
       // promotion path instead of waiting for the next store-mtime change.
       if (wasUp) onOwnerClosed?.(id, ownerClosed);
+      if (wasCurrent) scheduleClientRetry(id);
     };
     socket.on('error', () => down(false));
     socket.on('close', () => down(false));
@@ -459,17 +558,25 @@ export function createLiveShare({
     }, () => down(false));
   };
 
+  // Reconciles both legs against the current session role. Failed pipe opens
+  // continue through the local retry timers; the engine's 3s call is only a
+  // safety net, never the normal connection cadence.
+  const ensureShare = () => {
+    if (disposed) return;
+    const ownerId = String(ownerSessionId() || '');
+    const attachId = ownerId ? '' : String(viewerSessionId() || '');
+    if (serverRetryId && serverRetryId !== ownerId) clearServerRetry();
+    if (!ownerId && serverRetryTimer) clearServerRetry();
+    if (serverId && serverId !== ownerId) stopServer();
+    if (ownerId && !server && !serverRetryTimer) startServer(ownerId);
+    if (clientRetryId && clientRetryId !== attachId) clearClientRetry();
+    if (!attachId && clientRetryTimer) clearClientRetry();
+    if (clientId && clientId !== attachId) stopClient();
+    if (attachId && !client && !clientRetryTimer) startClient(attachId);
+  };
+
   return {
-    // Reconciles both legs against the current session role; called from the
-    // engine share tick (also serves as the reconnect/retry cadence).
-    ensure() {
-      const ownerId = String(ownerSessionId() || '');
-      const attachId = ownerId ? '' : String(viewerSessionId() || '');
-      if (serverId && serverId !== ownerId) stopServer();
-      if (ownerId && !server) startServer(ownerId);
-      if (clientId && clientId !== attachId) stopClient();
-      if (attachId && !client) startClient(attachId);
-    },
+    ensure: ensureShare,
     viewerConnected: () => clientUp,
     waitForViewerSync,
     sendSubmit(text) {
@@ -491,9 +598,11 @@ export function createLiveShare({
       }
     },
     dispose() {
+      disposed = true;
       listeners.delete(onPublish);
       stopServer();
       stopClient();
+      for (const waiter of [...viewerSyncWaiters]) waiter.finish(false);
     },
   };
 }