@duckmind/dm-darwin-x64 0.66.5 → 0.66.6

package/extensions/dm-subagents/src/runs/background/result-watcher.js

@@ -17,7 +17,7 @@ import { projectNestedRegistryForRoot, sanitizeSummary } from "../shared/nested-
 import { resolveWatchPath } from "../../shared/utils.js";
 import { recordWaitCompletion } from "./wait-completions.js";
 import { MISSION_BINDING_FILE, syncMissionFromAsyncCompletion } from "../../missions/lifecycle.js";
-import { missionObserverResultCandidateFiles, promotePendingResultFile, removeMissionObserverIndex, removeResultIndex, resultCandidateFilesForSession, resultPayloadPathForIndexedRun, resultPayloadPathForMissionObserverRun, resultPayloadPathForSessionRun, writeAsyncResultFile, writeResultIndexForData } from "./result-files.js";
+import { acknowledgeMissionObserverSnapshot, missionObserverResultCandidateFiles, promotePendingResultFile, readResultPayload, resultCandidateFilesForSession, resultPayloadPathForIndexedRun, resultPayloadPathForMissionObserverRun, resultPayloadPathForSessionRun, resultSnapshotReplaced, retireResultSnapshot, withResultRunLease, writeAsyncResultFile, writeResultIndexForData } from "./result-files.js";
 const WATCHER_RESTART_DELAY_MS = 3000;
 const POLL_INTERVAL_MS = 3000;
 const HEALTHY_SCAN_INTERVAL_MS = 60000;
