pi-rtk-optimizer 0.5.5 → 0.7.0

package/src/rtk-command-environment.ts

@@ -1,64 +1,69 @@
-import { join } from "node:path";
-
-import { splitLeadingEnvAssignments } from "./shell-env-prefix.js";
-
-const RTK_DB_PATH_ENV_NAME = "RTK_DB_PATH";
-const RTK_DB_PATH_ASSIGNMENT_PATTERN = /(?:^|\s)RTK_DB_PATH=(?:"[^"]*"|'[^']*'|[^\s]+)(?=\s|$)/;
-
-function resolveTemporaryDirectory(): string {
-	if (process.platform === "win32") {
-		const windowsTempDir = process.env.TEMP ?? process.env.TMP;
-		if (windowsTempDir && windowsTempDir.trim()) {
-			return windowsTempDir;
-		}
-
-		const localAppData = process.env.LOCALAPPDATA;
-		if (localAppData && localAppData.trim()) {
-			return join(localAppData, "Temp");
-		}
-
-		const userProfile = process.env.USERPROFILE;
-		if (userProfile && userProfile.trim()) {
-			return join(userProfile, "AppData", "Local", "Temp");
-		}
-
-		const systemRoot = process.env.SystemRoot ?? process.env.WINDIR;
-		if (systemRoot && systemRoot.trim()) {
-			return join(systemRoot, "Temp");
-		}
-
-		return "C:/Windows/Temp";
-	}
-
-	const posixTempDir = process.env.TMPDIR ?? process.env.TMP;
-	if (posixTempDir && posixTempDir.trim()) {
-		return posixTempDir;
-	}
-
-	return "/tmp";
-}
-
-function getTemporaryRtkHistoryDbPath(): string {
-	return join(resolveTemporaryDirectory(), "pi-rtk-optimizer", "history.db");
-}
-
-function quoteForShellEnv(value: string): string {
-	const normalizedValue = process.platform === "win32" ? value.replace(/\\/g, "/") : value;
-	return `"${normalizedValue.replace(/"/g, '\\"')}"`;
-}
-
-function hasLeadingRtkDbPathAssignment(command: string): boolean {
-	return RTK_DB_PATH_ASSIGNMENT_PATTERN.test(splitLeadingEnvAssignments(command).envPrefix);
-}
-
-export function applyRtkCommandEnvironment(command: string): string {
-	if (!command.trim()) {
-		return command;
-	}
-
-	if (hasLeadingRtkDbPathAssignment(command)) {
-		return command;
-	}
-
-	return `${RTK_DB_PATH_ENV_NAME}=${quoteForShellEnv(getTemporaryRtkHistoryDbPath())} ${command}`;
-}
+import { join } from "node:path";
+
+import { splitLeadingEnvAssignments } from "./shell-env-prefix.js";
+
+const RTK_DB_PATH_ENV_NAME = "RTK_DB_PATH";
+const RTK_DB_PATH_ASSIGNMENT_PATTERN = /(?:^|\s)RTK_DB_PATH=(?:"[^"]*"|'[^']*'|[^\s]+)(?=\s|$)/;
+const RTK_DB_PATH_EXPORT_PATTERN = /^export\s+RTK_DB_PATH=(?:"[^"]*"|'[^']*'|[^\s;]+)(?=\s*(?:;|$))/;
+
+function resolveTemporaryDirectory(): string {
+	if (process.platform === "win32") {
+		const windowsTempDir = process.env.TEMP ?? process.env.TMP;
+		if (windowsTempDir && windowsTempDir.trim()) {
+			return windowsTempDir;
+		}
+
+		const localAppData = process.env.LOCALAPPDATA;
+		if (localAppData && localAppData.trim()) {
+			return join(localAppData, "Temp");
+		}
+
+		const userProfile = process.env.USERPROFILE;
+		if (userProfile && userProfile.trim()) {
+			return join(userProfile, "AppData", "Local", "Temp");
+		}
+
+		const systemRoot = process.env.SystemRoot ?? process.env.WINDIR;
+		if (systemRoot && systemRoot.trim()) {
+			return join(systemRoot, "Temp");
+		}
+
+		return "C:/Windows/Temp";
+	}
+
+	const posixTempDir = process.env.TMPDIR ?? process.env.TMP;
+	if (posixTempDir && posixTempDir.trim()) {
+		return posixTempDir;
+	}
+
+	return "/tmp";
+}
+
+function getTemporaryRtkHistoryDbPath(): string {
+	return join(resolveTemporaryDirectory(), "pi-rtk-optimizer", "history.db");
+}
+
+function quoteForShellEnv(value: string): string {
+	const normalizedValue = process.platform === "win32" ? value.replace(/\\/g, "/") : value;
+	return `"${normalizedValue.replace(/"/g, '\\"')}"`;
+}
+
+function hasLeadingRtkDbPathAssignment(command: string): boolean {
+	const trimmed = command.trimStart();
+	return (
+		RTK_DB_PATH_ASSIGNMENT_PATTERN.test(splitLeadingEnvAssignments(trimmed).envPrefix) ||
+		RTK_DB_PATH_EXPORT_PATTERN.test(trimmed)
+	);
+}
+
+export function applyRtkCommandEnvironment(command: string): string {
+	if (!command.trim()) {
+		return command;
+	}
+
+	if (hasLeadingRtkDbPathAssignment(command)) {
+		return command;
+	}
+
+	return `export ${RTK_DB_PATH_ENV_NAME}=${quoteForShellEnv(getTemporaryRtkHistoryDbPath())}; ${command}`;
+}

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

@@ -7,6 +7,9 @@ export type RtkSourceFilterLevel = (typeof RTK_SOURCE_FILTER_LEVELS)[number];
 export interface RtkOutputCompactionConfig {
 	enabled: boolean;
 	stripAnsi: boolean;
+	readCompaction: {
+		enabled: boolean;
+	};
 	truncate: {
 		enabled: boolean;
 		maxChars: number;
@@ -31,15 +34,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,27 +42,21 @@ 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,
+		readCompaction: {
+			enabled: false,
+		},
 		truncate: {
 			enabled: true,
 			maxChars: 12_000,
 		},
-		sourceCodeFilteringEnabled: true,
+		sourceCodeFilteringEnabled: false,
 		preserveExactSkillReads: false,
-		sourceCodeFiltering: "minimal",
+		sourceCodeFiltering: "none",
 		smartTruncate: {
-			enabled: true,
+			enabled: false,
 			maxLines: 220,
 		},
 		aggregateTestOutput: 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;
-}