zcode-acp-server 0.48.0 → 0.49.0

package/dist/backend/jsonrpc-child.d.ts

@@ -0,0 +1,128 @@
+/**
+ * JsonRpcChild — shared stdio JSON-RPC subprocess transport for backends
+ * (ADR-0023).
+ *
+ * Every backend adapter reuses one read-loop multiplexer, watchdog, and
+ * process-group lifecycle:
+ *   - responses (id, no method) → resolve the matching pending request
+ *   - id + method               → our response (id registered) or a
+ *                                 server→client request (hook first, then queue)
+ *   - method + no id            → notification (backend-specific hook)
+ *
+ * Wire dialects differ per backend: zcode sends BARE frames (no `jsonrpc`
+ * field — the backend's strict validator rejects it) while a standard
+ * JSON-RPC 2.0 backend sends versioned frames. Subclasses override
+ * {@link decorateOutbound} for the write dialect and
+ * {@link handleNotification} / {@link handleServerRequest} for inbound
+ * routing.
+ */
+import { type ChildProcess } from "node:child_process";
+import type { BackendAdapter, BackendCapabilities, EventListener, ServerRequest } from "./adapter.js";
+import type { ZcodeEvent, ZcodeResponse } from "./types.js";
+export interface JsonRpcChildOptions {
+    argv: string[];
+    env: NodeJS.ProcessEnv;
+    /** Backend name used in error strings (e.g. "zcode" → "zcode backend pipe broken"). */
+    name: string;
+    /** Human-readable label for the start log line. */
+    logLabel: string;
+    /** CLI display name for the ENOENT hint. */
+    cliLabel: string;
+    /** Env var users can set to point at the CLI binary (for the ENOENT hint). */
+    binEnvVar: string;
+}
+export declare abstract class JsonRpcChild implements BackendAdapter {
+    /** Feature flags of the concrete backend — each subclass binds its kind's table. */
+    abstract readonly capabilities: BackendCapabilities;
+    readonly proc: ChildProcess;
+    protected readonly name: string;
+    private readonly pending;
+    private readonly serverRequests;
+    private readonly listeners;
+    private readerDead;
+    /** Monotonic id for fire-and-forget sends (send()). Uses a high range to
+     *  avoid collisions with the server's request ids (low range). */
+    private sendIdCounter;
+    /** Watchdog process that kills the backend group if this bridge dies (SIGKILL). */
+    private watchdog;
+    protected constructor(opts: JsonRpcChildOptions);
+    /**
+     * Spawn a tiny detached watchdog that kills the backend process group if this
+     * bridge process disappears.
+     *
+     * The detached/kill(-pid) cleanup in `close()` only runs when the bridge
+     * exits cleanly enough for the signal handlers to fire (SIGTERM/SIGINT/etc).
+     * If the bridge is SIGKILLed (Zed force-kill on reconnect, crash, OOM), the
+     * handler never runs and the backend subprocess group is orphaned. The
+     * watchdog closes that gap: it polls the bridge pid every 2s and, once the
+     * bridge is gone, sends SIGKILL to the backend process group, then exits.
+     *
+     * The watchdog is its own process-group leader (detached) and `unref`'d, so
+     * it never holds the event loop open and is not part of the backend group it
+     * kills. It self-terminates as soon as the backend process exits, so a
+     * normal shutdown leaves no lingering watchdog.
+     */
+    private startWatchdog;
+    private startReader;
+    private route;
+    /** Deliver a backend event to every listener registered for its session. */
+    protected dispatchEvent(ev: ZcodeEvent): void;
+    private resolvePending;
+    protected markReaderDead(reason: string): void;
+    /** Route an inbound notification. Unhandled methods are ignored. */
+    protected abstract handleNotification(method: string, params: Record<string, unknown>): void;
+    /**
+     * Intercept an unmatched server→client request before it queues. Return
+     * true when consumed (e.g. a handshake auto-reply, or an arrival-time
+     * responder) so the original never reaches the interaction queue verbatim.
+     */
+    protected handleServerRequest(_req: ServerRequest): boolean;
+    /** Adapt an outbound frame to the backend's wire dialect. */
+    protected decorateOutbound(msg: Record<string, unknown>): Record<string, unknown>;
+    registerEventListener(sessionId: string, listener: EventListener): void;
+    unregisterEventListener(sessionId: string, listener: EventListener): void;
+    /** Non-blocking drain of pending server→client requests. */
+    pollServerRequests(): ServerRequest[];
+    /**
+     * Re-queue server→client requests that belong to a different session (prepended
+     * to preserve arrival order). Used by `handleServerRequests` to put back
+     * requests it popped but doesn't own.
+     */
+    requeueServerRequests(reqs: ServerRequest[]): void;
+    /** Reply to a backend server→client request with a result (id + result). */
+    sendReply(id: number | string, result: unknown): void;
+    /** Reply to a backend server→client request with an error. */
+    sendError(id: number | string, code: number, message: string): void;
+    /** Fire-and-forget notification to the backend (no id, no response). */
+    notify(method: string, params?: Record<string, unknown>): void;
+    /**
+     * Send a message with an id but WITHOUT registering a pending response
+     * (fire-and-forget). Some backends route by id presence, so carrying an id
+     * is more robust than a bare notify. If the backend replies, the reader's
+     * `resolvePending` finds no pending entry and safely discards it.
+     */
+    send(method: string, params?: Record<string, unknown>): void;
+    private writeFrame;
+    /**
+     * Synchronous request/response: register a pending promise, send, await.
+     * Other notifications arriving during the wait are routed async by the
+     * reader loop (they don't get swallowed).
+     *
+     * Returns `{error}` on dead backend, broken pipe, or timeout — never throws.
+     */
+    request(id: number, method: string, params?: Record<string, unknown>, timeoutMs?: number): Promise<ZcodeResponse>;
+    /**
+     * Kill the whole backend process group and wait for it to die.
+     *
+     * SIGTERM → wait up to 3s → SIGKILL if still alive. Note `proc.killed` is
+     * NOT set by `process.kill(-pid)` (group signal), so we track liveness via
+     * `exitCode === null` instead. Async so the caller can `await` a full reap
+     * before the parent exits (an unref'd timer could be skipped on fast exit,
+     * leaving orphans).
+     */
+    close(): Promise<void>;
+    /** Terminate the watchdog process if it is still running. */
+    private killWatchdog;
+    get isDead(): boolean;
+}
+//# sourceMappingURL=jsonrpc-child.d.ts.map

