pi-subagents 0.24.2 → 0.24.4

package/src/runs/shared/mcp-direct-tool-allowlist.ts

@@ -0,0 +1,365 @@
+import { createHash } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { getAgentDir } from "../../shared/utils.ts";
+
+const CACHE_VERSION = 1;
+const CACHE_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
+const BUILTIN_TOOL_NAMES = new Set(["read", "bash", "edit", "write", "grep", "find", "ls", "mcp"]);
+const GENERIC_GLOBAL_CONFIG_PATH = path.join(os.homedir(), ".config", "mcp", "mcp.json");
+const IMPORT_PATHS = {
+	cursor: [path.join(os.homedir(), ".cursor", "mcp.json")],
+	"claude-code": [
+		path.join(os.homedir(), ".claude", "mcp.json"),
+		path.join(os.homedir(), ".claude.json"),
+		path.join(os.homedir(), ".claude", "claude_desktop_config.json"),
+	],
+	"claude-desktop": [path.join(os.homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json")],
+	codex: [path.join(os.homedir(), ".codex", "config.json")],
+	windsurf: [path.join(os.homedir(), ".windsurf", "mcp.json")],
+	vscode: [".vscode/mcp.json"],
+} as const;
+
+type ToolPrefix = "server" | "none" | "short";
+type ImportKind = keyof typeof IMPORT_PATHS;
+
+interface ServerEntry {
+	command?: string;
+	args?: string[];
+	env?: Record<string, string>;
+	cwd?: string;
+	url?: string;
+	headers?: Record<string, string>;
+	auth?: "oauth" | "bearer" | false;
+	bearerToken?: string;
+	bearerTokenEnv?: string;
+	exposeResources?: boolean;
+	excludeTools?: string[];
+	directTools?: boolean | string[];
+}
+
+interface McpConfig {
+	mcpServers: Record<string, ServerEntry>;
+	imports?: ImportKind[];
+	settings?: {
+		toolPrefix?: ToolPrefix;
+		directTools?: boolean;
+	};
+}
+
+interface CachedTool {
+	name?: string;
+}
+
+interface CachedResource {
+	uri?: string;
+	name?: string;
+}
+
+interface ServerCacheEntry {
+	configHash?: string;
+	tools?: CachedTool[];
+	resources?: CachedResource[];
+	cachedAt?: number;
+}
+
+interface MetadataCache {
+	version: number;
+	servers: Record<string, ServerCacheEntry>;
+}
+
+export function resolveMcpDirectToolNames(mcpDirectTools: string[] | undefined, cwd = process.cwd()): string[] {
+	if (!mcpDirectTools?.length) return [];
+
+	try {
+		const config = loadMcpConfig(cwd);
+		const cache = loadMetadataCache();
+		if (!cache) return [];
+		return resolveDirectToolNames(config, cache, getToolPrefix(config.settings?.toolPrefix), mcpDirectTools);
+	} catch {
+		return [];
+	}
+}
+
+function loadMetadataCache(): MetadataCache | null {
+	const cachePath = path.join(getAgentDir(), "mcp-cache.json");
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(fs.readFileSync(cachePath, "utf-8"));
+	} catch {
+		return null;
+	}
+
+	if (!parsed || typeof parsed !== "object") return null;
+	const raw = parsed as Record<string, unknown>;
+	if (raw.version !== CACHE_VERSION || !raw.servers || typeof raw.servers !== "object" || Array.isArray(raw.servers)) {
+		return null;
+	}
+	return raw as unknown as MetadataCache;
+}
+
+function loadMcpConfig(cwd: string): McpConfig {
+	let config: McpConfig = { mcpServers: {} };
+	for (const sourcePath of getConfigPaths(cwd)) {
+		const loaded = readConfig(sourcePath);
+		if (!loaded) continue;
+		config = mergeConfigs(config, expandImports(loaded, cwd));
+	}
+	return config;
+}
+
+function getConfigPaths(cwd: string): string[] {
+	const piGlobalPath = path.join(getAgentDir(), "mcp.json");
+	const projectPath = path.resolve(cwd, ".mcp.json");
+	const projectPiPath = path.resolve(cwd, ".pi", "mcp.json");
+	const sources: string[] = [];
+	if (GENERIC_GLOBAL_CONFIG_PATH !== piGlobalPath) sources.push(GENERIC_GLOBAL_CONFIG_PATH);
+	sources.push(piGlobalPath);
+	if (projectPath !== piGlobalPath) sources.push(projectPath);
+	if (projectPiPath !== piGlobalPath && projectPiPath !== projectPath) sources.push(projectPiPath);
+	return sources;
+}
+
+function readConfig(configPath: string): McpConfig | null {
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+	} catch {
+		return null;
+	}
+	return validateConfig(parsed);
+}
+
+function validateConfig(raw: unknown): McpConfig {
+	if (!raw || typeof raw !== "object" || Array.isArray(raw)) return { mcpServers: {} };
+	const obj = raw as Record<string, unknown>;
+	const servers = obj.mcpServers ?? obj["mcp-servers"] ?? {};
+	return {
+		mcpServers: servers && typeof servers === "object" && !Array.isArray(servers) ? servers as Record<string, ServerEntry> : {},
+		imports: Array.isArray(obj.imports) ? obj.imports.filter((value): value is ImportKind => isImportKind(value)) : undefined,
+		settings: obj.settings && typeof obj.settings === "object" && !Array.isArray(obj.settings)
+			? obj.settings as McpConfig["settings"]
+			: undefined,
+	};
+}
+
+function mergeConfigs(base: McpConfig, next: McpConfig): McpConfig {
+	const imports = [...(base.imports ?? []), ...(next.imports ?? [])];
+	return {
+		mcpServers: { ...base.mcpServers, ...next.mcpServers },
+		imports: imports.length ? [...new Set(imports)] : undefined,
+		settings: next.settings ? { ...base.settings, ...next.settings } : base.settings,
+	};
+}
+
+function expandImports(config: McpConfig, cwd: string): McpConfig {
+	if (!config.imports?.length) return config;
+
+	const importedServers: Record<string, ServerEntry> = {};
+	for (const importKind of config.imports) {
+		const importPath = resolveImportPath(importKind, cwd);
+		if (!importPath) continue;
+		let imported: unknown;
+		try {
+			imported = JSON.parse(fs.readFileSync(importPath, "utf-8"));
+		} catch {
+			continue;
+		}
+		for (const [name, definition] of Object.entries(extractServers(imported, importKind))) {
+			if (!importedServers[name]) importedServers[name] = definition;
+		}
+	}
+
+	return {
+		imports: config.imports,
+		settings: config.settings,
+		mcpServers: { ...importedServers, ...config.mcpServers },
+	};
+}
+
+function resolveImportPath(importKind: ImportKind, cwd: string): string | null {
+	for (const candidate of IMPORT_PATHS[importKind]) {
+		const fullPath = candidate.startsWith(".") ? path.resolve(cwd, candidate) : candidate;
+		if (fs.existsSync(fullPath)) return fullPath;
+	}
+	return null;
+}
+
+function extractServers(config: unknown, kind: ImportKind): Record<string, ServerEntry> {
+	if (!config || typeof config !== "object" || Array.isArray(config)) return {};
+	const obj = config as Record<string, unknown>;
+	const servers = kind === "cursor" || kind === "windsurf" || kind === "vscode"
+		? obj.mcpServers ?? obj["mcp-servers"]
+		: obj.mcpServers;
+	return servers && typeof servers === "object" && !Array.isArray(servers) ? servers as Record<string, ServerEntry> : {};
+}
+
+function resolveDirectToolNames(config: McpConfig, cache: MetadataCache, prefix: ToolPrefix, envOverride: string[]): string[] {
+	const names: string[] = [];
+	const seenNames = new Set<string>();
+	const { servers: selectedServers, tools: selectedTools } = parseSelections(envOverride);
+
+	for (const [serverName, definition] of Object.entries(config.mcpServers)) {
+		const serverCache = cache.servers[serverName];
+		if (!isServerCacheValid(serverCache, definition)) continue;
+
+		const toolFilter = selectedServers.has(serverName)
+			? true
+			: selectedTools.get(serverName);
+		if (!toolFilter) continue;
+
+		for (const tool of Array.isArray(serverCache.tools) ? serverCache.tools : []) {
+			if (typeof tool?.name !== "string" || !tool.name) continue;
+			if (toolFilter !== true && !toolFilter.has(tool.name)) continue;
+			if (isToolExcluded(tool.name, serverName, prefix, definition.excludeTools)) continue;
+			const prefixedName = formatToolName(tool.name, serverName, prefix);
+			if (BUILTIN_TOOL_NAMES.has(prefixedName) || seenNames.has(prefixedName)) continue;
+			seenNames.add(prefixedName);
+			names.push(prefixedName);
+		}
+
+		if (definition.exposeResources === false) continue;
+		for (const resource of Array.isArray(serverCache.resources) ? serverCache.resources : []) {
+			if (typeof resource?.name !== "string" || !resource.name || typeof resource.uri !== "string" || !resource.uri) continue;
+			const baseName = `get_${resourceNameToToolName(resource.name)}`;
+			if (toolFilter !== true && !toolFilter.has(baseName)) continue;
+			if (isToolExcluded(baseName, serverName, prefix, definition.excludeTools)) continue;
+			const prefixedName = formatToolName(baseName, serverName, prefix);
+			if (BUILTIN_TOOL_NAMES.has(prefixedName) || seenNames.has(prefixedName)) continue;
+			seenNames.add(prefixedName);
+			names.push(prefixedName);
+		}
+	}
+
+	return names;
+}
+
+function parseSelections(selections: string[]): { servers: Set<string>; tools: Map<string, Set<string>> } {
+	const servers = new Set<string>();
+	const tools = new Map<string, Set<string>>();
+	for (let item of selections) {
+		item = item.replace(/\/+$/, "");
+		if (item.includes("/")) {
+			const [server, tool] = item.split("/", 2);
+			if (server && tool) {
+				if (!tools.has(server)) tools.set(server, new Set());
+				tools.get(server)!.add(tool);
+			} else if (server) {
+				servers.add(server);
+			}
+		} else if (item) {
+			servers.add(item);
+		}
+	}
+	return { servers, tools };
+}
+
+function isServerCacheValid(entry: ServerCacheEntry | undefined, definition: ServerEntry): entry is ServerCacheEntry {
+	if (!entry || entry.configHash !== computeMcpServerHash(definition)) return false;
+	if (!entry.cachedAt || typeof entry.cachedAt !== "number") return false;
+	return Date.now() - entry.cachedAt <= CACHE_MAX_AGE_MS;
+}
+
+export function computeMcpServerHash(definition: ServerEntry): string {
+	const identity: Record<string, unknown> = {
+		command: definition.command,
+		args: definition.args,
+		env: interpolateEnvRecord(definition.env),
+		cwd: resolveConfigPath(definition.cwd),
+		url: definition.url,
+		headers: interpolateEnvRecord(definition.headers),
+		auth: definition.auth,
+		bearerToken: resolveBearerToken(definition),
+		bearerTokenEnv: definition.bearerTokenEnv,
+		exposeResources: definition.exposeResources,
+		excludeTools: definition.excludeTools,
+	};
+	return createHash("sha256").update(stableStringify(identity)).digest("hex");
+}
+
+function getToolPrefix(value: unknown): ToolPrefix {
+	return value === "none" || value === "short" || value === "server" ? value : "server";
+}
+
+function isImportKind(value: unknown): value is ImportKind {
+	return typeof value === "string" && Object.hasOwn(IMPORT_PATHS, value);
+}
+
+function getServerPrefix(serverName: string, mode: ToolPrefix): string {
+	if (mode === "none") return "";
+	if (mode === "short") {
+		const short = serverName.replace(/-?mcp$/i, "").replace(/-/g, "_");
+		return short || "mcp";
+	}
+	return serverName.replace(/-/g, "_");
+}
+
+function formatToolName(toolName: string, serverName: string, prefix: ToolPrefix): string {
+	const serverPrefix = getServerPrefix(serverName, prefix);
+	return serverPrefix ? `${serverPrefix}_${toolName}` : toolName;
+}
+
+function isToolExcluded(toolName: string, serverName: string, prefix: ToolPrefix, excludeTools: unknown): boolean {
+	if (!Array.isArray(excludeTools) || excludeTools.length === 0) return false;
+	const candidates = new Set([
+		normalizeToolName(toolName),
+		normalizeToolName(formatToolName(toolName, serverName, prefix)),
+		normalizeToolName(formatToolName(toolName, serverName, "server")),
+		normalizeToolName(formatToolName(toolName, serverName, "short")),
+	]);
+	return excludeTools.some((excluded) => typeof excluded === "string" && candidates.has(normalizeToolName(excluded)));
+}
+
+function normalizeToolName(value: string): string {
+	return value.replace(/-/g, "_");
+}
+
+function resourceNameToToolName(name: string): string {
+	let result = name
+		.replace(/[^a-zA-Z0-9]/g, "_")
+		.replace(/_+/g, "_")
+		.replace(/^_+/, "")
+		.replace(/_+$/, "")
+		.toLowerCase();
+	if (!result || /^\d/.test(result)) result = `resource${result ? `_${result}` : ""}`;
+	return result;
+}
+
+function interpolateEnvRecord(values: Record<string, string> | undefined): Record<string, string> | undefined {
+	if (!values || typeof values !== "object" || Array.isArray(values)) return undefined;
+	const resolved: Record<string, string> = {};
+	for (const [key, value] of Object.entries(values)) {
+		if (typeof value === "string") resolved[key] = interpolateEnvVars(value);
+	}
+	return resolved;
+}
+
+function interpolateEnvVars(value: string): string {
+	return value
+		.replace(/\$\{(\w+)\}/g, (_, name: string) => process.env[name] ?? "")
+		.replace(/\$env:(\w+)/g, (_, name: string) => process.env[name] ?? "");
+}
+
+function resolveConfigPath(value: string | undefined): string | undefined {
+	if (typeof value !== "string") return undefined;
+	const resolved = interpolateEnvVars(value);
+	if (resolved === "~") return os.homedir();
+	if (resolved.startsWith("~/") || resolved.startsWith("~\\")) return path.join(os.homedir(), resolved.slice(2));
+	return resolved;
+}
+
+function resolveBearerToken(definition: Pick<ServerEntry, "bearerToken" | "bearerTokenEnv">): string | undefined {
+	if (typeof definition.bearerToken === "string") return interpolateEnvVars(definition.bearerToken);
+	return typeof definition.bearerTokenEnv === "string" ? process.env[definition.bearerTokenEnv] : undefined;
+}
+
+function stableStringify(value: unknown): string {
+	if (value === null || value === undefined || typeof value !== "object") {
+		const serialized = JSON.stringify(value);
+		return serialized === undefined ? "undefined" : serialized;
+	}
+	if (Array.isArray(value)) return `[${value.map((entry) => stableStringify(entry)).join(",")}]`;
+	const obj = value as Record<string, unknown>;
+	return `{${Object.keys(obj).sort().map((key) => `${JSON.stringify(key)}:${stableStringify(obj[key])}`).join(",")}}`;
+}

