@qduc/term2 0.24.0 → 0.25.0

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

@@ -0,0 +1,232 @@
+/**
+ * Config loading for MCP servers (plan Decision 4 + the M1-connection brief).
+ *
+ * Sources: user `mcp.json` next to term2's settings directory and project
+ * `<workspace root>/.mcp.json`. A user entry wins over a clashing project
+ * entry; `${VAR}` expansion runs against the process environment for user
+ * config only, so a repository can never route a secret to a URL it chose.
+ * Invalid entries resolve to config errors — the connection manager turns
+ * those into `failed` snapshots — so one bad line never blocks startup.
+ */
+import { realpathSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import { isAbsolute, join, resolve } from 'node:path';
+import { getActiveWorkspaceRoot } from '../workspace/active-workspace-root.js';
+import { resolveSettingsDirectory } from '../settings/settings-path.js';
+const USER_CONFIG_FILE_NAME = 'mcp.json';
+const PROJECT_CONFIG_FILE_NAME = '.mcp.json';
+const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+const ENV_PATTERN = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
+const expandValue = (value, env) => value.replace(ENV_PATTERN, (_whole, name) => env[name] ?? '');
+/** Relative cwd paths run against the config file's context, never term2's process cwd. */
+const resolveCwd = (cwd, cwdBase) => (isAbsolute(cwd) ? cwd : resolve(cwdBase, cwd));
+const asStringRecord = (value) => {
+    if (!isRecord(value))
+        return undefined;
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+        if (typeof v !== 'string')
+            return undefined;
+        out[k] = v;
+    }
+    return out;
+};
+const EMPTY_SOURCE = { entries: new Map(), projectOverrides: new Map(), nonInteractiveAllow: [] };
+/** Canonical form for opt-in matching; falls back to the input when the path does not exist. */
+export const realpathOrSelf = (path) => {
+    try {
+        return realpathSync(path);
+    }
+    catch {
+        return path;
+    }
+};
+const parseSourceFile = (sourceName, contents, note) => {
+    let root;
+    try {
+        root = JSON.parse(contents);
+    }
+    catch (error) {
+        note(`${sourceName} is not valid JSON and was ignored: ${error.message}`);
+        return EMPTY_SOURCE;
+    }
+    if (!isRecord(root)) {
+        note(`${sourceName} is not a JSON object and was ignored.`);
+        return EMPTY_SOURCE;
+    }
+    const entries = new Map();
+    const rawServers = root.mcpServers;
+    if (rawServers !== undefined) {
+        if (!isRecord(rawServers)) {
+            note(`${sourceName}: "mcpServers" is not an object and was ignored.`);
+        }
+        else {
+            for (const [name, entry] of Object.entries(rawServers))
+                entries.set(name, entry);
+        }
+    }
+    const projectOverrides = new Map();
+    const nonInteractiveAllow = Array.isArray(root.nonInteractiveAllow)
+        ? root.nonInteractiveAllow.filter((value) => typeof value === 'string')
+        : [];
+    const rawOverrides = root.projectServers;
+    if (rawOverrides !== undefined) {
+        if (!isRecord(rawOverrides)) {
+            note(`${sourceName}: "projectServers" is not an object and was ignored.`);
+        }
+        else {
+            for (const [rootPath, servers] of Object.entries(rawOverrides)) {
+                // Keys are workspace roots: relative paths must never be resolved
+                // against term2's process cwd, so they are ignored with a note.
+                if (!isAbsolute(rootPath)) {
+                    note(`${sourceName}: "projectServers.${rootPath}" is not an absolute path and was ignored.`);
+                    continue;
+                }
+                if (!isRecord(servers)) {
+                    note(`${sourceName}: "projectServers.${rootPath}" is not an object and was ignored.`);
+                    continue;
+                }
+                const byName = new Map();
+                for (const [name, value] of Object.entries(servers)) {
+                    if (isRecord(value) && typeof value.enabled === 'boolean') {
+                        byName.set(name, { enabled: value.enabled });
+                    }
+                }
+                projectOverrides.set(rootPath, byName);
+            }
+        }
+    }
+    return { entries, projectOverrides, nonInteractiveAllow };
+};
+const resolveEntry = (name, provenance, entry, env, 
+/** User config expands `${VAR}`; project config is literal. */
+expandVariables, projectEnabledOverride, 
+/** Relative `cwd` resolves against this: the config file's workspace (project) or settings dir (user). */
+cwdBase) => {
+    const fail = (error) => ({
+        name,
+        provenance,
+        // Nothing is inferable when the entry itself is malformed; the manager
+        // never launches an errored entry, so this placeholder is inert.
+        transport: 'stdio',
+        projectEnabledOverride,
+        error,
+    });
+    if (!isRecord(entry))
+        return fail('entry is not an object');
+    const rawType = entry.type;
+    if (rawType !== undefined && rawType !== 'stdio' && rawType !== 'http' && rawType !== 'sse') {
+        return fail(`unknown type ${JSON.stringify(rawType)} (expected stdio, http, or sse)`);
+    }
+    const rawCommand = entry.command;
+    const rawUrl = entry.url;
+    if (rawCommand !== undefined && typeof rawCommand !== 'string')
+        return fail('command must be a string');
+    if (rawUrl !== undefined && typeof rawUrl !== 'string')
+        return fail('url must be a string');
+    let type = rawType;
+    if (type === undefined)
+        type = rawCommand !== undefined ? 'stdio' : rawUrl !== undefined ? 'http' : undefined;
+    if (type === undefined)
+        return fail('needs a command (stdio) or a url (http/sse)');
+    if (type === 'stdio' && rawCommand === undefined)
+        return fail('type "stdio" requires a command');
+    if (type !== 'stdio' && rawUrl === undefined)
+        return fail(`type "${type}" requires a url`);
+    const rawArgs = entry.args;
+    if (rawArgs !== undefined && (!Array.isArray(rawArgs) || rawArgs.some((a) => typeof a !== 'string'))) {
+        return fail('args must be an array of strings');
+    }
+    const rawEnv = asStringRecord(entry.env);
+    if (entry.env !== undefined && rawEnv === undefined)
+        return fail('env must be an object of strings');
+    const rawHeaders = asStringRecord(entry.headers);
+    if (entry.headers !== undefined && rawHeaders === undefined)
+        return fail('headers must be an object of strings');
+    const rawCwd = entry.cwd;
+    if (rawCwd !== undefined && typeof rawCwd !== 'string')
+        return fail('cwd must be a string');
+    const rawClientId = entry.clientId;
+    if (rawClientId !== undefined && typeof rawClientId !== 'string')
+        return fail('clientId must be a string');
+    const rawClientMetadataUrl = entry.clientMetadataUrl;
+    if (rawClientMetadataUrl !== undefined && typeof rawClientMetadataUrl !== 'string') {
+        return fail('clientMetadataUrl must be a string');
+    }
+    const rawRedirectPorts = entry.redirectPorts;
+    if (rawRedirectPorts !== undefined &&
+        (!Array.isArray(rawRedirectPorts) ||
+            rawRedirectPorts.some((p) => typeof p !== 'number' || !Number.isInteger(p) || p < 1 || p > 65535))) {
+        return fail('redirectPorts must be an array of port numbers');
+    }
+    const expandArg = (value) => (expandVariables ? expandValue(value, env) : value);
+    const transport = type === 'http' ? 'streamable-http' : type;
+    return {
+        name,
+        provenance,
+        transport,
+        ...(rawCommand !== undefined ? { command: expandArg(rawCommand) } : {}),
+        ...(rawArgs !== undefined ? { args: rawArgs.map(expandArg) } : {}),
+        ...(rawEnv !== undefined
+            ? { env: Object.fromEntries(Object.entries(rawEnv).map(([k, v]) => [k, expandArg(v)])) }
+            : {}),
+        ...(rawCwd !== undefined ? { cwd: resolveCwd(expandArg(rawCwd), cwdBase) } : {}),
+        ...(rawUrl !== undefined ? { url: expandArg(rawUrl) } : {}),
+        ...(rawHeaders !== undefined
+            ? { headers: Object.fromEntries(Object.entries(rawHeaders).map(([k, v]) => [k, expandArg(v)])) }
+            : {}),
+        ...(rawClientMetadataUrl !== undefined ? { clientMetadataUrl: expandArg(rawClientMetadataUrl) } : {}),
+        ...(rawClientId !== undefined ? { clientId: expandArg(rawClientId) } : {}),
+        ...(rawRedirectPorts !== undefined ? { redirectPorts: rawRedirectPorts } : {}),
+        projectEnabledOverride,
+    };
+};
+export async function loadMcpConfig(options = {}) {
+    const notes = [];
+    const note = (message) => {
+        notes.push(message);
+        options.onNote?.(message);
+    };
+    const read = options.files ?? ((path) => readFile(path, 'utf8'));
+    const env = options.env ?? process.env;
+    const settingsDir = options.settingsDir ?? resolveSettingsDirectory();
+    const workspaceRoot = options.workspaceRoot ?? getActiveWorkspaceRoot();
+    const userConfigPath = join(settingsDir, USER_CONFIG_FILE_NAME);
+    const projectConfigPath = join(workspaceRoot, PROJECT_CONFIG_FILE_NAME);
+    const loadSource = async (path, sourceName) => {
+        let contents;
+        try {
+            contents = await read(path);
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                return EMPTY_SOURCE;
+            note(`${sourceName} could not be read and was ignored: ${error.message}`);
+            return EMPTY_SOURCE;
+        }
+        return parseSourceFile(sourceName, contents, note);
+    };
+    const user = await loadSource(userConfigPath, userConfigPath);
+    const project = await loadSource(projectConfigPath, projectConfigPath);
+    // Opt-in matching compares the real path of the workspace with the real path
+    // of each projectServers key, so a symlinked session root still matches.
+    const workspaceKey = realpathOrSelf(workspaceRoot);
+    const servers = [];
+    for (const [name, entry] of user.entries) {
+        servers.push(resolveEntry(name, 'user', entry, env, true, undefined, settingsDir));
+    }
+    for (const [name, entry] of project.entries) {
+        if (user.entries.has(name)) {
+            note(`project server "${name}" from ${projectConfigPath} was dropped: a user entry with the same name wins.`);
+            continue;
+        }
+        let projectEnabledOverride;
+        for (const [rootPath, byName] of user.projectOverrides) {
+            if (realpathOrSelf(rootPath) === workspaceKey)
+                projectEnabledOverride = byName.get(name)?.enabled;
+        }
+        servers.push(resolveEntry(name, 'project', entry, env, false, projectEnabledOverride, workspaceRoot));
+    }
+    return { servers, notes, userConfigPath, nonInteractiveAllow: user.nonInteractiveAllow };
+}
+//# sourceMappingURL=mcp-config.js.map

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

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

