@moxxy/plugin-mcp 0.26.0

package/dist/admin/runtime.js

@@ -0,0 +1,196 @@
+import { MoxxyError } from '@moxxy/sdk';
+import { defaultClientFactory } from '../client.js';
+import { MCP_CONNECT_TIMEOUT_MS, withTimeout } from '../timeout.js';
+import { wrapMcpServerToolsLazy } from '../wrap.js';
+import { mutateMcpConfig } from './config-io.js';
+import { resolveServerSecrets } from './secrets.js';
+export function createMcpRuntime(registry, options = {}) {
+    const secretResolver = options.secretResolver ?? null;
+    /** Connect with secrets resolved; `server` itself stays placeholder-form. */
+    const connect = async (server) => defaultClientFactory(await resolveServerSecrets(server, secretResolver));
+    // Track hot-attached runtimes keyed by server name. We need to know
+    // which tools each server contributed so `mcp_remove_server` can
+    // unregister them cleanly, and which client to close on shutdown.
+    const runtimes = new Map();
+    /**
+     * Eager attach used by `mcp_add_server`: connect, list tools, register
+     * them. Returns the discovered descriptors so the caller can cache
+     * them into mcp.json for lazy boots next time.
+     */
+    const attachServer = async (server) => {
+        // Bound the connect + listTools handshake. `mcp_add_server` and
+        // `enableAndAttach` drive this path at the model's request; a wedged
+        // server spawn (or a connected-but-mute endpoint that never answers
+        // listTools) would otherwise hang the tool call indefinitely — a
+        // permanent pending dot with no recovery short of killing moxxy. On
+        // timeout we reject AND close any client that opened, so a slow-to-spawn
+        // stdio child / socket can't leak after we've given up on it.
+        const client = await withTimeout(connect(server), MCP_CONNECT_TIMEOUT_MS, `MCP connect "${server.name}"`);
+        let list;
+        try {
+            list = await withTimeout(client.listTools(), MCP_CONNECT_TIMEOUT_MS, `MCP listTools "${server.name}"`);
+        }
+        catch (err) {
+            await client.close().catch(() => { });
+            throw err;
+        }
+        const descriptors = list.tools;
+        // List ONCE and feed the descriptors into the lazy wrapper over the
+        // already-open client — wrapMcpServerTools would call listTools a second
+        // time, paying a redundant round-trip and risking descriptor/tool drift
+        // for servers whose tool list is non-deterministic between calls.
+        const wrapped = wrapMcpServerToolsLazy({
+            server,
+            descriptors,
+            getClient: () => Promise.resolve(client),
+        });
+        if (!registry) {
+            await client.close();
+            return { toolNames: wrapped.map((t) => t.name), descriptors };
+        }
+        const collisions = wrapped.filter((t) => registry.has(t.name)).map((t) => t.name);
+        if (collisions.length > 0) {
+            await client.close();
+            throw new MoxxyError({
+                code: 'CONFIG_INVALID',
+                message: `mcp_add_server: tool name collision — already registered: ${collisions.join(', ')}. ` +
+                    'Pick a different server name (the server name becomes a prefix on each tool).',
+            });
+        }
+        for (const tool of wrapped)
+            registry.register(tool);
+        runtimes.set(server.name, { client, toolNames: wrapped.map((t) => t.name) });
+        return { toolNames: wrapped.map((t) => t.name), descriptors };
+    };
+    /**
+     * Lazy attach used at boot: register stub tools using cached
+     * descriptors WITHOUT connecting. The first call to any of these
+     * tools triggers a single shared connection via `getOrConnect`;
+     * subsequent calls reuse it. Failed connections reset so the next
+     * call can retry.
+     *
+     * When `cachedTools` is missing (catalog entry predates the cache
+     * feature or was edited by hand), the caller is responsible for
+     * refreshing the cache first via `refreshServerCache`.
+     */
+    const attachServerLazy = (server) => {
+        if (!registry)
+            return { toolNames: [] };
+        if (runtimes.has(server.name))
+            return { toolNames: runtimes.get(server.name).toolNames };
+        const descriptors = server.cachedTools ?? [];
+        if (descriptors.length === 0) {
+            return { toolNames: [] };
+        }
+        let connectPromise = null;
+        const getOrConnect = async () => {
+            if (!connectPromise) {
+                connectPromise = (async () => {
+                    // Bound the first-call connect so a wedged transport can't hang the
+                    // triggering tool call forever (the per-call timeout in wrap.ts only
+                    // covers callTool, not this connect handshake).
+                    const client = await withTimeout(connect(server), MCP_CONNECT_TIMEOUT_MS, `MCP connect "${server.name}"`);
+                    // Stash the live client on the runtime entry so shutdown can
+                    // close it. The entry was created with a sentinel; replace it.
+                    const runtime = runtimes.get(server.name);
+                    if (runtime) {
+                        runtimes.set(server.name, { client, toolNames: runtime.toolNames });
+                        return client;
+                    }
+                    // detachServer ran while this connect was in flight: the runtime
+                    // entry (and its shutdown close path) is gone. Close the freshly
+                    // opened client here so its stdio child / socket isn't orphaned,
+                    // and fail the call rather than handing back a leaked handle.
+                    await client.close().catch(() => { });
+                    throw new Error(`MCP server "${server.name}" detached during connect`);
+                })().catch((err) => {
+                    // Reset so a future call can retry instead of being stuck on
+                    // a rejected promise.
+                    connectPromise = null;
+                    throw err;
+                });
+            }
+            return connectPromise;
+        };
+        const wrapped = wrapMcpServerToolsLazy({ server, descriptors, getClient: getOrConnect });
+        const collisions = wrapped.filter((t) => registry.has(t.name)).map((t) => t.name);
+        if (collisions.length > 0) {
+            throw new MoxxyError({
+                code: 'CONFIG_INVALID',
+                message: `lazy attach: tool name collision for "${server.name}": ${collisions.join(', ')}. ` +
+                    'A different server (or a previously-attached version) already owns these names.',
+            });
+        }
+        for (const tool of wrapped)
+            registry.register(tool);
+        // Sentinel client gets swapped for the real one inside getOrConnect.
+        // Until first call, close() is a no-op via the LazyClient sentinel.
+        const lazyClient = {
+            listTools: async () => ({ tools: descriptors }),
+            callTool: async (args) => (await getOrConnect()).callTool(args),
+            close: async () => {
+                if (connectPromise) {
+                    const client = await connectPromise.catch(() => null);
+                    if (client)
+                        await client.close();
+                }
+            },
+        };
+        runtimes.set(server.name, { client: lazyClient, toolNames: wrapped.map((t) => t.name) });
+        return { toolNames: wrapped.map((t) => t.name) };
+    };
+    /**
+     * Connect to a server, list its tools, and write the descriptors back
+     * to mcp.json. Used to refresh stale or missing caches at boot. The
+     * connection is closed immediately — registration happens via the
+     * caller's subsequent `attachServerLazy` call.
+     */
+    const refreshServerCache = async (server) => {
+        // Bound the connect handshake: a dead endpoint or a stdio child that
+        // spawns but never completes the MCP handshake would otherwise hang here,
+        // and at boot core awaits onInit serially — one stale entry would make
+        // moxxy unstartable. On timeout we reject (the onInit catch logs+skips it).
+        const client = await withTimeout(connect(server), MCP_CONNECT_TIMEOUT_MS, `MCP connect "${server.name}"`);
+        try {
+            // Bound listTools too — a connected-but-unresponsive server can stall
+            // discovery just as badly as a dead connect.
+            const list = await withTimeout(client.listTools(), MCP_CONNECT_TIMEOUT_MS, `MCP listTools "${server.name}"`);
+            const refreshed = { ...server, cachedTools: list.tools };
+            // Persist the refreshed cache so subsequent boots can lazy-attach
+            // without reconnecting. Read-modify-write under the shared config
+            // mutex so a concurrent add/remove can't clobber the file.
+            await mutateMcpConfig((cfg) => ({
+                next: { servers: cfg.servers.map((s) => (s.name === server.name ? refreshed : s)) },
+                result: undefined,
+            }));
+            return refreshed;
+        }
+        finally {
+            try {
+                await client.close();
+            }
+            catch {
+                /* ignore */
+            }
+        }
+    };
+    const detachServer = async (name) => {
+        const runtime = runtimes.get(name);
+        if (!runtime)
+            return false;
+        runtimes.delete(name);
+        if (registry) {
+            for (const toolName of runtime.toolNames)
+                registry.unregister(toolName);
+        }
+        try {
+            await runtime.client.close();
+        }
+        catch {
+            // ignore — best-effort close
+        }
+        return true;
+    };
+    return { runtimes, attachServer, attachServerLazy, refreshServerCache, detachServer };
+}
+//# sourceMappingURL=runtime.js.map

