@gajae-code/coding-agent 0.4.4 → 0.5.0

package/src/modes/components/status-line.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import type { AgentMessage } from "@gajae-code/agent-core";
-import { estimateTokens } from "@gajae-code/agent-core/compaction";
+import { estimateMessageTokensHeuristic } from "@gajae-code/agent-core/compaction";
 import { type Component, truncateToWidth, visibleWidth } from "@gajae-code/tui";
 import { formatCount, getProjectDir } from "@gajae-code/utils";
 import { $ } from "bun";
@@ -50,7 +50,7 @@ export interface StatusLineSettings {
 
 /**
  * Symbol-keyed sidecar tagged onto each `AgentMessage` to memoize its
- * `estimateTokens` result. Keyed by message identity (the object itself);
+ * `estimateMessageTokensHeuristic` result. Keyed by message identity (the object itself);
  * a cheap content fingerprint detects in-place mutations (post-hoc error
  * attachment, retry-truncated branch rebuild, etc.) and forces recompute.
  *
@@ -64,11 +64,11 @@ interface TaggedMessage {
 }
 
 /**
- * Cheap structural fingerprint mirroring `estimateTokens`'s content walk.
+ * Cheap structural fingerprint mirroring `estimateMessageTokensHeuristic`'s content walk.
  * O(blocks) — only reads string `.length` and primitives, never copies or
  * serializes content. Any in-place mutation that alters total tokenized
  * content also alters one of the byte-length sums or block counts captured
- * here, forcing the cached `estimateTokens` value to be recomputed.
+ * here, forcing the cached heuristic token value to be recomputed.
  */
 function messageFingerprint(msg: AgentMessage): string {
 	const role = (msg as { role?: string }).role ?? "";
@@ -136,7 +136,7 @@ function tokensForMessage(msg: AgentMessage): number {
 	const tagged = msg as TaggedMessage;
 	const cached = tagged[kTokenCache];
 	if (cached && cached.fingerprint === fp) return cached.tokens;
-	const tokens = estimateTokens(msg);
+	const tokens = estimateMessageTokensHeuristic(msg);
 	tagged[kTokenCache] = { fingerprint: fp, tokens };
 	return tokens;
 }
@@ -560,7 +560,7 @@ export class StatusLineComponent implements Component {
 		let messagesTokens = 0;
 		const lastIdx = messages.length - 1;
 		for (let i = 0; i < messages.length; i++) {
-			messagesTokens += i === lastIdx ? estimateTokens(messages[i]) : tokensForMessage(messages[i]);
+			messagesTokens += i === lastIdx ? estimateMessageTokensHeuristic(messages[i]) : tokensForMessage(messages[i]);
 		}
 
 		const usedTokens = this.#nonMessageTokensCache + messagesTokens;

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

@@ -152,6 +152,7 @@ export class ToolExecutionComponent extends Container {
 		isError?: boolean;
 		details?: any;
 	};
+	#textOutputCache?: { content: unknown; showImages: boolean; terminalImageProtocol: unknown; output: string };
 	// Edit preview state
 	#editMode?: EditMode;
 	#editDiffPreview?: PerFileDiffPreview[];
@@ -197,9 +198,11 @@ export class ToolExecutionComponent extends Container {
 
 		this.addChild(new Spacer(1));
 
-		// Always create both - contentBox for custom tools/bash/tools with renderers, contentText for other built-ins
-		this.#contentBox = new Box(1, 1, (text: string) => theme.bg("toolPendingBg", text));
-		this.#contentText = new Text("", 1, 1, (text: string) => theme.bg("toolPendingBg", text));
+		// Always create both - contentBox for custom tools/bash/tools with renderers, contentText for other built-ins.
+		// Vertical padding is 0: block separation comes solely from the leading Spacer
+		// (1 blank line above each block), matching reference TUIs (083.2).
+		this.#contentBox = new Box(1, 0, (text: string) => theme.bg("toolPendingBg", text));
+		this.#contentText = new Text("", 1, 0, (text: string) => theme.bg("toolPendingBg", text));
 
 		// Use Box for custom tools or built-in tools that have renderers
 		const hasRenderer = toolName in toolRenderers;
@@ -295,6 +298,7 @@ export class ToolExecutionComponent extends Container {
 		isPartial = false,
 		_toolCallId?: string,
 	): void {
+		this.#textOutputCache = undefined;
 		this.#result = result;
 		this.#isPartial = isPartial;
 		// When tool is complete, ensure args are marked complete so spinner stops
@@ -397,6 +401,7 @@ export class ToolExecutionComponent extends Container {
 
 	setShowImages(show: boolean): void {
 		this.#showImages = show;
+		this.#textOutputCache = undefined;
 		this.#updateDisplay();
 	}
 
@@ -514,7 +519,7 @@ export class ToolExecutionComponent extends Container {
 					const fileBgFn = fileResult.isError
 						? (text: string) => theme.bg("toolErrorBg", text)
 						: (text: string) => theme.bg("toolSuccessBg", text);
-					const fileBox = new Box(1, 1, fileBgFn);
+					const fileBox = new Box(1, 0, fileBgFn);
 					try {
 						const resultComponent = renderer.renderResult(
 							{ content: [], details: fileResult, isError: fileResult.isError },
@@ -540,7 +545,7 @@ export class ToolExecutionComponent extends Container {
 					const pendingSpacer = new Spacer(1);
 					this.#multiFileBoxes.push(pendingSpacer);
 					this.addChild(pendingSpacer);
-					const pendingBox = new Box(1, 1, (text: string) => theme.bg("toolPendingBg", text));
+					const pendingBox = new Box(1, 0, (text: string) => theme.bg("toolPendingBg", text));
 					const pendingText = renderStatusLine(
 						{
 							icon: "pending",
@@ -723,16 +728,27 @@ export class ToolExecutionComponent extends Container {
 	#getTextOutput(): string {
 		if (!this.#result) return "";
 
-		const textBlocks = this.#result.content?.filter((c: any) => c.type === "text") || [];
-		const imageBlocks = this.#getAllImageBlocks();
+		const content = this.#result.content;
+		const terminalImageProtocol = TERMINAL.imageProtocol;
+		const cached = this.#textOutputCache;
+		if (
+			cached?.content === content &&
+			cached.showImages === this.#showImages &&
+			cached.terminalImageProtocol === terminalImageProtocol
+		) {
+			return cached.output;
+		}
 
-		let output = textBlocks
-			.map((c: any) => {
-				return sanitizeWithOptionalSixelPassthrough(c.text || "", sanitizeText);
-			})
-			.join("\n");
+		const textParts: string[] = [];
+		for (const block of content ?? []) {
+			if (block.type !== "text") continue;
+			const text = block.text || "";
+			textParts.push(sanitizeWithOptionalSixelPassthrough(text, sanitizeText));
+		}
+		let output = textParts.join("\n");
 
-		if (imageBlocks.length > 0 && (!TERMINAL.imageProtocol || !this.#showImages)) {
+		const imageBlocks = this.#getAllImageBlocks();
+		if (imageBlocks.length > 0 && (!terminalImageProtocol || !this.#showImages)) {
 			const imageIndicators = imageBlocks
 				.map((img: any) => {
 					const dims = img.data ? (getImageDimensions(img.data, img.mimeType) ?? undefined) : undefined;
@@ -742,6 +758,7 @@ export class ToolExecutionComponent extends Container {
 			output = output ? `${output}\n${imageIndicators}` : imageIndicators;
 		}
 
+		this.#textOutputCache = { content, showImages: this.#showImages, terminalImageProtocol, output };
 		return output;
 	}
 

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

@@ -20,6 +20,7 @@ import type { AgentSessionEvent } from "../../session/agent-session";
 import { isSilentAbort, readPendingDisplayTag } from "../../session/messages";
 import type { ResolveToolDetails } from "../../tools/resolve";
 import { interruptHint } from "../shared";
+import { buildAbortDisplayMessage } from "../utils/abort-message";
 
 type AgentSessionEventKind = AgentSessionEvent["type"];
 
@@ -419,10 +420,10 @@ export class EventController {
 				// controller ran, so reaching this branch implies the abort was NOT a
 				// silent internal transition.
 				const retryAttempt = this.ctx.session.retryAttempt;
-				errorMessage =
-					retryAttempt > 0
-						? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
-						: "Operation aborted";
+				errorMessage = buildAbortDisplayMessage({
+					errorMessage: this.ctx.streamingMessage.errorMessage,
+					retryAttempt,
+				});
 				this.ctx.streamingMessage.errorMessage = errorMessage;
 			}
 			if (silentlyAborted || ttsrSilenced) {

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

@@ -5,6 +5,7 @@ import type { Component, OverlayHandle } from "@gajae-code/tui";
 import { Input, Loader, Spacer, Text } from "@gajae-code/tui";
 import { getAgentDbPath, getProjectDir } from "@gajae-code/utils";
 import { activateModelProfile } from "../../config/model-profile-activation";
+import { recommendModelProfileForProvider } from "../../config/model-profiles";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
@@ -45,7 +46,7 @@ import { CustomProviderWizardComponent, type CustomProviderWizardSubmit } from "
 import { ExtensionDashboard } from "../components/extensions";
 import { HistorySearchComponent } from "../components/history-search";
 import { JobsOverlayComponent } from "../components/jobs-overlay";
-import { ModelSelectorComponent, type ModelSelectorSelection } from "../components/model-selector";
+import { ModelSelectorComponent } from "../components/model-selector";
 import { OAuthSelectorComponent } from "../components/oauth-selector";
 import { PluginSelectorComponent } from "../components/plugin-selector";
 import {
@@ -537,12 +538,6 @@ export class SelectorController {
 				this.ctx.session.scopedModels,
 				async selection => {
 					try {
-						if (selection.kind === "preset") {
-							await this.#applyModelAssignmentPreset(selection);
-							done();
-							this.ctx.ui.requestRender();
-							return;
-						}
 						if (selection.kind === "profile") {
 							await activateModelProfile(
 								{
@@ -609,45 +604,12 @@ export class SelectorController {
 					done();
 					this.ctx.ui.requestRender();
 				},
-				options,
+				{ ...options, sessionId: this.ctx.session.sessionId },
 			);
 			return { component: selector, focus: selector };
 		});
 	}
 
-	async #applyModelAssignmentPreset(selection: Extract<ModelSelectorSelection, { kind: "preset" }>): Promise<void> {
-		const { assignments, model, preset, selector } = selection;
-		const apiKey = await this.ctx.session.modelRegistry.getApiKey(model, this.ctx.session.sessionId);
-		if (!apiKey) {
-			throw new Error(`No API key for ${model.provider}/${model.id}`);
-		}
-
-		const defaultThinkingLevel = assignments.default;
-		await this.ctx.session.setModel(model, "default", {
-			selector,
-			thinkingLevel: defaultThinkingLevel,
-		});
-		if (defaultThinkingLevel && defaultThinkingLevel !== ThinkingLevel.Inherit) {
-			this.ctx.session.setThinkingLevel(defaultThinkingLevel);
-		}
-
-		const overrides = this.ctx.settings.get("task.agentModelOverrides");
-		const nextOverrides = { ...overrides };
-		for (const [targetRole, presetThinkingLevel] of Object.entries(assignments) as [
-			keyof Extract<ModelSelectorSelection, { kind: "preset" }>["assignments"],
-			ThinkingLevel,
-		][]) {
-			if (!targetRole || targetRole === "default") continue;
-			nextOverrides[targetRole] =
-				presetThinkingLevel === ThinkingLevel.Inherit ? selector : `${selector}:${presetThinkingLevel}`;
-		}
-		this.ctx.settings.set("task.agentModelOverrides", nextOverrides);
-		this.ctx.settings.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
-		this.ctx.statusLine.invalidate();
-		this.ctx.updateEditorBorderColor();
-		this.ctx.showStatus(`${preset.label}: ${selector}`);
-	}
-
 	async showPluginSelector(mode: "install" | "uninstall" = "install"): Promise<void> {
 		const mgr = new MarketplaceManager({
 			marketplacesRegistryPath: getMarketplacesRegistryPath(),
@@ -1034,6 +996,34 @@ export class SelectorController {
 		await this.showSessionSelector();
 	}
 
+	async #handlePostLoginModelProfileRecommendation(providerId: string): Promise<void> {
+		const recommendedProfile = recommendModelProfileForProvider(
+			providerId,
+			this.ctx.session.modelRegistry.getModelProfiles(),
+		);
+		if (!recommendedProfile) {
+			return;
+		}
+
+		const activeProfile = this.ctx.session.getActiveModelProfile?.() ?? this.ctx.settings.get("modelProfile.default");
+		if (activeProfile) {
+			this.ctx.showStatus(`Preset ${recommendedProfile.name} is available in /model.`);
+			return;
+		}
+
+		const confirmed = await this.ctx.showHookConfirm(`Apply ${recommendedProfile.name} now?`, "");
+		if (!confirmed) {
+			return;
+		}
+
+		await activateModelProfile({
+			session: this.ctx.session,
+			modelRegistry: this.ctx.session.modelRegistry,
+			settings: this.ctx.settings,
+			profileName: recommendedProfile.name,
+		});
+	}
+
 	async #handleOAuthLogin(providerId: string): Promise<void> {
 		this.ctx.showStatus(`Logging in to ${providerId}…`);
 		const manualInput = this.ctx.oauthManualInput;
@@ -1090,6 +1080,7 @@ export class SelectorController {
 				new Text(theme.fg("success", `${theme.status.success} Successfully logged in to ${providerId}`), 1, 0),
 			);
 			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", `Credentials saved to ${getAgentDbPath()}`), 1, 0));
+			await this.#handlePostLoginModelProfileRecommendation(providerId);
 			this.ctx.ui.requestRender();
 		} catch (error: unknown) {
 			this.ctx.showError(`Login failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -1120,7 +1111,7 @@ export class SelectorController {
 	async showOAuthSelector(mode: "login" | "logout", providerId?: string): Promise<void> {
 		if (providerId) {
 			const oauthProvider = getOAuthProviders().find(provider => provider.id === providerId);
-			if (!oauthProvider) {
+			if (!oauthProvider && !this.ctx.session.modelRegistry.getModelProfiles().has(providerId)) {
 				this.ctx.showError(`Unknown OAuth provider: ${providerId}`);
 				return;
 			}

package/src/modes/interactive-mode.ts

@@ -1057,7 +1057,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				return;
 			}
 			if (event.state?.enabled === true && !this.#goalModePreviousTools) {
-				this.#goalModePreviousTools = this.session.getActiveToolNames().filter(name => name !== "goal");
+				this.#goalModePreviousTools = this.session.getActiveToolNames();
 			}
 			this.goalModeEnabled = event.state?.enabled === true;
 			this.goalModePaused = event.state?.enabled !== true && event.state?.goal?.status === "paused";
@@ -1146,10 +1146,9 @@ export class InteractiveMode implements InteractiveModeContext {
 			const restored = await this.session.goalRuntime.onThreadResumed();
 			this.goalModeEnabled = restored?.enabled === true;
 			this.goalModePaused = restored?.enabled !== true && restored?.goal.status === "paused";
-			// sdk.ts excludes "goal" from the initial active tool set unconditionally.
-			// Re-add it now so the agent can call resume, complete, or drop on this goal.
+			// Keep `goal` armed on resumed threads; it is part of the default active tool set.
 			if (restored?.goal) {
-				const previousTools = this.session.getActiveToolNames().filter(name => name !== "goal");
+				const previousTools = this.session.getActiveToolNames();
 				this.#goalModePreviousTools = previousTools;
 				await this.session.setActiveToolsByName([...new Set([...previousTools, "goal"])]);
 			}
@@ -1318,7 +1317,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.showWarning("Exit plan mode first.");
 			return;
 		}
-		const previousTools = this.session.getActiveToolNames().filter(name => name !== "goal");
+		const previousTools = this.session.getActiveToolNames();
 		const goalTools = [...new Set([...previousTools, "goal"])];
 		this.#goalModePreviousTools = previousTools;
 		this.goalModePaused = false;

package/src/modes/print-mode.ts

@@ -72,7 +72,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 	// In text mode, output final response
 	if (mode === "text") {
 		const state = session.state;
-		const lastMessage = state.messages[state.messages.length - 1];
+		const lastMessage = state.messages.findLast(message => message.role === "assistant");
 
 		if (lastMessage?.role === "assistant") {
 			const assistantMsg = lastMessage as AssistantMessage;

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

@@ -12,6 +12,7 @@ import type { SessionStats } from "../../session/agent-session";
 import type {
 	RpcCommand,
 	RpcExtensionUIRequest,
+	RpcGetStateInclude,
 	RpcHandoffResult,
 	RpcHostToolCallRequest,
 	RpcHostToolCancelRequest,
@@ -442,8 +443,8 @@ export class RpcClient {
 	/**
 	 * Get current session state.
 	 */
-	async getState(): Promise<RpcSessionState> {
-		const response = await this.#send({ type: "get_state" });
+	async getState(include?: RpcGetStateInclude[]): Promise<RpcSessionState> {
+		const response = await this.#send(include ? { type: "get_state", include } : { type: "get_state" });
 		return this.#getData(response);
 	}
 

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

@@ -11,7 +11,7 @@
  * - Extension UI: Extension UI requests are emitted, client responds with extension_ui_response
  */
 import * as path from "node:path";
-import { $env, readJsonl, Snowflake } from "@gajae-code/utils";
+import { $env, readLines, Snowflake } from "@gajae-code/utils";
 import type {
 	ExtensionUIContext,
 	ExtensionUIDialogOptions,
@@ -169,6 +169,7 @@ export async function runRpcMode(
 		process.stdout.write(`${JSON.stringify(obj)}\n`);
 	};
 	const emitRpcTitles = shouldEmitRpcTitles();
+	const decodeError = (err: unknown): string => (err instanceof Error ? err.message : String(err));
 
 	const pendingExtensionRequests = new Map<string, PendingExtensionRequest>();
 	const hostToolBridge = new RpcHostToolBridge(output);
@@ -229,6 +230,28 @@ export async function runRpcMode(
 
 	// Shutdown request flag (wrapped in object to allow mutation with const)
 	const shutdownState = { requested: false };
+	let shutdownStarted = false;
+	async function shutdown(exitCode: number, reason: string): Promise<never> {
+		if (shutdownStarted) {
+			process.exit(exitCode);
+		}
+		shutdownStarted = true;
+		hostToolBridge.rejectAllPending(`${reason} before host tool execution completed`);
+		hostUriBridge.clear(`${reason} before host URI request completed`);
+		try {
+			await session.sessionManager.ensureOnDisk();
+		} catch (err) {
+			output(error(undefined, "shutdown", decodeError(err)));
+			process.exit(1);
+		}
+		try {
+			await session.dispose();
+		} catch (err) {
+			output(error(undefined, "shutdown", decodeError(err)));
+			process.exit(1);
+		}
+		process.exit(exitCode);
+	}
 
 	/**
 	 * Extension UI context that uses the RPC protocol.
@@ -497,16 +520,24 @@ export async function runRpcMode(
 	 */
 	async function checkShutdownRequested(): Promise<void> {
 		if (!shutdownState.requested) return;
+		await shutdown(0, "RPC shutdown requested");
+	}
 
-		if (session.extensionRunner?.hasHandlers("session_shutdown")) {
-			await session.extensionRunner.emit({ type: "session_shutdown" });
-		}
+	// Listen for JSONL input using Bun's stdin. Parse frame-by-frame so a malformed
+	// command reports a parse error without poisoning the whole long-lived RPC session.
+	const inputDecoder = new TextDecoder("utf-8", { fatal: false });
+	for await (const line of readLines(Bun.stdin.stream())) {
+		const text = inputDecoder.decode(line).trim();
+		if (!text) continue;
 
-		process.exit(0);
-	}
+		let parsed: unknown;
+		try {
+			parsed = JSON.parse(text);
+		} catch (err) {
+			output(error(undefined, "parse", `Failed to parse command: ${decodeError(err)}`));
+			continue;
+		}
 
-	// Listen for JSON input using Bun's stdin
-	for await (const parsed of readJsonl(Bun.stdin.stream())) {
 		try {
 			// Handle extension UI responses
 			if ((parsed as RpcExtensionUIResponse).type === "extension_ui_response") {
@@ -540,13 +571,12 @@ export async function runRpcMode(
 
 			// Check for deferred shutdown request (idle between commands)
 			await checkShutdownRequested();
-		} catch (e: any) {
-			output(error(undefined, "parse", `Failed to parse command: ${e.message}`));
+		} catch (err) {
+			output(error(undefined, "parse", `Failed to parse command: ${decodeError(err)}`));
 		}
 	}
 
-	// stdin closed — RPC client is gone, exit cleanly
-	hostToolBridge.rejectAllPending("RPC client disconnected before host tool execution completed");
-	hostUriBridge.clear("RPC client disconnected before host URI request completed");
-	process.exit(0);
+	// stdin closed — RPC client is gone, flush durable state and exit cleanly
+	await shutdown(0, "RPC client disconnected");
+	throw new Error("RPC shutdown returned unexpectedly");
 }

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

@@ -12,6 +12,8 @@ import type { ContextUsage } from "../../extensibility/extensions/types";
 import type { SessionStats } from "../../session/agent-session";
 import type { TodoPhase } from "../../tools/todo-write";
 
+export type RpcGetStateInclude = "tools" | "dumpTools" | "systemPrompt";
+
 // ============================================================================
 // RPC Commands (stdin)
 // ============================================================================
@@ -26,7 +28,7 @@ export type RpcCommand =
 	| { id?: string; type: "new_session"; parentSession?: string }
 
 	// State
-	| { id?: string; type: "get_state" }
+	| { id?: string; type: "get_state"; include?: RpcGetStateInclude[] }
 	| { id?: string; type: "set_todos"; phases: TodoPhase[] }
 	| { id?: string; type: "set_host_tools"; tools: RpcHostToolDefinition[] }
 	| { id?: string; type: "set_host_uri_schemes"; schemes: RpcHostUriSchemeDefinition[] }
@@ -99,8 +101,9 @@ export interface RpcSessionState {
 	messageCount: number;
 	queuedMessageCount: number;
 	todoPhases: TodoPhase[];
-	/** For session dump / export (plain-text parity with /dump). */
+	/** Optional static system prompt blocks. Omitted by default; request with get_state include ["systemPrompt"]. */
 	systemPrompt?: string[];
+	/** Optional static tool schemas. Omitted by default; request with get_state include ["tools"]. */
 	dumpTools?: Array<{ name: string; description: string; parameters: unknown }>;
 	/** Current context window usage. Null tokens/percent when unknown (e.g. right after compaction). */
 	contextUsage?: ContextUsage;

package/src/modes/shared/agent-wire/command-dispatch.ts

@@ -183,14 +183,19 @@ export async function dispatchRpcCommand(
 				messageCount: session.messages.length,
 				queuedMessageCount: session.queuedMessageCount,
 				todoPhases: session.getTodoPhases(),
-				systemPrompt: session.systemPrompt,
-				dumpTools: session.agent.state.tools.map(tool => ({
+				contextUsage: session.getContextUsage(),
+			};
+			const include = new Set(command.include ?? []);
+			if (include.has("systemPrompt")) {
+				state.systemPrompt = session.systemPrompt;
+			}
+			if (include.has("tools") || include.has("dumpTools")) {
+				state.dumpTools = session.agent.state.tools.map(tool => ({
 					name: tool.name,
 					description: tool.description,
 					parameters: tool.parameters,
-				})),
-				contextUsage: session.getContextUsage(),
-			};
+				}));
+			}
 			return rpcSuccess(id, "get_state", state);
 		}
 

package/src/modes/shared/agent-wire/command-validation.ts

@@ -28,6 +28,15 @@ function stringArray(value: unknown): value is string[] {
 	return Array.isArray(value) && value.every(item => typeof item === "string");
 }
 
+const GET_STATE_INCLUDES = new Set(["tools", "dumpTools", "systemPrompt"]);
+
+function optionalGetStateInclude(value: unknown): boolean {
+	return (
+		value === undefined ||
+		(Array.isArray(value) && value.every(item => typeof item === "string" && GET_STATE_INCLUDES.has(item)))
+	);
+}
+
 function todoPhase(value: unknown): boolean {
 	if (!isRecord(value) || typeof value.name !== "string" || !Array.isArray(value.tasks)) return false;
 	return value.tasks.every(
@@ -96,7 +105,9 @@ export function isRpcCommand(value: unknown): value is RpcCommand {
 		case "follow_up":
 			return stringField(value, "message") && optionalArray(value.images);
 		case "abort":
+			return true;
 		case "get_state":
+			return optionalGetStateInclude(value.include);
 		case "cycle_model":
 		case "get_available_models":
 		case "cycle_thinking_level":

package/src/modes/theme/theme.ts

@@ -264,7 +264,7 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"icon.context": "◫",
 	"icon.cost": "💲",
 	"icon.time": "⏱",
-	"icon.pi": "π",
+	"icon.pi": "🦞",
 	"icon.agents": "👥",
 	"icon.cache": "💾",
 	"icon.input": "⤵",
@@ -686,7 +686,7 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"icon.context": "ctx:",
 	"icon.cost": "$",
 	"icon.time": "t:",
-	"icon.pi": "pi",
+	"icon.pi": "GJC",
 	"icon.agents": "AG",
 	"icon.cache": "cache",
 	"icon.input": "in:",

package/src/modes/utils/abort-message.ts

@@ -0,0 +1,41 @@
+const STREAM_IDLE_TIMEOUT_PATTERN = /\bstream stalled while waiting for the next event\b/i;
+const GENERIC_ABORT_PATTERN = /^Request was aborted\.?$/i;
+const ABORT_DISPLAY_LABEL_PATTERN = /^(?:Operation aborted|Aborted after \d+ retry attempts?)(?::|$)/;
+
+export function buildAbortDisplayMessage({
+	errorMessage,
+	retryAttempt,
+}: {
+	errorMessage?: string;
+	retryAttempt: number;
+}): string {
+	const existingDisplayMessage = normalizeExistingAbortDisplayMessage(errorMessage);
+	if (existingDisplayMessage) return existingDisplayMessage;
+
+	const baseMessage =
+		retryAttempt > 0
+			? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
+			: "Operation aborted";
+	const cause = normalizeAbortCause(errorMessage);
+	if (!cause) return baseMessage;
+
+	return `${baseMessage}: ${cause}${streamIdleTimeoutHint(cause)}`;
+}
+
+function normalizeExistingAbortDisplayMessage(errorMessage: string | undefined): string {
+	const trimmed = errorMessage?.trim();
+	if (!trimmed || !ABORT_DISPLAY_LABEL_PATTERN.test(trimmed)) return "";
+	return trimmed;
+}
+
+function normalizeAbortCause(errorMessage: string | undefined): string {
+	const trimmed = errorMessage?.trim();
+	if (!trimmed || GENERIC_ABORT_PATTERN.test(trimmed)) return "";
+	return trimmed;
+}
+
+function streamIdleTimeoutHint(cause: string): string {
+	if (!STREAM_IDLE_TIMEOUT_PATTERN.test(cause)) return "";
+	const separator = /[.!?]$/.test(cause) ? " " : ". ";
+	return `${separator}Hint: set PI_STREAM_IDLE_TIMEOUT_MS=300000 for slow reasoning/proxy streams, or PI_STREAM_IDLE_TIMEOUT_MS=0 to disable the watchdog.`;
+}

package/src/modes/utils/context-usage.ts

@@ -1,8 +1,12 @@
 import type { AgentMessage } from "@gajae-code/agent-core";
 import type { CompactionSettings } from "@gajae-code/agent-core/compaction";
-import { effectiveReserveTokens, estimateTokens, resolveThresholdTokens } from "@gajae-code/agent-core/compaction";
+import {
+	effectiveReserveTokens,
+	estimateMessageTokensHeuristic,
+	estimateTextTokensHeuristic,
+	resolveThresholdTokens,
+} from "@gajae-code/agent-core/compaction";
 import type { Model } from "@gajae-code/ai";
-import { countTokens } from "@gajae-code/natives";
 import { formatNumber } from "@gajae-code/utils";
 import type { Skill } from "../../extensibility/skills";
 import type { AgentSession } from "../../session/agent-session";
@@ -46,7 +50,7 @@ export function estimateSkillsTokens(skills: readonly Skill[]): number {
 		// concatenated form, so encode each piece separately and sum.
 		fragments.push(skill.name, skill.description);
 	}
-	return countTokens(fragments);
+	return estimateTextTokensHeuristic(fragments);
 }
 
 export function estimateToolSchemaTokens(
@@ -61,7 +65,7 @@ export function estimateToolSchemaTokens(
 			// Schema may contain functions or cycles; ignore.
 		}
 	}
-	return countTokens(fragments);
+	return estimateTextTokensHeuristic(fragments);
 }
 
 /**
@@ -100,8 +104,11 @@ function computeNonMessageBreakdown(session: AgentSession): {
 	const toolsTokens = estimateToolSchemaTokens(session.agent?.state?.tools ?? []);
 	const systemPromptParts = session.systemPrompt ?? [];
 	const rulesTokens = estimateRulesTokens(systemPromptParts);
-	const systemContextTokens = countTokens(systemPromptParts.slice(1));
-	const systemPromptTokens = Math.max(0, countTokens(systemPromptParts[0] ?? "") - skillsTokens - rulesTokens);
+	const systemContextTokens = estimateTextTokensHeuristic(systemPromptParts.slice(1));
+	const systemPromptTokens = Math.max(
+		0,
+		estimateTextTokensHeuristic(systemPromptParts[0] ?? "") - skillsTokens - rulesTokens,
+	);
 	return { rulesTokens, skillsTokens, toolsTokens, systemContextTokens, systemPromptTokens };
 }
 
@@ -112,7 +119,7 @@ function estimateRulesTokens(systemPromptParts: readonly string[]): number {
 			fragments.push(match[0]);
 		}
 	}
-	return fragments.length === 0 ? 0 : countTokens(fragments);
+	return fragments.length === 0 ? 0 : estimateTextTokensHeuristic(fragments);
 }
 
 function splitLastUserTurn(messages: readonly AgentMessage[]): {
@@ -130,7 +137,7 @@ function splitLastUserTurn(messages: readonly AgentMessage[]): {
 	let regularMessagesTokens = 0;
 	let lastUserTurnTokens = 0;
 	for (let i = 0; i < messages.length; i++) {
-		const tokens = estimateTokens(messages[i]);
+		const tokens = estimateMessageTokensHeuristic(messages[i]);
 		if (i === lastUserIndex) {
 			lastUserTurnTokens = tokens;
 		} else {