pi-rtk-optimizer 0.6.0 → 0.7.1

package/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.1] - 2026-05-04
+
+### Changed
+- Clarified the README architecture inventory for delegated `rtk rewrite` ownership and documented Bun as a development verification prerequisite.
+- Pinned TypeScript and esbuild as dev dependencies so build and bundle checks use locked local tooling.
+- Added RTK executable path visibility to runtime verification output and documented audit/debug config expectations.
+
+### Fixed
+- Hardened `RTK_DB_PATH` shell quoting against inherited temp paths containing command-substitution syntax.
+- Made the custom test helper await async tests before reporting pass.
+- Preserved RTK rewrite error details through the extension's existing UI warning path.
+- Expanded Windows command and rewritten-pipeline fixups for leading compound-command cases.
+- Normalized compaction technique return handling while preserving existing output behavior.
+- Added lifecycle and vendored modal regression coverage for high-risk extension event paths.
+
+## [0.7.0] - 2026-04-30
+
+### Added
+- Added opt-in `readCompaction` controls for `read` output so lossy source filtering and smart truncation stay disabled unless explicitly enabled.
+
+### Changed
+- Updated README and example configuration defaults for safer read-compaction behavior and troubleshooting guidance.
+- Updated `@mariozechner/pi-coding-agent` and `@mariozechner/pi-tui` peer dependencies to ^0.72.0.
+
 ## [0.6.0] - 2026-04-27
 
 ### Changed

package/README.md

@@ -16,6 +16,7 @@
 - **Automatic rewriting** or **suggestion-only** mode for common development workflows
 - Delegates bash command rewrite decisions to the installed `rtk rewrite` command, keeping RTK as the source of truth for supported commands, shell parsing, bypasses, and compound-command behavior
 - Runtime guard when `rtk` binary is unavailable (raw commands run unchanged and repeated missing-binary rewrite probes are avoided)
+- `/rtk show` and `/rtk verify` surface the resolved `rtk` executable path when the host can resolve it
 - Pi-specific shell safety fixups for rewritten commands on Windows
 
 ### Output Compaction Pipeline
@@ -107,6 +108,8 @@ Actual global path: $PI_CODING_AGENT_DIR/extensions/pi-rtk-optimizer/config.json
 
 A starter template is included at `config/config.example.json`.
 
+For audit or debugging sessions, keep `showRewriteNotifications` enabled and disable lossy `read` compaction/source filtering before gathering evidence. Existing `config.json` files are user-owned runtime state; do not overwrite local choices unless you intentionally want to change live extension behavior.
+
 ### Configuration Options
 
 #### Top-Level Settings
@@ -130,9 +133,10 @@ Bash command support is intentionally resolved by the installed `rtk` binary thr
 |--------|------|---------|-------------|
 | `outputCompaction.enabled` | boolean | `true` | Enable output compaction pipeline |
 | `outputCompaction.stripAnsi` | boolean | `true` | Remove ANSI escape codes |
-| `outputCompaction.sourceCodeFilteringEnabled` | boolean | `true` | Enable source code filtering for `read` output |
+| `outputCompaction.readCompaction.enabled` | boolean | `false` | Enable lossy compaction for `read` output; defaults off so code reads stay exact |
+| `outputCompaction.sourceCodeFilteringEnabled` | boolean | `false` | Enable source code filtering for `read` output when read compaction is enabled |
 | `outputCompaction.preserveExactSkillReads` | boolean | `false` | Keep reads under configured Pi/global/project skill directories exact, bypassing read compaction |
-| `outputCompaction.sourceCodeFiltering` | string | `"minimal"` | Filter level: `"none"`, `"minimal"`, `"aggressive"` |
+| `outputCompaction.sourceCodeFiltering` | string | `"none"` | Filter level: `"none"`, `"minimal"`, `"aggressive"` |
 | `outputCompaction.aggregateTestOutput` | boolean | `true` | Summarize test runner output |
 | `outputCompaction.filterBuildOutput` | boolean | `true` | Filter build/compile output |
 | `outputCompaction.compactGitOutput` | boolean | `true` | Compact git command output |
