@oh-my-pi/pi-coding-agent 4.3.2 → 4.4.5

package/src/modes/interactive/controllers/input-controller.ts

@@ -60,14 +60,14 @@ export class InputController {
 		this.ctx.editor.onShiftTab = () => this.cycleThinkingLevel();
 		this.ctx.editor.onCtrlP = () => this.cycleRoleModel();
 		this.ctx.editor.onShiftCtrlP = () => this.cycleRoleModel({ temporary: true });
-		this.ctx.editor.onCtrlY = () => this.ctx.showModelSelector({ temporaryOnly: true });
+		this.ctx.editor.onAltP = () => this.ctx.showModelSelector({ temporaryOnly: true });
 
 		// Global debug handler on TUI (works regardless of focus)
 		this.ctx.ui.onDebug = () => this.ctx.handleDebugCommand();
 		this.ctx.editor.onCtrlL = () => this.ctx.showModelSelector();
 		this.ctx.editor.onCtrlR = () => this.ctx.showHistorySearch();
 		this.ctx.editor.onCtrlO = () => this.toggleToolOutputExpansion();
-		this.ctx.editor.onCtrlT = () => this.toggleThinkingBlockVisibility();
+		this.ctx.editor.onCtrlT = () => this.ctx.toggleTodoExpansion();
 		this.ctx.editor.onCtrlG = () => this.openExternalEditor();
 		this.ctx.editor.onQuestionMark = () => this.ctx.handleHotkeysCommand();
 		this.ctx.editor.onCtrlV = () => this.handleImagePaste();
@@ -85,28 +85,34 @@ export class InputController {
 		};
 
 		this.ctx.editor.onAltEnter = async (text: string) => {
-			text = text.trim();
-			if (!text) return;
+			const trimmedText = text.trim();
 
 			// Queue follow-up messages while compaction is running
 			if (this.ctx.session.isCompacting) {
-				this.ctx.queueCompactionMessage(text, "followUp");
+				if (!trimmedText) {
+					this.ctx.editor.handleInput("\n");
+					return;
+				}
+				this.ctx.queueCompactionMessage(trimmedText, "followUp");
 				return;
 			}
 
-			// Alt+Enter queues a follow-up message (waits until agent finishes)
-			// This handles extension commands (execute immediately), prompt template expansion, and queueing
+			// Alt+Enter queues a follow-up message while streaming
 			if (this.ctx.session.isStreaming) {
-				this.ctx.editor.addToHistory(text);
+				if (!trimmedText) {
+					this.ctx.editor.handleInput("\n");
+					return;
+				}
+				this.ctx.editor.addToHistory(trimmedText);
 				this.ctx.editor.setText("");
-				await this.ctx.session.prompt(text, { streamingBehavior: "followUp" });
+				await this.ctx.session.prompt(trimmedText, { streamingBehavior: "followUp" });
 				this.ctx.updatePendingMessagesDisplay();
 				this.ctx.ui.requestRender();
+				return;
 			}
-			// If not streaming, Alt+Enter acts like regular Enter (trigger onSubmit)
-			else if (this.ctx.editor.onSubmit) {
-				this.ctx.editor.onSubmit(text);
-			}
+
+			// Default behavior: insert a new line
+			this.ctx.editor.handleInput("\n");
 		};
 	}
 

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

@@ -16,6 +16,7 @@ import {
 	Text,
 	TUI,
 } from "@oh-my-pi/pi-tui";
+import chalk from "chalk";
 import type { AgentSession, AgentSessionEvent } from "../../core/agent-session";
 import type { ExtensionUIContext } from "../../core/extensions/index";
 import { HistoryStorage } from "../../core/history-storage";
@@ -26,6 +27,7 @@ import { getRecentSessions } from "../../core/session-manager";
 import type { SettingsManager } from "../../core/settings-manager";
 import { loadSlashCommands } from "../../core/slash-commands";
 import { setTerminalTitle } from "../../core/title-generator";
+import { getArtifactsDir } from "../../core/tools/task/artifacts";
 import { VoiceSupervisor } from "../../core/voice-supervisor";
 import { registerAsyncCleanup } from "../cleanup";
 import type { AssistantMessageComponent } from "./components/assistant-message";
@@ -36,7 +38,7 @@ import type { HookEditorComponent } from "./components/hook-editor";
 import type { HookInputComponent } from "./components/hook-input";
 import type { HookSelectorComponent } from "./components/hook-selector";
 import { StatusLineComponent } from "./components/status-line";
