Skip to content

Commit e1e0304

Browse files
authored
fix(mcp): surface OAuth completion errors (anomalyco#34145)
1 parent 71c3a7c commit e1e0304

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

‎packages/opencode/src/mcp/index.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { McpAuth } from "./auth"
2828
import { EventV2Bridge } from "@/event-v2-bridge"
2929
import { TuiEvent } from "@/server/tui-event"
3030
import open from "open"
31-
import { Cause, Effect, Exit, Layer, Option, Context, Schema, Stream } from "effect"
31+
import { Cause, Effect, Exit, Layer, Context, Schema, Stream } from "effect"
3232
import { EffectBridge } from "@/effect/bridge"
3333
import { InstanceState } from "@/effect/instance-state"
3434
import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
@@ -928,16 +928,17 @@ export const layer = Layer.effect(
928928
const pending = pendingOAuthTransports.get(mcpName)
929929
if (!pending) throw new Error(`No pending OAuth flow for MCP server: ${mcpName}`)
930930

931-
const result = yield* Effect.tryPromise({
932-
try: () => pending.transport.finishAuth(authorizationCode).then(() => true as const),
933-
catch: (error) => {
934-
return error
935-
},
936-
}).pipe(Effect.option)
931+
const error = yield* Effect.tryPromise({
932+
try: () => pending.transport.finishAuth(authorizationCode),
933+
catch: (error) => error,
934+
}).pipe(
935+
Effect.match({
936+
onFailure: (error) => (error instanceof Error ? error.message : String(error)),
937+
onSuccess: () => undefined,
938+
}),
939+
)
937940

938-
if (Option.isNone(result)) {
939-
return { status: "failed", error: "OAuth completion failed" } satisfies Status
940-
}
941+
if (error) return { status: "failed", error: `OAuth completion failed: ${error}` } satisfies Status
941942

942943
yield* Effect.promise(() => pending.provider?.commit() ?? Promise.resolve())
943944
yield* auth.clearCodeVerifier(mcpName)

‎packages/opencode/test/mcp/oauth-auto-connect.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ mcpTest.instance(
263263

264264
expect(yield* mcp.finishAuth(name, "invalid-code")).toEqual({
265265
status: "failed",
266-
error: "OAuth completion failed",
266+
error: "OAuth completion failed: Token exchange failed",
267267
})
268268
const entry = yield* auth.get(name)
269269
expect(entry?.tokens?.accessToken).toBe("working-token")

0 commit comments

Comments
 (0)