@khalilgharbaoui/opencode-claude-code-plugin 0.42.1 → 0.42.3

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 });
@@ -5431,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
     });
@@ -5845,6 +5861,8 @@ 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",
+  "the interactive turn did not take a forwarded user message",
   "this opencode process is running an older plugin build than the one on disk",
   "timed out pending proxy call",
   "turn abort listener threw",
@@ -5994,6 +6012,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",
@@ -6453,6 +6472,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;
@@ -6535,6 +6582,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",
@@ -6547,7 +6603,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
@@ -6816,7 +6873,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"} |`);
@@ -6837,11 +6901,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"} |`
       );
     }
   }
@@ -7061,7 +7125,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,
@@ -8934,6 +9000,9 @@ var ClaudeSession = class {
    *  (the TUI repaints it while it takes the key, measured on 2.1.288) can
    *  never stand in for the next call's dialog. */
   planDialog = null;
+  /** `queue-operation` enqueue records read, which is how `queueInput` knows
+   *  the TUI took a message into the running turn. */
+  enqueued = 0;
   /** This turn's `ExitPlanMode` calls already answered. */
   answeredPlans = /* @__PURE__ */ new Set();
   abandonTurn = false;
@@ -8992,7 +9061,9 @@ var ClaudeSession = class {
       // The decision arrives after opencode's own question round trip, by
       // which time the dialog has long been drawn; this only bounds a TUI
       // that never draws it.
-      planDialogWaitMs: opts.planDialogWaitMs ?? 3e4
+      planDialogWaitMs: opts.planDialogWaitMs ?? 3e4,
+      // 100 times the longest silence measured while Claude works (h #g207).
+      idleEndMs: opts.idleEndMs ?? 2e4
     };
   }
   /** The CLI arguments this session spawns with. */
@@ -9270,7 +9341,8 @@ var ClaudeSession = class {
         end: null,
         sawUserRecord: false,
         lastBeat: Date.now(),
-        awaitingOwnPrompt: this.forkPending ? normalizedPrompt(prompt) : null
+        awaitingOwnPrompt: this.forkPending ? normalizedPrompt(prompt) : null,
+        sawReply: false
       };
       this.forkPending = false;
       this.scan = scan;
