agent-nuvira 3.4.0 → 3.5.0

package/dist/mcp/server.js.map

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

package/dist/mcp/settings.d.ts

@@ -0,0 +1,164 @@
+/**
+ * MCP settings — the `mcp.*` section of `buffconfig.json`, resolved.
+ *
+ * Assessment §8.6 found the config-only levers were: a file's presence, its own
+ * `enabled` flag, the `mcp` toolset toggle and `tools.loopExposure` — and that
+ * `enableMcp` existed only as a programmatic option with no config home. This
+ * module is that home, and it is deliberately SMALL: one section, all keys
+ * optional, every default reproducing today's behaviour so an existing install
+ * that never touches it is byte-identical.
+ *
+ * ```jsonc
+ * "mcp": {
+ *   "enabled": true,            // master switch
+ *   "autoConnect": true,        // connect at turn start (existence-gated)
+ *   "connectTimeoutMs": 2000,   // wall-clock budget; exceeding it proceeds without MCP
+ *   "maxToolsPerServer": 15,    // eager-schema cap per server
+ *   "maxToolsTotal": 60,        // eager-schema cap across all servers
+ *   "subagent": { "inherit": "conservative" },  // 'conservative' | 'full'
+ *   "servers": {
+ *     "context7": { "runtime": { "command": "/opt/node20/bin/node", "args": ["/usr/local/bin/npx"] } },
+ *     "filesystem": { "args": ["/Users/me/project"], "enabled": false }
+ *   }
+ * }
+ * ```
+ *
+ * WHY IT READS THE FILE DIRECTLY instead of going through `ConfigManager`:
+ * the MCP layer is used by tests, the parity harness and (from Phase 2) every
+ * chat surface, and it must not drag the config manager's vault/env bootstrap
+ * into a discovery call. The keys here are non-secret scalars, and the pure
+ * resolver (`resolveMcpSettings`) is exported so a caller that ALREADY holds the
+ * config object (the dashboard, the CLI) resolves the exact same values.
+ */
+import type { MCPServerConfig } from './types.js';
+/**
+ * How much MCP a SUBAGENT inherits from its parent.
+ *
+ * - `conservative` (DEFAULT) — plan §7.7: the child inherits MCP only when the
+ *   parent already had it AND the child's allowance covers it. A subagent never
+ *   silently gains reach.
+ * - `full` — explicit opt-in for Claude-style power: the child receives the
+ *   parent's whole discovered MCP set (still cap-bound, still governed by
+ *   effectClass/hooks/grants — the override widens REACH, never APPROVAL).
+ *
+ * Default is deliberately the safe one; turning it on is a decision a user makes
+ * once, in config, and can undo the same way.
+ */
+export type MCPSubagentInheritance = 'conservative' | 'full';
+/** Per-server overrides, merged over the server's own config file. */
+export interface MCPServerOverride {
+    /** Disable a configured server without deleting its file. */
+    enabled?: boolean;
+    /** Pin which catalog variant this server is (reported by `mcp list`). */
+    variant?: string;
+    /**
+     * Replace the stdio COMMAND — the path to a binary that is installed but NOT
+     * on PATH (e.g. `~/.local/bin/github-mcp-server`). Without this, a locally
+     * installed server is invisible to the probe and un-installable through the
+     * catalog, which is a reach gap rather than a missing capability.
+     */
+    command?: string;
+    /** Per-server runtime override (see `runtime.ts`). */
+    runtime?: {
+        command: string;
+        args?: string[];
+    };
+    /** Replace the stdio args (e.g. the allowed roots for `filesystem`). */
+    args?: string[];
+    /** Per-server eager-schema cap, overriding `maxToolsPerServer`. */
+    maxTools?: number;
+}
+export interface MCPConfigSection {
+    enabled?: boolean;
+    autoConnect?: boolean;
+    connectTimeoutMs?: number;
+    maxToolsPerServer?: number;
+    maxToolsTotal?: number;
+    subagent?: {
+        inherit?: MCPSubagentInheritance | string;
+    };
+    servers?: Record<string, MCPServerOverride>;
+}
+/**
+ * Merge a validated patch into the stored section.
+ *
+ * WHY THIS EXISTS rather than a plain spread: `runtime` is a nested object, so a
+ * patch that sets only `runtime.command` would otherwise DROP a previously
+ * configured `runtime.args` (and vice versa). It also has to preserve an
+ * explicit `undefined` as a CLEAR — a plain `{...old, ...new}` cannot tell
+ * "not mentioned" from "cleared".
+ */
+export declare function mergeMcpSetting(existing: MCPConfigSection | null | undefined, patch: MCPConfigSection): MCPConfigSection;
+export interface ResolvedMCPSettings {
+    enabled: boolean;
+    autoConnect: boolean;
+    connectTimeoutMs: number;
+    maxToolsPerServer: number;
+    maxToolsTotal: number;
+    subagentInheritance: MCPSubagentInheritance;
+    servers: Record<string, MCPServerOverride>;
+    /** Config values that were ignored/coerced, so a caller can report them once. */
+    warnings: string[];
+}
+export declare const MCP_SETTING_DEFAULTS: {
+    readonly enabled: true;
+    readonly autoConnect: true;
+    readonly connectTimeoutMs: 2000;
+    readonly maxToolsPerServer: 15;
+    readonly maxToolsTotal: 60;
+    readonly subagentInheritance: MCPSubagentInheritance;
+};
+/**
+ * Resolve the raw `mcp` section into settings with defaults + bounds applied.
+ * Pure: no I/O, so the dashboard, the CLI and tests all agree on the values.
+ */
+export declare function resolveMcpSettings(raw?: MCPConfigSection | null): ResolvedMCPSettings;
+/** Parse outcome for one `mcp.*` setting. */
+export type McpSettingParse = {
+    ok: true;
+    mcp: MCPConfigSection;
+} | {
+    ok: false;
+    error: string;
+};
+/** Human list of the keys the parser accepts (shared by every error message). */
+export declare const MCP_SETTING_KEYS: readonly ["mcp.enabled", "mcp.autoConnect", "mcp.connectTimeoutMs", "mcp.maxToolsPerServer", "mcp.maxToolsTotal", "mcp.subagent.inherit", "mcp.servers.<name>.enabled", "mcp.servers.<name>.command", "mcp.servers.<name>.variant", "mcp.servers.<name>.maxTools", "mcp.servers.<name>.args", "mcp.servers.<name>.runtime.command", "mcp.servers.<name>.runtime.args"];
+/**
+ * Validate ONE `mcp.*` setting from its dotted path and string value.
+ *
+ * SHARED BY DESIGN. `nuvira config set mcp.*` and the dashboard's MCP page both
+ * call this, so the same key cannot be accepted in one surface and rejected —
+ * or coerced differently — in the other, and both write the same
+ * `buffconfig.json` section. A setting that "saves" in the dashboard and is
+ * ignored by the CLI would be a silent lie on one of the two surfaces.
+ *
+ * Pure: no writes, no filesystem, no environment. Booleans accept
+ * true/false, 1/0, yes/no, on/off; numbers are integers; `args` split on commas;
+ * an empty value CLEARS a string/list.
+ */
+export declare function parseMcpSetting(key: string, value: string): McpSettingParse;
+/**
+ * Read `mcp` from the resolved config dir (`buffconfig.json`). Never throws: an
+ * absent or malformed file yields the defaults, because MCP configuration must
+ * not be able to break a chat turn.
+ */
+export declare function loadMcpSettings(configDir?: string): ResolvedMCPSettings;
+/**
+ * Merge the per-server overrides over the discovered configs.
+ *
+ * This is the "nothing requires code, just configuration" seam: `context7`
+ * needing an older Node is fixed with
+ * `mcp.servers.context7.runtime.command`, and disabling a server is a boolean in
+ * config — no edit to a server file, no CLI flag, no release.
+ */
+export declare function applyServerOverrides(configs: MCPServerConfig[], settings: Pick<ResolvedMCPSettings, 'servers' | 'enabled'>): MCPServerConfig[];
+/**
+ * The eager-schema cap that applies to one server, per plan §6:
+ * `min(perServerOverride ?? maxToolsPerServer, maxToolsTotal − alreadyExposed)`.
+ *
+ * Caps limit EXPOSURE, not access: an over-cap tool stays callable through
+ * `tool_search` results. Consumed by the Phase 3 exposure work; defined here so
+ * the number has one home.
+ */
+export declare function effectiveToolCap(server: string, settings: Pick<ResolvedMCPSettings, 'servers' | 'maxToolsPerServer' | 'maxToolsTotal'>, alreadyExposed: number): number;
+//# sourceMappingURL=settings.d.ts.map