@@ -146,7 +150,7 @@ Skill-read preservation covers the global Pi skills directory (`~/.pi/agent/skil
 
 | Option | Type | Default | Range | Description |
 |--------|------|---------|-------|-------------|
-| `outputCompaction.smartTruncate.enabled` | boolean | `true` | — | Enable smart line-based truncation |
+| `outputCompaction.smartTruncate.enabled` | boolean | `false` | — | Enable smart line-based truncation for read output when read compaction is enabled |
 | `outputCompaction.smartTruncate.maxLines` | number | `220` | 40–4000 | Maximum lines after smart truncation |
 | `outputCompaction.truncate.enabled` | boolean | `true` | — | Enable hard character truncation |
 | `outputCompaction.truncate.maxChars` | number | `12000` | 1000–200000 | Maximum characters in final output |
@@ -159,7 +163,7 @@ Skill-read preservation covers the global Pi skills directory (`~/.pi/agent/skil
 | `minimal` | Removes non-doc comments, collapses blank lines |
 | `aggressive` | Also removes imports, keeps only signatures and key logic |
 
-> **Note:** When source filtering and read truncation safeguards are active, Pi injects a troubleshooting note for repeated file-edit mismatches. If edits fail because "old text does not match," disable source filtering via `/rtk`, re-read the file, apply the edit, then re-enable filtering.
+> **Note:** When read compaction, source filtering, and read truncation safeguards are active, Pi injects a troubleshooting note for repeated file-edit mismatches. If edits fail because "old text does not match," disable read compaction via `/rtk`, re-read the file, apply the edit, then re-enable compaction.
 
 ### Example Configuration
 
@@ -172,9 +176,12 @@ Skill-read preservation covers the global Pi skills directory (`~/.pi/agent/skil
   "outputCompaction": {
     "enabled": true,
     "stripAnsi": true,
-    "sourceCodeFilteringEnabled": true,
+    "readCompaction": {
+      "enabled": false
+    },
+    "sourceCodeFilteringEnabled": false,
     "preserveExactSkillReads": false,
-    "sourceCodeFiltering": "minimal",
+    "sourceCodeFiltering": "none",
     "aggregateTestOutput": true,
     "filterBuildOutput": true,
     "compactGitOutput": true,
@@ -182,7 +189,7 @@ Skill-read preservation covers the global Pi skills directory (`~/.pi/agent/skil
     "groupSearchOutput": true,
     "trackSavings": true,
     "smartTruncate": {
-      "enabled": true,
+      "enabled": false,
       "maxLines": 220
     },
     "truncate": {
@@ -203,9 +210,8 @@ src/
 ├── index.ts                # Extension bootstrap and event wiring
 ├── config-store.ts         # Config load/save with normalization
 ├── config-modal.ts         # TUI settings modal and /rtk handler
-├── command-rewriter.ts         # Command tokenization and rewrite logic
-├── rewrite-bypass.ts           # Rewrite safety bypass rules for interactive/structured commands
-├── rewrite-rules.ts            # Rewrite rule catalog
+├── command-rewriter.ts         # Command rewrite decision adapter for RTK delegation
+├── rtk-rewrite-provider.ts     # Calls `rtk rewrite` as the rewrite source of truth
 ├── rewrite-pipeline-safety.ts  # Shell-safety fixups for rewritten commands
 ├── rtk-command-environment.ts  # RTK_DB_PATH scoping for rewritten commands
 ├── shell-env-prefix.ts         # Environment assignment parsing helpers
@@ -248,17 +254,18 @@ Automatic fixes applied on Windows:
 
 - **Peer dependencies:** `@mariozechner/pi-coding-agent`, `@mariozechner/pi-tui`
 - **Runtime:** Node.js ≥20, optional `rtk` binary for command rewriting
+- **Development verification:** Node.js ≥20, npm, and Bun for the test scripts
 
 ## Development
 
 ```bash
-# Build
+# Transpile-only TypeScript build check
 npm run build
 
 # Full typecheck
 npm run typecheck
 
-# Run tests
+# Run Bun-based tests
 npm run test
 
 # Full verification

package/config/config.example.json

@@ -6,15 +6,18 @@
   "outputCompaction": {
     "enabled": true,
     "stripAnsi": true,
-    "sourceCodeFilteringEnabled": true,
+    "readCompaction": {
+      "enabled": false
+    },
+    "sourceCodeFilteringEnabled": false,
     "preserveExactSkillReads": false,
     "truncate": {
       "enabled": true,
       "maxChars": 12000
     },
-    "sourceCodeFiltering": "minimal",
+    "sourceCodeFiltering": "none",
     "smartTruncate": {
-      "enabled": true,
+      "enabled": false,
       "maxLines": 220
     },
     "aggregateTestOutput": true,

package/package.json

@@ -1,64 +1,67 @@
-{
-  "name": "pi-rtk-optimizer",
-  "version": "0.6.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",
-    "pi-coding-agent",
-    "coding-agent",
-    "rtk",
-    "token-optimization",
-    "tool-compaction",
-    "output-compaction",
-    "command-rewrite",
-    "optimization"
-  ],
-  "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.70.2",
-    "@mariozechner/pi-tui": "^0.70.2"
-  }
-}
+{
+  "name": "pi-rtk-optimizer",
+  "version": "0.7.1",
+  "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": "tsc -p tsconfig.json --noCheck",
+    "typecheck": "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 typecheck && npm run test && npm run build:check",
+    "build:check": "esbuild ./index.ts --bundle --platform=node --format=esm --outfile=./.pi-rtk-optimizer-check.mjs --external:@mariozechner/pi-coding-agent --external:@mariozechner/pi-tui && node -e \"import { unlinkSync } from 'node:fs'; unlinkSync('./.pi-rtk-optimizer-check.mjs');\""
+  },
+  "keywords": [
+    "pi-package",
+    "pi",
+    "pi-extension",
+    "pi-coding-agent",
+    "coding-agent",
+    "rtk",
+    "token-optimization",
+    "tool-compaction",
+    "output-compaction",
+    "command-rewrite",
+    "optimization"
+  ],
+  "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"
+  },
+  "devDependencies": {
+    "esbuild": "0.28.0",
+    "typescript": "5.7.3"
+  },
+  "pi": {
+    "extensions": [
+      "./index.ts"
+    ]
+  },
+  "peerDependencies": {
+    "@mariozechner/pi-coding-agent": "^0.72.0",
+    "@mariozechner/pi-tui": "^0.72.0"
+  }
+}

package/src/additional-coverage-test.ts

@@ -66,6 +66,7 @@ runTest("config-store normalizes invalid values and clamps numeric ranges", () =
 	assert.equal(normalized.mode, "rewrite");
 	assert.equal(Object.hasOwn(normalized, "rewriteGitGithub"), false);
 	assert.equal(normalized.outputCompaction.stripAnsi, false);
+	assert.equal(normalized.outputCompaction.readCompaction.enabled, true);
 	assert.equal(normalized.outputCompaction.sourceCodeFilteringEnabled, true);
 	assert.equal(normalized.outputCompaction.sourceCodeFiltering, "minimal");
 	assert.equal(normalized.outputCompaction.truncate.maxChars, 1_000);
@@ -73,18 +74,32 @@ runTest("config-store normalizes invalid values and clamps numeric ranges", () =
 	assert.equal(normalized.outputCompaction.trackSavings, false);
 });
 
+runTest("config-store uses safer read defaults when readCompaction is explicit", () => {
+	const normalized = normalizeRtkIntegrationConfig({
+		outputCompaction: {
+			readCompaction: { enabled: false },
+		},
+	});
+
+	assert.equal(normalized.outputCompaction.readCompaction.enabled, false);
+	assert.equal(normalized.outputCompaction.sourceCodeFilteringEnabled, false);
+	assert.equal(normalized.outputCompaction.sourceCodeFiltering, "none");
+	assert.equal(normalized.outputCompaction.smartTruncate.enabled, false);
+});
+
 runTest("config-store can ensure, save, and reload isolated config files", () => {
 	const tempPath = makeTempConfigPath();
 	cleanupFile(tempPath);
 
 	try {
 		const ensured = ensureConfigExists(tempPath);
-		assert.equal(ensured.created, true);
+		assert.equal(ensured.error, undefined);
 		assert.equal(existsSync(tempPath), true);
 
 		const defaultLoad = loadRtkIntegrationConfig(tempPath);
 		assert.equal(defaultLoad.warning, undefined);
 		assert.equal(defaultLoad.config.mode, "rewrite");
+		assert.equal(defaultLoad.config.outputCompaction.readCompaction.enabled, false);
 
 		const saved = saveRtkIntegrationConfig(
 			{
@@ -153,6 +168,40 @@ runTest("command detection ignores env prefixes, blank lines, and chained suffix
 	assert.equal(matchesCommandPatterns("echo hello", [/^bun test/]), false);
 });
 
+runTest("RTK command environment preserves explicit leading RTK_DB_PATH overrides", () => {
+	const command = 'RTK_DB_PATH="/custom/history.db" rtk git diff';
+	assert.equal(applyRtkCommandEnvironment(command), command);
+
+	const singleQuotedCommand = "RTK_DB_PATH='/custom/it'\\''s/history.db' rtk git diff";
+	assert.equal(applyRtkCommandEnvironment(singleQuotedCommand), singleQuotedCommand);
+
+	const exportedCommand = 'export RTK_DB_PATH="/custom/history.db"; rtk git diff';
+	assert.equal(applyRtkCommandEnvironment(exportedCommand), exportedCommand);
+});
+
+runTest("RTK command environment single-quotes hostile temp paths", () => {
+	const previousTmpDir = process.env.TMPDIR;
+	const previousTmp = process.env.TMP;
+	const previousTemp = process.env.TEMP;
+	const hostilePath = process.platform === "win32" ? "C:\\Temp\\$(touch owned)`bad`'dir" : "/tmp/$(touch owned)`bad`'dir";
+
+	try {
+		process.env.TMPDIR = hostilePath;
+		process.env.TMP = hostilePath;
+		process.env.TEMP = hostilePath;
+
+		const rewritten = applyRtkCommandEnvironment("rtk git status");
+		assert.ok(rewritten.startsWith("export RTK_DB_PATH='"));
+		assert.ok(rewritten.includes("$(touch owned)`bad`'\\''dir"));
+		assert.ok(rewritten.endsWith("; rtk git status"));
+		assert.equal(/^export RTK_DB_PATH=\"/.test(rewritten), false);
+	} finally {
+		process.env.TMPDIR = previousTmpDir;
+		process.env.TMP = previousTmp;
+		process.env.TEMP = previousTemp;
+	}
+});
+
 runTest("path compaction preserves the tail and handles Windows separators", () => {
 	const unixPath = "/Users/example/projects/pi-rtk-optimizer/src/techniques/path-utils.ts";
 	const compactUnixPath = compactPath(unixPath, 28);
@@ -171,59 +220,99 @@ runTest("path compaction preserves the tail and handles Windows separators", ()
 
 runTest("windows bash compatibility rewrites only when the runtime is Windows", () => {
 	const command = "cd /d C:\\Users\\Administrator\\project && python script.py";
-	const fixed = applyWindowsBashCompatibilityFixes(command);
+	const fixed = applyWindowsBashCompatibilityFixes(command, "win32");
+	assert.deepEqual(fixed.applied, ["cd-/d", "python-utf8"]);
+	assert.equal(
+		fixed.command,
+		'PYTHONIOENCODING=utf-8 cd "C:/Users/Administrator/project" && python script.py',
+	);
 
-	if (process.platform === "win32") {
-		assert.deepEqual(fixed.applied, ["cd-/d", "python-utf8"]);
-		assert.equal(
-			fixed.command,
-			'PYTHONIOENCODING=utf-8 cd "C:/Users/Administrator/project" && python script.py',
-		);
+	const unchanged = applyWindowsBashCompatibilityFixes(command, "linux");
+	assert.deepEqual(unchanged.applied, []);
+	assert.equal(unchanged.command, command);
 
-		const alreadyUtf8 = applyWindowsBashCompatibilityFixes("PYTHONIOENCODING=utf-8 python script.py");
-		assert.deepEqual(alreadyUtf8.applied, []);
-		assert.equal(alreadyUtf8.command, "PYTHONIOENCODING=utf-8 python script.py");
-	} else {
-		assert.deepEqual(fixed.applied, []);
-		assert.equal(fixed.command, command);
-	}
+	const alreadyUtf8 = applyWindowsBashCompatibilityFixes("PYTHONIOENCODING=utf-8 python script.py", "win32");
+	assert.deepEqual(alreadyUtf8.applied, []);
+	assert.equal(alreadyUtf8.command, "PYTHONIOENCODING=utf-8 python script.py");
+});
+
+runTest("windows bash compatibility rewrites compound cd slash-d operators", () => {
+	assert.equal(
+		applyWindowsBashCompatibilityFixes("cd /d C:\\work || echo failed", "win32").command,
+		'cd "C:/work" || echo failed',
+	);
+	assert.equal(
+		applyWindowsBashCompatibilityFixes("cd /d C:\\work ; echo done", "win32").command,
+		'cd "C:/work" ; echo done',
+	);
+	assert.equal(
+		applyWindowsBashCompatibilityFixes("cd /d C:\\work | cat", "win32").command,
+		'cd "C:/work" | cat',
+	);
+	assert.equal(
+		applyWindowsBashCompatibilityFixes('cd /d "C:\\work space" || echo failed', "win32").command,
+		'cd "C:/work space" || echo failed',
+	);
 });
 
 runTest("rewrite pipeline safety buffers rewritten Windows producer commands", () => {
-	const rewritten = applyRewrittenCommandShellSafetyFixups("rtk git diff | grep TODO");
-
-	if (process.platform === "win32") {
-		assert.ok(rewritten.includes('mktemp'));
-		assert.ok(rewritten.includes('trap'));
-		assert.ok(rewritten.includes('rtk git diff > "$__pi_rtk_pipe_tmp"'));
-		assert.ok(rewritten.includes('(grep TODO) < "$__pi_rtk_pipe_tmp"'));
-	} else {
-		assert.equal(rewritten, "rtk git diff | grep TODO");
-	}
+	const rewritten = applyRewrittenCommandShellSafetyFixups("rtk git diff | grep TODO", "win32");
+	assert.ok(rewritten.includes('mktemp'));
+	assert.ok(rewritten.includes('trap'));
+	assert.ok(rewritten.includes('rtk git diff > "$__pi_rtk_pipe_tmp"'));
+	assert.ok(rewritten.includes('(grep TODO) < "$__pi_rtk_pipe_tmp"'));
+
+	assert.equal(
+		applyRewrittenCommandShellSafetyFixups("rtk git diff | grep TODO", "linux"),
+		"rtk git diff | grep TODO",
+	);
+	assert.equal(applyRewrittenCommandShellSafetyFixups("git diff | grep TODO", "win32"), "git diff | grep TODO");
+});
+
+runTest("rewrite pipeline safety buffers leading pipelines before compound suffixes", () => {
+	const andCommand = applyRewrittenCommandShellSafetyFixups("rtk git diff | grep TODO && echo done", "win32");
+	assert.ok(andCommand.includes('(grep TODO) < "$__pi_rtk_pipe_tmp"'));
+	assert.ok(andCommand.endsWith("&& echo done"));
+
+	const orCommand = applyRewrittenCommandShellSafetyFixups("rtk git diff | grep TODO || echo none", "win32");
+	assert.ok(orCommand.includes('(grep TODO) < "$__pi_rtk_pipe_tmp"'));
+	assert.ok(orCommand.endsWith("|| echo none"));
 
-	assert.equal(applyRewrittenCommandShellSafetyFixups("git diff | grep TODO"), "git diff | grep TODO");
+	const semicolonCommand = applyRewrittenCommandShellSafetyFixups("rtk git diff | grep TODO; echo done", "win32");
+	assert.ok(semicolonCommand.includes('(grep TODO) < "$__pi_rtk_pipe_tmp"'));
+	assert.ok(semicolonCommand.endsWith("; echo done"));
 });
 
-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"),
+runTest("rewrite pipeline safety keeps exported RTK_DB_PATH on rewritten producer commands", () => {
+	const envScopedCommand = applyRtkCommandEnvironment("rtk git diff agent/extensions/pi-multi-auth/account-manager.ts | head -200");
+	const rewritten = applyRewrittenCommandShellSafetyFixups(envScopedCommand, "win32");
+
+	assert.ok(rewritten.startsWith("export RTK_DB_PATH="));
+	assert.equal(rewritten.startsWith("RTK_DB_PATH="), false);
+	assert.ok(rewritten.includes("; {"));
+	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"'));
 
-	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"),
-		);
-	}
+	assert.equal(applyRewrittenCommandShellSafetyFixups(envScopedCommand, "linux"), envScopedCommand);
+});
+
+runTest("rewrite pipeline safety buffers explicit RTK_DB_PATH export preludes", () => {
+	const command = 'export RTK_DB_PATH="/custom/history.db"; rtk git diff | head -200';
+	const rewritten = applyRewrittenCommandShellSafetyFixups(command, "win32");
+
+	assert.ok(rewritten.startsWith('export RTK_DB_PATH="/custom/history.db"; {'));
+	assert.ok(rewritten.includes('rtk git diff > "$__pi_rtk_pipe_tmp"'));
+	assert.ok(rewritten.includes('(head -200) < "$__pi_rtk_pipe_tmp"'));
+
+	assert.equal(applyRewrittenCommandShellSafetyFixups(command, "linux"), command);
+});
+
+runTest("RTK command environment uses export prelude for shell compound commands", () => {
+	const rewritten = applyRtkCommandEnvironment('for d in a b; do echo "$d"; done');
+	assert.ok(/^export RTK_DB_PATH=/.test(rewritten));
+	assert.ok(/; for d in a b; do echo "\$d"; done$/.test(rewritten));
 });
 
 runTest("stripRtkHookWarnings handles bare, prefixed, and already-sanitized hook notices", () => {
@@ -273,11 +362,16 @@ runTest("streaming sanitizer strips hook notices, sanitizes emoji output, and pr
 			},
 		],
 	};
-	assert.equal(sanitizeStreamingBashExecutionResult(hookNoticeResult, "rtk git status"), true);
+	const hookNoticeSanitization = sanitizeStreamingBashExecutionResult(hookNoticeResult, "rtk git status");
+	assert.equal(hookNoticeSanitization.changed, true);
 	assert.equal(
-		(hookNoticeResult.content[0] as { text: string }).text,
+		((hookNoticeSanitization.result as typeof hookNoticeResult).content[0] as { text: string }).text,
 		"working tree clean\n",
 	);
+	assert.equal(
+		(hookNoticeResult.content[0] as { text: string }).text,
+		"[rtk] /!\\ No hook installed — run `rtk init -g` for automatic token savings\n\nworking tree clean\n",
+	);
 
 	const emojiResult = {
 		content: [
@@ -285,9 +379,14 @@ runTest("streaming sanitizer strips hook notices, sanitizes emoji output, and pr
 			{ type: "image", url: "ignored" },
 		],
 	};
-	assert.equal(sanitizeStreamingBashExecutionResult(emojiResult, "rtk git diff -- src/file.ts"), true);
-	assert.equal((emojiResult.content[0] as { text: string }).text, "> src/file.ts\n[OK] Files are identical\n");
-	assert.deepEqual(emojiResult.content[1], { type: "image", url: "ignored" });
+	const emojiSanitization = sanitizeStreamingBashExecutionResult(emojiResult, "rtk git diff -- src/file.ts");
+	assert.equal(emojiSanitization.changed, true);
+	assert.equal(
+		((emojiSanitization.result as typeof emojiResult).content[0] as { text: string }).text,
+		"> src/file.ts\n[OK] Files are identical\n",
+	);
+	assert.equal((emojiResult.content[0] as { text: string }).text, "📄 src/file.ts\n✅ Files are identical\n");
+	assert.deepEqual((emojiSanitization.result as typeof emojiResult).content[1], { type: "image", url: "ignored" });
 
 	const parseWarningResult = {
 		content: [
@@ -297,7 +396,9 @@ runTest("streaming sanitizer strips hook notices, sanitizes emoji output, and pr
 			},
 		],
 	};
-	assert.equal(sanitizeStreamingBashExecutionResult(parseWarningResult, "rtk git status"), false);
+	const parseWarningSanitization = sanitizeStreamingBashExecutionResult(parseWarningResult, "rtk git status");
+	assert.equal(parseWarningSanitization.changed, false);
+	assert.equal(parseWarningSanitization.result, parseWarningResult);
 	assert.equal(
 		(parseWarningResult.content[0] as { text: string }).text,
 		"[rtk] warning: builtin filters: parse failure\n\nworking tree clean\n",