From bc25ac8bacc294979f1a5616bfc8e589e715cd6a Mon Sep 17 00:00:00 2001 From: Andrei Shenets Date: Sun, 15 Nov 2026 14:03:28 +0100 Subject: [PATCH 1/4] fix(opencode): show MCP tool details in approval prompts --- .../Adapters/OpenCode2AdapterV2.test.ts | 69 +++++++++++++++++++ .../src/server/v2/adapter.ts | 15 +++- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts index 73dbb42ca8752..c46732467e609 100644 --- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts @@ -3059,6 +3059,75 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => { }), ); + it.effect.each([ + { + action: "github_create_issue", + resources: ["*"], + metadata: { input: { title: "Fix approvals", labels: ["bug"] } }, + prompt: + 'github_create_issue\n{\n "title": "Fix approvals",\n "labels": [\n "bug"\n ]\n}\nResource: *', + }, + { + action: "github_create_issue", + resources: ["*"], + metadata: {}, + prompt: "github_create_issue\nResource: *", + }, + { + action: "shell", + resources: ["echo FIRST"], + metadata: { input: { command: "echo FIRST" } }, + prompt: "echo FIRST", + }, + { + action: "external_directory", + resources: ["/first/*", "/second/*"], + metadata: {}, + prompt: "/first/*\n/second/*", + }, + { action: "custom", resources: [], metadata: {}, prompt: "custom" }, + ])( + "identifies a $action permission on $resources without changing its scope", + ({ prompt, ...permission }) => + Effect.gen(function* () { + const { runtime, thread } = yield* resumed([ + out("session.prompt", { sessionID: SESSION, text: "" }), + promptAccepted, + event("permission.asked", { ...shellAsk.data, ...permission, save: ["*"] }), + out("permission.reply", { + sessionID: SESSION, + requestID: shellAsk.data.id, + decision: "once", + }), + reply("permission.reply", null), + event("session.execution.succeeded", { sessionID: SESSION }), + ]); + const requested = yield* Deferred.make(); + const events = yield* runtime.events.pipe( + Stream.tap((entry) => + entry.type === "runtime_request.updated" && entry.runtimeRequest.status === "pending" + ? Deferred.succeed(requested, entry.runtimeRequest.id) + : Effect.void, + ), + Stream.takeUntil((entry) => entry.type === "turn.terminal"), + Stream.runCollect, + Effect.forkScoped, + ); + + yield* runtime.startTurn(turnInput(thread)); + const requestId = yield* Deferred.await(requested); + yield* runtime.respondToRuntimeRequest({ requestId, decision: "accept" }); + + const items = (yield* Fiber.join(events)).flatMap((entry) => + entry.type === "turn_item.updated" && entry.turnItem.type === "approval_request" + ? [entry.turnItem] + : [], + ); + assert.equal(items[0]?.prompt, prompt); + assert.equal(items[0]?.title, permission.action); + }), + ); + it.effect("asks a subagent's permission request on the parent thread's turn", () => Effect.gen(function* () { const child = "ses_f0e5aa64cffelFnoQRL0DAA9BH"; diff --git a/packages/provider-opencode/src/server/v2/adapter.ts b/packages/provider-opencode/src/server/v2/adapter.ts index 6604f84eb289e..24aab212bddf2 100644 --- a/packages/provider-opencode/src/server/v2/adapter.ts +++ b/packages/provider-opencode/src/server/v2/adapter.ts @@ -119,6 +119,10 @@ const NativeTodoList = Schema.Struct({ }); const isNativeTodoList = Schema.is(NativeTodoList); +const encodePermissionInput = Schema.encodeOption( + Schema.fromJsonString(Schema.Unknown, { space: 2 }), +); + const OpenCode2ProviderCapabilities = { sessions: { supportsMultipleProviderThreadsPerSession: true, @@ -2548,7 +2552,16 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr { type: "approval_request", requestKind: openCodePermissionRequestKind(data.action, toolName), - prompt: data.resources.length === 0 ? data.action : data.resources.join("\n"), + prompt: + data.resources.length === 1 && data.resources[0] === "*" + ? [ + data.action, + ...Option.toArray(encodePermissionInput(data.metadata?.input)), + "Resource: *", + ].join("\n") + : data.resources.length === 0 + ? data.action + : data.resources.join("\n"), options: [ { decision: "cancel", label: "Cancel" }, { decision: "decline", label: "Decline" }, From 467e5daa70e201b0cd94c41f4483deb58b538cf3 Mon Sep 17 00:00:00 2001 From: Andrei Shenets Date: Sun, 15 Nov 2026 14:20:49 +0100 Subject: [PATCH 2/4] fix(opencode): keep wildcard approvals on one line --- .../Adapters/OpenCode2AdapterV2.test.ts | 5 ++--- .../provider-opencode/src/server/v2/adapter.ts | 17 ++++------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts index c46732467e609..8a2920d326ed4 100644 --- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts @@ -3064,14 +3064,13 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => { action: "github_create_issue", resources: ["*"], metadata: { input: { title: "Fix approvals", labels: ["bug"] } }, - prompt: - 'github_create_issue\n{\n "title": "Fix approvals",\n "labels": [\n "bug"\n ]\n}\nResource: *', + prompt: "github_create_issue", }, { action: "github_create_issue", resources: ["*"], metadata: {}, - prompt: "github_create_issue\nResource: *", + prompt: "github_create_issue", }, { action: "shell", diff --git a/packages/provider-opencode/src/server/v2/adapter.ts b/packages/provider-opencode/src/server/v2/adapter.ts index 24aab212bddf2..dda0ddf11164b 100644 --- a/packages/provider-opencode/src/server/v2/adapter.ts +++ b/packages/provider-opencode/src/server/v2/adapter.ts @@ -119,10 +119,6 @@ const NativeTodoList = Schema.Struct({ }); const isNativeTodoList = Schema.is(NativeTodoList); -const encodePermissionInput = Schema.encodeOption( - Schema.fromJsonString(Schema.Unknown, { space: 2 }), -); - const OpenCode2ProviderCapabilities = { sessions: { supportsMultipleProviderThreadsPerSession: true, @@ -2553,15 +2549,10 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr type: "approval_request", requestKind: openCodePermissionRequestKind(data.action, toolName), prompt: - data.resources.length === 1 && data.resources[0] === "*" - ? [ - data.action, - ...Option.toArray(encodePermissionInput(data.metadata?.input)), - "Resource: *", - ].join("\n") - : data.resources.length === 0 - ? data.action - : data.resources.join("\n"), + data.resources.length === 0 || + (data.resources.length === 1 && data.resources[0] === "*") + ? data.action + : data.resources.join("\n"), options: [ { decision: "cancel", label: "Cancel" }, { decision: "decline", label: "Decline" }, From 92ce75edb1cb96c31e77de1f42929c4ad6c11b5c Mon Sep 17 00:00:00 2001 From: Andrei Shenets Date: Sun, 15 Nov 2026 14:29:24 +0100 Subject: [PATCH 3/4] test(opencode): cover permissions inside code mode --- .../Adapters/OpenCode2AdapterV2.test.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts index 8a2920d326ed4..01bbb7ca4dcdb 100644 --- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts @@ -3065,6 +3065,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => { resources: ["*"], metadata: { input: { title: "Fix approvals", labels: ["bug"] } }, prompt: "github_create_issue", + sourceTool: "execute", }, { action: "github_create_issue", @@ -3087,11 +3088,21 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => { { action: "custom", resources: [], metadata: {}, prompt: "custom" }, ])( "identifies a $action permission on $resources without changing its scope", - ({ prompt, ...permission }) => + ({ prompt, sourceTool, ...permission }) => Effect.gen(function* () { const { runtime, thread } = yield* resumed([ out("session.prompt", { sessionID: SESSION, text: "" }), promptAccepted, + ...(sourceTool === undefined + ? [] + : [ + event("session.tool.input.started", { + sessionID: SESSION, + assistantMessageID: shellAsk.data.source.messageID, + id: shellAsk.data.source.id, + name: sourceTool, + }), + ]), event("permission.asked", { ...shellAsk.data, ...permission, save: ["*"] }), out("permission.reply", { sessionID: SESSION, From ac75a09804277c37cb2bb1fe83aca40fe166517c Mon Sep 17 00:00:00 2001 From: Andrei Shenets Date: Sun, 15 Nov 2026 14:38:41 +0100 Subject: [PATCH 4/4] fix(opencode): show actions for resources containing wildcards --- .../Adapters/OpenCode2AdapterV2.test.ts | 113 +++++++++--------- .../src/server/v2/adapter.ts | 3 +- 2 files changed, 60 insertions(+), 56 deletions(-) diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts index 01bbb7ca4dcdb..e931d5cd3ae22 100644 --- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts @@ -3070,72 +3070,77 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => { { action: "github_create_issue", resources: ["*"], - metadata: {}, prompt: "github_create_issue", }, { action: "shell", resources: ["echo FIRST"], - metadata: { input: { command: "echo FIRST" } }, prompt: "echo FIRST", }, { action: "external_directory", - resources: ["/first/*", "/second/*"], - metadata: {}, - prompt: "/first/*\n/second/*", + resources: ["/first/config.json", "/second/*"], + prompt: "external_directory", }, - { action: "custom", resources: [], metadata: {}, prompt: "custom" }, - ])( - "identifies a $action permission on $resources without changing its scope", - ({ prompt, sourceTool, ...permission }) => - Effect.gen(function* () { - const { runtime, thread } = yield* resumed([ - out("session.prompt", { sessionID: SESSION, text: "" }), - promptAccepted, - ...(sourceTool === undefined - ? [] - : [ - event("session.tool.input.started", { - sessionID: SESSION, - assistantMessageID: shellAsk.data.source.messageID, - id: shellAsk.data.source.id, - name: sourceTool, - }), - ]), - event("permission.asked", { ...shellAsk.data, ...permission, save: ["*"] }), - out("permission.reply", { - sessionID: SESSION, - requestID: shellAsk.data.id, - decision: "once", - }), - reply("permission.reply", null), - event("session.execution.succeeded", { sessionID: SESSION }), - ]); - const requested = yield* Deferred.make(); - const events = yield* runtime.events.pipe( - Stream.tap((entry) => - entry.type === "runtime_request.updated" && entry.runtimeRequest.status === "pending" - ? Deferred.succeed(requested, entry.runtimeRequest.id) - : Effect.void, - ), - Stream.takeUntil((entry) => entry.type === "turn.terminal"), - Stream.runCollect, - Effect.forkScoped, - ); + { + action: "shell", + resources: ["git status *"], + prompt: "shell", + }, + { + action: "external_directory", + resources: ["/first/config.json", "/second/config.json"], + prompt: "/first/config.json\n/second/config.json", + }, + { action: "custom", resources: [], prompt: "custom" }, + ])("shows a $action permission prompt for $resources", ({ prompt, sourceTool, ...permission }) => + Effect.gen(function* () { + const { runtime, thread } = yield* resumed([ + out("session.prompt", { sessionID: SESSION, text: "" }), + promptAccepted, + ...(sourceTool === undefined + ? [] + : [ + event("session.tool.input.started", { + sessionID: SESSION, + assistantMessageID: shellAsk.data.source.messageID, + id: shellAsk.data.source.id, + name: sourceTool, + }), + ]), + event("permission.asked", { ...shellAsk.data, ...permission, save: ["*"] }), + out("permission.reply", { + sessionID: SESSION, + requestID: shellAsk.data.id, + decision: "once", + }), + reply("permission.reply", null), + event("session.execution.succeeded", { sessionID: SESSION }), + ]); + const requested = yield* Deferred.make(); + const events = yield* runtime.events.pipe( + Stream.tap((entry) => + entry.type === "runtime_request.updated" && entry.runtimeRequest.status === "pending" + ? Deferred.succeed(requested, entry.runtimeRequest.id) + : Effect.void, + ), + Stream.takeUntil((entry) => entry.type === "turn.terminal"), + Stream.runCollect, + Effect.forkScoped, + ); - yield* runtime.startTurn(turnInput(thread)); - const requestId = yield* Deferred.await(requested); - yield* runtime.respondToRuntimeRequest({ requestId, decision: "accept" }); + yield* runtime.startTurn(turnInput(thread)); + const requestId = yield* Deferred.await(requested); + yield* runtime.respondToRuntimeRequest({ requestId, decision: "accept" }); - const items = (yield* Fiber.join(events)).flatMap((entry) => - entry.type === "turn_item.updated" && entry.turnItem.type === "approval_request" - ? [entry.turnItem] - : [], - ); - assert.equal(items[0]?.prompt, prompt); - assert.equal(items[0]?.title, permission.action); - }), + const items = (yield* Fiber.join(events)).flatMap((entry) => + entry.type === "turn_item.updated" && entry.turnItem.type === "approval_request" + ? [entry.turnItem] + : [], + ); + assert.equal(items[0]?.prompt, prompt); + assert.equal(items[0]?.title, permission.action); + }), ); it.effect("asks a subagent's permission request on the parent thread's turn", () => diff --git a/packages/provider-opencode/src/server/v2/adapter.ts b/packages/provider-opencode/src/server/v2/adapter.ts index dda0ddf11164b..e6437671e5774 100644 --- a/packages/provider-opencode/src/server/v2/adapter.ts +++ b/packages/provider-opencode/src/server/v2/adapter.ts @@ -2549,8 +2549,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr type: "approval_request", requestKind: openCodePermissionRequestKind(data.action, toolName), prompt: - data.resources.length === 0 || - (data.resources.length === 1 && data.resources[0] === "*") + data.resources.length === 0 || data.resources.some((resource) => resource.includes("*")) ? data.action : data.resources.join("\n"), options: [