Pass abort signal to mcp

Nifury · Nifury · commit 079eaee9ecdf · 2026-04-30T20:46:44.000-07:00
diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts
@@ -148,7 +148,7 @@ function convertMcpTool(mcpTool: MCPToolDef, client: MCPClient, timeout?: number
   return dynamicTool({
     description: mcpTool.description ?? "",
     inputSchema: jsonSchema(schema),
-    execute: async (args: unknown) => {
+    execute: async (args: unknown, opts) => {
       return client.callTool(
         {
           name: mcpTool.name,
@@ -157,6 +157,7 @@ function convertMcpTool(mcpTool: MCPToolDef, client: MCPClient, timeout?: number
         CallToolResultSchema,
         {
           resetTimeoutOnProgress: true,
+          signal: opts.abortSignal,
           timeout,
         },
       )

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ function convertMcpTool(mcpTool: MCPToolDef, client: MCPClient, timeout?: number`
`148`	`148`	`return dynamicTool({`
`149`	`149`	`description: mcpTool.description ?? "",`
`150`	`150`	`inputSchema: jsonSchema(schema),`
`151`		`- execute: async (args: unknown) => {`
	`151`	`+ execute: async (args: unknown, opts) => {`
`152`	`152`	`return client.callTool(`
`153`	`153`	`{`
`154`	`154`	`name: mcpTool.name,`
`@@ -157,6 +157,7 @@ function convertMcpTool(mcpTool: MCPToolDef, client: MCPClient, timeout?: number`
`157`	`157`	`CallToolResultSchema,`
`158`	`158`	`{`
`159`	`159`	`resetTimeoutOnProgress: true,`
	`160`	`+ signal: opts.abortSignal,`
`160`	`161`	`timeout,`
`161`	`162`	`},`
`162`	`163`	`)`