pi-rtk-optimizer 0.5.4 → 0.6.0

package/src/config-modal.ts

@@ -54,25 +54,11 @@ function parseIntegerInRange(value: string, min: number, max: number): number |
 }
 
 function summarizeConfig(config: RtkIntegrationConfig, runtimeStatus: RuntimeStatus): string {
-	const categories = [
-		config.rewriteGitGithub ? "git" : "",
-		config.rewriteFilesystem ? "files" : "",
-		config.rewriteRust ? "rust" : "",
-		config.rewriteJavaScript ? "js" : "",
-		config.rewritePython ? "python" : "",
-		config.rewriteGo ? "go" : "",
-		config.rewriteContainers ? "containers" : "",
-		config.rewriteNetwork ? "network" : "",
-		config.rewritePackageManagers ? "packages" : "",
-	]
-		.filter((value) => value.length > 0)
-		.join(",");
-
 	const runtime = runtimeStatus.rtkAvailable
 		? "rtk=available"
 		: `rtk=missing${runtimeStatus.lastError ? ` (${runtimeStatus.lastError})` : ""}`;
 
-	return `enabled=${config.enabled}, mode=${config.mode}, rewriteNotice=${config.showRewriteNotifications}, compaction=${config.outputCompaction.enabled}, sourceFilterEnabled=${config.outputCompaction.sourceCodeFilteringEnabled}, preserveSkillReads=${config.outputCompaction.preserveExactSkillReads}, sourceFilter=${config.outputCompaction.sourceCodeFiltering}, categories=[${categories || "none"}], ${runtime}`;
+	return `enabled=${config.enabled}, mode=${config.mode}, rewriteSource=rtk, rewriteNotice=${config.showRewriteNotifications}, compaction=${config.outputCompaction.enabled}, sourceFilterEnabled=${config.outputCompaction.sourceCodeFilteringEnabled}, preserveSkillReads=${config.outputCompaction.preserveExactSkillReads}, sourceFilter=${config.outputCompaction.sourceCodeFiltering}, ${runtime}`;
 }
 
 function buildSettingItems(config: RtkIntegrationConfig): SettingItem[] {
@@ -210,69 +196,6 @@ function buildSettingItems(config: RtkIntegrationConfig): SettingItem[] {
 			currentValue: toOnOff(config.outputCompaction.trackSavings),
 			values: ON_OFF,
 		},
-		{
-			id: "rewriteGitGithub",
-			label: "Rewrite git / gh",
-			description: "git status/log/diff and gh pr/issue/run/api/release",
-			currentValue: toOnOff(config.rewriteGitGithub),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteFilesystem",
-			label: "Rewrite filesystem commands",
-			description: "cat, head, rg/grep, ls, tree, find, diff",
-			currentValue: toOnOff(config.rewriteFilesystem),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteRust",
-			label: "Rewrite Rust commands",
-			description: "cargo test/build/clippy/check/install/nextest/fmt",
-			currentValue: toOnOff(config.rewriteRust),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteJavaScript",
-			label: "Rewrite JavaScript/TypeScript",
-			description: "vitest, npm/npx/next, tsc, lint, prettier, playwright, prisma",
-			currentValue: toOnOff(config.rewriteJavaScript),
-			values: ON_OFF,
-		},
-		{
-			id: "rewritePython",
-			label: "Rewrite Python",
-			description: "pytest, ruff, pip, uv pip",
-			currentValue: toOnOff(config.rewritePython),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteGo",
-			label: "Rewrite Go",
-			description: "go test/build/vet and golangci-lint",
-			currentValue: toOnOff(config.rewriteGo),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteContainers",
-			label: "Rewrite containers",
-			description: "docker compose/ps/images/logs/run/build/exec and kubectl core ops",
-			currentValue: toOnOff(config.rewriteContainers),
-			values: ON_OFF,
-		},
-		{
-			id: "rewriteNetwork",
-			label: "Rewrite network",
-			description: "curl and wget",
-			currentValue: toOnOff(config.rewriteNetwork),
-			values: ON_OFF,
-		},
-		{
-			id: "rewritePackageManagers",
-			label: "Rewrite package managers",
-			description: "pnpm list/ls/outdated/build/typecheck and npm list/outdated",
-			currentValue: toOnOff(config.rewritePackageManagers),
-			values: ON_OFF,
-		},
 	];
 }
 
