pi-rtk-optimizer 0.5.0 → 0.5.2

package/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.2] - 2026-04-01
+
+### Changed
+- Updated `@mariozechner/pi-coding-agent` and `@mariozechner/pi-tui` peer dependencies to ^0.64.0
+- Improved RTK note message to guide users through '/rtk' toggle in Pi TUI
+
+## [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,60 +1,60 @@
-{
-  "name": "pi-rtk-optimizer",
-  "version": "0.5.0",
-  "description": "Pi extension that optimizes RTK command rewriting and tool output compaction for the coding agent.",
-  "type": "module",
-  "main": "./index.ts",
-  "exports": {
-    ".": "./index.ts"
-  },
-  "files": [
-    "index.ts",
-    "src",
-    "config/config.example.json",
-    "README.md",
-    "CHANGELOG.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "build": "npx --yes -p typescript@5.7.3 tsc -p tsconfig.json --noCheck",
-    "lint": "npm run build",
-    "typecheck": "npx --yes -p typescript@5.7.3 tsc -p tsconfig.json",
-    "test": "bun ./src/output-compactor-test.ts && bun ./src/command-rewriter-test.ts && bun ./src/runtime-guard-test.ts && bun ./src/additional-coverage-test.ts && bun ./src/config-modal-test.ts && bun ./src/index-test.ts",
-    "check": "npm run lint && npm run typecheck && npm run test",
-    "build:check": "bunx esbuild ./index.ts --bundle --platform=node --format=esm --outfile=./.pi-rtk-optimizer-check.mjs --external:@mariozechner/pi-coding-agent --external:@mariozechner/pi-tui && bun -e \"import { unlinkSync } from 'node:fs'; unlinkSync('./.pi-rtk-optimizer-check.mjs');\""
-  },
-  "keywords": [
-    "pi-package",
-    "pi",
-    "pi-extension",
-    "rtk",
-    "token-optimization",
-    "tool-compaction",
-    "coding-agent"
-  ],
-  "author": "MasuRii",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/MasuRii/pi-rtk-optimizer.git"
-  },
-  "bugs": {
-    "url": "https://github.com/MasuRii/pi-rtk-optimizer/issues"
-  },
-  "homepage": "https://github.com/MasuRii/pi-rtk-optimizer#readme",
-  "engines": {
-    "node": ">=20"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "pi": {
-    "extensions": [
-      "./index.ts"
-    ]
-  },
-  "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "^0.62.0",
-    "@mariozechner/pi-tui": "^0.62.0"
-  }
-}
+{
+  "name": "pi-rtk-optimizer",
+  "version": "0.5.2",
+  "description": "Pi extension that optimizes RTK command rewriting and tool output compaction for the coding agent.",
+  "type": "module",
+  "main": "./index.ts",
+  "exports": {
+    ".": "./index.ts"
+  },
+  "files": [
+    "index.ts",
+    "src",
+    "config/config.example.json",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "npx --yes -p typescript@5.7.3 tsc -p tsconfig.json --noCheck",
+    "lint": "npm run build",
+    "typecheck": "npx --yes -p typescript@5.7.3 tsc -p tsconfig.json",
+    "test": "bun ./src/output-compactor-test.ts && bun ./src/command-rewriter-test.ts && bun ./src/runtime-guard-test.ts && bun ./src/additional-coverage-test.ts && bun ./src/config-modal-test.ts && bun ./src/index-test.ts",
+    "check": "npm run lint && npm run typecheck && npm run test",
+    "build:check": "bunx esbuild ./index.ts --bundle --platform=node --format=esm --outfile=./.pi-rtk-optimizer-check.mjs --external:@mariozechner/pi-coding-agent --external:@mariozechner/pi-tui && bun -e \"import { unlinkSync } from 'node:fs'; unlinkSync('./.pi-rtk-optimizer-check.mjs');\""
+  },
+  "keywords": [
+    "pi-package",
+    "pi",
+    "pi-extension",
+    "rtk",
+    "token-optimization",
+    "tool-compaction",
+    "coding-agent"
+  ],
+  "author": "MasuRii",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MasuRii/pi-rtk-optimizer.git"
+  },
+  "bugs": {
+    "url": "https://github.com/MasuRii/pi-rtk-optimizer/issues"
+  },
+  "homepage": "https://github.com/MasuRii/pi-rtk-optimizer#readme",
+  "engines": {
+    "node": ">=20"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "pi": {
+    "extensions": [
+      "./index.ts"
+    ]
+  },
+  "peerDependencies": {
+    "@mariozechner/pi-coding-agent": "^0.64.0",
+    "@mariozechner/pi-tui": "^0.64.0"
+  }
+}

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

@@ -28,7 +28,7 @@ function trimMessage(raw: string, maxLength = 220): string {
 }
 
 const SOURCE_FILTER_TROUBLESHOOTING_NOTE =
-	"RTK note: If file edits repeatedly fail because old text does not match, run '/rtk', turn off 'Read source filtering enabled', re-read the file, apply the edit, then turn it back on.";
+	"RTK note: If file edits repeatedly fail because old text does not match, ask the user to manually run '/rtk' in the Pi TUI, disable 'Read source filtering enabled', re-read the file, apply the edit, then ask the user to manually re-enable it in the Pi TUI.";
 
 function mergeCompactionDetails(
 	existingDetails: unknown,
@@ -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),
+	};
+}