-import type { ToolExecutionComponent } from "./components/tool-execution";
+import type { ToolExecutionHandle } from "./components/tool-execution";
 import { WelcomeComponent } from "./components/welcome";
 import { CommandController } from "./controllers/command-controller";
 import { EventController } from "./controllers/event-controller";
@@ -45,10 +47,12 @@ import { InputController } from "./controllers/input-controller";
 import { SelectorController } from "./controllers/selector-controller";
 import type { Theme } from "./theme/theme";
 import { getEditorTheme, getMarkdownTheme, onThemeChange, theme } from "./theme/theme";
-import type { CompactionQueuedMessage, InteractiveModeContext } from "./types";
+import type { CompactionQueuedMessage, InteractiveModeContext, TodoItem } from "./types";
 import { UiHelpers } from "./utils/ui-helpers";
 import { VoiceManager } from "./utils/voice-manager";
 
+const TODO_FILE_NAME = "todos.json";
+
 /** Options for creating an InteractiveMode instance (for future API use) */
 export interface InteractiveModeOptions {
 	/** Providers that were migrated during startup */
@@ -75,6 +79,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	public chatContainer: Container;
 	public pendingMessagesContainer: Container;
 	public statusContainer: Container;
+	public todoContainer: Container;
 	public editor: CustomEditor;
 	public editorContainer: Container;
 	public statusLine: StatusLineComponent;
@@ -83,10 +88,12 @@ export class InteractiveMode implements InteractiveModeContext {
 	public isBackgrounded = false;
 	public isBashMode = false;
 	public toolOutputExpanded = false;
+	public todoExpanded = false;
+	public todoItems: TodoItem[] = [];
 	public hideThinkingBlock = false;
 	public pendingImages: ImageContent[] = [];
 	public compactionQueuedMessages: CompactionQueuedMessage[] = [];
-	public pendingTools = new Map<string, ToolExecutionComponent>();
+	public pendingTools = new Map<string, ToolExecutionHandle>();
 	public pendingBashComponents: BashExecutionComponent[] = [];
 	public bashComponent: BashExecutionComponent | undefined = undefined;
 	public streamingComponent: AssistantMessageComponent | undefined = undefined;
@@ -148,6 +155,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.chatContainer = new Container();
 		this.pendingMessagesContainer = new Container();
 		this.statusContainer = new Container();
+		this.todoContainer = new Container();
 		this.editor = new CustomEditor(getEditorTheme());
 		this.editor.setUseTerminalCursor(true);
 		this.editor.onAutocompleteCancel = () => {
@@ -308,6 +316,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.addChild(this.chatContainer);
 		this.ui.addChild(this.pendingMessagesContainer);
 		this.ui.addChild(this.statusContainer);
+		this.ui.addChild(this.todoContainer);
 		this.ui.addChild(new Spacer(1));
 		this.ui.addChild(this.editorContainer);
 		this.ui.addChild(this.statusLine); // Only renders hook statuses (main status in editor border)
@@ -316,6 +325,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.inputController.setupKeyHandlers();
 		this.inputController.setupEditorSubmitHandler();
 
+		// Load initial todos
+		await this.loadTodoList();
+
 		// Start the UI
 		this.ui.start();
 		this.isInitialized = true;
@@ -379,6 +391,82 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.renderSessionContext(context);
 	}
 
+	private formatTodoLine(todo: TodoItem, prefix: string): string {
+		const checkbox = theme.checkbox;
+		const label = todo.status === "in_progress" ? todo.activeForm : todo.content;
+		switch (todo.status) {
+			case "completed":
+				return theme.fg("success", `${prefix}${checkbox.checked} ${chalk.strikethrough(todo.content)}`);
+			case "in_progress":
+				return theme.fg("accent", `${prefix}${checkbox.unchecked} ${label}`);
+			default:
+				return theme.fg("dim", `${prefix}${checkbox.unchecked} ${label}`);
+		}
+	}
+
+	private getCollapsedTodos(todos: TodoItem[]): TodoItem[] {
+		let startIndex = 0;
+		for (let i = todos.length - 1; i >= 0; i -= 1) {
+			if (todos[i].status === "completed") {
+				startIndex = i;
+				break;
+			}
+		}
+		return todos.slice(startIndex, startIndex + 5);
+	}
+
+	private renderTodoList(): void {
+		this.todoContainer.clear();
+		if (this.todoItems.length === 0) {
+			return;
+		}
+
+		const visibleTodos = this.todoExpanded ? this.todoItems : this.getCollapsedTodos(this.todoItems);
+		const indent = "  ";
+		const hook = theme.tree.hook;
+		const lines = [indent + theme.bold(theme.fg("accent", "Todos"))];
+
+		visibleTodos.forEach((todo, index) => {
+			const prefix = `${indent}${index === 0 ? hook : " "} `;
+			lines.push(this.formatTodoLine(todo, prefix));
+		});
+
+		if (!this.todoExpanded && visibleTodos.length < this.todoItems.length) {
+			const remaining = this.todoItems.length - visibleTodos.length;
+			lines.push(theme.fg("muted", `${indent}${hook} +${remaining} more (Ctrl+T to expand)`));
+		}
+
+		this.todoContainer.addChild(new Text(lines.join("\n"), 1, 0));
+	}
+
+	private async loadTodoList(): Promise<void> {
+		const sessionFile = this.sessionManager.getSessionFile() ?? null;
+		if (!sessionFile) {
+			this.renderTodoList();
+			return;
+		}
+		const artifactsDir = getArtifactsDir(sessionFile);
+		if (!artifactsDir) {
+			this.renderTodoList();
+			return;
+		}
+		const todoPath = path.join(artifactsDir, TODO_FILE_NAME);
+		const file = Bun.file(todoPath);
+		if (!(await file.exists())) {
+			this.renderTodoList();
+			return;
+		}
+		try {
+			const data = (await file.json()) as { todos?: TodoItem[] };
+			if (data?.todos && Array.isArray(data.todos)) {
+				this.todoItems = data.todos;
+			}
+		} catch (error) {
+			logger.warn("Failed to load todos", { path: todoPath, error: String(error) });
+		}
+		this.renderTodoList();
+	}
+
 	stop(): void {
 		if (this.loadingAnimation) {
 			this.loadingAnimation.stop();
@@ -636,6 +724,18 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.inputController.toggleThinkingBlockVisibility();
 	}
 
+	toggleTodoExpansion(): void {
+		this.todoExpanded = !this.todoExpanded;
+		this.renderTodoList();
+		this.ui.requestRender();
+	}
+
+	setTodos(todos: TodoItem[]): void {
+		this.todoItems = todos;
+		this.renderTodoList();
+		this.ui.requestRender();
+	}
+
 	openExternalEditor(): void {
 		this.inputController.openExternalEditor();
 	}

package/src/modes/interactive/theme/theme.ts

@@ -1325,6 +1325,10 @@ export class Theme {
 		return chalk.underline(text);
 	}
 
+	strikethrough(text: string): string {
+		return chalk.strikethrough(text);
+	}
+
 	inverse(text: string): string {
 		return chalk.inverse(text);
 	}

package/src/modes/interactive/types.ts

@@ -15,7 +15,7 @@ import type { HookEditorComponent } from "./components/hook-editor";
 import type { HookInputComponent } from "./components/hook-input";
 import type { HookSelectorComponent } from "./components/hook-selector";
 import type { StatusLineComponent } from "./components/status-line";
-import type { ToolExecutionComponent } from "./components/tool-execution";
+import type { ToolExecutionHandle } from "./components/tool-execution";
 import type { Theme } from "./theme/theme";
 
 export type CompactionQueuedMessage = {
@@ -23,12 +23,20 @@ export type CompactionQueuedMessage = {
 	mode: "steer" | "followUp";
 };
 
+export type TodoItem = {
+	id: string;
+	content: string;
+	activeForm: string;
+	status: "pending" | "in_progress" | "completed";
+};
+
 export interface InteractiveModeContext {
 	// UI access
 	ui: TUI;
 	chatContainer: Container;
 	pendingMessagesContainer: Container;
 	statusContainer: Container;
+	todoContainer: Container;
 	editor: CustomEditor;
 	editorContainer: Container;
 	statusLine: StatusLineComponent;
@@ -46,10 +54,11 @@ export interface InteractiveModeContext {
 	isBackgrounded: boolean;
 	isBashMode: boolean;
 	toolOutputExpanded: boolean;
+	todoExpanded: boolean;
 	hideThinkingBlock: boolean;
 	pendingImages: ImageContent[];
 	compactionQueuedMessages: CompactionQueuedMessage[];
-	pendingTools: Map<string, ToolExecutionComponent>;
+	pendingTools: Map<string, ToolExecutionHandle>;
 	pendingBashComponents: BashExecutionComponent[];
 	bashComponent: BashExecutionComponent | undefined;
 	streamingComponent: AssistantMessageComponent | undefined;
@@ -74,6 +83,7 @@ export interface InteractiveModeContext {
 	lastStatusSpacer: Spacer | undefined;
 	lastStatusText: Text | undefined;
 	fileSlashCommands: Set<string>;
+	todoItems: TodoItem[];
 
 	// Lifecycle
 	init(): Promise<void>;
@@ -110,6 +120,8 @@ export interface InteractiveModeContext {
 	updateEditorTopBorder(): void;
 	updateEditorBorderColor(): void;
 	rebuildChatFromMessages(): void;
+	setTodos(todos: TodoItem[]): void;
+	toggleTodoExpansion(): void;
 
 	// Command handling
 	handleExportCommand(text: string): Promise<void>;

package/src/modes/interactive/utils/ui-helpers.ts

@@ -10,6 +10,7 @@ import { BranchSummaryMessageComponent } from "../components/branch-summary-mess
 import { CompactionSummaryMessageComponent } from "../components/compaction-summary-message";
 import { CustomMessageComponent } from "../components/custom-message";
 import { DynamicBorder } from "../components/dynamic-border";
+import { ReadToolGroupComponent } from "../components/read-tool-group";
 import { ToolExecutionComponent } from "../components/tool-execution";
 import { UserMessageComponent } from "../components/user-message";
 import { theme } from "../theme/theme";
@@ -159,47 +160,75 @@ export class UiHelpers {
 			this.ctx.updateEditorBorderColor();
 		}
 
+		let readGroup: ReadToolGroupComponent | null = null;
 		for (const message of sessionContext.messages) {
 			// Assistant messages need special handling for tool calls
 			if (message.role === "assistant") {
 				this.ctx.addMessageToChat(message);
+				readGroup = null;
+				const hasErrorStop = message.stopReason === "aborted" || message.stopReason === "error";
+				const errorMessage = hasErrorStop
+					? message.stopReason === "aborted"
+						? (() => {
+								const retryAttempt = this.ctx.session.retryAttempt;
+								return retryAttempt > 0
+									? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
+									: "Operation aborted";
+							})()
+						: message.errorMessage || "Error"
+					: null;
+
 				// Render tool call components
 				for (const content of message.content) {
-					if (content.type === "toolCall") {
-						const tool = this.ctx.session.getToolByName(content.name);
-						const component = new ToolExecutionComponent(
-							content.name,
-							content.arguments,
-							{ showImages: this.ctx.settingsManager.getShowImages() },
-							tool,
-							this.ctx.ui,
-							this.ctx.sessionManager.getCwd(),
-						);
-						component.setExpanded(this.ctx.toolOutputExpanded);
-						this.ctx.chatContainer.addChild(component);
+					if (content.type !== "toolCall") continue;
 
-						if (message.stopReason === "aborted" || message.stopReason === "error") {
-							let errorMessage: string;
-							if (message.stopReason === "aborted") {
-								const retryAttempt = this.ctx.session.retryAttempt;
-								errorMessage =
-									retryAttempt > 0
-										? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
-										: "Operation aborted";
-							} else {
-								errorMessage = message.errorMessage || "Error";
-							}
-							component.updateResult({ content: [{ type: "text", text: errorMessage }], isError: true });
+					if (content.name === "read") {
+						if (!readGroup) {
+							readGroup = new ReadToolGroupComponent();
+							readGroup.setExpanded(this.ctx.toolOutputExpanded);
+							this.ctx.chatContainer.addChild(readGroup);
+						}
+						readGroup.updateArgs(content.arguments, content.id);
+						if (hasErrorStop && errorMessage) {
+							readGroup.updateResult(
+								{ content: [{ type: "text", text: errorMessage }], isError: true },
+								false,
+								content.id,
+							);
 						} else {
-							this.ctx.pendingTools.set(content.id, component);
+							this.ctx.pendingTools.set(content.id, readGroup);
 						}
+						continue;
+					}
+
+					readGroup = null;
+					const tool = this.ctx.session.getToolByName(content.name);
+					const component = new ToolExecutionComponent(
+						content.name,
+						content.arguments,
+						{ showImages: this.ctx.settingsManager.getShowImages() },
+						tool,
+						this.ctx.ui,
+						this.ctx.sessionManager.getCwd(),
+					);
+					component.setExpanded(this.ctx.toolOutputExpanded);
+					this.ctx.chatContainer.addChild(component);
+
+					if (hasErrorStop && errorMessage) {
+						component.updateResult(
+							{ content: [{ type: "text", text: errorMessage }], isError: true },
+							false,
+							content.id,
+						);
+					} else {
+						this.ctx.pendingTools.set(content.id, component);
 					}
 				}
 			} else if (message.role === "toolResult") {
 				// Match tool results to pending tool components
 				const component = this.ctx.pendingTools.get(message.toolCallId);
 				if (component) {
-					component.updateResult(message);
+					component.updateResult(message, false, message.toolCallId);
 					this.ctx.pendingTools.delete(message.toolCallId);
 				}
 			} else {