@cabane/companion 0.6.14 → 0.6.15

package/dist/cli.js

@@ -7568,6 +7568,32 @@ ${reason}`,
         `runtime_unavailable:${err.runtime}`
       );
     }
+    let turnReceiptPath = null;
+    const totalTimeoutMs = this.opts.totalTimeoutMs ?? DEFAULT_AGENT_TOTAL_TIMEOUT_MS;
+    const closeTurnReceipt = (ok, reason) => {
+      if (!turnReceiptPath) return;
+      const target = turnReceiptPath;
+      turnReceiptPath = null;
+      try {
+        appendFileSync2(
+          target,
+          `${JSON.stringify({
+            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            event: "settled",
+            turnId,
+            ok,
+            reason
+          })}
+`,
+          { mode: 384 }
+        );
+      } catch (error) {
+        turnLog.warn(
+          { err: error instanceof Error ? error.message : String(error) },
+          "dispatcher: turn-settled diagnostic write failed"
+        );
+      }
+    };
     if (prepareHook && hookEnv?.CABANE_TASK_ID) {
       const proof = await proveWorkspaceTools(request, adapter.name, {
         ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
@@ -7582,8 +7608,9 @@ ${reason}`,
         try {
           const diagnosticDir = join13(effectiveCwd, ".git", "cabane");
           mkdirSync10(diagnosticDir, { recursive: true });
+          const receiptPath = join13(diagnosticDir, "readiness.jsonl");
           appendFileSync2(
-            join13(diagnosticDir, "readiness.jsonl"),
+            receiptPath,
             `${JSON.stringify({
               timestamp: (/* @__PURE__ */ new Date()).toISOString(),
               taskId: hookEnv.CABANE_TASK_ID,
@@ -7591,11 +7618,18 @@ ${reason}`,
               checkout: effectiveCwd,
               classification: proof.ok ? "ready" : "workspace_tools_missing",
               failedCapability: proof.failedCapability,
-              workspaceTools: proof
+              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) {
           turnLog.warn(
             { err: error instanceof Error ? error.message : String(error) },
@@ -7622,6 +7656,7 @@ ${reason}`,
       }
       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`;
+        closeTurnReceipt(false, reason);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
             body: `**Couldn't prepare your environment.** ${reason}`,
@@ -7733,7 +7768,6 @@ ${reason}`,
       }
     };
     const idleTimeoutMs = this.opts.idleTimeoutMs ?? DEFAULT_AGENT_IDLE_TIMEOUT_MS;
-    const totalTimeoutMs = this.opts.totalTimeoutMs ?? DEFAULT_AGENT_TOTAL_TIMEOUT_MS;
     const fireTimeout = (reason) => {
       if (abortController.signal.aborted) return;
       timeoutReason = reason;
@@ -7835,6 +7869,7 @@ ${reason}`,
     } finally {
       if (idleTimer) clearTimeout(idleTimer);
       clearTimeout(totalTimer);
+      closeTurnReceipt(okResult, resultReason ?? null);
       const userCancelled = abortController.signal.aborted && timeoutReason === null;
       if (timeoutReason !== null) {
         resultReason = timeoutReason;

package/dist/runtime.js

@@ -7221,6 +7221,32 @@ ${reason}`,
         `runtime_unavailable:${err.runtime}`
       );
     }
+    let turnReceiptPath = null;
+    const totalTimeoutMs = this.opts.totalTimeoutMs ?? DEFAULT_AGENT_TOTAL_TIMEOUT_MS;
+    const closeTurnReceipt = (ok, reason) => {
+      if (!turnReceiptPath) return;
+      const target = turnReceiptPath;
+      turnReceiptPath = null;
+      try {
+        appendFileSync2(
+          target,
+          `${JSON.stringify({
+            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            event: "settled",
+            turnId,
+            ok,
+            reason
+          })}
+`,
+          { mode: 384 }
+        );
+      } catch (error) {
+        turnLog.warn(
+          { err: error instanceof Error ? error.message : String(error) },
+          "dispatcher: turn-settled diagnostic write failed"
+        );
+      }
+    };
     if (prepareHook && hookEnv?.CABANE_TASK_ID) {
       const proof = await proveWorkspaceTools(request, adapter.name, {
         ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
@@ -7235,8 +7261,9 @@ ${reason}`,
         try {
           const diagnosticDir = join13(effectiveCwd, ".git", "cabane");
           mkdirSync9(diagnosticDir, { recursive: true });
+          const receiptPath = join13(diagnosticDir, "readiness.jsonl");
           appendFileSync2(
-            join13(diagnosticDir, "readiness.jsonl"),
+            receiptPath,
             `${JSON.stringify({
               timestamp: (/* @__PURE__ */ new Date()).toISOString(),
               taskId: hookEnv.CABANE_TASK_ID,
@@ -7244,11 +7271,18 @@ ${reason}`,
               checkout: effectiveCwd,
               classification: proof.ok ? "ready" : "workspace_tools_missing",
               failedCapability: proof.failedCapability,
-              workspaceTools: proof
+              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) {
           turnLog.warn(
             { err: error instanceof Error ? error.message : String(error) },
@@ -7275,6 +7309,7 @@ ${reason}`,
       }
       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`;
+        closeTurnReceipt(false, reason);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
             body: `**Couldn't prepare your environment.** ${reason}`,
@@ -7386,7 +7421,6 @@ ${reason}`,
       }
     };
     const idleTimeoutMs = this.opts.idleTimeoutMs ?? DEFAULT_AGENT_IDLE_TIMEOUT_MS;
-    const totalTimeoutMs = this.opts.totalTimeoutMs ?? DEFAULT_AGENT_TOTAL_TIMEOUT_MS;
     const fireTimeout = (reason) => {
       if (abortController.signal.aborted) return;
       timeoutReason = reason;
@@ -7488,6 +7522,7 @@ ${reason}`,
     } finally {
       if (idleTimer) clearTimeout(idleTimer);
       clearTimeout(totalTimer);
+      closeTurnReceipt(okResult, resultReason ?? null);
       const userCancelled = abortController.signal.aborted && timeoutReason === null;
       if (timeoutReason !== null) {
         resultReason = timeoutReason;

package/package.json

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