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

package/README.md

@@ -311,7 +311,7 @@ Set `permissionMode: "plan"` to forward `--permission-mode plan` to Claude. The
 
 - **Empty text blocks are dropped.** Claude sometimes opens a `content_block_start` for text but never sends a delta. The plugin no longer emits the empty block (which was triggering Anthropic 400s like `cache_control cannot be set for empty text blocks`).
 - **`AskUserQuestion`** from the CLI is converted into plain text content rather than forwarded as a tool call.
-- **Result fallback timer.** If the CLI finishes a text block but never sends a `result` message, the stream closes gracefully after 5 seconds rather than hanging.
+- **Wire-inactivity watchdog.** Once the CLI has produced any content, the stream closes gracefully if stdout goes silent for 60 seconds without a `result` message arriving. Resets on every line received, so long mid-turn pauses (Sonnet between text-end and the next tool_use, for example) are tolerated. On a user-initiated abort, the watchdog shortens to 5 seconds.
 - **Per-iteration usage.** When the CLI internally retries with tools, the plugin only counts the last iteration's usage so opencode's context accounting stays accurate.
 - **Lazy `cwd`.** The working directory is re-resolved at every request, so opencode's project-aware behavior works without restarting the plugin.
 - **Variants survive merge.** opencode recalculates variant lists after the plugin loads; the plugin re-injects defaults into runtime config so your variants don't disappear.

package/dist/index.d.ts

@@ -114,6 +114,7 @@ interface ClaudeCodeConfig {
     proxyTools?: string[];
     webSearch?: WebSearchRouting;
     hotReloadMcp?: boolean;
+    proxyOpencodeMcpTools?: boolean;
 }
 type WebSearchRouting = "claude" | "disabled" | (string & {});
 interface ClaudeCodeProviderSettings {
@@ -191,6 +192,21 @@ interface ClaudeCodeProviderSettings {
      * survives MCP changes until the chat is reset).
      */
     hotReloadMcp?: boolean;
+    /**
+     * Route opencode MCP server tools through the in-process `opencode_proxy`
+     * MCP server instead of bridging them directly into Claude CLI's
+     * `--mcp-config`. With both layers configured for the same MCP server,
+     * direct bridging causes each tool invocation to execute twice — once by
+     * Claude CLI's own MCP child process and once by opencode. Routing through
+     * the proxy keeps a single execution site (opencode) while preserving the
+     * tool-call/result surface in opencode's UI and its permission prompts.
+     *
+     * Defaults to `true`. Set to `false` to restore the prior direct-bridge
+     * behavior (Claude CLI executes MCP tools itself; opencode also re-executes
+     * — accept the duplication if you need Claude to invoke the tool without
+     * an opencode round-trip).
+     */
+    proxyOpencodeMcpTools?: boolean;
 }
 type PermissionMode = "acceptEdits" | "auto" | "bypassPermissions" | "default" | "dontAsk" | "plan";
 type ControlRequestBehavior = "allow" | "deny";
@@ -305,6 +321,16 @@ declare class ClaudeCodeLanguageModel implements LanguageModelV3 {
     private effectiveMcpConfig;
     /** Resolve ProxyToolDef[] for the configured proxyTools names. */
     private resolvedProxyTools;
+    /**
+     * Resolve ProxyToolDef[] for opencode's MCP-bridged tools so they go
+     * through the in-process proxy instead of being bridged into Claude CLI's
+     * `--mcp-config`. Direct bridging causes double execution because both
+     * Claude CLI's own MCP child and opencode hold their own connection to
+     * the same server; routing through the proxy keeps a single execution
+     * site (opencode). Returns null when the feature is disabled, the SDK
+     * client is unavailable, or no MCP servers are configured.
+     */
+    private resolvedProxyMcpTools;
     /**
      * Create a proxy MCP server for a single active Claude process/session.
      * The process lifecycle owns the server lifecycle via session-manager.
@@ -339,6 +365,18 @@ interface BridgedMcp {
     path: string;
     /** Stable hash of the merged opencode mcp block (pre-translation). */
     hash: string;
+    /**
+     * Names of opencode MCP servers that were bridged into Claude CLI's
+     * `--mcp-config`. Excludes any servers passed in `excludeServers`.
+     */
+    serverNames: string[];
+    /**
+     * Names of every enabled opencode MCP server after merge + runtime
+     * overlay, regardless of whether they ended up bridged or excluded.
+     * Callers (e.g. the proxy-tool builder) use this to decide which
+     * `<server>_<tool>` IDs in opencode's tool catalog are MCP-origin.
+     */
+    allEnabledServerNames: string[];
 }
 /**
  * Per-server runtime status from opencode's `client.mcp.status()`. Used as
@@ -362,7 +400,7 @@ type RuntimeMcpStatus = Record<string, string>;
  * return its path + a stable hash. Returns null when no enabled MCP servers
  * remain after the merge + overlay.
  */
-declare function bridgeOpencodeMcp(cwd: string, runtimeStatus?: RuntimeMcpStatus): BridgedMcp | null;
+declare function bridgeOpencodeMcp(cwd: string, runtimeStatus?: RuntimeMcpStatus, excludeServers?: ReadonlySet<string>): BridgedMcp | null;
 
 declare const defaultModels: Record<string, OpenCodeModel>;