@oh-my-pi/pi-coding-agent 8.1.0 → 8.2.0

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

@@ -1,29 +1,30 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { OAuthProvider } from "@oh-my-pi/pi-ai";
-import { getAgentDbPath } from "@oh-my-pi/pi-coding-agent/config";
-import { disableProvider, enableProvider } from "@oh-my-pi/pi-coding-agent/discovery";
-import { AssistantMessageComponent } from "@oh-my-pi/pi-coding-agent/modes/components/assistant-message";
-import { ExtensionDashboard } from "@oh-my-pi/pi-coding-agent/modes/components/extensions";
-import { HistorySearchComponent } from "@oh-my-pi/pi-coding-agent/modes/components/history-search";
-import { ModelSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/model-selector";
-import { OAuthSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/oauth-selector";
-import { SessionSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/session-selector";
-import { SettingsSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/settings-selector";
-import { ToolExecutionComponent } from "@oh-my-pi/pi-coding-agent/modes/components/tool-execution";
-import { TreeSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/tree-selector";
-import { UserMessageSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/user-message-selector";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
+import { getAgentDbPath } from "../../config";
+import { disableProvider, enableProvider } from "../../discovery";
+import { AssistantMessageComponent } from "../../modes/components/assistant-message";
+import { ExtensionDashboard } from "../../modes/components/extensions";
+import { HistorySearchComponent } from "../../modes/components/history-search";
+import { ModelSelectorComponent } from "../../modes/components/model-selector";
+import { OAuthSelectorComponent } from "../../modes/components/oauth-selector";
+import { SessionSelectorComponent } from "../../modes/components/session-selector";
+import { SettingsSelectorComponent } from "../../modes/components/settings-selector";
+import { ToolExecutionComponent } from "../../modes/components/tool-execution";
+import { TreeSelectorComponent } from "../../modes/components/tree-selector";
+import { UserMessageSelectorComponent } from "../../modes/components/user-message-selector";
 import {
 	getAvailableThemes,
 	getSymbolTheme,
+	setColorBlindMode,
 	setSymbolPreset,
 	setTheme,
 	theme,
-} from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
-import { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import { setPreferredImageProvider, setPreferredWebSearchProvider } from "@oh-my-pi/pi-coding-agent/tools";
-import type { Component } from "@oh-my-pi/pi-tui";
-import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
+} from "../../modes/theme/theme";
+import type { InteractiveModeContext } from "../../modes/types";
+import { SessionManager } from "../../session/session-manager";
+import { setPreferredImageProvider, setPreferredWebSearchProvider } from "../../tools";
 
 export class SelectorController {
 	constructor(private ctx: InteractiveModeContext) {}
@@ -46,49 +47,52 @@ export class SelectorController {
 	}
 
 	showSettingsSelector(): void {
-		this.showSelector((done) => {
-			const selector = new SettingsSelectorComponent(
-				this.ctx.settingsManager,
-				{
-					availableThinkingLevels: this.ctx.session.getAvailableThinkingLevels(),
-					thinkingLevel: this.ctx.session.thinkingLevel,
-					availableThemes: getAvailableThemes(),
-					cwd: process.cwd(),
-				},
-				{
-					onChange: (id, value) => this.handleSettingChange(id, value),
-					onThemePreview: (themeName) => {
-						const result = setTheme(themeName, true);
-						if (result.success) {
-							this.ctx.ui.invalidate();
-							this.ctx.ui.requestRender();
-						}
+		getAvailableThemes().then(availableThemes => {
+			this.showSelector(done => {
+				const selector = new SettingsSelectorComponent(
+					this.ctx.settingsManager,
+					{
+						availableThinkingLevels: this.ctx.session.getAvailableThinkingLevels(),
+						thinkingLevel: this.ctx.session.thinkingLevel,
+						availableThemes,
+						cwd: process.cwd(),
 					},
-					onStatusLinePreview: (settings) => {
-						// Update status line with preview settings
-						const currentSettings = this.ctx.settingsManager.getStatusLineSettings();
-						this.ctx.statusLine.updateSettings({ ...currentSettings, ...settings });
-						this.ctx.updateEditorTopBorder();
-						this.ctx.ui.requestRender();
-					},
-					getStatusLinePreview: () => {
-						// Return the rendered status line for inline preview
-						const width = this.ctx.ui.getWidth();
-						return this.ctx.statusLine.getTopBorder(width).content;
-					},
-					onPluginsChanged: () => {
-						this.ctx.ui.requestRender();
-					},
-					onCancel: () => {
-						done();
-						// Restore status line to saved settings
-						this.ctx.statusLine.updateSettings(this.ctx.settingsManager.getStatusLineSettings());
-						this.ctx.updateEditorTopBorder();
-						this.ctx.ui.requestRender();
+					{
+						onChange: (id, value) => this.handleSettingChange(id, value),
+						onThemePreview: themeName => {
+							setTheme(themeName, true).then(result => {
+								if (result.success) {
+									this.ctx.ui.invalidate();
+									this.ctx.ui.requestRender();
+								}
+							});
+						},
+						onStatusLinePreview: settings => {
+							// Update status line with preview settings
+							const currentSettings = this.ctx.settingsManager.getStatusLineSettings();
+							this.ctx.statusLine.updateSettings({ ...currentSettings, ...settings });
+							this.ctx.updateEditorTopBorder();
+							this.ctx.ui.requestRender();
+						},
+						getStatusLinePreview: () => {
+							// Return the rendered status line for inline preview
+							const width = this.ctx.ui.getWidth();
+							return this.ctx.statusLine.getTopBorder(width).content;
+						},
+						onPluginsChanged: () => {
+							this.ctx.ui.requestRender();
+						},
+						onCancel: () => {
+							done();
+							// Restore status line to saved settings
+							this.ctx.statusLine.updateSettings(this.ctx.settingsManager.getStatusLineSettings());
+							this.ctx.updateEditorTopBorder();
+							this.ctx.ui.requestRender();
+						},
 					},
-				},
-			);
-			return { component: selector, focus: selector };
+				);
+				return { component: selector, focus: selector };
+			});
 		});
 	}
 
@@ -96,10 +100,10 @@ export class SelectorController {
 		const historyStorage = this.ctx.historyStorage;
 		if (!historyStorage) return;
 
-		this.showSelector((done) => {
+		this.showSelector(done => {
 			const component = new HistorySearchComponent(
 				historyStorage,
-				(prompt) => {
+				prompt => {
 					done();
 					this.ctx.editor.setText(prompt);
 					this.ctx.ui.requestRender();
@@ -123,7 +127,7 @@ export class SelectorController {
 			this.ctx.settingsManager,
 			this.ctx.ui.terminal.rows,
 		);
-		this.showSelector((done) => {
+		this.showSelector(done => {
 			dashboard.onClose = () => {
 				done();
 				this.ctx.ui.requestRender();
@@ -189,20 +193,28 @@ export class SelectorController {
 				this.ctx.rebuildChatFromMessages();
 				break;
 			case "theme": {
-				const result = setTheme(value as string, true);
-				this.ctx.statusLine.invalidate();
-				this.ctx.updateEditorTopBorder();
-				this.ctx.ui.invalidate();
-				if (!result.success) {
-					this.ctx.showError(`Failed to load theme "${value}": ${result.error}\nFell back to dark theme.`);
-				}
+				setTheme(value as string, true).then(result => {
+					this.ctx.statusLine.invalidate();
+					this.ctx.updateEditorTopBorder();
+					this.ctx.ui.invalidate();
+					if (!result.success) {
+						this.ctx.showError(`Failed to load theme "${value}": ${result.error}\nFell back to dark theme.`);
+					}
+				});
 				break;
 			}
 			case "symbolPreset": {
-				setSymbolPreset(value as "unicode" | "nerd" | "ascii");
-				this.ctx.statusLine.invalidate();
-				this.ctx.updateEditorTopBorder();
-				this.ctx.ui.invalidate();
+				setSymbolPreset(value as "unicode" | "nerd" | "ascii").then(() => {
+					this.ctx.statusLine.invalidate();
+					this.ctx.updateEditorTopBorder();
+					this.ctx.ui.invalidate();
+				});
+				break;
+			}
+			case "colorBlindMode": {
+				setColorBlindMode(value === "true" || value === true).then(() => {
+					this.ctx.ui.invalidate();
+				});
 				break;
 			}
 			case "statusLinePreset":
@@ -239,7 +251,7 @@ export class SelectorController {
 	}
 
 	showModelSelector(options?: { temporaryOnly?: boolean }): void {
-		this.showSelector((done) => {
+		this.showSelector(done => {
 			const selector = new ModelSelectorComponent(
 				this.ctx.ui,
 				this.ctx.session.model,
@@ -291,10 +303,10 @@ export class SelectorController {
 			return;
 		}
 
-		this.showSelector((done) => {
+		this.showSelector(done => {
 			const selector = new UserMessageSelectorComponent(
-				userMessages.map((m) => ({ id: m.entryId, text: m.text })),
-				async (entryId) => {
+				userMessages.map(m => ({ id: m.entryId, text: m.text })),
+				async entryId => {
 					const result = await this.ctx.session.branch(entryId);
 					if (result.cancelled) {
 						// Hook cancelled the branch
@@ -336,12 +348,12 @@ export class SelectorController {
 			return;
 		}
 
-		this.showSelector((done) => {
+		this.showSelector(done => {
 			const selector = new TreeSelectorComponent(
 				tree,
 				visibleLeafId,
 				this.ctx.ui.terminal.rows,
-				async (entryId) => {
+				async entryId => {
 					// Selecting the visible leaf is a no-op (already there)
 					if (entryId === visibleLeafId) {
 						done();
@@ -396,8 +408,8 @@ export class SelectorController {
 						this.ctx.chatContainer.addChild(new Spacer(1));
 						summaryLoader = new Loader(
 							this.ctx.ui,
-							(spinner) => theme.fg("accent", spinner),
-							(text) => theme.fg("muted", text),
+							spinner => theme.fg("accent", spinner),
+							text => theme.fg("muted", text),
 							"Summarizing branch... (esc to cancel)",
 							getSymbolTheme().spinnerFrames,
 						);
@@ -453,15 +465,15 @@ export class SelectorController {
 		});
 	}
 
-	showSessionSelector(): void {
-		this.showSelector((done) => {
-			const sessions = SessionManager.list(
-				this.ctx.sessionManager.getCwd(),
-				this.ctx.sessionManager.getSessionDir(),
-			);
+	async showSessionSelector(): Promise<void> {
+		const sessions = await SessionManager.list(
+			this.ctx.sessionManager.getCwd(),
+			this.ctx.sessionManager.getSessionDir(),
+		);
+		this.showSelector(done => {
 			const selector = new SessionSelectorComponent(
 				sessions,
-				async (sessionPath) => {
+				async sessionPath => {
 					done();
 					await this.handleResumeSession(sessionPath);
 				},
@@ -505,14 +517,14 @@ export class SelectorController {
 	async showOAuthSelector(mode: "login" | "logout"): Promise<void> {
 		if (mode === "logout") {
 			const providers = this.ctx.session.modelRegistry.authStorage.list();
-			const loggedInProviders = providers.filter((p) => this.ctx.session.modelRegistry.authStorage.hasOAuth(p));
+			const loggedInProviders = providers.filter(p => this.ctx.session.modelRegistry.authStorage.hasOAuth(p));
 			if (loggedInProviders.length === 0) {
 				this.ctx.showStatus("No OAuth providers logged in. Use /login first.");
 				return;
 			}
 		}
 
-		this.showSelector((done) => {
+		this.showSelector(done => {
 			const selector = new OAuthSelectorComponent(
 				mode,
 				this.ctx.session.modelRegistry.authStorage,
@@ -546,7 +558,7 @@ export class SelectorController {
 									}
 									this.ctx.ui.requestRender();
 
-									return new Promise<string>((resolve) => {
+									return new Promise<string>(resolve => {
 										const codeInput = new Input();
 										codeInput.onSubmit = () => {
 											const code = codeInput.getValue();

package/src/modes/index.ts

@@ -1,3 +1,6 @@
+import { emergencyTerminalRestore } from "@oh-my-pi/pi-tui";
+import { postmortem } from "@oh-my-pi/pi-utils";
+
 /**
  * Run modes for the coding agent.
  */
@@ -7,9 +10,6 @@ export { type ModelInfo, RpcClient, type RpcClientOptions, type RpcEventListener
 export { runRpcMode } from "./rpc/rpc-mode";
 export type { RpcCommand, RpcResponse, RpcSessionState } from "./rpc/rpc-types";
 
-import { emergencyTerminalRestore } from "@oh-my-pi/pi-tui";
-import { postmortem } from "@oh-my-pi/pi-utils";
-
 postmortem.register("terminal-restore", () => {
 	emergencyTerminalRestore();
 });

package/src/modes/interactive-mode.ts

@@ -2,20 +2,9 @@
  * Interactive mode for the coding agent.
  * Handles TUI rendering and user interaction, delegating business logic to AgentSession.
  */
-
 import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, UsageReport } from "@oh-my-pi/pi-ai";
-import { KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
-import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions";
-import type { CompactOptions } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
-import { loadSlashCommands } from "@oh-my-pi/pi-coding-agent/extensibility/slash-commands";
-import type { AgentSession, AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
-import { HistoryStorage } from "@oh-my-pi/pi-coding-agent/session/history-storage";
-import type { SessionContext, SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import { getRecentSessions } from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import { setTerminalTitle } from "@oh-my-pi/pi-coding-agent/utils/title-generator";
 import type { Component, Loader, SlashCommand } from "@oh-my-pi/pi-tui";
 import {
 	CombinedAutocompleteProvider,
@@ -26,8 +15,18 @@ import {
 	Text,
 	TUI,
 } from "@oh-my-pi/pi-tui";
-import { logger, postmortem } from "@oh-my-pi/pi-utils";
+import { isEnoent, logger, postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
+import { KeybindingsManager } from "../config/keybindings";
+import type { SettingsManager } from "../config/settings-manager";
+import type { ExtensionUIContext } from "../extensibility/extensions";
+import type { CompactOptions } from "../extensibility/extensions/types";
+import { loadSlashCommands } from "../extensibility/slash-commands";
+import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
+import { HistoryStorage } from "../session/history-storage";
+import type { SessionContext, SessionManager } from "../session/session-manager";
+import { getRecentSessions } from "../session/session-manager";
+import { setTerminalTitle } from "../utils/title-generator";
 import type { AssistantMessageComponent } from "./components/assistant-message";
 import type { BashExecutionComponent } from "./components/bash-execution";
 import { CustomEditor } from "./components/custom-editor";
@@ -207,14 +206,14 @@ export class InteractiveMode implements InteractiveModeContext {
 		];
 
 		// Convert hook commands to SlashCommand format
-		const hookCommands: SlashCommand[] = (this.session.extensionRunner?.getRegisteredCommands() ?? []).map((cmd) => ({
+		const hookCommands: SlashCommand[] = (this.session.extensionRunner?.getRegisteredCommands() ?? []).map(cmd => ({
 			name: cmd.name,
 			description: cmd.description ?? "(hook command)",
 			getArgumentCompletions: cmd.getArgumentCompletions,
 		}));
 
 		// Convert custom commands (TypeScript) to SlashCommand format
-		const customCommands: SlashCommand[] = this.session.customCommands.map((loaded) => ({
+		const customCommands: SlashCommand[] = this.session.customCommands.map(loaded => ({
 			name: loaded.command.name,
 			description: `${loaded.command.description} (${loaded.source})`,
 		}));
@@ -250,8 +249,8 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		// Load and convert file commands to SlashCommand format (async)
 		const fileCommands = await loadSlashCommands({ cwd: process.cwd() });
-		this.fileSlashCommands = new Set(fileCommands.map((cmd) => cmd.name));
-		const fileSlashCommands: SlashCommand[] = fileCommands.map((cmd) => ({
+		this.fileSlashCommands = new Set(fileCommands.map(cmd => cmd.name));
+		const fileSlashCommands: SlashCommand[] = fileCommands.map(cmd => ({
 			name: cmd.name,
 			description: cmd.description,
 		}));
@@ -268,14 +267,14 @@ export class InteractiveMode implements InteractiveModeContext {
 		const providerName = this.session.model?.provider ?? "Unknown";
 
 		// Get recent sessions
-		const recentSessions = getRecentSessions(this.sessionManager.getSessionDir()).map((s) => ({
+		const recentSessions = (await getRecentSessions(this.sessionManager.getSessionDir())).map(s => ({
 			name: s.name,
 			timeAgo: s.timeAgo,
 		}));
 
 		// Convert LSP servers to welcome format
 		const lspServerInfo =
-			this.lspServers?.map((s) => ({
+			this.lspServers?.map(s => ({
 				name: s.name,
 				status: s.status as "ready" | "error" | "connecting",
 				fileTypes: s.fileTypes,
@@ -364,7 +363,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 	async getUserInput(): Promise<{ text: string; images?: ImageContent[] }> {
 		const { promise, resolve } = Promise.withResolvers<{ text: string; images?: ImageContent[] }>();
-		this.onInputCallback = (input) => {
+		this.onInputCallback = input => {
 			this.onInputCallback = undefined;
 			resolve(input);
 		};
@@ -452,17 +451,16 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 		const artifactsDir = sessionFile.slice(0, -6);
 		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[] };
+			const data = (await Bun.file(todoPath).json()) as { todos?: TodoItem[] };
 			if (data?.todos && Array.isArray(data.todos)) {
 				this.todoItems = data.todos;
 			}
 		} catch (error) {
+			if (isEnoent(error)) {
+				this.renderTodoList();
+				return;
+			}
 			logger.warn("Failed to load todos", { path: todoPath, error: String(error) });
 		}
 		this.renderTodoList();
@@ -612,16 +610,16 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.commandController.handleCopyCommand();
 	}
 
-	handleSessionCommand(): void {
-		this.commandController.handleSessionCommand();
+	handleSessionCommand(): Promise<void> {
+		return this.commandController.handleSessionCommand();
 	}
 
 	handleUsageCommand(reports?: UsageReport[] | null): Promise<void> {
 		return this.commandController.handleUsageCommand(reports);
 	}
 
-	handleChangelogCommand(): void {
-		this.commandController.handleChangelogCommand();
+	async handleChangelogCommand(): Promise<void> {
+		await this.commandController.handleChangelogCommand();
 	}
 
 	handleHotkeysCommand(): void {

package/src/modes/print-mode.ts

@@ -5,9 +5,8 @@
  * - `omp -p "prompt"` - text output
  * - `omp --mode json "prompt"` - JSON event stream
  */
-
 import type { AssistantMessage, ImageContent } from "@oh-my-pi/pi-ai";
-import type { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import type { AgentSession } from "../session/agent-session";
 
 /**
  * Options for print mode.
@@ -44,12 +43,12 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 			// ExtensionActions
 			{
 				sendMessage: (message, options) => {
-					session.sendCustomMessage(message, options).catch((e) => {
+					session.sendCustomMessage(message, options).catch(e => {
 						process.stderr.write(`Extension sendMessage failed: ${e instanceof Error ? e.message : String(e)}\n`);
 					});
 				},
 				sendUserMessage: (content, options) => {
-					session.sendUserMessage(content, options).catch((e) => {
+					session.sendUserMessage(content, options).catch(e => {
 						process.stderr.write(
 							`Extension sendUserMessage failed: ${e instanceof Error ? e.message : String(e)}\n`,
 						);
@@ -64,14 +63,14 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 				getActiveTools: () => session.getActiveToolNames(),
 				getAllTools: () => session.getAllToolNames(),
 				setActiveTools: (toolNames: string[]) => session.setActiveToolsByName(toolNames),
-				setModel: async (model) => {
+				setModel: async model => {
 					const key = await session.modelRegistry.getApiKey(model);
 					if (!key) return false;
 					await session.setModel(model);
 					return true;
 				},
 				getThinkingLevel: () => session.thinkingLevel,
-				setThinkingLevel: (level) => session.setThinkingLevel(level),
+				setThinkingLevel: level => session.setThinkingLevel(level),
 			},
 			// ExtensionContextActions
 			{
@@ -81,7 +80,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 				hasPendingMessages: () => session.queuedMessageCount > 0,
 				shutdown: () => {},
 				getContextUsage: () => session.getContextUsage(),
-				compact: async (instructionsOrOptions) => {
+				compact: async instructionsOrOptions => {
 					const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
 					const options =
 						instructionsOrOptions && typeof instructionsOrOptions === "object"
@@ -94,14 +93,14 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 			{
 				getContextUsage: () => session.getContextUsage(),
 				waitForIdle: () => session.agent.waitForIdle(),
-				newSession: async (options) => {
+				newSession: async options => {
 					const success = await session.newSession({ parentSession: options?.parentSession });
 					if (success && options?.setup) {
 						await options.setup(session.sessionManager);
 					}
 					return { cancelled: !success };
 				},
-				branch: async (entryId) => {
+				branch: async entryId => {
 					const result = await session.branch(entryId);
 					return { cancelled: result.cancelled };
 				},
@@ -109,7 +108,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 					const result = await session.navigateTree(targetId, { summarize: options?.summarize });
 					return { cancelled: result.cancelled };
 				},
-				compact: async (instructionsOrOptions) => {
+				compact: async instructionsOrOptions => {
 					const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
 					const options =
 						instructionsOrOptions && typeof instructionsOrOptions === "object"
@@ -120,7 +119,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 			},
 			// No UI context
 		);
-		extensionRunner.onError((err) => {
+		extensionRunner.onError(err => {
 			process.stderr.write(`Extension error (${err.extensionPath}): ${err.error}\n`);
 		});
 		// Emit session_start event
@@ -130,7 +129,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 	}
 
 	// Always subscribe to enable session persistence via _handleAgentEvent
-	session.subscribe((event) => {
+	session.subscribe(event => {
 		// In JSON mode, output all events
 		if (mode === "json") {
 			process.stdout.write(`${JSON.stringify(event)}\n`);
@@ -173,7 +172,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 	// Ensure stdout is fully flushed before returning
 	// This prevents race conditions where the process exits before all output is written
 	await new Promise<void>((resolve, reject) => {
-		process.stdout.write("", (err) => {
+		process.stdout.write("", err => {
 			if (err) reject(err);
 			else resolve();
 		});

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

@@ -3,13 +3,12 @@
  *
  * Spawns the agent in RPC mode and provides a typed API for all operations.
  */
-
 import type { AgentEvent, AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
-import type { BashResult } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
-import type { SessionStats } from "@oh-my-pi/pi-coding-agent/session/agent-session";
-import type { CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction";
 import { createSanitizerStream, createSplitterStream, createTextDecoderStream, ptree } from "@oh-my-pi/pi-utils";
+import type { BashResult } from "../../exec/bash-executor";
+import type { SessionStats } from "../../session/agent-session";
+import type { CompactionResult } from "../../session/compaction";
 import type { RpcCommand, RpcResponse, RpcSessionState } from "./rpc-types";
 
 /** Distributive Omit that works with union types */
@@ -372,7 +371,7 @@ export class RpcClient {
 	waitForIdle(timeout = 60000): Promise<void> {
 		const { promise, resolve, reject } = Promise.withResolvers<void>();
 		let settled = false;
-		const unsubscribe = this.onEvent((event) => {
+		const unsubscribe = this.onEvent(event => {
 			if (event.type === "agent_end") {
 				settled = true;
 				unsubscribe();
@@ -397,7 +396,7 @@ export class RpcClient {
 		const { promise, resolve, reject } = Promise.withResolvers<AgentEvent[]>();
 		const events: AgentEvent[] = [];
 		let settled = false;
-		const unsubscribe = this.onEvent((event) => {
+		const unsubscribe = this.onEvent(event => {
 			events.push(event);
 			if (event.type === "agent_end") {
 				settled = true;
@@ -470,12 +469,12 @@ export class RpcClient {
 		})();
 
 		this.pendingRequests.set(id, {
-			resolve: (response) => {
+			resolve: response => {
 				if (settled) return;
 				settled = true;
 				resolve(response);
 			},
-			reject: (error) => {
+			reject: error => {
 				if (settled) return;
 				settled = true;
 				reject(error);