pi-rtk-optimizer 0.7.1 → 0.8.1

package/src/rtk-executable-resolver.ts

@@ -1,97 +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)}`,
-		);
-	}
-}
+import type { ExtensionAPI } from "@earendil-works/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)}`,
+		);
+	}
+}

package/src/rtk-rewrite-provider.ts

@@ -1,126 +1,126 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { resolveRtkExecutable, type RtkExecutableResolution } from "./rtk-executable-resolver.js";
-
-export interface RtkRewriteProviderResult {
-	changed: boolean;
-	originalCommand: string;
-	rewrittenCommand: string;
-	exitCode: number;
-	error?: string;
-	executableResolution?: RtkExecutableResolution;
-}
-
-export interface RtkRewriteProviderOptions {
-	timeoutMs?: number;
-	resolverTimeoutMs?: number;
-	platform?: typeof process.platform;
-	executableResolution?: RtkExecutableResolution;
-}
-
-function isAlreadyRtk(command: string): boolean {
-	const trimmed = command.trimStart();
-	return trimmed === "rtk" || trimmed.startsWith("rtk ");
-}
-
-function normalizeOptions(optionsOrTimeout: number | RtkRewriteProviderOptions): RtkRewriteProviderOptions {
-	if (typeof optionsOrTimeout === "number") {
-		return { timeoutMs: optionsOrTimeout };
-	}
-	return optionsOrTimeout;
-}
-
-export async function resolveRtkRewrite(
-	pi: ExtensionAPI,
-	command: string,
-	optionsOrTimeout: number | RtkRewriteProviderOptions = {},
-): Promise<RtkRewriteProviderResult> {
-	const options = normalizeOptions(optionsOrTimeout);
-	const timeoutMs = options.timeoutMs ?? 3000;
-
-	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 executableResolution =
-			options.executableResolution ??
-			(await resolveRtkExecutable(pi, {
-				platform: options.platform,
-				timeoutMs: options.resolverTimeoutMs,
-			}));
-		const result = await pi.exec(executableResolution.command, ["rewrite", command], { timeout: timeoutMs });
-
-		if (result.code === 1) {
-			return {
-				changed: false,
-				originalCommand: command,
-				rewrittenCommand: command,
-				exitCode: 1,
-				executableResolution,
-			};
-		}
-
-		if (result.code === 2) {
-			return {
-				changed: false,
-				originalCommand: command,
-				rewrittenCommand: command,
-				exitCode: 2,
-				error: result.stderr?.trim() || "rtk denied rewrite",
-				executableResolution,
-			};
-		}
-
-		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",
-					executableResolution,
-				};
-			}
-			if (rewritten === command) {
-				return {
-					changed: false,
-					originalCommand: command,
-					rewrittenCommand: command,
-					exitCode: result.code,
-					executableResolution,
-				};
-			}
-			return {
-				changed: true,
-				originalCommand: command,
-				rewrittenCommand: rewritten,
-				exitCode: result.code,
-				executableResolution,
-			};
-		}
-
-		return {
-			changed: false,
-			originalCommand: command,
-			rewrittenCommand: command,
-			exitCode: result.code,
-			error: `unexpected exit code ${result.code}`,
-			executableResolution,
-		};
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		return {
-			changed: false,
-			originalCommand: command,
-			rewrittenCommand: command,
-			exitCode: -1,
-			error: message,
-		};
-	}
-}
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { resolveRtkExecutable, type RtkExecutableResolution } from "./rtk-executable-resolver.js";
+
+export interface RtkRewriteProviderResult {
+	changed: boolean;
+	originalCommand: string;
+	rewrittenCommand: string;
+	exitCode: number;
+	error?: string;
+	executableResolution?: RtkExecutableResolution;
+}
+
+export interface RtkRewriteProviderOptions {
+	timeoutMs?: number;
+	resolverTimeoutMs?: number;
+	platform?: typeof process.platform;
+	executableResolution?: RtkExecutableResolution;
+}
+
+function isAlreadyRtk(command: string): boolean {
+	const trimmed = command.trimStart();
+	return trimmed === "rtk" || trimmed.startsWith("rtk ");
+}
+
+function normalizeOptions(optionsOrTimeout: number | RtkRewriteProviderOptions): RtkRewriteProviderOptions {
+	if (typeof optionsOrTimeout === "number") {
+		return { timeoutMs: optionsOrTimeout };
+	}
+	return optionsOrTimeout;
+}
+
+export async function resolveRtkRewrite(
+	pi: ExtensionAPI,
+	command: string,
+	optionsOrTimeout: number | RtkRewriteProviderOptions = {},
+): Promise<RtkRewriteProviderResult> {
+	const options = normalizeOptions(optionsOrTimeout);
+	const timeoutMs = options.timeoutMs ?? 3000;
+
+	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 executableResolution =
+			options.executableResolution ??
+			(await resolveRtkExecutable(pi, {
+				platform: options.platform,
+				timeoutMs: options.resolverTimeoutMs,
+			}));
+		const result = await pi.exec(executableResolution.command, ["rewrite", command], { timeout: timeoutMs });
+
+		if (result.code === 1) {
+			return {
+				changed: false,
+				originalCommand: command,
+				rewrittenCommand: command,
+				exitCode: 1,
+				executableResolution,
+			};
+		}
+
+		if (result.code === 2) {
+			return {
+				changed: false,
+				originalCommand: command,
+				rewrittenCommand: command,
+				exitCode: 2,
+				error: result.stderr?.trim() || "rtk denied rewrite",
+				executableResolution,
+			};
+		}
+
+		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",
+					executableResolution,
+				};
+			}
+			if (rewritten === command) {
+				return {
+					changed: false,
+					originalCommand: command,
+					rewrittenCommand: command,
+					exitCode: result.code,
+					executableResolution,
+				};
+			}
+			return {
+				changed: true,
+				originalCommand: command,
+				rewrittenCommand: rewritten,
+				exitCode: result.code,
+				executableResolution,
+			};
+		}
+
+		return {
+			changed: false,
+			originalCommand: command,
+			rewrittenCommand: command,
+			exitCode: result.code,
+			error: `unexpected exit code ${result.code}`,
+			executableResolution,
+		};
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return {
+			changed: false,
+			originalCommand: command,
+			rewrittenCommand: command,
+			exitCode: -1,
+			error: message,
+		};
+	}
+}

package/src/types-shims.d.ts

@@ -1,4 +1,4 @@
-declare module "@mariozechner/pi-tui" {
+declare module "@earendil-works/pi-tui" {
 	export interface SettingItem {
 		id: string;
 		label: string;
@@ -27,6 +27,8 @@ declare module "@mariozechner/pi-tui" {
 
 	export class SettingsList {
 		constructor(...args: unknown[]);
+		render(width: number): string[];
+		invalidate(): void;
 		handleInput(data: string): void;
 		updateValue(id: string, value: string): void;
 	}
@@ -43,7 +45,7 @@ declare module "@mariozechner/pi-tui" {
 	export function visibleWidth(text: string): number;
 }
 
-declare module "@mariozechner/pi-coding-agent" {
+declare module "@earendil-works/pi-coding-agent" {
 	interface UiLike {
 		notify(message: string, level: "info" | "warning" | "error"): void;
 		custom<T>(