@qduc/term2 0.24.1 → 0.26.0

package/dist/services/mcp/mcp-oauth-store.js

@@ -0,0 +1,278 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { randomUUID } from 'node:crypto';
+import envPaths from 'env-paths';
+/**
+ * Credential storage for MCP servers that authenticate with OAuth.
+ *
+ * One file holds every server's credentials, keyed by the server URL from the
+ * config rather than by the config entry's name: renaming `"linear"` to
+ * `"linear-remote"` in `.mcp.json` must not lose the login, and pointing a
+ * different entry at another URL must never reach a token issued for this one.
+ *
+ * Within a server, client information and tokens are sub-keyed by the
+ * authorization server's `issuer` (stamped by the SDK on every save), because a
+ * client id is only meaningful to the authorization server that issued it. The
+ * PKCE code verifier and the discovery state have no issuer — the SDK passes no
+ * context for them — so they belong to the server entry itself.
+ *
+ * This is the persistence half of `OAuthClientProvider`; the policy half (when
+ * to log in, whether to open a browser) lives in `mcp-oauth-provider.ts` and its
+ * caller.
+ */
+export const MCP_OAUTH_STORE_VERSION = 1;
+/** term2's own MCP credential file, beside `grok-auth.json` and `codex-auth.json`. */
+export function defaultMcpOAuthStorePath() {
+    const dir = process.env.TERM2_CONFIG_DIR || envPaths('term2').config;
+    return path.join(dir, 'mcp-oauth.json');
+}
+/**
+ * The storage key for a server URL: lowercase scheme and host, no default port,
+ * no trailing slash, no query or fragment.
+ *
+ * The path keeps its case — URLs are only case-insensitive before the path — and
+ * a URL that cannot be parsed is keyed by its trimmed text, which keeps the
+ * function total while still giving two spellings of one bad string the same key.
+ */
+export function normalizeMcpServerUrl(raw) {
+    let url;
+    try {
+        url = new URL(raw);
+    }
+    catch {
+        return raw.trim();
+    }
+    url.search = '';
+    url.hash = '';
+    // Userinfo is not part of the server's identity, and a password must never
+    // reach the credential file's key on disk.
+    url.username = '';
+    url.password = '';
+    url.protocol = url.protocol.toLowerCase();
+    url.hostname = url.hostname.toLowerCase();
+    // The URL parser already drops a default port for the schemes it knows; the
+    // explicit checks keep the normalization true for one it does not.
+    if (url.protocol === 'https:' && url.port === '443')
+        url.port = '';
+    if (url.protocol === 'http:' && url.port === '80')
+        url.port = '';
+    url.pathname = url.pathname.replace(/\/+$/, '');
+    // A root path normalizes back to '/', so the trailing-slash rule needs one
+    // more pass than the pathname assignment.
+    return url.toString().replace(/\/$/, '');
+}
+function emptyStore() {
+    return { version: MCP_OAUTH_STORE_VERSION, servers: {} };
+}
+function emptyServerEntry() {
+    return { byIssuer: {} };
+}
+function isEmptyServerEntry(entry) {
+    return Object.keys(entry.byIssuer).length === 0 && entry.codeVerifier === undefined && entry.discovery === undefined;
+}
+export class McpOAuthStore {
+    filesystem;
+    filePath;
+    constructor(options = {}) {
+        this.filesystem = options.filesystem ?? fs;
+        this.filePath = options.filePath ?? defaultMcpOAuthStorePath();
+        this.sweepTemporaryFiles();
+    }
+    get path() {
+        return this.filePath;
+    }
+    /**
+     * Reads the store. A missing, unreadable, or corrupt file is an empty store:
+     * a credential file is not worth crashing a session over, and the next write
+     * replaces the damaged body.
+     */
+    read() {
+        let parsed;
+        try {
+            parsed = JSON.parse(this.filesystem.readFileSync(this.filePath, 'utf8'));
+        }
+        catch {
+            return emptyStore();
+        }
+        if (!parsed || typeof parsed !== 'object' || typeof parsed.servers !== 'object' || parsed.servers === null) {
+            return emptyStore();
+        }
+        const servers = {};
+        for (const [serverKey, value] of Object.entries(parsed.servers)) {
+            if (!value || typeof value !== 'object')
+                continue;
+            const byIssuer = {};
+            if (value.byIssuer && typeof value.byIssuer === 'object') {
+                for (const [issuer, issuerEntry] of Object.entries(value.byIssuer)) {
+                    if (!issuerEntry || typeof issuerEntry !== 'object')
+                        continue;
+                    byIssuer[issuer] = { client: issuerEntry.client, tokens: issuerEntry.tokens };
+                }
+            }
+            servers[serverKey] = {
+                byIssuer,
+                ...(typeof value.lastIssuer === 'string' ? { lastIssuer: value.lastIssuer } : {}),
+                ...(typeof value.codeVerifier === 'string' ? { codeVerifier: value.codeVerifier } : {}),
+                ...(value.discovery && typeof value.discovery === 'object' ? { discovery: value.discovery } : {}),
+            };
+        }
+        return { version: MCP_OAUTH_STORE_VERSION, servers };
+    }
+    getClientInformation(serverUrl, issuer) {
+        return this.serverEntry(serverUrl)?.byIssuer[issuer]?.client;
+    }
+    saveClientInformation(serverUrl, issuer, client) {
+        this.update(serverUrl, (entry) => {
+            entry.byIssuer[issuer] = { ...entry.byIssuer[issuer], client };
+            return entry;
+        });
+    }
+    /**
+     * Reads stored tokens. With no issuer, returns the most recently saved set —
+     * the transport's per-request read, which must not come back empty just
+     * because it has no context.
+     */
+    getTokens(serverUrl, issuer) {
+        const entry = this.serverEntry(serverUrl);
+        if (!entry)
+            return undefined;
+        if (issuer !== undefined)
+            return entry.byIssuer[issuer]?.tokens;
+        const key = entry.lastIssuer ?? Object.keys(entry.byIssuer).at(-1);
+        return key ? entry.byIssuer[key]?.tokens : undefined;
+    }
+    saveTokens(serverUrl, issuer, tokens) {
+        this.update(serverUrl, (entry) => {
+            entry.byIssuer[issuer] = { ...entry.byIssuer[issuer], tokens };
+            entry.lastIssuer = issuer;
+            return entry;
+        });
+    }
+    getCodeVerifier(serverUrl) {
+        return this.serverEntry(serverUrl)?.codeVerifier;
+    }
+    saveCodeVerifier(serverUrl, codeVerifier) {
+        this.update(serverUrl, (entry) => {
+            entry.codeVerifier = codeVerifier;
+            return entry;
+        });
+    }
+    getDiscoveryState(serverUrl) {
+        return this.serverEntry(serverUrl)?.discovery;
+    }
+    saveDiscoveryState(serverUrl, discovery) {
+        this.update(serverUrl, (entry) => {
+            entry.discovery = discovery;
+            return entry;
+        });
+    }
+    /**
+     * Forgets one class of credential for a server. Scopes are the SDK's: the
+     * transport calls `'client'` and `'tokens'` when the server rejects them,
+     * and hosts call `'discovery'` after repeated 401s so a changed
+     * `authorization_servers` list is picked up.
+     *
+     * `'client'` and `'tokens'` clear every issuer's entry, because the call
+     * carries no issuer and the rejected credential may be any of them.
+     */
+    invalidateCredentials(serverUrl, scope) {
+        if (scope === 'all') {
+            this.update(serverUrl, () => null);
+            return;
+        }
+        this.update(serverUrl, (entry) => {
+            if (scope === 'verifier')
+                entry.codeVerifier = undefined;
+            else if (scope === 'discovery')
+                entry.discovery = undefined;
+            else {
+                for (const issuer of Object.keys(entry.byIssuer)) {
+                    const issuerEntry = entry.byIssuer[issuer];
+                    if (scope === 'client')
+                        delete issuerEntry.client;
+                    else
+                        delete issuerEntry.tokens;
+                    if (!issuerEntry.client && !issuerEntry.tokens)
+                        delete entry.byIssuer[issuer];
+                }
+                if (entry.lastIssuer !== undefined && !entry.byIssuer[entry.lastIssuer]?.tokens) {
+                    entry.lastIssuer = undefined;
+                }
+            }
+            return entry;
+        });
+    }
+    serverEntry(serverUrl) {
+        return this.read().servers[normalizeMcpServerUrl(serverUrl)];
+    }
+    /** Applies one mutation and writes the whole store back atomically. */
+    update(serverUrl, mutate) {
+        const store = this.read();
+        const key = normalizeMcpServerUrl(serverUrl);
+        const next = mutate(store.servers[key] ?? emptyServerEntry());
+        if (next === null || isEmptyServerEntry(next))
+            delete store.servers[key];
+        else
+            store.servers[key] = next;
+        this.write({ version: MCP_OAUTH_STORE_VERSION, servers: store.servers });
+    }
+    /**
+     * Writes through a temporary file in the same directory, fsynced before the
+     * rename, so a reader — including another term2 instance — sees either the old
+     * file or the complete new one, never a half-written credential file.
+     */
+    write(store) {
+        this.filesystem.mkdirSync(path.dirname(this.filePath), { recursive: true });
+        const tmpPath = `${this.filePath}.${process.pid}.${randomUUID()}.tmp`;
+        let fd;
+        let renamed = false;
+        try {
+            fd = this.filesystem.openSync(tmpPath, 'w', 0o600);
+            this.filesystem.writeFileSync(fd, JSON.stringify(store, null, 2), { encoding: 'utf8' });
+            this.filesystem.fsyncSync(fd);
+            this.filesystem.closeSync(fd);
+            fd = undefined;
+            this.filesystem.renameSync(tmpPath, this.filePath);
+            renamed = true;
+        }
+        finally {
+            if (fd !== undefined) {
+                try {
+                    this.filesystem.closeSync(fd);
+                }
+                catch {
+                    // Preserve the original write failure.
+                }
+            }
+            if (!renamed) {
+                try {
+                    this.filesystem.unlinkSync(tmpPath);
+                }
+                catch {
+                    // Best-effort cleanup; the next startup sweep retries it.
+                }
+            }
+        }
+    }
+    sweepTemporaryFiles() {
+        const directory = path.dirname(this.filePath);
+        const base = path.basename(this.filePath).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const unique = new RegExp(`^${base}\\.[^.]+\\.[A-Fa-f0-9-]{36}\\.tmp$`);
+        try {
+            for (const name of this.filesystem.readdirSync(directory)) {
+                if (name === `${path.basename(this.filePath)}.tmp` || unique.test(name)) {
+                    try {
+                        this.filesystem.unlinkSync(path.join(directory, name));
+                    }
+                    catch {
+                        // A concurrent writer or permission failure is handled on its own path.
+                    }
+                }
+            }
+        }
+        catch {
+            // A missing store directory has no temporary credentials to recover.
+        }
+    }
+}
+//# sourceMappingURL=mcp-oauth-store.js.map