package/dist/services/mcp/mcp-connection-manager.d.ts

@@ -0,0 +1,126 @@
+import { McpCallError } from './mcp-tool-source.js';
+import type { McpServerSnapshot, McpToolSource } from './mcp-tool-source.js';
+export { McpCallError };
+import { type ResolvedMcpServerConfig } from './mcp-config.js';
+import { type StdioLauncher } from './mcp-stdio-launcher.js';
+import type { McpOAuthStore } from './mcp-oauth-store.js';
+export interface McpConnectionManagerOptions {
+    servers: readonly ResolvedMcpServerConfig[];
+    /** Path of the user config file, cited in the project-stdio opt-in error. */
+    userConfigPath?: string;
+    /** This session's workspace root, cited in the project-stdio opt-in error. */
+    workspaceRoot?: string;
+    /** Where stdio servers are actually spawned. Defaults to an unsandboxed spawn. */
+    stdioLauncher?: StdioLauncher;
+    /** Receives one notice per server that enters the failed state. */
+    onNotice?: (message: string) => void;
+    /**
+     * Credential storage for OAuth-protected HTTP servers. Without it no stored
+     * token is ever presented and such a server resolves to `needs-auth`.
+     */
+    oauthStore?: McpOAuthStore;
+    /**
+     * False in non-interactive runs, where no one can complete a browser login.
+     * A server needing one then resolves to `failed` with that reason, rather
+     * than to `needs-auth` naming a command that cannot be typed.
+     */
+    interactive?: boolean;
+}
+/** Everything `/mcp-login` needs to drive a flow for one configured server. */
+export interface McpOAuthTarget {
+    readonly serverName: string;
+    readonly serverUrl: string;
+    readonly clientMetadataUrl?: string;
+    readonly clientId?: string;
+    readonly redirectPorts?: readonly number[];
+}
+export declare class McpConnectionManager implements McpToolSource {
+    private readonly connections;
+    private readonly listeners;
+    private readonly stdioLauncher;
+    private readonly userConfigPath?;
+    private readonly workspaceRoot?;
+    private readonly onNotice?;
+    private readonly oauthStore?;
+    private readonly interactive;
+    private readonly noticedFailures;
+    private snapshotCache;
+    private started;
+    private closed;
+    private settlePromise;
+    constructor(options: McpConnectionManagerOptions);
+    /** Begins connecting every server concurrently. Resolved configs never throw. */
+    start(): void;
+    /** Resolves once every connection started by `start()` left `connecting`. */
+    whenSettled(): Promise<void>;
+    snapshot(): readonly McpServerSnapshot[];
+    onCatalogChanged(listener: () => void): () => void;
+    callTool(server: string, tool: string, args: Record<string, unknown>, options: {
+        signal: AbortSignal;
+        timeoutMs?: number;
+    }): Promise<{
+        content: readonly unknown[];
+        structuredContent?: unknown;
+        isError: boolean;
+    }>;
+    close(): Promise<void>;
+    /** Reconciles edited config while preserving this stable tool-source object. */
+    replaceServers(configs: readonly ResolvedMcpServerConfig[]): Promise<void>;
+    /**
+     * Closes and clears this connection's client and transport, waiting for the
+     * closes to finish (bounded by the caller). Clearing first means a close()
+     * racing an in-flight connect can never double-close or re-await a torn-down
+     * client, and connectOne's post-await checks see the cleared state.
+     */
+    private teardown;
+    /** True once close() ran or this connection is being torn down. */
+    private isAbandoned;
+    private mapCallError;
+    private connectOne;
+    /**
+     * All three shapes mean the same thing: the server wants a credential this
+     * session does not have.
+     *
+     * The `SdkHttpError` case is not redundant — the transport only raises
+     * `UnauthorizedError` when an auth provider is attached, and one is attached
+     * only once a credential is stored. A server nobody has logged in to yet
+     * therefore reports its 401 as a plain HTTP error, which is precisely the
+     * case that must reach `needs-auth`.
+     */
+    private isAuthRequired;
+    /**
+     * Routes a server that asked for a login to the right resting state: an
+     * actionable `needs-auth` interactively, a `failed` that says why when no one
+     * can complete a browser flow (non-interactive) or when a project config is
+     * not allowed to start one (D2).
+     */
+    private markAuthRequired;
+    private connectStdio;
+    private connectHttp;
+    /**
+     * A provider that refreshes a stored credential but never starts a login, or
+     * `undefined` when there is nothing stored to refresh.
+     *
+     * D2: a project server that has not been opted in gets no provider at all, so
+     * a repository cannot cause even a discovery request to an issuer it chose.
+     */
+    private refreshOnlyAuthProvider;
+    /** Whether this server's config is allowed to hold or obtain OAuth credentials (D2). */
+    private oauthEligible;
+    /** The login details for a server, or undefined when it may not use OAuth. */
+    oauthTarget(name: string): McpOAuthTarget | undefined;
+    /**
+     * Re-runs one server's connection, used after `/mcp-login` stores a token.
+     *
+     * Clears the previous failure first so a re-entered failure is noticed (and
+     * announced) again rather than being swallowed as a duplicate.
+     */
+    reconnect(name: string): Promise<void>;
+    private connectClient;
+    private watchStdio;
+    private handleListChanged;
+    private refreshTools;
+    private markFailed;
+    private rebuildSnapshot;
+}
+//# sourceMappingURL=mcp-connection-manager.d.ts.map

package/dist/services/mcp/mcp-connection-manager.d.ts.map

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