@code-yeongyu/senpi 2026.7.5-2 → 2026.7.9

package/dist/core/extensions/builtin/mcp/auth/token-store.js

@@ -0,0 +1,178 @@
+import { createHash, randomBytes } from "node:crypto";
+import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import lockfile from "proper-lockfile";
+import { getAgentDir } from "../../../../../config.js";
+const AUTH_ROOT = "mcp-auth";
+const TOKENS_FILE = "tokens.json";
+const INDEX_FILE = "index.json";
+const DEFAULT_LOCK = { retries: 50, stale: 30_000 };
+export class LockAcquireError extends Error {
+    constructor(lockPath, cause) {
+        super(`Could not acquire MCP auth lock at ${lockPath}: ${cause instanceof Error ? cause.message : String(cause)}`);
+        this.name = "LockAcquireError";
+        this.lockPath = lockPath;
+    }
+}
+export function hashServerUrl(serverUrl) {
+    return createHash("sha256").update(serverUrl).digest("hex");
+}
+export class McpTokenStore {
+    #agentDir;
+    #hash;
+    #lock;
+    #disableLock;
+    constructor(options) {
+        this.serverName = options.serverName;
+        this.serverUrl = options.serverUrl;
+        this.#agentDir = options.agentDir ?? getAgentDir();
+        this.#hash = hashServerUrl(options.serverUrl);
+        this.#lock = { ...DEFAULT_LOCK, ...options.lock };
+        this.#disableLock = options.disableLock ?? false;
+    }
+    get rootDir() {
+        return join(this.#agentDir, AUTH_ROOT);
+    }
+    get dir() {
+        return join(this.rootDir, this.#hash);
+    }
+    get tokensPath() {
+        return join(this.dir, TOKENS_FILE);
+    }
+    get lockPath() {
+        return join(this.dir, `${TOKENS_FILE}.lock`);
+    }
+    read() {
+        return readJsonFile(this.tokensPath);
+    }
+    async update(mutate) {
+        const release = await this.#acquire();
+        try {
+            const next = mutate(this.read());
+            if (next === undefined) {
+                this.#removeRecord();
+            }
+            else {
+                this.#writeAtomic(next);
+                this.#writeIndex();
+            }
+            return next;
+        }
+        finally {
+            await release();
+        }
+    }
+    async write(record) {
+        await this.update(() => record);
+    }
+    // Run an async critical section under the cross-process lock. The callback
+    // must use readUnlocked/writeUnlocked (never update/write) to avoid
+    // re-entrant lock acquisition, which proper-lockfile rejects immediately.
+    async withLock(fn) {
+        const release = await this.#acquire();
+        try {
+            return await fn();
+        }
+        finally {
+            await release();
+        }
+    }
+    readUnlocked() {
+        return this.read();
+    }
+    writeUnlocked(record) {
+        if (record === undefined) {
+            this.#removeRecord();
+            return;
+        }
+        this.#writeAtomic(record);
+        this.#writeIndex();
+    }
+    async clear() {
+        const release = await this.#acquire();
+        try {
+            rmSync(this.dir, { force: true, recursive: true });
+        }
+        finally {
+            await release().catch(() => undefined);
+        }
+        removeIndexEntry(this.rootDir, this.serverName, this.#hash);
+    }
+    #ensureDir() {
+        mkdirSync(this.dir, { mode: 0o700, recursive: true });
+        chmodSync(this.dir, 0o700);
+    }
+    async #acquire() {
+        this.#ensureDir();
+        if (this.#disableLock)
+            return () => Promise.resolve();
+        try {
+            return await lockfile.lock(this.dir, {
+                lockfilePath: this.lockPath,
+                realpath: false,
+                retries: { retries: this.#lock.retries, factor: 1.2, minTimeout: 20, maxTimeout: 200 },
+                stale: this.#lock.stale,
+            });
+        }
+        catch (cause) {
+            throw new LockAcquireError(this.lockPath, cause);
+        }
+    }
+    #writeAtomic(record) {
+        this.#ensureDir();
+        const tmp = join(this.dir, `${TOKENS_FILE}.${randomBytes(6).toString("hex")}.tmp`);
+        writeFileSync(tmp, `${JSON.stringify(record, null, 2)}\n`, { mode: 0o600 });
+        chmodSync(tmp, 0o600);
+        renameSync(tmp, this.tokensPath);
+        chmodSync(this.tokensPath, 0o600);
+    }
+    #removeTokens() {
+        rmSync(this.tokensPath, { force: true });
+    }
+    #removeRecord() {
+        this.#removeTokens();
+        removeIndexEntry(this.rootDir, this.serverName, this.#hash);
+    }
+    #writeIndex() {
+        writeIndexEntry(this.rootDir, this.serverName, this.#hash);
+    }
+}
+function readJsonFile(path) {
+    if (!existsSync(path))
+        return undefined;
+    const raw = readFileSync(path, "utf-8").trim();
+    if (raw.length === 0)
+        return undefined;
+    return JSON.parse(raw);
+}
+function indexPath(rootDir) {
+    return join(rootDir, INDEX_FILE);
+}
+function readIndex(rootDir) {
+    return readJsonFile(indexPath(rootDir)) ?? {};
+}
+function writeIndexEntry(rootDir, name, hash) {
+    mkdirSync(rootDir, { mode: 0o700, recursive: true });
+    const index = readIndex(rootDir);
+    if (index[name] === hash)
+        return;
+    index[name] = hash;
+    writeIndexAtomic(rootDir, index);
+}
+function removeIndexEntry(rootDir, name, hash) {
+    if (!existsSync(indexPath(rootDir)))
+        return;
+    const index = readIndex(rootDir);
+    if (index[name] !== hash && index[name] !== undefined)
+        return;
+    delete index[name];
+    writeIndexAtomic(rootDir, index);
+}
+function writeIndexAtomic(rootDir, index) {
+    const tmp = join(rootDir, `${INDEX_FILE}.${randomBytes(6).toString("hex")}.tmp`);
+    writeFileSync(tmp, `${JSON.stringify(index, null, 2)}\n`, { mode: 0o600 });
+    chmodSync(tmp, 0o600);
+    renameSync(tmp, indexPath(rootDir));
+    chmodSync(indexPath(rootDir), 0o600);
+}
+//# sourceMappingURL=token-store.js.map

package/dist/core/extensions/builtin/mcp/auth/token-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"token-store.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/auth/token-store.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash, randomBytes } from \"node:crypto\";\nimport { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport type { OAuthDiscoveryState } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type { OAuthClientInformationFull } from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport lockfile from \"proper-lockfile\";\nimport { getAgentDir } from \"../../../../../config.ts\";\n\n// URL-bound OAuth credential record persisted at\n// <agentDir>/mcp-auth/<sha256(serverUrl)>/tokens.json (dir 0700, file 0600).\nexport interface McpStoredAuth {\n\taccessToken?: string;\n\trefreshToken?: string;\n\tclientInfo?: OAuthClientInformationFull;\n\tcodeVerifier?: string;\n\tdiscoveryState?: OAuthDiscoveryState;\n\tresource?: string;\n\t// Absolute expiry (epoch ms) derived from tokens.expires_in at save time.\n\texpiresAt?: number;\n}\n\nexport interface TokenStoreLockOptions {\n\tretries?: number;\n\tstale?: number;\n}\n\nexport interface TokenStoreOptions {\n\tserverName: string;\n\tserverUrl: string;\n\tagentDir?: string;\n\tlock?: TokenStoreLockOptions;\n\t// Test-only escape hatch: skip the cross-process lock so the refresh-race\n\t// control case can demonstrate the token-family invalidation it prevents.\n\tdisableLock?: boolean;\n}\n\nconst AUTH_ROOT = \"mcp-auth\";\nconst TOKENS_FILE = \"tokens.json\";\nconst INDEX_FILE = \"index.json\";\nconst DEFAULT_LOCK: Required<TokenStoreLockOptions> = { retries: 50, stale: 30_000 };\n\nexport class LockAcquireError extends Error {\n\treadonly lockPath: string;\n\tconstructor(lockPath: string, cause: unknown) {\n\t\tsuper(\n\t\t\t`Could not acquire MCP auth lock at ${lockPath}: ${cause instanceof Error ? cause.message : String(cause)}`,\n\t\t);\n\t\tthis.name = \"LockAcquireError\";\n\t\tthis.lockPath = lockPath;\n\t}\n}\n\nexport function hashServerUrl(serverUrl: string): string {\n\treturn createHash(\"sha256\").update(serverUrl).digest(\"hex\");\n}\n\nexport class McpTokenStore<TRecord extends McpStoredAuth = McpStoredAuth> {\n\treadonly serverName: string;\n\treadonly serverUrl: string;\n\treadonly #agentDir: string;\n\treadonly #hash: string;\n\treadonly #lock: Required<TokenStoreLockOptions>;\n\treadonly #disableLock: boolean;\n\n\tconstructor(options: TokenStoreOptions) {\n\t\tthis.serverName = options.serverName;\n\t\tthis.serverUrl = options.serverUrl;\n\t\tthis.#agentDir = options.agentDir ?? getAgentDir();\n\t\tthis.#hash = hashServerUrl(options.serverUrl);\n\t\tthis.#lock = { ...DEFAULT_LOCK, ...options.lock };\n\t\tthis.#disableLock = options.disableLock ?? false;\n\t}\n\n\tget rootDir(): string {\n\t\treturn join(this.#agentDir, AUTH_ROOT);\n\t}\n\tget dir(): string {\n\t\treturn join(this.rootDir, this.#hash);\n\t}\n\tget tokensPath(): string {\n\t\treturn join(this.dir, TOKENS_FILE);\n\t}\n\tget lockPath(): string {\n\t\treturn join(this.dir, `${TOKENS_FILE}.lock`);\n\t}\n\n\tread(): TRecord | undefined {\n\t\treturn readJsonFile<TRecord>(this.tokensPath);\n\t}\n\n\tasync update(mutate: (current: TRecord | undefined) => TRecord | undefined): Promise<TRecord | undefined> {\n\t\tconst release = await this.#acquire();\n\t\ttry {\n\t\t\tconst next = mutate(this.read());\n\t\t\tif (next === undefined) {\n\t\t\t\tthis.#removeRecord();\n\t\t\t} else {\n\t\t\t\tthis.#writeAtomic(next);\n\t\t\t\tthis.#writeIndex();\n\t\t\t}\n\t\t\treturn next;\n\t\t} finally {\n\t\t\tawait release();\n\t\t}\n\t}\n\n\tasync write(record: TRecord): Promise<void> {\n\t\tawait this.update(() => record);\n\t}\n\n\t// Run an async critical section under the cross-process lock. The callback\n\t// must use readUnlocked/writeUnlocked (never update/write) to avoid\n\t// re-entrant lock acquisition, which proper-lockfile rejects immediately.\n\tasync withLock<T>(fn: () => Promise<T> | T): Promise<T> {\n\t\tconst release = await this.#acquire();\n\t\ttry {\n\t\t\treturn await fn();\n\t\t} finally {\n\t\t\tawait release();\n\t\t}\n\t}\n\n\treadUnlocked(): TRecord | undefined {\n\t\treturn this.read();\n\t}\n\n\twriteUnlocked(record: TRecord | undefined): void {\n\t\tif (record === undefined) {\n\t\t\tthis.#removeRecord();\n\t\t\treturn;\n\t\t}\n\t\tthis.#writeAtomic(record);\n\t\tthis.#writeIndex();\n\t}\n\n\tasync clear(): Promise<void> {\n\t\tconst release = await this.#acquire();\n\t\ttry {\n\t\t\trmSync(this.dir, { force: true, recursive: true });\n\t\t} finally {\n\t\t\tawait release().catch(() => undefined);\n\t\t}\n\t\tremoveIndexEntry(this.rootDir, this.serverName, this.#hash);\n\t}\n\n\t#ensureDir(): void {\n\t\tmkdirSync(this.dir, { mode: 0o700, recursive: true });\n\t\tchmodSync(this.dir, 0o700);\n\t}\n\n\tasync #acquire(): Promise<() => Promise<void>> {\n\t\tthis.#ensureDir();\n\t\tif (this.#disableLock) return () => Promise.resolve();\n\t\ttry {\n\t\t\treturn await lockfile.lock(this.dir, {\n\t\t\t\tlockfilePath: this.lockPath,\n\t\t\t\trealpath: false,\n\t\t\t\tretries: { retries: this.#lock.retries, factor: 1.2, minTimeout: 20, maxTimeout: 200 },\n\t\t\t\tstale: this.#lock.stale,\n\t\t\t});\n\t\t} catch (cause) {\n\t\t\tthrow new LockAcquireError(this.lockPath, cause);\n\t\t}\n\t}\n\n\t#writeAtomic(record: TRecord): void {\n\t\tthis.#ensureDir();\n\t\tconst tmp = join(this.dir, `${TOKENS_FILE}.${randomBytes(6).toString(\"hex\")}.tmp`);\n\t\twriteFileSync(tmp, `${JSON.stringify(record, null, 2)}\\n`, { mode: 0o600 });\n\t\tchmodSync(tmp, 0o600);\n\t\trenameSync(tmp, this.tokensPath);\n\t\tchmodSync(this.tokensPath, 0o600);\n\t}\n\n\t#removeTokens(): void {\n\t\trmSync(this.tokensPath, { force: true });\n\t}\n\n\t#removeRecord(): void {\n\t\tthis.#removeTokens();\n\t\tremoveIndexEntry(this.rootDir, this.serverName, this.#hash);\n\t}\n\n\t#writeIndex(): void {\n\t\twriteIndexEntry(this.rootDir, this.serverName, this.#hash);\n\t}\n}\n\nfunction readJsonFile<T>(path: string): T | undefined {\n\tif (!existsSync(path)) return undefined;\n\tconst raw = readFileSync(path, \"utf-8\").trim();\n\tif (raw.length === 0) return undefined;\n\treturn JSON.parse(raw) as T;\n}\n\nfunction indexPath(rootDir: string): string {\n\treturn join(rootDir, INDEX_FILE);\n}\n\nfunction readIndex(rootDir: string): Record<string, string> {\n\treturn readJsonFile<Record<string, string>>(indexPath(rootDir)) ?? {};\n}\n\nfunction writeIndexEntry(rootDir: string, name: string, hash: string): void {\n\tmkdirSync(rootDir, { mode: 0o700, recursive: true });\n\tconst index = readIndex(rootDir);\n\tif (index[name] === hash) return;\n\tindex[name] = hash;\n\twriteIndexAtomic(rootDir, index);\n}\n\nfunction removeIndexEntry(rootDir: string, name: string, hash: string): void {\n\tif (!existsSync(indexPath(rootDir))) return;\n\tconst index = readIndex(rootDir);\n\tif (index[name] !== hash && index[name] !== undefined) return;\n\tdelete index[name];\n\twriteIndexAtomic(rootDir, index);\n}\n\nfunction writeIndexAtomic(rootDir: string, index: Record<string, string>): void {\n\tconst tmp = join(rootDir, `${INDEX_FILE}.${randomBytes(6).toString(\"hex\")}.tmp`);\n\twriteFileSync(tmp, `${JSON.stringify(index, null, 2)}\\n`, { mode: 0o600 });\n\tchmodSync(tmp, 0o600);\n\trenameSync(tmp, indexPath(rootDir));\n\tchmodSync(indexPath(rootDir), 0o600);\n}\n"]}

