@bastani/atomic 0.9.10 → 0.9.11-alpha.10

package/dist/modes/rpc/rpc-client-process.js

@@ -2,30 +2,56 @@ import { spawn } from "node:child_process";
 import { rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { flushPersistentCompileCache } from "../../utils/compile-cache.js";
+import { INTERACTIVE_ENGINE_BOOTSTRAP_FLAG, removeOwnedInteractiveEngineBootstrap, writeInteractiveEngineBootstrap, } from "../../utils/interactive-engine-bootstrap.js";
+import { scrubInteractiveEngineEnv } from "../../utils/interactive-engine-env.js";
 import { killProcessTree, trackDetachedChildPid, untrackDetachedChildPid } from "../../utils/shell.js";
 import { sleep } from "../../utils/sleep.js";
-import { INTERACTIVE_ENGINE_MAX_FRAME_BYTES } from "../interactive-engine/protocol.js";
 const guardianFiles = new WeakMap();
+const bootstrapHandles = new WeakMap();
 export function spawnRpcClientProcess(options) {
     const guardianFile = options.interactiveEngine
         ? join(tmpdir(), `atomic-engine-guardian-${process.pid}-${crypto.randomUUID()}`)
         : undefined;
-    const child = spawn(options.runtimeExecutable ?? "bun", [...(options.runtimeArgs ?? []), ...(options.cliPath ? [options.cliPath] : []), ...options.cliArgs], {
-        cwd: options.cwd,
-        env: {
-            ...process.env,
-            ...options.env,
-            ...(options.interactiveEngine ? {
-                ATOMIC_INTERACTIVE_ENGINE_CHILD: "1",
-                ATOMIC_INTERACTIVE_ENGINE_HOST_PID: String(process.pid),
-                ATOMIC_INTERACTIVE_ENGINE_GUARD_FILE: guardianFile,
-            } : {}),
-        },
-        detached: options.interactiveEngine && process.platform !== "win32",
-        stdio: ["pipe", "pipe", "pipe"],
-    });
+    // The engine's startup metadata travels in a 0600 file rather than the
+    // environment: a Bun child spawned without an explicit `env` inherits the
+    // runtime's launch-time environment, so anything placed here would remain
+    // reachable by every descendant of the engine no matter what the engine
+    // deletes from its own `process.env` afterwards.
+    const bootstrap = options.interactiveEngine
+        ? writeInteractiveEngineBootstrap({
+            hostPid: process.pid,
+            guardFile: guardianFile,
+            ...(options.interactiveEngineApiKey ? { apiKey: options.interactiveEngineApiKey } : {}),
+        })
+        : undefined;
+    if (options.interactiveEngine)
+        flushPersistentCompileCache();
+    const cliArgs = bootstrap
+        ? [...options.cliArgs, INTERACTIVE_ENGINE_BOOTSTRAP_FLAG, bootstrap.path]
+        : options.cliArgs;
+    let child;
+    try {
+        child = spawn(options.runtimeExecutable ?? "bun", [...(options.runtimeArgs ?? []), ...(options.cliPath ? [options.cliPath] : []), ...cliArgs], {
+            cwd: options.cwd,
+            env: scrubInteractiveEngineEnv({ ...process.env, ...options.env }),
+            detached: options.interactiveEngine && process.platform !== "win32",
+            stdio: ["pipe", "pipe", "pipe"],
+        });
+    }
+    catch (error) {
+        removeOwnedInteractiveEngineBootstrap(bootstrap);
+        throw error;
+    }
     if (guardianFile)
         guardianFiles.set(child, guardianFile);
+    if (bootstrap) {
+        bootstrapHandles.set(child, bootstrap);
+        // The child unlinks the record after reading it; this handle-scoped cleanup
+        // removes the directory this process created, and only that directory.
+        child.once("error", () => removeOwnedInteractiveEngineBootstrap(bootstrap));
+        child.once("exit", () => removeOwnedInteractiveEngineBootstrap(bootstrap));
+    }
     if (options.interactiveEngine && child.pid) {
         trackDetachedChildPid(child.pid);
         child.once("exit", () => untrackDetachedChildPid(child.pid));
@@ -33,10 +59,13 @@ export function spawnRpcClientProcess(options) {
     return child;
 }
 export async function terminateRpcClientProcess(child, processTree) {
+    removeOwnedInteractiveEngineBootstrap(bootstrapHandles.get(child));
     if (child.exitCode !== null || child.signalCode !== null)
         return;
     let resolveExit;
-    const exited = new Promise((resolve) => { resolveExit = resolve; });
+    const exited = new Promise((resolve) => {
+        resolveExit = resolve;
+    });
     child.once("exit", resolveExit);
     const guardianFile = guardianFiles.get(child);
     child.kill("SIGTERM");
@@ -62,18 +91,37 @@ export async function terminateRpcClientProcess(child, processTree) {
     if (guardianFile)
         await rm(guardianFile, { force: true });
 }
-export function createInteractiveJsonlOptions(enabled, onDiagnostic) {
-    if (!enabled)
-        return {};
-    return {
-        maxBytesPerTurn: 256 * 1024,
-        maxFrameBytes: INTERACTIVE_ENGINE_MAX_FRAME_BYTES,
-        onOversizedLine: () => onDiagnostic?.({
-            activity: undefined,
-            elapsedMs: 0,
-            level: "unresponsive",
-            message: "Interactive engine violated the 1 MiB protocol frame limit; pending requests were cancelled",
-        }),
-    };
+export function createInteractiveJsonlOptions(enabled) {
+    return enabled ? { maxBytesPerTurn: 256 * 1024 } : {};
+}
+/**
+ * CLI args for a replacement engine child: drop whatever session flag the
+ * previous generation carried and bind the replacement to `sessionFile`, so a
+ * restart resumes the same conversation instead of starting a fresh one.
+ */
+export function restartCliArgs(args, sessionFile) {
+    const result = [];
+    for (let index = 0; index < (args?.length ?? 0); index += 1) {
+        const value = args[index];
+        if (value === "--no-session")
+            continue;
+        if (value === "--session") {
+            index += 1;
+            continue;
+        }
+        result.push(value);
+    }
+    result.push(sessionFile ? "--session" : "--no-session");
+    if (sessionFile)
+        result.push(sessionFile);
+    return result;
+}
+const MAX_STDERR_BYTES = 256 * 1024;
+/** Keep only the tail of a child's stderr, so a noisy child cannot grow the host. */
+export function appendBoundedStderr(existing, chunk) {
+    const next = existing + chunk;
+    if (Buffer.byteLength(next, "utf8") <= MAX_STDERR_BYTES)
+        return next;
+    return `${Buffer.from(next).subarray(-MAX_STDERR_BYTES).toString("utf8")}\n[stderr truncated]`;
 }
 //# sourceMappingURL=rpc-client-process.js.map

package/dist/modes/rpc/rpc-client-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client-process.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-client-process.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, type ChildProcess } from \"node:child_process\";\nimport { rm, writeFile } from \"node:fs/promises\";\nimport { tmpdir } from \"node:os\";\nimport { join } from \"node:path\";\nimport { killProcessTree, trackDetachedChildPid, untrackDetachedChildPid } from \"../../utils/shell.ts\";\nimport { sleep } from \"../../utils/sleep.ts\";\nimport type { ActivityWatchdogDiagnostic } from \"../interactive-engine/activity-watchdog.ts\";\nimport { INTERACTIVE_ENGINE_MAX_FRAME_BYTES } from \"../interactive-engine/protocol.ts\";\n\nexport interface RpcClientProcessOptions {\n\tcliPath: string;\n\tcliArgs: string[];\n\tcwd?: string;\n\tenv?: Record<string, string>;\n\truntimeExecutable?: string;\n\truntimeArgs?: string[];\n\tinteractiveEngine: boolean;\n}\n\nconst guardianFiles = new WeakMap<ChildProcess, string>();\n\nexport function spawnRpcClientProcess(options: RpcClientProcessOptions): ChildProcess {\n\tconst guardianFile = options.interactiveEngine\n\t\t? join(tmpdir(), `atomic-engine-guardian-${process.pid}-${crypto.randomUUID()}`)\n\t\t: undefined;\n\tconst child = spawn(\n\t\toptions.runtimeExecutable ?? \"bun\",\n\t\t[...(options.runtimeArgs ?? []), ...(options.cliPath ? [options.cliPath] : []), ...options.cliArgs],\n\t\t{\n\t\t\tcwd: options.cwd,\n\t\t\tenv: {\n\t\t\t\t...process.env,\n\t\t\t\t...options.env,\n\t\t\t\t...(options.interactiveEngine ? {\n\t\t\t\t\tATOMIC_INTERACTIVE_ENGINE_CHILD: \"1\",\n\t\t\t\t\tATOMIC_INTERACTIVE_ENGINE_HOST_PID: String(process.pid),\n\t\t\t\t\tATOMIC_INTERACTIVE_ENGINE_GUARD_FILE: guardianFile!,\n\t\t\t\t} : {}),\n\t\t\t},\n\t\t\tdetached: options.interactiveEngine && process.platform !== \"win32\",\n\t\t\tstdio: [\"pipe\", \"pipe\", \"pipe\"],\n\t\t},\n\t);\n\tif (guardianFile) guardianFiles.set(child, guardianFile);\n\tif (options.interactiveEngine && child.pid) {\n\t\ttrackDetachedChildPid(child.pid);\n\t\tchild.once(\"exit\", () => untrackDetachedChildPid(child.pid!));\n\t}\n\treturn child;\n}\n\nexport async function terminateRpcClientProcess(child: ChildProcess, processTree: boolean): Promise<void> {\n\tif (child.exitCode !== null || child.signalCode !== null) return;\n\tlet resolveExit!: () => void;\n\tconst exited = new Promise<void>((resolve) => { resolveExit = resolve; });\n\tchild.once(\"exit\", resolveExit);\n\tconst guardianFile = guardianFiles.get(child);\n\tchild.kill(\"SIGTERM\");\n\tif (await Promise.race([exited.then(() => true), sleep(250).then(() => false)])) {\n\t\tif (guardianFile) await rm(guardianFile, { force: true });\n\t\treturn;\n\t}\n\tif (processTree && guardianFile) {\n\t\tawait writeFile(guardianFile, \"stop\");\n\t\tif (await Promise.race([exited.then(() => true), sleep(500).then(() => false)])) {\n\t\t\tawait rm(guardianFile, { force: true });\n\t\t\treturn;\n\t\t}\n\t}\n\tif (processTree && child.pid) killProcessTree(child.pid);\n\telse child.kill(\"SIGKILL\");\n\tif (!(await Promise.race([exited.then(() => true), sleep(250).then(() => false)]))) {\n\t\tthrow new Error(`Agent process ${child.pid ?? \"unknown\"} did not exit after SIGKILL`);\n\t}\n\tif (guardianFile) await rm(guardianFile, { force: true });\n}\n\nexport function createInteractiveJsonlOptions(\n\tenabled: boolean,\n\tonDiagnostic: ((diagnostic: ActivityWatchdogDiagnostic) => void) | undefined,\n): { maxBytesPerTurn?: number; maxFrameBytes?: number; onOversizedLine?: () => void } {\n\tif (!enabled) return {};\n\treturn {\n\t\tmaxBytesPerTurn: 256 * 1024,\n\t\tmaxFrameBytes: INTERACTIVE_ENGINE_MAX_FRAME_BYTES,\n\t\tonOversizedLine: () => onDiagnostic?.({\n\t\t\tactivity: undefined,\n\t\t\telapsedMs: 0,\n\t\t\tlevel: \"unresponsive\",\n\t\t\tmessage: \"Interactive engine violated the 1 MiB protocol frame limit; pending requests were cancelled\",\n\t\t}),\n\t};\n}\n"]}
+{"version":3,"file":"rpc-client-process.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-client-process.ts"],"names":[],"mappings":"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","sourcesContent":["import { type ChildProcess, spawn } from \"node:child_process\";\nimport { rm, writeFile } from \"node:fs/promises\";\nimport { tmpdir } from \"node:os\";\nimport { join } from \"node:path\";\nimport { flushPersistentCompileCache } from \"../../utils/compile-cache.ts\";\nimport {\n\tINTERACTIVE_ENGINE_BOOTSTRAP_FLAG,\n\ttype InteractiveEngineBootstrapHandle,\n\tremoveOwnedInteractiveEngineBootstrap,\n\twriteInteractiveEngineBootstrap,\n} from \"../../utils/interactive-engine-bootstrap.ts\";\nimport { scrubInteractiveEngineEnv } from \"../../utils/interactive-engine-env.ts\";\nimport { killProcessTree, trackDetachedChildPid, untrackDetachedChildPid } from \"../../utils/shell.ts\";\nimport { sleep } from \"../../utils/sleep.ts\";\n\nexport interface RpcClientProcessOptions {\n\tcliPath: string;\n\tcliArgs: string[];\n\tcwd?: string;\n\tenv?: Record<string, string>;\n\truntimeExecutable?: string;\n\truntimeArgs?: string[];\n\tinteractiveEngine: boolean;\n\t/** Credential handed to the engine child through the bootstrap file, never argv or env. */\n\tinteractiveEngineApiKey?: string;\n}\n\nconst guardianFiles = new WeakMap<ChildProcess, string>();\nconst bootstrapHandles = new WeakMap<ChildProcess, InteractiveEngineBootstrapHandle>();\n\nexport function spawnRpcClientProcess(options: RpcClientProcessOptions): ChildProcess {\n\tconst guardianFile = options.interactiveEngine\n\t\t? join(tmpdir(), `atomic-engine-guardian-${process.pid}-${crypto.randomUUID()}`)\n\t\t: undefined;\n\t// The engine's startup metadata travels in a 0600 file rather than the\n\t// environment: a Bun child spawned without an explicit `env` inherits the\n\t// runtime's launch-time environment, so anything placed here would remain\n\t// reachable by every descendant of the engine no matter what the engine\n\t// deletes from its own `process.env` afterwards.\n\tconst bootstrap = options.interactiveEngine\n\t\t? writeInteractiveEngineBootstrap({\n\t\t\t\thostPid: process.pid,\n\t\t\t\tguardFile: guardianFile!,\n\t\t\t\t...(options.interactiveEngineApiKey ? { apiKey: options.interactiveEngineApiKey } : {}),\n\t\t\t})\n\t\t: undefined;\n\tif (options.interactiveEngine) flushPersistentCompileCache();\n\tconst cliArgs = bootstrap\n\t\t? [...options.cliArgs, INTERACTIVE_ENGINE_BOOTSTRAP_FLAG, bootstrap.path]\n\t\t: options.cliArgs;\n\tlet child: ChildProcess;\n\ttry {\n\t\tchild = spawn(\n\t\t\toptions.runtimeExecutable ?? \"bun\",\n\t\t\t[...(options.runtimeArgs ?? []), ...(options.cliPath ? [options.cliPath] : []), ...cliArgs],\n\t\t\t{\n\t\t\t\tcwd: options.cwd,\n\t\t\t\tenv: scrubInteractiveEngineEnv({ ...process.env, ...options.env }),\n\t\t\t\tdetached: options.interactiveEngine && process.platform !== \"win32\",\n\t\t\t\tstdio: [\"pipe\", \"pipe\", \"pipe\"],\n\t\t\t},\n\t\t);\n\t} catch (error) {\n\t\tremoveOwnedInteractiveEngineBootstrap(bootstrap);\n\t\tthrow error;\n\t}\n\tif (guardianFile) guardianFiles.set(child, guardianFile);\n\tif (bootstrap) {\n\t\tbootstrapHandles.set(child, bootstrap);\n\t\t// The child unlinks the record after reading it; this handle-scoped cleanup\n\t\t// removes the directory this process created, and only that directory.\n\t\tchild.once(\"error\", () => removeOwnedInteractiveEngineBootstrap(bootstrap));\n\t\tchild.once(\"exit\", () => removeOwnedInteractiveEngineBootstrap(bootstrap));\n\t}\n\tif (options.interactiveEngine && child.pid) {\n\t\ttrackDetachedChildPid(child.pid);\n\t\tchild.once(\"exit\", () => untrackDetachedChildPid(child.pid!));\n\t}\n\treturn child;\n}\n\nexport async function terminateRpcClientProcess(child: ChildProcess, processTree: boolean): Promise<void> {\n\tremoveOwnedInteractiveEngineBootstrap(bootstrapHandles.get(child));\n\tif (child.exitCode !== null || child.signalCode !== null) return;\n\tlet resolveExit!: () => void;\n\tconst exited = new Promise<void>((resolve) => {\n\t\tresolveExit = resolve;\n\t});\n\tchild.once(\"exit\", resolveExit);\n\tconst guardianFile = guardianFiles.get(child);\n\tchild.kill(\"SIGTERM\");\n\tif (await Promise.race([exited.then(() => true), sleep(250).then(() => false)])) {\n\t\tif (guardianFile) await rm(guardianFile, { force: true });\n\t\treturn;\n\t}\n\tif (processTree && guardianFile) {\n\t\tawait writeFile(guardianFile, \"stop\");\n\t\tif (await Promise.race([exited.then(() => true), sleep(500).then(() => false)])) {\n\t\t\tawait rm(guardianFile, { force: true });\n\t\t\treturn;\n\t\t}\n\t}\n\tif (processTree && child.pid) killProcessTree(child.pid);\n\telse child.kill(\"SIGKILL\");\n\tif (!(await Promise.race([exited.then(() => true), sleep(250).then(() => false)]))) {\n\t\tthrow new Error(`Agent process ${child.pid ?? \"unknown\"} did not exit after SIGKILL`);\n\t}\n\tif (guardianFile) await rm(guardianFile, { force: true });\n}\n\nexport function createInteractiveJsonlOptions(enabled: boolean): { maxBytesPerTurn?: number } {\n\treturn enabled ? { maxBytesPerTurn: 256 * 1024 } : {};\n}\n\n/**\n * CLI args for a replacement engine child: drop whatever session flag the\n * previous generation carried and bind the replacement to `sessionFile`, so a\n * restart resumes the same conversation instead of starting a fresh one.\n */\nexport function restartCliArgs(args: readonly string[] | undefined, sessionFile: string | undefined): string[] {\n\tconst result: string[] = [];\n\tfor (let index = 0; index < (args?.length ?? 0); index += 1) {\n\t\tconst value = args![index]!;\n\t\tif (value === \"--no-session\") continue;\n\t\tif (value === \"--session\") {\n\t\t\tindex += 1;\n\t\t\tcontinue;\n\t\t}\n\t\tresult.push(value);\n\t}\n\tresult.push(sessionFile ? \"--session\" : \"--no-session\");\n\tif (sessionFile) result.push(sessionFile);\n\treturn result;\n}\n\nconst MAX_STDERR_BYTES = 256 * 1024;\n\n/** Keep only the tail of a child's stderr, so a noisy child cannot grow the host. */\nexport function appendBoundedStderr(existing: string, chunk: string): string {\n\tconst next = existing + chunk;\n\tif (Buffer.byteLength(next, \"utf8\") <= MAX_STDERR_BYTES) return next;\n\treturn `${Buffer.from(next).subarray(-MAX_STDERR_BYTES).toString(\"utf8\")}\\n[stderr truncated]`;\n}\n"]}

package/dist/modes/rpc/rpc-client-waits.d.ts

@@ -1,8 +1,24 @@
-import type { RpcEvent } from "./rpc-types.ts";
+import type { BashResult } from "../../core/bash-executor.ts";
+import type { BashOutputChannel } from "../../core/tools/bash.ts";
+import type { RpcEvent, RpcResponse } from "./rpc-types.ts";
 export interface RpcEventSource {
     onEvent(listener: (event: RpcEvent) => void): () => void;
     getStderr(): string;
 }
 export declare function waitForRpcIdle(source: RpcEventSource, timeout: number): Promise<void>;
 export declare function collectRpcEvents(source: RpcEventSource, timeout: number): Promise<RpcEvent[]>;
+/**
+ * Run a user bash command, forwarding only the output of that request.
+ *
+ * The id is learned from the send itself, so the subscription is registered
+ * before the command starts and still filters by correlation.
+ */
+export declare function runUserBashWithUpdates(source: RpcEventSource, command: string, onUpdate: (delta: string, channel: BashOutputChannel) => void, options: {
+    excludeFromContext?: boolean;
+    onRequestId?: (id: string) => void;
+} | undefined, send: (body: {
+    type: "user_bash";
+    command: string;
+    excludeFromContext?: boolean;
+}, onRequestId: (id: string) => void) => Promise<RpcResponse>): Promise<BashResult>;
 //# sourceMappingURL=rpc-client-waits.d.ts.map

package/dist/modes/rpc/rpc-client-waits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client-waits.d.ts","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-client-waits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC9B,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACzD,SAAS,IAAI,MAAM,CAAC;CACpB;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAarF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAe7F"}
+{"version":3,"file":"rpc-client-waits.d.ts","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-client-waits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC9B,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACzD,SAAS,IAAI,MAAM,CAAC;CACpB;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAarF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAe7F;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC3C,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,KAAK,IAAI,EAC7D,OAAO,EAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,GAAG,SAAS,EACzF,IAAI,EAAE,CACL,IAAI,EAAE;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1E,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,KAC7B,OAAO,CAAC,WAAW,CAAC,GACvB,OAAO,CAAC,UAAU,CAAC,CAkBrB"}

package/dist/modes/rpc/rpc-client-waits.js

@@ -30,4 +30,29 @@ export function collectRpcEvents(source, timeout) {
         });
     });
 }