package/dist/mcp/settings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/mcp/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAOH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,sBAAsB,GAAG,cAAc,GAAG,MAAM,CAAC;AAE7D,sEAAsE;AACtE,MAAM,WAAW,iBAAiB;IAChC,6DAA6D;IAC7D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC/C,wEAAwE;IACxE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAA;KAAE,CAAC;IACzD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CAC7C;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,EAC7C,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,CA4ClB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,sBAAsB,CAAC;IAC5C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC3C,iFAAiF;IACjF,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,oBAAoB;;;;;;kCAMQ,sBAAsB;CACrD,CAAC;AAmCX;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,CAAC,EAAE,gBAAgB,GAAG,IAAI,GAAG,mBAAmB,CA+CrF;AAED,6CAA6C;AAC7C,MAAM,MAAM,eAAe,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,gBAAgB,CAAA;CAAE,GACnC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjC,iFAAiF;AACjF,eAAO,MAAM,gBAAgB,wWAcnB,CAAC;AAEX;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,eAAe,CAoG3E;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAWvE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,EAAE,EAC1B,QAAQ,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,SAAS,CAAC,GACzD,eAAe,EAAE,CAoBnB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,mBAAmB,GAAG,eAAe,CAAC,EACtF,cAAc,EAAE,MAAM,GACrB,MAAM,CAIR"}