package/dist/core/extensions/builtin/mcp/catalog-cache.d.ts

@@ -0,0 +1,25 @@
+import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { McpServerConfig } from "./config-schema.ts";
+import type { ServerConnection } from "./connection.ts";
+type ListedTool = Awaited<ReturnType<Client["listTools"]>>["tools"][number];
+type ListedResource = Awaited<ReturnType<Client["listResources"]>>["resources"][number];
+type ListedPrompt = Awaited<ReturnType<Client["listPrompts"]>>["prompts"][number];
+export interface McpCatalogCacheFile {
+    readonly version: 1;
+    readonly servers: Record<string, McpCachedServerCatalog>;
+}
+export interface McpCachedServerCatalog {
+    readonly configHash: string;
+    readonly fetchedAt: number;
+    readonly tools: ListedTool[];
+    readonly resources: ListedResource[];
+    readonly prompts: ListedPrompt[];
+    readonly instructions?: string;
+}
+export declare function getMcpCatalogCachePath(agentDir?: string): string;
+export declare function readMcpCatalogCache(agentDir?: string): Promise<McpCatalogCacheFile>;
+export declare function getValidCachedServer(cache: McpCatalogCacheFile, serverName: string, configHash: string, now?: number): McpCachedServerCatalog | undefined;
+export declare function collectServerCatalogForCache(connection: ServerConnection, config: McpServerConfig, configHash: string): Promise<McpCachedServerCatalog>;
+export declare function writeMcpCachedServer(agentDir: string | undefined, serverName: string, server: McpCachedServerCatalog): Promise<void>;
+export {};
+//# sourceMappingURL=catalog-cache.d.ts.map

