pi-rtk-optimizer 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.1] - 2026-03-24
+
+### Fixed
+- RTK_DB_PATH environment variable now correctly scoped to rewritten producer commands only — Windows commands now use subshell scoping `{ RTK_DB_PATH=...; ... }` instead of leaking the prefix into the rewritten command
+- Command rewrite pipeline now applies environment scoping BEFORE shell safety fixups to prevent env prefix stripping
+
+### Added
+- `shell-env-prefix.ts` module for splitting leading environment variable assignments from commands
+- `splitLeadingEnvAssignments()` function to properly extract `ENV=value` prefixes before command analysis
+
+### Changed
+- Refactored `rtk-command-environment.ts` to use the new `splitLeadingEnvAssignments` utility
+- Refactored `rewrite-pipeline-safety.ts` to preserve env prefixes when analyzing and rewriting rtk commands
+
+### Tests
+- Added test coverage for RTK_DB_PATH scoping on Windows vs Unix platforms
+- Verified env prefix is preserved through the rewrite pipeline
+
 ## [0.5.0] - 2026-03-23
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-rtk-optimizer",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Pi extension that optimizes RTK command rewriting and tool output compaction for the coding agent.",
   "type": "module",
   "main": "./index.ts",

package/src/additional-coverage-test.ts

@@ -14,6 +14,7 @@ import { matchesCommandPatterns, normalizeCommandForDetection } from "./techniqu
 import { compactPath } from "./techniques/path-utils.ts";
 import { applyWindowsBashCompatibilityFixes } from "./windows-command-helpers.ts";
 import { applyRewrittenCommandShellSafetyFixups } from "./rewrite-pipeline-safety.ts";
+import { applyRtkCommandEnvironment } from "./rtk-command-environment.ts";
 import { sanitizeStreamingBashExecutionResult } from "./tool-execution-sanitizer.ts";
 import { sanitizeRtkEmojiOutput } from "./techniques/emoji.ts";
 import { stripRtkHookWarnings } from "./techniques/rtk.ts";
@@ -197,6 +198,28 @@ runTest("rewrite pipeline safety buffers rewritten Windows producer commands", (
 	assert.equal(applyRewrittenCommandShellSafetyFixups("git diff | grep TODO"), "git diff | grep TODO");
 });
 
