@oh-my-pi/pi-coding-agent 13.3.13 → 13.4.0

package/src/modes/components/index.ts

@@ -1,41 +1,36 @@
 // UI Components barrel export
-export { AssistantMessageComponent } from "./assistant-message";
-export { BashExecutionComponent } from "./bash-execution";
-export { BorderedLoader } from "./bordered-loader";
-export { BranchSummaryMessageComponent } from "./branch-summary-message";
-export { CompactionSummaryMessageComponent } from "./compaction-summary-message";
-export { CountdownTimer } from "./countdown-timer";
-export { CustomEditor } from "./custom-editor";
-export { CustomMessageComponent } from "./custom-message";
-export { type RenderDiffOptions, renderDiff } from "./diff";
-export { DynamicBorder } from "./dynamic-border";
-export { FooterComponent } from "./footer";
-export { HookEditorComponent } from "./hook-editor";
-export { HookInputComponent, type HookInputOptions } from "./hook-input";
-export { HookMessageComponent } from "./hook-message";
-export { HookSelectorComponent } from "./hook-selector";
-export { appKey, appKeyHint, editorKey, keyHint, rawKeyHint } from "./keybinding-hints";
-export { LoginDialogComponent } from "./login-dialog";
-export { ModelSelectorComponent } from "./model-selector";
-export { OAuthSelectorComponent } from "./oauth-selector";
-export { QueueModeSelectorComponent } from "./queue-mode-selector";
-export { ReadToolGroupComponent } from "./read-tool-group";
-export { SessionSelectorComponent } from "./session-selector";
-export {
-	type SettingsCallbacks,
-	type SettingsRuntimeContext,
-	SettingsSelectorComponent,
-	type StatusLinePreviewSettings,
-} from "./settings-selector";
-export { ShowImagesSelectorComponent } from "./show-images-selector";
-export { StatusLineComponent } from "./status-line";
-export { ThemeSelectorComponent } from "./theme-selector";
-export { ThinkingSelectorComponent } from "./thinking-selector";
-export { TodoReminderComponent } from "./todo-reminder";
-export { ToolExecutionComponent, type ToolExecutionHandle, type ToolExecutionOptions } from "./tool-execution";
-export { TreeSelectorComponent } from "./tree-selector";
-export { TtsrNotificationComponent } from "./ttsr-notification";
-export { UserMessageComponent } from "./user-message";
-export { UserMessageSelectorComponent } from "./user-message-selector";
-export { truncateToVisualLines, type VisualTruncateResult } from "./visual-truncate";
-export { type LspServerInfo, type RecentSession, WelcomeComponent } from "./welcome";
+export * from "./assistant-message";
+export * from "./bash-execution";
+export * from "./bordered-loader";
+export * from "./branch-summary-message";
+export * from "./compaction-summary-message";
+export * from "./countdown-timer";
+export * from "./custom-editor";
+export * from "./custom-message";
+export * from "./diff";
+export * from "./dynamic-border";
+export * from "./footer";
+export * from "./hook-editor";
+export * from "./hook-input";
+export * from "./hook-message";
+export * from "./hook-selector";
+export * from "./keybinding-hints";
+export * from "./login-dialog";
+export * from "./model-selector";
+export * from "./oauth-selector";
+export * from "./queue-mode-selector";
+export * from "./read-tool-group";
+export * from "./session-selector";
+export * from "./settings-selector";
+export * from "./show-images-selector";
+export * from "./status-line";
+export * from "./theme-selector";
+export * from "./thinking-selector";
+export * from "./todo-reminder";
+export * from "./tool-execution";
+export * from "./tree-selector";
+export * from "./ttsr-notification";
+export * from "./user-message";
+export * from "./user-message-selector";
+export * from "./visual-truncate";
+export * from "./welcome";

package/src/modes/interactive-mode.ts

@@ -702,7 +702,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		await this.session.prompt(prompt, { synthetic: true });
 	}
 