package/dist/mcp/settings.js

@@ -0,0 +1,358 @@
+/**
+ * MCP settings — the `mcp.*` section of `buffconfig.json`, resolved.
+ *
+ * Assessment §8.6 found the config-only levers were: a file's presence, its own
+ * `enabled` flag, the `mcp` toolset toggle and `tools.loopExposure` — and that
+ * `enableMcp` existed only as a programmatic option with no config home. This
+ * module is that home, and it is deliberately SMALL: one section, all keys
+ * optional, every default reproducing today's behaviour so an existing install
+ * that never touches it is byte-identical.
+ *
+ * ```jsonc
+ * "mcp": {
+ *   "enabled": true,            // master switch
+ *   "autoConnect": true,        // connect at turn start (existence-gated)
+ *   "connectTimeoutMs": 2000,   // wall-clock budget; exceeding it proceeds without MCP
+ *   "maxToolsPerServer": 15,    // eager-schema cap per server
+ *   "maxToolsTotal": 60,        // eager-schema cap across all servers
+ *   "subagent": { "inherit": "conservative" },  // 'conservative' | 'full'
+ *   "servers": {
+ *     "context7": { "runtime": { "command": "/opt/node20/bin/node", "args": ["/usr/local/bin/npx"] } },
+ *     "filesystem": { "args": ["/Users/me/project"], "enabled": false }
+ *   }
+ * }
+ * ```
+ *
+ * WHY IT READS THE FILE DIRECTLY instead of going through `ConfigManager`:
+ * the MCP layer is used by tests, the parity harness and (from Phase 2) every
+ * chat surface, and it must not drag the config manager's vault/env bootstrap
+ * into a discovery call. The keys here are non-secret scalars, and the pure
+ * resolver (`resolveMcpSettings`) is exported so a caller that ALREADY holds the
+ * config object (the dashboard, the CLI) resolves the exact same values.
+ */
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { resolveNuviraConfigDir } from '../config/paths.js';
+import { logger } from '../utils/logger.js';
+/**
+ * Merge a validated patch into the stored section.
+ *
+ * WHY THIS EXISTS rather than a plain spread: `runtime` is a nested object, so a
+ * patch that sets only `runtime.command` would otherwise DROP a previously
+ * configured `runtime.args` (and vice versa). It also has to preserve an
+ * explicit `undefined` as a CLEAR — a plain `{...old, ...new}` cannot tell
+ * "not mentioned" from "cleared".
+ */
+export function mergeMcpSetting(existing, patch) {
+    const base = existing ?? {};
+    const servers = { ...(base.servers ?? {}) };
+    for (const [name, override] of Object.entries(patch.servers ?? {})) {
+        const previous = base.servers?.[name] ?? {};
+        const next = override;
+        const { runtime: patchedRuntime, ...rest } = next;
+        let runtime;
+        if (!('runtime' in next)) {
+            runtime = previous.runtime; // not mentioned — leave it alone
+        }
+        else if (!patchedRuntime) {
+            runtime = undefined; // explicit clear (`runtime.command` set to empty)
+        }
+        else if (!patchedRuntime.command && previous.runtime?.command) {
+            // `runtime.args` on its own must not erase the command it applies to: the
+            // parser emits an empty command because it cannot see the stored one.
+            runtime = {
+                command: previous.runtime.command,
+                ...(patchedRuntime.args !== undefined ? { args: patchedRuntime.args } : {}),
+            };
+        }
+        else {
+            // Setting the command must not drop args that were configured earlier
+            // (and vice versa) — `runtime` is one object, set in two commands.
+            runtime = {
+                ...patchedRuntime,
+                ...(patchedRuntime.args === undefined && previous.runtime?.args
+                    ? { args: previous.runtime.args }
+                    : {}),
+            };
+        }
+        const merged = { ...previous, ...rest };
+        if (runtime)
+            merged.runtime = runtime;
+        else
+            delete merged.runtime;
+        servers[name] = merged;
+    }
+    return {
+        ...base,
+        ...patch,
+        ...(base.subagent || patch.subagent
+            ? { subagent: { ...(base.subagent ?? {}), ...(patch.subagent ?? {}) } }
+            : {}),
+        ...(Object.keys(servers).length > 0 ? { servers } : {}),
+    };
+}
+export const MCP_SETTING_DEFAULTS = {
+    enabled: true,
+    autoConnect: true,
+    connectTimeoutMs: 2000,
+    maxToolsPerServer: 15,
+    maxToolsTotal: 60,
+    subagentInheritance: 'conservative',
+};
+/** Clamp bounds — a typo must not disable the budget or hang a turn for a minute. */
+const CONNECT_TIMEOUT_MIN_MS = 250;
+const CONNECT_TIMEOUT_MAX_MS = 15_000;
+const MAX_TOOLS_PER_SERVER_CEILING = 200;
+const MAX_TOOLS_TOTAL_CEILING = 1000;
+function positiveInt(value, fallback, min, max, key, warnings) {
+    if (value === undefined || value === null)
+        return fallback;
+    const n = typeof value === 'string' ? Number(value.trim()) : Number(value);
+    if (!Number.isFinite(n) || !Number.isInteger(n) || n <= 0) {
+        warnings.push(`mcp.${key} must be a positive integer — using ${fallback}`);
+        return fallback;
+    }
+    if (n < min || n > max) {
+        const clamped = Math.min(Math.max(n, min), max);
+        warnings.push(`mcp.${key} ${n} is outside ${min}–${max} — using ${clamped}`);
+        return clamped;
+    }
+    return n;
+}
+function booleanSetting(value, fallback, key, warnings) {
+    if (value === undefined || value === null)
+        return fallback;
+    if (typeof value === 'boolean')
+        return value;
+    if (typeof value === 'string') {
+        const lower = value.trim().toLowerCase();
+        if (['true', '1', 'yes', 'on'].includes(lower))
+            return true;
+        if (['false', '0', 'no', 'off'].includes(lower))
+            return false;
+    }
+    warnings.push(`mcp.${key} must be true or false — using ${fallback}`);
+    return fallback;
+}
+/**
+ * Resolve the raw `mcp` section into settings with defaults + bounds applied.
+ * Pure: no I/O, so the dashboard, the CLI and tests all agree on the values.
+ */
+export function resolveMcpSettings(raw) {
+    const warnings = [];
+    const section = raw ?? {};
+    const inheritRaw = section.subagent?.inherit;
+    let subagentInheritance = MCP_SETTING_DEFAULTS.subagentInheritance;
+    if (inheritRaw !== undefined) {
+        if (inheritRaw === 'conservative' || inheritRaw === 'full') {
+            subagentInheritance = inheritRaw;
+        }
+        else {
+            warnings.push(`mcp.subagent.inherit must be 'conservative' or 'full' (got '${String(inheritRaw)}') — using 'conservative'`);
+        }
+    }
+    return {
+        enabled: booleanSetting(section.enabled, MCP_SETTING_DEFAULTS.enabled, 'enabled', warnings),
+        autoConnect: booleanSetting(section.autoConnect, MCP_SETTING_DEFAULTS.autoConnect, 'autoConnect', warnings),
+        connectTimeoutMs: positiveInt(section.connectTimeoutMs, MCP_SETTING_DEFAULTS.connectTimeoutMs, CONNECT_TIMEOUT_MIN_MS, CONNECT_TIMEOUT_MAX_MS, 'connectTimeoutMs', warnings),
+        maxToolsPerServer: positiveInt(section.maxToolsPerServer, MCP_SETTING_DEFAULTS.maxToolsPerServer, 1, MAX_TOOLS_PER_SERVER_CEILING, 'maxToolsPerServer', warnings),
+        maxToolsTotal: positiveInt(section.maxToolsTotal, MCP_SETTING_DEFAULTS.maxToolsTotal, 1, MAX_TOOLS_TOTAL_CEILING, 'maxToolsTotal', warnings),
+        subagentInheritance,
+        servers: { ...(section.servers ?? {}) },
+        warnings,
+    };
+}
+/** Human list of the keys the parser accepts (shared by every error message). */
+export const MCP_SETTING_KEYS = [
+    'mcp.enabled',
+    'mcp.autoConnect',
+    'mcp.connectTimeoutMs',
+    'mcp.maxToolsPerServer',
+    'mcp.maxToolsTotal',
+    'mcp.subagent.inherit',
+    'mcp.servers.<name>.enabled',
+    'mcp.servers.<name>.command',
+    'mcp.servers.<name>.variant',
+    'mcp.servers.<name>.maxTools',
+    'mcp.servers.<name>.args',
+    'mcp.servers.<name>.runtime.command',
+    'mcp.servers.<name>.runtime.args',
+];
+/**
+ * Validate ONE `mcp.*` setting from its dotted path and string value.
+ *
+ * SHARED BY DESIGN. `nuvira config set mcp.*` and the dashboard's MCP page both
+ * call this, so the same key cannot be accepted in one surface and rejected —
+ * or coerced differently — in the other, and both write the same
+ * `buffconfig.json` section. A setting that "saves" in the dashboard and is
+ * ignored by the CLI would be a silent lie on one of the two surfaces.
+ *
+ * Pure: no writes, no filesystem, no environment. Booleans accept
+ * true/false, 1/0, yes/no, on/off; numbers are integers; `args` split on commas;
+ * an empty value CLEARS a string/list.
+ */
+export function parseMcpSetting(key, value) {
+    const parts = String(key).trim().split('.');
+    const raw = String(value ?? '');
+    const trimmed = raw.trim();
+    const bool = () => {
+        const lower = trimmed.toLowerCase();
+        if (['true', '1', 'yes', 'on'].includes(lower))
+            return true;
+        if (['false', '0', 'no', 'off'].includes(lower))
+            return false;
+        return null;
+    };
+    const int = (min, max, label) => {
+        const n = Number(trimmed);
+        if (!Number.isInteger(n) || n < min || n > max) {
+            return { error: `${key} must be an integer between ${min} and ${max} (got '${raw}')` };
+        }
+        return n;
+    };
+    const list = () => {
+        const items = raw.split(',').map((v) => v.trim()).filter(Boolean);
+        return items.length > 0 ? items : undefined;
+    };
+    if (parts[0] !== 'mcp') {
+        return { ok: false, error: `Not an MCP setting: ${key}. Expected one of: ${MCP_SETTING_KEYS.join(', ')}` };
+    }
+    if (parts.length === 2) {
+        const field = parts[1];
+        if (field === 'enabled' || field === 'autoConnect') {
+            const typed = bool();
+            if (typed === null)
+                return { ok: false, error: `${key} must be true or false (got '${raw}')` };
+            return { ok: true, mcp: { [field]: typed } };
+        }
+        if (field === 'connectTimeoutMs' || field === 'maxToolsPerServer' || field === 'maxToolsTotal') {
+            const parsed = int(1, field === 'connectTimeoutMs' ? 60_000 : 10_000, field);
+            if (typeof parsed !== 'number')
+                return { ok: false, error: parsed.error };
+            return { ok: true, mcp: { [field]: parsed } };
+        }
+        return {
+            ok: false,
+            error: `Unknown MCP setting '${field}'. Expected one of: ${MCP_SETTING_KEYS.slice(0, 6).join(', ')}`,
+        };
+    }
+    if (parts.length === 3 && parts[1] === 'subagent' && parts[2] === 'inherit') {
+        const mode = trimmed.toLowerCase();
+        if (mode !== 'conservative' && mode !== 'full') {
+            return {
+                ok: false,
+                error: `mcp.subagent.inherit must be 'conservative' (default) or 'full' (got '${raw}')`,
+            };
+        }
+        return { ok: true, mcp: { subagent: { inherit: mode } } };
+    }
+    if (parts.length >= 4 && parts[1] === 'servers') {
+        const server = parts[2];
+        if (!server)
+            return { ok: false, error: `mcp.servers needs a server name, e.g. ${MCP_SETTING_KEYS[6]}` };
+        const field = parts[3];
+        const rest = parts.slice(4).join('.');
+        if (parts.length === 4 && field === 'enabled') {
+            const typed = bool();
+            if (typed === null)
+                return { ok: false, error: `${key} must be true or false (got '${raw}')` };
+            return { ok: true, mcp: { servers: { [server]: { enabled: typed } } } };
+        }
+        if (parts.length === 4 && field === 'variant') {
+            return { ok: true, mcp: { servers: { [server]: { variant: trimmed || undefined } } } };
+        }
+        if (parts.length === 4 && field === 'command') {
+            // The path to a binary that is installed but not on PATH.
+            return { ok: true, mcp: { servers: { [server]: { command: trimmed || undefined } } } };
+        }
+        if (parts.length === 4 && field === 'maxTools') {
+            const parsed = int(1, 10_000, field);
+            if (typeof parsed !== 'number')
+                return { ok: false, error: parsed.error };
+            return { ok: true, mcp: { servers: { [server]: { maxTools: parsed } } } };
+        }
+        if (parts.length === 4 && field === 'args') {
+            return { ok: true, mcp: { servers: { [server]: { args: list() } } } };
+        }
+        if (parts.length === 5 && field === 'runtime' && rest === 'command') {
+            // An empty command CLEARS the whole runtime override (a half-configured
+            // override that prefixes nothing is worse than none).
+            return {
+                ok: true,
+                mcp: { servers: { [server]: { runtime: trimmed ? { command: trimmed } : undefined } } },
+            };
+        }
+        if (parts.length === 5 && field === 'runtime' && rest === 'args') {
+            return { ok: true, mcp: { servers: { [server]: { runtime: { command: '', args: list() } } } } };
+        }
+        return {
+            ok: false,
+            error: `Unknown mcp.servers setting '${parts.slice(3).join('.')}'. Expected: enabled, command, variant, maxTools, args, runtime.command, runtime.args`,
+        };
+    }
+    return { ok: false, error: `Unknown MCP setting '${key}'. Expected one of: ${MCP_SETTING_KEYS.join(', ')}` };
+}
+/**
+ * Read `mcp` from the resolved config dir (`buffconfig.json`). Never throws: an
+ * absent or malformed file yields the defaults, because MCP configuration must
+ * not be able to break a chat turn.
+ */
+export function loadMcpSettings(configDir) {
+    const dir = configDir ?? resolveNuviraConfigDir();
+    const file = join(dir, 'buffconfig.json');
+    try {
+        if (!existsSync(file))
+            return resolveMcpSettings(null);
+        const parsed = JSON.parse(readFileSync(file, 'utf-8'));
+        return resolveMcpSettings(parsed.mcp ?? null);
+    }
+    catch (err) {
+        logger.debug(`MCP: could not read settings from ${file}: ${err}`);
+        return resolveMcpSettings(null);
+    }
+}
+/**
+ * Merge the per-server overrides over the discovered configs.
+ *
+ * This is the "nothing requires code, just configuration" seam: `context7`
+ * needing an older Node is fixed with
+ * `mcp.servers.context7.runtime.command`, and disabling a server is a boolean in
+ * config — no edit to a server file, no CLI flag, no release.
+ */
+export function applyServerOverrides(configs, settings) {
+    if (!settings.enabled)
+        return [];
+    const out = [];
+    for (const config of configs) {
+        const override = settings.servers[config.name];
+        if (!override) {
+            out.push(config);
+            continue;
+        }
+        if (override.enabled === false)
+            continue;
+        out.push({
+            ...config,
+            ...(override.enabled !== undefined ? { enabled: override.enabled } : {}),
+            ...(override.variant !== undefined ? { variant: override.variant } : {}),
+            ...(override.command !== undefined ? { command: override.command } : {}),
+            ...(override.runtime !== undefined ? { runtime: override.runtime } : {}),
+            ...(override.args !== undefined ? { args: override.args } : {}),
+        });
+    }
+    return out;
+}
+/**
+ * The eager-schema cap that applies to one server, per plan §6:
+ * `min(perServerOverride ?? maxToolsPerServer, maxToolsTotal − alreadyExposed)`.
+ *
+ * Caps limit EXPOSURE, not access: an over-cap tool stays callable through
+ * `tool_search` results. Consumed by the Phase 3 exposure work; defined here so
+ * the number has one home.
+ */
+export function effectiveToolCap(server, settings, alreadyExposed) {
+    const perServer = settings.servers[server]?.maxTools ?? settings.maxToolsPerServer;
+    const remainingTotal = Math.max(settings.maxToolsTotal - alreadyExposed, 0);
+    return Math.max(Math.min(perServer, remainingTotal), 0);
+}
+//# sourceMappingURL=settings.js.map

