@oh-my-pi/pi-coding-agent 15.5.12 → 15.5.15

package/src/main.ts

@@ -9,6 +9,7 @@ import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import { createInterface } from "node:readline/promises";
+import { EventLoopKeepalive } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import {
 	$env,
@@ -144,6 +145,7 @@ export async function submitInteractiveInput(
 	}
 
 	try {
+		using _keepalive = new EventLoopKeepalive();
 		// Continue shortcuts submit an already-started empty prompt with no optimistic user message.
 		if (!input.started && !mode.markPendingSubmissionStarted(input)) {
 			return;
@@ -299,6 +301,7 @@ async function runInteractiveMode(
 
 	if (initialMessage !== undefined) {
 		try {
+			using _keepalive = new EventLoopKeepalive();
 			await session.prompt(initialMessage, { images: initialImages });
 		} catch (error: unknown) {
 			const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -308,6 +311,7 @@ async function runInteractiveMode(
 
 	for (const message of initialMessages) {
 		try {
+			using _keepalive = new EventLoopKeepalive();
 			await session.prompt(message);
 		} catch (error: unknown) {
 			const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";

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

@@ -105,6 +105,8 @@ const STATIC_PROVIDER_TABS: ProviderTabState[] = [
 	{ id: CANONICAL_TAB, label: CANONICAL_TAB },
 ];
 
+const MODEL_TAB_REFRESH_DEBOUNCE_MS = 120;
+
 function formatProviderTabLabel(providerId: string): string {
 	return providerId.replace(/[-_]+/g, " ").toUpperCase();
 }
@@ -145,6 +147,10 @@ export class ModelSelectorComponent extends Container {
 	// Tab state
 	#providers: ProviderTabState[] = STATIC_PROVIDER_TABS;
 	#activeTabIndex: number = 0;
+	#refreshingProviders: Set<string> = new Set();
+	#scheduledProviderRefreshes: Map<string, ReturnType<typeof setTimeout>> = new Map();
+	#refreshSpinnerFrame: number = 0;
+	#refreshSpinnerInterval?: NodeJS.Timeout;
 
 	// Context menu state
 	#isMenuOpen: boolean = false;
@@ -371,10 +377,8 @@ export class ModelSelectorComponent extends Container {
 		});
 	}
 
-	async #loadModels(): Promise<void> {
+	#loadModelsFromCurrentRegistryState(): void {
 		let models: ModelItem[];
-
-		// Use scoped models if provided via --models flag
 		if (this.#scopedModels.length > 0) {
 			models = this.#scopedModels.map(scoped => ({
 				kind: "provider",
@@ -384,10 +388,6 @@ export class ModelSelectorComponent extends Container {
 				selector: `${scoped.model.provider}/${scoped.model.id}`,
 			}));
 		} else {
-			// Reload config and cached discovery state without blocking on live provider refresh
-			await this.#modelRegistry.refresh("offline");
-
-			// Check for models.json errors
 			const loadError = this.#modelRegistry.getError();
 			if (loadError) {
 				this.#errorMessage = loadError;
@@ -395,7 +395,6 @@ export class ModelSelectorComponent extends Container {
 				this.#errorMessage = undefined;
 			}
 
-			// Load available models (built-in models still work even if models.json failed)
 			try {
 				const availableModels = this.#modelRegistry.getAvailable();
 				models = availableModels.map((model: Model) => ({
@@ -415,15 +414,16 @@ export class ModelSelectorComponent extends Container {
 			}
 		}
 
+		const candidates = models.map(item => item.model);
 		const canonicalRecords = this.#modelRegistry.getCanonicalModels({
 			availableOnly: this.#scopedModels.length === 0,
-			candidates: models.map(item => item.model),
+			candidates,
 		});
 		const canonicalModels = canonicalRecords
 			.map(record => {
 				const selectedModel = this.#modelRegistry.resolveCanonicalModel(record.id, {
 					availableOnly: this.#scopedModels.length === 0,
-					candidates: models.map(item => item.model),
+					candidates,
 				});
 				if (!selectedModel) return undefined;
 				const searchText = [
@@ -457,6 +457,14 @@ export class ModelSelectorComponent extends Container {
 		this.#selectedIndex = Math.min(this.#selectedIndex, Math.max(0, models.length - 1));
 	}
 
+	async #loadModels(): Promise<void> {
+		if (this.#scopedModels.length === 0) {
+			// Reload config and cached discovery state without blocking on live provider refresh
+			await this.#modelRegistry.refresh("offline");
+		}
+		this.#loadModelsFromCurrentRegistryState();
+	}
+
 	#buildProviderTabs(): void {
 		const activeTabId = this.#getActiveTab().id;
 		const providerSet = new Set<string>();
@@ -475,17 +483,100 @@ export class ModelSelectorComponent extends Container {
 			activeIndex >= 0 ? activeIndex : Math.min(this.#activeTabIndex, this.#providers.length - 1);
 	}
 
-	async #refreshSelectedProvider(): Promise<void> {
+	#getActiveProviderRefreshStatusText(): string | undefined {
+		const providerId = this.#getActiveProviderId();
+		if (!providerId || !this.#refreshingProviders.has(providerId)) {
+			return undefined;
+		}
+		const spinnerFrames = theme.spinnerFrames;
+		const spinner =
+			spinnerFrames.length > 0
+				? spinnerFrames[this.#refreshSpinnerFrame % spinnerFrames.length]
+				: theme.status.pending;
+		return theme.fg("warning", `  ${spinner} Refreshing ${formatProviderTabLabel(providerId)} in background...`);
+	}
+
+	#startRefreshSpinner(): void {
+		if (this.#refreshSpinnerInterval) {
+			return;
+		}
+		this.#refreshSpinnerInterval = setInterval(() => {
+			const frameCount = theme.spinnerFrames.length;
+			if (frameCount > 0) {
+				this.#refreshSpinnerFrame = (this.#refreshSpinnerFrame + 1) % frameCount;
+			}
+			this.#updateTabBar();
+			this.#tui.requestRender();
+		}, 80);
+	}
+
+	#stopRefreshSpinner(): void {
+		if (this.#refreshingProviders.size > 0) {
+			return;
+		}
+		if (this.#refreshSpinnerInterval) {
+			clearInterval(this.#refreshSpinnerInterval);
+			this.#refreshSpinnerInterval = undefined;
+		}
+		this.#refreshSpinnerFrame = 0;
+	}
+
+	#setProviderRefreshing(providerId: string, refreshing: boolean): void {
+		if (refreshing) {
+			this.#refreshingProviders.add(providerId);
+			this.#startRefreshSpinner();
+		} else {
+			this.#refreshingProviders.delete(providerId);
+			this.#stopRefreshSpinner();
+		}
+	}
+
+	#cancelScheduledProviderRefreshesExcept(keepProviderId?: string): void {
+		for (const [providerId, timer] of this.#scheduledProviderRefreshes) {
+			if (providerId === keepProviderId) {
+				continue;
+			}
+			clearTimeout(timer);
+			this.#scheduledProviderRefreshes.delete(providerId);
+			this.#setProviderRefreshing(providerId, false);
+		}
+	}
+
+	#scheduleSelectedProviderRefresh(): void {
 		const providerId = this.#getActiveProviderId();
 		if (this.#scopedModels.length > 0 || !providerId) {
 			return;
 		}
-		await this.#modelRegistry.refreshProvider(providerId);
-		await this.#loadModels();
-		this.#buildProviderTabs();
-		this.#updateTabBar();
-		this.#applyTabFilter();
-		this.#tui.requestRender();
+		if (this.#scheduledProviderRefreshes.has(providerId) || this.#refreshingProviders.has(providerId)) {
+			return;
+		}
+		this.#setProviderRefreshing(providerId, true);
+		const timer = setTimeout(() => {
+			this.#scheduledProviderRefreshes.delete(providerId);
+			void this.#refreshProviderInBackground(providerId);
+		}, MODEL_TAB_REFRESH_DEBOUNCE_MS);
+		this.#scheduledProviderRefreshes.set(providerId, timer);
+	}
+
+	async #refreshProviderInBackground(providerId: string): Promise<void> {
+		try {
+			await this.#modelRegistry.refreshProvider(providerId, "online");
+			// Provider refresh already updated the registry snapshot. Re-reading it
+			// here must stay purely in-memory — do not call modelRegistry.refresh()
+			// again or tab switches will pay an extra whole-registry reload after the
+			// network round-trip completes.
+			this.#loadModelsFromCurrentRegistryState();
+			this.#buildProviderTabs();
+			this.#updateTabBar();
+			this.#applyTabFilter();
+		} catch (error) {
+			this.#errorMessage = error instanceof Error ? error.message : String(error);
+			this.#updateList();
+		} finally {
+			this.#setProviderRefreshing(providerId, false);
+			this.#updateTabBar();
+			this.#tui.requestRender();
+		}
 	}
 
 	#updateTabBar(): void {
@@ -496,15 +587,21 @@ export class ModelSelectorComponent extends Container {
 		tabBar.onTabChange = (_tab, index) => {
 			this.#activeTabIndex = index;
 			this.#selectedIndex = 0;
+			this.#cancelScheduledProviderRefreshesExcept(this.#getActiveProviderId());
 			this.#applyTabFilter();
-			void this.#refreshSelectedProvider().catch(error => {
-				this.#errorMessage = error instanceof Error ? error.message : String(error);
-				this.#updateList();
-				this.#tui.requestRender();
-			});
+			this.#scheduleSelectedProviderRefresh();
+			this.#updateTabBar();
+			// Let TUI's normal post-input render paint the new tab immediately.
+			// The live refresh is debounced onto a later timer so tab cycling never
+			// shares a stack frame with provider refresh work.
+			this.#tui.requestRender();
 		};
 		this.#tabBar = tabBar;
 		this.#headerContainer.addChild(tabBar);
+		const refreshStatusText = this.#getActiveProviderRefreshStatusText();
+		if (refreshStatusText) {
+			this.#headerContainer.addChild(new Text(refreshStatusText, 0, 0));
+		}
 	}
 
 	#getActiveTab(): ProviderTabState {

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

@@ -36,6 +36,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 		leftSegments: ["pi", "hostname", "model", "mode", "path", "git", "pr", "subagents"],
 		rightSegments: [
 			"session_name",
+			"cache_hit",
 			"token_in",
 			"token_out",
 			"token_rate",

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

@@ -448,6 +448,28 @@ const cacheWriteSegment: StatusLineSegment = {
 	},
 };
 
+const cacheHitSegment: StatusLineSegment = {
+	id: "cache_hit",
+	render(ctx) {
+		const { cacheRead, cacheWrite, input } = ctx.usageStats;
+		if (!cacheRead) return { content: "", visible: false };
+
+		// Hit rate = cacheRead / total prompt tokens. The prompt is the sum of
+		// cacheRead (served from cache), cacheWrite (newly cached this turn) and
+		// input (uncached). Including uncached input keeps the denominator honest
+		// for Anthropic/OpenRouter; DeepSeek reports its miss as input with
+		// cacheWrite 0, so this still yields hit/(hit+miss).
+		const total = cacheRead + cacheWrite + input;
+
+		const rate = (cacheRead / total) * 100;
+		const rateStr = rate.toFixed(2);
+
+		const parts: string[] = [theme.icon.cache];
+		parts.push(theme.fg("statusLineSpend", `${rateStr}%`));
+		return { content: parts.join(" "), visible: true };
+	},
+};
+
 const sessionNameSegment: StatusLineSegment = {
 	id: "session_name",
 	render(ctx) {
@@ -537,6 +559,7 @@ export const SEGMENTS: Record<StatusLineSegmentId, StatusLineSegment> = {
 	hostname: hostnameSegment,
 	cache_read: cacheReadSegment,
 	cache_write: cacheWriteSegment,
+	cache_hit: cacheHitSegment,
 	session_name: sessionNameSegment,
 	usage: usageSegment,
 };

package/src/modes/interactive-mode.ts

@@ -324,8 +324,6 @@ export class InteractiveMode implements InteractiveModeContext {
 	#eventBus?: EventBus;
 	#eventBusUnsubscribers: Array<() => void> = [];
 	#welcomeComponent?: WelcomeComponent;
-	#todoSpinnerInterval?: NodeJS.Timeout;
-	#todoSpinnerFrame = 0;
 	#todoClosingTimeout?: NodeJS.Timeout;
 	#todoClosingState: "idle" | "playing" | "done" = "idle";
 
@@ -534,9 +532,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#observerRegistry.onChange(() => {
 			this.statusLine.setSubagentCount(this.#observerRegistry.getActiveSubagentCount());
 			// Auto-checkmark todos whose matching subagent just succeeded, then
-			// re-render so the running override (animated row when a subagent
-			// is doing the work for a still-pending todo) updates as subagents
-			// start, finish, or fail. Also handles spinner start/stop.
+			// re-render so the running override (the static "live" glyph when a
+			// subagent is doing the work for a still-pending todo) updates as
+			// subagents start, finish, or fail.
 			this.#reconcileTodosWithSubagents();
 			this.#renderTodoList();
 			this.ui.requestRender();
@@ -849,7 +847,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.#pendingSubmissionDispose = undefined;
 		}
 		this.editor.setText("");
-		this.ui.refreshNativeScrollbackIfDirty();
+		this.ui.refreshNativeScrollbackIfDirty({ allowUnknownViewport: true });
 		this.ensureLoadingAnimation();
 		this.ui.requestRender();
 		return submission;
@@ -960,29 +958,19 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.renderSessionContext(context);
 	}
 
-	#formatTodoLine(todo: TodoItem, prefix: string, matched: boolean, spinnerOn: boolean): string {
+	#formatTodoLine(todo: TodoItem, prefix: string, matched: boolean): string {
 		const checkbox = theme.checkbox;
 		const marker = formatHudNoteMarker(todo.notes?.length ?? 0);
-		const frames = theme.spinnerFrames;
-		// When the spinner is ticking, use the current animated frame; otherwise
-		// fall back to the static "running" glyph so in_progress rows still look
-		// distinct from pending rows.
-		const runningGlyph =
-			spinnerOn && frames.length > 0
-				? (frames[this.#todoSpinnerFrame % frames.length] ?? theme.status.running)
-				: theme.status.running;
 		switch (todo.status) {
 			case "completed":
-				return (
-					theme.fg("success", `${prefix}${theme.status.success} ${chalk.strikethrough(todo.content)}`) + marker
-				);
+				return theme.fg("success", `${prefix}${checkbox.checked} ${chalk.strikethrough(todo.content)}`) + marker;
 			case "in_progress":
-				return theme.fg("accent", `${prefix}${runningGlyph} ${todo.content}`) + marker;
+				return theme.fg("accent", `${prefix}${checkbox.unchecked} ${todo.content}`) + marker;
 			case "abandoned":
 				return theme.fg("error", `${prefix}${checkbox.unchecked} ${chalk.strikethrough(todo.content)}`) + marker;
 			default:
 				if (matched) {
-					return theme.fg("accent", `${prefix}${runningGlyph} ${todo.content}`) + marker;
+					return theme.fg("accent", `${prefix}${checkbox.unchecked} ${todo.content}`) + marker;
 				}
 				return theme.fg("dim", `${prefix}${checkbox.unchecked} ${todo.content}`) + marker;
 		}
@@ -1036,25 +1024,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.session.setTodoPhases(next);
 	}
 
-	#updateTodoSpinnerAnimation(needSpinner: boolean): void {
-		if (needSpinner) {
-			if (this.#todoSpinnerInterval) return;
-			this.#todoSpinnerInterval = setInterval(() => {
-				const frames = theme.spinnerFrames;
-				if (frames.length === 0) return;
-				this.#todoSpinnerFrame = (this.#todoSpinnerFrame + 1) % frames.length;
-				// Rebuild the todo container so the new frame appears, then schedule
-				// a paint. The renderer self-stops the interval once no row needs it.
-				this.#renderTodoList();
-				this.ui.requestRender();
-			}, 80);
-		} else if (this.#todoSpinnerInterval) {
-			clearInterval(this.#todoSpinnerInterval);
-			this.#todoSpinnerInterval = undefined;
-			this.#todoSpinnerFrame = 0;
-		}
-	}
-
 	#getActivePhase(phases: TodoPhase[]): TodoPhase | undefined {
 		const nonEmpty = phases.filter(phase => phase.tasks.length > 0);
 		const active = nonEmpty.find(phase =>
@@ -1067,7 +1036,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.todoContainer.clear();
 		const phases = this.todoPhases.filter(phase => phase.tasks.length > 0);
 		if (phases.length === 0) {
-			this.#updateTodoSpinnerAnimation(false);
 			this.#stopTodoClosingAnimation();
 			this.#todoClosingState = "idle";
 			return;
@@ -1081,7 +1049,6 @@ export class InteractiveMode implements InteractiveModeContext {
 			phase.tasks.every(t => t.status === "completed" || t.status === "abandoned"),
 		);
 		if (allClosed) {
-			this.#updateTodoSpinnerAnimation(false);
 			if (this.#todoClosingState === "done") return;
 			if (this.#todoClosingState === "idle") this.#startTodoClosingAnimation(phases);
 			return;
@@ -1095,52 +1062,23 @@ export class InteractiveMode implements InteractiveModeContext {
 		const lines = ["", indent + theme.bold(theme.fg("accent", "Todos"))];
 
 		const activeDescs = this.#getActiveSubagentDescriptions();
-		// Cache matcher results so we don't re-scan the description list per row
-		// twice (once for the spinner decision, once for the render).
-		const matchedSet = new Set<TodoItem>();
-		const isMatched = (todo: TodoItem): boolean => {
-			if (activeDescs.length === 0) return false;
-			if (matchedSet.has(todo)) return true;
-			if (todoMatchesAnyDescription(todo.content, activeDescs)) {
-				matchedSet.add(todo);
-				return true;
-			}
-			return false;
-		};
-
-		// The cube animates whenever any visible open todo is "live":
-		// (a) status is in_progress (the agent itself is working it), or
-		// (b) a still-pending todo has a matching in-flight subagent doing
-		// the work for it. The renderer self-stops the interval once no row
-		// qualifies, so an orphan in_progress row at end-of-session keeps
-		// ticking — that's the intentional "this todo is still open" signal.
-		let needsSpinner = false;
-		const considerForSpinner = (todo: TodoItem): void => {
-			if (todo.status === "in_progress") {
-				needsSpinner = true;
-				return;
-			}
-			if (todo.status !== "pending") return;
-			if (isMatched(todo)) needsSpinner = true;
-		};
+		// A pending todo "lights up" (accent + running glyph) when an in-flight
+		// subagent is doing its work, matched by normalized content overlap.
+		const isMatched = (todo: TodoItem): boolean =>
+			activeDescs.length > 0 && todoMatchesAnyDescription(todo.content, activeDescs);
 
 		if (!this.todoExpanded) {
 			const activeIdx = phases.indexOf(this.#getActivePhase(phases) ?? phases[0]);
 			const activePhase = phases[activeIdx];
-			if (!activePhase) {
-				this.#updateTodoSpinnerAnimation(false);
-				return;
-			}
+			if (!activePhase) return;
 			const { visible, hiddenOpenCount } = selectStickyTodoWindow(activePhase.tasks, 5);
-			for (const todo of visible) considerForSpinner(todo);
-			this.#updateTodoSpinnerAnimation(needsSpinner);
 
 			lines.push(
 				`${indent}${theme.fg("accent", `${hook} ${formatPhaseDisplayName(activePhase.name, activeIdx + 1)}`)}`,
 			);
 			visible.forEach((todo, index) => {
 				const prefix = `${indent}${index === 0 ? hook : " "} `;
-				lines.push(this.#formatTodoLine(todo, prefix, matchedSet.has(todo), needsSpinner));
+				lines.push(this.#formatTodoLine(todo, prefix, isMatched(todo)));
 			});
 			if (hiddenOpenCount > 0) {
 				lines.push(theme.fg("muted", `${indent}  ${hook} +${hiddenOpenCount} more`));
@@ -1149,14 +1087,11 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 
-		for (const phase of phases) for (const todo of phase.tasks) considerForSpinner(todo);
-		this.#updateTodoSpinnerAnimation(needsSpinner);
-
 		phases.forEach((phase, phaseIndex) => {
 			lines.push(`${indent}${theme.fg("accent", `${hook} ${formatPhaseDisplayName(phase.name, phaseIndex + 1)}`)}`);
 			phase.tasks.forEach((todo, index) => {
 				const prefix = `${indent}${index === 0 ? hook : " "} `;
-				lines.push(this.#formatTodoLine(todo, prefix, matchedSet.has(todo), needsSpinner));
+				lines.push(this.#formatTodoLine(todo, prefix, isMatched(todo)));
 			});
 		});
 
@@ -2166,20 +2101,21 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 
 		this.#renderPlanPreview(planContent, { append: true });
+		const contextUsage = this.session.getContextUsage();
+		const keepContextLabel =
+			contextUsage?.percent != null
+				? `Approve and keep context (${contextUsage.percent.toFixed(1)}%)`
+				: "Approve and keep context";
 		const choice = await this.showHookSelector(
 			"Plan mode - next step",
-			["Approve and execute", "Approve and compact context", "Approve and keep context", "Refine plan"],
+			["Approve and execute", "Approve and compact context", keepContextLabel, "Refine plan"],
 			{
 				helpText: this.#getPlanReviewHelpText(),
 				onExternalEditor: () => void this.#openPlanInExternalEditor(planFilePath),
 			},
 		);
 
-		if (
-			choice === "Approve and execute" ||
-			choice === "Approve and compact context" ||
-			choice === "Approve and keep context"
-		) {
+		if (choice === "Approve and execute" || choice === "Approve and compact context" || choice === keepContextLabel) {
 			const finalPlanFilePath = details.finalPlanFilePath || planFilePath;
 			try {
 				const latestPlanContent = await this.#readPlanFile(planFilePath);
@@ -2265,7 +2201,6 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.loadingAnimation = undefined;
 		}
 		this.#cleanupMicAnimation();
-		this.#updateTodoSpinnerAnimation(false);
 		this.#cancelGoalContinuation();
 		if (this.#sttController) {
 			this.#sttController.dispose();

package/src/modes/theme/theme.ts

@@ -144,6 +144,7 @@ export type SymbolKey =
 	| "md.quoteBorder"
 	| "md.hrChar"
 	| "md.bullet"
+	| "md.colorSwatch"
 	// Language/file type icons
 	| "lang.default"
 	| "lang.typescript"
@@ -308,6 +309,7 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"md.quoteBorder": "▏",
 	"md.hrChar": "─",
 	"md.bullet": "•",
+	"md.colorSwatch": "■",
 	// Language/file icons (emoji-centric, no Nerd Font required)
 	"lang.default": "⌘",
 	"lang.typescript": "🟦",
@@ -568,6 +570,8 @@ const NERD_SYMBOLS: SymbolMap = {
 	"md.hrChar": "─",
 	// pick:  | alt:  •
 	"md.bullet": "\uf111",
+	// pick: ■ | alt:  (U+F096)
+	"md.colorSwatch": "■",
 	// Language icons (nerd font devicons)
 	"lang.default": "",
 	"lang.typescript": "\u{E628}",
@@ -730,6 +734,7 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"md.quoteBorder": "|",
 	"md.hrChar": "-",
 	"md.bullet": "*",
+	"md.colorSwatch": "[]",
 	// Language icons (ASCII uses abbreviations)
 	"lang.default": "code",
 	"lang.typescript": "ts",
@@ -1519,6 +1524,7 @@ export class Theme {
 			quoteBorder: this.#symbols["md.quoteBorder"],
 			hrChar: this.#symbols["md.hrChar"],
 			bullet: this.#symbols["md.bullet"],
+			colorSwatch: this.#symbols["md.colorSwatch"],
 		};
 	}
 
@@ -2340,6 +2346,7 @@ export function getSymbolTheme(): SymbolTheme {
 		table: theme.boxSharp,
 		quoteBorder: theme.md.quoteBorder,
 		hrChar: theme.md.hrChar,
+		colorSwatch: theme.md.colorSwatch,
 		spinnerFrames: theme.getSpinnerFrames("activity"),
 	};
 }

package/src/prompts/tools/eval.md

@@ -44,6 +44,8 @@ output(*ids, format?="raw", query?=None, offset?=None, limit?=None) → str | di
     Read task/agent output by ID. Single id returns text/dict; multiple ids return a list.
 tool.<name>(args) → unknown
     Invoke any session tool by name. `args` is the tool's parameter object.
+llm(prompt, model?="default", system?=None, schema?=None) → str | dict
+    Oneshot, stateless LLM call (no history, no tools). `model` picks a tier: "smol" (fast), "default" (this session's model), "slow" (most capable). Pass `system` for a system prompt. Pass a JSON-Schema `schema` to force structured output and get the parsed object back; otherwise returns the completion text.
 ```
 </prelude>
 

package/src/session/agent-session.ts

@@ -453,6 +453,15 @@ function formatRetryFallbackBaseSelector(selector: RetryFallbackSelector): strin
 }
 
 const IRC_REPLY_MAX_BYTES = 4096;
+export const ANTHROPIC_TOOL_CALL_BATCH_CAP = 4;
+const CLAUDE_OPUS_4_8_MODEL_ID = /(?:^|[./_-])claude-opus-4[.-]8\b/i;
+
+export function resolveToolCallBatchCapForModel(model: Model | undefined): number | undefined {
+	if (!model) return undefined;
+	return model.provider === "anthropic" && CLAUDE_OPUS_4_8_MODEL_ID.test(model.id)
+		? ANTHROPIC_TOOL_CALL_BATCH_CAP
+		: undefined;
+}
 
 /**
  * Collapse degenerate IRC ephemeral replies before they hit the relay.
@@ -993,6 +1002,10 @@ export class AgentSession {
 		this.#flushPendingAgentEnd();
 	}
 
+	#syncToolCallBatchCap(model: Model | undefined = this.model): void {
+		this.agent.maxToolCallsPerTurn = resolveToolCallBatchCapForModel(model);
+	}
+
 	#flushPendingAgentEnd(): void {
 		const pending = this.#pendingAgentEndEmit;
 		if (!pending) return;
@@ -1097,6 +1110,7 @@ export class AgentSession {
 		this.#agentId = config.agentId;
 		this.#agentRegistry = config.agentRegistry;
 		this.#providerSessionId = config.providerSessionId;
+		this.#syncToolCallBatchCap();
 		this.agent.setAssistantMessageEventInterceptor((message, assistantMessageEvent) => {
 			const event: AgentEvent = {
 				type: "message_update",
@@ -6162,6 +6176,7 @@ export class AgentSession {
 			this.#closeProviderSessionsForModelSwitch(currentModel, model);
 		}
 		this.agent.setModel(model);
+		this.#syncToolCallBatchCap(model);
 
 		// Re-evaluate append-only context mode — provider or setting may have changed
 		this.#syncAppendOnlyContext(model);
@@ -8214,6 +8229,7 @@ export class AgentSession {
 							this.#setModelWithProviderSessionReset(match);
 						} else {
 							this.agent.setModel(match);
+							this.#syncToolCallBatchCap(match);
 						}
 					}
 				}
@@ -8272,6 +8288,9 @@ export class AgentSession {
 			this.#scheduledHiddenNextTurnGeneration = previousScheduledHiddenNextTurnGeneration;
 			if (previousModel) {
 				this.agent.setModel(previousModel);
+				this.#syncToolCallBatchCap(previousModel);
+			} else {
+				this.#syncToolCallBatchCap(undefined);
 			}
 			this.#thinkingLevel = previousThinkingLevel;
 			this.agent.setThinkingLevel(toReasoningEffort(previousThinkingLevel));