@oh-my-pi/pi-coding-agent 8.4.2 → 8.4.5

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [8.4.5] - 2026-01-26
+
+### Added
+- Model usage tracking to record and retrieve most recently used models
+- Model sorting in selector based on usage history
+
+### Changed
+- Renamed `head_limit` parameter to `limit` in grep and find tools for consistency
+- Added `context` as an alias for the `c` context parameter in grep tool
+- Made hidden files inclusion configurable in find tool via `hidden` parameter (defaults to true)
+- Added support for reading ignore patterns from .gitignore and .ignore files in find tool
+
+### Fixed
+- Respected .gitignore rules when filtering find tool results by glob pattern
 ## [8.4.2] - 2026-01-25
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "8.4.2",
+	"version": "8.4.5",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -50,6 +50,14 @@
 			"types": "./src/session/*.ts",
 			"import": "./src/session/*.ts"
 		},
+		"./internal-urls": {
+			"types": "./src/internal-urls/index.ts",
+			"import": "./src/internal-urls/index.ts"
+		},
+		"./internal-urls/*": {
+			"types": "./src/internal-urls/*.ts",
+			"import": "./src/internal-urls/*.ts"
+		},
 		"./vendor/photon/*": {
 			"types": "./src/vendor/photon/*",
 			"import": "./src/vendor/photon/*"
@@ -75,11 +83,11 @@
 		"test": "bun test"
 	},
 	"dependencies": {
-		"@oh-my-pi/omp-stats": "8.4.2",
-		"@oh-my-pi/pi-agent-core": "8.4.2",
-		"@oh-my-pi/pi-ai": "8.4.2",
-		"@oh-my-pi/pi-tui": "8.4.2",
-		"@oh-my-pi/pi-utils": "8.4.2",
+		"@oh-my-pi/omp-stats": "8.4.5",
+		"@oh-my-pi/pi-agent-core": "8.4.5",
+		"@oh-my-pi/pi-ai": "8.4.5",
+		"@oh-my-pi/pi-tui": "8.4.5",
+		"@oh-my-pi/pi-utils": "8.4.5",
 		"@openai/agents": "^0.4.3",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

package/src/cursor.ts

@@ -170,7 +170,7 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 			context: args.context ?? args.contextBefore ?? args.contextAfter ?? undefined,
 			ignore_case: args.caseInsensitive || undefined,
 			type: args.type || undefined,
-			head_limit: args.headLimit ?? undefined,
+			limit: args.headLimit ?? undefined,
 			multiline: args.multiline || undefined,
 		});
 		return toolResultMessage;

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

