@khalilgharbaoui/opencode-claude-code-plugin 0.4.2 → 0.4.4

package/README.md

@@ -171,6 +171,7 @@ The account model IDs are internally suffixed, for example `claude-sonnet-4-6@wo
 | `mcpConfig` | string \| string[] | – | Extra `--mcp-config` paths/JSON passed alongside the bridged config. |
 | `strictMcpConfig` | boolean | `false` | Pass `--strict-mcp-config` so Claude loads **only** the configured servers and ignores `~/.claude/settings.json`. |
 | `webSearch` | `"claude"` \| `"disabled"` \| `<tool>` | `"claude"` | Routing for Claude's built-in `WebSearch`. See [WebSearch routing](#websearch-routing). |
+| `multiStepContinuation` | boolean | `true` | Append a system-prompt hint nudging Claude to chain tool calls within one turn instead of pausing between subtasks. Each opencode turn boundary requires the user to manually press "continue", so for multi-step tasks this reduces friction. Set `false` to disable. |
 
 ### Overriding model metadata
 

package/dist/index.d.ts

@@ -115,6 +115,7 @@ interface ClaudeCodeConfig {
     webSearch?: WebSearchRouting;
     hotReloadMcp?: boolean;
     proxyOpencodeMcpTools?: boolean;
+    multiStepContinuation?: boolean;
 }
 type WebSearchRouting = "claude" | "disabled" | (string & {});
 interface ClaudeCodeProviderSettings {
@@ -207,6 +208,17 @@ interface ClaudeCodeProviderSettings {
      * an opencode round-trip).
      */
     proxyOpencodeMcpTools?: boolean;
+    /**
+     * Append a short system-prompt hint that nudges Claude to chain
+     * multiple tool calls within a single turn instead of pausing for user
+     * confirmation between subtasks. Each turn boundary in opencode
+     * requires the user to manually press "continue" to resume, so for
+     * multi-step tasks this option reduces friction. Defaults to `true`.
+     *
+     * Set to `false` if you prefer the un-nudged model behavior (Claude
+     * decides when to end the turn entirely on its own).
+     */
+    multiStepContinuation?: boolean;
 }
 type PermissionMode = "acceptEdits" | "auto" | "bypassPermissions" | "default" | "dontAsk" | "plan";
 type ControlRequestBehavior = "allow" | "deny";

package/dist/index.js

@@ -577,6 +577,17 @@ function dotOpencodeDirs(cwd, worktree) {
   if (envDir && dirExists(envDir)) push(envDir);
   return dirs;
 }
+function substituteEnvPlaceholders(source) {
+  const out = {};
+  for (const [k, v] of Object.entries(source)) {
+    if (typeof v !== "string") continue;
+    out[k] = v.replace(/\{env:([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, name) => {
+      const resolved = process.env[name];
+      return typeof resolved === "string" ? resolved : "";
+    });
+  }
+  return out;
+}
 function translateServer(name, spec) {
   if (spec.enabled === false) return null;
   const type = spec.type;
@@ -592,7 +603,9 @@ function translateServer(name, spec) {
     };
     if (cmd.length > 1) out.args = cmd.slice(1).map((s) => String(s));
     if (spec.environment && typeof spec.environment === "object") {
-      out.env = spec.environment;
+      out.env = substituteEnvPlaceholders(
+        spec.environment
+      );
     }
     return out;
   }
@@ -606,7 +619,9 @@ function translateServer(name, spec) {
       url: spec.url
     };
     if (spec.headers && typeof spec.headers === "object") {
-      out.headers = spec.headers;
+      out.headers = substituteEnvPlaceholders(
+        spec.headers
+      );
     }
     return out;
   }
@@ -1486,13 +1501,22 @@ function nearestWorkspaceAgentsPrompt(cwd) {
     dir = parent;
   }
 }
-function buildAppendedSystemPrompt(cwd) {
+var MULTI_STEP_TASK_HINT = `## Continuing through multi-step tasks
+
+opencode requires the user to press "continue" after each turn ends. When a
+task has multiple steps, do them all in one turn \u2014 chain tool calls rather
+than pausing for user confirmation between subtasks. End the turn only
+when the task is done, you need clarification on intent, or you hit a real
+blocker. The user can interrupt or abort at any time; turn endings should
+mark meaningful checkpoints, not every completed substep.`;
+function buildAppendedSystemPrompt(cwd, includeMultiStepHint = true) {
   const parts = [];
   const configRoot = process.env.XDG_CONFIG_HOME ?? join4(homedir2(), ".config");
   const globalAgents = readPromptFileIfPresent(join4(configRoot, "opencode", "AGENTS.md"));
   const workspaceAgents = nearestWorkspaceAgentsPrompt(cwd);
   if (globalAgents) parts.push(globalAgents);
   if (workspaceAgents && workspaceAgents !== globalAgents) parts.push(workspaceAgents);
+  if (includeMultiStepHint) parts.push(MULTI_STEP_TASK_HINT);
   const content = parts.join("\n\n");
   if (!content) return void 0;
   const path5 = join4(tmpdir2(), `opencode-cc-sys-${randomUUID2()}.md`);
@@ -1966,7 +1990,10 @@ var ClaudeCodeLanguageModel = class {
       reasoningEffort
     );
     const runtimeStatus = await getRuntimeMcpStatus();
-    const systemPromptFile = buildAppendedSystemPrompt(cwd);
+    const systemPromptFile = buildAppendedSystemPrompt(
+      cwd,
+      this.config.multiStepContinuation !== false
+    );
     const cliArgs = buildCliArgs({
       sessionKey: sk,
       skipPermissions: this.config.skipPermissions !== false,
@@ -2336,7 +2363,10 @@ ${plan}
             runtimeStatus,
             excludeServers
           );
-          const systemPromptFile = activeProcess ? void 0 : buildAppendedSystemPrompt(cwd);
+          const systemPromptFile = activeProcess ? void 0 : buildAppendedSystemPrompt(
+            cwd,
+            self.config.multiStepContinuation !== false
+          );
           const cliArgs = buildCliArgs({
             sessionKey: sk,
             skipPermissions,
@@ -2857,6 +2887,33 @@ ${plan}
                 });
                 turnCompleted = true;
                 endTextBlock();
+                if (drainBuffer.length > 0) {
+                  log.info(
+                    "draining pending proxy calls at turn-result boundary",
+                    {
+                      sessionKey: sk,
+                      count: drainBuffer.length
+                    }
+                  );
+                  drainNow();
+                  return;
+                }
+                const orphanPending = getPendingProxyCalls(sk);
+                if (orphanPending.length > 0) {
+                  log.warn(
+                    "rejecting orphan pending proxy calls at turn-result boundary",
+                    {
+                      sessionKey: sk,
+                      count: orphanPending.length
+                    }
+                  );
+                  rejectAllPendingProxyCallsForSession(
+                    sk,
+                    new Error(
+                      "Claude CLI emitted result with pending proxy calls not in drain buffer"
+                    )
+                  );
+                }
                 for (const [idx, reasoningId] of reasoningIds) {
                   if (reasoningStarted.get(idx)) {
                     controller.enqueue({
@@ -3498,7 +3555,8 @@ function createClaudeCode(settings = {}) {
       proxyTools,
       webSearch: settings.webSearch,
       hotReloadMcp: settings.hotReloadMcp ?? true,
-      proxyOpencodeMcpTools: settings.proxyOpencodeMcpTools ?? true
+      proxyOpencodeMcpTools: settings.proxyOpencodeMcpTools ?? true,
+      multiStepContinuation: settings.multiStepContinuation ?? true
     });
   };
   const provider = function(modelId) {