package/dist/services/mcp/mcp-oauth-store.js.map

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

package/dist/services/mcp/mcp-status.d.ts

@@ -0,0 +1,41 @@
+/**
+ * User-facing rendering of MCP server state.
+ *
+ * Kept apart from both the connection manager and the UI so `/mcp` and the
+ * startup notices phrase the same state identically — the states a user acts on
+ * (`needs-auth`, `failed`) are exactly the ones where inconsistent wording costs
+ * the most.
+ *
+ * Pure functions over snapshots: no IO, no React, directly testable.
+ */
+import type { McpServerSnapshot, McpServerState } from './mcp-tool-source.js';
+export declare const isActionableMcpState: (state: McpServerState) => boolean;
+/**
+ * One line per server for `/mcp`.
+ *
+ * The error is kept on its own continuation line: opt-in errors embed a JSON
+ * snippet and would otherwise hard-wrap into the middle of the next column.
+ */
+export declare const formatMcpServerLines: (server: McpServerSnapshot) => string[];
+export interface McpStatusView {
+    readonly snapshots: readonly McpServerSnapshot[];
+    /** Where the user edits server definitions; shown when there is nothing configured. */
+    readonly userConfigPath?: string;
+}
+/**
+ * The whole `/mcp` body.
+ *
+ * With no servers this is the only place the config file is ever named, so it
+ * doubles as the answer to "how do I add one?" — the plan deliberately ships no
+ * settings UI for MCP.
+ */
+export declare const formatMcpStatus: (view: McpStatusView) => string;
+/**
+ * The announcement for a server that has just settled somewhere the user must
+ * act, or `undefined` when the state needs no attention.
+ *
+ * `error` already carries the remedy (the `/mcp-login` instruction, or the exact
+ * config line for an opt-in), so it is surfaced verbatim rather than re-worded.
+ */
+export declare const formatMcpNotice: (server: McpServerSnapshot) => string | undefined;
+//# sourceMappingURL=mcp-status.d.ts.map

