@duckmind/dm-linux-x64 0.65.5 → 0.65.6

package/extensions/dm-subagents/src/agents/agent-management.js

@@ -1,7 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import {
-  BUILTIN_AGENT_NAMES,
   defaultInheritProjectContext,
   defaultInheritSkills,
   defaultSystemPromptMode,
@@ -22,16 +21,20 @@ import {
   buildProactiveSkillSubagentRecommendationLines
 } from "./proactive-skills.js";
 import { parseFrontmatter, parseFrontmatterList } from "./frontmatter.js";
-import { toModelInfo } from "../shared/model-info.js";
-import { resolveSubagentModelOverride } from "../runs/shared/model-fallback.js";
+import { resolveEffectiveThinking, toModelInfo } from "../shared/model-info.js";
+import { resolveSubagentModelOverride } from "../runs/shared/model-resolution.js";
 import { validateToolBudgetConfig } from "../runs/shared/tool-budget.js";
-import { validateAcceptanceInput } from "../runs/shared/acceptance.js";
+import { formatReviewGateLabel, validateAcceptanceInput } from "../runs/shared/acceptance.js";
 import { CODE_OWNED_EXTERNAL_CLI_ADAPTER_LABEL, isCodeOwnedExternalCliAdapterId, resolveExternalCliRunnerStatus, validateCodeOwnedProfileRunner } from "../runs/shared/external-cli-contract.js";
+import { resolveExternalCliBinaryAvailability } from "../runs/shared/external-cli-preflight.js";
 import { getProjectConfigDir } from "../shared/utils.js";
 import { previewDisplayText } from "../shared/display-text.js";
 import { capabilityCeilingAgentRestrictionSources, isAgentAllowedByCapabilityCeiling, resolveCurrentSubagentCapabilityCeiling } from "../runs/shared/capability-ceiling.js";
-import { listRuntimeAgentConfigs, mergeRuntimeAgents } from "./runtime-agent-registry.js";
+import { mergeRuntimeAgents } from "./runtime-agent-registry.js";
 import { listExternalJobProviders } from "../api/external-job-provider.js";
+function discoverCatalog(ctx, cwd = ctx.cwd, provider) {
+  return (ctx.discoverAgentsAll ?? discoverAgentsAll)(cwd, provider);
+}
 function result(text, isError = false, details) {
   return { content: [{ type: "text", text }], isError, details: { mode: "management", results: [], ...details } };
 }
@@ -100,16 +103,24 @@ function parsePackageConfig(value) {
 function allAgents(d) {
   return [...d.builtin, ...d.package, ...d.user, ...d.project];
 }
-function availableAgentNamesFromDiscovery(d) {
-  return [...new Set(allAgents(d).map((agent) => agent.name))].sort((a, b) => a.localeCompare(b));
+function effectiveAgentsForScope(scope, d, runtimeAgentOwner, preferredModelProvider) {
+  let agents = mergeAgentsForScope(scope, d.user, d.project, d.builtin, d.package);
+  if (runtimeAgentOwner) {
+    agents = mergeRuntimeAgents(runtimeAgentOwner, { agents }, allAgents(d), { cwd: d.cwd, scope, preferredModelProvider }).agents;
+  }
+  return agents;
+}
+function availableAgentNamesFromDiscovery(d, runtimeAgentOwner, preferredModelProvider) {
+  const agents = runtimeAgentOwner ? effectiveAgentsForScope("both", d, runtimeAgentOwner, preferredModelProvider) : allAgents(d);
+  return [...new Set(agents.map((agent) => agent.name))].sort((a, b) => a.localeCompare(b));
 }
-function availableAgentNames(cwd) {
-  return availableAgentNamesFromDiscovery(discoverAgentsAll(cwd));
+function availableAgentNames(ctx, cwd = ctx.cwd) {
+  return availableAgentNamesFromDiscovery(discoverCatalog(ctx, cwd));
 }
-function findAgentsInDiscovery(name, d, scope = "both") {
+function findAgentsInDiscovery(name, d, scope = "both", runtimeAgentOwner, preferredModelProvider) {
   const raw = name.trim();
   const sanitized = sanitizeName(raw);
-  const scoped = mergeAgentsForScope(scope, d.user, d.project, d.builtin, d.package);
+  const scoped = effectiveAgentsForScope(scope, d, runtimeAgentOwner, preferredModelProvider);
   let resolved = resolveAgentName(raw, scoped);
   if (!resolved.agent && !resolved.error && sanitized !== raw)
     resolved = resolveAgentName(sanitized, scoped);
@@ -117,8 +128,8 @@ function findAgentsInDiscovery(name, d, scope = "both") {
     return scoped.filter((agent) => agent.name === resolved.agent.name).sort((a, b) => a.source.localeCompare(b.source));
   return scoped.filter((agent) => Boolean(resolveAgentName(raw, [agent]).agent) || sanitized !== raw && Boolean(resolveAgentName(sanitized, [agent]).agent)).sort((a, b) => a.source.localeCompare(b.source));
 }
-function findAgents(name, cwd, scope = "both") {
-  return findAgentsInDiscovery(name, discoverAgentsAll(cwd), scope);
+function findAgents(name, ctx, scope = "both") {
+  return findAgentsInDiscovery(name, discoverCatalog(ctx), scope);
 }
 function diagnosticsForScope(diagnostics, scope) {
   if (scope === "both")
@@ -143,8 +154,8 @@ function resolveEffectiveAgent(d, name) {
   const matches = candidates.filter((agent) => agent.name === resolved.agent.name);
   return { agent: matches.reduce((best, agent) => AGENT_SOURCE_PRECEDENCE[agent.source] > AGENT_SOURCE_PRECEDENCE[best.source] ? agent : best) };
 }
-function nameExistsInScope(cwd, scope, name, excludePath) {
-  const d = discoverAgentsAll(cwd);
+function nameExistsInScope(ctx, scope, name, excludePath) {
+  const d = discoverCatalog(ctx);
   for (const a of scope === "user" ? d.user : d.project) {
     if (a.name === name && a.filePath !== excludePath)
       return true;
@@ -162,13 +173,6 @@ function modelWarning(ctx, model) {
     return;
   return `Warning: model '${model}' is not in the current model registry. Run subagent({ action: "models" }) to list valid provider/id selectors, then use the exact provider/id form (bare ids resolve only when unique).`;
 }
-function fallbackModelsWarning(ctx, fallbackModels) {
-  if (!fallbackModels || fallbackModels.length === 0)
-    return;
-  const available = new Set(ctx.modelRegistry.getAvailable().flatMap((m) => [`${m.provider}/${m.id}`, m.id]));
-  const missing = fallbackModels.filter((model) => !available.has(model));
-  return missing.length ? `Warning: fallback models not in the current model registry: ${missing.join(", ")}.` : undefined;
-}
 function skillsWarning(cwd, agent) {
   if (!agent.skills?.length)
     return;
@@ -187,13 +191,27 @@ function withDeclaredExtensionPaths(config, filePath) {
 export function editableAgentConfig(agent) {
   const { extensions: _extensions, ...withoutExtensions } = agent;
   const base = agent.override?.base;
+  const description = base?.description ?? agent.description;
+  const frontmatterFields = agent.source === "builtin" || agent.source === "runtime" ? undefined : readAgentFrontmatterFields(agent.filePath);
+  const hasDeclaredField = (...fields) => frontmatterFields === undefined || fields.some((field) => frontmatterFields.has(field));
+  const withoutSettingsDefaults = (config) => {
+    if (!frontmatterFields)
+      return config;
+    const next = { ...config };
+    if (!hasDeclaredField("model"))
+      delete next.model;
+    if (!hasDeclaredField("thinking"))
+      delete next.thinking;
+    return next;
+  };
   const {
     override: _override,
+    description: _description,
     output: _output,
     outputMode: _outputMode,
     defaultReads: _defaultReads,
     model: _model,
-    fallbackModels: _fallbackModels,
+    fast: _fast,
     thinking: _thinking,
     systemPromptMode: _systemPromptMode,
     inheritProjectContext: _inheritProjectContext,
@@ -206,26 +224,30 @@ export function editableAgentConfig(agent) {
     skills: _skills,
     skillPath: _skillPath,
     tools: _tools,
+    excludeTools: _excludeTools,
     mcpDirectTools: _mcpDirectTools,
+    allowNestedSubagents: _allowNestedSubagents,
+    allowedAgents: _allowedAgents,
     subagentOnlyExtensions: _subagentOnlyExtensions,
     mutationTools: _mutationTools,
-    completionGuard: _completionGuard,
+    toolBudget: _toolBudget,
     ...editable
   } = withoutExtensions;
   if (!base) {
-    return withDeclaredExtensionPaths({
+    return withDeclaredExtensionPaths(withoutSettingsDefaults({
       ...withoutExtensions,
       ...agent.extensionsFromDefault ? {} : agent.extensions !== undefined ? { extensions: [...agent.extensions] } : {}
-    }, agent.filePath);
+    }), agent.filePath);
   }
   return withDeclaredExtensionPaths({
     ...editable,
+    description,
     ...base.output !== undefined ? { output: base.output } : {},
     ...base.outputMode !== undefined ? { outputMode: base.outputMode } : {},
     ...base.defaultReads !== undefined ? { defaultReads: [...base.defaultReads] } : {},
-    ...base.model !== undefined ? { model: base.model } : {},
-    ...base.fallbackModels !== undefined ? { fallbackModels: [...base.fallbackModels] } : {},
-    ...base.thinking !== undefined ? { thinking: base.thinking } : {},
+    ...base.model !== undefined && hasDeclaredField("model") ? { model: base.model } : {},
+    ...base.fast !== undefined ? { fast: base.fast } : {},
+    ...base.thinking !== undefined && hasDeclaredField("thinking") ? { thinking: base.thinking } : {},
     systemPromptMode: base.systemPromptMode,
     inheritProjectContext: base.inheritProjectContext,
     inheritGlobalContext: base.inheritGlobalContext,
@@ -237,11 +259,14 @@ export function editableAgentConfig(agent) {
     ...base.skills !== undefined ? { skills: [...base.skills] } : {},
     ...base.skillPath !== undefined ? { skillPath: [...base.skillPath] } : {},
     ...base.tools !== undefined ? { tools: [...base.tools] } : {},
+    ...base.excludeTools !== undefined ? { excludeTools: [...base.excludeTools] } : {},
     ...base.mcpDirectTools !== undefined ? { mcpDirectTools: [...base.mcpDirectTools] } : {},
+    ...base.allowNestedSubagents !== undefined ? { allowNestedSubagents: base.allowNestedSubagents } : {},
+    ...base.allowedAgents !== undefined ? { allowedAgents: [...base.allowedAgents] } : {},
     ...base.extensions !== undefined ? { extensions: [...base.extensions] } : {},
     ...base.subagentOnlyExtensions !== undefined ? { subagentOnlyExtensions: [...base.subagentOnlyExtensions] } : {},
     ...base.mutationTools !== undefined ? { mutationTools: [...base.mutationTools] } : {},
-    ...base.completionGuard !== undefined ? { completionGuard: base.completionGuard } : {}
+    ...base.toolBudget !== undefined ? { toolBudget: base.toolBudget } : {}
   }, agent.filePath);
 }
 function readAgentFrontmatterFields(filePath) {
@@ -264,6 +289,8 @@ export function preservedAgentFrontmatterFields(agent, cfg) {
     changed("package");
   if (hasKey(cfg, "description"))
     changed("description");
+  if (hasKey(cfg, "advertise"))
+    changed("advertise");
   if (hasKey(cfg, "aliases"))
     changed("alias", "aliases");
   if (hasKey(cfg, "systemPrompt"))
@@ -272,10 +299,10 @@ export function preservedAgentFrontmatterFields(agent, cfg) {
     changed("runner");
   if (hasKey(cfg, "model"))
     changed("model");
-  if (hasKey(cfg, "fallbackModels"))
-    changed("fallbackModels");
   if (hasKey(cfg, "tools"))
     changed("tools");
+  if (hasKey(cfg, "excludeTools"))
+    changed("excludeTools");
   if (hasKey(cfg, "skills"))
     changed("skill", "skills");
   if (hasKey(cfg, "skillPath"))
@@ -327,11 +354,6 @@ export function preservedAgentFrontmatterFields(agent, cfg) {
     changed("defaultProgress");
   if (hasKey(cfg, "maxSubagentDepth"))
     changed("maxSubagentDepth");
-  if (hasKey(cfg, "completionGuard")) {
-    changed("completionGuard");
-    if (cfg.completionGuard === true)
-      fields.add("completionGuard");
-  }
   if (hasKey(cfg, "toolBudget"))
     changed("toolBudget");
   return fields;
@@ -353,6 +375,14 @@ function parseTools(raw) {
   };
 }
 function applyAgentConfig(target, cfg) {
+  if (hasKey(cfg, "advertise")) {
+    if (cfg.advertise === "")
+      delete target.advertise;
+    else if (typeof cfg.advertise === "boolean")
+      target.advertise = cfg.advertise;
+    else
+      return "config.advertise must be a boolean or empty string when provided.";
+  }
   if (hasKey(cfg, "aliases")) {
     if (cfg.aliases === false || cfg.aliases === "")
       delete target.aliases;
@@ -408,24 +438,8 @@ function applyAgentConfig(target, cfg) {
     } else
       return "config.model must be a string or false when provided.";
   }
-  if (hasKey(cfg, "fallbackModels")) {
-    if (cfg.fallbackModels === false || cfg.fallbackModels === "")
-      delete target.fallbackModels;
-    else if (typeof cfg.fallbackModels === "string") {
-      const models = parseCsv(cfg.fallbackModels);
-      if (models.length)
-        target.fallbackModels = models;
-      else
-        delete target.fallbackModels;
-    } else if (Array.isArray(cfg.fallbackModels)) {
-      const models = cfg.fallbackModels.filter((value) => typeof value === "string").map((value) => value.trim()).filter(Boolean);
-      if (models.length)
-        target.fallbackModels = [...new Set(models)];
-      else
-        delete target.fallbackModels;
-    } else
-      return "config.fallbackModels must be a comma-separated string, string array, or false when provided.";
-  }
+  if (hasKey(cfg, "fallbackModels"))
+    return "config.fallbackModels was removed; configure one model instead.";
   if (hasKey(cfg, "tools")) {
     if (cfg.tools === false || cfg.tools === "") {
       delete target.tools;
@@ -443,6 +457,24 @@ function applyAgentConfig(target, cfg) {
     } else
       return "config.tools must be a comma-separated string or false when provided.";
   }
+  if (hasKey(cfg, "excludeTools")) {
+    if (cfg.excludeTools === false || cfg.excludeTools === "")
+      delete target.excludeTools;
+    else if (typeof cfg.excludeTools === "string") {
+      const excludeTools = parseCsv(cfg.excludeTools);
+      if (excludeTools.length)
+        target.excludeTools = [...new Set(excludeTools)];
+      else
+        delete target.excludeTools;
+    } else if (Array.isArray(cfg.excludeTools) && cfg.excludeTools.every((entry) => typeof entry === "string")) {
+      const excludeTools = [...new Set(cfg.excludeTools.map((entry) => entry.trim()).filter(Boolean))];
+      if (excludeTools.length)
+        target.excludeTools = excludeTools;
+      else
+        delete target.excludeTools;
+    } else
+      return "config.excludeTools must be a comma-separated string, string array, or false when provided.";
+  }
   if (hasKey(cfg, "skills")) {
     if (cfg.skills === false || cfg.skills === "")
       delete target.skills;
@@ -617,11 +649,6 @@ function applyAgentConfig(target, cfg) {
     } else
       return "config.maxSubagentDepth must be an integer >= 0 or false when provided.";
   }
-  if (hasKey(cfg, "completionGuard")) {
-    if (typeof cfg.completionGuard !== "boolean")
-      return "config.completionGuard must be a boolean when provided.";
-    target.completionGuard = cfg.completionGuard;
-  }
   if (hasKey(cfg, "toolBudget")) {
     if (cfg.toolBudget === false || cfg.toolBudget === "")
       delete target.toolBudget;
@@ -635,15 +662,14 @@ function applyAgentConfig(target, cfg) {
   if (target.runner?.type === "external-cli" || target.runner?.type === "external-job") {
     const unsupported = [
       target.tools?.length || target.mcpDirectTools?.length ? "tools" : undefined,
+      target.excludeTools?.length ? "excludeTools" : undefined,
       target.model ? "model" : undefined,
-      target.fallbackModels?.length ? "fallbackModels" : undefined,
       target.thinking ? "thinking" : undefined,
       target.extensions?.length ? "extensions" : undefined,
       target.subagentOnlyExtensions?.length ? "subagentOnlyExtensions" : undefined,
       target.mutationTools?.length ? "mutationTools" : undefined,
       target.skills?.length || target.skillPath?.length ? "skills" : undefined,
       target.maxSubagentDepth !== undefined ? "maxSubagentDepth" : undefined,
-      target.completionGuard !== undefined ? "completionGuard" : undefined,
       target.toolBudget ? "toolBudget" : undefined
     ].filter((field) => Boolean(field));
     if (unsupported.length > 0)
@@ -651,7 +677,7 @@ function applyAgentConfig(target, cfg) {
   }
   return;
 }
-function resolveTarget(name, matches, cwd, scopeHint) {
+function resolveTarget(name, matches, cwd, ctx, scopeHint) {
   const distinctNames = [...new Set(matches.map((match) => match.name))];
   if (distinctNames.length > 1)
     return result(`Ambiguous agent alias or name '${name}': ${distinctNames.sort((a, b) => a.localeCompare(b)).join(", ")}`, true);
@@ -659,7 +685,7 @@ function resolveTarget(name, matches, cwd, scopeHint) {
   if (mutable.length === 0) {
     if (matches.length > 0)
       return result(`Agent '${name}' is read-only and cannot be modified. Create a same-named agent in user or project scope to override it.`, true);
-    return result(`Agent '${name}' not found. Available: ${availableAgentNames(cwd).join(", ") || "none"}.`, true);
+    return result(`Agent '${name}' not found. Available: ${availableAgentNames(ctx, cwd).join(", ") || "none"}.`, true);
   }
   if (mutable.length === 1)
     return mutable[0];
@@ -677,8 +703,8 @@ ${paths}`, true);
     return result(`Multiple agents named '${name}' found in scope '${scope}': ${scoped.map((match) => match.filePath).join(", ")}`, true);
   return scoped[0];
 }
-function renamePath(currentPath, newName, scope, cwd) {
-  if (nameExistsInScope(cwd, scope, newName, currentPath))
+function renamePath(currentPath, newName, scope, ctx) {
+  if (nameExistsInScope(ctx, scope, newName, currentPath))
     return { error: `Name '${newName}' already exists in ${scope} scope.` };
   const filePath = path.join(path.dirname(currentPath), `${newName}.md`);
   if (fs.existsSync(filePath) && filePath !== currentPath)
@@ -706,18 +732,43 @@ function externalJobProviderSuffix(provider, names) {
     return "?";
   return names.has(provider) ? "✓" : "missing";
 }
-function runnerListBadge(agent, providerNames) {
+function externalCliAvailabilityKey(command, machine) {
+  return machine ? `ssh@${machine}` : command;
+}
+function externalCliAvailabilityForAgents(agents) {
+  const availability = new Map;
+  for (const agent of agents) {
+    const runner = agent.runner;
+    if (runner?.type !== "external-cli")
+      continue;
+    const key = externalCliAvailabilityKey(runner.command, agent.machine);
+    if (availability.has(key))
+      continue;
+    availability.set(key, resolveExternalCliBinaryAvailability(agent.machine ? "ssh" : runner.command, process.env));
+  }
+  return availability;
+}
+function runnerListBadge(agent, providerNames, externalCliAvailability) {
   if (agent.runner?.type === "external-job")
     return `external-job:${agent.runner.provider} ${externalJobProviderSuffix(agent.runner.provider, providerNames)}`;
-  if (agent.runner?.type === "external-cli")
-    return "external-cli";
+  if (agent.runner?.type === "external-cli") {
+    const placed = agent.machine ? `${agent.runner.command} @ ${agent.machine}` : agent.runner.command;
+    const availability = externalCliAvailability?.get(externalCliAvailabilityKey(agent.runner.command, agent.machine));
+    if (!availability)
+      return `external-cli:${placed}`;
+    if (agent.machine)
+      return `external-cli:${placed} saved Herdr placement; transport ${availability.available ? "✓" : "missing"}; machine not preflighted`;
+    return `external-cli:${placed} ${availability.available ? "✓" : "missing"}`;
+  }
+  if (agent.machine)
+    return `machine: ${agent.machine} (saved Herdr placement)`;
   return;
 }
-function agentListMetadata(agent, providerNames) {
+function agentListMetadata(agent, providerNames, externalCliAvailability) {
   const source = agent.source === "package" ? packageSourceLabel(agent) : agent.source;
   return [
     source,
-    runnerListBadge(agent, providerNames),
+    runnerListBadge(agent, providerNames, externalCliAvailability),
     agent.defaultContext ? `context: ${agent.defaultContext}` : undefined,
     agent.aliases?.length ? `aliases: ${agent.aliases.join(", ")}` : undefined
   ].filter((part) => Boolean(part)).join(", ");
@@ -725,7 +776,7 @@ function agentListMetadata(agent, providerNames) {
 function formatAgentListLine(agent, providerNames) {
   return `- ${agent.name} (${agentListMetadata(agent, providerNames)}): ${agent.description}`;
 }
-function formatAgentCapabilitiesLine(agent, providerNames) {
+function formatAgentCapabilitiesLine(agent, providerNames, externalCliAvailability) {
   const declaredTools = [
     ...agent.tools ?? [],
     ...(agent.mcpDirectTools ?? []).map((tool) => `mcp:${tool}`)
@@ -736,6 +787,8 @@ function formatAgentCapabilitiesLine(agent, providerNames) {
   } else if (declaredTools.length > 0) {
     tools = declaredTools.join(", ");
   }
+  if (agent.excludeTools?.length)
+    tools = `${tools}; excludes: ${agent.excludeTools.join(", ")}`;
   let model = "inherits current session";
   if (agent.model !== undefined) {
     model = agent.model;
@@ -743,25 +796,68 @@ function formatAgentCapabilitiesLine(agent, providerNames) {
       model = `${agent.modelProvider}/${agent.model}`;
   }
   const thinking = agent.thinking === false ? "off" : agent.thinking ?? "default";
-  return `- ${agent.name} (${agentListMetadata(agent, providerNames)}): Description: ${previewDisplayText(agent.description, 240)}; Tools: ${tools}; Model: ${model}; Thinking: ${thinking}`;
+  const machine = agent.machine ? `; Machine: ${agent.machine} (saved Herdr placement)` : "";
+  const acceptance = formatAcceptanceSummary(agent);
+  return `- ${agent.name} (${agentListMetadata(agent, providerNames, externalCliAvailability)}): Description: ${previewDisplayText(agent.description, 240)}; Tools: ${tools}; Model: ${model}; Thinking: ${thinking}${machine}${acceptance ? `; ${acceptance}` : ""}`;
+}
+function formatAcceptanceSummary(agent) {
+  const policy = agent.defaultAcceptance;
+  const summary = [];
+  if (policy === false)
+    summary.push("Acceptance: disabled");
+  else if (typeof policy === "string")
+    summary.push(`Acceptance: ${policy}`);
+  else if (policy) {
+    const modifiers = [
+      ...policy.evidence ?? [],
+      ...(policy.verify ?? []).map((command) => `verify: ${formatAcceptanceDisplayLabel(command.id)}`),
+      ...policy.criteria?.length ? [`criteria: ${policy.criteria.length}`] : [],
+      ...policy.stopRules?.length ? [`stopRules: ${policy.stopRules.length}`] : []
+    ];
+    if (policy.review === false)
+      modifiers.push("review: off");
+    else if (policy.review) {
+      const displayReview = policy.review.agent ? { ...policy.review, agent: formatAcceptanceDisplayLabel(policy.review.agent) } : policy.review;
+      modifiers.push(`review: ${formatReviewGateLabel(displayReview)}`);
+    }
+    if (policy.report)
+      modifiers.push(`report: ${policy.report}`);
+    summary.push(`Acceptance: ${policy.level ?? "auto"}${modifiers.length > 0 ? ` (${modifiers.join(", ")})` : ""}`);
+  }
+  if (agent.acceptanceRole)
+    summary.push(`Acceptance role: ${agent.acceptanceRole}`);
+  return summary.length > 0 ? summary.join("; ") : undefined;
+}
+function formatAcceptanceDisplayLabel(value) {
+  return JSON.stringify(previewDisplayText(value, 80));
 }
 const EXTERNAL_JOB_CAPABILITIES = { stop: false, steer: false, resume: false, structuredOutput: false, toolEvents: false };
 const PI_AGENT_RUNNER = { type: "dm" };
 function listOrEmpty(values) {
   return values ?? [];
 }
-function agentCapabilityRunner(agent, providerNames) {
+function agentCapabilityRunner(agent, providerNames, externalCliAvailability) {
   const runner = agent.runner;
   if (!runner || runner.type === "dm")
     return PI_AGENT_RUNNER;
-  if (runner.type === "external-cli")
-    return { type: "external-cli", adapter: runner.adapter, capabilities: resolveExternalCliRunnerStatus(runner).capabilities };
+  if (runner.type === "external-cli") {
+    const availability = externalCliAvailability.get(externalCliAvailabilityKey(runner.command, agent.machine));
+    return {
+      type: "external-cli",
+      adapter: runner.adapter,
+      command: runner.command,
+      ...agent.machine ? { machine: agent.machine } : {},
+      ...availability,
+      capabilities: resolveExternalCliRunnerStatus(runner).capabilities
+    };
+  }
   return { type: "external-job", provider: runner.provider, available: providerNames?.has(runner.provider), capabilities: EXTERNAL_JOB_CAPABILITIES };
 }
 function agentCapabilityTools(agent) {
   return {
     ambient: agent.tools === undefined && agent.mcpDirectTools === undefined,
     names: listOrEmpty(agent.tools),
+    ...agent.excludeTools !== undefined ? { excludeTools: [...agent.excludeTools] } : {},
     mcpDirectTools: listOrEmpty(agent.mcpDirectTools),
     mutationTools: agent.mutationTools
   };
@@ -774,10 +870,11 @@ function agentCapabilityRow(agent, options) {
     executable: options.executable,
     restrictionSources: options.executable ? undefined : options.restrictionSources ?? [],
     aliases: agent.aliases ? [...agent.aliases] : undefined,
-    runner: agentCapabilityRunner(agent, options.providerNames),
+    runner: agentCapabilityRunner(agent, options.providerNames, options.externalCliAvailability),
     tools: agentCapabilityTools(agent),
-    model: presentDetails({ value: agent.model, fallbackModels: agent.fallbackModels, thinking: agent.thinking }),
+    model: presentDetails({ value: agent.model, thinking: agent.thinking }),
     execution: presentDetails({ defaultAsync: agent.defaultAsync, timeoutMs: agent.defaultTimeoutMs }),
+    acceptance: presentDetails({ policy: agent.defaultAcceptance, role: agent.acceptanceRole }),
     output: presentDetails({ path: agent.output, mode: agent.outputMode }),
     extensions: presentDetails({ names: agent.extensions, subagentOnly: agent.subagentOnlyExtensions, skills: agent.skills })
   };
@@ -785,8 +882,8 @@ function agentCapabilityRow(agent, options) {
 function agentCapabilitiesSnapshot(input) {
   return {
     agents: [
-      ...input.agents.map((agent) => agentCapabilityRow(agent, { executable: true, providerNames: input.providerNames })),
-      ...input.restrictedAgents.map((agent) => agentCapabilityRow(agent, { executable: false, providerNames: input.providerNames, restrictionSources: input.restrictedSources }))
+      ...input.agents.map((agent) => agentCapabilityRow(agent, { executable: true, providerNames: input.providerNames, externalCliAvailability: input.externalCliAvailability })),
+      ...input.restrictedAgents.map((agent) => agentCapabilityRow(agent, { executable: false, providerNames: input.providerNames, externalCliAvailability: input.externalCliAvailability, restrictionSources: input.restrictedSources }))
     ],
     restrictedCount: input.restrictedAgents.length,
     ...input.restrictedSources?.length ? { capabilityCeilingSources: [...input.restrictedSources] } : {}
@@ -818,6 +915,7 @@ function agentCapabilityDetails(input) {
       agents: input.agents,
       restrictedAgents: input.restrictedAgents,
       providerNames: input.providerNames,
+      externalCliAvailability: input.externalCliAvailability,
       restrictedSources: input.restrictedSources
     }))
   };
@@ -869,10 +967,10 @@ function formatAgentDetail(agent) {
     lines.push(`Aliases: ${agent.aliases.join(", ")}`);
   if (agent.model)
     lines.push(`Model: ${agent.model}`);
-  if (agent.fallbackModels?.length)
-    lines.push(`Fallback models: ${agent.fallbackModels.join(", ")}`);
   if (tools.length)
     lines.push(`Tools: ${tools.join(", ")}`);
+  if (agent.excludeTools?.length)
+    lines.push(`Excluded tools: ${agent.excludeTools.join(", ")}`);
   if (agent.skills?.length)
     lines.push(`Skills: ${agent.skills.join(", ")}`);
   if (agent.skillPath?.length)
@@ -919,8 +1017,6 @@ function formatAgentDetail(agent) {
     lines.push("Progress: true");
   if (agent.maxSubagentDepth !== undefined)
     lines.push(`Max subagent depth: ${agent.maxSubagentDepth}`);
-  if (agent.completionGuard === false)
-    lines.push("Completion guard: false");
   if (agent.toolBudget)
     lines.push(`Tool budget: ${JSON.stringify(agent.toolBudget)}`);
   if (agent.memory)
@@ -932,17 +1028,8 @@ function formatAgentDetail(agent) {
 }
 export function handleList(params, ctx) {
   const scope = normalizeListScope(params.agentScope) ?? "both";
-  const d = discoverAgentsAll(ctx.cwd, ctx.model?.provider);
-  let scopedAgents = mergeAgentsForScope(scope, d.user, d.project, d.builtin, d.package);
-  if (ctx.runtimeAgentOwner && listRuntimeAgentConfigs(ctx.runtimeAgentOwner).length > 0) {
-    const configuredAgents = [
-      ...d.builtin,
-      ...d.package,
-      ...d.user,
-      ...d.project
-    ];
-    scopedAgents = mergeRuntimeAgents(ctx.runtimeAgentOwner, { agents: scopedAgents }, configuredAgents).agents;
-  }
+  const d = discoverCatalog(ctx, ctx.cwd, ctx.model?.provider);
+  let scopedAgents = effectiveAgentsForScope(scope, d, ctx.runtimeAgentOwner, ctx.model?.provider);
   scopedAgents = scopedAgents.sort((a, b) => a.name.localeCompare(b.name));
   const capabilityCeiling = resolveCurrentSubagentCapabilityCeiling(ctx.currentSessionId);
   const visibleAgents = scopedAgents.filter((a) => !a.disabled);
@@ -957,7 +1044,8 @@ export function handleList(params, ctx) {
   const providerStatus = registeredExternalJobProviderStatus();
   const providerNameSet = providerNames(providerStatus);
   const capabilityMode = params.capabilities === true;
-  const formatLine = capabilityMode ? formatAgentCapabilitiesLine : formatAgentListLine;
+  const externalCliAvailability = capabilityMode ? externalCliAvailabilityForAgents([...agents, ...restrictedAgents]) : undefined;
+  const formatLine = capabilityMode ? (agent, names) => formatAgentCapabilitiesLine(agent, names, externalCliAvailability) : formatAgentListLine;
   const lines = [
     capabilityMode ? "Executable agents (capabilities):" : "Executable agents:",
     ...formatAgentListSections(agents, providerNameSet, formatLine)
@@ -973,6 +1061,7 @@ export function handleList(params, ctx) {
     agents,
     restrictedAgents,
     providerNames: providerNameSet,
+    externalCliAvailability: externalCliAvailability ?? new Map,
     restrictedSources
   }));
 }
@@ -984,78 +1073,91 @@ function formatModelSource(agent, currentModel) {
     return `${agent.modelSource.scope} defaultModel`;
   }
   if (agent.model)
-    return "builtin agent config";
+    return `${agent.source} agent config`;
   if (currentModel)
     return "inherits current session model";
   return "inherit requested, but no current session model is available";
 }
 function handleModels(params, ctx) {
   const requestedAgent = params.agent?.trim();
-  if (requestedAgent && !BUILTIN_AGENT_NAMES.includes(requestedAgent)) {
-    return result(`Builtin agent '${requestedAgent}' not found. Available: ${BUILTIN_AGENT_NAMES.join(", ")}.`, true);
-  }
-  const discovered = discoverAgentsAll(ctx.cwd, ctx.model?.provider);
-  const builtinByName = new Map(discovered.builtin.map((agent) => [agent.name, agent]));
-  const resolveBuiltinModelAgent = (name) => builtinByName.get(name) ?? resolveAgentName(name, discovered.builtin).agent;
+  const scope = normalizeListScope(params.agentScope);
+  if (!scope)
+    return result("agentScope must be 'user', 'project', or 'both' for models.", true);
+  const discovered = discoverCatalog(ctx, ctx.cwd, ctx.model?.provider);
+  const effectiveAgents = effectiveAgentsForScope(scope, discovered, ctx.runtimeAgentOwner, ctx.model?.provider).sort((a, b) => a.name.localeCompare(b.name));
   const availableModels = ctx.modelRegistry.getAvailable().map(toModelInfo);
   const currentModel = ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined;
   const preferredProvider = ctx.model?.provider;
-  const names = requestedAgent ? [requestedAgent] : [...BUILTIN_AGENT_NAMES];
+  const capabilityCeiling = resolveCurrentSubagentCapabilityCeiling(ctx.currentSessionId);
+  let selectedAgents = effectiveAgents;
   if (requestedAgent) {
-    const agent = resolveBuiltinModelAgent(requestedAgent);
-    if (!agent)
-      return result(`Builtin agent '${requestedAgent}' not found.`, true);
-    const resolvedModel = resolveSubagentModelOverride(agent.model, currentModel, availableModels, preferredProvider);
-    const lines = [
-      "Builtin subagent model",
-      "",
-      `Agent: ${requestedAgent}`,
-      "Effective model:",
-      `  ${resolvedModel ?? "(unresolved)"}`,
-      `Source: ${formatModelSource(agent, currentModel)}`
-    ];
-    if (agent.override) {
-      lines.push("Override file:");
-      lines.push(`  ${agent.override.path}`);
-    }
-    if (agent.model && resolvedModel && agent.model !== resolvedModel) {
-      lines.push("Requested model setting:");
-      lines.push(`  ${agent.model}`);
+    const matches = findAgentsInDiscovery(requestedAgent, discovered, scope, ctx.runtimeAgentOwner, ctx.model?.provider);
+    const diagnostics = diagnosticsForScope(discovered.agentDiagnostics, scope);
+    const normalizedName = sanitizeName(requestedAgent);
+    const diagnostic = findBlockingAgentDiagnostic(requestedAgent, matches, diagnostics) ?? (normalizedName !== requestedAgent ? findBlockingAgentDiagnostic(normalizedName, matches, diagnostics) : undefined);
+    if (diagnostic)
+      return result(`Agent '${params.agent}' has invalid configuration: ${diagnostic.error}`, true);
+    const distinctNames = [...new Set(matches.map((agent) => agent.name))];
+    if (distinctNames.length > 1)
+      return result(`Ambiguous agent alias or name '${params.agent}': ${distinctNames.sort((a, b) => a.localeCompare(b)).join(", ")}`, true);
+    if (!matches.length) {
+      return result(`Agent '${params.agent}' not found. Available: ${availableAgentNamesFromDiscovery(discovered, ctx.runtimeAgentOwner, ctx.model?.provider).join(", ") || "none"}.`, true);
     }
-    if (agent.disabled)
-      lines.push("Disabled: true");
-    lines.push("Current session model:");
-    lines.push(`  ${currentModel ? `${currentModel.provider}/${currentModel.id}` : "(unavailable)"}`);
-    return result(lines.join(`
-`));
+    selectedAgents = [matches[0]];
   }
   const lines = [
-    "Builtin subagent models",
+    requestedAgent ? "Subagent model" : "Subagent models",
     "",
-    "Current session model:",
-    `  ${currentModel ? `${currentModel.provider}/${currentModel.id}` : "(unavailable)"}`,
-    ""
+    ...requestedAgent ? [] : [
+      "Current session model:",
+      `  ${currentModel ? `${currentModel.provider}/${currentModel.id}` : "(unavailable)"}`,
+      ""
+    ]
   ];
-  for (const name of names) {
-    const agent = resolveBuiltinModelAgent(name);
-    if (!agent) {
-      lines.push(name);
-      lines.push("  model:");
-      lines.push("    (builtin definition not found)");
-      lines.push("  source: missing");
-      lines.push("");
-      continue;
+  const modelEntries = selectedAgents.flatMap((agent) => requestedAgent ? [{ agent, name: requestedAgent }] : [{ agent, name: agent.name }, ...(agent.aliases ?? []).map((name) => ({ agent, name }))]);
+  for (const { agent, name } of modelEntries) {
+    const resolvedModel = resolveSubagentModelOverride(agent.model, currentModel, availableModels, agent.modelProvider ?? preferredProvider);
+    const effectiveThinking = resolveEffectiveThinking(resolvedModel, agent.thinking) ?? (agent.thinking === false ? "off" : undefined);
+    const source = `${formatModelSource(agent, currentModel)}${agent.disabled ? "; disabled" : ""}${isAgentAllowedByCapabilityCeiling(agent.name, capabilityCeiling) ? "" : "; restricted"}`;
+    if (requestedAgent) {
+      lines.push(`Agent: ${requestedAgent}`);
+      lines.push("Effective model:");
+      lines.push(`  ${resolvedModel ?? "(unresolved)"}`);
+      lines.push(`Source: ${source}`);
+      lines.push(`Thinking: ${effectiveThinking ?? "default"}`);
+      if (agent.override) {
+        lines.push("Override file:");
+        lines.push(`  ${agent.override.path}`);
+      }
+      if (agent.model && resolvedModel && agent.model !== resolvedModel) {
+        lines.push("Requested model setting:");
+        lines.push(`  ${agent.model}`);
+      }
+      if (agent.disabled)
+        lines.push("Disabled: true");
+      if (!isAgentAllowedByCapabilityCeiling(agent.name, capabilityCeiling))
+        lines.push("Restricted: true");
+      lines.push("Current session model:");
+      lines.push(`  ${currentModel ? `${currentModel.provider}/${currentModel.id}` : "(unavailable)"}`);
+      break;
     }
-    const resolvedModel = resolveSubagentModelOverride(agent.model, currentModel, availableModels, preferredProvider);
-    const source = `${formatModelSource(agent, currentModel)}${agent.disabled ? "; disabled" : ""}`;
     lines.push(name);
     lines.push("  model:");
     lines.push(`    ${resolvedModel ?? "(unresolved)"}`);
     lines.push(`  source: ${source}`);
+    lines.push(`  thinking: ${effectiveThinking ?? "default"}`);
+    if (agent.override) {
+      lines.push("  override file:");
+      lines.push(`    ${agent.override.path}`);
+    }
+    if (agent.model && resolvedModel && agent.model !== resolvedModel) {
+      lines.push("  requested model setting:");
+      lines.push(`    ${agent.model}`);
+    }
     lines.push("");
   }
   const availableFullIds = availableModels.map((m) => m.fullId).sort();
-  if (availableFullIds.length > 0) {
+  if (!requestedAgent && availableFullIds.length > 0) {
     lines.push("Available models in this session's registry (copy an exact provider/id when passing model):");
     lines.push("");
     const shown = availableFullIds.slice(0, 80);
@@ -1066,6 +1168,8 @@ function handleModels(params, ctx) {
     lines.push("");
     lines.push("Use an exact provider/id from this list when you pass model; bare ids resolve only when unique in the registry.");
   }
+  if (!requestedAgent)
+    appendAgentDiagnosticLines(lines, diagnosticsForScope(discovered.agentDiagnostics, scope));
   return result(lines.join(`
 `));
 }
@@ -1075,7 +1179,7 @@ function handleGet(params, ctx) {
   const scope = normalizeListScope(params.agentScope);
   if (!scope)
     return result("agentScope must be 'user', 'project', or 'both' for get.", true);
-  const discovered = discoverAgentsAll(ctx.cwd, ctx.model?.provider);
+  const discovered = discoverCatalog(ctx, ctx.cwd, ctx.model?.provider);
   const matches = findAgentsInDiscovery(params.agent, discovered, scope);
   const diagnostics = diagnosticsForScope(discovered.agentDiagnostics, scope);
   const rawName = params.agent.trim();
@@ -1117,11 +1221,11 @@ export function handleCreate(params, ctx) {
   const scope = scopeRaw;
   if (hasKey(cfg, "steps"))
     return result("Durable chain definitions were removed; use workflowScript or /prompt-workflow for repeatable workflows.", true);
-  const d = discoverAgentsAll(ctx.cwd);
+  const d = discoverCatalog(ctx);
   const projectConfigDir = getProjectConfigDir(ctx.cwd);
   const targetDir = scope === "user" ? d.userDir : d.projectDir ?? path.join(projectConfigDir, "agents");
   fs.mkdirSync(targetDir, { recursive: true });
-  if (nameExistsInScope(ctx.cwd, scope, runtimeName))
+  if (nameExistsInScope(ctx, scope, runtimeName))
     return result(`Name '${runtimeName}' already exists in ${scope} scope. Use update instead.`, true);
   const targetPath = path.join(targetDir, `${runtimeName}.md`);
   if (fs.existsSync(targetPath))
@@ -1151,13 +1255,11 @@ export function handleCreate(params, ctx) {
   const mw = modelWarning(ctx, agent.model);
   if (mw)
     warnings.push(mw);
-  const fmw = fallbackModelsWarning(ctx, agent.fallbackModels);
-  if (fmw)
-    warnings.push(fmw);
   const sw = skillsWarning(ctx.cwd, agent);
   if (sw)
     warnings.push(sw);
   fs.writeFileSync(targetPath, serializeAgent(agent), "utf-8");
+  ctx.onAgentsChanged?.();
   return result([`Created agent '${runtimeName}' at ${targetPath}.`, ...warnings].join(`
 `));
 }
@@ -1174,7 +1276,7 @@ export function handleUpdate(params, ctx) {
     return result("Durable chain definitions were removed; use workflowScript or /prompt-workflow for repeatable workflows.", true);
   const warnings = [];
   const scopeHint = asDisambiguationScope(params.agentScope);
-  const targetOrError = resolveTarget(params.agent, findAgents(params.agent, ctx.cwd, scopeHint ?? "both"), ctx.cwd, scopeHint);
+  const targetOrError = resolveTarget(params.agent, findAgents(params.agent, ctx, scopeHint ?? "both"), ctx.cwd, ctx, scopeHint);
   if ("content" in targetOrError)
     return targetOrError;
   const target = targetOrError;
@@ -1225,23 +1327,19 @@ export function handleUpdate(params, ctx) {
     if (mw)
       warnings.push(mw);
   }
-  if (hasKey(cfg, "fallbackModels")) {
-    const fmw = fallbackModelsWarning(ctx, updated.fallbackModels);
-    if (fmw)
-      warnings.push(fmw);
-  }
   if (hasKey(cfg, "skills") || hasKey(cfg, "skillPath")) {
     const sw = skillsWarning(ctx.cwd, updated);
     if (sw)
       warnings.push(sw);
   }
   if (updated.name !== oldName) {
-    const renamed = renamePath(target.filePath, updated.name, target.source, ctx.cwd);
+    const renamed = renamePath(target.filePath, updated.name, target.source, ctx);
     if (renamed.error)
       return result(renamed.error, true);
     updated.filePath = renamed.filePath;
   }
   fs.writeFileSync(updated.filePath, serializeAgent(updated, { preserveFrontmatterFields }), "utf-8");
+  ctx.onAgentsChanged?.();
   const headline = updated.name === oldName ? `Updated agent '${updated.name}' at ${updated.filePath}.` : `Updated agent '${oldName}' to '${updated.name}' at ${updated.filePath}.`;
   return result([headline, ...warnings].join(`
 `));
@@ -1250,11 +1348,12 @@ function handleDelete(params, ctx) {
   if (!params.agent)
     return result("Specify 'agent' for delete.", true);
   const scopeHint = asDisambiguationScope(params.agentScope);
-  const targetOrError = resolveTarget(params.agent, findAgents(params.agent, ctx.cwd, scopeHint ?? "both"), ctx.cwd, scopeHint);
+  const targetOrError = resolveTarget(params.agent, findAgents(params.agent, ctx, scopeHint ?? "both"), ctx.cwd, ctx, scopeHint);
   if ("content" in targetOrError)
     return targetOrError;
   const target = targetOrError;
   fs.unlinkSync(target.filePath);
+  ctx.onAgentsChanged?.();
   return result(`Deleted agent '${target.name}' at ${target.filePath}.`);
 }
 function handleEject(params, ctx) {
@@ -1266,17 +1365,17 @@ function handleEject(params, ctx) {
   if (parsedScope.error)
     return parsedScope.error;
   const scope = parsedScope.scope;
-  const d = discoverAgentsAll(ctx.cwd);
+  const d = discoverCatalog(ctx);
   const source = [...d.package, ...d.builtin].find((a) => a.name === raw || a.name === sanitized);
   if (!source) {
-    return result(`Agent '${raw}' not found or is not a bundled/package agent. eject copies a builtin or package agent to ${scope} scope so it can be customized. Available: ${availableAgentNames(ctx.cwd).join(", ") || "none"}.`, true);
+    return result(`Agent '${raw}' not found or is not a bundled/package agent. eject copies a builtin or package agent to ${scope} scope so it can be customized. Available: ${availableAgentNames(ctx).join(", ") || "none"}.`, true);
   }
   const runtimeName = source.name;
   const existingCustom = (scope === "user" ? d.user : d.project).find((a) => a.name === runtimeName);
   if (existingCustom) {
     return result(`Agent '${runtimeName}' is already a custom ${scope} agent at ${existingCustom.filePath}. Edit it with { action: "update", agent: "${runtimeName}" } or delete it first.`, true);
   }
-  if (nameExistsInScope(ctx.cwd, scope, runtimeName)) {
+  if (nameExistsInScope(ctx, scope, runtimeName)) {
     return result(`An agent named '${runtimeName}' already exists in ${scope} scope. Remove or rename it first.`, true);
   }
   const projectConfigDir = getProjectConfigDir(ctx.cwd);
@@ -1294,6 +1393,7 @@ function handleEject(params, ctx) {
     return result(`Failed to read source agent at ${source.filePath}: ${message}`, true);
   }
   fs.writeFileSync(targetPath, content, "utf-8");
+  ctx.onAgentsChanged?.();
   return result(`Ejected agent '${runtimeName}' from ${source.source} to ${scope} scope at ${targetPath}. Edit it there to customize; it shadows the bundled ${source.source} agent of the same name.`);
 }
 function handleDisable(params, ctx) {
@@ -1304,7 +1404,7 @@ function handleDisable(params, ctx) {
   if (parsedScope.error)
     return parsedScope.error;
   const scope = parsedScope.scope;
-  const d = discoverAgentsAll(ctx.cwd);
+  const d = discoverCatalog(ctx);
   if (scope === "project" && d.projectSettingsPath === null) {
     return result("Project override is not available here: no project config root (.dm or .agents) was found above the cwd. Use agentScope: 'user' or run from inside a project.", true);
   }
@@ -1312,12 +1412,13 @@ function handleDisable(params, ctx) {
   if (effective.error)
     return result(effective.error, true);
   if (!effective.agent) {
-    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx.cwd).join(", ") || "none"}.`, true);
+    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx).join(", ") || "none"}.`, true);
   }
   const runtimeName = effective.agent.name;
   const settingsPath = mergeBuiltinAgentOverride(ctx.cwd, runtimeName, scope, { disabled: true });
-  const after = resolveEffectiveAgent(discoverAgentsAll(ctx.cwd), raw).agent;
+  const after = resolveEffectiveAgent(discoverCatalog(ctx), raw).agent;
   if (after?.disabled === true) {
+    ctx.onAgentsChanged?.();
     return result(`Disabled agent '${runtimeName}' via ${scope} settings override at ${settingsPath}. It is now hidden from runtime discovery and { action: "list" }.`);
   }
   return result(`Wrote a disabled override for '${runtimeName}' at ${settingsPath}, but the agent is still enabled. A higher-precedence ${after?.override?.scope ?? "project"} override is likely winning. Try agentScope: '${after?.override?.scope ?? "project"}'.`, true);
@@ -1330,7 +1431,7 @@ function handleEnable(params, ctx) {
   if (parsedScope.error)
     return parsedScope.error;
   const scope = parsedScope.scope;
-  const d = discoverAgentsAll(ctx.cwd);
+  const d = discoverCatalog(ctx);
   if (scope === "project" && d.projectSettingsPath === null) {
     return result("Project override is not available here: no project config root (.dm or .agents) was found above the cwd. Use agentScope: 'user' or run from inside a project.", true);
   }
@@ -1338,12 +1439,14 @@ function handleEnable(params, ctx) {
   if (effective.error)
     return result(effective.error, true);
   if (!effective.agent) {
-    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx.cwd).join(", ") || "none"}.`, true);
+    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx).join(", ") || "none"}.`, true);
   }
   const runtimeName = effective.agent.name;
   const { path: settingsPath, removed } = removeBuiltinAgentOverrideFields(ctx.cwd, runtimeName, scope, ["disabled"]);
-  const after = resolveEffectiveAgent(discoverAgentsAll(ctx.cwd), raw).agent;
+  const after = resolveEffectiveAgent(discoverCatalog(ctx), raw).agent;
   if (after && after.disabled !== true) {
+    if (removed)
+      ctx.onAgentsChanged?.();
     if (removed)
       return result(`Enabled agent '${runtimeName}' (removed disabled override at ${settingsPath}).`);
     return result(`Agent '${runtimeName}' is already enabled.`);
@@ -1362,7 +1465,7 @@ function handleReset(params, ctx) {
   if (parsedScope.error)
     return parsedScope.error;
   const scope = parsedScope.scope;
-  const d = discoverAgentsAll(ctx.cwd);
+  const d = discoverCatalog(ctx);
   if (scope === "project" && d.projectSettingsPath === null) {
     return result("Project override is not available here: no project config root (.dm or .agents) was found above the cwd. Use agentScope: 'user' or run from inside a project.", true);
   }
@@ -1372,7 +1475,7 @@ function handleReset(params, ctx) {
     if (custom) {
       return result(`Agent '${raw}' has no bundled default to reset to. Use { action: "delete", agent: "${custom.name}" } to remove the custom ${custom.source} agent.`, true);
     }
-    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx.cwd).join(", ") || "none"}.`, true);
+    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx).join(", ") || "none"}.`, true);
   }
   const runtimeName = bundled.name;
   const custom = (scope === "user" ? d.user : d.project).find((a) => a.name === raw || a.name === sanitized);
@@ -1381,9 +1484,9 @@ function handleReset(params, ctx) {
     fs.unlinkSync(custom.filePath);
     lines.push(`Deleted custom ${scope} agent file at ${custom.filePath}.`);
   }
-  const overrideRemoval = removeBuiltinAgentOverride(ctx.cwd, runtimeName, scope);
+  const overrideRemoval = removeBuiltinAgentOverride(ctx.cwd, runtimeName, scope, { preserveMachine: true });
   if (overrideRemoval.removed)
-    lines.push(`Removed ${scope} settings override at ${overrideRemoval.path}.`);
+    lines.push(`${overrideRemoval.machinePreserved ? "Cleared customization in" : "Removed"} ${scope} settings override at ${overrideRemoval.path}.${overrideRemoval.machinePreserved ? " Retained machine placement." : ""}`);
   if (lines.length === 0) {
     const otherScope = scope === "user" ? "project" : "user";
     const otherCustom = (otherScope === "user" ? d.user : d.project).find((a) => a.name === raw || a.name === sanitized);
@@ -1392,6 +1495,7 @@ function handleReset(params, ctx) {
     return result(`Agent '${runtimeName}' has no ${scope} customization to reset.${note} It is at its bundled ${bundled.source} default.`);
   }
   lines.push(`Reset agent '${runtimeName}' to its bundled ${bundled.source} default.`);
+  ctx.onAgentsChanged?.();
   return result(lines.join(`
 `));
 }