package/dist/mcp/settings.js.map

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

package/dist/mcp/types.d.ts

@@ -167,6 +167,41 @@ export interface GetPromptRequest {
     name: string;
     arguments?: Record<string, string>;
 }
+/**
+ * OAuth 2.0 for a remote MCP server whose credential is a TOKEN, not a static
+ * key — the flow Google Workspace, Slack and Figma's official remote servers
+ * require (none of them accept a long-lived API key).
+ *
+ * WHY IT LIVES IN THE SERVER CONFIG. The credential those servers want is a
+ * short-lived access token that must be refreshed, so "install the server" and
+ * "authorize the server" are two different moments: the config declares HOW to
+ * get a token, and the first connect obtains or refreshes one. Tokens themselves
+ * are NEVER written here — they live in the OAuth manager's own store
+ * (`~/.nuvira/mcp-oauth.json`), which is where refresh and expiry belong.
+ */
+export interface MCPOAuthServerConfig {
+    /** Token endpoint (required — the code exchange and every refresh go here). */
+    tokenEndpoint: string;
+    /** Authorization endpoint. Required for the interactive (authorization-code) flow. */
+    authorizationEndpoint?: string;
+    /**
+     * Client credentials. May reference an env var (`${VAR}`), which the catalog
+     * installer expands from the resolved environment at install time — so a
+     * secret can come from the environment and still land in a 0600 config file.
+     */
+    clientId?: string;
+    clientSecret?: string;
+    /** Scopes to request. Also written into the store so a refresh asks for the same set. */
+    scopes?: string[];
+    /** Use PKCE (S256) — required by Google's installed-app clients. */
+    usePKCE?: boolean;
+    /**
+     * `client_credentials` for a server-to-server token (no user, no browser);
+     * default is `authorization_code`, where a user token is obtained once
+     * (`nuvira mcp authorize <name>`) and then refreshed forever.
+     */
+    grant?: 'authorization_code' | 'client_credentials';
+}
 export interface MCPServerConfig {
     /** A unique name for this MCP server connection */
     name: string;
@@ -182,6 +217,33 @@ export interface MCPServerConfig {
     headers?: Record<string, string>;
     /** Environment variables for the stdio subprocess */
     env?: Record<string, string>;
+    /**
+     * Per-server runtime override: run the stdio `command` through a DIFFERENT
+     * interpreter — `runtime.command runtime.args… <command> <args…>`.
+     *
+     * It exists so one server with a higher Node (or Python) floor cannot raise
+     * the product's own floor: `context7-mcp@4.3.0` declares
+     * `engines.node ≥ 20.18.1`, while Nuvira ships `≥ 18.18.0`, so that server is
+     * started under its own Node instead. Set at install time (`nuvira mcp
+     * install context7 --runtime /path/to/node20`) or by configuration
+     * (`mcp.servers.<name>.runtime.command`), never by forking the codebase.
+     */
+    runtime?: {
+        command: string;
+        args?: string[];
+    };
+    /**
+     * Which catalog variant produced this config (e.g. 'remote', 'npx'), when it
+     * came from `nuvira mcp install`. Reported by `nuvira mcp list` / `info`;
+     * never required to connect.
+     */
+    variant?: string;
+    /**
+     * OAuth 2.0 for a remote server. When present, the connect path resolves a
+     * valid access token (reusing or refreshing a stored one) and sends it as
+     * `Authorization: Bearer …`; an explicit `headers.Authorization` wins.
+     */
+    oauth?: MCPOAuthServerConfig;
     /** Whether this server is enabled */
     enabled: boolean;
 }