@cabane/companion 0.6.189 → 0.6.191

package/dist/cli.js

@@ -5845,8 +5845,6 @@ var init_run_spec2 = __esm({
     TURN_CONTROL_MCP_SERVER2 = "cabane_companion";
     ACTIVE_CONVERSATION_HEADER3 = "x-cabane-active-conversation";
     ENV_ENVELOPE_KEYS = [
-      "CABANE_PLAYGROUND",
-      "CABANE_PLAYGROUND_BIN",
       "CABANE_CONVERSATION_ID",
       "CABANE_AGENT_ID",
       "CABANE_CONVERSATION_TITLE"
@@ -5972,6 +5970,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 +5992,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 +6058,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 {
@@ -7512,9 +7545,11 @@ function required(env, name) {
 function runnerPlace(env) {
   const workRoot2 = env[PLACE_ENV.workRoot];
   const transcriptDir = env[PLACE_ENV.transcriptDir];
+  const box = env[PLACE_ENV.box];
   return {
     ...workRoot2 ? { workRoot: workRoot2 } : {},
-    ...transcriptDir ? { transcriptDir } : {}
+    ...transcriptDir ? { transcriptDir } : {},
+    ...box ? { box } : {}
   };
 }
 function parseRunnerInput(env, stdin) {
@@ -7596,7 +7631,8 @@ var init_protocol = __esm({
     };
     PLACE_ENV = {
       workRoot: "CABANE_WORK_ROOT",
-      transcriptDir: "CABANE_TRANSCRIPT_DIR"
+      transcriptDir: "CABANE_TRANSCRIPT_DIR",
+      box: "CABANE_BOX"
     };
     runtimeHealthSchema = z14.object({
       quotaState: z14.enum(["ok", "limited", "auth_expired", "unknown"]),
@@ -7667,8 +7703,7 @@ function runnerExecEnv(base, boxed) {
   const env = {};
   for (const [k, v] of Object.entries(base)) {
     if (v === void 0) continue;
-    if (boxed && (BOXED_ENV_DROPPED.includes(k) || k.startsWith(BOXED_ENV_DROPPED_PREFIX)))
-      continue;
+    if (boxed && BOXED_ENV_DROPPED.includes(k)) continue;
     env[k] = v;
   }
   return env;
@@ -8006,7 +8041,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
   duties.notifyEnd({ id: payload.messageId, ok: false, durationMs, reason });
   return { ok: false, durationMs, reason };
 }
-var BOXED_ENV_DROPPED, BOXED_ENV_DROPPED_PREFIX, PINO_LEVELS;
+var BOXED_ENV_DROPPED, PINO_LEVELS;
 var init_launch = __esm({
   "src/runner/launch.ts"() {
     "use strict";
@@ -8026,7 +8061,6 @@ var init_launch = __esm({
       "DBUS_SESSION_BUS_ADDRESS",
       "XDG_RUNTIME_DIR"
     ];
-    BOXED_ENV_DROPPED_PREFIX = "CABANE_GATE_";
     PINO_LEVELS = {
       10: "trace",
       20: "debug",
@@ -9547,7 +9581,7 @@ var init_turn_execution = __esm({
       async prepareEnvironment() {
         const { payload, workspaceId, turnId, turnLog } = this;
         const prepareHook = this.opts.local.prepareHook;
-        const pairDir = pairDirectory(this.opts.workRoot, {
+        const pairDir = this.opts.boxed ? this.opts.workRoot : pairDirectory(this.opts.workRoot, {
           workspaceSlug: this.opts.workspaceSlug,
           agentUsername: this.opts.agentUsername,
           conversationId: payload.conversationId
@@ -10773,8 +10807,10 @@ function runnerTurnOptions(input, log2, emit, extras = {}) {
     local: spec.local,
     // The place the runner stands in names its own root and transcript
     // directory when it has them (`PLACE_ENV`); the launcher's host-computed
-    // values are what a runner on the person's own machine gets.
+    // values are what a runner on the person's own machine gets. A box is one
+    // conversation × agent's, so the turn stands in its root itself.
     workRoot: input.place?.workRoot ?? spec.workRoot,
+    ...input.place?.box ? { boxed: true } : {},
     runConfig: spec.runConfig,
     // The launcher's copy of the device's secrets, when it sent one: a runner
     // in a box has no `secrets.json` to read.

package/dist/runtime.js

@@ -5898,8 +5898,6 @@ var CABANE_MCP_SERVER3 = "cabane";
 var TURN_CONTROL_MCP_SERVER2 = "cabane_companion";
 var ACTIVE_CONVERSATION_HEADER3 = "x-cabane-active-conversation";
 var ENV_ENVELOPE_KEYS = [
-  "CABANE_PLAYGROUND",
-  "CABANE_PLAYGROUND_BIN",
   "CABANE_CONVERSATION_ID",
   "CABANE_AGENT_ID",
   "CABANE_CONVERSATION_TITLE"
@@ -6158,6 +6156,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 +6178,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 +6244,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 {
@@ -7506,13 +7539,11 @@ var BOXED_ENV_DROPPED = [
   "DBUS_SESSION_BUS_ADDRESS",
   "XDG_RUNTIME_DIR"
 ];
-var BOXED_ENV_DROPPED_PREFIX = "CABANE_GATE_";
 function runnerExecEnv(base, boxed) {
   const env = {};
   for (const [k, v] of Object.entries(base)) {
     if (v === void 0) continue;
-    if (boxed && (BOXED_ENV_DROPPED.includes(k) || k.startsWith(BOXED_ENV_DROPPED_PREFIX)))
-      continue;
+    if (boxed && BOXED_ENV_DROPPED.includes(k)) continue;
     env[k] = v;
   }
   return env;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.189",
+  "version": "0.6.191",
   "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",