@oh-my-pi/pi-coding-agent 12.6.0 → 12.7.0

package/src/modes/controllers/extension-ui-controller.ts

@@ -9,6 +9,7 @@ import type {
 	ExtensionError,
 	ExtensionUIContext,
 	ExtensionUIDialogOptions,
+	TerminalInputHandler,
 } from "../../extensibility/extensions";
 import { HookEditorComponent } from "../../modes/components/hook-editor";
 import { HookInputComponent } from "../../modes/components/hook-input";
@@ -20,6 +21,7 @@ import { setTerminalTitle } from "../../utils/title-generator";
 export class ExtensionUiController {
 	#hookSelectorOverlay: OverlayHandle | undefined;
 	#hookInputOverlay: OverlayHandle | undefined;
+	#extensionTerminalInputUnsubscribers = new Set<() => void>();
 
 	readonly #dialogOverlayOptions = {
 		anchor: "bottom-center",
@@ -41,6 +43,7 @@ export class ExtensionUiController {
 			confirm: (title, message, _dialogOptions) => this.showHookConfirm(title, message),
 			input: (title, placeholder, _dialogOptions) => this.showHookInput(title, placeholder),
 			notify: (message, type) => this.showHookNotify(message, type),
+			onTerminalInput: handler => this.addExtensionTerminalInputListener(handler),
 			setStatus: (key, text) => this.setHookStatus(key, text),
 			setWorkingMessage: message => this.ctx.setWorkingMessage(message),
 			setWidget: (key, content) => this.setHookWidget(key, content),
@@ -157,6 +160,7 @@ export class ExtensionUiController {
 				this.ctx.statusContainer.clear();
 
 				// Create new session
+				this.clearExtensionTerminalInputListeners();
 				const success = await this.ctx.session.newSession({ parentSession: options?.parentSession });
 				if (!success) {
 					return { cancelled: true };
@@ -351,6 +355,7 @@ export class ExtensionUiController {
 				this.ctx.statusContainer.clear();
 
 				// Create new session
+				this.clearExtensionTerminalInputListeners();
 				const success = await this.ctx.session.newSession({ parentSession: options?.parentSession });
 				if (!success) {
 					return { cancelled: true };
@@ -450,6 +455,7 @@ export class ExtensionUiController {
 			confirm: async (_title: string, _message: string, _dialogOptions) => false,
 			input: async (_title: string, _placeholder?: string, _dialogOptions?: unknown) => undefined,
 			notify: () => {},
+			onTerminalInput: () => () => {},
 			setStatus: () => {},
 			setWorkingMessage: () => {},
 			setWidget: () => {},
@@ -726,6 +732,22 @@ export class ExtensionUiController {
 	/**
 	 * Show an extension error in the UI.
 	 */
+	addExtensionTerminalInputListener(handler: TerminalInputHandler): () => void {
+		const unsubscribe = this.ctx.ui.addInputListener(handler);
+		this.#extensionTerminalInputUnsubscribers.add(unsubscribe);
+		return () => {
+			unsubscribe();
+			this.#extensionTerminalInputUnsubscribers.delete(unsubscribe);
+		};
+	}
+
+	clearExtensionTerminalInputListeners(): void {
+		for (const unsubscribe of this.#extensionTerminalInputUnsubscribers) {
+			unsubscribe();
+		}
+		this.#extensionTerminalInputUnsubscribers.clear();
+	}
+
 	showExtensionError(extensionPath: string, error: string): void {
 		const errorText = new Text(theme.fg("error", `Extension "${extensionPath}" error: ${error}`), 1, 0);
 		this.ctx.chatContainer.addChild(errorText);

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

@@ -279,7 +279,9 @@ export class SelectorController {
 
 			// Provider settings - update runtime preferences
 			case "webSearchProvider":
-				setPreferredSearchProvider(value as "auto" | "exa" | "perplexity" | "anthropic");
+				setPreferredSearchProvider(
+					value as "auto" | "exa" | "jina" | "zai" | "perplexity" | "anthropic" | "gemini" | "codex",
+				);
 				break;
 			case "imageProvider":
 				setPreferredImageProvider(value as "auto" | "gemini" | "openrouter");

package/src/modes/interactive-mode.ts

@@ -720,6 +720,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.#sttController.dispose();
 			this.#sttController = undefined;
 		}
+		this.#extensionUiController.clearExtensionTerminalInputListeners();
 		this.statusLine.dispose();
 		if (this.unsubscribe) {
 			this.unsubscribe();
@@ -919,6 +920,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	handleClearCommand(): Promise<void> {
+		this.#extensionUiController.clearExtensionTerminalInputListeners();
 		return this.#commandController.handleClearCommand();
 	}
 

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

@@ -164,6 +164,11 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 			);
 		}
 
+		onTerminalInput(): () => void {
+			// Raw terminal input not supported in RPC mode
+			return () => {};
+		}
+
 		notify(message: string, type?: "info" | "warning" | "error"): void {
 			// Fire and forget - no response needed
 			this.output({

package/src/session/agent-session.ts

@@ -51,10 +51,16 @@ import type {
 	ExtensionCommandContext,
 	ExtensionRunner,
 	ExtensionUIContext,
+	MessageEndEvent,
+	MessageStartEvent,
+	MessageUpdateEvent,
 	SessionBeforeBranchResult,
 	SessionBeforeCompactResult,
 	SessionBeforeSwitchResult,
 	SessionBeforeTreeResult,
+	ToolExecutionEndEvent,
+	ToolExecutionStartEvent,
+	ToolExecutionUpdateEvent,
 	TreePreparation,
 	TurnEndEvent,
 	TurnStartEvent,
@@ -102,6 +108,7 @@ import {
 	pythonExecutionToText,
 } from "./messages";
 import type { BranchSummaryEntry, CompactionEntry, NewSessionOptions, SessionManager } from "./session-manager";
+import { getLatestCompactionEntry } from "./session-manager";
 
 /** Session-specific events that extend the core AgentEvent */
 export type AgentSessionEvent =
@@ -226,6 +233,7 @@ const noOpUIContext: ExtensionUIContext = {
 	confirm: async (_title, _message, _dialogOptions) => false,
 	input: async (_title, _placeholder, _dialogOptions) => undefined,
 	notify: () => {},
+	onTerminalInput: () => () => {},
 	setStatus: () => {},
 	setWorkingMessage: () => {},
 	setWidget: () => {},
@@ -874,6 +882,51 @@ export class AgentSession {
 			};
 			await this.#extensionRunner.emit(hookEvent);
 			this.#turnIndex++;
+		} else if (event.type === "message_start") {
+			const extensionEvent: MessageStartEvent = {
+				type: "message_start",
+				message: event.message,
+			};
+			await this.#extensionRunner.emit(extensionEvent);
+		} else if (event.type === "message_update") {
+			const extensionEvent: MessageUpdateEvent = {
+				type: "message_update",
+				message: event.message,
+				assistantMessageEvent: event.assistantMessageEvent,
+			};
+			await this.#extensionRunner.emit(extensionEvent);
+		} else if (event.type === "message_end") {
+			const extensionEvent: MessageEndEvent = {
+				type: "message_end",
+				message: event.message,
+			};
+			await this.#extensionRunner.emit(extensionEvent);
+		} else if (event.type === "tool_execution_start") {
+			const extensionEvent: ToolExecutionStartEvent = {
+				type: "tool_execution_start",
+				toolCallId: event.toolCallId,
+				toolName: event.toolName,
+				args: event.args,
+			};
+			await this.#extensionRunner.emit(extensionEvent);
+		} else if (event.type === "tool_execution_update") {
+			const extensionEvent: ToolExecutionUpdateEvent = {
+				type: "tool_execution_update",
+				toolCallId: event.toolCallId,
+				toolName: event.toolName,
+				args: event.args,
+				partialResult: event.partialResult,
+			};
+			await this.#extensionRunner.emit(extensionEvent);
+		} else if (event.type === "tool_execution_end") {
+			const extensionEvent: ToolExecutionEndEvent = {
+				type: "tool_execution_end",
+				toolCallId: event.toolCallId,
+				toolName: event.toolName,
+				result: event.result,
+				isError: event.isError ?? false,
+			};
+			await this.#extensionRunner.emit(extensionEvent);
 		} else if (event.type === "auto_compaction_start") {
 			await this.#extensionRunner.emit({ type: "auto_compaction_start", reason: event.reason });
 		} else if (event.type === "auto_compaction_end") {
@@ -2664,9 +2717,9 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		// The error shouldn't trigger another compaction since we already compacted.
 		// 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 = this.sessionManager.getBranch().find(e => e.type === "compaction");
+		const compactionEntry = getLatestCompactionEntry(this.sessionManager.getBranch());
 		const errorIsFromBeforeCompaction =
-			compactionEntry && assistantMessage.timestamp < new Date(compactionEntry.timestamp).getTime();
+			compactionEntry !== null && assistantMessage.timestamp < new Date(compactionEntry.timestamp).getTime();
 
 		// Case 1: Overflow - LLM returned context overflow error
 		if (sameModel && !errorIsFromBeforeCompaction && isContextOverflow(assistantMessage, contextWindow)) {
@@ -3959,6 +4012,35 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		const contextWindow = model.contextWindow ?? 0;
 		if (contextWindow <= 0) return undefined;
 
+		// After compaction, the last assistant usage reflects pre-compaction context size.
+		// We can only trust usage from an assistant that responded after the latest compaction.
+		// If no such assistant exists, context token count is unknown until the next LLM response.
+		const branchEntries = this.sessionManager.getBranch();
+		const latestCompaction = getLatestCompactionEntry(branchEntries);
+
+		if (latestCompaction) {
+			// Check if there's a valid assistant usage after the compaction boundary
+			const compactionIndex = branchEntries.lastIndexOf(latestCompaction);
+			let hasPostCompactionUsage = false;
+			for (let i = branchEntries.length - 1; i > compactionIndex; i--) {
+				const entry = branchEntries[i];
+				if (entry.type === "message" && entry.message.role === "assistant") {
+					const assistant = entry.message;
+					if (assistant.stopReason !== "aborted" && assistant.stopReason !== "error") {
+						const contextTokens = calculateContextTokens(assistant.usage);
+						if (contextTokens > 0) {
+							hasPostCompactionUsage = true;
+						}
+						break;
+					}
+				}
+			}
+
+			if (!hasPostCompactionUsage) {
+				return { tokens: null, contextWindow, percent: null };
+			}
+		}
+
 		const estimate = this.#estimateContextTokens();
 		const percent = (estimate.tokens / contextWindow) * 100;
 
@@ -3966,9 +4048,6 @@ Be thorough - include exact file paths, function names, error messages, and tech
 			tokens: estimate.tokens,
 			contextWindow,
 			percent,
-			usageTokens: estimate.usageTokens,
-			trailingTokens: estimate.trailingTokens,
-			lastUsageIndex: estimate.lastUsageIndex,
 		};
 	}
 
@@ -3985,9 +4064,6 @@ Be thorough - include exact file paths, function names, error messages, and tech
 	 */
 	#estimateContextTokens(): {
 		tokens: number;
-		usageTokens: number;
-		trailingTokens: number;
-		lastUsageIndex: number | null;
 	} {
 		const messages = this.messages;
 
@@ -4014,9 +4090,6 @@ Be thorough - include exact file paths, function names, error messages, and tech
 			}
 			return {
 				tokens: estimated,
-				usageTokens: 0,
-				trailingTokens: estimated,
-				lastUsageIndex: null,
 			};
 		}
 
@@ -4028,9 +4101,6 @@ Be thorough - include exact file paths, function names, error messages, and tech
 
 		return {
 			tokens: usageTokens + trailingTokens,
-			usageTokens,
-			trailingTokens,
-			lastUsageIndex,
 		};
 	}
 

package/src/task/render.ts

@@ -684,7 +684,7 @@ function renderFindings(
 		const findingContinue = isLastFinding ? "   " : `${theme.tree.vertical}  `;
 
 		const { color } = getPriorityInfo(finding.priority);
-		const titleText = finding.title.replace(/^\[P\d\]\s*/, "");
+		const titleText = finding.title?.replace(/^\[P\d\]\s*/, "") ?? "Untitled";
 		const loc = `${path.basename(finding.file_path)}:${finding.line_start}`;
 
 		lines.push(

package/src/web/search/index.ts

@@ -1,7 +1,7 @@
 /**
  * Unified Web Search Tool
  *
- * Single tool supporting Anthropic, Perplexity, Exa, Jina, Gemini, and Codex
+ * Single tool supporting Anthropic, Perplexity, Exa, Jina, Gemini, Codex, and Z.AI
  * providers with provider-specific parameters exposed conditionally.
  *
  * When EXA_API_KEY is available, additional specialized tools are exposed:
@@ -33,7 +33,7 @@ import { SearchProviderError } from "./types";
 export const webSearchSchema = Type.Object({
 	query: Type.String({ description: "Search query" }),
 	provider: Type.Optional(
-		StringEnum(["auto", "exa", "jina", "anthropic", "perplexity", "gemini", "codex"], {
+		StringEnum(["auto", "exa", "jina", "zai", "anthropic", "perplexity", "gemini", "codex"], {
 			description: "Search provider (default: auto)",
 		}),
 	),
@@ -47,7 +47,7 @@ export const webSearchSchema = Type.Object({
 
 export type SearchParams = {
 	query: string;
-	provider?: "auto" | "exa" | "jina" | "anthropic" | "perplexity" | "gemini" | "codex";
+	provider?: "auto" | "exa" | "jina" | "zai" | "anthropic" | "perplexity" | "gemini" | "codex";
 	recency?: "day" | "week" | "month" | "year";
 	limit?: number;
 	/** Maximum output tokens. Defaults to 4096. */
@@ -56,6 +56,8 @@ export type SearchParams = {
 	temperature?: number;
 	/** Number of search results to retrieve. Defaults to 10. */
 	num_search_results?: number;
+	/** Disable provider fallback when explicit provider is selected (CLI/debug use). */
+	no_fallback?: boolean;
 };
 
 function formatProviderList(providers: SearchProvider[]): string {
@@ -68,6 +70,9 @@ function formatProviderError(error: unknown, provider: SearchProvider): string {
 			return "Anthropic web search returned 404 (model or endpoint not found).";
 		}
 		if (error.status === 401 || error.status === 403) {
+			if (error.provider === "zai") {
+				return error.message;
+			}
 			return `${getSearchProvider(error.provider).label} authorization failed (${error.status}). Check API key or base URL.`;
 		}
 		return error.message;
@@ -165,7 +170,12 @@ async function executeSearch(
 	_toolCallId: string,
 	params: SearchParams,
 ): Promise<{ content: Array<{ type: "text"; text: string }>; details: SearchRenderDetails }> {
-	const providers = await resolveProviderChain(params.provider);
+	const providers =
+		params.provider && params.provider !== "auto" && params.no_fallback
+			? (await getSearchProvider(params.provider).isAvailable())
+				? [getSearchProvider(params.provider)]
+				: []
+			: await resolveProviderChain(params.provider);
 
 	if (providers.length === 0) {
 		const message = "No web search provider configured.";
@@ -226,7 +236,7 @@ export async function runSearchQuery(
 /**
  * Web search tool implementation.
  *
- * Supports Anthropic, Perplexity, Exa, Jina, Gemini, and Codex providers with automatic fallback.
+ * Supports Anthropic, Perplexity, Exa, Jina, Gemini, Codex, and Z.AI providers with automatic fallback.
  * Session is accepted for interface consistency but not used.
  */
 export class SearchTool implements AgentTool<typeof webSearchSchema, SearchRenderDetails> {

package/src/web/search/provider.ts

@@ -5,6 +5,7 @@ import { ExaProvider } from "./providers/exa";
 import { GeminiProvider } from "./providers/gemini";
 import { JinaProvider } from "./providers/jina";
 import { PerplexityProvider } from "./providers/perplexity";
+import { ZaiProvider } from "./providers/zai";
 import type { SearchProviderId } from "./types";
 
 export type { SearchParams } from "./providers/base";
@@ -14,12 +15,13 @@ const SEARCH_PROVIDERS: Record<SearchProviderId, SearchProvider> = {
 	exa: new ExaProvider(),
 	jina: new JinaProvider(),
 	perplexity: new PerplexityProvider(),
+	zai: new ZaiProvider(),
 	anthropic: new AnthropicProvider(),
 	gemini: new GeminiProvider(),
 	codex: new CodexProvider(),
 } as const;
 
-const SEARCH_PROVIDER_ORDER: SearchProviderId[] = ["exa", "jina", "perplexity", "anthropic", "gemini", "codex"];
+const SEARCH_PROVIDER_ORDER: SearchProviderId[] = ["exa", "jina", "perplexity", "anthropic", "gemini", "codex", "zai"];
 
 export function getSearchProvider(provider: SearchProviderId): SearchProvider {
 	return SEARCH_PROVIDERS[provider];