@oh-my-pi/pi-coding-agent 16.2.9 → 16.2.11

package/src/lsp/config.ts

@@ -209,13 +209,27 @@ export function hasRootMarkers(cwd: string, markers: string[]): boolean {
  * Local bin directories to check before $PATH, ordered by priority.
  * Each entry maps a root marker to the bin directory to check.
  */
+const PYTHON_ROOT_MARKERS = [
+	"pyproject.toml",
+	"requirements.txt",
+	"setup.py",
+	"setup.cfg",
+	"Pipfile",
+	"pyrightconfig.json",
+	"ruff.toml",
+	".ruff.toml",
+];
+
 const LOCAL_BIN_PATHS: Array<{ markers: string[]; binDir: string }> = [
 	// Node.js - check node_modules/.bin/
 	{ markers: ["package.json", "package-lock.json", "yarn.lock", "pnpm-lock.yaml"], binDir: "node_modules/.bin" },
 	// Python - check virtual environment bin directories
-	{ markers: ["pyproject.toml", "requirements.txt", "setup.py", "Pipfile"], binDir: ".venv/bin" },
-	{ markers: ["pyproject.toml", "requirements.txt", "setup.py", "Pipfile"], binDir: "venv/bin" },
-	{ markers: ["pyproject.toml", "requirements.txt", "setup.py", "Pipfile"], binDir: ".env/bin" },
+	{ markers: PYTHON_ROOT_MARKERS, binDir: ".venv/bin" },
+	{ markers: PYTHON_ROOT_MARKERS, binDir: ".venv/Scripts" },
+	{ markers: PYTHON_ROOT_MARKERS, binDir: "venv/bin" },
+	{ markers: PYTHON_ROOT_MARKERS, binDir: "venv/Scripts" },
+	{ markers: PYTHON_ROOT_MARKERS, binDir: ".env/bin" },
+	{ markers: PYTHON_ROOT_MARKERS, binDir: ".env/Scripts" },
 	// Ruby - check vendor bundle and binstubs
 	{ markers: ["Gemfile", "Gemfile.lock"], binDir: "vendor/bundle/bin" },
 	{ markers: ["Gemfile", "Gemfile.lock"], binDir: "bin" },

package/src/modes/acp/acp-agent.ts

@@ -53,7 +53,7 @@ import {
 } from "../../extensibility/extensions";
 import { runExtensionCompact } from "../../extensibility/extensions/compact-handler";
 import { getSessionSlashCommands } from "../../extensibility/extensions/get-commands-handler";
-import { buildSkillPromptMessage } from "../../extensibility/skills";
+import { buildSkillPromptMessage, parseSkillInvocation } from "../../extensibility/skills";
 import { loadSlashCommands } from "../../extensibility/slash-commands";
 import { resolveLocalUrlToPath } from "../../internal-urls";
 import { MCPManager } from "../../mcp/manager";
@@ -831,21 +831,18 @@ export class AcpAgent implements Agent {
 	}
 
 	async #tryRunSkillCommand(record: ManagedSessionRecord, text: string): Promise<boolean> {
-		if (!text.startsWith("/skill:")) {
+		if (!record.session.skillsSettings?.enableSkillCommands) {
 			return false;
 		}
-		if (!record.session.skillsSettings?.enableSkillCommands) {
+		const parsed = parseSkillInvocation(text);
+		if (!parsed) {
 			return false;
 		}
-		const spaceIndex = text.indexOf(" ");
-		const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
-		const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
-		const skillName = commandName.slice("skill:".length);
-		const skill = record.session.skills.find(candidate => candidate.name === skillName);
+		const skill = record.session.skills.find(candidate => candidate.name === parsed.name);
 		if (!skill) {
 			return false;
 		}
-		const built = await buildSkillPromptMessage(skill, args);
+		const built = await buildSkillPromptMessage(skill, parsed.args);
 		await record.session.promptCustomMessage({
 			customType: SKILL_PROMPT_MESSAGE_TYPE,
 			content: built.message,

package/src/modes/components/todo-reminder.ts

@@ -3,7 +3,9 @@ import { theme } from "../../modes/theme/theme";
 import type { TodoItem } from "../../tools/todo";
 
 /**
- * Component that renders a todo completion reminder notification.
+ * Component that renders a todo completion reminder notification, committed into
+ * the transcript like a TTSR notification so it stays anchored in history rather
+ * than floating above the editor.
  * Shows when the agent stops with incomplete todos.
  */
 export class TodoReminderComponent extends Container {
@@ -16,6 +18,8 @@ export class TodoReminderComponent extends Container {
 	) {
 		super();
 
+		this.addChild(new Spacer(1));
+
 		this.#box = new Box(1, 1, t => theme.inverse(theme.fg("warning", t)));
 		this.#box.setIgnoreTight(true);
 		this.addChild(this.#box);

package/src/modes/controllers/event-controller.ts

@@ -72,6 +72,11 @@ export class EventController {
 	// emits one read per completion — does not break it, so a run of consecutive
 	// reads collapses into one group even across completion boundaries.
 	#lastVisibleBlockCount = 0;
+	// Bumped on each assistant message_start. Scopes the placeholder key for a
+	// not-yet-id'd streamed tool block (see the toolCall loop) so a sealed,
+	// undeleted pending entry from an aborted message can never be reused by the
+	// next message's same content index.
+	#streamTurnNonce = 0;
 	#renderedCustomMessages = new Set<string>();
 	#lastIntent: string | undefined = undefined;
 	#backgroundToolCallIds = new Set<string>();
@@ -401,6 +406,7 @@ export class EventController {
 			this.ctx.ui.requestRender();
 		} else if (event.message.role === "assistant") {
 			this.#lastVisibleBlockCount = 0;
+			this.#streamTurnNonce++;
 			this.ctx.streamingComponent = createAssistantMessageComponent(this.ctx);
 			this.ctx.streamingMessage = event.message;
 			this.ctx.chatContainer.addChild(this.ctx.streamingComponent);
@@ -607,18 +613,14 @@ export class EventController {
 			if (this.ctx.streamingMessage.content.some(content => content.type === "toolCall")) {
 				this.ctx.streamingComponent.markTranscriptBlockFinalized();
 			}
-			for (const content of this.ctx.streamingMessage.content) {
+			for (const [contentIndex, content] of this.ctx.streamingMessage.content.entries()) {
 				if (content.type !== "toolCall") continue;
-				// Anthropic/OpenAI open a streamed tool block with an empty id (and
-				// `{}` args) before the id/arguments arrive; Gemini assembles the
-				// whole call first, so it never hits this. Keying `pendingTools` by
-				// "" would create a placeholder card, and the later real-id frame —
-				// `pendingTools.has(realId)` false — would create a SECOND card,
-				// orphaning the blank one (no `tool_execution_*` event ever carries
-				// "", so it is never matched, updated, or removed). Defer until the
-				// provider assigns the real id.
-				if (!content.id) continue;
 				if (content.name === "read") {
+					// Read groups key by the real id (one group spans several reads),
+					// and the owned-dialect parser delivers id + args together when
+					// the call closes, so a parseable target without an id never
+					// occurs here. Defer if it somehow does.
+					if (!content.id) continue;
 					if (!readArgsHaveTarget(content.arguments)) {
 						// Args still streaming — defer until path is parseable so we can route to the
 						// read group (regular files) vs ToolExecutionComponent (internal URLs).
@@ -641,6 +643,26 @@ export class EventController {
 					// Internal URL read falls through to ToolExecutionComponent below.
 				}
 
+				// The owned-dialect tool parser (text-based tool calls for OAuth
+				// Anthropic / OpenAI) appends a tool block when it detects the call
+				// opening and only fills `id` + arguments once the call's text
+				// closes — so the live preview must stream while `content.id` is "".
+				// Key the preview by stable content position until the id lands,
+				// then migrate the pending entry + reveal state onto the real id
+				// (so `tool_execution_*`, which always carries the real id, matches
+				// the same component instead of orphaning a blank card). Native
+				// structured tool calls — every Gemini call, and Anthropic/OpenAI
+				// function calls — carry the id from the first frame, so
+				// `pendingKey === content.id` throughout and the migration no-ops.
+				const streamKey = `\u0000stream:${this.#streamTurnNonce}:${contentIndex}`;
+				const pendingKey = content.id || streamKey;
+				if (content.id && this.ctx.pendingTools.has(streamKey)) {
+					const migrated = this.ctx.pendingTools.get(streamKey);
+					this.ctx.pendingTools.delete(streamKey);
+					if (migrated) this.ctx.pendingTools.set(pendingKey, migrated);
+					this.#toolArgsReveal.rekey(streamKey, pendingKey);
+				}
+
 				// Preserve the raw partial JSON only for renderers that need to surface fields before the JSON object closes.
 				// Bash uses this to show inline env assignments during streaming instead of popping them in at completion.
 				// While the JSON is still open, ToolArgsRevealController paces the
@@ -652,16 +674,16 @@ export class EventController {
 				const rawInput = content.customWireName !== undefined;
 				const tool = this.ctx.viewSession.getToolByName(content.name);
 				if (partialJson) {
-					renderArgs = this.#toolArgsReveal.setTarget(content.id, partialJson, {
+					renderArgs = this.#toolArgsReveal.setTarget(pendingKey, partialJson, {
 						rawInput,
 						exposeRawPartialJson: exposesRawPartialJson(content.name, rawInput, tool),
 						fullArgs: content.arguments,
 					});
 				} else {
-					this.#toolArgsReveal.finish(content.id);
+					this.#toolArgsReveal.finish(pendingKey);
 					renderArgs = content.arguments;
 				}
-				if (!this.ctx.pendingTools.has(content.id)) {
+				if (!this.ctx.pendingTools.has(pendingKey)) {
 					this.#resolveDisplaceablePoll(content.name);
 					this.#resetReadGroup();
 					const component = new ToolExecutionComponent(
@@ -680,13 +702,13 @@ export class EventController {
 					);
 					component.setExpanded(this.ctx.toolOutputExpanded);
 					this.ctx.chatContainer.addChild(component);
-					this.ctx.pendingTools.set(content.id, component);
-					this.#toolArgsReveal.bind(content.id, component);
+					this.ctx.pendingTools.set(pendingKey, component);
+					this.#toolArgsReveal.bind(pendingKey, component);
 				} else {
-					const component = this.ctx.pendingTools.get(content.id);
+					const component = this.ctx.pendingTools.get(pendingKey);
 					if (component) {
 						component.updateArgs(renderArgs, content.id);
-						this.#toolArgsReveal.bind(content.id, component);
+						this.#toolArgsReveal.bind(pendingKey, component);
 					}
 				}
 			}
@@ -978,13 +1000,9 @@ export class EventController {
 		}
 		// Update todo display when todo tool completes
 		if (event.toolName === "todo" && !event.isError) {
-			const hadTodoReminder = (this.ctx.todoReminderContainer?.children.length ?? 0) > 0;
-			this.ctx.todoReminderContainer?.clear();
 			const details = event.result.details as { phases?: TodoPhase[] } | undefined;
 			if (details?.phases) {
 				this.ctx.setTodos(details.phases);
-			} else if (hadTodoReminder) {
-				this.ctx.ui.requestRender();
 			}
 		} else if (event.toolName === "todo" && event.isError) {
 			const textContent = event.result.content.find(
@@ -1281,9 +1299,7 @@ export class EventController {
 
 	async #handleTodoReminder(event: Extract<AgentSessionEvent, { type: "todo_reminder" }>): Promise<void> {
 		const component = new TodoReminderComponent(event.todos, event.attempt, event.maxAttempts);
-		this.ctx.todoReminderContainer.clear();
-		this.ctx.todoReminderContainer.addChild(component);
-		this.ctx.ui.requestRender();
+		this.ctx.present(component);
 	}
 
 	async #handleTodoAutoClear(_event: Extract<AgentSessionEvent, { type: "todo_auto_clear" }>): Promise<void> {

package/src/modes/controllers/selector-controller.ts

@@ -962,43 +962,65 @@ export class SelectorController {
 		// every project's history when the cwd has nothing to resume. See #3099.
 		const historyStorage = this.ctx.historyStorage;
 		const historyMatcher = historyStorage ? (query: string) => historyStorage.matchingSessionIds(query) : undefined;
-		this.showSelector(done => {
-			const selector = new SessionSelectorComponent(
-				sessions,
-				async (session: SessionInfo) => {
-					done();
-					await this.handleResumeSession(session.path);
-				},
-				() => {
-					done();
-					this.ctx.ui.requestRender();
-				},
-				() => {
-					void this.ctx.shutdown();
-				},
-				{
-					onDelete: async (session: SessionInfo) => {
-						if (!(await this.#detachActiveSessionBeforeDeletion(session.path))) {
-							return false;
-						}
-						const storage = new FileSessionStorage();
-						try {
-							await storage.deleteSessionWithArtifacts(session.path);
-							return true;
-						} catch (err) {
-							throw new Error(`Failed to delete session: ${err instanceof Error ? err.message : String(err)}`, {
-								cause: err,
-							});
-						}
-					},
-					historyMatcher,
-					loadAllSessions: () => SessionManager.listAll(),
-					getTerminalRows: () => this.ctx.ui.terminal.rows,
+		// Fullscreen session picker on the alternate screen (the /settings idiom):
+		// the overlay borrows the alt buffer and enables mouse tracking (wheel
+		// scroll + click-to-resume) for its lifetime, leaving the transcript
+		// untouched underneath. Anchored top-left at full size so a mouse row maps
+		// directly to a rendered line (the overlay paints from screen row 0), and
+		// `fillHeight` pads the body so the footer pins to the screen bottom.
+		let overlayHandle: OverlayHandle | undefined;
+		const done = () => {
+			overlayHandle?.hide();
+			this.focusActiveEditorArea();
+			this.ctx.ui.requestRender();
+		};
+		const selector = new SessionSelectorComponent(
+			sessions,
+			async (session: SessionInfo) => {
+				done();
+				await this.handleResumeSession(session.path);
+			},
+			() => {
+				done();
+			},
+			() => {
+				// Release the alt buffer before teardown: shutdown() awaits flush/save/
+				// dispose/drain before stop() leaves the alt screen, so without this the
+				// fullscreen picker would freeze on screen for that window on Ctrl+C.
+				done();
+				void this.ctx.shutdown();
+			},
+			{
+				onDelete: async (session: SessionInfo) => {
+					if (!(await this.#detachActiveSessionBeforeDeletion(session.path))) {
+						return false;
+					}
+					const storage = new FileSessionStorage();
+					try {
+						await storage.deleteSessionWithArtifacts(session.path);
+						return true;
+					} catch (err) {
+						throw new Error(`Failed to delete session: ${err instanceof Error ? err.message : String(err)}`, {
+							cause: err,
+						});
+					}
 				},
-			);
-			selector.setOnRequestRender(() => this.ctx.ui.requestRender());
-			return { component: selector, focus: selector };
+				historyMatcher,
+				loadAllSessions: () => SessionManager.listAll(),
+				getTerminalRows: () => this.ctx.ui.terminal.rows,
+				fillHeight: true,
+			},
+		);
+		selector.setOnRequestRender(() => this.ctx.ui.requestRender());
+		overlayHandle = this.ctx.ui.showOverlay(selector, {
+			anchor: "top-left",
+			width: "100%",
+			maxHeight: "100%",
+			margin: 0,
+			fullscreen: true,
 		});
+		this.ctx.ui.setFocus(selector);
+		this.ctx.ui.requestRender();
 	}
 
 	#refreshSessionTerminalTitle(): void {

package/src/modes/controllers/tool-args-reveal.ts

@@ -177,6 +177,18 @@ export class ToolArgsRevealController {
 		if (entry) entry.component = component;
 	}
 
+	/** Migrate a live reveal entry from a placeholder key onto the real
+	 *  tool-call id once the owned-dialect parser assigns it. No-op when no
+	 *  entry exists under `from` (smoothing disabled, or the JSON already
+	 *  closed and `finish` cleared it). */
+	rekey(from: string, to: string): void {
+		if (from === to) return;
+		const entry = this.#entries.get(from);
+		if (!entry) return;
+		this.#entries.delete(from);
+		this.#entries.set(to, entry);
+	}
+
 	/** Final arguments arrived (the JSON closed): drop the reveal so the
 	 *  caller's final-args render wins immediately, mirroring how assistant
 	 *  text snaps to the full message at message_end. */

package/src/modes/interactive-mode.ts

@@ -379,7 +379,6 @@ export class InteractiveMode implements InteractiveModeContext {
 	chatContainer: TranscriptContainer;
 	pendingMessagesContainer: Container;
 	statusContainer: Container;
-	todoReminderContainer: Container;
 	todoContainer: Container;
 	subagentContainer: Container;
 	btwContainer: Container;
@@ -548,7 +547,6 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.retryLoader = undefined;
 		}
 		this.statusContainer.clear();
-		this.todoReminderContainer.clear();
 		this.pendingMessagesContainer.clear();
 		this.#cancelModelCycleClearTimer();
 		this.modelCycleContainer.clear();
@@ -628,7 +626,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.chatContainer = new TranscriptContainer();
 		this.pendingMessagesContainer = new Container();
 		this.statusContainer = new AnchoredLiveContainer();
-		this.todoReminderContainer = new AnchoredLiveContainer();
 		this.todoContainer = new AnchoredLiveContainer();
 		this.subagentContainer = new AnchoredLiveContainer();
 		this.btwContainer = new AnchoredLiveContainer();
@@ -848,7 +845,6 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		this.ui.addChild(this.chatContainer);
 		this.ui.addChild(this.pendingMessagesContainer);
-		this.ui.addChild(this.todoReminderContainer);
 		this.ui.addChild(this.todoContainer);
 		this.ui.addChild(this.subagentContainer);
 		this.ui.addChild(this.btwContainer);
@@ -4077,14 +4073,12 @@ export class InteractiveMode implements InteractiveModeContext {
 				},
 			];
 		}
-		this.todoReminderContainer.clear();
 		this.#syncTodoAutoClearTimer();
 		this.#renderTodoList();
 		this.ui.requestRender();
 	}
 
 	async reloadTodos(): Promise<void> {
-		this.todoReminderContainer.clear();
 		await this.#loadTodoList();
 		this.ui.requestRender();
 	}

package/src/modes/rpc/rpc-mode.ts

@@ -22,7 +22,7 @@ import {
 	type ExtensionWidgetOptions,
 	getExtensionUISelectOptionLabel,
 } from "../../extensibility/extensions";
-import { buildSkillPromptMessage } from "../../extensibility/skills";
+import { buildSkillPromptMessage, parseSkillInvocation } from "../../extensibility/skills";
 import { loadSlashCommands } from "../../extensibility/slash-commands";
 import { type Theme, theme } from "../../modes/theme/theme";
 import type { AgentSession } from "../../session/agent-session";
@@ -86,15 +86,12 @@ export async function tryRunRpcSkillCommand(
 	session: RpcSkillCommandSession,
 	text: string,
 ): Promise<RpcSkillCommandResult | false> {
-	if (!text.startsWith("/skill:")) return false;
 	if (!session.skillsSettings?.enableSkillCommands) return false;
-	const spaceIndex = text.indexOf(" ");
-	const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
-	const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
-	const skillName = commandName.slice("skill:".length);
-	const skill = session.skills.find(candidate => candidate.name === skillName);
+	const parsed = parseSkillInvocation(text);
+	if (!parsed) return false;
+	const skill = session.skills.find(candidate => candidate.name === parsed.name);
 	if (!skill) return false;
-	const built = await buildSkillPromptMessage(skill, args);
+	const built = await buildSkillPromptMessage(skill, parsed.args);
 	await session.promptCustomMessage({
 		customType: SKILL_PROMPT_MESSAGE_TYPE,
 		content: built.message,

package/src/modes/skill-command.ts

@@ -1,4 +1,5 @@
 import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
+import { getSkillSlashCommandName, parseSkillInvocation } from "../extensibility/skills";
 import { type CustomMessage, SKILL_PROMPT_MESSAGE_TYPE, type SkillPromptDetails } from "../session/messages";
 import type { InteractiveModeContext } from "./types";
 
@@ -20,11 +21,6 @@ type SkillPromptOptions = {
 	queueChipText: string;
 };
 
-interface ParsedSkillCommand {
-	commandName: string;
-	args: string;
-}
-
 interface InvokeSkillCommandOptions {
 	propagateErrors?: boolean;
 	queueOnly?: boolean;
@@ -37,19 +33,11 @@ export interface BuiltSkillCommandPrompt {
 	options: SkillPromptOptions;
 }
 
-function parseSkillCommand(text: string): ParsedSkillCommand | undefined {
-	if (!text.startsWith("/skill:")) return undefined;
-	const spaceIndex = text.indexOf(" ");
-	const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
-	const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
-	return { commandName, args };
-}
-
-/** Return true when `text` names a registered `/skill:<name>` command. */
+/** Return true when `text` invokes a registered `/skill:<name>` command. */
 export function isKnownSkillCommand(ctx: SkillCommandHost, text: string): boolean {
-	const parsed = parseSkillCommand(text);
+	const parsed = parseSkillInvocation(text);
 	if (!parsed) return false;
-	return ctx.skillCommands.has(parsed.commandName);
+	return ctx.skillCommands.has(getSkillSlashCommandName({ name: parsed.name }));
 }
 
 /** Build the user-attributed custom message for a registered `/skill:<name>` command. */
@@ -59,9 +47,10 @@ export async function buildSkillCommandPrompt(
 	streamingBehavior: "steer" | "followUp",
 	images?: ImageContent[],
 ): Promise<BuiltSkillCommandPrompt | undefined> {
-	const parsed = parseSkillCommand(text);
+	const parsed = parseSkillInvocation(text);
 	if (!parsed) return undefined;
-	const skillPath = ctx.skillCommands.get(parsed.commandName);
+	const commandName = getSkillSlashCommandName({ name: parsed.name });
+	const skillPath = ctx.skillCommands.get(commandName);
 	if (!skillPath) return undefined;
 
 	const content = await Bun.file(skillPath).text();
@@ -73,9 +62,8 @@ export async function buildSkillCommandPrompt(
 	const message = `${body}\n\n---\n\n${metaLines.join("\n")}`;
 	const textBlock: TextContent = { type: "text", text: message };
 	const promptContent = images && images.length > 0 ? [textBlock, ...images] : message;
-	const skillName = parsed.commandName.slice("skill:".length);
 	const details: SkillPromptDetails = {
-		name: skillName || parsed.commandName,
+		name: parsed.name,
 		path: skillPath,
 		args: parsed.args || undefined,
 		lineCount: body ? body.split("\n").length : 0,

package/src/modes/types.ts

@@ -96,7 +96,6 @@ export interface InteractiveModeContext {
 	chatContainer: TranscriptContainer;
 	pendingMessagesContainer: Container;
 	statusContainer: Container;
-	todoReminderContainer: Container;
 	todoContainer: Container;
 	subagentContainer: Container;
 	btwContainer: Container;