gsd-pi 2.41.0 → 2.42.0-dev.eedc83f

package/packages/pi-coding-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gsd/pi-coding-agent",
-  "version": "2.41.0",
+  "version": "2.42.0",
   "description": "Coding agent CLI (vendored from pi-mono)",
   "type": "module",
   "piConfig": {

package/packages/pi-coding-agent/src/core/agent-session.ts

@@ -687,6 +687,8 @@ export class AgentSession {
 	 * Call this when completely done with the session.
 	 */
 	dispose(): void {
+		this._extensionErrorUnsubscriber?.();
+		this._extensionErrorUnsubscriber = undefined;
 		this._disconnectFromAgent();
 		this._eventListeners = [];
 	}
@@ -1928,7 +1930,11 @@ export class AgentSession {
 		runner.setUIContext(this._extensionUIContext);
 		runner.bindCommandContext(this._extensionCommandContextActions);
 
-		this._extensionErrorUnsubscriber?.();
+		try {
+			this._extensionErrorUnsubscriber?.();
+		} catch {
+			// Ignore errors from previous unsubscriber
+		}
 		this._extensionErrorUnsubscriber = this._extensionErrorListener
 			? runner.onError(this._extensionErrorListener)
 			: undefined;

package/packages/pi-coding-agent/src/core/auth-storage.test.ts

@@ -263,6 +263,74 @@ describe("AuthStorage — areAllCredentialsBackedOff", () => {
 	});
 });
 
+// ─── mismatched oauth credential for non-OAuth provider (#2083) ───────────────
+
+describe("AuthStorage — oauth credential for non-OAuth provider (#2083)", () => {
+	it("returns undefined when openrouter has type:oauth (no registered OAuth provider)", async () => {
+		// Simulates the bug: OpenRouter credential stored as type:"oauth"
+		// but OpenRouter is not a registered OAuth provider.
+		const storage = inMemory({
+			openrouter: {
+				type: "oauth",
+				access_token: "sk-or-v1-fake",
+				refresh_token: "rt-fake",
+				expires: Date.now() + 3_600_000,
+			},
+		});
+
+		// Before the fix, getApiKey returns undefined because
+		// resolveCredentialApiKey calls getOAuthProvider("openrouter") → null → undefined.
+		// The key in the oauth credential is never extracted.
+		const key = await storage.getApiKey("openrouter");
+		// After the fix, the oauth credential with an unrecognised provider
+		// should be skipped, and getApiKey should fall through to env / fallback.
+		assert.equal(key, undefined);
+	});
+
+	it("falls through to env var when openrouter has type:oauth credential", async () => {
+		const storage = inMemory({
+			openrouter: {
+				type: "oauth",
+				access_token: "sk-or-v1-fake",
+				refresh_token: "rt-fake",
+				expires: Date.now() + 3_600_000,
+			},
+		});
+
+		// Simulate OPENROUTER_API_KEY being set via env
+		const origEnv = process.env.OPENROUTER_API_KEY;
+		try {
+			process.env.OPENROUTER_API_KEY = "sk-or-v1-env-key";
+			const key = await storage.getApiKey("openrouter");
+			assert.equal(key, "sk-or-v1-env-key");
+		} finally {
+			if (origEnv === undefined) {
+				delete process.env.OPENROUTER_API_KEY;
+			} else {
+				process.env.OPENROUTER_API_KEY = origEnv;
+			}
+		}
+	});
+
+	it("falls through to fallback resolver when openrouter has type:oauth credential", async () => {
+		const storage = inMemory({
+			openrouter: {
+				type: "oauth",
+				access_token: "sk-or-v1-fake",
+				refresh_token: "rt-fake",
+				expires: Date.now() + 3_600_000,
+			},
+		});
+
+		storage.setFallbackResolver((provider) =>
+			provider === "openrouter" ? "sk-or-v1-fallback" : undefined,
+		);
+
+		const key = await storage.getApiKey("openrouter");
+		assert.equal(key, "sk-or-v1-fallback");
+	});
+});
+
 // ─── getAll truncation ────────────────────────────────────────────────────────
 
 describe("AuthStorage — getAll()", () => {

package/packages/pi-coding-agent/src/core/auth-storage.ts

@@ -202,6 +202,7 @@ export class AuthStorage {
 	private fallbackResolver?: (provider: string) => string | undefined;
 	private loadError: Error | null = null;
 	private errors: Error[] = [];
+	private credentialChangeListeners: Set<() => void> = new Set();
 
 	/**
 	 * Round-robin index per provider. Incremented on each call to getApiKey
@@ -263,6 +264,25 @@ export class AuthStorage {
 		this.fallbackResolver = resolver;
 	}
 
+	/**
+	 * Register a callback to be notified when credentials change (e.g., after OAuth token refresh).
+	 * Returns a function to unregister the listener.
+	 */
+	onCredentialChange(listener: () => void): () => void {
+		this.credentialChangeListeners.add(listener);
+		return () => this.credentialChangeListeners.delete(listener);
+	}
+
+	private notifyCredentialChange(): void {
+		for (const listener of this.credentialChangeListeners) {
+			try {
+				listener();
+			} catch {
+				// Don't let listener errors break the refresh flow
+			}
+		}
+	}
+
 	private recordError(error: unknown): void {
 		const normalizedError = error instanceof Error ? error : new Error(String(error));
 		this.errors.push(normalizedError);
@@ -667,6 +687,11 @@ export class AuthStorage {
 			return { result: refreshed, next: JSON.stringify(merged, null, 2) };
 		});
 
+		// Notify listeners after credential change (e.g., model registry refresh)
+		if (result) {
+			queueMicrotask(() => this.notifyCredentialChange());
+		}
+
 		return result;
 	}
 
@@ -731,9 +756,12 @@ export class AuthStorage {
 		if (credentials.length > 0) {
 			const index = this.selectCredentialIndex(providerId, credentials, sessionId);
 			if (index >= 0) {
-				return this.resolveCredentialApiKey(providerId, credentials[index]);
+				const resolved = await this.resolveCredentialApiKey(providerId, credentials[index]);
+				if (resolved) return resolved;
+				// Credential unresolvable (e.g. type:"oauth" for a non-OAuth provider) —
+				// fall through to env / fallback instead of returning undefined (#2083)
 			}
-			// All credentials backed off - fall through to env/fallback
+			// All credentials backed off or unresolvable - fall through to env/fallback
 		}
 
 		// Fall back to environment variable

package/packages/pi-coding-agent/src/core/discovery-cache.test.ts

@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, it } from "node:test";
@@ -59,7 +59,9 @@ describe("ModelDiscoveryCache — basic operations", () => {
 
 		cache.clear("openai");
 		assert.equal(cache.get("openai"), undefined);
-		assert.ok(cache.get("google"));
+		const googleEntry = cache.get("google");
+		assert.ok(googleEntry);
+		assert.equal(googleEntry.models[0].id, "gemini-pro");
 	});
 
 	it("clear without provider removes all entries", () => {

package/packages/pi-coding-agent/src/core/extensions/loader.ts

@@ -569,6 +569,24 @@ function createExtensionAPI(
 }
 
 async function loadExtensionModule(extensionPath: string) {
+	// Pre-compiled extension loading: if the source is .ts and a sibling .js
+	// file exists with matching or newer mtime, use native import() to skip
+	// jiti JIT compilation entirely.  This is the biggest startup win for
+	// bundled extensions that have already been built.
+	if (extensionPath.endsWith(".ts")) {
+		const jsPath = extensionPath.replace(/\.ts$/, ".js");
+		try {
+			const [tsStat, jsStat] = [fs.statSync(extensionPath), fs.statSync(jsPath)];
+			if (jsStat.mtimeMs >= tsStat.mtimeMs) {
+				const module = await import(jsPath);
+				const factory = (module.default ?? module) as ExtensionFactory;
+				return typeof factory !== "function" ? undefined : factory;
+			}
+		} catch {
+			// .js file doesn't exist or stat failed — fall through to jiti
+		}
+	}
+
 	const jiti = createJiti(import.meta.url, {
 		moduleCache: false,
 		...getJitiOptions(),

package/packages/pi-coding-agent/src/core/lsp/client.ts

@@ -29,6 +29,9 @@ let idleTimeoutMs: number | null = null;
 let idleCheckInterval: ReturnType<typeof setInterval> | null = null;
 const IDLE_CHECK_INTERVAL_MS = 60 * 1000;
 
+/** Maximum allowed size for the message buffer (10 MB). */
+const MAX_MESSAGE_BUFFER_SIZE = 10 * 1024 * 1024;
+
 /**
  * Configure the idle timeout for LSP clients.
  */
@@ -52,6 +55,10 @@ function startIdleChecker(): void {
 				shutdownClient(key);
 			}
 		}
+		// Stop the checker if there are no more clients to monitor
+		if (clients.size === 0) {
+			stopIdleChecker();
+		}
 	}, IDLE_CHECK_INTERVAL_MS);
 }
 
@@ -252,6 +259,17 @@ async function startMessageReader(client: LspClient): Promise<void> {
 	return new Promise<void>((resolve) => {
 		stdout.on("data", async (chunk: Buffer) => {
 			const currentBuffer: Buffer = Buffer.concat([client.messageBuffer, chunk]);
+
+			if (currentBuffer.length > MAX_MESSAGE_BUFFER_SIZE) {
+				if (process.env.DEBUG) {
+					console.error(
+						`[lsp] Message buffer exceeded ${MAX_MESSAGE_BUFFER_SIZE} bytes (${currentBuffer.length}), discarding`,
+					);
+				}
+				client.messageBuffer = Buffer.alloc(0);
+				return;
+			}
+
 			client.messageBuffer = currentBuffer;
 
 			let workingBuffer = currentBuffer;
@@ -708,6 +726,14 @@ function shutdownClient(key: string): void {
 		client.proc.kill();
 	}
 	clients.delete(key);
+	clientLocks.delete(key);
+
+	// Clean up any file operation locks associated with this client
+	for (const lockKey of Array.from(fileOperationLocks.keys())) {
+		if (lockKey.startsWith(`${key}:`)) {
+			fileOperationLocks.delete(lockKey);
+		}
+	}
 }
 
 // =============================================================================
@@ -822,6 +848,9 @@ async function sendNotification(client: LspClient, method: string, params: unkno
 function shutdownAll(): void {
 	const clientsToShutdown = Array.from(clients.values());
 	clients.clear();
+	clientLocks.clear();
+	fileOperationLocks.clear();
+	stopIdleChecker();
 
 	const err = new Error("LSP client shutdown");
 	for (const client of clientsToShutdown) {

package/packages/pi-coding-agent/src/core/model-registry.ts

@@ -243,6 +243,9 @@ export class ModelRegistry {
 			return undefined;
 		});
 
+		// Refresh models when credentials change (e.g., OAuth token refresh with new model limits)
+		this.authStorage.onCredentialChange(() => this.refresh());
+
 		// Load models
 		this.loadModels();
 	}

package/packages/pi-coding-agent/src/core/package-manager.ts

@@ -1562,6 +1562,26 @@ export class DefaultPackageManager implements PackageManager {
 		}
 	}
 
+	/**
+	 * Batch-discover which resource subdirectories exist under a parent dir.
+	 * A single readdirSync replaces 4 separate existsSync probes, reducing
+	 * syscalls during startup.
+	 */
+	private discoverResourceSubdirs(baseDir: string): Set<string> {
+		try {
+			const entries = readdirSync(baseDir, { withFileTypes: true });
+			const names = new Set<string>();
+			for (const e of entries) {
+				if (e.isDirectory() || e.isSymbolicLink()) {
+					names.add(e.name);
+				}
+			}
+			return names;
+		} catch {
+			return new Set();
+		}
+	}
+
 	private addAutoDiscoveredResources(
 		accumulator: ResourceAccumulator,
 		globalSettings: ReturnType<SettingsManager["getGlobalSettings"]>,
@@ -1595,6 +1615,11 @@ export class DefaultPackageManager implements PackageManager {
 			themes: (projectSettings.themes ?? []) as string[],
 		};
 
+		// Batch directory discovery: one readdir of each parent replaces up to
+		// 4 separate existsSync calls per base directory, cutting syscalls.
+		const projectSubdirs = this.discoverResourceSubdirs(projectBaseDir);
+		const userSubdirs = this.discoverResourceSubdirs(globalBaseDir);
+
 		const userDirs = {
 			extensions: join(globalBaseDir, "extensions"),
 			skills: join(globalBaseDir, "skills"),
@@ -1626,66 +1651,82 @@ export class DefaultPackageManager implements PackageManager {
 			}
 		};
 
-		addResources(
-			"extensions",
-			collectAutoExtensionEntries(projectDirs.extensions),
-			projectMetadata,
-			projectOverrides.extensions,
-			projectBaseDir,
-		);
-		addResources(
-			"skills",
-			[
-				...collectAutoSkillEntries(projectDirs.skills),
+		// Project resources — skip collect calls when the parent readdir shows
+		// the subdirectory doesn't exist (avoids redundant existsSync + readdirSync).
+		if (projectSubdirs.has("extensions")) {
+			addResources(
+				"extensions",
+				collectAutoExtensionEntries(projectDirs.extensions),
+				projectMetadata,
+				projectOverrides.extensions,
+				projectBaseDir,
+			);
+		}
+		{
+			const skillEntries = [
+				...(projectSubdirs.has("skills") ? collectAutoSkillEntries(projectDirs.skills) : []),
 				...projectAgentsSkillDirs.flatMap((dir) => collectAutoSkillEntries(dir)),
-			],
-			projectMetadata,
-			projectOverrides.skills,
-			projectBaseDir,
-		);
-		addResources(
-			"prompts",
-			collectAutoPromptEntries(projectDirs.prompts),
-			projectMetadata,
-			projectOverrides.prompts,
-			projectBaseDir,
-		);
-		addResources(
-			"themes",
-			collectAutoThemeEntries(projectDirs.themes),
-			projectMetadata,
-			projectOverrides.themes,
-			projectBaseDir,
-		);
+			];
+			if (skillEntries.length > 0) {
+				addResources("skills", skillEntries, projectMetadata, projectOverrides.skills, projectBaseDir);
+			}
+		}
+		if (projectSubdirs.has("prompts")) {
+			addResources(
+				"prompts",
+				collectAutoPromptEntries(projectDirs.prompts),
+				projectMetadata,
+				projectOverrides.prompts,
+				projectBaseDir,
+			);
+		}
+		if (projectSubdirs.has("themes")) {
+			addResources(
+				"themes",
+				collectAutoThemeEntries(projectDirs.themes),
+				projectMetadata,
+				projectOverrides.themes,
+				projectBaseDir,
+			);
+		}
 
-		addResources(
-			"extensions",
-			collectAutoExtensionEntries(userDirs.extensions),
-			userMetadata,
-			userOverrides.extensions,
-			globalBaseDir,
-		);
-		addResources(
-			"skills",
-			[...collectAutoSkillEntries(userDirs.skills), ...collectAutoSkillEntries(userAgentsSkillsDir)],
-			userMetadata,
-			userOverrides.skills,
-			globalBaseDir,
-		);
-		addResources(
-			"prompts",
-			collectAutoPromptEntries(userDirs.prompts),
-			userMetadata,
-			userOverrides.prompts,
-			globalBaseDir,
-		);
-		addResources(
-			"themes",
-			collectAutoThemeEntries(userDirs.themes),
-			userMetadata,
-			userOverrides.themes,
-			globalBaseDir,
-		);
+		// User (global) resources
+		if (userSubdirs.has("extensions")) {
+			addResources(
+				"extensions",
+				collectAutoExtensionEntries(userDirs.extensions),
+				userMetadata,
+				userOverrides.extensions,
+				globalBaseDir,
+			);
+		}
+		{
+			const skillEntries = [
+				...(userSubdirs.has("skills") ? collectAutoSkillEntries(userDirs.skills) : []),
+				...collectAutoSkillEntries(userAgentsSkillsDir),
+			];
+			if (skillEntries.length > 0) {
+				addResources("skills", skillEntries, userMetadata, userOverrides.skills, globalBaseDir);
+			}
+		}
+		if (userSubdirs.has("prompts")) {
+			addResources(
+				"prompts",
+				collectAutoPromptEntries(userDirs.prompts),
+				userMetadata,
+				userOverrides.prompts,
+				globalBaseDir,
+			);
+		}
+		if (userSubdirs.has("themes")) {
+			addResources(
+				"themes",
+				collectAutoThemeEntries(userDirs.themes),
+				userMetadata,
+				userOverrides.themes,
+				globalBaseDir,
+			);
+		}
 	}
 
 	private collectFilesFromPaths(paths: string[], resourceType: ResourceType): string[] {

package/packages/pi-coding-agent/src/core/resource-loader.ts

@@ -1,6 +1,6 @@
 import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
-import { join, resolve, sep } from "node:path";
+import { basename, dirname, join, resolve, sep } from "node:path";
 import chalk from "chalk";
 import { CONFIG_DIR_NAME, getAgentDir } from "../config.js";
 import { loadThemeFromPath, type Theme } from "../modes/interactive/theme/theme.js";
@@ -127,6 +127,8 @@ export interface DefaultResourceLoaderOptions {
 	noThemes?: boolean;
 	systemPrompt?: string;
 	appendSystemPrompt?: string;
+	/** Names of bundled extensions (used to identify built-in extensions in conflict detection). */
+	bundledExtensionNames?: Set<string>;
 	extensionsOverride?: (base: LoadExtensionsResult) => LoadExtensionsResult;
 	skillsOverride?: (base: { skills: Skill[]; diagnostics: ResourceDiagnostic[] }) => {
 		skills: Skill[];
@@ -164,6 +166,7 @@ export class DefaultResourceLoader implements ResourceLoader {
 	private noThemes: boolean;
 	private systemPromptSource?: string;
 	private appendSystemPromptSource?: string;
+	private bundledExtensionNames: Set<string>;
 	private extensionsOverride?: (base: LoadExtensionsResult) => LoadExtensionsResult;
 	private skillsOverride?: (base: { skills: Skill[]; diagnostics: ResourceDiagnostic[] }) => {
 		skills: Skill[];
@@ -219,6 +222,7 @@ export class DefaultResourceLoader implements ResourceLoader {
 		this.noThemes = options.noThemes ?? false;
 		this.systemPromptSource = options.systemPrompt;
 		this.appendSystemPromptSource = options.appendSystemPrompt;
+		this.bundledExtensionNames = options.bundledExtensionNames ?? new Set();
 		this.extensionsOverride = options.extensionsOverride;
 		this.skillsOverride = options.skillsOverride;
 		this.promptsOverride = options.promptsOverride;
@@ -790,6 +794,19 @@ export class DefaultResourceLoader implements ResourceLoader {
 		return target.startsWith(prefix);
 	}
 
+	/**
+	 * Extract the extension name from its path.
+	 * For root-level files: basename without extension (e.g. "search-the-web.ts" → "search-the-web")
+	 * For subdirectory extensions: the directory name (e.g. "/path/to/gsd/index.ts" → "gsd")
+	 */
+	private getExtensionNameFromPath(extPath: string): string {
+		const base = basename(extPath);
+		if (base === "index.js" || base === "index.ts") {
+			return basename(dirname(extPath));
+		}
+		return base.replace(/\.(?:ts|js)$/, "");
+	}
+
 	private detectExtensionConflicts(extensions: Extension[]): Array<{ path: string; message: string }> {
 		const conflicts: Array<{ path: string; message: string }> = [];
 
@@ -803,9 +820,10 @@ export class DefaultResourceLoader implements ResourceLoader {
 			for (const toolName of ext.tools.keys()) {
 				const existingOwner = toolOwners.get(toolName);
 				if (existingOwner && existingOwner !== ext.path) {
-					// Determine if the existing owner is a built-in (not a user extension)
-					const isBuiltIn = !existingOwner.includes("/.gsd/agent/extensions/") &&
-						!existingOwner.includes("/.gsd/extensions/");
+					// Determine if the existing owner is a bundled extension by checking
+					// its name against the canonical bundled extensions list
+					const ownerName = this.getExtensionNameFromPath(existingOwner);
+					const isBuiltIn = this.bundledExtensionNames.has(ownerName);
 					const hint = isBuiltIn
 						? ` (built-in tool supersedes — consider removing ${ext.path})`
 						: "";
@@ -822,8 +840,8 @@ export class DefaultResourceLoader implements ResourceLoader {
 			for (const commandName of ext.commands.keys()) {
 				const existingOwner = commandOwners.get(commandName);
 				if (existingOwner && existingOwner !== ext.path) {
-					const isBuiltIn = !existingOwner.includes("/.gsd/agent/extensions/") &&
-						!existingOwner.includes("/.gsd/extensions/");
+					const ownerName = this.getExtensionNameFromPath(existingOwner);
+					const isBuiltIn = this.bundledExtensionNames.has(ownerName);
 					const hint = isBuiltIn
 						? ` (built-in command supersedes — consider removing ${ext.path})`
 						: "";

package/packages/pi-coding-agent/src/core/system-prompt.ts

@@ -84,9 +84,9 @@ export function buildSystemPrompt(options: BuildSystemPromptOptions = {}): strin
 			}
 		}
 
-		// Append skills section (only if read tool is available)
-		const customPromptHasRead = !selectedTools || selectedTools.includes("read");
-		if (customPromptHasRead && skills.length > 0) {
+		// Append skills section (if read or Skill tool is available)
+		const customPromptHasSkillAccess = !selectedTools || selectedTools.includes("read") || selectedTools.includes("Skill");
+		if (customPromptHasSkillAccess && skills.length > 0) {
 			prompt += formatSkillsForPrompt(skills);
 		}
 
@@ -232,8 +232,9 @@ Pi documentation (read only when the user asks about pi itself, its SDK, extensi
 		}
 	}
 
-	// Append skills section (only if read tool is available)
-	if (hasRead && skills.length > 0) {
+	// Append skills section (if read or Skill tool is available)
+	const hasSkill = tools.includes("Skill");
+	if ((hasRead || hasSkill) && skills.length > 0) {
 		prompt += formatSkillsForPrompt(skills);
 	}
 

package/packages/pi-coding-agent/src/modes/interactive/components/extension-editor.ts

@@ -113,6 +113,9 @@ export class ExtensionEditorComponent extends Container implements Focusable {
 	private openExternalEditor(): void {
 		const editorCmd = process.env.VISUAL || process.env.EDITOR;
 		if (!editorCmd) {
+			// No editor configured — nothing to do.
+			// The main interactive-mode handler shows a warning with an iTerm2 hint;
+			// this component is a secondary editor so we silently bail.
 			return;
 		}
 

package/packages/pi-coding-agent/src/modes/interactive/components/footer.ts

@@ -68,10 +68,14 @@ export class FooterComponent implements Component {
 		const totalCacheWrite = usageTotals.cacheWrite;
 		const totalCost = usageTotals.cost;
 
+		// Use activeInferenceModel during streaming to show the model actually
+		// being used, not the configured model which may have been switched mid-turn.
+		const displayModel = state.activeInferenceModel ?? state.model;
+
 		// Calculate context usage from session (handles compaction correctly).
 		// After compaction, tokens are unknown until the next LLM response.
 		const contextUsage = this.session.getContextUsage();
-		const contextWindow = contextUsage?.contextWindow ?? state.model?.contextWindow ?? 0;
+		const contextWindow = contextUsage?.contextWindow ?? displayModel?.contextWindow ?? 0;
 		const contextPercentValue = contextUsage?.percent ?? 0;
 		const contextPercent = contextUsage?.percent !== null ? contextPercentValue.toFixed(1) : "?";
 
@@ -102,7 +106,7 @@ export class FooterComponent implements Component {
 		if (totalCacheWrite) statsParts.push(`W${formatTokens(totalCacheWrite)}`);
 
 		// Show cost with "(sub)" indicator if using OAuth subscription
-		const usingSubscription = state.model ? this.session.modelRegistry.isUsingOAuth(state.model) : false;
+		const usingSubscription = displayModel ? this.session.modelRegistry.isUsingOAuth(displayModel) : false;
 		if (totalCost || usingSubscription) {
 			const costStr = `$${totalCost.toFixed(3)}${usingSubscription ? " (sub)" : ""}`;
 			statsParts.push(costStr);
@@ -127,7 +131,7 @@ export class FooterComponent implements Component {
 		let statsLeft = statsParts.join(" ");
 
 		// Add model name on the right side, plus thinking level if model supports it
-		const modelName = state.model?.id || "no-model";
+		const modelName = displayModel?.id || "no-model";
 
 		let statsLeftWidth = visibleWidth(statsLeft);
 
@@ -142,7 +146,7 @@ export class FooterComponent implements Component {
 
 		// Add thinking level indicator if model supports reasoning
 		let rightSideWithoutProvider = modelName;
-		if (state.model?.reasoning) {
+		if (displayModel?.reasoning) {
 			const thinkingLevel = state.thinkingLevel || "off";
 			rightSideWithoutProvider =
 				thinkingLevel === "off" ? `${modelName} • thinking off` : `${modelName} • ${thinkingLevel}`;
@@ -150,8 +154,8 @@ export class FooterComponent implements Component {
 
 		// Prepend the provider in parentheses if there are multiple providers and there's enough room
 		let rightSide = rightSideWithoutProvider;
-		if (this.footerData.getAvailableProviderCount() > 1 && state.model) {
-			rightSide = `(${state.model!.provider}) ${rightSideWithoutProvider}`;
+		if (this.footerData.getAvailableProviderCount() > 1 && displayModel) {
+			rightSide = `(${displayModel.provider}) ${rightSideWithoutProvider}`;
 			if (statsLeftWidth + minPadding + visibleWidth(rightSide) > width) {
 				// Too wide, fall back
 				rightSide = rightSideWithoutProvider;