package/src/runs/shared/parallel-utils.ts

@@ -3,10 +3,12 @@ export interface RunnerSubagentStep {
 	task: string;
 	cwd?: string;
 	model?: string;
+	thinking?: string;
 	modelCandidates?: string[];
 	tools?: string[];
 	extensions?: string[];
 	mcpDirectTools?: string[];
+	completionGuard?: boolean;
 	systemPrompt?: string | null;
 	systemPromptMode?: "append" | "replace";
 	inheritProjectContext: boolean;

package/src/runs/shared/pi-args.ts

@@ -2,6 +2,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
+import { resolveMcpDirectToolNames } from "./mcp-direct-tool-allowlist.ts";
 
 const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"];
 const TASK_ARG_LIMIT = 8000;
@@ -27,6 +28,7 @@ interface BuildPiArgsInput {
 	extensions?: string[];
 	systemPrompt?: string | null;
 	mcpDirectTools?: string[];
+	cwd?: string;
 	promptFileStem?: string;
 	intercomSessionName?: string;
 	orchestratorIntercomTarget?: string;
@@ -80,6 +82,9 @@ export function buildPiArgs(input: BuildPiArgsInput): BuildPiArgsResult {
 			}
 		}
 		if (builtinTools.length > 0) {
+			if (input.mcpDirectTools?.length) {
+				builtinTools.push(...resolveMcpDirectToolNames(input.mcpDirectTools, input.cwd));
+			}
 			args.push("--tools", builtinTools.join(","));
 		}
 	}

