@oh-my-pi/pi-coding-agent 12.11.2 → 12.12.0

package/src/modes/components/assistant-message.ts

@@ -1,5 +1,6 @@
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
 import { Container, Markdown, Spacer, TERMINAL, Text } from "@oh-my-pi/pi-tui";
+import { logger } from "@oh-my-pi/pi-utils";
 import { hasPendingMermaid, prerenderMermaid } from "../../modes/theme/mermaid-cache";
 import { getMarkdownTheme, theme } from "../../modes/theme/theme";
 
@@ -47,15 +48,22 @@ export class AssistantMessageComponent extends Container {
 		this.#prerenderInFlight = true;
 
 		// Fire off background prerender
-		(async () => {
-			for (const content of message.content) {
-				if (content.type === "text" && content.text.trim() && hasPendingMermaid(content.text)) {
-					await prerenderMermaid(content.text);
+		void (async () => {
+			try {
+				for (const content of message.content) {
+					if (content.type === "text" && content.text.trim() && hasPendingMermaid(content.text)) {
+						await prerenderMermaid(content.text);
+					}
 				}
+			} catch (error) {
+				logger.warn("Background mermaid prerender failed", {
+					error: error instanceof Error ? error.message : String(error),
+				});
+			} finally {
+				this.#prerenderInFlight = false;
+				// Invalidate to re-render with cached images
+				this.invalidate();
 			}
-			this.#prerenderInFlight = false;
-			// Invalidate to re-render with cached images
-			this.invalidate();
 		})();
 	}
 

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

@@ -161,8 +161,11 @@ export class ModelSelectorComponent extends Container {
 		this.#loadModels().then(() => {
 			this.#buildProviderTabs();
 			this.#updateTabBar();
-			if (initialSearchInput) {
-				this.#filterModels(initialSearchInput);
+			// Always apply the current search query — the user may have typed
+			// while models were loading asynchronously.
+			const currentQuery = this.#searchInput.getValue();
+			if (currentQuery) {
+				this.#filterModels(currentQuery);
 			} else {
 				this.#updateList();
 			}

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

@@ -7,16 +7,6 @@ import { MODEL_ROLES } from "../../config/model-registry";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
-import { AssistantMessageComponent } from "../../modes/components/assistant-message";
-import { ExtensionDashboard } from "../../modes/components/extensions";
-import { HistorySearchComponent } from "../../modes/components/history-search";
-import { ModelSelectorComponent } from "../../modes/components/model-selector";
-import { OAuthSelectorComponent } from "../../modes/components/oauth-selector";
-import { SessionSelectorComponent } from "../../modes/components/session-selector";
-import { SettingsSelectorComponent } from "../../modes/components/settings-selector";
-import { ToolExecutionComponent } from "../../modes/components/tool-execution";
-import { TreeSelectorComponent } from "../../modes/components/tree-selector";
-import { UserMessageSelectorComponent } from "../../modes/components/user-message-selector";
 import {
 	getAvailableThemes,
 	getSymbolTheme,
@@ -29,6 +19,17 @@ import {
 import type { InteractiveModeContext } from "../../modes/types";
 import { SessionManager } from "../../session/session-manager";
 import { setPreferredImageProvider, setPreferredSearchProvider } from "../../tools";
+import { AgentDashboard } from "../components/agent-dashboard";
+import { AssistantMessageComponent } from "../components/assistant-message";
+import { ExtensionDashboard } from "../components/extensions";
+import { HistorySearchComponent } from "../components/history-search";
+import { ModelSelectorComponent } from "../components/model-selector";
+import { OAuthSelectorComponent } from "../components/oauth-selector";
+import { SessionSelectorComponent } from "../components/session-selector";
+import { SettingsSelectorComponent } from "../components/settings-selector";
+import { ToolExecutionComponent } from "../components/tool-execution";
+import { TreeSelectorComponent } from "../components/tree-selector";
+import { UserMessageSelectorComponent } from "../components/user-message-selector";
 
 export class SelectorController {
 	constructor(private ctx: InteractiveModeContext) {}
@@ -158,6 +159,30 @@ export class SelectorController {
 		});
 	}
 
+	/**
+	 * Show the Agent Control Center dashboard.
+	 */
+	async showAgentsDashboard(): Promise<void> {
+		const activeModel = this.ctx.session.model;
+		const activeModelPattern = activeModel ? `${activeModel.provider}/${activeModel.id}` : undefined;
+		const defaultModelPattern = this.ctx.settings.getModelRole("default");
+		const dashboard = await AgentDashboard.create(getProjectDir(), this.ctx.settings, this.ctx.ui.terminal.rows, {
+			modelRegistry: this.ctx.session.modelRegistry,
+			activeModelPattern,
+			defaultModelPattern,
+		});
+		this.showSelector(done => {
+			dashboard.onClose = () => {
+				done();
+				this.ctx.ui.requestRender();
+			};
+			dashboard.onRequestRender = () => {
+				this.ctx.ui.requestRender();
+			};
+			return { component: dashboard, focus: dashboard };
+		});
+	}
+
 	/**
 	 * Handle setting changes from the settings selector.
 	 * Most settings are saved directly via SettingsManager in the definitions.

package/src/modes/interactive-mode.ts

@@ -60,6 +60,10 @@ import { UiHelpers } from "./utils/ui-helpers";
 const debugStartup = $env.PI_DEBUG_STARTUP ? (stage: string) => process.stderr.write(`[startup] ${stage}\n`) : () => {};
 
 const TODO_FILE_NAME = "todos.json";
+const EDITOR_MAX_HEIGHT_MIN = 6;
+const EDITOR_MAX_HEIGHT_MAX = 18;
+const EDITOR_RESERVED_ROWS = 12;
+const EDITOR_FALLBACK_ROWS = 24;
 
 /** Options for creating an InteractiveMode instance (for future API use) */
 export interface InteractiveModeOptions {
@@ -158,6 +162,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	#voiceHue = 0;
 	#voicePreviousShowHardwareCursor: boolean | null = null;
 	#voicePreviousUseTerminalCursor: boolean | null = null;
+	#resizeHandler?: () => void;
 
 	constructor(
 		session: AgentSession,
@@ -196,6 +201,11 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.editor.onAutocompleteUpdate = () => {
 			this.ui.requestRender(true);
 		};
+		this.#syncEditorMaxHeight();
+		this.#resizeHandler = () => {
+			this.#syncEditorMaxHeight();
+		};
+		process.stdout.on("resize", this.#resizeHandler);
 		try {
 			this.historyStorage = HistoryStorage.open();
 			this.editor.setHistoryStorage(this.historyStorage);
@@ -332,6 +342,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		// Start the UI
 		this.ui.start();
+		this.#syncEditorMaxHeight();
 		this.isInitialized = true;
 		this.ui.requestRender(true);
 
@@ -390,6 +401,17 @@ export class InteractiveMode implements InteractiveModeContext {
 		return promise;
 	}
 
+	#computeEditorMaxHeight(): number {
+		const rows = this.ui.terminal.rows;
+		const terminalRows = Number.isFinite(rows) && rows > 0 ? rows : EDITOR_FALLBACK_ROWS;
+		const maxHeight = terminalRows - EDITOR_RESERVED_ROWS;
+		return Math.max(EDITOR_MAX_HEIGHT_MIN, Math.min(EDITOR_MAX_HEIGHT_MAX, maxHeight));
+	}
+
+	#syncEditorMaxHeight(): void {
+		this.editor.setMaxHeight(this.#computeEditorMaxHeight());
+	}
+
 	updateEditorBorderColor(): void {
 		if (this.isBashMode) {
 			this.editor.borderColor = theme.getBashModeBorderColor();
@@ -723,6 +745,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 		this.#extensionUiController.clearExtensionTerminalInputListeners();
 		this.statusLine.dispose();
+		if (this.#resizeHandler) {
+			process.stdout.removeListener("resize", this.#resizeHandler);
+			this.#resizeHandler = undefined;
+		}
 		if (this.unsubscribe) {
 			this.unsubscribe();
 		}
@@ -1055,6 +1081,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		void this.#selectorController.showExtensionsDashboard();
 	}
 
+	showAgentsDashboard(): void {
+		void this.#selectorController.showAgentsDashboard();
+	}
+
 	showModelSelector(options?: { temporaryOnly?: boolean }): void {
 		this.#selectorController.showModelSelector(options);
 	}

package/src/modes/theme/mermaid-cache.ts

@@ -4,9 +4,11 @@ import {
 	type MermaidRenderOptions,
 	renderMermaidToPng,
 } from "@oh-my-pi/pi-tui";
+import { logger } from "@oh-my-pi/pi-utils";
 
 const cache = new Map<string, MermaidImage>();
 const pending = new Map<string, Promise<MermaidImage | null>>();
+const failed = new Set<string>();
 
 const defaultOptions: MermaidRenderOptions = {
 	theme: "dark",
@@ -45,7 +47,7 @@ export async function prerenderMermaid(
 	const promises: Promise<boolean>[] = [];
 
 	for (const { source, hash } of blocks) {
-		if (cache.has(hash)) continue;
+		if (cache.has(hash) || failed.has(hash)) continue;
 
 		let promise = pending.get(hash);
 		if (!promise) {
@@ -54,14 +56,26 @@ export async function prerenderMermaid(
 		}
 
 		promises.push(
-			promise.then(image => {
-				pending.delete(hash);
-				if (image) {
-					cache.set(hash, image);
-					return true;
-				}
-				return false;
-			}),
+			promise
+				.then(image => {
+					pending.delete(hash);
+					if (image) {
+						cache.set(hash, image);
+						failed.delete(hash);
+						return true;
+					}
+					failed.add(hash);
+					return false;
+				})
+				.catch(error => {
+					pending.delete(hash);
+					failed.add(hash);
+					logger.warn("Mermaid render failed", {
+						hash,
+						error: error instanceof Error ? error.message : String(error),
+					});
+					return false;
+				}),
 		);
 	}
 
@@ -69,7 +83,13 @@ export async function prerenderMermaid(
 	const newImages = results.some(added => added);
 
 	if (newImages && onRenderNeeded) {
-		onRenderNeeded();
+		try {
+			onRenderNeeded();
+		} catch (error) {
+			logger.warn("Mermaid render callback failed", {
+				error: error instanceof Error ? error.message : String(error),
+			});
+		}
 	}
 }
 
@@ -78,7 +98,7 @@ export async function prerenderMermaid(
  */
 export function hasPendingMermaid(markdown: string): boolean {
 	const blocks = extractMermaidBlocks(markdown);
-	return blocks.some(({ hash }) => !cache.has(hash));
+	return blocks.some(({ hash }) => !cache.has(hash) && !failed.has(hash));
 }
 
 /**
@@ -86,4 +106,6 @@ export function hasPendingMermaid(markdown: string): boolean {
  */
 export function clearMermaidCache(): void {
 	cache.clear();
+	failed.clear();
+	pending.clear();
 }

package/src/modes/types.ts

@@ -161,6 +161,7 @@ export interface InteractiveModeContext {
 	showSettingsSelector(): void;
 	showHistorySearch(): void;
 	showExtensionsDashboard(): void;
+	showAgentsDashboard(): void;
 	showModelSelector(options?: { temporaryOnly?: boolean }): void;
 	showUserMessageSelector(): void;
 	showTreeSelector(): void;

package/src/prompts/system/agent-creation-architect.md

@@ -0,0 +1,65 @@
+You are an elite AI agent architect specializing in crafting high-performance agent configurations. Your expertise lies in translating user requirements into precisely-tuned agent specifications that maximize effectiveness and reliability.
+
+Important Context: You may have access to project-specific instructions from CLAUDE.md files and other context that may include coding standards, project structure, and custom requirements. Consider this context when creating agents to ensure they align with the project's established patterns and practices.
+
+When a user describes what they want an agent to do, you will:
+1. Extract Core Intent: Identify the fundamental purpose, key responsibilities, and success criteria for the agent. Look for both explicit requirements and implicit needs. Consider any project-specific context from CLAUDE.md files. For agents that are meant to review code, you should assume that the user is asking to review recently written code and not the whole codebase, unless the user has explicitly instructed you otherwise.
+2. Design Expert Persona: Create a compelling expert identity that embodies deep domain knowledge relevant to the task. The persona should inspire confidence and guide the agent's decision-making approach.
+3. Architect Comprehensive Instructions: Develop a system prompt that:
+   - Establishes clear behavioral boundaries and operational parameters
+   - Provides specific methodologies and best practices for task execution
+   - Anticipates edge cases and provides guidance for handling them
+   - Incorporates any specific requirements or preferences mentioned by the user
+   - Defines output format expectations when relevant
+   - Aligns with project-specific coding standards and patterns from CLAUDE.md
+4. Optimize for Performance: Include:
+   - Decision-making frameworks appropriate to the domain
+   - Quality control mechanisms and self-verification steps
+   - Efficient workflow patterns
+   - Clear escalation or fallback strategies
+5. Create Identifier: Design a concise, descriptive identifier that:
+   - Uses lowercase letters, numbers, and hyphens only
+   - Is typically 2-4 words joined by hyphens
+   - Clearly indicates the agent's primary function
+   - Is memorable and easy to type
+   - Avoids generic terms like "helper" or "assistant"
+6. Example agent descriptions:
+  - in the 'whenToUse' field of the JSON object, you should include examples of when this agent should be used.
+  - examples should be of the form:
+    - <example>
+      Context: The user is creating a test-runner agent that should be called after a logical chunk of code is written.
+      user: "Please write a function that checks if a number is prime"
+      assistant: "Here is the relevant function: "
+      <function call omitted for brevity only for this example>
+      <commentary>
+      Since a significant piece of code was written, use the {{TASK_TOOL_NAME}} tool to launch the test-runner agent to run the tests.
+</commentary>
+      assistant: "Now let me use the test-runner agent to run the tests"
+</example>
+    - <example>
+      Context: User is creating an agent to respond to the word "hello" with a friendly jok.
+      user: "Hello"
+      assistant: "I'm going to use the {{TASK_TOOL_NAME}} tool to launch the greeting-responder agent to respond with a friendly joke"
+      <commentary>
+      Since the user is greeting, use the greeting-responder agent to respond with a friendly joke.
+</commentary>
+</example>
+  - If the user mentioned or implied that the agent should be used proactively, you should include examples of this.
+- NOTE: Ensure that in the examples, you are making the assistant use the Agent tool and not simply respond directly to the task.
+
+Your output must be a valid JSON object with exactly these fields:
+{
+  "identifier": "A unique, descriptive identifier using lowercase letters, numbers, and hyphens (e.g., 'test-runner', 'api-docs-writer', 'code-formatter')",
+  "whenToUse": "A precise, actionable description starting with 'Use this agent when...' that clearly defines the triggering conditions and use cases. Ensure you include examples as described above.",
+  "systemPrompt": "The complete system prompt that will govern the agent's behavior, written in second person ('You are...', 'You will...') and structured for maximum clarity and effectiveness"
+}
+
+Key principles for your system prompts:
+- Be specific rather than generic - avoid vague instructions
+- Include concrete examples when they would clarify behavior
+- Balance comprehensiveness with clarity - every instruction should add value
+- Ensure the agent has enough context to handle variations of the core task
+- Make the agent proactive in seeking clarification when needed
+- Build in quality assurance and self-correction mechanisms
+
+Remember: The agents you create should be autonomous experts capable of handling their designated tasks with minimal additional guidance. Your system prompts are their complete operational manual.

package/src/prompts/system/agent-creation-user.md

@@ -0,0 +1,6 @@
+Design a custom agent for this request:
+
+{{request}}
+
+Return only the JSON object required by your system instructions.
+Do not include markdown fences.

package/src/session/agent-session.ts

@@ -2302,7 +2302,7 @@ export class AgentSession {
 			throw new Error(`No API key for ${model.provider}/${model.id}`);
 		}
 
-		this.agent.setModel(this.#applySessionModelOverrides(model));
+		this.#setModelWithProviderSessionReset(model);
 		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, role);
 		this.settings.setModelRole(role, `${model.provider}/${model.id}`);
 		this.settings.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
@@ -2322,7 +2322,7 @@ export class AgentSession {
 			throw new Error(`No API key for ${model.provider}/${model.id}`);
 		}
 
-		this.agent.setModel(this.#applySessionModelOverrides(model));
+		this.#setModelWithProviderSessionReset(model);
 		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, "temporary");
 		this.settings.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 
@@ -2436,7 +2436,7 @@ export class AgentSession {
 		const next = scopedModels[nextIndex];
 
 		// Apply model
-		this.agent.setModel(this.#applySessionModelOverrides(next.model));
+		this.#setModelWithProviderSessionReset(next.model);
 		this.sessionManager.appendModelChange(`${next.model.provider}/${next.model.id}`);
 		this.settings.setModelRole("default", `${next.model.provider}/${next.model.id}`);
 		this.settings.getStorage()?.recordModelUsage(`${next.model.provider}/${next.model.id}`);
@@ -2464,7 +2464,7 @@ export class AgentSession {
 			throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
 		}
 
-		this.agent.setModel(this.#applySessionModelOverrides(nextModel));
+		this.#setModelWithProviderSessionReset(nextModel);
 		this.sessionManager.appendModelChange(`${nextModel.provider}/${nextModel.id}`);
 		this.settings.setModelRole("default", `${nextModel.provider}/${nextModel.id}`);
 		this.settings.getStorage()?.recordModelUsage(`${nextModel.provider}/${nextModel.id}`);
@@ -2610,6 +2610,7 @@ export class AgentSession {
 		await this.sessionManager.rewriteEntries();
 		const sessionContext = this.sessionManager.buildSessionContext();
 		this.agent.replaceMessages(sessionContext.messages);
+		this.#closeCodexProviderSessionsForHistoryRewrite();
 		return result;
 	}
 
@@ -2733,6 +2734,7 @@ export class AgentSession {
 			const newEntries = this.sessionManager.getEntries();
 			const sessionContext = this.sessionManager.buildSessionContext();
 			this.agent.replaceMessages(sessionContext.messages);
+			this.#closeCodexProviderSessionsForHistoryRewrite();
 
 			// Get the saved compaction entry for the hook
 			const savedCompactionEntry = newEntries.find(e => e.type === "compaction" && e.summary === summary) as
@@ -3082,7 +3084,6 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		if (!targetModel) return false;
 
 		try {
-			this.#closeProviderSessionsForModelSwitch(currentModel, targetModel);
 			await this.setModelTemporary(targetModel);
 			logger.debug("Context promotion switched model on overflow", {
 				from: `${currentModel.provider}/${currentModel.id}`,
@@ -3132,6 +3133,20 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		return undefined;
 	}
 
+	#setModelWithProviderSessionReset(model: Model): void {
+		const currentModel = this.model;
+		if (currentModel) {
+			this.#closeProviderSessionsForModelSwitch(currentModel, model);
+		}
+		this.agent.setModel(this.#applySessionModelOverrides(model));
+	}
+
+	#closeCodexProviderSessionsForHistoryRewrite(): void {
+		const currentModel = this.model;
+		if (!currentModel || currentModel.api !== "openai-codex-responses") return;
+		this.#closeProviderSessionsForModelSwitch(currentModel, currentModel);
+	}
+
 	#closeProviderSessionsForModelSwitch(currentModel: Model, nextModel: Model): void {
 		if (currentModel.api !== "openai-codex-responses" && nextModel.api !== "openai-codex-responses") return;
 
@@ -3431,6 +3446,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 			const newEntries = this.sessionManager.getEntries();
 			const sessionContext = this.sessionManager.buildSessionContext();
 			this.agent.replaceMessages(sessionContext.messages);
+			this.#closeCodexProviderSessionsForHistoryRewrite();
 
 			// Get the saved compaction entry for the hook
 			const savedCompactionEntry = newEntries.find(e => e.type === "compaction" && e.summary === summary) as
@@ -4013,7 +4029,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 				const availableModels = this.#modelRegistry.getAvailable();
 				const match = availableModels.find(m => m.provider === provider && m.id === modelId);
 				if (match) {
-					this.agent.setModel(this.#applySessionModelOverrides(match));
+					this.#setModelWithProviderSessionReset(match);
 				}
 			}
 		}

package/src/slash-commands/builtin-registry.ts

@@ -212,6 +212,14 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 			runtime.ctx.editor.setText("");
 		},
 	},
+	{
+		name: "agents",
+		description: "Open Agent Control Center dashboard",
+		handle: (_command, runtime) => {
+			runtime.ctx.showAgentsDashboard();
+			runtime.ctx.editor.setText("");
+		},
+	},
 	{
 		name: "branch",
 		description: "Create a new branch from a previous message",

package/src/task/index.ts

@@ -36,6 +36,7 @@ import { mapWithConcurrencyLimit } from "./parallel";
 import { renderCall, renderResult } from "./render";
 import { renderTemplate } from "./template";
 import {
+	type AgentDefinition,
 	type AgentProgress,
 	type SingleResult,
 	type TaskParams,
@@ -109,13 +110,17 @@ export type { AgentDefinition, AgentProgress, SingleResult, TaskParams, TaskTool
 export { taskSchema } from "./types";
 
 /**
- * Build dynamic tool description listing available agents.
+ * Render the tool description from a cached agent list and current settings.
  */
-async function buildDescription(cwd: string, maxConcurrency: number, isolationEnabled: boolean): Promise<string> {
-	const { agents } = await discoverAgents(cwd);
-
+function renderDescription(
+	agents: AgentDefinition[],
+	maxConcurrency: number,
+	isolationEnabled: boolean,
+	disabledAgents: string[],
+): string {
+	const filteredAgents = disabledAgents.length > 0 ? agents.filter(a => !disabledAgents.includes(a.name)) : agents;
 	return renderPromptTemplate(taskDescriptionTemplate, {
-		agents,
+		agents: filteredAgents,
 		MAX_CONCURRENCY: maxConcurrency,
 		isolationEnabled,
 	});
@@ -137,26 +142,33 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 	readonly parameters: TaskSchema;
 	readonly renderCall = renderCall;
 	readonly renderResult = renderResult;
-
+	readonly #discoveredAgents: AgentDefinition[];
 	readonly #blockedAgent: string | undefined;
 
+	/** Dynamic description that reflects current disabled-agent settings */
+	get description(): string {
+		const disabledAgents = this.session.settings.get("task.disabledAgents") as string[];
+		const maxConcurrency = this.session.settings.get("task.maxConcurrency");
+		const isolationEnabled = this.session.settings.get("task.isolation.enabled");
+		return renderDescription(this.#discoveredAgents, maxConcurrency, isolationEnabled, disabledAgents);
+	}
 	private constructor(
 		private readonly session: ToolSession,
-		public readonly description: string,
+		discoveredAgents: AgentDefinition[],
 		isolationEnabled: boolean,
 	) {
 		this.parameters = isolationEnabled ? taskSchema : taskSchemaNoIsolation;
 		this.#blockedAgent = $env.PI_BLOCKED_AGENT;
+		this.#discoveredAgents = discoveredAgents;
 	}
 
 	/**
 	 * Create a TaskTool instance with async agent discovery.
 	 */
 	static async create(session: ToolSession): Promise<TaskTool> {
-		const maxConcurrency = session.settings.get("task.maxConcurrency");
 		const isolationEnabled = session.settings.get("task.isolation.enabled");
-		const description = await buildDescription(session.cwd, maxConcurrency, isolationEnabled);
-		return new TaskTool(session, description, isolationEnabled);
+		const { agents } = await discoverAgents(session.cwd);
+		return new TaskTool(session, agents, isolationEnabled);
 	}
 
 	async execute(
@@ -209,6 +221,25 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 			};
 		}
 
+		// Check if agent is disabled in settings
+		const disabledAgents = this.session.settings.get("task.disabledAgents") as string[];
+		if (disabledAgents.length > 0 && disabledAgents.includes(agentName)) {
+			const enabled = agents.filter(a => !disabledAgents.includes(a.name)).map(a => a.name);
+			return {
+				content: [
+					{
+						type: "text",
+						text: `Agent "${agentName}" is disabled in settings. Enable it via /agents, or use a different agent type.${enabled.length > 0 ? ` Available: ${enabled.join(", ")}` : ""}`,
+					},
+				],
+				details: {
+					projectAgentsDir,
+					results: [],
+					totalDurationMs: 0,
+				},
+			};
+		}
+
 		const planModeState = this.session.getPlanModeState?.();
 		const planModeTools = ["read", "grep", "find", "ls", "lsp", "fetch", "web_search"];
 		const effectiveAgent: typeof agent = planModeState?.enabled
@@ -220,9 +251,15 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 				}
 			: agent;
 
+		// Apply per-agent model override from settings (highest priority)
+		const agentModelOverrides = this.session.settings.get("task.agentModelOverrides") as Record<string, string>;
+		const settingsModelOverride = agentModelOverrides[agentName];
 		const effectiveAgentModel = isDefaultModelAlias(effectiveAgent.model) ? undefined : effectiveAgent.model;
 		const modelOverride =
-			effectiveAgentModel ?? this.session.getActiveModelString?.() ?? this.session.getModelString?.();
+			settingsModelOverride ??
+			effectiveAgentModel ??
+			this.session.getActiveModelString?.() ??
+			this.session.getModelString?.();
 		const thinkingLevelOverride = effectiveAgent.thinkingLevel;
 
 		// Output schema priority: agent frontmatter > params > inherited from parent session