@gajae-code/coding-agent 0.18.1 → 0.18.5

package/src/sdk/host/session-runtime.ts

@@ -50,6 +50,12 @@ import { parseThinkingLevel } from "../../thinking";
 import { readEndpointFile } from "../broker/endpoint-authority";
 import { ensureBroker } from "../broker/ensure";
 import { processIncarnation } from "../broker/process-incarnation";
+import { RecoveryBackoffTracker } from "../broker/recovery-backoff";
+import {
+	captureRuntimeImageIdentity,
+	isSdkInternalRuntimeImageReplaced,
+	sdkInternalRuntimeImage,
+} from "../broker/runtime";
 import {
 	type MasterRoleAttestationV2,
 	resolveSessionLocator,
@@ -716,6 +722,15 @@ export interface CreateSdkSessionRuntimeOptions {
 	onFailureDiagnosticKeyCountForTests?: (count: number) => void;
 	/** Test-only observation after a resolved invocation completion is reconciled. */
 	onInvocationCompletionReconciledForTests?: (kind: InvocationKind, correlation: InvocationCorrelation) => void;
+	/** Test hook: provides a function to inject a controlled clock for broker recovery backoff assertions. */
+	setRecoveryBackoffClockForTest?: (inject: (clock: { now(): number }) => void) => void;
+	/** Test hook: inject mock runtime image identity and replacement detection for broker recovery tests. */
+	setRuntimeImageIdentityForTest?: (
+		register: (
+			captureFn: () => Awaited<ReturnType<typeof captureRuntimeImageIdentity>> | undefined,
+			isReplacedFn: () => Promise<boolean>,
+		) => void,
+	) => void;
 }
 
 function unavailable(operation: string): () => never {
@@ -7013,6 +7028,43 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 		let brokerRegistered = false;
 		let brokerRegistrationInFlight: Promise<void> | undefined;
 		let brokerRecoveryStopped = false;
+		let brokerRecoveryRestartRequired = false;
+		const brokerRecoveryBackoff = new RecoveryBackoffTracker();
+		if (options.setRecoveryBackoffClockForTest) {
+			options.setRecoveryBackoffClockForTest((clock: { now(): number }) =>
+				brokerRecoveryBackoff.setClockForTest(clock),
+			);
+		}
+		// Capture runtime image identity at startup to detect replacements
+		let startupRuntimeImageIdentity: Awaited<ReturnType<typeof captureRuntimeImageIdentity>> | undefined;
+		let captureStartupRuntimeImageForTest:
+			| (() => Awaited<ReturnType<typeof captureRuntimeImageIdentity>> | undefined)
+			| undefined;
+		let isRuntimeImageReplacedForTest: (() => Promise<boolean>) | undefined;
+		if (options.setRuntimeImageIdentityForTest) {
+			options.setRuntimeImageIdentityForTest(
+				(
+					captureFn: () => Awaited<ReturnType<typeof captureRuntimeImageIdentity>> | undefined,
+					isReplacedFn: () => Promise<boolean>,
+				) => {
+					captureStartupRuntimeImageForTest = captureFn;
+					isRuntimeImageReplacedForTest = isReplacedFn;
+				},
+			);
+		}
+		const captureStartupRuntimeImage = async (): Promise<void> => {
+			if (options.setRuntimeImageIdentityForTest) {
+				// Test mode: use injected identity
+				startupRuntimeImageIdentity = captureStartupRuntimeImageForTest?.();
+			} else {
+				// Production mode: capture real runtime image
+				const runtimeImage = sdkInternalRuntimeImage();
+				if (runtimeImage) {
+					startupRuntimeImageIdentity = await captureRuntimeImageIdentity(runtimeImage);
+				}
+			}
+		};
+		const startupImageCapture = captureStartupRuntimeImage();
 		const registerBroker = async (): Promise<void> => {
 			if (brokerRegistered) return;
 			if (brokerRegistrationInFlight !== undefined) {
@@ -7143,17 +7195,58 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 		let brokerRecoveryTimer: NodeJS.Timeout | undefined;
 		let brokerRecoveryInFlight: Promise<void> | undefined;
 		const runBrokerRecovery = async (): Promise<void> => {
-			if (brokerRecoveryStopped || brokerRecoveryInFlight !== undefined) return;
+			if (brokerRecoveryStopped || brokerRecoveryInFlight !== undefined || brokerRecoveryRestartRequired) return;
+			// Checked synchronously so an interval tick cannot start an attempt the backoff forbids.
+			if (!brokerRecoveryBackoff.canAttemptRecovery(options.agentDir)) return;
+
+			// The single-flight slot is claimed before the first await: the interval does not wait
+			// for prior callbacks, so a slow runtime-image probe must not let a second tick through
+			// to ensure the broker and record the same failure twice.
 			const recovery = (async (): Promise<void> => {
+				// A replaced runtime image cannot launch a broker; restarting the session is the only fix.
+				const imageReplaced = await (isRuntimeImageReplacedForTest
+					? isRuntimeImageReplacedForTest()
+					: isSdkInternalRuntimeImageReplaced(startupRuntimeImageIdentity).catch(() => false));
+				if (imageReplaced) {
+					brokerRecoveryRestartRequired = true;
+					stopBrokerRecovery();
+					logger.warn("sdk broker recovery requires session restart", {
+						reason: "runtime_image_replaced",
+					});
+					return;
+				}
 				if (brokerRecoveryStopped) return;
 				if (brokerRegistered) await (options.ensureBrokerImpl ?? ensureBroker)({ agentDir: options.agentDir });
-				else await registerBroker();
+				else {
+					// Optional registration logs and resolves on failure; recovery must still count it
+					// as a failed attempt so the backoff holds instead of resetting every tick.
+					await registerBroker();
+					if (!brokerRegistered && !brokerRecoveryStopped)
+						throw Object.assign(new Error("SDK broker registration did not complete."), {
+							code: "registration_incomplete",
+						});
+				}
 			})();
 			brokerRecoveryInFlight = recovery;
 			try {
 				await recovery;
+				if (brokerRecoveryRestartRequired || brokerRecoveryStopped) return;
+				brokerRecoveryBackoff.recordSuccess(options.agentDir);
 			} catch (error) {
-				logger.warn("sdk broker recovery unavailable", { code: brokerDiagnosticCode(error) });
+				const shouldContinue = brokerRecoveryBackoff.recordFailure(options.agentDir);
+				if (!shouldContinue) {
+					// Max recovery attempts reached; mark that restart is required.
+					brokerRecoveryRestartRequired = true;
+					stopBrokerRecovery();
+					logger.warn("sdk broker recovery max attempts exceeded", {
+						code: brokerDiagnosticCode(error),
+					});
+				} else {
+					logger.warn("sdk broker recovery unavailable", {
+						code: brokerDiagnosticCode(error),
+						backoffWaitMs: brokerRecoveryBackoff.getBackoffWaitMs(options.agentDir),
+					});
+				}
 			} finally {
 				if (brokerRecoveryInFlight === recovery) brokerRecoveryInFlight = undefined;
 			}
@@ -7210,6 +7303,9 @@ export function createSdkSessionRuntimeExtension(api: ExtensionAPI, options: Cre
 		try {
 			publishedEndpointUrl = (await runtime.start()).url;
 			await registerBroker();
+			// Await the startup runtime image capture before arming recovery.
+			// This ensures replacement detection works correctly on the first recovery check.
+			await startupImageCapture;
 			if (!brokerRecoveryStopped) startBrokerRecovery();
 		} catch (error) {
 			active = undefined;

package/src/sdk/prompt-watchdog.ts

@@ -97,8 +97,13 @@ export class PromptActivity {
 	#awaitingModel = false;
 
 	/** Folds one inbound frame's lifecycle event into the in-flight tool and model state. */
-	observe(eventType: string | undefined, toolCallId: string | undefined, messageRole: string | undefined): void {
-		this.#observeInference(eventType, messageRole);
+	observe(
+		eventType: string | undefined,
+		toolCallId: string | undefined,
+		messageRole: string | undefined,
+		messageHasToolCall = false,
+	): void {
+		this.#observeInference(eventType, messageRole, messageHasToolCall);
 		if (toolCallId === undefined) return;
 		if (eventType === "tool_execution_start" || eventType === "tool_execution_update") this.#running.add(toolCallId);
 		else if (eventType === "tool_execution_end") this.#running.delete(toolCallId);
@@ -110,7 +115,11 @@ export class PromptActivity {
 	 * re-invocation that carries a tool result back — until the first frame of that
 	 * response proves the model answered.
 	 */
-	#observeInference(eventType: string | undefined, messageRole: string | undefined): void {
+	#observeInference(
+		eventType: string | undefined,
+		messageRole: string | undefined,
+		messageHasToolCall: boolean,
+	): void {
 		if (eventType === "agent_start" || eventType === "tool_execution_end") {
 			this.#awaitingModel = true;
 			return;
@@ -132,7 +141,11 @@ export class PromptActivity {
 		// Providers that do not stream emit no `message_update`, so the assistant message
 		// itself is the first proof. `message_start`/`message_end` also carry the user and
 		// tool-result messages the host echoes back, which prove nothing about the model.
-		if ((eventType === "message_start" || eventType === "message_end") && messageRole === "assistant")
+		if (
+			(eventType === "message_start" || eventType === "message_end") &&
+			messageRole === "assistant" &&
+			!messageHasToolCall
+		)
 			this.#awaitingModel = false;
 	}
 

package/src/session/agent-session.ts

@@ -24425,8 +24425,15 @@ export class AgentSession {
 		if (!managedFallback && assistantMessageHasVisibleOrToolContent(message)) {
 			return false;
 		}
+		const canReplayUnexpectedSocketClose =
+			classification === "transient" &&
+			isUnexpectedSocketCloseMessage(message.errorMessage ?? "") &&
+			!hasBareDefaultRetryDisqualifyingFacts(message) &&
+			this.#hasCleanRetryReplaySafety;
 		// Bare defaults retain their narrow watchdog and provider capacity-overload
-		// admissions. A first-event timeout adds the typed, content-free,
+		// admissions. A content-free unexpected socket close is replay-safe when
+		// the attempt has no conflicting facts and the retry scope is clean. A
+		// first-event timeout adds the typed, content-free,
 		// current-clean-scope requirement above; other transient watchdogs preserve
 		// legacy behavior. A provider overload is admitted only from that provider's
 		// own typed overload code on a content-free attempt carrying no conflicting
@@ -24435,12 +24442,16 @@ export class AgentSession {
 		if (!managedFallback && !legacyRetryConfigured && !canReplayRotatedCredential && !canReplayEmptyResponse) {
 			if (
 				(!canReplayProviderOverload &&
+					!canReplayUnexpectedSocketClose &&
 					!this.#isTypedFirstEventTimeout(message) &&
 					!messageOnlyWatchdogTimeout &&
 					(hasBareDefaultRetryDisqualifyingFacts(message) ||
 						(classification !== "transient" && classification !== "first_event_timeout") ||
 						!BARE_DEFAULT_WATCHDOG_ERROR.test(message.errorMessage ?? ""))) ||
-				(!firstEventTimeout && !messageOnlyWatchdogTimeout && !this.#hasCleanRetryReplaySafety)
+				(!firstEventTimeout &&
+					!messageOnlyWatchdogTimeout &&
+					!canReplayUnexpectedSocketClose &&
+					!this.#hasCleanRetryReplaySafety)
 			) {
 				return false;
 			}
@@ -24449,6 +24460,7 @@ export class AgentSession {
 			!managedFallback &&
 			classification === "transient" &&
 			!canReplayProviderOverload &&
+			!canReplayUnexpectedSocketClose &&
 			!this.#isIdleStreamStallErrorMessage(message.errorMessage ?? "");
 
 		const failedSelector = managedFallback ? controller.currentSelector() : undefined;

package/src/session/internal/managed-session-storage.ts

@@ -165,6 +165,27 @@ function isRetryableReplacementReceiptCleanupError(error: unknown): boolean {
 	return error instanceof Error && error.message === "managed_replace_receipt_cleanup_pending:io_error";
 }
 
+/**
+ * A receipt retirement slot is named only from the receipt and predecessor
+ * identities, so every process sharing a managed scope — the publisher retiring
+ * its own receipt and each peer reconciler that listed it — claims the same
+ * slot. Native exact-unlink reports `quarantine_collision` from its no-replace
+ * claim before any rename, so a collision that carries no detached or retained
+ * path proves only that a peer owns the retirement right now: this process
+ * changed nothing, the receipt stays where a later reconciliation finds it, and
+ * the unrelated mutation that triggered the scan must not fail.
+ */
+function isPeerOwnedReceiptRetirement(result: NativeExactUnlinkResult): boolean {
+	return (
+		!result.ok &&
+		result.code === "quarantine_collision" &&
+		result.detachedPath === undefined &&
+		result.retainedSuccessorPath === undefined &&
+		result.retainedPlaceholderPath === undefined &&
+		result.retainedUnknownPath === undefined
+	);
+}
+
 /** A same-filesystem rename updates the moved root's ctime but no other tree identity. */
 function sameDirectoryTreeSnapshotAfterRename(
 	left: NativeDirectoryTreeSnapshot,
@@ -1622,6 +1643,7 @@ export class ManagedSessionDescendantStore {
 			sha256: placeholder.identity.sha256,
 			quarantineName,
 		});
+		if (isPeerOwnedReceiptRetirement(removed)) return true;
 		if (
 			(!exactUnlinkCompleted(removed) && removed.code !== "not_found") ||
 			removed.retainedSuccessorPath !== undefined ||
@@ -1660,6 +1682,7 @@ export class ManagedSessionDescendantStore {
 			detachOnly: true,
 			quarantineName,
 		});
+		if (isPeerOwnedReceiptRetirement(detached)) return;
 		if (
 			!detached.ok &&
 			detached.code === "not_found" &&

package/src/tools/bash.ts

@@ -10,10 +10,26 @@ import { type BashArtifactSaveResult, type BashResult, executeBash } from "../ex
 
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { buildGjcRuntimeSessionEnv } from "../gjc-runtime/goal-mode-request";
+import {
+	MANAGED_OWNER_PREDECESSOR_GENERATION_ENV,
+	MANAGED_OWNER_PREDECESSOR_INCARNATION_ENV,
+	MANAGED_OWNER_PREDECESSOR_RUN_ID_ENV,
+	MANAGED_OWNER_PREDECESSOR_TOKEN_ENV,
+	MANAGED_OWNER_TRANSCRIPT_PATH_ENV,
+} from "../gjc-runtime/managed-owner-admission";
+import {
+	MANAGED_OWNER_CHILD_TOKEN_ENV,
+	MANAGED_OWNER_GENERATION_ENV,
+	MANAGED_OWNER_INCARNATION_ENV,
+	MANAGED_OWNER_RUN_ID_ENV,
+	MANAGED_OWNER_STATE_DIR_ENV,
+} from "../gjc-runtime/managed-owner-supervisor";
 import {
 	GJC_RALPLAN_ARTIFACT_ENV,
 	GJC_RESTRICTED_ROLE_AGENT_BASH_ENV,
 } from "../gjc-runtime/restricted-role-agent-bash";
+import { GJC_TMUX_OWNER_SERVER_KEY_ENV } from "../gjc-runtime/session-state-sidecar";
+import { GJC_TMUX_LAUNCHED_ENV } from "../gjc-runtime/windows-powershell-command";
 import { InternalUrlRouter } from "../internal-urls";
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
 import { highlightCode, type Theme } from "../modes/theme/theme";
@@ -94,6 +110,27 @@ const ARTIFACT_SAVE_DIAGNOSTIC_MAX_BYTES = 256;
 const BASH_ENV_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 const MASTER_CAPABILITY_ENV = "GJC_MASTER_CAPABILITY";
 const MASTER_OWNER_SESSION_ENV = "GJC_MASTER_OWNER_SESSION_ID";
+// Managed-owner env vars that must be scrubbed from child processes.
+// Exported for testing the env scrubbing behavior.
+export const MANAGED_OWNER_BASH_ENV = [
+	MANAGED_OWNER_STATE_DIR_ENV,
+	MANAGED_OWNER_GENERATION_ENV,
+	MANAGED_OWNER_RUN_ID_ENV,
+	MANAGED_OWNER_INCARNATION_ENV,
+	MANAGED_OWNER_CHILD_TOKEN_ENV,
+	MANAGED_OWNER_PREDECESSOR_TOKEN_ENV,
+	MANAGED_OWNER_PREDECESSOR_GENERATION_ENV,
+	MANAGED_OWNER_PREDECESSOR_RUN_ID_ENV,
+	MANAGED_OWNER_PREDECESSOR_INCARNATION_ENV,
+	MANAGED_OWNER_TRANSCRIPT_PATH_ENV,
+	// The rest of the tmux-owner tuple (tmux-sessions.ts managedEnvironment): leaving
+	// either behind makes ownerTerminalContextFromEnvironment() report "invalid" in a
+	// nested gjc, because a server key or GJC_TMUX_LAUNCHED=1 without generation/state
+	// dir is an incomplete owner context.
+	GJC_TMUX_OWNER_SERVER_KEY_ENV,
+	GJC_TMUX_LAUNCHED_ENV,
+] as const;
+
 const COORDINATOR_ONLY_BASH_ENV = [
 	"GJC_COORDINATOR_SESSION_STATE_FILE",
 	"GJC_COORDINATOR_SESSION_ID",
@@ -102,6 +139,8 @@ const COORDINATOR_ONLY_BASH_ENV = [
 	"GJC_COORDINATOR_SESSION_READINESS_FILE",
 	"GJC_COORDINATOR_SIDECAR_SIGNATURE_REQUIRED",
 	"GJC_COORDINATOR_SIDECAR_KEY_ID",
+	// Managed-owner env family from managed-owner-supervisor.ts and managed-owner-admission.ts
+	...MANAGED_OWNER_BASH_ENV,
 ] as const;
 const DEFAULT_AUTO_BACKGROUND_THRESHOLD_MS = 60_000;
 const ACP_RELEASE_TIMEOUT_MS = 1_000;

package/dist/types/cli/grep-cli.d.ts

@@ -1,17 +0,0 @@
-import { GrepOutputMode } from "@gajae-code/natives";
-export interface GrepCommandArgs {
-    pattern: string;
-    path: string;
-    glob?: string;
-    limit: number;
-    context: number;
-    mode: GrepOutputMode;
-    gitignore: boolean;
-}
-/**
- * Parse grep subcommand arguments.
- * Returns undefined if not a grep command.
- */
-export declare function parseGrepArgs(args: string[]): GrepCommandArgs | undefined;
-export declare function runGrepCommand(cmd: GrepCommandArgs): Promise<void>;
-export declare function printGrepHelp(): void;

package/dist/types/cli/shell-cli.d.ts

@@ -1,8 +0,0 @@
-export interface ShellCommandArgs {
-    cwd?: string;
-    timeoutMs?: number;
-    noSnapshot?: boolean;
-}
-export declare function parseShellArgs(args: string[]): ShellCommandArgs | undefined;
-export declare function runShellCommand(cmd: ShellCommandArgs): Promise<void>;
-export declare function printShellHelp(): void;

package/dist/types/commands/grep.d.ts

@@ -1,42 +0,0 @@
-import { Command } from "@gajae-code/utils/cli";
-export default class Grep extends Command {
-    static description: string;
-    static args: {
-        pattern: import("@gajae-code/utils/cli").ArgDescriptor & {
-            description: string;
-            required: false;
-        };
-        path: import("@gajae-code/utils/cli").ArgDescriptor & {
-            description: string;
-            required: false;
-        };
-    };
-    static flags: {
-        glob: import("@gajae-code/utils/cli").FlagDescriptor<"string"> & {
-            char: string;
-            description: string;
-        };
-        limit: import("@gajae-code/utils/cli").FlagDescriptor<"integer"> & {
-            char: string;
-            description: string;
-            default: number;
-        };
-        context: import("@gajae-code/utils/cli").FlagDescriptor<"integer"> & {
-            char: string;
-            description: string;
-            default: number;
-        };
-        files: import("@gajae-code/utils/cli").FlagDescriptor<"boolean"> & {
-            char: string;
-            description: string;
-        };
-        count: import("@gajae-code/utils/cli").FlagDescriptor<"boolean"> & {
-            char: string;
-            description: string;
-        };
-        "no-gitignore": import("@gajae-code/utils/cli").FlagDescriptor<"boolean"> & {
-            description: string;
-        };
-    };
-    run(): Promise<void>;
-}

package/dist/types/commands/shell.d.ts

@@ -1,21 +0,0 @@
-/**
- * Interactive shell console.
- */
-import { Command } from "@gajae-code/utils/cli";
-export default class Shell extends Command {
-    static description: string;
-    static flags: {
-        cwd: import("@gajae-code/utils/cli").FlagDescriptor<"string"> & {
-            char: string;
-            description: string;
-        };
-        timeout: import("@gajae-code/utils/cli").FlagDescriptor<"integer"> & {
-            char: string;
-            description: string;
-        };
-        "no-snapshot": import("@gajae-code/utils/cli").FlagDescriptor<"boolean"> & {
-            description: string;
-        };
-    };
-    run(): Promise<void>;
-}

package/src/cli/grep-cli.ts

@@ -1,160 +0,0 @@
-/**
- * Grep CLI command handlers.
- *
- * Handles `gjc grep` subcommand for testing grep tool on Windows.
- */
-import * as path from "node:path";
-import { GrepOutputMode, grep } from "@gajae-code/natives";
-import { APP_NAME } from "@gajae-code/utils";
-import chalk from "chalk";
-
-export interface GrepCommandArgs {
-	pattern: string;
-	path: string;
-	glob?: string;
-	limit: number;
-	context: number;
-	mode: GrepOutputMode;
-	gitignore: boolean;
-}
-
-/**
- * Parse grep subcommand arguments.
- * Returns undefined if not a grep command.
- */
-export function parseGrepArgs(args: string[]): GrepCommandArgs | undefined {
-	if (args.length === 0 || args[0] !== "grep") {
-		return undefined;
-	}
-
-	const result: GrepCommandArgs = {
-		pattern: "",
-		path: ".",
-		limit: 20,
-		context: 2,
-		mode: GrepOutputMode.Content,
-		gitignore: true,
-	};
-
-	const positional: string[] = [];
-
-	for (let i = 1; i < args.length; i++) {
-		const arg = args[i];
-		if (arg === "--glob" || arg === "-g") {
-			result.glob = args[++i];
-		} else if (arg === "--limit" || arg === "-l") {
-			result.limit = parseInt(args[++i], 10);
-		} else if (arg === "--context" || arg === "-C") {
-			result.context = parseInt(args[++i], 10);
-		} else if (arg === "--files" || arg === "-f") {
-			result.mode = GrepOutputMode.FilesWithMatches;
-		} else if (arg === "--count" || arg === "-c") {
-			result.mode = GrepOutputMode.Count;
-		} else if (arg === "--no-gitignore") {
-			result.gitignore = false;
-		} else if (!arg.startsWith("-")) {
-			positional.push(arg);
-		}
-	}
-
-	if (positional.length >= 1) {
-		result.pattern = positional[0];
-	}
-	if (positional.length >= 2) {
-		result.path = positional[1];
-	}
-
-	return result;
-}
-
-export async function runGrepCommand(cmd: GrepCommandArgs): Promise<void> {
-	if (!cmd.pattern) {
-		console.error(chalk.red("Error: Pattern is required"));
-		process.exit(1);
-	}
-
-	const searchPath = path.resolve(cmd.path);
-	console.log(chalk.dim(`Searching in: ${searchPath}`));
-	console.log(chalk.dim(`Pattern: ${cmd.pattern}`));
-	console.log(
-		chalk.dim(`Mode: ${cmd.mode}, Limit: ${cmd.limit}, Context: ${cmd.context}, Gitignore: ${cmd.gitignore}`),
-	);
-
-	console.log("");
-
-	try {
-		const result = await grep({
-			pattern: cmd.pattern,
-			path: searchPath,
-			glob: cmd.glob,
-			mode: cmd.mode,
-			maxCount: cmd.limit,
-			context: cmd.mode === GrepOutputMode.Content ? cmd.context : undefined,
-			hidden: true,
-			gitignore: cmd.gitignore,
-		});
-
-		console.log(chalk.green(`Total matches: ${result.totalMatches}`));
-		console.log(chalk.green(`Files with matches: ${result.filesWithMatches}`));
-		console.log(chalk.green(`Files searched: ${result.filesSearched}`));
-		if (result.limitReached) {
-			console.log(chalk.yellow(`Result limit reached (${cmd.limit} matches). Use --limit to show more.`));
-		}
-		console.log("");
-
-		for (const match of result.matches) {
-			const displayPath = match.path.replace(/\\/g, "/");
-
-			if (cmd.mode === GrepOutputMode.Content) {
-				if (match.contextBefore) {
-					for (const ctx of match.contextBefore) {
-						console.log(chalk.dim(`${displayPath}-${ctx.lineNumber}- ${ctx.line}`));
-					}
-				}
-				console.log(`${chalk.cyan(displayPath)}:${chalk.yellow(String(match.lineNumber))}: ${match.line}`);
-				if (match.contextAfter) {
-					for (const ctx of match.contextAfter) {
-						console.log(chalk.dim(`${displayPath}-${ctx.lineNumber}- ${ctx.line}`));
-					}
-				}
-				console.log("");
-			} else if (cmd.mode === GrepOutputMode.Count) {
-				console.log(`${chalk.cyan(displayPath)}: ${match.matchCount ?? 0} matches`);
-			} else {
-				console.log(chalk.cyan(displayPath));
-			}
-		}
-	} catch (err) {
-		console.error(chalk.red(`Error: ${err instanceof Error ? err.message : String(err)}`));
-		process.exit(1);
-	}
-}
-
-export function printGrepHelp(): void {
-	console.log(`${chalk.bold(`${APP_NAME} grep`)} - Test grep tool
-
-${chalk.bold("Usage:")}
-  ${APP_NAME} grep <pattern> [path] [options]
-
-${chalk.bold("Arguments:")}
-  pattern   Regex pattern to search for
-  path      Directory or file to search (default: .)
-
-${chalk.bold("Options:")}
-  -g, --glob <pattern>  Filter files by glob pattern
-  -l, --limit <n>       Max matches (default: 20)
-  -C, --context <n>     Context lines (default: 2)
-  -f, --files           Output file names only
-  -c, --count           Output match counts per file
-  -h, --help            Show this help
-  --no-gitignore        Include files excluded by .gitignore
-
-${chalk.bold("Environment:")}
-  PI_GREP_WORKERS=N    Set filesystem walker workers (default 4, 0 = auto)
-
-${chalk.bold("Examples:")}
-  ${APP_NAME} grep "import" src/
-  ${APP_NAME} grep "TODO" . --glob "*.ts"
-  ${APP_NAME} grep "function" --files
-`);
-}