@namzu/cli 30.0.0 → 32.0.0

package/dist/integrations/mcp/servers.d.ts

@@ -14,7 +14,7 @@
  *       "search":   { "url": "https://tools.example.internal/mcp" }
  *     }
  *
- * Its tools arrive prefixed with the server's name (`mcp_tickets_create`), so
+ * Its tools arrive prefixed with the server's name (`mcp__tickets__create`), so
  * two servers offering `search` do not collide and the transcript says where a
  * call went.
  *
@@ -31,7 +31,7 @@
  * and a headless run has nobody to read anything, so it refuses. This module
  * reports; the callers decide.
  */
-import { type MCPTransportUnion, type ToolDefinition } from '@namzu/sdk';
+import { type MCPToolDrift, type MCPTransportUnion, type ToolDefinition, type Toolset } from '@namzu/sdk';
 /**
  * How long a single server gets to connect, hand shake and list its tools.
  *
@@ -55,6 +55,15 @@ export interface McpServerSpec {
     /** Stdio: the executable to run. */
     readonly command?: string;
     readonly args?: readonly string[];
+    /**
+     * A value may reference the operator's own environment with a bare
+     * `${VAR_NAME}` — no `${VAR:-default}` fallback, and an unset
+     * `VAR_NAME` fails this server with a named reason rather than running
+     * with an empty string. See {@link expandEnvRefsInRecord}. Prefer
+     * `inheritEnv` below for a plain "grant this variable under its own
+     * name"; use `${VAR_NAME}` here to rename a variable into whatever key
+     * the server expects.
+     */
     readonly env?: Readonly<Record<string, string>>;
     /**
      * Variables from the operator's own environment this server may have.
@@ -72,6 +81,11 @@ export interface McpServerSpec {
     readonly cwd?: string;
     /** HTTP: the server's endpoint. */
     readonly url?: string;
+    /**
+     * Same `${VAR_NAME}` expansion as `env` above — the only secret-safe
+     * option for a header value, since `inheritEnv` reaches the stdio
+     * child's process environment only, never an HTTP header.
+     */
     readonly headers?: Readonly<Record<string, string>>;
     /**
      * How long THIS server gets to connect, hand shake and list its tools, in
@@ -100,6 +114,18 @@ export interface McpServerSpec {
      * `connectTimeoutMs` for the handshake that will actually answer.
      */
     readonly eraProbeTimeoutMs?: number;
