@khalilgharbaoui/opencode-claude-code-plugin 0.2.5 → 0.3.0

package/dist/index.d.ts

@@ -201,6 +201,7 @@ interface ClaudeStreamMessage {
     type: string;
     subtype?: string;
     request_id?: string;
+    event?: ClaudeStreamMessage;
     request?: {
         subtype?: string;
         tool_name?: string;

package/dist/index.js

@@ -145,7 +145,7 @@ function mapTool(name, input, opts) {
       const toolName = parts.slice(1).join("_");
       const openCodeName = `${serverName}_${toolName}`;
       log.debug("mapping MCP tool", { original: name, mapped: openCodeName });
-      return { name: openCodeName, input, executed: false };
+      return { name: openCodeName, input, executed: true };
     }
   }
   if (OPENCODE_HANDLED_TOOLS.has(name)) {
@@ -825,10 +825,12 @@ function buildCliArgs(opts) {
     appendSystemPromptFile
   } = opts;
   const args = [
+    "--print",
     "--output-format",
     "stream-json",
     "--input-format",
     "stream-json",
+    "--include-partial-messages",
     "--verbose"
   ];
   if (model) {
@@ -1267,6 +1269,25 @@ import { unlink as unlink2 } from "fs/promises";
 import { homedir as homedir2, tmpdir as tmpdir3 } from "os";
 import { randomUUID as randomUUID2 } from "crypto";
 import { dirname as dirname2, join as join3 } from "path";
+function hasNewUserContent(prompt) {
+  for (let i = prompt.length - 1; i >= 0; i--) {
+    const msg = prompt[i];
+    if (msg.role === "assistant") return false;
+    if (msg.role !== "user") continue;
+    const content = msg.content;
+    if (typeof content === "string") {
+      if (content.trim()) return true;
+      continue;
+    }
+    if (Array.isArray(content)) {
+      for (const part of content) {
+        if (part.type === "text" && part.text && part.text.trim()) return true;
+        if (part.type === "tool-result") return true;
+      }
+    }
+  }
+  return false;
+}
 function readPromptFileIfPresent(path4) {
   try {
     const content = readFileSync2(path4, "utf8").trim();
@@ -1692,6 +1713,24 @@ var ClaudeCodeLanguageModel = class {
         warnings
       };
     }
+    if (!hasNewUserContent(options.prompt)) {
+      log.info("doGenerate short-circuit: no new user content");
+      return {
+        content: [],
+        finishReason: this.toFinishReason("stop"),
+        usage: this.toUsage({ input_tokens: 0, output_tokens: 0 }),
+        request: { body: { text: "" } },
+        response: {
+          id: generateId(),
+          timestamp: /* @__PURE__ */ new Date(),
+          modelId: this.modelId
+        },
+        providerMetadata: {
+          "claude-code": { synthetic: true, path: "no-new-user-content" }
+        },
+        warnings
+      };
+    }
     const hasPriorConversation = options.prompt.filter((m) => m.role === "user" || m.role === "assistant").length > 1;
     if (!hasPriorConversation) {
       deleteClaudeSessionId(sk);
@@ -1743,11 +1782,16 @@ var ClaudeCodeLanguageModel = class {
     let thinkingText = "";
     let resultMeta = {};
     const toolCalls = [];
+    let gotPartialEvents = false;
     const result = await new Promise((resolve3, reject) => {
       rl.on("line", (line) => {
         if (!line.trim()) return;
         try {
-          const msg = JSON.parse(line);
+          const outer = JSON.parse(line);
+          const msg = outer.type === "stream_event" && outer.event ? { ...outer.event, session_id: outer.session_id } : outer;
+          if (outer.type === "stream_event") {
+            gotPartialEvents = true;
+          }
           if (this.handleControlRequest(msg, proc)) {
             return;
           }
@@ -1756,7 +1800,7 @@ var ClaudeCodeLanguageModel = class {
               setClaudeSessionId(sk, msg.session_id);
             }
           }
-          if (msg.type === "assistant" && msg.message?.content) {
+          if (msg.type === "assistant" && msg.message?.content && !gotPartialEvents) {
             for (const block of msg.message.content) {
               if (block.type === "text" && block.text) {
                 responseText += block.text;
@@ -1975,6 +2019,24 @@ ${plan}
         request: { body: { text: "" } }
       };
     }
+    if (!hasNewUserContent(options.prompt)) {
+      log.info("doStream short-circuit: no new user content");
+      const stream2 = new ReadableStream({
+        start(controller) {
+          controller.enqueue({ type: "stream-start", warnings });
+          controller.enqueue({
+            type: "finish",
+            finishReason: toFinishReason("stop"),
+            usage: toUsage({ input_tokens: 0, output_tokens: 0 }),
+            providerMetadata: {
+              "claude-code": { synthetic: true, path: "no-new-user-content" }
+            }
+          });
+          controller.close();
+        }
+      });
+      return { stream: stream2, request: { body: { text: "" } } };
+    }
     const hasPriorConversation = options.prompt.filter((m) => m.role === "user" || m.role === "assistant").length > 1;
     if (!hasPriorConversation) {
       deleteClaudeSessionId(sk);
@@ -2096,14 +2158,16 @@ ${plan}
               resultFallbackTimer = null;
             }
           };
-          const startResultFallback = () => {
+          const startResultFallback = (delayMs = 6e4) => {
             clearFallbackTimer();
             if (!hasReceivedContent || controllerClosed) return;
             resultFallbackTimer = setTimeout(() => {
               if (controllerClosed) return;
-              log.warn("result fallback timer fired \u2014 closing stream without result event");
+              log.warn("result fallback timer fired \u2014 closing stream without result event", {
+                delayMs
+              });
               closeHandler();
-            }, 5e3);
+            }, delayMs);
           };
           const toolCallMap = /* @__PURE__ */ new Map();
           const skipResultForIds = /* @__PURE__ */ new Set();
@@ -2139,11 +2203,17 @@ ${plan}
             } catch {
             }
           };
+          let gotPartialEvents = false;
           const lineHandler = (line) => {
             if (!line.trim()) return;
             if (controllerClosed) return;
+            startResultFallback();
             try {
-              const msg = JSON.parse(line);
+              const outer = JSON.parse(line);
+              const msg = outer.type === "stream_event" && outer.event ? { ...outer.event, session_id: outer.session_id } : outer;
+              if (outer.type === "stream_event") {
+                gotPartialEvents = true;
+              }
               if (handleControlRequest(msg, proc)) {
                 return;
               }
@@ -2172,7 +2242,6 @@ ${plan}
                   reasoningStarted.set(idx, true);
                 }
                 if (block.type === "text") {
-                  clearFallbackTimer();
                   textBlockIndices.add(idx);
                   if (block.text) {
                     if (!currentTextId) startTextBlock();
@@ -2185,7 +2254,6 @@ ${plan}
                   }
                 }
                 if (block.type === "tool_use" && block.id && block.name) {
-                  clearFallbackTimer();
                   toolCallMap.set(idx, {
                     id: block.id,
                     name: block.name,
@@ -2260,7 +2328,6 @@ ${plan}
                 if (textBlockIndices.has(idx)) {
                   endTextBlock();
                   textBlockIndices.delete(idx);
-                  startResultFallback();
                 }
                 const tc = toolCallMap.get(idx);
                 if (tc) {
@@ -2338,7 +2405,7 @@ ${plan}
                   }
                 }
               }
-              if (msg.type === "assistant" && msg.message?.content) {
+              if (msg.type === "assistant" && msg.message?.content && !gotPartialEvents) {
                 const hasText = msg.message.content.some(
                   (b) => b.type === "text" && b.text
                 );
@@ -2637,7 +2704,7 @@ ${plan}
                 "abort signal received mid-turn, starting grace period",
                 { cwd }
               );
-              startResultFallback();
+              startResultFallback(5e3);
             });
           }
           if (pendingProxyCall && pendingProxyResult) {