@duckmind/dm-windows-x64 0.61.5 → 0.62.1

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

@@ -7,25 +7,40 @@ import {
   defaultSystemPromptMode,
   discoverAgentsAll,
   buildRuntimeName,
+  findBlockingAgentDiagnostic,
   frontmatterNameForConfig,
   parsePackageName,
   mergeBuiltinAgentOverride,
   removeBuiltinAgentOverride,
-  removeBuiltinAgentOverrideFields
+  removeBuiltinAgentOverrideFields,
+  resolveAgentName
 } from "./agents.js";
 import { serializeAgent } from "./agent-serializer.js";
-import { serializeChain, serializeJsonChain } from "./chain-serializer.js";
-import { discoverAvailableSkills } from "./skills.js";
+import { mergeAgentsForScope } from "./agent-selection.js";
+import { discoverAvailableSkills, resolveSkills } from "./skills.js";
 import {
   buildProactiveSkillSubagentRecommendationLines
 } from "./proactive-skills.js";
-import { parseFrontmatter } from "./frontmatter.js";
+import { parseFrontmatter, parseFrontmatterList } from "./frontmatter.js";
 import { toModelInfo } from "../shared/model-info.js";
 import { resolveSubagentModelOverride } from "../runs/shared/model-fallback.js";
 import { validateToolBudgetConfig } from "../runs/shared/tool-budget.js";
+import { validateAcceptanceInput } from "../runs/shared/acceptance.js";
+import { CODE_OWNED_EXTERNAL_CLI_ADAPTER_LABEL, isCodeOwnedExternalCliAdapterId, resolveExternalCliRunnerStatus, validateCodeOwnedProfileRunner } from "../runs/shared/external-cli-contract.js";
 import { getProjectConfigDir } from "../shared/utils.js";
-function result(text, isError = false) {
-  return { content: [{ type: "text", text }], isError, details: { mode: "management", results: [] } };
+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 { listExternalJobProviders } from "../api/external-job-provider.js";
+function result(text, isError = false, details) {
+  return { content: [{ type: "text", text }], isError, details: { mode: "management", results: [], ...details } };
+}
+function jsonDetails(value) {
+  return JSON.parse(JSON.stringify(value));
+}
+function presentDetails(value) {
+  const cleaned = jsonDetails(value);
+  return Object.keys(cleaned).length > 0 ? cleaned : undefined;
 }
 function parseCsv(value) {
   return [...new Set(value.split(",").map((v) => v.trim()).filter(Boolean))];
@@ -37,16 +52,27 @@ function configObject(config) {
       val = JSON.parse(val);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      return { error: `config must be valid JSON: ${message}` };
+      return { status: "error", message: `config must be valid JSON: ${message}` };
     }
   }
   if (!val || typeof val !== "object" || Array.isArray(val))
-    return {};
-  return { value: val };
+    return { status: "missing" };
+  return { status: "ok", value: val };
 }
 function hasKey(obj, key) {
   return Object.prototype.hasOwnProperty.call(obj, key);
 }
