@bastani/atomic 0.9.10 → 0.9.11-alpha.10

package/dist/modes/interactive-engine/engine-health.d.ts

@@ -0,0 +1,107 @@
+import { type ActivityWatchdogDiagnostic } from "./activity-watchdog.ts";
+import type { InteractiveEngineGenerationEnded } from "./engine-generation.ts";
+export type EngineDiagnosticListener = (diagnostic: ActivityWatchdogDiagnostic) => void;
+export interface EngineHealthDeps {
+    /** Terminate the current (or hung replacement) engine child. */
+    stop(): Promise<void>;
+    /** Replace the engine child and reload host state from it. */
+    restart(): Promise<void>;
+    /** Drop streaming/compaction/callback activity owned by the dead generation. */
+    clearActivity(): void;
+}
+export declare const UNEXPECTED_ENGINE_LOSS_NOTICE = "Interactive engine stopped unexpectedly; restarting.";
+export declare const UNRESPONSIVE_ENGINE_NOTICE = "Interactive engine is not responding; restarting.";
+/**
+ * Keep the actionable transport cause in the recovery notice. Child stderr can
+ * contain provider output or secrets, so only the bounded summary before the
+ * RpcClient's `. Stderr:` suffix is safe to render.
+ */
+export declare function formatUnexpectedEngineLossNotice(event: InteractiveEngineGenerationEnded): string;
+export interface EngineHealthOptions {
+    /** Injectable clock so tests can cross the unresponsive threshold instantly. */
+    now?: () => number;
+}
+/**
+ * Engine health surface: diagnostic fan-out plus single-flight recovery.
+ *
+ * Recovery has exactly two entry points, deliberately separate:
+ *
+ *  - {@link handleGenerationEnded} runs ONE automatic replacement attempt after
+ *    an unexpected loss of a generation. Expected losses (explicit stop,
+ *    deliberate generation replacement, host shutdown) never restart.
+ *  - {@link terminate} is the explicit user escape hatch (Ctrl+C). It force-stops
+ *    first, so it can rescue a replacement child that is hung waiting for
+ *    readiness instead of joining that pending promise.
+ *
+ * Neither path is reachable from an interrupt: pressing Escape only requests the
+ * engine's own cooperative abort and waits for it.
+ */
+export declare class EngineHealthController {
+    private readonly deps;
+    private readonly now;
+    private readonly listeners;
+    private pending;
+    private unresponsive;
+    private abortStartedAt;
+    private attempt;
+    /** When the current replacement attempt began; undefined once it settles. */
+    private attemptStartedAt;
+    private attemptId;
+    private forceStoppedAttemptId;
+    private rescueRequested;
+    /**
+     * Latched when a replacement failed on its own. Automatic recovery stays
+     * single-shot, but the user's Ctrl+C must remain able to try again: without
+     * this the host would be left with no engine, no pending attempt, no overdue
+     * abort, and no watchdog flag, so nothing could arm the escape hatch.
+     */
+    private replacementNeeded;
+    private termination;
+    /** Set once disposal begins; joins the in-flight attempt and termination. */
+    private shutdownPromise;
+    private stopped;
+    constructor(deps: EngineHealthDeps, options?: EngineHealthOptions);
+    onDiagnostic(listener: EngineDiagnosticListener): () => void;
+    /** Publish a diagnostic produced elsewhere (watchdog, transport, bridge). */
+    publish(diagnostic: ActivityWatchdogDiagnostic): void;
+    /** A heartbeat proves the child's loop turns again, so clear a reported stall. */
+    clearUnresponsive(): void;
+    markCooperativeAbortStarted(): void;
+    markCooperativeAbortSettled(): void;
+    /**
+     * True only when the engine is provably not answering:
+     *
+     *  - the heartbeat watchdog declared it unresponsive;
+     *  - a replacement failed on its own and the host has no engine;
+     *  - a cooperative abort has been outstanding past the unresponsive threshold
+     *    (a child whose loop still turns but is deadlocked);
+     *  - a replacement has been waiting for `engine_ready` past that threshold.
+     *
+     * The readiness case has no watchdog coverage at all: a child stopped before
+     * readiness emits no heartbeat and no diagnostic, and `start()` waits without
+     * a deadline by design. Crossing a threshold arms nothing on its own — it
+     * only decides whether a deliberate Ctrl+C escalates — and all of this stays
+     * false for a healthy engine so a stray second Ctrl+C cannot replace one.
+     */
+    needsExplicitTermination(): boolean;
+    private isOverdue;
+    isRecovering(): boolean;
+    /**
+     * Stop accepting recovery work and join whatever is still running.
+     *
+     * Disposal must not return while a replacement is between its own stop and
+     * its spawn: the client's restart permit is voided by `deps.stop()`, and the
+     * attempt is then awaited so no child, and no host initialization, outlives
+     * teardown. Idempotent, and bounded by the client's own stop deadlines.
+     */
+    shutdown(): Promise<void>;
+    handleGenerationEnded(event: InteractiveEngineGenerationEnded): void;
+    terminate(): Promise<void>;
+    /** Force-stop an overdue replacement, at most once per attempt. */
+    private rescueOverdueAttempt;
+    private stopQuietly;
+    private recover;
+    private notice;
+    private deliver;
+}
+//# sourceMappingURL=engine-health.d.ts.map

package/dist/modes/interactive-engine/engine-health.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"engine-health.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-health.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAA0B,MAAM,wBAAwB,CAAC;AACjG,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE/E,MAAM,MAAM,wBAAwB,GAAG,CAAC,UAAU,EAAE,0BAA0B,KAAK,IAAI,CAAC;AAExF,MAAM,WAAW,gBAAgB;IAChC,gEAAgE;IAChE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,8DAA8D;IAC9D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,gFAAgF;IAChF,aAAa,IAAI,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,6BAA6B,yDAAyD,CAAC;AACpG,eAAO,MAAM,0BAA0B,sDAAsD,CAAC;AAE9F;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,gCAAgC,GAAG,MAAM,CAQhG;AAED,MAAM,WAAW,mBAAmB;IACnC,gFAAgF;IAChF,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,sBAAsB;IAClC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmB;IACxC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IACjE,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,OAAO,CAA4B;IAC3C,6EAA6E;IAC7E,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,qBAAqB,CAAqB;IAClD,OAAO,CAAC,eAAe,CAAS;IAChC;;;;;OAKG;IACH,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,WAAW,CAA4B;IAC/C,6EAA6E;IAC7E,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,OAAO,CAAS;IAExB,YAAY,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,mBAAmB,EAGhE;IAED,YAAY,CAAC,QAAQ,EAAE,wBAAwB,GAAG,MAAM,IAAI,CAI3D;IAED,6EAA6E;IAC7E,OAAO,CAAC,UAAU,EAAE,0BAA0B,GAAG,IAAI,CAGpD;IAED,kFAAkF;IAClF,iBAAiB,IAAI,IAAI,CAExB;IAED,2BAA2B,IAAI,IAAI,CAElC;IAED,2BAA2B,IAAI,IAAI,CAElC;IAED;;;;;;;;;;;;;;OAcG;IACH,wBAAwB,IAAI,OAAO,CAGlC;IAED,OAAO,CAAC,SAAS;IAIjB,YAAY,IAAI,OAAO,CAEtB;IAED;;;;;;;OAOG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAWxB;IAED,qBAAqB,CAAC,KAAK,EAAE,gCAAgC,GAAG,IAAI,CAYnE;IAED,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAiCzB;IAED,mEAAmE;IACnE,OAAO,CAAC,oBAAoB;YASd,WAAW;IASzB,OAAO,CAAC,OAAO;IA6Cf,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,OAAO;CAIf"}

