@cabane/companion 0.6.189 → 0.6.190

package/dist/cli.js

@@ -5972,6 +5972,10 @@ var init_transport2 = __esm({
 });
 
 // packages/agent-runtime/src/codex/index.ts
+function isMissingRollout(err) {
+  const message2 = err instanceof Error ? err.message : String(err);
+  return /no rollout found for thread id/i.test(message2);
+}
 function createCodexAdapter(deps = {}) {
   const transport = deps.transport ?? (deps.enabled ? createSdkCodexTransport({ ...deps.apiKey ? { apiKey: deps.apiKey } : {} }) : null);
   return {
@@ -5990,8 +5994,8 @@ function createCodexAdapter(deps = {}) {
       }
       const directory = req.local.cwd ?? "";
       const decision = decideResume3(req.session, directory);
-      const resumeThreadId = "resume" in decision ? decision.resume : null;
-      const threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
+      let resumeThreadId = "resume" in decision ? decision.resume : null;
+      let threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
       if ("fresh" in decision && decision.reason === "cwd_mismatch") {
         deps.onWarn?.(
           "codex adapter: stored session directory no longer matches the current environment \u2014 starting a fresh thread (SJ527-analogue guard)",
@@ -6056,38 +6060,69 @@ function createCodexAdapter(deps = {}) {
           }
           if (signal.aborted) return;
         }
-        const spec = buildRunSpec2(req, resumeThreadId, threadStanding, images?.paths ?? []);
-        if (spec.model === null) {
-          deps.onWarn?.("Codex is using its default model because no model was resolved", {
-            model: req.config.model
-          });
+        for (; ; ) {
+          const spec = buildRunSpec2(req, resumeThreadId, threadStanding, images?.paths ?? []);
+          if (spec.model === null) {
+            deps.onWarn?.("Codex is using its default model because no model was resolved", {
+              model: req.config.model
+            });
+          }
+          let emitted = false;
+          try {
+            const result = await transport.run(spec, signal);
+            if (signal.aborted) return;
+            for await (const event of decodeCodexStream(result.events, {
+              signal,
+              cwd: req.local.cwd,
+              resumedThreadId: resumeThreadId,
+              degraded,
+              // Which segments the thread carries once this turn lands. A segment sent is that one —
+              // the later copy is what the model reads. One withheld is what the thread had. Read off
+              // the spec, so the record can't disagree with what was sent.
+              promptFingerprint: spec.preamble.core ? spec.fingerprints.core : threadStanding?.core ?? null,
+              conversationFingerprint: spec.preamble.conversation ? spec.fingerprints.conversation : threadStanding?.conversation ?? null,
+              compactions,
+              // What the thread held before this turn, for the write at `thread.started`.
+              heldStanding: {
+                promptFingerprint: threadStanding?.core ?? null,
+                conversationFingerprint: threadStanding?.conversation ?? null,
+                compactions: threadStanding ? compactions : null
+              },
+              storedState: req.session,
+              usageBaseline: threadUsageBaseline,
+              // Codex reports no model in-stream, so record what the thread was started with (null on the
+              // default token). Same for the reasoning effort.
+              resolvedModel: spec.model,
+              resolvedReasoningEffort: spec.modelReasoningEffort ?? null
+            })) {
+              emitted = true;
+              yield event;
+            }
+            return;
+          } catch (err) {
+            if (resumeThreadId === null || emitted || signal.aborted || !isMissingRollout(err)) {
+              throw err;
+            }
+            deps.onWarn?.(
+              "codex adapter: the stored thread has no rollout on this host \u2014 starting a fresh thread",
+              { threadId: resumeThreadId }
+            );
+            resumeThreadId = null;
+            threadUsageBaseline = null;
+            threadStanding = null;
+            compactions = 0;
+            req = { ...req, session: null };
+            degraded = true;
+            if (hooks?.fresh) {
+              const recomposed = await hooks.fresh("session_start_failed");
+              if (signal.aborted) return;
+              if (recomposed) {
+                req = { ...req, ...recomposed, session: null };
+                degraded = false;
+              }
+            }
+          }
         }
-        const result = await transport.run(spec, signal);
-        if (signal.aborted) return;
-        yield* decodeCodexStream(result.events, {
-          signal,
-          cwd: req.local.cwd,
-          resumedThreadId: resumeThreadId,
-          degraded,
-          // Which segments the thread carries once this turn lands. A segment sent is that one —
-          // the later copy is what the model reads. One withheld is what the thread had. Read off
-          // the spec, so the record can't disagree with what was sent.
-          promptFingerprint: spec.preamble.core ? spec.fingerprints.core : threadStanding?.core ?? null,
-          conversationFingerprint: spec.preamble.conversation ? spec.fingerprints.conversation : threadStanding?.conversation ?? null,
-          compactions,
-          // What the thread held before this turn, for the write at `thread.started`.
-          heldStanding: {
-            promptFingerprint: threadStanding?.core ?? null,
-            conversationFingerprint: threadStanding?.conversation ?? null,
-            compactions: threadStanding ? compactions : null
-          },
-          storedState: req.session,
-          usageBaseline: threadUsageBaseline,
-          // Codex reports no model in-stream, so record what the thread was started with (null on the
-          // default token). Same for the reasoning effort.
-          resolvedModel: spec.model,
-          resolvedReasoningEffort: spec.modelReasoningEffort ?? null
-        });
       } finally {
         if (images) {
           try {

package/dist/runtime.js

@@ -6158,6 +6158,10 @@ function createSdkCodexTransport(opts = {}) {
 }
 
 // packages/agent-runtime/src/codex/index.ts
+function isMissingRollout(err) {
+  const message = err instanceof Error ? err.message : String(err);
+  return /no rollout found for thread id/i.test(message);
+}
 function createCodexAdapter(deps = {}) {
   const transport = deps.transport ?? (deps.enabled ? createSdkCodexTransport({ ...deps.apiKey ? { apiKey: deps.apiKey } : {} }) : null);
   return {
@@ -6176,8 +6180,8 @@ function createCodexAdapter(deps = {}) {
       }
       const directory = req.local.cwd ?? "";
       const decision = decideResume3(req.session, directory);
-      const resumeThreadId = "resume" in decision ? decision.resume : null;
-      const threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
+      let resumeThreadId = "resume" in decision ? decision.resume : null;
+      let threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
       if ("fresh" in decision && decision.reason === "cwd_mismatch") {
         deps.onWarn?.(
           "codex adapter: stored session directory no longer matches the current environment \u2014 starting a fresh thread (SJ527-analogue guard)",
@@ -6242,38 +6246,69 @@ function createCodexAdapter(deps = {}) {
           }
           if (signal.aborted) return;
         }
-        const spec = buildRunSpec2(req, resumeThreadId, threadStanding, images?.paths ?? []);
-        if (spec.model === null) {
-          deps.onWarn?.("Codex is using its default model because no model was resolved", {
-            model: req.config.model
-          });
+        for (; ; ) {
+          const spec = buildRunSpec2(req, resumeThreadId, threadStanding, images?.paths ?? []);
+          if (spec.model === null) {
+            deps.onWarn?.("Codex is using its default model because no model was resolved", {
+              model: req.config.model
+            });
+          }
+          let emitted = false;
+          try {
+            const result = await transport.run(spec, signal);
+            if (signal.aborted) return;
+            for await (const event of decodeCodexStream(result.events, {
+              signal,
+              cwd: req.local.cwd,
+              resumedThreadId: resumeThreadId,
+              degraded,
+              // Which segments the thread carries once this turn lands. A segment sent is that one —
+              // the later copy is what the model reads. One withheld is what the thread had. Read off
+              // the spec, so the record can't disagree with what was sent.
+              promptFingerprint: spec.preamble.core ? spec.fingerprints.core : threadStanding?.core ?? null,
+              conversationFingerprint: spec.preamble.conversation ? spec.fingerprints.conversation : threadStanding?.conversation ?? null,
+              compactions,
+              // What the thread held before this turn, for the write at `thread.started`.
+              heldStanding: {
+                promptFingerprint: threadStanding?.core ?? null,
+                conversationFingerprint: threadStanding?.conversation ?? null,
+                compactions: threadStanding ? compactions : null
+              },
+              storedState: req.session,
+              usageBaseline: threadUsageBaseline,
+              // Codex reports no model in-stream, so record what the thread was started with (null on the
+              // default token). Same for the reasoning effort.
+              resolvedModel: spec.model,
+              resolvedReasoningEffort: spec.modelReasoningEffort ?? null
+            })) {
+              emitted = true;
+              yield event;
+            }
+            return;
+          } catch (err) {
+            if (resumeThreadId === null || emitted || signal.aborted || !isMissingRollout(err)) {
+              throw err;
+            }
+            deps.onWarn?.(
+              "codex adapter: the stored thread has no rollout on this host \u2014 starting a fresh thread",
+              { threadId: resumeThreadId }
+            );
+            resumeThreadId = null;
+            threadUsageBaseline = null;
+            threadStanding = null;
+            compactions = 0;
+            req = { ...req, session: null };
+            degraded = true;
+            if (hooks?.fresh) {
+              const recomposed = await hooks.fresh("session_start_failed");
+              if (signal.aborted) return;
+              if (recomposed) {
+                req = { ...req, ...recomposed, session: null };
+                degraded = false;
+              }
+            }
+          }
         }
-        const result = await transport.run(spec, signal);
-        if (signal.aborted) return;
-        yield* decodeCodexStream(result.events, {
-          signal,
-          cwd: req.local.cwd,
-          resumedThreadId: resumeThreadId,
-          degraded,
-          // Which segments the thread carries once this turn lands. A segment sent is that one —
-          // the later copy is what the model reads. One withheld is what the thread had. Read off
-          // the spec, so the record can't disagree with what was sent.
-          promptFingerprint: spec.preamble.core ? spec.fingerprints.core : threadStanding?.core ?? null,
-          conversationFingerprint: spec.preamble.conversation ? spec.fingerprints.conversation : threadStanding?.conversation ?? null,
-          compactions,
-          // What the thread held before this turn, for the write at `thread.started`.
-          heldStanding: {
-            promptFingerprint: threadStanding?.core ?? null,
-            conversationFingerprint: threadStanding?.conversation ?? null,
-            compactions: threadStanding ? compactions : null
-          },
-          storedState: req.session,
-          usageBaseline: threadUsageBaseline,
-          // Codex reports no model in-stream, so record what the thread was started with (null on the
-          // default token). Same for the reasoning effort.
-          resolvedModel: spec.model,
-          resolvedReasoningEffort: spec.modelReasoningEffort ?? null
-        });
       } finally {
         if (images) {
           try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.189",
+  "version": "0.6.190",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",