pi-rtk-optimizer 0.6.0 → 0.7.1

package/src/output-compactor.ts

@@ -140,6 +140,10 @@ function shouldPreserveExactReadOutput(
 	input: Record<string, unknown>,
 	config: RtkIntegrationConfig,
 ): boolean {
+	if (!config.outputCompaction.readCompaction.enabled) {
+		return true;
+	}
+
 	if (hasExplicitReadRange(input)) {
 		return true;
 	}
@@ -186,6 +190,10 @@ function hasLossyCompaction(techniques: string[]): boolean {
 	);
 }
 
+function normalizeTechniqueResult(result: string | null, currentText: string): string {
+	return result === null ? currentText : result;
+}
+
 function compactBashText(
 	text: string,
 	command: string | undefined,
@@ -203,45 +211,45 @@ function compactBashText(
 		}
 	}
 
-	const withoutRtkHookWarnings = stripRtkHookWarnings(nextText, command);
-	if (withoutRtkHookWarnings !== null && withoutRtkHookWarnings !== nextText) {
+	const withoutRtkHookWarnings = normalizeTechniqueResult(stripRtkHookWarnings(nextText, command), nextText);
+	if (withoutRtkHookWarnings !== nextText) {
 		nextText = withoutRtkHookWarnings;
 		techniques.push("rtk-hook-warning");
 	}
 
-	const withoutRtkEmoji = sanitizeRtkEmojiOutput(nextText, command);
-	if (withoutRtkEmoji !== null && withoutRtkEmoji !== nextText) {
+	const withoutRtkEmoji = normalizeTechniqueResult(sanitizeRtkEmojiOutput(nextText, command), nextText);
+	if (withoutRtkEmoji !== nextText) {
 		nextText = withoutRtkEmoji;
 		techniques.push("rtk-emoji");
 	}
 
 	if (compaction.filterBuildOutput) {
-		const compacted = filterBuildOutput(nextText, command);
-		if (compacted !== null && compacted !== nextText) {
+		const compacted = normalizeTechniqueResult(filterBuildOutput(nextText, command), nextText);
+		if (compacted !== nextText) {
 			nextText = compacted;
 			techniques.push("build");
 		}
 	}
 
 	if (compaction.aggregateTestOutput) {
-		const compacted = aggregateTestOutput(nextText, command);
-		if (compacted !== null && compacted !== nextText) {
+		const compacted = normalizeTechniqueResult(aggregateTestOutput(nextText, command), nextText);
+		if (compacted !== nextText) {
 			nextText = compacted;
 			techniques.push("test");
 		}
 	}
 
 	if (compaction.compactGitOutput) {
-		const compacted = compactGitOutput(nextText, command);
-		if (compacted !== null && compacted !== nextText) {
+		const compacted = normalizeTechniqueResult(compactGitOutput(nextText, command), nextText);
+		if (compacted !== nextText) {
 			nextText = compacted;
 			techniques.push("git");
 		}
 	}
 
 	if (compaction.aggregateLinterOutput) {
-		const compacted = aggregateLinterOutput(nextText, command);
-		if (compacted !== null && compacted !== nextText) {
+		const compacted = normalizeTechniqueResult(aggregateLinterOutput(nextText, command), nextText);
+		if (compacted !== nextText) {
 			nextText = compacted;
 			techniques.push("linter");
 		}
@@ -284,7 +292,10 @@ function compactReadText(
 		compaction.sourceCodeFiltering !== "none" &&
 		shouldApplyReadSourceFiltering(text, config)
 	) {
-		const filtered = filterSourceCode(nextText, language, compaction.sourceCodeFiltering);
+		const filtered = normalizeTechniqueResult(
+			filterSourceCode(nextText, language, compaction.sourceCodeFiltering),
+			nextText,
+		);
 		if (filtered !== nextText) {
 			nextText = filtered;
 			techniques.push(`source:${compaction.sourceCodeFiltering}`);
@@ -328,8 +339,8 @@ function compactGrepText(text: string, config: RtkIntegrationConfig): { text: st
 	}
 
 	if (compaction.groupSearchOutput) {
-		const grouped = groupSearchResults(nextText);
-		if (grouped !== null && grouped !== nextText) {
+		const grouped = normalizeTechniqueResult(groupSearchResults(nextText), nextText);
+		if (grouped !== nextText) {
 			nextText = grouped;
 			techniques.push("search");
 		}

package/src/rewrite-pipeline-safety.ts

@@ -1,157 +1,203 @@
-import { splitLeadingEnvAssignments } from "./shell-env-prefix.js";
-
-interface ParsedPipeline {
-	segments: string[];
-	separators: string[];
-}
-
-interface ProducerRewritePlan {
-	command: string;
-	captureStderr: boolean;
-}
-
-function isTopLevelQuoteCharacter(character: string): character is '"' | "'" | "`" {
-	return character === '"' || character === "'" || character === "`";
-}
-
-function parseSimpleTopLevelPipeline(command: string): ParsedPipeline | null {
-	const segments: string[] = [];
-	const separators: string[] = [];
-	let quote: '"' | "'" | "`" | null = null;
-	let escaped = false;
-	let segmentStart = 0;
-
-	for (let index = 0; index < command.length; index += 1) {
-		const character = command[index] ?? "";
-		const nextCharacter = command[index + 1] ?? "";
-		const previousCharacter = index > 0 ? (command[index - 1] ?? "") : "";
-
-		if (escaped) {
-			escaped = false;
-			continue;
-		}
-
-		if (quote !== null) {
-			if (character === "\\" && quote !== "'") {
-				escaped = true;
-				continue;
-			}
-			if (character === quote) {
-				quote = null;
-			}
-			continue;
-		}
-
-		if (character === "\\") {
-			escaped = true;
-			continue;
-		}
-
-		if (isTopLevelQuoteCharacter(character)) {
-			quote = character;
-			continue;
-		}
-
-		if (character === "|" && nextCharacter === "|") {
-			return null;
-		}
-
-		if (character === "|" && previousCharacter !== ">") {
-			const separatorLength = nextCharacter === "&" ? 2 : 1;
-			segments.push(command.slice(segmentStart, index));
-			separators.push(command.slice(index, index + separatorLength));
-			segmentStart = index + separatorLength;
-			if (separatorLength === 2) {
-				index += 1;
-			}
-			continue;
-		}
-
-		if (character === "&" && nextCharacter === "&") {
-			return null;
-		}
-
-		if (character === "&" && nextCharacter !== ">" && previousCharacter !== ">" && previousCharacter !== "<") {
-			return null;
-		}
-
-		if (character === ";") {
-			return null;
-		}
-	}
-
-	if (separators.length === 0) {
-		return null;
-	}
-
-	segments.push(command.slice(segmentStart));
-	return { segments, separators };
-}
-
-function extractProducerRewritePlan(segment: string, firstSeparator: string): ProducerRewritePlan | null {
-	const trimmed = segment.trim();
-	const { envPrefix, command: commandWithOptionalRedirect } = splitLeadingEnvAssignments(trimmed);
-	if (!/^rtk\s+/i.test(commandWithOptionalRedirect)) {
-		return null;
-	}
-
-	const stderrMergeMatch = commandWithOptionalRedirect.match(/^(.*?)(?:\s+)?2>\s*&1\s*$/u);
-	if (stderrMergeMatch) {
-		const command = stderrMergeMatch[1]?.trimEnd() ?? "";
-		return command ? { command: `${envPrefix}${command}`.trim(), captureStderr: true } : null;
-	}
-
-	return {
-		command: `${envPrefix}${commandWithOptionalRedirect}`.trim(),
-		captureStderr: firstSeparator === "|&",
-	};
-}
-
-function buildBufferedPipelineCommand(
-	producer: ProducerRewritePlan,
-	remainder: string,
-): string {
-	const tempFileVariable = "__pi_rtk_pipe_tmp";
-	const statusVariable = "__pi_rtk_pipe_status";
-	const producerRedirect = producer.captureStderr ? `> "$${tempFileVariable}" 2>&1` : `> "$${tempFileVariable}"`;
-	const cleanupTrap = `rm -f "$${tempFileVariable}"`;
-
-	return [
-		"{",
-		`${tempFileVariable}="$(mktemp)" || exit $?;`,
-		`${statusVariable}=0;`,
-		`trap '${cleanupTrap}' EXIT HUP INT TERM;`,
-		`${producer.command} ${producerRedirect};`,
-		`${statusVariable}=$?;`,
-		`if [ $${statusVariable} -eq 0 ]; then (${remainder}) < "$${tempFileVariable}"; ${statusVariable}=$?; fi;`,
-		`exit $${statusVariable};`,
-		"}",
-	].join(" ");
-}
-
-export function applyRewrittenCommandShellSafetyFixups(command: string): string {
-	if (process.platform !== "win32") {
-		return command;
-	}
-
-	const parsedPipeline = parseSimpleTopLevelPipeline(command);
-	if (!parsedPipeline) {
-		return command;
-	}
-
-	const producer = extractProducerRewritePlan(parsedPipeline.segments[0] ?? "", parsedPipeline.separators[0] ?? "");
-	if (!producer) {
-		return command;
-	}
-
-	const remainder = parsedPipeline.segments
-		.slice(1)
-		.map((segment, index) => `${index === 0 ? "" : (parsedPipeline.separators[index] ?? "")}${segment}`)
-		.join("")
-		.trim();
-	if (!remainder) {
-		return command;
-	}
-
-	return buildBufferedPipelineCommand(producer, remainder);
-}
+import { splitLeadingEnvAssignments } from "./shell-env-prefix.js";
+
+interface ParsedPipeline {
+	segments: string[];
+	separators: string[];
+	suffix: string;
+}
+
+interface ProducerRewritePlan {
+	command: string;
+	captureStderr: boolean;
+}
+
+interface ShellSafetyTarget {
+	environmentPrelude: string;
+	command: string;
+}
+
+const SINGLE_QUOTED_SHELL_VALUE_PATTERN = "'(?:'\\\\''|[^'])*'";
+const SHELL_ENV_VALUE_PATTERN = `(?:"(?:\\\\.|[^"])*"|${SINGLE_QUOTED_SHELL_VALUE_PATTERN}|[^\\s;]+)`;
+const LEADING_RTK_DB_PATH_EXPORT_PRELUDE_PATTERN = new RegExp(
+	`^(\\s*export\\s+RTK_DB_PATH=${SHELL_ENV_VALUE_PATTERN}\\s*;\\s*)([\\s\\S]*)$`,
+	"u",
+);
+
+function splitLeadingRtkDbPathExportPrelude(command: string): ShellSafetyTarget {
+	const match = command.match(LEADING_RTK_DB_PATH_EXPORT_PRELUDE_PATTERN);
+	if (!match) {
+		return { environmentPrelude: "", command };
+	}
+
+	return {
+		environmentPrelude: match[1] ?? "",
+		command: match[2] ?? "",
+	};
+}
+
+function isTopLevelQuoteCharacter(character: string): character is '"' | "'" | "`" {
+	return character === '"' || character === "'" || character === "`";
+}
+
+function parseSimpleTopLevelPipeline(command: string): ParsedPipeline | null {
+	const segments: string[] = [];
+	const separators: string[] = [];
+	let quote: '"' | "'" | "`" | null = null;
+	let escaped = false;
+	let segmentStart = 0;
+	let suffix = "";
+
+	for (let index = 0; index < command.length; index += 1) {
+		const character = command[index] ?? "";
+		const nextCharacter = command[index + 1] ?? "";
+		const previousCharacter = index > 0 ? (command[index - 1] ?? "") : "";
+
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+
+		if (quote !== null) {
+			if (character === "\\" && quote !== "'") {
+				escaped = true;
+				continue;
+			}
+			if (character === quote) {
+				quote = null;
+			}
+			continue;
+		}
+
+		if (character === "\\") {
+			escaped = true;
+			continue;
+		}
+
+		if (isTopLevelQuoteCharacter(character)) {
+			quote = character;
+			continue;
+		}
+
+		if (character === "|" && nextCharacter === "|") {
+			if (separators.length === 0) {
+				return null;
+			}
+			segments.push(command.slice(segmentStart, index));
+			suffix = command.slice(index);
+			break;
+		}
+
+		if (character === "|" && previousCharacter !== ">") {
+			const separatorLength = nextCharacter === "&" ? 2 : 1;
+			segments.push(command.slice(segmentStart, index));
+			separators.push(command.slice(index, index + separatorLength));
+			segmentStart = index + separatorLength;
+			if (separatorLength === 2) {
+				index += 1;
+			}
+			continue;
+		}
+
+		if (character === "&" && nextCharacter === "&") {
+			if (separators.length === 0) {
+				return null;
+			}
+			segments.push(command.slice(segmentStart, index));
+			suffix = command.slice(index);
+			break;
+		}
+
+		if (character === "&" && nextCharacter !== ">" && previousCharacter !== ">" && previousCharacter !== "<") {
+			return null;
+		}
+
+		if (character === ";") {
+			if (separators.length === 0) {
+				return null;
+			}
+			segments.push(command.slice(segmentStart, index));
+			suffix = command.slice(index);
+			break;
+		}
+	}
+
+	if (separators.length === 0) {
+		return null;
+	}
+
+	if (!suffix) {
+		segments.push(command.slice(segmentStart));
+	}
+
+	return { segments, separators, suffix };
+}
+
+function extractProducerRewritePlan(segment: string, firstSeparator: string): ProducerRewritePlan | null {
+	const trimmed = segment.trim();
+	const { envPrefix, command: commandWithOptionalRedirect } = splitLeadingEnvAssignments(trimmed);
+	if (!/^rtk\s+/i.test(commandWithOptionalRedirect)) {
+		return null;
+	}
+
+	const stderrMergeMatch = commandWithOptionalRedirect.match(/^(.*?)(?:\s+)?2>\s*&1\s*$/u);
+	if (stderrMergeMatch) {
+		const command = stderrMergeMatch[1]?.trimEnd() ?? "";
+		return command ? { command: `${envPrefix}${command}`.trim(), captureStderr: true } : null;
+	}
+
+	return {
+		command: `${envPrefix}${commandWithOptionalRedirect}`.trim(),
+		captureStderr: firstSeparator === "|&",
+	};
+}
+
+function buildBufferedPipelineCommand(
+	producer: ProducerRewritePlan,
+	remainder: string,
+): string {
+	const tempFileVariable = "__pi_rtk_pipe_tmp";
+	const statusVariable = "__pi_rtk_pipe_status";
+	const producerRedirect = producer.captureStderr ? `> "$${tempFileVariable}" 2>&1` : `> "$${tempFileVariable}"`;
+	const cleanupTrap = `rm -f "$${tempFileVariable}"`;
+
+	return [
+		"{",
+		`${tempFileVariable}="$(mktemp)" || exit $?;`,
+		`${statusVariable}=0;`,
+		`trap '${cleanupTrap}' EXIT HUP INT TERM;`,
+		`${producer.command} ${producerRedirect};`,
+		`${statusVariable}=$?;`,
+		`if [ $${statusVariable} -eq 0 ]; then (${remainder}) < "$${tempFileVariable}"; ${statusVariable}=$?; fi;`,
+		`exit $${statusVariable};`,
+		"}",
+	].join(" ");
+}
+
+export function applyRewrittenCommandShellSafetyFixups(command: string, platform: string = process.platform): string {
+	if (platform !== "win32") {
+		return command;
+	}
+
+	const target = splitLeadingRtkDbPathExportPrelude(command);
+	const parsedPipeline = parseSimpleTopLevelPipeline(target.command);
+	if (!parsedPipeline) {
+		return command;
+	}
+
+	const producer = extractProducerRewritePlan(parsedPipeline.segments[0] ?? "", parsedPipeline.separators[0] ?? "");
+	if (!producer) {
+		return command;
+	}
+
+	const remainder = parsedPipeline.segments
+		.slice(1)
+		.map((segment, index) => `${index === 0 ? "" : (parsedPipeline.separators[index] ?? "")}${segment}`)
+		.join("")
+		.trim();
+	if (!remainder) {
+		return command;
+	}
+
+	const suffix = parsedPipeline.suffix ? ` ${parsedPipeline.suffix.trimStart()}` : "";
+	return `${target.environmentPrelude}${buildBufferedPipelineCommand(producer, remainder)}${suffix}`;
+}

package/src/rtk-command-environment.ts

@@ -3,7 +3,12 @@ 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 SINGLE_QUOTED_SHELL_VALUE_PATTERN = "'(?:'\\\\''|[^'])*'";
+const SHELL_ENV_VALUE_PATTERN = `(?:"[^"]*"|${SINGLE_QUOTED_SHELL_VALUE_PATTERN}|[^\\s;]+)`;
+const RTK_DB_PATH_ASSIGNMENT_PATTERN = new RegExp(
+	`(?:^|\\s)RTK_DB_PATH=${SHELL_ENV_VALUE_PATTERN}(?=\\s|$)`,
+);
+const RTK_DB_PATH_EXPORT_PATTERN = new RegExp(`^export\\s+RTK_DB_PATH=${SHELL_ENV_VALUE_PATTERN}(?=\\s*(?:;|$))`);
 
 function resolveTemporaryDirectory(): string {
 	if (process.platform === "win32") {
@@ -44,11 +49,15 @@ function getTemporaryRtkHistoryDbPath(): string {
 
 function quoteForShellEnv(value: string): string {
 	const normalizedValue = process.platform === "win32" ? value.replace(/\\/g, "/") : value;
-	return `"${normalizedValue.replace(/"/g, '\\"')}"`;
+	return `'${normalizedValue.replace(/'/g, `'\\''`)}'`;
 }
 
 function hasLeadingRtkDbPathAssignment(command: string): boolean {
-	return RTK_DB_PATH_ASSIGNMENT_PATTERN.test(splitLeadingEnvAssignments(command).envPrefix);
+	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 {
@@ -60,5 +69,5 @@ export function applyRtkCommandEnvironment(command: string): string {
 		return command;
 	}
 
-	return `${RTK_DB_PATH_ENV_NAME}=${quoteForShellEnv(getTemporaryRtkHistoryDbPath())} ${command}`;
+	return `export ${RTK_DB_PATH_ENV_NAME}=${quoteForShellEnv(getTemporaryRtkHistoryDbPath())}; ${command}`;
 }

package/src/rtk-executable-resolver.ts

@@ -0,0 +1,97 @@
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+
+export type RtkExecutableResolverName = "where" | "which";
+
+export interface RtkExecutableResolution {
+	command: string;
+	resolvedPath?: string;
+	resolver: RtkExecutableResolverName;
+	warning?: string;
+}
+
+interface ResolverCommand {
+	command: RtkExecutableResolverName;
+	args: string[];
+}
+
+export interface ResolveRtkExecutableOptions {
+	platform?: typeof process.platform;
+	timeoutMs?: number;
+}
+
+function trimResolutionDetail(value: string | undefined): string {
+	return (value ?? "").replace(/\s+/g, " ").trim();
+}
+
+function stripWrappingQuotes(value: string): string {
+	if (value.length < 2) {
+		return value;
+	}
+
+	const first = value[0];
+	const last = value[value.length - 1];
+	if ((first === '"' && last === '"') || (first === "'" && last === "'")) {
+		return value.slice(1, -1);
+	}
+
+	return value;
+}
+
+export function parseRtkExecutablePath(stdout: string): string | undefined {
+	for (const line of stdout.split(/\r?\n/)) {
+		const candidate = stripWrappingQuotes(line.trim());
+		if (candidate) {
+			return candidate;
+		}
+	}
+
+	return undefined;
+}
+
+function getResolverCommand(platform: typeof process.platform): ResolverCommand {
+	if (platform === "win32") {
+		return { command: "where", args: ["rtk"] };
+	}
+
+	return { command: "which", args: ["rtk"] };
+}
+
+function fallbackResolution(resolver: RtkExecutableResolverName, warning: string): RtkExecutableResolution {
+	return {
+		command: "rtk",
+		resolver,
+		warning,
+	};
+}
+
+export async function resolveRtkExecutable(
+	pi: ExtensionAPI,
+	options: ResolveRtkExecutableOptions = {},
+): Promise<RtkExecutableResolution> {
+	const resolver = getResolverCommand(options.platform ?? process.platform);
+	const timeout = options.timeoutMs ?? 1000;
+
+	try {
+		const result = await pi.exec(resolver.command, resolver.args, { timeout });
+		const resolvedPath = parseRtkExecutablePath(result.stdout ?? "");
+		if (result.code === 0 && resolvedPath) {
+			return {
+				command: resolvedPath,
+				resolvedPath,
+				resolver: resolver.command,
+			};
+		}
+
+		const detail = trimResolutionDetail(result.stderr || result.stdout || `exit ${result.code}`);
+		return fallbackResolution(
+			resolver.command,
+			`rtk executable path resolution via ${resolver.command} failed${detail ? `: ${detail}` : ""}`,
+		);
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return fallbackResolution(
+			resolver.command,
+			`rtk executable path resolution via ${resolver.command} failed: ${trimResolutionDetail(message)}`,
+		);
+	}
+}