@duckmind/dm-darwin-x64 0.66.5 → 0.66.6

package/extensions/dm-subagents/src/extension/index.js

@@ -2,29 +2,28 @@ import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { keyText } from "@duckmind/dm-coding-agent";
-import { Box, Container, Spacer, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@duckmind/dm-tui";
+import { Box, Container, Spacer, Text } from "@duckmind/dm-tui";
 import { clearAgentDiscoveryCache, discoverAgentSnapshot, discoverAgents, discoverAgentsAll } from "../agents/agents.js";
 import { resolveGlobalNpmRoot } from "../agents/global-npm-root.js";
-import { appendAdvertisedAgentPrompt, buildAdvertisedAgentPrompt } from "../agents/advertised-agent-prompt.js";
+import { buildAdvertisedAgentCatalog, buildAdvertisedAgentPrompt } from "../agents/advertised-agent-prompt.js";
 import { clearRuntimeAgentsForPi, listRuntimeAgentConfigs, mergeRuntimeAgents } from "../agents/runtime-agent-registry.js";
 import { registerRuntimeAgentEventListener } from "../agents/runtime-agent-events.js";
 import { ensureAccessibleDir } from "../shared/accessible-dir.js";
 import { cleanupAllArtifactDirs, cleanupOldArtifacts, getArtifactsDir } from "../shared/artifacts.js";
 import { resolveCurrentSessionId } from "../shared/session-identity.js";
 import { getAgentDir } from "../shared/utils.js";
-import { isStaleExtensionContextError, withCachedUiContext } from "../shared/extension-context.js";
+import { isStaleExtensionContextError, MODEL_ONLY_TOOL, withCachedUiContext } from "../shared/extension-context.js";
 import { currentCompletionOwnerId } from "../shared/completion-owner.js";
 import { cleanupOldChainDirs } from "../shared/settings.js";
 import { clearLegacyResultAnimationTimer, renderSubagentResult, renderSubagentSummary, setInlineWorkflowCoverage } from "../tui/render.js";
-import { openSubagentFleet } from "../tui/fleet.js";
-import { createBuiltinInspectorPlugins } from "../inspectors/plugins.js";
+import { getInspectorPlugins, registerInspectorEventListener } from "../inspectors/plugins.js";
 import { SubagentFleetStatus, resolveFleetViewPlacement } from "../tui/fleet-status.js";
+import { readMainThinkingLevel, setMainThinkingLevelSource } from "../tui/running-tone.js";
 import { createSubagentParamsSchema } from "./schemas.js";
-import { createSubagentExecutor } from "../runs/foreground/subagent-executor.js";
+import { resolveDisabledFeatureSurface } from "../shared/disabled-features.js";
 import { createAsyncJobTracker } from "../runs/background/async-job-tracker.js";
 import { getActiveAsyncCapacitySnapshot, resolveAbandonedSlotReleaseAfterMs, resolveMaxActiveAsyncRunsPerSession } from "../runs/background/active-async-capacity.js";
-import { cleanupResultIndexes, missionObserverResultCandidateFiles } from "../runs/background/result-files.js";
+import { cleanupResultIndexes, missionObserverResultCandidateFiles, resultFilePath } from "../runs/background/result-files.js";
 import { ASYNC_RETENTION_DELAY_MS, cleanupAsyncRetention } from "../runs/background/async-retention.js";
 import { createResultWatcher } from "../runs/background/result-watcher.js";
 import { createResultDeliveryOwnership } from "../runs/background/result-delivery-ownership.js";
@@ -34,13 +33,9 @@ import { registerPromptTemplateDelegationBridge } from "../slash/prompt-template
 import { registerMainWatchdog } from "../watchdog/register-main.js";
 import { registerSlashSubagentBridge } from "../slash/slash-bridge.js";
 import { createNativeSupervisorChannel } from "../intercom/native-supervisor-channel.js";
-import {
-  renderSupervisorReply,
-  renderSupervisorRequest,
-  SUPERVISOR_REPLY_ENTRY_TYPE,
-  SUPERVISOR_REQUEST_MESSAGE_TYPE
-} from "../intercom/supervisor-ui.js";
+import { renderSubagentEntry, renderSubagentMessage, SUBAGENT_ENTRY_TYPES, SUBAGENT_MESSAGE_TYPES } from "../tui/subagent-messages.js";
 import { registerHerdrStatusBridge } from "../integrations/herdr-status.js";
+import { registerProgramStatusReporter } from "../integrations/program-status.js";
 import { hasLiveSubagentWork, registerPiWebSessionLiveness } from "../integrations/dm-web-session-liveness.js";
 import { createRetainedNestedRouteTracker } from "../runs/background/retained-nested-route-tracker.js";
 import { listHerdrProjectPaneRoots, restoreHerdrProjectPaneSnapshots } from "../inspectors/herdr/project-panes.js";
@@ -49,18 +44,21 @@ import { clearSlashSnapshots, getSlashRenderableSnapshot, resolveSlashMessageDet
 import { resolveWaitToolConfig } from "../runs/background/subagent-wait.js";
 import { registerWaitTool } from "../runs/background/wait-tool.js";
 import { registerSubagentToolActivation } from "./tool-activation.js";
+import { recordedPromptSection, registerPinnedTool } from "./declaration-pinning.js";
 import { createWaitSubscriptionManager } from "../runs/background/wait-subscriptions.js";
 import { drainOutstandingWork } from "../runs/background/auto-drain.js";
-import registerSubagentNotify, { parseSubagentNotifyContent } from "../runs/background/notify.js";
-import { formatSteeringNotice, handleSubagentSteeringNotice, SUBAGENT_STEERING_MESSAGE_TYPE } from "./steering-notices.js";
+import registerSubagentNotify from "../runs/background/notify.js";
+import { createParentWake } from "../shared/parent-wake.js";
+import { handleSubagentSteeringNotice } from "./steering-notices.js";
 import { SUBAGENT_CHILD_ENV, SUBAGENT_PARENT_SESSION_ENV } from "../runs/shared/child-runtime-config.js";
 import { disposeChildSessions } from "../runs/shared/child-session.js";
 import { resolveCurrentSubagentCapabilityCeiling } from "../runs/shared/capability-ceiling.js";
-import { formatDuration, shortenPath } from "../shared/formatters.js";
 import { loadConfig, resolveAsyncByDefault, resolveScheduledStoreRoot } from "./config.js";
 import { buildSubagentToolDescription, buildSubagentToolPromptMetadata } from "./tool-description.js";
 import { formatWorkflowPreflightSummary, normalizeWorkflowPreflight } from "../workflows/workflow-preflight.js";
+import { runtimeReplacedAbortReason } from "../workflows/workflow-reuse.js";
 import { finalizeToolResult } from "./tool-result.js";
+import { flattenSubagentToolOptions } from "./subagent-options.js";
 import { collectGoalContinuationNotices } from "../missions/goal-driver.js";
 import { restoreForegroundRunHistory } from "../runs/foreground/foreground-history.js";
 import { resolveMissionStoreLocation } from "../missions/store.js";
@@ -79,12 +77,14 @@ import {
   resolveMaxSubagentSpawnsPerSession
 } from "../shared/types.js";
 import {
-  formatSubagentControlNotice,
-  handleSubagentControlNotice,
-  SUBAGENT_CONTROL_MESSAGE_TYPE
+  handleSubagentControlNotice
 } from "./control-notices.js";
+import { showUpgradeNotice } from "./upgrade-notice.js";
 export { loadConfig, resolveAsyncByDefault } from "./config.js";
 const SLOW_RELOAD_PHASE_MS = 250;
+const MODULE_PRELOAD_DELAY_MS = 1000;
+const COMPACTION_RESUME_POLL_MS = 50;
+const COMPACTION_RESUME_DEADLINE_MS = 1e4;
 const RUNTIME_REGISTRY_STORE_KEY = "__piSubagentRuntimeRegistry";
 function getRuntimeRegistry() {
   const globalStore = globalThis;
@@ -108,139 +108,6 @@ function logSlowPhase(label, startedAt) {
   if (elapsed >= SLOW_RELOAD_PHASE_MS)
     console.error(`Subagent reload phase '${label}' took ${elapsed}ms.`);
 }
-function workflowLaneKeys(script) {
-  const keys = [];
-  const seen = new Set;
-  const add = (key) => {
-    if (!seen.has(key)) {
-      seen.add(key);
-      keys.push(key);
-    }
-  };
-  const isIdentifier = (char) => char !== undefined && /[\w$]/.test(char);
-  const skipTrivia = (start) => {
-    let index = start;
-    while (index < script.length) {
-      if (/\s/.test(script[index]))
-        index += 1;
-      else if (script.startsWith("//", index)) {
-        const end = script.indexOf(`
-`, index + 2);
-        index = end === -1 ? script.length : end + 1;
-      } else if (script.startsWith("/*", index)) {
-        const end = script.indexOf("*/", index + 2);
-        index = end === -1 ? script.length : end + 2;
-      } else
-        break;
-    }
-    return index;
-  };
-  const readLiteral = (start) => {
-    const quote = script[start];
-    if (quote !== "'" && quote !== '"' && quote !== "`")
-      return;
-    let index = start + 1;
-    let dynamicTemplate = false;
-    while (index < script.length) {
-      if (script[index] === "\\") {
-        index += 2;
-        continue;
-      }
-      if (quote === "`" && script.startsWith("${", index))
-        dynamicTemplate = true;
-      if (script[index] === quote)
-        return { key: dynamicTemplate ? undefined : script.slice(start + 1, index), end: index + 1 };
-      if (quote !== "`" && /[\r\n]/.test(script[index]))
-        return { end: index + 1 };
-      index += 1;
-    }
-    return { end: script.length };
-  };
-  const collectRunsAllKeys = (start) => {
-    let index = skipTrivia(start);
-    if (script[index] !== "(")
-      return start;
-    index = skipTrivia(index + 1);
-    if (script[index] !== "[")
-      return start;
-    let arrayDepth = 1;
-    let objectDepth = 0;
-    let directChildObject = false;
-    let expectingElement = true;
-    for (index += 1;index < script.length; index += 1) {
-      index = skipTrivia(index);
-      const literal = readLiteral(index);
-      if (literal) {
-        index = literal.end - 1;
-        continue;
-      }
-      if (script[index] === "[") {
-        arrayDepth += 1;
-        expectingElement = false;
-        continue;
-      }
-      if (script[index] === "]") {
-        arrayDepth -= 1;
-        if (arrayDepth === 0)
-          return index + 1;
-        continue;
-      }
-      if (script[index] === "{") {
-        objectDepth += 1;
-        if (objectDepth === 1)
-          directChildObject = arrayDepth === 1 && expectingElement;
-        expectingElement = false;
-        continue;
-      }
-      if (script[index] === "}") {
-        objectDepth -= 1;
-        if (objectDepth === 0)
-          directChildObject = false;
-        continue;
-      }
-      if (script[index] === "," && arrayDepth === 1 && objectDepth === 0) {
-        expectingElement = true;
-        continue;
-      }
-      if (directChildObject && objectDepth === 1 && !isIdentifier(script[index - 1]) && script.startsWith("key", index) && !isIdentifier(script[index + 3])) {
-        const colon = skipTrivia(index + 3);
-        const key = script[colon] === ":" ? readLiteral(skipTrivia(colon + 1)) : undefined;
-        if (key) {
-          const next = skipTrivia(key.end);
-          if (key.key !== undefined && (script[next] === "," || script[next] === "}"))
-            add(key.key);
-          index = key.end - 1;
-        }
-      }
-    }
-    return index;
-  };
-  for (let index = 0;index < script.length; ) {
-    index = skipTrivia(index);
-    const literal = readLiteral(index);
-    if (literal) {
-      index = literal.end;
-      continue;
-    }
-    if (!isIdentifier(script[index - 1]) && script.startsWith("runs.run", index) && !isIdentifier(script[index + 8])) {
-      const open = skipTrivia(index + 8);
-      const key = script[open] === "(" ? readLiteral(skipTrivia(open + 1)) : undefined;
-      if (key) {
-        const next = skipTrivia(key.end);
-        if (key.key !== undefined && (script[next] === "," || script[next] === ")"))
-          add(key.key);
-        index = key.end;
-        continue;
-      }
-    }
-    if (!isIdentifier(script[index - 1]) && script.startsWith("runs.all", index) && !isIdentifier(script[index + 8])) {
-      index = collectRunsAllKeys(index + 8);
-      continue;
-    }
-    index += 1;
-  }
-  return keys;
-}
 function formatWorkflowPreflightCall(input) {
   if (input === undefined)
     return "";
@@ -250,18 +117,6 @@ function formatWorkflowPreflightCall(input) {
     return `preflight · rejected: ${error instanceof Error ? error.message : String(error)}`;
   }
 }
-function formatWorkflowManifest(script, async, clarify, preflightInput) {
-  if (clarify === true)
-    return "workflow script · rejected: clarify UI unsupported";
-  const keys = workflowLaneKeys(script);
-  const mode = async === false ? "foreground" : "background";
-  const preflight = formatWorkflowPreflightCall(preflightInput);
-  if (keys.length === 0)
-    return `workflow script · ${mode}${preflight ? ` · ${preflight}` : ""}`;
-  const visibleKeys = keys.slice(0, 4).join(", ");
-  const remainder = keys.length > 4 ? `, +${keys.length - 4}` : "";
-  return `workflow · ${mode} · ${keys.length} lane${keys.length === 1 ? "" : "s"}: ${visibleKeys}${remainder}${preflight ? ` · ${preflight}` : ""}`;
-}
 function getSubagentSessionRoot(parentSessionFile) {
   if (parentSessionFile) {
     const baseName = path.basename(parentSessionFile, ".jsonl");
@@ -303,34 +158,6 @@ function createSlashResultComponent(details, options, theme, rendererConfig, for
   };
   return container;
 }
-
-class SubagentControlNoticeComponent {
-  details;
-  theme;
-  constructor(details, theme) {
-    this.details = details;
-    this.theme = theme;
-  }
-  invalidate() {}
-  render(width) {
-    const eventLabel = this.details.event.type.replaceAll("_", " ");
-    if (width < 3)
-      return [truncateToWidth(`Subagent ${eventLabel}`, width)];
-    const bodyWidth = Math.max(1, width - 2);
-    const borderChar = "─";
-    const header = ` ⚠ Subagent ${eventLabel}: ${this.details.event.agent} `;
-    const headerText = truncateToWidth(header, bodyWidth, "");
-    const headerPadding = Math.max(0, bodyWidth - visibleWidth(headerText));
-    const lines = [this.theme.fg("accent", `╭${headerText}${borderChar.repeat(headerPadding)}╮`)];
-    for (const line of wrapTextWithAnsi(formatSubagentControlNotice(this.details), bodyWidth)) {
-      const text = truncateToWidth(line, bodyWidth, "");
-      const padding = Math.max(0, bodyWidth - visibleWidth(text));
-      lines.push(this.theme.fg("accent", `│${text}${" ".repeat(padding)}│`));
-    }
-    lines.push(this.theme.fg("accent", `╰${borderChar.repeat(bodyWidth)}╯`));
-    return lines;
-  }
-}
 export function projectActiveHerdrRuns(state) {
   const active = (status) => status === "queued" || status === "running";
   const foregroundChildrenByWorkflow = new Map;
@@ -348,13 +175,22 @@ export function projectActiveHerdrRuns(state) {
     foregroundChildrenByWorkflow.set(control.parentWorkflowRunId, existing);
   }
   return [...state.asyncJobs.values()].filter((job) => active(job.status)).map((job) => {
-    const children = job.mode === "workflow" ? foregroundChildrenByWorkflow.get(job.asyncId) : undefined;
     const currentStep = job.steps?.find((step) => step.status === "running") ?? (job.currentStep !== undefined ? job.steps?.[job.currentStep] : undefined) ?? job.steps?.find((step) => step.status === "pending");
+    if (job.mode === "workflow") {
+      const children = foregroundChildrenByWorkflow.get(job.asyncId) ?? [];
+      return {
+        id: job.asyncId,
+        coordinator: true,
+        agents: children.map((child) => child.agent),
+        ...currentStep?.label ? { taskLabel: currentStep.label } : {},
+        needsAttention: job.activityState === "needs_attention" || children.some((child) => child.needsAttention)
+      };
+    }
     return {
       id: job.asyncId,
-      agents: children?.length ? children.map((child) => child.agent) : job.agents,
+      agents: job.agents,
       ...currentStep?.label ? { taskLabel: currentStep.label } : {},
-      needsAttention: job.activityState === "needs_attention" || children?.some((child) => child.needsAttention)
+      needsAttention: job.activityState === "needs_attention"
     };
   });
 }
@@ -363,6 +199,10 @@ export default function registerSubagentExtension(dm) {
     return;
   }
   const runtimeRegistry = getRuntimeRegistry();
+  setMainThinkingLevelSource(() => readMainThinkingLevel(() => {
+    const level = dm.getThinkingLevel();
+    return level === "ultra" ? "max" : level;
+  }));
   DIRS.results = ensureAccessibleDir(DIRS.results);
   DIRS.async = ensureAccessibleDir(DIRS.async);
   cleanupOldChainDirs();
@@ -372,6 +212,8 @@ export default function registerSubagentExtension(dm) {
   const fleetViewEnabled = config.fleetView !== false;
   const fleetViewPlacement = resolveFleetViewPlacement(config.fleetViewPlacement);
   const asyncWidgetEnabled = config.asyncWidget !== false;
+  const asyncWidgetCollapsed = config.asyncWidgetCollapsed === true;
+  const asyncWidgetLayout = config.asyncWidgetLayout ?? "adaptive";
   const summaryInlineToolDisplay = config.inlineToolDisplay === "summary";
   const tempArtifactsDir = getArtifactsDir(null);
   const artifactCleanupDays = config.artifactConfig?.cleanupDays ?? DEFAULT_ARTIFACT_CONFIG.cleanupDays;
@@ -421,20 +263,30 @@ export default function registerSubagentExtension(dm) {
         state.lastUiContext = null;
     }, run);
   };
+  const parentWake = createParentWake(dm);
+  const wakingPi = { events: dm.events, sendMessage: parentWake.sendMessage, isHeld: parentWake.isHeld, on: dm.on };
   const supervisorChannel = createNativeSupervisorChannel(dm, state, {
-    getCurrentOwnerStates: () => executor.getCurrentSupervisorOwnerStates()
+    getCurrentOwnerStates: () => executor?.getCurrentSupervisorOwnerStates() ?? [],
+    parentWake
   });
-  const waitSubscriptionManager = createWaitSubscriptionManager(dm, state);
+  const waitSubscriptionManager = createWaitSubscriptionManager(wakingPi, state);
   const mainWatchdog = registerMainWatchdog(dm);
   const resultDeliveryOwnership = createResultDeliveryOwnership(state);
-  const completionNotifier = registerSubagentNotify(dm, state, { batchConfig: config.completionBatch, ownership: resultDeliveryOwnership });
+  const completionNotifier = registerSubagentNotify(wakingPi, state, { batchConfig: config.completionBatch, ownership: resultDeliveryOwnership });
+  const owedResultRunIds = new Set;
+  const deliveredRunIds = new Set;
+  const holdOwedResult = (job) => {
+    if (!job.parentWorkflowRunId && !deliveredRunIds.has(job.asyncId) && job.sessionId && resultDeliveryOwnership.owns(job.sessionId, job.completionOwnerId))
+      owedResultRunIds.add(job.asyncId);
+  };
   let retainedNestedRouteTracker;
   const fleetStatus = fleetViewEnabled ? new SubagentFleetStatus(state, async (itemKey) => {
     const ctx = withLastUiContext((current) => current);
     if (!ctx)
       return;
     try {
-      await openSubagentFleet(ctx, state, { initialKey: itemKey, asyncDirRoot: DIRS.async, resultsDir: DIRS.results, fleetKeybindings: config.fleetKeybindings, inspectorPlugins: createBuiltinInspectorPlugins() });
+      const { openSubagentFleet } = await import("../tui/fleet.js");
+      await openSubagentFleet(ctx, state, { initialKey: itemKey, asyncDirRoot: DIRS.async, resultsDir: DIRS.results, fleetKeybindings: config.fleetKeybindings, inspectorPlugins: () => getInspectorPlugins(dm) });
     } catch (error) {
       if (isStaleExtensionContextError(error)) {
         if (state.lastUiContext === ctx)
@@ -444,7 +296,6 @@ export default function registerSubagentExtension(dm) {
       throw error;
     }
   }, { placement: fleetViewPlacement, onWorkflowCoverageChange: setInlineWorkflowCoverage }) : undefined;
-  let executorScheduled;
   let goalTurnId = 0;
   let releaseHostSessionLiveness = () => {};
   const scheduledStoreRoot = config.scheduledRuns?.storeRoot === undefined ? undefined : resolveScheduledStoreRoot(config.scheduledRuns.storeRoot);
@@ -452,15 +303,8 @@ export default function registerSubagentExtension(dm) {
     config,
     storeRoot: scheduledStoreRoot,
     launch: async (params, ctx, signal) => {
-      if (!executorScheduled) {
-        return {
-          content: [{ type: "text", text: "Scheduled subagent launch is unavailable (executor not ready)." }],
-          isError: true,
-          details: { mode: "management", results: [] }
-        };
-      }
       await waitForAdvertisement();
-      return executorScheduled(randomUUID(), params, signal, ctx);
+      return (await getExecutor()).executeScheduled(randomUUID(), params, signal, ctx);
     },
     resolveCapabilityCeiling: (sessionId) => resolveCurrentSubagentCapabilityCeiling(sessionId)
   });
@@ -486,7 +330,7 @@ export default function registerSubagentExtension(dm) {
     if (!advertisedContext)
       return;
     clearAgentDiscoveryCache();
-    advertisedAgents = discoverAgents(advertisedContext.cwd, "both", advertisedContext.model?.provider, { globalNpmRoot: globalRoot }).agents.filter((agent) => agent.advertise === true);
+    advertisedAgents = discoverAgents(advertisedContext.cwd, "both", advertisedContext.model?.provider, { globalNpmRoot: globalRoot, projectTrusted: advertisedContext.projectTrusted }).agents.filter((agent) => agent.advertise === true);
   };
   const beginAdvertisement = (ctx) => {
     const generation = ++advertisementGeneration;
@@ -495,9 +339,9 @@ export default function registerSubagentExtension(dm) {
       notifySessionChange = resolve;
     });
     advertisedAgents = [];
-    advertisedContext = { cwd: ctx.cwd, model: ctx.model };
+    advertisedContext = { cwd: ctx.cwd, model: ctx.model, projectTrusted: typeof ctx.isProjectTrusted === "function" ? ctx.isProjectTrusted() : undefined };
     globalRoot = null;
-    advertisementReady = resolveGlobalNpmRoot().catch(() => null).then((root) => {
+    advertisementReady = resolveGlobalNpmRoot().then((root) => {
       if (generation !== advertisementGeneration)
         return;
       globalRoot = root;
@@ -509,8 +353,11 @@ export default function registerSubagentExtension(dm) {
       return { error };
     });
   };
+  const activeAsyncJobCount = () => [...state.asyncJobs.values()].filter((job) => job.status === "queued" || job.status === "running").length;
   const hasResultDeliveryDemand = () => {
-    if ([...state.asyncJobs.values()].some((job) => job.status === "queued" || job.status === "running"))
+    if (owedResultRunIds.size > 0)
+      return true;
+    if (activeAsyncJobCount() > 0)
       return true;
     if (state.foregroundControls.size > 0)
       return true;
@@ -518,10 +365,10 @@ export default function registerSubagentExtension(dm) {
       return true;
     return missionObserverResultCandidateFiles(DIRS.results).length > 0;
   };
-  const discoverAgentsForRuntime = (cwd, scope, preferredModelProvider) => {
+  const discoverAgentsForRuntime = (cwd, scope, preferredModelProvider, options = {}) => {
     if (listRuntimeAgentConfigs(dm).length === 0)
-      return discoverAgents(cwd, scope, preferredModelProvider, { globalNpmRoot: globalRoot });
-    const snapshot = discoverAgentSnapshot(cwd, scope, preferredModelProvider, { includeChains: false, globalNpmRoot: globalRoot });
+      return discoverAgents(cwd, scope, preferredModelProvider, { globalNpmRoot: globalRoot, projectTrusted: options.projectTrusted });
+    const snapshot = discoverAgentSnapshot(cwd, scope, preferredModelProvider, { includeChains: false, globalNpmRoot: globalRoot, projectTrusted: options.projectTrusted });
     const discovered = snapshot.effective;
     const all = snapshot.all;
     const configuredAgents = [
@@ -530,7 +377,7 @@ export default function registerSubagentExtension(dm) {
       ...all.user,
       ...all.project
     ];
-    const merged = mergeRuntimeAgents(dm, discovered, configuredAgents, { cwd, scope, preferredModelProvider });
+    const merged = mergeRuntimeAgents(dm, discovered, configuredAgents, { cwd, scope: discovered.scope, preferredModelProvider, projectTrusted: options.projectTrusted });
     if (discovered.maxThinking === undefined)
       return merged;
     return {
@@ -538,14 +385,31 @@ export default function registerSubagentExtension(dm) {
       agents: merged.agents.map((agent) => agent.maxThinking === discovered.maxThinking ? agent : { ...agent, maxThinking: discovered.maxThinking })
     };
   };
+  const programStatus = registerProgramStatusReporter({
+    enabled: config.programStatus !== false,
+    getJobs: () => new Map([...state.fleetJobs ?? [], ...state.asyncJobs]).values(),
+    getPendingRequests: () => supervisorChannel.pending.values()
+  });
   const { ensurePoller, refreshWidget, handleStarted, handleComplete, resetJobs, restoreActiveJobs, dispose: disposeAsyncJobTracker } = createAsyncJobTracker(dm, state, DIRS.async, {
     widgetEnabled: asyncWidgetEnabled,
-    onJobTerminal: () => refreshResultDelivery(),
-    supervisorRequestState: supervisorChannel.getSupervisorRequestState
+    widgetCollapsed: asyncWidgetCollapsed,
+    widgetLayout: asyncWidgetLayout,
+    onJobTerminal: (job) => {
+      holdOwedResult(job);
+      refreshResultDelivery();
+    },
+    onJobCleanup: (asyncId) => deliveredRunIds.delete(asyncId),
+    supervisorRequestState: supervisorChannel.getSupervisorRequestState,
+    onJobsChanged: programStatus.sync
   });
-  const resultWatcher = createResultWatcher(dm, state, DIRS.results, 10 * 60 * 1000, {
+  const resultWatcher = createResultWatcher(dm, state, DIRS.results, 600000, {
     notifier: completionNotifier,
     ownership: resultDeliveryOwnership,
+    onResultDelivered: (runId) => {
+      owedResultRunIds.delete(runId);
+      if (state.asyncJobs.has(runId))
+        deliveredRunIds.add(runId);
+    },
     observeCompletion: (result) => scheduledRunManager.handleAsyncCompletion(result),
     observedCompletionRunIds: () => scheduledRunManager.observedCompletionRunIds(),
     hasDeliveryDemand: hasResultDeliveryDemand,
@@ -590,6 +454,7 @@ export default function registerSubagentExtension(dm) {
   };
   const executorDeps = {
     dm,
+    parentWake,
     state,
     config,
     asyncByDefault,
@@ -614,12 +479,34 @@ export default function registerSubagentExtension(dm) {
     refreshResultDelivery: () => refreshResultDelivery(),
     trackRetainedNestedRoute: undefined
   };
-  const executor = createSubagentExecutor(executorDeps);
-  executorScheduled = executor.executeScheduled;
-  dm.registerMessageRenderer(SUPERVISOR_REQUEST_MESSAGE_TYPE, renderSupervisorRequest);
+  let executor;
+  let executorPromise;
+  let executorModulePromise;
+  const loadExecutorModule = () => executorModulePromise ??= import("../runs/foreground/subagent-executor.js");
+  const getExecutor = () => {
+    executorPromise ??= loadExecutorModule().then(({ createSubagentExecutor }) => {
+      executor = createSubagentExecutor(executorDeps);
+      return executor;
+    });
+    return executorPromise;
+  };
+  let modulePreloadTimer;
+  const scheduleModulePreload = () => {
+    if (executorModulePromise || modulePreloadTimer)
+      return;
+    modulePreloadTimer = setTimeout(() => {
+      loadExecutorModule().catch(() => {});
+      if (fleetViewEnabled)
+        import("../tui/fleet.js").catch(() => {});
+    }, MODULE_PRELOAD_DELAY_MS);
+    modulePreloadTimer.unref?.();
+  };
+  for (const customType of SUBAGENT_MESSAGE_TYPES)
+    dm.registerMessageRenderer(customType, renderSubagentMessage);
   const registerEntryRenderer = dm.registerEntryRenderer;
   if (typeof registerEntryRenderer === "function") {
-    registerEntryRenderer.call(dm, SUPERVISOR_REPLY_ENTRY_TYPE, renderSupervisorReply);
+    for (const customType of SUBAGENT_ENTRY_TYPES)
+      registerEntryRenderer.call(dm, customType, renderSubagentEntry);
   }
   dm.registerMessageRenderer(SLASH_RESULT_TYPE, (message, options, theme) => {
     const details = resolveSlashMessageDetails(message.details);
@@ -632,68 +519,9 @@ export default function registerSubagentExtension(dm) {
 `);
     return new Text(content, 0, 0);
   });
-  dm.registerMessageRenderer("subagent-notify", (message, options, theme) => {
-    const content = typeof message.content === "string" ? message.content : "";
-    const details = message.details ?? parseSubagentNotifyContent(content);
-    if (!details)
-      return new Text(content, 0, 0);
-    const icon = details.status === "completed" ? theme.fg("success", "✓") : details.status === "paused" ? theme.fg("warning", "■") : theme.fg("error", "✗");
-    const parts = [];
-    if (details.taskInfo)
-      parts.push(details.taskInfo);
-    if (details.durationMs !== undefined)
-      parts.push(formatDuration(details.durationMs));
-    let text = `${icon} ${theme.bold(details.agent)} ${theme.fg("dim", details.status)}`;
-    if (parts.length > 0)
-      text += ` ${theme.fg("dim", "·")} ${parts.map((part) => theme.fg("dim", part)).join(` ${theme.fg("dim", "·")} `)}`;
-    const trimmedPreview = details.resultPreview.trim();
-    const previewLines = options.expanded ? trimmedPreview.split(`
-`).filter((line) => line.trim()) : [trimmedPreview.split(`
-`, 1)[0] ?? ""].filter((line) => line.trim());
-    for (const line of previewLines.length > 0 ? previewLines : ["(no output)"]) {
-      text += `
-  ${theme.fg("dim", `⎿  ${line}`)}`;
-    }
-    if (!options.expanded && trimmedPreview.includes(`
-`)) {
-      const expandKey = keyText("app.tools.expand");
-      text += `
-  ${theme.fg("dim", `${expandKey} full notification`)}`;
-    }
-    if (details.workflowRunId) {
-      text += `
-  ${theme.fg("muted", `workflow: ${details.workflowRunId}`)}`;
-    }
-    if (details.childRuns?.length) {
-      text += `
-  ${theme.fg("muted", `children: ${details.childRuns.map((child) => `${child.workflowKey ?? child.agent ?? "child"}=${child.runId}`).join(", ")}`)}`;
-    }
-    if (details.reconciledFromDetachedChild) {
-      text += `
-  ${theme.fg("muted", `reconciled child: ${details.reconciledFromDetachedChild}`)}`;
-    }
-    if (details.sessionLabel && details.sessionValue) {
-      text += `
-  ${theme.fg("muted", `${details.sessionLabel}: ${shortenPath(details.sessionValue)}`)}`;
-    }
-    return new Text(text, 0, 0);
-  });
-  dm.registerMessageRenderer(SUBAGENT_STEERING_MESSAGE_TYPE, (message, _options, theme) => {
-    const details = message.details;
-    if (!details)
-      return;
-    return new Text(theme.fg(details.state === "recovered" ? "warning" : "error", formatSteeringNotice(details)), 0, 0);
-  });
-  dm.registerMessageRenderer(SUBAGENT_CONTROL_MESSAGE_TYPE, (message, _options, theme) => {
-    const details = message.details;
-    if (!details?.event)
-      return;
-    const content = typeof message.content === "string" ? message.content : undefined;
-    return new SubagentControlNoticeComponent({ ...details, noticeText: formatSubagentControlNotice(details, content) }, theme);
-  });
   const executeSubagentReady = async (id, params, signal, onUpdate, ctx) => {
     await waitForAdvertisement();
-    return executor.executePublic(id, params, signal, onUpdate, ctx);
+    return (await getExecutor()).executePublic(id, params, signal, onUpdate, ctx);
   };
   const executeSubagentCollapsed = (id, params, signal, onUpdate, ctx) => {
     if (ctx.hasUI)
@@ -713,24 +541,27 @@ export default function registerSubagentExtension(dm) {
       if (ctx.hasUI)
         ctx.ui.setToolsExpanded(false);
       await waitForAdvertisement();
-      return executor.executeDelegated(requestId, params, signal, onUpdate, ctx);
+      return (await getExecutor()).executeDelegated(requestId, params, signal, onUpdate, ctx);
     }
   });
+  const disabledFeatures = resolveDisabledFeatureSurface(config);
   const rpcBridge = registerSubagentRpcBridge({
     events: dm.events,
     getContext: () => state.lastUiContext,
     execute: executeSubagentReady,
-    state
+    state,
+    disabledFeatures
   });
-  const parameters = createSubagentParamsSchema();
+  const parameters = createSubagentParamsSchema(disabledFeatures);
   const tool = {
     name: "subagent",
+    ...MODEL_ONLY_TOOL,
     label: "Subagent",
-    description: buildSubagentToolDescription(config),
-    ...buildSubagentToolPromptMetadata(config),
+    description: buildSubagentToolDescription(config, { disabledFeatures }),
+    ...buildSubagentToolPromptMetadata(config, disabledFeatures),
     parameters,
     async execute(id, params, signal, onUpdate, ctx) {
-      return finalizeToolResult(await executeSubagentCollapsed(id, params, signal ?? new AbortController().signal, onUpdate, ctx));
+      return finalizeToolResult(await executeSubagentCollapsed(id, flattenSubagentToolOptions(params, disabledFeatures), signal ?? new AbortController().signal, onUpdate, ctx));
     },
     renderCall(args, theme) {
       const gap = " ".repeat(config.mainWindowRenderer?.horizontalSpacing ?? 1);
@@ -739,10 +570,9 @@ export default function registerSubagentExtension(dm) {
         const target = args.agent || "";
         return new Text(`${title}${gap}${args.action}${target ? `${gap}${theme.fg("accent", target)}` : ""}`, 0, 0);
       }
-      if (args.workflowScript)
-        return new Text(`${title}${gap}${formatWorkflowManifest(args.workflowScript, args.async, false, args.preflight)}`, 0, 0);
-      if (args.workflowScriptPath)
-        return new Text(`${title}${gap}${theme.fg("accent", args.workflowScriptPath)}${args.async === true ? `${gap}${theme.fg("warning", "[async]")}` : ""}${args.preflight !== undefined ? `${gap}${theme.fg("dim", formatWorkflowPreflightCall(args.preflight))}` : ""}`, 0, 0);
+      const preflight = args.options?.preflight ?? args.preflight;
+      if (args.workflow !== undefined)
+        return new Text(`${title}${gap}${theme.fg("accent", args.workflow === true || args.workflow === "true" ? "workflow (reply block)" : `workflow ${String(args.workflow)}`)}${args.async === true ? `${gap}${theme.fg("warning", "[async]")}` : ""}${preflight !== undefined ? `${gap}${theme.fg("dim", formatWorkflowPreflightCall(preflight))}` : ""}`, 0, 0);
       const asyncLabel = args.async === true ? `${gap}${theme.fg("warning", "[async]")}` : "";
       return new Text(`${title}${gap}${theme.fg("accent", args.agent || "?")}${asyncLabel}`, 0, 0);
     },
@@ -752,42 +582,59 @@ export default function registerSubagentExtension(dm) {
       return summaryInlineToolDisplay ? renderSubagentSummary(renderedResult, options, theme) : renderSubagentResult(renderedResult, options, theme, undefined, config.mainWindowRenderer, config.foregroundDetachShortcut);
     }
   };
-  dm.registerTool(tool);
+  registerPinnedTool(dm, tool);
   dm.on("before_agent_start", async (event, ctx) => {
     await waitForAdvertisement();
-    const selectedTools = event.systemPromptOptions?.selectedTools ?? (typeof dm.getActiveTools === "function" ? dm.getActiveTools() : []);
+    if (event.systemPromptOptions.selectedTools && !event.systemPromptOptions.selectedTools.includes("subagent"))
+      return;
     const sessionId = state.currentSessionId ?? resolveCurrentSessionId(ctx.sessionManager);
-    const advertisedPrompt = Array.isArray(selectedTools) && selectedTools.includes("subagent") ? buildAdvertisedAgentPrompt(advertisedAgents, resolveCurrentSubagentCapabilityCeiling(sessionId)) : undefined;
-    const systemPrompt = appendAdvertisedAgentPrompt(event.systemPrompt, advertisedPrompt);
-    if (systemPrompt !== event.systemPrompt)
-      return { systemPrompt };
+    const catalog = buildAdvertisedAgentCatalog(advertisedAgents, resolveCurrentSubagentCapabilityCeiling(sessionId), recordedPromptSection(dm, "advertised_subagents"));
+    if (catalog) {
+      const options = event.systemPromptOptions;
+      if (options.sections)
+        options.sections.advertised_subagents = catalog;
+      else
+        options.appendSystemPrompt = [options.appendSystemPrompt, catalog].filter(Boolean).join(`
+
+`);
+    }
   });
   registerWaitTool(dm, state, waitToolConfig.enabled, waitSubscriptionManager, waitToolConfig.defaultTimeoutMs, undefined, supervisorChannel.hasPendingRequests);
   dm.on("agent_end", async (_event, ctx) => {
-    if (!ctx.hasUI)
-      await drainOutstandingWork({ state, events: dm.events, hasPendingSupervisorRequest: supervisorChannel.hasPendingRequests });
-    const ownerSessionId = state.currentSessionId;
-    if (!ownerSessionId)
-      return;
-    goalTurnId += 1;
     try {
-      const location = resolveMissionStoreLocation({ projectRoot: state.baseCwd, ...config.missions ? { config: config.missions } : {} });
-      const retainedChildren = listRetainedChildren(DIRS.async, ownerSessionId);
-      for (const notice of collectGoalContinuationNotices({ location, ownerSessionId, retainedChildren, turnId: goalTurnId })) {
-        handleSubagentControlNotice({
-          dm,
-          state,
-          visibleControlNotices: new Set,
-          details: { source: "goal", event: notice.event, noticeText: notice.message }
-        });
+      if (ctx.hasUI && ctx.signal?.aborted) {
+        parentWake.userAborted();
+        const active = activeAsyncJobCount();
+        if (active > 0)
+          ctx.ui.notify(`${active} background subagent run${active === 1 ? " is" : "s are"} still active · /subagents-stop`, "info");
+      }
+      if (!ctx.hasUI)
+        await drainOutstandingWork({ state, events: dm.events, hasPendingSupervisorRequest: supervisorChannel.hasPendingRequests }).then(resultWatcher.deliverPendingResults);
+    } finally {
+      const ownerSessionId = state.currentSessionId;
+      if (ownerSessionId) {
+        goalTurnId += 1;
+        try {
+          const location = resolveMissionStoreLocation({ projectRoot: state.baseCwd, ...config.missions ? { config: config.missions } : {} });
+          const retainedChildren = listRetainedChildren(DIRS.async, ownerSessionId);
+          for (const notice of collectGoalContinuationNotices({ location, ownerSessionId, retainedChildren, turnId: goalTurnId })) {
+            handleSubagentControlNotice({
+              dm: parentWake,
+              state,
+              visibleControlNotices: new Set,
+              details: { source: "goal", event: notice.event, noticeText: notice.message }
+            });
+          }
+        } catch (error) {
+          console.error("Failed to evaluate goal missions:", error);
+        }
       }
-    } catch (error) {
-      console.error("Failed to evaluate goal missions:", error);
     }
   });
   const disposeSlashCommands = registerSlashCommands(dm, state, {
     fleetKeybindings: config.fleetKeybindings,
-    foregroundDetachShortcut: config.foregroundDetachShortcut
+    foregroundDetachShortcut: config.foregroundDetachShortcut,
+    workflowScriptsDisabled: disabledFeatures.features.has("workflow-scripts")
   });
   let visibleControlNotices = new Set;
   const activeHerdrRuns = () => projectActiveHerdrRuns(state);
@@ -801,14 +648,14 @@ export default function registerSubagentExtension(dm) {
   });
   const controlEventHandler = (payload) => {
     handleSubagentControlNotice({
-      dm,
+      dm: parentWake,
       state,
       visibleControlNotices,
       details: payload
     });
   };
   const steeringNoticeHandler = (payload) => {
-    handleSubagentSteeringNotice({ dm, state, details: payload });
+    handleSubagentSteeringNotice({ dm: parentWake, state, details: payload });
   };
   const asyncStartedHandler = (payload) => {
     handleStarted(payload);
@@ -818,6 +665,9 @@ export default function registerSubagentExtension(dm) {
   };
   const asyncCompleteHandler = (payload) => {
     handleComplete(payload);
+    const job = state.asyncJobs.get(payload?.id ?? "");
+    if (job && job.status !== "queued" && job.status !== "running" && fs.existsSync(resultFilePath(DIRS.results, job.asyncId)))
+      holdOwedResult(job);
     refreshResultDelivery();
     refreshActiveAsyncCapacity();
     scheduledRunManager.handleAsyncCompletion(payload);
@@ -825,6 +675,7 @@ export default function registerSubagentExtension(dm) {
   };
   const eventUnsubscribes = [
     registerRuntimeAgentEventListener(dm),
+    registerInspectorEventListener(dm),
     dm.events.on(SUBAGENT_ASYNC_STARTED_EVENT, asyncStartedHandler),
     dm.events.on(SUBAGENT_ASYNC_COMPLETE_EVENT, asyncCompleteHandler),
     dm.events.on(SUBAGENT_PROCESS_TERMINAL_EVENT, () => {
@@ -891,6 +742,8 @@ export default function registerSubagentExtension(dm) {
     state.currentSessionId = resolveCurrentSessionId(ctx.sessionManager);
     state.supervisorOwnerSessionId = ctx.sessionManager.getSessionId() || null;
     transitionResultDelivery();
+    owedResultRunIds.clear();
+    deliveredRunIds.clear();
     state.parentSessionFile = ctx.sessionManager.getSessionFile();
     state.trustedSessionFileRoot = state.parentSessionFile ? path.join(getAgentDir(), "sessions") : undefined;
     state.trustedSessionRoots = [...new Set([
@@ -951,15 +804,23 @@ export default function registerSubagentExtension(dm) {
   const runtimeEntry = {
     sessionManager: null,
     visibleControlNotices,
-    cleanup() {
+    cleanup(shutdownReason) {
       if (runtimeCleaned)
         return;
       runtimeCleaned = true;
+      programStatus.dispose(shutdownReason);
       releaseHostSessionLiveness();
       releaseHostSessionLiveness = () => {};
+      for (const control of state.foregroundControls.values()) {
+        try {
+          control.stopForRuntimeReplacement?.();
+        } catch (error) {
+          console.error(`Failed to stop detached foreground run ${control.runId}:`, error);
+        }
+      }
       for (const controller of state.workflowControllers?.values() ?? []) {
         if (!controller.signal.aborted)
-          controller.abort(new Error("Workflow stopped because the extension session was replaced or reloaded."));
+          controller.abort(runtimeReplacedAbortReason());
       }
       state.workflowControllers?.clear();
       state.workflowChildStops?.clear();
@@ -970,6 +831,9 @@ export default function registerSubagentExtension(dm) {
       if (asyncRetentionTimer)
         clearTimeout(asyncRetentionTimer);
       asyncRetentionTimer = undefined;
+      if (modulePreloadTimer)
+        clearTimeout(modulePreloadTimer);
+      modulePreloadTimer = undefined;
       asyncRetentionAbort.abort();
       stopResultWatcher();
       resultDeliveryOwnership.clear();
@@ -1043,12 +907,22 @@ export default function registerSubagentExtension(dm) {
       } catch {}
     }
   };
+  let compactionResumeTimer;
+  const cancelCompactionResume = () => {
+    clearTimeout(compactionResumeTimer);
+    compactionResumeTimer = undefined;
+  };
   dm.on("agent_start", () => {
+    cancelCompactionResume();
+    parentWake.agentStarted();
     resumeWidgetsAfterCompaction();
     herdrStatusBridge.agentStarted();
+    programStatus.agentStarted();
   });
+  dm.on("message_start", (event) => completionNotifier.messageStarted(event.message));
   dm.on("agent_end", () => {
     resumeWidgetsAfterCompaction();
+    programStatus.agentSettled();
   });
   dm.on("session_before_compact", (event) => {
     if (event.reason !== "manual")
@@ -1057,18 +931,37 @@ export default function registerSubagentExtension(dm) {
   dm.on("session_compact", (event) => {
     if (event.reason !== "manual")
       return;
-    const hasActiveAsyncWork = [...state.asyncJobs.values()].some((job) => job.status === "queued" || job.status === "running");
-    if (!hasActiveAsyncWork || !withLastUiContext(() => true))
+    if (activeAsyncJobCount() === 0 || !withLastUiContext(() => true))
       return;
-    dm.sendMessage({
-      customType: "subagent-compaction-resume",
-      content: "Compaction is complete. Resume the parent task now; background subagent results will arrive separately when ready.",
-      display: false
-    }, { triggerTurn: true });
+    cancelCompactionResume();
+    const sessionId = state.currentSessionId;
+    const deadline = Date.now() + COMPACTION_RESUME_DEADLINE_MS;
+    const resumeWhenIdle = () => {
+      if (state.currentSessionId !== sessionId || activeAsyncJobCount() === 0)
+        return;
+      const idle = withLastUiContext((ctx) => ctx.isIdle());
+      if (idle === undefined)
+        return;
+      if (!idle) {
+        if (Date.now() < deadline)
+          compactionResumeTimer = setTimeout(resumeWhenIdle, COMPACTION_RESUME_POLL_MS);
+        return;
+      }
+      parentWake.releaseHold();
+      parentWake.sendMessage({
+        customType: "subagent-compaction-resume",
+        content: "Compaction is complete. Resume the parent task now; background subagent results will arrive separately when ready.",
+        display: false
+      }, { triggerTurn: true });
+    };
+    compactionResumeTimer = setTimeout(resumeWhenIdle, COMPACTION_RESUME_POLL_MS);
   });
   dm.on("session_start", (event, ctx) => {
+    parentWake.bindSession(ctx);
+    completionNotifier.bindSession(ctx.sessionManager);
     installRuntime(ctx);
     startSessionMaintenance();
+    scheduleModulePreload();
     const recovering = event.reason === "startup" || event.reason === "reload" || event.reason === "resume";
     resetSessionState(ctx, recovering, event.previousSessionFile);
     releaseHostSessionLiveness();
@@ -1077,7 +970,7 @@ export default function registerSubagentExtension(dm) {
     const liveness = sessionId ? registerPiWebSessionLiveness({
       sessionId,
       ...sessionFile ? { sessionFile } : {},
-      isActive: () => hasLiveSubagentWork(state) || completionNotifier.hasPendingDelivery()
+      isActive: () => owedResultRunIds.size > 0 || hasLiveSubagentWork(state) || completionNotifier.hasPendingDelivery() || parentWake.isPending()
     }) : { registered: false, release: () => {} };
     releaseHostSessionLiveness = liveness.release;
     if (liveness.registered) {
@@ -1088,12 +981,16 @@ export default function registerSubagentExtension(dm) {
       hasUI: ctx.hasUI === true,
       runs: activeHerdrRuns()
     });
+    programStatus.sessionStarted({ hasUI: ctx.hasUI === true, mode: ctx.mode });
     rpcBridge.emitReady(ctx);
     supervisorChannel.start();
     supervisorChannel.activateTransport();
   });
-  dm.on("session_shutdown", async () => {
-    runtimeEntry.cleanup();
+  dm.on("session_shutdown", async (event) => {
+    cancelCompactionResume();
+    completionNotifier.sessionShutdown(event?.reason);
+    parentWake.sessionShutdown(event?.reason);
+    runtimeEntry.cleanup(event?.reason);
     try {
       await disposeChildSessions();
     } catch (error) {
@@ -1101,8 +998,10 @@ export default function registerSubagentExtension(dm) {
     }
     await herdrStatusBridge.flush();
   });
+  dm.on("session_start", (_event, ctx) => void showUpgradeNotice(ctx).catch((error) => console.error("Failed to show the dm-subagents upgrade notice:", error)));
   dm.on("session_start", (_event, ctx) => beginAdvertisement(ctx));
   registerSubagentToolActivation(dm, {
+    mode: config.toolActivation,
     advertisedPrompt: async () => {
       await waitForAdvertisement();
       return buildAdvertisedAgentPrompt(advertisedAgents, resolveCurrentSubagentCapabilityCeiling(state.currentSessionId ?? undefined));