@@ -78,19 +78,16 @@ function shouldPoll(error) {
 function hasDeliveredNotification(data) {
   return typeof data.notificationDeliveredAt === "number" && Number.isFinite(data.notificationDeliveredAt);
 }
-function resultPayloadWasReplaced(delivered, disk) {
-  if (!disk)
-    return false;
-  const deliveredState = typeof delivered.state === "string" ? delivered.state : undefined;
-  if (disk.state && deliveredState && disk.state !== deliveredState)
-    return true;
-  const deliveredTimestamp = typeof delivered.timestamp === "number" && Number.isFinite(delivered.timestamp) ? delivered.timestamp : undefined;
-  return disk.timestamp !== undefined && deliveredTimestamp !== undefined && disk.timestamp !== deliveredTimestamp;
-}
-function markDeliveredNotification(resultPath, data, runId, now) {
-  const marked = { ...data, runId, notificationDeliveredAt: now };
-  writeAsyncResultFile(resultPath, marked);
-  return marked;
+function markDeliveredNotification(resultPath, data, read, now) {
+  const marked = { ...data, runId: read.runId, notificationDeliveredAt: now };
+  return withResultRunLease(path.dirname(resultPath), read.runId, () => {
+    if (resultSnapshotReplaced(resultPath, read))
+      return;
+    const { state } = writeAsyncResultFile(resultPath, marked);
+    const snapshot = JSON.stringify(marked, null, 2);
+    const stalePublic = state === "pending" ? readResultPayload(resultPath) : undefined;
+    return { data: marked, read: { ...read, snapshot, stalePublic } };
+  });
 }
 export function createResultWatcher(dm, state, resultsDir, completionTtlMs, deps = {}) {
   const fsApi = deps.fs ?? fs;
@@ -100,6 +97,8 @@ export function createResultWatcher(dm, state, resultsDir, completionTtlMs, deps
   const deliverIntercomResults = deps.deliverIntercomResults !== false;
   const pendingTriggerTurn = new Map;
   const processing = new Set;
+  const handling = new Set;
+  let deliveringPending = 0;
   const identityCache = new Map;
   let deliveryActive = true;
   let deliveryEpoch = 0;
@@ -216,19 +215,16 @@ export function createResultWatcher(dm, state, resultsDir, completionTtlMs, deps
       return true;
     return Boolean(deps.observeCompletion && !deps.observedCompletionRunIds);
   };
-  const removeDeliveredResult = (file, sessionId, runId, toolCallId) => {
+  const removeDeliveredResult = (file, triggerTurn, read) => {
+    identityCache.delete(file);
     try {
-      if (publicResultFileExists(file))
-        fsApi.unlinkSync(publicResultPath(file));
-      identityCache.delete(file);
-      removeResultIndex(resultsDir, sessionId, runId, toolCallId);
-      return true;
+      if (retireResultSnapshot(publicResultPath(file), read) === "replaced")
+        scheduleResult(file, triggerTurn);
     } catch (error) {
-      if (!isAbsentResultCandidate(error)) {
-        console.error(`Failed to remove delivered subagent result '${publicResultPath(file)}'; will retry:`, error);
-        return false;
-      }
-      return true;
+      if (isAbsentResultCandidate(error))
+        return;
+      console.error(`Failed to remove delivered subagent result '${publicResultPath(file)}'; will retry:`, error);
+      scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
     }
   };
   const handleResult = async (file, triggerTurn) => {
@@ -252,32 +248,24 @@ export function createResultWatcher(dm, state, resultsDir, completionTtlMs, deps
     processing.add(file);
     let rereadReplacedPayload = false;
     let resultPath = publicResultPath(file);
-    const readPublicResultIdentity = () => {
-      if (!publicResultFileExists(file))
-        return;
-      const parsed = JSON.parse(fsApi.readFileSync(publicResultPath(file), "utf-8"));
-      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed))
-        return;
-      const record = parsed;
-      const state = typeof record.state === "string" && record.state ? record.state : undefined;
-      const timestamp = typeof record.timestamp === "number" && Number.isFinite(record.timestamp) ? record.timestamp : undefined;
-      if (!state && timestamp === undefined)
-        return;
-      return { state, timestamp };
+    let publicAtRead;
+    const readPayload = (payloadPath) => {
+      publicAtRead = readResultPayload(publicResultPath(file));
+      return fsApi.readFileSync(payloadPath, "utf-8");
     };
     try {
       const payloadPath = resultPayloadPath(file, observed);
       if (!payloadPath)
         return;
       resultPath = payloadPath;
-      let raw = fsApi.readFileSync(resultPath, "utf-8");
+      let raw = readPayload(resultPath);
       let identity = resultFileIdentity(raw, file);
       if (identity.sessionId && identity.runId) {
         const pendingState = promotePendingResultFile(resultsDir, identity.sessionId, identity.runId, file);
         if (pendingState === "promoted") {
           identityCache.delete(file);
           resultPath = publicResultPath(file);
-          raw = fsApi.readFileSync(resultPath, "utf-8");
+          raw = readPayload(resultPath);
           identity = resultFileIdentity(raw, file);
         } else if (pendingState === "pending") {
           const pendingPath = resultPayloadPathForSessionRun(resultsDir, identity.sessionId, identity.runId);
@@ -286,32 +274,31 @@ export function createResultWatcher(dm, state, resultsDir, completionTtlMs, deps
             return;
           }
           resultPath = pendingPath;
-          raw = fsApi.readFileSync(resultPath, "utf-8");
+          raw = readPayload(resultPath);
           identity = resultFileIdentity(raw, file);
         }
       }
       let data = parseResult(raw);
+      if (typeof data.sessionId !== "string" || !data.sessionId)
+        return;
+      const sessionId = data.sessionId;
+      const completionOwnerId = data.completionOwnerId;
+      const runId = typeof data.runId === "string" && data.runId ? data.runId : typeof data.id === "string" && data.id ? data.id : file.replace(/\.json$/i, "");
+      const toolCallId = typeof data.toolCallId === "string" ? data.toolCallId : undefined;
+      let read = { runId, sessionId, toolCallId, snapshot: raw, ...publicAtRead !== undefined && publicAtRead !== raw ? { stalePublic: publicAtRead } : {} };
       const markReplacedPayload = () => {
         try {
-          if (!resultPayloadWasReplaced(data, readPublicResultIdentity()))
+          if (!resultSnapshotReplaced(publicResultPath(file), read))
             return false;
         } catch (error) {
           if (isAccessDenied(error))
             throw error;
-          if (isAbsentResultCandidate(error))
-            return false;
           console.error(`Failed to re-read subagent result file '${publicResultPath(file)}':`, error);
         }
         identityCache.delete(file);
         rereadReplacedPayload = true;
         return true;
       };
-      if (typeof data.sessionId !== "string" || !data.sessionId)
-        return;
-      const sessionId = data.sessionId;
-      const completionOwnerId = data.completionOwnerId;
-      const runId = typeof data.runId === "string" && data.runId ? data.runId : typeof data.id === "string" && data.id ? data.id : file.replace(/\.json$/i, "");
-      const toolCallId = typeof data.toolCallId === "string" ? data.toolCallId : undefined;
       let observerSucceeded = true;
       try {
         syncMissionFromAsyncCompletion({ ...data, runId });
@@ -325,8 +312,15 @@ export function createResultWatcher(dm, state, resultsDir, completionTtlMs, deps
         observerSucceeded = false;
         console.error(`Completion observer failed for '${resultPath}':`, error);
       }
-      if (observerSucceeded)
-        removeMissionObserverIndex(resultsDir, runId);
+      if (observerSucceeded) {
+        try {
+          if (acknowledgeMissionObserverSnapshot(publicResultPath(file), read) === "replaced")
+            rereadReplacedPayload = true;
+        } catch (error) {
+          observerSucceeded = false;
+          console.error(`Failed to acknowledge the mission observer for '${resultPath}'; will retry:`, error);
+        }
+      }
       const epoch = deliveryEpoch;
       if (!ownsCompletion(sessionId, completionOwnerId, epoch))
         return;
@@ -359,12 +353,12 @@ export function createResultWatcher(dm, state, resultsDir, completionTtlMs, deps
           return;
         if (markReplacedPayload())
           return;
+        deps.onResultDelivered?.(runId);
         if (!completionPersisted) {
           scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
           return;
         }
-        if (!removeDeliveredResult(file, sessionId, runId, toolCallId))
-          scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
+        removeDeliveredResult(file, triggerTurn, read);
         return;
       }
       const hasResultChildren = Array.isArray(data.results) && data.results.length > 0;
@@ -395,6 +389,7 @@ ${baseOutput}` : ""}` : output;
             processSignal: result.processSignal
           }),
           outputState: result.outputState === "present" || result.outputState === "absent" || result.outputState === "unknown" ? result.outputState : "unknown",
+          ...result.outputPartial === true ? { outputPartial: true } : {},
           summary,
           index,
           artifactPath: result.artifactPaths?.outputPath,
@@ -413,12 +408,12 @@ ${baseOutput}` : ""}` : output;
           return;
         if (markReplacedPayload())
           return;
+        deps.onResultDelivered?.(runId);
         if (!completionPersisted) {
           scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
           return;
         }
-        if (!removeDeliveredResult(file, sessionId, runId, toolCallId))
-          scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
+        removeDeliveredResult(file, triggerTurn, read);
         return;
       }
       const intercomTarget = data.intercomTarget?.trim();
@@ -440,7 +435,7 @@ ${baseOutput}` : ""}` : output;
         if (!intercomDelivered)
           console.error(`Subagent async grouped result intercom delivery was not acknowledged for '${resultPath}'.`);
       }
-      const accepted = await notifier.deliver({
+      const delivery = notifier.deliver({
         ...data,
         id: data.id ?? runId,
         runId,
@@ -460,6 +455,9 @@ ${baseOutput}` : ""}` : output;
           })) : []
         } : {}
       });
+      if (deliveringPending > 0)
+        notifier.flush?.();
+      const accepted = await delivery;
       if (!ownsCompletion(sessionId, completionOwnerId, epoch))
         return;
       if (!accepted) {
@@ -468,9 +466,15 @@ ${baseOutput}` : ""}` : output;
       }
       if (markReplacedPayload())
         return;
+      deps.onResultDelivered?.(runId);
       try {
-        data = markDeliveredNotification(publicResultPath(file), data, runId, Date.now());
+        const marked = markDeliveredNotification(publicResultPath(file), data, read, Date.now());
         identityCache.delete(file);
+        if (!marked) {
+          rereadReplacedPayload = true;
+          return;
+        }
+        ({ data, read } = marked);
       } catch (error) {
         console.error(`Failed to mark subagent result notification delivered for '${resultPath}'; will retry:`, error);
         scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
@@ -510,8 +514,7 @@ ${baseOutput}` : ""}` : output;
         scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
         return;
       }
-      if (!removeDeliveredResult(file, sessionId, runId, toolCallId))
-        scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
+      removeDeliveredResult(file, triggerTurn, read);
     } catch (error) {
       if (isAccessDenied(error)) {
         console.error(`Failed to process subagent result file '${resultPath}'; will retry:`, error);
@@ -524,11 +527,14 @@ ${baseOutput}` : ""}` : output;
         scheduleResult(file, triggerTurn);
     }
   };
-  state.resultFileCoalescer = createFileCoalescer((file) => {
+  const resultFileCoalescer = createFileCoalescer((file) => {
     const triggerTurn = pendingTriggerTurn.get(file) !== false;
     pendingTriggerTurn.delete(file);
-    handleResult(file, triggerTurn);
+    const run = handleResult(file, triggerTurn);
+    handling.add(run);
+    run.finally(() => handling.delete(run));
   }, deps.coalesceDelayMs ?? 50);
+  state.resultFileCoalescer = resultFileCoalescer;
   const logScanStats = (stats) => {
     const elapsed = Date.now() - stats.startedAt;
     if (elapsed < SLOW_RESULT_SCAN_MS)
@@ -556,9 +562,9 @@ ${baseOutput}` : ""}` : output;
       files.add(`${runId}.json`);
     return [...files];
   };
-  const primeExistingResults = (options = {}) => {
+  const eligibleResultFiles = () => {
+    const files = [];
     try {
-      const triggerTurn = options.triggerTurn !== false;
       const stats = { files: 0, scheduled: 0, startedAt: Date.now() };
       const observed = observedRunIds();
       for (const file of indexedResultCandidates(observed)) {
@@ -569,13 +575,34 @@ ${baseOutput}` : ""}` : output;
         if (!shouldProcessResult(file, observed, signature))
           continue;
         stats.scheduled += 1;
-        scheduleResult(file, triggerTurn);
+        files.push(file);
       }
       logScanStats(stats);
     } catch (error) {
       if (!isNotFound(error))
         console.error(`Failed to scan subagent result index in '${resultsDir}':`, error);
     }
+    return files;
+  };
+  const primeExistingResults = (options = {}) => {
+    const triggerTurn = options.triggerTurn !== false;
+    for (const file of eligibleResultFiles())
+      scheduleResult(file, triggerTurn);
+  };
+  const deliverPendingResults = async () => {
+    if (!deliveryActive)
+      return;
+    deliveringPending += 1;
+    try {
+      notifier.flush?.();
+      for (const file of eligibleResultFiles()) {
+        scheduleResult(file, true);
+        resultFileCoalescer.flush(file);
+      }
+      await Promise.allSettled([...handling]);
+    } finally {
+      deliveringPending -= 1;
+    }
   };
   const clearResultScan = () => {
     if (resultScanTimer)
@@ -708,7 +735,7 @@ ${baseOutput}` : ""}` : output;
     processing.clear();
     identityCache.clear();
   };
-  return { startResultWatcher, transitionResultDelivery, primeExistingResults, stopResultWatcher, refreshResultDelivery: () => {
+  return { startResultWatcher, transitionResultDelivery, primeExistingResults, deliverPendingResults, stopResultWatcher, refreshResultDelivery: () => {
     primeExistingResults();
     startDemandPolling();
   } };

package/extensions/dm-subagents/src/runs/background/resume-guidance.js

@@ -21,8 +21,8 @@ export function formatAsyncReviveCommand(run) {
   } catch {
     return;
   }
-  const index = run.steps.length === 1 ? "" : `, index: ${step.index}`;
-  return `subagent({ action: "resume", id: "${run.id}"${index}, message: "Continue from the persisted child session and report the result." })`;
+  const index = run.steps.length === 1 ? "" : `, options: { index: ${step.index} }`;
+  return `subagent({ action: "resume", id: "${run.id}", message: "Continue from the persisted child session and report the result."${index} })`;
 }
 export function formatResumeFirstFailedRunDetail(run) {
   if (run.state !== "failed")

package/extensions/dm-subagents/src/runs/background/run-child-session.js

@@ -1,4 +1,5 @@
 import { extractTextFromContent, extractToolArgsPreview, getFinalOutput, hasEmptyTerminalAssistantResponse } from "../../shared/utils.js";
+import { qualifyModelWithProvider } from "../../shared/model-info.js";
 import {
   acceptChildWatchdogEvent,
   applyChildWatchdogMessage,
@@ -11,6 +12,7 @@ import { formatChildModelResolutionDiagnostic, isChildModelResolutionFailure } f
 import { isMutatingTool, resolveCurrentPath } from "../shared/long-running-guard.js";
 import { effectiveToolTimeoutMs, formatToolTimeoutMessage, toolTimeoutCallKey } from "../shared/tool-timeout.js";
 import { createReportedChildSessionInput } from "../shared/child-launch.js";
+import { createPartialOutputTracker, formatPartialOutput } from "../shared/partial-output.js";
 import { childSessionHasQueuedMessages, projectChildSessionEventForJson } from "../shared/child-session.js";
 import { reconcileAttemptUsage } from "../shared/usage-reconciliation.js";
 import { formatSteerMessage } from "../shared/subagent-prompt-runtime.js";
@@ -47,6 +49,7 @@ export function runChildSession(input) {
     let assistantError;
     let interrupted = false;
     let timedOut = false;
+    const partialOutput = createPartialOutputTracker();
     let stopped = false;
     let observedMutationAttempt = false;
     let structuredOutputToolInvoked = false;
@@ -74,7 +77,7 @@ export function runChildSession(input) {
     let childWatchdogState;
     const childLifecycleState = { compactionRetryActive: false };
     const timeoutMessage = () => input.timeoutMessage ?? "Subagent timed out.";
-    const stopMessage = () => input.stopMessage ?? "Subagent stopped by user.";
+    const stopMessage = () => input.stopMessage ?? "Subagent stopped.";
     let activeToolSequence = 0;
     const activeToolCalls = new Map;
     const activeToolKeysByName = new Map;
@@ -285,11 +288,15 @@ export function runChildSession(input) {
     const processEvent = (raw) => {
       if (settled)
         return;
+      partialOutput.observe(raw);
       const event = raw;
       appendChildEvent(projectChildSessionEventForJson(raw));
       input.transcriptWriter?.writeChildEvent(projectChildSessionEventForJson(raw));
-      if (event.type === "compaction_start")
+      if (event.type === "compaction_start") {
         compactionStartedReceived = true;
+        if (agentSettledReceived)
+          afterCompactionSettlement = true;
+      }
       if (event.type === "compaction_end" && event.willRetry === true) {
         compactionStartedReceived = false;
         afterCompactionSettlement = false;
@@ -384,9 +391,9 @@ export function runChildSession(input) {
           return;
         const hasToolCall = assistantStartsToolCall(event.message);
         if (event.message.model) {
-          model = event.message.model;
+          model = qualifyModelWithProvider(event.message.model, event.message.provider, input.modelVerificationRegistry) ?? event.message.model;
           if (input.expectedModelForVerification && !hasToolCall) {
-            const modelVerificationError = formatSubagentModelVerificationError(input.expectedModelForVerification, event.message.model, input.modelVerificationRegistry, input.modelResponseAliases);
+            const modelVerificationError = formatSubagentModelVerificationError(input.expectedModelForVerification, event.message.model, input.modelVerificationRegistry, input.modelResponseAliases, session?.virtualModelId);
             if (modelVerificationError && !error)
               error = modelVerificationError;
           }
@@ -417,7 +424,7 @@ export function runChildSession(input) {
         }
       }
     };
-    const finish = () => {
+    const finish = async () => {
       clearFinalDrainTimers();
       clearWatchdogTailTimer();
       clearAllToolTimeouts();
@@ -431,9 +438,18 @@ export function runChildSession(input) {
       input.registerSteer?.(undefined);
       input.registerWatchdogStatus?.(undefined);
       unsubscribe?.();
-      return Promise.resolve().then(() => session?.dispose()).catch(() => {
+      let commandError;
+      if (!interrupted && !timedOut && !stopped) {
+        try {
+          await session?.finishCommands?.();
+        } catch (error) {
+          commandError = error instanceof Error ? error.message : String(error);
+        }
+      }
+      await Promise.resolve().then(() => session?.dispose()).catch(() => {
         return;
       });
+      return commandError;
     };
     const failUnconsumedSteers = () => {
       for (const entry of acceptedSteers.splice(0)) {
@@ -447,7 +463,10 @@ export function runChildSession(input) {
       failUnconsumedSteers();
       const terminalUsage = session && messageBaseline !== undefined ? reconcileAttemptUsage(usage, session.messages, messageBaseline) : usage;
       const closed = finish();
-      const finalOutput = getFinalOutput(messages);
+      const completedOutput = getFinalOutput(messages);
+      const partialCause = timedOut ? "timeout" : promptError !== undefined && !stopped && !interrupted ? "child error" : undefined;
+      const streamedPartial = partialCause ? partialOutput.text() : undefined;
+      const finalOutput = partialCause && streamedPartial ? formatPartialOutput(streamedPartial, partialCause) : completedOutput;
       let finalError = error ?? assistantError;
       const promptErrorMessage = promptError === undefined ? undefined : promptError instanceof Error ? promptError.message : String(promptError);
       if (!finalError && promptErrorMessage !== undefined) {
@@ -463,8 +482,12 @@ ${formatChildModelResolutionDiagnostic({ agent: input.launch.config.agent, model
       if (!finalError && forced && !forcedDrainAfterFinalSuccess && !interrupted && !timedOut && !stopped) {
         finalError = "Subagent session did not settle after it was aborted.";
       }
-      const exitCode = timedOut || stopped ? 1 : interrupted || forcedDrainAfterFinalSuccess && !forcedDrainAfterEmptyTerminal ? 0 : finalError || promptError !== undefined ? 1 : 0;
-      closed.then(() => {
+      let exitCode = timedOut || stopped ? 1 : interrupted || forcedDrainAfterFinalSuccess && !forcedDrainAfterEmptyTerminal ? 0 : finalError || promptError !== undefined ? 1 : 0;
+      closed.then((commandError) => {
+        if (commandError) {
+          finalError ??= commandError;
+          exitCode = 1;
+        }
         const result = omitUndefined({
           exitCode,
           messages,
@@ -473,9 +496,10 @@ ${formatChildModelResolutionDiagnostic({ agent: input.launch.config.agent, model
           durationMs: Date.now() - startedAt,
           model,
           nativeMachine: session?.machineEvidence ? { provider: "herdr", machineId: session.machineEvidence.machineId, ...session.machineEvidence.initial ? { initialGit: session.machineEvidence.initial } : {}, ...session.machineEvidence.final ? { finalGit: session.machineEvidence.final } : {} } : undefined,
-          error: stopped ? stopMessage() : timedOut ? error ?? timeoutMessage() : interrupted || forcedDrainAfterFinalSuccess && !forcedDrainAfterEmptyTerminal ? undefined : finalError,
+          error: stopped ? stopMessage() : timedOut ? error ?? timeoutMessage() : interrupted || forcedDrainAfterFinalSuccess && !forcedDrainAfterEmptyTerminal && !commandError ? undefined : finalError,
           finalOutput: (timedOut || stopped) && !finalOutput.trim() ? stopped ? stopMessage() : error ?? timeoutMessage() : finalOutput,
           outputState: finalOutput.trim() ? "present" : "absent",
+          outputPartial: partialCause && streamedPartial ? true : undefined,
           interrupted: interrupted || undefined,
           timedOut: timedOut || undefined,
           stopped: stopped || undefined,

package/extensions/dm-subagents/src/runs/background/run-id-resolver.js

@@ -5,6 +5,7 @@ import { readStatus } from "../../shared/utils.js";
 import { findAsyncRunPrefixMatches } from "./async-resume.js";
 import { resultCandidateFilesForToolCall, resultFilePath, resultPayloadPathForIndexedRun } from "./result-files.js";
 import { readActiveRunToolCallIndex } from "./active-run-index.js";
+import { readTerminalRunToolCallIndex } from "./terminal-run-index.js";
 import { assertSafeNestedId, findNestedRunMatchesById } from "../shared/nested-events.js";
 function exactAsyncLocation(id, asyncDirRoot, resultsDir) {
   const asyncDir = path.join(asyncDirRoot, id);
@@ -43,7 +44,7 @@ function toolCallIdMatches(value, query) {
 }
 function indexedToolCallIdAsyncLocations(toolCallId, asyncDirRoot, resultsDir) {
   const byId = new Map;
-  for (const entry of readActiveRunToolCallIndex(asyncDirRoot, toolCallId)) {
+  for (const entry of [...readActiveRunToolCallIndex(asyncDirRoot, toolCallId), ...readTerminalRunToolCallIndex(asyncDirRoot, toolCallId)]) {
     const asyncDir = path.join(asyncDirRoot, entry);
     const status = readStatus(asyncDir);
     if (!status || !toolCallIdMatches(status.toolCallId, toolCallId))
@@ -131,14 +132,15 @@ export function resolveSubagentRunId(id, deps = {}) {
   const exactAsync = exactAsyncLocation(id, asyncDirRoot, resultsDir);
   if (exactAsync)
     return { kind: "async", id, location: exactAsync };
+  const toolCallMatches = new Map(indexedToolCallIdAsyncLocations(id, asyncDirRoot, resultsDir).map((match) => [match.id, match]));
   const exactLiveToolCallMatch = exactLiveAsyncToolCallMatch(deps.state, id, asyncDirRoot, resultsDir);
   if (exactLiveToolCallMatch)
-    return { kind: "async", id: exactLiveToolCallMatch.id, location: exactLiveToolCallMatch.location };
-  const exactToolCallIdMatches = indexedToolCallIdAsyncLocations(id, asyncDirRoot, resultsDir);
-  if (exactToolCallIdMatches.length > 1)
+    toolCallMatches.set(exactLiveToolCallMatch.id, exactLiveToolCallMatch);
+  if (toolCallMatches.size > 1)
     throw new Error(`Subagent tool-call id '${id}' is ambiguous across async runs. Use the returned asyncId instead.`);
-  if (exactToolCallIdMatches[0])
-    return { kind: "async", id: exactToolCallIdMatches[0].id, location: exactToolCallIdMatches[0].location };
+  const [toolCallMatch] = toolCallMatches.values();
+  if (toolCallMatch)
+    return { kind: "async", id: toolCallMatch.id, location: toolCallMatch.location };
   const nestedScope = deps.nested ?? nestedScopeFromState(deps.state);
   const exactNested = findNestedRunMatchesById(id, nestedScope ? { scope: nestedScope } : {});
   if (exactNested.length > 1)

package/extensions/dm-subagents/src/runs/background/run-status.js

@@ -33,6 +33,9 @@ import { formatTimeoutRecoveryLines } from "../shared/mutation-evidence.js";
 import { formatWorkflowChecklistText, projectWorkflowChecklist } from "../../workflows/workflow-checklist.js";
 import { validHostStepNodes } from "../shared/host-step-status.js";
 import { workflowAsyncChildSteeringGuidance } from "../shared/workflow-async-child-guidance.js";
+import { formatWorkflowKeyRevival, projectWorkflowKeyRevival } from "../../workflows/workflow-revival.js";
+import { capSummaryOutputs } from "../shared/single-output.js";
+const STRUCTURED_PREVIEW_WITH_PATH_CHARS = 500;
 function formatProcessTerminal(value) {
   if (!value)
     return "missing";
@@ -120,7 +123,7 @@ function formatResumeGuidance(runId, children, fallbackSessionFile, options = {}
   }
   const childWithSession = knownChildren.find(({ child }) => hasExistingSessionFile(child.sessionFile));
   if (childWithSession) {
-    return `Revive child: subagent({ action: "resume", id: "${runId}", index: ${childWithSession.index}, message: "..." })`;
+    return `Revive child: subagent({ action: "resume", id: "${runId}", message: "...", options: { index: ${childWithSession.index} } })`;
   }
   return "Resume: unavailable; no child session file was persisted.";
 }
@@ -211,15 +214,15 @@ function formatRememberedForegroundStatus(run) {
   }
   lines.push("", `Status: subagent({ action: "status", id: "${run.runId}" })`);
   if (run.children.length === 1)
-    lines.push(`Transcript: subagent({ action: "status", id: "${run.runId}", view: "transcript" })`);
+    lines.push(`Transcript: subagent({ action: "status", id: "${run.runId}", options: { view: "transcript" } })`);
   else
-    lines.push(`Transcript: subagent({ action: "status", id: "${run.runId}", index: 0, view: "transcript" })`);
+    lines.push(`Transcript: subagent({ action: "status", id: "${run.runId}", options: { index: 0, view: "transcript" } })`);
   const detached = run.children.some((child) => child.status === "detached");
   const resumable = run.children.find((child) => hasExistingSessionFile(child.sessionFile));
   if (detached) {
     lines.push(`Recovery: reply to the supervisor request first, then wait with bg_wait({ id: "${run.runId}" }); do not resume or launch a replacement while any child remains detached.`);
   } else if (resumable) {
-    lines.push(run.children.length === 1 ? `Revive: subagent({ action: "resume", id: "${run.runId}", message: "..." })` : `Revive child: subagent({ action: "resume", id: "${run.runId}", index: ${resumable.index}, message: "..." })`);
+    lines.push(run.children.length === 1 ? `Revive: subagent({ action: "resume", id: "${run.runId}", message: "..." })` : `Revive child: subagent({ action: "resume", id: "${run.runId}", message: "...", options: { index: ${resumable.index} } })`);
   } else {
     lines.push("Resume: unavailable; no child session file was persisted.");
   }
@@ -373,7 +376,7 @@ export function inspectSubagentStatus(params, deps = {}) {
         if (runs.length === 1)
           return inspectSubagentStatus({ ...params, id: runs[0].id }, deps);
         return {
-          content: [{ type: "text", text: runs.length === 0 ? "No active async run transcript is available." : `Transcript view requires an id when ${runs.length} active async runs exist. Use subagent({ action: "status", view: "fleet" }) to choose one.` }],
+          content: [{ type: "text", text: runs.length === 0 ? "No active async run transcript is available." : `Transcript view requires an id when ${runs.length} active async runs exist. Use subagent({ action: "status", options: { view: "fleet" } }) to choose one.` }],
           isError: true,
           details: { mode: "single", results: [] }
         };
@@ -587,6 +590,7 @@ Extensions denied: ${status.capabilityCeiling.denyExtensions ? "yes" : "no"} (so
         status.parentWorkflowRunId ? `Workflow parent: ${status.parentWorkflowRunId}${status.workflowKey ? ` (${status.workflowKey})` : ""}` : undefined,
         status.mode === "workflow" && workflowReturnPreview !== undefined ? `Return: ${workflowReturnPreview}` : undefined,
         status.mode === "workflow" && workflowEmitPreview !== undefined ? `Latest emit: ${workflowEmitPreview}` : undefined,
+        status.mode === "workflow" && (workflowReturnPreview?.endsWith("…") || workflowEmitPreview?.endsWith("…")) ? `Full return value and emits: ${path.join(asyncDir, "status.json")} (workflow.value, workflow.emits)` : undefined,
         `Progress: ${progressLabel}`,
         ...status.mode === "workflow" ? formatWorkflowChecklistText(projectWorkflowChecklist({
           graph: status.workflowGraph,
@@ -623,7 +627,12 @@ Extensions denied: ${status.capabilityCeiling.denyExtensions ? "yes" : "no"} (so
         lines.push(`${stepLineLabel(status, index)}: ${phase}${display} ${step.status}${modelText}${stepActivityText ? `, ${stepActivityText}` : ""}${steeringSuffix}${acceptanceText}${budgetText}${errorText}`);
         if (status.mode === "workflow" && step.runId)
           lines.push(`  Child run: ${step.runId}`);
-        const structuredOutputPreview = step.structuredOutput === undefined ? undefined : formatWorkflowJsonPreview(step.structuredOutput, 4000);
+        if (status.mode === "workflow" && step.runId && step.workflowKey && step.status === "failed") {
+          const revival = projectWorkflowKeyRevival(asyncDirRoot, status.runId, step.workflowKey, step.runId);
+          if (revival)
+            lines.push(`  ${formatWorkflowKeyRevival(revival)}`);
+        }
+        const structuredOutputPreview = step.structuredOutput === undefined ? undefined : formatWorkflowJsonPreview(step.structuredOutput, step.structuredOutputPath ? STRUCTURED_PREVIEW_WITH_PATH_CHARS : 4000);
         if (structuredOutputPreview !== undefined)
           lines.push(`  Structured output: ${structuredOutputPreview}`);
         if (step.structuredOutputPath)
@@ -671,7 +680,7 @@ Extensions denied: ${status.capabilityCeiling.denyExtensions ? "yes" : "no"} (so
             lines.push(`  Result artifact: ${step.externalJob.resultArtifactPath}`);
           if ((step.status === "complete" || step.status === "completed") && step.externalJob?.state === "completed" && step.externalJob.providerJobId && externalJobFollowUpSupported(step.runner.provider)) {
             hasExternalJobFollowUpHint = true;
-            lines.push(`  Follow-up: subagent({ action: "resume", id: "${status.runId}", index: ${index}, message: "..." })`);
+            lines.push(`  Follow-up: subagent({ action: "resume", id: "${status.runId}", message: "...", options: { index: ${index} } })`);
           }
         }
         lines.push(...formatNestedRunStatusLines(step.children, { indent: "  ", commandHints: true, maxLines: 20 }));
@@ -680,7 +689,7 @@ Extensions denied: ${status.capabilityCeiling.denyExtensions ? "yes" : "no"} (so
           lines.push(`  Output: ${stepOutputPath}`);
         if (step.status === "running" && step.runner?.type !== "external-cli" && step.runner?.type !== "external-job" && status.mode !== "workflow") {
           lines.push(`  Intercom target: ${resolveSubagentIntercomTarget(status.runId, step.agent, index)} (if registered)`);
-          lines.push(`  Steer: subagent({ action: "steer", id: "${status.runId}", index: ${index}, message: "..." })`);
+          lines.push(`  Steer: subagent({ action: "steer", id: "${status.runId}", message: "...", options: { index: ${index} } })`);
         } else if (step.status === "running" && (step.runner?.type === "external-cli" || step.runner?.type === "external-job")) {
           lines.push("  Steer: unavailable; external runners do not accept live messages.");
         }
@@ -700,7 +709,7 @@ Extensions denied: ${status.capabilityCeiling.denyExtensions ? "yes" : "no"} (so
         else
           for (const control of liveWorkflowControls) {
             for (const index of [...control.activeChildren.keys()].sort((left, right) => left - right)) {
-              lines.push(`Steer live foreground child: subagent({ action: "steer", id: "${control.runId}", index: ${index}, message: "..." })`);
+              lines.push(`Steer live foreground child: subagent({ action: "steer", id: "${control.runId}", message: "...", options: { index: ${index} } })`);
             }
           }
         lines.push(...workflowAsyncChildSteeringGuidance(status, deps.state));
@@ -722,7 +731,7 @@ Extensions denied: ${status.capabilityCeiling.denyExtensions ? "yes" : "no"} (so
       if (fs.existsSync(eventsPath))
         lines.push(`Events: ${eventsPath}`);
       return { content: [{ type: "text", text: lines.join(`
-`) }], details: { mode: "single", results: [], ...status.workflowReceiptPath ? { workflowReceiptPath: status.workflowReceiptPath } : {}, ...status.preflight ? { preflight: status.preflight } : {}, ...status.workflow?.preflightWarnings?.length ? { preflightWarnings: status.workflow.preflightWarnings } : {}, ...workflowChildren ? { workflowChildren } : {}, ...workflowTerminalProof ? { workflowTerminalProof } : {}, ...runFanoutBudget ? { runFanoutBudget } : {}, ...processTerminal ? { lifecycleStatus: { processTerminal } } : {} } };
+`) }], details: { mode: "single", runId: status.runId, ...status.toolCallId ? { toolCallId: status.toolCallId } : {}, results: [], ...status.workflowReceiptPath ? { workflowReceiptPath: status.workflowReceiptPath } : {}, ...status.preflight ? { preflight: status.preflight } : {}, ...status.workflow?.preflightWarnings?.length ? { preflightWarnings: status.workflow.preflightWarnings } : {}, ...workflowChildren ? { workflowChildren } : {}, ...workflowTerminalProof ? { workflowTerminalProof } : {}, ...runFanoutBudget ? { runFanoutBudget } : {}, ...processTerminal ? { lifecycleStatus: { processTerminal } } : {} } };
     }
   }
   if (resultPath) {
@@ -768,22 +777,23 @@ Extensions denied: ${status.capabilityCeiling.denyExtensions ? "yes" : "no"} (so
       lines.push(...formatTimeoutRecoveryLines(data.timeoutRecovery, "  "));
       for (const [index, child] of children.entries()) {
         const structuredOutput = child.structuredOutput;
-        const structuredOutputPreview = structuredOutput === undefined ? undefined : formatWorkflowJsonPreview(structuredOutput, 4000);
+        const structuredOutputPath = child.structuredOutputPath;
+        const hasStructuredOutputPath = typeof structuredOutputPath === "string" && structuredOutputPath.trim() !== "";
+        const structuredOutputPreview = structuredOutput === undefined ? undefined : formatWorkflowJsonPreview(structuredOutput, hasStructuredOutputPath ? STRUCTURED_PREVIEW_WITH_PATH_CHARS : 4000);
         if (structuredOutputPreview !== undefined)
           lines.push(`  Structured output${children.length > 1 ? ` (${index + 1})` : ""}: ${structuredOutputPreview}`);
-        const structuredOutputPath = child.structuredOutputPath;
-        if (typeof structuredOutputPath === "string" && structuredOutputPath.trim())
+        if (hasStructuredOutputPath)
           lines.push(`  Structured output path${children.length > 1 ? ` (${index + 1})` : ""}: ${structuredOutputPath}`);
         lines.push(...formatTimeoutRecoveryLines(child.timeoutRecovery, "  "));
       }
       lines.push(formatResumeGuidance(runId, children, data.sessionFile, { stopped: status === "stopped" }));
       if (data.summary)
-        lines.push("", data.summary);
+        lines.push("", capSummaryOutputs(data.summary, data.results));
       const workflowChildren = parseWorkflowChildSummary(data.workflowChildren);
       if (workflowChildren && workflowChildren.workflowRunId !== runId)
         throw new Error("workflowChildren.workflowRunId does not match the result run id.");
       return { content: [{ type: "text", text: lines.join(`
-`) }], details: { mode: "single", results: [], ...workflowReceiptPath ? { workflowReceiptPath } : {}, ...workflowChildren ? { workflowChildren } : {} } };
+`) }], details: { mode: "single", ...runId ? { runId } : {}, ...data.toolCallId ? { toolCallId: data.toolCallId } : {}, results: [], ...workflowReceiptPath ? { workflowReceiptPath } : {}, ...workflowChildren ? { workflowChildren } : {} } };
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       return {