@cabane/companion 0.6.15 → 0.6.16

package/dist/cli.js

@@ -4918,6 +4918,7 @@ function parseCodexModel(model) {
 var CABANE_MCP_SERVER3 = "cabane";
 var TURN_CONTROL_MCP_SERVER2 = "cabane_companion";
 var ACTIVE_CONVERSATION_HEADER4 = "x-cabane-active-conversation";
+var ENV_ENVELOPE_KEYS = ["CABANE_ENV_TIER", "CABANE_ENV_KEY", "CABANE_ENV_BINDING"];
 function buildRunSpec2(req, resumeThreadId, instructionsFile = null) {
   const { policy, config } = req;
   const directory = req.local.cwd ?? "";
@@ -5004,6 +5005,12 @@ function buildConfig(req, baseInstructionsFile) {
   }
   const policy = codexToolPolicy(req.policy);
   const tmpDir = req.local.env?.TMPDIR;
+  const shellEnv = {};
+  if (tmpDir) shellEnv.TMPDIR = tmpDir;
+  for (const key of ENV_ENVELOPE_KEYS) {
+    const value = req.local.env?.[key];
+    if (value !== void 0) shellEnv[key] = value;
+  }
   const gateLockDir = req.local.env?.CABANE_GATE_LOCK_DIR;
   return {
     mcp_servers,
@@ -5012,7 +5019,7 @@ function buildConfig(req, baseInstructionsFile) {
     // becomes Codex's base instructions, and Codex's own environment preamble goes
     // with the harness prompt it belonged to.
     ...baseInstructionsFile ? { model_instructions_file: baseInstructionsFile, include_environment_context: false } : {},
-    ...tmpDir ? { shell_environment_policy: { set: { TMPDIR: tmpDir } } } : {},
+    ...Object.keys(shellEnv).length ? { shell_environment_policy: { set: shellEnv } } : {},
     ...policy.permissionProfile ? {
       // CT733: named permission profiles are Codex's split-filesystem path.
       // `:root = read` preserves coding-mode host reads; the one explicit
@@ -7581,6 +7588,8 @@ ${reason}`,
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
             event: "settled",
             turnId,
+            agentId: payload.agentId,
+            conversationId: payload.conversationId,
             ok,
             reason
           })}
@@ -7595,50 +7604,63 @@ ${reason}`,
       }
     };
     if (prepareHook && hookEnv?.CABANE_TASK_ID) {
-      const proof = await proveWorkspaceTools(request, adapter.name, {
-        ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
-        harnessFingerprint: turnContext.runtime
-      });
       const checkout = checkoutState(effectiveCwd);
-      turnLog[proof.ok && checkout.ok ? "info" : "error"](
-        { workspaceProof: proof, checkout: effectiveCwd ?? null, checkoutState: checkout },
-        `dispatcher: workspace tool proof ${proof.ok ? "passed" : "failed"}, checkout ${checkout.ok ? "usable" : checkout.reason}`
-      );
-      if (effectiveCwd && checkout.ok) {
+      if (!effectiveCwd || !checkout.ok) {
+        const reason = `checkout_missing: ${checkout.reason}; task=${hookEnv.CABANE_TASK_ID}; recovery=re-dispatch this conversation (the prepare hook re-provisions the environment)`;
+        turnLog.error({ checkout: effectiveCwd ?? null, checkoutState: checkout }, reason);
         try {
-          const diagnosticDir = join13(effectiveCwd, ".git", "cabane");
-          mkdirSync10(diagnosticDir, { recursive: true });
-          const receiptPath = join13(diagnosticDir, "readiness.jsonl");
-          appendFileSync2(
-            receiptPath,
-            `${JSON.stringify({
-              timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-              taskId: hookEnv.CABANE_TASK_ID,
-              binding: hookEnv.CABANE_TASK_BINDING ?? null,
-              checkout: effectiveCwd,
-              classification: proof.ok ? "ready" : "workspace_tools_missing",
-              failedCapability: proof.failedCapability,
-              workspaceTools: proof,
-              // CT1022: the two fields the environment reaper reads — which turn
-              // this is (so its settle can be matched among interleaved agents)
-              // and how long it may legitimately run (so an unclosed receipt
-              // expires on this turn's real deadline, not the reaper's guess).
-              turnId,
-              totalTimeoutMs
-            })}
-`,
-            { mode: 384 }
-          );
-          turnReceiptPath = receiptPath;
-        } catch (error) {
+          await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
+            body: `**Couldn't prepare your environment.** ${reason}`,
+            kind: "final",
+            turnId,
+            parentMessageId: payload.messageId
+          });
+        } catch (postErr) {
           turnLog.warn(
-            { err: error instanceof Error ? error.message : String(error) },
-            "dispatcher: workspace-proof diagnostic write failed"
+            { err: postErr instanceof Error ? postErr.message : String(postErr) },
+            "dispatcher: checkout-missing notice post failed"
           );
         }
+        return this.concludeBeforeRun(payload, turnLog, startedAt, reason);
       }
-      if (!checkout.ok) {
-        const reason = `checkout_missing: ${checkout.reason}; task=${hookEnv.CABANE_TASK_ID}; recovery=re-dispatch this conversation (the prepare hook re-provisions the environment)`;
+      const receiptPath = join13(effectiveCwd, ".git", "cabane", "readiness.jsonl");
+      const receiptLine = (fields) => `${JSON.stringify({
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        taskId: hookEnv.CABANE_TASK_ID,
+        binding: hookEnv.CABANE_TASK_BINDING ?? null,
+        checkout: effectiveCwd,
+        // CT1022: the two fields the environment reaper reads — which turn this
+        // is (so its settle can be matched among interleaved agents) and how long
+        // it may legitimately run (so an unclosed receipt expires on this turn's
+        // real deadline, not the reaper's guess).
+        turnId,
+        totalTimeoutMs,
+        // CT1062: WHOSE turn. A task env is shared — between agents, and between
+        // an agent's own sequential conversations — so a reader asking "is a turn
+        // of THIS agent, other than mine, running here?" (the host's run-lock
+        // does, before it lets a second conversation into the tree) can only
+        // answer it if the line says who. An unattributed open line has to count
+        // for everyone, which refuses work that should have been admitted.
+        agentId: payload.agentId,
+        conversationId: payload.conversationId,
+        ...fields
+      })}
+`;
+      try {
+        mkdirSync10(join13(effectiveCwd, ".git", "cabane"), { recursive: true });
+        appendFileSync2(
+          receiptPath,
+          // `starting` is the honest classification before the proof has run. The
+          // line the proof appends below carries the same `turnId`, so a reader
+          // replaying the file sees one turn, not two.
+          receiptLine({ classification: "starting" }),
+          { mode: 384 }
+        );
+        turnReceiptPath = receiptPath;
+      } catch (error) {
+        const detail = error instanceof Error ? error.message : String(error);
+        const reason = `turn_receipt_unwritable: ${detail}; task=${hookEnv.CABANE_TASK_ID}; checkout=${effectiveCwd}; recovery=restore write access to the checkout's .git/cabane, then re-dispatch`;
+        turnLog.error({ err: detail, receiptPath }, reason);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
             body: `**Couldn't prepare your environment.** ${reason}`,
@@ -7649,13 +7671,37 @@ ${reason}`,
         } catch (postErr) {
           turnLog.warn(
             { err: postErr instanceof Error ? postErr.message : String(postErr) },
-            "dispatcher: checkout-missing notice post failed"
+            "dispatcher: turn-receipt failure notice post failed"
           );
         }
         return this.concludeBeforeRun(payload, turnLog, startedAt, reason);
       }
+      const proof = await proveWorkspaceTools(request, adapter.name, {
+        ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
+        harnessFingerprint: turnContext.runtime
+      });
+      turnLog[proof.ok ? "info" : "error"](
+        { workspaceProof: proof, checkout: effectiveCwd },
+        `dispatcher: workspace tool proof ${proof.ok ? "passed" : "failed"}, checkout usable`
+      );
+      try {
+        appendFileSync2(
+          receiptPath,
+          receiptLine({
+            classification: proof.ok ? "ready" : "workspace_tools_missing",
+            failedCapability: proof.failedCapability,
+            workspaceTools: proof
+          }),
+          { mode: 384 }
+        );
+      } catch (error) {
+        turnLog.warn(
+          { err: error instanceof Error ? error.message : String(error) },
+          "dispatcher: workspace-proof diagnostic write failed (the turn receipt is open)"
+        );
+      }
       if (!proof.ok) {
-        const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd ?? "unknown"}; runtime=${adapter.name}; recovery=restart the connector after restoring the Cabane workspace tool mount`;
+        const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd}; runtime=${adapter.name}; recovery=restart the connector after restoring the Cabane workspace tool mount`;
         closeTurnReceipt(false, reason);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {

package/dist/runtime.js

@@ -4571,6 +4571,7 @@ function parseCodexModel(model) {
 var CABANE_MCP_SERVER3 = "cabane";
 var TURN_CONTROL_MCP_SERVER2 = "cabane_companion";
 var ACTIVE_CONVERSATION_HEADER4 = "x-cabane-active-conversation";
+var ENV_ENVELOPE_KEYS = ["CABANE_ENV_TIER", "CABANE_ENV_KEY", "CABANE_ENV_BINDING"];
 function buildRunSpec2(req, resumeThreadId, instructionsFile = null) {
   const { policy, config } = req;
   const directory = req.local.cwd ?? "";
@@ -4657,6 +4658,12 @@ function buildConfig(req, baseInstructionsFile) {
   }
   const policy = codexToolPolicy(req.policy);
   const tmpDir = req.local.env?.TMPDIR;
+  const shellEnv = {};
+  if (tmpDir) shellEnv.TMPDIR = tmpDir;
+  for (const key of ENV_ENVELOPE_KEYS) {
+    const value = req.local.env?.[key];
+    if (value !== void 0) shellEnv[key] = value;
+  }
   const gateLockDir = req.local.env?.CABANE_GATE_LOCK_DIR;
   return {
     mcp_servers,
@@ -4665,7 +4672,7 @@ function buildConfig(req, baseInstructionsFile) {
     // becomes Codex's base instructions, and Codex's own environment preamble goes
     // with the harness prompt it belonged to.
     ...baseInstructionsFile ? { model_instructions_file: baseInstructionsFile, include_environment_context: false } : {},
-    ...tmpDir ? { shell_environment_policy: { set: { TMPDIR: tmpDir } } } : {},
+    ...Object.keys(shellEnv).length ? { shell_environment_policy: { set: shellEnv } } : {},
     ...policy.permissionProfile ? {
       // CT733: named permission profiles are Codex's split-filesystem path.
       // `:root = read` preserves coding-mode host reads; the one explicit
@@ -7234,6 +7241,8 @@ ${reason}`,
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
             event: "settled",
             turnId,
+            agentId: payload.agentId,
+            conversationId: payload.conversationId,
             ok,
             reason
           })}
@@ -7248,50 +7257,63 @@ ${reason}`,
       }
     };
     if (prepareHook && hookEnv?.CABANE_TASK_ID) {
-      const proof = await proveWorkspaceTools(request, adapter.name, {
-        ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
-        harnessFingerprint: turnContext.runtime
-      });
       const checkout = checkoutState(effectiveCwd);
-      turnLog[proof.ok && checkout.ok ? "info" : "error"](
-        { workspaceProof: proof, checkout: effectiveCwd ?? null, checkoutState: checkout },
-        `dispatcher: workspace tool proof ${proof.ok ? "passed" : "failed"}, checkout ${checkout.ok ? "usable" : checkout.reason}`
-      );
-      if (effectiveCwd && checkout.ok) {
+      if (!effectiveCwd || !checkout.ok) {
+        const reason = `checkout_missing: ${checkout.reason}; task=${hookEnv.CABANE_TASK_ID}; recovery=re-dispatch this conversation (the prepare hook re-provisions the environment)`;
+        turnLog.error({ checkout: effectiveCwd ?? null, checkoutState: checkout }, reason);
         try {
-          const diagnosticDir = join13(effectiveCwd, ".git", "cabane");
-          mkdirSync9(diagnosticDir, { recursive: true });
-          const receiptPath = join13(diagnosticDir, "readiness.jsonl");
-          appendFileSync2(
-            receiptPath,
-            `${JSON.stringify({
-              timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-              taskId: hookEnv.CABANE_TASK_ID,
-              binding: hookEnv.CABANE_TASK_BINDING ?? null,
-              checkout: effectiveCwd,
-              classification: proof.ok ? "ready" : "workspace_tools_missing",
-              failedCapability: proof.failedCapability,
-              workspaceTools: proof,
-              // CT1022: the two fields the environment reaper reads — which turn
-              // this is (so its settle can be matched among interleaved agents)
-              // and how long it may legitimately run (so an unclosed receipt
-              // expires on this turn's real deadline, not the reaper's guess).
-              turnId,
-              totalTimeoutMs
-            })}
-`,
-            { mode: 384 }
-          );
-          turnReceiptPath = receiptPath;
-        } catch (error) {
+          await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
+            body: `**Couldn't prepare your environment.** ${reason}`,
+            kind: "final",
+            turnId,
+            parentMessageId: payload.messageId
+          });
+        } catch (postErr) {
           turnLog.warn(
-            { err: error instanceof Error ? error.message : String(error) },
-            "dispatcher: workspace-proof diagnostic write failed"
+            { err: postErr instanceof Error ? postErr.message : String(postErr) },
+            "dispatcher: checkout-missing notice post failed"
           );
         }