-	async handlePlanModeCommand(): Promise<void> {
+	async handlePlanModeCommand(initialPrompt?: string): Promise<void> {
 		if (this.planModeEnabled) {
 			const confirmed = await this.showHookConfirm(
 				"Exit plan mode?",
@@ -713,6 +713,9 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 		await this.#enterPlanMode();
+		if (initialPrompt) {
+			this.onInputCallback?.({ text: initialPrompt });
+		}
 	}
 
 	async handleExitPlanModeTool(details: ExitPlanModeDetails): Promise<void> {

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

@@ -23,13 +23,7 @@ import type {
 } from "./rpc-types";
 
 // Re-export types for consumers
-export type {
-	RpcCommand,
-	RpcExtensionUIRequest,
-	RpcExtensionUIResponse,
-	RpcResponse,
-	RpcSessionState,
-} from "./rpc-types";
+export type * from "./rpc-types";
 
 /**
  * Run in RPC mode.

package/src/modes/theme/theme.ts

@@ -1629,25 +1629,26 @@ function detectTerminalBackground(): "dark" | "light" {
 	if (terminalReportedAppearance) {
 		return terminalReportedAppearance;
 	}
-	// macOS: query system appearance via CoreFoundation (native, no shell).
-	// Uses cached observer value, or falls back to CFPreferencesCopyAppValue.
-	// Works on all terminals including Warp which lacks Mode 2031 / OSC 11.
-	const macAppearance = macOSReportedAppearance ?? detectMacOSAppearance();
-	if (macAppearance) {
-		return macAppearance;
-	}
-	// Fallback: COLORFGBG environment variable (static, set once at terminal launch)
+	// COLORFGBG is set by the terminal emulator to reflect the actual profile colors.
+	// Check it before macOS system appearance because the terminal profile may differ
+	// from the OS-level dark/light setting (e.g. dark terminal on macOS light mode).
 	const colorfgbg = Bun.env.COLORFGBG || "";
 	if (colorfgbg) {
 		const parts = colorfgbg.split(";");
 		if (parts.length >= 2) {
 			const bg = parseInt(parts[1], 10);
 			if (!Number.isNaN(bg)) {
-				const result = bg < 8 ? "dark" : "light";
-				return result;
+				return bg < 8 ? "dark" : "light";
 			}
 		}
 	}
+	// macOS: query system appearance via CoreFoundation (native, no shell).
+	// Uses cached observer value, or falls back to CFPreferencesCopyAppValue.
+	// Works on all terminals including Warp which lacks Mode 2031 / OSC 11.
+	const macAppearance = macOSReportedAppearance ?? detectMacOSAppearance();
+	if (macAppearance) {
+		return macAppearance;
+	}
 	return "dark";
 }
 

package/src/modes/types.ts

@@ -197,7 +197,7 @@ export interface InteractiveModeContext {
 	toggleThinkingBlockVisibility(): void;
 	openExternalEditor(): void;
 	registerExtensionShortcuts(): void;
-	handlePlanModeCommand(): Promise<void>;
+	handlePlanModeCommand(initialPrompt?: string): Promise<void>;
 	handleExitPlanModeTool(details: ExitPlanModeDetails): Promise<void>;
 
 	// Hook UI methods

package/src/patch/index.ts

@@ -48,30 +48,14 @@ import { EditMatchError } from "./types";
 // Application
 export { applyPatch, defaultFileSystem, previewPatch } from "./applicator";
 // Diff generation
-export {
-	computeEditDiff,
-	computeHashlineDiff,
-	computePatchDiff,
-	generateDiffString,
-	generateUnifiedDiffString,
-	replaceText,
-} from "./diff";
+export * from "./diff";
 
 // Fuzzy matching
-export { DEFAULT_FUZZY_THRESHOLD, findContextLine, findMatch as findEditMatch, findMatch, seekSequence } from "./fuzzy";
+export * from "./fuzzy";
 // Hashline
-export {
-	applyHashlineEdits,
-	computeLineHash,
-	formatHashLines,
-	HashlineMismatchError,
-	parseTag,
-	streamHashLinesFromLines,
-	streamHashLinesFromUtf8,
-	validateLineRef,
-} from "./hashline";
+export * from "./hashline";
 // Normalization
-export { adjustIndentation, detectLineEnding, normalizeToLF, restoreLineEndings, stripBom } from "./normalize";
+export * from "./normalize";
 // Parsing
 export { normalizeCreateContent, normalizeDiff, parseHunks as parseDiffHunks } from "./parser";
 export type { EditRenderContext, EditToolDetails } from "./shared";

package/src/prompts/system/system-prompt.md

@@ -154,13 +154,28 @@ Semantic questions **MUST** be answered with semantic tools.
 - Can the server propose fixes/imports/refactors? → `lsp code_actions` (list first, then apply with `apply: true` + `query`)
 {{/has}}
 
-{{#ifAny (includes tools "ast_find") (includes tools "ast_replace")}}
+{{#ifAny (includes tools "ast_grep") (includes tools "ast_edit")}}
 ### AST tools for structural code work
 
 When AST tools are available, syntax-aware operations take priority over text hacks.
-{{#has tools "ast_find"}}- Use `ast_find` for structural discovery (call shapes, declarations, syntax patterns) before text grep when code structure matters{{/has}}
-{{#has tools "ast_replace"}}- Use `ast_replace` for structural codemods/replacements; do not use bash `sed`/`perl`/`awk` for syntax-level rewrites{{/has}}
+{{#has tools "ast_grep"}}- Use `ast_grep` for structural discovery (call shapes, declarations, syntax patterns) before text grep when code structure matters{{/has}}
+{{#has tools "ast_edit"}}- Use `ast_edit` for structural codemods/replacements; do not use bash `sed`/`perl`/`awk` for syntax-level rewrites{{/has}}
 - Use `grep` for plain text/regex lookup only when AST shape is irrelevant
+
+#### Pattern syntax
+
+Patterns match **AST structure, not text** — whitespace and formatting are irrelevant. `foo( x, y )` and `foo(x,y)` are the same pattern.
+
+|Syntax|Name|Matches|
+|---|---|---|
+|`$VAR`|Capture|One AST node, bound as `$VAR`|
+|`$_`|Wildcard|One AST node, not captured|
+|`$$$VAR`|Variadic capture|Zero or more nodes, bound as `$VAR`|
+|`$$$`|Variadic wildcard|Zero or more nodes, not captured|
+
+Metavariable names **MUST** be UPPERCASE (`$A`, `$FUNC`, `$MY_VAR`). Lowercase `$var` is invalid.
+
+When a metavariable appears multiple times in one pattern, all occurrences must match **identical** code: `$A == $A` matches `x == x` but not `x == y`.
 {{/ifAny}}
 {{#if eagerTasks}}
 <eager-tasks>
@@ -244,7 +259,6 @@ Justify sequential work; default parallel. Cannot articulate why B depends on A
 - You **MUST NOT** yield without proof when non-trivial work, self-assessment is deceptive: tests, linters, type checks, repro steps… exhaust all external verification.
 ## 8. Handoff
 Before finishing, you **MUST**:
-- List all commands run and confirm they passed.
 - Summarize changes with file and line references.
 - Call out TODOs, follow-up work, or uncertainties — no surprises are **PERMITTED**.
 

package/src/prompts/tools/ast-edit.md

@@ -0,0 +1,33 @@
+Performs structural AST-aware rewrites via native ast-grep.
+
+<instruction>
+- Use for codemods and structural rewrites where plain text replace is unsafe
+- Narrow scope with `path` before replacing (`path` accepts files, directories, or glob patterns)
+- Default to language-scoped rewrites in mixed repositories: set `lang` and keep `path` narrow
+- Always returns a preview; after reviewing, call `resolve` with `action: "apply"` or `action: "discard"`
+- Treat parse issues as a scoping signal: tighten `path`/`lang` before retrying
+- Metavariables captured in each rewrite pattern (`$A`, `$$$ARGS`) are substituted into that entry's rewrite template
+- Each matched rewrite is a 1:1 structural substitution; you cannot split one capture into multiple nodes or merge multiple captures into one node
+</instruction>
+
+<output>
+- Returns replacement summary, per-file replacement counts, and change previews
+- Reports whether changes were applied or only previewed
+- Includes parse issues when files cannot be processed
+</output>
+
+<examples>
+- Rename a call site across a directory, preview first:
+  `{"ops":[{"pat":"oldApi($$$ARGS)","out":"newApi($$$ARGS)"}],"lang":"typescript","path":"src/"}`
+- Multi-op codemod preview before resolving:
+  `{"ops":[{"pat":"require($A)","out":"import $A"},{"pat":"module.exports = $E","out":"export default $E"}],"lang":"javascript","path":"src/"}`
+- Swap two arguments using captures:
+  `{"ops":[{"pat":"assertEqual($A, $B)","out":"assertEqual($B, $A)"}],"lang":"typescript","path":"tests/"}`
+</examples>
+
+<critical>
+- `ops` **MUST** contain at least one concrete `{ pat, out }` entry
+- If the path pattern spans multiple languages, set `lang` explicitly for deterministic rewrites
+- Review preview output, then use the `resolve` tool to apply or discard (with a reason)
+- For one-off local text edits, prefer the Edit tool instead of AST edit
+</critical>

package/src/prompts/tools/ast-grep.md

@@ -0,0 +1,34 @@
+Performs structural code search using AST matching via native ast-grep.
+
+<instruction>
+- Use this when syntax shape matters more than raw text (calls, declarations, specific language constructs)
+- Prefer a precise `path` scope to keep results targeted and deterministic (`path` accepts files, directories, or glob patterns)
+- Default to language-scoped search in mixed repositories: pair `path` glob + explicit `lang` to avoid parse-noise from non-source files
+- `patterns` is required and must include at least one non-empty AST pattern; `lang` is optional (`lang` is inferred per file extension when omitted)
+- Multiple patterns run in one native pass; results are merged and then `offset`/`limit` are applied to the combined match set
+- Use `selector` only for contextual pattern mode; otherwise provide direct patterns
+- For variadic arguments/fields, use `$$$NAME` (not `$$NAME`)
+- Patterns match AST structure, not text — whitespace/formatting differences are ignored
+- When the same metavariable appears multiple times, all occurrences must match identical code
+</instruction>
+
+<output>
+- Returns grouped matches with file path, byte range, line/column ranges, and metavariable captures
+- Includes summary counts (`totalMatches`, `filesWithMatches`, `filesSearched`) and parse issues when present
+</output>
+
+<examples>
+- Find all console logging calls in one pass (multi-pattern, scoped):
+  `{"patterns":["console.log($$$)","console.error($$$)"],"lang":"typescript","path":"src/"}`
+- Capture and inspect metavariable bindings from a pattern:
+  `{"patterns":["require($MOD)"],"lang":"javascript","path":"src/"}`
+- Contextual pattern with selector — match only the identifier `foo`, not the whole call:
+  `{"patterns":["foo()"],"selector":"identifier","lang":"typescript","path":"src/utils.ts"}`
+</examples>
+
+<critical>
+- `patterns` is required
+- Set `lang` explicitly to constrain matching when path pattern spans mixed-language trees
+- Avoid repo-root AST scans when the target is language-specific; narrow `path` first
+- If exploration is broad/open-ended across subsystems, use Task tool with explore subagent first
+</critical>

package/src/prompts/tools/bash.md

@@ -35,8 +35,8 @@ You **MUST** use specialized tools instead of bash for ALL file operations:
 |`ls dir/`|`read(path="dir/")`|
 |`cat <<'EOF' > file`|`write(path="file", content="...")`|
 |`sed -i 's/old/new/' file`|`edit(path="file", edits=[...])`|
-- If `ast_find` / `ast_replace` tools are available in the session, you **MUST** use them for structural code search/rewrites instead of bash `grep`/`sed`/`awk`/`perl` pipelines
-- Bash is for command execution, not syntax-aware code transformation; prefer `ast_find` for discovery and `ast_replace` for codemods
+- If `ast_grep` / `ast_edit` tools are available in the session, you **MUST** use them for structural code search/rewrites instead of bash `grep`/`sed`/`awk`/`perl` pipelines
+- Bash is for command execution, not syntax-aware code transformation; prefer `ast_grep` for discovery and `ast_edit` for codemods
 - You **MUST NOT** use Bash for these operations like read, grep, find, edit, write, where specialized tools exist.
 - You **MUST NOT** use `2>&1` | `2>/dev/null` pattern, stdout and stderr are already merged.
 - You **MUST NOT** use `| head -n 50` or `| tail -n 100` pattern, use `head` and `tail` parameters instead.

package/src/prompts/tools/hashline.md

@@ -247,4 +247,5 @@ Good — anchors to structural line:
 - Every tag **MUST** be copied exactly from fresh tool result as `N#ID`.
 - You **MUST** re-read after each edit call before issuing another on same file.
 - Formatting is a batch operation. You **MUST** never use this tool for formatting.
+- `lines` entries **MUST** be literal file content with real space indentation. (`\\t` in JSON inserts a literal backslash-t into the file, not a tab.)
 </critical>

package/src/prompts/tools/resolve.md

@@ -0,0 +1,8 @@
+Resolves a pending preview action by either applying or discarding it.
+- `action` is required:
+  - `"apply"` persists the pending changes.
+  - `"discard"` rejects the pending changes.
+- `reason` is required and must explain why you chose to apply or discard.
+
+This tool is only valid when a pending action exists (typically after a preview step).
+If no pending action exists, the call fails with an error.

package/src/sdk.ts

@@ -84,9 +84,11 @@ import {
 	FindTool,
 	GrepTool,
 	getSearchTools,
+	HIDDEN_TOOLS,
 	loadSshTool,
 	PythonTool,
 	ReadTool,
+	ResolveTool,
 	setPreferredImageProvider,
 	setPreferredSearchProvider,
 	type Tool,
@@ -96,6 +98,8 @@ import {
 } from "./tools";
 import { ToolContextStore } from "./tools/context";
 import { getGeminiImageTools } from "./tools/gemini-image";
+import { wrapToolWithMetaNotice } from "./tools/output-meta";
+import { PendingActionStore } from "./tools/pending-action";
 import { EventBus } from "./utils/event-bus";
 
 // Types
@@ -205,13 +209,7 @@ export type { PromptTemplate } from "./config/prompt-templates";
 export { Settings, type SkillsSettings } from "./config/settings";
 export type { CustomCommand, CustomCommandFactory } from "./extensibility/custom-commands/types";
 export type { CustomTool, CustomToolFactory } from "./extensibility/custom-tools/types";
-export type {
-	ExtensionAPI,
-	ExtensionCommandContext,
-	ExtensionContext,
-	ExtensionFactory,
-	ToolDefinition,
-} from "./extensibility/extensions";
+export type * from "./extensibility/extensions";
 export type { Skill } from "./extensibility/skills";
 export type { FileSlashCommand } from "./extensibility/slash-commands";
 export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResult } from "./mcp";
@@ -222,6 +220,7 @@ export {
 	BashTool,
 	// Tool classes and factories
 	BUILTIN_TOOLS,
+	HIDDEN_TOOLS,
 	createTools,
 	EditTool,
 	FindTool,
@@ -229,6 +228,7 @@ export {
 	loadSshTool,
 	PythonTool,
 	ReadTool,
+	ResolveTool,
 	WriteTool,
 	type ToolSession,
 };
@@ -776,6 +776,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			})
 		: undefined;
 
+	const pendingActionStore = new PendingActionStore();
 	const toolSession: ToolSession = {
 		cwd,
 		hasUI: options.hasUI ?? false,
@@ -816,6 +817,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		authStorage,
 		modelRegistry,
 		asyncJobManager,
+		pendingActionStore,
 	};
 
 	// Initialize internal URL router for internal protocols (agent://, artifact://, memory://, skill://, rule://, local://)
@@ -924,6 +926,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		[],
 		cwd,
 		builtInToolNames,
+		pendingActionStore,
 	);
 	for (const { path, error } of discoveredCustomTools.errors) {
 		logger.error("Custom tool load failed", { path, error });
@@ -1109,6 +1112,16 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		toolRegistry.delete("edit");
 	}
 
+	const hasDeferrableTools = Array.from(toolRegistry.values()).some(tool => tool.deferrable === true);
+	if (!hasDeferrableTools) {
+		toolRegistry.delete("resolve");
+	} else if (!toolRegistry.has("resolve")) {
+		const resolveTool = await logger.timeAsync("createTools:resolve:session", HIDDEN_TOOLS.resolve, toolSession);
+		if (resolveTool) {
+			toolRegistry.set(resolveTool.name, wrapToolWithMetaNotice(resolveTool) as AgentTool);
+		}
+	}
+
 	let cursorEventEmitter: ((event: AgentEvent) => void) | undefined;
 	const cursorExecHandlers = new CursorExecHandlers({
 		cwd,
@@ -1307,6 +1320,12 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			return result;
 		},
 		intentTracing: !!intentField,
+		getToolChoice: () => {
+			if (pendingActionStore.hasPending) {
+				return { type: "function", name: "resolve" };
+			}
+			return undefined;
+		},
 	});
 	cursorEventEmitter = event => agent.emitExternalEvent(event);
 
@@ -1343,6 +1362,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		forceCopilotAgentInitiator,
 		obfuscator,
 		asyncJobManager,
+		pendingActionStore,
 	});
 
 	if (model?.api === "openai-codex-responses") {

package/src/session/agent-session.ts

@@ -86,6 +86,7 @@ import ttsrInterruptTemplate from "../prompts/system/ttsr-interrupt.md" with { t
 import type { SecretObfuscator } from "../secrets/obfuscator";
 import { outputMeta } from "../tools/output-meta";
 import { resolveToCwd } from "../tools/path-utils";
+import type { PendingActionStore } from "../tools/pending-action";
 import { getLatestTodoPhasesFromEntries, type TodoItem, type TodoPhase } from "../tools/todo-write";
 import { parseCommandArgs } from "../utils/command-args";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
@@ -177,6 +178,8 @@ export interface AgentSessionConfig {
 	forceCopilotAgentInitiator?: boolean;
 	/** Secret obfuscator for deobfuscating streaming edit content */
 	obfuscator?: SecretObfuscator;
+	/** Pending action store for preview/apply workflows */
+	pendingActionStore?: PendingActionStore;
 }
 
 /** Options for AgentSession.prompt() */
@@ -368,6 +371,7 @@ export class AgentSession {
 	#streamingEditFileCache = new Map<string, string>();
 	#promptInFlight = false;
 	#obfuscator: SecretObfuscator | undefined;
+	#pendingActionStore: PendingActionStore | undefined;
 	#promptGeneration = 0;
 	#providerSessionState = new Map<string, ProviderSessionState>();
 
@@ -392,6 +396,7 @@ export class AgentSession {
 		this.#forceCopilotAgentInitiator = config.forceCopilotAgentInitiator ?? false;
 		this.#obfuscator = config.obfuscator;
 		this.agent.providerSessionState = this.#providerSessionState;
+		this.#pendingActionStore = config.pendingActionStore;
 		this.#syncTodoPhasesFromBranch();
 
 		// Always subscribe to agent events for internal handling
@@ -651,17 +656,12 @@ export class AgentSession {
 			}
 
 			if (event.message.role === "toolResult") {
-				const { toolName, $normative, toolCallId, details, isError, content } = event.message as {
+				const { toolName, details, isError, content } = event.message as {
 					toolName?: string;
-					toolCallId?: string;
 					details?: { path?: string; phases?: TodoPhase[] };
-					$normative?: Record<string, unknown>;
 					isError?: boolean;
 					content?: Array<TextContent | ImageContent>;
 				};
-				if ($normative && toolCallId && this.settings.get("normativeRewrite")) {
-					await this.#rewriteToolCallArgs(toolCallId, $normative);
-				}
 				// Invalidate streaming edit cache when edit tool completes to prevent stale data
 				if (toolName === "edit" && details?.path) {
 					this.#invalidateFileCacheForPath(details.path);
@@ -688,6 +688,22 @@ export class AgentSession {
 						{ deliverAs: "nextTurn" },
 					);
 				}
+				if (!isError && this.#pendingActionStore?.hasPending) {
+					const reminderText = [
+						"<system-reminder>",
+						"This is a preview. Call the `resolve` tool to apply or discard these changes.",
+						"</system-reminder>",
+					].join("\n");
+					await this.sendCustomMessage(
+						{
+							customType: "resolve-reminder",
+							content: reminderText,
+							display: false,
+							details: { toolName },
+						},
+						{ deliverAs: "nextTurn" },
+					);
+				}
 			}
 		}
 
@@ -1259,33 +1275,6 @@ export class AgentSession {
 		}
 	}
 
-	/** Rewrite tool call arguments in agent state and persisted session history. */
-	async #rewriteToolCallArgs(toolCallId: string, args: Record<string, unknown>): Promise<void> {
-		let updated = false;
-		const messages = this.agent.state.messages;
-		for (let i = messages.length - 1; i >= 0; i--) {
-			const msg = messages[i];
-			if (msg.role !== "assistant") continue;
-			const assistantMsg = msg as AssistantMessage;
-			if (!Array.isArray(assistantMsg.content)) continue;
-			for (const block of assistantMsg.content) {
-				if (typeof block !== "object" || block === null) continue;
-				if (!("type" in block) || (block as { type?: string }).type !== "toolCall") continue;
-				const toolCall = block as { id?: string; arguments?: Record<string, unknown> };
-				if (toolCall.id === toolCallId) {
-					toolCall.arguments = args;
-					updated = true;
-					break;
-				}
-			}
-			if (updated) break;
-		}
-
-		if (updated) {
-			await this.sessionManager.rewriteAssistantToolCallArgs(toolCallId, args);
-		}
-	}
-
 	/** Emit extension events based on session events */
 	async #emitExtensionEvent(event: AgentSessionEvent): Promise<void> {
 		if (!this.#extensionRunner) return;
@@ -3200,7 +3189,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 			this.model && assistantMessage.provider === this.model.provider && assistantMessage.model === this.model.id;
 		// This handles the case where an error was kept after compaction (in the "kept" region).
 		// The error shouldn't trigger another compaction since we already compacted.
-		// Example: opus fails \u2192 switch to codex \u2192 compact \u2192 switch back to opus \u2192 opus error
+		// Example: opus fails -> switch to codex -> compact -> switch back to opus -> opus error
 		// is still in context but shouldn't trigger compaction again.
 		const compactionEntry = getLatestCompactionEntry(this.sessionManager.getBranch());
 		const errorIsFromBeforeCompaction =
@@ -3213,7 +3202,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 				this.agent.replaceMessages(messages.slice(0, -1));
 			}
 
-			// Try context promotion first \u2014 switch to a larger model and retry without compacting
+			// Try context promotion first - switch to a larger model and retry without compacting
 			const promoted = await this.#tryContextPromotion(assistantMessage);
 			if (promoted) {
 				// Retry on the promoted (larger) model without compacting
@@ -3221,7 +3210,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 				return;
 			}
 
-			// No promotion target available \u2014 fall through to compaction
+			// No promotion target available fall through to compaction
 			const compactionSettings = this.settings.getGroup("compaction");
 			if (compactionSettings.enabled) {
 				await this.#runAutoCompaction("overflow", true);

package/src/session/session-manager.ts

@@ -1819,36 +1819,6 @@ export class SessionManager {
 		await this.#rewriteFile();
 	}
 
-	/**
-	 * Rewrite tool call arguments in the most recent assistant message containing the toolCallId.
-	 * Returns true if a tool call was updated.
-	 */
-	async rewriteAssistantToolCallArgs(toolCallId: string, args: Record<string, unknown>): Promise<boolean> {
-		let updated = false;
-		for (let i = this.#fileEntries.length - 1; i >= 0; i--) {
-			const entry = this.#fileEntries[i];
-			if (entry.type !== "message" || entry.message.role !== "assistant") continue;
-			const message = entry.message as { content?: unknown };
-			if (!Array.isArray(message.content)) continue;
-			for (const block of message.content) {
-				if (typeof block !== "object" || block === null) continue;
-				if (!("type" in block) || (block as { type?: string }).type !== "toolCall") continue;
-				const toolCall = block as { id?: string; arguments?: Record<string, unknown> };
-				if (toolCall.id === toolCallId) {
-					toolCall.arguments = args;
-					updated = true;
-					break;
-				}
-			}
-			if (updated) break;
-		}
-
-		if (updated && this.persist && this.#sessionFile) {
-			await this.#rewriteFile();
-		}
-		return updated;
-	}
-
 	/**
 	 * Append a custom message entry (for extensions) that participates in LLM context.
 	 * @param customType Hook identifier for filtering on reload

package/src/slash-commands/builtin-registry.ts

@@ -75,8 +75,10 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 	{
 		name: "plan",
 		description: "Toggle plan mode (agent plans before executing)",
-		handle: async (_command, runtime) => {
-			await runtime.ctx.handlePlanModeCommand();
+		inlineHint: "[prompt]",
+		allowArgs: true,
+		handle: async (command, runtime) => {
+			await runtime.ctx.handlePlanModeCommand(command.args || undefined);
 			runtime.ctx.editor.setText("");
 		},
 	},

package/src/stt/index.ts

@@ -1,3 +1,3 @@
-export { type DownloadProgress, ensureSTTDependencies } from "./downloader";
-export { checkDependencies, formatDependencyStatus, type STTDependencyStatus } from "./setup";
-export { STTController, type SttState } from "./stt-controller";
+export * from "./downloader";
+export * from "./setup";
+export * from "./stt-controller";

package/src/task/types.ts

@@ -34,8 +34,8 @@ export const TASK_SUBAGENT_PROGRESS_CHANNEL = "task:subagent:progress";
 /** Single task item for parallel execution */
 export const taskItemSchema = Type.Object({
 	id: Type.String({
-		description: "CamelCase identifier, max 32 chars",
-		maxLength: 32,
+		description: "CamelCase identifier, max 48 chars",
+		maxLength: 48,
 	}),
 	description: Type.String({
 		description: "Short one-liner for UI display only — not seen by the subagent",