@prestyj/cli 5.10.0 → 5.11.0

package/dist/core/mcp/client-session-recovery.test.js

@@ -0,0 +1,231 @@
+import fs from "node:fs/promises";
+import http from "node:http";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { MCPClientManager } from "./client.js";
+import { McpCatalogCache } from "./catalog-cache.js";
+const PROTOCOL_VERSION = "2025-11-25";
+async function startStubServer() {
+    const validSessions = new Set();
+    let generation = 0;
+    let holding = false;
+    let toolTrafficBroken = false;
+    const held = [];
+    const state = {
+        initializeCount: 0,
+        get heldCount() {
+            return held.length;
+        },
+    };
+    const readBody = (req) => new Promise((resolve, reject) => {
+        let raw = "";
+        req.on("data", (chunk) => {
+            raw += chunk;
+        });
+        req.on("end", () => resolve(raw));
+        req.on("error", reject);
+    });
+    const server = http.createServer((req, res) => {
+        // The SDK opens a standalone GET for server→client streaming and DELETEs on
+        // teardown. 405 is the spec's "not offered", which it handles cleanly.
+        if (req.method !== "POST") {
+            res.writeHead(405).end();
+            return;
+        }
+        void readBody(req).then((raw) => {
+            let message;
+            try {
+                message = JSON.parse(raw);
+            }
+            catch {
+                res.writeHead(400).end();
+                return;
+            }
+            const isNotification = message.id === undefined || message.id === null;
+            const sendResult = (result, headers = {}) => {
+                const body = JSON.stringify({ jsonrpc: "2.0", id: message.id, result });
+                res.writeHead(200, { "content-type": "application/json", ...headers }).end(body);
+            };
+            if (message.method === "initialize") {
+                state.initializeCount += 1;
+                const sessionId = `session-${++generation}`;
+                validSessions.add(sessionId);
+                sendResult({
+                    protocolVersion: PROTOCOL_VERSION,
+                    capabilities: { tools: {} },
+                    serverInfo: { name: "session-fixture", version: "1.0.0" },
+                }, { "mcp-session-id": sessionId });
+                return;
+            }
+            const sessionId = req.headers["mcp-session-id"];
+            const isToolTraffic = message.method === "tools/list" || message.method === "tools/call";
+            const expired = (typeof sessionId === "string" && !validSessions.has(sessionId)) ||
+                (toolTrafficBroken && isToolTraffic);
+            if (expired) {
+                const reply = () => {
+                    res.writeHead(404, { "content-type": "text/plain" }).end("Session not found");
+                };
+                if (holding)
+                    held.push(reply);
+                else
+                    reply();
+                return;
+            }
+            if (isNotification) {
+                res.writeHead(202).end();
+                return;
+            }
+            switch (message.method) {
+                case "ping":
+                    sendResult({});
+                    return;
+                case "tools/list":
+                    sendResult({
+                        tools: [
+                            {
+                                name: "echo",
+                                description: "Echo the provided text back to the caller",
+                                inputSchema: {
+                                    type: "object",
+                                    properties: { text: { type: "string" } },
+                                    required: ["text"],
+                                },
+                            },
+                        ],
+                    });
+                    return;
+                case "tools/call": {
+                    const args = message.params
+                        ?.arguments;
+                    sendResult({ content: [{ type: "text", text: String(args?.text ?? "") }] });
+                    return;
+                }
+                default:
+                    res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({
+                        jsonrpc: "2.0",
+                        id: message.id,
+                        error: { code: -32601, message: `Method not found: ${message.method}` },
+                    }));
+            }
+        });
+    });
+    await new Promise((resolve) => server.listen(0, "127.0.0.1", () => resolve()));
+    const { port } = server.address();
+    return {
+        url: `http://127.0.0.1:${port}/mcp`,
+        get initializeCount() {
+            return state.initializeCount;
+        },
+        get heldCount() {
+            return held.length;
+        },
+        expireAll: () => validSessions.clear(),
+        holdExpired: (hold) => {
+            holding = hold;
+        },
+        releaseHeld: () => {
+            holding = false;
+            while (held.length > 0)
+                held.shift()?.();
+        },
+        breakToolTraffic: (broken) => {
+            toolTrafficBroken = broken;
+        },
+        close: () => new Promise((resolve) => {
+            server.closeAllConnections?.();
+            server.close(() => resolve());
+        }),
+    };
+}
+function toolContext(signal) {
+    return { signal: signal ?? new AbortController().signal, toolCallId: "call-1" };
+}
+async function runTool(tool, text, signal) {
+    const result = await tool.execute({ text }, toolContext(signal));
+    return typeof result === "string" ? result : JSON.stringify(result);
+}
+let dir;
+let stub;
+const managers = [];
+function manager() {
+    const instance = new MCPClientManager({
+        catalogCache: new McpCatalogCache(path.join(dir, "mcp-catalog.json")),
+    });
+    managers.push(instance);
+    return instance;
+}
+function httpConfig() {
+    return { name: "session-fixture", url: stub.url, timeout: 10_000 };
+}
+beforeEach(async () => {
+    dir = await fs.mkdtemp(path.join(os.tmpdir(), "gg-mcp-session-"));
+    stub = await startStubServer();
+});
+afterEach(async () => {
+    await Promise.all(managers.splice(0).map((instance) => instance.dispose()));
+    await stub.close();
+    await fs.rm(dir, { recursive: true, force: true });
+});
+describe("MCP HTTP session recovery", () => {
+    it("reconnects once and replays the call when the session has expired", async () => {
+        const mcp = manager();
+        const tools = await mcp.connectAll([httpConfig()]);
+        const echo = tools.find((t) => t.name === "mcp__session-fixture__echo");
+        expect(echo).toBeDefined();
+        expect(stub.initializeCount).toBe(1);
+        stub.expireAll();
+        expect(await runTool(echo, "after-expiry")).toBe("after-expiry");
+        expect(stub.initializeCount).toBe(2);
+    }, 30_000);
+    it("coalesces concurrent expiries into exactly one reconnect", async () => {
+        const mcp = manager();
+        const tools = await mcp.connectAll([httpConfig()]);
+        const echo = tools.find((t) => t.name === "mcp__session-fixture__echo");
+        // Park the 404s so all three calls are in flight at once. The manager
+        // paces calls to one server 2s apart, so without parking the first would
+        // have finished recovering long before the others even started.
+        stub.expireAll();
+        stub.holdExpired(true);
+        const calls = Promise.all([runTool(echo, "a"), runTool(echo, "b"), runTool(echo, "c")]);
+        await waitFor(() => stub.heldCount === 3, 15_000);
+        stub.releaseHeld();
+        expect(await calls).toEqual(["a", "b", "c"]);
+        // 1 initial + 1 shared reconnect. Three would mean the coalescing map leaked.
+        expect(stub.initializeCount).toBe(2);
+    }, 30_000);
+    it("fails after a single retry against a permanently expired server", async () => {
+        const mcp = manager();
+        const tools = await mcp.connectAll([httpConfig()]);
+        const echo = tools.find((t) => t.name === "mcp__session-fixture__echo");
+        // The handshake still works, but the server 404s all tool traffic — so a
+        // rebuilt session is no better than the old one.
+        stub.breakToolTraffic(true);
+        const result = await runTool(echo, "doomed");
+        expect(result).toContain("MCP tool error");
+        expect(result).toContain("404");
+        // Exactly one recovery attempt — a retry loop would keep climbing.
+        expect(stub.initializeCount).toBe(2);
+    }, 30_000);
+    it("does not resurrect a call that was aborted while in flight", async () => {
+        const mcp = manager();
+        const tools = await mcp.connectAll([httpConfig()]);
+        const echo = tools.find((t) => t.name === "mcp__session-fixture__echo");
+        const controller = new AbortController();
+        controller.abort();
+        stub.expireAll();
+        const result = await runTool(echo, "cancelled", controller.signal);
+        expect(result).toContain("MCP tool error");
+        // No reconnect: the user cancelled, so replaying the work would be wrong.
+        expect(stub.initializeCount).toBe(1);
+    }, 30_000);
+});
+async function waitFor(predicate, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    while (!predicate()) {
+        if (Date.now() > deadline)
+            throw new Error("timed out waiting for condition");
+        await new Promise((r) => setTimeout(r, 25));
+    }
+}
+//# sourceMappingURL=client-session-recovery.test.js.map