package/dist/core/extensions/builtin/mcp/catalog-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-cache.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/catalog-cache.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAExE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAC5E,KAAK,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AACxF,KAAK,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAElF,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,cAAc,EAAE,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAC/B;AAKD,wBAAgB,sBAAsB,CAAC,QAAQ,SAAgB,GAAG,MAAM,CAEvE;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAOzF;AAED,wBAAgB,oBAAoB,CACnC,KAAK,EAAE,mBAAmB,EAC1B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,GAAG,SAAa,GACd,sBAAsB,GAAG,SAAS,CAMpC;AAED,wBAAsB,4BAA4B,CACjD,UAAU,EAAE,gBAAgB,EAC5B,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,MAAM,GAChB,OAAO,CAAC,sBAAsB,CAAC,CAkBjC;AAED,wBAAsB,oBAAoB,CACzC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,sBAAsB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAIf"}

package/dist/core/extensions/builtin/mcp/catalog-cache.js

@@ -0,0 +1,105 @@
+import { randomUUID } from "node:crypto";
+import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+import { getAgentDir } from "../../../../config.js";
+import { collectAllPages } from "./expose/pagination.js";
+const CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;
+const EMPTY_CACHE = { version: 1, servers: {} };
+export function getMcpCatalogCachePath(agentDir = getAgentDir()) {
+    return join(agentDir, "cache", "mcp-cache.json");
+}
+export async function readMcpCatalogCache(agentDir) {
+    try {
+        const parsed = JSON.parse(await readFile(getMcpCatalogCachePath(agentDir), "utf8"));
+        return normalizeCacheFile(parsed);
+    }
+    catch {
+        return EMPTY_CACHE;
+    }
+}
+export function getValidCachedServer(cache, serverName, configHash, now = Date.now()) {
+    const cached = cache.servers[serverName];
+    if (cached === undefined)
+        return undefined;
+    if (cached.configHash !== configHash)
+        return undefined;
+    if (now - cached.fetchedAt > CACHE_TTL_MS)
+        return undefined;
+    return cached;
+}
+export async function collectServerCatalogForCache(connection, config, configHash) {
+    const tools = await collectAllPages((cursor) => connection.client.listTools(cursor === undefined ? {} : { cursor }, { timeout: config.requestTimeoutMs }));
+    const resources = await collectOptionalPages((cursor) => connection.client.listResources(cursor === undefined ? {} : { cursor }, { timeout: config.requestTimeoutMs }));
+    const prompts = await collectOptionalPages((cursor) => connection.client.listPrompts(cursor === undefined ? {} : { cursor }, { timeout: config.requestTimeoutMs }));
+    return {
+        configHash,
+        fetchedAt: Date.now(),
+        instructions: connection.client.getInstructions(),
+        prompts,
+        resources,
+        tools: tools.items,
+    };
+}
+export async function writeMcpCachedServer(agentDir, serverName, server) {
+    const cache = await readMcpCatalogCache(agentDir);
+    const next = { version: 1, servers: { ...cache.servers, [serverName]: server } };
+    await atomicWriteJson(getMcpCatalogCachePath(agentDir), next);
+}
+async function collectOptionalPages(listFn) {
+    try {
+        const result = await collectAllPages((cursor) => listFn(cursor));
+        return result.items;
+    }
+    catch {
+        return [];
+    }
+}
+async function atomicWriteJson(path, value) {
+    await mkdir(dirname(path), { recursive: true });
+    const tmp = `${path}.${process.pid}.${randomUUID()}.tmp`;
+    await writeFile(tmp, `${JSON.stringify(value, null, 2)}\n`, "utf8");
+    await rename(tmp, path);
+}
+function normalizeCacheFile(value) {
+    if (!isRecord(value) || value.version !== 1 || !isRecord(value.servers))
+        return EMPTY_CACHE;
+    const servers = {};
+    for (const [name, server] of Object.entries(value.servers)) {
+        const normalized = normalizeCachedServer(server);
+        if (normalized !== undefined)
+            servers[name] = normalized;
+    }
+    return { version: 1, servers };
+}
+function normalizeCachedServer(value) {
+    if (!isRecord(value) || typeof value.configHash !== "string" || typeof value.fetchedAt !== "number") {
+        return undefined;
+    }
+    const tools = normalizeTools(value.tools);
+    if (tools === undefined)
+        return undefined;
+    const resources = Array.isArray(value.resources) ? value.resources : [];
+    const prompts = Array.isArray(value.prompts) ? value.prompts : [];
+    const instructions = typeof value.instructions === "string" ? value.instructions : undefined;
+    return { configHash: value.configHash, fetchedAt: value.fetchedAt, instructions, prompts, resources, tools };
+}
+function normalizeTools(value) {
+    if (!Array.isArray(value))
+        return undefined;
+    const tools = [];
+    for (const item of value) {
+        if (!isRecord(item) || typeof item.name !== "string" || !isRecord(item.inputSchema))
+            return undefined;
+        tools.push({
+            annotations: isRecord(item.annotations) ? item.annotations : undefined,
+            description: typeof item.description === "string" ? item.description : undefined,
+            inputSchema: item.inputSchema,
+            name: item.name,
+        });
+    }
+    return tools;
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+//# sourceMappingURL=catalog-cache.js.map

package/dist/core/extensions/builtin/mcp/catalog-cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-cache.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/catalog-cache.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport { mkdir, readFile, rename, writeFile } from \"node:fs/promises\";\nimport { dirname, join } from \"node:path\";\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { getAgentDir } from \"../../../../config.ts\";\nimport type { McpServerConfig } from \"./config-schema.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport { collectAllPages } from \"./expose/pagination.ts\";\n\ntype ListedTool = Awaited<ReturnType<Client[\"listTools\"]>>[\"tools\"][number];\ntype ListedResource = Awaited<ReturnType<Client[\"listResources\"]>>[\"resources\"][number];\ntype ListedPrompt = Awaited<ReturnType<Client[\"listPrompts\"]>>[\"prompts\"][number];\n\nexport interface McpCatalogCacheFile {\n\treadonly version: 1;\n\treadonly servers: Record<string, McpCachedServerCatalog>;\n}\n\nexport interface McpCachedServerCatalog {\n\treadonly configHash: string;\n\treadonly fetchedAt: number;\n\treadonly tools: ListedTool[];\n\treadonly resources: ListedResource[];\n\treadonly prompts: ListedPrompt[];\n\treadonly instructions?: string;\n}\n\nconst CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;\nconst EMPTY_CACHE: McpCatalogCacheFile = { version: 1, servers: {} };\n\nexport function getMcpCatalogCachePath(agentDir = getAgentDir()): string {\n\treturn join(agentDir, \"cache\", \"mcp-cache.json\");\n}\n\nexport async function readMcpCatalogCache(agentDir?: string): Promise<McpCatalogCacheFile> {\n\ttry {\n\t\tconst parsed: unknown = JSON.parse(await readFile(getMcpCatalogCachePath(agentDir), \"utf8\"));\n\t\treturn normalizeCacheFile(parsed);\n\t} catch {\n\t\treturn EMPTY_CACHE;\n\t}\n}\n\nexport function getValidCachedServer(\n\tcache: McpCatalogCacheFile,\n\tserverName: string,\n\tconfigHash: string,\n\tnow = Date.now(),\n): McpCachedServerCatalog | undefined {\n\tconst cached = cache.servers[serverName];\n\tif (cached === undefined) return undefined;\n\tif (cached.configHash !== configHash) return undefined;\n\tif (now - cached.fetchedAt > CACHE_TTL_MS) return undefined;\n\treturn cached;\n}\n\nexport async function collectServerCatalogForCache(\n\tconnection: ServerConnection,\n\tconfig: McpServerConfig,\n\tconfigHash: string,\n): Promise<McpCachedServerCatalog> {\n\tconst tools = await collectAllPages<ListedTool>((cursor) =>\n\t\tconnection.client.listTools(cursor === undefined ? {} : { cursor }, { timeout: config.requestTimeoutMs }),\n\t);\n\tconst resources = await collectOptionalPages<ListedResource>((cursor) =>\n\t\tconnection.client.listResources(cursor === undefined ? {} : { cursor }, { timeout: config.requestTimeoutMs }),\n\t);\n\tconst prompts = await collectOptionalPages<ListedPrompt>((cursor) =>\n\t\tconnection.client.listPrompts(cursor === undefined ? {} : { cursor }, { timeout: config.requestTimeoutMs }),\n\t);\n\treturn {\n\t\tconfigHash,\n\t\tfetchedAt: Date.now(),\n\t\tinstructions: connection.client.getInstructions(),\n\t\tprompts,\n\t\tresources,\n\t\ttools: tools.items,\n\t};\n}\n\nexport async function writeMcpCachedServer(\n\tagentDir: string | undefined,\n\tserverName: string,\n\tserver: McpCachedServerCatalog,\n): Promise<void> {\n\tconst cache = await readMcpCatalogCache(agentDir);\n\tconst next: McpCatalogCacheFile = { version: 1, servers: { ...cache.servers, [serverName]: server } };\n\tawait atomicWriteJson(getMcpCatalogCachePath(agentDir), next);\n}\n\nasync function collectOptionalPages<TItem>(listFn: (cursor: string | undefined) => Promise<unknown>): Promise<TItem[]> {\n\ttry {\n\t\tconst result = await collectAllPages<TItem>((cursor) => listFn(cursor) as Promise<{ items?: TItem[] }>);\n\t\treturn result.items;\n\t} catch {\n\t\treturn [];\n\t}\n}\n\nasync function atomicWriteJson(path: string, value: unknown): Promise<void> {\n\tawait mkdir(dirname(path), { recursive: true });\n\tconst tmp = `${path}.${process.pid}.${randomUUID()}.tmp`;\n\tawait writeFile(tmp, `${JSON.stringify(value, null, 2)}\\n`, \"utf8\");\n\tawait rename(tmp, path);\n}\n\nfunction normalizeCacheFile(value: unknown): McpCatalogCacheFile {\n\tif (!isRecord(value) || value.version !== 1 || !isRecord(value.servers)) return EMPTY_CACHE;\n\tconst servers: Record<string, McpCachedServerCatalog> = {};\n\tfor (const [name, server] of Object.entries(value.servers)) {\n\t\tconst normalized = normalizeCachedServer(server);\n\t\tif (normalized !== undefined) servers[name] = normalized;\n\t}\n\treturn { version: 1, servers };\n}\n\nfunction normalizeCachedServer(value: unknown): McpCachedServerCatalog | undefined {\n\tif (!isRecord(value) || typeof value.configHash !== \"string\" || typeof value.fetchedAt !== \"number\") {\n\t\treturn undefined;\n\t}\n\tconst tools = normalizeTools(value.tools);\n\tif (tools === undefined) return undefined;\n\tconst resources = Array.isArray(value.resources) ? (value.resources as ListedResource[]) : [];\n\tconst prompts = Array.isArray(value.prompts) ? (value.prompts as ListedPrompt[]) : [];\n\tconst instructions = typeof value.instructions === \"string\" ? value.instructions : undefined;\n\treturn { configHash: value.configHash, fetchedAt: value.fetchedAt, instructions, prompts, resources, tools };\n}\n\nfunction normalizeTools(value: unknown): ListedTool[] | undefined {\n\tif (!Array.isArray(value)) return undefined;\n\tconst tools: ListedTool[] = [];\n\tfor (const item of value) {\n\t\tif (!isRecord(item) || typeof item.name !== \"string\" || !isRecord(item.inputSchema)) return undefined;\n\t\ttools.push({\n\t\t\tannotations: isRecord(item.annotations) ? (item.annotations as ListedTool[\"annotations\"]) : undefined,\n\t\t\tdescription: typeof item.description === \"string\" ? item.description : undefined,\n\t\t\tinputSchema: item.inputSchema as ListedTool[\"inputSchema\"],\n\t\t\tname: item.name,\n\t\t});\n\t}\n\treturn tools;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n"]}

