@duckmind/dm-darwin-arm64 0.13.7 → 0.13.8

package/extensions/.dm-extensions.json

@@ -1,6 +1,6 @@
 {
   "status": "ok",
-  "prepared_at": "2026-04-14T04:48:34.917084+00:00",
+  "prepared_at": "2026-04-14T05:04:55.747359+00:00",
   "managed_entries": [
     {
       "id": "dm-context",
@@ -22,7 +22,7 @@
       "id": "dm-subagents",
       "upstream_name": "pi-subagents",
       "source_url": "https://github.com/nicobailon/pi-subagents",
-      "upstream_revision": "0165165b797692a6e1ade71f0cbcb34b4792ce9c",
+      "upstream_revision": "670f9999a4452b01fb6510c897a31818c89e3f40",
       "target_dir": "extensions/dm-subagents",
       "bundle_mode": "source-package",
       "copied_paths": [

package/extensions/dm-subagents/agent-management.ts

@@ -35,13 +35,18 @@ function parseCsv(value: string): string[] {
 	return [...new Set(value.split(",").map((v) => v.trim()).filter(Boolean))];
 }
 
-function configObject(config: unknown): Record<string, unknown> | undefined {
+function configObject(config: unknown): { value?: Record<string, unknown>; error?: string } {
 	let val = config;
 	if (typeof val === "string") {
-		try { val = JSON.parse(val); } catch { return undefined; }
+		try {
+			val = JSON.parse(val);
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			return { error: `config must be valid JSON: ${message}` };
+		}
 	}
-	if (!val || typeof val !== "object" || Array.isArray(val)) return undefined;
-	return val as Record<string, unknown>;
+	if (!val || typeof val !== "object" || Array.isArray(val)) return {};
+	return { value: val as Record<string, unknown> };
 }
 
 function hasKey(obj: Record<string, unknown>, key: string): boolean {
@@ -383,7 +388,9 @@ export function handleGet(params: ManagementParams, ctx: ManagementContext): Age
 }
 
 export function handleCreate(params: ManagementParams, ctx: ManagementContext): AgentToolResult<Details> {
-	const cfg = configObject(params.config);
+	const parsedConfig = configObject(params.config);
+	if (parsedConfig.error) return result(parsedConfig.error, true);
+	const cfg = parsedConfig.value;
 	if (!cfg) return result("config required for create.", true);
 	if (typeof cfg.name !== "string" || !cfg.name.trim()) return result("config.name is required and must be a non-empty string.", true);
 	if (typeof cfg.description !== "string" || !cfg.description.trim()) return result("config.description is required and must be a non-empty string.", true);
@@ -427,7 +434,9 @@ export function handleCreate(params: ManagementParams, ctx: ManagementContext):
 export function handleUpdate(params: ManagementParams, ctx: ManagementContext): AgentToolResult<Details> {
 	if (!params.agent && !params.chainName) return result("Specify 'agent' or 'chainName' for update.", true);
 	if (params.agent && params.chainName) return result("Specify either 'agent' or 'chainName', not both.", true);
-	const cfg = configObject(params.config);
+	const parsedConfig = configObject(params.config);
+	if (parsedConfig.error) return result(parsedConfig.error, true);
+	const cfg = parsedConfig.value;
 	if (!cfg) return result("config required for update.", true);
 	const warnings: string[] = [];
 	if (params.agent) {

package/extensions/dm-subagents/agent-manager-detail.ts

@@ -61,6 +61,10 @@ function buildDetailLines(
 	const maxSubagentDepth = agent.maxSubagentDepth !== undefined ? String(agent.maxSubagentDepth) : "(default)";
 
 	lines.push(renderFieldLine("Model:", agent.model ?? "default", contentWidth, theme));
+	if (agent.override) {
+		const overrideLabel = `${agent.override.scope} · ${formatPath(agent.override.path)}`;
+		lines.push(renderFieldLine("Override:", overrideLabel, contentWidth, theme));
+	}
 	lines.push(renderFieldLine("Thinking:", agent.thinking ?? "off", contentWidth, theme));
 	lines.push(renderFieldLine("Tools:", tools, contentWidth, theme));
 	lines.push(renderFieldLine("MCP:", mcp, contentWidth, theme));
@@ -131,7 +135,11 @@ export function renderDetail(
 	theme: Theme,
 ): string[] {
 	const lines: string[] = [];
-	const scopeBadge = agent.source === "builtin" ? "[builtin]" : agent.source === "project" ? "[proj]" : "[user]";
+	const scopeBadge = agent.source === "builtin"
+		? (agent.override ? `[builtin+${agent.override.scope}]` : "[builtin]")
+		: agent.source === "project"
+			? "[proj]"
+			: "[user]";
 	const headerText = ` ${agent.name} ${scopeBadge} ${formatPath(agent.filePath)} `;
 	lines.push(renderHeader(headerText, width, theme));
 	lines.push(row("", width, theme));
@@ -152,7 +160,9 @@ export function renderDetail(
 	lines.push(row(scrollInfo ? ` ${theme.fg("dim", scrollInfo)}` : "", width, theme));
 
 	const footer = agent.source === "builtin"
-		? " [l]aunch  [v] raw/resolved  [↑↓] scroll  [esc] back "
+		? agent.override
+			? " [l]aunch  [e]dit override  [v] raw/resolved  [↑↓] scroll  [esc] back "
+			: " [l]aunch  [e]create override  [v] raw/resolved  [↑↓] scroll  [esc] back "
 		: " [l]aunch  [e]dit  [v] raw/resolved  [↑↓] scroll  [esc] back ";
 	lines.push(renderFooter(footer, width, theme));
 	return lines;

package/extensions/dm-subagents/agent-manager-edit.ts

@@ -1,6 +1,6 @@
 import type { Theme } from "@mariozechner/pi-coding-agent";
 import { matchesKey, truncateToWidth } from "@mariozechner/pi-tui";
-import type { AgentConfig } from "./agents.ts";
+import type { AgentConfig, BuiltinAgentOverrideBase } from "./agents.ts";
 import { createEditorState, ensureCursorVisible, getCursorDisplayPos, handleEditorInput, renderEditor, wrapText } from "./text-editor.ts";
 import type { TextEditorState } from "./text-editor.ts";
 import { pad, row, renderHeader, renderFooter, formatScrollInfo } from "./render-helpers.ts";
@@ -8,30 +8,70 @@ import { pad, row, renderHeader, renderFooter, formatScrollInfo } from "./render
 export interface ModelInfo { provider: string; id: string; fullId: string; }
 export interface SkillInfo { name: string; source: string; description?: string; }
 export type EditScreen = "edit" | "edit-field" | "edit-prompt";
+export type EditField = typeof FIELD_ORDER[number];
+
 export interface EditState {
 	draft: AgentConfig; isNew: boolean; fieldIndex: number; fieldMode: "text" | "model" | "thinking" | "skills" | null;
 	fieldEditor: TextEditorState; promptEditor: TextEditorState; modelSearchQuery: string; modelCursor: number; filteredModels: ModelInfo[];
 	thinkingCursor: number; skillSearchQuery: string; skillCursor: number; filteredSkills: SkillInfo[]; skillSelected: Set<string>; error?: string;
+	fields: EditField[];
+	title?: string;
+	overrideBase?: BuiltinAgentOverrideBase;
+}
+export interface EditInputResult { action?: "save" | "discard" | "delete"; nextScreen?: EditScreen; }
+export interface CreateEditStateOptions {
+	fields?: EditField[];
+	title?: string;
+	overrideBase?: BuiltinAgentOverrideBase;
 }
-export interface EditInputResult { action?: "save" | "discard"; nextScreen?: EditScreen; }
 
 const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"] as const;
 const FIELD_ORDER = ["name", "description", "model", "fallbackModels", "thinking", "tools", "extensions", "skills", "output", "reads", "progress", "interactive", "prompt"] as const;
-type EditField = typeof FIELD_ORDER[number];
 type ThinkingLevel = typeof THINKING_LEVELS[number];
 const PROMPT_VIEWPORT_HEIGHT = 16;
 const MODEL_SELECTOR_HEIGHT = 10;
 const SKILL_SELECTOR_HEIGHT = 10;
 
-function formatTools(draft: AgentConfig): string { const tools = [...(draft.tools ?? []), ...(draft.mcpDirectTools ?? []).map((tool) => `mcp:${tool}`)]; return tools.length > 0 ? tools.join(", ") : ""; }
+function formatTools(draft: Pick<AgentConfig, "tools" | "mcpDirectTools">): string { const tools = [...(draft.tools ?? []), ...(draft.mcpDirectTools ?? []).map((tool) => `mcp:${tool}`)]; return tools.length > 0 ? tools.join(", ") : ""; }
+function toolList(draft: Pick<AgentConfig, "tools" | "mcpDirectTools">): string[] | undefined { const tools = [...(draft.tools ?? []), ...(draft.mcpDirectTools ?? []).map((tool) => `mcp:${tool}`)]; return tools.length > 0 ? tools : undefined; }
 function parseTools(value: string): { tools?: string[]; mcp?: string[] } { const items = value.split(",").map((item) => item.trim()).filter((item) => item.length > 0); const tools: string[] = []; const mcp: string[] = []; for (const item of items) { if (item.startsWith("mcp:")) { const name = item.slice(4).trim(); if (name) mcp.push(name); } else { tools.push(item); } } return { tools: tools.length > 0 ? tools : undefined, mcp: mcp.length > 0 ? mcp : undefined }; }
 function parseCommaList(value: string): string[] | undefined { const items = value.split(",").map((item) => item.trim()).filter((item) => item.length > 0); return items.length > 0 ? items : undefined; }
+function arraysEqual(a: string[] | undefined, b: string[] | undefined): boolean { if (!a && !b) return true; if (!a || !b || a.length !== b.length) return false; for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false; return true; }
+
+function fieldValueMatchesBase(field: EditField, state: EditState): boolean {
+	const base = state.overrideBase;
+	if (!base) return false;
+	switch (field) {
+		case "model": return state.draft.model === base.model;
+		case "fallbackModels": return arraysEqual(state.draft.fallbackModels, base.fallbackModels);
+		case "thinking": return state.draft.thinking === base.thinking;
+		case "tools": return arraysEqual(toolList(state.draft), toolList(base));
+		case "skills": return arraysEqual(state.draft.skills, base.skills);
+		case "prompt": return state.draft.systemPrompt === base.systemPrompt;
+		default: return false;
+	}
+}
 
-export function createEditState(draft: AgentConfig, isNew: boolean, models: ModelInfo[], skills: SkillInfo[]): EditState {
+function resetFieldToBase(field: EditField, state: EditState): void {
+	const base = state.overrideBase;
+	if (!base) return;
+	switch (field) {
+		case "model": state.draft.model = base.model; break;
+		case "fallbackModels": state.draft.fallbackModels = base.fallbackModels ? [...base.fallbackModels] : undefined; break;
+		case "thinking": state.draft.thinking = base.thinking; break;
+		case "tools": state.draft.tools = base.tools ? [...base.tools] : undefined; state.draft.mcpDirectTools = base.mcpDirectTools ? [...base.mcpDirectTools] : undefined; break;
+		case "skills": state.draft.skills = base.skills ? [...base.skills] : undefined; break;
+		case "prompt": state.draft.systemPrompt = base.systemPrompt; state.promptEditor = createEditorState(base.systemPrompt); break;
+		default: break;
+	}
+}
+
+export function createEditState(draft: AgentConfig, isNew: boolean, models: ModelInfo[], skills: SkillInfo[], options: CreateEditStateOptions = {}): EditState {
 	return {
 		draft: { ...draft, tools: draft.tools ? [...draft.tools] : undefined, mcpDirectTools: draft.mcpDirectTools ? [...draft.mcpDirectTools] : undefined, skills: draft.skills ? [...draft.skills] : undefined, fallbackModels: draft.fallbackModels ? [...draft.fallbackModels] : undefined, extensions: draft.extensions ? [...draft.extensions] : draft.extensions, defaultReads: draft.defaultReads ? [...draft.defaultReads] : undefined, extraFields: draft.extraFields ? { ...draft.extraFields } : undefined },
 		isNew, fieldIndex: 0, fieldMode: null, fieldEditor: createEditorState(), promptEditor: createEditorState(draft.systemPrompt ?? ""),
 		modelSearchQuery: "", modelCursor: 0, filteredModels: [...models], thinkingCursor: 0, skillSearchQuery: "", skillCursor: 0, filteredSkills: [...skills], skillSelected: new Set(draft.skills ?? []),
+		fields: options.fields ?? [...FIELD_ORDER], title: options.title, overrideBase: options.overrideBase,
 	};
 }
 
@@ -71,15 +111,15 @@ function applyFieldValue(field: EditField, state: EditState, value: string): voi
 }
 
 function openModelPicker(state: EditState, models: ModelInfo[]): void {
-	state.fieldIndex = FIELD_ORDER.indexOf("model"); state.fieldMode = "model"; state.modelSearchQuery = ""; state.filteredModels = [...models];
+	state.fieldIndex = state.fields.indexOf("model"); state.fieldMode = "model"; state.modelSearchQuery = ""; state.filteredModels = [...models];
 	const idx = state.filteredModels.findIndex((m) => m.fullId === state.draft.model || m.id === state.draft.model); state.modelCursor = idx >= 0 ? idx : 0;
 }
 function openThinkingPicker(state: EditState): void {
-	state.fieldIndex = FIELD_ORDER.indexOf("thinking"); state.fieldMode = "thinking";
+	state.fieldIndex = state.fields.indexOf("thinking"); state.fieldMode = "thinking";
 	const idx = THINKING_LEVELS.indexOf((state.draft.thinking ?? "off") as ThinkingLevel); state.thinkingCursor = idx >= 0 ? idx : 0;
 }
 function openSkillPicker(state: EditState, skills: SkillInfo[]): void {
-	state.fieldIndex = FIELD_ORDER.indexOf("skills"); state.fieldMode = "skills"; state.skillSearchQuery = ""; state.filteredSkills = [...skills]; state.skillSelected = new Set(state.draft.skills ?? []); state.skillCursor = 0;
+	state.fieldIndex = state.fields.indexOf("skills"); state.fieldMode = "skills"; state.skillSearchQuery = ""; state.filteredSkills = [...skills]; state.skillSelected = new Set(state.draft.skills ?? []); state.skillCursor = 0;
 }
 
 function renderModelPicker(state: EditState, width: number, theme: Theme): string[] {
@@ -183,9 +223,11 @@ export function handleEditInput(screen: EditScreen, state: EditState, data: stri
 	if (screen === "edit") {
 		if (matchesKey(data, "ctrl+s")) return { action: "save" };
 		if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) return { action: "discard" };
+		if (data === "D" && state.overrideBase) return { action: "delete" };
 		if (matchesKey(data, "up")) { state.fieldIndex = Math.max(0, state.fieldIndex - 1); return; }
-		if (matchesKey(data, "down")) { state.fieldIndex = Math.min(FIELD_ORDER.length - 1, state.fieldIndex + 1); return; }
-		const field = FIELD_ORDER[state.fieldIndex]!;
+		if (matchesKey(data, "down")) { state.fieldIndex = Math.min(state.fields.length - 1, state.fieldIndex + 1); return; }
+		const field = state.fields[state.fieldIndex]!;
+		if (data === "r" && state.overrideBase) { resetFieldToBase(field, state); return; }
 		if (data === "m") { openModelPicker(state, models); return { nextScreen: "edit-field" }; }
 		if (data === "t") { openThinkingPicker(state); return { nextScreen: "edit-field" }; }
 		if (data === "s") { openSkillPicker(state, skills); return { nextScreen: "edit-field" }; }
@@ -234,7 +276,7 @@ export function handleEditInput(screen: EditScreen, state: EditState, data: stri
 			return;
 		}
 		if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) { state.fieldMode = null; return { nextScreen: "edit" }; }
-		if (matchesKey(data, "return")) { const field = FIELD_ORDER[state.fieldIndex]!; applyFieldValue(field, state, state.fieldEditor.buffer); state.fieldMode = null; return { nextScreen: "edit" }; }
+		if (matchesKey(data, "return")) { const field = state.fields[state.fieldIndex]!; applyFieldValue(field, state, state.fieldEditor.buffer); state.fieldMode = null; return { nextScreen: "edit" }; }
 		if (matchesKey(data, "tab")) return;
 		const innerW = width - 2; const labelWidth = 12; const textWidth = Math.max(10, innerW - labelWidth - 6);
 		const nextState = handleEditorInput(state.fieldEditor, data, textWidth); if (nextState) state.fieldEditor = nextState; return;
@@ -256,13 +298,14 @@ export function renderEdit(screen: EditScreen, state: EditState, width: number,
 	if (screen === "edit-prompt") return renderPromptEditor(state, width, theme);
 	const lines: string[] = [];
 	const scopeBadge = state.draft.source === "user" ? "[user]" : "[proj]"; const label = state.isNew ? " [new]" : "";
-	lines.push(renderHeader(` Editing: ${state.draft.name} ${scopeBadge}${label} `, width, theme));
+	lines.push(renderHeader(` ${state.title ?? `Editing: ${state.draft.name} ${scopeBadge}${label}`} `, width, theme));
 	lines.push(row("", width, theme));
 	const innerW = width - 2; const labelWidth = 12; const valueWidth = Math.max(10, innerW - labelWidth - 6);
-	for (let i = 0; i < FIELD_ORDER.length; i++) {
-		const field = FIELD_ORDER[i]!; if (field === "prompt") break;
+	for (let i = 0; i < state.fields.length; i++) {
+		const field = state.fields[i]!; if (field === "prompt") break;
 		const isFocused = i === state.fieldIndex; const prefix = isFocused ? theme.fg("accent", "▸ ") : "  ";
-		const labelText = pad(`${field[0]!.toUpperCase()}${field.slice(1)}:`, labelWidth); let valueText = renderFieldValue(field, state);
+		const rawLabel = pad(`${field[0]!.toUpperCase()}${field.slice(1)}:`, labelWidth);
+		const labelText = state.overrideBase && !fieldValueMatchesBase(field, state) ? theme.fg("accent", rawLabel) : rawLabel; let valueText = renderFieldValue(field, state);
 		if (field === "progress") { const toggle = state.draft.defaultProgress ? theme.fg("success", "[x]") : "[ ]"; valueText = `${toggle} ${state.draft.defaultProgress ? "on" : "off"}`; lines.push(row(` ${prefix}${labelText} ${pad(truncateToWidth(valueText, valueWidth), valueWidth)}`, width, theme)); continue; }
 		if (field === "interactive") { const toggle = state.draft.interactive ? theme.fg("success", "[x]") : "[ ]"; valueText = `${toggle} ${state.draft.interactive ? "on" : "off"}`; lines.push(row(` ${prefix}${labelText} ${pad(truncateToWidth(valueText, valueWidth), valueWidth)}`, width, theme)); continue; }
 		let displayValue = truncateToWidth(valueText, valueWidth);
@@ -275,14 +318,23 @@ export function renderEdit(screen: EditScreen, state: EditState, width: number,
 		}
 		lines.push(row(` ${prefix}${labelText} [${displayValue}]`, width, theme));
 	}
-	lines.push(row("", width, theme));
-	const promptFocused = state.fieldIndex === FIELD_ORDER.indexOf("prompt");
-	const promptPrefix = promptFocused ? theme.fg("accent", "▸ ") : "  ";
-	lines.push(row(` ${promptPrefix}${theme.fg("dim", "── System Prompt ──")}`, width, theme));
-	const previewWidth = innerW - 2; const wrapped = wrapText(state.draft.systemPrompt ?? "", previewWidth); const previewLines = wrapped.lines.slice(0, 4);
-	for (const line of previewLines) lines.push(row(` ${line}`, width, theme));
-	for (let i = previewLines.length; i < 4; i++) lines.push(row("", width, theme));
+	if (state.fields.includes("prompt")) {
+		lines.push(row("", width, theme));
+		const promptIndex = state.fields.indexOf("prompt");
+		const promptFocused = state.fieldIndex === promptIndex;
+		const promptPrefix = promptFocused ? theme.fg("accent", "▸ ") : "  ";
+		const promptTitle = state.overrideBase && !fieldValueMatchesBase("prompt", state)
+			? theme.fg("accent", "── System Prompt ──")
+			: theme.fg("dim", "── System Prompt ──");
+		lines.push(row(` ${promptPrefix}${promptTitle}`, width, theme));
+		const previewWidth = innerW - 2; const wrapped = wrapText(state.draft.systemPrompt ?? "", previewWidth); const previewLines = wrapped.lines.slice(0, 4);
+		for (const line of previewLines) lines.push(row(` ${line}`, width, theme));
+		for (let i = previewLines.length; i < 4; i++) lines.push(row("", width, theme));
+	}
 	if (state.error) lines.push(row(` ${theme.fg("error", state.error)}`, width, theme)); else lines.push(row("", width, theme));
-	lines.push(renderFooter(" [ctrl+s] save  [esc] back ", width, theme));
+	const footer = state.overrideBase
+		? " [ctrl+s] save  [r] reset field  [D] remove override  [esc] back "
+		: " [ctrl+s] save  [esc] back ";
+	lines.push(renderFooter(footer, width, theme));
 	return lines;
 }

package/extensions/dm-subagents/agent-manager-list.ts

@@ -9,6 +9,7 @@ export interface ListAgent {
 	description: string;
 	model?: string;
 	source: AgentSource;
+	overrideScope?: "user" | "project";
 	kind: "agent" | "chain";
 	stepCount?: number;
 }
@@ -190,7 +191,7 @@ export function renderList(
 		const innerW = width - 2;
 		const nameWidth = 16;
 		const modelWidth = 12;
-		const scopeWidth = 9;
+		const scopeWidth = 17;
 
 		for (let i = 0; i < visible.length; i++) {
 			const agent = visible[i]!;
@@ -208,7 +209,13 @@ export function renderList(
 			const modelDisplay = modelRaw.includes("/") ? modelRaw.split("/").pop() ?? modelRaw : modelRaw;
 			const nameText = isCursor ? theme.fg("accent", agent.name) : agent.name;
 			const modelText = theme.fg("dim", modelDisplay);
-			const scopeLabel = agent.kind === "chain" ? "[chain]" : agent.source === "builtin" ? "[builtin]" : agent.source === "project" ? "[proj]" : "[user]";
+			const scopeLabel = agent.kind === "chain"
+				? "[chain]"
+				: agent.source === "builtin"
+					? (agent.overrideScope ? `[builtin+${agent.overrideScope}]` : "[builtin]")
+					: agent.source === "project"
+						? "[proj]"
+						: "[user]";
 			const scopeBadge = theme.fg("dim", scopeLabel);
 			const descText = theme.fg("dim", agent.description);
 

package/extensions/dm-subagents/agent-manager.ts

@@ -3,7 +3,15 @@ import * as path from "node:path";
 import type { Theme } from "@mariozechner/pi-coding-agent";
 import type { Component, TUI } from "@mariozechner/pi-tui";
 import { matchesKey, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
-import type { AgentConfig, ChainConfig } from "./agents.ts";
+import {
+	buildBuiltinOverrideConfig,
+	discoverAgentsAll,
+	removeBuiltinAgentOverride,
+	saveBuiltinAgentOverride,
+	type AgentConfig,
+	type BuiltinAgentOverrideBase,
+	type ChainConfig,
+} from "./agents.ts";
 import { serializeAgent } from "./agent-serializer.ts";
 import { TEMPLATE_ITEMS, type AgentTemplate, type TemplateItem } from "./agent-templates.ts";
 import { parseChain, serializeChain } from "./chain-serializer.ts";
@@ -11,7 +19,7 @@ import { renderList, handleListInput, type ListAgent, type ListState, type ListA
 import { createParallelState, handleParallelInput, renderParallel, formatParallelTitle, type ParallelState, type AgentOption } from "./agent-manager-parallel.ts";
 import { renderDetail, handleDetailInput, renderTaskInput, type DetailState, type DetailAction } from "./agent-manager-detail.ts";
 import { renderChainDetail, handleChainDetailInput, type ChainDetailAction, type ChainDetailState } from "./agent-manager-chain-detail.ts";
-import { createEditState, handleEditInput, renderEdit, type EditScreen, type EditState, type ModelInfo, type SkillInfo } from "./agent-manager-edit.ts";
+import { createEditState, handleEditInput, renderEdit, type EditField, type EditScreen, type EditState, type ModelInfo, type SkillInfo } from "./agent-manager-edit.ts";
 import { createEditorState, ensureCursorVisible, getCursorDisplayPos, handleEditorInput, renderEditor, wrapText } from "./text-editor.ts";
 import type { TextEditorState } from "./text-editor.ts";
 import { loadRunsForAgent } from "./run-history.ts";
@@ -24,14 +32,39 @@ export type ManagerResult =
 	| { action: "launch-chain"; chain: ChainConfig; task: string; skipClarify?: boolean }
 	| undefined;
 
-export interface AgentData { builtin: AgentConfig[]; user: AgentConfig[]; project: AgentConfig[]; chains: ChainConfig[]; userDir: string; projectDir: string | null; cwd: string; }
-type ManagerScreen = "list" | "detail" | "chain-detail" | "edit" | "edit-field" | "edit-prompt" | "task-input" | "confirm-delete" | "name-input" | "chain-edit" | "template-select" | "parallel-builder";
+export interface AgentData { builtin: AgentConfig[]; user: AgentConfig[]; project: AgentConfig[]; chains: ChainConfig[]; userDir: string; projectDir: string | null; userSettingsPath: string; projectSettingsPath: string | null; cwd: string; }
+type ManagerScreen = "list" | "detail" | "chain-detail" | "edit" | "edit-field" | "edit-prompt" | "task-input" | "confirm-delete" | "name-input" | "chain-edit" | "template-select" | "parallel-builder" | "override-scope";
 interface AgentEntry { id: string; kind: "agent"; config: AgentConfig; isNew: boolean; }
 interface ChainEntry { id: string; kind: "chain"; config: ChainConfig; }
 interface NameInputState { mode: "new-agent" | "clone-agent" | "clone-chain" | "new-chain"; editor: TextEditorState; scope: "user" | "project"; allowProject: boolean; sourceId?: string; template?: AgentTemplate; error?: string; }
 interface StatusMessage { text: string; type: "error" | "info"; }
+interface OverrideScopeState { selectedScope: "user" | "project"; allowProject: boolean; }
 
-function cloneConfig(config: AgentConfig): AgentConfig { return { ...config, tools: config.tools ? [...config.tools] : undefined, mcpDirectTools: config.mcpDirectTools ? [...config.mcpDirectTools] : undefined, skills: config.skills ? [...config.skills] : undefined, defaultReads: config.defaultReads ? [...config.defaultReads] : undefined, extraFields: config.extraFields ? { ...config.extraFields } : undefined }; }
+const BUILTIN_OVERRIDE_FIELDS: EditField[] = ["model", "fallbackModels", "thinking", "tools", "skills", "prompt"];
+
+function cloneConfig(config: AgentConfig): AgentConfig {
+	return {
+		...config,
+		tools: config.tools ? [...config.tools] : undefined,
+		mcpDirectTools: config.mcpDirectTools ? [...config.mcpDirectTools] : undefined,
+		skills: config.skills ? [...config.skills] : undefined,
+		fallbackModels: config.fallbackModels ? [...config.fallbackModels] : undefined,
+		defaultReads: config.defaultReads ? [...config.defaultReads] : undefined,
+		extraFields: config.extraFields ? { ...config.extraFields } : undefined,
+		override: config.override
+			? {
+				...config.override,
+				base: {
+					...config.override.base,
+					fallbackModels: config.override.base.fallbackModels ? [...config.override.base.fallbackModels] : undefined,
+					skills: config.override.base.skills ? [...config.override.base.skills] : undefined,
+					tools: config.override.base.tools ? [...config.override.base.tools] : undefined,
+					mcpDirectTools: config.override.base.mcpDirectTools ? [...config.override.base.mcpDirectTools] : undefined,
+				},
+			}
+			: undefined,
+	};
+}
 function cloneChainConfig(config: ChainConfig): ChainConfig { return { ...config, steps: config.steps.map((step) => ({ ...step, reads: Array.isArray(step.reads) ? [...step.reads] : step.reads, skills: Array.isArray(step.skills) ? [...step.skills] : step.skills })), extraFields: config.extraFields ? { ...config.extraFields } : undefined }; }
 function slugTemplateName(name: string): string { return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, ""); }
 function nextSelectableIndex(items: TemplateItem[], current: number, direction: 1 | -1): number { let next = current + direction; while (next >= 0 && next < items.length && items[next]!.type === "separator") next += direction; if (next < 0 || next >= items.length) return current; return next; }
@@ -60,6 +93,8 @@ export class AgentManagerComponent implements Component {
 	private taskBackScreen: ManagerScreen = "list";
 	private templateCursor = 0;
 	private statusMessage?: StatusMessage;
+	private overrideScopeState: OverrideScopeState | null = null;
+	private builtinOverrideScope: "user" | "project" | null = null;
 	private nextId = 1;
 	private tui: TUI;
 	private theme: Theme;
@@ -86,15 +121,57 @@ export class AgentManagerComponent implements Component {
 
 	private getAgentEntry(id: string | null): AgentEntry | undefined { if (!id) return undefined; return this.agents.find((entry) => entry.id === id); }
 	private getChainEntry(id: string | null): ChainEntry | undefined { if (!id) return undefined; return this.chains.find((entry) => entry.id === id); }
-	private listAgents(): ListAgent[] { const a = this.agents.map((entry) => ({ id: entry.id, name: entry.config.name, description: entry.config.description, model: entry.config.model, source: entry.config.source, kind: "agent" as const })); const c = this.chains.map((entry) => ({ id: entry.id, name: entry.config.name, description: entry.config.description, source: entry.config.source, kind: "chain" as const, stepCount: entry.config.steps.length })); return [...a, ...c]; }
+	private listAgents(): ListAgent[] { const a = this.agents.map((entry) => ({ id: entry.id, name: entry.config.name, description: entry.config.description, model: entry.config.model, source: entry.config.source, overrideScope: entry.config.override?.scope, kind: "agent" as const })); const c = this.chains.map((entry) => ({ id: entry.id, name: entry.config.name, description: entry.config.description, source: entry.config.source, kind: "chain" as const, stepCount: entry.config.steps.length })); return [...a, ...c]; }
 	private clearStatus(): void { this.statusMessage = undefined; }
 
+	private resolveBuiltinOverrideBase(entry: AgentEntry): BuiltinAgentOverrideBase {
+		if (entry.config.override) return entry.config.override.base;
+		return {
+			model: entry.config.model,
+			fallbackModels: entry.config.fallbackModels ? [...entry.config.fallbackModels] : undefined,
+			thinking: entry.config.thinking,
+			systemPrompt: entry.config.systemPrompt,
+			skills: entry.config.skills ? [...entry.config.skills] : undefined,
+			tools: entry.config.tools ? [...entry.config.tools] : undefined,
+			mcpDirectTools: entry.config.mcpDirectTools ? [...entry.config.mcpDirectTools] : undefined,
+		};
+	}
+
+	private refreshAgentData(agentName?: string, chainName?: string): void {
+		this.agentData = { ...discoverAgentsAll(this.agentData.cwd), cwd: this.agentData.cwd };
+		this.nextId = 1;
+		this.loadEntries();
+		if (agentName) {
+			const entry = this.agents.find((candidate) => candidate.config.name === agentName);
+			this.currentAgentId = entry?.id ?? null;
+		}
+		if (chainName) {
+			const entry = this.chains.find((candidate) => candidate.config.name === chainName);
+			this.currentChainId = entry?.id ?? null;
+		}
+	}
+
 	private removeAgentEntry(entry: AgentEntry): void { this.agents = this.agents.filter((e) => e.id !== entry.id); this.listState.selected = this.listState.selected.filter((id) => id !== entry.id); }
 	private removeChainEntry(entry: ChainEntry): void { this.chains = this.chains.filter((e) => e.id !== entry.id); }
 
 	private enterDetail(entry: AgentEntry): void { this.currentAgentId = entry.id; this.detailState = { resolved: true, scrollOffset: 0, recentRuns: loadRunsForAgent(entry.config.name).slice(0, 5) }; this.screen = "detail"; }
 	private enterChainDetail(entry: ChainEntry): void { this.currentChainId = entry.id; this.chainDetailState = { scrollOffset: 0 }; this.screen = "chain-detail"; }
-	private enterEdit(entry: AgentEntry): void { this.currentAgentId = entry.id; this.editState = createEditState(entry.config, entry.isNew, this.models, this.skills); this.screen = "edit"; }
+	private enterEdit(entry: AgentEntry): void { this.currentAgentId = entry.id; this.builtinOverrideScope = null; this.editState = createEditState(entry.config, entry.isNew, this.models, this.skills); this.screen = "edit"; }
+	private enterBuiltinOverrideScope(entry: AgentEntry): void {
+		this.currentAgentId = entry.id;
+		this.overrideScopeState = { selectedScope: this.agentData.projectSettingsPath ? "project" : "user", allowProject: Boolean(this.agentData.projectSettingsPath) };
+		this.screen = "override-scope";
+	}
+	private enterBuiltinOverrideEdit(entry: AgentEntry, scope: "user" | "project"): void {
+		this.currentAgentId = entry.id;
+		this.builtinOverrideScope = scope;
+		this.editState = createEditState(entry.config, false, this.models, this.skills, {
+			fields: BUILTIN_OVERRIDE_FIELDS,
+			title: `Builtin Override: ${entry.config.name} [${scope}]`,
+			overrideBase: this.resolveBuiltinOverrideBase(entry),
+		});
+		this.screen = "edit";
+	}
 	private enterParallelBuilder(ids: string[]): void {
 		const names = ids.map((id) => this.getAgentEntry(id)?.config.name).filter((n): n is string => Boolean(n));
 		if (names.length === 0) return;
@@ -127,6 +204,27 @@ export class AgentManagerComponent implements Component {
 
 	private saveEdit(): boolean {
 		const edit = this.editState; if (!edit) return false; const entry = this.getAgentEntry(this.currentAgentId); if (!entry) return false;
+		if (entry.config.source === "builtin") {
+			const scope = entry.config.override?.scope ?? this.builtinOverrideScope;
+			if (!scope) { edit.error = "Choose where to store the override first."; return false; }
+			try {
+				const override = buildBuiltinOverrideConfig(this.resolveBuiltinOverrideBase(entry), edit.draft);
+				if (override) {
+					saveBuiltinAgentOverride(this.agentData.cwd, entry.config.name, scope, override);
+				} else {
+					removeBuiltinAgentOverride(this.agentData.cwd, entry.config.name, scope);
+				}
+				this.refreshAgentData(entry.config.name);
+				this.builtinOverrideScope = null;
+				this.editState = null;
+				const refreshed = this.getAgentEntry(this.currentAgentId);
+				if (refreshed) this.enterDetail(refreshed);
+				return true;
+			} catch (err) {
+				edit.error = err instanceof Error ? err.message : "Failed to save builtin override.";
+				return false;
+			}
+		}
 		if (!edit.draft.name || !edit.draft.description) { edit.error = "Name and description are required."; return false; }
 		let filePath = entry.config.filePath;
 		if (entry.isNew) {
@@ -140,6 +238,24 @@ export class AgentManagerComponent implements Component {
 		catch (err) { edit.error = err instanceof Error ? err.message : "Failed to save agent."; return false; }
 	}
 
+	private removeBuiltinOverride(): boolean {
+		const edit = this.editState; if (!edit) return false; const entry = this.getAgentEntry(this.currentAgentId); if (!entry || entry.config.source !== "builtin") return false;
+		const scope = entry.config.override?.scope ?? this.builtinOverrideScope;
+		if (!scope) { edit.error = "No builtin override to remove."; return false; }
+		try {
+			removeBuiltinAgentOverride(this.agentData.cwd, entry.config.name, scope);
+			this.refreshAgentData(entry.config.name);
+			this.builtinOverrideScope = null;
+			this.editState = null;
+			const refreshed = this.getAgentEntry(this.currentAgentId);
+			if (refreshed) this.enterDetail(refreshed);
+			return true;
+		} catch (err) {
+			edit.error = err instanceof Error ? err.message : "Failed to remove builtin override.";
+			return false;
+		}
+	}
+
 	private saveChainEdit(): boolean {
 		const state = this.chainEditState; const entry = this.getChainEntry(this.currentChainId); if (!state || !entry) return false;
 		try { const parsed = parseChain(state.editor.buffer, entry.config.source, entry.config.filePath); fs.writeFileSync(entry.config.filePath, serializeChain(parsed), "utf-8"); entry.config = parsed; state.error = undefined; return true; }
@@ -159,6 +275,46 @@ export class AgentManagerComponent implements Component {
 		}
 	}
 
+	private handleOverrideScopeInput(data: string): void {
+		const state = this.overrideScopeState;
+		const entry = this.getAgentEntry(this.currentAgentId);
+		if (!state || !entry) {
+			this.screen = "detail";
+			this.tui.requestRender();
+			return;
+		}
+
+		if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
+			this.overrideScopeState = null;
+			this.enterDetail(entry);
+			this.tui.requestRender();
+			return;
+		}
+
+		if (matchesKey(data, "tab") || matchesKey(data, "up") || matchesKey(data, "down")) {
+			if (state.allowProject) state.selectedScope = state.selectedScope === "user" ? "project" : "user";
+			this.tui.requestRender();
+			return;
+		}
+
+		if (data === "u") {
+			state.selectedScope = "user";
+			this.tui.requestRender();
+			return;
+		}
+
+		if (data === "p" && state.allowProject) {
+			state.selectedScope = "project";
+			this.tui.requestRender();
+			return;
+		}
+
+		if (!matchesKey(data, "return")) return;
+		this.overrideScopeState = null;
+		this.enterBuiltinOverrideEdit(entry, state.selectedScope);
+		this.tui.requestRender();
+	}
+
 	private handleNameInput(data: string): void {
 		const state = this.nameInputState; if (!state) return; state.error = undefined;
 		const canToggleScope = state.allowProject;
@@ -219,6 +375,27 @@ export class AgentManagerComponent implements Component {
 		lines.push(renderFooter(" [enter] continue  [esc] cancel ", w, this.theme)); return lines;
 	}
 
+	private renderOverrideScope(w: number): string[] {
+		const state = this.overrideScopeState;
+		const entry = this.getAgentEntry(this.currentAgentId);
+		if (!state || !entry) return [];
+		const lines: string[] = [];
+		lines.push(renderHeader(` Create Override: ${entry.config.name} `, w, this.theme));
+		lines.push(row("", w, this.theme));
+		lines.push(row(` ${this.theme.fg("dim", "Where should this builtin override live?")}`, w, this.theme));
+		lines.push(row("", w, this.theme));
+		const userLine = state.selectedScope === "user" ? this.theme.fg("accent", "▸ user") : "  user";
+		lines.push(row(` ${userLine}${this.theme.fg("dim", `  ${this.agentData.userSettingsPath}`)}`, w, this.theme));
+		if (state.allowProject) {
+			const projectPath = this.agentData.projectSettingsPath ?? ".dm/settings.json";
+			const projectLine = state.selectedScope === "project" ? this.theme.fg("accent", "▸ project") : "  project";
+			lines.push(row(` ${projectLine}${this.theme.fg("dim", `  ${projectPath}`)}`, w, this.theme));
+		}
+		while (lines.length < 8) lines.push(row("", w, this.theme));
+		lines.push(renderFooter(" [enter] continue  [↑↓/tab] choose  [esc] cancel ", w, this.theme));
+		return lines;
+	}
+
 	private renderTemplateSelect(w: number): string[] {
 		const lines: string[] = []; lines.push(renderHeader(" Select Template ", w, this.theme)); lines.push(row("", w, this.theme));
 		const innerW = w - 2; const viewport = 12; const start = Math.max(0, Math.min(this.templateCursor - Math.floor(viewport / 2), Math.max(0, TEMPLATE_ITEMS.length - viewport))); const visible = TEMPLATE_ITEMS.slice(start, start + viewport);
@@ -261,6 +438,7 @@ export class AgentManagerComponent implements Component {
 		switch (this.screen) {
 			case "list": { const action = handleListInput(this.listState, this.listAgents(), data); if (action) this.handleListAction(action); this.tui.requestRender(); return; }
 			case "template-select": this.handleTemplateSelectInput(data); return;
+			case "override-scope": this.handleOverrideScopeInput(data); return;
 			case "detail": {
 				const entry = this.getAgentEntry(this.currentAgentId); if (!entry) { this.screen = "list"; this.tui.requestRender(); return; }
 				const action = handleDetailInput(this.detailState, data); if (action) this.handleDetailAction(action, entry); this.tui.requestRender(); return;
@@ -337,6 +515,7 @@ export class AgentManagerComponent implements Component {
 				if (!this.editState) { this.screen = "list"; this.tui.requestRender(); return; }
 				const result = handleEditInput(this.screen as EditScreen, this.editState, data, this.overlayWidth, this.models, this.skills);
 				if (result?.action === "discard") { this.handleEditDiscard(); return; }
+				if (result?.action === "delete") { this.removeBuiltinOverride(); this.tui.requestRender(); return; }
 				if (result?.action === "save") { const ok = this.saveEdit(); if (ok) { const entry = this.getAgentEntry(this.currentAgentId); if (entry) this.enterDetail(entry); } this.tui.requestRender(); return; }
 				if (result?.nextScreen) this.screen = result.nextScreen; this.tui.requestRender(); return;
 			}
@@ -344,9 +523,9 @@ export class AgentManagerComponent implements Component {
 	}
 
 	private handleEditDiscard(): void {
-		const entry = this.getAgentEntry(this.currentAgentId); if (!entry) { this.screen = "list"; this.editState = null; this.tui.requestRender(); return; }
-		if (entry.isNew) { this.removeAgentEntry(entry); this.editState = null; this.screen = "list"; this.tui.requestRender(); return; }
-		this.editState = null; this.enterDetail(entry); this.tui.requestRender();
+		const entry = this.getAgentEntry(this.currentAgentId); if (!entry) { this.screen = "list"; this.editState = null; this.builtinOverrideScope = null; this.tui.requestRender(); return; }
+		if (entry.isNew) { this.removeAgentEntry(entry); this.editState = null; this.builtinOverrideScope = null; this.screen = "list"; this.tui.requestRender(); return; }
+		this.editState = null; this.builtinOverrideScope = null; this.enterDetail(entry); this.tui.requestRender();
 	}
 
 	private isBuiltin(id: string): boolean { const a = this.getAgentEntry(id); return a?.config.source === "builtin"; }
@@ -365,7 +544,15 @@ export class AgentManagerComponent implements Component {
 
 	private handleDetailAction(action: DetailAction, entry: AgentEntry): void {
 		if (action.type === "back") { this.screen = "list"; return; }
-		if (action.type === "edit") { if (entry.config.source === "builtin") { this.statusMessage = { text: "Builtin agents cannot be edited. Clone to user scope to override.", type: "error" }; this.screen = "list"; return; } this.enterEdit(entry); return; }
+		if (action.type === "edit") {
+			if (entry.config.source === "builtin") {
+				if (entry.config.override) this.enterBuiltinOverrideEdit(entry, entry.config.override.scope);
+				else this.enterBuiltinOverrideScope(entry);
+				return;
+			}
+			this.enterEdit(entry);
+			return;
+		}
 		if (action.type === "launch") { this.enterTaskInput([entry.id], "detail"); return; }
 	}
 
@@ -380,6 +567,7 @@ export class AgentManagerComponent implements Component {
 		switch (this.screen) {
 			case "list": return renderList(this.listState, this.listAgents(), w, this.theme, this.statusMessage);
 			case "template-select": return this.renderTemplateSelect(w);
+			case "override-scope": return this.renderOverrideScope(w);
 			case "detail": { const entry = this.getAgentEntry(this.currentAgentId); if (!entry) return renderList(this.listState, this.listAgents(), w, this.theme, this.statusMessage); return renderDetail(this.detailState, entry.config, this.agentData.cwd, w, this.theme); }
 			case "chain-detail": { const entry = this.getChainEntry(this.currentChainId); if (!entry) return renderList(this.listState, this.listAgents(), w, this.theme, this.statusMessage); return renderChainDetail(this.chainDetailState, entry.config, w, this.theme); }
 			case "edit": case "edit-field": case "edit-prompt": return this.editState ? renderEdit(this.screen as EditScreen, this.editState, w, this.theme) : [];

package/extensions/dm-subagents/agents.ts

@@ -15,6 +15,31 @@ export type AgentScope = "user" | "project" | "both";
 
 export type AgentSource = "builtin" | "user" | "project";
 
+export interface BuiltinAgentOverrideBase {
+	model?: string;
+	fallbackModels?: string[];
+	thinking?: string;
+	systemPrompt: string;
+	skills?: string[];
+	tools?: string[];
+	mcpDirectTools?: string[];
+}
+
+export interface BuiltinAgentOverrideConfig {
+	model?: string | false;
+	fallbackModels?: string[] | false;
+	thinking?: string | false;
+	systemPrompt?: string;
+	skills?: string[] | false;
+	tools?: string[] | false;
+}
+
+export interface BuiltinAgentOverrideInfo {
+	scope: "user" | "project";
+	path: string;
+	base: BuiltinAgentOverrideBase;
+}
+
 export interface AgentConfig {
 	name: string;
 	description: string;
@@ -28,13 +53,13 @@ export interface AgentConfig {
 	filePath: string;
 	skills?: string[];
 	extensions?: string[];
-	// Chain behavior fields
 	output?: string;
 	defaultReads?: string[];
 	defaultProgress?: boolean;
 	interactive?: boolean;
 	maxSubagentDepth?: number;
 	extraFields?: Record<string, string>;
+	override?: BuiltinAgentOverrideInfo;
 }
 
 export interface ChainStepConfig {
@@ -61,6 +86,266 @@ export interface AgentDiscoveryResult {
 	projectAgentsDir: string | null;
 }
 
+function splitToolList(rawTools: string[] | undefined): { tools?: string[]; mcpDirectTools?: string[] } {
+	const mcpDirectTools: string[] = [];
+	const tools: string[] = [];
+	for (const tool of rawTools ?? []) {
+		if (tool.startsWith("mcp:")) {
+			mcpDirectTools.push(tool.slice(4));
+		} else {
+			tools.push(tool);
+		}
+	}
+	return {
+		...(tools.length > 0 ? { tools } : {}),
+		...(mcpDirectTools.length > 0 ? { mcpDirectTools } : {}),
+	};
+}
+
+function joinToolList(config: Pick<AgentConfig, "tools" | "mcpDirectTools">): string[] | undefined {
+	const joined = [
+		...(config.tools ?? []),
+		...(config.mcpDirectTools ?? []).map((tool) => `mcp:${tool}`),
+	];
+	return joined.length > 0 ? joined : undefined;
+}
+
+function arraysEqual(a: string[] | undefined, b: string[] | undefined): boolean {
+	if (!a && !b) return true;
+	if (!a || !b) return false;
+	if (a.length !== b.length) return false;
+	for (let i = 0; i < a.length; i++) {
+		if (a[i] !== b[i]) return false;
+	}
+	return true;
+}
+
+function cloneOverrideBase(agent: AgentConfig): BuiltinAgentOverrideBase {
+	return {
+		model: agent.model,
+		fallbackModels: agent.fallbackModels ? [...agent.fallbackModels] : undefined,
+		thinking: agent.thinking,
+		systemPrompt: agent.systemPrompt,
+		skills: agent.skills ? [...agent.skills] : undefined,
+		tools: agent.tools ? [...agent.tools] : undefined,
+		mcpDirectTools: agent.mcpDirectTools ? [...agent.mcpDirectTools] : undefined,
+	};
+}
+
+function cloneOverrideValue(override: BuiltinAgentOverrideConfig): BuiltinAgentOverrideConfig {
+	return {
+		...(override.model !== undefined ? { model: override.model } : {}),
+		...(override.fallbackModels !== undefined
+			? { fallbackModels: override.fallbackModels === false ? false : [...override.fallbackModels] }
+			: {}),
+		...(override.thinking !== undefined ? { thinking: override.thinking } : {}),
+		...(override.systemPrompt !== undefined ? { systemPrompt: override.systemPrompt } : {}),
+		...(override.skills !== undefined ? { skills: override.skills === false ? false : [...override.skills] } : {}),
+		...(override.tools !== undefined ? { tools: override.tools === false ? false : [...override.tools] } : {}),
+	};
+}
+
+function findNearestProjectRoot(cwd: string): string | null {
+	let currentDir = cwd;
+	while (true) {
+		if (isDirectory(path.join(currentDir, ".dm")) || isDirectory(path.join(currentDir, ".agents"))) {
+			return currentDir;
+		}
+
+		const parentDir = path.dirname(currentDir);
+		if (parentDir === currentDir) return null;
+		currentDir = parentDir;
+	}
+}
+
+export function getUserAgentSettingsPath(): string {
+	return path.join(os.homedir(), ".dm", "agent", "settings.json");
+}
+
+export function getProjectAgentSettingsPath(cwd: string): string | null {
+	const projectRoot = findNearestProjectRoot(cwd);
+	return projectRoot ? path.join(projectRoot, ".dm", "settings.json") : null;
+}
+
+function readSettingsFileStrict(filePath: string): Record<string, unknown> {
+	if (!fs.existsSync(filePath)) return {};
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		throw new Error(`Failed to parse settings file '${filePath}': ${message}`, { cause: error });
+	}
+	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+		throw new Error(`Settings file '${filePath}' must contain a JSON object.`);
+	}
+	return parsed as Record<string, unknown>;
+}
+
+function writeSettingsFile(filePath: string, settings: Record<string, unknown>): void {
+	fs.mkdirSync(path.dirname(filePath), { recursive: true });
+	fs.writeFileSync(filePath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+}
+
+function parseStringArrayOrFalse(value: unknown): string[] | false | undefined {
+	if (value === false) return false;
+	if (!Array.isArray(value)) return undefined;
+	const items = value.filter((item): item is string => typeof item === "string").map((item) => item.trim()).filter(Boolean);
+	return items;
+}
+
+function parseBuiltinOverrideEntry(value: unknown): BuiltinAgentOverrideConfig | undefined {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
+	const input = value as Record<string, unknown>;
+	const override: BuiltinAgentOverrideConfig = {};
+
+	if (typeof input.model === "string" || input.model === false) override.model = input.model;
+	if (typeof input.thinking === "string" || input.thinking === false) override.thinking = input.thinking;
+	if (typeof input.systemPrompt === "string") override.systemPrompt = input.systemPrompt;
+
+	const fallbackModels = parseStringArrayOrFalse(input.fallbackModels);
+	if (fallbackModels !== undefined) override.fallbackModels = fallbackModels;
+
+	const skills = parseStringArrayOrFalse(input.skills);
+	if (skills !== undefined) override.skills = skills;
+
+	const tools = parseStringArrayOrFalse(input.tools);
+	if (tools !== undefined) override.tools = tools;
+
+	return Object.keys(override).length > 0 ? override : undefined;
+}
+
+function readBuiltinOverrides(filePath: string | null): Record<string, BuiltinAgentOverrideConfig> {
+	if (!filePath || !fs.existsSync(filePath)) return {};
+	const settings = readSettingsFileStrict(filePath);
+	const subagents = settings.subagents;
+	if (!subagents || typeof subagents !== "object" || Array.isArray(subagents)) return {};
+	const agentOverrides = (subagents as Record<string, unknown>).agentOverrides;
+	if (!agentOverrides || typeof agentOverrides !== "object" || Array.isArray(agentOverrides)) return {};
+
+	const parsed: Record<string, BuiltinAgentOverrideConfig> = {};
+	for (const [name, value] of Object.entries(agentOverrides)) {
+		const override = parseBuiltinOverrideEntry(value);
+		if (override) parsed[name] = override;
+	}
+	return parsed;
+}
+
+function applyBuiltinOverride(
+	agent: AgentConfig,
+	override: BuiltinAgentOverrideConfig,
+	meta: { scope: "user" | "project"; path: string },
+): AgentConfig {
+	const next: AgentConfig = {
+		...agent,
+		override: { ...meta, base: cloneOverrideBase(agent) },
+	};
+
+	if (override.model !== undefined) next.model = override.model === false ? undefined : override.model;
+	if (override.fallbackModels !== undefined) {
+		next.fallbackModels = override.fallbackModels === false ? undefined : [...override.fallbackModels];
+	}
+	if (override.thinking !== undefined) next.thinking = override.thinking === false ? undefined : override.thinking;
+	if (override.systemPrompt !== undefined) next.systemPrompt = override.systemPrompt;
+	if (override.skills !== undefined) next.skills = override.skills === false ? undefined : [...override.skills];
+	if (override.tools !== undefined) {
+		const { tools, mcpDirectTools } = splitToolList(override.tools === false ? [] : override.tools);
+		next.tools = tools;
+		next.mcpDirectTools = mcpDirectTools;
+	}
+
+	return next;
+}
+
+function applyBuiltinOverrides(
+	builtinAgents: AgentConfig[],
+	userOverrides: Record<string, BuiltinAgentOverrideConfig>,
+	projectOverrides: Record<string, BuiltinAgentOverrideConfig>,
+	userSettingsPath: string,
+	projectSettingsPath: string | null,
+): AgentConfig[] {
+	return builtinAgents.map((agent) => {
+		const projectOverride = projectOverrides[agent.name];
+		if (projectOverride && projectSettingsPath) {
+			return applyBuiltinOverride(agent, projectOverride, { scope: "project", path: projectSettingsPath });
+		}
+
+		const userOverride = userOverrides[agent.name];
+		if (userOverride) {
+			return applyBuiltinOverride(agent, userOverride, { scope: "user", path: userSettingsPath });
+		}
+
+		return agent;
+	});
+}
+
+export function buildBuiltinOverrideConfig(
+	base: BuiltinAgentOverrideBase,
+	draft: Pick<AgentConfig, "model" | "fallbackModels" | "thinking" | "systemPrompt" | "skills" | "tools" | "mcpDirectTools">,
+): BuiltinAgentOverrideConfig | undefined {
+	const override: BuiltinAgentOverrideConfig = {};
+
+	if (draft.model !== base.model) override.model = draft.model ?? false;
+	if (!arraysEqual(draft.fallbackModels, base.fallbackModels)) override.fallbackModels = draft.fallbackModels ? [...draft.fallbackModels] : false;
+	if (draft.thinking !== base.thinking) override.thinking = draft.thinking ?? false;
+	if (draft.systemPrompt !== base.systemPrompt) override.systemPrompt = draft.systemPrompt;
+	if (!arraysEqual(draft.skills, base.skills)) override.skills = draft.skills ? [...draft.skills] : false;
+
+	const baseTools = joinToolList(base);
+	const draftTools = joinToolList(draft);
+	if (!arraysEqual(draftTools, baseTools)) override.tools = draftTools ? [...draftTools] : false;
+
+	return Object.keys(override).length > 0 ? override : undefined;
+}
+
+export function saveBuiltinAgentOverride(
+	cwd: string,
+	name: string,
+	scope: "user" | "project",
+	override: BuiltinAgentOverrideConfig,
+): string {
+	const filePath = scope === "project" ? getProjectAgentSettingsPath(cwd) : getUserAgentSettingsPath();
+	if (!filePath) throw new Error("Project override is not available here. No project config root was found.");
+
+	const settings = readSettingsFileStrict(filePath);
+	const subagents = settings.subagents && typeof settings.subagents === "object" && !Array.isArray(settings.subagents)
+		? { ...(settings.subagents as Record<string, unknown>) }
+		: {};
+	const agentOverrides = subagents.agentOverrides && typeof subagents.agentOverrides === "object" && !Array.isArray(subagents.agentOverrides)
+		? { ...(subagents.agentOverrides as Record<string, unknown>) }
+		: {};
+
+	agentOverrides[name] = cloneOverrideValue(override);
+	subagents.agentOverrides = agentOverrides;
+	settings.subagents = subagents;
+	writeSettingsFile(filePath, settings);
+	return filePath;
+}
+
+export function removeBuiltinAgentOverride(cwd: string, name: string, scope: "user" | "project"): string {
+	const filePath = scope === "project" ? getProjectAgentSettingsPath(cwd) : getUserAgentSettingsPath();
+	if (!filePath) throw new Error("Project override is not available here. No project config root was found.");
+	if (!fs.existsSync(filePath)) return filePath;
+
+	const settings = readSettingsFileStrict(filePath);
+	const subagents = settings.subagents;
+	if (!subagents || typeof subagents !== "object" || Array.isArray(subagents)) return filePath;
+	const nextSubagents = { ...(subagents as Record<string, unknown>) };
+	const agentOverrides = nextSubagents.agentOverrides;
+	if (!agentOverrides || typeof agentOverrides !== "object" || Array.isArray(agentOverrides)) return filePath;
+
+	const nextOverrides = { ...(agentOverrides as Record<string, unknown>) };
+	delete nextOverrides[name];
+	if (Object.keys(nextOverrides).length > 0) nextSubagents.agentOverrides = nextOverrides;
+	else delete nextSubagents.agentOverrides;
+
+	if (Object.keys(nextSubagents).length > 0) settings.subagents = nextSubagents;
+	else delete settings.subagents;
+
+	writeSettingsFile(filePath, settings);
+	return filePath;
+}
+
 function loadAgentsFromDir(dir: string, source: AgentSource): AgentConfig[] {
 	const agents: AgentConfig[] = [];
 
@@ -111,7 +396,6 @@ function loadAgentsFromDir(dir: string, source: AgentSource): AgentConfig[] {
 			}
 		}
 
-		// Parse defaultReads as comma-separated list (like tools)
 		const defaultReads = frontmatter.defaultReads
 			?.split(",")
 			.map((f) => f.trim())
@@ -155,7 +439,6 @@ function loadAgentsFromDir(dir: string, source: AgentSource): AgentConfig[] {
 			filePath,
 			skills: skills && skills.length > 0 ? skills : undefined,
 			extensions,
-			// Chain behavior fields
 			output: frontmatter.output,
 			defaultReads: defaultReads && defaultReads.length > 0 ? defaultReads : undefined,
 			defaultProgress: frontmatter.defaultProgress === "true",
@@ -216,18 +499,12 @@ function isDirectory(p: string): boolean {
 }
 
 function findNearestProjectAgentsDir(cwd: string): string | null {
-	let currentDir = cwd;
-	while (true) {
-		const candidateAlt = path.join(currentDir, ".agents");
-		if (isDirectory(candidateAlt)) return candidateAlt;
-
-		const candidate = path.join(currentDir, ".dm", "agents");
-		if (isDirectory(candidate)) return candidate;
-
-		const parentDir = path.dirname(currentDir);
-		if (parentDir === currentDir) return null;
-		currentDir = parentDir;
-	}
+	const projectRoot = findNearestProjectRoot(cwd);
+	if (!projectRoot) return null;
+	const candidateAlt = path.join(projectRoot, ".agents");
+	if (isDirectory(candidateAlt)) return candidateAlt;
+	const candidate = path.join(projectRoot, ".dm", "agents");
+	return isDirectory(candidate) ? candidate : null;
 }
 
 const BUILTIN_AGENTS_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), "agents");
@@ -236,8 +513,16 @@ export function discoverAgents(cwd: string, scope: AgentScope): AgentDiscoveryRe
 	const userDirOld = path.join(os.homedir(), ".dm", "agent", "agents");
 	const userDirNew = path.join(os.homedir(), ".agents");
 	const projectAgentsDir = findNearestProjectAgentsDir(cwd);
-
-	const builtinAgents = loadAgentsFromDir(BUILTIN_AGENTS_DIR, "builtin");
+	const userSettingsPath = getUserAgentSettingsPath();
+	const projectSettingsPath = getProjectAgentSettingsPath(cwd);
+
+	const builtinAgents = applyBuiltinOverrides(
+		loadAgentsFromDir(BUILTIN_AGENTS_DIR, "builtin"),
+		scope === "project" ? {} : readBuiltinOverrides(userSettingsPath),
+		scope === "user" ? {} : readBuiltinOverrides(projectSettingsPath),
+		userSettingsPath,
+		projectSettingsPath,
+	);
 	
 	const userAgentsOld = scope === "project" ? [] : loadAgentsFromDir(userDirOld, "user");
 	const userAgentsNew = scope === "project" ? [] : loadAgentsFromDir(userDirNew, "user");
@@ -256,12 +541,22 @@ export function discoverAgentsAll(cwd: string): {
 	chains: ChainConfig[];
 	userDir: string;
 	projectDir: string | null;
+	userSettingsPath: string;
+	projectSettingsPath: string | null;
 } {
 	const userDirOld = path.join(os.homedir(), ".dm", "agent", "agents");
 	const userDirNew = path.join(os.homedir(), ".agents");
 	const projectDir = findNearestProjectAgentsDir(cwd);
-
-	const builtin = loadAgentsFromDir(BUILTIN_AGENTS_DIR, "builtin");
+	const userSettingsPath = getUserAgentSettingsPath();
+	const projectSettingsPath = getProjectAgentSettingsPath(cwd);
+
+	const builtin = applyBuiltinOverrides(
+		loadAgentsFromDir(BUILTIN_AGENTS_DIR, "builtin"),
+		readBuiltinOverrides(userSettingsPath),
+		readBuiltinOverrides(projectSettingsPath),
+		userSettingsPath,
+		projectSettingsPath,
+	);
 	const user = [
 		...loadAgentsFromDir(userDirOld, "user"),
 		...loadAgentsFromDir(userDirNew, "user"),
@@ -275,5 +570,5 @@ export function discoverAgentsAll(cwd: string): {
 
 	const userDir = fs.existsSync(userDirNew) ? userDirNew : userDirOld;
 
-	return { builtin, user, project, chains, userDir, projectDir };
+	return { builtin, user, project, chains, userDir, projectDir, userSettingsPath, projectSettingsPath };
 }

package/extensions/dm-ultrathink/README.md

@@ -13,6 +13,11 @@ Bundled DM extension for multi-pass review loops and oracle-assisted review sess
 - Global config path: `~/.dm/ultrathink.json`
 - Config env override: `DM_ULTRATHINK_CONFIG_PATH`
 
+## Naming-model catalogs
+
+- DuckMind/OpenRouter sessions show `duckmind/free`, `duckmind/auto`, `duckmind/lite`, `duckmind/smart`, `duckmind/deep`
+- OpenAI Codex / dm-multicodex sessions show `openai-codex/gpt-5.1`, `openai-codex/gpt-5.1-codex-max`, `openai-codex/gpt-5.1-codex-mini`, `openai-codex/gpt-5.2`, `openai-codex/gpt-5.2-codex`
+
 ## Bundled with dm
 
 No separate install step is required. The extension is loaded from DM's bundled extension catalog.

package/extensions/dm-ultrathink/src/naming.ts

@@ -61,6 +61,7 @@ type DuckMindPreset = {
 
 const DUCKMIND_PROVIDER = "duckmind";
 const OPENROUTER_PROVIDER = "openrouter";
+const OPENAI_CODEX_PROVIDER = "openai-codex";
 const DUCKMIND_PRESETS: readonly DuckMindPreset[] = [
   {
     alias: "free",
@@ -94,6 +95,34 @@ const DUCKMIND_PRESETS: readonly DuckMindPreset[] = [
   },
 ];
 
+const OPENAI_CODEX_NAMING_MODELS = [
+  {
+    modelId: "gpt-5.1",
+    fallbackModelId: "gpt-5.1-codex-mini",
+    displayName: "GPT-5.1",
+  },
+  {
+    modelId: "gpt-5.1-codex-max",
+    fallbackModelId: "gpt-5.1-codex-mini",
+    displayName: "GPT-5.1 Codex Max",
+  },
+  {
+    modelId: "gpt-5.1-codex-mini",
+    fallbackModelId: "gpt-5.1-codex-mini",
+    displayName: "GPT-5.1 Codex Mini",
+  },
+  {
+    modelId: "gpt-5.2",
+    fallbackModelId: "gpt-5.1-codex-mini",
+    displayName: "GPT-5.2",
+  },
+  {
+    modelId: "gpt-5.2-codex",
+    fallbackModelId: "gpt-5.1-codex-mini",
+    displayName: "GPT-5.2 Codex",
+  },
+] as const;
+
 let testOverrides: NamingTestOverrides | undefined;
 
 export function setNamingTestOverrides(overrides?: NamingTestOverrides): void {
@@ -208,6 +237,25 @@ function buildDuckMindNamingChoices(availableModels: Model<any>[]): NamingModelC
   });
 }
 
+function buildOpenAICodexNamingChoices(availableModels: Model<any>[]): NamingModelChoice[] {
+  const codexModels = availableModels.filter((model) => model.provider === OPENAI_CODEX_PROVIDER);
+  return OPENAI_CODEX_NAMING_MODELS.flatMap((entry) => {
+    const model = pickOpenRouterModel(codexModels, entry.modelId, entry.fallbackModelId, entry.displayName);
+    if (!model) {
+      return [];
+    }
+    return [
+      {
+        label: `${OPENAI_CODEX_PROVIDER}/${entry.modelId}`,
+        config: {
+          provider: OPENAI_CODEX_PROVIDER,
+          modelId: entry.modelId,
+        },
+      },
+    ];
+  });
+}
+
 function resolveDuckMindAliasModel(availableModels: Model<any>[], config: NamingModelConfig): Model<any> | undefined {
   const normalizedProvider = config.provider.trim().toLowerCase();
   const normalizedModelId = config.modelId.trim().toLowerCase();
@@ -231,9 +279,31 @@ function resolveDuckMindAliasModel(availableModels: Model<any>[], config: Naming
   );
 }
 
+function resolveOpenAICodexAliasModel(availableModels: Model<any>[], config: NamingModelConfig): Model<any> | undefined {
+  const normalizedProvider = config.provider.trim().toLowerCase();
+  const normalizedModelId = config.modelId.trim().toLowerCase();
+  if (normalizedProvider !== OPENAI_CODEX_PROVIDER) {
+    return undefined;
+  }
+
+  const preset = OPENAI_CODEX_NAMING_MODELS.find((entry) => normalizedModelId === entry.modelId.toLowerCase());
+  if (!preset) {
+    return undefined;
+  }
+
+  return pickOpenRouterModel(
+    availableModels.filter((model) => model.provider === OPENAI_CODEX_PROVIDER),
+    preset.modelId,
+    preset.fallbackModelId,
+    preset.displayName,
+  );
+}
+
 async function resolveNamingModel(ctx: ExtensionContext, config: NamingModelConfig): Promise<{ model: Model<any>; apiKey: string }> {
+  const availableModels = ctx.modelRegistry.getAvailable();
   const model =
-    resolveDuckMindAliasModel(ctx.modelRegistry.getAvailable(), config) ??
+    resolveDuckMindAliasModel(availableModels, config) ??
+    resolveOpenAICodexAliasModel(availableModels, config) ??
     ctx.modelRegistry.find(config.provider, config.modelId);
   if (!model) {
     throw new Error(`Ultrathink naming model ${config.provider}/${config.modelId} is not available in DM.`);
@@ -320,10 +390,12 @@ export async function ensureNamingModel(
   const choices =
     ctx.model?.provider === OPENROUTER_PROVIDER || ctx.model?.provider === DUCKMIND_PROVIDER
       ? buildDuckMindNamingChoices(availableModels)
-      : availableModels.map(buildDefaultNamingChoice);
+      : ctx.model?.provider === OPENAI_CODEX_PROVIDER
+        ? buildOpenAICodexNamingChoices(availableModels)
+        : availableModels.map(buildDefaultNamingChoice);
 
   if (choices.length === 0) {
-    throw new Error("Ultrathink could not find any available DM models to use for branch and commit naming.");
+    throw new Error("Ultrathink could not find any available naming models to use for branch and commit naming.");
   }
 
   const selection = await ctx.ui.select(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckmind/dm-darwin-arm64",
-  "version": "0.13.7",
+  "version": "0.13.8",
   "description": "DuckMind (dm) binary payload for darwin arm64",
   "license": "MIT",
   "os": [