package/dist/admin/runtime.js.map

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

package/dist/admin/schema.d.ts

@@ -0,0 +1,37 @@
+import { z } from '@moxxy/sdk';
+import type { McpServerConfig } from '../types.js';
+export declare const serverNameSchema: z.ZodString;
+export declare const addServerInput: z.ZodObject<{
+    kind: z.ZodEnum<["stdio", "http", "sse"]>;
+    name: z.ZodString;
+    command: z.ZodOptional<z.ZodString>;
+    args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    cwd: z.ZodOptional<z.ZodString>;
+    url: z.ZodOptional<z.ZodString>;
+    headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    autoSkill: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+}, "strip", z.ZodTypeAny, {
+    kind: "stdio" | "sse" | "http";
+    name: string;
+    autoSkill: boolean;
+    headers?: Record<string, string> | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
+    env?: Record<string, string> | undefined;
+    cwd?: string | undefined;
+    url?: string | undefined;
+}, {
+    kind: "stdio" | "sse" | "http";
+    name: string;
+    headers?: Record<string, string> | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
+    env?: Record<string, string> | undefined;
+    cwd?: string | undefined;
+    url?: string | undefined;
+    autoSkill?: boolean | undefined;
+}>;
+export type AddServerInput = z.infer<typeof addServerInput>;
+export declare function validateAddServerInput(input: AddServerInput): McpServerConfig;
+//# sourceMappingURL=schema.d.ts.map