package/dist/modes/interactive-engine/engine-health.js

@@ -0,0 +1,250 @@
+import { ENGINE_UNRESPONSIVE_MS } from "./activity-watchdog.js";
+export const UNEXPECTED_ENGINE_LOSS_NOTICE = "Interactive engine stopped unexpectedly; restarting.";
+export const UNRESPONSIVE_ENGINE_NOTICE = "Interactive engine is not responding; restarting.";
+/**
+ * Keep the actionable transport cause in the recovery notice. Child stderr can
+ * contain provider output or secrets, so only the bounded summary before the
+ * RpcClient's `. Stderr:` suffix is safe to render.
+ */
+export function formatUnexpectedEngineLossNotice(event) {
+    const firstLine = event.error.message.split(/\r?\n/u, 1)[0]?.trim() ?? "";
+    const stderrIndex = firstLine.indexOf(". Stderr:");
+    const withoutStderr = (stderrIndex === -1 ? firstLine : firstLine.slice(0, stderrIndex)).trim();
+    const summary = withoutStderr.slice(0, 240).replace(/[.!?]+$/u, "");
+    return summary
+        ? `${UNEXPECTED_ENGINE_LOSS_NOTICE} Cause (${event.kind}): ${summary}.`
+        : `${UNEXPECTED_ENGINE_LOSS_NOTICE} Cause: ${event.kind}.`;
+}
+/**
+ * Engine health surface: diagnostic fan-out plus single-flight recovery.
+ *
+ * Recovery has exactly two entry points, deliberately separate:
+ *
+ *  - {@link handleGenerationEnded} runs ONE automatic replacement attempt after
+ *    an unexpected loss of a generation. Expected losses (explicit stop,
+ *    deliberate generation replacement, host shutdown) never restart.
+ *  - {@link terminate} is the explicit user escape hatch (Ctrl+C). It force-stops
+ *    first, so it can rescue a replacement child that is hung waiting for
+ *    readiness instead of joining that pending promise.
+ *
+ * Neither path is reachable from an interrupt: pressing Escape only requests the
+ * engine's own cooperative abort and waits for it.
+ */
+export class EngineHealthController {
+    constructor(deps, options) {
+        this.listeners = new Set();
+        this.pending = [];
+        this.unresponsive = false;
+        this.attemptId = 0;
+        this.rescueRequested = false;
+        /**
+         * Latched when a replacement failed on its own. Automatic recovery stays
+         * single-shot, but the user's Ctrl+C must remain able to try again: without
+         * this the host would be left with no engine, no pending attempt, no overdue
+         * abort, and no watchdog flag, so nothing could arm the escape hatch.
+         */
+        this.replacementNeeded = false;
+        this.stopped = false;
+        this.deps = deps;
+        this.now = options?.now ?? (() => performance.now());
+    }
+    onDiagnostic(listener) {
+        for (const diagnostic of this.pending.splice(0))
+            listener(diagnostic);
+        this.listeners.add(listener);
+        return () => this.listeners.delete(listener);
+    }
+    /** Publish a diagnostic produced elsewhere (watchdog, transport, bridge). */
+    publish(diagnostic) {
+        if (diagnostic.level === "unresponsive" && diagnostic.source === "watchdog")
+            this.unresponsive = true;
+        this.deliver(diagnostic);
+    }
+    /** A heartbeat proves the child's loop turns again, so clear a reported stall. */
+    clearUnresponsive() {
+        this.unresponsive = false;
+    }
+    markCooperativeAbortStarted() {
+        this.abortStartedAt ??= this.now();
+    }
+    markCooperativeAbortSettled() {
+        this.abortStartedAt = undefined;
+    }
+    /**
+     * True only when the engine is provably not answering:
+     *
+     *  - the heartbeat watchdog declared it unresponsive;
+     *  - a replacement failed on its own and the host has no engine;
+     *  - a cooperative abort has been outstanding past the unresponsive threshold
+     *    (a child whose loop still turns but is deadlocked);
+     *  - a replacement has been waiting for `engine_ready` past that threshold.
+     *
+     * The readiness case has no watchdog coverage at all: a child stopped before
+     * readiness emits no heartbeat and no diagnostic, and `start()` waits without
+     * a deadline by design. Crossing a threshold arms nothing on its own — it
+     * only decides whether a deliberate Ctrl+C escalates — and all of this stays
+     * false for a healthy engine so a stray second Ctrl+C cannot replace one.
+     */
+    needsExplicitTermination() {
+        if (this.unresponsive || this.replacementNeeded)
+            return true;
+        return this.isOverdue(this.abortStartedAt) || this.isOverdue(this.attemptStartedAt);
+    }
+    isOverdue(startedAt) {
+        return startedAt !== undefined && this.now() - startedAt >= ENGINE_UNRESPONSIVE_MS;
+    }
+    isRecovering() {
+        return this.attempt !== undefined || this.termination !== undefined;
+    }
+    /**
+     * Stop accepting recovery work and join whatever is still running.
+     *
+     * Disposal must not return while a replacement is between its own stop and
+     * its spawn: the client's restart permit is voided by `deps.stop()`, and the
+     * attempt is then awaited so no child, and no host initialization, outlives
+     * teardown. Idempotent, and bounded by the client's own stop deadlines.
+     */
+    shutdown() {
+        if (this.shutdownPromise)
+            return this.shutdownPromise;
+        this.stopped = true;
+        this.rescueRequested = false;
+        this.replacementNeeded = false;
+        this.shutdownPromise = (async () => {
+            await this.stopQuietly();
+            await this.attempt?.catch(() => { });
+            await this.termination?.catch(() => { });
+        })();
+        return this.shutdownPromise;
+    }
+    handleGenerationEnded(event) {
+        this.deps.clearActivity();
+        if (event.expected || this.stopped)
+            return;
+        if (this.attempt) {
+            // A newer child died while the replacement attempt was still running, so
+            // that attempt cannot leave a viable generation behind. Latch instead of
+            // restarting again: automatic recovery stays single-shot, and Ctrl+C is
+            // armed once the in-flight attempt settles.
+            this.replacementNeeded = true;
+            return;
+        }
+        void this.recover(formatUnexpectedEngineLossNotice(event)).catch(() => { });
+    }
+    terminate() {
+        // A repeat Ctrl+C must be able to rescue a replacement that is itself
+        // overdue, instead of joining the in-flight termination forever. The stop
+        // is fenced by attempt id so repeated presses cannot stack restarts onto a
+        // healthy replacement.
+        if (this.termination) {
+            this.rescueOverdueAttempt();
+            return this.termination;
+        }
+        const inFlight = this.attempt;
+        // The attempt this press supersedes fails by our own hand, so its failure is
+        // expected rather than something to report to the user.
+        if (inFlight)
+            this.forceStoppedAttemptId = this.attemptId;
+        const run = (async () => {
+            this.deps.clearActivity();
+            this.notice(UNRESPONSIVE_ENGINE_NOTICE);
+            await this.stopQuietly();
+            // An automatic attempt swallows its own errors, so this only waits for it
+            // to release the single-flight slot.
+            if (inFlight)
+                await inFlight;
+            await this.recover(undefined);
+            // Each user-forced stop of an overdue replacement earns exactly one more
+            // replacement attempt, so the escape hatch stays usable indefinitely.
+            while (this.rescueRequested && !this.stopped) {
+                this.rescueRequested = false;
+                this.notice(UNRESPONSIVE_ENGINE_NOTICE);
+                await this.recover(undefined);
+            }
+        })().finally(() => {
+            if (this.termination === run)
+                this.termination = undefined;
+        });
+        this.termination = run;
+        return run;
+    }
+    /** Force-stop an overdue replacement, at most once per attempt. */
+    rescueOverdueAttempt() {
+        if (!this.isOverdue(this.attemptStartedAt))
+            return false;
+        if (this.forceStoppedAttemptId === this.attemptId)
+            return false;
+        this.forceStoppedAttemptId = this.attemptId;
+        this.rescueRequested = true;
+        void this.stopQuietly();
+        return true;
+    }
+    async stopQuietly() {
+        try {
+            await this.deps.stop();
+        }
+        catch {
+            // A stop failure must not strand the escape hatch: the restart still
+            // replaces the child and reports any real failure.
+        }
+    }
+    recover(notice) {
+        // Order matters: after shutdown no caller may join, or revive, an attempt
+        // that still happens to occupy the slot.
+        if (this.stopped)
+            return Promise.resolve();
+        if (this.attempt)
+            return this.attempt;
+        if (notice)
+            this.notice(notice);
+        this.attemptId += 1;
+        const id = this.attemptId;
+        this.attemptStartedAt = this.now();
+        this.rescueRequested = false;
+        // A new attempt is under way, so the previous failure is no longer the
+        // reason to arm Ctrl+C. It re-arms below only if this attempt fails too.
+        this.replacementNeeded = false;
+        // The watchdog verdict belonged to the generation being replaced. A fresh
+        // child emits no heartbeat until it is ready, so leaving the latch set
+        // would keep `needsExplicitTermination()` true through the whole pre-ready
+        // window and let the first Ctrl+C stop a replacement that never misbehaved.
+        // Only this child's own heartbeat, or its own stall, may set it again.
+        this.unresponsive = false;
+        const run = this.deps
+            .restart()
+            .catch((error) => {
+            // An attempt the user deliberately stopped, or one cancelled by
+            // disposal, did not fail on its own.
+            if (this.forceStoppedAttemptId === id || this.stopped)
+                return;
+            // Keep Ctrl+C armed: automatic recovery is single-shot, but the user
+            // must be able to ask for another attempt after a real failure.
+            this.replacementNeeded = true;
+            // A concrete failure, so no operational source: this one surfaces.
+            this.deliver({
+                activity: undefined,
+                elapsedMs: 0,
+                level: "unresponsive",
+                message: `Interactive engine restart failed: ${error.message}`,
+            });
+        })
+            .finally(() => {
+            if (this.attempt !== run)
+                return;
+            this.attempt = undefined;
+            this.attemptStartedAt = undefined;
+        });
+        this.attempt = run;
+        return run;
+    }
+    notice(message) {
+        this.deliver({ activity: undefined, elapsedMs: 0, level: "blocking", message, source: "recovery" });
+    }
+    deliver(diagnostic) {
+        if (this.listeners.size === 0)
+            this.pending.push(diagnostic);
+        for (const listener of this.listeners)
+            listener(diagnostic);
+    }
+}
+//# sourceMappingURL=engine-health.js.map

