@cabane/companion 0.6.47 → 0.6.49

package/dist/cli.js

@@ -149,6 +149,7 @@ var runPrepareHook = (hook, input) => {
           CABANE_AGENT_ID: input.agentId,
           CABANE_AGENT_USERNAME: input.agentUsername,
           CABANE_RUNTIME: input.runtime ?? "",
+          CABANE_HOST_ACCESS: input.hostAccess ? "1" : "0",
           // CT319: the conversation anchor is gone. These are kept as DEPRECATED
           // back-compat constants so an old user prepare script that still reads
           // them doesn't crash; a hook should key off CABANE_TRIGGER_ENTRY_PATHS.
@@ -3598,7 +3599,7 @@ var TurnPump = class {
     };
   }
   opts;
-  // `finalEmitted` gates the end-of-turn empty-final promotion;
+  // `finalEmitted` gates the end-of-turn progress promotion;
   // `lastProgressBody` is what we promote to `final` when a clean turn ended on
   // a tool call with no closing text.
   emittedFinal = false;
@@ -3613,28 +3614,28 @@ var TurnPump = class {
   // frozen committer test — drive. Each callback applies the choreography and
   // commits through the injected sink.
   sink;
-  // End-of-turn empty-final promotion. A clean turn that ended on a tool call
-  // with no closing text still needs exactly one `final` row (so the user gets
-  // one notification and the drawer closes the turn). Promote the last progress
-  // body when we have one (the drawer collapses the dup), else the host's
-  // minimal note. Skipped when cancelled or already final. The held-text flush
-  // that precedes it is a classification concern, driven by the caller before
-  // this runs.
+  // End-of-turn progress promotion. A clean turn that emitted interim text but
+  // no closing text promotes the agent's own last progress body (the drawer
+  // collapses the duplicate). If the agent emitted no words, emit no message:
+  // Cabane never attributes host-authored text to an agent, in any turn shape,
+  // for any reason. The host closes that wordless turn with a marker instead.
+  // Skipped when cancelled or already final. The held-text flush that precedes
+  // this is a classification concern, driven by the caller before this runs.
   async finalize(ok) {
-    if (!ok || this.opts.signal.aborted || this.emittedFinal) return;
-    const body = this.lastProgressBody ?? this.opts.emptyFinalBody;
+    if (!ok || this.opts.signal.aborted || this.emittedFinal || !this.lastProgressBody) return;
+    const body = this.lastProgressBody;
     const seq = this.opts.nextSeq();
     try {
       await this.opts.commit.commitMessage({ body, kind: "final", seq });
       this.emittedFinal = true;
       this.finalReplyBody = body;
-      this.emittedFinalSource = this.lastProgressBody ? "progress_promotion" : "host_fallback";
+      this.emittedFinalSource = "progress_promotion";
     } catch (err) {
-      this.opts.onError?.(err, "empty-final");
+      this.opts.onError?.(err, "progress-promotion");
     }
   }
   // Whether the turn has committed its `final` row — read by the host to decide
-  // whether the empty-final path or a marker is owed.
+  // whether a marker is owed.
   get finalEmitted() {
     return this.emittedFinal;
   }
@@ -5777,7 +5778,8 @@ var ENV_ENVELOPE_KEYS = [
   "CABANE_PLAYGROUND_BIN",
   "CABANE_CONVERSATION_ID",
   "CABANE_AGENT_ID",
-  "CABANE_CONVERSATION_TITLE"
+  "CABANE_CONVERSATION_TITLE",
+  "CABANE_HOST_ACCESS"
 ];
 function buildRunSpec2(req, resumeThreadId, instructionsFile = null, threadPromptFingerprint = null) {
   const { policy, config } = req;
@@ -7272,7 +7274,6 @@ function pruneOld(dir2, retain) {
 }
 
 // src/turn-committer.ts
-var EMPTY_FINAL_BODY = "Done \u2014 see the changes above.";
 var TurnCommitter = class {
   constructor(deps) {
     this.deps = deps;
@@ -7293,9 +7294,7 @@ var TurnCommitter = class {
             turnId: deps.turnId,
             seq,
             parentMessageId: deps.parentMessageId,
-            ...kind === "final" ? this.summonField() : {},
-            ...kind === "final" ? this.askField() : {},
-            ...kind === "final" ? this.wakeField() : {}
+            ...kind === "final" ? this.turnControlFields() : {}
           },
           deps.signal
         );
@@ -7342,11 +7341,10 @@ var TurnCommitter = class {
       commit,
       signal: deps.signal,
       nextSeq: deps.nextSeq,
-      emptyFinalBody: EMPTY_FINAL_BODY,
       onError: (err) => {
         deps.log.warn(
           { err: err instanceof Error ? err.message : String(err) },
-          "dispatcher: empty-final commit failed"
+          "dispatcher: progress-promotion commit failed"
         );
       }
     });
@@ -7372,11 +7370,11 @@ var TurnCommitter = class {
       this.onError(err, event.type);
     }
   }
-  // End-of-turn empty-final promotion. The held-text flush is now the adapter's
+  // End-of-turn progress promotion. The held-text flush is now the adapter's
   // job (it emits the closing reply as a `text` event before `result`), so this
-  // only runs the pump's empty-final: a clean turn that ended on a tool call with
-  // no closing text still gets exactly one `final`. Guards on the abort signal, so
-  // on cancel no `final` is forced.
+  // only asks the pump to promote agent-authored interim text. A wordless turn
+  // stays wordless and the dispatcher closes it with a marker. Guards on the
+  // abort signal, so on cancel no `final` is forced.
   async finalize(okResult) {
     await this.pump.finalize(okResult);
   }
@@ -7387,6 +7385,19 @@ var TurnCommitter = class {
   get finalSource() {
     return this.pump.finalSource;
   }
+  get finalEmitted() {
+    return this.pump.finalEmitted;
+  }
+  // A closing textual reply and a wordless terminal marker carry the same
+  // per-turn control state. Keep this one projection so ask/wake/summon cannot
+  // silently diverge when the agent ends without words.
+  turnControlFields() {
+    return {
+      ...this.summonField(),
+      ...this.askField(),
+      ...this.wakeField()
+    };
+  }
   // CT183: resolve the in-thread summon into the `dispatch` field for a `final`
   // commit. A self-target is stripped here (mirror of the in-app self-strip); the
   // server strips it again and resolves / ignores an unknown id.
@@ -7615,6 +7626,7 @@ var STOPPED_MARKER_BODY = "(stopped)";
 var RUNTIME_UNAVAILABLE_PREFIX = "**This agent's runtime isn't available on this companion.** The model this agent uses needs a runtime this device isn't running, so I can't run this turn here. Details:";
 var UNEXPECTED_ROLE_REASON = `refused the wake trigger (role "system" isn't dispatchable on this companion) \u2014 the companion is likely running outdated code; refresh it, then re-address the agent`;
 var SKIPPED_MARKER_BODY = "(skipped)";
+var SILENT_MARKER_BODY = "(no reply)";
 var DEFAULT_PREPARING_ROW_DELAY_MS = 1500;
 var DEFAULT_AGENT_IDLE_TIMEOUT_MS = 10 * 6e4;
 var DEFAULT_AGENT_TOTAL_TIMEOUT_MS = 6 * 60 * 6e4;
@@ -7861,6 +7873,7 @@ var Dispatcher = class {
               agentId: payload.agentId,
               agentUsername: this.opts.agentUsername,
               runtime: turnContext.runtime,
+              hostAccess: turnContext.policy.hostFs,
               triggerEntryPaths: turnContext.conversation.triggerEntryPaths ?? [],
               title: turnContext.conversation.title,
               messageBody: message.body,
@@ -7922,6 +7935,7 @@ ${reason}`,
             agentId: payload.agentId,
             agentUsername: this.opts.agentUsername,
             runtime: turnContext.runtime,
+            hostAccess: turnContext.policy.hostFs,
             // CT317/CT319: the trigger message's referenced-entry paths — what the
             // tasker prepare hook keys its per-task env off. Defaults to `[]` for
             // an older API. The conversation anchor is gone (CT319).
@@ -7965,7 +7979,10 @@ ${reason}`,
         }
       }
     }
