@duckmind/dm-darwin-arm64 0.13.7 → 0.14.6

package/README.md

@@ -15,13 +15,7 @@ OSS weekend runs Monday, April 13, 2026 through Monday, April 20, 2026. New issu
 </p>
 <p align="center">
   <a href="https://discord.com/invite/3cU7Bz4UPx"><img alt="Discord" src="https://img.shields.io/badge/discord-community-5865F2?style=flat-square&logo=discord&logoColor=white" /></a>
-  <a href="https://www.npmjs.com/package/@mariozechner/pi-coding-agent"><img alt="npm" src="https://img.shields.io/npm/v/@mariozechner/pi-coding-agent?style=flat-square" /></a>
-  <img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/badlogic/pi-mono/ci.yml?style=flat-square&branch=main" />
-</p>
-<p align="center">
-  <a href="https://pi.dev">pi.dev</a> domain graciously donated by
-  <br /><br />
-  <a href="https://exe.dev"><img src="docs/images/exy.png" alt="Exy mascot" width="48" /><br />exe.dev</a>
+  <a href="https://www.npmjs.com/package/@duckmind/dm"><img alt="npm" src="https://img.shields.io/npm/v/@duckmind/dm?style=flat-square" /></a>
 </p>
 
 DM is a minimal terminal coding harness. Adapt dm to your workflows, not the other way around, without having to fork and modify dm internals. Extend it with TypeScript [Extensions](#extensions), [Skills](#skills), [Prompt Templates](#prompt-templates), and [Themes](#themes). Put your extensions, skills, prompt templates, and themes in [DM Packages](#dm-packages) and share them with others via npm or git.
@@ -38,13 +32,13 @@ Public OSS session data helps improve models, prompts, tools, and evaluations us
 
 For the full explanation, see [this post on X](https://x.com/badlogicgames/status/2037811643774652911).
 
-To publish sessions, use [`badlogic/pi-share-hf`](https://github.com/badlogic/pi-share-hf). Read its README.md for setup instructions. All you need is a Hugging Face account, the Hugging Face CLI, and `pi-share-hf`.
+To publish sessions, use the DuckMind session publishing workflow documented in your release process. All you need is a Hugging Face account and the Hugging Face CLI.
 
 You can also watch [this video](https://x.com/badlogicgames/status/2041151967695634619), where I show how I publish my `dm` sessions.
 
 I regularly publish my own `dm` work sessions here:
 
-- [badlogicgames/pi-mono on Hugging Face](https://huggingface.co/datasets/badlogicgames/pi-mono)
+- DuckMind OSS sessions dataset
 
 ## Table of Contents
 
@@ -75,7 +69,7 @@ I regularly publish my own `dm` work sessions here:
 ## Quick Start
 
 ```bash
-npm install -g @mariozechner/pi-coding-agent
+npm install -g @duckmind/dm@latest
 ```
 
 Authenticate with an API key:

package/docs/compaction.md

@@ -2,7 +2,7 @@
 
 LLMs have limited context windows. When conversations grow too long, dm uses compaction to summarize older content while preserving recent work. This page covers both auto-compaction and branch summarization.
 
-**Source files** (pi-mono):
+**Source files** (dm runtime clone):
 - `packages/coding-agent/src/core/compaction/compaction.ts` - Auto-compaction logic
 - `packages/coding-agent/src/core/compaction/branch-summarization.ts` - Branch summarization
 - `packages/coding-agent/src/core/compaction/utils.ts` - Shared utilities (file tracking, serialization)

package/docs/packages.md

@@ -8,7 +8,7 @@ DM packages bundle extensions, skills, prompt templates, and themes so you can s
 
 - [Install and Manage](#install-and-manage)
 - [Package Sources](#package-sources)
-- [Creating a DM Package](#creating-a-pi-package)
+- [Creating a DM Package](#creating-a-dm-package)
 - [Package Structure](#package-structure)
 - [Dependencies](#dependencies)
 - [Package Filtering](#package-filtering)

package/docs/session.md

@@ -28,7 +28,7 @@ Existing sessions are automatically migrated to the current version (v3) when lo
 
 ## Source Files
 
-Source reference (pi-mono):
+Source reference (dm runtime clone):
 - `packages/coding-agent/src/core/session-manager.ts` - Session entry types and SessionManager
 - `packages/coding-agent/src/core/messages.ts` - Extended message types (BashExecutionMessage, CustomMessage, etc.)
 - `packages/ai/src/types.ts` - Base message types (UserMessage, AssistantMessage, ToolResultMessage)

package/docs/termux.md

@@ -17,7 +17,7 @@ pkg update && pkg upgrade
 pkg install nodejs termux-api git
 
 # Install dm
-npm install -g @mariozechner/pi-coding-agent
+npm install -g @duckmind/dm@latest
 
 # Create config directory
 mkdir -p ~/.dm/agent

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-14T09:11:51.893610+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": "fb21a75bb321eb9bee3cb9097d78a1e3003c4933",
       "target_dir": "extensions/dm-subagents",
       "bundle_mode": "source-package",
       "copied_paths": [
@@ -133,11 +133,11 @@
       ]
     },
     {
-      "id": "dm-multicodex",
+      "id": "dm-ultradex",
       "upstream_name": "pi-multicodex",
       "source_url": "https://github.com/victor-software-house/pi-multicodex",
       "upstream_revision": "f80c63c8ff00ae29c1b8c88821c65b4d4ef9da81",
-      "target_dir": "extensions/dm-multicodex",
+      "target_dir": "extensions/dm-ultradex",
       "bundle_mode": "source-package-with-runtime-deps",
       "copied_paths": [
         "README.md",
@@ -230,9 +230,9 @@
       "install_mode": "none"
     },
     {
-      "id": "dm-multicodex",
-      "source_dir": "extensions/dm-multicodex",
-      "staged_dir": "dist/extensions/dm-multicodex",
+      "id": "dm-ultradex",
+      "source_dir": "extensions/dm-ultradex",
+      "staged_dir": "dist/extensions/dm-ultradex",
       "bundle_mode": "source-package-with-runtime-deps",
       "dependencies_installed": true,
       "install_mode": "npm-install"

package/extensions/dm-phone/src/session-pool/session-worker.ts

@@ -268,7 +268,6 @@ export class PhoneSessionWorker {
         cwd: this.cwd,
         env: {
           ...process.env,
-          DM_PHONE_CHILD: "1",
           PI_PHONE_CHILD: "1",
         },
         stdio: ["pipe", "pipe", "pipe"],

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);