@oh-my-pi/pi-coding-agent 15.11.4 → 15.11.7

package/src/mcp/transports/stdio.ts

@@ -85,27 +85,99 @@ async function resolveWindowsCommandPath(
 	env: Record<string, string | undefined>,
 ): Promise<string | null> {
 	const extensions = getWindowsPathExt(env);
-	if (hasExecutableExtension(command, extensions)) return command;
+	const hasExt = hasExecutableExtension(command, extensions);
+	const candidates = hasExt ? [command] : extensions.map(ext => `${command}${ext}`);
 
-	const candidates = extensions.map(ext => `${command}${ext}`);
 	if (hasPathSegment(command)) {
 		for (const candidate of candidates) {
 			const resolved = path.isAbsolute(candidate) ? candidate : path.resolve(cwd, candidate);
 			if (await fileExists(resolved)) return resolved;
 		}
-		return null;
+		return hasExt ? command : null;
 	}
 
+	// Match cmd.exe's lookup order for an unqualified name: current directory
+	// first, then PATH. Skipping cwd would launch a global shim instead of a
+	// project-local one with the same name.
+	const searchDirs = [cwd];
 	const pathValue = getCaseInsensitiveEnv(env, "PATH");
-	if (!pathValue) return null;
-	for (const dir of pathValue.split(";")) {
-		if (!dir) continue;
+	if (pathValue) {
+		for (const dir of pathValue.split(";")) {
+			if (dir) searchDirs.push(dir);
+		}
+	}
+	for (const dir of searchDirs) {
 		for (const candidate of candidates) {
 			const resolved = path.join(dir, candidate);
 			if (await fileExists(resolved)) return resolved;
 		}
 	}
-	return null;
+	return hasExt ? command : null;
+}
+
+function resolveWindowsShimPath(value: string, shimDir: string): string | null {
+	const match = /^%dp0%[\\/]*(.*)$/i.exec(value);
+	if (!match) return null;
+	const suffix = match[1];
+	if (!suffix) return shimDir;
+	return path.join(shimDir, ...suffix.split(/[\\/]+/).filter(Boolean));
+}
+
+function extractWindowsNpmShimTarget(content: string): string | null {
+	const match = /"%_prog%"\s+"([^"]+)"\s+%\*/i.exec(content);
+	return match?.[1] ?? null;
+}
+
+/**
+ * Extract the shim's PATH-fallback interpreter (`SET "_prog=node"`). The
+ * `IF EXIST` branch assigns a `%dp0%`-prefixed value, so requiring a
+ * non-`%`-leading value picks the bare program name.
+ */
+function extractWindowsNpmShimProg(content: string): string | null {
+	const match = /SET\s+"_prog=([^%"][^"]*)"/i.exec(content);
+	return match?.[1] ?? null;
+}
+
+async function resolveWindowsNpmShimCommand(
+	command: string,
+	args: readonly string[],
+	cwd: string,
+): Promise<StdioSpawnCommand | null> {
+	if (!isWindowsBatchCommand(command)) return null;
+	if (!hasPathSegment(command)) return null;
+	const commandPath = path.resolve(cwd, command);
+
+	let content: string;
+	try {
+		content = await Bun.file(commandPath).text();
+	} catch {
+		return null;
+	}
+
+	// cmd-shim emits the same invocation line for every interpreter; only
+	// bypass cmd.exe when the shim's fallback interpreter is actually node.
+	const prog = extractWindowsNpmShimProg(content);
+	if (
+		!prog ||
+		path
+			.basename(prog)
+			.replace(/\.exe$/i, "")
+			.toLowerCase() !== "node"
+	)
+		return null;
+
+	const rawTarget = extractWindowsNpmShimTarget(content);
+	if (!rawTarget) return null;
+
+	const target = resolveWindowsShimPath(rawTarget, path.dirname(commandPath));
+	if (!target) return null;
+
+	const siblingNode = path.join(path.dirname(commandPath), "node.exe");
+	const nodeCommand = (await fileExists(siblingNode)) ? siblingNode : "node";
+	return {
+		cmd: [nodeCommand, target, ...args],
+		windowsHide: true,
+	};
 }
 
 function quoteCmdArg(value: string): string {
@@ -150,6 +222,8 @@ export async function resolveStdioSpawnCommand(
 
 	const resolvedCommand =
 		(await resolveWindowsCommandPath(config.command, options.cwd, options.env)) ?? config.command;
+	const npmShimCommand = await resolveWindowsNpmShimCommand(resolvedCommand, args, options.cwd);
+	if (npmShimCommand) return npmShimCommand;
 	if (!isWindowsBatchCommand(resolvedCommand)) return { cmd: [resolvedCommand, ...args] };
 
 	return {

package/src/modes/components/oauth-selector.ts

@@ -6,6 +6,7 @@ import {
 	fuzzyFilter,
 	matchesKey,
 	ScrollView,
+	type SgrMouseEvent,
 	Spacer,
 	TruncatedText,
 } from "@oh-my-pi/pi-tui";
@@ -16,6 +17,12 @@ import { DynamicBorder } from "./dynamic-border";
 
 const OAUTH_SELECTOR_MAX_VISIBLE = 10;
 
+/**
+ * Rendered lines before the provider rows: top border, spacer, title, spacer
+ * (must mirror the constructor's addChild order).
+ */
+const LIST_ROW_OFFSET = 4;
+
 /** Compact, human-readable tag for each credential-origin leg. */
 const ORIGIN_LABELS: Record<CredentialOriginKind, string> = {
 	runtime: "--api-key",
@@ -34,6 +41,10 @@ export class OAuthSelectorComponent extends Container {
 	#filteredProviders: OAuthProviderInfo[] = [];
 	#searchQuery = "";
 	#selectedIndex: number = 0;
+	#hoveredIndex: number | null = null;
+	/** First provider index of the visible ScrollView window (last #updateList). */
+	#scrollStart = 0;
+	#visibleCount = 0;
 	#mode: "login" | "logout";
 	#authStorage: AuthStorage;
 	#onSelectCallback: (providerId: string) => void;
@@ -252,6 +263,8 @@ export class OAuthSelectorComponent extends Container {
 				? 0
 				: Math.max(0, Math.min(this.#selectedIndex - Math.floor(maxVisible / 2), total - maxVisible));
 		const endIndex = Math.min(startIndex + maxVisible, total);
+		this.#scrollStart = startIndex;
+		this.#visibleCount = endIndex - startIndex;
 
 		const rows: string[] = [];
 		for (let i = startIndex; i < endIndex; i++) {
@@ -270,6 +283,9 @@ export class OAuthSelectorComponent extends Container {
 				const text = isAvailable ? `  ${provider.name}` : theme.fg("dim", `  ${provider.name}`);
 				line = text + statusIndicator;
 			}
+			if (!isSelected && i === this.#hoveredIndex) {
+				line = theme.bg("selectedBg", line);
+			}
 			rows.push(line);
 		}
 
@@ -354,15 +370,59 @@ export class OAuthSelectorComponent extends Container {
 		}
 		// Enter
 		else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
-			const selectedProvider = this.#filteredProviders[this.#selectedIndex];
-			if (selectedProvider?.available) {
-				this.#statusMessage = undefined;
-				this.stopValidation();
-				this.#onSelectCallback(selectedProvider.id);
-			} else if (selectedProvider) {
-				this.#statusMessage = "Provider unavailable in this environment.";
+			this.#confirmSelection();
+		}
+	}
+
+	/** Confirm the selected provider (Enter or mouse click). */
+	#confirmSelection(): void {
+		const selectedProvider = this.#filteredProviders[this.#selectedIndex];
+		if (selectedProvider?.available) {
+			this.#statusMessage = undefined;
+			this.stopValidation();
+			this.#onSelectCallback(selectedProvider.id);
+		} else if (selectedProvider) {
+			this.#statusMessage = "Provider unavailable in this environment.";
+			this.#updateList();
+		}
+	}
+
+	/** Move the selection one step for a wheel notch (clamped, no wrap). */
+	handleWheel(delta: -1 | 1): void {
+		if (this.#filteredProviders.length === 0) return;
+		const next = Math.max(0, Math.min(this.#selectedIndex + delta, this.#filteredProviders.length - 1));
+		if (next === this.#selectedIndex) return;
+		this.#selectedIndex = next;
+		this.#statusMessage = undefined;
+		this.#updateList();
+	}
+
+	/**
+	 * Route an SGR mouse report at component-local coordinates. Provider rows
+	 * start LIST_ROW_OFFSET lines into the render; the ScrollView window shows
+	 * #visibleCount rows from #scrollStart. Wheel moves the selection, motion
+	 * drives the hover band, and a left click selects and confirms like Enter.
+	 */
+	routeMouse(event: SgrMouseEvent, line: number, _col: number): void {
+		if (event.wheel !== null) {
+			this.handleWheel(event.wheel);
+			return;
+		}
+		const localRow = line - LIST_ROW_OFFSET;
+		const index = localRow >= 0 && localRow < this.#visibleCount ? this.#scrollStart + localRow : undefined;
+		const target = index !== undefined && index < this.#filteredProviders.length ? index : null;
+		if (event.motion) {
+			if (target !== this.#hoveredIndex) {
+				this.#hoveredIndex = target;
 				this.#updateList();
 			}
+			return;
+		}
+		if (!event.leftClick || target === null) return;
+		if (target !== this.#selectedIndex) {
+			this.#selectedIndex = target;
+			this.#statusMessage = undefined;
 		}
+		this.#confirmSelection();
 	}
 }

package/src/modes/components/reset-usage-selector.ts

@@ -0,0 +1,161 @@
+import { Container, matchesKey, ScrollView, Spacer, TruncatedText } from "@oh-my-pi/pi-tui";
+import { theme } from "../../modes/theme/theme";
+import { matchesSelectCancel, matchesSelectDown, matchesSelectUp } from "../../modes/utils/keybinding-matchers";
+import type { ResetUsageAccount } from "../../slash-commands/helpers/reset-usage";
+import { DynamicBorder } from "./dynamic-border";
+
+const RESET_SELECTOR_MAX_VISIBLE = 10;
+
+/**
+ * Account picker for `/usage reset`. Lists Codex accounts with their saved
+ * rate-limit reset counts; selecting one redeems a reset. Because a reset is a
+ * scarce, irreversible credit, Enter requires a second press to confirm.
+ */
+export class ResetUsageSelectorComponent extends Container {
+	#listContainer: Container;
+	#accounts: ResetUsageAccount[];
+	#selectedIndex = 0;
+	#pendingIndex: number | null = null;
+	#statusMessage: string | undefined;
+	#onSelectCallback: (account: ResetUsageAccount) => void;
+	#onCancelCallback: () => void;
+
+	constructor(accounts: ResetUsageAccount[], onSelect: (account: ResetUsageAccount) => void, onCancel: () => void) {
+		super();
+		this.#accounts = accounts;
+		this.#onSelectCallback = onSelect;
+		this.#onCancelCallback = onCancel;
+		const firstRedeemable = accounts.findIndex(account => account.availableCount > 0);
+		this.#selectedIndex = firstRedeemable >= 0 ? firstRedeemable : 0;
+
+		this.addChild(new DynamicBorder());
+		this.addChild(new Spacer(1));
+		this.addChild(new TruncatedText(theme.bold("Spend a saved rate-limit reset:")));
+		this.addChild(new Spacer(1));
+		this.#listContainer = new Container();
+		this.addChild(this.#listContainer);
+		this.addChild(new Spacer(1));
+		this.addChild(new DynamicBorder());
+		this.#updateList();
+	}
+
+	#updateList(): void {
+		this.#listContainer.clear();
+
+		const total = this.#accounts.length;
+		const maxVisible = RESET_SELECTOR_MAX_VISIBLE;
+		const startIndex =
+			total <= maxVisible
+				? 0
+				: Math.max(0, Math.min(this.#selectedIndex - Math.floor(maxVisible / 2), total - maxVisible));
+		const endIndex = Math.min(startIndex + maxVisible, total);
+
+		const rows: string[] = [];
+		for (let i = startIndex; i < endIndex; i++) {
+			const account = this.#accounts[i];
+			if (!account) continue;
+			const isSelected = i === this.#selectedIndex;
+			const redeemable = account.availableCount > 0;
+			const countLabel = account.error
+				? account.error
+				: `${account.availableCount} saved reset${account.availableCount === 1 ? "" : "s"}`;
+			const countText = account.error
+				? theme.fg("error", countLabel)
+				: redeemable
+					? theme.fg("success", countLabel)
+					: theme.fg("dim", countLabel);
+			const activeTag = account.active ? theme.fg("muted", " (active)") : "";
+			if (isSelected) {
+				const name = redeemable ? theme.fg("accent", account.label) : theme.fg("dim", account.label);
+				rows.push(`${theme.fg("accent", `${theme.nav.cursor} `)}${name}${activeTag}  ${countText}`);
+			} else {
+				const name = redeemable ? `  ${account.label}` : theme.fg("dim", `  ${account.label}`);
+				rows.push(`${name}${activeTag}  ${countText}`);
+			}
+		}
+
+		if (rows.length > 0) {
+			const sv = new ScrollView(rows, {
+				height: rows.length,
+				scrollbar: "auto",
+				totalRows: total,
+				theme: { track: t => theme.fg("muted", t), thumb: t => theme.fg("accent", t) },
+			});
+			sv.setScrollOffset(startIndex);
+			this.#listContainer.addChild(sv);
+		}
+
+		if (total === 0) {
+			this.#listContainer.addChild(
+				new TruncatedText(theme.fg("muted", "  No Codex accounts with saved resets"), 0, 0),
+			);
+		}
+
+		const pending = this.#pendingIndex !== null ? this.#accounts[this.#pendingIndex] : undefined;
+		const hint = pending
+			? theme.fg("warning", `  Press Enter again to spend 1 reset for ${pending.label}, Esc to cancel`)
+			: theme.fg("muted", "  ↑/↓ select · ↵ spend a reset · Esc cancel");
+		this.#listContainer.addChild(new TruncatedText(hint, 0, 0));
+
+		if (this.#statusMessage) {
+			this.#listContainer.addChild(new Spacer(1));
+			this.#listContainer.addChild(new TruncatedText(theme.fg("warning", `  ${this.#statusMessage}`), 0, 0));
+		}
+	}
+
+	handleInput(keyData: string): void {
+		if (matchesSelectCancel(keyData)) {
+			if (this.#pendingIndex !== null) {
+				this.#pendingIndex = null;
+				this.#statusMessage = undefined;
+				this.#updateList();
+				return;
+			}
+			this.#onCancelCallback();
+			return;
+		}
+
+		if (matchesSelectUp(keyData)) {
+			if (this.#accounts.length > 0) {
+				this.#selectedIndex = this.#selectedIndex === 0 ? this.#accounts.length - 1 : this.#selectedIndex - 1;
+			}
+			this.#pendingIndex = null;
+			this.#statusMessage = undefined;
+			this.#updateList();
+		} else if (matchesSelectDown(keyData)) {
+			if (this.#accounts.length > 0) {
+				this.#selectedIndex = this.#selectedIndex === this.#accounts.length - 1 ? 0 : this.#selectedIndex + 1;
+			}
+			this.#pendingIndex = null;
+			this.#statusMessage = undefined;
+			this.#updateList();
+		} else if (matchesKey(keyData, "pageUp")) {
+			if (this.#accounts.length > 0) {
+				this.#selectedIndex = Math.max(0, this.#selectedIndex - RESET_SELECTOR_MAX_VISIBLE);
+			}
+			this.#pendingIndex = null;
+			this.#updateList();
+		} else if (matchesKey(keyData, "pageDown")) {
+			if (this.#accounts.length > 0) {
+				this.#selectedIndex = Math.min(this.#accounts.length - 1, this.#selectedIndex + RESET_SELECTOR_MAX_VISIBLE);
+			}
+			this.#pendingIndex = null;
+			this.#updateList();
+		} else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
+			const account = this.#accounts[this.#selectedIndex];
+			if (!account) return;
+			if (account.availableCount <= 0) {
+				this.#statusMessage = "That account has no saved resets to spend.";
+				this.#updateList();
+				return;
+			}
+			if (this.#pendingIndex === this.#selectedIndex) {
+				this.#onSelectCallback(account);
+				return;
+			}
+			this.#pendingIndex = this.#selectedIndex;
+			this.#statusMessage = undefined;
+			this.#updateList();
+		}
+	}
+}

package/src/modes/components/session-selector.ts

@@ -67,13 +67,15 @@ function compareSessionRecency(a: SessionInfo, b: SessionInfo): number {
 	return b.modified.getTime() - a.modified.getTime();
 }
 
+const MIN_PURE_FUZZY_TOKEN_SCORE = -20;
+
 /**
  * Filter and rank session picker search results.
  *
  * Resume search narrows a recency-sorted list: once every query token appears
  * as a literal substring, newer sessions should beat a slightly better fuzzy
  * position match. Pure fuzzy/acronym matches still sort by fuzzy score after
- * literal matches.
+ * literal matches, but weak pure fuzzy tokens are dropped as noise.
  */
 export function rankSessionSearchMatches(allSessions: SessionInfo[], query: string): SessionInfo[] {
 	const tokens = tokenizeSessionQuery(query);
@@ -85,6 +87,7 @@ export function rankSessionSearchMatches(allSessions: SessionInfo[], query: stri
 		const text = sessionSearchText(session);
 		const textLower = text.toLowerCase();
 		let score = 0;
+		let worstTokenScore = Number.NEGATIVE_INFINITY;
 		let literal = true;
 		let matches = true;
 
@@ -95,10 +98,13 @@ export function rankSessionSearchMatches(allSessions: SessionInfo[], query: stri
 				break;
 			}
 			score += match.score;
+			worstTokenScore = Math.max(worstTokenScore, match.score);
 			if (!textLower.includes(token)) literal = false;
 		}
 
-		if (matches) results.push({ session, score, literal, index });
+		if (matches && (literal || worstTokenScore < MIN_PURE_FUZZY_TOKEN_SCORE)) {
+			results.push({ session, score, literal, index });
+		}
 	}
 
 	results.sort((a, b) => {