-    const turnEnv = hookEnv;
+    const turnEnv = {
+      ...hookEnv,
+      CABANE_HOST_ACCESS: turnContext.policy.hostFs ? "1" : "0"
+    };
     const key = runKey(payload.conversationId, payload.agentId);
     const abortController = new AbortController();
     this.aborts.set(key, abortController);
@@ -8028,9 +8045,8 @@ ${reason}`,
       ...turnContext.turnToken ? { turnToken: turnContext.turnToken } : {},
       // SJ524: the hook-resolved cwd overrides the static local cwd.
       ...effectiveCwd ? { cwd: effectiveCwd } : {},
-      // CT804: `turnEnv` = the prepare-hook env plus the per-turn checkout-local
-      // TMPDIR (falls back to `hookEnv` when no cwd was resolved).
-      ...turnEnv ? { env: turnEnv } : {},
+      // CT1103: the prepare-hook env plus the authoritative host-access token.
+      env: turnEnv,
       mcpServers: resolvedMcpServers,
       summonServer,
       // CT238: this turn's conversation, forwarded as the active-conversation
@@ -8268,6 +8284,7 @@ ${reason}`,
     let contentBearingEvents = 0;
     let latestSessionState = request.session;
     let settledDiagnostics = null;
+    let silentMarkerEmitted = false;
     const committer = new TurnCommitter({
       api: this.opts.api,
       workspaceId,
@@ -8459,6 +8476,27 @@ ${reason}`,
         }
       } else {
         await committer.finalize(okResult);
+        if (!abortController.signal.aborted && okResult && !committer.finalEmitted) {
+          try {
+            await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
+              body: SILENT_MARKER_BODY,
+              kind: "silent",
+              turnId,
+              seq: nextSeq(),
+              parentMessageId: payload.messageId,
+              // ask, wake and summon must survive a wordless turn exactly as
+              // they survive a textual final; dropping one can strand a person
+              // or the next actor with no visible failure.
+              ...committer.turnControlFields()
+            });
+            silentMarkerEmitted = true;
+          } catch (err) {
+            turnLog.warn(
+              { err: err instanceof Error ? err.message : String(err) },
+              "dispatcher: silent-marker commit failed"
+            );
+          }
+        }
       }
     } catch (err) {
       okResult = false;
@@ -8549,7 +8587,7 @@ ${reason}`,
         sessionFingerprint: fingerprintSessionState(latestSessionState),
         eventCounts,
         runtimeResultKind,
-        finalSource: outcome === "skipped" || outcome === "cancelled" ? "marker" : committer.finalSource
+        finalSource: outcome === "skipped" || outcome === "cancelled" || silentMarkerEmitted ? "marker" : committer.finalSource
       };
       body.diagnostics = settledDiagnostics;
       if (diagnosticReason && !["usage_capped", "rate_limited", "auth_expired", "cancelled", "skipped"].includes(

package/dist/runtime.js

@@ -141,6 +141,7 @@ var runPrepareHook = (hook, input) => {
           CABANE_AGENT_ID: input.agentId,
           CABANE_AGENT_USERNAME: input.agentUsername,
           CABANE_RUNTIME: input.runtime ?? "",
+          CABANE_HOST_ACCESS: input.hostAccess ? "1" : "0",
           // CT319: the conversation anchor is gone. These are kept as DEPRECATED
           // back-compat constants so an old user prepare script that still reads
           // them doesn't crash; a hook should key off CABANE_TRIGGER_ENTRY_PATHS.
@@ -3106,7 +3107,7 @@ var TurnPump = class {
     };
   }
   opts;
-  // `finalEmitted` gates the end-of-turn empty-final promotion;
+  // `finalEmitted` gates the end-of-turn progress promotion;
   // `lastProgressBody` is what we promote to `final` when a clean turn ended on
   // a tool call with no closing text.
   emittedFinal = false;
@@ -3121,28 +3122,28 @@ var TurnPump = class {
   // frozen committer test — drive. Each callback applies the choreography and
   // commits through the injected sink.
   sink;
-  // End-of-turn empty-final promotion. A clean turn that ended on a tool call
-  // with no closing text still needs exactly one `final` row (so the user gets
-  // one notification and the drawer closes the turn). Promote the last progress
-  // body when we have one (the drawer collapses the dup), else the host's
-  // minimal note. Skipped when cancelled or already final. The held-text flush
-  // that precedes it is a classification concern, driven by the caller before
-  // this runs.
+  // End-of-turn progress promotion. A clean turn that emitted interim text but
+  // no closing text promotes the agent's own last progress body (the drawer
+  // collapses the duplicate). If the agent emitted no words, emit no message:
+  // Cabane never attributes host-authored text to an agent, in any turn shape,
+  // for any reason. The host closes that wordless turn with a marker instead.
+  // Skipped when cancelled or already final. The held-text flush that precedes
+  // this is a classification concern, driven by the caller before this runs.
   async finalize(ok) {
-    if (!ok || this.opts.signal.aborted || this.emittedFinal) return;
-    const body = this.lastProgressBody ?? this.opts.emptyFinalBody;
+    if (!ok || this.opts.signal.aborted || this.emittedFinal || !this.lastProgressBody) return;
+    const body = this.lastProgressBody;
     const seq = this.opts.nextSeq();
     try {
       await this.opts.commit.commitMessage({ body, kind: "final", seq });
       this.emittedFinal = true;
       this.finalReplyBody = body;
-      this.emittedFinalSource = this.lastProgressBody ? "progress_promotion" : "host_fallback";
+      this.emittedFinalSource = "progress_promotion";
     } catch (err) {
-      this.opts.onError?.(err, "empty-final");
+      this.opts.onError?.(err, "progress-promotion");
     }
   }
   // Whether the turn has committed its `final` row — read by the host to decide
-  // whether the empty-final path or a marker is owed.
+  // whether a marker is owed.
   get finalEmitted() {
     return this.emittedFinal;
   }
@@ -5285,7 +5286,8 @@ var ENV_ENVELOPE_KEYS = [
   "CABANE_PLAYGROUND_BIN",
   "CABANE_CONVERSATION_ID",
   "CABANE_AGENT_ID",
-  "CABANE_CONVERSATION_TITLE"
+  "CABANE_CONVERSATION_TITLE",
+  "CABANE_HOST_ACCESS"
 ];
 function buildRunSpec2(req, resumeThreadId, instructionsFile = null, threadPromptFingerprint = null) {
   const { policy, config } = req;
@@ -6780,7 +6782,6 @@ function pruneOld(dir2, retain) {
 }
 
 // src/turn-committer.ts
-var EMPTY_FINAL_BODY = "Done \u2014 see the changes above.";
 var TurnCommitter = class {
   constructor(deps) {
     this.deps = deps;
@@ -6801,9 +6802,7 @@ var TurnCommitter = class {
             turnId: deps.turnId,
             seq,
             parentMessageId: deps.parentMessageId,
-            ...kind === "final" ? this.summonField() : {},
-            ...kind === "final" ? this.askField() : {},
-            ...kind === "final" ? this.wakeField() : {}
+            ...kind === "final" ? this.turnControlFields() : {}
           },
           deps.signal
         );
@@ -6850,11 +6849,10 @@ var TurnCommitter = class {
       commit,
       signal: deps.signal,
       nextSeq: deps.nextSeq,
-      emptyFinalBody: EMPTY_FINAL_BODY,
       onError: (err) => {
         deps.log.warn(
           { err: err instanceof Error ? err.message : String(err) },
-          "dispatcher: empty-final commit failed"
+          "dispatcher: progress-promotion commit failed"
         );
       }
     });
@@ -6880,11 +6878,11 @@ var TurnCommitter = class {
       this.onError(err, event.type);
     }
   }
-  // End-of-turn empty-final promotion. The held-text flush is now the adapter's
+  // End-of-turn progress promotion. The held-text flush is now the adapter's
   // job (it emits the closing reply as a `text` event before `result`), so this
-  // only runs the pump's empty-final: a clean turn that ended on a tool call with
-  // no closing text still gets exactly one `final`. Guards on the abort signal, so
-  // on cancel no `final` is forced.
+  // only asks the pump to promote agent-authored interim text. A wordless turn
+  // stays wordless and the dispatcher closes it with a marker. Guards on the
+  // abort signal, so on cancel no `final` is forced.
   async finalize(okResult) {
     await this.pump.finalize(okResult);
   }
@@ -6895,6 +6893,19 @@ var TurnCommitter = class {
   get finalSource() {
     return this.pump.finalSource;
   }
+  get finalEmitted() {
+    return this.pump.finalEmitted;
+  }
+  // A closing textual reply and a wordless terminal marker carry the same
+  // per-turn control state. Keep this one projection so ask/wake/summon cannot
+  // silently diverge when the agent ends without words.
+  turnControlFields() {
+    return {
+      ...this.summonField(),
+      ...this.askField(),
+      ...this.wakeField()
+    };
+  }
   // CT183: resolve the in-thread summon into the `dispatch` field for a `final`
   // commit. A self-target is stripped here (mirror of the in-app self-strip); the
   // server strips it again and resolves / ignores an unknown id.
@@ -7123,6 +7134,7 @@ var STOPPED_MARKER_BODY = "(stopped)";
 var RUNTIME_UNAVAILABLE_PREFIX = "**This agent's runtime isn't available on this companion.** The model this agent uses needs a runtime this device isn't running, so I can't run this turn here. Details:";
 var UNEXPECTED_ROLE_REASON = `refused the wake trigger (role "system" isn't dispatchable on this companion) \u2014 the companion is likely running outdated code; refresh it, then re-address the agent`;
 var SKIPPED_MARKER_BODY = "(skipped)";
+var SILENT_MARKER_BODY = "(no reply)";
 var DEFAULT_PREPARING_ROW_DELAY_MS = 1500;
 var DEFAULT_AGENT_IDLE_TIMEOUT_MS = 10 * 6e4;
 var DEFAULT_AGENT_TOTAL_TIMEOUT_MS = 6 * 60 * 6e4;
@@ -7369,6 +7381,7 @@ var Dispatcher = class {
               agentId: payload.agentId,
               agentUsername: this.opts.agentUsername,
               runtime: turnContext.runtime,
+              hostAccess: turnContext.policy.hostFs,
               triggerEntryPaths: turnContext.conversation.triggerEntryPaths ?? [],
               title: turnContext.conversation.title,
               messageBody: message.body,
@@ -7430,6 +7443,7 @@ ${reason}`,
             agentId: payload.agentId,
             agentUsername: this.opts.agentUsername,
             runtime: turnContext.runtime,
+            hostAccess: turnContext.policy.hostFs,
             // CT317/CT319: the trigger message's referenced-entry paths — what the
             // tasker prepare hook keys its per-task env off. Defaults to `[]` for
             // an older API. The conversation anchor is gone (CT319).
@@ -7473,7 +7487,10 @@ ${reason}`,
         }
       }
     }
-    const turnEnv = hookEnv;
+    const turnEnv = {
+      ...hookEnv,
+      CABANE_HOST_ACCESS: turnContext.policy.hostFs ? "1" : "0"
+    };
     const key = runKey(payload.conversationId, payload.agentId);
     const abortController = new AbortController();
     this.aborts.set(key, abortController);
@@ -7536,9 +7553,8 @@ ${reason}`,
       ...turnContext.turnToken ? { turnToken: turnContext.turnToken } : {},
       // SJ524: the hook-resolved cwd overrides the static local cwd.
       ...effectiveCwd ? { cwd: effectiveCwd } : {},
-      // CT804: `turnEnv` = the prepare-hook env plus the per-turn checkout-local
-      // TMPDIR (falls back to `hookEnv` when no cwd was resolved).
-      ...turnEnv ? { env: turnEnv } : {},
+      // CT1103: the prepare-hook env plus the authoritative host-access token.
+      env: turnEnv,
       mcpServers: resolvedMcpServers,
       summonServer,
       // CT238: this turn's conversation, forwarded as the active-conversation
@@ -7776,6 +7792,7 @@ ${reason}`,
     let contentBearingEvents = 0;
     let latestSessionState = request.session;
     let settledDiagnostics = null;
+    let silentMarkerEmitted = false;
     const committer = new TurnCommitter({
       api: this.opts.api,
       workspaceId,
@@ -7967,6 +7984,27 @@ ${reason}`,
         }
       } else {
         await committer.finalize(okResult);
+        if (!abortController.signal.aborted && okResult && !committer.finalEmitted) {
+          try {
+            await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
+              body: SILENT_MARKER_BODY,
+              kind: "silent",
+              turnId,
+              seq: nextSeq(),
+              parentMessageId: payload.messageId,
+              // ask, wake and summon must survive a wordless turn exactly as
+              // they survive a textual final; dropping one can strand a person
+              // or the next actor with no visible failure.
+              ...committer.turnControlFields()
+            });
+            silentMarkerEmitted = true;
+          } catch (err) {
+            turnLog.warn(
+              { err: err instanceof Error ? err.message : String(err) },
+              "dispatcher: silent-marker commit failed"
+            );
+          }
+        }
       }
     } catch (err) {
       okResult = false;
@@ -8057,7 +8095,7 @@ ${reason}`,
         sessionFingerprint: fingerprintSessionState(latestSessionState),
         eventCounts,
         runtimeResultKind,
-        finalSource: outcome === "skipped" || outcome === "cancelled" ? "marker" : committer.finalSource
+        finalSource: outcome === "skipped" || outcome === "cancelled" || silentMarkerEmitted ? "marker" : committer.finalSource
       };
       body.diagnostics = settledDiagnostics;
       if (diagnosticReason && !["usage_capped", "rate_limited", "auth_expired", "cancelled", "skipped"].includes(

package/package.json

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