package/dist/core/mcp/client-session-recovery.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-session-recovery.test.js","sourceRoot":"","sources":["../../../src/core/mcp/client-session-recovery.test.ts"],"names":[],"mappings":"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"}

package/dist/core/mcp/client.d.ts

@@ -1,5 +1,8 @@
+import type { ElicitResult } from "@modelcontextprotocol/client";
 import type { AgentTool } from "@prestyj/agent";
 import type { MCPServerConfig } from "./types.js";
+import { McpCatalogCache } from "./catalog-cache.js";
+import { type SharedMcpPool } from "./shared-pool.js";
 /** Per-server connection outcome for the dashboard / non-interactive list. */
 export interface MCPConnectResult {
     name: string;
@@ -17,13 +20,140 @@ export interface MCPLoginResult {
     toolCount: number;
     error?: string;
 }
+/** Terminal state of one server's connection attempt, awaited by `whenConnected`. */
+type ConnectionOutcome = {
+    ok: true;
+} | {
+    ok: false;
+    error: string;
+};
+/**
+ * A server-initiated request for user input, mid tool call. The host resolves
+ * it by showing the user a form built from `requestedSchema` and returning
+ * their answer — or `decline` / `cancel`.
+ */
+export interface MCPElicitation {
+    /** Which configured server is asking. */
+    server: string;
+    /** Human-readable prompt from the server. */
+    message: string;
+    /** JSON Schema object describing the fields to collect. */
+    requestedSchema: Record<string, unknown>;
+}
+export type MCPElicitHandler = (request: MCPElicitation) => Promise<ElicitResult>;
 export declare class MCPClientManager {
     private servers;
+    /**
+     * Per-server connection settlement, so a caller holding a cached-only tool
+     * can wait for the live client instead of failing or hanging forever.
+     */
+    private connections;
+    /**
+     * In-flight session rebuilds, keyed by server name. N tool calls to the same
+     * server all 404 at once when its session expires; without coalescing each
+     * would spawn its own reconnect and they would race to replace each other in
+     * `this.servers`. Sharing one promise means exactly one reconnect per outage.
+     */
+    private reconnecting;
+    /**
+     * Claims on process-wide shared connections, keyed by server name. Held so
+     * `dispose` can hand them back: the pooled child only exits once the LAST
+     * manager holding it releases, so leaking a claim here would pin the process
+     * for the daemon's lifetime — the exact bug sharing is meant to fix.
+     */
+    private sharedHandles;
+    private readonly catalogCache;
+    /**
+     * Opt into the 2026-07-28 revision. Off by default: `mode: "auto"` probes with
+     * `server/discover` before falling back to `initialize`, and a legacy stdio
+     * server that ignores pre-`initialize` requests pays the full probe timeout.
+     */
+    private readonly modernProtocol;
+    /**
+     * Host callback for server-initiated `elicitation/create`. Absent means we
+     * declare no elicitation capability at all — which is protocol-legal and is
+     * how the CLI runs, since it has nowhere to render the form.
+     */
+    private readonly onElicit?;
+    /**
+     * Pool backing `shared: true` servers. Defaults to the daemon-wide singleton;
+     * injectable so tests can exercise sharing without touching global state.
+     */
+    private readonly pool;
+    /**
+     * Fired when a connected server's transport closes on its own — a crashed or
+     * exited child, not our own `dispose`. The pool uses it to drop a dead
+     * connection so the next session rebuilds instead of inheriting a corpse.
+     */
+    private readonly onServerClosed?;
+    /** Set while `dispose` runs, so our own teardown is not reported as a death. */
+    private disposing;
+    constructor(opts?: {
+        catalogCache?: McpCatalogCache;
+        modernProtocol?: boolean;
+        onElicit?: MCPElicitHandler;
+        sharedPool?: SharedMcpPool;
+        onServerClosed?: (name: string) => void;
+    });
+    /**
+     * Build a `Client` for one server, declaring elicitation support and wiring
+     * the handler when the host can actually prompt the user.
+     *
+     * Form mode only. URL mode would have us open a browser tab in the middle of
+     * a tool call with no user gesture behind it — the SDK rejects URL-mode
+     * requests for us when the `url` capability is undeclared.
+     */
+    private createClient;
+    /**
+     * Version-negotiation options for a real (non-probe) connect. `probe()` is
+     * spawn-per-invocation and deliberately never negotiates: a legacy stdio
+     * server that ignores the discovery request would stall it for the whole
+     * probe timeout, turning "validate this server" into a 30s hang.
+     *
+     * The probe timeout is transport-aware because the SDK's timeout VERDICT is:
+     *
+     * - **stdio** — silence on a local pipe means a legacy server, and the SDK
+     *   falls back to `initialize`. The probe runs on a disposable sibling
+     *   process, so the fallback is clean. Waiting the full connect timeout to
+     *   reach a conclusion we can draw in seconds is pure dead time, so cap it
+     *   short.
+     * - **HTTP** — silence means an outage, and the SDK REJECTS the connect
+     *   rather than falling back. A short timeout would therefore turn a slow
+     *   cold start into a hard connection failure, so inherit the full connect
+     *   timeout and let the normal timeout handling deal with a real outage.
+     */
+    private negotiationOptions;
+    /**
+     * Claim the pooled connection for a shared server and adopt its tools.
+     *
+     * Shaped like `connectServer` (resolve tools / throw on failure) so the
+     * caller's `allSettled` handling is identical for both kinds. The pool
+     * reports failure in-band, so it is rethrown here with the message the pool
+     * already formatted.
+     */
+    private connectShared;
+    /** Get-or-create the settlement record for one server name. */
+    private connectionSlot;
+    /**
+     * Resolve once a server's connection attempt has settled. Returns `ok:false`
+     * with the failure reason when that server could not connect, and times out
+     * rather than hanging when no attempt is ever made (e.g. a server that was
+     * removed from the config since the catalog cache was written).
+     */
+    whenConnected(name: string, timeoutMs?: number): Promise<ConnectionOutcome>;
     connectAll(configs: MCPServerConfig[]): Promise<AgentTool[]>;
     /**
      * Connect every enabled server and return one result per server (success →
      * ok + toolCount; failure → ok:false with a human-readable error string).
      * Keeps successfully connected servers in `this.servers`.
+     *
+     * Shareable servers — stdio, unless opted out with `shared: false` — are not
+     * connected here at all: they are claimed from the process-wide pool, so every
+     * session in the daemon multiplexes over one child process instead of spawning
+     * its own. The split is invisible to callers — results and tools come back in
+     * the same shape, `whenConnected` settles for both kinds, and `dispose`
+     * releases the pooled claims — so sharing applies wherever a manager is used
+     * (sessions, CLI, subagents) without each call site opting in.
      */
     connectAllDetailed(configs: MCPServerConfig[]): Promise<MCPConnectResult[]>;
     /**
@@ -45,6 +175,25 @@ export declare class MCPClientManager {
      */
     login(config: MCPServerConfig, onAuthorizationUrl: (url: string) => void, timeoutMs?: number): Promise<MCPLoginResult>;
     private connectServer;
+    /**
+     * Is this failure a recoverable expired HTTP session?
+     *
+     * Stdio servers are excluded: they have no HTTP session to expire, so a 404
+     * from one means something else entirely and respawning the child process
+     * mid-call would be a surprise. An already-aborted call is excluded too —
+     * reconnecting to replay work the user cancelled resurrects it.
+     */
+    private canRecoverSession;
+    /** A local "the transport went away mid-request" failure, as the SDK reports it. */
+    private isConnectionClosed;
+    /**
+     * Rebuild one server's connection from its stored config, replacing the dead
+     * entry in `this.servers`. Concurrent callers share a single rebuild.
+     *
+     * Rejects if the reconnect itself fails, so the caller reports a real error
+     * rather than retrying against a client that was never replaced.
+     */
+    private reconnectServer;
     /**
      * Connect a single HTTP (Streamable HTTP or SSE) server and return the live
      * client + transport. Transport selection:
@@ -56,6 +205,15 @@ export declare class MCPClientManager {
      * protocol mismatch as a login requirement.
      */
     private connectHttp;
+    /**
+     * Protocol era actually negotiated with a server, as the SDK reports it.
+     * Undefined before a connect completes; with negotiation off the SDK always
+     * settles on `legacy` (the 2025 `initialize` handshake).
+     */
+    private negotiatedEra;
+    /** Previously negotiated era for this exact server config, if still cached. */
+    private cachedEra;
     dispose(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=client.d.ts.map

package/dist/core/mcp/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAKhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAiBlD,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;oFACgF;IAChF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,wDAAwD;AACxD,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAyB;IAElC,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKlE;;;;OAIG;IACG,kBAAkB,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAuBjF;;;;OAIG;IACG,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoB/D;;;;;;;;;;OAUG;IACG,KAAK,CACT,MAAM,EAAE,eAAe,EACvB,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,EACzC,SAAS,SAAU,GAClB,OAAO,CAAC,cAAc,CAAC;YAwHZ,aAAa;IAgI3B;;;;;;;;;OASG;YACW,WAAW;IAiDnB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAU/B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"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"}