zelari-code 2.15.0 → 2.16.0

package/dist/cli/serve/harnessServer.js

@@ -0,0 +1,333 @@
+/**
+ * harnessServer — `--serve-harness` (t29, Pilastro B).
+ *
+ * A long-lived host for the HarnessAppServer kernel
+ * (@zelari/core/harness) speaking line-delimited JSON (NDJSON) over
+ * stdio, on top of the EXISTING headless protocol v2: the boot line is
+ * the same `protocol_info` event `--headless` emits (version 2), and
+ * while a turn runs the same BrainEvent stream is forwarded verbatim.
+ *
+ * Wire format (client → server requests carry `id`; server → client
+ * unsolicited events carry `type` — clients demultiplex on that):
+ *
+ *   → {"id":1,"method":"session.create","params":{"workspaceRoot":"…"}}
+ *   ← {"id":1,"ok":true,"result":{"sessionId":"…"}}
+ *   → {"id":2,"method":"run.turn","params":{"sessionId":"…", …turn input
+ *      same shape as a headless single turn (HeadlessOptions)}}
+ *   ← {"id":2,"ok":true,"result":{"exitCode":0}}
+ *   → {"id":3,"method":"session.dispose","params":{"sessionId":"…"}}
+ *   ← {"id":3,"ok":true,"result":{"disposed":true}}
+ *   → {"id":4,"method":"session.steer","params":{"sessionId":"…","text":"…",
+ *      "controlId":"s1"}}                      (t32, protocol v2 unchanged)
+ *   ← {"id":4,"ok":true,"result":{"accepted":true,"controlId":"s1",…}}
+ *   ← {"type":"control_accepted","controlId":"s1","controlType":"steer",…}
+ *      (unsolicited §24 acks ride the same stdout; `control_applied`
+ *      arrives later, when the turn's SteeringObserver drains the queue)
+ *   → {"id":5,"method":"session.cancel","params":{"sessionId":"…","reason":"…"}}
+ *   ← {"id":5,"ok":true,"result":{"accepted":true,"delivered":true,…}}
+ *   steer/cancel on a session with no running turn → ok:true with
+ *   {"accepted":false,"outcome":"already_finished"} (explicit noop, no crash)
+ *   unknown method  → {"id":n,"ok":false,"error":{"code":"unknown_method",…}}
+ *   unknown session → {"id":n,"ok":false,"error":{"code":"unknown_session",…}}
+ *   malformed line  → {"id":null,"ok":false,"error":{"code":"bad_json",…}}
+ *                     (the server process NEVER exits on bad input)
+ *
+ * Error codes: bad_json · bad_request · unknown_method · unknown_session ·
+ * method_failed. Malformed JSON and handler failures are contained — the
+ * process keeps serving the next line.
+ *
+ * Ownership (the whole point of Pilastro B): the SERVER owns per-workspace
+ * services (one LspManager + policy cache per resolved workspace root —
+ * a second session on the same workspace does NOT respawn them) and the
+ * completion-proof persistence (a client disconnect never cancels an
+ * in-flight/queued proof write). The in-process stdin control plane is
+ * suppressed in this mode (ZELARI_SERVE_HARNESS=1) because the transport
+ * owns stdin. `--headless` remains the in-process CI client of the same
+ * kernel via runOneTurn — no fork, same code path.
+ */
+import { createInterface } from 'node:readline';
+import { randomUUID } from 'node:crypto';
+import { HarnessAppServer } from '@zelari/core/harness';
+import { controlAcceptedEvent, controlAppliedEvent, protocolInfoEvent } from '../headless/protocol.js';
+import { runOneTurn } from '../headless/runOneTurn.js';
+import { clearSessionTurnControl, getLiveTurnControl, runWithSession, } from './sessionControl.js';
+import { resolveHeadlessKey, resolveHeadlessProvider } from '../headless.js';
+import { LspManager } from '../lsp/manager.js';
+import { writeCompletionProofDetailed } from '../kraken/completionProof.js';
+import { setActiveProofPersistenceSurface } from '../kraken/completionProofPersist.js';
+import { checkStrictPolicyLoad } from '../headless/policyGate.js';
+import { activePolicyLoadMode, setActivePolicyLoadSurface } from '../safety/policyLoadMode.js';
+/**
+ * Real per-workspace services: one LspManager anchored to the workspace,
+ * the strict policy-load snapshot (cached per root by the kernel), and the
+ * durable completion-proof writer (atomic tmp→fsync→rename, CLI-owned).
+ */
+export function createCliWorkspaceServices(workspaceRoot) {
+    const mode = activePolicyLoadMode();
+    const policyLoad = checkStrictPolicyLoad(workspaceRoot, { mode });
+    // Extra host fields ride along; the kernel sees the PolicyCacheLike shape.
+    const policyCache = {
+        workspaceRoot,
+        loadedAt: Date.now(),
+        mode,
+        blocked: policyLoad.blocked,
+        warnings: policyLoad.warnings,
+    };
+    return {
+        lspManager: new LspManager({ cwd: workspaceRoot }),
+        policyCache,
+        completionProofWriter: async (request) => {
+            await writeCompletionProofDetailed(request.payload, {
+                baseDir: request.baseDir,
+                meta: { surface: request.surface, sessionId: request.sessionId },
+            });
+        },
+    };
+}
+/**
+ * Real turn implementation: provider/key/stream resolution happens ONCE
+ * per server (mirroring runHeadless: one process, one key), then each
+ * run.turn is a runOneTurn call — the exact `--headless` code path.
+ */
+export function createCliRunTurn() {
+    let streamPromise = null;
+    const ensureStream = () => {
+        if (!streamPromise) {
+            streamPromise = (async () => {
+                const { provider, model } = resolveHeadlessProvider({});
+                const key = await resolveHeadlessKey(provider);
+                if ('error' in key)
+                    throw new Error(key.error);
+                const { buildProviderStream } = await import('../provider/resolveStream.js');
+                const stream = buildProviderStream({
+                    providerId: provider,
+                    apiKey: key.apiKey,
+                    baseUrl: key.baseUrl,
+                    model,
+                });
+                return { provider, model, stream };
+            })();
+            streamPromise.catch(() => {
+                streamPromise = null; // allow a retry after the key materializes
+            });
+        }
+        return streamPromise;
+    };
+    return async (input, deps) => {
+        const { provider, model, stream } = await ensureStream();
+        // Transport-boundary validation: a headless single turn needs a task.
+        // Everything else arrives as untrusted JSON, so the payload is cast
+        // once (unknown → Omit) and the required/forced fields are set here.
+        const turnInput = input;
+        if (typeof turnInput.task !== 'string' || turnInput.task.length === 0) {
+            throw new Error('run.turn requires a non-empty string `task`');
+        }
+        const opts = {
+            ...input,
+            task: turnInput.task,
+            mode: (typeof turnInput.mode === 'string'
+                ? turnInput.mode
+                : 'kraken'),
+            output: 'json', // NDJSON transport: BrainEvents ride the same stdout
+        };
+        const exitCode = await runOneTurn(opts, provider, model, stream);
+        void deps.services.policyCache.workspaceRoot;
+        return { exitCode };
+    };
+}
+/** Typed unknown_session envelope (shared by the session-scoped methods). */
+function unknownSessionEnvelope(id, rawSessionId) {
+    return {
+        id,
+        ok: false,
+        error: { code: 'unknown_session', message: `no session '${String(rawSessionId ?? '')}'` },
+    };
+}
+/**
+ * Boot the kernel + NDJSON transport. Injectable I/O keeps this testable
+ * without spawning a process; `runHarnessServer()` below is the stdio entry.
+ */
+export function startHarnessServer(options = {}) {
+    const io = options.io ?? { input: process.stdin, output: process.stdout };
+    const server = new HarnessAppServer({
+        createWorkspaceServices: options.createWorkspaceServices ?? createCliWorkspaceServices,
+    });
+    const write = (line) => {
+        try {
+            io.output.write(line + '\n');
+        }
+        catch {
+            /* transport is gone (EPIPE) — the kernel outlives the client */
+        }
+    };
+    const respond = (envelope) => {
+        write(JSON.stringify(envelope));
+    };
+    const dispatch = async (req) => {
+        if (typeof req.method !== 'string') {
+            return { id: req.id ?? null, ok: false, error: { code: 'bad_request', message: 'missing method' } };
+        }
+        const params = req.params ?? {};
+        switch (req.method) {
+            case 'session.create': {
+                const root = typeof params.workspaceRoot === 'string' ? params.workspaceRoot : process.cwd();
+                const session = server.createSession({ workspaceRoot: root, runTurn: options.runTurn ?? createCliRunTurn() });
+                return { id: req.id ?? null, ok: true, result: { sessionId: session.id, workspaceRoot: session.workspaceRoot } };
+            }
+            case 'run.turn': {
+                const session = server.getSession(String(params.sessionId ?? ''));
+                if (!session) {
+                    return { id: req.id ?? null, ok: false, error: { code: 'unknown_session', message: `no session '${String(params.sessionId ?? '')}'` } };
+                }
+                const { sessionId: _ignored, ...turnInput } = params;
+                // t32: carry the session id into runOneTurn's control-plane
+                // registration via async context (same call-chain, no new
+                // HeadlessOptions field). Settlement cleanup drops the registration
+                // even on a crash path, so later steers get the honest
+                // already_finished noop instead of targeting a dead queue.
+                const result = await runWithSession(session.id, async () => {
+                    try {
+                        return await session.runTurn(turnInput);
+                    }
+                    finally {
+                        clearSessionTurnControl(session.id);
+                    }
+                });
+                return { id: req.id ?? null, ok: true, result };
+            }
+            case 'session.dispose': {
+                const session = server.getSession(String(params.sessionId ?? ''));
+                if (!session) {
+                    return { id: req.id ?? null, ok: false, error: { code: 'unknown_session', message: `no session '${String(params.sessionId ?? '')}'` } };
+                }
+                await session.dispose();
+                return { id: req.id ?? null, ok: true, result: { disposed: true } };
+            }
+            // t32: session-scoped steer/cancel over the SAME protocol v2 — no new
+            // protocol version, same §24 ack events the stdin bridge emits.
+            case 'session.steer':
+            case 'session.cancel': {
+                const isCancel = req.method === 'session.cancel';
+                const session = server.getSession(String(params.sessionId ?? ''));
+                if (!session) {
+                    return unknownSessionEnvelope(req.id ?? null, params.sessionId);
+                }
+                const controlId = typeof params.controlId === 'string' && params.controlId.length > 0
+                    ? params.controlId
+                    : `ctrl-${randomUUID()}`;
+                const controlType = isCancel ? 'cancel' : 'steer';
+                // Shape validation BEFORE state checks: a malformed control is a
+                // bad_request regardless of session/turn state (same shape rule as
+                // the stdin control reader, controlReader.ts).
+                const text = params.text;
+                if (!isCancel && (typeof text !== 'string' || text.trim().length === 0)) {
+                    return {
+                        id: req.id ?? null,
+                        ok: false,
+                        error: { code: 'bad_request', message: 'session.steer requires a non-empty string `text`' },
+                    };
+                }
+                const live = getLiveTurnControl(session.id);
+                if (!live) {
+                    // Known session, but no turn is running (never started, already
+                    // completed or cancelled): EXPLICIT noop result — never a crash,
+                    // never a fake acceptance (§24: never pretend a control applied).
+                    return {
+                        id: req.id ?? null,
+                        ok: true,
+                        result: { accepted: false, outcome: 'already_finished', controlId, controlType },
+                    };
+                }
+                if (isCancel) {
+                    // Nothing drains cancel events mid-run, so application goes
+                    // through the cooperative harness cancel hook directly; the queue
+                    // never holds an undrainable cancel.
+                    const delivered = live.cancel();
+                    if (delivered) {
+                        write(JSON.stringify(controlAppliedEvent(controlId, 'cancel', 'cancel')));
+                    }
+                    return {
+                        id: req.id ?? null,
+                        ok: true,
+                        result: { accepted: true, delivered, controlId, controlType },
+                    };
+                }
+                // §24: enqueue = accepted; the control_applied ack (boundary
+                // turn-end) is emitted by the turn when SteeringObserver drains.
+                live.queue.enqueue({ type: 'steer', id: controlId, text: text, ts: Date.now() });
+                write(JSON.stringify(controlAcceptedEvent(controlId, 'steer')));
+                return {
+                    id: req.id ?? null,
+                    ok: true,
+                    result: { accepted: true, controlId, controlType, boundary: 'turn-end' },
+                };
+            }
+            default:
+                return {
+                    id: req.id ?? null,
+                    ok: false,
+                    error: { code: 'unknown_method', message: `unsupported method '${req.method}'` },
+                };
+        }
+    };
+    const rl = createInterface({ input: io.input });
+    // Boot handshake — same protocol_info envelope/version as `--headless`.
+    write(JSON.stringify(protocolInfoEvent()));
+    rl.on('line', (line) => {
+        const trimmed = line.trim();
+        if (trimmed === '')
+            return;
+        let req;
+        try {
+            req = JSON.parse(trimmed);
+            if (req === null || typeof req !== 'object')
+                throw new Error('not an object');
+        }
+        catch (err) {
+            respond({
+                id: null,
+                ok: false,
+                error: {
+                    code: 'bad_json',
+                    message: `malformed JSON line skipped: ${err instanceof Error ? err.message : String(err)}`,
+                },
+            });
+            return; // server keeps running (DoD e)
+        }
+        void dispatch(req).then((envelope) => respond(envelope), (err) => respond({
+            id: (req.id ?? null),
+            ok: false,
+            error: {
+                code: 'method_failed',
+                message: err instanceof Error ? err.message : String(err),
+            },
+        }));
+    });
+    return {
+        server,
+        close() {
+            // Kernel teardown FIRST-class: pending completion-proof writes are
+            // awaited (never cancelled) before services die.
+            rl.close();
+            io.input.pause();
+            return server.dispose();
+        },
+    };
+}
+/** Process entry for `--serve-harness`: stdio transport + host pre-flight. */
+export async function runHarnessServer() {
+    // Same host registration runHeadless performs before any registry exists.
+    setActivePolicyLoadSurface('headless');
+    setActiveProofPersistenceSurface('headless');
+    // runOneTurn checks this to keep its paws off stdin (transport-owned).
+    process.env.ZELARI_SERVE_HARNESS = '1';
+    const started = startHarnessServer();
+    await new Promise((resolvePromise) => {
+        const finish = () => void started.close().then(() => resolvePromise());
+        process.stdin.once('end', finish);
+        process.stdin.once('close', finish);
+        process.once('SIGINT', finish);
+        process.once('SIGTERM', finish);
+    });
+}
+//# sourceMappingURL=harnessServer.js.map