+function isJsonSerializable(value) {
+  if (value === null || typeof value === "string" || typeof value === "boolean")
+    return true;
+  if (typeof value === "number")
+    return Number.isFinite(value);
+  if (Array.isArray(value))
+    return value.every(isJsonSerializable);
+  if (value && typeof value === "object")
+    return Object.values(value).every(isJsonSerializable);
+  return false;
+}
 function asDisambiguationScope(scope) {
   if (scope === "user" || scope === "project")
     return scope;
@@ -74,30 +100,48 @@ function parsePackageConfig(value) {
 function allAgents(d) {
   return [...d.builtin, ...d.package, ...d.user, ...d.project];
 }
-function availableNames(cwd, kind) {
-  const d = discoverAgentsAll(cwd);
-  const items = kind === "agent" ? allAgents(d) : d.chains;
-  return [...new Set(items.map((x) => x.name))].sort((a, b) => a.localeCompare(b));
+function availableAgentNamesFromDiscovery(d) {
+  return [...new Set(allAgents(d).map((agent) => agent.name))].sort((a, b) => a.localeCompare(b));
 }
-function findAgents(name, cwd, scope = "both") {
-  const d = discoverAgentsAll(cwd);
-  const raw = name.trim();
-  const sanitized = sanitizeName(raw);
-  return allAgents(d).filter((a) => (scope === "both" || a.source === scope) && (a.name === raw || a.name === sanitized)).sort((a, b) => a.source.localeCompare(b.source));
+function availableAgentNames(cwd) {
+  return availableAgentNamesFromDiscovery(discoverAgentsAll(cwd));
 }
-function findChains(name, cwd, scope = "both") {
+function findAgentsInDiscovery(name, d, scope = "both") {
   const raw = name.trim();
   const sanitized = sanitizeName(raw);
-  return discoverAgentsAll(cwd).chains.filter((c) => (scope === "both" || c.source === scope) && (c.name === raw || c.name === sanitized)).sort((a, b) => a.source.localeCompare(b.source));
+  const scoped = mergeAgentsForScope(scope, d.user, d.project, d.builtin, d.package);
+  let resolved = resolveAgentName(raw, scoped);
+  if (!resolved.agent && !resolved.error && sanitized !== raw)
+    resolved = resolveAgentName(sanitized, scoped);
+  if (resolved.agent)
+    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 diagnosticsForScope(diagnostics, scope) {
+  if (scope === "both")
+    return diagnostics;
+  const excludedSource = scope === "user" ? "project" : "user";
+  return diagnostics?.filter((diagnostic) => diagnostic.source !== excludedSource);
 }
-const AGENT_SOURCE_PRECEDENCE = { builtin: 0, package: 1, user: 2, project: 3 };
-function pickEffectiveAgent(d, name) {
+const AGENT_SOURCE_PRECEDENCE = { builtin: 0, package: 1, user: 2, project: 3, runtime: 4 };
+function resolveEffectiveAgent(d, name) {
   const raw = name.trim();
-  const sanitized = sanitizeName(raw);
-  const matches = allAgents(d).filter((a) => a.name === raw || a.name === sanitized);
-  if (matches.length === 0)
-    return;
-  return matches.reduce((best, agent) => AGENT_SOURCE_PRECEDENCE[agent.source] > AGENT_SOURCE_PRECEDENCE[best.source] ? agent : best);
+  const candidates = allAgents(d);
+  let resolved = resolveAgentName(raw, candidates);
+  if (!resolved.agent && !resolved.error) {
+    const sanitized = sanitizeName(raw);
+    if (sanitized !== raw)
+      resolved = resolveAgentName(sanitized, candidates);
+  }
+  if (resolved.error)
+    return { error: resolved.error };
+  if (!resolved.agent)
+    return {};
+  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);
@@ -105,43 +149,18 @@ function nameExistsInScope(cwd, scope, name, excludePath) {
     if (a.name === name && a.filePath !== excludePath)
       return true;
   }
-  for (const c of d.chains) {
-    if (c.source === scope && c.name === name && c.filePath !== excludePath)
-      return true;
-  }
   return false;
 }
 function isMutableSource(source) {
   return source === "user" || source === "project";
 }
-function unknownChainAgents(cwd, steps) {
-  const d = discoverAgentsAll(cwd);
-  const known = new Set(allAgents(d).map((a) => a.name));
-  return [...new Set(steps.map((s) => s.agent).filter((a) => !known.has(a)))].sort((a, b) => a.localeCompare(b));
-}
-function chainStepWarnings(ctx, steps) {
-  const warnings = [];
-  const available = new Set(discoverAvailableSkills(ctx.cwd).map((s) => s.name));
-  for (let i = 0;i < steps.length; i++) {
-    const s = steps[i];
-    if (s.model) {
-      const found = ctx.modelRegistry.getAvailable().some((m) => `${m.provider}/${m.id}` === s.model || m.id === s.model);
-      if (!found)
-        warnings.push(`Warning: step ${i + 1} (${s.agent}): model '${s.model}' is not in the current model registry.`);
-    }
-    if (Array.isArray(s.skills) && s.skills.length > 0) {
-      const missing = s.skills.filter((sk) => !available.has(sk));
-      if (missing.length)
-        warnings.push(`Warning: step ${i + 1} (${s.agent}): skills not found: ${missing.join(", ")}.`);
-    }
-  }
-  return warnings;
-}
 function modelWarning(ctx, model) {
   if (!model)
     return;
   const found = ctx.modelRegistry.getAvailable().some((m) => `${m.provider}/${m.id}` === model || m.id === model);
-  return found ? undefined : `Warning: model '${model}' is not in the current model registry.`;
+  if (found)
+    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)
@@ -150,35 +169,80 @@ function fallbackModelsWarning(ctx, fallbackModels) {
   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, skills) {
-  if (!skills || skills.length === 0)
+function skillsWarning(cwd, agent) {
+  if (!agent.skills?.length)
     return;
-  const available = new Set(discoverAvailableSkills(cwd).map((s) => s.name));
-  const missing = skills.filter((s) => !available.has(s));
+  const { missing } = resolveSkills(agent.skills, cwd, agent.skillPath, agent.filePath ? path.dirname(agent.filePath) : cwd);
   return missing.length ? `Warning: skills not found: ${missing.join(", ")}.` : undefined;
 }
-function editableAgentConfig(agent) {
-  const base = agent.override?.base;
-  if (!base)
-    return { ...agent };
+function withDeclaredExtensionPaths(config, filePath) {
+  const { frontmatter } = parseFrontmatter(fs.readFileSync(filePath, "utf-8"));
+  const { extensions: _extensions, subagentOnlyExtensions: _subagentOnlyExtensions, ...withoutResolvedExtensions } = config;
   return {
-    ...agent,
-    model: base.model,
-    fallbackModels: base.fallbackModels ? [...base.fallbackModels] : undefined,
-    thinking: base.thinking,
+    ...withoutResolvedExtensions,
+    ...frontmatter.extensions !== undefined ? { extensions: parseFrontmatterList(frontmatter.extensions) } : {},
+    ...frontmatter.subagentOnlyExtensions !== undefined ? { subagentOnlyExtensions: parseFrontmatterList(frontmatter.subagentOnlyExtensions) } : {}
+  };
+}
+export function editableAgentConfig(agent) {
+  const { extensions: _extensions, ...withoutExtensions } = agent;
+  const base = agent.override?.base;
+  const {
+    override: _override,
+    output: _output,
+    outputMode: _outputMode,
+    defaultReads: _defaultReads,
+    model: _model,
+    fallbackModels: _fallbackModels,
+    thinking: _thinking,
+    systemPromptMode: _systemPromptMode,
+    inheritProjectContext: _inheritProjectContext,
+    inheritGlobalContext: _inheritGlobalContext,
+    inheritSkills: _inheritSkills,
+    defaultContext: _defaultContext,
+    acceptanceRole: _acceptanceRole,
+    disabled: _disabled,
+    systemPrompt: _systemPrompt,
+    skills: _skills,
+    skillPath: _skillPath,
+    tools: _tools,
+    mcpDirectTools: _mcpDirectTools,
+    subagentOnlyExtensions: _subagentOnlyExtensions,
+    mutationTools: _mutationTools,
+    completionGuard: _completionGuard,
+    ...editable
+  } = withoutExtensions;
+  if (!base) {
+    return withDeclaredExtensionPaths({
+      ...withoutExtensions,
+      ...agent.extensionsFromDefault ? {} : agent.extensions !== undefined ? { extensions: [...agent.extensions] } : {}
+    }, agent.filePath);
+  }
+  return withDeclaredExtensionPaths({
+    ...editable,
+    ...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 } : {},
     systemPromptMode: base.systemPromptMode,
     inheritProjectContext: base.inheritProjectContext,
+    inheritGlobalContext: base.inheritGlobalContext,
     inheritSkills: base.inheritSkills,
-    defaultContext: base.defaultContext,
-    disabled: base.disabled,
+    ...base.defaultContext !== undefined ? { defaultContext: base.defaultContext } : {},
+    ...base.acceptanceRole !== undefined ? { acceptanceRole: base.acceptanceRole } : {},
+    ...base.disabled !== undefined ? { disabled: base.disabled } : {},
     systemPrompt: base.systemPrompt,
-    skills: base.skills ? [...base.skills] : undefined,
-    tools: base.tools ? [...base.tools] : undefined,
-    mcpDirectTools: base.mcpDirectTools ? [...base.mcpDirectTools] : undefined,
-    subagentOnlyExtensions: base.subagentOnlyExtensions ? [...base.subagentOnlyExtensions] : undefined,
-    completionGuard: base.completionGuard,
-    override: undefined
-  };
+    ...base.skills !== undefined ? { skills: [...base.skills] } : {},
+    ...base.skillPath !== undefined ? { skillPath: [...base.skillPath] } : {},
+    ...base.tools !== undefined ? { tools: [...base.tools] } : {},
+    ...base.mcpDirectTools !== undefined ? { mcpDirectTools: [...base.mcpDirectTools] } : {},
+    ...base.extensions !== undefined ? { extensions: [...base.extensions] } : {},
+    ...base.subagentOnlyExtensions !== undefined ? { subagentOnlyExtensions: [...base.subagentOnlyExtensions] } : {},
+    ...base.mutationTools !== undefined ? { mutationTools: [...base.mutationTools] } : {},
+    ...base.completionGuard !== undefined ? { completionGuard: base.completionGuard } : {}
+  }, agent.filePath);
 }
 function readAgentFrontmatterFields(filePath) {
   try {
@@ -188,7 +252,7 @@ function readAgentFrontmatterFields(filePath) {
     return new Set;
   }
 }
-function preservedAgentFrontmatterFields(agent, cfg) {
+export function preservedAgentFrontmatterFields(agent, cfg) {
   const fields = readAgentFrontmatterFields(agent.filePath);
   const changed = (...names) => {
     for (const name of names)
@@ -200,8 +264,12 @@ function preservedAgentFrontmatterFields(agent, cfg) {
     changed("package");
   if (hasKey(cfg, "description"))
     changed("description");
+  if (hasKey(cfg, "aliases"))
+    changed("alias", "aliases");
   if (hasKey(cfg, "systemPrompt"))
     changed("systemPrompt");
+  if (hasKey(cfg, "runner"))
+    changed("runner");
   if (hasKey(cfg, "model"))
     changed("model");
   if (hasKey(cfg, "fallbackModels"))
@@ -210,10 +278,14 @@ function preservedAgentFrontmatterFields(agent, cfg) {
     changed("tools");
   if (hasKey(cfg, "skills"))
     changed("skill", "skills");
+  if (hasKey(cfg, "skillPath"))
+    changed("skillPath");
   if (hasKey(cfg, "extensions"))
     changed("extensions");
   if (hasKey(cfg, "subagentOnlyExtensions"))
     changed("subagentOnlyExtensions");
+  if (hasKey(cfg, "mutationTools"))
+    changed("mutationTools");
   if (hasKey(cfg, "thinking")) {
     changed("thinking");
     if (cfg.thinking === "off")
@@ -227,14 +299,28 @@ function preservedAgentFrontmatterFields(agent, cfg) {
     changed("inheritProjectContext");
     fields.add("inheritProjectContext");
   }
+  if (hasKey(cfg, "inheritGlobalContext")) {
+    changed("inheritGlobalContext");
+    fields.add("inheritGlobalContext");
+  }
   if (hasKey(cfg, "inheritSkills")) {
     changed("inheritSkills");
     fields.add("inheritSkills");
   }
   if (hasKey(cfg, "defaultContext"))
     changed("defaultContext");
+  if (hasKey(cfg, "async"))
+    changed("async");
+  if (hasKey(cfg, "timeoutMs"))
+    changed("timeoutMs");
+  if (hasKey(cfg, "acceptance"))
+    changed("acceptance");
+  if (hasKey(cfg, "acceptanceRole"))
+    changed("acceptanceRole");
   if (hasKey(cfg, "output"))
     changed("output");
+  if (hasKey(cfg, "outputMode"))
+    changed("outputMode");
   if (hasKey(cfg, "reads"))
     changed("defaultReads");
   if (hasKey(cfg, "progress"))
@@ -250,96 +336,6 @@ function preservedAgentFrontmatterFields(agent, cfg) {
     changed("toolBudget");
   return fields;
 }
-function parseStepList(raw) {
-  if (!Array.isArray(raw))
-    return { error: "config.steps must be an array." };
-  if (raw.length === 0)
-    return { error: "config.steps must include at least one step." };
-  const steps = [];
-  for (let i = 0;i < raw.length; i++) {
-    const item = raw[i];
-    if (!item || typeof item !== "object" || Array.isArray(item))
-      return { error: `config.steps[${i}] must be an object.` };
-    const s = item;
-    if (typeof s.agent !== "string" || !s.agent.trim())
-      return { error: `config.steps[${i}].agent must be a non-empty string.` };
-    const step = { agent: s.agent.trim(), task: typeof s.task === "string" ? s.task : "" };
-    if (hasKey(s, "phase")) {
-      if (typeof s.phase === "string")
-        step.phase = s.phase;
-      else
-        return { error: `config.steps[${i}].phase must be a string.` };
-    }
-    if (hasKey(s, "label")) {
-      if (typeof s.label === "string")
-        step.label = s.label;
-      else
-        return { error: `config.steps[${i}].label must be a string.` };
-    }
-    if (hasKey(s, "as")) {
-      if (typeof s.as === "string")
-        step.as = s.as;
-      else
-        return { error: `config.steps[${i}].as must be a string.` };
-    }
-    if (hasKey(s, "outputSchema")) {
-      if (typeof s.outputSchema === "string")
-        step.outputSchema = s.outputSchema;
-      else
-        return { error: `config.steps[${i}].outputSchema must be a schema file path string for saved chains.` };
-    }
-    if (hasKey(s, "output")) {
-      if (s.output === false)
-        step.output = false;
-      else if (typeof s.output === "string")
-        step.output = s.output;
-      else
-        return { error: `config.steps[${i}].output must be a string or false.` };
-    }
-    if (hasKey(s, "outputMode")) {
-      if (s.outputMode === "inline" || s.outputMode === "file-only")
-        step.outputMode = s.outputMode;
-      else
-        return { error: `config.steps[${i}].outputMode must be 'inline' or 'file-only'.` };
-    }
-    if (hasKey(s, "reads")) {
-      if (s.reads === false)
-        step.reads = false;
-      else if (Array.isArray(s.reads))
-        step.reads = s.reads.filter((v) => typeof v === "string").map((v) => v.trim()).filter(Boolean);
-      else
-        return { error: `config.steps[${i}].reads must be an array or false.` };
-    }
-    if (hasKey(s, "model")) {
-      if (typeof s.model === "string")
-        step.model = s.model;
-      else
-        return { error: `config.steps[${i}].model must be a string.` };
-    }
-    if (hasKey(s, "skills")) {
-      if (s.skills === false)
-        step.skills = false;
-      else if (Array.isArray(s.skills))
-        step.skills = s.skills.filter((v) => typeof v === "string").map((v) => v.trim()).filter(Boolean);
-      else
-        return { error: `config.steps[${i}].skills must be an array or false.` };
-    }
-    if (hasKey(s, "progress")) {
-      if (typeof s.progress === "boolean")
-        step.progress = s.progress;
-      else
-        return { error: `config.steps[${i}].progress must be a boolean.` };
-    }
-    if (hasKey(s, "toolBudget")) {
-      const validation = validateToolBudgetConfig(s.toolBudget, `config.steps[${i}].toolBudget`);
-      if (validation.error)
-        return { error: validation.error };
-      step.toolBudget = s.toolBudget;
-    }
-    steps.push(step);
-  }
-  return { steps };
-}
 function parseTools(raw) {
   const tools = [];
   const mcpDirectTools = [];
@@ -351,9 +347,30 @@ function parseTools(raw) {
     } else
       tools.push(item);
   }
-  return { tools: tools.length ? tools : undefined, mcpDirectTools: mcpDirectTools.length ? mcpDirectTools : undefined };
+  return {
+    ...tools.length ? { tools } : {},
+    ...mcpDirectTools.length ? { mcpDirectTools } : {}
+  };
 }
 function applyAgentConfig(target, cfg) {
+  if (hasKey(cfg, "aliases")) {
+    if (cfg.aliases === false || cfg.aliases === "")
+      delete target.aliases;
+    else if (typeof cfg.aliases === "string") {
+      const aliases = parseCsv(cfg.aliases).filter((alias) => alias !== target.name);
+      if (aliases.length)
+        target.aliases = aliases;
+      else
+        delete target.aliases;
+    } else if (Array.isArray(cfg.aliases) && cfg.aliases.every((entry) => typeof entry === "string")) {
+      const aliases = [...new Set(cfg.aliases.map((entry) => entry.trim()).filter(Boolean).filter((alias) => alias !== target.name))];
+      if (aliases.length)
+        target.aliases = aliases;
+      else
+        delete target.aliases;
+    } else
+      return "config.aliases must be a comma-separated string, string array, or false when provided.";
+  }
   if (hasKey(cfg, "systemPrompt")) {
     if (cfg.systemPrompt === false || cfg.systemPrompt === "")
       target.systemPrompt = "";
@@ -362,49 +379,103 @@ function applyAgentConfig(target, cfg) {
     else
       return "config.systemPrompt must be a string or false when provided.";
   }
+  if (hasKey(cfg, "runner")) {
+    if (cfg.runner === false || cfg.runner === "")
+      delete target.runner;
+    else if (cfg.runner && typeof cfg.runner === "object" && !Array.isArray(cfg.runner)) {
+      const runner = cfg.runner;
+      if (runner.type === "dm" && Object.keys(runner).every((key) => key === "type"))
+        target.runner = { type: "dm" };
+      else if (runner.type === "external-cli" && typeof runner.command === "string" && runner.command.trim() && (runner.args === undefined || Array.isArray(runner.args) && runner.args.every((arg) => typeof arg === "string")) && (runner.adapter === undefined || isCodeOwnedExternalCliAdapterId(runner.adapter)) && (runner.adapter === undefined || runner.args === undefined || runner.args.length === 0) && (runner.promptDelivery === undefined || runner.promptDelivery === "stdin") && Object.keys(runner).every((key) => ["type", "adapter", "command", "args", "promptDelivery"].includes(key))) {
+        const runnerArgs = Array.isArray(runner.args) ? runner.args.filter((arg) => typeof arg === "string") : undefined;
+        target.runner = { type: "external-cli", ...isCodeOwnedExternalCliAdapterId(runner.adapter) ? { adapter: runner.adapter } : {}, command: runner.command.trim(), ...runnerArgs?.length ? { args: runnerArgs } : {}, ...runner.promptDelivery ? { promptDelivery: "stdin" } : {} };
+      } else if (runner.type === "external-job" && typeof runner.provider === "string" && runner.provider.trim() === runner.provider && runner.provider && (runner.options === undefined || runner.options && typeof runner.options === "object" && !Array.isArray(runner.options) && isJsonSerializable(runner.options)) && Object.keys(runner).every((key) => ["type", "provider", "options"].includes(key))) {
+        target.runner = { type: "external-job", provider: runner.provider, ...runner.options ? { options: runner.options } : {} };
+      } else
+        return `config.runner must be { type: 'dm' }, { type: 'external-cli', adapter?: ${CODE_OWNED_EXTERNAL_CLI_ADAPTER_LABEL}, command: string, args?: string[], promptDelivery?: 'stdin' }, or { type: 'external-job', provider: string, options?: object }.`;
+    } else
+      return "config.runner must be an object, false, or empty string when provided.";
+  }
   if (hasKey(cfg, "model")) {
     if (cfg.model === false || cfg.model === "")
-      target.model = undefined;
-    else if (typeof cfg.model === "string")
-      target.model = cfg.model.trim() || undefined;
-    else
+      delete target.model;
+    else if (typeof cfg.model === "string") {
+      const model = cfg.model.trim();
+      if (model)
+        target.model = model;
+      else
+        delete target.model;
+    } else
       return "config.model must be a string or false when provided.";
   }
   if (hasKey(cfg, "fallbackModels")) {
     if (cfg.fallbackModels === false || cfg.fallbackModels === "")
-      target.fallbackModels = undefined;
+      delete target.fallbackModels;
     else if (typeof cfg.fallbackModels === "string") {
       const models = parseCsv(cfg.fallbackModels);
-      target.fallbackModels = models.length ? models : undefined;
+      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);
-      target.fallbackModels = models.length ? [...new Set(models)] : undefined;
+      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, "tools")) {
     if (cfg.tools === false || cfg.tools === "") {
-      target.tools = undefined;
-      target.mcpDirectTools = undefined;
+      delete target.tools;
+      delete target.mcpDirectTools;
     } else if (typeof cfg.tools === "string") {
       const parsed = parseTools(cfg.tools);
-      target.tools = parsed.tools;
-      target.mcpDirectTools = parsed.mcpDirectTools;
+      if (parsed.tools)
+        target.tools = parsed.tools;
+      else
+        delete target.tools;
+      if (parsed.mcpDirectTools)
+        target.mcpDirectTools = parsed.mcpDirectTools;
+      else
+        delete target.mcpDirectTools;
     } else
       return "config.tools must be a comma-separated string or false when provided.";
   }
   if (hasKey(cfg, "skills")) {
     if (cfg.skills === false || cfg.skills === "")
-      target.skills = undefined;
+      delete target.skills;
     else if (typeof cfg.skills === "string") {
       const skills = parseCsv(cfg.skills);
-      target.skills = skills.length ? skills : undefined;
+      if (skills.length)
+        target.skills = skills;
+      else
+        delete target.skills;
     } else
       return "config.skills must be a comma-separated string or false when provided.";
   }
+  if (hasKey(cfg, "skillPath")) {
+    if (cfg.skillPath === false || cfg.skillPath === "")
+      delete target.skillPath;
+    else if (typeof cfg.skillPath === "string") {
+      const skillPath = parseCsv(cfg.skillPath);
+      if (skillPath.length)
+        target.skillPath = skillPath;
+      else
+        delete target.skillPath;
+    } else if (Array.isArray(cfg.skillPath) && cfg.skillPath.every((entry) => typeof entry === "string")) {
+      const skillPath = [...new Set(cfg.skillPath.map((entry) => entry.trim()).filter(Boolean))];
+      if (skillPath.length)
+        target.skillPath = skillPath;
+      else
+        delete target.skillPath;
+    } else
+      return "config.skillPath must be a comma-separated string, string array, or false when provided.";
+  }
   if (hasKey(cfg, "extensions")) {
     if (cfg.extensions === false)
-      target.extensions = undefined;
+      delete target.extensions;
     else if (cfg.extensions === "")
       target.extensions = [];
     else if (typeof cfg.extensions === "string")
@@ -414,7 +485,7 @@ function applyAgentConfig(target, cfg) {
   }
   if (hasKey(cfg, "subagentOnlyExtensions")) {
     if (cfg.subagentOnlyExtensions === false)
-      target.subagentOnlyExtensions = undefined;
+      delete target.subagentOnlyExtensions;
     else if (cfg.subagentOnlyExtensions === "")
       target.subagentOnlyExtensions = [];
     else if (typeof cfg.subagentOnlyExtensions === "string")
@@ -422,12 +493,26 @@ function applyAgentConfig(target, cfg) {
     else
       return "config.subagentOnlyExtensions must be a comma-separated string, empty string, or false when provided.";
   }
+  if (hasKey(cfg, "mutationTools")) {
+    if (cfg.mutationTools === false)
+      delete target.mutationTools;
+    else if (cfg.mutationTools === "")
+      target.mutationTools = [];
+    else if (typeof cfg.mutationTools === "string")
+      target.mutationTools = parseCsv(cfg.mutationTools);
+    else
+      return "config.mutationTools must be a comma-separated string, empty string, or false when provided.";
+  }
   if (hasKey(cfg, "thinking")) {
     if (cfg.thinking === false || cfg.thinking === "")
-      target.thinking = undefined;
-    else if (typeof cfg.thinking === "string")
-      target.thinking = cfg.thinking.trim() || undefined;
-    else
+      delete target.thinking;
+    else if (typeof cfg.thinking === "string") {
+      const thinking = cfg.thinking.trim();
+      if (thinking)
+        target.thinking = thinking;
+      else
+        delete target.thinking;
+    } else
       return "config.thinking must be a string or false when provided.";
   }
   if (hasKey(cfg, "systemPromptMode")) {
@@ -441,6 +526,11 @@ function applyAgentConfig(target, cfg) {
       return "config.inheritProjectContext must be a boolean when provided.";
     target.inheritProjectContext = cfg.inheritProjectContext;
   }
+  if (hasKey(cfg, "inheritGlobalContext")) {
+    if (typeof cfg.inheritGlobalContext !== "boolean")
+      return "config.inheritGlobalContext must be a boolean when provided.";
+    target.inheritGlobalContext = cfg.inheritGlobalContext;
+  }
   if (hasKey(cfg, "inheritSkills")) {
     if (typeof cfg.inheritSkills !== "boolean")
       return "config.inheritSkills must be a boolean when provided.";
@@ -448,26 +538,69 @@ function applyAgentConfig(target, cfg) {
   }
   if (hasKey(cfg, "defaultContext")) {
     if (cfg.defaultContext === false || cfg.defaultContext === "")
-      target.defaultContext = undefined;
+      delete target.defaultContext;
     else if (cfg.defaultContext === "fresh" || cfg.defaultContext === "fork")
       target.defaultContext = cfg.defaultContext;
     else
       return "config.defaultContext must be 'fresh', 'fork', or false when provided.";
   }
+  if (hasKey(cfg, "async")) {
+    if (cfg.async === "")
+      delete target.defaultAsync;
+    else if (typeof cfg.async === "boolean")
+      target.defaultAsync = cfg.async;
+    else
+      return "config.async must be a boolean or empty string when provided.";
+  }
+  if (hasKey(cfg, "timeoutMs")) {
+    if (cfg.timeoutMs === false || cfg.timeoutMs === "")
+      delete target.defaultTimeoutMs;
+    else if (typeof cfg.timeoutMs === "number" && Number.isInteger(cfg.timeoutMs) && cfg.timeoutMs > 0)
+      target.defaultTimeoutMs = cfg.timeoutMs;
+    else
+      return "config.timeoutMs must be a positive integer or false when provided.";
+  }
+  if (hasKey(cfg, "acceptance")) {
+    if (cfg.acceptance === "")
+      delete target.defaultAcceptance;
+    else {
+      const errors = validateAcceptanceInput(cfg.acceptance, "config.acceptance");
+      if (errors.length > 0)
+        return errors.join(" ");
+      target.defaultAcceptance = cfg.acceptance;
+    }
+  }
+  if (hasKey(cfg, "acceptanceRole")) {
+    if (cfg.acceptanceRole === false || cfg.acceptanceRole === "")
+      delete target.acceptanceRole;
+    else if (cfg.acceptanceRole === "read-only" || cfg.acceptanceRole === "writer")
+      target.acceptanceRole = cfg.acceptanceRole;
+    else
+      return "config.acceptanceRole must be 'read-only', 'writer', or false when provided.";
+  }
   if (hasKey(cfg, "output")) {
     if (cfg.output === false || cfg.output === "")
-      target.output = undefined;
+      delete target.output;
     else if (typeof cfg.output === "string")
       target.output = cfg.output;
     else
       return "config.output must be a string or false when provided.";
   }
+  if (hasKey(cfg, "outputMode")) {
+    if (cfg.outputMode === "inline" || cfg.outputMode === "file-only")
+      target.outputMode = cfg.outputMode;
+    else
+      return "config.outputMode must be 'inline' or 'file-only' when provided.";
+  }
   if (hasKey(cfg, "reads")) {
     if (cfg.reads === false || cfg.reads === "")
-      target.defaultReads = undefined;
+      delete target.defaultReads;
     else if (typeof cfg.reads === "string") {
       const reads = parseCsv(cfg.reads);
-      target.defaultReads = reads.length ? reads : undefined;
+      if (reads.length)
+        target.defaultReads = reads;
+      else
+        delete target.defaultReads;
     } else
       return "config.reads must be a comma-separated string or false when provided.";
   }
@@ -478,7 +611,7 @@ function applyAgentConfig(target, cfg) {
   }
   if (hasKey(cfg, "maxSubagentDepth")) {
     if (cfg.maxSubagentDepth === false || cfg.maxSubagentDepth === "")
-      target.maxSubagentDepth = undefined;
+      delete target.maxSubagentDepth;
     else if (typeof cfg.maxSubagentDepth === "number" && Number.isInteger(cfg.maxSubagentDepth) && cfg.maxSubagentDepth >= 0) {
       target.maxSubagentDepth = cfg.maxSubagentDepth;
     } else
@@ -491,7 +624,7 @@ function applyAgentConfig(target, cfg) {
   }
   if (hasKey(cfg, "toolBudget")) {
     if (cfg.toolBudget === false || cfg.toolBudget === "")
-      target.toolBudget = undefined;
+      delete target.toolBudget;
     else {
       const validation = validateToolBudgetConfig(cfg.toolBudget, "config.toolBudget");
       if (validation.error)
@@ -499,51 +632,241 @@ function applyAgentConfig(target, cfg) {
       target.toolBudget = cfg.toolBudget;
     }
   }
+  if (target.runner?.type === "external-cli" || target.runner?.type === "external-job") {
+    const unsupported = [
+      target.tools?.length || target.mcpDirectTools?.length ? "tools" : 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)
+      return `config.runner type '${target.runner.type}' does not support DM-only fields: ${unsupported.join(", ")}.`;
+  }
   return;
 }
-function resolveTarget(kind, name, matches, cwd, scopeHint) {
-  const mutable = matches.filter((m) => isMutableSource(m.source));
+function resolveTarget(name, matches, cwd, 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);
+  const mutable = matches.filter((match) => isMutableSource(match.source));
   if (mutable.length === 0) {
-    if (matches.length > 0) {
-      return result(`${kind === "agent" ? "Agent" : "Chain"} '${name}' is read-only and cannot be modified. Create a same-named ${kind} in user or project scope to override it.`, true);
-    }
-    const available = availableNames(cwd, kind);
-    return result(`${kind === "agent" ? "Agent" : "Chain"} '${name}' not found. Available: ${available.join(", ") || "none"}.`, true);
+    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);
   }
   if (mutable.length === 1)
     return mutable[0];
   const scope = asDisambiguationScope(scopeHint);
   if (!scope) {
-    const paths = mutable.map((m) => `${m.source}: ${m.filePath}`).join(`
+    const paths = mutable.map((match) => `${match.source}: ${match.filePath}`).join(`
 `);
-    return result(`${kind === "agent" ? "Agent" : "Chain"} '${name}' exists in both scopes. Specify agentScope: 'user' or 'project'.
+    return result(`Agent '${name}' exists in both scopes. Specify agentScope: 'user' or 'project'.
 ${paths}`, true);
   }
-  const scoped = mutable.filter((m) => m.source === scope);
+  const scoped = mutable.filter((match) => match.source === scope);
   if (scoped.length === 0)
-    return result(`${kind === "agent" ? "Agent" : "Chain"} '${name}' not found in scope '${scope}'.`, true);
+    return result(`Agent '${name}' not found in scope '${scope}'.`, true);
   if (scoped.length > 1)
-    return result(`Multiple ${kind}s named '${name}' found in scope '${scope}': ${scoped.map((m) => m.filePath).join(", ")}`, true);
+    return result(`Multiple agents named '${name}' found in scope '${scope}': ${scoped.map((match) => match.filePath).join(", ")}`, true);
   return scoped[0];
 }
-function renamePath(kind, currentPath, newName, scope, cwd) {
+function renamePath(currentPath, newName, scope, cwd) {
   if (nameExistsInScope(cwd, scope, newName, currentPath))
     return { error: `Name '${newName}' already exists in ${scope} scope.` };
-  const ext = kind === "agent" ? ".md" : currentPath.endsWith(".chain.json") ? ".chain.json" : ".chain.md";
-  const filePath = path.join(path.dirname(currentPath), `${newName}${ext}`);
-  if (fs.existsSync(filePath) && filePath !== currentPath) {
-    return { error: `File already exists at ${filePath} but is not a valid ${kind} definition. Remove or rename it first.` };
-  }
+  const filePath = path.join(path.dirname(currentPath), `${newName}.md`);
+  if (fs.existsSync(filePath) && filePath !== currentPath)
+    return { error: `File already exists at ${filePath} but is not a valid agent definition. Remove or rename it first.` };
   fs.renameSync(currentPath, filePath);
   return { filePath };
 }
+function packageSourceLabel(agent) {
+  if (!agent.packageSourceName)
+    return agent.source;
+  return agent.packageSourceVersion ? `${agent.packageSourceName}@${agent.packageSourceVersion}` : agent.packageSourceName;
+}
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+function registeredExternalJobProviderStatus() {
+  try {
+    return { ok: true, names: new Set(listExternalJobProviders().map((provider) => provider.name)) };
+  } catch (error) {
+    return { ok: false, error: errorMessage(error) };
+  }
+}
+function externalJobProviderSuffix(provider, names) {
+  if (!names)
+    return "?";
+  return names.has(provider) ? "✓" : "missing";
+}
+function runnerListBadge(agent, providerNames) {
+  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";
+  return;
+}
+function agentListMetadata(agent, providerNames) {
+  const source = agent.source === "package" ? packageSourceLabel(agent) : agent.source;
+  return [
+    source,
+    runnerListBadge(agent, providerNames),
+    agent.defaultContext ? `context: ${agent.defaultContext}` : undefined,
+    agent.aliases?.length ? `aliases: ${agent.aliases.join(", ")}` : undefined
+  ].filter((part) => Boolean(part)).join(", ");
+}
+function formatAgentListLine(agent, providerNames) {
+  return `- ${agent.name} (${agentListMetadata(agent, providerNames)}): ${agent.description}`;
+}
+function formatAgentCapabilitiesLine(agent, providerNames) {
+  const declaredTools = [
+    ...agent.tools ?? [],
+    ...(agent.mcpDirectTools ?? []).map((tool) => `mcp:${tool}`)
+  ];
+  let tools = "none";
+  if (agent.tools === undefined && agent.mcpDirectTools === undefined) {
+    tools = "default/ambient";
+  } else if (declaredTools.length > 0) {
+    tools = declaredTools.join(", ");
+  }
+  let model = "inherits current session";
+  if (agent.model !== undefined) {
+    model = agent.model;
+    if (agent.modelProvider && !agent.model.includes("/"))
+      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 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) {
+  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 };
+  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),
+    mcpDirectTools: listOrEmpty(agent.mcpDirectTools),
+    mutationTools: agent.mutationTools
+  };
+}
+function agentCapabilityRow(agent, options) {
+  return {
+    name: agent.name,
+    description: previewDisplayText(agent.description, 1000),
+    source: agent.source,
+    executable: options.executable,
+    restrictionSources: options.executable ? undefined : options.restrictionSources ?? [],
+    aliases: agent.aliases ? [...agent.aliases] : undefined,
+    runner: agentCapabilityRunner(agent, options.providerNames),
+    tools: agentCapabilityTools(agent),
+    model: presentDetails({ value: agent.model, fallbackModels: agent.fallbackModels, thinking: agent.thinking }),
+    execution: presentDetails({ defaultAsync: agent.defaultAsync, timeoutMs: agent.defaultTimeoutMs }),
+    output: presentDetails({ path: agent.output, mode: agent.outputMode }),
+    extensions: presentDetails({ names: agent.extensions, subagentOnly: agent.subagentOnlyExtensions, skills: agent.skills })
+  };
+}
+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 }))
+    ],
+    restrictedCount: input.restrictedAgents.length,
+    ...input.restrictedSources?.length ? { capabilityCeilingSources: [...input.restrictedSources] } : {}
+  };
+}
+function providerNames(status) {
+  return status.ok ? status.names : undefined;
+}
+function appendRestrictedAgentLines(input) {
+  if (input.agents.length === 0)
+    return;
+  input.lines.push("", `Restricted agents (not executable in this session${input.sources?.length ? `; capability ceiling: ${input.sources.join(", ")}` : ""}):`, ...input.agents.map((agent) => input.formatLine(agent, input.providerNames)));
+}
+function appendExternalJobRegistryLine(lines, agents, status) {
+  if (status.ok || !agents.some((agent) => agent.runner?.type === "external-job"))
+    return;
+  lines.push("", `External-job provider registry unavailable: ${status.error}`);
+}
+function appendAgentDiagnosticLines(lines, diagnostics) {
+  if (!diagnostics?.length)
+    return;
+  lines.push("", "Invalid agent definitions:", ...diagnostics.map((diagnostic) => `- ${diagnostic.name ?? diagnostic.filePath} (${diagnostic.source}): ${diagnostic.error}`));
+}
+function agentCapabilityDetails(input) {
+  if (!input.capabilityMode)
+    return;
+  return {
+    agentCapabilities: jsonDetails(agentCapabilitiesSnapshot({
+      agents: input.agents,
+      restrictedAgents: input.restrictedAgents,
+      providerNames: input.providerNames,
+      restrictedSources: input.restrictedSources
+    }))
+  };
+}
+function formatAgentListSections(agents, providerNames, formatLine = formatAgentListLine) {
+  if (agents.length === 0)
+    return ["- (none)"];
+  const sections = [
+    ["package", "Package agents"],
+    ["user", "User agents"],
+    ["project", "Project agents"],
+    ["runtime", "Runtime agents"],
+    ["builtin", "Builtin agents"]
+  ];
+  const lines = [];
+  for (const [source, label] of sections) {
+    const matches = agents.filter((agent) => agent.source === source);
+    if (matches.length === 0)
+      continue;
+    if (lines.length > 0)
+      lines.push("");
+    lines.push(label, ...matches.map((agent) => formatLine(agent, providerNames)));
+  }
+  return lines;
+}
+function formatRunnerDetail(agent, providerNames) {
+  if (!agent.runner)
+    return;
+  if (agent.runner.type === "external-job")
+    return `Runner: external-job via ${agent.runner.provider} ${externalJobProviderSuffix(agent.runner.provider, providerNames)}`;
+  if (agent.runner.type === "external-cli")
+    return `Runner: external-cli ${agent.runner.command}`;
+  return `Runner: ${JSON.stringify(agent.runner)}`;
+}
 function formatAgentDetail(agent) {
   const tools = [...agent.tools ?? [], ...(agent.mcpDirectTools ?? []).map((t) => `mcp:${t}`)];
+  const providerStatus = registeredExternalJobProviderStatus();
   const lines = [`Agent: ${agent.name} (${agent.source})`, `Path: ${agent.filePath}`, `Description: ${agent.description}`];
+  if (agent.source === "package" && agent.packageSourceName) {
+    lines.push(`Source package: ${packageSourceLabel(agent)}`);
+    if (agent.packageSourceRoot)
+      lines.push(`Package root: ${agent.packageSourceRoot}`);
+  }
   if (agent.packageName) {
     lines.push(`Local name: ${frontmatterNameForConfig(agent)}`);
     lines.push(`Package: ${agent.packageName}`);
   }
+  if (agent.aliases?.length)
+    lines.push(`Aliases: ${agent.aliases.join(", ")}`);
   if (agent.model)
     lines.push(`Model: ${agent.model}`);
   if (agent.fallbackModels?.length)
@@ -552,21 +875,44 @@ function formatAgentDetail(agent) {
     lines.push(`Tools: ${tools.join(", ")}`);
   if (agent.skills?.length)
     lines.push(`Skills: ${agent.skills.join(", ")}`);
+  if (agent.skillPath?.length)
+    lines.push(`Skill paths: ${agent.skillPath.join(", ")}`);
   lines.push(`System prompt mode: ${agent.systemPromptMode}`);
+  const runnerDetail = formatRunnerDetail(agent, providerStatus.ok ? providerStatus.names : undefined);
+  if (runnerDetail) {
+    lines.push(runnerDetail);
+    if (agent.runner?.type === "external-job" && !providerStatus.ok)
+      lines.push(`External-job provider registry unavailable: ${providerStatus.error}`);
+    if (agent.runner?.type === "external-job" && agent.runner.options)
+      lines.push(`Runner options: ${JSON.stringify(agent.runner.options)}`);
+  }
   lines.push(`Inherit project context: ${agent.inheritProjectContext ? "true" : "false"}`);
+  lines.push(`Inherit global context: ${agent.inheritGlobalContext ? "true" : "false"}`);
   lines.push(`Inherit skills: ${agent.inheritSkills ? "true" : "false"}`);
   if (agent.defaultContext)
     lines.push(`Default context: ${agent.defaultContext}`);
+  if (agent.defaultAsync !== undefined)
+    lines.push(`Async: ${agent.defaultAsync ? "true" : "false"}`);
+  if (agent.defaultTimeoutMs !== undefined)
+    lines.push(`Timeout: ${agent.defaultTimeoutMs}ms`);
+  if (agent.defaultAcceptance !== undefined)
+    lines.push(`Acceptance: ${typeof agent.defaultAcceptance === "object" ? JSON.stringify(agent.defaultAcceptance) : String(agent.defaultAcceptance)}`);
+  if (agent.acceptanceRole)
+    lines.push(`Acceptance role: ${agent.acceptanceRole}`);
   if (agent.source === "builtin")
     lines.push(`Disabled: ${agent.disabled ? "true" : "false"}`);
   if (agent.extensions !== undefined)
     lines.push(`Extensions: ${agent.extensions.length ? agent.extensions.join(", ") : "(none)"}`);
   if (agent.subagentOnlyExtensions !== undefined)
     lines.push(`Subagent-only extensions: ${agent.subagentOnlyExtensions.length ? agent.subagentOnlyExtensions.join(", ") : "(none)"}`);
+  if (agent.mutationTools !== undefined)
+    lines.push(`Mutation tools: ${agent.mutationTools.length ? agent.mutationTools.join(", ") : "(none)"}`);
   if (agent.thinking)
     lines.push(`Thinking: ${agent.thinking}`);
   if (agent.output)
     lines.push(`Output: ${agent.output}`);
+  if (agent.outputMode)
+    lines.push(`Output mode: ${agent.outputMode}`);
   if (agent.defaultReads?.length)
     lines.push(`Reads: ${agent.defaultReads.join(", ")}`);
   if (agent.defaultProgress)
@@ -584,103 +930,51 @@ function formatAgentDetail(agent) {
   return lines.join(`
 `);
 }
-function formatChainStepDetail(step, index) {
-  const lines = [];
-  if (step.expand || step.collect) {
-    const parallel = step.parallel && !Array.isArray(step.parallel) && typeof step.parallel === "object" ? step.parallel : undefined;
-    const expand = step.expand && typeof step.expand === "object" ? step.expand : undefined;
-    const collect = step.collect && typeof step.collect === "object" ? step.collect : undefined;
-    lines.push(`${index + 1}. Dynamic fanout${typeof collect?.as === "string" ? ` -> ${collect.as}` : ""}`);
-    if (expand?.from)
-      lines.push(`   Expand: ${String(expand.from.output ?? "?")}${String(expand.from.path ?? "")}`);
-    if (typeof expand?.item === "string")
-      lines.push(`   Item variable: ${expand.item}`);
-    if (typeof expand?.key === "string")
-      lines.push(`   Key: ${expand.key}`);
-    if (typeof expand?.maxItems === "number")
-      lines.push(`   Max items: ${expand.maxItems}`);
-    if (typeof expand?.onEmpty === "string")
-      lines.push(`   On empty: ${expand.onEmpty}`);
-    if (parallel?.agent)
-      lines.push(`   Agent: ${String(parallel.agent)}`);
-    if (typeof parallel?.label === "string")
-      lines.push(`   Label: ${parallel.label}`);
-    if (typeof parallel?.task === "string" && parallel.task.trim())
-      lines.push(`   Task: ${parallel.task}`);
-    if (parallel?.outputSchema)
-      lines.push("   Structured output: true");
-    if (parallel && "toolBudget" in parallel)
-      lines.push(`   Tool budget: ${JSON.stringify(parallel.toolBudget)}`);
-    if (collect?.outputSchema)
-      lines.push("   Collect schema: true");
-    if (step.concurrency !== undefined)
-      lines.push(`   Concurrency: ${step.concurrency}`);
-    if (step.failFast !== undefined)
-      lines.push(`   Fail fast: ${step.failFast ? "true" : "false"}`);
-    return lines;
-  }
-  lines.push(`${index + 1}. ${step.agent}`);
-  if (step.task?.trim())
-    lines.push(`   Task: ${step.task}`);
-  if (step.output === false)
-    lines.push("   Output: false");
-  else if (step.output)
-    lines.push(`   Output: ${step.output}`);
-  if (step.outputMode)
-    lines.push(`   Output mode: ${step.outputMode}`);
-  if (step.toolBudget)
-    lines.push(`   Tool budget: ${JSON.stringify(step.toolBudget)}`);
-  if (step.reads === false)
-    lines.push("   Reads: false");
-  else if (Array.isArray(step.reads) && step.reads.length > 0)
-    lines.push(`   Reads: ${step.reads.join(", ")}`);
-  if (step.model)
-    lines.push(`   Model: ${step.model}`);
-  if (step.skills === false)
-    lines.push("   Skills: false");
-  else if (Array.isArray(step.skills) && step.skills.length > 0)
-    lines.push(`   Skills: ${step.skills.join(", ")}`);
-  if (step.progress !== undefined)
-    lines.push(`   Progress: ${step.progress ? "true" : "false"}`);
-  return lines;
-}
-function formatChainDetail(chain) {
-  const lines = [`Chain: ${chain.name} (${chain.source})`, `Path: ${chain.filePath}`, `Description: ${chain.description}`];
-  if (chain.packageName) {
-    lines.push(`Local name: ${frontmatterNameForConfig(chain)}`);
-    lines.push(`Package: ${chain.packageName}`);
-  }
-  lines.push("", "Steps:");
-  for (let i = 0;i < chain.steps.length; i++) {
-    lines.push(...formatChainStepDetail(chain.steps[i], i));
-  }
-  return lines.join(`
-`);
-}
 export function handleList(params, ctx) {
   const scope = normalizeListScope(params.agentScope) ?? "both";
-  const d = discoverAgentsAll(ctx.cwd);
-  const scopedAgents = allAgents(d).filter((a) => scope === "both" || a.source === "builtin" || a.source === "package" || a.source === scope).sort((a, b) => a.name.localeCompare(b.name));
-  const agents = scopedAgents.filter((a) => !a.disabled);
-  const chains = d.chains.filter((c) => scope === "both" || c.source === "package" || c.source === scope).sort((a, b) => a.name.localeCompare(b.name));
-  const diagnostics = d.chainDiagnostics.filter((entry) => scope === "both" || entry.source === scope);
+  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;
+  }
+  scopedAgents = scopedAgents.sort((a, b) => a.name.localeCompare(b.name));
+  const capabilityCeiling = resolveCurrentSubagentCapabilityCeiling(ctx.currentSessionId);
+  const visibleAgents = scopedAgents.filter((a) => !a.disabled);
+  const agents = visibleAgents.filter((a) => isAgentAllowedByCapabilityCeiling(a.name, capabilityCeiling));
+  const restrictedAgents = visibleAgents.filter((a) => !isAgentAllowedByCapabilityCeiling(a.name, capabilityCeiling));
+  const restrictedSources = capabilityCeilingAgentRestrictionSources(capabilityCeiling);
   const proactiveSuggestions = buildProactiveSkillSubagentRecommendationLines({
     agents,
-    chains,
-    config: ctx.config?.proactiveSkillSubagents,
+    ...ctx.config?.proactiveSkillSubagents !== undefined ? { config: ctx.config.proactiveSkillSubagents } : {},
     discoverAvailableSkills: () => discoverAvailableSkills(ctx.cwd)
   });
+  const providerStatus = registeredExternalJobProviderStatus();
+  const providerNameSet = providerNames(providerStatus);
+  const capabilityMode = params.capabilities === true;
+  const formatLine = capabilityMode ? formatAgentCapabilitiesLine : formatAgentListLine;
   const lines = [
-    "Executable agents:",
-    ...agents.length ? agents.map((a) => `- ${a.name} (${a.source}${a.defaultContext ? `, context: ${a.defaultContext}` : ""}): ${a.description}`) : ["- (none)"],
-    "",
-    "Chains:",
-    ...chains.length ? chains.map((c) => `- ${c.name} (${c.source}): ${c.description}`) : ["- (none)"],
-    ...proactiveSuggestions.length ? ["", ...proactiveSuggestions] : [],
-    ...diagnostics.length ? ["", "Chain diagnostics:", ...diagnostics.map((entry) => `- ${entry.filePath}: ${entry.error}`)] : []
+    capabilityMode ? "Executable agents (capabilities):" : "Executable agents:",
+    ...formatAgentListSections(agents, providerNameSet, formatLine)
   ];
+  appendRestrictedAgentLines({ lines, agents: restrictedAgents, sources: restrictedSources, providerNames: providerNameSet, formatLine });
+  appendExternalJobRegistryLine(lines, [...agents, ...restrictedAgents], providerStatus);
+  appendAgentDiagnosticLines(lines, d.agentDiagnostics);
+  if (proactiveSuggestions.length)
+    lines.push("", ...proactiveSuggestions);
   return result(lines.join(`
-`));
+`), false, agentCapabilityDetails({
+    capabilityMode,
+    agents,
+    restrictedAgents,
+    providerNames: providerNameSet,
+    restrictedSources
+  }));
 }
 function formatModelSource(agent, currentModel) {
   if (agent.override && agent.model !== agent.override.base.model) {
@@ -700,14 +994,15 @@ function handleModels(params, ctx) {
   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);
+  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 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];
   if (requestedAgent) {
-    const agent = builtinByName.get(requestedAgent);
+    const agent = resolveBuiltinModelAgent(requestedAgent);
     if (!agent)
       return result(`Builtin agent '${requestedAgent}' not found.`, true);
     const resolvedModel = resolveSubagentModelOverride(agent.model, currentModel, availableModels, preferredProvider);
@@ -742,7 +1037,7 @@ function handleModels(params, ctx) {
     ""
   ];
   for (const name of names) {
-    const agent = builtinByName.get(name);
+    const agent = resolveBuiltinModelAgent(name);
     if (!agent) {
       lines.push(name);
       lines.push("  model:");
@@ -759,50 +1054,52 @@ function handleModels(params, ctx) {
     lines.push(`  source: ${source}`);
     lines.push("");
   }
+  const availableFullIds = availableModels.map((m) => m.fullId).sort();
+  if (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);
+    for (const fullId of shown)
+      lines.push(`  ${fullId}`);
+    if (availableFullIds.length > shown.length)
+      lines.push(`  ... and ${availableFullIds.length - shown.length} more`);
+    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.");
+  }
   return result(lines.join(`
 `));
 }
 function handleGet(params, ctx) {
-  if (!params.agent && !params.chainName)
-    return result("Specify 'agent' or 'chainName' for get.", true);
-  const hasBoth = Boolean(params.agent && params.chainName);
-  const blocks = [];
-  let anyFound = false;
-  if (params.agent) {
-    const matches = findAgents(params.agent, ctx.cwd, "both");
-    if (!matches.length) {
-      const msg = `Agent '${params.agent}' not found. Available: ${availableNames(ctx.cwd, "agent").join(", ") || "none"}.`;
-      if (!hasBoth)
-        return result(msg, true);
-      blocks.push(msg);
-    } else {
-      anyFound = true;
-      blocks.push(...matches.map(formatAgentDetail));
-    }
-  }
-  if (params.chainName) {
-    const matches = findChains(params.chainName, ctx.cwd, "both");
-    if (!matches.length) {
-      const msg = `Chain '${params.chainName}' not found. Available: ${availableNames(ctx.cwd, "chain").join(", ") || "none"}.`;
-      if (!hasBoth)
-        return result(msg, true);
-      blocks.push(msg);
-    } else {
-      anyFound = true;
-      blocks.push(...matches.map(formatChainDetail));
-    }
-  }
-  return result(blocks.join(`
+  if (!params.agent)
+    return result("Specify 'agent' for get.", true);
+  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 matches = findAgentsInDiscovery(params.agent, discovered, scope);
+  const diagnostics = diagnosticsForScope(discovered.agentDiagnostics, scope);
+  const rawName = params.agent.trim();
+  const normalizedName = sanitizeName(rawName);
+  const diagnostic = findBlockingAgentDiagnostic(rawName, matches, diagnostics) ?? (normalizedName !== rawName ? 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).join(", ") || "none"}.`, true);
+  }
+  return result(matches.map(formatAgentDetail).join(`
 
-`), !anyFound);
+`));
 }
 export function handleCreate(params, ctx) {
   const parsedConfig = configObject(params.config);
-  if (parsedConfig.error)
-    return result(parsedConfig.error, true);
-  const cfg = parsedConfig.value;
-  if (!cfg)
+  if (parsedConfig.status === "error")
+    return result(parsedConfig.message, true);
+  if (parsedConfig.status === "missing")
     return result("config required for create.", true);
+  const cfg = parsedConfig.value;
   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())
@@ -818,54 +1115,46 @@ export function handleCreate(params, ctx) {
   if (scopeRaw !== "user" && scopeRaw !== "project")
     return result("config.scope must be 'user' or 'project'.", true);
   const scope = scopeRaw;
-  const isChain = hasKey(cfg, "steps");
+  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 projectConfigDir = getProjectConfigDir(ctx.cwd);
-  const targetDir = isChain ? scope === "user" ? d.userChainDir : d.projectChainDir ?? path.join(projectConfigDir, "chains") : scope === "user" ? d.userDir : d.projectDir ?? path.join(projectConfigDir, "agents");
+  const targetDir = scope === "user" ? d.userDir : d.projectDir ?? path.join(projectConfigDir, "agents");
   fs.mkdirSync(targetDir, { recursive: true });
   if (nameExistsInScope(ctx.cwd, scope, runtimeName))
     return result(`Name '${runtimeName}' already exists in ${scope} scope. Use update instead.`, true);
-  const targetPath = path.join(targetDir, isChain ? `${runtimeName}.chain.md` : `${runtimeName}.md`);
+  const targetPath = path.join(targetDir, `${runtimeName}.md`);
   if (fs.existsSync(targetPath))
-    return result(`File already exists at ${targetPath} but is not a valid ${isChain ? "chain" : "agent"} definition. Remove or rename it first.`, true);
+    return result(`File already exists at ${targetPath} but is not a valid agent definition. Remove or rename it first.`, true);
   const warnings = [];
-  if (!isChain && d.builtin.some((a) => a.name === runtimeName))
+  if (d.builtin.some((a) => a.name === runtimeName))
     warnings.push(`Note: this shadows the builtin agent '${runtimeName}'.`);
-  if (isChain) {
-    const parsed = parseStepList(cfg.steps);
-    if (parsed.error)
-      return result(parsed.error, true);
-    const chain = { name: runtimeName, localName: name, packageName: parsedPackage.packageName, description: cfg.description.trim(), source: scope, filePath: targetPath, steps: parsed.steps };
-    fs.writeFileSync(targetPath, serializeChain(chain), "utf-8");
-    const missing = unknownChainAgents(ctx.cwd, chain.steps);
-    if (missing.length)
-      warnings.push(`Warning: chain steps reference unknown agents: ${missing.join(", ")}.`);
-    warnings.push(...chainStepWarnings(ctx, chain.steps));
-    return result([`Created chain '${runtimeName}' at ${targetPath}.`, ...warnings].join(`
-`));
-  }
   const agent = {
     name: runtimeName,
     localName: name,
-    packageName: parsedPackage.packageName,
+    ...parsedPackage.packageName !== undefined ? { packageName: parsedPackage.packageName } : {},
     description: cfg.description.trim(),
     source: scope,
     filePath: targetPath,
     systemPrompt: "",
     systemPromptMode: defaultSystemPromptMode(name),
     inheritProjectContext: defaultInheritProjectContext(name),
+    inheritGlobalContext: false,
     inheritSkills: defaultInheritSkills()
   };
   const applyError = applyAgentConfig(agent, cfg);
   if (applyError)
     return result(applyError, true);
+  const profileError = validateCodeOwnedProfileRunner(agent);
+  if (profileError)
+    return result(profileError, true);
   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.skills);
+  const sw = skillsWarning(ctx.cwd, agent);
   if (sw)
     warnings.push(sw);
   fs.writeFileSync(targetPath, serializeAgent(agent), "utf-8");
@@ -873,88 +1162,31 @@ export function handleCreate(params, ctx) {
 `));
 }
 export function handleUpdate(params, ctx) {
-  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);
+  if (!params.agent)
+    return result("Specify 'agent' for update.", true);
   const parsedConfig = configObject(params.config);
-  if (parsedConfig.error)
-    return result(parsedConfig.error, true);
-  const cfg = parsedConfig.value;
-  if (!cfg)
+  if (parsedConfig.status === "error")
+    return result(parsedConfig.message, true);
+  if (parsedConfig.status === "missing")
     return result("config required for update.", true);
+  const cfg = parsedConfig.value;
+  if (hasKey(cfg, "steps"))
+    return result("Durable chain definitions were removed; use workflowScript or /prompt-workflow for repeatable workflows.", true);
   const warnings = [];
-  if (params.agent) {
-    const scopeHint = asDisambiguationScope(params.agentScope);
-    const targetOrError = resolveTarget("agent", params.agent, findAgents(params.agent, ctx.cwd, scopeHint ?? "both"), ctx.cwd, params.agentScope);
-    if ("content" in targetOrError)
-      return targetOrError;
-    const target = targetOrError;
-    const updated = editableAgentConfig(target);
-    const oldName = target.name;
-    if (hasKey(cfg, "name") && (typeof cfg.name !== "string" || !cfg.name.trim()))
-      return result("config.name must be a non-empty string when provided.", true);
-    if (hasKey(cfg, "description") && (typeof cfg.description !== "string" || !cfg.description.trim()))
-      return result("config.description must be a non-empty string when provided.", true);
-    let newLocalName = target.localName ?? frontmatterNameForConfig(target);
-    if (hasKey(cfg, "name")) {
-      newLocalName = sanitizeName(cfg.name);
-      if (!newLocalName)
-        return result("config.name is invalid after sanitization.", true);
-    }
-    let newPackageName = target.packageName;
-    if (hasKey(cfg, "package")) {
-      const parsedPackage = parsePackageConfig(cfg.package);
-      if (parsedPackage.error)
-        return result(parsedPackage.error, true);
-      newPackageName = parsedPackage.packageName;
-    }
-    const applyError = applyAgentConfig(updated, cfg);
-    if (applyError)
-      return result(applyError, true);
-    const preserveFrontmatterFields = preservedAgentFrontmatterFields(target, cfg);
-    updated.localName = newLocalName;
-    updated.packageName = newPackageName;
-    updated.name = buildRuntimeName(newLocalName, newPackageName);
-    if (hasKey(cfg, "description"))
-      updated.description = cfg.description.trim();
-    if (hasKey(cfg, "model")) {
-      const mw = modelWarning(ctx, updated.model);
-      if (mw)
-        warnings.push(mw);
-    }
-    if (hasKey(cfg, "fallbackModels")) {
-      const fmw = fallbackModelsWarning(ctx, updated.fallbackModels);
-      if (fmw)
-        warnings.push(fmw);
-    }
-    if (hasKey(cfg, "skills")) {
-      const sw = skillsWarning(ctx.cwd, updated.skills);
-      if (sw)
-        warnings.push(sw);
-    }
-    if (updated.name !== oldName) {
-      const renamed = renamePath("agent", target.filePath, updated.name, target.source, ctx.cwd);
-      if (renamed.error)
-        return result(renamed.error, true);
-      updated.filePath = renamed.filePath;
-    }
-    fs.writeFileSync(updated.filePath, serializeAgent(updated, { preserveFrontmatterFields }), "utf-8");
-    if (updated.name !== oldName) {
-      const refs = discoverAgentsAll(ctx.cwd).chains.filter((c) => c.steps.some((s) => s.agent === oldName)).map((c) => `${c.name} (${c.source})`);
-      if (refs.length)
-        warnings.push(`Warning: chains still reference '${oldName}': ${refs.join(", ")}.`);
-    }
-    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(`
-`));
-  }
   const scopeHint = asDisambiguationScope(params.agentScope);
-  const targetOrError = resolveTarget("chain", params.chainName, findChains(params.chainName, ctx.cwd, scopeHint ?? "both"), ctx.cwd, params.agentScope);
+  const targetOrError = resolveTarget(params.agent, findAgents(params.agent, ctx.cwd, scopeHint ?? "both"), ctx.cwd, scopeHint);
   if ("content" in targetOrError)
     return targetOrError;
   const target = targetOrError;
-  const updated = { ...target, steps: [...target.steps] };
+  if (target.source !== "user" && target.source !== "project")
+    return result(`Cannot update ${target.source} agent '${target.name}'. Eject it to user or project scope first.`, true);
+  let updated;
+  try {
+    updated = editableAgentConfig(target);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return result(`Could not reread agent definition ${target.filePath} before updating '${target.name}': ${message}`, true);
+  }
   const oldName = target.name;
   if (hasKey(cfg, "name") && (typeof cfg.name !== "string" || !cfg.name.trim()))
     return result("config.name must be a non-empty string when provided.", true);
@@ -973,61 +1205,57 @@ export function handleUpdate(params, ctx) {
       return result(parsedPackage.error, true);
     newPackageName = parsedPackage.packageName;
   }
-  let parsedSteps;
-  if (hasKey(cfg, "steps")) {
-    const parsed = parseStepList(cfg.steps);
-    if (parsed.error)
-      return result(parsed.error, true);
-    parsedSteps = parsed.steps;
-  }
+  const applyError = applyAgentConfig(updated, cfg);
+  if (applyError)
+    return result(applyError, true);
+  const preserveFrontmatterFields = preservedAgentFrontmatterFields(target, cfg);
   updated.localName = newLocalName;
-  updated.packageName = newPackageName;
+  if (newPackageName !== undefined)
+    updated.packageName = newPackageName;
+  else
+    delete updated.packageName;
   updated.name = buildRuntimeName(newLocalName, newPackageName);
+  const profileError = validateCodeOwnedProfileRunner(updated);
+  if (profileError)
+    return result(profileError, true);
   if (hasKey(cfg, "description"))
     updated.description = cfg.description.trim();
-  if (parsedSteps) {
-    updated.steps = parsedSteps;
-    const missing = unknownChainAgents(ctx.cwd, updated.steps);
-    if (missing.length)
-      warnings.push(`Warning: chain steps reference unknown agents: ${missing.join(", ")}.`);
-    warnings.push(...chainStepWarnings(ctx, updated.steps));
+  if (hasKey(cfg, "model")) {
+    const mw = modelWarning(ctx, updated.model);
+    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("chain", target.filePath, updated.name, target.source, ctx.cwd);
+    const renamed = renamePath(target.filePath, updated.name, target.source, ctx.cwd);
     if (renamed.error)
       return result(renamed.error, true);
     updated.filePath = renamed.filePath;
   }
-  fs.writeFileSync(updated.filePath, updated.filePath.endsWith(".chain.json") ? serializeJsonChain(updated) : serializeChain(updated), "utf-8");
-  const headline = updated.name === oldName ? `Updated chain '${updated.name}' at ${updated.filePath}.` : `Updated chain '${oldName}' to '${updated.name}' at ${updated.filePath}.`;
+  fs.writeFileSync(updated.filePath, serializeAgent(updated, { preserveFrontmatterFields }), "utf-8");
+  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(`
 `));
 }
 function handleDelete(params, ctx) {
-  if (!params.agent && !params.chainName)
-    return result("Specify 'agent' or 'chainName' for delete.", true);
-  if (params.agent && params.chainName)
-    return result("Specify either 'agent' or 'chainName', not both.", true);
+  if (!params.agent)
+    return result("Specify 'agent' for delete.", true);
   const scopeHint = asDisambiguationScope(params.agentScope);
-  if (params.agent) {
-    const targetOrError = resolveTarget("agent", params.agent, findAgents(params.agent, ctx.cwd, scopeHint ?? "both"), ctx.cwd, params.agentScope);
-    if ("content" in targetOrError)
-      return targetOrError;
-    const target = targetOrError;
-    fs.unlinkSync(target.filePath);
-    const refs = discoverAgentsAll(ctx.cwd).chains.filter((c) => c.steps.some((s) => s.agent === target.name)).map((c) => `${c.name} (${c.source})`);
-    const lines = [`Deleted agent '${target.name}' at ${target.filePath}.`];
-    if (refs.length)
-      lines.push(`Warning: chains reference deleted agent '${target.name}': ${refs.join(", ")}.`);
-    return result(lines.join(`
-`));
-  }
-  const targetOrError = resolveTarget("chain", params.chainName, findChains(params.chainName, ctx.cwd, scopeHint ?? "both"), ctx.cwd, params.agentScope);
+  const targetOrError = resolveTarget(params.agent, findAgents(params.agent, ctx.cwd, scopeHint ?? "both"), ctx.cwd, scopeHint);
   if ("content" in targetOrError)
     return targetOrError;
   const target = targetOrError;
   fs.unlinkSync(target.filePath);
-  return result(`Deleted chain '${target.name}' at ${target.filePath}.`);
+  return result(`Deleted agent '${target.name}' at ${target.filePath}.`);
 }
 function handleEject(params, ctx) {
   if (!params.agent)
@@ -1041,7 +1269,7 @@ function handleEject(params, ctx) {
   const d = discoverAgentsAll(ctx.cwd);
   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: ${availableNames(ctx.cwd, "agent").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.cwd).join(", ") || "none"}.`, true);
   }
   const runtimeName = source.name;
   const existingCustom = (scope === "user" ? d.user : d.project).find((a) => a.name === runtimeName);
@@ -1049,7 +1277,7 @@ function handleEject(params, ctx) {
     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)) {
-    return result(`An agent or chain named '${runtimeName}' already exists in ${scope} scope. Remove or rename it first.`, true);
+    return result(`An agent named '${runtimeName}' already exists in ${scope} scope. Remove or rename it first.`, true);
   }
   const projectConfigDir = getProjectConfigDir(ctx.cwd);
   const targetDir = scope === "user" ? d.userDir : d.projectDir ?? path.join(projectConfigDir, "agents");
@@ -1078,15 +1306,17 @@ function handleDisable(params, ctx) {
   const scope = parsedScope.scope;
   const d = discoverAgentsAll(ctx.cwd);
   if (scope === "project" && d.projectSettingsPath === null) {
-    return result("Project override is not available here: no DM project config root was found above the cwd. Use agentScope: 'user' or run from inside a project.", true);
+    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);
   }
-  const effective = pickEffectiveAgent(d, raw);
-  if (!effective) {
-    return result(`Agent '${raw}' not found. Available: ${availableNames(ctx.cwd, "agent").join(", ") || "none"}.`, true);
+  const effective = resolveEffectiveAgent(d, raw);
+  if (effective.error)
+    return result(effective.error, true);
+  if (!effective.agent) {
+    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx.cwd).join(", ") || "none"}.`, true);
   }
-  const runtimeName = effective.name;
+  const runtimeName = effective.agent.name;
   const settingsPath = mergeBuiltinAgentOverride(ctx.cwd, runtimeName, scope, { disabled: true });
-  const after = pickEffectiveAgent(discoverAgentsAll(ctx.cwd), raw);
+  const after = resolveEffectiveAgent(discoverAgentsAll(ctx.cwd), raw).agent;
   if (after?.disabled === true) {
     return result(`Disabled agent '${runtimeName}' via ${scope} settings override at ${settingsPath}. It is now hidden from runtime discovery and { action: "list" }.`);
   }
@@ -1102,15 +1332,17 @@ function handleEnable(params, ctx) {
   const scope = parsedScope.scope;
   const d = discoverAgentsAll(ctx.cwd);
   if (scope === "project" && d.projectSettingsPath === null) {
-    return result("Project override is not available here: no DM project config root was found above the cwd. Use agentScope: 'user' or run from inside a project.", true);
+    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);
   }
-  const effective = pickEffectiveAgent(d, raw);
-  if (!effective) {
-    return result(`Agent '${raw}' not found. Available: ${availableNames(ctx.cwd, "agent").join(", ") || "none"}.`, true);
+  const effective = resolveEffectiveAgent(d, raw);
+  if (effective.error)
+    return result(effective.error, true);
+  if (!effective.agent) {
+    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx.cwd).join(", ") || "none"}.`, true);
   }
-  const runtimeName = effective.name;
+  const runtimeName = effective.agent.name;
   const { path: settingsPath, removed } = removeBuiltinAgentOverrideFields(ctx.cwd, runtimeName, scope, ["disabled"]);
-  const after = pickEffectiveAgent(discoverAgentsAll(ctx.cwd), raw);
+  const after = resolveEffectiveAgent(discoverAgentsAll(ctx.cwd), raw).agent;
   if (after && after.disabled !== true) {
     if (removed)
       return result(`Enabled agent '${runtimeName}' (removed disabled override at ${settingsPath}).`);
@@ -1132,7 +1364,7 @@ function handleReset(params, ctx) {
   const scope = parsedScope.scope;
   const d = discoverAgentsAll(ctx.cwd);
   if (scope === "project" && d.projectSettingsPath === null) {
-    return result("Project override is not available here: no DM project config root was found above the cwd. Use agentScope: 'user' or run from inside a project.", true);
+    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);
   }
   const bundled = [...d.package, ...d.builtin].find((a) => a.name === raw || a.name === sanitized);
   if (!bundled) {
@@ -1140,7 +1372,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: ${availableNames(ctx.cwd, "agent").join(", ") || "none"}.`, true);
+    return result(`Agent '${raw}' not found. Available: ${availableAgentNames(ctx.cwd).join(", ") || "none"}.`, true);
   }
   const runtimeName = bundled.name;
   const custom = (scope === "user" ? d.user : d.project).find((a) => a.name === raw || a.name === sanitized);