package/dist/modes/interactive-engine/engine-health.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"engine-health.js","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-health.ts"],"names":[],"mappings":"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","sourcesContent":["import { type ActivityWatchdogDiagnostic, ENGINE_UNRESPONSIVE_MS } from \"./activity-watchdog.ts\";\nimport type { InteractiveEngineGenerationEnded } from \"./engine-generation.ts\";\n\nexport type EngineDiagnosticListener = (diagnostic: ActivityWatchdogDiagnostic) => void;\n\nexport interface EngineHealthDeps {\n\t/** Terminate the current (or hung replacement) engine child. */\n\tstop(): Promise<void>;\n\t/** Replace the engine child and reload host state from it. */\n\trestart(): Promise<void>;\n\t/** Drop streaming/compaction/callback activity owned by the dead generation. */\n\tclearActivity(): void;\n}\n\nexport const UNEXPECTED_ENGINE_LOSS_NOTICE = \"Interactive engine stopped unexpectedly; restarting.\";\nexport const UNRESPONSIVE_ENGINE_NOTICE = \"Interactive engine is not responding; restarting.\";\n\n/**\n * Keep the actionable transport cause in the recovery notice. Child stderr can\n * contain provider output or secrets, so only the bounded summary before the\n * RpcClient's `. Stderr:` suffix is safe to render.\n */\nexport function formatUnexpectedEngineLossNotice(event: InteractiveEngineGenerationEnded): string {\n\tconst firstLine = event.error.message.split(/\\r?\\n/u, 1)[0]?.trim() ?? \"\";\n\tconst stderrIndex = firstLine.indexOf(\". Stderr:\");\n\tconst withoutStderr = (stderrIndex === -1 ? firstLine : firstLine.slice(0, stderrIndex)).trim();\n\tconst summary = withoutStderr.slice(0, 240).replace(/[.!?]+$/u, \"\");\n\treturn summary\n\t\t? `${UNEXPECTED_ENGINE_LOSS_NOTICE} Cause (${event.kind}): ${summary}.`\n\t\t: `${UNEXPECTED_ENGINE_LOSS_NOTICE} Cause: ${event.kind}.`;\n}\n\nexport interface EngineHealthOptions {\n\t/** Injectable clock so tests can cross the unresponsive threshold instantly. */\n\tnow?: () => number;\n}\n\n/**\n * Engine health surface: diagnostic fan-out plus single-flight recovery.\n *\n * Recovery has exactly two entry points, deliberately separate:\n *\n *  - {@link handleGenerationEnded} runs ONE automatic replacement attempt after\n *    an unexpected loss of a generation. Expected losses (explicit stop,\n *    deliberate generation replacement, host shutdown) never restart.\n *  - {@link terminate} is the explicit user escape hatch (Ctrl+C). It force-stops\n *    first, so it can rescue a replacement child that is hung waiting for\n *    readiness instead of joining that pending promise.\n *\n * Neither path is reachable from an interrupt: pressing Escape only requests the\n * engine's own cooperative abort and waits for it.\n */\nexport class EngineHealthController {\n\tprivate readonly deps: EngineHealthDeps;\n\tprivate readonly now: () => number;\n\tprivate readonly listeners = new Set<EngineDiagnosticListener>();\n\tprivate pending: ActivityWatchdogDiagnostic[] = [];\n\tprivate unresponsive = false;\n\tprivate abortStartedAt: number | undefined;\n\tprivate attempt: Promise<void> | undefined;\n\t/** When the current replacement attempt began; undefined once it settles. */\n\tprivate attemptStartedAt: number | undefined;\n\tprivate attemptId = 0;\n\tprivate forceStoppedAttemptId: number | undefined;\n\tprivate rescueRequested = false;\n\t/**\n\t * Latched when a replacement failed on its own. Automatic recovery stays\n\t * single-shot, but the user's Ctrl+C must remain able to try again: without\n\t * this the host would be left with no engine, no pending attempt, no overdue\n\t * abort, and no watchdog flag, so nothing could arm the escape hatch.\n\t */\n\tprivate replacementNeeded = false;\n\tprivate termination: Promise<void> | undefined;\n\t/** Set once disposal begins; joins the in-flight attempt and termination. */\n\tprivate shutdownPromise: Promise<void> | undefined;\n\tprivate stopped = false;\n\n\tconstructor(deps: EngineHealthDeps, options?: EngineHealthOptions) {\n\t\tthis.deps = deps;\n\t\tthis.now = options?.now ?? (() => performance.now());\n\t}\n\n\tonDiagnostic(listener: EngineDiagnosticListener): () => void {\n\t\tfor (const diagnostic of this.pending.splice(0)) listener(diagnostic);\n\t\tthis.listeners.add(listener);\n\t\treturn () => this.listeners.delete(listener);\n\t}\n\n\t/** Publish a diagnostic produced elsewhere (watchdog, transport, bridge). */\n\tpublish(diagnostic: ActivityWatchdogDiagnostic): void {\n\t\tif (diagnostic.level === \"unresponsive\" && diagnostic.source === \"watchdog\") this.unresponsive = true;\n\t\tthis.deliver(diagnostic);\n\t}\n\n\t/** A heartbeat proves the child's loop turns again, so clear a reported stall. */\n\tclearUnresponsive(): void {\n\t\tthis.unresponsive = false;\n\t}\n\n\tmarkCooperativeAbortStarted(): void {\n\t\tthis.abortStartedAt ??= this.now();\n\t}\n\n\tmarkCooperativeAbortSettled(): void {\n\t\tthis.abortStartedAt = undefined;\n\t}\n\n\t/**\n\t * True only when the engine is provably not answering:\n\t *\n\t *  - the heartbeat watchdog declared it unresponsive;\n\t *  - a replacement failed on its own and the host has no engine;\n\t *  - a cooperative abort has been outstanding past the unresponsive threshold\n\t *    (a child whose loop still turns but is deadlocked);\n\t *  - a replacement has been waiting for `engine_ready` past that threshold.\n\t *\n\t * The readiness case has no watchdog coverage at all: a child stopped before\n\t * readiness emits no heartbeat and no diagnostic, and `start()` waits without\n\t * a deadline by design. Crossing a threshold arms nothing on its own — it\n\t * only decides whether a deliberate Ctrl+C escalates — and all of this stays\n\t * false for a healthy engine so a stray second Ctrl+C cannot replace one.\n\t */\n\tneedsExplicitTermination(): boolean {\n\t\tif (this.unresponsive || this.replacementNeeded) return true;\n\t\treturn this.isOverdue(this.abortStartedAt) || this.isOverdue(this.attemptStartedAt);\n\t}\n\n\tprivate isOverdue(startedAt: number | undefined): boolean {\n\t\treturn startedAt !== undefined && this.now() - startedAt >= ENGINE_UNRESPONSIVE_MS;\n\t}\n\n\tisRecovering(): boolean {\n\t\treturn this.attempt !== undefined || this.termination !== undefined;\n\t}\n\n\t/**\n\t * Stop accepting recovery work and join whatever is still running.\n\t *\n\t * Disposal must not return while a replacement is between its own stop and\n\t * its spawn: the client's restart permit is voided by `deps.stop()`, and the\n\t * attempt is then awaited so no child, and no host initialization, outlives\n\t * teardown. Idempotent, and bounded by the client's own stop deadlines.\n\t */\n\tshutdown(): Promise<void> {\n\t\tif (this.shutdownPromise) return this.shutdownPromise;\n\t\tthis.stopped = true;\n\t\tthis.rescueRequested = false;\n\t\tthis.replacementNeeded = false;\n\t\tthis.shutdownPromise = (async () => {\n\t\t\tawait this.stopQuietly();\n\t\t\tawait this.attempt?.catch(() => {});\n\t\t\tawait this.termination?.catch(() => {});\n\t\t})();\n\t\treturn this.shutdownPromise;\n\t}\n\n\thandleGenerationEnded(event: InteractiveEngineGenerationEnded): void {\n\t\tthis.deps.clearActivity();\n\t\tif (event.expected || this.stopped) return;\n\t\tif (this.attempt) {\n\t\t\t// A newer child died while the replacement attempt was still running, so\n\t\t\t// that attempt cannot leave a viable generation behind. Latch instead of\n\t\t\t// restarting again: automatic recovery stays single-shot, and Ctrl+C is\n\t\t\t// armed once the in-flight attempt settles.\n\t\t\tthis.replacementNeeded = true;\n\t\t\treturn;\n\t\t}\n\t\tvoid this.recover(formatUnexpectedEngineLossNotice(event)).catch(() => {});\n\t}\n\n\tterminate(): Promise<void> {\n\t\t// A repeat Ctrl+C must be able to rescue a replacement that is itself\n\t\t// overdue, instead of joining the in-flight termination forever. The stop\n\t\t// is fenced by attempt id so repeated presses cannot stack restarts onto a\n\t\t// healthy replacement.\n\t\tif (this.termination) {\n\t\t\tthis.rescueOverdueAttempt();\n\t\t\treturn this.termination;\n\t\t}\n\t\tconst inFlight = this.attempt;\n\t\t// The attempt this press supersedes fails by our own hand, so its failure is\n\t\t// expected rather than something to report to the user.\n\t\tif (inFlight) this.forceStoppedAttemptId = this.attemptId;\n\t\tconst run = (async () => {\n\t\t\tthis.deps.clearActivity();\n\t\t\tthis.notice(UNRESPONSIVE_ENGINE_NOTICE);\n\t\t\tawait this.stopQuietly();\n\t\t\t// An automatic attempt swallows its own errors, so this only waits for it\n\t\t\t// to release the single-flight slot.\n\t\t\tif (inFlight) await inFlight;\n\t\t\tawait this.recover(undefined);\n\t\t\t// Each user-forced stop of an overdue replacement earns exactly one more\n\t\t\t// replacement attempt, so the escape hatch stays usable indefinitely.\n\t\t\twhile (this.rescueRequested && !this.stopped) {\n\t\t\t\tthis.rescueRequested = false;\n\t\t\t\tthis.notice(UNRESPONSIVE_ENGINE_NOTICE);\n\t\t\t\tawait this.recover(undefined);\n\t\t\t}\n\t\t})().finally(() => {\n\t\t\tif (this.termination === run) this.termination = undefined;\n\t\t});\n\t\tthis.termination = run;\n\t\treturn run;\n\t}\n\n\t/** Force-stop an overdue replacement, at most once per attempt. */\n\tprivate rescueOverdueAttempt(): boolean {\n\t\tif (!this.isOverdue(this.attemptStartedAt)) return false;\n\t\tif (this.forceStoppedAttemptId === this.attemptId) return false;\n\t\tthis.forceStoppedAttemptId = this.attemptId;\n\t\tthis.rescueRequested = true;\n\t\tvoid this.stopQuietly();\n\t\treturn true;\n\t}\n\n\tprivate async stopQuietly(): Promise<void> {\n\t\ttry {\n\t\t\tawait this.deps.stop();\n\t\t} catch {\n\t\t\t// A stop failure must not strand the escape hatch: the restart still\n\t\t\t// replaces the child and reports any real failure.\n\t\t}\n\t}\n\n\tprivate recover(notice: string | undefined): Promise<void> {\n\t\t// Order matters: after shutdown no caller may join, or revive, an attempt\n\t\t// that still happens to occupy the slot.\n\t\tif (this.stopped) return Promise.resolve();\n\t\tif (this.attempt) return this.attempt;\n\t\tif (notice) this.notice(notice);\n\t\tthis.attemptId += 1;\n\t\tconst id = this.attemptId;\n\t\tthis.attemptStartedAt = this.now();\n\t\tthis.rescueRequested = false;\n\t\t// A new attempt is under way, so the previous failure is no longer the\n\t\t// reason to arm Ctrl+C. It re-arms below only if this attempt fails too.\n\t\tthis.replacementNeeded = false;\n\t\t// The watchdog verdict belonged to the generation being replaced. A fresh\n\t\t// child emits no heartbeat until it is ready, so leaving the latch set\n\t\t// would keep `needsExplicitTermination()` true through the whole pre-ready\n\t\t// window and let the first Ctrl+C stop a replacement that never misbehaved.\n\t\t// Only this child's own heartbeat, or its own stall, may set it again.\n\t\tthis.unresponsive = false;\n\t\tconst run = this.deps\n\t\t\t.restart()\n\t\t\t.catch((error: Error) => {\n\t\t\t\t// An attempt the user deliberately stopped, or one cancelled by\n\t\t\t\t// disposal, did not fail on its own.\n\t\t\t\tif (this.forceStoppedAttemptId === id || this.stopped) return;\n\t\t\t\t// Keep Ctrl+C armed: automatic recovery is single-shot, but the user\n\t\t\t\t// must be able to ask for another attempt after a real failure.\n\t\t\t\tthis.replacementNeeded = true;\n\t\t\t\t// A concrete failure, so no operational source: this one surfaces.\n\t\t\t\tthis.deliver({\n\t\t\t\t\tactivity: undefined,\n\t\t\t\t\telapsedMs: 0,\n\t\t\t\t\tlevel: \"unresponsive\",\n\t\t\t\t\tmessage: `Interactive engine restart failed: ${error.message}`,\n\t\t\t\t});\n\t\t\t})\n\t\t\t.finally(() => {\n\t\t\t\tif (this.attempt !== run) return;\n\t\t\t\tthis.attempt = undefined;\n\t\t\t\tthis.attemptStartedAt = undefined;\n\t\t\t});\n\t\tthis.attempt = run;\n\t\treturn run;\n\t}\n\n\tprivate notice(message: string): void {\n\t\tthis.deliver({ activity: undefined, elapsedMs: 0, level: \"blocking\", message, source: \"recovery\" });\n\t}\n\n\tprivate deliver(diagnostic: ActivityWatchdogDiagnostic): void {\n\t\tif (this.listeners.size === 0) this.pending.push(diagnostic);\n\t\tfor (const listener of this.listeners) listener(diagnostic);\n\t}\n}\n"]}

