@oh-my-pi/pi-coding-agent 13.9.15 → 13.9.16

package/src/modes/interactive-mode.ts

@@ -54,7 +54,7 @@ import {
 	onThemeChange,
 	theme,
 } from "./theme/theme";
-import type { CompactionQueuedMessage, InteractiveModeContext, TodoItem, TodoPhase } from "./types";
+import type { CompactionQueuedMessage, InteractiveModeContext, SubmittedUserInput, TodoItem, TodoPhase } from "./types";
 import { UiHelpers } from "./utils/ui-helpers";
 
 const EDITOR_MAX_HEIGHT_MIN = 6;
@@ -121,8 +121,9 @@ export class InteractiveMode implements InteractiveModeContext {
 	autoCompactionEscapeHandler?: () => void;
 	retryEscapeHandler?: () => void;
 	unsubscribe?: () => void;
-	onInputCallback?: (input: { text: string; images?: ImageContent[] }) => void;
+	onInputCallback?: (input: SubmittedUserInput) => void;
 	optimisticUserMessageSignature: string | undefined = undefined;
+	#pendingSubmittedInput: SubmittedUserInput | undefined;
 	lastSigintTime = 0;
 	lastEscapeTime = 0;
 	shutdownRequested = false;
@@ -397,8 +398,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.session.setSlashCommands(fileCommands);
 	}
 
