@khalilgharbaoui/opencode-claude-code-plugin 0.42.0 → 0.42.2

package/dist/index.js

@@ -1723,6 +1723,21 @@ function cliSupportsDontAsk(v) {
   if (!v) return false;
   return gte(v, { major: 2, minor: 1, patch: 263 });
 }
+var INTERACTIVE_MEASURED_CLI = "2.1.288";
+var INTERACTIVE_MEASURED = { major: 2, minor: 1, patch: 288 };
+function isUnmeasuredInteractiveCli(v) {
+  if (!v) return false;
+  return gte(v, INTERACTIVE_MEASURED) && !(v.major === INTERACTIVE_MEASURED.major && v.minor === INTERACTIVE_MEASURED.minor && v.patch === INTERACTIVE_MEASURED.patch);
+}
+var warnedUnmeasuredInteractive = /* @__PURE__ */ new Set();
+function reportUnmeasuredInteractiveCli(v) {
+  if (!v || !isUnmeasuredInteractiveCli(v) || warnedUnmeasuredInteractive.has(v.raw)) return;
+  warnedUnmeasuredInteractive.add(v.raw);
+  log.warn(
+    "the interactive transport has not been measured on this Claude Code version; it reads the TUI's screen and transcript, which a new release can change. If a turn hangs or a dialog is not handled, run /claude-code-doctor bundle and report it",
+    { cliVersion: v.raw, measuredCli: INTERACTIVE_MEASURED_CLI }
+  );
+}
 function cliSupportsSideQuestion(v) {
   if (!v) return false;
   return gte(v, { major: 2, minor: 1, patch: 258 });
@@ -3783,12 +3798,16 @@ async function fetchSessionParentId(sessionID) {
     return void 0;
   }
 }