package/dist/modes/interactive-engine/engine-input-form.d.ts

@@ -5,7 +5,7 @@ export declare class EngineInputFormService {
     private readonly write;
     private nextId;
     constructor(write: (line: string) => void);
-    open(request: HostInputFormRequest): Promise<Record<string, string> | undefined>;
+    open(request: HostInputFormRequest, signal?: AbortSignal): Promise<Record<string, string> | undefined>;
     handleLine(line: string): boolean;
     dispose(): void;
     private send;

package/dist/modes/interactive-engine/engine-input-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-input-form.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-input-form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAY9E,oDAAoD;AACpD,qBAAa,sBAAsB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IACxD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAC/C,OAAO,CAAC,MAAM,CAAK;IACnB,YAAY,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAExC;IAED,IAAI,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CAgB/E;IAED,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQhC;IAED,OAAO,IAAI,IAAI,CAGd;IAED,OAAO,CAAC,IAAI;CAGZ"}
+{"version":3,"file":"engine-input-form.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-input-form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAY9E,oDAAoD;AACpD,qBAAa,sBAAsB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IACxD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAC/C,OAAO,CAAC,MAAM,CAAK;IACnB,YAAY,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAExC;IAED,IAAI,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CAgCrG;IAED,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQhC;IAED,OAAO,IAAI,IAAI,CAGd;IAED,OAAO,CAAC,IAAI;CAGZ"}

package/dist/modes/interactive-engine/engine-input-form.js

@@ -6,27 +6,44 @@ export class EngineInputFormService {
         this.nextId = 0;
         this.write = write;
     }
-    open(request) {
+    open(request, signal) {
+        if (signal?.aborted)
+            return Promise.resolve(undefined);
         const componentId = `input_form_${++this.nextId}`;
         let resolveResult;
-        const result = new Promise((resolve) => { resolveResult = resolve; });
+        const result = new Promise((resolve) => {
+            resolveResult = resolve;
+        });
+        const onAbort = () => {
+            this.send({ type: "engine_input_form_close", componentId });
+            record.resolve(undefined);
+        };
         const record = {
             settled: false,
             resolve: (values) => {
                 if (record.settled)
                     return;
                 record.settled = true;
+                signal?.removeEventListener("abort", onAbort);
                 this.active.delete(componentId);
                 resolveResult(values);
             },
         };
+        signal?.addEventListener("abort", onAbort, { once: true });
         this.active.set(componentId, record);
-        this.send({ type: "engine_input_form_open", componentId, title: request.title, fields: request.fields.map((field) => ({ ...field, choices: field.choices ? [...field.choices] : undefined })) });
+        this.send({
+            type: "engine_input_form_open",
+            componentId,
+            title: request.title,
+            fields: request.fields.map((field) => ({ ...field, choices: field.choices ? [...field.choices] : undefined })),
+            ...(request.heading !== undefined ? { heading: request.heading } : {}),
+            ...(request.submitLabel !== undefined ? { submitLabel: request.submitLabel } : {}),
+        });
         return result;
     }
     handleLine(line) {
         const command = parseInteractiveEngineCommand(line);
-        if (!command || !command.type.startsWith("engine_input_form_"))
+        if (!command?.type.startsWith("engine_input_form_"))
             return false;
         const record = this.active.get(command.componentId);
         if (!record)

package/dist/modes/interactive-engine/engine-input-form.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine-input-form.js","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-input-form.ts"],"names":[],"mappings":"AACA,OAAO,EACN,6BAA6B,EAC7B,iCAAiC,GAEjC,MAAM,eAAe,CAAC;AAOvB,oDAAoD;AACpD,MAAM,OAAO,sBAAsB;IAIlC,YAAY,KAA6B;QAHxB,WAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;QAEhD,WAAM,GAAG,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,CAAC,OAA6B;QACjC,MAAM,WAAW,GAAG,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QAClD,IAAI,aAAoE,CAAC;QACzE,MAAM,MAAM,GAAG,IAAI,OAAO,CAAqC,CAAC,OAAO,EAAE,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1G,MAAM,MAAM,GAAe;YAC1B,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;gBACnB,IAAI,MAAM,CAAC,OAAO;oBAAE,OAAO;gBAC3B,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;gBACtB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAChC,aAAa,CAAC,MAAM,CAAC,CAAC;YACvB,CAAC;SACD,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACjM,OAAO,MAAM,CAAC;IACf,CAAC;IAED,UAAU,CAAC,IAAY;QACtB,MAAM,OAAO,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,IAAI,OAAO,CAAC,IAAI,KAAK,0BAA0B;YAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aAC3E,IAAI,OAAO,CAAC,IAAI,KAAK,0BAA0B;YAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO;QACN,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAEO,IAAI,CAAC,OAAiC;QAC7C,IAAI,CAAC,KAAK,CAAC,iCAAiC,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC;CACD","sourcesContent":["import type { HostInputFormRequest } from \"../../core/extensions/ui-types.ts\";\nimport {\n\tparseInteractiveEngineCommand,\n\tserializeInteractiveEngineMessage,\n\ttype InteractiveEngineMessage,\n} from \"./protocol.ts\";\n\ninterface ActiveForm {\n\tsettled: boolean;\n\tresolve: (values: Record<string, string> | undefined) => void;\n}\n\n/** Child-side owner for host-native input forms. */\nexport class EngineInputFormService {\n\tprivate readonly active = new Map<string, ActiveForm>();\n\tprivate readonly write: (line: string) => void;\n\tprivate nextId = 0;\n\tconstructor(write: (line: string) => void) {\n\t\tthis.write = write;\n\t}\n\n\topen(request: HostInputFormRequest): Promise<Record<string, string> | undefined> {\n\t\tconst componentId = `input_form_${++this.nextId}`;\n\t\tlet resolveResult!: (values: Record<string, string> | undefined) => void;\n\t\tconst result = new Promise<Record<string, string> | undefined>((resolve) => { resolveResult = resolve; });\n\t\tconst record: ActiveForm = {\n\t\t\tsettled: false,\n\t\t\tresolve: (values) => {\n\t\t\t\tif (record.settled) return;\n\t\t\t\trecord.settled = true;\n\t\t\t\tthis.active.delete(componentId);\n\t\t\t\tresolveResult(values);\n\t\t\t},\n\t\t};\n\t\tthis.active.set(componentId, record);\n\t\tthis.send({ type: \"engine_input_form_open\", componentId, title: request.title, fields: request.fields.map((field) => ({ ...field, choices: field.choices ? [...field.choices] : undefined })) });\n\t\treturn result;\n\t}\n\n\thandleLine(line: string): boolean {\n\t\tconst command = parseInteractiveEngineCommand(line);\n\t\tif (!command || !command.type.startsWith(\"engine_input_form_\")) return false;\n\t\tconst record = this.active.get(command.componentId);\n\t\tif (!record) return true;\n\t\tif (command.type === \"engine_input_form_submit\") record.resolve(command.values);\n\t\telse if (command.type === \"engine_input_form_cancel\") record.resolve(undefined);\n\t\treturn true;\n\t}\n\n\tdispose(): void {\n\t\tfor (const record of this.active.values()) record.resolve(undefined);\n\t\tthis.active.clear();\n\t}\n\n\tprivate send(message: InteractiveEngineMessage): void {\n\t\tthis.write(serializeInteractiveEngineMessage(message));\n\t}\n}\n"]}
+{"version":3,"file":"engine-input-form.js","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-input-form.ts"],"names":[],"mappings":"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","sourcesContent":["import type { HostInputFormRequest } from \"../../core/extensions/ui-types.ts\";\nimport {\n\ttype InteractiveEngineMessage,\n\tparseInteractiveEngineCommand,\n\tserializeInteractiveEngineMessage,\n} from \"./protocol.ts\";\n\ninterface ActiveForm {\n\tsettled: boolean;\n\tresolve: (values: Record<string, string> | undefined) => void;\n}\n\n/** Child-side owner for host-native input forms. */\nexport class EngineInputFormService {\n\tprivate readonly active = new Map<string, ActiveForm>();\n\tprivate readonly write: (line: string) => void;\n\tprivate nextId = 0;\n\tconstructor(write: (line: string) => void) {\n\t\tthis.write = write;\n\t}\n\n\topen(request: HostInputFormRequest, signal?: AbortSignal): Promise<Record<string, string> | undefined> {\n\t\tif (signal?.aborted) return Promise.resolve(undefined);\n\t\tconst componentId = `input_form_${++this.nextId}`;\n\t\tlet resolveResult!: (values: Record<string, string> | undefined) => void;\n\t\tconst result = new Promise<Record<string, string> | undefined>((resolve) => {\n\t\t\tresolveResult = resolve;\n\t\t});\n\t\tconst onAbort = () => {\n\t\t\tthis.send({ type: \"engine_input_form_close\", componentId });\n\t\t\trecord.resolve(undefined);\n\t\t};\n\t\tconst record: ActiveForm = {\n\t\t\tsettled: false,\n\t\t\tresolve: (values) => {\n\t\t\t\tif (record.settled) return;\n\t\t\t\trecord.settled = true;\n\t\t\t\tsignal?.removeEventListener(\"abort\", onAbort);\n\t\t\t\tthis.active.delete(componentId);\n\t\t\t\tresolveResult(values);\n\t\t\t},\n\t\t};\n\t\tsignal?.addEventListener(\"abort\", onAbort, { once: true });\n\t\tthis.active.set(componentId, record);\n\t\tthis.send({\n\t\t\ttype: \"engine_input_form_open\",\n\t\t\tcomponentId,\n\t\t\ttitle: request.title,\n\t\t\tfields: request.fields.map((field) => ({ ...field, choices: field.choices ? [...field.choices] : undefined })),\n\t\t\t...(request.heading !== undefined ? { heading: request.heading } : {}),\n\t\t\t...(request.submitLabel !== undefined ? { submitLabel: request.submitLabel } : {}),\n\t\t});\n\t\treturn result;\n\t}\n\n\thandleLine(line: string): boolean {\n\t\tconst command = parseInteractiveEngineCommand(line);\n\t\tif (!command?.type.startsWith(\"engine_input_form_\")) return false;\n\t\tconst record = this.active.get(command.componentId);\n\t\tif (!record) return true;\n\t\tif (command.type === \"engine_input_form_submit\") record.resolve(command.values);\n\t\telse if (command.type === \"engine_input_form_cancel\") record.resolve(undefined);\n\t\treturn true;\n\t}\n\n\tdispose(): void {\n\t\tfor (const record of this.active.values()) record.resolve(undefined);\n\t\tthis.active.clear();\n\t}\n\n\tprivate send(message: InteractiveEngineMessage): void {\n\t\tthis.write(serializeInteractiveEngineMessage(message));\n\t}\n}\n"]}

