@gajae-code/coding-agent 0.18.5 → 0.18.7

package/src/edit/streaming.ts

@@ -7,7 +7,7 @@
  * - compute unified diff previews for the in-flight args
  *   (`computeDiffPreview`), and
  * - render a text placeholder while no diff exists yet
- *   (`renderStreamingFallback`).
+ *   (`renderStreamingPlaceholder`).
  *
  * The shared renderer / `ToolExecutionComponent` consult the strategy via
  * the injected `editMode` rather than probing argument shape.
@@ -72,7 +72,7 @@ export interface EditStreamingStrategy<Args = unknown> {
 	 * Rendered inline while the diff hasn't been computed yet (or when the
 	 * compute returned `null` because args are still too partial).
 	 */
-	renderStreamingFallback(args: Args, uiTheme: Theme): string;
+	renderStreamingPlaceholder(args: Args, uiTheme: Theme): string;
 }
 export interface EditRequestTargetInventory {
 	paths: string[];
@@ -169,7 +169,7 @@ export function getEditRequestTargetInventory(
 	if (editMode === "hashline") {
 		const input = typeof values.input === "string" ? values.input : "";
 		const headerPaths = getHashlineTargetPaths(input);
-		// `path` is only a fallback for headerless input; explicit §PATH headers are the full target set.
+		// `path` is only the target for headerless input; explicit §PATH headers are the full target set.
 		if (headerPaths.length > 0) return { paths: orderedDistinctPaths(headerPaths) };
 		return { paths: orderedDistinctPaths([topLevelPath]) };
 	}
@@ -197,8 +197,8 @@ export function getEditRequestTargetInventory(
 	return { paths: orderedDistinctPaths([topLevelPath, ...editPaths, partialPath]) };
 }
 
-const STREAMING_FALLBACK_LINES = 12;
-const STREAMING_FALLBACK_WIDTH = 80;
+const STREAMING_PLACEHOLDER_LINES = 12;
+const STREAMING_PLACEHOLDER_WIDTH = 80;
 
 function isHashlineHeaderLine(line: string): boolean {
 	return line.trimEnd().startsWith(HL_FILE_PREFIX);
@@ -236,15 +236,15 @@ function trimHashlineStreamingSyntax(lines: string[]): string[] {
 	return lines.slice(index).filter(line => !isHashlineEnvelopeMarkerLine(line));
 }
 
-function renderHashlineInputFallback(input: string, uiTheme: Theme): string {
+function renderHashlineInputPlaceholder(input: string, uiTheme: Theme): string {
 	const lines = trimHashlineStreamingSyntax(sanitizeText(input).split("\n"));
 	if (!lines.some(line => line.trim().length > 0)) return "";
 
-	const displayLines = lines.slice(-STREAMING_FALLBACK_LINES);
+	const displayLines = lines.slice(-STREAMING_PLACEHOLDER_LINES);
 	const hidden = lines.length - displayLines.length;
 	let text = "\n\n";
 	text += displayLines
-		.map(line => uiTheme.fg("toolOutput", truncateToWidth(replaceTabs(line), STREAMING_FALLBACK_WIDTH)))
+		.map(line => uiTheme.fg("toolOutput", truncateToWidth(replaceTabs(line), STREAMING_PLACEHOLDER_WIDTH)))
 		.join("\n");
 	if (hidden > 0) {
 		text += uiTheme.fg("dim", `\n… (streaming +${hidden} lines)`);
@@ -376,7 +376,7 @@ const replaceStrategy: EditStreamingStrategy<ReplaceArgs> = {
 		ctx.signal.throwIfAborted();
 		return [toPerFilePreview(args.path, result)];
 	},
-	renderStreamingFallback() {
+	renderStreamingPlaceholder() {
 		return "";
 	},
 };
@@ -405,7 +405,7 @@ const patchStrategy: EditStreamingStrategy<PatchArgs> = {
 		ctx.signal.throwIfAborted();
 		return [toPerFilePreview(args.path, result)];
 	},
-	renderStreamingFallback() {
+	renderStreamingPlaceholder() {
 		return "";
 	},
 };
@@ -552,7 +552,7 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		try {
 			sections = splitHashlineInputs(input, { cwd: ctx.cwd, path: args.path });
 		} catch {
-			// Single-section fallback keeps the original error rendering for the
+			// Single-section handling keeps the original error rendering for the
 			// "haven't typed `§ PATH` yet" case.
 			const result = await computeHashlineDiff({ input, path: args.path }, ctx.cwd, {
 				autoDropPureInsertDuplicates: ctx.hashlineAutoDropPureInsertDuplicates,
@@ -590,8 +590,8 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		}
 		return previews.length > 0 ? previews : null;
 	},
-	renderStreamingFallback(args, uiTheme) {
-		return typeof args.input === "string" ? renderHashlineInputFallback(args.input, uiTheme) : "";
+	renderStreamingPlaceholder(args, uiTheme) {
+		return typeof args.input === "string" ? renderHashlineInputPlaceholder(args.input, uiTheme) : "";
 	},
 };
 
@@ -642,7 +642,7 @@ const applyPatchStrategy: EditStreamingStrategy<ApplyPatchArgs> = {
 		}
 		return previews.length > 0 ? previews : null;
 	},
-	renderStreamingFallback() {
+	renderStreamingPlaceholder() {
 		return "";
 	},
 };
@@ -656,7 +656,7 @@ const vimStrategy: EditStreamingStrategy<unknown> = {
 	async computeDiffPreview() {
 		return null;
 	},
-	renderStreamingFallback() {
+	renderStreamingPlaceholder() {
 		return "";
 	},
 };

package/src/exec/bash-shell-supervisor.ts

@@ -1,6 +1,7 @@
 import { dlopen, FFIType, ptr } from "bun:ffi";
 import * as childProcess from "node:child_process";
 import { createHmac } from "node:crypto";
+import type { EventEmitter } from "node:events";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -121,6 +122,63 @@ async function reapLinuxAdoptedZombies(excludedPid: number | undefined): Promise
 	}
 }
 
+/**
+ * Reap adopted zombies only when the kernel reports a child state change.
+ *
+ * As the Linux child subreaper, the supervisor inherits orphaned descendants
+ * and must reap them, but a full `/proc` sweep is expensive. Polling it on a
+ * short interval kept every idle supervisor busy (issue #5972), so sweeps are
+ * driven by SIGCHLD instead. At most one sweep runs at a time, and a SIGCHLD that
+ * arrives mid-sweep schedules exactly one follow-up so a zombie created after
+ * its `/proc` entry was passed is never missed. Returns the unsubscribe hook.
+ */
+export function startLinuxAdoptedZombieReaper(
+	excludedPid: number | undefined,
+	reap: (excludedPid: number | undefined) => Promise<void> = reapLinuxAdoptedZombies,
+	signals: Pick<EventEmitter, "on" | "off"> = process,
+): () => void {
+	if (process.platform !== "linux") return () => undefined;
+	let running = false;
+	let rerun = false;
+	let stopped = false;
+	let sweepPending = false;
+	const sweep = (): void => {
+		if (stopped) return;
+		if (running) {
+			rerun = true;
+			return;
+		}
+		if (sweepPending) return;
+		sweepPending = true;
+		running = true;
+		void reap(excludedPid)
+			.catch(() => undefined)
+			.finally(() => {
+				running = false;
+				sweepPending = false;
+				if (!rerun || stopped) return;
+				rerun = false;
+				// Defer recursive call to avoid stack overflow
+				setImmediate(() => {
+					if (!stopped && !running) sweep();
+				});
+			});
+	};
+	try {
+		signals.on("SIGCHLD", sweep);
+	} catch {
+		// Signal handler installation may fail in some environments
+	}
+	return () => {
+		stopped = true;
+		try {
+			signals.off("SIGCHLD", sweep);
+		} catch {
+			// Signal handler removal may fail in some environments
+		}
+	};
+}
+
 function signalFromExit(code: number | null, signal: NodeJS.Signals | null): NodeJS.Signals | null {
 	if (signal) return signal;
 	if (code === null || code <= 128) return null;
@@ -210,8 +268,7 @@ export async function runBashShellSupervisor(): Promise<void> {
 		stdio: ["pipe", "pipe", "pipe"],
 		windowsHide: true,
 	});
-	const zombieReaper = setInterval(() => void reapLinuxAdoptedZombies(worker.pid), 25);
-	zombieReaper.unref();
+	const stopZombieReaper = startLinuxAdoptedZombieReaper(worker.pid);
 	const pendingRuns: number[] = [];
 	let terminating = false;
 	let protocolToken: string | undefined;
@@ -315,7 +372,7 @@ export async function runBashShellSupervisor(): Promise<void> {
 		);
 	});
 	worker.once("exit", async (code, signal) => {
-		clearInterval(zombieReaper);
+		stopZombieReaper();
 		const resultSignal = signalFromExit(code, signal);
 		if (code === 0 && resultSignal === null) {
 			await reapLinuxSubreaperChildren();

package/src/gjc-runtime/gc-runtime.ts

@@ -30,7 +30,8 @@ import {
 	listCanonicalBlobs,
 	removeCanonicalBlob,
 } from "../session/blob-store";
-import { FileSessionStorage, probeSessionRetirement, retireSessionTranscript } from "../session/session-storage";
+import { probeSessionRetirement, retireSessionTranscript } from "../session/session-retirement";
+import { FileSessionStorage } from "../session/session-storage";
 import {
 	collectEmptyDeleteReceipts,
 	type EmptyDeleteGcRecord,

package/src/hindsight/config.ts

@@ -62,11 +62,17 @@ function envBool(value: string | undefined): boolean | undefined {
 	return ["true", "1", "yes"].includes(value.toLowerCase());
 }
 
-/** Coerce an env var value into an int, returning undefined for non-numeric input. */
+/**
+ * Coerce an env var value into a non-negative int, returning undefined (so the
+ * settings value applies) for anything that is not plain digits. `parseInt`
+ * alone would read "5turns" as 5, "1e3" as 1 and "-3" as -3.
+ */
 function envInt(value: string | undefined): number | undefined {
 	if (value === undefined) return undefined;
-	const n = Number.parseInt(value, 10);
-	return Number.isFinite(n) ? n : undefined;
+	const trimmed = value.trim();
+	if (!/^\d+$/.test(trimmed)) return undefined;
+	const n = Number(trimmed);
+	return Number.isSafeInteger(n) ? n : undefined;
 }
 
 function envString(value: string | undefined): string | undefined {