Skip to content

fix(mcp): apply timeouts to prompts and resources #31612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rekram1-node merged 4 commits into from
Jun 10, 2026
Merged

fix(mcp): apply timeouts to prompts and resources #31612

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5ad643
fix(mcp): apply timeouts to prompts and resources
rekram1-node Jun 10, 2026
37eea08
fix(mcp): prefer active server timeout
rekram1-node Jun 10, 2026
f255ef9
fix(mcp): preserve static timeout fallback
rekram1-node Jun 10, 2026
8cb86fa
test(mcp): trim timeout coverage
rekram1-node Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test(mcp): trim timeout coverage
  • Loading branch information
@rekram1-node
rekram1-node committed Jun 10, 2026
commit 8cb86fa03f6c17ed5f9dcf2d6bd24511a294980a
88 changes: 0 additions & 88 deletions packages/opencode/test/mcp/lifecycle.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,94 +793,6 @@ it.instance(
{ config: { mcp: {}, experimental: { mcp_timeout: 5000 } } },
)

it.instance(
"uses the experimental MCP timeout as the request fallback",
() =>
MCP.Service.use((mcp: MCPNS.Interface) =>
Effect.gen(function* () {
lastCreatedClientName = "fallback-server"
const serverState = getOrCreateClientState("fallback-server")

yield* mcp.add("fallback-server", {
type: "local",
command: ["echo", "test"],
})
yield* mcp.getPrompt("fallback-server", "test")
yield* mcp.readResource("fallback-server", "test://resource")

expect(serverState.getPromptTimeout).toBe(5000)
expect(serverState.readResourceTimeout).toBe(5000)
}),
),
{ config: { mcp: {}, experimental: { mcp_timeout: 5000 } } },
)

it.instance(
"uses the active runtime server timeout over static config",
() =>
MCP.Service.use((mcp: MCPNS.Interface) =>
Effect.gen(function* () {
lastCreatedClientName = "replaced-server"
const serverState = getOrCreateClientState("replaced-server")

yield* mcp.add("replaced-server", {
type: "local",
command: ["echo", "runtime"],
timeout: 2500,
})
yield* mcp.getPrompt("replaced-server", "test")
yield* mcp.readResource("replaced-server", "test://resource")

expect(serverState.getPromptTimeout).toBe(2500)
expect(serverState.readResourceTimeout).toBe(2500)
}),
),
{
config: {
mcp: {
"replaced-server": {
type: "local",
command: ["echo", "static"],
timeout: 1000,
},
},
},
},
)

it.instance(
"uses the static timeout when the runtime server does not override it",
() =>
MCP.Service.use((mcp: MCPNS.Interface) =>
Effect.gen(function* () {
lastCreatedClientName = "replaced-server"
const serverState = getOrCreateClientState("replaced-server")

yield* mcp.add("replaced-server", {
type: "local",
command: ["echo", "runtime"],
})
yield* mcp.getPrompt("replaced-server", "test")
yield* mcp.readResource("replaced-server", "test://resource")

expect(serverState.getPromptTimeout).toBe(1000)
expect(serverState.readResourceTimeout).toBe(1000)
}),
),
{
config: {
mcp: {
"replaced-server": {
type: "local",
command: ["echo", "static"],
timeout: 1000,
},
},
experimental: { mcp_timeout: 5000 },
},
},
)

it.instance(
"resource-only servers connect without listing tools",
() =>
Expand Down
Loading