-	async getUserInput(): Promise<{ text: string; images?: ImageContent[] }> {
-		const { promise, resolve } = Promise.withResolvers<{ text: string; images?: ImageContent[] }>();
+	async getUserInput(): Promise<SubmittedUserInput> {
+		const { promise, resolve } = Promise.withResolvers<SubmittedUserInput>();
 		this.onInputCallback = input => {
 			this.onInputCallback = undefined;
 			resolve(input);
@@ -406,6 +407,64 @@ export class InteractiveMode implements InteractiveModeContext {
 		return promise;
 	}
 
+	startPendingSubmission(input: { text: string; images?: ImageContent[] }): SubmittedUserInput {
+		const submission: SubmittedUserInput = {
+			text: input.text,
+			images: input.images,
+			cancelled: false,
+			started: false,
+		};
+		this.#pendingSubmittedInput = submission;
+		this.optimisticUserMessageSignature = `${submission.text}\u0000${submission.images?.length ?? 0}`;
+		this.addMessageToChat({
+			role: "user",
+			content: [{ type: "text", text: submission.text }, ...(submission.images ?? [])],
+			attribution: "user",
+			timestamp: Date.now(),
+		});
+		this.editor.setText("");
+		this.ensureLoadingAnimation();
+		this.ui.requestRender();
+		return submission;
+	}
+
+	cancelPendingSubmission(): boolean {
+		const submission = this.#pendingSubmittedInput;
+		if (!submission || submission.started) {
+			return false;
+		}
+
+		submission.cancelled = true;
+		this.#pendingSubmittedInput = undefined;
+		this.optimisticUserMessageSignature = undefined;
+		this.#pendingWorkingMessage = undefined;
+		if (this.loadingAnimation) {
+			this.loadingAnimation.stop();
+			this.loadingAnimation = undefined;
+			this.statusContainer.clear();
+		}
+		this.pendingImages = submission.images ? [...submission.images] : [];
+		this.rebuildChatFromMessages();
+		this.editor.setText(submission.text);
+		this.updateEditorBorderColor();
+		this.ui.requestRender();
+		return true;
+	}
+
+	markPendingSubmissionStarted(input: SubmittedUserInput): boolean {
+		if (this.#pendingSubmittedInput !== input || input.cancelled) {
+			return false;
+		}
+		input.started = true;
+		return true;
+	}
+
+	finishPendingSubmission(input: SubmittedUserInput): void {
+		if (this.#pendingSubmittedInput === input) {
+			this.#pendingSubmittedInput = undefined;
+		}
+	}
+
 	#computeEditorMaxHeight(): number {
 		const rows = this.ui.terminal.rows;
 		const terminalRows = Number.isFinite(rows) && rows > 0 ? rows : EDITOR_FALLBACK_ROWS;
@@ -713,8 +772,8 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 		await this.#enterPlanMode();
-		if (initialPrompt) {
-			this.onInputCallback?.({ text: initialPrompt });
+		if (initialPrompt && this.onInputCallback) {
+			this.onInputCallback(this.startPendingSubmission({ text: initialPrompt }));
 		}
 	}
 
@@ -855,6 +914,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	showError(message: string): void {
+		this.#pendingSubmittedInput = undefined;
 		this.optimisticUserMessageSignature = undefined;
 		this.#pendingWorkingMessage = undefined;
 		if (this.loadingAnimation) {

package/src/modes/types.ts

@@ -27,6 +27,13 @@ export type CompactionQueuedMessage = {
 	mode: "steer" | "followUp";
 };
 
+export type SubmittedUserInput = {
+	text: string;
+	images?: ImageContent[];
+	cancelled: boolean;
+	started: boolean;
+};
+
 export type TodoStatus = "pending" | "in_progress" | "completed" | "abandoned";
 
 export type TodoItem = {
@@ -87,7 +94,7 @@ export interface InteractiveModeContext {
 	autoCompactionEscapeHandler?: () => void;
 	retryEscapeHandler?: () => void;
 	unsubscribe?: () => void;
-	onInputCallback?: (input: { text: string; images?: ImageContent[] }) => void;
+	onInputCallback?: (input: SubmittedUserInput) => void;
 	optimisticUserMessageSignature: string | undefined;
 	lastSigintTime: number;
 	lastEscapeTime: number;
@@ -129,6 +136,10 @@ export interface InteractiveModeContext {
 	setWorkingMessage(message?: string): void;
 	applyPendingWorkingMessage(): void;
 	ensureLoadingAnimation(): void;
+	startPendingSubmission(input: { text: string; images?: ImageContent[] }): SubmittedUserInput;
+	cancelPendingSubmission(): boolean;
+	markPendingSubmissionStarted(input: SubmittedUserInput): boolean;
+	finishPendingSubmission(input: SubmittedUserInput): void;
 	isKnownSlashCommand(text: string): boolean;
 	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): void;
 	renderSessionContext(

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

@@ -79,6 +79,7 @@ You generate code inside-out: starting at the function body, working outward. Th
 - **Time:** You do not feel the cost of duplicating a pattern across six files, of a resource operation with no upper bound, of an escape hatch that bypasses the type system. Name these costs before you choose the easy path. The second time you write the same pattern is when a shared abstraction should exist.
 - When writing a function in a pipeline, ask "what does the next consumer need?" — not just "what do I need right now?"
 - **DRY at 2.** When you write the same pattern a second time, stop and extract a shared helper. Two copies is a maintenance fork. Three copies is a bug.
+- Write maintainable code. Add brief comments when they clarify non-obvious intent, invariants, edge cases, or tradeoffs. Prefer explaining why over restating what the code already does.
 - **Earn every line.** A 12-line switch for a 3-way mapping is a lookup table. A one-liner wrapper that exists only for test access is a design smell.
 </code-integrity>
 
@@ -230,7 +231,7 @@ Don't open a file hoping. Hope is not a strategy.
 {{#has tools "grep"}}- `grep` to locate target{{/has}}
 {{#has tools "find"}}- `find` to map it{{/has}}
 {{#has tools "read"}}- `read` with offset/limit, not whole file{{/has}}
-{{#has tools "task"}}- `task` to gather context if needed via explore agent{{/has}}
+{{#has tools "task"}}- `task` for investigate+edit in one pass — prefer this over a separate explore→task chain{{/has}}
 {{/ifAny}}
 
 {{#if (includes tools "inspect_image")}}

package/src/prompts/tools/python.md

@@ -6,7 +6,7 @@ Kernel persists across calls and cells; **imports, variables, and functions surv
 - You **SHOULD** use one logical step per cell (imports, define function, test it, use it)
 - You **SHOULD** pass multiple small cells in one call
 - You **SHOULD** define small functions you can reuse and debug individually
-- You **MUST** put explanations in assistant message or cell title, **MUST NOT** put them in code
+- You **MUST** put workflow explanations in assistant message or cell title
 **When something fails:**
 - Errors tell you which cell failed (e.g., "Cell 3 failed")
 - You **SHOULD** resubmit only the fixed cell (or fixed cell + remaining cells)

package/src/prompts/tools/task.md

@@ -22,7 +22,7 @@ Subagents lack your conversation history. Every decision, file content, and user
 - **MUST NOT** duplicate shared constraints across assignments — put them in `context` once.
 - **MUST NOT** tell tasks to run project-wide build/test/lint. Parallel agents share the working tree; each task edits, stops. Caller verifies after all complete.
 - For large payloads (traces, JSON blobs), write to `local://<path>` and pass the path in context.
-- If scope is unclear, run a **Discovery task** first to enumerate files and callsites, then fan out.
+- Prefer `task` agents that investigate **and** edit in one pass. Only launch a dedicated read-only discovery step when the affected files are genuinely unknown and cannot be inferred from the task description.
 </critical>
 
 <scope>

package/src/sdk.ts

@@ -612,9 +612,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const { authStorage, modelRegistry } = await logger.timeAsync("discoverModels", async () => {
 		const authStorage = options.authStorage ?? (await discoverAuthStorage(agentDir));
 		const modelRegistry = options.modelRegistry ?? new ModelRegistry(authStorage);
-		if (!options.modelRegistry) {
-			await modelRegistry.refresh();
-		}
 		return { authStorage, modelRegistry };
 	});
 
@@ -623,6 +620,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		async () => options.settings ?? (await Settings.init({ cwd, agentDir })),
 	);
 	logger.time("initializeWithSettings", initializeWithSettings, settings);
+	if (!options.modelRegistry) {
+		modelRegistry.refreshInBackground();
+	}
 	const skillsSettings = settings.getGroup("skills") as SkillsSettings;
 	const discoveredSkillsPromise =
 		options.skills === undefined ? discoverSkills(cwd, agentDir, skillsSettings) : undefined;
@@ -1358,6 +1358,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			tools: initialTools,
 		},
 		convertToLlm: convertToLlmFinal,
+		onPayload: extensionRunner
+			? async (payload, _model) => {
+					return extensionRunner.emitBeforeProviderRequest(payload);
+				}
+			: undefined,
 		sessionId: sessionManager.getSessionId(),
 		transformContext: extensionRunner
 			? async messages => {

package/src/session/agent-session.ts

@@ -4113,8 +4113,8 @@ export class AgentSession {
 	}
 
 	#isRetryableErrorMessage(errorMessage: string): boolean {
-		// Match: overloaded_error, rate limit, usage limit, 429, 500, 502, 503, 504, service unavailable, connection error, fetch failed, retry delay exceeded
-		return /overloaded|rate.?limit|usage.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|unable to connect|fetch failed|retry delay/i.test(
+		// Match: overloaded_error, rate limit, usage limit, 429, 500, 502, 503, 504, service unavailable, connection error, fetch failed, retry delay exceeded, stream stall
+		return /overloaded|rate.?limit|usage.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|unable to connect|fetch failed|retry delay|stream stall/i.test(
 			errorMessage,
 		);
 	}

package/src/session/compaction/utils.ts

@@ -104,6 +104,19 @@ export function upsertFileOperations(summary: string, readFiles: string[], modif
 // Message Serialization
 // ============================================================================
 
+/** Maximum characters for a tool result in serialized summaries. */
+const TOOL_RESULT_MAX_CHARS = 2000;
+
+/**
+ * Truncate text to a maximum character length for summarization.
+ * Keeps the beginning and appends a truncation marker.
+ */
+function truncateForSummary(text: string, maxChars: number): string {
+	if (text.length <= maxChars) return text;
+	const truncatedChars = text.length - maxChars;
+	return `${text.slice(0, maxChars)}\n\n[... ${truncatedChars} more characters truncated]`;
+}
+
 /**
  * Serialize LLM messages to text for summarization.
  * This prevents the model from treating it as a conversation to continue.
@@ -156,7 +169,7 @@ export function serializeConversation(messages: Message[]): string {
 				.map(c => c.text)
 				.join("");
 			if (content) {
-				parts.push(`[Tool result]: ${content}`);
+				parts.push(`[Tool result]: ${truncateForSummary(content, TOOL_RESULT_MAX_CHARS)}`);
 			}
 		}
 	}

package/src/tools/write.ts

@@ -152,9 +152,13 @@ function formatMetadataLine(lineCount: number | null, language: string | undefin
 	return uiTheme.fg("dim", `${icon}`);
 }
 
+function normalizeDisplayText(text: string): string {
+	return text.replace(/\r/g, "");
+}
+
 function formatStreamingContent(content: string, uiTheme: Theme): string {
 	if (!content) return "";
-	const lines = content.split("\n");
+	const lines = normalizeDisplayText(content).split("\n");
 	const displayLines = lines.slice(-WRITE_STREAMING_PREVIEW_LINES);
 	const hidden = lines.length - displayLines.length;
 
@@ -171,7 +175,7 @@ function formatStreamingContent(content: string, uiTheme: Theme): string {
 
 function renderContentPreview(content: string, expanded: boolean, uiTheme: Theme): string {
 	if (!content) return "";
-	const lines = content.split("\n");
+	const lines = normalizeDisplayText(content).split("\n");
 	const maxLines = expanded ? lines.length : Math.min(lines.length, WRITE_PREVIEW_LINES);
 	const displayLines = expanded ? lines : lines.slice(-maxLines);
 	const hidden = lines.length - displayLines.length;

package/src/utils/external-editor.ts

@@ -39,7 +39,7 @@ export async function openInEditor(
 		const [editor, ...editorArgs] = editorCmd.split(" ");
 		const stdio = options?.stdio ?? ["inherit", "inherit", "inherit"];
 
-		const child = spawn(editor, [...editorArgs, tmpFile], { stdio });
+		const child = spawn(editor, [...editorArgs, tmpFile], { stdio, shell: process.platform === "win32" });
 		const exitCode = await new Promise<number>((resolve, reject) => {
 			child.once("exit", (code, signal) => resolve(code ?? (signal ? -1 : 0)));
 			child.once("error", error => reject(error));

package/src/web/search/index.ts

@@ -26,34 +26,12 @@ import type { ToolSession } from "../../tools";
 import { formatAge } from "../../tools/render-utils";
 import { getSearchProvider, resolveProviderChain, type SearchProvider } from "./provider";
 import { renderSearchCall, renderSearchResult, type SearchRenderDetails } from "./render";
-import type { SearchResponse } from "./types";
+import type { SearchProviderId, SearchResponse } from "./types";
 import { SearchProviderError } from "./types";
 
-/** Web search parameters schema */
+/** Web search tool parameters schema */
 export const webSearchSchema = Type.Object({
 	query: Type.String({ description: "Search query" }),
-	provider: Type.Optional(
-		StringEnum(
-			[
-				"auto",
-				"exa",
-				"brave",
-				"jina",
-				"kimi",
-				"zai",
-				"anthropic",
-				"perplexity",
-				"gemini",
-				"codex",
-				"tavily",
-				"kagi",
-				"synthetic",
-			],
-			{
-				description: "Search provider (default: auto)",
-			},
-		),
-	),
 	recency: Type.Optional(
 		StringEnum(["day", "week", "month", "year"], {
 			description: "Recency filter (Brave, Perplexity)",
@@ -65,22 +43,8 @@ export const webSearchSchema = Type.Object({
 	num_search_results: Type.Optional(Type.Number({ description: "Number of search results to retrieve" })),
 });
 
-export type SearchParams = {
+export type SearchToolParams = {
 	query: string;
-	provider?:
-		| "auto"
-		| "exa"
-		| "brave"
-		| "jina"
-		| "kimi"
-		| "zai"
-		| "anthropic"
-		| "perplexity"
-		| "gemini"
-		| "codex"
-		| "tavily"
-		| "kagi"
-		| "synthetic";
 	recency?: "day" | "week" | "month" | "year";
 	limit?: number;
 	/** Maximum output tokens. Defaults to 4096. */
@@ -89,10 +53,12 @@ export type SearchParams = {
 	temperature?: number;
 	/** Number of search results to retrieve. Defaults to 10. */
 	num_search_results?: number;
-	/** Deprecated CLI flag; explicit provider fallback now happens only when provider is unavailable. */
-	no_fallback?: boolean;
 };
 
+export interface SearchQueryParams extends SearchToolParams {
+	provider?: SearchProviderId | "auto";
+}
+
 function formatProviderList(providers: SearchProvider[]): string {
 	return providers.map(provider => provider.label).join(", ");
 }
@@ -178,14 +144,14 @@ function formatForLLM(response: SearchResponse): string {
 /** Execute web search */
 async function executeSearch(
 	_toolCallId: string,
-	params: SearchParams,
+	params: SearchQueryParams,
 ): Promise<{ content: Array<{ type: "text"; text: string }>; details: SearchRenderDetails }> {
 	const providers =
 		params.provider && params.provider !== "auto"
 			? (await getSearchProvider(params.provider).isAvailable())
 				? [getSearchProvider(params.provider)]
 				: await resolveProviderChain("auto")
-			: await resolveProviderChain(params.provider);
+			: await resolveProviderChain();
 	if (providers.length === 0) {
 		const message = "No web search provider configured.";
 		return {
@@ -237,7 +203,7 @@ async function executeSearch(
  * Execute a web search query for CLI/testing workflows.
  */
 export async function runSearchQuery(
-	params: SearchParams,
+	params: SearchQueryParams,
 ): Promise<{ content: Array<{ type: "text"; text: string }>; details: SearchRenderDetails }> {
 	return executeSearch("cli-web-search", params);
 }
@@ -261,7 +227,7 @@ export class SearchTool implements AgentTool<typeof webSearchSchema, SearchRende
 
 	async execute(
 		_toolCallId: string,
-		params: SearchParams,
+		params: SearchToolParams,
 		_signal?: AbortSignal,
 		_onUpdate?: AgentToolUpdateCallback<SearchRenderDetails>,
 		_context?: AgentToolContext,
@@ -277,11 +243,17 @@ export const webSearchCustomTool: CustomTool<typeof webSearchSchema, SearchRende
 	description: renderPromptTemplate(webSearchDescription),
 	parameters: webSearchSchema,
 
-	async execute(toolCallId: string, params: SearchParams, _onUpdate, _ctx: CustomToolContext, _signal?: AbortSignal) {
+	async execute(
+		toolCallId: string,
+		params: SearchToolParams,
+		_onUpdate,
+		_ctx: CustomToolContext,
+		_signal?: AbortSignal,
+	) {
 		return executeSearch(toolCallId, params);
 	},
 
-	renderCall(args: SearchParams, options: RenderResultOptions, theme: Theme) {
+	renderCall(args: SearchToolParams, options: RenderResultOptions, theme: Theme) {
 		return renderSearchCall(args, options, theme);
 	},
 

package/src/web/search/render.ts

@@ -75,7 +75,6 @@ export function renderSearchResult(
 	theme: Theme,
 	args?: {
 		query?: string;
-		provider?: string;
 		allowLongAnswer?: boolean;
 		maxAnswerLines?: number;
 	},
@@ -282,13 +281,12 @@ export function renderSearchResult(
 
 /** Render web search call (query preview) */
 export function renderSearchCall(
-	args: { query?: string; provider?: string; [key: string]: unknown },
+	args: { query?: string; [key: string]: unknown },
 	_options: RenderResultOptions,
 	theme: Theme,
 ): Component {
-	const provider = args.provider ?? "auto";
 	const query = truncateToWidth(args.query ?? "", 80);
-	const text = renderStatusLine({ icon: "pending", title: "Web Search", description: query, meta: [provider] }, theme);
+	const text = renderStatusLine({ icon: "pending", title: "Web Search", description: query }, theme);
 	return new Text(text, 0, 0);
 }