@khalilgharbaoui/opencode-claude-code-plugin 0.15.3 → 0.15.4

package/dist/index.js

@@ -2511,7 +2511,7 @@ function compactConversationHistory(prompt, opts = {}) {
     return buildCompactionHistory(prompt);
   }
   const conversationMessages = prompt.filter(
-    (m) => m.role === "user" || m.role === "assistant"
+    (m) => m.role === "user" || m.role === "assistant" || m.role === "tool"
   );
   if (conversationMessages.length <= 1) {
     return null;
@@ -2519,28 +2519,8 @@ function compactConversationHistory(prompt, opts = {}) {
   const historyParts = [];
   for (let i = 0; i < conversationMessages.length - 1; i++) {
     const msg = conversationMessages[i];
-    const role = msg.role === "user" ? "User" : "Assistant";
-    let text = "";
-    if (typeof msg.content === "string") {
-      text = msg.content;
-    } else if (Array.isArray(msg.content)) {
-      const textParts = msg.content.filter((p) => p.type === "text" && p.text).map((p) => p.text);
-      text = textParts.join("\n");
-      const toolCalls = msg.content.filter(
-        (p) => p.type === "tool-call"
-      );
-      const toolResults = msg.content.filter(
-        (p) => p.type === "tool-result"
-      );
-      if (toolCalls.length > 0) {
-        text += `
-[Called ${toolCalls.length} tool(s): ${toolCalls.map((t) => t.toolName).join(", ")}]`;
-      }
-      if (toolResults.length > 0) {
-        text += `
-[Received ${toolResults.length} tool result(s)]`;
-      }
-    }
+    const role = msg.role === "user" ? "User" : msg.role === "assistant" ? "Assistant" : "Tool";
+    const { text } = renderMessageContentForCompaction(msg);
     if (text.trim()) {
       const truncated = text.length > 2e3 ? text.slice(0, 2e3) + "..." : text;
       historyParts.push(`${role}: ${truncated}`);
@@ -2583,7 +2563,27 @@ function buildCompactionHistory(prompt) {
 }
 function getClaudeUserMessage(prompt, includeHistoryContext = false, opts = {}) {
   const compactionMode = opts.compactionMode === true;
+  const cliToolCallIds = opts.cliToolCallIds;
   const content = [];
+  const pushToolResult = (part) => {
+    const id = part.toolCallId;
+    const text = getToolResultText(part);
+    if (!cliToolCallIds || cliToolCallIds.has(id)) {
+      content.push({ type: "tool_result", tool_use_id: id, content: text });
+      return;
+    }
+    log.info("rendering opencode-side tool result as text", {
+      toolCallId: id,
+      toolName: part.toolName,
+      chars: text.length
+    });
+    content.push({
+      type: "text",
+      text: `<opencode_tool_result tool="${part.toolName ?? "unknown"}">
+${text}
+</opencode_tool_result>`
+    });
+  };
   if (compactionMode) {
     const transcript = compactConversationHistory(prompt, {
       mode: "compaction"
@@ -2653,12 +2653,7 @@ Now continuing with the current message:
               });
             }
           } else if (part.type === "tool-result") {
-            const p = part;
-            content.push({
-              type: "tool_result",
-              tool_use_id: p.toolCallId,
-              content: getToolResultText(p)
-            });
+            pushToolResult(part);
           }
         }
       }
@@ -2666,12 +2661,7 @@ Now continuing with the current message:
       if (Array.isArray(msg.content)) {
         for (const part of msg.content) {
           if (part?.type === "tool-result") {
-            const p = part;
-            content.push({
-              type: "tool_result",
-              tool_use_id: p.toolCallId,
-              content: getToolResultText(p)
-            });
+            pushToolResult(part);
           }
         }
       }
@@ -5058,7 +5048,12 @@ var ClaudeCodeLanguageModel = class {
     }
     const hasExistingSession = !!getClaudeSessionId(sk);
     const includeHistoryContext = !hasExistingSession && hasPriorConversation;
-    const userMsg = consumeExitPlanModeQuestionResult(sk, options.prompt) ?? getClaudeUserMessage(options.prompt, includeHistoryContext);
+    const userMsg = consumeExitPlanModeQuestionResult(sk, options.prompt) ?? // doGenerate has no proxy wiring, so this process issued no tool calls
+    // at all: every tool result reaching it belongs to opencode and must be
+    // rendered as text rather than an orphaned `tool_result` (issue #29).
+    getClaudeUserMessage(options.prompt, includeHistoryContext, {
+      cliToolCallIds: /* @__PURE__ */ new Set()
+    });
     const [runtimeStatus, cliVersion, planModeQuestionActive] = await Promise.all([
       getRuntimeMcpStatus(),
       detectCliVersion(this.config.cliPath),
@@ -5514,8 +5509,10 @@ ${plan}
     if (exitPlanModeQuestionResult) {
       log.info("sending plan approval decision to claude", { sk });
     }
+    const previousPendingProxyCalls = compactionMode ? [] : getPendingProxyCalls(sk);
     const userMsg = exitPlanModeQuestionResult ?? getClaudeUserMessage(options.prompt, includeHistoryContext, {
-      compactionMode
+      compactionMode,
+      cliToolCallIds: new Set(previousPendingProxyCalls.map((c) => c.toolCallId))
     });
     const resolvedProxy = compactionMode ? null : this.resolvedProxyTools();
     const loadLiveToolInfo = this.createLiveToolInfoLoader();
@@ -5524,7 +5521,6 @@ ${plan}
       loadLiveToolInfo
     );
     const self = this;
-    const previousPendingProxyCalls = compactionMode ? [] : getPendingProxyCalls(sk);
     const previousPendingProxyMatches = previousPendingProxyCalls.map((call) => ({
       call,
       result: this.extractPendingProxyResult(options.prompt, call.toolCallId)