@@ -9293,6 +9365,9 @@ var ClaudeSession = class {
         if (scan.stopReason && Date.now() - scan.stopSeenAt >= this.o.stopSettleMs) {
           return { stopReason: scan.stopReason, end: "stop", denied: this.turnDenied };
         }
+        if (scan.sawReply && !this.planApprovalToolUseId && Date.now() - this.lastDataAt >= this.o.idleEndMs && Date.now() - scan.stopSeenAt >= this.o.idleEndMs) {
+          return { stopReason: null, end: "ended", denied: this.turnDenied };
+        }
         if (this.exited) throw new Error(this.failureMessage("claude exited mid-turn", true));
         if (this.abandonTurn) return { stopReason: null, end: "interrupted", denied: this.turnDenied };
         const now = Date.now();
@@ -9342,9 +9417,11 @@ var ClaudeSession = class {
         scan.awaitingOwnPrompt = null;
       }
       if (rec) this.notePlanApproval(rec);
+      if (rec?.type === "queue-operation" && rec.operation === "enqueue") this.enqueued++;
       scan.onRecord(s, rec);
       if (rec) {
         if (rec.type === "assistant" && rec.message) {
+          scan.sawReply = true;
           const reason = rec.message.stop_reason;
           if (typeof reason === "string") {
             scan.stopReason = TERMINAL_STOP.has(reason) ? reason : null;
@@ -9433,6 +9510,29 @@ var ClaudeSession = class {
     this.write("\r");
     return true;
   }
+  /**
+   * Type a message into the running turn's own input queue, not as a turn of
+   * its own (h #g206). Measured on 2.1.288: text pasted and submitted while a
+   * tool call runs is recorded as `queue-operation` enqueue and remove plus a
+   * `queued_command` attachment, answered in the same turn, which still ends
+   * once. Resolves true once the enqueue is in the transcript; false with no
+   * turn running, or with a plan approval dialog up, which would take the
+   * keys as its answer.
+   */
+  async queueInput(text, timeoutMs = 3e3) {
+    if (!this.turn || !this.proc || this.exited || this.pendingPlanApproval) return false;
+    const before = this.enqueued;
+    this.write(this.o.bracketedPaste ? "\x1B[200~" + text + "\x1B[201~" : text);
+    await delay(this.o.submitMinMs);
+    this.write("\r");
+    const deadline = Date.now() + timeoutMs;
+    while (this.enqueued === before) {
+      if (!this.turn || this.exited || Date.now() >= deadline) return false;
+      await delay(this.o.pollMs);
+      this.scanTranscript();
+    }
+    return true;
+  }
   /** Wait until the PTY has been quiet for `permissionQuietMs`, at most 3 s. */
   async waitForQuiet() {
     const until = Date.now() + 3e3;
@@ -10058,38 +10158,19 @@ function spawnInteractiveProcess(opts) {
       },
       flushTranscript: () => session.flushTranscript(),
       planApprovalPending: () => session.pendingPlanApproval !== null,
+      // Text only: an image in a mid-call message is dropped with the
+      // decoder's own warning rather than staged for a turn that is not ours.
+      queueInput: async (content) => {
+        const text = decodeUserEnvelope(JSON.stringify({ type: "user", message: { role: "user", content } })).trim();
+        if (!text) return false;
+        return session.queueInput(text);
+      },
       askAside
     }
   };
   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";
@@ -13333,6 +13414,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) {
@@ -14292,9 +14374,10 @@ var ClaudeCodeLanguageModel = class {
           state.proc.on("error", procErrorHandler);
           if (hasMatchedPendingResults) {
             state.cliAskedForWork = true;
-            const forwardTrailingUserMessages = () => {
+            const forwardTrailingUserMessages = async () => {
               if (compactionMode || !state.activeProcess) return 0;
-              if (state.activeProcess.interactiveControl) return 0;
+              const control = state.activeProcess.interactiveControl;
+              if (control && (!control.queueInput || !control.turnRunning())) return 0;
               const trailing = getTrailingUserMessages(effectivePrompt, {
                 stripContextReminders: self.stripContextRemindersEnabled()
               });
@@ -14305,6 +14388,21 @@ var ClaudeCodeLanguageModel = class {
                 assistantIndex: trailing.assistantIndex,
                 count: trailing.messages.length
               };
+              if (control) {
+                let queued = 0;
+                for (const content of fresh) if (await control.queueInput(content)) queued++;
+                if (queued < fresh.length) {
+                  log.warn("the interactive turn did not take a forwarded user message", {
+                    sessionKey: sk,
+                    messages: fresh.length - queued
+                  });
+                }
+                log.info("forwarded user messages into the interactive turn's input queue", {
+                  sessionKey: sk,
+                  messages: queued
+                });
+                return queued;
+              }
               for (const content of fresh) {
                 state.proc.stdin?.write(
                   JSON.stringify({ type: "user", message: { role: "user", content } }) + "\n"
@@ -14316,7 +14414,7 @@ var ClaudeCodeLanguageModel = class {
               });
               return fresh.length;
             };
-            if (!state.unattendedTurnEnded && forwardTrailingUserMessages() > 0) {
+            if (!state.unattendedTurnEnded && await forwardTrailingUserMessages() > 0) {
               await new Promise((resolve6) => setTimeout(resolve6, FORWARD_SETTLE_MS));
               if (state.controllerClosed) return;
             }
@@ -14351,7 +14449,7 @@ var ClaudeCodeLanguageModel = class {
             }
             if (state.unattendedTurnEnded) {
               deliverPendingCompletions(state);
-              forwardTrailingUserMessages();
+              await forwardTrailingUserMessages();
             }
             const unemitted = getPendingProxyCalls(sk).filter(
               (call) => !call.emitted