@cabane/companion 0.6.139 → 0.6.141

package/README.md

@@ -212,7 +212,7 @@ Run `cabane-companion start --foreground`. Configure the supervisor itself for r
 
 There's a deliberate split. **What the agent is** — its mode, MCP servers, model, reasoning, and charter — is configured in **Cabane** (Workspace settings → Agents) and delivered to the Companion per turn, so an edit in Cabane lands on the next turn with **no restart**. The Companion holds only the bits that can't travel from a server: the **working directory** an agent runs in (a path on _this_ machine) and your **secrets**.
 
-An agent can reach MCP servers two ways, and they don't overlap. **The agent's own MCP servers** are part of what the agent is: set on its Agents page, they go with it into every room. **Connections** belong to a person instead: you add one under Workspace settings → Connections (an endpoint and a pasted key, stored encrypted in Cabane), then bring it into a room from the room's menu and pick which agents there may use it. On each turn in that room, Cabane attaches the room's connections for that agent and sends the key with the turn, into the harness's environment and never onto its command line. Nothing is configured on this machine. Replacing, disconnecting or deleting a key takes effect on the agent's next turn, and nothing is revoked at the service itself.
+An agent can reach MCP servers two ways, and they don't overlap. **The agent's own MCP servers** are part of what the agent is: set on its Agents page, they go with it into every room. **Connections** belong to a person instead: you add one under Workspace settings → Connections (an endpoint and a pasted key, stored encrypted in Cabane), then add it to a room from the room's menu and pick which agents there may use it. On each turn in that room, Cabane attaches the room's connections for that agent and sends the key with the turn, into the harness's environment and never onto its command line. Nothing is configured on this machine. Replacing, disconnecting or deleting a key takes effect on the agent's next turn, and nothing is revoked at the service itself.
 
 ### Agent modes (set in Cabane)
 

package/dist/cli.js

