@namzu/sdk 45.1.0 → 48.0.0

package/dist/connector/mcp/mcp-toolset.js

@@ -0,0 +1,399 @@
+import { createHash } from 'node:crypto';
+import { z } from 'zod';
+import { NAMZU } from '../../constants/telemetry/index.js';
+import { ToolsetConflictError } from '../../toolsets/combine.js';
+import { deferred } from '../../toolsets/wrappers.js';
+import { toErrorMessage } from '../../utils/error.js';
+import { SCOPE_ATTRIBUTE } from '../../utils/log/types.js';
+import { resolveLogger } from '../../utils/logger.js';
+import { frameServerResult, mcpToolResultToToolResult, mcpToolToToolDefinition } from './adapter.js';
+import { MCPToolDiscovery } from './discovery.js';
+import { mcpPromptToToolDefinition } from './prompt-adapter.js';
+import { MCPReconnectSupervisor, } from './reconnect.js';
+/**
+ * `mcp__<server>__<rest>`, the one MCP naming convention (plan.md §4,
+ * "Names become `mcp__<server>__<tool>` everywhere"). Before this, the CLI's
+ * own path minted `mcp_<server>_<tool>` (single underscore, ambiguous the
+ * moment either name contains one) while the plugin path already used
+ * `mcp__`; this toolset is the one place both now go through.
+ *
+ * `mcpToolToToolDefinition`/`mcpPromptToToolDefinition` keep their OWN
+ * historical naming (`mcp_<server>_<tool>` / `mcp_prompt_<server>_<name>`)
+ * for direct adapter users — this module renames what they hand back rather
+ * than changing what they produce. The CLI and plugin lifecycle both use
+ * this toolset.
+ */
+const MCP_TOOLSET_NAME_MAX_LENGTH = 64;
+/**
+ * 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 function mcpToolsetName(serverName, ...segments) {
+    const full = ['mcp', serverName, ...segments].join('__');
+    if (full.length <= MCP_TOOLSET_NAME_MAX_LENGTH)
+        return full;
+    const hash = createHash('sha256').update(full).digest('hex').slice(0, 8);
+    const suffix = `_${hash}`;
+    return `${full.slice(0, MCP_TOOLSET_NAME_MAX_LENGTH - suffix.length)}${suffix}`;
+}
+/**
+ * Fetch and admit this server's resources, and refresh `state.admittedUris`
+ * from the result — the ONLY place that set is ever written, so it can only
+ * ever hold a post-policy URI. `list_resources`'s own `execute` below and
+ * `mcpToolset`'s `refreshResourceUris` (construction, `resources/list_changed`,
+ * reconnection) both call this rather than `client.listResources` directly,
+ * which is what used to let a denied resource stay listed and readable: the
+ * two callers fetched raw and set `admittedUris` from it with no policy gate
+ * at all, unlike `discovery.discoverFrom`/`discoverPromptsFrom`, which both
+ * already run everything through `applyNamePolicy`.
+ */
+async function refreshAdmittedResources(discovery, state, options) {
+    const resources = await discovery.discoverResourcesFrom(state.client, options);
+    state.admittedUris = new Set(resources.map((r) => r.uri));
+    return resources;
+}
+function buildResourceTools(discovery, state) {
+    const { client, serverName } = state;
+    const listResources = {
+        name: mcpToolsetName(serverName, 'list_resources'),
+        description: `[MCP:${serverName}] List the resources this server publishes. Call this before "${mcpToolsetName(serverName, 'read_resource')}" — only a URI this returns may be read.`,
+        inputSchema: z.object({}),
+        category: 'network',
+        permissions: ['network_access'],
+        isReadOnly: () => true,
+        isDestructive: () => false,
+        isConcurrencySafe: () => true,
+        async execute(_input, context) {
+            try {
+                const resources = await refreshAdmittedResources(discovery, state, {
+                    signal: context.abortSignal,
+                });
+                const listing = resources.map((r) => ({
+                    uri: r.uri,
+                    name: r.name,
+                    description: r.description,
+                    mimeType: r.mimeType,
+                }));
+                return frameServerResult({ success: true, output: JSON.stringify(listing, null, 2) }, serverName, 'list_resources');
+            }
+            catch (err) {
+                return {
+                    success: false,
+                    output: '',
+                    error: `Could not list resources on "${serverName}": ${toErrorMessage(err)}`,
+                };
+            }
+        },
+    };
+    const readResource = {
+        name: mcpToolsetName(serverName, 'read_resource'),
+        description: `[MCP:${serverName}] Read one resource this server publishes. "uri" must be one "${mcpToolsetName(serverName, 'list_resources')}" listed.`,
+        inputSchema: z.object({
+            uri: z.string().describe('A resource URI this server listed via list_resources.'),
+        }),
+        category: 'network',
+        permissions: ['network_access'],
+        isReadOnly: () => true,
+        isDestructive: () => false,
+        isConcurrencySafe: () => true,
+        async execute(input, context) {
+            const { uri } = input;
+            // Admission, not merely a lookup: the server does not get to decide
+            // what this call may read by returning a resource it never listed.
+            // `state.admittedUris` is refreshed by `list_resources` above and by
+            // `resources/list_changed` (see `mcpToolset`), so a URI has to have
+            // been SEEN, not merely well-formed.
+            if (!state.admittedUris.has(uri)) {
+                return {
+                    success: false,
+                    output: '',
+                    error: `"${uri}" is not a resource "${serverName}" has listed. Call "${mcpToolsetName(serverName, 'list_resources')}" first.`,
+                };
+            }
+            try {
+                const contents = await client.readResource(uri, { signal: context.abortSignal });
+                const result = mcpToolResultToToolResult({ content: contents, isError: false });
+                return frameServerResult(result, serverName, 'read_resource');
+            }
+            catch (err) {
+                return {
+                    success: false,
+                    output: '',
+                    error: `Could not read resource "${uri}" from "${serverName}": ${toErrorMessage(err)}`,
+                };
+            }
+        },
+    };
+    return [listResources, readResource];
+}
+/**
+ * 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 async function mcpToolset(client, options = {}) {
+    const initial = client.getState();
+    if (initial.status !== 'connected') {
+        throw new Error(`mcpToolset: the MCP client for "${initial.serverName}" must be connected before its toolset is built (status: "${initial.status}").`);
+    }
+    const serverName = initial.serverName;
+    const readOnlyHintTrusted = options.readOnlyHintTrusted ?? false;
+    const log = resolveLogger(options.logger).child({
+        [SCOPE_ATTRIBUTE]: 'connector/mcp/mcp-toolset',
+    });
+    const source = {
+        id: options.id ?? `mcp:${serverName}`,
+        kind: 'mcp_server',
+        name: serverName,
+        // The server's own account of how to use it (`instructions`, read off
+        // the last `initialize`/discover result) is remote-party text, same as
+        // a tool's description — carried here rather than dropped, since a
+        // host may choose to surface it (plan.md §4, CLI half).
+        ...(initial.serverInstructions !== undefined
+            ? { description: initial.serverInstructions }
+            : {}),
+        mcpServer: { name: serverName, readOnlyHintTrusted },
+    };
+    const heldToolNames = new Set();
+    const discovery = new MCPToolDiscovery([client], {
+        policies: { [serverName]: { allow: options.allow, deny: options.deny } },
+        onDrift: (event) => {
+            for (const name of event.drift.changed)
+                heldToolNames.add(name);
+            options.onDrift?.(event);
+        },
+        onRefused: options.onRefused,
+        logger: options.logger,
+    });
+    let toolDefs = [];
+    let promptDefs = [];
+    let mainTools = [];
+    let closed = false;
+    const listeners = new Set();
+    function rebuildMain() {
+        mainTools = [...toolDefs, ...promptDefs];
+    }
+    async function refreshTools() {
+        const discovered = await discovery.discoverFrom(client);
+        const previous = new Map(toolDefs.map((definition) => [definition.name, definition]));
+        toolDefs = discovered.map((d) => {
+            const name = mcpToolsetName(serverName, d.tool.name);
+            const admitted = previous.get(name);
+            if (admitted && heldToolNames.has(d.tool.name))
+                return admitted;
+            const base = mcpToolToToolDefinition(d.tool, client, serverName, readOnlyHintTrusted, options.maxRetries);
+            return { ...base, name };
+        });
+        for (const name of heldToolNames) {
+            if (!discovered.some((entry) => entry.tool.name === name))
+                heldToolNames.delete(name);
+        }
+        rebuildMain();
+    }
+    async function refreshPrompts() {
+        if (!client.getState().serverCapabilities?.prompts) {
+            promptDefs = [];
+            rebuildMain();
+            return;
+        }
+        const prompts = await discovery.discoverPromptsFrom(client);
+        promptDefs = prompts.map((p) => {
+            const base = mcpPromptToToolDefinition(p, client, serverName);
+            return { ...base, name: mcpToolsetName(serverName, 'prompt', p.name) };
+        });
+        rebuildMain();
+    }
+    const resourceState = {
+        client,
+        serverName,
+        admittedUris: new Set(),
+    };
+    async function refreshResourceUris() {
+        await refreshAdmittedResources(discovery, resourceState);
+    }
+    // The two resource tool DEFINITIONS are built once, unconditionally — they
+    // are inert until `resourceTools` (below) actually includes them. Building
+    // them up front, rather than only when the server first supports
+    // resources, is what lets a reconnect that negotiates the capability for
+    // the FIRST time (see `syncResourceCapability`) expose them without
+    // rebuilding the toolset this function returns.
+    const resourceToolDefs = buildResourceTools(discovery, resourceState);
+    let supportsResources = initial.serverCapabilities?.resources !== undefined;
+    let resourceTools = supportsResources ? resourceToolDefs : [];
+    /**
+     * Re-read whether the server currently supports resources and bring
+     * `resourceTools`/`admittedUris` into line with that — called at
+     * construction and after every reconnect, never relying on a value
+     * captured once. A server that stops advertising the capability loses its
+     * resource tools from the next `tools()` snapshot; one that gains it for
+     * the first time (a restart with a newer build, say) gets them added.
+     */
+    async function syncResourceCapability() {
+        supportsResources = client.getState().serverCapabilities?.resources !== undefined;
+        resourceTools = supportsResources ? resourceToolDefs : [];
+        if (supportsResources) {
+            await refreshResourceUris();
+        }
+        else {
+            resourceState.admittedUris = new Set();
+        }
+    }
+    await Promise.all([
+        refreshTools(),
+        refreshPrompts(),
+        supportsResources ? refreshResourceUris() : Promise.resolve(),
+    ]);
+    const assertUnique = () => {
+        const names = new Set();
+        for (const tool of [...mainTools, ...resourceTools]) {
+            if (names.has(tool.name))
+                throw new ToolsetConflictError(tool.name, source, source);
+            names.add(tool.name);
+        }
+    };
+    assertUnique();
+    const notify = () => {
+        assertUnique();
+        for (const listener of listeners)
+            listener();
+    };
+    const onChange = (listener) => {
+        listeners.add(listener);
+        return () => listeners.delete(listener);
+    };
+    // Read fresh on every notification rather than captured once: a
+    // reconnect can renegotiate different capabilities, and a stale copy
+    // would keep acting on what the PREVIOUS connection advertised.
+    const currentCapabilities = () => client.getState().serverCapabilities;
+    // A rejection here would otherwise be a genuine unhandled promise
+    // rejection: it happens inside a fire-and-forget notification callback,
+    // not inside anything a caller of `mcpToolset` is awaiting, so nothing
+    // upstream ever gets a chance to catch it. A transient failure on the
+    // re-fetch a notification triggers (a network blip, or the connection
+    // dropping around the same moment the server notified) is exactly the
+    // kind of thing that must be logged, not left to crash the process.
+    const onRefreshFailure = (which) => (err) => {
+        log.error('Failed to refresh MCP tools after a server notification', {
+            [NAMZU.SERVER_NAME]: serverName,
+            'namzu.connector.refresh': which,
+            'exception.message': toErrorMessage(err),
+        });
+    };
+    const unsubscribeNotifications = client.onNotification((method) => {
+        if (closed)
+            return;
+        if (method === 'notifications/tools/list_changed') {
+            if (!currentCapabilities()?.tools?.listChanged)
+                return;
+            void refreshTools().then(notify).catch(onRefreshFailure('tools'));
+        }
+        else if (method === 'notifications/prompts/list_changed') {
+            if (!currentCapabilities()?.prompts?.listChanged)
+                return;
+            void refreshPrompts().then(notify).catch(onRefreshFailure('prompts'));
+        }
+        else if (method === 'notifications/resources/list_changed') {
+            if (!currentCapabilities()?.resources?.listChanged)
+                return;
+            void refreshResourceUris().then(notify).catch(onRefreshFailure('resources'));
+        }
+    });
+    const readReconnectOptions = typeof options.reconnect === 'function'
+        ? options.reconnect
+        : () => options.reconnect ?? {};
+    const supervisor = new MCPReconnectSupervisor(client, () => ({
+        ...readReconnectOptions(),
+        onReconnected: async () => {
+            if (closed)
+                return;
+            // The server may have come back with a different tool set entirely
+            // — not a `list_changed` notification, which this reconnected
+            // client has not even finished re-subscribing to yet. Re-run every
+            // discovery unconditionally, the same as first construction, and
+            // re-derive `supportsResources` rather than reuse the value from
+            // the FIRST connection: a reconnect can renegotiate capabilities,
+            // and a stale copy would keep acting on what the previous
+            // connection advertised, the same reasoning `currentCapabilities`
+            // above already applies to the `list_changed` gates.
+            await Promise.all([refreshTools(), refreshPrompts(), syncResourceCapability()]);
+            if (closed)
+                return;
+            notify();
+            await readReconnectOptions().onReconnected?.();
+        },
+    }));
+    supervisor.start();
+    const close = async () => {
+        if (closed)
+            return;
+        closed = true;
+        unsubscribeNotifications();
+        supervisor.stop();
+    };
+    const mainToolset = {
+        source,
+        tools: () => mainTools,
+        availability: options.availability,
+        onChange,
+        close,
+    };
+    const resourceToolset = {
+        source,
+        // A `let`, not a snapshot: `syncResourceCapability` reassigns this on
+        // every reconnect, so a capability that appears or disappears between
+        // two calls is visible without rebuilding either returned toolset.
+        tools: () => resourceTools,
+        onChange,
+        close,
+    };
+    // Keep these as separate ToolManager entries. A Toolset has one availability
+    // for all its tools, so merging them would silently activate the resources.
+    return [mainToolset, deferred(resourceToolset)];
+}
+//# sourceMappingURL=mcp-toolset.js.map

