@schoolai/shipyard 3.14.0 → 3.15.0

package/dist/{serve-25I4ML7R.js → serve-DAP6V7SY.js}

@@ -12,7 +12,7 @@ import {
   guardedSubscribe,
   makeInitialAttemptState,
   shutdownFileWatcherGuard
-} from "./chunk-3KE2VDKA.js";
+} from "./chunk-VKY7UXTP.js";
 import {
   TRAILER_SCHEMA_VERSION,
   appendTrailerToMessage,
@@ -39,13 +39,13 @@ import {
   startPlanBackfillForDaemon,
   sync,
   validatePeerId
-} from "./chunk-BUAEJNUG.js";
+} from "./chunk-HPDRJ4VZ.js";
 import {
   loadAuthToken
 } from "./chunk-TFWDJCUJ.js";
 import {
   getDaemonVersion
-} from "./chunk-WGS7ZW6N.js";
+} from "./chunk-L5FQEZ6Y.js";
 import {
   collectPriorCrashDetail,
   getRecentWasmPanicMessages
@@ -54,6 +54,7 @@ import "./chunk-UNGAIUEX.js";
 import "./chunk-WW4UGZBY.js";
 import {
   CHARS_PER_TOKEN,
+  CODEX_BUNDLED_VERSION,
   CURSOR_MODEL_CATALOG,
   PROFILE_AUTH_ADAPTERS,
   REDACTED_THINKING_PLACEHOLDER,
@@ -167,7 +168,7 @@ import {
   translateWarningNotification,
   unresolveReviewThread,
   writeCursorApiKeyToVault
-} from "./chunk-OX3UY44R.js";
+} from "./chunk-5PBWS7BB.js";
 import {
   buildNodeSpawnEnv,
   nodeSpawnEnvOverlay,
@@ -202,8 +203,10 @@ import {
   redactArgs,
   redactEnv,
   resolveEnabledMcpServers,
-  resolveStdioEnv
-} from "./chunk-T3OTZ66B.js";
+  resolveStdioEnv,
+  setTelemetrySink,
+  telemeter
+} from "./chunk-B7WZUKYX.js";
 import {
   atomicWriteFile,
   findProjectRoot,
@@ -226,7 +229,7 @@ import {
   createAssetResolver,
   toSdkContent,
   toSdkPermissionMode
-} from "./chunk-RCEAMZVG.js";
+} from "./chunk-6SK6FBYC.js";
 import {
   AGENT_IDS,
   AGENT_SYSTEM_CLAUDE_CODE,
@@ -408,7 +411,7 @@ import {
   unsafeAssertSourceId,
   vizFileExtension,
   withPreferredRuntimeAuthMethod
-} from "./chunk-IWBDVGD2.js";
+} from "./chunk-VTALUCDB.js";
 import {
   AuthGitHubCallbackRequestSchema,
   AuthGitHubCallbackResponseSchema,
@@ -448,13 +451,15 @@ import {
   PublishCreateResponseSchema,
   ROUTES,
   TESTED_CLAUDE_CODE_VERSION,
+  TESTED_CODEX_VERSION,
   TurnHealthResponseSchema,
   ValidationErrorResponseSchema,
   VaultKeyGetResponseSchema,
   VaultKeyPutRequestSchema,
   VaultKeyPutResponseSchema,
-  classifyClaudeCodeCompatibility
-} from "./chunk-M3WBYTB3.js";
+  classifyClaudeCodeCompatibility,
+  classifyCodexCompatibility
+} from "./chunk-AXHG3QQA.js";
 import {
   external_exports as external_exports2
 } from "./chunk-EHQITHQX.js";
@@ -5764,7 +5769,7 @@ function nanoid(size = 21) {
 }
 
 // src/services/bootstrap/signaling.ts
-var DAEMON_NPM_VERSION = true ? "3.14.0" : "unknown";
+var DAEMON_NPM_VERSION = true ? "3.15.0" : "unknown";
 function createDaemonSignaling(config) {
   const agentId = config.agentId ?? nanoid();
   function send(msg) {
@@ -7123,6 +7128,12 @@ function resolveSnapshotAwareLive(s2, sessionEntry, workspaceLive, inSnapshot) {
   };
 }
 function buildWorkspaceRow(s2, live, transportEnabled, userEnabled) {
+  const accountIssue = s2.source === "claudeai" && s2.authStatus === "unauthenticated" && s2.url === void 0 ? {
+    errorType: "agent_signin_required",
+    remediation: {
+      message: "Re-authenticate with Claude to enable claude.ai connectors."
+    }
+  } : null;
   return {
     name: s2.name,
     canonicalId: canonicalMcpServerKey(s2),
@@ -7139,6 +7150,8 @@ function buildWorkspaceRow(s2, live, transportEnabled, userEnabled) {
     ...live?.toolCount !== void 0 ? { toolCount: live.toolCount } : {},
     ...live?.errorType !== void 0 ? { errorType: live.errorType } : {},
     ...live?.remediation !== void 0 ? { remediation: live.remediation } : {},
+    ...accountIssue?.errorType !== void 0 ? { errorType: accountIssue.errorType } : {},
+    ...accountIssue?.remediation !== void 0 ? { remediation: accountIssue.remediation } : {},
     ...s2.sources !== void 0 ? { sources: s2.sources } : {}
   };
 }
@@ -8017,7 +8030,7 @@ function searchViaRipgrep(query3, jsonlPaths, signal) {
     };
     rl.on("line", (line) => {
       const parsed = parseRgJsonLine(line);
-      if (!parsed || parsed.type !== "match") return;
+      if (parsed?.type !== "match") return;
       if (!isRgMatchData(parsed.data)) return;
       const data = parsed.data;
       const sessionId = extractSessionIdFromPath(data.path.text);
@@ -8792,7 +8805,7 @@ function parseRipgrepOutput(stdout, maxResults) {
   for (const raw of stdout.split("\n")) {
     if (raw.length === 0) continue;
     const parsed = parseRgJsonLine2(raw);
-    if (!parsed || parsed.type !== "match") continue;
+    if (parsed?.type !== "match") continue;
     if (!isRgMatchData2(parsed.data)) continue;
     const [firstSub] = parsed.data.submatches;
     if (!firstSub) continue;
@@ -13393,7 +13406,7 @@ var WorktreeMachineRunner = class {
   }
   #runValidate(_input, key) {
     const entry = this.#entries.get(key);
-    if (!entry || entry.state.phase !== "validating") return;
+    if (entry?.state.phase !== "validating") return;
     const result = this.#deps.io.validateInputs(entry.state.input);
     if (!result.ok) {
       this.dispatch({ type: "validation_failed", error: result.error, reason: result.reason }, key);
@@ -13450,7 +13463,7 @@ var WorktreeMachineRunner = class {
   }
   #clearSetupTimeout(key) {
     const entry = this.#entries.get(key);
-    if (!entry || !entry.setupTimer) return;
+    if (!entry?.setupTimer) return;
     this.#clearTimeoutFn(entry.setupTimer);
     entry.setupTimer = null;
   }
@@ -13775,81 +13788,6 @@ function flattenControlChannel(v2) {
   };
 }
 
-// src/services/metrics/telemeter.ts
-var TELEMETERED_EVENT_NAMES = [
-  "run_stall_timeout",
-  "request_task_state_replay_failed",
-  "loro_recovery_failed",
-  "mcp_server_connect_failed",
-  "mcp_server_needs_auth",
-  "mcp_reconnect_failed",
-  "mcp_reconnect_terminal",
-  "mcp_reconnect_terminal_unsupported",
-  "mcp_reauth_failed",
-  "mcp_adopted_set_failed",
-  "mcp_push_failed",
-  "harness_mcp_registration_failed",
-  "codex_auth_divergence_detected",
-  "cursor_auth_divergence_detected",
-  /**
-   * A Codex remote-compact cycle failed with a 401 "Missing bearer" error —
-   * the app-server lost its in-memory token during refresh-token rotation.
-   * Emitted once per compact attempt (not per retry) so fleet dashboards can
-   * surface the storm rate without log amplification.
-   */
-  "codex_compact_auth_failure",
-  "event_loop_stall",
-  "machine_sleep_artifact",
-  /**
-   * Per-process memory from the Electron main process (`app.getAppMetrics()`).
-   * The only source of true per-process RSS for the renderer/GPU/utility — JS
-   * heap (browser_metrics_sample) is capped ~4GB and cannot reveal a 50GB
-   * process. Forwarded to D1 by the daemon so runaway RAM is localizable
-   * fleet-wide to the offending Electron process.
-   */
-  "electron_app_metrics",
-  /** Electron main cleared a wedged Squirrel.Mac staged install on launch. */
-  "squirrel_install_stuck_recovered",
-  /**
-   * An ALO control-channel entry exhausted its maxDeliver retry budget
-   * without receiving an ack. Payload: { streamId, attempts, channel: 'control' }.
-   * Emitted via the `onDeadLetter` callback in control-channel-wiring.ts.
-   * Complements the `alo_resend_exhausted` ERROR log event emitted by the
-   * shell itself; this telemetry path routes it to D1 for fleet-wide
-   * observability so silent resend exhaustion is detectable in aggregate.
-   */
-  "alo_resend_exhausted",
-  /**
-   * An ALO control-channel shell reaped itself as an orphan — no truncating
-   * ack landed for `orphanThresholdMs` (5 min) while its retry buffer was
-   * non-empty, so the WHOLE buffer of unacked control messages was discarded.
-   * This is the bulk-loss sibling of `alo_resend_exhausted` (one entry): a
-   * reap can drop dozens of messages at once. Payload:
-   * { streamId, discardedCount, msSinceLastAck, attempts, channel: 'control' }.
-   * Emitted via the `onOrphanReaped` callback in control-channel-wiring.ts;
-   * the shell also emits a matching ERROR log. Routed to D1 so silent
-   * reconnect-time loss is detectable fleet-wide.
-   */
-  "alo_shell_orphan_reaped",
-  /**
-   * A `task_index_snapshot` envelope serialized past the control-channel
-   * high-water even after byte-bounded pagination — i.e. a single slim entry
-   * alone exceeds the cap (a page is guaranteed >=1 entry for forward
-   * progress). The control channel may drop it whole (`channel_send_dropped`).
-   * Payload: { bytes, taskCount, limitBytes }. Surfaces the pathological
-   * oversized-record case the byte budget cannot otherwise bound.
-   */
-  "task_index_snapshot_oversized"
-];
-var TELEMETERED_EVENTS = new Set(TELEMETERED_EVENT_NAMES);
-var sink = null;
-function setTelemetrySink(fn) {
-  sink = fn;
-}
-function telemeter(event, payload) {
-  sink?.(event, payload);
-}
-
 // src/services/channels/auth/agent-auth-verifier.ts
 var AUTH_CONVERGENCE_RUNTIMES = /* @__PURE__ */ new Set(["codex", "cursor", "claude-code"]);
 function isAuthConvergenceRuntime(runtimeId) {
@@ -17095,7 +17033,7 @@ async function refreshPluginCapabilities(daemon, tokenStore) {
   const userSettings = await daemon.userSettingsStore.getSettings();
   const [updatedMarketplace, updatedMcp, updatedSkills] = await Promise.all([
     detectMarketplacePlugins(daemon.capabilities.marketplacePlugins),
-    import("./mcp-servers-GUA5WOHO.js").then(
+    import("./mcp-servers-DSOX243C.js").then(
       (m2) => m2.detectMCPServers(
         daemon.capabilities.environments,
         tokenStore,
@@ -17144,6 +17082,17 @@ function runPluginOp(pluginName, marketplace, action, ctx) {
     return;
   }
   logAdapter({ event: `plugin_cc_${action}_requested`, pluginName, marketplace });
+  const claudeBinary = resolveClaudeBinaryPath(logAdapter);
+  if (!claudeBinary) {
+    handler.sendControl({
+      type: action === "install" ? "plugin_cc_install_status" : "plugin_cc_uninstall_status",
+      pluginName,
+      marketplace,
+      status: "error",
+      error: "Claude Code binary not found. Reinstall Shipyard or set CLAUDE_CODE_PATH."
+    });
+    return;
+  }
   inFlightPluginOps.add(fullId);
   if (action === "install") {
     handler.sendControl({
@@ -17160,7 +17109,7 @@ function runPluginOp(pluginName, marketplace, action, ctx) {
       status: "uninstalling"
     });
   }
-  execFile8("claude", ["plugin", action, fullId], { timeout: 6e4 }).then(async () => {
+  execFile8(claudeBinary, ["plugin", action, fullId], { timeout: 6e4 }).then(async () => {
     logAdapter({ event: `plugin_cc_${action}_completed`, pluginName, marketplace });
     if (action === "install") {
       handler.sendControl({
@@ -19233,6 +19182,10 @@ function handleLoginExit(exitCode, output, ctx) {
         output,
         reason: classification.kind
       });
+      telemeter("anthropic_login_failed", {
+        exitCode,
+        method: ctx.method ?? "default"
+      });
       ctx.sendStatus({
         type: "anthropic_login_status",
         requestId: ctx.requestId,
@@ -30199,6 +30152,14 @@ function handleMessageChannel(opts) {
   };
 }
 
+// src/services/collab/connection-lifecycle.ts
+function decideStaleSignal(entry, incoming) {
+  if (!entry) return { action: "drop" };
+  if (entry.generationId === incoming.generationId) return { action: "apply" };
+  if (entry.lastState === "new") return { action: "reoffer", generationId: entry.generationId };
+  return { action: "drop" };
+}
+
 // src/services/peer-manager.ts
 function routeDataChannel(label) {
   if (label === LORO_SYNC_LABEL) {
@@ -30404,12 +30365,6 @@ function installControlGuard(dc, label, machineId, log, logAdapter, dcBufferedSa
 var HANDSHAKE_TIMEOUT_MS = 3e4;
 function noopLogAdapter(_entry) {
 }
-function decideStaleSignal(entry, incoming) {
-  if (!entry) return { action: "drop" };
-  if (entry.generationId === incoming.generationId) return { action: "apply" };
-  if (entry.lastState === "new") return { action: "reoffer", generationId: entry.generationId };
-  return { action: "drop" };
-}
 var DISCONNECT_WATCHDOG_MS = 5e3;
 var REOFFER_THROTTLE_MS = 1e3;
 function createPeerManager(config) {
@@ -32799,7 +32754,7 @@ function filterEntriesToPorts(entries, cwdByPid, workspaceRoot) {
     if (seenPorts.has(entry.port)) continue;
     if (IGNORED_COMMANDS.has(entry.command.toLowerCase())) continue;
     const cwd = cwdByPid.get(entry.pid);
-    if (!cwd || !cwd.startsWith(workspaceRoot)) continue;
+    if (!cwd?.startsWith(workspaceRoot)) continue;
     const framework = detectFramework2(entry.command);
     const isDevRuntime = /^(node|python|ruby|bun|deno)$/i.test(entry.command);
     if (!framework && !isDevRuntime) continue;
@@ -35321,6 +35276,15 @@ function makeBinarySender(dc, guarded) {
     }
   };
 }
+function sendLoadedPluginPanelsToCollabPeer(dc, loadedPluginsRef) {
+  if (loadedPluginsRef.current.length === 0) return;
+  if (dc.readyState !== "open") return;
+  const msg = {
+    type: "plugin_panels_updated",
+    plugins: loadedPluginsRef.current
+  };
+  dc.send(JSON.stringify(msg));
+}
 function buildCollabRoomManager(deps) {
   const {
     peerRoleRegistry,
@@ -35435,12 +35399,7 @@ function buildCollabRoomManager(deps) {
           housekeepingBarrier,
           skillResolutionService: daemon.skillResolution
         });
-        if (loadedPluginsRef.current.length > 0) {
-          daemon.taskManager.broadcastControl({
-            type: "plugin_panels_updated",
-            plugins: loadedPluginsRef.current
-          });
-        }
+        sendLoadedPluginPanelsToCollabPeer(narrow(rawChannel), loadedPluginsRef);
       },
       onTaskMessageChannel: (machineId, rawChannel, taskId) => {
         if (!isTaskMessageChannelAllowed(taskId, collabTaskId)) {
@@ -36888,7 +36847,7 @@ function buildOutgoingMessage(report) {
     ...report.previousVersion ? { previousVersion: report.previousVersion } : {}
   };
 }
-function wireUpdateStatusForwarding(report, sink2, onMessage, log) {
+function wireUpdateStatusForwarding(report, sink, onMessage, log) {
   if (!report) return;
   let sent = false;
   let unsub = null;
@@ -36896,7 +36855,7 @@ function wireUpdateStatusForwarding(report, sink2, onMessage, log) {
     if (sent) return;
     if (msg.type !== "authenticated") return;
     try {
-      sink2.send(buildOutgoingMessage(report));
+      sink.send(buildOutgoingMessage(report));
     } catch (err3) {
       log?.warn({ err: err3 }, "update-status forward failed; will retry on next authenticated");
       return;
@@ -53350,7 +53309,7 @@ var McpCoordinator = class {
       if (snap.state !== "disabled") continue;
       if (this.#disabledNames.has(snap.name)) continue;
       const resolved = this.#resolvedByName.get(snap.name);
-      if (!resolved || resolved.transport !== "stdio") continue;
+      if (resolved?.transport !== "stdio") continue;
       this.#deps.log({ event: "mcp_stdio_adoption_recovery", serverName: snap.name });
       this.#registry.dispatch(snap.name, { type: "enable", config: resolved });
     }
@@ -55223,7 +55182,7 @@ async function handleProxyHttpRequest(opts) {
     return;
   }
   const authHeader = opts.req.headers.authorization;
-  if (!authHeader || !authHeader.toLowerCase().startsWith("bearer ")) {
+  if (!authHeader?.toLowerCase().startsWith("bearer ")) {
     await respondProxyError(
       opts.req,
       opts.res,
@@ -55822,7 +55781,7 @@ async function buildMcpCoordinator(input) {
     resolveServerUrl: (name) => {
       const caps = input.getCapabilities();
       const server = caps?.mcpServers?.find((s2) => s2.name === name);
-      if (!server || !server.url) return null;
+      if (!server?.url) return null;
       const out = { url: server.url };
       if (server.oauth?.callbackPort !== void 0 && server.oauth.callbackPort > 0) {
         out.callbackPort = server.oauth.callbackPort;
@@ -55942,6 +55901,13 @@ var DEFAULT_THRESHOLD_MS = 250;
 var DEFAULT_INTERVAL_MS4 = 100;
 var MACHINE_SLEEP_ARTIFACT_LAG_MS = 6e4;
 var ATTRIBUTION_EPSILON_MS = 100;
+var lastMachineSleepArtifactAtMs = 0;
+function markMachineSleepArtifact(atMs) {
+  lastMachineSleepArtifactAtMs = atMs;
+}
+function didMachineSleepArtifactOccurSince(sinceMs) {
+  return lastMachineSleepArtifactAtMs > sinceMs;
+}
 var EventLoopWatchdog = class {
   #log;
   #thresholdMs;
@@ -56005,6 +55971,7 @@ var EventLoopWatchdog = class {
       ...cause.attributedLabel !== void 0 && { attributedLabel: cause.attributedLabel }
     };
     if (lag > MACHINE_SLEEP_ARTIFACT_LAG_MS) {
+      markMachineSleepArtifact(now);
       this.#log({ event: "machine_sleep_artifact", ...payload });
       telemeter("machine_sleep_artifact", payload);
       return;
@@ -56072,12 +56039,14 @@ var HealthMetrics = class {
     };
     hist.reset();
     const nowMs = Date.now();
+    const windowStartMs = this.#lastCpuSampleAtMs;
     const cpuDelta = process.cpuUsage(this.#lastCpuUsage ?? void 0);
     const cpu = {
       userMs: cpuDelta.user / 1e3,
       systemMs: cpuDelta.system / 1e3,
-      windowMs: this.#lastCpuSampleAtMs > 0 ? nowMs - this.#lastCpuSampleAtMs : 0
+      windowMs: windowStartMs > 0 ? nowMs - windowStartMs : 0
     };
+    const postSleepArtifact = windowStartMs > 0 && (didMachineSleepArtifactOccurSince(windowStartMs) || cpu.windowMs - this.#intervalMs > MACHINE_SLEEP_ARTIFACT_LAG_MS);
     this.#lastCpuUsage = process.cpuUsage();
     this.#lastCpuSampleAtMs = nowMs;
     return {
@@ -56098,7 +56067,8 @@ var HealthMetrics = class {
         canvas: this.#canvasDocsCache.cachedDocCount
       },
       eventLoop,
-      cpu
+      cpu,
+      postSleepArtifact
     };
   }
   #emitSnapshot() {
@@ -56124,6 +56094,7 @@ var HealthMetrics = class {
       cpuUserMs: snap.cpu.userMs,
       cpuSystemMs: snap.cpu.systemMs,
       cpuWindowMs: snap.cpu.windowMs,
+      ...snap.postSleepArtifact && { postSleepArtifact: true },
       windowEpoch
     });
     this.#metricsCollector.capture("health_snapshot", {
@@ -56137,7 +56108,8 @@ var HealthMetrics = class {
       loroCanvasDocCount: snap.loroDocs.canvas,
       eventLoopP99Ms: snap.eventLoop.p99,
       cpuUserMs: snap.cpu.userMs,
-      cpuSystemMs: snap.cpu.systemMs
+      cpuSystemMs: snap.cpu.systemMs,
+      ...snap.postSleepArtifact && { postSleepArtifact: true }
     });
   }
 };
@@ -60090,7 +60062,7 @@ var ScheduleEvaluator = class {
   }
   async #fireSchedule(schedule) {
     const freshSchedule = await this.#deps.loadSchedule(schedule.id);
-    if (!freshSchedule || !freshSchedule.enabled) {
+    if (!freshSchedule?.enabled) {
       this.#deps.log({
         event: "schedule_fire_skipped",
         scheduleId: schedule.id,
@@ -61801,8 +61773,8 @@ var CodexAppServerClient = class {
    *
    * Calling again replaces the previous sink. Pass `null` to deregister.
    */
-  registerAccountSink(sink2) {
-    this.#accountSink = sink2;
+  registerAccountSink(sink) {
+    this.#accountSink = sink;
   }
   /**
    * Register the MCP server set to be sent on the next `thread/start` call.
@@ -62350,16 +62322,16 @@ var CodexAppServerClient = class {
     if (threadId === null) return false;
     if (!this.#compactThreads.has(threadId)) return false;
     if (method === CodexNotifications.error) {
-      const sink3 = this.#threadScopedSinks(params).onError;
-      if (!sink3) return false;
+      const sink2 = this.#threadScopedSinks(params).onError;
+      if (!sink2) return false;
       this.#compactThreads.delete(threadId);
-      sink3(params);
+      sink2(params);
       return true;
     }
     if (!isContextCompactionItemNotification(method, params)) return false;
-    const sink2 = this.#threadScopedSinks(params).onUnregisteredTurnEvent;
-    if (!sink2) return false;
-    sink2({ method, params });
+    const sink = this.#threadScopedSinks(params).onUnregisteredTurnEvent;
+    if (!sink) return false;
+    sink({ method, params });
     if (method === CodexNotifications.itemCompleted) {
       this.#compactThreads.delete(threadId);
     }
@@ -65398,6 +65370,35 @@ function isCodexResumeThreadNotFound(err3) {
 }
 
 // src/services/session/codex-subprocess-facade.ts
+function detectedCodexVersionForLog(input) {
+  const { detectedCodexVersion, compatibility } = input;
+  switch (compatibility.status) {
+    case "compatible":
+      return detectedCodexVersion ?? null;
+    case "untested":
+      return compatibility.detected;
+    case "unknown":
+      return detectedCodexVersion ?? null;
+    default: {
+      const _exhaustive = compatibility;
+      return _exhaustive;
+    }
+  }
+}
+function formatCodexSpawnFailureMessage(input) {
+  const { detail, compatibility } = input;
+  switch (compatibility.status) {
+    case "compatible":
+    case "unknown":
+      return `Codex spawn failed: ${detail}`;
+    case "untested":
+      return `Codex spawn failed: codex version mismatch; update Shipyard bundled Codex (detected ${compatibility.detected}, tested ${compatibility.tested}). Original error: ${detail}`;
+    default: {
+      const _exhaustive = compatibility;
+      return _exhaustive;
+    }
+  }
+}
 function createCodexSubprocessFacade(options, log) {
   const pending = [];
   let inner = null;
@@ -65483,9 +65484,28 @@ function createCodexSubprocessFacade(options, log) {
       drainOnto(subprocess);
     } catch (err3) {
       const msg = err3 instanceof Error ? err3.message : String(err3);
-      log({ event: "codex_spawn_failed", detail: msg });
+      const detectedCodexVersion = options.spawnArgs.codexVersion;
+      const compatibility = classifyCodexCompatibility(detectedCodexVersion);
+      const detectedForLog = detectedCodexVersionForLog({ detectedCodexVersion, compatibility });
+      log({
+        event: "codex_spawn_failed",
+        detail: msg,
+        codexVersionCompatibility: compatibility.status,
+        detectedCodexVersion: detectedForLog,
+        testedCodexVersion: TESTED_CODEX_VERSION,
+        hint: compatibility.status === "untested" ? "codex version mismatch; update Shipyard bundled Codex" : null
+      });
+      telemeter("codex_spawn_failed", {
+        errorName: err3 instanceof Error ? err3.name : "NonErrorThrown",
+        codexVersionCompatibility: compatibility.status,
+        detectedCodexVersion: detectedForLog,
+        testedCodexVersion: TESTED_CODEX_VERSION
+      });
       spawnFailed = true;
-      options.onEvent({ type: "sdk_error", error: `Codex spawn failed: ${msg}` });
+      options.onEvent({
+        type: "sdk_error",
+        error: formatCodexSpawnFailureMessage({ detail: msg, compatibility })
+      });
       options.onEvent({ type: "subprocess_died", exitCode: 1 });
     }
   })();
@@ -66037,7 +66057,7 @@ async function createHarnessHttpServer(opts = {}) {
       return;
     }
     const authHeader = req.headers.authorization;
-    if (!authHeader || !authHeader.toLowerCase().startsWith("bearer ")) {
+    if (!authHeader?.toLowerCase().startsWith("bearer ")) {
       await rejectAuth(req, res, 401, JSON_RPC_ERROR_UNAUTHORIZED, "unauthorized");
       return;
     }
@@ -66208,6 +66228,7 @@ function buildCodexSpawnArgs(args) {
   });
   return {
     binary: spawn15.binary,
+    ...args.codexVersion !== void 0 ? { codexVersion: args.codexVersion } : {},
     argv: spawn15.argv,
     ...spawn15.env !== void 0 ? { env: spawn15.env } : {},
     stripEnv: args.stripEnv
@@ -66380,13 +66401,18 @@ function createCodexFacadeSubsystem(d) {
     unregisterCodexFacade
   });
   const codexFacadesByTaskId = /* @__PURE__ */ new Map();
+  async function resolveRequiredCodexBinary() {
+    const binary = await codexProfile.spawn.binaryResolver();
+    if (binary === null) throw new Error("Codex binary not resolved");
+    return binary;
+  }
   const codexEngineRef = { current: null };
   function getOrCreateCodexEngine() {
     const existing = codexEngineRef.current;
     if (existing !== null && !existing.isDisposed) return existing;
     const engine = new CodexEngineSingleton({
       resolveSpawnConfig: async () => {
-        const binaryPath = await codexProfile.spawn.binaryResolver() ?? "codex";
+        const binaryPath = await resolveRequiredCodexBinary();
         const spawn15 = rewriteElectronNodeScriptSpawn({
           binary: binaryPath,
           argv: ["app-server"]
@@ -66457,7 +66483,7 @@ function createCodexFacadeSubsystem(d) {
     state.pending.length = 0;
   }
   async function initCodexInner(state, input) {
-    const binary = await codexProfile.spawn.binaryResolver() ?? "codex";
+    const binary = await resolveRequiredCodexBinary();
     const spawnCtx = {
       taskId: input.args.taskId,
       cwd: input.args.cwd,
@@ -66469,7 +66495,13 @@ function createCodexFacadeSubsystem(d) {
     const argv = codexProfile.spawn.args(spawnCtx);
     const envInject = codexProfile.spawn.envInject(spawnCtx);
     const stripEnv = codexProfile.spawn.envStrip;
-    const spawnArgs = buildCodexSpawnArgs({ binary, argv, env: envInject, stripEnv });
+    const spawnArgs = buildCodexSpawnArgs({
+      binary,
+      codexVersion: CODEX_BUNDLED_VERSION,
+      argv,
+      env: envInject,
+      stripEnv
+    });
     const harnessReg = await input.harnessHttp.registerTask(
       buildHarnessRegisterCtx({
         taskId: input.args.taskId,
@@ -78858,10 +78890,10 @@ var ThreadStreamDeltaForwarder = class {
   #sinks = /* @__PURE__ */ new Set();
   #inFlight = [];
   #disposed = false;
-  addSink(sink2) {
-    this.#sinks.add(sink2);
+  addSink(sink) {
+    this.#sinks.add(sink);
     return () => {
-      this.#sinks.delete(sink2);
+      this.#sinks.delete(sink);
     };
   }
   /** Shape a stream_delta event, buffer it for replay, and fan it out to sinks. */
@@ -78909,9 +78941,9 @@ var ThreadStreamDeltaForwarder = class {
     this.#inFlight = [];
   }
   #fanOut(msg) {
-    for (const sink2 of this.#sinks) {
+    for (const sink of this.#sinks) {
       try {
-        sink2(msg);
+        sink(msg);
       } catch {
       }
     }
@@ -79439,8 +79471,8 @@ var Thread = class {
   denyAllPendingPermissions(reason) {
     this.#permissionHandler.denyAllPending(reason);
   }
-  addStreamDeltaSink(sink2) {
-    return this.#streamDelta.addSink(sink2);
+  addStreamDeltaSink(sink) {
+    return this.#streamDelta.addSink(sink);
   }
   getInFlightStreamDeltas() {
     return this.#streamDelta.getInFlight();
@@ -81184,6 +81216,132 @@ ${diff}
   }
 }
 
+// src/services/plan-backfill/plan-storage-recovery.ts
+var PLAN_STORAGE_RECOVERY_MAX_ATTEMPTS = 4;
+var BASE_BACKOFF_MS = 750;
+var MAX_BACKOFF_MS = 6e3;
+function planStorageRecoveryBackoffMs(attempt) {
+  return Math.min(BASE_BACKOFF_MS * 2 ** Math.max(0, attempt - 1), MAX_BACKOFF_MS);
+}
+function decidePlanStorageRecovery(state) {
+  switch (state.outcome) {
+    case "has-content":
+    case "rebuilt":
+      return { kind: "recovered" };
+    case "no-source":
+      return { kind: "exhausted" };
+    case "storage-error":
+    case "failed":
+      return state.attempts >= state.maxAttempts ? { kind: "give_up" } : { kind: "retry" };
+    default: {
+      const _exhaustive = state.outcome;
+      void _exhaustive;
+      return { kind: "give_up" };
+    }
+  }
+}
+
+// src/services/plan/plan-storage-recovery-controller.ts
+function defaultScheduleStorageRecovery(fn, delayMs) {
+  const timer = setTimeout(fn, delayMs);
+  return () => clearTimeout(timer);
+}
+var PlanStorageRecoveryController = class {
+  #deps;
+  /**
+   * One-shot guard: true while a cycle is scheduled or running, so repeated
+   * empty replays (reconnects, several viewers requesting state) cannot start
+   * overlapping evict-and-reload loops against the live doc.
+   */
+  #inFlight = false;
+  /** Cancel handle for the pending attempt's deferred timer; null when none armed. */
+  #cancel = null;
+  constructor(deps) {
+    this.#deps = deps;
+  }
+  /** Begin a recovery cycle for `detection`. No-op if disposed or already running. */
+  schedule(detection) {
+    if (this.#deps.isDisposed() || this.#inFlight) return;
+    this.#inFlight = true;
+    this.#deps.log({ event: "plan_storage_recovery_scheduled", taskId: this.#deps.taskId });
+    this.#scheduleAttempt(detection, 1);
+  }
+  /** Cancel any pending attempt and clear the one-shot guard (dispose/rewind). */
+  cancel() {
+    this.#cancel?.();
+    this.#cancel = null;
+    this.#inFlight = false;
+  }
+  #scheduleAttempt(detection, attempt) {
+    const fire = () => {
+      this.#cancel = null;
+      if (this.#deps.isDisposed()) {
+        this.#inFlight = false;
+        return;
+      }
+      this.#deps.enqueueAsync(() => this.#runAttempt(detection, attempt));
+    };
+    const schedule = this.#deps.scheduleStorageRecovery ?? defaultScheduleStorageRecovery;
+    this.#cancel = schedule(fire, planStorageRecoveryBackoffMs(attempt));
+  }
+  async #runAttempt(detection, attempt) {
+    if (this.#deps.isDisposed() || !this.#inFlight) return;
+    const evicted = await this.#deps.planRepo.invalidate(this.#deps.taskId);
+    if (!evicted) {
+      this.#deps.log({
+        event: "plan_storage_recovery_evict_blocked",
+        taskId: this.#deps.taskId,
+        attempt
+      });
+    }
+    if (this.#deps.isDisposed() || !this.#inFlight) return;
+    const outcome = await ensurePlanDocRebuilt({
+      taskId: this.#deps.taskId,
+      planRepo: this.#deps.planRepo,
+      taskRecord: { lastPlanDetection: { filePath: detection.filePath } },
+      dataDir: this.#deps.dataDir,
+      shipyardHome: getShipyardHome(),
+      log: this.#deps.log
+    });
+    if (this.#deps.isDisposed() || !this.#inFlight) return;
+    const action = decidePlanStorageRecovery({
+      outcome: outcome.kind,
+      attempts: attempt,
+      maxAttempts: PLAN_STORAGE_RECOVERY_MAX_ATTEMPTS
+    });
+    switch (action.kind) {
+      case "recovered":
+        this.#inFlight = false;
+        this.#deps.log({
+          event: "plan_storage_recovery_succeeded",
+          taskId: this.#deps.taskId,
+          attempt
+        });
+        this.#deps.reEmitPlanDetected(detection);
+        return;
+      case "retry":
+        this.#scheduleAttempt(detection, attempt + 1);
+        return;
+      case "exhausted":
+      case "give_up":
+        this.#inFlight = false;
+        this.#deps.log({
+          event: "plan_storage_recovery_gave_up",
+          taskId: this.#deps.taskId,
+          attempt,
+          reason: action.kind
+        });
+        return;
+      default: {
+        const _exhaustive = action;
+        void _exhaustive;
+        this.#inFlight = false;
+        return;
+      }
+    }
+  }
+};
+
 // src/services/plan/plan-handler.ts
 var PLAN_PUBLISHED_DENY_MESSAGE = `Your plan has been published to the Shipyard canvas for collaborative review. Reviewers can comment, edit, and approve your plan in real-time. You will receive feedback as <${XML_TAGS.COMMENT}> children of the <plan> resource and plan edits as <${XML_TAGS.PLAN_UPDATE}> diffs. Wait for <${XML_TAGS.PLAN_REVIEW} decision="approve"> before calling ExitPlanMode again.`;
 var PLAN_STILL_UNDER_REVIEW_MESSAGE = `Your plan is still under review. Wait for <${XML_TAGS.PLAN_REVIEW} decision="approve"> before calling ExitPlanMode again.`;
@@ -81250,8 +81408,23 @@ var PlanHandler = class {
    * single chained promise here suffices.
    */
   #codexPlanQueue = Promise.resolve();
+  /**
+   * #4770 storage-error recovery loop (evict + reload + re-emit). Owns its own
+   * one-shot/timer state; cancelled on dispose/rewind. See the controller.
+   */
+  #storageRecovery;
   constructor(deps) {
     this.#deps = deps;
+    this.#storageRecovery = new PlanStorageRecoveryController({
+      taskId: deps.taskId,
+      planRepo: deps.planRepo,
+      dataDir: deps.dataDir,
+      isDisposed: deps.isDisposed,
+      enqueueAsync: deps.enqueueAsync,
+      log: deps.log,
+      reEmitPlanDetected: (detection) => this.#reEmitPlanDetected(detection),
+      scheduleStorageRecovery: deps.scheduleStorageRecovery
+    });
     if (deps.initialPlanDetection) {
       this.#lastPlanDetection = deps.initialPlanDetection;
       this.#lastPersistedPlanDetection = deps.initialPlanDetection;
@@ -81666,7 +81839,24 @@ var PlanHandler = class {
       shipyardHome: getShipyardHome(),
       log: this.#deps.log
     });
-    if (outcome.kind !== "rebuilt" || this.#deps.isDisposed()) return;
+    if (this.#deps.isDisposed()) return;
+    if (outcome.kind === "storage-error") {
+      this.#storageRecovery.schedule(detection);
+      return;
+    }
+    if (outcome.kind !== "rebuilt") return;
+    this.#reEmitPlanDetected(detection);
+  }
+  /**
+   * Re-broadcast `plan_detected` carrying the plan doc's CURRENT markdown via
+   * the durable path (current sender, else the persist queue) rather than a
+   * captured per-peer `send`, so the populated state reaches every browser —
+   * owner and collab viewers (`plan_detected` is collab-whitelisted) — even if
+   * the original requester reconnected meanwhile. No-op when the doc is still
+   * empty, so a failed recovery never emits a misleading empty re-detection.
+   */
+  #reEmitPlanDetected(detection) {
+    if (this.#deps.isDisposed()) return;
     const markdown = this.#deps.planRepo.getContent(this.#deps.taskId);
     if (markdown.trim() === "") return;
     const msg = this.#buildPlanDetectedReplay(detection, markdown);
@@ -81715,6 +81905,7 @@ var PlanHandler = class {
     this.#createdPlanFiles.clear();
     this.#proactiveToolUseId = null;
     this.#detectionInFlight = false;
+    this.#storageRecovery.cancel();
     void this.#planFileBridge?.dispose();
     this.#planFileBridge = null;
   }
@@ -81722,6 +81913,7 @@ var PlanHandler = class {
     this.#approvalReceived = false;
     this.#planPublished = false;
     this.#stopPlanWatch();
+    this.#storageRecovery.cancel();
     void this.#planFileBridge?.dispose();
     this.#planFileBridge = null;
     this.#processedPlanToolUseIds.clear();
@@ -85866,7 +86058,7 @@ function maybeEmitCursorWindowOccupancy(ctx, event) {
   handleAutoCompactionSnapshot(ctx, synthetic, resolved.windowTokens, resolved.source === "held");
 }
 function priorOccupancyFromTurnStats(prior) {
-  if (!prior || prior.type !== "turn_stats") return null;
+  if (prior?.type !== "turn_stats") return null;
   const used = prior.liveContextTokens ?? 0;
   const priorWindow = prior.contextWindow ?? 0;
   if (used <= 0 || priorWindow <= 0) return null;
@@ -86782,7 +86974,7 @@ var RoiTracker = class {
 function syntheticResourceUri(msg) {
   if (!msg.isSynthetic || msg.content.length !== 1) return null;
   const block = msg.content[0];
-  if (!block || block.type !== "resource") return null;
+  if (block?.type !== "resource") return null;
   if (!("uri" in block.resource)) return null;
   return block.resource.uri;
 }
@@ -86790,7 +86982,7 @@ function seedPushedEverFromHistory(msgs, pushManager) {
   const seeded = /* @__PURE__ */ new Set();
   for (const msg of msgs) {
     const uri = syntheticResourceUri(msg);
-    if (!uri || !uri.startsWith("shipyard://")) continue;
+    if (!uri?.startsWith("shipyard://")) continue;
     if (seeded.has(uri)) continue;
     seeded.add(uri);
     pushManager.seedSessionPushed(uri);
@@ -88183,7 +88375,7 @@ var StructuredTaskTracker = class {
     const overlay = this.#currentOverlay ?? DEFAULT_TASK_OVERLAY;
     const merged = applyOverlayToMap(this.#structuredTasks, overlay);
     const item = merged.get(itemId);
-    if (!item || item.status !== "in_progress") return;
+    if (item?.status !== "in_progress") return;
     const caps = this.#resolveEffectiveCaps(itemId, item);
     this.#maybeFireItemActivated(itemId, caps);
   }
@@ -91104,8 +91296,8 @@ var Task = class {
       thread.clearControlChannelSend();
     }
   }
-  addStreamDeltaSink(sink2) {
-    return this.#getPrimary().addStreamDeltaSink(sink2);
+  addStreamDeltaSink(sink) {
+    return this.#getPrimary().addStreamDeltaSink(sink);
   }
   getInFlightStreamDeltas() {
     return this.#getPrimary().getInFlightStreamDeltas();
@@ -94970,7 +95162,7 @@ function extractTaskSnapshotDigest(ctx) {
   return JSON.stringify(parts);
 }
 function summarizePrState(payload) {
-  if (!payload || !payload.currentBranchPR) {
+  if (!payload?.currentBranchPR) {
     return { prState: null, ci: null, reviewers: null, mergeable: null };
   }
   const pr = payload.currentBranchPR;
@@ -95029,7 +95221,7 @@ function findPendingAskQuestion(notifications) {
 function findLastAssistantPreview(messages) {
   for (let i = messages.length - 1; i >= 0; i--) {
     const m2 = messages[i];
-    if (!m2 || m2.senderKind !== "agent") continue;
+    if (m2?.senderKind !== "agent") continue;
     const text = collectAgentText(m2);
     if (!text) continue;
     return previewSlice(text);
@@ -97708,8 +97900,8 @@ async function createDaemon(deps) {
         throw err3;
       }
     },
-    wireUpdateStatusForwarding: (sink2, onMessage) => {
-      wireUpdateStatusForwarding(pendingUpdateReport, sink2, onMessage);
+    wireUpdateStatusForwarding: (sink, onMessage) => {
+      wireUpdateStatusForwarding(pendingUpdateReport, sink, onMessage);
       pendingUpdateReport = null;
     },
     findVizBySlug: (slug) => {
@@ -100994,4 +101186,4 @@ export {
   decideWorkspaceScope,
   serve
 };
-//# sourceMappingURL=serve-25I4ML7R.js.map
+//# sourceMappingURL=serve-DAP6V7SY.js.map