@1mcp/agent 0.37.0 → 0.38.1

package/build/commands/shared/connectionHelper.js

@@ -1,5 +1,7 @@
 import { ClientManager } from '../../core/client/clientManager.js';
+import { requestLegacyAdapter } from '../../core/client/legacyAdapterRequest.js';
 import logger from '../../logger/logger.js';
+import { toProtocolPrompts, toProtocolResources, toProtocolTools, } from '../../sdk/contracts/index.js';
 import { createTransports } from '../../transport/transportFactory.js';
 /**
  * Connection helper for connecting to MCP servers and retrieving their capabilities
@@ -97,24 +99,24 @@ export class McpConnectionHelper {
                 items: tools,
                 capabilityName: 'tools',
                 timeoutMessage: 'Tools listing timeout',
-                list: () => connection.client.listTools({}),
-                select: (result) => result?.tools ?? [],
+                list: () => requestLegacyAdapter(connection.adapter, 'tools/list'),
+                select: (result) => toProtocolTools(result?.tools ?? []),
             });
             await this.collectCapabilityItems({
                 serverName,
                 items: resources,
                 capabilityName: 'resources',
                 timeoutMessage: 'Resources listing timeout',
-                list: () => connection.client.listResources({}),
-                select: (result) => result?.resources ?? [],
+                list: () => requestLegacyAdapter(connection.adapter, 'resources/list'),
+                select: (result) => toProtocolResources(result?.resources ?? []),
             });
             await this.collectCapabilityItems({
                 serverName,
                 items: prompts,
                 capabilityName: 'prompts',
                 timeoutMessage: 'Prompts listing timeout',
-                list: () => connection.client.listPrompts({}),
-                select: (result) => result?.prompts ?? [],
+                list: () => requestLegacyAdapter(connection.adapter, 'prompts/list'),
+                select: (result) => toProtocolPrompts(result?.prompts ?? []),
             });
         }
         catch (error) {
@@ -145,30 +147,11 @@ export class McpConnectionHelper {
         for (const [serverName, connection] of this.connections) {
             const cleanupPromise = (async () => {
                 try {
-                    if (connection.client && typeof connection.client.close === 'function') {
-                        await this.withTimeout(Promise.resolve(connection.client.close()), 3000, 'Client close timeout');
-                    }
+                    await this.withTimeout(connection.adapter.close(), 3000, 'Client close timeout');
                 }
                 catch (error) {
                     logger.warn(`Error closing client for ${serverName}: ${error instanceof Error ? error.message : error}`);
                 }
-                try {
-                    if (connection.transport && typeof connection.transport.close === 'function') {
-                        await this.withTimeout(Promise.resolve(connection.transport.close()), 3000, 'Transport close timeout');
-                    }
-                }
-                catch (error) {
-                    logger.warn(`Error closing transport for ${serverName}: ${error instanceof Error ? error.message : error}`);
-                }
-                try {
-                    const oauthProvider = connection.transport?.oauthProvider;
-                    if (oauthProvider && typeof oauthProvider.shutdown === 'function') {
-                        oauthProvider.shutdown();
-                    }
-                }
-                catch (error) {
-                    logger.warn(`Error shutting down OAuth provider for ${serverName}: ${error instanceof Error ? error.message : error}`);
-                }
                 logger.debug(`Closed connection to ${serverName}`);
             })();
             cleanupPromises.push(cleanupPromise);

package/build/commands/shared/connectionHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"connectionHelper.js","sourceRoot":"","sources":["../../../src/commands/shared/connectionHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connectionHelper.js","sourceRoot":"","sources":["../../../src/commands/shared/connectionHelper.ts"],"names":[],"mappings":"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"}

package/build/commands/shared/inspectApiSchemas.d.ts

@@ -5,10 +5,10 @@ export declare const clientServerStatusSchema: z.ZodEnum<{
     connected: "connected";
     disconnected: "disconnected";
     awaiting_oauth: "awaiting_oauth";
-    failed: "failed";
-    cancelled: "cancelled";
     pending: "pending";
     loading: "loading";
+    failed: "failed";
+    cancelled: "cancelled";
     initializing: "initializing";
 }>;
 export declare const inspectServerSummarySchema: z.ZodObject<{
@@ -20,10 +20,10 @@ export declare const inspectServerSummarySchema: z.ZodObject<{
         connected: "connected";
         disconnected: "disconnected";
         awaiting_oauth: "awaiting_oauth";
-        failed: "failed";
-        cancelled: "cancelled";
         pending: "pending";
         loading: "loading";
+        failed: "failed";
+        cancelled: "cancelled";
         initializing: "initializing";
     }>;
     available: z.ZodBoolean;
@@ -40,10 +40,10 @@ export declare const inspectServersResultSchema: z.ZodObject<{
             connected: "connected";
             disconnected: "disconnected";
             awaiting_oauth: "awaiting_oauth";
-            failed: "failed";
-            cancelled: "cancelled";
             pending: "pending";
             loading: "loading";
+            failed: "failed";
+            cancelled: "cancelled";
             initializing: "initializing";
         }>;
         available: z.ZodBoolean;
@@ -59,10 +59,10 @@ export declare const inspectServerResultSchema: z.ZodObject<{
         connected: "connected";
         disconnected: "disconnected";
         awaiting_oauth: "awaiting_oauth";
-        failed: "failed";
-        cancelled: "cancelled";
         pending: "pending";
         loading: "loading";
+        failed: "failed";
+        cancelled: "cancelled";
         initializing: "initializing";
     }>;
     available: z.ZodBoolean;
@@ -80,4 +80,17 @@ export declare const inspectToolResultSchema: z.ZodObject<{
 }, z.core.$loose>;
 export type InspectServerSummary = z.infer<typeof inspectServerSummarySchema>;
 export type ApiInspectServerResult = z.infer<typeof inspectServerResultSchema>;
+export declare const inspectToolsPageSchema: z.ZodObject<{
+    tools: z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        description: z.ZodOptional<z.ZodString>;
+        inputSchema: z.ZodObject<{
+            type: z.ZodLiteral<"object">;
+        }, z.core.$loose>;
+        outputSchema: z.ZodOptional<z.ZodObject<{
+            type: z.ZodLiteral<"object">;
+        }, z.core.$loose>>;
+    }, z.core.$loose>>;
+    nextCursor: z.ZodOptional<z.ZodString>;
+}, z.core.$loose>;
 //# sourceMappingURL=inspectApiSchemas.d.ts.map

package/build/commands/shared/inspectApiSchemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspectApiSchemas.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,wBAAwB;;;;;;;;;;;EAAiC,CAAC;AAEvE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;iBAQvB,CAAC;AAEjB,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;iBAKvB,CAAC;AAEjB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;iBAStB,CAAC;AAEjB,eAAO,MAAM,uBAAuB;;;;;;;;iBAUpB,CAAC;AAEjB,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC9E,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"inspectApiSchemas.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,wBAAwB;;;;;;;;;;;EAAiC,CAAC;AAEvE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;iBAQvB,CAAC;AAEjB,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;iBAKvB,CAAC;AAEjB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;iBAStB,CAAC;AAEjB,eAAO,MAAM,uBAAuB;;;;;;;;iBAUpB,CAAC;AAEjB,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC9E,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAe/E,eAAO,MAAM,sBAAsB;;;;;;;;;;;;iBAKnB,CAAC"}

package/build/commands/shared/inspectApiSchemas.js

@@ -37,4 +37,22 @@ export const inspectToolResultSchema = z
     outputSchema: z.record(z.string(), z.unknown()).optional(),
 })
     .passthrough();
+// Validate each upstream page before using its tool objects or continuation cursor.
+const inspectToolSchema = z
+    .object({
+    name: z.string(),
+    description: z.string().optional(),
+    inputSchema: z.object({ type: z.literal('object') }).passthrough(),
+    outputSchema: z
+        .object({ type: z.literal('object') })
+        .passthrough()
+        .optional(),
+})
+    .passthrough();
+export const inspectToolsPageSchema = z
+    .object({
+    tools: z.array(inspectToolSchema),
+    nextCursor: z.string().optional(),
+})
+    .passthrough();
 //# sourceMappingURL=inspectApiSchemas.js.map

package/build/commands/shared/inspectApiSchemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectApiSchemas.js","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;CACzB,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,0BAA0B,CAAC;CAC7C,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC;KACvC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC;KACrC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3D,CAAC;KACD,WAAW,EAAE,CAAC"}
+{"version":3,"file":"inspectApiSchemas.js","sourceRoot":"","sources":["../../../src/commands/shared/inspectApiSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAEvE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;CACzB,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,0BAA0B,CAAC;CAC7C,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC;KACvC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,wBAAwB;IAChC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC;KACrC,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3D,CAAC;KACD,WAAW,EAAE,CAAC;AAKjB,oFAAoF;AACpF,MAAM,iBAAiB,GAAG,CAAC;KACxB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;IAClE,YAAY,EAAE,CAAC;SACZ,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;SACrC,WAAW,EAAE;SACb,QAAQ,EAAE;CACd,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC;KACpC,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;IACjC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC;KACD,WAAW,EAAE,CAAC"}

package/build/commands/shared/serveClient.d.ts

@@ -1,70 +1,2 @@
-import { type CallToolResult, type Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { TemplateContextProof } from '../../core/context/templateContextTrust.js';
-import type { ContextData } from '../../types/context.js';
-export interface JsonRpcSuccessEnvelope<Result> {
-    jsonrpc: '2.0';
-    id: number;
-    result: Result;
-}
-export interface JsonRpcErrorEnvelope {
-    jsonrpc: '2.0';
-    id: number;
-    error: {
-        code: number;
-        message: string;
-        data?: unknown;
-    };
-}
-export type JsonRpcResponse<Result> = JsonRpcSuccessEnvelope<Result> | JsonRpcErrorEnvelope;
-export interface ListToolsResult {
-    tools: Tool[];
-    nextCursor?: string;
-}
-export interface InitializeResult {
-    protocolVersion: string;
-    instructions?: string;
-}
-export interface CliSessionCache {
-    sessionId: string;
-    serverUrl: string;
-    contextHash: string;
-    savedAt: number;
-    hasRestEndpoint?: boolean;
-}
-export interface ServeUrlOptions {
-    preset?: string;
-    filter?: string;
-    tags?: string[];
-    'tag-filter'?: string;
-}
-export interface CliSessionCachePathOptions {
-    cachePathTemplate?: string;
-    serverPid?: number;
-    serverUrl?: string;
-    contextHash?: string;
-}
-export declare const SESSION_CACHE_TTL_MS: number;
-export declare class StreamableServeClient {
-    private readonly transport;
-    private readonly pendingRequests;
-    private nextId;
-    constructor(serverUrl: URL, sessionId?: string, bearerToken?: string);
-    start(): Promise<void>;
-    initialize(context?: ContextData, contextProof?: TemplateContextProof): Promise<JsonRpcResponse<InitializeResult>>;
-    listTools(): Promise<JsonRpcResponse<ListToolsResult>>;
-    callTool(name: string, args: Record<string, unknown>): Promise<JsonRpcResponse<CallToolResult>>;
-    get sessionId(): string | undefined;
-    close(): Promise<void>;
-    private sendRequest;
-    private handleMessage;
-    private rejectAll;
-}
-export declare function buildServerUrl(baseUrl: string, options: ServeUrlOptions): URL;
-export declare function getDefaultCliSessionCachePathTemplate(): string;
-export declare function resolveCliSessionCachePathTemplate(cachePathTemplate?: string): string;
-export declare function getCliSessionCachePath(options?: CliSessionCachePathOptions): string;
-export declare function getCliSessionContextHash(context: ContextData): string;
-export declare function readCliSessionCache(cachePath: string, serverUrl: string, contextHash: string): Promise<CliSessionCache | null>;
-export declare function writeCliSessionCache(cachePath: string, cache: CliSessionCache): Promise<void>;
-export declare function deleteCliSessionCache(cachePath: string): Promise<void>;
+export * from '../../sdk/legacy/client/runtime/serveClient.js';
 //# sourceMappingURL=serveClient.d.ts.map

package/build/commands/shared/serveClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serveClient.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serveClient.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"AAAA,cAAc,+CAA+C,CAAC"}

package/build/commands/shared/serveClient.js

@@ -1,235 +1,2 @@
-import { createHash } from 'node:crypto';
-import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { LATEST_PROTOCOL_VERSION, } from '@modelcontextprotocol/sdk/types.js';
-import { MCP_SERVER_NAME, MCP_SERVER_VERSION } from '../../constants.js';
-import { resolveFilterSelection } from '../../core/filtering/filterSelection.js';
-import logger from '../../logger/logger.js';
-import { createContextHash } from '../../utils/context/contextHash.js';
-export const SESSION_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
-export class StreamableServeClient {
-    transport;
-    pendingRequests = new Map();
-    nextId = 1;
-    constructor(serverUrl, sessionId, bearerToken) {
-        const headers = {
-            'User-Agent': `1MCP/${MCP_SERVER_VERSION}`,
-        };
-        if (bearerToken) {
-            headers.Authorization = `Bearer ${bearerToken}`;
-        }
-        this.transport = new StreamableHTTPClientTransport(serverUrl, {
-            sessionId,
-            requestInit: {
-                headers,
-                redirect: 'error',
-            },
-        });
-        this.transport.onmessage = (message) => {
-            this.handleMessage(message);
-        };
-        this.transport.onerror = (error) => {
-            this.rejectAll(error instanceof Error ? error : new Error(String(error)));
-        };
-        this.transport.onclose = () => {
-            this.rejectAll(new Error('Connection closed.'));
-        };
-    }
-    async start() {
-        await this.transport.start();
-    }
-    async initialize(context, contextProof) {
-        const response = await this.sendRequest('initialize', {
-            protocolVersion: LATEST_PROTOCOL_VERSION,
-            capabilities: {},
-            clientInfo: {
-                name: MCP_SERVER_NAME,
-                version: MCP_SERVER_VERSION,
-            },
-            ...(context
-                ? {
-                    _meta: {
-                        context,
-                        ...(contextProof ? { contextProof } : {}),
-                    },
-                }
-                : {}),
-        });
-        if ('result' in response && response.result.protocolVersion) {
-            this.transport.setProtocolVersion(response.result.protocolVersion);
-        }
-        await this.transport.send({
-            jsonrpc: '2.0',
-            method: 'notifications/initialized',
-        });
-        return response;
-    }
-    async listTools() {
-        return this.sendRequest('tools/list', {});
-    }
-    async callTool(name, args) {
-        return this.sendRequest('tools/call', {
-            name,
-            arguments: args,
-        });
-    }
-    get sessionId() {
-        return this.transport.sessionId;
-    }
-    async close() {
-        await this.transport.close();
-    }
-    async sendRequest(method, params) {
-        const id = this.nextId++;
-        return new Promise((resolve, reject) => {
-            const timeout = setTimeout(() => {
-                this.pendingRequests.delete(id);
-                reject(new Error(`Timed out waiting for ${method} response.`));
-            }, 30000);
-            this.pendingRequests.set(id, {
-                resolve: resolve,
-                reject,
-                timeout,
-            });
-            void this.transport
-                .send({
-                jsonrpc: '2.0',
-                id,
-                method,
-                params,
-            })
-                .catch((error) => {
-                clearTimeout(timeout);
-                this.pendingRequests.delete(id);
-                reject(error instanceof Error ? error : new Error(String(error)));
-            });
-        });
-    }
-    handleMessage(message) {
-        if (!('id' in message) || typeof message.id !== 'number') {
-            return;
-        }
-        const pending = this.pendingRequests.get(message.id);
-        if (!pending) {
-            return;
-        }
-        clearTimeout(pending.timeout);
-        this.pendingRequests.delete(message.id);
-        pending.resolve(message);
-    }
-    rejectAll(error) {
-        for (const [id, pending] of this.pendingRequests.entries()) {
-            clearTimeout(pending.timeout);
-            pending.reject(error);
-            this.pendingRequests.delete(id);
-        }
-    }
-}
-export function buildServerUrl(baseUrl, options) {
-    const serverUrl = new URL(baseUrl);
-    const filterResult = resolveFilterSelection({
-        preset: options.preset,
-        tagFilter: options['tag-filter'],
-        filter: options.filter,
-        tags: options.tags && options.tags.length > 0 ? options.tags.join(',') : undefined,
-    }, { allowUnknownPreset: true });
-    if (!filterResult.ok) {
-        throw new Error(filterResult.error.message);
-    }
-    switch (filterResult.selection.mode) {
-        case 'preset':
-            serverUrl.searchParams.set('preset', filterResult.selection.presetName);
-            break;
-        case 'advanced':
-            if (options['tag-filter']) {
-                serverUrl.searchParams.set('tag-filter', options['tag-filter']);
-            }
-            else if (options.filter) {
-                serverUrl.searchParams.set('filter', options.filter);
-            }
-            break;
-        case 'simple-or':
-            if (options.filter) {
-                serverUrl.searchParams.set('filter', options.filter);
-            }
-            else if (filterResult.selection.tags && filterResult.selection.tags.length > 0) {
-                serverUrl.searchParams.set('tags', filterResult.selection.tags.join(','));
-            }
-            break;
-        case 'none':
-            break;
-    }
-    return serverUrl;
-}
-export function getDefaultCliSessionCachePathTemplate() {
-    return path.join(os.tmpdir(), '1mcp', '.cli-session.{pid}.{scope}');
-}
-export function resolveCliSessionCachePathTemplate(cachePathTemplate) {
-    return cachePathTemplate || getDefaultCliSessionCachePathTemplate();
-}
-export function getCliSessionCachePath(options = {}) {
-    const resolvedTemplate = resolveCliSessionCachePathTemplate(options.cachePathTemplate);
-    const pidToken = options.serverPid !== undefined
-        ? String(options.serverPid)
-        : options.serverUrl
-            ? `server-${createHash('sha256').update(options.serverUrl).digest('hex').slice(0, 12)}`
-            : 'unknown';
-    const scopeToken = options.serverUrl || options.contextHash
-        ? createHash('sha256')
-            .update(`${options.serverUrl ?? ''}\0${options.contextHash ?? ''}`)
-            .digest('hex')
-            .slice(0, 12)
-        : 'default';
-    return resolvedTemplate.replaceAll('{pid}', pidToken).replaceAll('{scope}', scopeToken);
-}
-export function getCliSessionContextHash(context) {
-    return createContextHash(context, { omitWorkingDirectory: true });
-}
-export async function readCliSessionCache(cachePath, serverUrl, contextHash) {
-    try {
-        const raw = await readFile(cachePath, 'utf8');
-        const parsed = JSON.parse(raw);
-        if (!isCliSessionCache(parsed)) {
-            return null;
-        }
-        if (parsed.serverUrl !== serverUrl) {
-            return null;
-        }
-        if (parsed.contextHash !== contextHash) {
-            return null;
-        }
-        if (Date.now() - parsed.savedAt > SESSION_CACHE_TTL_MS) {
-            return null;
-        }
-        return parsed;
-    }
-    catch (error) {
-        logger.debug('Failed to read CLI session cache, starting fresh:', { error });
-        return null;
-    }
-}
-export async function writeCliSessionCache(cachePath, cache) {
-    await mkdir(path.dirname(cachePath), { recursive: true, mode: 0o700 });
-    const tempPath = `${cachePath}.tmp.${process.pid}`;
-    await writeFile(tempPath, JSON.stringify(cache), { encoding: 'utf8', mode: 0o600 });
-    await rename(tempPath, cachePath);
-}
-export async function deleteCliSessionCache(cachePath) {
-    await rm(cachePath, { force: true });
-}
-function isCliSessionCache(value) {
-    return (typeof value === 'object' &&
-        value !== null &&
-        'sessionId' in value &&
-        typeof value.sessionId === 'string' &&
-        'serverUrl' in value &&
-        typeof value.serverUrl === 'string' &&
-        'contextHash' in value &&
-        typeof value.contextHash === 'string' &&
-        'savedAt' in value &&
-        typeof value.savedAt === 'number' &&
-        Number.isFinite(value.savedAt));
-}
+export * from '../../sdk/legacy/client/runtime/serveClient.js';
 //# sourceMappingURL=serveClient.js.map

package/build/commands/shared/serveClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"serveClient.js","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serveClient.js","sourceRoot":"","sources":["../../../src/commands/shared/serveClient.ts"],"names":[],"mappings":"AAAA,cAAc,+CAA+C,CAAC"}

package/build/commands/shared/serveTargetResolver.d.ts

@@ -1,4 +1,4 @@
-import { type ServeUrlOptions } from '../../commands/shared/serveClient.js';
+import { type ServeUrlOptions } from './serveClient.js';
 import type { ProjectConfig } from '../../config/projectConfigTypes.js';
 import { type RuntimeIdentityWarning, verifyRuntimeIdentityForTarget } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
 import { RuntimeTargetStore } from '../../domains/runtime-targets/runtimeTargetStore.js';

package/build/commands/shared/serveTargetResolver.js

@@ -1,4 +1,4 @@
-import { buildServerUrl } from '../../commands/shared/serveClient.js';
+import { buildServerUrl } from './serveClient.js';
 import { normalizeTags, resolveProjectContext } from '../../config/projectConfigLoader.js';
 import { getConfigDir } from '../../constants.js';
 import { verifyRuntimeIdentityForTarget, } from '../../domains/runtime-targets/runtimeIdentityVerification.js';

package/build/commands/target/index.js

@@ -1,4 +1,4 @@
-import { runCliCommand } from '../../commands/shared/commandRunner.js';
+import { runCliCommand } from '../shared/commandRunner.js';
 import { globalOptions } from '../../globalOptions.js';
 export function setupTargetCommands(yargs) {
     return yargs.command('target <subcommand>', 'Manage Runtime Target Contexts', (commandYargs) => {

package/build/commands/wait/index.js

@@ -1,4 +1,4 @@
-import { runCliCommand } from '../../commands/shared/commandRunner.js';
+import { runCliCommand } from '../shared/commandRunner.js';
 import { globalOptions } from '../../globalOptions.js';
 export function setupWaitCommand(yargs) {
     return yargs.command('wait [server]', 'Wait for configured static MCP servers to become connected and available', (commandYargs) => commandYargs

package/build/commands/wait/wait.d.ts

@@ -1,5 +1,5 @@
-import { type ClientSurfaceAttachmentContext } from '../../commands/shared/clientSurfaceAttachment.js';
-import { type InspectServerSummary } from '../../commands/shared/inspectApiSchemas.js';
+import { type ClientSurfaceAttachmentContext } from '../shared/clientSurfaceAttachment.js';
+import { type InspectServerSummary } from '../shared/inspectApiSchemas.js';
 import type { GlobalOptions } from '../../globalOptions.js';
 export interface WaitCommandOptions extends GlobalOptions {
     server?: string;

package/build/commands/wait/wait.js

@@ -1,8 +1,8 @@
 import { encode } from '@toon-format/toon';
-import { ApiClient } from '../../commands/shared/apiClient.js';
-import { attachReusableClientSurface, formatClientSurfaceAuthRequiredMessage, getClientSurfaceAuthRecoveryCommand, } from '../../commands/shared/clientSurfaceAttachment.js';
-import { buildFilterSelectionQuery } from '../../commands/shared/filterSelectionQuery.js';
-import { inspectServersResultSchema } from '../../commands/shared/inspectApiSchemas.js';
+import { ApiClient } from '../shared/apiClient.js';
+import { attachReusableClientSurface, formatClientSurfaceAuthRequiredMessage, getClientSurfaceAuthRecoveryCommand, } from '../shared/clientSurfaceAttachment.js';
+import { buildFilterSelectionQuery } from '../shared/filterSelectionQuery.js';
+import { inspectServersResultSchema } from '../shared/inspectApiSchemas.js';
 import { API_INSPECT_ENDPOINT } from '../../constants/api.js';
 import { z } from 'zod';
 const waitCommandOptionsSchema = z

package/build/config/configLoader.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { getUnknownGlobalConfigKeys, mergeGlobalAndServerConfig } from '../config/mcpConfigMerge.js';
+import { getUnknownGlobalConfigKeys, mergeGlobalAndServerConfig } from './mcpConfigMerge.js';
 import { DEFAULT_CONFIG, getGlobalConfigPath } from '../constants.js';
 import { MCP_CONFIG_SCHEMA_URL } from '../constants/schema.js';
 import { AgentConfigManager } from '../core/server/agentConfig.js';

package/build/config/configManager.js

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'events';
-import { McpConfigManager } from '../config/mcpConfigManager.js';
-import { mergeGlobalAndServerConfig } from '../config/mcpConfigMerge.js';
-import { isOperatorDisabledTemplateDefinition } from '../config/configuredServerTargets.js';
+import { isOperatorDisabledTemplateDefinition } from './configuredServerTargets.js';
+import { McpConfigManager } from './mcpConfigManager.js';
+import { mergeGlobalAndServerConfig } from './mcpConfigMerge.js';
 import { AgentConfigManager } from '../core/server/agentConfig.js';
 import { mcpServerConfigSchema, transportConfigSchema, } from '../core/types/transport.js';
 import logger, { debugIf } from '../logger/logger.js';