@cabane/companion 0.6.116 → 0.6.118

package/dist/cli.js

@@ -3200,9 +3200,9 @@ var CabaneApi = class {
   // Commit one outgoing act (ask, withdraw_ask, wake_me, cancel_wake) at
   // invocation. The server records the effect and receipt in one transaction;
   // an ok:false response is a recorded refusal for the tool to report.
-  // Retries retain the caller's callId and recover the same receipt while the
-  // HTTP route admits the request. Currently that route rejects ended spans
-  // before receipt lookup: a 409 cannot prove an earlier attempt had no effect.
+  // Retries retain the caller's callId and recover the same receipt, even
+  // when the turn settled between attempts (CT1447): the route consults the
+  // receipt before it refuses an ended turn, so a 4xx proves no attempt wrote.
   // The caller's signal bounds how long the model waits for the tool result.
   turnAct(workspaceId, turnId, act, signal) {
     return this.request(
@@ -8488,6 +8488,9 @@ async function performAct(acts, act) {
       AbortSignal.timeout(TURN_ACT_TIMEOUT_MS)
     );
   } catch (err) {
+    if (err instanceof ApiError && err.status >= 500) {
+      return uncertainOutcome(`${err.status}: ${apiErrorMessage(err)}`);
+    }
     if (err instanceof ApiError) {
       if (err.status === 409 && apiErrorCode(err) === "no_active_turn") {
         return toolError(
@@ -8496,14 +8499,16 @@ async function performAct(acts, act) {
       }
       return toolError(`The act was refused (${err.status}): ${apiErrorMessage(err)}`);
     }
-    const message = err instanceof Error ? err.message : String(err);
-    return toolError(
-      `Cabane could not be reached (${message}), so it is UNKNOWN whether this act was recorded \u2014 it may have committed with only the response lost. Do NOT simply repeat the call: a repeat is a second, separate act, not a retry. Carry on, and say in your reply that you could not confirm it.`
-    );
+    return uncertainOutcome(err instanceof Error ? err.message : String(err));
   }
   if (!result.ok) return toolError(JSON.stringify(result));
   return { content: [{ type: "text", text: JSON.stringify(result) }] };
 }
+function uncertainOutcome(cause) {
+  return toolError(
+    `The outcome of this act could not be confirmed (${cause}). It may already have been performed, with only the response lost. Do NOT simply repeat the call: a repeat is a second, separate act, not a retry. Carry on, and say in your reply that you could not confirm it.`
+  );
+}
 function createTurnControlMcpServer(acts, skipState) {
   const ACT_TOOL = { readOnlyHint: false, destructiveHint: false, openWorldHint: false };
   const CANCEL_TOOL = { ...ACT_TOOL, idempotentHint: true };
@@ -9133,6 +9138,7 @@ var MANAGER_ENV_KEYS = ["DBUS_SESSION_BUS_ADDRESS", "XDG_RUNTIME_DIR", "PATH"];
 var managerEnvKey = (env) => MANAGER_ENV_KEYS.map((k) => `${k}=${env[k] ?? ""}`).join("\0");
 function createTurnContainment(turnId, deps = {}) {
   const probe = deps.capabilityProbe ?? scopeCapabilityUsable;
+  const fallbackGraceMs = deps.fallbackGraceMs ?? FALLBACK_GRACE_MS;
   const ownUnit = (deps.ownSystemdUnit ?? readCurrentSystemdUnit)();
   const scopeUnits = [];
   const groups = [];
@@ -9254,7 +9260,7 @@ function createTurnContainment(turnId, deps = {}) {
         } catch {
         }
       }
-      await sleep3(FALLBACK_GRACE_MS);
+      await sleep3(fallbackGraceMs);
       const afterTerm = processGroupMembers(pgid);
       if (!afterTerm.ok) {
         result.failures.push({

package/dist/runtime.js

@@ -2534,9 +2534,9 @@ var CabaneApi = class {
   // Commit one outgoing act (ask, withdraw_ask, wake_me, cancel_wake) at
   // invocation. The server records the effect and receipt in one transaction;
   // an ok:false response is a recorded refusal for the tool to report.
-  // Retries retain the caller's callId and recover the same receipt while the
-  // HTTP route admits the request. Currently that route rejects ended spans
-  // before receipt lookup: a 409 cannot prove an earlier attempt had no effect.
+  // Retries retain the caller's callId and recover the same receipt, even
+  // when the turn settled between attempts (CT1447): the route consults the
+  // receipt before it refuses an ended turn, so a 4xx proves no attempt wrote.
   // The caller's signal bounds how long the model waits for the tool result.
   turnAct(workspaceId, turnId, act, signal) {
     return this.request(
@@ -7911,6 +7911,9 @@ async function performAct(acts, act) {
       AbortSignal.timeout(TURN_ACT_TIMEOUT_MS)
     );
   } catch (err) {
+    if (err instanceof ApiError && err.status >= 500) {
+      return uncertainOutcome(`${err.status}: ${apiErrorMessage(err)}`);
+    }
     if (err instanceof ApiError) {
       if (err.status === 409 && apiErrorCode(err) === "no_active_turn") {
         return toolError(
@@ -7919,14 +7922,16 @@ async function performAct(acts, act) {
       }
       return toolError(`The act was refused (${err.status}): ${apiErrorMessage(err)}`);
     }
-    const message = err instanceof Error ? err.message : String(err);
-    return toolError(
-      `Cabane could not be reached (${message}), so it is UNKNOWN whether this act was recorded \u2014 it may have committed with only the response lost. Do NOT simply repeat the call: a repeat is a second, separate act, not a retry. Carry on, and say in your reply that you could not confirm it.`
-    );
+    return uncertainOutcome(err instanceof Error ? err.message : String(err));
   }
   if (!result.ok) return toolError(JSON.stringify(result));
   return { content: [{ type: "text", text: JSON.stringify(result) }] };
 }
+function uncertainOutcome(cause) {
+  return toolError(
+    `The outcome of this act could not be confirmed (${cause}). It may already have been performed, with only the response lost. Do NOT simply repeat the call: a repeat is a second, separate act, not a retry. Carry on, and say in your reply that you could not confirm it.`
+  );
+}
 function createTurnControlMcpServer(acts, skipState) {
   const ACT_TOOL = { readOnlyHint: false, destructiveHint: false, openWorldHint: false };
   const CANCEL_TOOL = { ...ACT_TOOL, idempotentHint: true };
@@ -8556,6 +8561,7 @@ var MANAGER_ENV_KEYS = ["DBUS_SESSION_BUS_ADDRESS", "XDG_RUNTIME_DIR", "PATH"];
 var managerEnvKey = (env) => MANAGER_ENV_KEYS.map((k) => `${k}=${env[k] ?? ""}`).join("\0");
 function createTurnContainment(turnId, deps = {}) {
   const probe = deps.capabilityProbe ?? scopeCapabilityUsable;
+  const fallbackGraceMs = deps.fallbackGraceMs ?? FALLBACK_GRACE_MS;
   const ownUnit = (deps.ownSystemdUnit ?? readCurrentSystemdUnit)();
   const scopeUnits = [];
   const groups = [];
@@ -8677,7 +8683,7 @@ function createTurnContainment(turnId, deps = {}) {
         } catch {
         }
       }
-      await sleep2(FALLBACK_GRACE_MS);
+      await sleep2(fallbackGraceMs);
       const afterTerm = processGroupMembers(pgid);
       if (!afterTerm.ok) {
         result.failures.push({

package/package.json

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