package/dist/core/extensions/builtin/mcp/catalog.d.ts

@@ -0,0 +1,24 @@
+import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { McpCachedServerCatalog } from "./catalog-cache.ts";
+import type { McpServerConfig, McpSettings } from "./config-schema.ts";
+import type { ServerConnection } from "./connection.ts";
+import type { McpEnsureFreshAuth } from "./health.ts";
+type ListedTool = Awaited<ReturnType<Client["listTools"]>>["tools"][number];
+export interface McpToolCatalogEntry {
+    server: string;
+    tool: string;
+    schema: ListedTool["inputSchema"];
+    description?: string;
+    annotations?: ListedTool["annotations"];
+    requestTimeoutMs: number;
+    connection: ServerConnection;
+    ensureConnected?: () => Promise<void>;
+    ensureFresh?: McpEnsureFreshAuth;
+    agentDir?: string;
+    outputGuard?: McpSettings["outputGuard"];
+}
+type McpToolCatalogOptions = Pick<McpToolCatalogEntry, "agentDir" | "ensureFresh" | "outputGuard">;
+export declare function collectToolCatalog(server: string, connection: ServerConnection, config: McpServerConfig, options?: McpToolCatalogOptions): Promise<McpToolCatalogEntry[]>;
+export declare function cachedToolsToCatalogEntries(server: string, catalog: McpCachedServerCatalog, connection: ServerConnection, requestTimeoutMs: number, ensureConnected: () => Promise<void>, options?: McpToolCatalogOptions): McpToolCatalogEntry[];
+export {};
+//# sourceMappingURL=catalog.d.ts.map