@@ -75,7 +75,6 @@ export class ModelSelectorComponent extends Container {
 	private allModels: ModelItem[] = [];
 	private filteredModels: ModelItem[] = [];
 	private selectedIndex: number = 0;
-	private currentModel?: Model<any>;
 	private defaultModel?: Model<any>;
 	private smolModel?: Model<any>;
 	private slowModel?: Model<any>;
@@ -98,7 +97,7 @@ export class ModelSelectorComponent extends Container {
 
 	constructor(
 		tui: TUI,
-		currentModel: Model<any> | undefined,
+		_currentModel: Model<any> | undefined,
 		settingsManager: SettingsManager,
 		modelRegistry: ModelRegistry,
 		scopedModels: ReadonlyArray<ScopedModelItem>,
@@ -109,7 +108,6 @@ export class ModelSelectorComponent extends Container {
 		super();
 
 		this.tui = tui;
-		this.currentModel = currentModel;
 		this.settingsManager = settingsManager;
 		this.modelRegistry = modelRegistry;
 		this.scopedModels = scopedModels;
@@ -213,6 +211,44 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
+	private sortModels(models: ModelItem[]): void {
+		// Sort: tagged models (default/smol/slow) first, then MRU, then alphabetical
+		const mruOrder = this.settingsManager.getStorage()?.getModelUsageOrder() ?? [];
+		const mruIndex = new Map(mruOrder.map((key, i) => [key, i]));
+
+		models.sort((a, b) => {
+			const aKey = `${a.provider}/${a.id}`;
+			const bKey = `${b.provider}/${b.id}`;
+
+			// Tagged models first: default (0), smol (1), slow (2), untagged (3)
+			const aTag = modelsAreEqual(this.defaultModel, a.model)
+				? 0
+				: modelsAreEqual(this.smolModel, a.model)
+					? 1
+					: modelsAreEqual(this.slowModel, a.model)
+						? 2
+						: 3;
+			const bTag = modelsAreEqual(this.defaultModel, b.model)
+				? 0
+				: modelsAreEqual(this.smolModel, b.model)
+					? 1
+					: modelsAreEqual(this.slowModel, b.model)
+						? 2
+						: 3;
+			if (aTag !== bTag) return aTag - bTag;
+
+			// Then MRU order (models in mruIndex come before those not in it)
+			const aMru = mruIndex.get(aKey) ?? Number.MAX_SAFE_INTEGER;
+			const bMru = mruIndex.get(bKey) ?? Number.MAX_SAFE_INTEGER;
+			if (aMru !== bMru) return aMru - bMru;
+
+			// Finally alphabetical by provider, then id
+			const providerCmp = a.provider.localeCompare(b.provider);
+			if (providerCmp !== 0) return providerCmp;
+			return a.id.localeCompare(b.id);
+		});
+	}
+
 	private async loadModels(): Promise<void> {
 		let models: ModelItem[];
 
@@ -249,16 +285,7 @@ export class ModelSelectorComponent extends Container {
 			}
 		}
 
-		// Sort: current model first, then by provider, then by id
-		models.sort((a, b) => {
-			const aIsCurrent = modelsAreEqual(this.currentModel, a.model);
-			const bIsCurrent = modelsAreEqual(this.currentModel, b.model);
-			if (aIsCurrent && !bIsCurrent) return -1;
-			if (!aIsCurrent && bIsCurrent) return 1;
-			const providerCmp = a.provider.localeCompare(b.provider);
-			if (providerCmp !== 0) return providerCmp;
-			return a.id.localeCompare(b.id);
-		});
+		this.sortModels(models);
 
 		this.allModels = models;
 		this.filteredModels = models;
@@ -315,7 +342,9 @@ export class ModelSelectorComponent extends Container {
 				this.updateTabBar();
 				baseModels = this.allModels;
 			}
-			this.filteredModels = fuzzyFilter(baseModels, query, ({ id, provider }) => `${id} ${provider}`);
+			const fuzzyMatches = fuzzyFilter(baseModels, query, ({ id, provider }) => `${id} ${provider}`);
+			this.sortModels(fuzzyMatches);
+			this.filteredModels = fuzzyMatches;
 		} else {
 			this.filteredModels = baseModels;
 		}

package/src/modes/components/tool-execution.ts

@@ -558,9 +558,7 @@ export class ToolExecutionComponent extends Container {
 		const context: Record<string, unknown> = {};
 		const normalizeTimeoutSeconds = (value: unknown, maxSeconds: number): number | undefined => {
 			if (typeof value !== "number" || !Number.isFinite(value)) return undefined;
-			let timeoutSec = value > 1000 ? value / 1000 : value;
-			timeoutSec = Math.max(1, Math.min(maxSeconds, timeoutSec));
-			return timeoutSec;
+			return Math.max(1, Math.min(maxSeconds, value));
 		};
 
 		if (this.toolName === "bash" && this.result) {

package/src/modes/interactive-mode.ts

@@ -5,7 +5,6 @@
 import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, Model, UsageReport } from "@oh-my-pi/pi-ai";
-import { resolvePlanUrlToPath } from "@oh-my-pi/pi-coding-agent/internal-urls";
 import type { Component, Loader, SlashCommand } from "@oh-my-pi/pi-tui";
 import {
 	CombinedAutocompleteProvider,
@@ -24,6 +23,7 @@ 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 { resolvePlanUrlToPath } from "../internal-urls";
 import planModeApprovedPrompt from "../prompts/system/plan-mode-approved.md" with { type: "text" };
 import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
 import { HistoryStorage } from "../session/history-storage";
@@ -136,7 +136,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	private planModeHasEntered = false;
 	public readonly lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined =
 		undefined;
-	public mcpManager?: import("@oh-my-pi/pi-coding-agent/mcp").MCPManager;
+	public mcpManager?: import("../mcp").MCPManager;
 	private readonly toolUiContextSetter: (uiContext: ExtensionUIContext, hasUI: boolean) => void;
 
 	private readonly commandController: CommandController;
@@ -152,7 +152,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		changelogMarkdown: string | undefined = undefined,
 		setToolUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void = () => {},
 		lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined = undefined,
-		mcpManager?: import("@oh-my-pi/pi-coding-agent/mcp").MCPManager,
+		mcpManager?: import("../mcp").MCPManager,
 	) {
 		this.session = session;
 		this.sessionManager = session.sessionManager;

package/src/prompts/system/plan-mode-active.md

@@ -19,6 +19,10 @@ Create your plan at `{{planFilePath}}`.
 
 The plan file is the ONLY file you may write or edit.
 
+<important>
+Plan execution runs in a fresh context (session cleared). Make the plan file self-contained: include any requirements, decisions, key findings, and remaining todos needed to continue without prior session history.
+</important>
+
 {{#if reentry}}
 ## Re-entry
 

package/src/prompts/tools/enter-plan-mode.md

@@ -38,6 +38,12 @@ In plan mode:
 Requires user approval to enter. Once approved, you enter read-only exploration mode with restricted tool access.
 </output>
 
+<parameters>
+Optional parameters:
+  - `parallel`: Explore independent threads in parallel before synthesizing.
+  - `iterative`: One thread at a time with checkpoints between steps.
+</parameters>
+
 <example name="auth">
 User: "Add user authentication to the app"
 → Use plan mode: architectural decisions (session vs JWT, where to store tokens, middleware structure)

package/src/prompts/tools/find.md

@@ -3,12 +3,13 @@
 Fast file pattern matching that works with any codebase size.
 
 <instruction>
-- Supports glob patterns like "**/*.js" or "src/**/*.ts"
+- Supports glob patterns like `**/*.js` or `src/**/*.ts`
+- Includes hidden files by default (use `hidden: false` to exclude)
 - Speculatively perform multiple searches in parallel when potentially useful
 </instruction>
 
 <output>
-Matching file paths sorted by modification time (most recent first). Results truncated at 1000 entries or 50KB.
+Matching file paths sorted by modification time (most recent first). Results truncated at 1000 entries or 50KB (configurable via `limit`).
 </output>
 
 <avoid>

package/src/prompts/tools/grep.md

@@ -16,7 +16,7 @@ Results depend on `output_mode`:
 - `count`: Match counts per file
 
 In `content` mode, truncated at 100 matches by default (configurable via `limit`).
-For `files_with_matches` and `count` modes, use `head_limit` to truncate results.
+For `files_with_matches` and `count` modes, use `limit` to truncate results.
 </output>
 
 <critical>

package/src/session/agent-session.ts

@@ -27,7 +27,6 @@ import type {
 	UsageReport,
 } from "@oh-my-pi/pi-ai";
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
-import { resolvePlanUrlToPath } from "@oh-my-pi/pi-coding-agent/internal-urls";
 import { abortableSleep, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import type { Rule } from "../capability/rule";
@@ -61,6 +60,7 @@ import type { CompactOptions, ContextUsage } from "../extensibility/extensions/t
 import type { HookCommandContext } from "../extensibility/hooks/types";
 import type { Skill, SkillWarning } from "../extensibility/skills";
 import { expandSlashCommand, type FileSlashCommand } from "../extensibility/slash-commands";
+import { resolvePlanUrlToPath } from "../internal-urls";
 import { executePython as executePythonCommand, type PythonResult } from "../ipy/executor";
 import { theme } from "../modes/theme/theme";
 import { normalizeDiff, normalizeToLF, ParseError, previewPatch, stripBom } from "../patch";
@@ -1676,6 +1676,7 @@ export class AgentSession {
 		this.agent.setModel(model);
 		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, role);
 		this.settingsManager.setModelRole(role, `${model.provider}/${model.id}`);
+		this.settingsManager.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 
 		// Re-clamp thinking level for new model's capabilities
 		this.setThinkingLevel(this.thinkingLevel);
@@ -1694,6 +1695,7 @@ export class AgentSession {
 
 		this.agent.setModel(model);
 		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, "temporary");
+		this.settingsManager.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 
 		// Re-clamp thinking level for new model's capabilities
 		this.setThinkingLevel(this.thinkingLevel);
@@ -1790,6 +1792,7 @@ export class AgentSession {
 		this.agent.setModel(next.model);
 		this.sessionManager.appendModelChange(`${next.model.provider}/${next.model.id}`);
 		this.settingsManager.setModelRole("default", `${next.model.provider}/${next.model.id}`);
+		this.settingsManager.getStorage()?.recordModelUsage(`${next.model.provider}/${next.model.id}`);
 
 		// Apply thinking level (setThinkingLevel clamps to model capabilities)
 		this.setThinkingLevel(next.thinkingLevel);
@@ -1817,6 +1820,7 @@ export class AgentSession {
 		this.agent.setModel(nextModel);
 		this.sessionManager.appendModelChange(`${nextModel.provider}/${nextModel.id}`);
 		this.settingsManager.setModelRole("default", `${nextModel.provider}/${nextModel.id}`);
+		this.settingsManager.getStorage()?.recordModelUsage(`${nextModel.provider}/${nextModel.id}`);
 
 		// Re-clamp thinking level for new model's capabilities
 		this.setThinkingLevel(this.thinkingLevel);

package/src/session/agent-storage.ts

@@ -23,6 +23,12 @@ type AuthRow = {
 	data: string;
 };
 
+/** Row shape for model_usage table queries */
+type ModelUsageRow = {
+	model_key: string;
+	last_used_at: number;
+};
+
 /**
  * Auth credential with database row ID for updates/deletes.
  * Wraps AuthCredential with storage metadata.
@@ -34,7 +40,7 @@ export interface StoredAuthCredential {
 }
 
 /** Bump when schema changes require migration */
-const SCHEMA_VERSION = 2;
+const SCHEMA_VERSION = 3;
 
 /**
  * Type guard for plain objects.
@@ -126,6 +132,9 @@ export class AgentStorage {
 	private deleteAuthStmt: Statement;
 	private deleteAuthByProviderStmt: Statement;
 	private countAuthStmt: Statement;
+	private upsertModelUsageStmt: Statement;
+	private listModelUsageStmt: Statement;
+	private modelUsageCache: string[] | null = null;
 
 	private constructor(dbPath: string) {
 		this.ensureDir(dbPath);
@@ -157,6 +166,13 @@ export class AgentStorage {
 		this.deleteAuthStmt = this.db.prepare("DELETE FROM auth_credentials WHERE id = ?");
 		this.deleteAuthByProviderStmt = this.db.prepare("DELETE FROM auth_credentials WHERE provider = ?");
 		this.countAuthStmt = this.db.prepare("SELECT COUNT(*) as count FROM auth_credentials");
+
+		this.upsertModelUsageStmt = this.db.prepare(
+			"INSERT INTO model_usage (model_key, last_used_at) VALUES (?, unixepoch()) ON CONFLICT(model_key) DO UPDATE SET last_used_at = unixepoch()",
+		);
+		this.listModelUsageStmt = this.db.prepare(
+			"SELECT model_key, last_used_at FROM model_usage ORDER BY last_used_at DESC",
+		);
 	}
 
 	/**
@@ -186,6 +202,11 @@ CREATE TABLE IF NOT EXISTS cache (
 );
 CREATE INDEX IF NOT EXISTS idx_cache_expires ON cache(expires_at);
 
+CREATE TABLE IF NOT EXISTS model_usage (
+	model_key TEXT PRIMARY KEY,
+	last_used_at INTEGER NOT NULL DEFAULT (unixepoch())
+);
+
 CREATE TABLE IF NOT EXISTS schema_version (version INTEGER PRIMARY KEY);
 `);
 
@@ -357,6 +378,38 @@ CREATE TABLE settings (
 		}
 	}
 
+	/**
+	 * Records model usage, updating the last-used timestamp.
+	 * @param modelKey - Model key in "provider/modelId" format
+	 */
+	recordModelUsage(modelKey: string): void {
+		try {
+			this.upsertModelUsageStmt.run(modelKey);
+			this.modelUsageCache = null;
+		} catch (error) {
+			logger.warn("AgentStorage failed to record model usage", { modelKey, error: String(error) });
+		}
+	}
+
+	/**
+	 * Gets model keys ordered by most recently used.
+	 * Results are cached until recordModelUsage is called.
+	 * @returns Array of model keys ("provider/modelId") in MRU order
+	 */
+	getModelUsageOrder(): string[] {
+		if (this.modelUsageCache) {
+			return this.modelUsageCache;
+		}
+		try {
+			const rows = this.listModelUsageStmt.all() as ModelUsageRow[];
+			this.modelUsageCache = rows.map(row => row.model_key);
+			return this.modelUsageCache;
+		} catch (error) {
+			logger.warn("AgentStorage failed to get model usage order", { error: String(error) });
+			return [];
+		}
+	}
+
 	/**
 	 * Checks if any auth credentials exist in storage.
 	 * @returns True if at least one credential is stored

package/src/task/executor.ts

@@ -5,18 +5,18 @@
  */
 import path from "node:path";
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { PromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { Skill } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
-import { getPreludeDocs } from "@oh-my-pi/pi-coding-agent/ipy/executor";
-import { checkPythonKernelAvailability } from "@oh-my-pi/pi-coding-agent/ipy/kernel";
-import type { ContextFileEntry, ToolSession } from "@oh-my-pi/pi-coding-agent/tools";
 import type { ModelRegistry } from "../config/model-registry";
 import { formatModelString, parseModelPattern } from "../config/model-resolver";
+import type { PromptTemplate } from "../config/prompt-templates";
+import type { Skill } from "../extensibility/skills";
+import { getPreludeDocs } from "../ipy/executor";
+import { checkPythonKernelAvailability } from "../ipy/kernel";
 import { LspTool } from "../lsp";
 import type { LspParams } from "../lsp/types";
 import { callTool } from "../mcp/client";
 import type { MCPManager } from "../mcp/manager";
 import type { AuthStorage } from "../session/auth-storage";
+import type { ContextFileEntry, ToolSession } from "../tools";
 import { PythonTool, type PythonToolParams } from "../tools/python";
 import type { EventBus } from "../utils/event-bus";
 import { subprocessToolRegistry } from "./subprocess-tool-registry";
@@ -80,7 +80,7 @@ export interface ExecutorOptions {
 	authStorage?: AuthStorage;
 	modelRegistry?: ModelRegistry;
 	settingsManager?: {
-		serialize: () => import("@oh-my-pi/pi-coding-agent/config/settings-manager").Settings;
+		serialize: () => import("../config/settings-manager").Settings;
 		getPlansDirectory: (cwd?: string) => string;
 		getPythonToolMode?: () => "ipy-only" | "bash-only" | "both";
 		getPythonKernelMode?: () => "session" | "per-call";

package/src/task/index.ts

@@ -17,14 +17,12 @@ import * as os from "node:os";
 import path from "node:path";
 import type { AgentTool, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Usage } from "@oh-my-pi/pi-ai";
-import planModeSubagentPrompt from "@oh-my-pi/pi-coding-agent/prompts/system/plan-mode-subagent.md" with {
-	type: "text",
-};
 import { $ } from "bun";
 import { nanoid } from "nanoid";
 import type { ToolSession } from "..";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { Theme } from "../modes/theme/theme";
+import planModeSubagentPrompt from "../prompts/system/plan-mode-subagent.md" with { type: "text" };
 import taskDescriptionTemplate from "../prompts/tools/task.md" with { type: "text" };
 import { formatDuration } from "../tools/render-utils";
 // Import review tools for side effects (registers subagent tool handlers)

package/src/task/worker-protocol.ts

@@ -1,11 +1,11 @@
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { PromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { Skill } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
-import type { PreludeHelper } from "@oh-my-pi/pi-coding-agent/ipy/kernel";
-import type { ContextFileEntry } from "@oh-my-pi/pi-coding-agent/tools";
 import type { SerializedModelRegistry } from "../config/model-registry";
+import type { PromptTemplate } from "../config/prompt-templates";
 import type { Settings } from "../config/settings-manager";
+import type { Skill } from "../extensibility/skills";
+import type { PreludeHelper } from "../ipy/kernel";
 import type { SerializedAuthStorage } from "../session/auth-storage";
+import type { ContextFileEntry } from "../tools";
 
 /**
  * MCP tool metadata passed from parent to worker for proxy tool creation.

package/src/task/worker.ts

@@ -14,7 +14,6 @@
  */
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { setPreludeDocsCache } from "@oh-my-pi/pi-coding-agent/ipy/executor";
 import { logger, postmortem, untilAborted } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
 import { ModelRegistry } from "../config/model-registry";
@@ -22,6 +21,7 @@ import { parseModelPattern, parseModelString } from "../config/model-resolver";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import { SettingsManager } from "../config/settings-manager";
 import type { CustomTool } from "../extensibility/custom-tools/types";
+import { setPreludeDocsCache } from "../ipy/executor";
 import { type LspToolDetails, lspSchema } from "../lsp/types";
 import lspDescription from "../prompts/tools/lsp.md" with { type: "text" };
 import { createAgentSession, discoverAuthStorage, discoverModels } from "../sdk";

package/src/tools/bash.ts

@@ -85,10 +85,8 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 			throw new ToolError(`Working directory is not a directory: ${commandCwd}`);
 		}
 
-		// Auto-convert milliseconds to seconds if value > 1000 (16+ min is unreasonable)
-		let timeoutSec = rawTimeout > 1000 ? rawTimeout / 1000 : rawTimeout;
 		// Clamp to reasonable range: 1s - 3600s (1 hour)
-		timeoutSec = Math.max(1, Math.min(3600, timeoutSec));
+		const timeoutSec = Math.max(1, Math.min(3600, rawTimeout));
 		const timeoutMs = timeoutSec * 1000;
 
 		// Track output for streaming updates (tail only)

package/src/tools/enter-plan-mode.ts

@@ -1,15 +1,20 @@
 import * as fs from "node:fs/promises";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import { resolvePlanUrlToPath } from "@oh-my-pi/pi-coding-agent/internal-urls";
-import enterPlanModeDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/enter-plan-mode.md" with { type: "text" };
-import type { ToolSession } from "@oh-my-pi/pi-coding-agent/tools";
-import { ToolError } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
+import { StringEnum } from "@oh-my-pi/pi-ai";
 import { isEnoent } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import { resolvePlanUrlToPath } from "../internal-urls";
+import enterPlanModeDescription from "../prompts/tools/enter-plan-mode.md" with { type: "text" };
+import type { ToolSession } from ".";
+import { ToolError } from "./tool-errors";
 
 const enterPlanModeSchema = Type.Object({
-	workflow: Type.Optional(Type.Union([Type.Literal("parallel"), Type.Literal("iterative")])),
+	workflow: Type.Optional(
+		StringEnum(["parallel", "iterative"], {
+			description: "Planning workflow to use",
+		}),
+	),
 });
 
 export interface EnterPlanModeDetails {