package/dist/admin/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/admin/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,CAAC,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,gBAAgB,aAIkE,CAAC;AAQhG,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyDzB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAE5D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,eAAe,CAiC7E"}

package/dist/admin/schema.js

@@ -0,0 +1,97 @@
+import { MoxxyError, z } from '@moxxy/sdk';
+export const serverNameSchema = z
+    .string()
+    .min(1)
+    .max(60)
+    .regex(/^[a-z0-9][a-z0-9-]*$/, 'name must be slug-like (lowercase letters, digits, hyphens)');
+// Flat schema (no discriminated union) so OpenAI's function-calling
+// validator accepts it. OpenAI rejects top-level oneOf/anyOf with
+// "object schema missing properties"; the model now sees a single
+// object with `kind` + every transport-specific field optional, plus
+// a runtime guard in the handler that enforces the per-kind required
+// set with a readable error.
+export const addServerInput = z.object({
+    kind: z.enum(['stdio', 'http', 'sse']).describe('Transport kind. "stdio" runs a local executable; "http" and "sse" connect to a remote URL.'),
+    name: serverNameSchema,
+    // stdio-only fields
+    command: z
+        .string()
+        .min(1)
+        .optional()
+        .describe('Required when kind="stdio". Executable to spawn (e.g. "npx", "uv", "python").'),
+    args: z
+        .array(z.string())
+        .optional()
+        .describe('Optional when kind="stdio". CLI arguments for the executable.'),
+    env: z
+        .record(z.string())
+        .optional()
+        .describe('Optional when kind="stdio". Environment variables for the spawned process. ' +
+        'Secrets MUST be vault references ("${vault:NAME}", stored via vault_set first), ' +
+        'never plaintext — placeholders are resolved at connect time only.'),
+    cwd: z
+        .string()
+        .optional()
+        .describe('Optional when kind="stdio". Working directory for the spawned process.'),
+    // http/sse-only fields
+    url: z
+        .string()
+        .url()
+        // Restrict to http(s): a bare .url() accepts file:, gopher:, ws:, etc.,
+        // turning a model-proposed MCP endpoint into an SSRF/file-read surface
+        // (e.g. file:///etc/passwd, http://169.254.169.254 metadata). The human
+        // permission prompt still gates the add/test, but reject obviously-wrong
+        // schemes before any connection is attempted.
+        .regex(/^https?:\/\//i, 'url must use the http:// or https:// scheme')
+        .optional()
+        .describe('Required when kind="http" or "sse". Server URL (http/https only).'),
+    headers: z
+        .record(z.string())
+        .optional()
+        .describe('Optional when kind="http" or "sse". HTTP headers (auth, etc). Secrets MUST be ' +
+        'vault references ("${vault:NAME}", stored via vault_set first), never plaintext — ' +
+        'placeholders are resolved at connect time only.'),
+    autoSkill: z
+        .boolean()
+        .optional()
+        .default(true)
+        .describe('When true (default), auto-write a deterministic usage skill ' +
+        '<server-name>-mcp.md into ~/.moxxy/skills/ documenting the ' +
+        'tools the server exposes. Pass false if the user explicitly ' +
+        'asked for no skill.'),
+});
+export function validateAddServerInput(input) {
+    // autoSkill is consumed by the handler, not by the connection factory —
+    // strip it before constructing the McpServerConfig.
+    void input.autoSkill;
+    if (input.kind === 'stdio') {
+        if (!input.command) {
+            throw new MoxxyError({
+                code: 'CONFIG_INVALID',
+                message: 'mcp_add_server: kind="stdio" requires a `command` field (e.g. "npx", "uv", "python").',
+            });
+        }
+        const out = {
+            kind: 'stdio',
+            name: input.name,
+            command: input.command,
+            ...(input.args ? { args: input.args } : {}),
+            ...(input.env ? { env: input.env } : {}),
+            ...(input.cwd ? { cwd: input.cwd } : {}),
+        };
+        return out;
+    }
+    if (!input.url) {
+        throw new MoxxyError({
+            code: 'CONFIG_INVALID',
+            message: `mcp_add_server: kind="${input.kind}" requires a \`url\` field (the remote MCP endpoint).`,
+        });
+    }
+    return {
+        kind: input.kind,
+        name: input.name,
+        url: input.url,
+        ...(input.headers ? { headers: input.headers } : {}),
+    };
+}
+//# sourceMappingURL=schema.js.map

package/dist/admin/schema.js.map

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

package/dist/admin/secrets.d.ts

@@ -0,0 +1,24 @@
+import type { McpServerConfig } from '../types.js';
+/**
+ * Connect-time secret resolution for MCP server credentials.
+ *
+ * Server entries in ~/.moxxy/mcp.json (and the `mcp_add_server` /
+ * `mcp_test_server` tool args) may carry `${vault:NAME}` placeholders in
+ * `env` values (stdio) and `headers` values (http/sse). The PLACEHOLDER is
+ * what gets persisted; the plaintext secret only ever materializes in the
+ * resolved copy handed to the transport at connect time — never in the
+ * model's context, never on disk.
+ *
+ * plugin-mcp deliberately has no vault dependency: setup wires a resolver
+ * (the CLI passes the vault's `resolveString`). A resolver MUST pass literal
+ * values through unchanged so pre-placeholder configs keep working.
+ */
+export type McpSecretResolver = (value: string) => Promise<string>;
+/**
+ * Return a copy of `server` with every `env` / `headers` value passed
+ * through `resolver`. With no resolver (or nothing to resolve) the original
+ * object is returned untouched — callers rely on that to persist the
+ * placeholder form, not the resolved one.
+ */
+export declare function resolveServerSecrets(server: McpServerConfig, resolver: McpSecretResolver | null | undefined): Promise<McpServerConfig>;
+//# sourceMappingURL=secrets.d.ts.map

package/dist/admin/secrets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/admin/secrets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEnE;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,GAC7C,OAAO,CAAC,eAAe,CAAC,CAa1B"}

package/dist/admin/secrets.js

@@ -0,0 +1,35 @@
+/**
+ * Return a copy of `server` with every `env` / `headers` value passed
+ * through `resolver`. With no resolver (or nothing to resolve) the original
+ * object is returned untouched — callers rely on that to persist the
+ * placeholder form, not the resolved one.
+ */
+export async function resolveServerSecrets(server, resolver) {
+    if (!resolver)
+        return server;
+    const kind = server.kind ?? 'stdio';
+    if (kind === 'http' || kind === 'sse') {
+        const httpish = server;
+        if (!httpish.headers)
+            return server;
+        const headers = await resolveRecord(httpish.headers, resolver);
+        return headers === httpish.headers ? server : { ...httpish, headers };
+    }
+    const stdio = server;
+    if (!stdio.env)
+        return server;
+    const env = await resolveRecord(stdio.env, resolver);
+    return env === stdio.env ? server : { ...stdio, env };
+}
+async function resolveRecord(rec, resolver) {
+    let changed = false;
+    const out = {};
+    for (const [key, value] of Object.entries(rec)) {
+        const resolved = await resolver(value);
+        if (resolved !== value)
+            changed = true;
+        out[key] = resolved;
+    }
+    return changed ? out : rec;
+}
+//# sourceMappingURL=secrets.js.map

package/dist/admin/secrets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../../src/admin/secrets.ts"],"names":[],"mappings":"AAkBA;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAuB,EACvB,QAA8C;IAE9C,IAAI,CAAC,QAAQ;QAAE,OAAO,MAAM,CAAC;IAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC;IACpC,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,MAAmD,CAAC;QACpE,IAAI,CAAC,OAAO,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/D,OAAO,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC;IACxE,CAAC;IACD,MAAM,KAAK,GAAG,MAAuD,CAAC;IACtE,IAAI,CAAC,KAAK,CAAC,GAAG;QAAE,OAAO,MAAM,CAAC;IAC9B,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrD,OAAO,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,CAAC;AACxD,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,GAA2B,EAC3B,QAA2B;IAE3B,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,QAAQ,KAAK,KAAK;YAAE,OAAO,GAAG,IAAI,CAAC;QACvC,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;IACtB,CAAC;IACD,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAC7B,CAAC"}

package/dist/admin/skill.d.ts

@@ -0,0 +1,18 @@
+import type { McpServerConfig, McpToolDescriptor } from '../types.js';
+import type { AdminSkillRegistryLike } from './types.js';
+export interface WriteMcpUsageSkillOptions {
+    readonly skillRegistry: AdminSkillRegistryLike | null;
+    readonly userSkillsDir: string;
+}
+/**
+ * Compose a deterministic usage skill from the server's tool list.
+ * Cheaper and more reliable than a synthesize_skill model call — the
+ * descriptors already carry name + description, so the skill body just
+ * lays them out as a bulleted checklist. The user can edit the file
+ * later if they want a richer playbook.
+ */
+export declare function createMcpUsageSkillWriter(opts: WriteMcpUsageSkillOptions): (server: McpServerConfig, descriptors: ReadonlyArray<McpToolDescriptor>) => Promise<{
+    path: string;
+    skillName: string;
+} | null>;
+//# sourceMappingURL=skill.d.ts.map

package/dist/admin/skill.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill.d.ts","sourceRoot":"","sources":["../../src/admin/skill.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,aAAa,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,yBAAyB,GAC9B,CACD,MAAM,EAAE,eAAe,EACvB,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAAC,KAC1C,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA2DvD"}

package/dist/admin/skill.js

@@ -0,0 +1,70 @@
+import * as path from 'node:path';
+import {} from '@moxxy/sdk';
+import { writeFileAtomic } from '@moxxy/sdk/server';
+/**
+ * Compose a deterministic usage skill from the server's tool list.
+ * Cheaper and more reliable than a synthesize_skill model call — the
+ * descriptors already carry name + description, so the skill body just
+ * lays them out as a bulleted checklist. The user can edit the file
+ * later if they want a richer playbook.
+ */
+export function createMcpUsageSkillWriter(opts) {
+    const { skillRegistry, userSkillsDir } = opts;
+    return async (server, descriptors) => {
+        const skillName = `${server.name}-mcp`;
+        if (skillRegistry?.byName(skillName)) {
+            // Already exists (likely from a previous attach) — leave it alone
+            // so user edits aren't clobbered.
+            return null;
+        }
+        const triggers = [server.name, `${server.name} mcp`, `use ${server.name}`];
+        const toolBullets = descriptors
+            .map((d) => {
+            const wrappedName = `mcp__${server.name}__${d.name}`;
+            return `- \`${wrappedName}\` — ${d.description ?? '(no description provided)'}`;
+        })
+            .join('\n');
+        const allowed = descriptors.map((d) => `mcp__${server.name}__${d.name}`);
+        const description = `Use the ${server.name} MCP server (${descriptors.length} tools).`.slice(0, 240);
+        const frontmatter = `---\n` +
+            `name: ${skillName}\n` +
+            `description: ${description}\n` +
+            `triggers:\n${triggers.map((t) => `  - "${t}"`).join('\n')}\n` +
+            `allowed-tools:\n${allowed.map((a) => `  - ${a}`).join('\n')}\n` +
+            `---\n`;
+        const body = `When the user wants to work with **${server.name}**, use the MCP tools below. Pick the tool that best matches the user's intent; chain multiple if needed.\n\n` +
+            `## Available tools\n\n${toolBullets}\n\n` +
+            `## Notes\n\n` +
+            `- Every tool above is namespaced \`mcp__${server.name}__*\`.\n` +
+            `- Auto-generated when the MCP server was registered. Edit this file by hand to refine the playbook.`;
+        const raw = `${frontmatter}\n${body}\n`;
+        const filePath = path.join(userSkillsDir, `${skillName}.md`);
+        // writeFileAtomic creates parent dirs and does a crash-safe tmp+rename.
+        await writeFileAtomic(filePath, raw);
+        if (skillRegistry) {
+            // Build a Skill object that mirrors what discoverSkills would
+            // produce so /skills, the system-prompt index, and load_skill all
+            // see it immediately.
+            const skillObject = {
+                id: `user/${skillName}`,
+                path: filePath,
+                scope: 'user',
+                frontmatter: {
+                    name: skillName,
+                    description,
+                    triggers,
+                    'allowed-tools': allowed,
+                },
+                body,
+            };
+            try {
+                skillRegistry.register(skillObject);
+            }
+            catch {
+                // already registered — fine
+            }
+        }
+        return { path: filePath, skillName };
+    };
+}
+//# sourceMappingURL=skill.js.map

package/dist/admin/skill.js.map

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

package/dist/admin/tools/add.d.ts

@@ -0,0 +1,19 @@
+import { type ToolDef } from '@moxxy/sdk';
+import type { McpServerConfig, McpToolDescriptor } from '../../types.js';
+import type { AdminToolRegistryLike } from '../types.js';
+export interface AddServerToolDeps {
+    readonly registry: AdminToolRegistryLike | null;
+    attachServer(server: McpServerConfig): Promise<{
+        toolNames: ReadonlyArray<string>;
+        descriptors: ReadonlyArray<McpToolDescriptor>;
+    }>;
+    /** Roll back a hot-attach (unregister its tools + close the client) when
+     *  persisting the new entry fails after `attachServer` already succeeded. */
+    detachServer(name: string): Promise<boolean>;
+    writeMcpUsageSkill(server: McpServerConfig, descriptors: ReadonlyArray<McpToolDescriptor>): Promise<{
+        path: string;
+        skillName: string;
+    } | null>;
+}
+export declare function buildAddServerTool(deps: AddServerToolDeps): ToolDef;
+//# sourceMappingURL=add.d.ts.map

package/dist/admin/tools/add.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/admin/tools/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGzE,OAAO,KAAK,EACV,qBAAqB,EAEtB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAChD,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC;QAC7C,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QACjC,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;KAC/C,CAAC,CAAC;IACH;iFAC6E;IAC7E,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,kBAAkB,CAChB,MAAM,EAAE,eAAe,EACvB,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAAC,GAC5C,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;CACxD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CA6FnE"}