pi-rtk-optimizer 0.5.5 → 0.6.0

package/src/config-modal.ts

@@ -54,25 +54,11 @@ function parseIntegerInRange(value: string, min: number, max: number): number |
 }
 
 function summarizeConfig(config: RtkIntegrationConfig, runtimeStatus: RuntimeStatus): string {
-	const categories = [
-		config.rewriteGitGithub ? "git" : "",
-		config.rewriteFilesystem ? "files" : "",
-		config.rewriteRust ? "rust" : "",
-		config.rewriteJavaScript ? "js" : "",
-		config.rewritePython ? "python" : "",
-		config.rewriteGo ? "go" : "",
-		config.rewriteContainers ? "containers" : "",
-		config.rewriteNetwork ? "network" : "",
-		config.rewritePackageManagers ? "packages" : "",
-	]
-		.filter((value) => value.length > 0)
-		.join(",");
-
 	const runtime = runtimeStatus.rtkAvailable
 		? "rtk=available"
 		: `rtk=missing${runtimeStatus.lastError ? ` (${runtimeStatus.lastError})` : ""}`;
 
-	return `enabled=${config.enabled}, mode=${config.mode}, rewriteNotice=${config.showRewriteNotifications}, compaction=${config.outputCompaction.enabled}, sourceFilterEnabled=${config.outputCompaction.sourceCodeFilteringEnabled}, preserveSkillReads=${config.outputCompaction.preserveExactSkillReads}, sourceFilter=${config.outputCompaction.sourceCodeFiltering}, categories=[${categories || "none"}], ${runtime}`;
+	return `enabled=${config.enabled}, mode=${config.mode}, rewriteSource=rtk, rewriteNotice=${config.showRewriteNotifications}, compaction=${config.outputCompaction.enabled}, sourceFilterEnabled=${config.outputCompaction.sourceCodeFilteringEnabled}, preserveSkillReads=${config.outputCompaction.preserveExactSkillReads}, sourceFilter=${config.outputCompaction.sourceCodeFiltering}, ${runtime}`;
 }
 
 function buildSettingItems(config: RtkIntegrationConfig): SettingItem[] {
@@ -210,69 +196,6 @@ function buildSettingItems(config: RtkIntegrationConfig): SettingItem[] {
 			currentValue: toOnOff(config.outputCompaction.trackSavings),
 			values: ON_OFF,
 		},
-		{
-			id: "rewriteGitGithub",
-			label: "Rewrite git / gh",
-			description: "git status/log/diff and gh pr/issue/run/api/release",
-			currentValue: toOnOff(config.rewriteGitGithub),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteFilesystem",
-			label: "Rewrite filesystem commands",
-			description: "cat, head, rg/grep, ls, tree, find, diff",
-			currentValue: toOnOff(config.rewriteFilesystem),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteRust",
-			label: "Rewrite Rust commands",
-			description: "cargo test/build/clippy/check/install/nextest/fmt",
-			currentValue: toOnOff(config.rewriteRust),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteJavaScript",
-			label: "Rewrite JavaScript/TypeScript",
-			description: "vitest, npm/npx/next, tsc, lint, prettier, playwright, prisma",
-			currentValue: toOnOff(config.rewriteJavaScript),
-			values: ON_OFF,
-		},
-		{
-			id: "rewritePython",
-			label: "Rewrite Python",
-			description: "pytest, ruff, pip, uv pip",
-			currentValue: toOnOff(config.rewritePython),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteGo",
-			label: "Rewrite Go",
-			description: "go test/build/vet and golangci-lint",
-			currentValue: toOnOff(config.rewriteGo),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteContainers",
-			label: "Rewrite containers",
-			description: "docker compose/ps/images/logs/run/build/exec and kubectl core ops",
-			currentValue: toOnOff(config.rewriteContainers),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteNetwork",
-			label: "Rewrite network",
-			description: "curl and wget",
-			currentValue: toOnOff(config.rewriteNetwork),
-			values: ON_OFF,
-		},
-		{
-			id: "rewritePackageManagers",
-			label: "Rewrite package managers",
-			description: "pnpm list/ls/outdated/build/typecheck and npm list/outdated",
-			currentValue: toOnOff(config.rewritePackageManagers),
-			values: ON_OFF,
-		},
 	];
 }
 