package/dist/services/mcp/mcp-status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-status.d.ts","sourceRoot":"","sources":["../../../source/services/mcp/mcp-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAa9E,eAAO,MAAM,oBAAoB,UAAW,cAAc,KAAG,OAAgC,CAAC;AAK9F;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,WAAY,iBAAiB,KAAG,MAAM,EAUtE,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,SAAS,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACjD,uFAAuF;IACvF,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;CAClC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,SAAU,aAAa,KAAG,MAiBrD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,WAAY,iBAAiB,KAAG,MAAM,GAAG,SAKpE,CAAC"}

package/dist/services/mcp/mcp-status.js

@@ -0,0 +1,69 @@
+/** How a state reads to a human, rather than the protocol-facing name. */
+const STATE_LABEL = {
+    connecting: 'connecting',
+    ready: 'ready',
+    'needs-auth': 'needs login',
+    failed: 'failed',
+};
+/** States a user can do something about; the ones worth interrupting them for. */
+const ACTIONABLE = new Set(['needs-auth', 'failed']);
+export const isActionableMcpState = (state) => ACTIONABLE.has(state);
+const toolCount = (server) => server.state === 'ready' ? `${server.tools.length} tool${server.tools.length === 1 ? '' : 's'}` : '';
+/**
+ * One line per server for `/mcp`.
+ *
+ * The error is kept on its own continuation line: opt-in errors embed a JSON
+ * snippet and would otherwise hard-wrap into the middle of the next column.
+ */
+export const formatMcpServerLines = (server) => {
+    const head = [
+        `  ${server.name}`,
+        `[${STATE_LABEL[server.state]}]`,
+        toolCount(server),
+        `(${server.provenance} ${server.transport})`,
+    ]
+        .filter(Boolean)
+        .join('  ');
+    return server.error ? [head, `      ${server.error}`] : [head];
+};
+/**
+ * The whole `/mcp` body.
+ *
+ * With no servers this is the only place the config file is ever named, so it
+ * doubles as the answer to "how do I add one?" — the plan deliberately ships no
+ * settings UI for MCP.
+ */
+export const formatMcpStatus = (view) => {
+    if (view.snapshots.length === 0) {
+        return [
+            'No MCP servers are configured.',
+            view.userConfigPath ? `Add them under "mcpServers" in ${view.userConfigPath}` : '',
+            'A project can also define them in .mcp.json at the workspace root.',
+        ]
+            .filter(Boolean)
+            .join('\n');
+    }
+    const lines = [`MCP servers (${view.snapshots.length}):`];
+    for (const server of view.snapshots)
+        lines.push(...formatMcpServerLines(server));
+    const needLogin = view.snapshots.filter((s) => s.state === 'needs-auth').map((s) => s.name);
+    if (needLogin.length) {
+        lines.push('', `Run /mcp-login <server> to authenticate: ${needLogin.join(', ')}`);
+    }
+    return lines.join('\n');
+};
+/**
+ * The announcement for a server that has just settled somewhere the user must
+ * act, or `undefined` when the state needs no attention.
+ *
+ * `error` already carries the remedy (the `/mcp-login` instruction, or the exact
+ * config line for an opt-in), so it is surfaced verbatim rather than re-worded.
+ */
+export const formatMcpNotice = (server) => {
+    if (!isActionableMcpState(server.state))
+        return undefined;
+    return server.error
+        ? `MCP server "${server.name}" ${STATE_LABEL[server.state]}: ${server.error}`
+        : `MCP server "${server.name}" ${STATE_LABEL[server.state]}.`;
+};
+//# sourceMappingURL=mcp-status.js.map