package/dist/core/extensions/builtin/mcp/catalog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5E,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;IACxC,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CACzC;AAED,KAAK,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG,aAAa,GAAG,aAAa,CAAC,CAAC;AAEnG,wBAAsB,kBAAkB,CACvC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,gBAAgB,EAC5B,MAAM,EAAE,eAAe,EACvB,OAAO,GAAE,qBAA0B,GACjC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAgBhC;AAED,wBAAgB,2BAA2B,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,sBAAsB,EAC/B,UAAU,EAAE,gBAAgB,EAC5B,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACpC,OAAO,GAAE,qBAA0B,GACjC,mBAAmB,EAAE,CAcvB"}

package/dist/core/extensions/builtin/mcp/catalog.js

@@ -0,0 +1,32 @@
+import { collectAllPages } from "./expose/pagination.js";
+export async function collectToolCatalog(server, connection, config, options = {}) {
+    const result = await collectAllPages((cursor) => connection.client.listTools(cursor === undefined ? {} : { cursor }, { timeout: config.requestTimeoutMs }));
+    return result.items.map((tool) => ({
+        annotations: tool.annotations,
+        agentDir: options.agentDir,
+        connection,
+        description: tool.description,
+        ensureFresh: options.ensureFresh,
+        outputGuard: options.outputGuard,
+        requestTimeoutMs: config.requestTimeoutMs,
+        schema: tool.inputSchema,
+        server,
+        tool: tool.name,
+    }));
+}
+export function cachedToolsToCatalogEntries(server, catalog, connection, requestTimeoutMs, ensureConnected, options = {}) {
+    return catalog.tools.map((tool) => ({
+        annotations: tool.annotations,
+        agentDir: options.agentDir,
+        connection,
+        description: tool.description,
+        ensureConnected,
+        ensureFresh: options.ensureFresh,
+        outputGuard: options.outputGuard,
+        requestTimeoutMs,
+        schema: tool.inputSchema,
+        server,
+        tool: tool.name,
+    }));
+}
+//# sourceMappingURL=catalog.js.map

