@prestyj/cli 5.9.0 → 5.11.0

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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"}