package/dist/services/mcp/mcp-status.js.map

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

package/dist/services/mcp/mcp-stdio-launcher.d.ts

@@ -0,0 +1,26 @@
+/**
+ * The seam where stdio MCP servers are launched.
+ *
+ * The default launcher spawns the configured command as-is. The seam is
+ * injectable so tests can observe launches and a future slice can rewrite the
+ * spawn without touching the connection manager.
+ */
+export interface StdioLaunchSpec {
+    /** Server config key, for launcher diagnostics. */
+    readonly name: string;
+    readonly command: string;
+    readonly args: readonly string[];
+    readonly env: Readonly<Record<string, string>>;
+    readonly cwd?: string;
+}
+/** What actually gets spawned. A sandboxed launcher rewrites this. */
+export interface StdioSpawnSpec {
+    readonly command: string;
+    readonly args: readonly string[];
+    readonly env: Readonly<Record<string, string>>;
+    readonly cwd?: string;
+}
+export type StdioLauncher = (spec: StdioLaunchSpec) => Promise<StdioSpawnSpec>;
+/** Runs the configured command as-is. Used until sandboxed launch lands. */
+export declare const unsandboxedStdioLauncher: StdioLauncher;
+//# sourceMappingURL=mcp-stdio-launcher.d.ts.map

