@cabane/companion 0.6.51 → 0.6.53

package/dist/cli.js

@@ -232,6 +232,9 @@ function realAccountHome() {
   }
   return realHomeCache;
 }
+function agentCompanionHome() {
+  return join(cabaneDir(), "agent-home");
+}
 function cabaneDir() {
   const dir2 = join(process.env.CABANE_COMPANION_HOME || homedir(), ".cabane");
   if (process.env.VITEST) {
@@ -5530,6 +5533,7 @@ function readToolItem(item, eventType) {
   if (type === "mcp_tool_call") {
     const tool2 = str(item.tool) ?? "tool";
     const server = str(item.server);
+    const result = readMcpResult(item.result);
     return {
       id,
       // A cabane tool reads best as its bare verb (`read`); a non-cabane server's
@@ -5537,7 +5541,7 @@ function readToolItem(item, eventType) {
       name: server && server !== "cabane" ? `${server}.${tool2}` : tool2,
       input: item.arguments,
       status: toStatus(item.status),
-      ...item.status === "completed" ? { result: readMcpResult(item.result) } : item.status === "failed" ? { result: readMcpError(item.error) } : {}
+      ...item.status === "completed" ? { result } : item.status === "failed" ? { result: hasMcpReceipt(result) ? result : readMcpError(item.error) } : {}
     };
   }
   if (type === "web_search") {
@@ -5577,9 +5581,38 @@ function toStatus(v) {
 }
 function readMcpResult(result) {
   const rec2 = asRecord2(result);
-  if (rec2 && "content" in rec2) return rec2.content;
+  if (!rec2) return result;
+  if (hasOnlyNonTextContentBlocks(rec2.content)) return rec2.content;
+  if (rec2.structured_content !== void 0 && rec2.structured_content !== null) {
+    return rec2.structured_content;
+  }
+  if (rec2.structuredContent !== void 0 && rec2.structuredContent !== null) {
+    return rec2.structuredContent;
+  }
+  if ("content" in rec2) return rec2.content;
   return result;
 }
+function hasOnlyNonTextContentBlocks(content) {
+  if (!Array.isArray(content) || content.length === 0) return false;
+  let sawTypedBlock = false;
+  for (const raw of content) {
+    const block = asRecord2(raw);
+    const type = block && str(block.type);
+    if (!type) continue;
+    sawTypedBlock = true;
+    if (type === "text" && typeof block?.text === "string" && block.text.trim().length > 0) {
+      return false;
+    }
+  }
+  return sawTypedBlock;
+}
+function hasMcpReceipt(result) {
+  if (result === void 0 || result === null) return false;
+  if (typeof result === "string") return result.trim().length > 0;
+  if (Array.isArray(result)) return result.length > 0;
+  if (typeof result === "object") return Object.keys(result).length > 0;
+  return true;
+}
 function readMcpError(error) {
   const rec2 = asRecord2(error);
   return rec2 && str(rec2.message) || "error";
@@ -6103,6 +6136,25 @@ var errorItem = (id, message) => ({
   type: "item.completed",
   item: { id, type: "error", message }
 });
+var SDK_SUCCESS = { ok: true, result: { source: "native" }, logs: "", truncated: false };
+var SDK_FAILURE = {
+  ok: false,
+  result: null,
+  preview: '{"rows":[1,2,3]}',
+  logs: "",
+  truncated: false,
+  error: { kind: "output_too_large", bytes: 169167, limit: 65536 },
+  warnings: [],
+  committed: {
+    calls: [
+      {
+        method: "conversations.update",
+        args: { id: "conv-1", opts: { title: "Renamed before failure" } }
+      }
+    ]
+  },
+  inFlight: null
+};
 var sessionEvent3 = (threadId, cwd = DIR2, degraded = false, promptFingerprint = fingerprintPrompt(PROMPT)) => ({
   type: "session",
   state: encodeSession3({ threadId, cwd, promptFingerprint }),
@@ -6182,6 +6234,194 @@ var CODEX_CONFORMANCE_FIXTURES = [
       { type: "result", ok: true }
     ]
   },
+  {
+    // CT1211: recorded SDK success shape. Codex exposes the text compatibility
+    // copy and the native object together; normalization must keep the object.
+    name: "MCP success prefers native structured content",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      toolFrame("item.started", {
+        id: "sdk-success",
+        type: "mcp_tool_call",
+        server: "cabane",
+        tool: "sdk",
+        arguments: { code: 'return { source: "native" }' },
+        status: "in_progress"
+      }),
+      toolFrame("item.completed", {
+        id: "sdk-success",
+        type: "mcp_tool_call",
+        server: "cabane",
+        tool: "sdk",
+        arguments: { code: 'return { source: "native" }' },
+        status: "completed",
+        result: {
+          content: [{ type: "text", text: JSON.stringify(SDK_SUCCESS) }],
+          structured_content: SDK_SUCCESS
+        }
+      }),
+      turnCompleted()
+    ],
+    expected: [
+      sessionEvent3(NEW_THREAD_ID),
+      {
+        type: "tool",
+        id: "sdk-success",
+        name: "sdk",
+        phase: "start",
+        summary: "",
+        input: { code: 'return { source: "native" }' }
+      },
+      {
+        type: "tool",
+        id: "sdk-success",
+        name: "sdk",
+        phase: "done",
+        summary: "",
+        input: { code: 'return { source: "native" }' },
+        result: SDK_SUCCESS
+      },
+      { type: "result", ok: true }
+    ]
+  },
+  {
+    // CT1211 incident shape: MCP `isError` keeps the failed phase, while the raw
+    // camel-case structured payload survives instead of the generic `error` token.
+    name: "failed SDK call preserves structured receipt while remaining error phase",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      toolFrame("item.started", {
+        id: "sdk-failed",
+        type: "mcp_tool_call",
+        server: "cabane",
+        tool: "sdk",
+        arguments: { code: "return largeResult" },
+        status: "in_progress"
+      }),
+      toolFrame("item.completed", {
+        id: "sdk-failed",
+        type: "mcp_tool_call",
+        server: "cabane",
+        tool: "sdk",
+        arguments: { code: "return largeResult" },
+        status: "failed",
+        result: {
+          content: [{ type: "text", text: JSON.stringify(SDK_FAILURE) }],
+          structuredContent: SDK_FAILURE,
+          isError: true
+        },
+        error: { message: "error" }
+      }),
+      turnCompleted()
+    ],
+    expected: [
+      sessionEvent3(NEW_THREAD_ID),
+      {
+        type: "tool",
+        id: "sdk-failed",
+        name: "sdk",
+        phase: "start",
+        summary: "",
+        input: { code: "return largeResult" }
+      },
+      {
+        type: "tool",
+        id: "sdk-failed",
+        name: "sdk",
+        phase: "error",
+        summary: "",
+        input: { code: "return largeResult" },
+        result: SDK_FAILURE
+      },
+      { type: "result", ok: true }
+    ]
+  },
+  {
+    // A transport/tool failure has no MCP result payload and still uses the real
+    // adapter error message. CT1211 must not replace this fallback with `undefined`.
+    name: "failed MCP call without result keeps error message fallback",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      toolFrame("item.completed", {
+        id: "mcp-failed",
+        type: "mcp_tool_call",
+        server: "other",
+        tool: "lookup",
+        arguments: { q: "receipt" },
+        status: "failed",
+        result: { content: [], isError: true },
+        error: { message: "connection closed" }
+      }),
+      turnCompleted()
+    ],
+    expected: [
+      sessionEvent3(NEW_THREAD_ID),
+      {
+        type: "tool",
+        id: "mcp-failed",
+        name: "other.lookup",
+        phase: "start",
+        summary: "receipt",
+        input: { q: "receipt" }
+      },
+      {
+        type: "tool",
+        id: "mcp-failed",
+        name: "other.lookup",
+        phase: "error",
+        summary: "receipt",
+        input: { q: "receipt" },
+        result: "connection closed"
+      },
+      { type: "result", ok: true }
+    ]
+  },
+  {
+    // CT1147 stays intact when a connector includes structured metadata beside an
+    // image-only MCP response: no image/base64 payload enters activity receipts.
+    name: "image-only MCP result remains empty despite structured metadata",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      toolFrame("item.completed", {
+        id: "mcp-image",
+        type: "mcp_tool_call",
+        server: "other",
+        tool: "render",
+        arguments: {},
+        status: "completed",
+        result: {
+          content: [{ type: "image", data: "base64-bytes", mimeType: "image/png" }],
+          structured_content: { image: "base64-bytes" }
+        }
+      }),
+      turnCompleted()
+    ],
+    expected: [
+      sessionEvent3(NEW_THREAD_ID),
+      {
+        type: "tool",
+        id: "mcp-image",
+        name: "other.render",
+        phase: "start",
+        summary: "",
+        input: {}
+      },
+      {
+        type: "tool",
+        id: "mcp-image",
+        name: "other.render",
+        phase: "done",
+        summary: "",
+        input: {},
+        result: [{ type: "image", data: "base64-bytes", mimeType: "image/png" }]
+      },
+      { type: "result", ok: true }
+    ]
+  },
   {
     // A streaming tool whose args arrive on a later snapshot: `item.started` carries
     // empty args, `item.updated` fills them, `item.completed` finishes. The `start`
@@ -8010,7 +8250,8 @@ ${reason}`,
     }
     const turnEnv = {
       ...hookEnv,
-      CABANE_HOST_ACCESS: turnContext.policy.hostFs ? "1" : "0"
+      CABANE_HOST_ACCESS: turnContext.policy.hostFs ? "1" : "0",
+      CABANE_COMPANION_HOME: agentCompanionHome()
     };
     const key = runKey(payload.conversationId, payload.agentId);
     const abortController = new AbortController();

package/dist/runtime.js

@@ -224,6 +224,9 @@ function realAccountHome() {
   }
   return realHomeCache;
 }
+function agentCompanionHome() {
+  return join(cabaneDir(), "agent-home");
+}
 function cabaneDir() {
   const dir2 = join(process.env.CABANE_COMPANION_HOME || homedir(), ".cabane");
   if (process.env.VITEST) {
@@ -5029,6 +5032,7 @@ function readToolItem(item, eventType) {
   if (type === "mcp_tool_call") {
     const tool2 = str(item.tool) ?? "tool";
     const server = str(item.server);
+    const result = readMcpResult(item.result);
     return {
       id,
       // A cabane tool reads best as its bare verb (`read`); a non-cabane server's
@@ -5036,7 +5040,7 @@ function readToolItem(item, eventType) {
       name: server && server !== "cabane" ? `${server}.${tool2}` : tool2,
       input: item.arguments,
       status: toStatus(item.status),
-      ...item.status === "completed" ? { result: readMcpResult(item.result) } : item.status === "failed" ? { result: readMcpError(item.error) } : {}
+      ...item.status === "completed" ? { result } : item.status === "failed" ? { result: hasMcpReceipt(result) ? result : readMcpError(item.error) } : {}
     };
   }
   if (type === "web_search") {
@@ -5076,9 +5080,38 @@ function toStatus(v) {
 }
 function readMcpResult(result) {
   const rec = asRecord2(result);
-  if (rec && "content" in rec) return rec.content;
+  if (!rec) return result;
+  if (hasOnlyNonTextContentBlocks(rec.content)) return rec.content;
+  if (rec.structured_content !== void 0 && rec.structured_content !== null) {
+    return rec.structured_content;
+  }
+  if (rec.structuredContent !== void 0 && rec.structuredContent !== null) {
+    return rec.structuredContent;
+  }
+  if ("content" in rec) return rec.content;
   return result;
 }
+function hasOnlyNonTextContentBlocks(content) {
+  if (!Array.isArray(content) || content.length === 0) return false;
+  let sawTypedBlock = false;
+  for (const raw of content) {
+    const block = asRecord2(raw);
+    const type = block && str(block.type);
+    if (!type) continue;
+    sawTypedBlock = true;
+    if (type === "text" && typeof block?.text === "string" && block.text.trim().length > 0) {
+      return false;
+    }
+  }
+  return sawTypedBlock;
+}
+function hasMcpReceipt(result) {
+  if (result === void 0 || result === null) return false;
+  if (typeof result === "string") return result.trim().length > 0;
+  if (Array.isArray(result)) return result.length > 0;
+  if (typeof result === "object") return Object.keys(result).length > 0;
+  return true;
+}
 function readMcpError(error) {
   const rec = asRecord2(error);
   return rec && str(rec.message) || "error";
@@ -5602,6 +5635,25 @@ var errorItem = (id, message) => ({
   type: "item.completed",
   item: { id, type: "error", message }
 });
+var SDK_SUCCESS = { ok: true, result: { source: "native" }, logs: "", truncated: false };
+var SDK_FAILURE = {
+  ok: false,
+  result: null,
+  preview: '{"rows":[1,2,3]}',
+  logs: "",
+  truncated: false,
+  error: { kind: "output_too_large", bytes: 169167, limit: 65536 },
+  warnings: [],
+  committed: {
+    calls: [
+      {
+        method: "conversations.update",
+        args: { id: "conv-1", opts: { title: "Renamed before failure" } }
+      }
+    ]
+  },
+  inFlight: null
+};
 var sessionEvent3 = (threadId, cwd = DIR2, degraded = false, promptFingerprint = fingerprintPrompt(PROMPT)) => ({
   type: "session",
   state: encodeSession3({ threadId, cwd, promptFingerprint }),
@@ -5681,6 +5733,194 @@ var CODEX_CONFORMANCE_FIXTURES = [
       { type: "result", ok: true }
     ]
   },
+  {
+    // CT1211: recorded SDK success shape. Codex exposes the text compatibility
+    // copy and the native object together; normalization must keep the object.
+    name: "MCP success prefers native structured content",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      toolFrame("item.started", {
+        id: "sdk-success",
+        type: "mcp_tool_call",
+        server: "cabane",
+        tool: "sdk",
+        arguments: { code: 'return { source: "native" }' },
+        status: "in_progress"
+      }),
+      toolFrame("item.completed", {
+        id: "sdk-success",
+        type: "mcp_tool_call",
+        server: "cabane",
+        tool: "sdk",
+        arguments: { code: 'return { source: "native" }' },
+        status: "completed",
+        result: {
+          content: [{ type: "text", text: JSON.stringify(SDK_SUCCESS) }],
+          structured_content: SDK_SUCCESS
+        }
+      }),
+      turnCompleted()
+    ],
+    expected: [
+      sessionEvent3(NEW_THREAD_ID),
+      {
+        type: "tool",
+        id: "sdk-success",
+        name: "sdk",
+        phase: "start",
+        summary: "",
+        input: { code: 'return { source: "native" }' }
+      },
+      {
+        type: "tool",
+        id: "sdk-success",
+        name: "sdk",
+        phase: "done",
+        summary: "",
+        input: { code: 'return { source: "native" }' },
+        result: SDK_SUCCESS
+      },
+      { type: "result", ok: true }
+    ]
+  },
+  {
+    // CT1211 incident shape: MCP `isError` keeps the failed phase, while the raw
+    // camel-case structured payload survives instead of the generic `error` token.
+    name: "failed SDK call preserves structured receipt while remaining error phase",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      toolFrame("item.started", {
+        id: "sdk-failed",
+        type: "mcp_tool_call",
+        server: "cabane",
+        tool: "sdk",
+        arguments: { code: "return largeResult" },
+        status: "in_progress"
+      }),
+      toolFrame("item.completed", {
+        id: "sdk-failed",
+        type: "mcp_tool_call",
+        server: "cabane",
+        tool: "sdk",
+        arguments: { code: "return largeResult" },
+        status: "failed",
+        result: {
+          content: [{ type: "text", text: JSON.stringify(SDK_FAILURE) }],
+          structuredContent: SDK_FAILURE,
+          isError: true
+        },
+        error: { message: "error" }
+      }),
+      turnCompleted()
+    ],
+    expected: [
+      sessionEvent3(NEW_THREAD_ID),
+      {
+        type: "tool",
+        id: "sdk-failed",
+        name: "sdk",
+        phase: "start",
+        summary: "",
+        input: { code: "return largeResult" }
+      },
+      {
+        type: "tool",
+        id: "sdk-failed",
+        name: "sdk",
+        phase: "error",
+        summary: "",
+        input: { code: "return largeResult" },
+        result: SDK_FAILURE
+      },
+      { type: "result", ok: true }
+    ]
+  },
+  {
+    // A transport/tool failure has no MCP result payload and still uses the real
+    // adapter error message. CT1211 must not replace this fallback with `undefined`.
+    name: "failed MCP call without result keeps error message fallback",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      toolFrame("item.completed", {
+        id: "mcp-failed",
+        type: "mcp_tool_call",
+        server: "other",
+        tool: "lookup",
+        arguments: { q: "receipt" },
+        status: "failed",
+        result: { content: [], isError: true },
+        error: { message: "connection closed" }
+      }),
+      turnCompleted()
+    ],
+    expected: [
+      sessionEvent3(NEW_THREAD_ID),
+      {
+        type: "tool",
+        id: "mcp-failed",
+        name: "other.lookup",
+        phase: "start",
+        summary: "receipt",
+        input: { q: "receipt" }
+      },
+      {
+        type: "tool",
+        id: "mcp-failed",
+        name: "other.lookup",
+        phase: "error",
+        summary: "receipt",
+        input: { q: "receipt" },
+        result: "connection closed"
+      },
+      { type: "result", ok: true }
+    ]
+  },
+  {
+    // CT1147 stays intact when a connector includes structured metadata beside an
+    // image-only MCP response: no image/base64 payload enters activity receipts.
+    name: "image-only MCP result remains empty despite structured metadata",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      toolFrame("item.completed", {
+        id: "mcp-image",
+        type: "mcp_tool_call",
+        server: "other",
+        tool: "render",
+        arguments: {},
+        status: "completed",
+        result: {
+          content: [{ type: "image", data: "base64-bytes", mimeType: "image/png" }],
+          structured_content: { image: "base64-bytes" }
+        }
+      }),
+      turnCompleted()
+    ],
+    expected: [
+      sessionEvent3(NEW_THREAD_ID),
+      {
+        type: "tool",
+        id: "mcp-image",
+        name: "other.render",
+        phase: "start",
+        summary: "",
+        input: {}
+      },
+      {
+        type: "tool",
+        id: "mcp-image",
+        name: "other.render",
+        phase: "done",
+        summary: "",
+        input: {},
+        result: [{ type: "image", data: "base64-bytes", mimeType: "image/png" }]
+      },
+      { type: "result", ok: true }
+    ]
+  },
   {
     // A streaming tool whose args arrive on a later snapshot: `item.started` carries
     // empty args, `item.updated` fills them, `item.completed` finishes. The `start`
@@ -7509,7 +7749,8 @@ ${reason}`,
     }
     const turnEnv = {
       ...hookEnv,
-      CABANE_HOST_ACCESS: turnContext.policy.hostFs ? "1" : "0"
+      CABANE_HOST_ACCESS: turnContext.policy.hostFs ? "1" : "0",
+      CABANE_COMPANION_HOME: agentCompanionHome()
     };
     const key = runKey(payload.conversationId, payload.agentId);
     const abortController = new AbortController();

package/package.json

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