package/dist/modes/interactive-engine/engine-monitor.d.ts

@@ -7,11 +7,18 @@ export declare class InteractiveEngineMonitor {
     private readonly bound;
     private resolveBound;
     private rejectBound;
+    private readonly failure;
+    private rejectFailure;
     private readonly onMessage;
     constructor(onDiagnostic: (diagnostic: ActivityWatchdogDiagnostic) => void, onMessage: (message: InteractiveEngineMessage) => void);
     stop(): void;
     fail(error: Error): void;
-    waitUntilReady(timeoutMs?: number): Promise<void>;
+    /**
+     * Waits for the engine to announce readiness. There is deliberately no
+     * deadline: slow starts (cold module loads on Windows) must not be treated
+     * as failures. Engine exit or a transport error rejects via fail().
+     */
+    waitUntilReady(): Promise<void>;
     waitUntilBound(): Promise<void>;
     handleLine(line: string): boolean;
 }

package/dist/modes/interactive-engine/engine-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-monitor.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAiC,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE7F,qBAAa,wBAAwB;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8C;IAExE,YACC,YAAY,EAAE,CAAC,UAAU,EAAE,0BAA0B,KAAK,IAAI,EAC9D,SAAS,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,IAAI,EAWtD;IAGD,IAAI,IAAI,IAAI,CAEX;IACD,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAA6B;IAE/C,cAAc,CAAC,SAAS,SAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAYrD;IAED,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAuB;IAEtD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAyBhC;CACD"}
+{"version":3,"file":"engine-monitor.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,wBAAwB,EAAiC,MAAM,eAAe,CAAC;AAE7F,qBAAa,wBAAwB;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8C;IAExE,YACC,YAAY,EAAE,CAAC,UAAU,EAAE,0BAA0B,KAAK,IAAI,EAC9D,SAAS,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,IAAI,EAgBtD;IAED,IAAI,IAAI,IAAI,CAEX;IACD,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAGvB;IAED;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAEpC;IAED,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9B;IAED,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAyBhC;CACD"}