package/dist/backend/jsonrpc-child.d.ts.map

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

package/dist/backend/jsonrpc-child.js

@@ -0,0 +1,397 @@
+/**
+ * JsonRpcChild — shared stdio JSON-RPC subprocess transport for backends
+ * (ADR-0023).
+ *
+ * Every backend adapter reuses one read-loop multiplexer, watchdog, and
+ * process-group lifecycle:
+ *   - responses (id, no method) → resolve the matching pending request
+ *   - id + method               → our response (id registered) or a
+ *                                 server→client request (hook first, then queue)
+ *   - method + no id            → notification (backend-specific hook)
+ *
+ * Wire dialects differ per backend: zcode sends BARE frames (no `jsonrpc`
+ * field — the backend's strict validator rejects it) while a standard
+ * JSON-RPC 2.0 backend sends versioned frames. Subclasses override
+ * {@link decorateOutbound} for the write dialect and
+ * {@link handleNotification} / {@link handleServerRequest} for inbound
+ * routing.
+ */
+import { spawn } from "node:child_process";
+import { createInterface } from "node:readline";
+import process from "node:process";
+import { log, warn } from "../utils.js";
+export class JsonRpcChild {
+    proc;
+    name;
+    pending = new Map();
+    serverRequests = [];
+    // Per-session listener SET so a long-lived session listener (e.g. background
+    // task monitor) can coexist with a per-turn EventStreamListener. Each event
+    // is delivered to every registered listener for the session.
+    listeners = new Map();
+    readerDead = false;
+    /** Monotonic id for fire-and-forget sends (send()). Uses a high range to
+     *  avoid collisions with the server's request ids (low range). */
+    sendIdCounter = 1_000_000_000;
+    /** Watchdog process that kills the backend group if this bridge dies (SIGKILL). */
+    watchdog = null;
+    constructor(opts) {
+        this.name = opts.name;
+        this.proc = spawn(opts.argv[0], opts.argv.slice(1), {
+            stdio: ["pipe", "pipe", "ignore"],
+            env: opts.env,
+            detached: true, // own process group → kill(-pid) reaps the whole tree
+        });
+        // Spawn failures (ENOENT when the CLI can't be resolved) arrive here
+        // asynchronously — without a listener the bridge dies on an unhandled
+        // 'error' event. Mark the backend dead so requests fail with a JSON-RPC
+        // error instead of crashing the whole process.
+        this.proc.on("error", (err) => {
+            const hint = err.code === "ENOENT"
+                ? `${this.proc.spawnfile} not found — install the ${opts.cliLabel}, put it on PATH, or set ${opts.binEnvVar}`
+                : err.message;
+            this.markReaderDead(`spawn failed: ${hint}`);
+        });
+        // Node stream write errors (EPIPE on a closed stdin) are emitted as async
+        // 'error' events, NOT thrown synchronously — without a listener the process
+        // crashes with an unhandled 'error' event. Catch them here and mark the
+        // reader dead so the rest of the bridge stops talking to a gone backend.
+        this.proc.stdin?.on("error", (err) => {
+            this.readerDead = true;
+            warn(`backend: stdin error: ${err.message}`);
+        });
+        this.startReader();
+        this.startWatchdog();
+        log(`backend: started ${opts.logLabel} (pid=${this.proc.pid})`);
+    }
+    /**
+     * Spawn a tiny detached watchdog that kills the backend process group if this
+     * bridge process disappears.
+     *
+     * The detached/kill(-pid) cleanup in `close()` only runs when the bridge
+     * exits cleanly enough for the signal handlers to fire (SIGTERM/SIGINT/etc).
+     * If the bridge is SIGKILLed (Zed force-kill on reconnect, crash, OOM), the
+     * handler never runs and the backend subprocess group is orphaned. The
+     * watchdog closes that gap: it polls the bridge pid every 2s and, once the
+     * bridge is gone, sends SIGKILL to the backend process group, then exits.
+     *
+     * The watchdog is its own process-group leader (detached) and `unref`'d, so
+     * it never holds the event loop open and is not part of the backend group it
+     * kills. It self-terminates as soon as the backend process exits, so a
+     * normal shutdown leaves no lingering watchdog.
+     */
+    startWatchdog() {
+        const bridgePid = process.pid;
+        const backendPid = this.proc.pid;
+        if (!bridgePid || !backendPid)
+            return;
+        // Inline script: poll bridge liveness, kill backend group on bridge death.
+        const script = `
+      const bridgePid = ${bridgePid};
+      const backendPid = ${backendPid};
+      const tick = () => {
+        // Bridge gone? → reap the whole backend process group, then exit.
+        try { process.kill(bridgePid, 0); }
+        catch {
+          try { process.kill(-backendPid, 'SIGKILL'); } catch {}
+          process.exit(0);
+        }
+        // backend already exited? → watchdog has no job left.
+        try { process.kill(-backendPid, 0); }
+        catch { process.exit(0); }
+      };
+      setInterval(tick, 2000);
+      tick();
+    `;
+        this.watchdog = spawn(process.execPath, ["-e", script], {
+            stdio: "ignore",
+            detached: true, // own process group, not part of the backend group
+        });
+        this.watchdog.unref();
+    }
+    // ---------- read loop ----------
+    startReader() {
+        const stdout = this.proc.stdout;
+        if (!stdout) {
+            this.markReaderDead("no stdout");
+            return;
+        }
+        const rl = createInterface({ input: stdout });
+        rl.on("line", (line) => {
+            const trimmed = line.trim();
+            if (!trimmed)
+                return;
+            let msg;
+            try {
+                msg = JSON.parse(trimmed);
+            }
+            catch {
+                return; // unparseable line: ignore
+            }
+            this.route(msg);
+        });
+        rl.on("close", () => this.markReaderDead("stdout closed"));
+    }
+    route(msg) {
+        const method = msg.method;
+        const id = msg.id;
+        if (id !== undefined && method === undefined) {
+            // Response (id, no method) → resolve pending request. A late reply to a
+            // fire-and-forget send has no pending entry and is safely dropped.
+            this.resolvePending(id, msg);
+            return;
+        }
+        if (id !== undefined && method !== undefined) {
+            // id + method: our pending response wins the race; else a hook gets a
+            // chance (dialect-specific auto-reply), else it queues as server→client.
+            if (this.pending.has(id)) {
+                this.resolvePending(id, msg);
+            }
+            else {
+                const req = {
+                    id,
+                    method,
+                    params: (msg.params ?? {}),
+                };
+                if (!this.handleServerRequest(req)) {
+                    this.serverRequests.push(req);
+                }
+            }
+            return;
+        }
+        if (method !== undefined) {
+            // Notification — dialect-specific routing.
+            this.handleNotification(method, (msg.params ?? {}));
+        }
+    }
+    /** Deliver a backend event to every listener registered for its session. */
+    dispatchEvent(ev) {
+        const sid = ev.sessionId;
+        const set = sid ? this.listeners.get(sid) : undefined;
+        if (set) {
+            // Iterate a snapshot so a listener that (un)registers during dispatch
+            // doesn't mutate the set under us.
+            for (const listener of [...set]) {
+                try {
+                    listener.handleEvent(ev);
+                }
+                catch (e) {
+                    warn(`backend: listener.handleEvent threw: ${e instanceof Error ? e.message : String(e)}`);
+                }
+            }
+        }
+    }
+    resolvePending(id, resp) {
+        const p = this.pending.get(id);
+        if (!p)
+            return;
+        clearTimeout(p.timer);
+        this.pending.delete(id);
+        p.resolve(resp);
+    }
+    markReaderDead(reason) {
+        if (this.readerDead)
+            return;
+        this.readerDead = true;
+        warn(`backend: reader exited (${reason})`);
+        for (const [, p] of this.pending) {
+            clearTimeout(p.timer);
+            p.resolve({
+                id: 0,
+                error: { message: `${this.name} backend reader exited (backend dead)` },
+            });
+        }
+        this.pending.clear();
+    }
+    /**
+     * Intercept an unmatched server→client request before it queues. Return
+     * true when consumed (e.g. a handshake auto-reply, or an arrival-time
+     * responder) so the original never reaches the interaction queue verbatim.
+     */
+    handleServerRequest(_req) {
+        return false;
+    }
+    /** Adapt an outbound frame to the backend's wire dialect. */
+    decorateOutbound(msg) {
+        return msg;
+    }
+    // ---------- listeners / server requests ----------
+    registerEventListener(sessionId, listener) {
+        let set = this.listeners.get(sessionId);
+        if (!set) {
+            set = new Set();
+            this.listeners.set(sessionId, set);
+        }
+        set.add(listener);
+    }
+    unregisterEventListener(sessionId, listener) {
+        const set = this.listeners.get(sessionId);
+        if (!set)
+            return;
+        set.delete(listener);
+        if (set.size === 0)
+            this.listeners.delete(sessionId);
+    }
+    /** Non-blocking drain of pending server→client requests. */
+    pollServerRequests() {
+        if (this.serverRequests.length === 0)
+            return [];
+        return this.serverRequests.splice(0, this.serverRequests.length);
+    }
+    /**
+     * Re-queue server→client requests that belong to a different session (prepended
+     * to preserve arrival order). Used by `handleServerRequests` to put back
+     * requests it popped but doesn't own.
+     */
+    requeueServerRequests(reqs) {
+        if (reqs.length === 0)
+            return;
+        this.serverRequests.unshift(...reqs);
+    }
+    /** Reply to a backend server→client request with a result (id + result). */
+    sendReply(id, result) {
+        this.writeFrame({ id, result });
+    }
+    /** Reply to a backend server→client request with an error. */
+    sendError(id, code, message) {
+        this.writeFrame({ id, error: { code, message } });
+    }
+    // ---------- send / request ----------
+    /** Fire-and-forget notification to the backend (no id, no response). */
+    notify(method, params) {
+        this.writeFrame({ method, params });
+    }
+    /**
+     * Send a message with an id but WITHOUT registering a pending response
+     * (fire-and-forget). Some backends route by id presence, so carrying an id
+     * is more robust than a bare notify. If the backend replies, the reader's
+     * `resolvePending` finds no pending entry and safely discards it.
+     */
+    send(method, params) {
+        this.writeFrame({ id: this.sendIdCounter++, method, params: params ?? {} });
+    }
+    writeFrame(msg) {
+        const stdin = this.proc.stdin;
+        if (!stdin || stdin.destroyed) {
+            warn("backend: frame dropped (stdin closed)");
+            return;
+        }
+        // Write errors (EPIPE) are delivered via the stdin 'error' listener
+        // installed in the constructor (synchronous try/catch cannot catch them);
+        // no try/catch needed here.
+        stdin.write(JSON.stringify(this.decorateOutbound(msg)) + "\n");
+    }
+    /**
+     * Synchronous request/response: register a pending promise, send, await.
+     * Other notifications arriving during the wait are routed async by the
+     * reader loop (they don't get swallowed).
+     *
+     * Returns `{error}` on dead backend, broken pipe, or timeout — never throws.
+     */
+    async request(id, method, params, timeoutMs = 30000) {
+        if (this.readerDead) {
+            return { id, error: { message: `${this.name} backend reader exited (backend dead)` } };
+        }
+        const promise = new Promise((resolve) => {
+            const timer = setTimeout(() => {
+                if (this.pending.delete(id)) {
+                    resolve({ id, error: { message: "timeout" } });
+                }
+            }, timeoutMs);
+            this.pending.set(id, { resolve, timer });
+        });
+        try {
+            // Fast-fail a closed pipe BEFORE the pending wait: writeFrame only
+            // warns and drops (fire-and-forget semantics), which would leave this
+            // request hanging until timeoutMs with readerDead unset.
+            const stdin = this.proc.stdin;
+            if (!stdin || stdin.destroyed)
+                throw new Error("stdin closed");
+            this.writeFrame({ id, method, params: params ?? {} });
+        }
+        catch (e) {
+            this.pending.delete(id);
+            this.readerDead = true;
+            return {
+                id,
+                error: {
+                    message: `${this.name} backend pipe broken: ${e instanceof Error ? e.message : String(e)}`,
+                },
+            };
+        }
+        return promise;
+    }
+    // ---------- lifecycle ----------
+    /**
+     * Kill the whole backend process group and wait for it to die.
+     *
+     * SIGTERM → wait up to 3s → SIGKILL if still alive. Note `proc.killed` is
+     * NOT set by `process.kill(-pid)` (group signal), so we track liveness via
+     * `exitCode === null` instead. Async so the caller can `await` a full reap
+     * before the parent exits (an unref'd timer could be skipped on fast exit,
+     * leaving orphans).
+     */
+    async close() {
+        const proc = this.proc;
+        if (!proc.pid)
+            return;
+        try {
+            // Already exited?
+            if (proc.exitCode !== null || proc.signalCode)
+                return;
+            try {
+                process.kill(-proc.pid, "SIGTERM");
+            }
+            catch {
+                return; // group already gone
+            }
+            // Wait up to 3s for a clean exit.
+            const exited = await new Promise((resolve) => {
+                let timer;
+                const done = () => {
+                    clearTimeout(timer); // don't let the timeout keep the event loop alive
+                    resolve(true);
+                };
+                proc.once("exit", done);
+                timer = setTimeout(() => {
+                    proc.removeListener("exit", done);
+                    resolve(false);
+                }, 3000);
+            });
+            if (exited)
+                return;
+            // Still alive → SIGKILL the whole group.
+            try {
+                if (proc.pid && proc.exitCode === null)
+                    process.kill(-proc.pid, "SIGKILL");
+            }
+            catch {
+                // already gone
+            }
+        }
+        finally {
+            // Stop the watchdog — it would self-exit on its next tick once the
+            // backend group is gone, but killing it here avoids the up-to-2s delay.
+            this.killWatchdog();
+        }
+    }
+    /** Terminate the watchdog process if it is still running. */
+    killWatchdog() {
+        const wd = this.watchdog;
+        if (!wd)
+            return;
+        this.watchdog = null;
+        if (wd.pid && wd.exitCode === null) {
+            try {
+                process.kill(wd.pid, "SIGTERM");
+            }
+            catch {
+                // already gone
+            }
+        }
+    }
+    get isDead() {
+        return this.readerDead;
+    }
+}
+//# sourceMappingURL=jsonrpc-child.js.map