@@ -418,24 +341,6 @@ function applySetting(config: RtkIntegrationConfig, id: string, value: string):
 					trackSavings: value === "on",
 				},
 			};
-		case "rewriteGitGithub":
-			return { ...config, rewriteGitGithub: value === "on" };
-		case "rewriteFilesystem":
-			return { ...config, rewriteFilesystem: value === "on" };
-		case "rewriteRust":
-			return { ...config, rewriteRust: value === "on" };
-		case "rewriteJavaScript":
-			return { ...config, rewriteJavaScript: value === "on" };
-		case "rewritePython":
-			return { ...config, rewritePython: value === "on" };
-		case "rewriteGo":
-			return { ...config, rewriteGo: value === "on" };
-		case "rewriteContainers":
-			return { ...config, rewriteContainers: value === "on" };
-		case "rewriteNetwork":
-			return { ...config, rewriteNetwork: value === "on" };
-		case "rewritePackageManagers":
-			return { ...config, rewritePackageManagers: value === "on" };
 		default:
 			return config;
 	}
@@ -461,15 +366,6 @@ function syncSettingValues(settingsList: SettingValueSyncTarget, config: RtkInte
 	settingsList.updateValue("outputAggregateLinterOutput", toOnOff(config.outputCompaction.aggregateLinterOutput));
 	settingsList.updateValue("outputGroupSearchOutput", toOnOff(config.outputCompaction.groupSearchOutput));
 	settingsList.updateValue("outputTrackSavings", toOnOff(config.outputCompaction.trackSavings));
-	settingsList.updateValue("rewriteGitGithub", toOnOff(config.rewriteGitGithub));
-	settingsList.updateValue("rewriteFilesystem", toOnOff(config.rewriteFilesystem));
-	settingsList.updateValue("rewriteRust", toOnOff(config.rewriteRust));
-	settingsList.updateValue("rewriteJavaScript", toOnOff(config.rewriteJavaScript));
-	settingsList.updateValue("rewritePython", toOnOff(config.rewritePython));
-	settingsList.updateValue("rewriteGo", toOnOff(config.rewriteGo));
-	settingsList.updateValue("rewriteContainers", toOnOff(config.rewriteContainers));
-	settingsList.updateValue("rewriteNetwork", toOnOff(config.rewriteNetwork));
-	settingsList.updateValue("rewritePackageManagers", toOnOff(config.rewritePackageManagers));
 }
 
 async function openSettingsModal(ctx: ExtensionCommandContext, controller: RtkIntegrationController): Promise<void> {

package/src/config-store.ts

@@ -60,30 +60,6 @@ export function normalizeRtkIntegrationConfig(raw: unknown): RtkIntegrationConfi
 			source.showRewriteNotifications,
 			DEFAULT_RTK_INTEGRATION_CONFIG.showRewriteNotifications,
 		),
