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

package/README.md

@@ -524,7 +524,14 @@ The plugin registers the command without replacing an existing user-defined `btw
 
 Where the answer appears, in the conversation either way:
 
-- **A receipt, straight away**, when you asked while a turn was running: a `▌ **btw:** *sent to Claude on the side*` line in the reply you are watching, so a `/btw` typed mid-turn is visibly taken rather than looking swallowed until the answer arrives. If opencode is between two streams at that moment (it was running a tool), the receipt lands when the next one opens.
+- **A receipt, straight away**, when you asked while a turn was running, in the reply you are watching, so a `/btw` typed mid-turn is visibly taken rather than looking swallowed until the answer arrives:
+
+  ```text
+  ▌ **btw:** <your question, in full>
+  ▌ *sent to Claude on the side*
+  ```
+
+  It quotes the question back untruncated because the prompt box clears on submit and no `/btw` message is ever created, so this is the only place you can read back what you sent. If opencode is between two streams at that moment (it was running a tool), the receipt lands when the next one opens.
 - **Inside the running turn's own reply**, as soon as the answer arrives, when you asked while Claude was working. It is written into the reply you are already watching as its own block, headed `▌ **btw:** <your question>`, so it stays there and is easy to pick out. Every line of the aside, answer included, carries that `▌` bar, so it reads as one block down its whole height. Nothing is queued and the `/btw` message itself is dropped, because the answer is already in the transcript. The turn goes on to deliver its own reply as usual.
 - **As its own `/btw` message and answer** when the conversation is idle, or when the turn had no stream open to write into at that moment (opencode was running a tool between two of them). In the second case the pair lands when the turn ends; nothing is announced in the meantime, because the answer itself is what arrives.
 - Follow-ups work: earlier asides in the conversation are sent along as the aside's history.

package/dist/index.js

@@ -2100,8 +2100,11 @@ var LEGACY_INLINE_ASIDE_MARKERS = ["> **btw:**"];
 function barEveryLine(text) {
   return text.split("\n").map((line) => line.trim() === "" ? "\u258C" : `\u258C ${line}`).join("\n");
 }
+function oneLine(question) {
+  return question.replace(/\s+/g, " ").trim();
+}
 function asideHeader(question) {
-  return `${INLINE_ASIDE_MARKER} ${question.replace(/\s+/g, " ").trim()}`;
+  return `${INLINE_ASIDE_MARKER} ${oneLine(question)}`;
 }
 function formatInlineAside(question, answer) {
   return `
@@ -2110,10 +2113,11 @@ ${asideHeader(question)}
 ${barEveryLine(answer.trim())}
 `;
 }
-var INLINE_ASIDE_SENT = `${INLINE_ASIDE_MARKER} *sent to Claude on the side*`;
-function formatInlineAsideAsk() {
+var INLINE_ASIDE_SENT_NOTE = "*sent to Claude on the side*";
+function formatInlineAsideAsk(question) {
   return `
-${INLINE_ASIDE_SENT}
+${asideHeader(question)}
+\u258C ${INLINE_ASIDE_SENT_NOTE}
 `;
 }
 var asideSinks = /* @__PURE__ */ new Map();
@@ -2282,7 +2286,7 @@ async function handleBtwCommand(client, input, options = {}) {
       questionLength: question.length,
       history: history.length
     });
-    const asked = busy ? deliverAsideInline(client, input.sessionID, formatInlineAsideAsk(), options).catch(() => false) : Promise.resolve(false);
+    const asked = busy ? deliverAsideInline(client, input.sessionID, formatInlineAsideAsk(question), options).catch(() => false) : Promise.resolve(false);
     answer.then(
       async (result) => {
         log.info("btw: early answer arrived", { sessionID: input.sessionID, busy, responseLength: result.response.length });
@@ -2507,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;
@@ -2515,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}`);
@@ -2579,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"
@@ -2649,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);
           }
         }
       }
@@ -2662,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);
           }
         }
       }
@@ -5054,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),
@@ -5510,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();
@@ -5520,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)