package/dist/core/extensions/builtin/mcp/catalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/catalog.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAqBzD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,MAAc,EACd,UAA4B,EAC5B,MAAuB,EACvB,OAAO,GAA0B,EAAE;IAEnC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAa,CAAC,MAAM,EAAE,EAAE,CAC3D,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CACzG,CAAC;IACF,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAClC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,UAAU;QACV,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,MAAM,EAAE,IAAI,CAAC,WAAW;QACxB,MAAM;QACN,IAAI,EAAE,IAAI,CAAC,IAAI;KACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B,CAC1C,MAAc,EACd,OAA+B,EAC/B,UAA4B,EAC5B,gBAAwB,EACxB,eAAoC,EACpC,OAAO,GAA0B,EAAE;IAEnC,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,UAAU;QACV,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,eAAe;QACf,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,gBAAgB;QAChB,MAAM,EAAE,IAAI,CAAC,WAAW;QACxB,MAAM;QACN,IAAI,EAAE,IAAI,CAAC,IAAI;KACf,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport type { McpCachedServerCatalog } from \"./catalog-cache.ts\";\nimport type { McpServerConfig, McpSettings } from \"./config-schema.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport { collectAllPages } from \"./expose/pagination.ts\";\nimport type { McpEnsureFreshAuth } from \"./health.ts\";\n\ntype ListedTool = Awaited<ReturnType<Client[\"listTools\"]>>[\"tools\"][number];\n\nexport interface McpToolCatalogEntry {\n\tserver: string;\n\ttool: string;\n\tschema: ListedTool[\"inputSchema\"];\n\tdescription?: string;\n\tannotations?: ListedTool[\"annotations\"];\n\trequestTimeoutMs: number;\n\tconnection: ServerConnection;\n\tensureConnected?: () => Promise<void>;\n\tensureFresh?: McpEnsureFreshAuth;\n\tagentDir?: string;\n\toutputGuard?: McpSettings[\"outputGuard\"];\n}\n\ntype McpToolCatalogOptions = Pick<McpToolCatalogEntry, \"agentDir\" | \"ensureFresh\" | \"outputGuard\">;\n\nexport async function collectToolCatalog(\n\tserver: string,\n\tconnection: ServerConnection,\n\tconfig: McpServerConfig,\n\toptions: McpToolCatalogOptions = {},\n): Promise<McpToolCatalogEntry[]> {\n\tconst result = await collectAllPages<ListedTool>((cursor) =>\n\t\tconnection.client.listTools(cursor === undefined ? {} : { cursor }, { timeout: config.requestTimeoutMs }),\n\t);\n\treturn result.items.map((tool) => ({\n\t\tannotations: tool.annotations,\n\t\tagentDir: options.agentDir,\n\t\tconnection,\n\t\tdescription: tool.description,\n\t\tensureFresh: options.ensureFresh,\n\t\toutputGuard: options.outputGuard,\n\t\trequestTimeoutMs: config.requestTimeoutMs,\n\t\tschema: tool.inputSchema,\n\t\tserver,\n\t\ttool: tool.name,\n\t}));\n}\n\nexport function cachedToolsToCatalogEntries(\n\tserver: string,\n\tcatalog: McpCachedServerCatalog,\n\tconnection: ServerConnection,\n\trequestTimeoutMs: number,\n\tensureConnected: () => Promise<void>,\n\toptions: McpToolCatalogOptions = {},\n): McpToolCatalogEntry[] {\n\treturn catalog.tools.map((tool) => ({\n\t\tannotations: tool.annotations,\n\t\tagentDir: options.agentDir,\n\t\tconnection,\n\t\tdescription: tool.description,\n\t\tensureConnected,\n\t\tensureFresh: options.ensureFresh,\n\t\toutputGuard: options.outputGuard,\n\t\trequestTimeoutMs,\n\t\tschema: tool.inputSchema,\n\t\tserver,\n\t\ttool: tool.name,\n\t}));\n}\n"]}

