@oh-my-pi/pi-coding-agent 13.2.1 → 13.3.1

package/CHANGELOG.md

@@ -2,6 +2,46 @@
 
 ## [Unreleased]
 
+## [13.3.1] - 2026-02-26
+
+### Added
+
+- Added `topP` setting to control nucleus sampling cutoff for model output diversity
+- Added `topK` setting to sample from top-K tokens for controlled generation
+- Added `minP` setting to enforce minimum probability threshold for token selection
+- Added `presencePenalty` setting to penalize introduction of already-present tokens
+- Added `repetitionPenalty` setting to penalize repeated tokens in model output
+
+### Fixed
+
+- Fixed skill discovery to continue loading project skills when user skills directory is missing
+
+## [13.3.0] - 2026-02-26
+
+### Breaking Changes
+
+- Renamed `task.isolation.enabled` (boolean) setting to `task.isolation.mode` (enum: `none`, `worktree`, `fuse-overlay`). Existing `true`/`false` values are auto-migrated to `worktree`/`none`.
+
+### Added
+
+- Added `PERPLEXITY_COOKIES` env var for Perplexity web search via session cookies extracted from desktop app
+- Added `fuse-overlay` isolation mode for subagents using `fuse-overlayfs` (copy-on-write overlay, no baseline patch apply needed)
+- Added `task.isolation.merge` setting (`patch` or `branch`) to control how isolated task changes are integrated back. `branch` mode commits each task to a temp branch and cherry-picks for clean commit history
+- Added `task.isolation.commits` setting (`generic` or `ai`) for commit messages on isolated task branches and nested repos. `ai` mode uses a smol model to generate conventional commit messages from diffs
+- Nested non-submodule git repos are now discovered and handled during task isolation (changes captured and applied independently from parent repo)
+- Added `task.eager` setting to encourage the agent to delegate work to subagents by default
+- Added manual OAuth login flow that lets users paste redirect URLs with /login for callback-server providers and prevents overlapping logins
+
+### Fixed
+
+- Fixed nested repo changes being lost when tasks commit inside the isolation (baseline state is now committed before task runs, so delta correctly excludes it)
+- Fixed nested repo patches conflicting when multiple tasks contribute to the same repo (baseline untracked files no longer leak into patches)
+- Nested repo changes are now committed after patch application (previously left as untracked files)
+- Failed tasks no longer create stale branches or capture garbage patches (gated on exit code)
+- Merge failures (e.g. conflicting patches) are now non-fatal — agent output is preserved with `merge failed` status instead of `failed`
+- Stale branches are cleaned up when `commitToBranch` fails
+- Commit message generator filters lock files from diffs before AI summarization
+
 ## [13.2.1] - 2026-02-24
 
 ### Fixed
@@ -11,7 +51,6 @@
 ### Changed
 
 - Extracted non-interactive environment config from `bash-interactive.ts` into shared `non-interactive-env.ts` module, applied consistently to all bash execution paths
-
 ## [13.2.0] - 2026-02-23
 ### Breaking Changes
 
@@ -34,12 +73,14 @@
 - Removed unused SSH resource cleanup functions `closeAllConnections` and `unmountAll` from session imports
 
 ## [13.1.2] - 2026-02-23
-### Breaking Changes
 
+### Breaking Changes
 - Removed `timeout` parameter from await tool—tool now waits indefinitely until jobs complete or the call is aborted
 - Renamed `job_ids` parameter to `jobs` in await tool schema
 - Removed `timedOut` field from await tool result details
 
+### Changed
+- Resolved docs index generation paths using path.resolve relative to the script directory
 ## [13.1.1] - 2026-02-23
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.2.1",
+	"version": "13.3.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.2.1",
-		"@oh-my-pi/pi-agent-core": "13.2.1",
-		"@oh-my-pi/pi-ai": "13.2.1",
-		"@oh-my-pi/pi-natives": "13.2.1",
-		"@oh-my-pi/pi-tui": "13.2.1",
-		"@oh-my-pi/pi-utils": "13.2.1",
+		"@oh-my-pi/omp-stats": "13.3.1",
+		"@oh-my-pi/pi-agent-core": "13.3.1",
+		"@oh-my-pi/pi-ai": "13.3.1",
+		"@oh-my-pi/pi-natives": "13.3.1",
+		"@oh-my-pi/pi-tui": "13.3.1",
+		"@oh-my-pi/pi-utils": "13.3.1",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/scripts/generate-docs-index.ts