package/dist/modes/interactive-engine/engine-monitor.js

@@ -11,27 +11,30 @@ export class InteractiveEngineMonitor {
             this.resolveBound = resolve;
             this.rejectBound = reject;
         });
+        this.bound.catch(() => { });
+        this.failure = new Promise((_, reject) => {
+            this.rejectFailure = reject;
+        });
+        this.failure.catch(() => { });
     }
     stop() {
         this.watchdog.stop();
     }
-    fail(error) { this.rejectBound(error); }
-    async waitUntilReady(timeoutMs = 5_000) {
-        let timeout;
-        try {
-            await Promise.race([
-                this.readiness,
-                new Promise((_, reject) => {
-                    timeout = setTimeout(() => reject(new Error(`Interactive engine did not become ready within ${timeoutMs} ms`)), timeoutMs);
-                }),
-            ]);
-        }
-        finally {
-            if (timeout)
-                clearTimeout(timeout);
-        }
+    fail(error) {
+        this.rejectBound(error);
+        this.rejectFailure(error);
+    }
+    /**
+     * Waits for the engine to announce readiness. There is deliberately no
+     * deadline: slow starts (cold module loads on Windows) must not be treated
+     * as failures. Engine exit or a transport error rejects via fail().
+     */
+    async waitUntilReady() {
+        await Promise.race([this.readiness, this.failure]);
+    }
+    waitUntilBound() {
+        return this.bound;
     }
-    waitUntilBound() { return this.bound; }
     handleLine(line) {
         const message = parseInteractiveEngineMessage(line);
         if (!message)

package/dist/modes/interactive-engine/engine-monitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine-monitor.js","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAiC,MAAM,eAAe,CAAC;AAE7F,MAAM,OAAO,wBAAwB;IASpC,YACC,YAA8D,EAC9D,SAAsD;QAEtD,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACxC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;YAC5B,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC3B,CAAC,CAAC,CAAC;IACJ,CAAC;IAGD,IAAI;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,KAAY,IAAU,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAErD,KAAK,CAAC,cAAc,CAAC,SAAS,GAAG,KAAK;QACrC,IAAI,OAAkD,CAAC;QACvD,IAAI,CAAC;YACJ,MAAM,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAI,CAAC,SAAS;gBACd,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;oBAChC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kDAAkD,SAAS,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;gBAC5H,CAAC,CAAC;aACF,CAAC,CAAC;QACJ,CAAC;gBAAS,CAAC;YACV,IAAI,OAAO;gBAAE,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;IACF,CAAC;IAED,cAAc,KAAoB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAEtD,UAAU,CAAC,IAAY;QACtB,MAAM,OAAO,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACxB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACtB,KAAK,cAAc;gBAClB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACtB,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,MAAM;YACP,KAAK,cAAc;gBAClB,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,MAAM;YACP,KAAK,kBAAkB;gBACtB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACtB,MAAM;YACP,KAAK,yBAAyB;gBAC7B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAChD,MAAM;YACP,KAAK,0BAA0B;gBAC9B,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBACnD,MAAM;QACR,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;CACD","sourcesContent":["import { ActivityWatchdog, type ActivityWatchdogDiagnostic } from \"./activity-watchdog.ts\";\nimport { parseInteractiveEngineMessage, type InteractiveEngineMessage } from \"./protocol.ts\";\n\nexport class InteractiveEngineMonitor {\n\tprivate readonly watchdog: ActivityWatchdog;\n\tprivate readonly readiness: Promise<void>;\n\tprivate resolveReady!: () => void;\n\tprivate readonly bound: Promise<void>;\n\tprivate resolveBound!: () => void;\n\tprivate rejectBound!: (error: Error) => void;\n\tprivate readonly onMessage: (message: InteractiveEngineMessage) => void;\n\n\tconstructor(\n\t\tonDiagnostic: (diagnostic: ActivityWatchdogDiagnostic) => void,\n\t\tonMessage: (message: InteractiveEngineMessage) => void,\n\t) {\n\t\tthis.watchdog = new ActivityWatchdog({ onDiagnostic });\n\t\tthis.onMessage = onMessage;\n\t\tthis.readiness = new Promise((resolve) => {\n\t\t\tthis.resolveReady = resolve;\n\t\t});\n\t\tthis.bound = new Promise((resolve, reject) => {\n\t\t\tthis.resolveBound = resolve;\n\t\t\tthis.rejectBound = reject;\n\t\t});\n\t}\n\n\n\tstop(): void {\n\t\tthis.watchdog.stop();\n\t}\n\tfail(error: Error): void { this.rejectBound(error); }\n\n\tasync waitUntilReady(timeoutMs = 5_000): Promise<void> {\n\t\tlet timeout: ReturnType<typeof setTimeout> | undefined;\n\t\ttry {\n\t\t\tawait Promise.race([\n\t\t\t\tthis.readiness,\n\t\t\t\tnew Promise<never>((_, reject) => {\n\t\t\t\t\ttimeout = setTimeout(() => reject(new Error(`Interactive engine did not become ready within ${timeoutMs} ms`)), timeoutMs);\n\t\t\t\t}),\n\t\t\t]);\n\t\t} finally {\n\t\t\tif (timeout) clearTimeout(timeout);\n\t\t}\n\t}\n\n\twaitUntilBound(): Promise<void> { return this.bound; }\n\n\thandleLine(line: string): boolean {\n\t\tconst message = parseInteractiveEngineMessage(line);\n\t\tif (!message) return false;\n\t\tthis.onMessage(message);\n\t\tswitch (message.type) {\n\t\t\tcase \"engine_ready\":\n\t\t\t\tthis.watchdog.heartbeat();\n\t\t\t\tthis.watchdog.start();\n\t\t\t\tthis.resolveReady();\n\t\t\t\tbreak;\n\t\t\tcase \"engine_bound\":\n\t\t\t\tthis.resolveBound();\n\t\t\t\tbreak;\n\t\t\tcase \"engine_heartbeat\":\n\t\t\t\tthis.watchdog.heartbeat();\n\t\t\t\tthis.watchdog.start();\n\t\t\t\tbreak;\n\t\t\tcase \"engine_activity_started\":\n\t\t\t\tthis.watchdog.activityStarted(message.activity);\n\t\t\t\tbreak;\n\t\t\tcase \"engine_activity_finished\":\n\t\t\t\tthis.watchdog.activityFinished(message.activityId);\n\t\t\t\tbreak;\n\t\t}\n\t\treturn true;\n\t}\n}\n"]}
+{"version":3,"file":"engine-monitor.js","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAiC,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAE7F,MAAM,OAAO,wBAAwB;IAWpC,YACC,YAA8D,EAC9D,SAAsD;QAEtD,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACxC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;YAC5B,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YACxC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,KAAY;QAChB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,cAAc;QACnB,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,cAAc;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,UAAU,CAAC,IAAY;QACtB,MAAM,OAAO,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACxB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACtB,KAAK,cAAc;gBAClB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACtB,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,MAAM;YACP,KAAK,cAAc;gBAClB,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,MAAM;YACP,KAAK,kBAAkB;gBACtB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACtB,MAAM;YACP,KAAK,yBAAyB;gBAC7B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAChD,MAAM;YACP,KAAK,0BAA0B;gBAC9B,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBACnD,MAAM;QACR,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;CACD","sourcesContent":["import { ActivityWatchdog, type ActivityWatchdogDiagnostic } from \"./activity-watchdog.ts\";\nimport { type InteractiveEngineMessage, parseInteractiveEngineMessage } from \"./protocol.ts\";\n\nexport class InteractiveEngineMonitor {\n\tprivate readonly watchdog: ActivityWatchdog;\n\tprivate readonly readiness: Promise<void>;\n\tprivate resolveReady!: () => void;\n\tprivate readonly bound: Promise<void>;\n\tprivate resolveBound!: () => void;\n\tprivate rejectBound!: (error: Error) => void;\n\tprivate readonly failure: Promise<never>;\n\tprivate rejectFailure!: (error: Error) => void;\n\tprivate readonly onMessage: (message: InteractiveEngineMessage) => void;\n\n\tconstructor(\n\t\tonDiagnostic: (diagnostic: ActivityWatchdogDiagnostic) => void,\n\t\tonMessage: (message: InteractiveEngineMessage) => void,\n\t) {\n\t\tthis.watchdog = new ActivityWatchdog({ onDiagnostic });\n\t\tthis.onMessage = onMessage;\n\t\tthis.readiness = new Promise((resolve) => {\n\t\t\tthis.resolveReady = resolve;\n\t\t});\n\t\tthis.bound = new Promise((resolve, reject) => {\n\t\t\tthis.resolveBound = resolve;\n\t\t\tthis.rejectBound = reject;\n\t\t});\n\t\tthis.bound.catch(() => {});\n\t\tthis.failure = new Promise((_, reject) => {\n\t\t\tthis.rejectFailure = reject;\n\t\t});\n\t\tthis.failure.catch(() => {});\n\t}\n\n\tstop(): void {\n\t\tthis.watchdog.stop();\n\t}\n\tfail(error: Error): void {\n\t\tthis.rejectBound(error);\n\t\tthis.rejectFailure(error);\n\t}\n\n\t/**\n\t * Waits for the engine to announce readiness. There is deliberately no\n\t * deadline: slow starts (cold module loads on Windows) must not be treated\n\t * as failures. Engine exit or a transport error rejects via fail().\n\t */\n\tasync waitUntilReady(): Promise<void> {\n\t\tawait Promise.race([this.readiness, this.failure]);\n\t}\n\n\twaitUntilBound(): Promise<void> {\n\t\treturn this.bound;\n\t}\n\n\thandleLine(line: string): boolean {\n\t\tconst message = parseInteractiveEngineMessage(line);\n\t\tif (!message) return false;\n\t\tthis.onMessage(message);\n\t\tswitch (message.type) {\n\t\t\tcase \"engine_ready\":\n\t\t\t\tthis.watchdog.heartbeat();\n\t\t\t\tthis.watchdog.start();\n\t\t\t\tthis.resolveReady();\n\t\t\t\tbreak;\n\t\t\tcase \"engine_bound\":\n\t\t\t\tthis.resolveBound();\n\t\t\t\tbreak;\n\t\t\tcase \"engine_heartbeat\":\n\t\t\t\tthis.watchdog.heartbeat();\n\t\t\t\tthis.watchdog.start();\n\t\t\t\tbreak;\n\t\t\tcase \"engine_activity_started\":\n\t\t\t\tthis.watchdog.activityStarted(message.activity);\n\t\t\t\tbreak;\n\t\t\tcase \"engine_activity_finished\":\n\t\t\t\tthis.watchdog.activityFinished(message.activityId);\n\t\t\t\tbreak;\n\t\t}\n\t\treturn true;\n\t}\n}\n"]}

package/dist/modes/interactive-engine/engine-render-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-render-service.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-render-service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAkEhE,qBAAa,mBAAmB;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAE/C,YAAY,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAExC;IAED,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAGvC;IAED,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAuBhC;IAED,OAAO,IAAI,IAAI,CAEd;IAED,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,UAAU;IAoClB,OAAO,CAAC,aAAa;IAoBrB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,IAAI;CAGZ"}
+{"version":3,"file":"engine-render-service.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/engine-render-service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAsDhE,qBAAa,mBAAmB;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAE/C,YAAY,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAExC;IAED,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAGvC;IAED,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAgChC;IAED,OAAO,IAAI,IAAI,CAEd;IAED,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,UAAU;IAuClB,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,IAAI;CAGZ"}