package/dist/services/mcp/mcp-stdio-launcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-stdio-launcher.d.ts","sourceRoot":"","sources":["../../../source/services/mcp/mcp-stdio-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,mDAAmD;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,sEAAsE;AACtE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;AAE/E,4EAA4E;AAC5E,eAAO,MAAM,wBAAwB,EAAE,aAKrC,CAAC"}

package/dist/services/mcp/mcp-stdio-launcher.js

@@ -0,0 +1,8 @@
+/** Runs the configured command as-is. Used until sandboxed launch lands. */
+export const unsandboxedStdioLauncher = async (spec) => ({
+    command: spec.command,
+    args: spec.args,
+    env: spec.env,
+    ...(spec.cwd !== undefined ? { cwd: spec.cwd } : {}),
+});
+//# sourceMappingURL=mcp-stdio-launcher.js.map

package/dist/services/mcp/mcp-stdio-launcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-stdio-launcher.js","sourceRoot":"","sources":["../../../source/services/mcp/mcp-stdio-launcher.ts"],"names":[],"mappings":"AA0BA,4EAA4E;AAC5E,MAAM,CAAC,MAAM,wBAAwB,GAAkB,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACtE,OAAO,EAAE,IAAI,CAAC,OAAO;IACrB,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,GAAG,EAAE,IAAI,CAAC,GAAG;IACb,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CACrD,CAAC,CAAC"}