@@ -418,24 +341,6 @@ function applySetting(config: RtkIntegrationConfig, id: string, value: string):
 					trackSavings: value === "on",
 				},
 			};
-		case "rewriteGitGithub":
-			return { ...config, rewriteGitGithub: value === "on" };
-		case "rewriteFilesystem":
-			return { ...config, rewriteFilesystem: value === "on" };
-		case "rewriteRust":
-			return { ...config, rewriteRust: value === "on" };
-		case "rewriteJavaScript":
-			return { ...config, rewriteJavaScript: value === "on" };
-		case "rewritePython":
-			return { ...config, rewritePython: value === "on" };
-		case "rewriteGo":
-			return { ...config, rewriteGo: value === "on" };
-		case "rewriteContainers":
-			return { ...config, rewriteContainers: value === "on" };
-		case "rewriteNetwork":
-			return { ...config, rewriteNetwork: value === "on" };
-		case "rewritePackageManagers":
-			return { ...config, rewritePackageManagers: value === "on" };
 		default:
 			return config;
 	}
@@ -461,15 +366,6 @@ function syncSettingValues(settingsList: SettingValueSyncTarget, config: RtkInte
 	settingsList.updateValue("outputAggregateLinterOutput", toOnOff(config.outputCompaction.aggregateLinterOutput));
 	settingsList.updateValue("outputGroupSearchOutput", toOnOff(config.outputCompaction.groupSearchOutput));
 	settingsList.updateValue("outputTrackSavings", toOnOff(config.outputCompaction.trackSavings));
-	settingsList.updateValue("rewriteGitGithub", toOnOff(config.rewriteGitGithub));
-	settingsList.updateValue("rewriteFilesystem", toOnOff(config.rewriteFilesystem));
-	settingsList.updateValue("rewriteRust", toOnOff(config.rewriteRust));
-	settingsList.updateValue("rewriteJavaScript", toOnOff(config.rewriteJavaScript));
-	settingsList.updateValue("rewritePython", toOnOff(config.rewritePython));
-	settingsList.updateValue("rewriteGo", toOnOff(config.rewriteGo));
-	settingsList.updateValue("rewriteContainers", toOnOff(config.rewriteContainers));
-	settingsList.updateValue("rewriteNetwork", toOnOff(config.rewriteNetwork));
-	settingsList.updateValue("rewritePackageManagers", toOnOff(config.rewritePackageManagers));
 }
 
 async function openSettingsModal(ctx: ExtensionCommandContext, controller: RtkIntegrationController): Promise<void> {

package/src/config-store.ts

@@ -60,30 +60,6 @@ export function normalizeRtkIntegrationConfig(raw: unknown): RtkIntegrationConfi
 			source.showRewriteNotifications,
 			DEFAULT_RTK_INTEGRATION_CONFIG.showRewriteNotifications,
 		),