-		rewriteGitGithub: toBoolean(
-			source.rewriteGitGithub,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewriteGitGithub,
-		),
-		rewriteFilesystem: toBoolean(
-			source.rewriteFilesystem,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewriteFilesystem,
-		),
-		rewriteRust: toBoolean(source.rewriteRust, DEFAULT_RTK_INTEGRATION_CONFIG.rewriteRust),
-		rewriteJavaScript: toBoolean(
-			source.rewriteJavaScript,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewriteJavaScript,
-		),
-		rewritePython: toBoolean(source.rewritePython, DEFAULT_RTK_INTEGRATION_CONFIG.rewritePython),
-		rewriteGo: toBoolean(source.rewriteGo, DEFAULT_RTK_INTEGRATION_CONFIG.rewriteGo),
-		rewriteContainers: toBoolean(
-			source.rewriteContainers,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewriteContainers,
-		),
-		rewriteNetwork: toBoolean(source.rewriteNetwork, DEFAULT_RTK_INTEGRATION_CONFIG.rewriteNetwork),
-		rewritePackageManagers: toBoolean(
-			source.rewritePackageManagers,
-			DEFAULT_RTK_INTEGRATION_CONFIG.rewritePackageManagers,
-		),
 		outputCompaction: {
 			enabled: toBoolean(
 				outputCompactionSource.enabled,

package/src/index-test.ts

@@ -28,7 +28,38 @@ mock.module("@mariozechner/pi-tui", () => ({
 	visibleWidth: (text: string) => text.length,
 }));
 
-const { createBoundedNoticeTracker } = await import("./index.ts");
+const { createBoundedNoticeTracker, shouldInjectSourceFilterTroubleshootingNote } = await import("./index.ts");
+const { DEFAULT_RTK_INTEGRATION_CONFIG } = await import("./types.ts");
+
+function configWith(overrides: {
+	enabled?: boolean;
+	compactionEnabled?: boolean;
+	sourceFilteringEnabled?: boolean;
+	sourceFilteringLevel?: "none" | "minimal" | "aggressive";
+	smartTruncateEnabled?: boolean;
+	truncateEnabled?: boolean;
+}): typeof DEFAULT_RTK_INTEGRATION_CONFIG {
+	const base = DEFAULT_RTK_INTEGRATION_CONFIG;
+	return {
+		...base,
+		enabled: overrides.enabled ?? base.enabled,
+		outputCompaction: {
+			...base.outputCompaction,
+			enabled: overrides.compactionEnabled ?? base.outputCompaction.enabled,
+			sourceCodeFilteringEnabled:
+				overrides.sourceFilteringEnabled ?? base.outputCompaction.sourceCodeFilteringEnabled,
+			sourceCodeFiltering: overrides.sourceFilteringLevel ?? base.outputCompaction.sourceCodeFiltering,
+			smartTruncate: {
+				...base.outputCompaction.smartTruncate,
+				enabled: overrides.smartTruncateEnabled ?? base.outputCompaction.smartTruncate.enabled,
+			},
+			truncate: {
+				...base.outputCompaction.truncate,
+				enabled: overrides.truncateEnabled ?? base.outputCompaction.truncate.enabled,
+			},
+		},
+	};
+}
 
 runTest("bounded notice tracker evicts old entries and supports reset", () => {
 	const tracker = createBoundedNoticeTracker(2);
@@ -52,4 +83,52 @@ runTest("bounded notice tracker coerces invalid limits to a safe minimum", () =>
 	assert.equal(tracker.remember("alpha"), true);
 });
 
+runTest("source-filter note injected when source filtering is active", () => {
+	assert.equal(
+		shouldInjectSourceFilterTroubleshootingNote(
+			configWith({ sourceFilteringEnabled: true, sourceFilteringLevel: "minimal" }),
+		),
+		true,
+	);
+	assert.equal(
+		shouldInjectSourceFilterTroubleshootingNote(
+			configWith({ sourceFilteringEnabled: true, sourceFilteringLevel: "aggressive" }),
+		),
+		true,
+	);
+});
+
+runTest("source-filter note skipped when extension is disabled", () => {
+	assert.equal(shouldInjectSourceFilterTroubleshootingNote(configWith({ enabled: false })), false);
+});
+
+runTest("source-filter note skipped when compaction is disabled", () => {
+	assert.equal(shouldInjectSourceFilterTroubleshootingNote(configWith({ compactionEnabled: false })), false);
+});
+
+runTest("source-filter note skipped when source filtering flag is off", () => {
+	assert.equal(
+		shouldInjectSourceFilterTroubleshootingNote(configWith({ sourceFilteringEnabled: false })),
+		false,
+	);
+});
+
+runTest("source-filter note skipped when filtering level is 'none'", () => {
+	assert.equal(
+		shouldInjectSourceFilterTroubleshootingNote(
+			configWith({ sourceFilteringEnabled: true, sourceFilteringLevel: "none" }),
+		),
+		false,
+	);
+});
+
+runTest("source-filter note skipped when all read filtering safeguards are disabled", () => {
+	assert.equal(
+		shouldInjectSourceFilterTroubleshootingNote(
+			configWith({ smartTruncateEnabled: false, truncateEnabled: false }),
+		),
+		false,
+	);
+});
+
 console.log("All index tests passed.");

package/src/index.ts

@@ -30,6 +30,17 @@ 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, 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.";
 
+export function shouldInjectSourceFilterTroubleshootingNote(config: RtkIntegrationConfig): boolean {
+	const compaction = config.outputCompaction;
+	return (
+		config.enabled &&
+		compaction.enabled &&
+		compaction.sourceCodeFilteringEnabled &&
+		compaction.sourceCodeFiltering !== "none" &&
+		(compaction.smartTruncate.enabled || compaction.truncate.enabled)
+	);
+}
+
 function mergeCompactionDetails(
 	existingDetails: unknown,
 	compaction: ToolResultCompactionMetadata,
@@ -112,7 +123,6 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 			return;
 		}
 
-		console.warn(`[${EXTENSION_NAME}] ${message}`);
 		if (ctx.hasUI) {
 			ctx.ui.notify(message, level);
 		}
@@ -211,7 +221,7 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 	};
 
 	const maybeWarnRtkMissing = (ctx: ExtensionContext): void => {
-		if (!config.enabled || config.mode !== "rewrite" || !config.guardWhenRtkMissing) {
+		if (!config.enabled || !config.guardWhenRtkMissing) {
 			return;
 		}
 
@@ -226,7 +236,8 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 
 		missingRtkWarningShown = true;
 		const reason = runtimeStatus.lastError ? ` (${runtimeStatus.lastError})` : "";
-		warnOnce(ctx, `${EXTENSION_NAME}: rtk binary unavailable, command rewrite bypassed${reason}.`);
+		const handling = config.mode === "suggest" ? "rewrite suggestions" : "command rewrite";
+		warnOnce(ctx, `${EXTENSION_NAME}: rtk binary unavailable, ${handling} bypassed${reason}.`);
 	};
 
 	const ensureRuntimeStatusFresh = async (): Promise<void> => {
@@ -316,6 +327,10 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 		await ensureRuntimeStatusFresh();
 		maybeWarnRtkMissing(ctx);
 
+		if (!shouldInjectSourceFilterTroubleshootingNote(config)) {
+			return {};
+		}
+
 		if (event.systemPrompt.includes(SOURCE_FILTER_TROUBLESHOOTING_NOTE)) {
 			return {};
 		}
@@ -346,8 +361,8 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 			return {};
 		}
 
-		const decision = computeRewriteDecision(event.input.command, config);
-		if (!decision.changed || !decision.rule) {
+		const decision = await computeRewriteDecision(event.input.command, config, pi);
+		if (!decision.changed) {
 			return {};
 		}
 
@@ -361,7 +376,7 @@ export default function rtkIntegrationExtension(pi: ExtensionAPI): void {
 		}
 
 		if (config.mode === "suggest") {
-			const suggestionKey = `${decision.rule.id}:${decision.rewrittenCommand}`;
+			const suggestionKey = `${decision.originalCommand}:${decision.rewrittenCommand}`;
 			if (suggestionNotices.remember(suggestionKey) && ctx.hasUI) {
 				ctx.ui.notify(`RTK suggestion: ${decision.rewrittenCommand}`, "info");
 			}

package/src/output-compactor-test.ts

@@ -1,13 +1,13 @@
 import assert from "node:assert/strict";
-import { mock } from "bun:test";
 import { join } from "node:path";
+import { mock } from "bun:test";
 
 import { cloneDefaultConfig, runTest } from "./test-helpers.ts";
 
-const MOCK_AGENT_DIR = "C:/tmp/.pi/agent";
+const TEST_AGENT_DIR = "/tmp/.pi/agent";
 
 mock.module("@mariozechner/pi-coding-agent", () => ({
-	getAgentDir: () => MOCK_AGENT_DIR,
+	getAgentDir: () => TEST_AGENT_DIR,
 }));
 
 const { compactToolResult } = await import("./output-compactor.ts");
@@ -223,7 +223,7 @@ runTest("skill reads stay exact when preserveExactSkillReads is enabled for user
 	const result = compactToolResult(
 		{
 			toolName: "read",
-			input: { path: join(MOCK_AGENT_DIR, "skills", "example", "SKILL.md") },
+			input: { path: join(TEST_AGENT_DIR, "skills", "example", "SKILL.md") },
 			content: [{ type: "text", text: content }],
 		},
 		config,

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

@@ -31,15 +31,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,15 +39,6 @@ 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,