michal/mcpctl
1
0
Fork 0
Code Issues Pull Requests 7 Actions Packages Projects Releases Wiki Activity

fix(mcplocal): give proxied tools/call a 120s budget, not the 30s default

Browse Source 
McpdUpstream.send routed every non-list method through the default-timeout
client, so any tool that legitimately runs past 30s — web_url_read through
a browser solver, a large PDF extraction, a slow retail site — died as
"mcpd proxy error: mcpd did not respond within 30000ms" while mcpd was
still working on it. LibreChat agents hit this constantly on real pages.

New TOOLCALL_TIMEOUT_MS (default 120s, env MCPLOCAL_TOOLCALL_TIMEOUT_MS)
sits between DISCOVERY_TIMEOUT_MS (list calls must stay short so a dead
upstream can't stall session init) and LONG_RUNNING_TIMEOUT_MS (chat and
inference, minutes). withTimeout preserves the caller token and headers.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JaFvfHrQyUKCGv6o3N2Wir
This commit is contained in:
Michal
2026-08-15 21:43:00 +01:00
parent b6983f036d
commit 740ce31469
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mcplocal/src/discovery.ts
View File

@@ -1,5 +1,5 @@
import type { McpdClient } from './http/mcpd-client.js'; import type { McpdClient } from './http/mcpd-client.js';
import { DISCOVERY_TIMEOUT_MS } from './http/mcpd-client.js'; import { DISCOVERY_TIMEOUT_MS, TOOLCALL_TIMEOUT_MS } from './http/mcpd-client.js';
import type { McpRouter } from './router.js'; import type { McpRouter } from './router.js';
import { McpdUpstream } from './upstream/mcpd.js'; import { McpdUpstream } from './upstream/mcpd.js';
@@ -152,6 +152,10 @@ function syncUpstreams(router: McpRouter, mcpdClient: McpdClient, servers: McpdS
// unreachable upstream cannot stall session init for the full tool-call window. // unreachable upstream cannot stall session init for the full tool-call window.
const discoveryClient = mcpdClient.withTimeout(DISCOVERY_TIMEOUT_MS); const discoveryClient = mcpdClient.withTimeout(DISCOVERY_TIMEOUT_MS);
// Everything else an upstream receives is a proxied tools/call, which can
// legitimately run past the 30s default (browser solvers, PDF extraction).
const toolClient = mcpdClient.withTimeout(TOOLCALL_TIMEOUT_MS);
// Remove stale upstreams // Remove stale upstreams
const currentNames = new Set(router.getUpstreamNames()); const currentNames = new Set(router.getUpstreamNames());
const serverNames = new Set(servers.map((s) => s.name)); const serverNames = new Set(servers.map((s) => s.name));
@@ -164,7 +168,7 @@ function syncUpstreams(router: McpRouter, mcpdClient: McpdClient, servers: McpdS
// Add/update upstreams for each server // Add/update upstreams for each server
for (const server of servers) { for (const server of servers) {
if (!currentNames.has(server.name)) { if (!currentNames.has(server.name)) {
const upstream = new McpdUpstream(server.id, server.name, mcpdClient, server.description, discoveryClient); const upstream = new McpdUpstream(server.id, server.name, toolClient, server.description, discoveryClient);
router.addUpstream(upstream); router.addUpstream(upstream);
} }
registered.push(server.name); registered.push(server.name);

11
src/mcplocal/src/http/mcpd-client.ts
View File

@@ -62,6 +62,17 @@ export const LONG_RUNNING_TIMEOUT_MS = Number(process.env['MCPLOCAL_LONG_TIMEOUT
*/ */
export const DISCOVERY_TIMEOUT_MS = Number(process.env['MCPLOCAL_DISCOVERY_TIMEOUT_MS']) || 8_000; export const DISCOVERY_TIMEOUT_MS = Number(process.env['MCPLOCAL_DISCOVERY_TIMEOUT_MS']) || 8_000;
/**
* Budget for proxied tools/call. The 30s DEFAULT_TIMEOUT_MS is a guaranteed
* failure for tools that legitimately run long — web_url_read through a
* browser solver, a large PDF extraction, a slow retail site — all of which
* died as `mcpd proxy error: mcpd did not respond within 30000ms` while mcpd
* was still working. Distinct from LONG_RUNNING_TIMEOUT_MS (chat/inference,
* minutes) and DISCOVERY_TIMEOUT_MS (list calls, must stay short so a dead
* upstream cannot stall session init). Override via `MCPLOCAL_TOOLCALL_TIMEOUT_MS`.
*/
export const TOOLCALL_TIMEOUT_MS = Number(process.env['MCPLOCAL_TOOLCALL_TIMEOUT_MS']) || 120_000;
export class McpdClient { export class McpdClient {
private readonly baseUrl: string; private readonly baseUrl: string;
private readonly token: string; private readonly token: string;