-		rewriteGitGithub: toBoolean(
-			source.rewriteGitGithub,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewriteGitGithub,
-		),
-		rewriteFilesystem: toBoolean(
-			source.rewriteFilesystem,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewriteFilesystem,
-		),
-		rewriteRust: toBoolean(source.rewriteRust, DEFAULT_RTK_INTEGRATION_CONFIG.rewriteRust),
-		rewriteJavaScript: toBoolean(
-			source.rewriteJavaScript,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewriteJavaScript,
-		),
-		rewritePython: toBoolean(source.rewritePython, DEFAULT_RTK_INTEGRATION_CONFIG.rewritePython),
-		rewriteGo: toBoolean(source.rewriteGo, DEFAULT_RTK_INTEGRATION_CONFIG.rewriteGo),
-		rewriteContainers: toBoolean(
-			source.rewriteContainers,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewriteContainers,
-		),
-		rewriteNetwork: toBoolean(source.rewriteNetwork, DEFAULT_RTK_INTEGRATION_CONFIG.rewriteNetwork),
-		rewritePackageManagers: toBoolean(
-			source.rewritePackageManagers,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewritePackageManagers,
-		),
 		outputCompaction: {
 			enabled: toBoolean(
 				outputCompactionSource.enabled,

package/src/index.ts

@@ -123,7 +123,6 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 			return;
 		}
 
-		console.warn(`[${EXTENSION_NAME}] ${message}`);
 		if (ctx.hasUI) {
 			ctx.ui.notify(message, level);
 		}
@@ -222,7 +221,7 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 	};
 
 	const maybeWarnRtkMissing = (ctx: ExtensionContext): void => {
-		if (!config.enabled || config.mode !== "rewrite" || !config.guardWhenRtkMissing) {
+		if (!config.enabled || !config.guardWhenRtkMissing) {
 			return;
 		}
 
@@ -237,7 +236,8 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 
 		missingRtkWarningShown = true;
 		const reason = runtimeStatus.lastError ? ` (${runtimeStatus.lastError})` : "";
-		warnOnce(ctx, `${EXTENSION_NAME}: rtk binary unavailable, command rewrite bypassed${reason}.`);
+		const handling = config.mode === "suggest" ? "rewrite suggestions" : "command rewrite";
+		warnOnce(ctx, `${EXTENSION_NAME}: rtk binary unavailable, ${handling} bypassed${reason}.`);
 	};
 
 	const ensureRuntimeStatusFresh = async (): Promise<void> => {
@@ -361,8 +361,8 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 			return {};
 		}
 
-		const decision = computeRewriteDecision(event.input.command, config);
-		if (!decision.changed || !decision.rule) {
+		const decision = await computeRewriteDecision(event.input.command, config, pi);
+		if (!decision.changed) {
 			return {};
 		}
 
@@ -376,7 +376,7 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 		}
 
 		if (config.mode === "suggest") {
-			const suggestionKey = `${decision.rule.id}:${decision.rewrittenCommand}`;
+			const suggestionKey = `${decision.originalCommand}:${decision.rewrittenCommand}`;
 			if (suggestionNotices.remember(suggestionKey) && ctx.hasUI) {
 				ctx.ui.notify(`RTK suggestion: ${decision.rewrittenCommand}`, "info");
 			}

package/src/rtk-rewrite-provider.ts

@@ -0,0 +1,90 @@
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+
+export interface RtkRewriteProviderResult {
+	changed: boolean;
+	originalCommand: string;
+	rewrittenCommand: string;
+	exitCode: number;
+	error?: string;
+}
+
+function isAlreadyRtk(command: string): boolean {
+	const trimmed = command.trimStart();
+	return trimmed === "rtk" || trimmed.startsWith("rtk ");
+}
+
+export async function resolveRtkRewrite(
+	pi: ExtensionAPI,
+	command: string,
+	timeoutMs = 3000,
+): Promise<RtkRewriteProviderResult> {
+	if (!command || !command.trim()) {
+		return { changed: false, originalCommand: command, rewrittenCommand: command, exitCode: 1 };
+	}
+
+	if (isAlreadyRtk(command)) {
+		return { changed: false, originalCommand: command, rewrittenCommand: command, exitCode: 1 };
+	}
+
+	try {
+		const result = await pi.exec("rtk", ["rewrite", command], { timeout: timeoutMs });
+
+		if (result.code === 1) {
+			return { changed: false, originalCommand: command, rewrittenCommand: command, exitCode: 1 };
+		}
+
+		if (result.code === 2) {
+			return {
+				changed: false,
+				originalCommand: command,
+				rewrittenCommand: command,
+				exitCode: 2,
+				error: result.stderr?.trim() || "rtk denied rewrite",
+			};
+		}
+
+		if (result.code === 0 || result.code === 3) {
+			const rewritten = result.stdout?.trim();
+			if (!rewritten) {
+				return {
+					changed: false,
+					originalCommand: command,
+					rewrittenCommand: command,
+					exitCode: result.code,
+					error: "rtk returned empty output",
+				};
+			}
+			if (rewritten === command) {
+				return {
+					changed: false,
+					originalCommand: command,
+					rewrittenCommand: command,
+					exitCode: result.code,
+				};
+			}
+			return {
+				changed: true,
+				originalCommand: command,
+				rewrittenCommand: rewritten,
+				exitCode: result.code,
+			};
+		}
+
+		return {
+			changed: false,
+			originalCommand: command,
+			rewrittenCommand: command,
+			exitCode: result.code,
+			error: `unexpected exit code ${result.code}`,
+		};
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return {
+			changed: false,
+			originalCommand: command,
+			rewrittenCommand: command,
+			exitCode: -1,
+			error: message,
+		};
+	}
+}

package/src/runtime-guard-test.ts

@@ -21,13 +21,14 @@ runTest("rewrite mode still requires RTK availability when guard is enabled", ()
 	assert.equal(shouldSkipCommandHandlingWhenRtkMissing(config, runtimeStatus(true)), false);
 });
 
-runTest("suggest mode does not suppress suggestions when RTK is missing", () => {
+runTest("suggest mode uses RTK availability guard to avoid repeated missing-binary rewrite probes", () => {
 	const config = cloneDefaultConfig();
 	config.mode = "suggest";
 	config.guardWhenRtkMissing = true;
 
-	assert.equal(shouldRequireRtkAvailabilityForCommandHandling(config), false);
-	assert.equal(shouldSkipCommandHandlingWhenRtkMissing(config, runtimeStatus(false)), false);
+	assert.equal(shouldRequireRtkAvailabilityForCommandHandling(config), true);
+	assert.equal(shouldSkipCommandHandlingWhenRtkMissing(config, runtimeStatus(false)), true);
+	assert.equal(shouldSkipCommandHandlingWhenRtkMissing(config, runtimeStatus(true)), false);
 });
 
 runTest("guard disabled never blocks command handling", () => {

package/src/runtime-guard.ts

@@ -3,7 +3,7 @@ import type { RtkIntegrationConfig, RuntimeStatus } from "./types.js";
 export function shouldRequireRtkAvailabilityForCommandHandling(
 	config: Pick<RtkIntegrationConfig, "mode" | "guardWhenRtkMissing">,
 ): boolean {
-	return config.mode === "rewrite" && config.guardWhenRtkMissing;
+	return config.guardWhenRtkMissing;
 }
 
 export function shouldSkipCommandHandlingWhenRtkMissing(

package/src/types.ts

@@ -31,15 +31,6 @@ export interface RtkIntegrationConfig {
 	mode: RtkMode;
 	guardWhenRtkMissing: boolean;
 	showRewriteNotifications: boolean;
-	rewriteGitGithub: boolean;
-	rewriteFilesystem: boolean;
-	rewriteRust: boolean;
-	rewriteJavaScript: boolean;
-	rewritePython: boolean;
-	rewriteGo: boolean;
-	rewriteContainers: boolean;
-	rewriteNetwork: boolean;
-	rewritePackageManagers: boolean;
 	outputCompaction: RtkOutputCompactionConfig;
 }
 
@@ -48,15 +39,6 @@ export const DEFAULT_RTK_INTEGRATION_CONFIG: RtkIntegrationConfig = {
 	mode: "rewrite",
 	guardWhenRtkMissing: true,
 	showRewriteNotifications: true,
-	rewriteGitGithub: true,
-	rewriteFilesystem: true,
-	rewriteRust: true,
-	rewriteJavaScript: true,
-	rewritePython: true,
-	rewriteGo: true,
-	rewriteContainers: true,
-	rewriteNetwork: true,
-	rewritePackageManagers: true,
 	outputCompaction: {
 		enabled: true,
 		stripAnsi: true,

package/src/rewrite-bypass.ts

@@ -1,332 +0,0 @@
-import type { RtkRewriteRule } from "./rewrite-rules.js";
-
-const COMMAND_WORD_PATTERN = /"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|`(?:\\.|[^`])*`|[^\s]+/g;
-const BYPASSED_CARGO_SUBCOMMANDS = new Set(["help", "install", "publish"]);
-const GH_STRUCTURED_OUTPUT_FLAGS = ["--json", "--jq", "--template"] as const;
-const UNSAFE_COMPOUND_REWRITE_COMMANDS = new Set(["find", "grep", "rg", "ls"]);
-const BYPASSED_FIND_ACTIONS = new Set([
-	"-delete",
-	"-exec",
-	"-execdir",
-	"-fprint",
-	"-fprint0",
-	"-fprintf",
-	"-fls",
-	"-ls",
-	"-ok",
-	"-okdir",
-	"-print0",
-	"-printf",
-	"-prune",
-	"-quit",
-]);
-const BASH_INLINE_COMMAND_FLAGS = new Set(["-c", "-cl", "-lc", "--command"]);
-const POWERSHELL_INLINE_COMMAND_FLAGS = new Set(["-c", "-command", "-encodedcommand"]);
-const CMD_INLINE_COMMAND_FLAGS = new Set(["/c", "/k"]);
-const INTERACTIVE_CONTAINER_SHELLS = new Set([
-	"ash",
-	"bash",
-	"cmd",
-	"cmd.exe",
-	"fish",
-	"powershell",
-	"powershell.exe",
-	"pwsh",
-	"pwsh.exe",
-	"sh",
-	"zsh",
-]);
-
-function splitCommandWords(commandBody: string): string[] {
-	return commandBody.match(COMMAND_WORD_PATTERN) ?? [];
-}
-
-function splitTopLevelCompoundSegments(command: string): string[] {
-	const segments: string[] = [];
-	let segmentStart = 0;
-	let quote: "'" | '"' | "`" | null = null;
-	let escaped = false;
-
-	const pushSegment = (endIndex: number): void => {
-		const segment = command.slice(segmentStart, endIndex).trim();
-		if (segment) {
-			segments.push(segment);
-		}
-	};
-
-	for (let index = 0; index < command.length; index += 1) {
-		const char = command[index] ?? "";
-		const nextChar = command[index + 1] ?? "";
-		const prevChar = index > 0 ? command[index - 1] ?? "" : "";
-
-		if (escaped) {
-			escaped = false;
-			continue;
-		}
-
-		if (quote !== null) {
-			if (char === "\\" && quote !== "'") {
-				escaped = true;
-				continue;
-			}
-			if (char === quote) {
-				quote = null;
-			}
-			continue;
-		}
-
-		if (char === "\\") {
-			escaped = true;
-			continue;
-		}
-
-		if (char === "'" || char === '"' || char === "`") {
-			quote = char;
-			continue;
-		}
-
-		let separatorLength = 0;
-		if ((char === "&" && nextChar === "&") || (char === "|" && nextChar === "|") || (char === "|" && nextChar === "&")) {
-			separatorLength = 2;
-		} else if (char === "|" && prevChar !== ">") {
-			separatorLength = 1;
-		} else if (char === "&" && nextChar !== ">" && prevChar !== ">" && prevChar !== "<") {
-			separatorLength = 1;
-		}
-
-		// Intentionally ignore semicolons here so unquoted sed scripts remain eligible for
-		// segment-level rewriting instead of being treated as unsafe compound shells.
-		if (separatorLength === 0) {
-			continue;
-		}
-
-		pushSegment(index);
-		segmentStart = index + separatorLength;
-		if (separatorLength === 2) {
-			index += 1;
-		}
-	}
-
-	pushSegment(command.length);
-	return segments;
-}
-
-function shouldBypassCargoRewrite(tokens: string[]): boolean {
-	let index = 1;
-
-	while (index < tokens.length && tokens[index].startsWith("+")) {
-		index += 1;
-	}
-
-	while (index < tokens.length && tokens[index].startsWith("-")) {
-		index += 1;
-	}
-
-	const subcommand = tokens[index]?.toLowerCase();
-	if (!subcommand) {
-		return true;
-	}
-
-	return BYPASSED_CARGO_SUBCOMMANDS.has(subcommand);
-}
-
-function normalizeCommandWord(token: string): string {
-	const unwrapped = token.replace(/^(?:["'`])|(?:["'`])$/g, "");
-	const lastPathSeparator = Math.max(unwrapped.lastIndexOf("/"), unwrapped.lastIndexOf("\\"));
-	const basename = lastPathSeparator >= 0 ? unwrapped.slice(lastPathSeparator + 1) : unwrapped;
-	return basename.toLowerCase();
-}
-
-function findInteractiveShellIndex(tokens: string[], startIndex: number, endIndex: number): number {
-	for (let index = startIndex; index < endIndex; index += 1) {
-		if (INTERACTIVE_CONTAINER_SHELLS.has(normalizeCommandWord(tokens[index] ?? ""))) {
-			return index;
-		}
-	}
-
-	return -1;
-}
-
-function hasTrailingArguments(tokens: string[], startIndex: number, endIndex: number): boolean {
-	return startIndex >= 0 && startIndex < endIndex - 1;
-}
-
-function hasStructuredGhOutputFlag(tokens: string[]): boolean {
-	return tokens.some((token) => {
-		const normalized = token.toLowerCase();
-		return GH_STRUCTURED_OUTPUT_FLAGS.some((flag) => normalized === flag || normalized.startsWith(`${flag}=`));
-	});
-}
-
-function hasShortInteractiveFlag(token: string, flag: "i" | "t"): boolean {
-	if (!token.startsWith("-") || token.startsWith("--")) {
-		return false;
-	}
-
-	return token.slice(1).includes(flag);
-}
-
-function hasInteractiveFlagPair(tokens: string[], startIndex: number, endIndex: number): boolean {
-	let interactive = false;
-	let tty = false;
-
-	for (let index = startIndex; index < endIndex; index += 1) {
-		const token = tokens[index] ?? "";
-		if (token === "--interactive") {
-			interactive = true;
-			continue;
-		}
-		if (token === "--tty") {
-			tty = true;
-			continue;
-		}
-		if (hasShortInteractiveFlag(token, "i")) {
-			interactive = true;
-		}
-		if (hasShortInteractiveFlag(token, "t")) {
-			tty = true;
-		}
-	}
-
-	return interactive && tty;
-}
-
-function shouldBypassInteractiveContainerRewrite(tokens: string[]): boolean {
-	const command = tokens[0]?.toLowerCase();
-	if (!command) {
-		return false;
-	}
-
-	if (command === "docker" || command === "podman") {
-		const subcommand = tokens[1]?.toLowerCase();
-		if (subcommand === "run" || subcommand === "exec") {
-			const interactiveShellIndex = findInteractiveShellIndex(tokens, 2, tokens.length);
-			return (
-				interactiveShellIndex >= 0 &&
-				!hasTrailingArguments(tokens, interactiveShellIndex, tokens.length) &&
-				!hasInteractiveFlagPair(tokens, 2, interactiveShellIndex)
-			);
-		}
-
-		if (subcommand === "compose") {
-			const composeSubcommand = tokens[2]?.toLowerCase();
-			if (composeSubcommand === "run" || composeSubcommand === "exec") {
-				const interactiveShellIndex = findInteractiveShellIndex(tokens, 3, tokens.length);
-				return (
-					interactiveShellIndex >= 0 &&
-					!hasTrailingArguments(tokens, interactiveShellIndex, tokens.length) &&
-					!hasInteractiveFlagPair(tokens, 3, interactiveShellIndex)
-				);
-			}
-		}
-	}
-
-	if (command === "kubectl" && tokens[1]?.toLowerCase() === "exec") {
-		const separatorIndex = tokens.indexOf("--");
-		if (separatorIndex === -1 || separatorIndex >= tokens.length - 1) {
-			return false;
-		}
-
-		const interactiveShellIndex = findInteractiveShellIndex(tokens, separatorIndex + 1, tokens.length);
-		if (interactiveShellIndex === -1) {
-			return false;
-		}
-
-		return !hasTrailingArguments(tokens, interactiveShellIndex, tokens.length) && !hasInteractiveFlagPair(tokens, 2, separatorIndex);
-	}
-
-	return false;
-}
-
-function shouldBypassFindRewrite(tokens: string[]): boolean {
-	return tokens.slice(1).some((token) => {
-		const normalized = token.toLowerCase();
-		return (
-			BYPASSED_FIND_ACTIONS.has(normalized) ||
-			normalized.startsWith("-exec") ||
-			normalized.startsWith("-ok") ||
-			normalized.startsWith("-printf") ||
-			normalized.startsWith("-fprint") ||
-			normalized.startsWith("-fls")
-		);
-	});
-}
-
-function shouldBypassLsRewrite(tokens: string[]): boolean {
-	return tokens.slice(1).some((token) => token.startsWith("-"));
-}
-
-function shouldBypassNativeShellProxyRewrite(tokens: string[]): boolean {
-	const command = normalizeCommandWord(tokens[0] ?? "");
-	const firstArgument = tokens[1]?.toLowerCase();
-	if (!command || !firstArgument) {
-		return false;
-	}
-
-	if (command === "bash") {
-		return BASH_INLINE_COMMAND_FLAGS.has(firstArgument);
-	}
-
-	if (command === "powershell" || command === "powershell.exe") {
-		return POWERSHELL_INLINE_COMMAND_FLAGS.has(firstArgument);
-	}
-
-	if (command === "cmd" || command === "cmd.exe") {
-		return CMD_INLINE_COMMAND_FLAGS.has(firstArgument);
-	}
-
-	return false;
-}
-
-/**
- * Skips entire compound commands when any segment depends on native shell piping or
- * formatting-sensitive search/list output that RTK wrappers may not preserve exactly.
- */
-export function shouldBypassWholeCommandRewrite(command: string): boolean {
-	const segments = splitTopLevelCompoundSegments(command.trim());
-	if (segments.length <= 1) {
-		return false;
-	}
-
-	return segments.some((segment) => {
-		const tokens = splitCommandWords(segment);
-		const commandName = normalizeCommandWord(tokens[0] ?? "");
-		return UNSAFE_COMPOUND_REWRITE_COMMANDS.has(commandName) || shouldBypassNativeShellProxyRewrite(tokens);
-	});
-}
-
-/**
- * Skips RTK rewrites for command shapes that do not map cleanly to RTK wrappers.
- */
-export function shouldBypassRewriteForCommand(commandBody: string, rule: RtkRewriteRule): boolean {
-	const tokens = splitCommandWords(commandBody.trim());
-	if (tokens.length === 0) {
-		return false;
-	}
-
-	if (tokens[0]?.toLowerCase() === "gh" && hasStructuredGhOutputFlag(tokens)) {
-		return true;
-	}
-
-	if (rule.category === "rust" && tokens[0]?.toLowerCase() === "cargo") {
-		return shouldBypassCargoRewrite(tokens);
-	}
-
-	if (rule.category === "containers") {
-		return shouldBypassInteractiveContainerRewrite(tokens);
-	}
-
-	if (rule.id === "find") {
-		return shouldBypassFindRewrite(tokens);
-	}
-
-	if (rule.id === "ls") {
-		return shouldBypassLsRewrite(tokens);
-	}
-
-	if (rule.id === "bash-proxy" || rule.id === "cmd-proxy" || rule.id === "powershell-proxy") {
-		return shouldBypassNativeShellProxyRewrite(tokens);
-	}
-
-	return false;
-}