package/dist/services/mcp/mcp-tool-source.d.ts

@@ -0,0 +1,77 @@
+/**
+ * Contract between the MCP connection layer (`source/services/mcp/`) and its
+ * only consumer, the `run_code` script surface. MCP tools are never direct
+ * model tools; see docs/plans/mcp-code-mode.md, Decision 1.
+ *
+ * This file is types only. Implementations must not widen it without updating
+ * both sides and the plan.
+ */
+import type { JsonSchemaObject } from '../../tools/types.js';
+/** Where a server's configuration came from. Drives sandboxing (plan Decision 4). */
+export type McpServerProvenance = 'user' | 'project';
+export type McpTransportKind = 'stdio' | 'streamable-http' | 'sse';
+/**
+ * `needs-auth` is a distinct resting state, not a failure: the server answered
+ * correctly and asked for an OAuth login that only the user can start
+ * (plan decision D1). `error` carries the `/mcp-login` instruction.
+ */
+export type McpServerState = 'connecting' | 'ready' | 'failed' | 'needs-auth';
+export interface McpToolAnnotations {
+    readonly title?: string;
+    readonly readOnlyHint?: boolean;
+    readonly destructiveHint?: boolean;
+    readonly idempotentHint?: boolean;
+    readonly openWorldHint?: boolean;
+}
+/** One tool exactly as the server listed it (all `tools/list` pages merged). */
+export interface McpToolDescriptor {
+    readonly name: string;
+    readonly title?: string;
+    readonly description?: string;
+    readonly inputSchema: JsonSchemaObject;
+    readonly outputSchema?: JsonSchemaObject;
+    /** Server-supplied hints. Untrusted: never used to bypass approval. */
+    readonly annotations?: McpToolAnnotations;
+}
+export interface McpServerSnapshot {
+    /** Config key, unique across merged user + project config. */
+    readonly name: string;
+    readonly provenance: McpServerProvenance;
+    readonly transport: McpTransportKind;
+    readonly state: McpServerState;
+    /**
+     * Human-readable reason when `state` is `failed` or `needs-auth`, including
+     * sandbox override hints and the `/mcp-login` instruction.
+     */
+    readonly error?: string;
+    /** Empty unless `state === 'ready'`. */
+    readonly tools: readonly McpToolDescriptor[];
+}
+export interface McpCallResult {
+    /** MCP `CallToolResult.content` blocks, unmodified. */
+    readonly content: readonly unknown[];
+    readonly structuredContent?: unknown;
+    /** Application-level tool failure reported by the server. */
+    readonly isError: boolean;
+}
+export type McpCallErrorCode = 'unknown_server' | 'unknown_tool' | 'server_unavailable' | 'timeout' | 'aborted' | 'protocol';
+/** Rejection type for {@link McpToolSource.callTool}. Transport/protocol failures only. */
+export declare class McpCallError extends Error {
+    readonly code: McpCallErrorCode;
+    constructor(code: McpCallErrorCode, message: string);
+}
+export interface McpCallOptions {
+    readonly signal: AbortSignal;
+    readonly timeoutMs?: number;
+}
+export interface McpToolSource {
+    /**
+     * Current catalog. Returns the same array instance until the catalog changes,
+     * so callers can cheaply detect change by identity.
+     */
+    snapshot(): readonly McpServerSnapshot[];
+    callTool(server: string, tool: string, args: Record<string, unknown>, options: McpCallOptions): Promise<McpCallResult>;
+    /** Fires after `snapshot()` would return a new array. Returns an unsubscribe function. */
+    onCatalogChanged(listener: () => void): () => void;
+}
+//# sourceMappingURL=mcp-tool-source.d.ts.map

