@cabane/companion 0.6.140 → 0.6.142

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;
@@ -2561,8 +2564,7 @@ var init_addendum = __esm({
     CLAUDE_CODE_ADDENDUM = [
       "On this harness the Cabane tools register under MCP prefixes. The workspace tools are",
       "`mcp__cabane__query`, `mcp__cabane__mutate` and `mcp__cabane__describe`; the ancillary",
-      "tools are `mcp__cabane__list_workspaces`,",
-      "`mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`,",
+      "tools are `mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`,",
       "`mcp__cabane__finalize_upload`, and `mcp__cabane__mint_render_token`.",
       turnControlPromptGuidance("mcp__cabane_companion__"),
       "Where this prompt names a tool by its bare verb, call",
@@ -2903,6 +2905,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 +2931,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 +3005,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 +3072,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 +3136,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 +3216,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;
   }
 }
@@ -3853,7 +3889,7 @@ var init_addendum2 = __esm({
       "Every tool here goes by its plain name: the workspace tools are `query`, `mutate` and",
       "`describe`.",
       turnControlPromptGuidance(""),
-      "The ancillary tools are `list_workspaces`, `read_binary`, `upload`, `begin_upload`,",
+      "The ancillary tools are `read_binary`, `upload`, `begin_upload`,",
       "`finalize_upload`, `mint_render_token`; and the host tools are plain verbs too (`bash`,",
       "`read`, `edit`). Mind the collision: a bare `read` or `edit` is the HOST tool, acting on the",
       "local machine \u2014 a workspace read is `query` with the operation name `files.read`. The",
@@ -5038,8 +5074,8 @@ var init_addendum3 = __esm({
       // in sat two lines under the instruction to invoke the exact qualified names,
       // so the sentence contradicted itself. The bare `query` / `mutate` below stay:
       // that sentence is about operation names, after the qualified forms are given.
-      "The ancillary tools are `mcp__cabane__list_workspaces`, `mcp__cabane__read_binary`,",
-      "`mcp__cabane__upload`, `mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload` and",
+      "The ancillary tools are `mcp__cabane__read_binary`, `mcp__cabane__upload`,",
+      "`mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload` and",
       "`mcp__cabane__mint_render_token` \u2014 all possibly deferred too.",
       "There is no Cabane `read`/`write`/`search` tool \u2014 those are",
       "operation NAMES you pass to `query` / `mutate`. One more harness fact: you can interleave",

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;
@@ -3987,8 +3990,7 @@ function turnControlPromptGuidance(prefix) {
 var CLAUDE_CODE_ADDENDUM = [
   "On this harness the Cabane tools register under MCP prefixes. The workspace tools are",
   "`mcp__cabane__query`, `mcp__cabane__mutate` and `mcp__cabane__describe`; the ancillary",
-  "tools are `mcp__cabane__list_workspaces`,",
-  "`mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`,",
+  "tools are `mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`,",
   "`mcp__cabane__finalize_upload`, and `mcp__cabane__mint_render_token`.",
   turnControlPromptGuidance("mcp__cabane_companion__"),
   "Where this prompt names a tool by its bare verb, call",
@@ -4295,6 +4297,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 +4323,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 +4397,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 +4464,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 +4591,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;
   }
 }
@@ -5192,7 +5227,7 @@ var OPENCODE_ADDENDUM = [
   "Every tool here goes by its plain name: the workspace tools are `query`, `mutate` and",
   "`describe`.",
   turnControlPromptGuidance(""),
-  "The ancillary tools are `list_workspaces`, `read_binary`, `upload`, `begin_upload`,",
+  "The ancillary tools are `read_binary`, `upload`, `begin_upload`,",
   "`finalize_upload`, `mint_render_token`; and the host tools are plain verbs too (`bash`,",
   "`read`, `edit`). Mind the collision: a bare `read` or `edit` is the HOST tool, acting on the",
   "local machine \u2014 a workspace read is `query` with the operation name `files.read`. The",
@@ -6297,8 +6332,8 @@ var CODEX_ADDENDUM = [
   // in sat two lines under the instruction to invoke the exact qualified names,
   // so the sentence contradicted itself. The bare `query` / `mutate` below stay:
   // that sentence is about operation names, after the qualified forms are given.
-  "The ancillary tools are `mcp__cabane__list_workspaces`, `mcp__cabane__read_binary`,",
-  "`mcp__cabane__upload`, `mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload` and",
+  "The ancillary tools are `mcp__cabane__read_binary`, `mcp__cabane__upload`,",
+  "`mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload` and",
   "`mcp__cabane__mint_render_token` \u2014 all possibly deferred too.",
   "There is no Cabane `read`/`write`/`search` tool \u2014 those are",
   "operation NAMES you pass to `query` / `mutate`. One more harness fact: you can interleave",

package/package.json

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