+/**
+ * Run a user bash command, forwarding only the output of that request.
+ *
+ * The id is learned from the send itself, so the subscription is registered
+ * before the command starts and still filters by correlation.
+ */
+export async function runUserBashWithUpdates(source, command, onUpdate, options, send) {
+    let requestId;
+    const unsubscribe = source.onEvent((event) => {
+        if (event.type === "bash_execution_update" && event.id === requestId)
+            onUpdate(event.delta, event.channel);
+    });
+    try {
+        const response = await send({ type: "user_bash", command, excludeFromContext: options?.excludeFromContext }, (id) => {
+            requestId = id;
+            options?.onRequestId?.(id);
+        });
+        if (!response.success)
+            throw new Error(response.error);
+        return response.data;
+    }
+    finally {
+        unsubscribe();
+    }
+}
 //# sourceMappingURL=rpc-client-waits.js.map

package/dist/modes/rpc/rpc-client-waits.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client-waits.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-client-waits.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,cAAc,CAAC,MAAsB,EAAE,OAAe;IACrE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,WAAW,EAAE,CAAC;YACd,MAAM,CAAC,IAAI,KAAK,CAAC,qDAAqD,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9F,CAAC,EAAE,OAAO,CAAC,CAAC;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO;YACvC,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAsB,EAAE,OAAe;IACvE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,WAAW,EAAE,CAAC;YACd,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,CAAC,EAAE,OAAO,CAAC,CAAC;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO;YACvC,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,WAAW,EAAE,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { RpcEvent } from \"./rpc-types.ts\";\n\nexport interface RpcEventSource {\n\tonEvent(listener: (event: RpcEvent) => void): () => void;\n\tgetStderr(): string;\n}\n\nexport function waitForRpcIdle(source: RpcEventSource, timeout: number): Promise<void> {\n\treturn new Promise((resolve, reject) => {\n\t\tconst timer = setTimeout(() => {\n\t\t\tunsubscribe();\n\t\t\treject(new Error(`Timeout waiting for agent to become idle. Stderr: ${source.getStderr()}`));\n\t\t}, timeout);\n\t\tconst unsubscribe = source.onEvent((event) => {\n\t\t\tif (event.type !== \"agent_end\") return;\n\t\t\tclearTimeout(timer);\n\t\t\tunsubscribe();\n\t\t\tresolve();\n\t\t});\n\t});\n}\n\nexport function collectRpcEvents(source: RpcEventSource, timeout: number): Promise<RpcEvent[]> {\n\treturn new Promise((resolve, reject) => {\n\t\tconst events: RpcEvent[] = [];\n\t\tconst timer = setTimeout(() => {\n\t\t\tunsubscribe();\n\t\t\treject(new Error(`Timeout collecting events. Stderr: ${source.getStderr()}`));\n\t\t}, timeout);\n\t\tconst unsubscribe = source.onEvent((event) => {\n\t\t\tevents.push(event);\n\t\t\tif (event.type !== \"agent_end\") return;\n\t\t\tclearTimeout(timer);\n\t\t\tunsubscribe();\n\t\t\tresolve(events);\n\t\t});\n\t});\n}\n"]}
+{"version":3,"file":"rpc-client-waits.js","sourceRoot":"","sources":["../../../src/modes/rpc/rpc-client-waits.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,cAAc,CAAC,MAAsB,EAAE,OAAe;IACrE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,WAAW,EAAE,CAAC;YACd,MAAM,CAAC,IAAI,KAAK,CAAC,qDAAqD,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9F,CAAC,EAAE,OAAO,CAAC,CAAC;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO;YACvC,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAsB,EAAE,OAAe;IACvE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,WAAW,EAAE,CAAC;YACd,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,CAAC,EAAE,OAAO,CAAC,CAAC;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO;YACvC,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,WAAW,EAAE,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC3C,MAAsB,EACtB,OAAe,EACf,QAA6D,EAC7D,OAAyF,EACzF,IAGyB;IAEzB,IAAI,SAA6B,CAAC;IAClC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,uBAAuB,IAAI,KAAK,CAAC,EAAE,KAAK,SAAS;YAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5G,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAC1B,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAC/E,CAAC,EAAE,EAAE,EAAE;YACN,SAAS,GAAG,EAAE,CAAC;YACf,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC,CACD,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvD,OAAQ,QAAmE,CAAC,IAAkB,CAAC;IAChG,CAAC;YAAS,CAAC;QACV,WAAW,EAAE,CAAC;IACf,CAAC;AACF,CAAC","sourcesContent":["import type { BashResult } from \"../../core/bash-executor.ts\";\nimport type { BashOutputChannel } from \"../../core/tools/bash.ts\";\nimport type { RpcEvent, RpcResponse } from \"./rpc-types.ts\";\n\nexport interface RpcEventSource {\n\tonEvent(listener: (event: RpcEvent) => void): () => void;\n\tgetStderr(): string;\n}\n\nexport function waitForRpcIdle(source: RpcEventSource, timeout: number): Promise<void> {\n\treturn new Promise((resolve, reject) => {\n\t\tconst timer = setTimeout(() => {\n\t\t\tunsubscribe();\n\t\t\treject(new Error(`Timeout waiting for agent to become idle. Stderr: ${source.getStderr()}`));\n\t\t}, timeout);\n\t\tconst unsubscribe = source.onEvent((event) => {\n\t\t\tif (event.type !== \"agent_end\") return;\n\t\t\tclearTimeout(timer);\n\t\t\tunsubscribe();\n\t\t\tresolve();\n\t\t});\n\t});\n}\n\nexport function collectRpcEvents(source: RpcEventSource, timeout: number): Promise<RpcEvent[]> {\n\treturn new Promise((resolve, reject) => {\n\t\tconst events: RpcEvent[] = [];\n\t\tconst timer = setTimeout(() => {\n\t\t\tunsubscribe();\n\t\t\treject(new Error(`Timeout collecting events. Stderr: ${source.getStderr()}`));\n\t\t}, timeout);\n\t\tconst unsubscribe = source.onEvent((event) => {\n\t\t\tevents.push(event);\n\t\t\tif (event.type !== \"agent_end\") return;\n\t\t\tclearTimeout(timer);\n\t\t\tunsubscribe();\n\t\t\tresolve(events);\n\t\t});\n\t});\n}\n\n/**\n * Run a user bash command, forwarding only the output of that request.\n *\n * The id is learned from the send itself, so the subscription is registered\n * before the command starts and still filters by correlation.\n */\nexport async function runUserBashWithUpdates(\n\tsource: RpcEventSource,\n\tcommand: string,\n\tonUpdate: (delta: string, channel: BashOutputChannel) => void,\n\toptions: { excludeFromContext?: boolean; onRequestId?: (id: string) => void } | undefined,\n\tsend: (\n\t\tbody: { type: \"user_bash\"; command: string; excludeFromContext?: boolean },\n\t\tonRequestId: (id: string) => void,\n\t) => Promise<RpcResponse>,\n): Promise<BashResult> {\n\tlet requestId: string | undefined;\n\tconst unsubscribe = source.onEvent((event) => {\n\t\tif (event.type === \"bash_execution_update\" && event.id === requestId) onUpdate(event.delta, event.channel);\n\t});\n\ttry {\n\t\tconst response = await send(\n\t\t\t{ type: \"user_bash\", command, excludeFromContext: options?.excludeFromContext },\n\t\t\t(id) => {\n\t\t\t\trequestId = id;\n\t\t\t\toptions?.onRequestId?.(id);\n\t\t\t},\n\t\t);\n\t\tif (!response.success) throw new Error(response.error);\n\t\treturn (response as Extract<RpcResponse, { success: true; data: unknown }>).data as BashResult;\n\t} finally {\n\t\tunsubscribe();\n\t}\n}\n"]}

package/dist/modes/rpc/rpc-client.d.ts

@@ -1,17 +1,19 @@
 import type { ImageContent } from "@earendil-works/pi-ai/compat";
+import type { BashResult } from "../../core/bash-executor.ts";
+import type { BashOutputChannel } from "../../core/tools/bash.ts";
 import type { ActivityWatchdogDiagnostic } from "../interactive-engine/activity-watchdog.ts";
+import type { InteractiveEngineGenerationEndedListener } from "../interactive-engine/engine-generation.ts";
 import { type EngineKeybindingState, type InteractiveEngineCommand, type InteractiveEngineMessage } from "../interactive-engine/protocol.ts";
 import { RpcClientApi, type RpcCommandBody } from "./rpc-client-api.ts";
-import type { RpcExtensionUIRequest, RpcExtensionUIResponse, RpcEvent, RpcResponse } from "./rpc-types.ts";
+import type { RpcEvent, RpcExtensionUIRequest, RpcExtensionUIResponse, RpcResponse } from "./rpc-types.ts";
 export type { ModelInfo, RpcCommandBody } from "./rpc-client-api.ts";
-export type { RpcContextWindowInfo, RpcEvent } from "./rpc-types.ts";
+export type { RpcEvent } from "./rpc-types.ts";
 export interface RpcClientOptions {
     cliPath?: string;
     cwd?: string;
     env?: Record<string, string>;
     provider?: string;
     model?: string;
-    contextWindow?: number | string;
     args?: string[];
     runtimeExecutable?: string;
     runtimeArgs?: string[];
@@ -23,6 +25,17 @@ export interface RpcClientOptions {
     interactiveEngine?: {
         onDiagnostic: (diagnostic: ActivityWatchdogDiagnostic) => void;
         onActivityChange?: (active: boolean) => void;
+        /**
+         * Heartbeat observer. Deliberately NOT a generic engine-message listener:
+         * subscribing there drains the buffered startup custom-UI messages into the
+         * first subscriber and stops buffering for the real controllers.
+         */
+        onHeartbeat?: () => void;
+        /**
+         * Credential for the engine child. Delivered through the protected
+         * bootstrap file, never through the child's environment or argv.
+         */
+        apiKey?: string;
     };
 }
 export type RpcEventListener = (event: RpcEvent) => void;
@@ -31,12 +44,15 @@ export declare class RpcClient extends RpcClientApi {
     private stopReadingStdout;
     private eventListeners;
     private extensionUIListeners;
-    private pendingExtensionUIRequests;
+    private readonly pendingExtensionUIRequests;
     private engineMessageListeners;
     private latestEngineKeybindingState;
-    private pendingEngineMessages;
-    private pendingEngineMessageBytes;
-    private pendingRequests;
+    private readonly pendingEngineMessages;
+    private readonly pendingRequests;
+    /** Bumped by every explicit stop; a restart holds a permit across its own stop. */
+    private restartRevision;
+    private readonly terminalDrain;
+    private stdoutDrained;
     private requestId;
     private stderr;
     private exitError;
@@ -44,24 +60,60 @@ export declare class RpcClient extends RpcClientApi {
     private eventBuffer;
     private stdinWriter;
     private generation;
+    private lastEndedGeneration;
+    private generationEndedListeners;
+    /**
+     * The latest generation-end event, retained so a subscriber that attaches
+     * after the child died still observes it. A child can exit between
+     * `start()` returning and the runtime constructing its listeners.
+     */
+    private retainedGenerationEnd;
     private readonly activeActivityIds;
     private enginePid;
     private options;
     constructor(options?: RpcClientOptions);
     start(): Promise<void>;
+    /**
+     * Explicit stop. Voids any in-flight restart permit, so a replacement caught
+     * between its own stop and start can never spawn after this returns.
+     */
     stop(): Promise<void>;
+    /**
+     * Tear down the current child without touching the restart permit. The reader
+     * stays attached and the generation stays current until the dead child's
+     * stdout settles, so an ownership frame it already sent still reaches its
+     * request; only then is the generation retired (see RpcTerminalDrain).
+     */
+    private stopCurrentGeneration;
     /** Subscribe to agent events. */
     onEvent(listener: RpcEventListener): () => void;
     onExtensionUIRequest(listener: (request: RpcExtensionUIRequest) => void): () => void;
     respondExtensionUI(response: RpcExtensionUIResponse): Promise<void>;
     onInteractiveEngineMessage(listener: (message: InteractiveEngineMessage) => void): () => void;
     onInteractiveEngineKeybindingState(listener: (state: EngineKeybindingState) => void): () => void;
+    /**
+     * Subscribe to host-local generation death. Fires at most once per
+     * generation, synchronously, before any restart work. A death that has
+     * already happened for the current generation replays immediately, so a
+     * listener attached after an exit still sees it.
+     */
+    onGenerationEnded(listener: InteractiveEngineGenerationEndedListener): () => void;
     sendInteractiveEngineCommand(command: InteractiveEngineCommand): void;
     waitForInteractiveEngineBound(): Promise<void>;
     getEnginePid(): number | undefined;
     getGeneration(): number;
+    /**
+     * Replace the engine child, unless an explicit stop supersedes this attempt.
+     * The permit is checked immediately before spawning, so a `stop()` in that
+     * window is always observed; cancellation throws rather than returning
+     * quietly, because callers go on to initialize against the new child.
+     */
     restart(sessionFile: string | undefined): Promise<void>;
     requestInternal<T>(command: RpcCommandBody): Promise<T>;
+    userBashWithUpdates(command: string, onUpdate: (delta: string, channel: BashOutputChannel) => void, options?: {
+        excludeFromContext?: boolean;
+        onRequestId?: (id: string) => void;
+    }): Promise<BashResult>;
     getStderr(): string;
     waitForIdle(timeout?: number): Promise<void>;
     collectEvents(timeout?: number): Promise<RpcEvent[]>;
@@ -72,11 +124,18 @@ export declare class RpcClient extends RpcClientApi {
     private createProcessExitError;
     private invalidateEngineShortcuts;
     private observeInteractiveEngineMessage;
-    private rejectPendingRequests;
+    /**
+     * Shared teardown for every unexpected end of `generation`. Death publishes
+     * at once for the host UI; its requests wait for stdout (RpcTerminalDrain).
+     */
+    private failGeneration;
+    /** Hold this generation's requests until its stdout drains (RpcTerminalDrain). */
+    private beginTerminalDrain;
+    private publishGenerationEnded;
     private failTransport;
     private requireWriter;
     private bestEffort;
-    protected request(command: RpcCommandBody): Promise<RpcResponse>;
+    protected request(command: RpcCommandBody, onRequestId?: (id: string) => void): Promise<RpcResponse>;
     private assertSuccess;
     protected data<T>(response: RpcResponse): T;
 }

package/dist/modes/rpc/rpc-client.d.ts.map

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