+runTest("rewrite pipeline safety keeps RTK_DB_PATH scoped to rewritten producer commands", () => {
+	const rewritten = applyRewrittenCommandShellSafetyFixups(
+		applyRtkCommandEnvironment("rtk git diff agent/extensions/pi-multi-auth/account-manager.ts | head -200"),
+	);
+
+	if (process.platform === "win32") {
+		assert.ok(rewritten.startsWith("{"));
+		assert.equal(rewritten.startsWith("RTK_DB_PATH="), false);
+		assert.ok(rewritten.includes("RTK_DB_PATH="));
+		assert.ok(
+			rewritten.includes('rtk git diff agent/extensions/pi-multi-auth/account-manager.ts > "$__pi_rtk_pipe_tmp"'),
+		);
+		assert.ok(rewritten.includes('(head -200) < "$__pi_rtk_pipe_tmp"'));
+	} else {
+		assert.ok(rewritten.startsWith("RTK_DB_PATH="));
+		assert.equal(
+			rewritten,
+			applyRtkCommandEnvironment("rtk git diff agent/extensions/pi-multi-auth/account-manager.ts | head -200"),
+		);
+	}
+});
+
 runTest("stripRtkHookWarnings handles bare, prefixed, and already-sanitized hook notices", () => {
 	assert.equal(
 		stripRtkHookWarnings("No hook installed — run `rtk init -g` for automatic token savings\n\nready\n", null),

package/src/index.ts

@@ -363,8 +363,8 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 			if (config.showRewriteNotifications && ctx.hasUI) {
 				ctx.ui.notify(formatRewriteNotice(decision.originalCommand, decision.rewrittenCommand), "info");
 			}
-			const safeRewrittenCommand = applyRewrittenCommandShellSafetyFixups(decision.rewrittenCommand);
-			event.input.command = applyRtkCommandEnvironment(safeRewrittenCommand);
+			const envScopedRewrittenCommand = applyRtkCommandEnvironment(decision.rewrittenCommand);
+			event.input.command = applyRewrittenCommandShellSafetyFixups(envScopedRewrittenCommand);
 			return {};
 		}
 

package/src/rewrite-pipeline-safety.ts

@@ -1,3 +1,5 @@
+import { splitLeadingEnvAssignments } from "./shell-env-prefix.js";
+
 interface ParsedPipeline {
 	segments: string[];
 	separators: string[];
@@ -88,18 +90,19 @@ function parseSimpleTopLevelPipeline(command: string): ParsedPipeline | null {
 
 function extractProducerRewritePlan(segment: string, firstSeparator: string): ProducerRewritePlan | null {
 	const trimmed = segment.trim();
-	if (!/^rtk\s+/i.test(trimmed)) {
+	const { envPrefix, command: commandWithOptionalRedirect } = splitLeadingEnvAssignments(trimmed);
+	if (!/^rtk\s+/i.test(commandWithOptionalRedirect)) {
 		return null;
 	}
 
-	const stderrMergeMatch = trimmed.match(/^(.*?)(?:\s+)?2>\s*&1\s*$/u);
+	const stderrMergeMatch = commandWithOptionalRedirect.match(/^(.*?)(?:\s+)?2>\s*&1\s*$/u);
 	if (stderrMergeMatch) {
 		const command = stderrMergeMatch[1]?.trimEnd() ?? "";
-		return command ? { command, captureStderr: true } : null;
+		return command ? { command: `${envPrefix}${command}`.trim(), captureStderr: true } : null;
 	}
 
 	return {
-		command: trimmed,
+		command: `${envPrefix}${commandWithOptionalRedirect}`.trim(),
 		captureStderr: firstSeparator === "|&",
 	};
 }

package/src/rtk-command-environment.ts

@@ -1,7 +1,8 @@
 import { join } from "node:path";
 
+import { splitLeadingEnvAssignments } from "./shell-env-prefix.js";
+
 const RTK_DB_PATH_ENV_NAME = "RTK_DB_PATH";
-const LEADING_ENV_ASSIGNMENT_PATTERN = /^((?:[A-Za-z_][A-Za-z0-9_]*=(?:"[^"]*"|'[^']*'|[^\s]+)\s+)*)/;
 const RTK_DB_PATH_ASSIGNMENT_PATTERN = /(?:^|\s)RTK_DB_PATH=(?:"[^"]*"|'[^']*'|[^\s]+)(?=\s|$)/;
 
 function resolveTemporaryDirectory(): string {
@@ -47,8 +48,7 @@ function quoteForShellEnv(value: string): string {
 }
 
 function hasLeadingRtkDbPathAssignment(command: string): boolean {
-	const leadingAssignments = command.match(LEADING_ENV_ASSIGNMENT_PATTERN)?.[1] ?? "";
-	return RTK_DB_PATH_ASSIGNMENT_PATTERN.test(leadingAssignments);
+	return RTK_DB_PATH_ASSIGNMENT_PATTERN.test(splitLeadingEnvAssignments(command).envPrefix);
 }
 
 export function applyRtkCommandEnvironment(command: string): string {

package/src/shell-env-prefix.ts

@@ -0,0 +1,14 @@
+const LEADING_ENV_ASSIGNMENT_PATTERN = /^((?:[A-Za-z_][A-Za-z0-9_]*=(?:"[^"]*"|'[^']*'|[^\s]+)\s+)*)/;
+
+export interface LeadingEnvAssignmentSplit {
+	envPrefix: string;
+	command: string;
+}
+
+export function splitLeadingEnvAssignments(input: string): LeadingEnvAssignmentSplit {
+	const envPrefix = input.match(LEADING_ENV_ASSIGNMENT_PATTERN)?.[1] ?? "";
+	return {
+		envPrefix,
+		command: input.slice(envPrefix.length),
+	};
+}