@@ -3,8 +3,8 @@
 import { Glob } from "bun";
 import * as path from "node:path";
 
-const docsDir = new URL("../../../docs/", import.meta.url).pathname;
-const outputPath = new URL("../src/internal-urls/docs-index.generated.ts", import.meta.url).pathname;
+const docsDir = path.resolve(import.meta.dir, "../../../docs");
+const outputPath = path.resolve(import.meta.dir, "../src/internal-urls/docs-index.generated.ts");
 
 const glob = new Glob("**/*.md");
 const entries: string[] = [];

package/src/cli/args.ts

@@ -216,7 +216,8 @@ export function getExtraHelpText(): string {
   ${chalk.dim("# Search & Tools")}
   EXA_API_KEY                - Exa web search
   BRAVE_API_KEY              - Brave web search
-  PERPLEXITY_API_KEY         - Perplexity web search
+  PERPLEXITY_API_KEY         - Perplexity web search (API)
+  PERPLEXITY_COOKIES         - Perplexity web search (session cookie)
   ANTHROPIC_SEARCH_API_KEY   - Anthropic search provider
 
   ${chalk.dim("# Configuration")}

package/src/cli/config-cli.ts

@@ -2,7 +2,7 @@
  * Config CLI command handlers.
  *
  * Handles `omp config <command>` subcommands for managing settings.
- * Uses settings-defs as the source of truth for available settings.
+ * Uses the settings schema as the source of truth for available settings.
  */
 
 import { APP_NAME, getAgentDir } from "@oh-my-pi/pi-utils";
@@ -11,12 +11,13 @@ import {
 	getDefault,
 	getEnumValues,
 	getType,
+	getUi,
 	type SettingPath,
 	Settings,
 	type SettingValue,
 	settings,
 } from "../config/settings";
-import { getAllSettingDefs, type SettingDef } from "../modes/components/settings-defs";
+import { SETTINGS_SCHEMA } from "../config/settings-schema";
 import { theme } from "../modes/theme/theme";
 
 // =============================================================================
@@ -38,21 +39,32 @@ export interface ConfigCommandArgs {
 // Setting Filtering
 // =============================================================================
 
+type CliSettingDef = {
+	path: SettingPath;
+	type: string;
+	description: string;
+	tab: string;
+};
+
+const ALL_SETTING_PATHS = Object.keys(SETTINGS_SCHEMA) as SettingPath[];
+
 /** Find setting definition by path */
-function findSettingDef(path: string): SettingDef | undefined {
-	return getAllSettingDefs().find(def => def.path === path);
+function findSettingDef(path: string): CliSettingDef | undefined {
+	if (!(path in SETTINGS_SCHEMA)) return undefined;
+	const key = path as SettingPath;
+	const ui = getUi(key);
+	return {
+		path: key,
+		type: getType(key),
+		description: ui?.description ?? "",
+		tab: ui?.tab ?? "internal",
+	};
 }
 
 /** Get available values for a setting */
-function getSettingValues(def: SettingDef): readonly string[] | undefined {
+function getSettingValues(def: CliSettingDef): readonly string[] | undefined {
 	if (def.type === "enum") {
-		return def.values;
-	}
-	if (def.type === "submenu") {
-		const options = def.options;
-		if (options.length > 0) {
-			return options.map(o => o.value);
-		}
+		return getEnumValues(def.path);
 	}
 	return undefined;
 }
@@ -125,7 +137,7 @@ function formatValue(value: unknown): string {
 	return chalk.yellow(String(value));
 }
 
-function getTypeDisplay(def: SettingDef): string {
+function getTypeDisplay(def: CliSettingDef): string {
 	if (def.type === "boolean") {
 		return "(boolean)";
 	}
@@ -199,13 +211,13 @@ export async function runConfigCommand(cmd: ConfigCommandArgs): Promise<void> {
 }
 
 function handleList(flags: { json?: boolean }): void {
-	const defs = getAllSettingDefs();
+	const defs = ALL_SETTING_PATHS.map(path => findSettingDef(path)).filter((def): def is CliSettingDef => !!def);
 
 	if (flags.json) {
 		const result: Record<string, { value: unknown; type: string; description: string }> = {};
 		for (const def of defs) {
 			result[def.path] = {
-				value: settings.get(def.path as SettingPath),
+				value: settings.get(def.path),
 				type: def.type,
 				description: def.description,
 			};
@@ -216,7 +228,7 @@ function handleList(flags: { json?: boolean }): void {
 
 	console.log(chalk.bold("Settings:\n"));
 
-	const groups: Record<string, SettingDef[]> = {};
+	const groups: Record<string, CliSettingDef[]> = {};
 	for (const def of defs) {
 		if (!groups[def.tab]) {
 			groups[def.tab] = [];
@@ -233,7 +245,7 @@ function handleList(flags: { json?: boolean }): void {
 	for (const group of sortedGroups) {
 		console.log(chalk.bold.blue(`[${group}]`));
 		for (const def of groups[group]) {
-			const value = settings.get(def.path as SettingPath);
+			const value = settings.get(def.path);
 			const valueStr = formatValue(value);
 			const typeStr = getTypeDisplay(def);
 			console.log(`  ${chalk.white(def.path)} = ${valueStr} ${chalk.dim(typeStr)}`);
@@ -256,7 +268,7 @@ function handleGet(key: string | undefined, flags: { json?: boolean }): void {
 		process.exit(1);
 	}
 
-	const value = settings.get(def.path as SettingPath);
+	const value = settings.get(def.path);
 
 	if (flags.json) {
 		console.log(JSON.stringify({ key: def.path, value, type: def.type, description: def.description }, null, 2));
@@ -281,13 +293,13 @@ async function handleSet(key: string | undefined, value: string | undefined, fla
 	}
 
 	try {
-		parseAndSetValue(def.path as SettingPath, value);
+		parseAndSetValue(def.path, value);
 	} catch (err) {
 		console.error(chalk.red(String(err)));
 		process.exit(1);
 	}
 
-	const newValue = settings.get(def.path as SettingPath);
+	const newValue = settings.get(def.path);
 
 	if (flags.json) {
 		console.log(JSON.stringify({ key: def.path, value: newValue }));

package/src/config/settings-schema.ts

@@ -197,16 +197,6 @@ export const SETTINGS_SCHEMA = {
 			submenu: true,
 		},
 	},
-	temperature: {
-		type: "number",
-		default: -1,
-		ui: {
-			tab: "agent",
-			label: "Temperature",
-			description: "Sampling temperature (0 = deterministic, 1 = creative, -1 = provider default)",
-			submenu: true,
-		},
-	},
 	hideThinkingBlock: {
 		type: "boolean",
 		default: false,
@@ -544,16 +534,48 @@ export const SETTINGS_SCHEMA = {
 	// ─────────────────────────────────────────────────────────────────────────
 	// Task tool settings
 	// ─────────────────────────────────────────────────────────────────────────
-	"task.isolation.enabled": {
-		type: "boolean",
-		default: false,
+	"task.isolation.mode": {
+		type: "enum",
+		values: ["none", "worktree", "fuse-overlay"] as const,
+		default: "none",
 		ui: {
 			tab: "tools",
 			label: "Task isolation",
-			description: "Run subagents in isolated git worktrees",
+			description: "Isolation mode for subagents (none, git worktree, or fuse-overlay)",
+			submenu: true,
+		},
+	},
+	"task.isolation.merge": {
+		type: "enum",
+		values: ["patch", "branch"] as const,
+		default: "patch",
+		ui: {
+			tab: "tools",
+			label: "Task isolation merge",
+			description: "How isolated task changes are integrated (patch apply or branch merge)",
 			submenu: true,
 		},
 	},
+	"task.isolation.commits": {
+		type: "enum",
+		values: ["generic", "ai"] as const,
+		default: "generic",
+		ui: {
+			tab: "tools",
+			label: "Task isolation commits",
+			description: "Commit message style for nested repo changes (generic or AI-generated)",
+			submenu: true,
+		},
+	},
+	"task.eager": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			label: "Eager task delegation",
+			description: "Encourage the agent to delegate work to subagents unless changes are trivial",
+		},
+	},
 	"task.maxConcurrency": {
 		type: "number",
 		default: 32,
@@ -1016,6 +1038,66 @@ export const SETTINGS_SCHEMA = {
 	"statusLine.leftSegments": { type: "array", default: [] as StatusLineSegmentId[] },
 	"statusLine.rightSegments": { type: "array", default: [] as StatusLineSegmentId[] },
 	"statusLine.segmentOptions": { type: "record", default: {} as Record<string, unknown> },
+	temperature: {
+		type: "number",
+		default: -1,
+		ui: {
+			tab: "agent",
+			label: "Temperature",
+			description: "Sampling temperature (0 = deterministic, 1 = creative, -1 = provider default)",
+			submenu: true,
+		},
+	},
+	topP: {
+		type: "number",
+		default: -1,
+		ui: {
+			tab: "agent",
+			label: "Top P",
+			description: "Nucleus sampling cutoff (0-1, -1 = provider default)",
+			submenu: true,
+		},
+	},
+	topK: {
+		type: "number",
+		default: -1,
+		ui: {
+			tab: "agent",
+			label: "Top K",
+			description: "Sample from top-K tokens (-1 = provider default)",
+			submenu: true,
+		},
+	},
+	minP: {
+		type: "number",
+		default: -1,
+		ui: {
+			tab: "agent",
+			label: "Min P",
+			description: "Minimum probability threshold (0-1, -1 = provider default)",
+			submenu: true,
+		},
+	},
+	presencePenalty: {
+		type: "number",
+		default: -1,
+		ui: {
+			tab: "agent",
+			label: "Presence penalty",
+			description: "Penalty for introducing already-present tokens (-1 = provider default)",
+			submenu: true,
+		},
+	},
+	repetitionPenalty: {
+		type: "number",
+		default: -1,
+		ui: {
+			tab: "agent",
+			label: "Repetition penalty",
+			description: "Penalty for repeated tokens (-1 = provider default)",
+			submenu: true,
+		},
+	},
 } as const;
 
 // ═══════════════════════════════════════════════════════════════════════════

package/src/config/settings.ts

@@ -553,6 +553,16 @@ export class Settings {
 			}
 		}
 
+		// task.isolation.enabled (boolean) -> task.isolation.mode (enum)
+		const taskObj = raw.task as Record<string, unknown> | undefined;
+		const isolationObj = taskObj?.isolation as Record<string, unknown> | undefined;
+		if (isolationObj && "enabled" in isolationObj) {
+			if (typeof isolationObj.enabled === "boolean") {
+				isolationObj.mode = isolationObj.enabled ? "worktree" : "none";
+			}
+			delete isolationObj.enabled;
+		}
+
 		return raw;
 	}
 

package/src/discovery/claude.ts

@@ -5,7 +5,7 @@
  * Priority: 80 (tool-specific, below builtin but above shared standards)
  */
 import * as path from "node:path";
-import { tryParseJson } from "@oh-my-pi/pi-utils";
+import { hasFsCode, tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
@@ -47,6 +47,10 @@ function getProjectClaude(ctx: LoadContext): string {
 	return path.join(ctx.cwd, CONFIG_DIR);
 }
 
+function isMissingDirectoryError(error: unknown): boolean {
+	return hasFsCode(error, "ENOENT") || hasFsCode(error, "ENOTDIR");
+}
+
 // =============================================================================
 // MCP Servers
 // =============================================================================
@@ -162,15 +166,29 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const userSkillsDir = path.join(getUserClaude(ctx), "skills");
 	const projectSkillsDir = path.join(getProjectClaude(ctx), "skills");
 
-	const results = await Promise.all([
+	const [userResult, projectResult] = await Promise.allSettled([
 		scanSkillsFromDir(ctx, { dir: userSkillsDir, providerId: PROVIDER_ID, level: "user" }),
 		scanSkillsFromDir(ctx, { dir: projectSkillsDir, providerId: PROVIDER_ID, level: "project" }),
 	]);
 
-	return {
-		items: results.flatMap(r => r.items),
-		warnings: results.flatMap(r => r.warnings ?? []),
-	};
+	const items: Skill[] = [];
+	const warnings: string[] = [];
+
+	if (userResult.status === "fulfilled") {
+		items.push(...userResult.value.items);
+		warnings.push(...(userResult.value.warnings ?? []));
+	} else if (!isMissingDirectoryError(userResult.reason)) {
+		warnings.push(`Failed to scan Claude user skills in ${userSkillsDir}: ${String(userResult.reason)}`);
+	}
+
+	if (projectResult.status === "fulfilled") {
+		items.push(...projectResult.value.items);
+		warnings.push(...(projectResult.value.warnings ?? []));
+	} else if (!isMissingDirectoryError(projectResult.reason)) {
+		warnings.push(`Failed to scan Claude project skills in ${projectSkillsDir}: ${String(projectResult.reason)}`);
+	}
+
+	return { items, warnings };
 }
 
 // =============================================================================

package/src/discovery/helpers.ts

@@ -284,8 +284,15 @@ export async function scanSkillsFromDir(
 	const warnings: string[] = [];
 	const { dir, level, providerId, requireDescription = false } = options;
 
-	const entries = await fs.promises.readdir(dir, { withFileTypes: true });
-
+	let entries: fs.Dirent[];
+	try {
+		entries = await fs.promises.readdir(dir, { withFileTypes: true });
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+			warnings.push(`Failed to read skills directory: ${dir} (${String(error)})`);
+		}
+		return { items, warnings };
+	}
 	const loadSkill = async (skillPath: string) => {
 		try {
 			const content = await readFile(skillPath);

package/src/ipy/runtime.ts

@@ -72,6 +72,7 @@ const DEFAULT_ENV_DENYLIST = new Set([
 	"GEMINI_API_KEY",
 	"OPENROUTER_API_KEY",
 	"PERPLEXITY_API_KEY",
+	"PERPLEXITY_COOKIES",
 	"EXA_API_KEY",
 	"AZURE_OPENAI_API_KEY",
 	"MISTRAL_API_KEY",

package/src/mcp/config.ts

@@ -110,7 +110,7 @@ export async function loadAllMCPConfigs(cwd: string, options?: LoadMCPConfigsOpt
 	let sources: Record<string, SourceMeta> = {};
 	for (const server of servers) {
 		const config = convertToLegacyConfig(server);
-		if (config.enabled === false || (server._source.level !== "user" && disabledServers.has(server.name))) {
+		if (config.enabled === false || disabledServers.has(server.name)) {
 			continue;
 		}
 		configs[server.name] = config;

package/src/modes/components/settings-defs.ts

@@ -93,6 +93,22 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "2", label: "Double" },
 		{ value: "3", label: "Triple" },
 	],
+	// Task isolation mode
+	"task.isolation.mode": [
+		{ value: "none", label: "None", description: "No isolation" },
+		{ value: "worktree", label: "Worktree", description: "Git worktree isolation" },
+		{ value: "fuse-overlay", label: "Fuse Overlay", description: "COW overlay via fuse-overlayfs" },
+	],
+	// Task isolation merge strategy
+	"task.isolation.merge": [
+		{ value: "patch", label: "Patch", description: "Combine diffs and git apply" },
+		{ value: "branch", label: "Branch", description: "Commit per task, merge with --no-ff" },
+	],
+	// Task isolation commit messages
+	"task.isolation.commits": [
+		{ value: "generic", label: "Generic", description: "Static commit message" },
+		{ value: "ai", label: "AI", description: "AI-generated commit message from diff" },
+	],
 	// Todo max reminders
 	"todo.reminders.max": [
 		{ value: "1", label: "1 reminder" },
@@ -166,7 +182,7 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "brave", label: "Brave", description: "Requires BRAVE_API_KEY" },
 		{ value: "jina", label: "Jina", description: "Requires JINA_API_KEY" },
 		{ value: "kimi", label: "Kimi", description: "Requires MOONSHOT_SEARCH_API_KEY or MOONSHOT_API_KEY" },
-		{ value: "perplexity", label: "Perplexity", description: "Requires PERPLEXITY_API_KEY" },
+		{ value: "perplexity", label: "Perplexity", description: "Requires PERPLEXITY_COOKIES or PERPLEXITY_API_KEY" },
 		{ value: "anthropic", label: "Anthropic", description: "Uses Anthropic web search" },
 		{ value: "zai", label: "Z.AI", description: "Calls Z.AI webSearchPrime MCP" },
 		{ value: "synthetic", label: "Synthetic", description: "Requires SYNTHETIC_API_KEY" },
@@ -198,6 +214,42 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "0.7", label: "0.7", description: "Creative" },
 		{ value: "1", label: "1", description: "Maximum variety" },
 	],
+	topP: [
+		{ value: "-1", label: "Default", description: "Use provider default" },
+		{ value: "0.1", label: "0.1", description: "Very focused" },
+		{ value: "0.3", label: "0.3", description: "Focused" },
+		{ value: "0.5", label: "0.5", description: "Balanced" },
+		{ value: "0.9", label: "0.9", description: "Broad" },
+		{ value: "1", label: "1", description: "No nucleus filtering" },
+	],
+	topK: [
+		{ value: "-1", label: "Default", description: "Use provider default" },
+		{ value: "1", label: "1", description: "Greedy top token" },
+		{ value: "20", label: "20", description: "Focused" },
+		{ value: "40", label: "40", description: "Balanced" },
+		{ value: "100", label: "100", description: "Broad" },
+	],
+	minP: [
+		{ value: "-1", label: "Default", description: "Use provider default" },
+		{ value: "0.01", label: "0.01", description: "Very permissive" },
+		{ value: "0.05", label: "0.05", description: "Balanced" },
+		{ value: "0.1", label: "0.1", description: "Strict" },
+	],
+	presencePenalty: [
+		{ value: "-1", label: "Default", description: "Use provider default" },
+		{ value: "0", label: "0", description: "No penalty" },
+		{ value: "0.5", label: "0.5", description: "Mild novelty" },
+		{ value: "1", label: "1", description: "Encourage novelty" },
+		{ value: "2", label: "2", description: "Strong novelty" },
+	],
+	repetitionPenalty: [
+		{ value: "-1", label: "Default", description: "Use provider default" },
+		{ value: "0.8", label: "0.8", description: "Allow repetition" },
+		{ value: "1", label: "1", description: "No penalty" },
+		{ value: "1.1", label: "1.1", description: "Mild penalty" },
+		{ value: "1.2", label: "1.2", description: "Balanced" },
+		{ value: "1.5", label: "1.5", description: "Strong penalty" },
+	],
 	// Symbol preset
 	symbolPreset: [
 		{ value: "unicode", label: "Unicode", description: "Standard symbols (default)" },

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

@@ -50,6 +50,7 @@ export class StatusLineComponent implements Component {
 	// Git status caching (1s TTL)
 	#cachedGitStatus: { staged: number; unstaged: number; untracked: number } | null = null;
 	#gitStatusLastFetch = 0;
+	#gitStatusInFlight = false;
 
 	constructor(private readonly session: AgentSession) {
 		this.#settings = {
@@ -153,11 +154,12 @@ export class StatusLineComponent implements Component {
 	}
 
 	#getGitStatus(): { staged: number; unstaged: number; untracked: number } | null {
-		const now = Date.now();
-		if (now - this.#gitStatusLastFetch < 1000) {
+		if (this.#gitStatusInFlight || Date.now() - this.#gitStatusLastFetch < 1000) {
 			return this.#cachedGitStatus;
 		}
 
+		this.#gitStatusInFlight = true;
+
 		// Fire async fetch, return cached value
 		(async () => {
 			try {
@@ -165,7 +167,6 @@ export class StatusLineComponent implements Component {
 
 				if (result.exitCode !== 0) {
 					this.#cachedGitStatus = null;
-					this.#gitStatusLastFetch = now;
 					return;
 				}
 
@@ -195,10 +196,11 @@ export class StatusLineComponent implements Component {
 				}
 
 				this.#cachedGitStatus = { staged, unstaged, untracked };
-				this.#gitStatusLastFetch = now;
 			} catch {
 				this.#cachedGitStatus = null;
-				this.#gitStatusLastFetch = now;
+			} finally {
+				this.#gitStatusLastFetch = Date.now();
+				this.#gitStatusInFlight = false;
 			}
 		})();
 

package/src/modes/controllers/mcp-command-controller.ts

@@ -739,10 +739,12 @@ export class MCPCommandController {
 
 			// Collect runtime-discovered servers not in config files
 			const configServerNames = new Set([...userServers, ...projectServers]);
+			const disabledServerNames = new Set(await readDisabledServers(userPath));
 			const discoveredServers: { name: string; source: SourceMeta }[] = [];
 			if (this.ctx.mcpManager) {
 				for (const name of this.ctx.mcpManager.getAllServerNames()) {
 					if (configServerNames.has(name)) continue;
+					if (disabledServerNames.has(name)) continue;
 					const source = this.ctx.mcpManager.getSource(name);
 					if (source) {
 						discoveredServers.push({ name, source });
@@ -754,7 +756,7 @@ export class MCPCommandController {
 				userServers.length === 0 &&
 				projectServers.length === 0 &&
 				discoveredServers.length === 0 &&
-				(userConfig.disabledServers ?? []).length === 0
+				disabledServerNames.size === 0
 			) {
 				this.#showMessage(
 					[
@@ -851,8 +853,7 @@ export class MCPCommandController {
 			}
 
 			// Show servers disabled via /mcp disable (from third-party configs)
-			const disabledServers = await readDisabledServers(userPath);
-			const relevantDisabled = disabledServers.filter(n => !configServerNames.has(n));
+			const relevantDisabled = [...disabledServerNames].filter(n => !configServerNames.has(n));
 			if (relevantDisabled.length > 0) {
 				lines.push(theme.fg("accent", "Disabled") + theme.fg("muted", " (discovered servers):"));
 				for (const name of relevantDisabled) {