+        return this.concludeBeforeRun(payload, turnLog, startedAt, reason);
       }
-      if (!checkout.ok) {
-        const reason = `checkout_missing: ${checkout.reason}; task=${hookEnv.CABANE_TASK_ID}; recovery=re-dispatch this conversation (the prepare hook re-provisions the environment)`;
+      const receiptPath = join13(effectiveCwd, ".git", "cabane", "readiness.jsonl");
+      const receiptLine = (fields) => `${JSON.stringify({
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        taskId: hookEnv.CABANE_TASK_ID,
+        binding: hookEnv.CABANE_TASK_BINDING ?? null,
+        checkout: effectiveCwd,
+        // CT1022: the two fields the environment reaper reads — which turn this
+        // is (so its settle can be matched among interleaved agents) and how long
+        // it may legitimately run (so an unclosed receipt expires on this turn's
+        // real deadline, not the reaper's guess).
+        turnId,
+        totalTimeoutMs,
+        // CT1062: WHOSE turn. A task env is shared — between agents, and between
+        // an agent's own sequential conversations — so a reader asking "is a turn
+        // of THIS agent, other than mine, running here?" (the host's run-lock
+        // does, before it lets a second conversation into the tree) can only
+        // answer it if the line says who. An unattributed open line has to count
+        // for everyone, which refuses work that should have been admitted.
+        agentId: payload.agentId,
+        conversationId: payload.conversationId,
+        ...fields
+      })}
+`;
+      try {
+        mkdirSync9(join13(effectiveCwd, ".git", "cabane"), { recursive: true });
+        appendFileSync2(
+          receiptPath,
+          // `starting` is the honest classification before the proof has run. The
+          // line the proof appends below carries the same `turnId`, so a reader
+          // replaying the file sees one turn, not two.
+          receiptLine({ classification: "starting" }),
+          { mode: 384 }
+        );
+        turnReceiptPath = receiptPath;
+      } catch (error) {
+        const detail = error instanceof Error ? error.message : String(error);
+        const reason = `turn_receipt_unwritable: ${detail}; task=${hookEnv.CABANE_TASK_ID}; checkout=${effectiveCwd}; recovery=restore write access to the checkout's .git/cabane, then re-dispatch`;
+        turnLog.error({ err: detail, receiptPath }, reason);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
             body: `**Couldn't prepare your environment.** ${reason}`,
@@ -7302,13 +7324,37 @@ ${reason}`,
         } catch (postErr) {
           turnLog.warn(
             { err: postErr instanceof Error ? postErr.message : String(postErr) },
-            "dispatcher: checkout-missing notice post failed"
+            "dispatcher: turn-receipt failure notice post failed"
           );
         }
         return this.concludeBeforeRun(payload, turnLog, startedAt, reason);
       }
+      const proof = await proveWorkspaceTools(request, adapter.name, {
+        ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
+        harnessFingerprint: turnContext.runtime
+      });
+      turnLog[proof.ok ? "info" : "error"](
+        { workspaceProof: proof, checkout: effectiveCwd },
+        `dispatcher: workspace tool proof ${proof.ok ? "passed" : "failed"}, checkout usable`
+      );
+      try {
+        appendFileSync2(
+          receiptPath,
+          receiptLine({
+            classification: proof.ok ? "ready" : "workspace_tools_missing",
+            failedCapability: proof.failedCapability,
+            workspaceTools: proof
+          }),
+          { mode: 384 }
+        );
+      } catch (error) {
+        turnLog.warn(
+          { err: error instanceof Error ? error.message : String(error) },
+          "dispatcher: workspace-proof diagnostic write failed (the turn receipt is open)"
+        );
+      }
       if (!proof.ok) {
-        const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd ?? "unknown"}; runtime=${adapter.name}; recovery=restart the connector after restoring the Cabane workspace tool mount`;
+        const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd}; runtime=${adapter.name}; recovery=restart the connector after restoring the Cabane workspace tool mount`;
         closeTurnReceipt(false, reason);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.15",
+  "version": "0.6.16",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding 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",