@@ -1763,7 +1763,8 @@ var init_turn_event = __esm({
       // `progress` row); `terminal: true` is the turn's closing reply (commits as
       // the `final` row).
       z6.object({ type: z6.literal("text"), body: z6.string(), terminal: z6.boolean() }),
-      // Runtime/provider-authored prose surfaced alongside a failed turn. Unlike
+      // Runtime/provider-authored prose about the turn — a failure's explanation, or
+      // a line the harness wrote on a turn it recovered (CT1750). Unlike
       // `text`, this is not the agent's narration or reply: the pump persists it as
       // `runtime_notice`, and the transcript renders it in the shared SystemNote
       // voice. Adapters emit it only from positive runtime evidence; the web never
@@ -1971,10 +1972,12 @@ function isContentBearingEvent(event) {
       return normalizeCommitText(event.body) !== "";
     case "thinking":
       return normalizeCommitText(event.text) !== "";
-    case "runtime_notice":
-      return normalizeCommitText(event.body) !== "";
     case "tool":
       return true;
+    // CT1750: a runtime notice is shown, but it is the harness speaking about
+    // the turn, not the turn's output — a success whose only output is a CLI
+    // line still produced nothing.
+    case "runtime_notice":
     case "session":
     case "result":
       return false;
@@ -2903,6 +2906,7 @@ async function* decodeSdkStream(iter, ctx) {
   let lastRequestContextTokens;
   let resolvedModel;
   const signals = { sawRejectedLimit: false };
+  let preInitNotice = null;
   try {
     for await (const msg of iter) {
       if (ctx.signal.aborted) return;
@@ -2928,12 +2932,19 @@ async function* decodeSdkStream(iter, ctx) {
         if (preInitToolActivity(msg) && ctx.startEvidence) ctx.startEvidence.toolActivity = true;
         const failure = classifyPreInitFrame(msg, signals);
         resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
+        if (msg.type === "assistant" && isHarnessAuthored(msg))
+          preInitNotice = harnessNoticeText(msg);
         break;
       } else if (msg.type === "assistant") {
         const assistantErr = msg.error;
         if (typeof assistantErr === "string" && assistantErr.length > 0) {
           signals.lastAssistantError = assistantErr;
         }
+        if (isHarnessAuthored(msg)) {
+          await emitHarnessMessage(msg, emit, pending, buffer);
+          yield* drain(out);
+          continue;
+        }
         const reqContext = readRequestContextTokens(msg);
         if (reqContext !== void 0) lastRequestContextTokens = reqContext;
         await processAssistantMessage(msg, emit, pending, buffer);
@@ -2995,6 +3006,7 @@ async function* decodeSdkStream(iter, ctx) {
       const failure = classifyFailure(signals, { text: "" });
       resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
     }
+    if (preInitNotice) yield { type: "runtime_notice", body: preInitNotice };
   }
   const heldFailure = !ok ? classifyRuntimeNoticeText(buffer.held) : null;
   const terminalFailure = !ok ? decodeFailureReason(resultReason) : null;
@@ -3061,6 +3073,29 @@ function preInitToolActivity(msg) {
   const kind = msg.type === "assistant" ? "tool_use" : msg.type === "user" ? "tool_result" : null;
   return kind !== null && contentBlocks(msg).some((b) => b.type === kind);
 }
+function isHarnessAuthored(msg) {
+  const error = msg.error;
+  if (typeof error === "string" && error.length > 0) return true;
+  return msg.message?.model === "<synthetic>";
+}
+function harnessNoticeText(msg) {
+  const body = contentBlocks(msg).flatMap((b) => b.type === "text" && typeof b.text === "string" ? [b.text] : []).join("\n\n").trim();
+  return body && !HARNESS_PLACEHOLDERS.has(body) ? body : null;
+}
+async function emitHarnessMessage(msg, emit, pending, buffer) {
+  const body = harnessNoticeText(msg);
+  if (body) emit({ type: "runtime_notice", body });
+  const toolUses = contentBlocks(msg).filter((b) => b.type === "tool_use");
+  if (toolUses.length > 0) {
+    const inner = msg.message ?? {};
+    await processAssistantMessage(
+      { message: { ...inner, content: toolUses } },
+      emit,
+      pending,
+      buffer
+    );
+  }
+}
 function contentBlocks(msg) {
   const content = msg.message?.content;
   return Array.isArray(content) ? content : [];
@@ -3102,12 +3137,14 @@ function readContextWindow(msg, resolvedModel) {
   }
   return max;
 }
+var HARNESS_PLACEHOLDERS;
 var init_loop = __esm({
   "packages/agent-runtime/src/claude-code/loop.ts"() {
     "use strict";
     init_transcript();
     init_failure();
     init_session();
+    HARNESS_PLACEHOLDERS = /* @__PURE__ */ new Set(["No response requested.", "(no content)"]);
   }
 });
 
@@ -3180,7 +3217,7 @@ async function* runWithResumeRecovery(queryFn, req, signal, initial, augmentOpti
       yield* sdkEvents(queryFn, fresh.req, signal, options, fresh.degraded);
       return;
     }
-    emitted = true;
+    if (event.type !== "runtime_notice") emitted = true;
     yield event;
   }
 }

package/dist/runtime.js

@@ -3256,7 +3256,8 @@ var turnEventSchema = z6.discriminatedUnion("type", [
   // `progress` row); `terminal: true` is the turn's closing reply (commits as
   // the `final` row).
   z6.object({ type: z6.literal("text"), body: z6.string(), terminal: z6.boolean() }),
-  // Runtime/provider-authored prose surfaced alongside a failed turn. Unlike
+  // Runtime/provider-authored prose about the turn — a failure's explanation, or
+  // a line the harness wrote on a turn it recovered (CT1750). Unlike
   // `text`, this is not the agent's narration or reply: the pump persists it as
   // `runtime_notice`, and the transcript renders it in the shared SystemNote
   // voice. Adapters emit it only from positive runtime evidence; the web never
@@ -3450,10 +3451,12 @@ function isContentBearingEvent(event) {
       return normalizeCommitText(event.body) !== "";
     case "thinking":
       return normalizeCommitText(event.text) !== "";
-    case "runtime_notice":
-      return normalizeCommitText(event.body) !== "";
     case "tool":
       return true;
+    // CT1750: a runtime notice is shown, but it is the harness speaking about
+    // the turn, not the turn's output — a success whose only output is a CLI
+    // line still produced nothing.
+    case "runtime_notice":
     case "session":
     case "result":
       return false;
@@ -4295,6 +4298,7 @@ async function* decodeSdkStream(iter, ctx) {
   let lastRequestContextTokens;
   let resolvedModel;
   const signals = { sawRejectedLimit: false };
+  let preInitNotice = null;
   try {
     for await (const msg of iter) {
       if (ctx.signal.aborted) return;
@@ -4320,12 +4324,19 @@ async function* decodeSdkStream(iter, ctx) {
         if (preInitToolActivity(msg) && ctx.startEvidence) ctx.startEvidence.toolActivity = true;
         const failure = classifyPreInitFrame(msg, signals);
         resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
+        if (msg.type === "assistant" && isHarnessAuthored(msg))
+          preInitNotice = harnessNoticeText(msg);
         break;
       } else if (msg.type === "assistant") {
         const assistantErr = msg.error;
         if (typeof assistantErr === "string" && assistantErr.length > 0) {
           signals.lastAssistantError = assistantErr;
         }
+        if (isHarnessAuthored(msg)) {
+          await emitHarnessMessage(msg, emit, pending, buffer);
+          yield* drain(out);
+          continue;
+        }
         const reqContext = readRequestContextTokens(msg);
         if (reqContext !== void 0) lastRequestContextTokens = reqContext;
         await processAssistantMessage(msg, emit, pending, buffer);
@@ -4387,6 +4398,7 @@ async function* decodeSdkStream(iter, ctx) {
       const failure = classifyFailure(signals, { text: "" });
       resultReason = failure ? encodeFailureReason(failure) : "session_start_failed";
     }
+    if (preInitNotice) yield { type: "runtime_notice", body: preInitNotice };
   }
   const heldFailure = !ok ? classifyRuntimeNoticeText(buffer.held) : null;
   const terminalFailure = !ok ? decodeFailureReason(resultReason) : null;
@@ -4453,6 +4465,30 @@ function preInitToolActivity(msg) {
   const kind = msg.type === "assistant" ? "tool_use" : msg.type === "user" ? "tool_result" : null;
   return kind !== null && contentBlocks(msg).some((b) => b.type === kind);
 }
+function isHarnessAuthored(msg) {
+  const error = msg.error;
+  if (typeof error === "string" && error.length > 0) return true;
+  return msg.message?.model === "<synthetic>";
+}
+var HARNESS_PLACEHOLDERS = /* @__PURE__ */ new Set(["No response requested.", "(no content)"]);
+function harnessNoticeText(msg) {
+  const body = contentBlocks(msg).flatMap((b) => b.type === "text" && typeof b.text === "string" ? [b.text] : []).join("\n\n").trim();
+  return body && !HARNESS_PLACEHOLDERS.has(body) ? body : null;
+}
+async function emitHarnessMessage(msg, emit, pending, buffer) {
+  const body = harnessNoticeText(msg);
+  if (body) emit({ type: "runtime_notice", body });
+  const toolUses = contentBlocks(msg).filter((b) => b.type === "tool_use");
+  if (toolUses.length > 0) {
+    const inner = msg.message ?? {};
+    await processAssistantMessage(
+      { message: { ...inner, content: toolUses } },
+      emit,
+      pending,
+      buffer
+    );
+  }
+}
 function contentBlocks(msg) {
   const content = msg.message?.content;
   return Array.isArray(content) ? content : [];
@@ -4556,7 +4592,7 @@ async function* runWithResumeRecovery(queryFn, req, signal, initial, augmentOpti
       yield* sdkEvents(queryFn, fresh.req, signal, options, fresh.degraded);
       return;
     }
-    emitted = true;
+    if (event.type !== "runtime_notice") emitted = true;
     yield event;
   }
 }

package/package.json

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