@namzu/sdk 46.0.0 → 48.0.0

package/dist/connector/mcp/discovery.d.ts

@@ -1,4 +1,4 @@
-import type { MCPDiscoveredTool, MCPPromptDefinition } from '../../types/connector/index.js';
+import type { MCPDiscoveredTool, MCPPromptDefinition, MCPRequestOptions, MCPResource } from '../../types/connector/index.js';
 import type { ToolDefinition } from '../../types/tool/index.js';
 import { type Logger } from '../../utils/logger.js';
 import type { MCPClient } from './client.js';
@@ -26,6 +26,16 @@ export interface MCPToolDiscoveryOptions {
         clientId: string;
         drift: MCPToolDrift;
     }) => void;
+    /** The current policy refusals after each listing, including an empty list when they clear. */
+    readonly onRefused?: (event: {
+        serverName: string;
+        clientId: string;
+        kind: 'tools' | 'prompts' | 'resources';
+        refused: readonly {
+            name: string;
+            reason: 'not_allowed' | 'denied';
+        }[];
+    }) => void;
     readonly logger?: Logger;
 }
 export declare class MCPToolDiscovery {
@@ -64,6 +74,19 @@ export declare class MCPToolDiscovery {
      * than taking discovery down.
      */
     discoverPromptsFrom(client: MCPClient): Promise<MCPPromptDefinition[]>;
+    /**
+     * The resources a server publishes, through the same admission gate its
+     * tools and prompts go through.
+     *
+     * A server publishing a resource is the same trust question as one
+     * publishing a tool or a prompt: the remote side must not decide what
+     * enters the agent's registry. Policy is matched on the resource's own
+     * `name`, as the server reports it — before this call existed,
+     * `mcpToolset` read `client.listResources()` directly and admitted every
+     * URI the server returned, so `deny`/`allow` governed tools and prompts
+     * but not the one other surface a server can contribute by name.
+     */
+    discoverResourcesFrom(client: MCPClient, options?: MCPRequestOptions): Promise<MCPResource[]>;
     toToolDefinitions(): Promise<ToolDefinition[]>;
     private detectDrift;
 }

package/dist/connector/mcp/discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/discovery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,iBAAiB,EACjB,mBAAmB,EAEnB,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAG/D,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,aAAa,EAKlB,MAAM,aAAa,CAAA;AAEpB,MAAM,WAAW,uBAAuB;IACvC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;IAC3D;;;;;;;;OAQG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,YAAY,CAAA;KAAE,KAAK,IAAI,CAAA;IACjG,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,OAAO,CAAyB;IACxC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,QAAQ,CAAyC;gBAE7C,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,uBAA4B;IAWvE,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAIlC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAS9B,WAAW,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA2B3C,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA4BnE;;;;;;;;;;;;OAYG;IACG,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA6BtE,iBAAiB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAWpD,OAAO,CAAC,WAAW;CAiBnB"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/discovery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EAEX,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAG/D,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,aAAa,EAKlB,MAAM,aAAa,CAAA;AAEpB,MAAM,WAAW,uBAAuB;IACvC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;IAC3D;;;;;;;;OAQG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,YAAY,CAAA;KAAE,KAAK,IAAI,CAAA;IACjG,+FAA+F;IAC/F,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE;QAC5B,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAA;QACvC,OAAO,EAAE,SAAS;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,aAAa,GAAG,QAAQ,CAAA;SAAE,EAAE,CAAA;KACtE,KAAK,IAAI,CAAA;IACV,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,OAAO,CAAyB;IACxC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,QAAQ,CAAyC;gBAE7C,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,uBAA4B;IAWvE,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAIlC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAS9B,WAAW,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA2B3C,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAkCnE;;;;;;;;;;;;OAYG;IACG,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAmC5E;;;;;;;;;;;OAWG;IACG,qBAAqB,CAC1B,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,WAAW,EAAE,CAAC;IAwBnB,iBAAiB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAWpD,OAAO,CAAC,WAAW;CAiBnB"}

package/dist/connector/mcp/discovery.js