package/dist/core/extensions/builtin/mcp/commands.d.ts

@@ -0,0 +1,3 @@
+import type { ExtensionAPI } from "../../types.ts";
+export declare function registerMcpCommands(pi: ExtensionAPI): void;
+//# sourceMappingURL=commands.d.ts.map

package/dist/core/extensions/builtin/mcp/commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAA2B,MAAM,gBAAgB,CAAC;AAuB5E,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAa1D"}

package/dist/core/extensions/builtin/mcp/commands.js

@@ -0,0 +1,197 @@
+import { handleMcpAuthCommand } from "./auth/commands-auth-dispatch.js";
+import { addGlobalMcpServer, setGlobalMcpServerEnabled } from "./config-edit.js";
+import { getMcpService } from "./service.js";
+import { buildMcpStatusRows, formatMcpStatus } from "./status.js";
+const SUBCOMMANDS = [
+    "status",
+    "add",
+    "enable",
+    "disable",
+    "test",
+    "logs",
+    "reconnect",
+    "auth",
+    "auth-start",
+    "auth-complete",
+    "logout",
+];
+const AUTH_SUBCOMMANDS = new Set(["auth", "auth-start", "auth-complete", "logout"]);
+export function registerMcpCommands(pi) {
+    pi.registerCommand("mcp", {
+        description: "Inspect and manage MCP servers.",
+        getArgumentCompletions: (prefix) => SUBCOMMANDS.filter((item) => item.startsWith(prefix)).map((value) => ({ value, label: value })),
+        handler: async (rawArgs, ctx) => {
+            try {
+                await handleMcpCommand(rawArgs, ctx, pi);
+            }
+            catch (error) {
+                ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
+            }
+        },
+    });
+}
+async function handleMcpCommand(rawArgs, ctx, pi) {
+    const args = splitCommandArgs(rawArgs);
+    const subcommand = args[0] ?? "";
+    if (subcommand === "") {
+        await showPanel(ctx);
+        return;
+    }
+    if (AUTH_SUBCOMMANDS.has(subcommand)) {
+        await handleMcpAuthCommand(subcommand, args.slice(1), ctx, pi);
+        return;
+    }
+    if (subcommand === "status") {
+        await notifyStatus(ctx);
+        return;
+    }
+    if (subcommand === "add") {
+        await addServer(args.slice(1), ctx, pi);
+        return;
+    }
+    if (subcommand === "enable" || subcommand === "disable") {
+        await setServerEnabled(ctx, pi, args[1] ?? "", subcommand === "enable");
+        return;
+    }
+    if (subcommand === "test") {
+        await testServer(args[1] ?? "", ctx);
+        return;
+    }
+    if (subcommand === "logs") {
+        showLogs(args[1] ?? "", ctx);
+        return;
+    }
+    if (subcommand === "reconnect") {
+        await reconnectServer(args[1] ?? "", ctx, pi);
+        return;
+    }
+    ctx.ui.notify(`Unknown /mcp subcommand: ${subcommand}`, "error");
+}
+async function showPanel(ctx) {
+    const text = await renderStatus("MCP servers");
+    if (!ctx.hasUI) {
+        ctx.ui.notify(text);
+        return;
+    }
+    const choice = await ctx.ui.select(text, ["status", "logs <server>", "test <server>"]);
+    if (choice === undefined)
+        ctx.ui.notify(text);
+}
+async function notifyStatus(ctx) {
+    ctx.ui.notify(await renderStatus("MCP status"));
+}
+async function renderStatus(title) {
+    const service = getMcpService();
+    const rows = await buildMcpStatusRows(service.getServerSnapshots(), (name) => service.getServerExposureStatus(name));
+    return formatMcpStatus(title, rows);
+}
+async function addServer(args, ctx, pi) {
+    const [name, ...endpoint] = args;
+    if (!name || endpoint.length === 0) {
+        ctx.ui.notify("Usage: /mcp add <name> <command...|url>", "error");
+        return;
+    }
+    if (!ctx.hasUI) {
+        ctx.ui.notify("Cannot add MCP server without UI confirmation.", "error");
+        return;
+    }
+    const server = parseServerConfig(endpoint);
+    const confirmed = await ctx.ui.confirm("Add MCP server?", `${name}: ${endpoint.join(" ")}`);
+    if (!confirmed) {
+        ctx.ui.notify("MCP add cancelled", "warning");
+        return;
+    }
+    addGlobalMcpServer(name, server);
+    await getMcpService().attachSession({ type: "session_start", reason: "reload" }, ctx, pi);
+    ctx.ui.notify(`Added MCP server ${name}`);
+}
+async function setServerEnabled(ctx, pi, name, enabled) {
+    if (!ensureKnown(name, ctx))
+        return;
+    if (!setGlobalMcpServerEnabled(name, enabled)) {
+        ctx.ui.notify(`MCP server ${name} is not in the global config file`, "error");
+        return;
+    }
+    ctx.ui.notify(`MCP server ${name} connecting`);
+    await getMcpService().attachSession({ type: "session_start", reason: "reload" }, ctx, pi);
+    ctx.ui.notify(`${enabled ? "Enabled" : "Disabled"} MCP server ${name}`);
+}
+async function testServer(name, ctx) {
+    if (!ensureKnown(name, ctx))
+        return;
+    const connection = getMcpService().getConnection(name);
+    if (connection === undefined)
+        return;
+    const started = Date.now();
+    try {
+        await connection.connect();
+        const result = await connection.client.listTools({}, { timeout: 2000 });
+        const elapsedMs = Date.now() - started;
+        getMcpService().recordCall(name, elapsedMs, false);
+        ctx.ui.notify(`MCP test ${name} ok (${elapsedMs}ms): ${result.tools.length} tools`);
+    }
+    catch (error) {
+        const elapsedMs = Date.now() - started;
+        getMcpService().recordCall(name, elapsedMs, true);
+        const message = error instanceof Error ? error.message : String(error);
+        ctx.ui.notify(`MCP test ${name} failed (${elapsedMs}ms): ${message}`, "error");
+    }
+}
+function showLogs(name, ctx) {
+    if (!ensureKnown(name, ctx))
+        return;
+    const lines = getMcpService().getLogLines(name, 20);
+    ctx.ui.notify(lines.length === 0 ? `MCP logs for ${name}: (empty)` : lines.join("\n"));
+}
+async function reconnectServer(name, ctx, pi) {
+    if (!ensureKnown(name, ctx))
+        return;
+    try {
+        const service = getMcpService();
+        await service.reconnectServer(name);
+        await service.attachSession({ type: "session_start", reason: "reload" }, ctx, pi);
+        ctx.ui.notify(`MCP reconnect ${name} connected`);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        ctx.ui.notify(`MCP reconnect ${name} failed: ${message}`, "error");
+    }
+}
+function ensureKnown(name, ctx) {
+    if (name.length > 0 &&
+        getMcpService()
+            .getServerSnapshots()
+            .some((snapshot) => snapshot.name === name))
+        return true;
+    const known = getMcpService()
+        .getServerSnapshots()
+        .map((snapshot) => snapshot.name)
+        .join(", ");
+    ctx.ui.notify(`Unknown MCP server: ${name || "<missing>"}\nKnown MCP servers: ${known || "(none)"}`, "error");
+    return false;
+}
+function parseServerConfig(endpoint) {
+    const first = endpoint[0] ?? "";
+    if (/^https?:\/\//.test(first)) {
+        return baseServer({ type: "http", url: first });
+    }
+    return baseServer({ type: "stdio", command: first, args: endpoint.slice(1) });
+}
+function baseServer(endpoint) {
+    return {
+        args: [],
+        connectTimeoutMs: 15_000,
+        enabled: true,
+        exposure: "auto",
+        idleTimeoutMin: 10,
+        lifecycle: "lazy",
+        logLevel: "info",
+        requestTimeoutMs: 30_000,
+        ...endpoint,
+    };
+}
+function splitCommandArgs(raw) {
+    const matches = raw.match(/"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|[^\s]+/g) ?? [];
+    return matches.map((part) => part.replace(/^["']|["']$/g, "").replace(/\\(["'])/g, "$1"));
+}
+//# sourceMappingURL=commands.js.map