@x-code-cli/core 0.2.10 → 0.3.1

package/dist/mcp/arg-parser.js

@@ -0,0 +1,357 @@
+/** Names allowed in `mcpServers.<name>`. Tightened relative to the runtime
+ *  name-mangling sanitizer because *config entry point* is a better place
+ *  to refuse weird names — surprising sanitisation post-add ("I typed
+ *  `my server!` and got `my_server___xxx`") is worse than a clear
+ *  rejection. Length 32 leaves headroom for the `{server}__{tool}`
+ *  format to stay well under the model-side 64-char tool name limit. */
+const NAME_RE = /^[a-zA-Z0-9_-]{1,32}$/;
+// ── Top-level entry points ─────────────────────────────────────────────────
+/** Parse args for `/mcp add [...flags] <name> <command-or-url> [args...]`. */
+export function parseAdd(rawArg) {
+    const tokRes = tokenize(rawArg);
+    if (!tokRes.ok)
+        return tokRes;
+    const tokens = tokRes.tokens;
+    // First pass: pull flags off the front. Stop at the first non-flag token
+    // (which becomes the server name); the `--` separator hard-stops flag
+    // parsing and is then dropped — everything after is positional.
+    let isHttp = false;
+    let scope = 'user';
+    let timeout;
+    const envEntries = [];
+    const headerEntries = [];
+    let i = 0;
+    let sawDoubleDash = false;
+    while (i < tokens.length) {
+        const t = tokens[i];
+        if (!t.startsWith('-'))
+            break; // first positional
+        if (t === '--') {
+            sawDoubleDash = true;
+            i++;
+            break;
+        }
+        if (t === '--http' || t === '--transport') {
+            // --http is our shorthand; --transport <name> is Claude/Gemini syntax
+            // (we accept only http here; sse is intentionally not supported per
+            // the design doc — MCP spec deprecated SSE in 2025-03).
+            if (t === '--transport') {
+                const next = tokens[i + 1];
+                if (next !== 'http') {
+                    return err(`--transport only supports "http" (got ${next ?? '(missing)'}); use --http directly or omit for stdio`);
+                }
+                i += 2;
+            }
+            else {
+                i++;
+            }
+            isHttp = true;
+            continue;
+        }
+        if (t === '--scope') {
+            const v = tokens[i + 1];
+            if (v !== 'user' && v !== 'project') {
+                return err(`--scope requires "user" or "project" (got ${v ?? '(missing)'})`);
+            }
+            scope = v;
+            i += 2;
+            continue;
+        }
+        if (t === '--env') {
+            const v = tokens[i + 1];
+            if (typeof v !== 'string')
+                return err('--env requires a KEY=VALUE argument');
+            const eq = v.indexOf('=');
+            if (eq <= 0)
+                return err(`--env expects KEY=VALUE (got ${v})`);
+            envEntries.push([v.slice(0, eq), v.slice(eq + 1)]);
+            i += 2;
+            continue;
+        }
+        if (t === '--header') {
+            const v = tokens[i + 1];
+            if (typeof v !== 'string')
+                return err('--header requires a "Key: value" argument');
+            // Header format: "Key: Value" (RFC 7230 style). Be permissive with
+            // whitespace around the colon to match user habit.
+            const colon = v.indexOf(':');
+            if (colon <= 0)
+                return err(`--header expects "Key: Value" (got ${v})`);
+            headerEntries.push([v.slice(0, colon).trim(), v.slice(colon + 1).trim()]);
+            i += 2;
+            continue;
+        }
+        if (t === '--timeout') {
+            const v = tokens[i + 1];
+            if (typeof v !== 'string')
+                return err('--timeout requires a number (ms)');
+            const n = Number(v);
+            if (!Number.isInteger(n) || n <= 0)
+                return err(`--timeout requires a positive integer (got ${v})`);
+            timeout = n;
+            i += 2;
+            continue;
+        }
+        return err(`Unknown flag: ${t}`);
+    }
+    // Positional args. After the (optional) `--`, everything left is name +
+    // command/url + the rest. Stdio: tokens[i] = name, tokens[i+1] = command,
+    // tokens[i+2..] = args. HTTP: tokens[i] = name, tokens[i+1] = url, nothing
+    // after.
+    //
+    // Users coming from Claude Code muscle-memory write `add <name> -- <cmd>`
+    // with the separator AFTER the name. Our flag loop already stops at the
+    // first non-flag (the name), so any `--` lands at positional[1]. Drop it
+    // — it's cosmetic, the actual command follows.
+    let positional = tokens.slice(i);
+    if (positional[1] === '--') {
+        positional = [positional[0], ...positional.slice(2)];
+    }
+    if (positional.length < 2) {
+        return err(isHttp
+            ? 'Usage: /mcp add --http [--scope user|project] [--header "K: V"]... [--timeout N] <name> <url>'
+            : 'Usage: /mcp add [--scope user|project] [--env K=V]... [--timeout N] <name> <command> [args...]');
+    }
+    const name = positional[0];
+    if (!NAME_RE.test(name)) {
+        return err(`Invalid server name "${name}". Must match ${NAME_RE.source}.`);
+    }
+    if (isHttp) {
+        if (positional.length > 2) {
+            return err('HTTP servers take only <name> <url> — no extra positional args');
+        }
+        if (envEntries.length > 0)
+            return err('--env is only valid for stdio servers');
+        const url = positional[1];
+        if (!isValidUrl(url))
+            return err(`Invalid URL: ${url}`);
+        const config = {
+            url,
+            ...(headerEntries.length > 0 ? { headers: Object.fromEntries(headerEntries) } : {}),
+            ...(timeout !== undefined ? { timeout } : {}),
+        };
+        return ok({ kind: 'add', name, scope, config });
+    }
+    // stdio. `--` is allowed but optional. Some users will write
+    // `/mcp add fs npx -y @pkg/foo /tmp`, others `/mcp add fs -- npx -y ...`.
+    // Both reach this branch identically — we already stripped `--` upstream.
+    void sawDoubleDash;
+    if (headerEntries.length > 0)
+        return err('--header is only valid for HTTP servers (--http)');
+    const command = positional[1];
+    const args = positional.slice(2);
+    const config = {
+        command,
+        ...(args.length > 0 ? { args } : {}),
+        ...(envEntries.length > 0 ? { env: Object.fromEntries(envEntries) } : {}),
+        ...(timeout !== undefined ? { timeout } : {}),
+    };
+    return ok({ kind: 'add', name, scope, config });
+}
+/** Parse args for `/mcp add-json [--scope ...] <name> '<json>'`.
+ *  The JSON blob is whatever the schema accepts — same validation runs
+ *  on the loader side, so passing parseServerConfig here keeps errors
+ *  uniform between "wrote it via CLI" and "edited the file by hand". */
+export function parseAddJson(rawArg) {
+    // add-json uniquely benefits from KEEPING the JSON literal intact rather
+    // than running it through the shell tokeniser (which would mangle nested
+    // quotes). Strategy: pull flags + name off the front via tokenize on the
+    // *prefix* up to where the JSON begins, then take the JSON as the
+    // suffix verbatim. We find the JSON start by looking for the first `{`
+    // after the name token.
+    const trimmed = rawArg.trim();
+    if (!trimmed) {
+        return err("Usage: /mcp add-json [--scope user|project] <name> '<json>'");
+    }
+    // Walk through tokens until we either run out of flags/name OR hit a
+    // token starting with `{`. The JSON blob may have been entered single-
+    // quoted to the slash command — in that case the tokeniser strips the
+    // quotes and we get a clean object string. If unquoted, the user
+    // shouldn't have nested whitespace anyway, so a single token suffices.
+    const tokRes = tokenize(trimmed);
+    if (!tokRes.ok)
+        return tokRes;
+    const tokens = tokRes.tokens;
+    let scope = 'user';
+    let i = 0;
+    while (i < tokens.length) {
+        const t = tokens[i];
+        if (t === '--scope') {
+            const v = tokens[i + 1];
+            if (v !== 'user' && v !== 'project') {
+                return err(`--scope requires "user" or "project" (got ${v ?? '(missing)'})`);
+            }
+            scope = v;
+            i += 2;
+            continue;
+        }
+        if (!t.startsWith('-'))
+            break;
+        return err(`Unknown flag for add-json: ${t}`);
+    }
+    if (i >= tokens.length) {
+        return err("Usage: /mcp add-json [--scope user|project] <name> '<json>'");
+    }
+    const name = tokens[i];
+    if (!NAME_RE.test(name)) {
+        return err(`Invalid server name "${name}". Must match ${NAME_RE.source}.`);
+    }
+    i++;
+    // The JSON might have been split across tokens if the user didn't quote
+    // it. Concatenate the remainder with single spaces; JSON parsing tolerates
+    // any whitespace between tokens so this round-trips fine in practice.
+    if (i >= tokens.length) {
+        return err(`Missing JSON body for "${name}". Wrap it in single quotes: '{...}'`);
+    }
+    const jsonBlob = tokens.slice(i).join(' ').trim();
+    let parsed;
+    try {
+        parsed = JSON.parse(jsonBlob);
+    }
+    catch (e) {
+        return err(`Invalid JSON: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    // We validate via the same zod schema the loader uses, but we keep the
+    // dependency in the writer layer to avoid a circular import here — so
+    // signal "needs validation" by returning the parsed object as
+    // McpServerConfig and letting the caller validate. The writer DOES
+    // validate before writing (see config-writer.ts).
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return err('JSON body must be an object');
+    }
+    return ok({ kind: 'add-json', name, scope, config: parsed });
+}
+/** Parse args for `/mcp remove [--scope ...] <name>`. */
+export function parseRemove(rawArg) {
+    const tokRes = tokenize(rawArg);
+    if (!tokRes.ok)
+        return tokRes;
+    const tokens = tokRes.tokens;
+    if (tokens.length === 0) {
+        return err('Usage: /mcp remove [--scope user|project] <name>');
+    }
+    let scope;
+    let i = 0;
+    while (i < tokens.length) {
+        const t = tokens[i];
+        if (t === '--scope') {
+            const v = tokens[i + 1];
+            if (v !== 'user' && v !== 'project') {
+                return err(`--scope requires "user" or "project" (got ${v ?? '(missing)'})`);
+            }
+            scope = v;
+            i += 2;
+            continue;
+        }
+        if (!t.startsWith('-'))
+            break;
+        return err(`Unknown flag for remove: ${t}`);
+    }
+    if (i >= tokens.length) {
+        return err('Usage: /mcp remove [--scope user|project] <name>');
+    }
+    if (i + 1 < tokens.length) {
+        return err(`/mcp remove takes exactly one name (got extra: ${tokens.slice(i + 1).join(' ')})`);
+    }
+    const name = tokens[i];
+    if (!NAME_RE.test(name)) {
+        return err(`Invalid server name "${name}". Must match ${NAME_RE.source}.`);
+    }
+    return ok({ kind: 'remove', name, scope });
+}
+// ── Internals ──────────────────────────────────────────────────────────────
+function ok(command) {
+    return { ok: true, command };
+}
+function err(message) {
+    return { ok: false, error: message };
+}
+/** Minimal POSIX-ish tokeniser. Supports "..."/'...' quoting and
+ *  backslash-escape of any single char. Quotes are stripped from the
+ *  output; escapes drop the backslash. Returns a tagged result so the
+ *  caller can surface "unclosed quote" without throwing. */
+export function tokenize(input) {
+    const tokens = [];
+    let i = 0;
+    const n = input.length;
+    while (i < n) {
+        // Skip whitespace between tokens.
+        while (i < n && /\s/.test(input[i]))
+            i++;
+        if (i >= n)
+            break;
+        let token = '';
+        let quote = null;
+        let inToken = true;
+        while (i < n && inToken) {
+            const c = input[i];
+            if (quote) {
+                if (c === '\\' && quote === '"' && i + 1 < n) {
+                    // Inside double quotes, allow backslash escape for " and \.
+                    const next = input[i + 1];
+                    if (next === '"' || next === '\\') {
+                        token += next;
+                        i += 2;
+                        continue;
+                    }
+                    // Otherwise keep the backslash literal — POSIX behaviour.
+                    token += c;
+                    i++;
+                    continue;
+                }
+                if (c === quote) {
+                    quote = null;
+                    i++;
+                    continue;
+                }
+                token += c;
+                i++;
+                continue;
+            }
+            // Unquoted.
+            if (c === '"' || c === "'") {
+                quote = c;
+                i++;
+                continue;
+            }
+            if (c === '\\' && i + 1 < n) {
+                // Only escape whitespace, quotes, and backslash itself. Anything
+                // else passes through with the backslash intact so Windows paths
+                // like `D:\res\x-code-cli\tmp` survive — eating those backslashes
+                // would silently corrupt the path and the user wouldn't notice
+                // until the MCP server failed to access the directory.
+                const next = input[i + 1];
+                if (next === ' ' || next === '\t' || next === '"' || next === "'" || next === '\\') {
+                    token += next;
+                    i += 2;
+                    continue;
+                }
+                // Backslash followed by anything else: keep both chars literal.
+                token += c;
+                i++;
+                continue;
+            }
+            if (/\s/.test(c)) {
+                inToken = false;
+                break;
+            }
+            token += c;
+            i++;
+        }
+        if (quote) {
+            return { ok: false, error: `Unclosed ${quote} quote` };
+        }
+        tokens.push(token);
+    }
+    return { ok: true, tokens };
+}
+function isValidUrl(s) {
+    try {
+        const u = new URL(s);
+        return u.protocol === 'http:' || u.protocol === 'https:';
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=arg-parser.js.map

package/dist/mcp/arg-parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arg-parser.js","sourceRoot":"","sources":["../../src/mcp/arg-parser.ts"],"names":[],"mappings":"AAqDA;;;;;wEAKwE;AACxE,MAAM,OAAO,GAAG,uBAAuB,CAAA;AAEvC,8EAA8E;AAE9E,8EAA8E;AAC9E,MAAM,UAAU,QAAQ,CAAC,MAAc;IACrC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC/B,IAAI,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,MAAM,CAAA;IAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IAE5B,yEAAyE;IACzE,sEAAsE;IACtE,gEAAgE;IAChE,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,IAAI,KAAK,GAAgB,MAAM,CAAA;IAC/B,IAAI,OAA2B,CAAA;IAC/B,MAAM,UAAU,GAA4B,EAAE,CAAA;IAC9C,MAAM,aAAa,GAA4B,EAAE,CAAA;IAEjD,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,IAAI,aAAa,GAAG,KAAK,CAAA;IACzB,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAE,CAAA;QACpB,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,MAAK,CAAC,mBAAmB;QACjD,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YACf,aAAa,GAAG,IAAI,CAAA;YACpB,CAAC,EAAE,CAAA;YACH,MAAK;QACP,CAAC;QACD,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,aAAa,EAAE,CAAC;YAC1C,sEAAsE;YACtE,oEAAoE;YACpE,wDAAwD;YACxD,IAAI,CAAC,KAAK,aAAa,EAAE,CAAC;gBACxB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;gBAC1B,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpB,OAAO,GAAG,CACR,yCAAyC,IAAI,IAAI,WAAW,0CAA0C,CACvG,CAAA;gBACH,CAAC;gBACD,CAAC,IAAI,CAAC,CAAA;YACR,CAAC;iBAAM,CAAC;gBACN,CAAC,EAAE,CAAA;YACL,CAAC;YACD,MAAM,GAAG,IAAI,CAAA;YACb,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBACpC,OAAO,GAAG,CAAC,6CAA6C,CAAC,IAAI,WAAW,GAAG,CAAC,CAAA;YAC9E,CAAC;YACD,KAAK,GAAG,CAAC,CAAA;YACT,CAAC,IAAI,CAAC,CAAA;YACN,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;YAClB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,OAAO,GAAG,CAAC,qCAAqC,CAAC,CAAA;YAC5E,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YACzB,IAAI,EAAE,IAAI,CAAC;gBAAE,OAAO,GAAG,CAAC,gCAAgC,CAAC,GAAG,CAAC,CAAA;YAC7D,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YAClD,CAAC,IAAI,CAAC,CAAA;YACN,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;YACrB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,OAAO,GAAG,CAAC,2CAA2C,CAAC,CAAA;YAClF,mEAAmE;YACnE,mDAAmD;YACnD,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAC5B,IAAI,KAAK,IAAI,CAAC;gBAAE,OAAO,GAAG,CAAC,sCAAsC,CAAC,GAAG,CAAC,CAAA;YACtE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;YACzE,CAAC,IAAI,CAAC,CAAA;YACN,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,KAAK,WAAW,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,OAAO,GAAG,CAAC,kCAAkC,CAAC,CAAA;YACzE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YACnB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBAAE,OAAO,GAAG,CAAC,8CAA8C,CAAC,GAAG,CAAC,CAAA;YAClG,OAAO,GAAG,CAAC,CAAA;YACX,CAAC,IAAI,CAAC,CAAA;YACN,SAAQ;QACV,CAAC;QACD,OAAO,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;IAClC,CAAC;IAED,wEAAwE;IACxE,0EAA0E;IAC1E,2EAA2E;IAC3E,SAAS;IACT,EAAE;IACF,0EAA0E;IAC1E,wEAAwE;IACxE,yEAAyE;IACzE,+CAA+C;IAC/C,IAAI,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChC,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC3B,UAAU,GAAG,CAAC,UAAU,CAAC,CAAC,CAAE,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IACvD,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,GAAG,CACR,MAAM;YACJ,CAAC,CAAC,+FAA+F;YACjG,CAAC,CAAC,gGAAgG,CACrG,CAAA;IACH,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAE,CAAA;IAC3B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,GAAG,CAAC,wBAAwB,IAAI,iBAAiB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;IAC5E,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC,gEAAgE,CAAC,CAAA;QAC9E,CAAC;QACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,GAAG,CAAC,uCAAuC,CAAC,CAAA;QAC9E,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAE,CAAA;QAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,GAAG,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAA;QACvD,MAAM,MAAM,GAAwB;YAClC,GAAG;YACH,GAAG,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnF,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9C,CAAA;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IACjD,CAAC;IAED,6DAA6D;IAC7D,0EAA0E;IAC1E,0EAA0E;IAC1E,KAAK,aAAa,CAAA;IAClB,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,kDAAkD,CAAC,CAAA;IAC5F,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAE,CAAA;IAC9B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChC,MAAM,MAAM,GAAyB;QACnC,OAAO;QACP,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpC,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAA;IACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;AACjD,CAAC;AAED;;;wEAGwE;AACxE,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,yEAAyE;IACzE,yEAAyE;IACzE,yEAAyE;IACzE,kEAAkE;IAClE,uEAAuE;IACvE,wBAAwB;IAExB,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,CAAC,6DAA6D,CAAC,CAAA;IAC3E,CAAC;IAED,qEAAqE;IACrE,uEAAuE;IACvE,sEAAsE;IACtE,iEAAiE;IACjE,uEAAuE;IACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;IAChC,IAAI,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,MAAM,CAAA;IAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IAE5B,IAAI,KAAK,GAAgB,MAAM,CAAA;IAC/B,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAE,CAAA;QACpB,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBACpC,OAAO,GAAG,CAAC,6CAA6C,CAAC,IAAI,WAAW,GAAG,CAAC,CAAA;YAC9E,CAAC;YACD,KAAK,GAAG,CAAC,CAAA;YACT,CAAC,IAAI,CAAC,CAAA;YACN,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,MAAK;QAC7B,OAAO,GAAG,CAAC,8BAA8B,CAAC,EAAE,CAAC,CAAA;IAC/C,CAAC;IAED,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,6DAA6D,CAAC,CAAA;IAC3E,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAE,CAAA;IACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,GAAG,CAAC,wBAAwB,IAAI,iBAAiB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;IAC5E,CAAC;IACD,CAAC,EAAE,CAAA;IAEH,wEAAwE;IACxE,2EAA2E;IAC3E,sEAAsE;IACtE,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,0BAA0B,IAAI,sCAAsC,CAAC,CAAA;IAClF,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;IAEjD,IAAI,MAAe,CAAA;IACnB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC/B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,GAAG,CAAC,iBAAiB,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC3E,CAAC;IAED,uEAAuE;IACvE,sEAAsE;IACtE,8DAA8D;IAC9D,mEAAmE;IACnE,kDAAkD;IAClD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACnE,OAAO,GAAG,CAAC,6BAA6B,CAAC,CAAA;IAC3C,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAyB,EAAE,CAAC,CAAA;AACjF,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,WAAW,CAAC,MAAc;IACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC/B,IAAI,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,MAAM,CAAA;IAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,GAAG,CAAC,kDAAkD,CAAC,CAAA;IAChE,CAAC;IAED,IAAI,KAA8B,CAAA;IAClC,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAE,CAAA;QACpB,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBACpC,OAAO,GAAG,CAAC,6CAA6C,CAAC,IAAI,WAAW,GAAG,CAAC,CAAA;YAC9E,CAAC;YACD,KAAK,GAAG,CAAC,CAAA;YACT,CAAC,IAAI,CAAC,CAAA;YACN,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,MAAK;QAC7B,OAAO,GAAG,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,kDAAkD,CAAC,CAAA;IAChE,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,GAAG,CAAC,kDAAkD,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChG,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAE,CAAA;IACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,GAAG,CAAC,wBAAwB,IAAI,iBAAiB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;IAC5E,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;AAC5C,CAAC;AAED,8EAA8E;AAE9E,SAAS,EAAE,CAA0B,OAAU;IAC7C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AAC9B,CAAC;AACD,SAAS,GAAG,CAAC,OAAe;IAC1B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;AACtC,CAAC;AAED;;;4DAG4D;AAC5D,MAAM,UAAU,QAAQ,CAAC,KAAa;IACpC,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAA;IAEtB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACb,kCAAkC;QAClC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC;YAAE,CAAC,EAAE,CAAA;QACzC,IAAI,CAAC,IAAI,CAAC;YAAE,MAAK;QAEjB,IAAI,KAAK,GAAG,EAAE,CAAA;QACd,IAAI,KAAK,GAAqB,IAAI,CAAA;QAClC,IAAI,OAAO,GAAG,IAAI,CAAA;QAElB,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,CAAA;YACnB,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,KAAK,IAAI,IAAI,KAAK,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC7C,4DAA4D;oBAC5D,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAE,CAAA;oBAC1B,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;wBAClC,KAAK,IAAI,IAAI,CAAA;wBACb,CAAC,IAAI,CAAC,CAAA;wBACN,SAAQ;oBACV,CAAC;oBACD,0DAA0D;oBAC1D,KAAK,IAAI,CAAC,CAAA;oBACV,CAAC,EAAE,CAAA;oBACH,SAAQ;gBACV,CAAC;gBACD,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC;oBAChB,KAAK,GAAG,IAAI,CAAA;oBACZ,CAAC,EAAE,CAAA;oBACH,SAAQ;gBACV,CAAC;gBACD,KAAK,IAAI,CAAC,CAAA;gBACV,CAAC,EAAE,CAAA;gBACH,SAAQ;YACV,CAAC;YACD,YAAY;YACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC3B,KAAK,GAAG,CAAC,CAAA;gBACT,CAAC,EAAE,CAAA;gBACH,SAAQ;YACV,CAAC;YACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,iEAAiE;gBACjE,iEAAiE;gBACjE,kEAAkE;gBAClE,+DAA+D;gBAC/D,uDAAuD;gBACvD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAE,CAAA;gBAC1B,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;oBACnF,KAAK,IAAI,IAAI,CAAA;oBACb,CAAC,IAAI,CAAC,CAAA;oBACN,SAAQ;gBACV,CAAC;gBACD,gEAAgE;gBAChE,KAAK,IAAI,CAAC,CAAA;gBACV,CAAC,EAAE,CAAA;gBACH,SAAQ;YACV,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjB,OAAO,GAAG,KAAK,CAAA;gBACf,MAAK;YACP,CAAC;YACD,KAAK,IAAI,CAAC,CAAA;YACV,CAAC,EAAE,CAAA;QACL,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,KAAK,QAAQ,EAAE,CAAA;QACxD,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpB,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;AAC7B,CAAC;AAED,SAAS,UAAU,CAAC,CAAS;IAC3B,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAA;QACpB,OAAO,CAAC,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAA;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC"}

package/dist/mcp/client.d.ts

@@ -0,0 +1,73 @@
+import { type OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import { type McpCallResult, type McpResourceEntry, type McpServerConfig } from './types.js';
+export interface ConnectInfo {
+    toolCount: number;
+    resourceCount: number;
+}
+export declare class McpClient {
+    readonly serverName: string;
+    private readonly config;
+    /** Optional OAuth provider for HTTP servers. Stdio servers ignore this. */
+    private readonly authProvider?;
+    /** SDK client. Only present after a successful connect. */
+    private client;
+    /** SDK transport. Owned by us so we can `close()` it cleanly. */
+    private transport;
+    /** Rolling tail of stderr (stdio servers only). */
+    private stderrTail;
+    /** Cached results from the last connect, served to the registry. */
+    private cachedTools;
+    private cachedResources;
+    constructor(serverName: string, config: McpServerConfig, 
+    /** Optional OAuth provider for HTTP servers. Stdio servers ignore this. */
+    authProvider?: OAuthClientProvider | undefined);
+    /** Spawn / dial the server and complete the MCP initialize handshake.
+     *  On success, populates internal tool + resource caches. On failure,
+     *  cleans up the transport (no zombie subprocess) and re-throws. */
+    connect(): Promise<ConnectInfo>;
+    /** Tools discovered at connect time. Stable for the connection lifetime;
+     *  refresh by calling connect() again on a fresh McpClient. */
+    tools(): ReadonlyArray<{
+        name: string;
+        description?: string;
+        inputSchema: Record<string, unknown>;
+    }>;
+    resources(): ReadonlyArray<McpResourceEntry>;
+    /** Connect with a full interactive OAuth round-trip.
+     *
+     *  The MCP SDK's StreamableHTTP transport handles auth lazily: a fresh
+     *  connect with no stored token calls `authProvider.redirectToAuthorization`
+     *  and then throws `UnauthorizedError` because the token-exchange step
+     *  has to wait for the user. The caller is expected to wait for the
+     *  redirect callback to land, hand the authorization code to
+     *  `transport.finishAuth(code)`, then retry connect — at which point
+     *  tokens are saved and the next attempt succeeds.
+     *
+     *  We encapsulate that dance here so that the `/mcp auth` handler can
+     *  opt into "drive OAuth to completion" without knowing about
+     *  `finishAuth`. The default `connect()` path keeps the OAuth provider
+     *  PASSIVE — `redirectToAuthorization` is a no-op until we flip
+     *  `setInteractive(true)` here, so CLI boot doesn't accidentally pop a
+     *  browser window for servers in `needs_auth`. */
+    connectWithOAuth(hooks?: {
+        onBrowserOpen?: (url: string) => void;
+    }): Promise<ConnectInfo>;
+    /** The actual two-phase connect: attempt-1 fires redirect, then we
+     *  wait for the user, finish the auth, attempt-2 lands a real
+     *  session. Both attempts share `cachedTools` / `cachedResources`. */
+    private runOAuthDance;
+    callTool(name: string, args: unknown, signal?: AbortSignal): Promise<McpCallResult>;
+    readResource(uri: string, signal?: AbortSignal): Promise<{
+        text: string;
+        mimeType?: string;
+    }>;
+    /** Snapshot the last N stderr lines for diagnostics. Empty for HTTP. */
+    stderr(): string;
+    close(): Promise<void>;
+    private buildTransport;
+    private safeClose;
+    /** Attach stderr tail (if any) to a connect error so /mcp list shows
+     *  something more useful than "Connection closed". */
+    private enrichError;
+}
+//# sourceMappingURL=client.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,mBAAmB,EAAqB,MAAM,0CAA0C,CAAA;AAWtG,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGrB,MAAM,YAAY,CAAA;AAgBnB,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,qBAAa,SAAS;aAYF,UAAU,EAAE,MAAM;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,2EAA2E;IAC3E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAdhC,2DAA2D;IAC3D,OAAO,CAAC,MAAM,CAAsB;IACpC,iEAAiE;IACjE,OAAO,CAAC,SAAS,CAAyB;IAC1C,mDAAmD;IACnD,OAAO,CAAC,UAAU,CAAe;IACjC,oEAAoE;IACpE,OAAO,CAAC,WAAW,CAA0F;IAC7G,OAAO,CAAC,eAAe,CAAyB;gBAG9B,UAAU,EAAE,MAAM,EACjB,MAAM,EAAE,eAAe;IACxC,2EAA2E;IAC1D,YAAY,CAAC,EAAE,mBAAmB,YAAA;IAGrD;;wEAEoE;IAC9D,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;IAkErC;mEAC+D;IAC/D,KAAK,IAAI,aAAa,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;IAIpG,SAAS,IAAI,aAAa,CAAC,gBAAgB,CAAC;IAI5C;;;;;;;;;;;;;;;sDAekD;IAC5C,gBAAgB,CAAC,KAAK,GAAE;QAAE,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IA+CnG;;0EAEsE;YACxD,aAAa;IAmCrB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAUnF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAkBnG,wEAAwE;IACxE,MAAM,IAAI,MAAM;IAIV,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B,OAAO,CAAC,cAAc;YAqCR,SAAS;IAmBvB;0DACsD;IACtD,OAAO,CAAC,WAAW;CAQpB"}