@@ -75,6 +75,12 @@ export class MCPToolDiscovery {
         // having agreed to it.
         const policy = this.options.policies?.[state.serverName] ?? this.options.policies?.['*'];
         const { admitted, refused } = applyToolPolicy(advertised, policy);
+        this.options.onRefused?.({
+            serverName: state.serverName,
+            clientId: client.id,
+            kind: 'tools',
+            refused,
+        });
         if (refused.length > 0) {
             this.log.warn('MCP tools refused by policy', {
                 [NAMZU.SERVER_NAME]: state.serverName,
@@ -118,6 +124,12 @@ export class MCPToolDiscovery {
         }
         const policy = this.options.policies?.[state.serverName] ?? this.options.policies?.['*'];
         const { admitted, refused } = applyNamePolicy(advertised, policy);
+        this.options.onRefused?.({
+            serverName: state.serverName,
+            clientId: client.id,
+            kind: 'prompts',
+            refused,
+        });
         if (refused.length > 0) {
             this.log.warn('MCP prompts refused by policy', {
                 [NAMZU.SERVER_NAME]: state.serverName,
@@ -127,6 +139,38 @@ export class MCPToolDiscovery {
         }
         return admitted;
     }
+    /**
+     * The resources a server publishes, through the same admission gate its
+     * tools and prompts go through.
+     *
+     * A server publishing a resource is the same trust question as one
+     * publishing a tool or a prompt: the remote side must not decide what
+     * enters the agent's registry. Policy is matched on the resource's own
+     * `name`, as the server reports it — before this call existed,
+     * `mcpToolset` read `client.listResources()` directly and admitted every
+     * URI the server returned, so `deny`/`allow` governed tools and prompts
+     * but not the one other surface a server can contribute by name.
+     */
+    async discoverResourcesFrom(client, options) {
+        const state = client.getState();
+        const advertised = await client.listResources(options);
+        const policy = this.options.policies?.[state.serverName] ?? this.options.policies?.['*'];
+        const { admitted, refused } = applyNamePolicy(advertised, policy);
+        this.options.onRefused?.({
+            serverName: state.serverName,
+            clientId: client.id,
+            kind: 'resources',
+            refused,
+        });
+        if (refused.length > 0) {
+            this.log.warn('MCP resources refused by policy', {
+                [NAMZU.SERVER_NAME]: state.serverName,
+                'namzu.mcp.client_id': client.id,
+                'namzu.connector.refused': refused.map((r) => `${r.name} (${r.reason})`),
+            });
+        }
+        return admitted;
+    }
     async toToolDefinitions() {
         const discovered = await this.discoverAll();
         return discovered.map((d) => {

package/dist/connector/mcp/discovery.js.map

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

package/dist/connector/mcp/index.d.ts

@@ -12,6 +12,8 @@ export type { McpHeaderAnnotationVerdict, McpParamHeaderBinding } from './x-mcp-
 export { mcpToolToToolDefinition, toolDefinitionToMCPTool, mcpJsonSchemaToZod, zodToMCPJsonSchema, mcpToolResultToToolResult, toolResultToMCPToolResult, } from './adapter.js';
 export { MCPToolDiscovery } from './discovery.js';
 export { mcpPromptToToolDefinition, renderPromptMessages } from './prompt-adapter.js';
+export { mcpToolset, mcpToolsetName } from './mcp-toolset.js';
+export type { MCPToolsetOptions, MCPToolsets } from './mcp-toolset.js';
 export { MCPConnectorBridge } from '../../bridge/mcp/connector/adapter.js';
 export { MCPMethodNotFound, MCPServer, ServerStdioTransport } from './server/index.js';
 export type { MCPServerPromptProvider, MCPServerResourceProvider, MCPServerToolProvider, } from './server/index.js';

package/dist/connector/mcp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EACN,qBAAqB,EACrB,sCAAsC,EACtC,uBAAuB,EACvB,iCAAiC,EACjC,kBAAkB,EAClB,qBAAqB,EACrB,yBAAyB,EACzB,gBAAgB,GAChB,MAAM,aAAa,CAAA;AAKpB,OAAO,EACN,yBAAyB,EACzB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,aAAa,GACb,MAAM,UAAU,CAAA;AACjB,YAAY,EACX,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,GACrB,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AACjF,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAKpF,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAChE,YAAY,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAE1F,OAAO,EACN,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,GACzB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAM1E,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACtF,YAAY,EACX,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,GACrB,MAAM,mBAAmB,CAAA;AAE1B,YAAY,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC9F,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EACN,qBAAqB,EACrB,sCAAsC,EACtC,uBAAuB,EACvB,iCAAiC,EACjC,kBAAkB,EAClB,qBAAqB,EACrB,yBAAyB,EACzB,gBAAgB,GAChB,MAAM,aAAa,CAAA;AAKpB,OAAO,EACN,yBAAyB,EACzB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,aAAa,GACb,MAAM,UAAU,CAAA;AACjB,YAAY,EACX,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,GACrB,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AACjF,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAKpF,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAChE,YAAY,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAY1F,OAAO,EACN,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,GACzB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAErF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAC7D,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAM1E,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACtF,YAAY,EACX,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,GACrB,MAAM,mBAAmB,CAAA;AAE1B,YAAY,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC9F,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA"}

package/dist/connector/mcp/index.js

@@ -12,9 +12,20 @@ export { buildEnvelope, decodeResult, encodeMcpHeaderValue } from './envelope.js
 // Exported so a host can ask the same question of a schema it holds — and
 // because `McpEnvelopeInput.paramHeaders` names the binding type.
 export { validateMcpHeaderAnnotations } from './x-mcp-header.js';
+// `mcpToolset` (below) is now the ONE path new code should take onto a
+// `Toolset` from MCP (plan.md §4): tools, prompts and resources, discovered,
+// admitted and named together. `mcpToolToToolDefinition` and
+// `mcpPromptToToolDefinition` — the pieces `mcpToolset` wraps — were planned
+// to stop being exported here, but `packages/cli`'s own
+// `integrations/mcp/servers.ts` still calls `mcpToolToToolDefinition`
+// directly (its own naming convention, `mcp_<server>_<tool>`, predates
+// `mcp__`); migrating that CLI path — its tests assert the old names — is
+// item C1's job (plan.md's execution order), not this one's, so both stay
+// exported until C1 lands and removes them here.
 export { mcpToolToToolDefinition, toolDefinitionToMCPTool, mcpJsonSchemaToZod, zodToMCPJsonSchema, mcpToolResultToToolResult, toolResultToMCPToolResult, } from './adapter.js';
 export { MCPToolDiscovery } from './discovery.js';
 export { mcpPromptToToolDefinition, renderPromptMessages } from './prompt-adapter.js';
+export { mcpToolset, mcpToolsetName } from './mcp-toolset.js';
 export { MCPConnectorBridge } from '../../bridge/mcp/connector/adapter.js';
 // The direction reverses in `server/`: everything else in this barrel is
 // this process calling somebody else's MCP server, and that subdirectory

package/dist/connector/mcp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EACN,qBAAqB,EACrB,sCAAsC,EACtC,uBAAuB,EACvB,iCAAiC,EACjC,kBAAkB,EAClB,qBAAqB,EACrB,yBAAyB,EACzB,gBAAgB,GAChB,MAAM,aAAa,CAAA;AAEpB,0EAA0E;AAC1E,0EAA0E;AAC1E,4DAA4D;AAC5D,OAAO,EACN,yBAAyB,EACzB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,aAAa,GACb,MAAM,UAAU,CAAA;AAOjB,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAGjF,6EAA6E;AAC7E,0EAA0E;AAC1E,kEAAkE;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAGhE,OAAO,EACN,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,GACzB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAE1E,yEAAyE;AACzE,yEAAyE;AACzE,sEAAsE;AACtE,kCAAkC;AAClC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAQtF,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EACN,qBAAqB,EACrB,sCAAsC,EACtC,uBAAuB,EACvB,iCAAiC,EACjC,kBAAkB,EAClB,qBAAqB,EACrB,yBAAyB,EACzB,gBAAgB,GAChB,MAAM,aAAa,CAAA;AAEpB,0EAA0E;AAC1E,0EAA0E;AAC1E,4DAA4D;AAC5D,OAAO,EACN,yBAAyB,EACzB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,aAAa,GACb,MAAM,UAAU,CAAA;AAOjB,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAGjF,6EAA6E;AAC7E,0EAA0E;AAC1E,kEAAkE;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAGhE,uEAAuE;AACvE,6EAA6E;AAC7E,6DAA6D;AAC7D,6EAA6E;AAC7E,wDAAwD;AACxD,sEAAsE;AACtE,uEAAuE;AACvE,0EAA0E;AAC1E,0EAA0E;AAC1E,iDAAiD;AACjD,OAAO,EACN,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,GACzB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAErF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAG7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAE1E,yEAAyE;AACzE,yEAAyE;AACzE,sEAAsE;AACtE,kCAAkC;AAClC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAQtF,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA"}

package/dist/connector/mcp/mcp-toolset.d.ts

@@ -0,0 +1,133 @@
+import type { Toolset, ToolsetAvailability } from '../../toolsets/types.js';
+import { type Logger } from '../../utils/logger.js';
+import type { MCPClient } from './client.js';
+import type { MCPToolDrift } from './policy.js';
+import { type MCPReconnectOptions, type MCPReconnectPolicySource } from './reconnect.js';
+/**
+ * Join `serverName` and `segments` under the `mcp__` convention, shortened
+ * deterministically when the result would not fit the wire's 64-character
+ * tool-name ceiling.
+ *
+ * Never refuses a tool silently: a name over the limit is truncated and
+ * given an 8-hex-character content hash suffix (`_<hash>`) instead of being
+ * dropped, so two overlong names that happen to share a 55-character prefix
+ * still end up distinct. The hash is over the FULL untruncated name, so
+ * renaming is a pure function of `(serverName, segments)` — the same inputs
+ * always shorten to the same output, which is what makes a later call
+ * (`callTool`, permission rules keyed by name) able to reconstruct it.
+ */
+export declare function mcpToolsetName(serverName: string, ...segments: readonly string[]): string;
+export interface MCPToolsetOptions {
+    /**
+     * `ToolSource.id` for the returned toolset. Defaults to `mcp:<server
+     * name>`. A caller composing several servers under one namespace — a
+     * plugin's own MCP server, say — passes its own hierarchical id (for
+     * instance `plugin:<name>/mcp:<server>`) so the source id says where the
+     * connection came from, not only which server it reached.
+     */
+    readonly id?: string;
+    /**
+     * Names (as the SERVER reports them, before the `mcp__` prefix) this
+     * toolset admits from `tools/list` and `prompts/list`. Absent admits
+     * everything, matching `MCPToolDiscovery`'s own default.
+     */
+    readonly allow?: readonly string[];
+    /** Names never admitted, even when `allow` lists them. */
+    readonly deny?: readonly string[];
+    /**
+     * In-loop retry budget for every tool this server contributes. See
+     * `mcpToolToToolDefinition`'s own `maxRetries` parameter: only a result
+     * the adapter already classifies `retrySafety: 'safe'` is ever retried,
+     * whatever this is set to.
+     */
+    readonly maxRetries?: number;
+    /**
+     * The operator marked this server's read-only claims trustworthy. Per
+     * server, default `false` — an unmarked server's claim raises the
+     * requirement and never lowers it. The owning source carries this decision.
+     */
+    readonly readOnlyHintTrusted?: boolean;
+    /**
+     * This toolset's own default for the tools and prompts it contributes.
+     * Absent means `'active'`. The two resource tools (`list_resources`,
+     * `read_resource`) are always `'deferred'` regardless of this — see the
+     * "resource tools are always deferred" note on {@link mcpToolset}.
+     */
+    readonly availability?: ToolsetAvailability;
+    /**
+     * Called when a re-discovery (a `list_changed` notification, or a
+     * reconnect) finds a tool set that differs from the previous one — the
+     * "rug pull" shape `MCPToolDiscovery` exists to catch. A changed tool's
+     * previously admitted definition keeps serving for this toolset's lifetime;
+     * added and removed names apply at the next refresh boundary.
+     */
+    readonly onDrift?: (event: {
+        serverName: string;
+        clientId: string;
+        drift: MCPToolDrift;
+    }) => void;
+    /** Current tool, prompt and resource names refused by this server's policy. */
+    readonly onRefused?: (event: {
+        serverName: string;
+        clientId: string;
+        kind: 'tools' | 'prompts' | 'resources';
+        refused: readonly {
+            name: string;
+            reason: 'not_allowed' | 'denied';
+        }[];
+    }) => void;
+    /**
+     * How this toolset recovers a dropped connection. `{ enabled: false }`
+     * turns this off — for a caller that already runs its own
+     * `MCPReconnectSupervisor` against the same client and would otherwise
+     * end up with two supervisors racing to reconnect it.
+     */
+    readonly reconnect?: MCPReconnectOptions | MCPReconnectPolicySource;
+    readonly logger?: Logger;
+}
+/** Mount both entries: server tools use the configured availability; resource tools stay deferred. */
+export type MCPToolsets = readonly [main: Toolset, resources: Toolset];
+/**
+ * A connected MCP server as a live {@link Toolset}: its tools, its prompts
+ * (through the existing adapters), and its resources as two deferred tools.
+ *
+ * The ONE path onto a `Toolset` from MCP — the CLI and a plugin both build
+ * their server toolsets this way (plan.md §4). `client` must already be
+ * connected; this function only discovers and wraps, it never dials.
+ *
+ * `options.allow`/`options.deny` govern all three surfaces a server can
+ * contribute by name — tools, prompts AND resources — through
+ * `MCPToolDiscovery`'s `discoverFrom`/`discoverPromptsFrom`/
+ * `discoverResourcesFrom`. A denied resource is never listed and never
+ * admitted into `read_resource`'s URI set, the same as a denied tool never
+ * reaching `tools()`.
+ *
+ * ## Resource tools are always deferred
+ *
+ * `mcp__<server>__list_resources` and `mcp__<server>__read_resource` are
+ * built with `deferred(...)` regardless of `options.availability` — a
+ * server's resource catalogue is usually not worth showing up front the way
+ * its tools are. `Toolset.availability` is a whole-toolset default, so this
+ * function returns two toolsets to mount together: the main tools and the
+ * deferred resource pair. It checks name collisions across both entries
+ * before returning and after a notification refresh.
+ *
+ * ## Change and reconnection
+ *
+ * `onChange` fires when a `tools/list_changed`, `prompts/list_changed` or
+ * `resources/list_changed` notification arrives — each gated on the server
+ * having advertised that capability's own `listChanged: true`, so a server
+ * that never declared it cannot make this toolset re-fetch by sending the
+ * notification anyway — and after every successful reconnection (the
+ * server may have restarted with a different tool set, which is not a
+ * notification at all, and may have negotiated different capabilities
+ * entirely — including resources, which is why whether the two resource
+ * tools are currently present is re-checked on every reconnect rather than
+ * decided once at construction). `close()` stops the reconnect supervisor
+ * this function owns and releases the `onNotification` subscription it
+ * registered; pass `reconnect: { enabled: false }` when the caller runs its
+ * own supervisor against the same client, to avoid two supervisors racing to
+ * reconnect it.
+ */
+export declare function mcpToolset(client: MCPClient, options?: MCPToolsetOptions): Promise<MCPToolsets>;
+//# sourceMappingURL=mcp-toolset.d.ts.map

package/dist/connector/mcp/mcp-toolset.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-toolset.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/mcp-toolset.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAO3E,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,EACN,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAE7B,MAAM,gBAAgB,CAAA;AAiBvB;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAMzF;AAED,MAAM,WAAW,iBAAiB;IACjC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAA;IACpB;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAClC,0DAA0D;IAC1D,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;IACtC;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAA;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,YAAY,CAAA;KAAE,KAAK,IAAI,CAAA;IACjG,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE;QAC5B,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAA;QACvC,OAAO,EAAE,SAAS;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,aAAa,GAAG,QAAQ,CAAA;SAAE,EAAE,CAAA;KACtE,KAAK,IAAI,CAAA;IACV;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,mBAAmB,GAAG,wBAAwB,CAAA;IACnE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,sGAAsG;AACtG,MAAM,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;AAiHtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAsB,UAAU,CAC/B,MAAM,EAAE,SAAS,EACjB,OAAO,GAAE,iBAAsB,GAC7B,OAAO,CAAC,WAAW,CAAC,CAyOtB"}