+    /** Server-reported names admitted from tools, prompts and resources. */
+    readonly allow?: readonly string[];
+    /** Server-reported names refused even if `allow` includes them. */
+    readonly deny?: readonly string[];
+    /** Retries only tool calls the SDK marks safe to repeat. Defaults to none. */
+    readonly maxRetries?: number;
+    /** Require a person to approve every call this server contributes. */
+    readonly requireApproval?: boolean;
+    /** Trust this server's read-only hints for review exemptions. Defaults to false. */
+    readonly readOnlyHintTrusted?: boolean;
+    /** Include the server's own initialize instructions as untrusted turn context. Default false. */
+    readonly instructions?: boolean;
 }
 export type McpServersConfig = Readonly<Record<string, McpServerSpec>>;
 export interface ConnectedMcpServer {
@@ -109,11 +135,21 @@ export interface ConnectedMcpServer {
      * What this server actually contributes, by tool name.
      *
      * Carried from the listing rather than recovered later. The names arrive
-     * prefixed with the server's own (`mcp_tickets_create`), so a caller COULD
+     * prefixed with the server's own (`mcp__tickets__create`), so a caller COULD
      * split them back apart — but that turns an encoding this file owns into a
      * format two places have to agree about, and the list is free right here.
      */
     readonly tools: readonly string[];
+    /** The server's current initialize instructions, if it supplied any. */
+    readonly instructions?: string;
+    /** Names changed since this connection's first listing; changed definitions remain held. */
+    readonly drift?: MCPToolDrift;
+    /** Current allow/deny refusals, by server-reported name. */
+    readonly refused?: readonly {
+        kind: 'tools' | 'prompts' | 'resources';
+        name: string;
+        reason: 'not_allowed' | 'denied';
+    }[];
 }
 export interface FailedMcpServer {
     readonly name: string;
@@ -121,8 +157,13 @@ export interface FailedMcpServer {
     readonly reason: string;
 }
 export interface McpConnection {
-    /** Adapted tools from every server that connected, ready to register. */
+    /** Current definitions from every connected server, read from its live toolsets. */
     readonly tools: readonly ToolDefinition[];
+    /**
+     * Two live entries per connected server: its configured main tools and its
+     * always-deferred resource tools. Both carry the `mcp:<server>` source.
+     */
+    readonly toolsets: readonly Toolset[];
     /** One coherent live snapshot; use this when successes and failures are shown together. */
     current(): {
         readonly connected: readonly ConnectedMcpServer[];
@@ -142,6 +183,32 @@ export interface McpConnection {
      */
     close(): Promise<void>;
 }
+/**
+ * Expand `${VAR}` references inside `env`/`headers` values against the
+ * operator's own environment.
+ *
+ * Deliberately narrower than the interpolation some other MCP clients'
+ * configs use (see docs/cli/mcp-servers.md): bare `${VAR}` only, no
+ * `${VAR:-default}` fallback, and only inside `env` and `headers` values —
+ * never `command`, `args`, `url` or `cwd`, which have no legitimate secret
+ * use case and would only widen the surface for an accidental literal `${`
+ * to break. A referenced variable that is unset is refused with a named
+ * reason, not silently substituted with an empty string: that is exactly
+ * the footgun a `:-default` fallback would reintroduce, and this module's
+ * whole design is "every failure is named" rather than a server running
+ * quietly with a secret it never got.
+ *
+ * `inheritEnv` stays the primary idiom for "grant this named variable to
+ * the child process under its own name" — this is for the config VALUE
+ * itself, letting an operator rename an env var into whatever key or
+ * header a server expects, and giving `headers` a secret-safe option it
+ * has never had (`inheritEnv` only reaches the stdio child's process env,
+ * not header values).
+ *
+ * Returns the expanded record, or a reason string naming the first unset
+ * variable a value referenced.
+ */
+export declare function expandEnvRefsInRecord(record: Readonly<Record<string, string>>, env: NodeJS.ProcessEnv): Readonly<Record<string, string>> | string;
 /**
  * Turn one spec into a transport, or say why it is not one.
  *
@@ -149,7 +216,7 @@ export interface McpConnection {
  * operator who edited one into a file that already had the other, and picking
  * either would run something they did not mean to run.
  */
-export declare function transportFor(spec: McpServerSpec, defaultCwd: string): MCPTransportUnion | string;
+export declare function transportFor(spec: McpServerSpec, defaultCwd: string, env?: NodeJS.ProcessEnv): MCPTransportUnion | string;
 /**
  * The connect deadline a spec asks for, or why it cannot have it.
  *

package/dist/integrations/mcp/servers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"servers.d.ts","sourceRoot":"","sources":["../../../src/integrations/mcp/servers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,OAAO,EAEN,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAEnB,MAAM,YAAY,CAAA;AAEnB;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,QAAS,CAAA;AAExC;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,OAAQ,CAAA;AAErC,gFAAgF;AAChF,MAAM,WAAW,aAAa;IAC7B,oCAAoC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAC/C;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,gEAAgE;IAChE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,mCAAmC;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACnD;;;;;;;;;OASG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAClC;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;CACnC;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;AAEtE,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B;;;;;;;OAOG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CACjC;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,mEAAmE;IACnE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,aAAa;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,KAAK,EAAE,SAAS,cAAc,EAAE,CAAA;IACzC,2FAA2F;IAC3F,OAAO,IAAI;QACV,QAAQ,CAAC,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAA;QACjD,QAAQ,CAAC,MAAM,EAAE,SAAS,eAAe,EAAE,CAAA;KAC3C,CAAA;IACD,mEAAmE;IACnE,QAAQ,CAAC,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAA;IACjD,+EAA+E;IAC/E,QAAQ,CAAC,MAAM,EAAE,SAAS,eAAe,EAAE,CAAA;IAC3C;;;;;;;OAOG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,iBAAiB,GAAG,MAAM,CAwBhG;AAkBD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,GAAG,MAAM,CAOvE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,CAOnF;AAED,wBAAsB,iBAAiB,CACtC,MAAM,EAAE,gBAAgB,GAAG,SAAS,EACpC,OAAO,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC/B,OAAO,CAAC,aAAa,CAAC,CAyHxB"}
+{"version":3,"file":"servers.d.ts","sourceRoot":"","sources":["../../../src/integrations/mcp/servers.ts"],"names":[],"mappings":"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"}

package/dist/integrations/mcp/servers.js

@@ -14,7 +14,7 @@
  *       "search":   { "url": "https://tools.example.internal/mcp" }
  *     }
  *
- * Its tools arrive prefixed with the server's name (`mcp_tickets_create`), so
+ * Its tools arrive prefixed with the server's name (`mcp__tickets__create`), so
  * two servers offering `search` do not collide and the transcript says where a
  * call went.
  *
@@ -31,7 +31,7 @@
  * and a headless run has nobody to read anything, so it refuses. This module
  * reports; the callers decide.
  */
-import { MCPClient, mcpToolToToolDefinition, } from '@namzu/sdk';
+import { MCPClient, mcpToolset, requireApproval, } from '@namzu/sdk';
 /**
  * How long a single server gets to connect, hand shake and list its tools.
  *
@@ -50,6 +50,55 @@ export const CONNECT_TIMEOUT_MS = 10_000;
  * command open past the work it was asked to do.
  */
 export const CLOSE_TIMEOUT_MS = 2_000;
+/**
+ * A bare `${VAR}` reference inside an `env` or `headers` value — identifier
+ * characters only, no `:-default` fallback. See {@link expandEnvRefsInRecord}.
+ */
+const ENV_REF_PATTERN = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
+/**
+ * Expand `${VAR}` references inside `env`/`headers` values against the
+ * operator's own environment.
+ *
+ * Deliberately narrower than the interpolation some other MCP clients'
+ * configs use (see docs/cli/mcp-servers.md): bare `${VAR}` only, no
+ * `${VAR:-default}` fallback, and only inside `env` and `headers` values —
+ * never `command`, `args`, `url` or `cwd`, which have no legitimate secret
+ * use case and would only widen the surface for an accidental literal `${`
+ * to break. A referenced variable that is unset is refused with a named
+ * reason, not silently substituted with an empty string: that is exactly
+ * the footgun a `:-default` fallback would reintroduce, and this module's
+ * whole design is "every failure is named" rather than a server running
+ * quietly with a secret it never got.
+ *
+ * `inheritEnv` stays the primary idiom for "grant this named variable to
+ * the child process under its own name" — this is for the config VALUE
+ * itself, letting an operator rename an env var into whatever key or
+ * header a server expects, and giving `headers` a secret-safe option it
+ * has never had (`inheritEnv` only reaches the stdio child's process env,
+ * not header values).
+ *
+ * Returns the expanded record, or a reason string naming the first unset
+ * variable a value referenced.
+ */
+export function expandEnvRefsInRecord(record, env) {
+    const result = {};
+    for (const [key, raw] of Object.entries(record)) {
+        let missing;
+        const expanded = raw.replace(ENV_REF_PATTERN, (whole, name) => {
+            const value = env[name];
+            if (value === undefined) {
+                missing = name;
+                return whole;
+            }
+            return value;
+        });
+        if (missing !== undefined) {
+            return `references \${${missing}}, which is not set in the operator's environment`;
+        }
+        result[key] = expanded;
+    }
+    return result;
+}
 /**
  * Turn one spec into a transport, or say why it is not one.
  *
@@ -57,27 +106,33 @@ export const CLOSE_TIMEOUT_MS = 2_000;
  * operator who edited one into a file that already had the other, and picking
  * either would run something they did not mean to run.
  */
-export function transportFor(spec, defaultCwd) {
+export function transportFor(spec, defaultCwd, env = process.env) {
     const hasCommand = typeof spec.command === 'string' && spec.command.trim().length > 0;
     const hasUrl = typeof spec.url === 'string' && spec.url.trim().length > 0;
     if (hasCommand && hasUrl) {
         return 'it declares both a command and a url — pick one';
     }
     if (hasCommand) {
+        const expandedEnv = spec.env ? expandEnvRefsInRecord(spec.env, env) : undefined;
+        if (typeof expandedEnv === 'string')
+            return expandedEnv;
         return {
             type: 'stdio',
             command: spec.command,
             ...(spec.args ? { args: [...spec.args] } : {}),
-            ...(spec.env ? { env: { ...spec.env } } : {}),
+            ...(expandedEnv ? { env: expandedEnv } : {}),
             ...(spec.inheritEnv ? { inheritEnv: [...spec.inheritEnv] } : {}),
             cwd: spec.cwd ?? defaultCwd,
         };
     }
     if (hasUrl) {
+        const expandedHeaders = spec.headers ? expandEnvRefsInRecord(spec.headers, env) : undefined;
+        if (typeof expandedHeaders === 'string')
+            return expandedHeaders;
         return {
             type: 'streamable-http',
             url: spec.url,
-            ...(spec.headers ? { headers: { ...spec.headers } } : {}),
+            ...(expandedHeaders ? { headers: expandedHeaders } : {}),
         };
     }
     return 'it declares neither a command nor a url';
@@ -136,9 +191,38 @@ export function eraProbeTimeoutFor(spec) {
     }
     return ms;
 }
+function toolsetOptionsFor(spec, name) {
+    for (const field of ['allow', 'deny']) {
+        const value = spec[field];
+        if (value !== undefined &&
+            (!Array.isArray(value) || !value.every((item) => typeof item === 'string' && item.length > 0))) {
+            return `${field} must be a list of nonempty server-reported names`;
+        }
+    }
+    if (spec.maxRetries !== undefined &&
+        (!Number.isSafeInteger(spec.maxRetries) || spec.maxRetries < 0)) {
+        return `maxRetries must be a nonnegative integer, got ${JSON.stringify(spec.maxRetries)}`;
+    }
+    if (spec.requireApproval !== undefined && typeof spec.requireApproval !== 'boolean') {
+        return 'requireApproval must be true or false';
+    }
+    if (spec.readOnlyHintTrusted !== undefined && typeof spec.readOnlyHintTrusted !== 'boolean') {
+        return 'readOnlyHintTrusted must be true or false';
+    }
+    if (spec.instructions !== undefined && typeof spec.instructions !== 'boolean') {
+        return 'instructions must be true or false';
+    }
+    return {
+        id: `mcp:${name}`,
+        allow: spec.allow,
+        deny: spec.deny,
+        maxRetries: spec.maxRetries,
+        readOnlyHintTrusted: spec.readOnlyHintTrusted,
+    };
+}
 export async function connectMcpServers(config, options) {
     const entries = Object.entries(config ?? {});
-    const tools = [];
+    const toolsets = [];
     const startupFailed = [];
     const clients = [];
     const liveServers = [];
@@ -147,6 +231,10 @@ export async function connectMcpServers(config, options) {
     // of nothing and the failure output arrive interleaved, for a saving that
     // matters only to someone running many servers, who has other problems.
     for (const [name, spec] of entries) {
+        if (typeof spec !== 'object' || spec === null) {
+            startupFailed.push({ name, reason: 'server spec must be a mapping' });
+            continue;
+        }
         const transport = transportFor(spec, options.cwd);
         if (typeof transport === 'string') {
             startupFailed.push({ name, reason: transport });
@@ -162,26 +250,41 @@ export async function connectMcpServers(config, options) {
             startupFailed.push({ name, reason: eraProbeTimeoutMs });
             continue;
         }
+        const toolsetOptions = toolsetOptionsFor(spec, name);
+        if (typeof toolsetOptions === 'string') {
+            startupFailed.push({ name, reason: toolsetOptions });
+            continue;
+        }
         const client = new MCPClient({
             serverName: name,
             transport,
             ...(eraProbeTimeoutMs !== undefined ? { eraProbeTimeoutMs } : {}),
         });
+        const discovery = {
+            added: new Set(),
+            removed: new Set(),
+            changed: new Set(),
+            refused: new Map(),
+        };
         try {
             await withDeadline(client.connect(), deadline, `server "${name}"`);
-            const listed = await withDeadline(client.listTools(), deadline, `server "${name}" listing its tools`);
-            // Adapted once, then read twice. Adapting a second time to collect
-            // the names would build a parallel set of definitions bound to the
-            // same client — cheap today and exactly the kind of duplicate a
-            // future adapter with a side effect turns into a bug.
-            const adapted = listed.map((tool) => mcpToolToToolDefinition(tool, client, name));
-            tools.push(...adapted);
-            const summary = {
-                name,
-                toolCount: adapted.length,
-                tools: adapted.map((tool) => tool.name),
-            };
-            liveServers.push({ client, summary });
+            const discovered = await withDeadline(mcpToolset(client, {
+                ...toolsetOptions,
+                onDrift: ({ drift }) => {
+                    for (const item of drift.added)
+                        discovery.added.add(item);
+                    for (const item of drift.removed)
+                        discovery.removed.add(item);
+                    for (const item of drift.changed)
+                        discovery.changed.add(item);
+                },
+                onRefused: ({ kind, refused }) => discovery.refused.set(kind, refused),
+            }), deadline, `server "${name}" discovering its tools`);
+            const mounted = spec.requireApproval
+                ? discovered.map((entry) => requireApproval(entry))
+                : [...discovered];
+            toolsets.push(...mounted);
+            liveServers.push({ client, name, toolsets: mounted, discovery });
             clients.push(client);
         }
         catch (err) {
@@ -207,14 +310,28 @@ export async function connectMcpServers(config, options) {
     const current = () => {
         const connected = [];
         const failed = [...startupFailed];
-        for (const { client, summary } of liveServers) {
+        for (const { client, name, toolsets: serverToolsets, discovery } of liveServers) {
             const state = client.getState();
             if (state.status === 'connected') {
-                connected.push(summary);
+                const names = serverToolsets.flatMap((entry) => entry.tools().map((tool) => tool.name));
+                connected.push({
+                    name,
+                    toolCount: names.length,
+                    tools: names,
+                    drift: {
+                        added: [...discovery.added],
+                        removed: [...discovery.removed],
+                        changed: [...discovery.changed],
+                    },
+                    refused: [...discovery.refused.entries()].flatMap(([kind, items]) => items.map((item) => ({ kind, ...item }))),
+                    ...(state.serverInstructions !== undefined
+                        ? { instructions: state.serverInstructions }
+                        : {}),
+                });
                 continue;
             }
             failed.push({
-                name: summary.name,
+                name,
                 reason: state.error ??
                     (state.status === 'disconnected'
                         ? 'connection closed after startup'
@@ -224,7 +341,10 @@ export async function connectMcpServers(config, options) {
         return { connected, failed };
     };
     return {
-        tools,
+        get tools() {
+            return toolsets.flatMap((entry) => entry.tools());
+        },
+        toolsets,
         current,
         get connected() {
             return current().connected;
@@ -233,6 +353,7 @@ export async function connectMcpServers(config, options) {
             return current().failed;
         },
         close: async () => {
+            await Promise.all(toolsets.map((entry) => entry.close?.()));
             await Promise.all(clients.map((c) => withDeadline(c.disconnect(), CLOSE_TIMEOUT_MS, 'closing a tool server').catch(() => {
                 // Shutting down is best effort by definition: the process may
                 // already be gone, and nothing useful follows from saying so.

package/dist/integrations/mcp/servers.js.map

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

package/dist/integrations/plugins/runtime.d.ts

@@ -1,4 +1,4 @@
-import { PluginLifecycleManager, SkillRegistry, type ToolDefinition, type ToolRegistry } from '@namzu/sdk';
+import { PluginLifecycleManager, SkillRegistry } from '@namzu/sdk';
 import type { HooksConfig, PluginConfig, PluginScope } from '../../config/schema.js';
 export interface CliPluginRuntime {
     readonly manager: PluginLifecycleManager;
@@ -30,18 +30,20 @@ export interface CliPluginInfo {
  * The exact `enabled === true` check is the default-off boundary. Nothing in
  * the plugin directories is discovered, read, or imported on every other
  * value. Callers invoke this only after project trust has pinned `cwd`.
+ *
+ * No longer takes a tool registry to register into (plan.md v3 §7):
+ * `PluginLifecycleManager` exposes one live file source per plugin and one
+ * live MCP source per plugin server (`manager.toolsets`); a caller folds them into
+ * its own `toolsets` array. The `skill` tool itself is the CALLER's concern
+ * now too — this runtime only reports `skills.size` so the caller can decide
+ * live whether to offer it, rather than this module owning a "who registered
+ * it first" flag over a shared mutable registry.
  */
-export declare function createCliPluginRuntime(config: PluginConfig | undefined, tools: ToolRegistry, cwd: string, 
+export declare function createCliPluginRuntime(config: PluginConfig | undefined, cwd: string, 
 /**
  * Operator shell hooks. They ride the same lifecycle manager plugins use,
  * so a session with hooks and no plugins still builds one — with nothing
  * installed, and `pluginCount` honestly 0.
  */
-hooks?: HooksConfig, 
-/**
- * The `skill` tool to register when plugin skills arrive and the session
- * has none yet: the session's own, so a plugin skill is told the same
- * directory rules as a file skill. Defaults to the SDK's `SkillTool`.
- */
-skillTool?: ToolDefinition): Promise<CliPluginRuntime | undefined>;
+hooks?: HooksConfig): Promise<CliPluginRuntime | undefined>;
 //# sourceMappingURL=runtime.d.ts.map

package/dist/integrations/plugins/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/integrations/plugins/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,sBAAsB,EAEtB,aAAa,EAEb,KAAK,cAAc,EACnB,KAAK,YAAY,EAGjB,MAAM,YAAY,CAAA;AAEnB,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAKpF,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAA;IACxC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,IAAI,IAAI,SAAS,aAAa,EAAE,CAAA;IAChC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACzD,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACtB;AAED,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAA;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;IAClC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAA;CACtC;AAMD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC3C,MAAM,EAAE,YAAY,GAAG,SAAS,EAChC,KAAK,EAAE,YAAY,EACnB,GAAG,EAAE,MAAM;AACX;;;;GAIG;AACH,KAAK,CAAC,EAAE,WAAW;AACnB;;;;GAIG;AACH,SAAS,GAAE,cAA0B,GACnC,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAyKvC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/integrations/plugins/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,sBAAsB,EAEtB,aAAa,EAGb,MAAM,YAAY,CAAA;AAEnB,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAKpF,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAA;IACxC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,IAAI,IAAI,SAAS,aAAa,EAAE,CAAA;IAChC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACzD,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACtB;AAED,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAA;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;IAClC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAA;CACtC;AAMD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,sBAAsB,CAC3C,MAAM,EAAE,YAAY,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM;AACX;;;;GAIG;AACH,KAAK,CAAC,EAAE,WAAW,GACjB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAuJvC"}

package/dist/integrations/plugins/runtime.js

@@ -1,4 +1,4 @@
-import { PluginLifecycleManager, PluginRegistry, SkillRegistry, SkillTool, attachShellHooks, discoverAllPluginDirs, } from '@namzu/sdk';
+import { PluginLifecycleManager, PluginRegistry, SkillRegistry, attachShellHooks, discoverAllPluginDirs, } from '@namzu/sdk';
 import { cliLogger } from '../../logging.js';
 import { resolveNamzuHome } from '../state/home.js';
 import { PluginSettingsStore } from './settings.js';
@@ -11,20 +11,22 @@ function message(error) {
  * The exact `enabled === true` check is the default-off boundary. Nothing in
  * the plugin directories is discovered, read, or imported on every other
  * value. Callers invoke this only after project trust has pinned `cwd`.
+ *
+ * No longer takes a tool registry to register into (plan.md v3 §7):
+ * `PluginLifecycleManager` exposes one live file source per plugin and one
+ * live MCP source per plugin server (`manager.toolsets`); a caller folds them into
+ * its own `toolsets` array. The `skill` tool itself is the CALLER's concern
+ * now too — this runtime only reports `skills.size` so the caller can decide
+ * live whether to offer it, rather than this module owning a "who registered
+ * it first" flag over a shared mutable registry.
  */
-export async function createCliPluginRuntime(config, tools, cwd, 
+export async function createCliPluginRuntime(config, cwd, 
 /**
  * Operator shell hooks. They ride the same lifecycle manager plugins use,
  * so a session with hooks and no plugins still builds one — with nothing
  * installed, and `pluginCount` honestly 0.
  */
-hooks, 
-/**
- * The `skill` tool to register when plugin skills arrive and the session
- * has none yet: the session's own, so a plugin skill is told the same
- * directory rules as a file skill. Defaults to the SDK's `SkillTool`.
- */
-skillTool = SkillTool) {
+hooks) {
     const pluginsEnabled = config?.enabled === true;
     const hookCount = hooks ? Object.values(hooks).reduce((n, list) => n + (list?.length ?? 0), 0) : 0;
     if (!pluginsEnabled && hookCount === 0)
@@ -36,7 +38,6 @@ skillTool = SkillTool) {
     const skills = new SkillRegistry(log);
     const manager = new PluginLifecycleManager({
         pluginRegistry: plugins,
-        toolRegistry: tools,
         skillRegistry: skills,
         scopeRoots: { project: cwd, user: userRoot },
         log,
@@ -55,7 +56,6 @@ skillTool = SkillTool) {
         })
         : { project: [], user: [] };
     const installed = [];
-    let ownsSkillTool = false;
     try {
         for (const scope of allowedScopes) {
             const dirs = [...discovered[scope]].sort((a, b) => a.localeCompare(b));
@@ -67,14 +67,8 @@ skillTool = SkillTool) {
                     await manager.enable(plugin.id);
             }
         }
-        if (skills.size > 0 && !tools.has(skillTool.name)) {
-            tools.register(skillTool);
-            ownsSkillTool = true;
-        }
     }
     catch (error) {
-        if (ownsSkillTool)
-            tools.unregister(skillTool.name);
         const cleanupErrors = [];
         for (const plugin of [...installed].reverse()) {
             try {
@@ -94,16 +88,11 @@ skillTool = SkillTool) {
     let closePromise;
     let closed = false;
     let mutation;
-    const syncSkillTool = () => {
-        if (skills.size > 0 && !tools.has(skillTool.name)) {
-            tools.register(skillTool);
-            ownsSkillTool = true;
-        }
-        else if (skills.size === 0 && ownsSkillTool) {
-            tools.unregister(skillTool.name);
-            ownsSkillTool = false;
-        }
-    };
+    const contributedToolNames = (prefix) => manager.toolsets
+        .flatMap((ts) => ts.tools())
+        .map((tool) => tool.name)
+        .filter((name) => name.startsWith(prefix))
+        .sort();
     return {
         manager,
         skills,
@@ -129,10 +118,7 @@ skillTool = SkillTool) {
                 status: plugin.status === 'installed' ? 'disabled' : plugin.status,
                 ...(startupEnabled !== undefined ? { startupEnabled } : {}),
                 ...(startupError ? { startupError } : {}),
-                tools: tools
-                    .listNames()
-                    .filter((name) => name.startsWith(prefix))
-                    .sort(),
+                tools: contributedToolNames(prefix),
                 skills: skills
                     .list()
                     .map((skill) => skill.metadata.name)
@@ -159,7 +145,6 @@ skillTool = SkillTool) {
                 await mutation;
             }
             finally {
-                syncSkillTool();
                 mutation = undefined;
             }
         },
@@ -185,10 +170,6 @@ skillTool = SkillTool) {
                 if (mutation)
                     await mutation.catch(() => { });
                 const errors = [];
-                if (ownsSkillTool) {
-                    tools.unregister(skillTool.name);
-                    ownsSkillTool = false;
-                }
                 for (const plugin of [...installed].reverse()) {
                     try {
                         await manager.uninstall(plugin.id);