package/src/runs/shared/run-history.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
+import { getAgentDir } from "../../shared/utils.ts";
 
 export interface RunEntry {
 	agent: string;
@@ -11,10 +11,13 @@ export interface RunEntry {
 	exit?: number;
 }
 
-const HISTORY_PATH = path.join(os.homedir(), ".pi", "agent", "run-history.jsonl");
 const ROTATE_READ_THRESHOLD = 1200;
 const ROTATE_KEEP = 1000;
 
+function getHistoryPath(): string {
+	return path.join(getAgentDir(), "run-history.jsonl");
+}
+
 export function recordRun(agent: string, task: string, exitCode: number, durationMs: number): void {
 	try {
 		const entry: RunEntry = {
@@ -25,18 +28,20 @@ export function recordRun(agent: string, task: string, exitCode: number, duratio
 			duration: durationMs,
 			...(exitCode !== 0 ? { exit: exitCode } : {}),
 		};
-		fs.mkdirSync(path.dirname(HISTORY_PATH), { recursive: true });
-		fs.appendFileSync(HISTORY_PATH, `${JSON.stringify(entry)}\n`);
+		const historyPath = getHistoryPath();
+		fs.mkdirSync(path.dirname(historyPath), { recursive: true });
+		fs.appendFileSync(historyPath, `${JSON.stringify(entry)}\n`);
 	} catch {
 		// Best-effort — never crash the execution flow for history recording
 	}
 }
 
 export function loadRunsForAgent(agent: string): RunEntry[] {
-	if (!fs.existsSync(HISTORY_PATH)) return [];
+	const historyPath = getHistoryPath();
+	if (!fs.existsSync(historyPath)) return [];
 	let raw: string;
 	try {
-		raw = fs.readFileSync(HISTORY_PATH, "utf-8");
+		raw = fs.readFileSync(historyPath, "utf-8");
 	} catch {
 		return [];
 	}
@@ -45,7 +50,7 @@ export function loadRunsForAgent(agent: string): RunEntry[] {
 
 	if (lines.length > ROTATE_READ_THRESHOLD) {
 		lines = lines.slice(-ROTATE_KEEP);
-		try { fs.writeFileSync(HISTORY_PATH, `${lines.join("\n")}\n`, "utf-8"); } catch {}
+		try { fs.writeFileSync(historyPath, `${lines.join("\n")}\n`, "utf-8"); } catch {}
 	}
 
 	return lines

package/src/runs/shared/single-output.ts

@@ -8,12 +8,22 @@ export interface SingleOutputSnapshot {
 	size?: number;
 }
 
+export function normalizeSingleOutputOverride(
+	output: string | boolean | undefined,
+	defaultOutput: string | undefined,
+): string | false | undefined {
+	if (output === false || output === "false") return false;
+	if (output === true || output === "true") return defaultOutput;
+	if (typeof output === "string" && output.length > 0) return output;
+	return undefined;
+}
+
 export function resolveSingleOutputPath(
-	output: string | false | undefined,
+	output: string | boolean | undefined,
 	runtimeCwd: string,
 	requestedCwd?: string,
 ): string | undefined {
-	if (typeof output !== "string" || !output) return undefined;
+	if (typeof output !== "string" || !output || output === "false" || output === "true") return undefined;
 	if (path.isAbsolute(output)) return output;
 	const baseCwd = requestedCwd
 		? (path.isAbsolute(requestedCwd) ? requestedCwd : path.resolve(runtimeCwd, requestedCwd))

package/src/shared/artifacts.ts

@@ -1,7 +1,7 @@
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
 import { TEMP_ARTIFACTS_DIR, type ArtifactPaths } from "./types.ts";
+import { getAgentDir } from "./utils.ts";
 const CLEANUP_MARKER_FILE = ".last-cleanup";
 
 export function getArtifactsDir(sessionFile: string | null): string {
@@ -74,7 +74,7 @@ export function cleanupOldArtifacts(dir: string, maxAgeDays: number): void {
 export function cleanupAllArtifactDirs(maxAgeDays: number): void {
 	cleanupOldArtifacts(TEMP_ARTIFACTS_DIR, maxAgeDays);
 
-	const sessionsBase = path.join(os.homedir(), ".pi", "agent", "sessions");
+	const sessionsBase = path.join(getAgentDir(), "sessions");
 	if (!fs.existsSync(sessionsBase)) return;
 
 	let dirs: string[];

package/src/shared/formatters.ts

@@ -7,6 +7,7 @@ import * as path from "node:path";
 import type { Usage, SingleResult } from "./types.ts";
 import type { ChainStep } from "./settings.ts";
 import { isParallelStep } from "./settings.ts";
+import { splitKnownThinkingSuffix, THINKING_LEVELS } from "./model-info.ts";
 
 /**
  * Format token count with k suffix for large numbers
@@ -15,6 +16,18 @@ export function formatTokens(n: number): string {
 	return n < 1000 ? String(n) : n < 10000 ? `${(n / 1000).toFixed(1)}k` : `${Math.round(n / 1000)}k`;
 }
 
+export function formatModelThinking(model?: string, thinking?: string): string {
+	const parsed = model ? splitKnownThinkingSuffix(model) : undefined;
+	let displayModel = parsed?.baseModel ?? model;
+	const explicitThinking = THINKING_LEVELS.find((level) => level === thinking?.trim());
+	const displayThinking = parsed?.thinkingSuffix ? parsed.thinkingSuffix.slice(1) : explicitThinking;
+	if (displayModel) {
+		const slashIdx = displayModel.lastIndexOf("/");
+		if (slashIdx !== -1) displayModel = displayModel.slice(slashIdx + 1);
+	}
+	return [displayModel, displayThinking ? `thinking ${displayThinking}` : undefined].filter(Boolean).join(" · ");
+}
+
 /**
  * Format usage statistics into a compact string
  */

package/src/shared/model-info.ts

@@ -27,6 +27,16 @@ export function toModelInfo(model: RegistryModelLike): ModelInfo {
 	};
 }
 
+/** Resolve the effective thinking level from a model string (which may contain a known suffix like `:high`)
+ * and an explicit thinking config value. Returns `undefined` when no thinking is applicable
+ * (e.g. no model was specified, or the model has no suffix and no config was provided). */
+export function resolveEffectiveThinking(model: string | undefined, configThinking: string | undefined): string | undefined {
+	if (!model) return undefined;
+	const { thinkingSuffix } = splitKnownThinkingSuffix(model);
+	if (thinkingSuffix) return thinkingSuffix.slice(1);
+	return THINKING_LEVELS.find((level) => level === configThinking);
+}
+
 export function splitKnownThinkingSuffix(model: string): { baseModel: string; thinkingSuffix: string } {
 	const colonIdx = model.lastIndexOf(":");
 	if (colonIdx === -1) return { baseModel: model, thinkingSuffix: "" };

package/src/shared/types.ts

@@ -315,6 +315,7 @@ export interface AsyncStatus {
 		tokens?: TokenUsage;
 		skills?: string[];
 		model?: string;
+		thinking?: string;
 		attemptedModels?: string[];
 		modelAttempts?: ModelAttempt[];
 		error?: string;

package/src/shared/utils.ts

@@ -13,6 +13,13 @@ import type { AgentProgress, AsyncStatus, Details, DisplayItem, ErrorInfo, Singl
 // File System Utilities
 // ============================================================================
 
+export function getAgentDir(): string {
+	const configured = process.env.PI_CODING_AGENT_DIR;
+	if (configured === "~") return os.homedir();
+	if (configured?.startsWith("~/")) return path.join(os.homedir(), configured.slice(2));
+	return configured || path.join(os.homedir(), ".pi", "agent");
+}
+
 const statusCache = new Map<string, { mtime: number; status: AsyncStatus }>();
 
 function getErrorMessage(error: unknown): string {
@@ -182,8 +189,11 @@ export function getFinalOutput(messages: Message[]): string {
 	for (let i = messages.length - 1; i >= 0; i--) {
 		const msg = messages[i];
 		if (msg.role === "assistant") {
+			const hasAssistantError = ("errorMessage" in msg && typeof msg.errorMessage === "string" && msg.errorMessage.length > 0)
+				|| ("stopReason" in msg && msg.stopReason === "error");
+			if (hasAssistantError) continue;
 			for (const part of msg.content) {
-				if (part.type === "text") return part.text;
+				if (part.type === "text" && part.text.trim().length > 0) return part.text;
 			}
 		}
 	}