package/dist/backend/jsonrpc-child.js.map

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

package/dist/code-fingerprint.json

@@ -1,4 +1,4 @@
 {
-  "fingerprint": "e72828b13a1a6a6f146f100e240f65a8076b1ffaee85180ae1eb18ec504043ee",
-  "fileCount": 101
+  "fingerprint": "46865404a2a22d973866a200518cc4e517346735645692c53687ead2ce32bad5",
+  "fileCount": 103
 }

package/dist/config/options.d.ts.map

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

package/dist/config/options.js

@@ -10,6 +10,7 @@
  * reflects the new state.
  */
 import { readFileSync } from "node:fs";
+import { backendCapabilities } from "../backend/adapter.js";
 import { recordModelChoice } from "../lazy-sessions.js";
 import { clientConnectionRoot, CONFIG_DISPATCH, CONFIG_META, log, warn, ZCODE_CREDS_PATH, zcodePersonalProviderPath, } from "../utils.js";
 import { configProviderIdFor } from "./account-provider.js";
@@ -178,9 +179,17 @@ export function loadAllModels() {
             if (!providerSelectable(pid, p))
                 continue;
             const providerName = p.name ?? pid;
-            const ids = new Set(Object.keys(p.models ?? {}));
-            for (const modelId of personal?.modelsByProvider.get(pid) ?? [])
-                ids.add(modelId);
+            // Custom providers: once the personal config tracks the provider's
+            // models, THAT list is authoritative. Additions AND deletions land only
+            // there (config.json stopped syncing), and the backend registry knows no
+            // other source for the provider's models — a config.json-only entry is a
+            // deleted-model ghost that fails on switch (observed 2026-09-28). Builtin
+            // providers keep the union: their catalog comes from the account
+            // snapshot, and a personal rule is an override, not a complete list.
+            const personalIds = personal?.modelsByProvider.get(pid);
+            const ids = personalIds !== undefined && !isBuiltinProvider(pid)
+                ? new Set(personalIds)
+                : new Set([...Object.keys(p.models ?? {}), ...(personalIds ?? [])]);
             for (const modelId of ids) {
                 out.push({ providerId: pid, providerName, modelId });
             }
@@ -511,7 +520,8 @@ export async function buildConfigOptions(server, zcodeSid, receiverRoot) {
     // extension through typecheck. `set_config_option` on it is a no-op.
     // Gated on the RECEIVER's connection identity, not process state — a
     // non-martty client must never see the spec-external string option.
-    if (server.quotaDock &&
+    if (backendCapabilities(server.backendKind).quota &&
+        server.quotaDock &&
         receiverRoot !== undefined &&
         server.marttyConnectionRoots.has(receiverRoot)) {
         options.push({