package/dist/cli/serve/harnessServer.js.map

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

package/dist/cli/serve/sessionControl.js

@@ -0,0 +1,67 @@
+/**
+ * Session-scoped control plane for the harness App Server (t32, Pilastro B
+ * residuo).
+ *
+ * In `--serve-harness` mode the NDJSON transport owns stdin, so the headless
+ * stdin control plane (controlBridge.ts) cannot serve per-session
+ * steer/cancel. Instead:
+ *   - the server's `run.turn` dispatch carries the harness sessionId down the
+ *     turn's async call-chain via AsyncLocalStorage (no new HeadlessOptions
+ *     field, CLI/protocol surface unchanged, concurrent sessions isolated);
+ *   - runOneTurn (serve mode ONLY) registers its per-turn RuntimeControlQueue
+ *     + cooperative cancel hook under that session id;
+ *   - the server answers `session.steer` / `session.cancel` NDJSON methods by
+ *     targeting the live registration, with protocol-v2 acks (§24:
+ *     accepted ≠ applied — `control_applied` still fires from the queue drain
+ *     / the cancel hook, never fabricated by this module).
+ *
+ * Plain `--headless` never dispatches through runWithSession, so
+ * registerLiveTurnControl returns undefined there and behavior is unchanged.
+ */
+import { AsyncLocalStorage } from 'node:async_hooks';
+const dispatchContext = new AsyncLocalStorage();
+/** Live registry: harness sessionId → its running turn control (if any). */
+const liveTurns = new Map();
+/** Run `fn` inside a session dispatch context (server → runOneTurn). */
+export function runWithSession(sessionId, fn) {
+    return dispatchContext.run({ sessionId, token: {} }, fn);
+}
+/**
+ * runOneTurn (serve mode) registers the per-turn control surface. Returns
+ * the unregister fn (identity-guarded, safe across back-to-back turns on
+ * the same session), or undefined when NOT dispatched by the harness server
+ * — plain `--headless` keeps its stdin control plane, zero behavior change.
+ */
+export function registerLiveTurnControl(control) {
+    const store = dispatchContext.getStore();
+    if (!store)
+        return undefined;
+    const registered = { ...control, token: store.token };
+    liveTurns.set(store.sessionId, registered);
+    return () => {
+        if (liveTurns.get(store.sessionId) === registered) {
+            liveTurns.delete(store.sessionId);
+        }
+    };
+}
+/** The live turn control for a session, when one is running. */
+export function getLiveTurnControl(sessionId) {
+    return liveTurns.get(sessionId);
+}
+/**
+ * Server-side settlement cleanup (called inside runWithSession, after the
+ * turn promise settles). Drops the registration of THIS dispatch only —
+ * token-matched, so a concurrent newer turn on the same session survives.
+ * Covers the crash path where the turn impl never unregistered, keeping the
+ * `already_finished` noop honest instead of steering a dead queue.
+ */
+export function clearSessionTurnControl(sessionId) {
+    const store = dispatchContext.getStore();
+    if (!store || store.sessionId !== sessionId)
+        return;
+    const registered = liveTurns.get(sessionId);
+    if (registered && registered.token === store.token) {
+        liveTurns.delete(sessionId);
+    }
+}
+//# sourceMappingURL=sessionControl.js.map

package/dist/cli/serve/sessionControl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionControl.js","sourceRoot":"","sources":["../../../src/cli/serve/sessionControl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAoBrD,MAAM,eAAe,GAAG,IAAI,iBAAiB,EAAwC,CAAC;AAEtF,4EAA4E;AAC5E,MAAM,SAAS,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEpD,wEAAwE;AACxE,MAAM,UAAU,cAAc,CAAI,SAAiB,EAAE,EAAW;IAC9D,OAAO,eAAe,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAY,EAAE,EAAE,EAAE,CAAC,CAAC;AACrE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,OAAwB;IAExB,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;IACzC,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,UAAU,GAAmB,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IACtE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC3C,OAAO,GAAG,EAAE;QACV,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,UAAU,EAAE,CAAC;YAClD,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,kBAAkB,CAChC,SAAiB;IAEjB,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAClC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,uBAAuB,CAAC,SAAiB;IACvD,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;IACzC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO;IACpD,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5C,IAAI,UAAU,IAAI,UAAU,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;QACnD,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}