@cybedefend/vibedefend 1.5.0 → 1.7.0

package/dist/mcp/proxy/upstreamStdio.js

@@ -0,0 +1,188 @@
+/**
+ * stdio upstream: the proxy spawns the server the client used to spawn, and
+ * hands it the same `command`, `args`, `env` and `cwd`.
+ *
+ * Three things matter here beyond piping bytes:
+ *  - the child's stderr is forwarded to our stderr, because that is where the
+ *    client already looks for a server's diagnostics; it is also copied to
+ *    the log file. It never reaches stdout;
+ *  - the child is stopped for good on shutdown, including on Windows where
+ *    `npx` shims leave a process tree behind;
+ *  - `.cmd` / `.bat` on Windows go through `cmd.exe`, see `windowsCommand.ts`.
+ */
+import { spawn } from 'node:child_process';
+import { encodeMessage, LineFramer } from './jsonrpc.js';
+import { upstreamEnvironment } from './spec.js';
+import { planSpawn } from './windowsCommand.js';
+/** How long a child gets to exit on its own before it is killed. */
+export const STDIO_SHUTDOWN_GRACE_MS = 2000;
+export class StdioUpstream {
+    options;
+    kind = 'stdio';
+    child;
+    framer = new LineFramer();
+    closing = false;
+    exited = false;
+    constructor(options) {
+        this.options = options;
+    }
+    async start() {
+        const { spec, logger } = this.options;
+        const platform = this.options.platform ?? process.platform;
+        const parentEnv = this.options.env ?? process.env;
+        const plan = planSpawn(spec.command, spec.args, platform, parentEnv);
+        // ⚠️ The KEYS of the entry's own env, never the values: one of them is
+        // routinely an API key, and this line lands in a file on disk.
+        const envKeys = Object.keys(spec.env ?? {});
+        logger.info('spawning upstream', {
+            command: plan.command,
+            args: plan.args,
+            cwd: spec.cwd,
+            wrapped: plan.command !== spec.command,
+            envCount: envKeys.length,
+            envKeys,
+        });
+        const child = spawn(plan.command, plan.args, {
+            cwd: spec.cwd,
+            env: upstreamEnvironment(parentEnv, spec.env),
+            stdio: ['pipe', 'pipe', 'pipe'],
+            windowsVerbatimArguments: plan.windowsVerbatimArguments,
+            // Never a shell: the arguments are already exactly what the child must
+            // see, and a shell would re-split them.
+            shell: false,
+        });
+        this.child = child;
+        child.stdout.on('data', (chunk) => this.consume(chunk));
+        child.stdout.on('end', () => {
+            const { messages, errors } = this.framer.flush();
+            for (const message of messages)
+                this.options.events.onMessage(message);
+            for (const error of errors) {
+                this.options.logger.warn('undecodable trailing bytes from upstream', { ...error });
+            }
+        });
+        child.stderr.on('data', (chunk) => {
+            const text = chunk.toString('utf8');
+            this.options.logger.debug('upstream stderr', { text: text.trimEnd() });
+            const sink = this.options.stderr === undefined ? process.stderr : this.options.stderr;
+            if (sink)
+                sink.write(chunk);
+        });
+        // A write to a child that died between our check and the write raises
+        // EPIPE asynchronously; it is a close, not a crash.
+        child.stdin.on('error', (error) => {
+            if (error.code === 'EPIPE') {
+                this.options.logger.debug('upstream stdin closed under a write');
+                return;
+            }
+            this.options.events.onError(error);
+        });
+        child.on('exit', (code, signal) => {
+            this.exited = true;
+            this.options.logger.info('upstream exited', { code, signal });
+            this.options.events.onClose({ code, signal });
+        });
+        return new Promise((resolve, reject) => {
+            let settled = false;
+            child.once('error', (error) => {
+                if (settled) {
+                    this.options.events.onError(error);
+                    return;
+                }
+                settled = true;
+                this.exited = true;
+                reject(new Error(`cannot start upstream "${spec.command}": ${error.message}`));
+            });
+            // `spawn` fires once the OS accepted the exec; a command that does not
+            // exist fires `error` instead, which is the rejection above.
+            child.once('spawn', () => {
+                if (settled)
+                    return;
+                settled = true;
+                resolve();
+            });
+        });
+    }
+    send(message) {
+        const child = this.child;
+        if (!child || this.exited) {
+            this.options.logger.warn('dropping a message for a dead upstream', {
+                method: typeof message.method === 'string' ? message.method : undefined,
+            });
+            return;
+        }
+        child.stdin.write(encodeMessage(message));
+    }
+    async close() {
+        const child = this.child;
+        if (!child || this.closing)
+            return;
+        this.closing = true;
+        if (this.exited)
+            return;
+        // Closing stdin is how an MCP server is asked to shut down; the signals
+        // below are only for a server that ignores it.
+        try {
+            child.stdin.end();
+        }
+        catch {
+            /* already gone */
+        }
+        const exited = new Promise((resolve) => {
+            if (this.exited)
+                return resolve();
+            child.once('exit', () => resolve());
+        });
+        const grace = this.options.shutdownGraceMs ?? STDIO_SHUTDOWN_GRACE_MS;
+        const timer = setTimeout(() => {
+            this.options.logger.warn('upstream ignored the shutdown, killing it', { pid: child.pid });
+            this.kill(child);
+        }, grace);
+        // The proxy must not be kept alive by its own shutdown timer.
+        if (typeof timer.unref === 'function')
+            timer.unref();
+        try {
+            await exited;
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+    /**
+     * `child.kill()` only signals the process itself. `npx`, `uv` and friends
+     * spawn the real server as a grandchild, so on Windows the tree is killed
+     * through `taskkill` — a shipped executable, not a native dependency.
+     */
+    kill(child) {
+        const platform = this.options.platform ?? process.platform;
+        if (platform === 'win32' && child.pid !== undefined) {
+            try {
+                spawn('taskkill', ['/pid', String(child.pid), '/T', '/F'], {
+                    stdio: 'ignore',
+                    windowsHide: true,
+                }).unref();
+                return;
+            }
+            catch (error) {
+                this.options.logger.warn('taskkill failed, falling back to SIGKILL', {
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+        }
+        try {
+            child.kill('SIGKILL');
+        }
+        catch {
+            /* already gone */
+        }
+    }
+    consume(chunk) {
+        const { messages, errors } = this.framer.push(chunk);
+        for (const message of messages)
+            this.options.events.onMessage(message);
+        for (const error of errors) {
+            this.options.logger.warn('undecodable line from upstream', { ...error });
+        }
+    }
+}
+//# sourceMappingURL=upstreamStdio.js.map

package/dist/mcp/proxy/upstreamStdio.js.map

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

package/dist/mcp/proxy/upstreams.js

@@ -0,0 +1,143 @@
+/**
+ * `~/.cybedefend/mcp/upstreams.json` — the proxy's source of truth.
+ *
+ * After `vibedefend install` (Phase 5) a client's own config no longer holds
+ * the URL, the command or the headers of an MCP server: it holds
+ * `{"command": "vibedefend", "args": ["mcp", "--name", "<id>"]}`, and the real
+ * entry lives here. That is what makes `vibedefend unwrap` able to restore
+ * the original from a record of its own rather than from a backup that may
+ * have been edited since.
+ *
+ * Phase 2 only reads the file, and writes back the one field it learns:
+ * whether a server wants authentication. Phase 5 adds the writer that fills
+ * it from the client configs.
+ */
+import { readFileSync } from 'node:fs';
+import { writeFileAtomic } from '../config/atomicWrite.js';
+import { upstreamsFile } from './paths.js';
+import { dialectFor, expandSpec } from './expand.js';
+export function emptyUpstreams() {
+    return { version: 1, servers: {} };
+}
+/**
+ * Reads the file. A missing, unreadable or malformed file reads as empty:
+ * the proxy is spawned by an agent mid-session and has nowhere useful to
+ * report a parse error, so it degrades to "no upstream is known", which the
+ * caller already handles.
+ */
+export function readUpstreams(env = process.env) {
+    let raw;
+    try {
+        raw = readFileSync(upstreamsFile(env), 'utf8');
+    }
+    catch {
+        return emptyUpstreams();
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (!parsed || parsed.version !== 1 || typeof parsed.servers !== 'object' || !parsed.servers) {
+            return emptyUpstreams();
+        }
+        const servers = {};
+        for (const [name, entry] of Object.entries(parsed.servers)) {
+            if (!entry || typeof entry !== 'object')
+                continue;
+            const typed = entry;
+            if (typed.transport !== 'stdio' && typed.transport !== 'http')
+                continue;
+            Object.defineProperty(servers, name, {
+                value: { ...typed, name },
+                writable: true,
+                enumerable: true,
+                configurable: true,
+            });
+        }
+        return { version: 1, servers };
+    }
+    catch {
+        return emptyUpstreams();
+    }
+}
+/**
+ * Writes the file atomically.
+ *
+ * One proxy runs per MCP server, so several of them race on this file — the
+ * temp-then-rename keeps a reader from ever seeing half a document. `0600`
+ * because an entry may carry a header the client config used to hold in the
+ * clear.
+ */
+export function writeUpstreams(file, env = process.env) {
+    // 0600: an entry may carry a header the client config used to hold in the
+    // clear, which is the whole reason it moved here.
+    writeFileAtomic(upstreamsFile(env), `${JSON.stringify(file, null, 2)}\n`, { mode: 0o600 });
+}
+/** Records what a probe or a connection learned, leaving everything else alone. */
+export function recordUpstreamAuth(name, auth, env = process.env) {
+    const file = readUpstreams(env);
+    const entry = Object.hasOwn(file.servers, name)
+        ? Object.getOwnPropertyDescriptor(file.servers, name)?.value
+        : undefined;
+    if (!entry)
+        return;
+    Object.defineProperty(file.servers, name, {
+        value: { ...entry, auth, updatedAt: new Date().toISOString() },
+        writable: true,
+        enumerable: true,
+        configurable: true,
+    });
+    writeUpstreams(file, env);
+}
+export class UnknownUpstreamError extends Error {
+    name;
+    known;
+    constructor(name, known) {
+        super(known.length === 0
+            ? `no upstream named "${name}": ~/.cybedefend/mcp/upstreams.json is empty or missing. Run \`vibedefend install\` to fill it.`
+            : `no upstream named "${name}". Known: ${known.join(', ')}.`);
+        this.name = name;
+        this.known = known;
+        this.name = 'UnknownUpstreamError';
+    }
+}
+/** The spec the proxy needs, from an entry. */
+export function specOf(entry) {
+    if (entry.transport === 'http') {
+        if (!entry.url)
+            throw new Error(`upstream "${entry.name}" is http but has no url`);
+        return { transport: 'http', url: entry.url, headers: entry.headers };
+    }
+    if (!entry.command)
+        throw new Error(`upstream "${entry.name}" is stdio but has no command`);
+    return {
+        transport: 'stdio',
+        command: entry.command,
+        args: entry.args ?? [],
+        env: entry.env,
+        cwd: entry.cwd,
+    };
+}
+/**
+ * The spec as the ORIGINATING CLIENT would have built it: variable references
+ * resolved, in that client's own syntax.
+ *
+ * ⚠️ Deliberately NOT folded into `specOf`. That one feeds
+ * `upstreamServerId`, and an identity that moved every time an environment
+ * variable did would invalidate the verdict cache on every shell change —
+ * and would let anyone flip a server's identity by exporting a variable.
+ */
+export function expandedSpecOf(entry, env = process.env) {
+    return expandSpec(specOf(entry), env, dialectFor(entry.source?.client));
+}
+/** Resolves `--name <id>` to a spec, or says what is known instead. */
+export function resolveNamedUpstream(name, env = process.env) {
+    const file = readUpstreams(env);
+    const entry = file.servers[name];
+    if (!entry)
+        throw new UnknownUpstreamError(name, Object.keys(file.servers));
+    return { entry, spec: specOf(entry) };
+}
+/** Every http upstream, which is what `vibedefend connect --all` iterates over. */
+export function httpUpstreams(env = process.env) {
+    return Object.values(readUpstreams(env).servers).filter((entry) => entry.transport === 'http' && typeof entry.url === 'string');
+}
+//# sourceMappingURL=upstreams.js.map

package/dist/mcp/proxy/upstreams.js.map

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