package/dist/services/mcp/mcp-tool-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-tool-source.d.ts","sourceRoot":"","sources":["../../../source/services/mcp/mcp-tool-source.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,qFAAqF;AACrF,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,SAAS,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,iBAAiB,GAAG,KAAK,CAAC;AAEnE;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,CAAC;AAE9E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,gFAAgF;AAChF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,YAAY,CAAC,EAAE,gBAAgB,CAAC;IACzC,uEAAuE;IACvE,QAAQ,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAChC,8DAA8D;IAC9D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,wCAAwC;IACxC,QAAQ,CAAC,KAAK,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC9C;AAED,MAAM,WAAW,aAAa;IAC5B,uDAAuD;IACvD,QAAQ,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,CAAC;IACrC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IACrC,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,MAAM,gBAAgB,GACxB,gBAAgB,GAChB,cAAc,GACd,oBAAoB,GACpB,SAAS,GACT,SAAS,GACT,UAAU,CAAC;AAEf,2FAA2F;AAC3F,qBAAa,YAAa,SAAQ,KAAK;IACzB,QAAQ,CAAC,IAAI,EAAE,gBAAgB;IAA3C,YAAqB,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAG3D;CACF;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,QAAQ,IAAI,SAAS,iBAAiB,EAAE,CAAC;IACzC,QAAQ,CACN,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1B,0FAA0F;IAC1F,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;CACpD"}

package/dist/services/mcp/mcp-tool-source.js

@@ -0,0 +1,10 @@
+/** Rejection type for {@link McpToolSource.callTool}. Transport/protocol failures only. */
+export class McpCallError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.code = code;
+        this.name = 'McpCallError';
+    }
+}
+//# sourceMappingURL=mcp-tool-source.js.map

package/dist/services/mcp/mcp-tool-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-tool-source.js","sourceRoot":"","sources":["../../../source/services/mcp/mcp-tool-source.ts"],"names":[],"mappings":"AAwEA,2FAA2F;AAC3F,MAAM,OAAO,YAAa,SAAQ,KAAK;IAChB,IAAI;IAAzB,YAAqB,IAAsB,EAAE,OAAe;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;oBADI,IAAI;QAEvB,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;IAC7B,CAAC;CACF"}

package/dist/services/mcp/test-fixtures/fake-authorization-server.d.ts

@@ -0,0 +1,25 @@
+/**
+ * An offline OAuth 2.1 authorization server for MCP flow tests: RFC 8414 metadata
+ * discovery, an `/authorize` endpoint that records the PKCE challenge, a `/token`
+ * endpoint that validates the S256 verifier and rotates refresh tokens, and an
+ * RFC 7591 `/register` endpoint for dynamic client registration.
+ *
+ * Deliberately strict: a flow that skips PKCE, reuses a code, or sends the wrong
+ * redirect URI fails here rather than in the client, so a green test means the
+ * client really did the protocol work.
+ */
+export type FakeAuthorizationServer = {
+    /** Issuer identifier; also the base URL clients discover and talk to. */
+    issuer: string;
+    /** Access tokens issued so far, in order. */
+    issuedAccessTokens: string[];
+    /** Refresh tokens presented on a refresh grant, in order. */
+    refreshGrants: string[];
+    /** Client ids handed out by `/register`, in order. */
+    registeredClientIds: string[];
+    /** Requests refused because the PKCE verifier or the code did not check out. */
+    refusedTokenRequests: number;
+    stop: () => Promise<void>;
+};
+export declare function startFakeAuthorizationServer(): Promise<FakeAuthorizationServer>;
+//# sourceMappingURL=fake-authorization-server.d.ts.map

package/dist/services/mcp/test-fixtures/fake-authorization-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fake-authorization-server.d.ts","sourceRoot":"","sources":["../../../../source/services/mcp/test-fixtures/fake-authorization-server.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,6DAA6D;IAC7D,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,sDAAsD;IACtD,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,gFAAgF;IAChF,oBAAoB,EAAE,MAAM,CAAC;IAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B,CAAC;AAoCF,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAyHrF"}