package/dist/connector/mcp/mcp-toolset.js.map

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

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

@@ -2,6 +2,6 @@ export { createConnectorExecuteTool, createConnectorListTool, createConnectorToo
 export type { ConnectorToolConfig } from './definitions.js';
 export { connectorMethodToTool, connectorInstanceToTools, allConnectorTools, createConnectorRouterTool, } from './adapter.js';
 export type { ConnectorRouterInput } from './adapter.js';
-export { ConnectorToolRouter } from './router.js';
-export type { ConnectorToolStrategy, ConnectorToolRouterConfig } from './router.js';
+export { connectorTools } from './router.js';
+export type { ConnectorToolStrategy, ConnectorTools } from './router.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connector/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,0BAA0B,EAC1B,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,kBAAkB,CAAA;AACzB,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAE3D,OAAO,EACN,qBAAqB,EACrB,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,GACzB,MAAM,cAAc,CAAA;AACrB,YAAY,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAExD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connector/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,0BAA0B,EAC1B,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,kBAAkB,CAAA;AACzB,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAE3D,OAAO,EACN,qBAAqB,EACrB,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,GACzB,MAAM,cAAc,CAAA;AACrB,YAAY,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,YAAY,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA"}

package/dist/connector/tools/index.js

@@ -1,4 +1,4 @@
 export { createConnectorExecuteTool, createConnectorListTool, createConnectorTools, } from './definitions.js';
 export { connectorMethodToTool, connectorInstanceToTools, allConnectorTools, createConnectorRouterTool, } from './adapter.js';
-export { ConnectorToolRouter } from './router.js';
+export { connectorTools } from './router.js';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,0BAA0B,EAC1B,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EACN,qBAAqB,EACrB,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,GACzB,MAAM,cAAc,CAAA;AAGrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,0BAA0B,EAC1B,uBAAuB,EACvB,oBAAoB,GACpB,MAAM,kBAAkB,CAAA;AAGzB,OAAO,EACN,qBAAqB,EACrB,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,GACzB,MAAM,cAAc,CAAA;AAGrB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA"}

package/dist/connector/tools/router.d.ts

@@ -1,20 +1,22 @@
 import type { ConnectorManager } from '../../manager/connector/lifecycle.js';
-import type { ToolDefinition, ToolRegistryContract } from '../../types/tool/index.js';
+import type { ToolDefinition } from '../../types/tool/index.js';
 import { type Logger } from '../../utils/logger.js';
 export type ConnectorToolStrategy = 'per-method' | 'router';
-export interface ConnectorToolRouterConfig {
-    manager: ConnectorManager;
+export interface ConnectorTools {
     strategy?: ConnectorToolStrategy;
     log?: Logger;
 }
-export declare class ConnectorToolRouter {
-    private manager;
-    private strategy;
-    private log;
-    constructor(config: ConnectorToolRouterConfig);
-    getTools(): ToolDefinition[];
-    registerTools(toolRegistry: ToolRegistryContract): string[];
-    unregisterTools(toolRegistry: ToolRegistryContract, toolNames: string[]): void;
-    refreshTools(toolRegistry: ToolRegistryContract, previousNames: string[]): string[];
-}
+/**
+ * Every tool a connector manager's connected instances currently offer.
+ *
+ * Plain and stateless — a caller wraps the result in `toolset(source, tools)`
+ * (`toolsets/toolset.ts`) itself, re-calling this whenever a reconnect or a
+ * drift notice (`onMCPToolDrift`-shaped) means the set may have changed. This
+ * replaces `ConnectorToolRouter`, whose `registerTools`/`unregisterTools`/
+ * `refreshTools` mutated a `ToolRegistryContract` directly (plan.md v3 §2)
+ * and had no production caller; a live toolset with its own `onChange` is
+ * where that live-refresh story belongs now, not a router bound to a
+ * specific registry instance.
+ */
+export declare function connectorTools(manager: ConnectorManager, config?: ConnectorTools): ToolDefinition[];
 //# sourceMappingURL=router.d.ts.map

package/dist/connector/tools/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../src/connector/tools/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAGrF,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;AAGlE,MAAM,MAAM,qBAAqB,GAAG,YAAY,GAAG,QAAQ,CAAA;AAE3D,MAAM,WAAW,yBAAyB;IACzC,OAAO,EAAE,gBAAgB,CAAA;IACzB,QAAQ,CAAC,EAAE,qBAAqB,CAAA;IAChC,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,qBAAa,mBAAmB;IAC/B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,GAAG,CAAQ;gBAEP,MAAM,EAAE,yBAAyB;IAM7C,QAAQ,IAAI,cAAc,EAAE;IAqB5B,aAAa,CAAC,YAAY,EAAE,oBAAoB,GAAG,MAAM,EAAE;IAc3D,eAAe,CAAC,YAAY,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAS9E,YAAY,CAAC,YAAY,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;CAInF"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../src/connector/tools/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAG/D,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;AAGlE,MAAM,MAAM,qBAAqB,GAAG,YAAY,GAAG,QAAQ,CAAA;AAE3D,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,EAAE,qBAAqB,CAAA;IAChC,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAC7B,OAAO,EAAE,gBAAgB,EACzB,MAAM,GAAE,cAAmB,GACzB,cAAc,EAAE,CAsBlB"}

package/dist/connector/tools/router.js

@@ -2,60 +2,39 @@ import { toErrorMessage } from '../../utils/error.js';
 import { SCOPE_ATTRIBUTE } from '../../utils/log/types.js';
 import { resolveLogger } from '../../utils/logger.js';
 import { connectorInstanceToTools, createConnectorRouterTool } from './adapter.js';
-export class ConnectorToolRouter {
-    manager;
-    strategy;
-    log;
-    constructor(config) {
-        this.manager = config.manager;
-        this.strategy = config.strategy ?? 'per-method';
-        this.log = resolveLogger(config.log).child({ [SCOPE_ATTRIBUTE]: 'connector/tools/router' });
+/**
+ * Every tool a connector manager's connected instances currently offer.
+ *
+ * Plain and stateless — a caller wraps the result in `toolset(source, tools)`
+ * (`toolsets/toolset.ts`) itself, re-calling this whenever a reconnect or a
+ * drift notice (`onMCPToolDrift`-shaped) means the set may have changed. This
+ * replaces `ConnectorToolRouter`, whose `registerTools`/`unregisterTools`/
+ * `refreshTools` mutated a `ToolRegistryContract` directly (plan.md v3 §2)
+ * and had no production caller; a live toolset with its own `onChange` is
+ * where that live-refresh story belongs now, not a router bound to a
+ * specific registry instance.
+ */
+export function connectorTools(manager, config = {}) {
+    const strategy = config.strategy ?? 'per-method';
+    const log = resolveLogger(config.log).child({ [SCOPE_ATTRIBUTE]: 'connector/tools/router' });
+    if (strategy === 'router') {
+        const connected = manager.listConnectedInstances();
+        if (connected.length === 0)
+            return [];
+        return [createConnectorRouterTool(manager)];
     }
-    getTools() {
-        if (this.strategy === 'router') {
-            const connected = this.manager.listConnectedInstances();
-            if (connected.length === 0)
-                return [];
-            return [createConnectorRouterTool(this.manager)];
+    const tools = [];
+    for (const instance of manager.listConnectedInstances()) {
+        try {
+            tools.push(...connectorInstanceToTools(instance.id, manager));
         }
-        const tools = [];
-        for (const instance of this.manager.listConnectedInstances()) {
-            try {
-                tools.push(...connectorInstanceToTools(instance.id, this.manager));
-            }
-            catch (err) {
-                this.log.error('Failed to create tools for a connector instance', {
-                    'namzu.connector.instance_id': instance.id,
-                    'exception.message': toErrorMessage(err),
-                });
-            }
+        catch (err) {
+            log.error('Failed to create tools for a connector instance', {
+                'namzu.connector.instance_id': instance.id,
+                'exception.message': toErrorMessage(err),
+            });
         }
-        return tools;
-    }
-    registerTools(toolRegistry) {
-        const tools = this.getTools();
-        const names = [];
-        for (const tool of tools) {
-            toolRegistry.register(tool);
-            names.push(tool.name);
-        }
-        this.log.info('Registered connector tools', {
-            'namzu.connector.tool_count': names.length,
-            'namzu.tool.names': names,
-        });
-        return names;
-    }
-    unregisterTools(toolRegistry, toolNames) {
-        for (const name of toolNames) {
-            toolRegistry.unregister(name);
-        }
-        this.log.info('Unregistered connector tools', {
-            'namzu.connector.tool_count': toolNames.length,
-        });
-    }
-    refreshTools(toolRegistry, previousNames) {
-        this.unregisterTools(toolRegistry, previousNames);
-        return this.registerTools(toolRegistry);
     }
+    return tools;
 }
 //# sourceMappingURL=router.js.map

package/dist/connector/tools/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/connector/tools/router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAe,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AAUlF,MAAM,OAAO,mBAAmB;IACvB,OAAO,CAAkB;IACzB,QAAQ,CAAuB;IAC/B,GAAG,CAAQ;IAEnB,YAAY,MAAiC;QAC5C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAC7B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,YAAY,CAAA;QAC/C,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,wBAAwB,EAAE,CAAC,CAAA;IAC5F,CAAC;IAED,QAAQ;QACP,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAA;YACvD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAA;YACrC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACjD,CAAC;QAED,MAAM,KAAK,GAAqB,EAAE,CAAA;QAClC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC;YAC9D,IAAI,CAAC;gBACJ,KAAK,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;YACnE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iDAAiD,EAAE;oBACjE,6BAA6B,EAAE,QAAQ,CAAC,EAAE;oBAC1C,mBAAmB,EAAE,cAAc,CAAC,GAAG,CAAC;iBACxC,CAAC,CAAA;YACH,CAAC;QACF,CAAC;QACD,OAAO,KAAK,CAAA;IACb,CAAC;IAED,aAAa,CAAC,YAAkC;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAC7B,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC3B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtB,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE;YAC3C,4BAA4B,EAAE,KAAK,CAAC,MAAM;YAC1C,kBAAkB,EAAE,KAAK;SACzB,CAAC,CAAA;QACF,OAAO,KAAK,CAAA;IACb,CAAC;IAED,eAAe,CAAC,YAAkC,EAAE,SAAmB;QACtE,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC9B,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC9B,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAC7C,4BAA4B,EAAE,SAAS,CAAC,MAAM;SAC9C,CAAC,CAAA;IACH,CAAC;IAED,YAAY,CAAC,YAAkC,EAAE,aAAuB;QACvE,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;QACjD,OAAO,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;IACxC,CAAC;CACD"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/connector/tools/router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAe,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AASlF;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,cAAc,CAC7B,OAAyB,EACzB,SAAyB,EAAE;IAE3B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,YAAY,CAAA;IAChD,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,wBAAwB,EAAE,CAAC,CAAA;IAE5F,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAA;QAClD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAA;QACrC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,KAAK,GAAqB,EAAE,CAAA;IAClC,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC;QACzD,IAAI,CAAC;YACJ,KAAK,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;QAC9D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,KAAK,CAAC,iDAAiD,EAAE;gBAC5D,6BAA6B,EAAE,QAAQ,CAAC,EAAE;gBAC1C,mBAAmB,EAAE,cAAc,CAAC,GAAG,CAAC;aACxC,CAAC,CAAA;QACH,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAA;AACb,CAAC"}

package/dist/contracts/a2a.d.ts

@@ -726,13 +726,13 @@ export declare const A2ATaskListSchema: z.ZodObject<{
 }, "strict", z.ZodTypeAny, {
     limit: number;
     state?: "pending" | "running" | "completed" | "failed" | "rejected" | "canceled" | "input-required" | undefined;
-    contextId?: string | undefined;
     cursor?: string | undefined;
+    contextId?: string | undefined;
 }, {
     limit?: number | undefined;
     state?: "pending" | "running" | "completed" | "failed" | "rejected" | "canceled" | "input-required" | undefined;
-    contextId?: string | undefined;
     cursor?: string | undefined;
+    contextId?: string | undefined;
 }>;
 export declare const A2ATaskCancelSchema: z.ZodObject<{
     id: z.ZodString;

package/dist/directory/derive-supervisor.d.ts

@@ -1,5 +1,5 @@
 import type { AgentIdentity } from '../agents/runAgent.js';
-import { ToolRegistry } from '../registry/tool/execute.js';
+import type { Toolset } from '../toolsets/types.js';
 import type { SupervisorAgentConfig } from '../types/agent/supervisor.js';
 import type { LLMProvider } from '../types/provider/index.js';
 import type { DirectoryManifest } from './types.js';
@@ -39,7 +39,7 @@ export interface DelegatePlan {
     readonly manifest: DirectoryManifest;
     /** The delegate's own instructions, tools and model, already assembled. */
     readonly systemPrompt: string;
-    readonly tools: ToolRegistry;
+    readonly toolsets: readonly Toolset[];
     readonly model: string;
 }
 /**

package/dist/directory/derive-supervisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive-supervisor.d.ts","sourceRoot":"","sources":["../../src/directory/derive-supervisor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,YAAY,CAAA;AAElE,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAA;IAC9B,qEAAqE;IACrE,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;IAC3C;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAA;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,cAAc;IAC9B,+DAA+D;IAC/D,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAA;IACtC;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,YAAY,EAAE,CAAA;CAC3C;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAA;IACpC,2EAA2E;IAC3E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAA;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACtB;AAsBD;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACtC,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,qBAAqB,GAC1B,cAAc,CA4EhB"}
+{"version":3,"file":"derive-supervisor.d.ts","sourceRoot":"","sources":["../../src/directory/derive-supervisor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAE1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,YAAY,CAAA;AAElE,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAA;IAC9B,qEAAqE;IACrE,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;IAC3C;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAA;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,cAAc;IAC9B,+DAA+D;IAC/D,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAA;IACtC;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,YAAY,EAAE,CAAA;CAC3C;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAA;IACpC,2EAA2E;IAC3E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAA;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACtB;AAyBD;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACtC,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,qBAAqB,GAC1B,cAAc,CA4EhB"}