-async function fetchSessionRunState(sessionID) {
+async function fetchSessionRunState(sessionID, directory) {
   if (!sessionID || sessionID === "default") return "unknown";
   const status = opencodeClient?.session?.status;
   if (!status) return "unknown";
   try {
-    const res = await status.call(opencodeClient.session);
+    const dir = directory ?? await fetchSessionDirectory(sessionID);
+    const res = await status.call(
+      opencodeClient.session,
+      dir ? { query: { directory: dir } } : void 0
+    );
     const data = res.data;
     if (!data || typeof data !== "object") return "unknown";
     const entry = data[sessionID];
@@ -3808,8 +3827,10 @@ async function settleSessionRunState(sessionID, options = {}) {
   const windowMs = options.windowMs ?? 1500;
   const started = Date.now();
   let last = "unknown";
+  let directory = options.directory;
   for (; ; ) {
-    const state = await fetchSessionRunState(sessionID);
+    directory ??= await fetchSessionDirectory(sessionID);
+    const state = await fetchSessionRunState(sessionID, directory ?? "");
     if (state === "busy") return "busy";
     if (state !== "unknown") last = state;
     if (Date.now() - started >= windowMs) return last;
@@ -5425,6 +5446,7 @@ function snapshotActiveProcesses(now = Date.now()) {
       ageMs: ap.startedAt === void 0 ? void 0 : Math.max(0, now - ap.startedAt),
       effort: ap.effort,
       attached: ap.lineEmitter.listenerCount("line") > 0,
+      transport: ap.interactiveControl ? "interactive" : "headless",
       proxyUrl: ap.proxyServer?.url,
       lastStderr: typeof lastStderr === "string" ? lastStderr : void 0
     });
@@ -5839,6 +5861,7 @@ var PLUGIN_LOG_MESSAGES = /* @__PURE__ */ new Set([
   "skipping remote MCP server with no url",
   "stale scratch directory sweep failed",
   "task_batch resolving with child results missing",
+  "the interactive transport has not been measured on this Claude Code version; it reads the TUI's screen and transcript, which a new release can change. If a turn hangs or a dialog is not handled, run /claude-code-doctor bundle and report it",
   "this opencode process is running an older plugin build than the one on disk",
   "timed out pending proxy call",
   "turn abort listener threw",
@@ -5988,6 +6011,7 @@ var BUNDLE_DATA_ALLOWLIST = {
   toolNames: "name",
   cliFloor: "version",
   cliVersion: "version",
+  measuredCli: "version",
   // The two halves of the stale-build WARN: what this process loaded and what
   // is on disk now. Both are this package's own version strings.
   loadedVersion: "version",
@@ -6447,6 +6471,34 @@ import * as fs4 from "fs";
 import * as path5 from "path";
 import { promisify as promisify2 } from "util";
 import { fileURLToPath } from "url";
+
+// src/transport.ts
+function requestedTransport(config, env = process.env.CLAUDE_CODE_INTERACTIVE_TRANSPORT) {
+  if (config.transport !== void 0) {
+    if (!["auto", "headless", "interactive"].includes(config.transport)) {
+      throw new Error(`Unknown Claude transport: ${config.transport}`);
+    }
+    return config.transport;
+  }
+  const enabled = config.interactive ?? (env !== void 0 && !["", "0", "false", "no", "off"].includes(env.trim().toLowerCase()));
+  return enabled ? "interactive" : "headless";
+}
+function hasInteractiveTransport() {
+  const runtime = globalThis;
+  return typeof runtime.Bun?.Terminal === "function";
+}
+async function selectTransport(requested, cliPath, available = hasInteractiveTransport()) {
+  if (requested === "headless") return "headless";
+  if (requested === "interactive") {
+    if (!available) throw new Error("Interactive Claude transport requires Bun.Terminal. Run opencode under a Bun runtime with PTY support.");
+    return "interactive";
+  }
+  if (await detectHeadlessSupport(cliPath) !== "unsupported") return "headless";
+  if (!available) throw new Error("Claude no longer supports the headless flags, and Bun.Terminal is unavailable. Run opencode under a Bun runtime with PTY support.");
+  return "interactive";
+}
+
+// src/startup-diagnostics.ts
 var cachedPluginVersion;
 function pluginVersion() {
   if (cachedPluginVersion) return cachedPluginVersion;
@@ -6529,6 +6581,15 @@ function collectStartupDiagnostics(providers, opencodeVersion) {
       error: err instanceof Error ? err.message : String(err)
     });
   }
+  let transport;
+  try {
+    transport = requestedTransport({
+      transport: firstOption(providers, "transport"),
+      interactive: firstOption(providers, "interactive")
+    });
+  } catch {
+    transport = "invalid";
+  }
   return {
     plugin: pluginVersion(),
     opencode: opencodeVersion ?? process.env.OPENCODE_VERSION ?? "unknown",
@@ -6541,7 +6602,8 @@ function collectStartupDiagnostics(providers, opencodeVersion) {
     permissionPresets: Object.entries(providers).map(
       ([name, entry]) => summarizePermissionPreset(name, entry?.options)
     ),
-    interactiveTransport: firstOption(providers, "interactive") === true || process.env.CLAUDE_CODE_INTERACTIVE_TRANSPORT === "1",
+    transport,
+    interactiveTransport: transport === "interactive",
     planModeQuestion: firstOption(providers, "planModeQuestion") === true,
     anthropicApiKeyInEnv: Boolean(
       process.env.ANTHROPIC_API_KEY || process.env.ANTHROPIC_AUTH_TOKEN
@@ -6810,7 +6872,14 @@ function formatDoctorReport(report) {
   lines.push(`| proxyTools | ${list(report.proxyTools)} |`);
   lines.push(`| MCP servers (on disk) | ${list(report.mcpServers)} |`);
   lines.push(`| permissionPreset | ${describePermissionPresets(report.permissionPresets)} |`);
-  lines.push(`| transport | ${report.transport} |`);
+  lines.push(
+    `| transport | ${report.transport}${report.transport === "auto" ? " (headless until claude refuses `--print`)" : ""}; this conversation: ${report.transportInUse} |`
+  );
+  if (report.interactiveMeasured) {
+    lines.push(
+      `| interactive transport measured on | Claude Code ${report.interactiveMeasured.measured}${report.interactiveMeasured.unmeasured ? ` (this CLI, ${report.claudeCli.version}, is newer and unmeasured: if a turn hangs, send \`/claude-code-doctor bundle\`)` : ""} |`
+    );
+  }
   lines.push(`| planModeQuestion | ${report.planModeQuestion} |`);
   lines.push(`| turnStats | ${report.turnStats} |`);
   lines.push(`| ANTHROPIC_API_KEY in env | ${report.anthropicApiKeyInEnv ? "yes" : "no"} |`);
@@ -6831,11 +6900,11 @@ function formatDoctorReport(report) {
   if (report.processes.length === 0) {
     lines.push("None. The next message in a Claude Code session spawns one.");
   } else {
-    lines.push("| session | model | pid | in flight | age | effort |");
-    lines.push("|---|---|---|---|---|---|");
+    lines.push("| session | model | transport | pid | in flight | age | effort |");
+    lines.push("|---|---|---|---|---|---|---|");
     for (const proc of report.processes) {
       lines.push(
-        `| ${proc.session}${proc.compaction ? " (compaction)" : ""} | ${proc.model} | ${proc.pid ?? "unknown"} | ${proc.inFlight ? "yes" : "no"} | ${formatAge(proc.ageMs)} | ${proc.effort ?? "inherited"} |`
+        `| ${proc.session}${proc.compaction ? " (compaction)" : ""} | ${proc.model} | ${proc.transport} | ${proc.pid ?? "unknown"} | ${proc.inFlight ? "yes" : "no"} | ${formatAge(proc.ageMs)} | ${proc.effort ?? "inherited"} |`
       );
     }
   }
@@ -7055,7 +7124,9 @@ async function gatherDoctorReport(options) {
     proxyTools: base.proxyTools,
     mcpServers: base.mcpServers,
     permissionPresets: base.permissionPresets,
-    transport: options.interactive || base.interactiveTransport ? "interactive" : "headless",
+    transport: base.transport,
+    transportInUse: options.interactive ? "interactive" : "headless",
+    interactiveMeasured: base.transport !== "headless" || options.interactive || processes.some((proc) => proc.transport === "interactive") ? { measured: INTERACTIVE_MEASURED_CLI, unmeasured: isUnmeasuredInteractiveCli(cli) } : void 0,
     planModeQuestion: base.planModeQuestion,
     turnStats: options.turnStats,
     anthropicApiKeyInEnv: base.anthropicApiKeyInEnv,
@@ -8219,6 +8290,38 @@ Now continuing with the current message:
     }
   });
 }
+function getTrailingUserMessages(prompt, opts = {}) {
+  prompt = stripAccountFailoverParts(prompt);
+  if (opts.stripContextReminders) prompt = stripContextReminders(prompt).prompt;
+  let assistantIndex = -1;
+  for (let i = prompt.length - 1; i >= 0; i--) {
+    if (prompt[i].role === "assistant") {
+      assistantIndex = i;
+      break;
+    }
+  }
+  const messages = [];
+  for (let i = assistantIndex + 1; i < prompt.length; i++) {
+    const msg = prompt[i];
+    if (msg.role !== "user") continue;
+    if (parseSideQuestionContent(msg.content) !== null) continue;
+    const blocks = [];
+    if (typeof msg.content === "string") {
+      if (msg.content.trim()) blocks.push({ type: "text", text: msg.content });
+    } else if (Array.isArray(msg.content)) {
+      for (const part of msg.content) {
+        if (part.type === "text") {
+          if (part.text && part.text.trim()) blocks.push({ type: "text", text: part.text });
+        } else if (part.type === "file" || part.type === "image") {
+          const block = toImageBlock(part);
+          if (block) blocks.push(block);
+        }
+      }
+    }
+    if (blocks.length > 0) messages.push(blocks);
+  }
+  return { assistantIndex, messages };
+}
 
 // src/skill-bridge.ts
 import * as crypto3 from "crypto";
@@ -10026,32 +10129,6 @@ function spawnInteractiveProcess(opts) {
   return ap;
 }
 
-// src/transport.ts
-function requestedTransport(config, env = process.env.CLAUDE_CODE_INTERACTIVE_TRANSPORT) {
-  if (config.transport !== void 0) {
-    if (!["auto", "headless", "interactive"].includes(config.transport)) {
-      throw new Error(`Unknown Claude transport: ${config.transport}`);
-    }
-    return config.transport;
-  }
-  const enabled = config.interactive ?? (env !== void 0 && !["", "0", "false", "no", "off"].includes(env.trim().toLowerCase()));
-  return enabled ? "interactive" : "headless";
-}
-function hasInteractiveTransport() {
-  const runtime = globalThis;
-  return typeof runtime.Bun?.Terminal === "function";
-}
-async function selectTransport(requested, cliPath, available = hasInteractiveTransport()) {
-  if (requested === "headless") return "headless";
-  if (requested === "interactive") {
-    if (!available) throw new Error("Interactive Claude transport requires Bun.Terminal. Run opencode under a Bun runtime with PTY support.");
-    return "interactive";
-  }
-  if (await detectHeadlessSupport(cliPath) !== "unsupported") return "headless";
-  if (!available) throw new Error("Claude no longer supports the headless flags, and Bun.Terminal is unavailable. Run opencode under a Bun runtime with PTY support.");
-  return "interactive";
-}
-
 // src/prompts.ts
 import { readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir8 } from "os";
@@ -12502,6 +12579,7 @@ async function isProxyCallStillServed(callId) {
   return await fetchSessionRunState(session) === "busy";
 }
 setProxyDeadlineGuard(({ callId }) => isProxyCallStillServed(callId));
+var FORWARD_SETTLE_MS = 250;
 var CHILD_EXIT_STATUS_GRACE_MS = 250;
 var ClaudeCodeLanguageModel = class {
   specificationVersion = "v3";
@@ -13294,6 +13372,7 @@ var ClaudeCodeLanguageModel = class {
       return abortedBeforeWork("waiting for opencode's MCP status and the CLI version");
     }
     const [runtimeStatus, cliVersion] = prologue.value;
+    if (useInteractive) reportUnmeasuredInteractiveCli(cliVersion);
     const ptyReadOnly = useInteractive && !compactionMode && !doctor && isReadOnlyPermissionMode(this.config.permissionMode);
     const ptyReadOnlySupported = cliSupportsRestricted(cliVersion) && cliSupportsDontAsk(cliVersion);
     if (ptyReadOnly && !ptyReadOnlySupported) {
@@ -13422,7 +13501,7 @@ var ClaudeCodeLanguageModel = class {
                   });
                   return;
                 }
-                log.info("abort between proxy tool boundaries; releasing pending calls", { sk, reason });
+                log.info("abort between proxy tool boundaries; releasing pending calls", { sk, reason, session: stopped });
                 void interruptTurn(stoppedProcess).then((idle) => {
                   log.info("interrupt sent for aborted turn", { sk, idle });
                 });
@@ -14253,6 +14332,34 @@ var ClaudeCodeLanguageModel = class {
           state.proc.on("error", procErrorHandler);
           if (hasMatchedPendingResults) {
             state.cliAskedForWork = true;
+            const forwardTrailingUserMessages = () => {
+              if (compactionMode || !state.activeProcess) return 0;
+              if (state.activeProcess.interactiveControl) return 0;
+              const trailing = getTrailingUserMessages(effectivePrompt, {
+                stripContextReminders: self.stripContextRemindersEnabled()
+              });
+              const sent = state.activeProcess.forwardedUserMessages?.assistantIndex === trailing.assistantIndex ? state.activeProcess.forwardedUserMessages.count : 0;
+              const fresh = trailing.messages.slice(sent);
+              if (fresh.length === 0) return 0;
+              state.activeProcess.forwardedUserMessages = {
+                assistantIndex: trailing.assistantIndex,
+                count: trailing.messages.length
+              };
+              for (const content of fresh) {
+                state.proc.stdin?.write(
+                  JSON.stringify({ type: "user", message: { role: "user", content } }) + "\n"
+                );
+              }
+              log.info("forwarded user messages that arrived beside tool results", {
+                sessionKey: sk,
+                messages: fresh.length
+              });
+              return fresh.length;
+            };
+            if (!state.unattendedTurnEnded && forwardTrailingUserMessages() > 0) {
+              await new Promise((resolve6) => setTimeout(resolve6, FORWARD_SETTLE_MS));
+              if (state.controllerClosed) return;
+            }
             for (const { call, result } of previousPendingProxyMatches) {
               if (result) {
                 const channelClosed = isPendingProxyCallChannelClosed(call);
@@ -14282,7 +14389,10 @@ var ClaudeCodeLanguageModel = class {
                 );
               }
             }
-            if (state.unattendedTurnEnded) deliverPendingCompletions(state);
+            if (state.unattendedTurnEnded) {
+              deliverPendingCompletions(state);
+              forwardTrailingUserMessages();
+            }
             const unemitted = getPendingProxyCalls(sk).filter(
               (call) => !call.emitted
             );
@@ -14311,7 +14421,10 @@ var ClaudeCodeLanguageModel = class {
             }
           }
           state.cliAskedForWork = true;
-          if (state.activeProcess) noteTurnStarted(state.activeProcess);
+          if (state.activeProcess) {
+            noteTurnStarted(state.activeProcess);
+            state.activeProcess.forwardedUserMessages = void 0;
+          }
           state.proc.stdin?.write(userMsg + "\n");
           log.debug("sent user message", { textLength: userMsg.length });
           armStartWatchdog(state);