@duckmind/dm-darwin-x64 0.66.5 → 0.66.7

package/extensions/dm-subagents/src/runs/background/subagent-runner.js

@@ -5,17 +5,17 @@ import { performance } from "node:perf_hooks";
 import { pathToFileURL } from "node:url";
 import { installRunnerHttpDispatcher } from "./runner-http-dispatcher.js";
 import { writeAtomicJson } from "../../shared/atomic-json.js";
-import { writeAsyncResultFile, writePendingAsyncResultFile } from "./result-files.js";
+import { withResultRunLease, writeAsyncResultFile, writePendingAsyncResultFile } from "./result-files.js";
 import { createFileCoalescer } from "../../shared/file-coalescer.js";
 import { createCapacityResilientJsonWriter } from "../../shared/capacity-resilient-json.js";
 import { isStorageCapacityError } from "../../shared/file-system-retry.js";
 import { updateActiveRunIndex } from "./active-run-index.js";
 import { createChildTranscriptWriter } from "../../shared/child-transcript.js";
-import { closeSteerInbox, consumeInterruptRequest, consumeSteerRequests, consumeStopRequestPayloads, deliverInterruptRequest, deliverStopRequest, deliverTimeoutRequest, watchAsyncControlInbox } from "./control-channel.js";
+import { closeSteerInbox, closeStopInbox, consumeInterruptRequest, consumeSteerRequests, consumeStopRequestPayloads, deliverInterruptRequest, deliverStopRequest, deliverTimeoutRequest, watchAsyncControlInbox } from "./control-channel.js";
 import { appendJsonl as appendRawJsonl, formatOutputArtifactContent, getArtifactPaths, writeArtifact, writeMetadata } from "../../shared/artifacts.js";
 import { DM_CODING_AGENT_PACKAGE, resolveInstalledPiPackageRoot } from "../shared/dm-spawn.js";
 import { preflightLaunchCwd } from "../shared/launch-cwd.js";
-import { captureSingleOutputSnapshot, extractChildWrittenOutput, finalizeSingleOutput, formatSavedOutputReference, injectOutputPathSystemPrompt, injectSingleOutputInstruction, resolveSingleOutput } from "../shared/single-output.js";
+import { captureSingleOutputSnapshot, extractChildWrittenOutput, finalizeSingleOutput, formatSavedOutputReference, injectSingleOutputInstruction, resolveSingleOutput } from "../shared/single-output.js";
 import { runSetupCommand } from "../shared/worktree-setup-command.js";
 import {
   DEFAULT_MAX_OUTPUT,
@@ -44,6 +44,7 @@ import {
 import { applyThinkingSuffix, projectLaunchResolvedChildExtensions, resolvePiLaunchToolPlan } from "../shared/child-tool-plan.js";
 import { buildRunnerChildLaunch } from "./runner-child-launch.js";
 import { normalizeExtensionBindings } from "../shared/extension-bindings.js";
+import { dmRetryDelay, implementationMutationError, implementationToolsError } from "../../shared/dm-safeguards.js";
 import { runChildSession } from "./run-child-session.js";
 import { loadRunnerChildSessionFactory } from "./runner-child-sessions.js";
 import { SUBAGENT_CHILD_ENV } from "../shared/child-runtime-config.js";
@@ -60,8 +61,10 @@ import { nestedSummaryFromAsyncStatus, projectNestedEvents, resolveNestedAsyncDi
 import { isContextOverflow } from "../shared/model-resolution.js";
 import { processTerminalPath, writeProcessTerminalCandidate } from "./process-terminal.js";
 import { persistRunnerStartupFailure } from "./runner-startup-failure.js";
+import { currentPidNamespaceScope } from "./pid-namespace.js";
 import { createSteeringStatus, recordSteeringRequest, steeringStatus, terminalSteeringNoticeState, unconsumedSteerReason, updateSteeringTarget } from "./steering.js";
 import { PROMPT_REDACTED, detectSubagentError, extractTextFromContent, extractToolArgsPreview, formatEmptyTerminalAssistantResponseError, getAgentDir, hasEmptyTerminalAssistantResponse, readStatus } from "../../shared/utils.js";
+import { planBackgroundRunHistory, recordRun } from "../shared/run-history.js";
 import { planAbortRecovery } from "../shared/abort-recovery.js";
 import {
   createMutatingFailureState,
@@ -86,7 +89,7 @@ import {
   formatWorktreeTaskCwdConflict,
   WORKTREE_AGENT_CWD_PLACEHOLDER
 } from "../shared/worktree.js";
-import { findModelInfo, resolveEffectiveThinking } from "../../shared/model-info.js";
+import { findModelInfo, qualifyModelWithProvider, resolveEffectiveThinking } from "../../shared/model-info.js";
 import { assertThinkingWithinCeiling } from "../../shared/thinking-ceiling.js";
 import { resolveLaunchBinding } from "../../shared/launch-contract.js";
 import { writeInitialProgressFile } from "../../shared/settings.js";
@@ -482,7 +485,7 @@ export async function runSingleStepInner(step, ctx) {
       } catch {}
       const stopped = importStopped || imported.stopped === true || ctx.stopSignal?.aborted === true;
       const timedOut = !stopped && (importTimedOut || imported.timedOut === true || ctx.timeoutSignal?.aborted === true || ctx.skipAcceptance?.() === true);
-      const message = stopped ? ctx.stopMessage ?? "Subagent stopped by user." : ctx.timeoutMessage ?? "Subagent timed out.";
+      const message = stopped ? ctx.stopMessage ?? "Subagent stopped." : ctx.timeoutMessage ?? "Subagent timed out.";
       return omitUndefinedProperties({
         agent: imported.agent,
         output: timedOut || stopped ? message : imported.output,
@@ -525,6 +528,7 @@ export async function runSingleStepInner(step, ctx) {
       fast: step.fast,
       model: step.model,
       mcpDirectTools: step.mcpDirectTools,
+      builtinMcpTools: step.builtinMcpTools,
       cwd: step.cwd ?? ctx.cwd,
       requireReadTool: Boolean(step.skills?.length),
       structuredOutput: Boolean(effectiveStructuredOutput),
@@ -574,7 +578,7 @@ ${PROMPT_REDACTED}; live Prompt Audit only.
       await ctx.prepareExternalActivity?.(externalCwd, externalAbortSignal);
     if (externalAbortSignal?.aborted) {
       const stopped = ctx.stopSignal?.aborted === true;
-      const message = stopped ? ctx.stopMessage ?? "Subagent stopped by user." : ctx.timeoutMessage ?? "Subagent timed out.";
+      const message = stopped ? ctx.stopMessage ?? "Subagent stopped." : ctx.timeoutMessage ?? "Subagent timed out.";
       return omitUndefinedProperties({ agent: step.agent, context: step.context, output: message, error: message, exitCode: 1, stopped: stopped || undefined, timedOut: stopped ? undefined : true });
     }
     if (step.machine) {
@@ -607,7 +611,7 @@ ${PROMPT_REDACTED}; live Prompt Audit only.
           else if (raced.kind === "timeout")
             settled = createHerdrExternalAdapter(step.runner.adapter).normalize(evidenceInput, "Placed external run timed out; truthful pane retained for inspection.");
           else
-            return { agent: step.agent, context: step.context, output: "Placed external run stopped by user.", outputState: "present", exitCode: 1, stopped: true, runner, execution: { status: "stopped", success: false, exitCode: 1, stopped: true } };
+            return { agent: step.agent, context: step.context, output: "Placed external run stopped.", outputState: "present", exitCode: 1, stopped: true, runner, execution: { status: "stopped", success: false, exitCode: 1, stopped: true } };
         } catch (error) {
           retain = true;
           settled = await settleHerdrExternalRunnerError(error, step.runner.adapter, evidenceInput, () => session.retain());
@@ -619,7 +623,7 @@ ${PROMPT_REDACTED}; live Prompt Audit only.
         const resolvedOutput = step.outputPath ? resolveSingleOutput(step.outputPath, output, outputSnapshot, step.outputClaimPath) : { fullOutput: output };
         const outputReference = resolvedOutput.savedPath ? formatSavedOutputReference(resolvedOutput.savedPath, resolvedOutput.fullOutput) : undefined;
         const finalizedOutput = finalizeSingleOutput(omitUndefinedProperties({ fullOutput: resolvedOutput.fullOutput, outputPath: step.outputPath, outputMode: step.outputMode, exitCode: 1, preserveSavedOutput: true, savedPath: resolvedOutput.savedPath, outputReference, saveError: resolvedOutput.saveError }));
-        const artifactErrors = artifactPaths && ctx.artifactConfig?.enabled !== false ? persistStepArtifacts({ artifactPaths, artifactConfig: ctx.artifactConfig, output: formatOutputArtifactContent(omitUndefinedProperties({ output: resolvedOutput.fullOutput, metadataPath: ctx.artifactConfig?.includeMetadata === false ? undefined : artifactPaths.metadataPath })), metadata: { runId: ctx.id, agent: step.agent, task: PROMPT_REDACTED, runner, placement: session.owner.identity, settlement: settled.settlement, outcome: settled.outcome, timestamp: Date.now() } }) : {};
+        const artifactErrors = artifactPaths && ctx.artifactConfig?.enabled !== false ? persistStepArtifacts({ artifactPaths, artifactConfig: ctx.artifactConfig, output: formatOutputArtifactContent(omitUndefinedProperties({ output: resolvedOutput.fullOutput, metadataPath: ctx.artifactConfig?.includeMetadata === false ? undefined : artifactPaths.metadataPath })), metadata: { runId: ctx.id, parentSessionId: step.parentSessionId, agent: step.agent, task: PROMPT_REDACTED, runner, placement: session.owner.identity, settlement: settled.settlement, outcome: settled.outcome, timestamp: Date.now() } }) : {};
         return omitUndefinedProperties({ agent: step.agent, ...childSessionName ? { sessionName: childSessionName } : {}, context: step.context, output: finalizedOutput.displayOutput, outputState: output.trim() ? "present" : "absent", exitCode: 1, error: resolvedOutput.fatalError ? resolvedOutput.saveError : undefined, timedOut, stopped, artifactPaths, outputSaveError: [resolvedOutput.saveError, artifactErrors.outputSaveError].filter(Boolean).join(`
 `) || undefined, metadataSaveError: artifactErrors.metadataSaveError, runner, execution: { status: "partial", success: false, exitCode: 1 } });
       } catch (error) {
@@ -634,7 +638,7 @@ ${PROMPT_REDACTED}; live Prompt Audit only.
           await session.dispose();
       }
     }
-    const adapterLaunch = step.runner.adapter === "codex-exec" || step.runner.adapter === "codex-exec-writer" ? resolveCodexExecLaunch({ adapter: step.runner.adapter, command: step.runner.command, asyncDir: path.dirname(ctx.outputFile), stepIndex: ctx.flatIndex }) : step.runner.adapter === "claude-code" || step.runner.adapter === "claude-code-writer" ? resolveClaudeCodeLaunch({ adapter: step.runner.adapter, command: step.runner.command }) : step.runner.adapter === "cursor-agent" || step.runner.adapter === "cursor-agent-writer" ? resolveCursorAgentLaunch({ adapter: step.runner.adapter, command: step.runner.command, cwd: externalCwd, asyncDir: path.dirname(ctx.outputFile), stepIndex: ctx.flatIndex }) : undefined;
+    const adapterLaunch = step.runner.adapter === "codex-exec" || step.runner.adapter === "codex-exec-writer" ? resolveCodexExecLaunch({ adapter: step.runner.adapter, command: step.runner.command, asyncDir: path.dirname(ctx.outputFile), stepIndex: ctx.flatIndex }) : step.runner.adapter === "claude-code" || step.runner.adapter === "claude-code-writer" ? resolveClaudeCodeLaunch({ adapter: step.runner.adapter, command: step.runner.command, overrideArgs: step.claudeCodeOverrideArgs }) : step.runner.adapter === "cursor-agent" || step.runner.adapter === "cursor-agent-writer" ? resolveCursorAgentLaunch({ adapter: step.runner.adapter, command: step.runner.command, cwd: externalCwd, asyncDir: path.dirname(ctx.outputFile), stepIndex: ctx.flatIndex }) : undefined;
     const runner = resolveExternalCliRunnerStatus({ ...step.runner, ...adapterLaunch ? { args: adapterLaunch.args } : {}, ...step.machine ? { machine: step.machine } : {} });
     const outputSnapshot = captureSingleOutputSnapshot(step.outputPath);
     const onExternalOutput = (chunk) => {
@@ -688,7 +692,7 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
       artifactPaths,
       artifactConfig: ctx.artifactConfig,
       output: formatOutputArtifactContent(omitUndefinedProperties({ output: resolvedOutput.fullOutput, error: external.error, metadataPath: ctx.artifactConfig?.includeMetadata === false ? undefined : artifactPaths.metadataPath })),
-      metadata: { runId: ctx.id, agent: step.agent, task: PROMPT_REDACTED, runner, externalProcess, exitCode: external.exitCode, error: external.error, timestamp: Date.now() }
+      metadata: { runId: ctx.id, parentSessionId: step.parentSessionId, agent: step.agent, task: PROMPT_REDACTED, runner, externalProcess, exitCode: external.exitCode, error: external.error, timestamp: Date.now() }
     }) : {};
     return omitUndefinedProperties({
       agent: step.agent,
@@ -756,7 +760,7 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
       artifactPaths,
       artifactConfig: ctx.artifactConfig,
       output: formatOutputArtifactContent(omitUndefinedProperties({ output: resolvedOutput.fullOutput, error: external.error, metadataPath: ctx.artifactConfig?.includeMetadata === false ? undefined : artifactPaths.metadataPath })),
-      metadata: { runId: ctx.id, agent: step.agent, task: PROMPT_REDACTED, runner, externalJob: external.externalJob, exitCode: external.exitCode, error: external.error, timestamp: Date.now() }
+      metadata: { runId: ctx.id, parentSessionId: step.parentSessionId, agent: step.agent, task: PROMPT_REDACTED, runner, externalJob: external.externalJob, exitCode: external.exitCode, error: external.error, timestamp: Date.now() }
     }) : {};
     return omitUndefinedProperties({
       agent: step.agent,
@@ -784,6 +788,9 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
   if (step.context === "fork" && step.sessionFile && fs.existsSync(step.sessionFile)) {
     alignForkedSessionCwd(step.sessionFile, effectiveCwd);
   }
+  const toolContractError = implementationToolsError(step.agent, task, step.tools, step.mcpDirectTools);
+  if (toolContractError && !step.runner)
+    return { agent: step.agent, output: toolContractError, error: toolContractError, exitCode: 1, context: step.context };
   const candidate = step.model;
   let capabilityAudit;
   let launchResolvedExtensions = step.launchResolvedExtensions;
@@ -803,9 +810,10 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
   const aggregateUsage = emptyUsage();
   let launched = false;
   let recoveryTask = task;
+  let recoveredCompaction = false;
   let stagedIndexBaseline;
   singleLaunch:
-    for (let attemptIndex = 0;attemptIndex < 2; attemptIndex++) {
+    for (let attemptIndex = 0;attemptIndex < 5; attemptIndex++) {
       if (ctx.timeoutSignal?.aborted || ctx.stopSignal?.aborted || ctx.skipAcceptance?.())
         break singleLaunch;
       const expectedModelForVerification = candidate && !step.skipPrimaryModelVerification ? candidate : undefined;
@@ -869,6 +877,7 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
           fast: step.fast,
           model: step.model,
           mcpDirectTools: step.mcpDirectTools,
+          builtinMcpTools: step.builtinMcpTools,
           cwd: step.cwd ?? ctx.cwd,
           requireReadTool: Boolean(step.skills?.length),
           structuredOutput: Boolean(effectiveStructuredOutput),
@@ -995,7 +1004,15 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
       const missingRequiredOutputAfterMutation = Boolean(missingRequiredOutputError) && (mutationAttemptObserved || Boolean(mutationEvidence.changedFiles.length));
       const effectiveExitCode = toolAvailabilityError || midToolExitError || structuredError || emptyOutputError || missingRequiredOutputError ? 1 : hiddenError?.hasError ? hiddenError.exitCode ?? 1 : run.error && run.exitCode === 0 ? 1 : run.exitCode;
       const underlyingError = toolAvailabilityError ?? midToolExitError ?? structuredError ?? run.error ?? emptyOutputError ?? (missingRequiredOutputAfterMutation ? missingRequiredOutputError : undefined) ?? (hiddenError?.hasError ? hiddenError.details ? `${hiddenError.errorType} failed (exit ${effectiveExitCode}): ${hiddenError.details}` : `${hiddenError.errorType} failed with exit code ${effectiveExitCode}` : undefined);
-      const error = underlyingError ?? missingRequiredOutputError;
+      const mutationGuardError = effectiveExitCode === 0 && !underlyingError && !missingRequiredOutputError && !step.runner ? implementationMutationError({
+        agent: step.agent,
+        task,
+        tools: step.tools,
+        mcpDirectTools: step.mcpDirectTools,
+        attempted: mutationAttemptObserved,
+        unavailable: mutationEvidence.unavailable
+      }) : undefined;
+      const error = underlyingError ?? missingRequiredOutputError ?? mutationGuardError;
       finalOutputSnapshot = outputSnapshot;
       if (step.toolBudget) {
         const toolMessages = run.messages.filter((message) => message.role === "toolResult");
@@ -1010,16 +1027,28 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
         afterCompactionSettlement: run.afterCompactionSettlement === true
       } : undefined;
       const fileMutationEffect = missingRequiredOutputAfterMutation ? { status: "observed", attempted: true, evidence: mutationEvidence } : undefined;
-      finalResult = { ...run, exitCode: effectiveExitCode, model: candidate ?? run.model, error, structuredOutput, structuredOutputFailed: structuredError ? true : undefined, runtimeAcknowledgedExtensions, ...step.agentContract ? { agentContract: step.agentContract } : {}, ...fileMutationEffect || settlementDiagnostic ? { effects: { ...fileMutationEffect ? { fileMutation: fileMutationEffect } : {}, ...settlementDiagnostic ? { settlementDiagnostic } : {} } } : {} };
+      finalResult = { ...run, exitCode: mutationGuardError ? 1 : effectiveExitCode, model: candidate ?? run.model, error, structuredOutput, structuredOutputFailed: structuredError ? true : undefined, runtimeAcknowledgedExtensions, ...step.agentContract ? { agentContract: step.agentContract } : {}, ...fileMutationEffect || settlementDiagnostic ? { effects: { ...fileMutationEffect ? { fileMutation: fileMutationEffect } : {}, ...settlementDiagnostic ? { settlementDiagnostic } : {} } } : {} };
       if (run.stopped || run.timedOut || ctx.timeoutSignal?.aborted || ctx.stopSignal?.aborted || ctx.skipAcceptance?.())
         break singleLaunch;
       if (effectiveExitCode === 0 && !error)
         break singleLaunch;
+      const retryDelay = dmRetryDelay({
+        ...run,
+        error,
+        exitCode: effectiveExitCode,
+        observedMutationAttempt: mutationAttemptObserved,
+        completionDiagnostic: Boolean(emptyOutputError || missingRequiredOutputError || structuredError || mutationGuardError)
+      }, attemptIndex);
+      if (retryDelay !== undefined && !ctx.timeoutSignal?.aborted && !ctx.stopSignal?.aborted) {
+        await new Promise((resolve) => setTimeout(resolve, retryDelay));
+        if (!ctx.timeoutSignal?.aborted && !ctx.stopSignal?.aborted)
+          continue singleLaunch;
+      }
       const recovery = planAbortRecovery({
         messages: run.messages,
         error,
         sessionAvailable: Boolean(step.sessionFile && fs.existsSync(step.sessionFile)),
-        alreadyResumed: attemptIndex > 0,
+        alreadyResumed: recoveredCompaction,
         stopped: run.stopped || ctx.stopSignal?.aborted || ctx.skipAcceptance?.(),
         interrupted: run.interrupted,
         timedOut: run.timedOut || ctx.timeoutSignal?.aborted,
@@ -1031,6 +1060,7 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
         afterCompactionSettlement: run.afterCompactionSettlement
       });
       if (recovery.action === "resume") {
+        recoveredCompaction = true;
         recoveryTask = recovery.prompt;
         continue singleLaunch;
       }
@@ -1044,10 +1074,11 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError : external.error;
       break singleLaunch;
     }
   const rawOutput = finalResult?.finalOutput ?? "";
-  let outputForPersistence = stripAcceptanceReport(rawOutput);
-  if (!outputForPersistence.trim() && finalResult?.structuredOutput !== undefined)
-    outputForPersistence = JSON.stringify(finalResult.structuredOutput, null, 2);
-  const resolvedOutput = step.outputPath && finalResult?.exitCode === 0 ? resolveSingleOutput(step.outputPath, outputForPersistence, finalOutputSnapshot, step.outputClaimPath) : { fullOutput: outputForPersistence };
+  const structuredText = finalResult?.structuredOutput === undefined ? undefined : JSON.stringify(finalResult.structuredOutput, null, 2);
+  let replyOutput = stripAcceptanceReport(rawOutput);
+  if (!replyOutput.trim() && structuredText !== undefined)
+    replyOutput = structuredText;
+  const resolvedOutput = step.outputPath && finalResult?.exitCode === 0 ? resolveSingleOutput(step.outputPath, structuredText ?? replyOutput, finalOutputSnapshot, step.outputClaimPath) : { fullOutput: replyOutput };
   if (resolvedOutput.fatalError) {
     if (finalResult) {
       finalResult.exitCode = 1;
@@ -1059,9 +1090,9 @@ ${resolvedOutput.saveError}` : resolvedOutput.saveError;
   const outputReference = resolvedOutput.savedPath ? formatSavedOutputReference(resolvedOutput.savedPath, output) : undefined;
   let outputForSummary = output;
   if (finalResult?.stopped && !outputForSummary.trim()) {
-    outputForSummary = ctx.stopMessage ?? "Subagent stopped by user.";
+    outputForSummary = ctx.stopMessage ?? "Subagent stopped.";
   }
-  const outputForAcceptance = rawOutput;
+  const outputForAcceptance = finalResult?.outputPartial ? "" : rawOutput;
   const childWrittenOutput = step.outputPath ? extractChildWrittenOutput(finalResult?.messages, step.outputPath, step.cwd ?? ctx.cwd) : undefined;
   const outputState = finalResult?.outputState === "present" || finalResult?.structuredOutput !== undefined || Boolean(childWrittenOutput?.trim()) ? "present" : resolvedOutput.savedPath ? "unknown" : finalResult?.outputState ?? "unknown";
   const timeoutRecovery = finalResult?.timedOut === true || ctx.timeoutSignal?.aborted === true ? buildTimeoutRecoverySummary({
@@ -1098,7 +1129,7 @@ ${timeoutRecovery.message}` : timeoutRecovery.message;
     cwd: step.cwd ?? ctx.cwd,
     stagedIndexBaseline,
     signal: combinedAbortSignal([ctx.timeoutSignal, ctx.stopSignal]),
-    abortMessage: ctx.stopSignal?.aborted ? ctx.stopMessage ?? "Subagent stopped by user." : ctx.timeoutMessage ?? "Subagent timed out.",
+    abortMessage: ctx.stopSignal?.aborted ? ctx.stopMessage ?? "Subagent stopped." : ctx.timeoutMessage ?? "Subagent timed out.",
     reportOptional: isAgentContract(step.agentContract),
     artifactsDir: ctx.artifactsDir,
     runId: ctx.id,
@@ -1115,7 +1146,7 @@ ${timeoutRecovery.message}` : timeoutRecovery.message;
     finalResult = { ...finalResult, structuredOutput: typedGate.value };
   }
   const intercomDetachReceipt = finalResult?.finalOutput === INTERCOM_DETACH_RECEIPT;
-  const baseFinalError = stoppedAfterAcceptance ? ctx.stopMessage ?? "Subagent stopped by user." : timedOutAfterAcceptance ? finalResult?.error ?? ctx.timeoutMessage ?? "Subagent timed out." : acceptanceCanFailRun ? finalResult?.error ? `${finalResult.error}
+  const baseFinalError = stoppedAfterAcceptance ? ctx.stopMessage ?? "Subagent stopped." : timedOutAfterAcceptance ? finalResult?.error ?? ctx.timeoutMessage ?? "Subagent timed out." : acceptanceCanFailRun ? finalResult?.error ? `${finalResult.error}
 ${acceptanceFailure}` : acceptanceFailure : finalResult?.error ?? (intercomDetachReceipt ? INTERCOM_DETACH_RECEIPT : undefined);
   const effectiveFinalError = formatChildFailureDiagnostic({
     error: baseFinalError,
@@ -1135,6 +1166,7 @@ ${acceptanceFailure}` : acceptanceFailure : finalResult?.error ?? (intercomDetac
     })),
     metadata: {
       runId: ctx.id,
+      parentSessionId: step.parentSessionId,
       agent: step.agent,
       task: PROMPT_REDACTED,
       exitCode: effectiveFinalExitCode,
@@ -1162,6 +1194,7 @@ ${acceptanceFailure}` : acceptanceFailure : finalResult?.error ?? (intercomDetac
     launchContractDigest: actualLaunchContractDigest,
     output: outputForSummary,
     outputState,
+    outputPartial: finalResult?.outputPartial,
     exitCode: effectiveFinalExitCode,
     error: effectiveFinalError,
     sessionFile: step.sessionFile,
@@ -1255,7 +1288,10 @@ function markParallelGroupSetupFailure(input) {
       throw new Error(`Missing parallel task at index ${taskIndex}`);
     const stopped = statusStep.stopped || statusStep.stopRequested || input.statusPayload.stopped;
     const paused = !stopped && input.statusPayload.state === "paused";
+    const timedOut = !stopped && !paused && input.statusPayload.timedOut === true;
     statusStep.status = stopped ? "stopped" : paused ? "paused" : "failed";
+    if (timedOut)
+      statusStep.timedOut = true;
     statusStep.startedAt = input.failedAt;
     statusStep.endedAt = input.failedAt;
     statusStep.durationMs = 0;
@@ -1420,6 +1456,7 @@ export async function runSubagent(config, childSessions) {
   let previousOutput = "";
   const outputs = {};
   const results = [];
+  const launchedFlatIndices = new Set;
   const overallStartTime = Date.now();
   const shareEnabled = config.share === true;
   const asyncDir = config.asyncDir;
@@ -1445,7 +1482,7 @@ export async function runSubagent(config, childSessions) {
   let stopped = false;
   let usageBudgetExceeded = false;
   const timeoutMessage = config.timeoutMs !== undefined ? `Subagent timed out after ${config.timeoutMs}ms.` : undefined;
-  const stopMessage = "Subagent stopped by user.";
+  const stopMessage = "Subagent stopped.";
   const timeoutAbortController = new AbortController;
   const stopAbortController = new AbortController;
   const setupInterruptController = new AbortController;
@@ -1568,6 +1605,7 @@ export async function runSubagent(config, childSessions) {
   const statusPayload = omitUndefinedProperties({
     lifecycleArtifactVersion: SUBAGENT_LIFECYCLE_ARTIFACT_VERSION,
     runId: id,
+    ...config.toolCallId ? { toolCallId: config.toolCallId } : {},
     ...config.sessionId ? { sessionId: config.sessionId } : {},
     ...config.completionOwnerId ? { completionOwnerId: config.completionOwnerId } : {},
     mode: config.resultMode ?? (flatSteps.length > 1 ? "chain" : "single"),
@@ -1582,6 +1620,7 @@ export async function runSubagent(config, childSessions) {
     ...config.toolBudget ? { toolBudget: initialToolBudgetState(config.toolBudget) } : {},
     ...config.usageBudget ? { usageBudget: usageBudgetState(config.usageBudget, undefined) } : {},
     pid: process.pid,
+    pidNamespaceScope: currentPidNamespaceScope(),
     cwd,
     currentStep: 0,
     chainStepCount: steps.length,
@@ -1595,6 +1634,7 @@ export async function runSubagent(config, childSessions) {
     ...config.workflowKey ? { workflowKey: config.workflowKey } : {},
     ...config.lane ? { lane: config.lane } : {},
     ...config.runnerProcessInstanceId ? { processTerminal: { version: 1, state: "pending", runId: id, runnerProcessInstanceId: config.runnerProcessInstanceId } } : {},
+    ...config.launcher ? { launcher: config.launcher } : {},
     steps: initialStatusSteps,
     artifactsDir,
     sessionDir: config.sessionDir,
@@ -1619,6 +1659,7 @@ export async function runSubagent(config, childSessions) {
   };
   let finalResultCommitted = false;
   let finalResultPublication;
+  const publishRunResult = (filePath, write) => withResultRunLease(path.dirname(filePath), id, write);
   const runPersistence = createCapacityResilientJsonWriter({
     keepAlive: true,
     onSuccess: (filePath, payload) => {
@@ -1801,7 +1842,7 @@ export async function runSubagent(config, childSessions) {
       sessionId: config.sessionId,
       completionOwnerId: config.completionOwnerId,
       sessionFile: statusPayload.sessionFile ?? latestSessionFile
-    }), (filePath, payload) => writePendingAsyncResultFile(filePath, payload));
+    }), (filePath, payload) => publishRunResult(filePath, () => writePendingAsyncResultFile(filePath, payload)));
   };
   const writeStatusPayloadNow = () => {
     if (finalResultPublication)
@@ -2282,7 +2323,7 @@ export async function runSubagent(config, childSessions) {
     const key = typeof event.toolCallId === "string" && event.toolCallId.length > 0 ? `id:${event.toolCallId}` : typeof event.toolName === "string" ? activeToolKeysByName[flatIndex]?.get(event.toolName)?.[0] : calls?.size === 1 ? [...calls.keys()][0] : undefined;
     return key ? removeActiveToolCallKey(flatIndex, key) : undefined;
   };
-  const openToolAttentionTarget = (flatIndex, now) => [...activeToolCalls[flatIndex]?.values() ?? []].filter((active) => shouldEmitOpenToolAttention({ config: controlConfig, currentTool: active.tool, currentToolStartedAt: active.startedAt, now })).sort((left, right) => left.startedAt - right.startedAt)[0];
+  const openToolAttentionTarget = (flatIndex, now) => [...activeToolCalls[flatIndex]?.values() ?? []].filter((active) => !active.attentionEmitted && shouldEmitOpenToolAttention({ config: controlConfig, currentTool: active.tool, currentToolStartedAt: active.startedAt, now })).sort((left, right) => left.startedAt - right.startedAt)[0];
   const supervisorAttentionSteps = new Map;
   const mutatingFailureWindowMs = 300000;
   const appendControlEvent = (rawEvent) => {
@@ -2327,11 +2368,14 @@ export async function runSubagent(config, childSessions) {
   };
   const maybeEmitOpenToolAttention = (flatIndex, now) => {
     const step = statusPayload.steps[flatIndex];
-    if (!step || step.status !== "running" || step.activityState === "needs_attention")
+    if (!step || step.status !== "running")
       return false;
     const target = openToolAttentionTarget(flatIndex, now);
     if (!target)
       return false;
+    target.attentionEmitted = true;
+    if (supervisorAttentionSteps.has(flatIndex))
+      supervisorAttentionSteps.set(flatIndex, "needs_attention");
     const previous = step.activityState;
     step.activityState = "needs_attention";
     statusPayload.activityState = "needs_attention";
@@ -2350,6 +2394,7 @@ export async function runSubagent(config, childSessions) {
       tokens: step.tokens?.total,
       toolCount: step.toolCount,
       currentTool: target.tool,
+      toolCallId: target.key.startsWith("id:") ? target.key.slice(3) : undefined,
       currentToolDurationMs: toolDurationMs,
       currentPath: target.path
     })));
@@ -2531,6 +2576,7 @@ export async function runSubagent(config, childSessions) {
     if (!step)
       return;
     setOptionalProperty(step, "model", model);
+    setOptionalProperty(step, "launchModel", undefined);
     setOptionalProperty(step, "thinking", thinking);
     setOptionalProperty(step, "contextLimit", contextLimit);
     statusPayload.lastUpdate = now;
@@ -2679,6 +2725,13 @@ export async function runSubagent(config, childSessions) {
       appendRecentStepOutput(step, stripAcceptanceReport(extractTextFromContent(event.message.content)).split(`
 `).slice(-10));
       step.turnCount = (step.turnCount ?? 0) + 1;
+      if (event.message.model) {
+        const observedModel = qualifyModelWithProvider(event.message.model, event.message.provider, flatSteps[flatIndex]?.modelVerificationRegistry) ?? event.message.model;
+        if (observedModel !== step.model) {
+          step.launchModel ??= step.model;
+          step.model = observedModel;
+        }
+      }
       const usage = event.message.usage;
       if (config.usageBudget) {
         const known = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0;
@@ -3188,7 +3241,6 @@ export async function runSubagent(config, childSessions) {
             dynamic: step.parallel.acceptanceInput === undefined,
             agentContract: step.parallel.agentContract ?? step.agentContract
           })),
-          systemPrompt: step.parallel.namespaceOutputPath ? injectOutputPathSystemPrompt(step.parallel.systemPrompt ?? "", outputPath, step.parallel) : step.parallel.systemPrompt,
           outputPath,
           label: task.label ?? step.parallel.label,
           ...step.sessionFiles?.[itemIndex] ? { sessionFile: step.sessionFiles[itemIndex] } : {},
@@ -3205,6 +3257,7 @@ export async function runSubagent(config, childSessions) {
         return omitUndefinedProperties({
           agent: task.agent,
           ...task.sessionName ? { sessionName: task.sessionName } : {},
+          ...externalRunnerStatus(task.runner) ? { runner: externalRunnerStatus(task.runner) } : {},
           ...statusStepDescription(task.task) ? { description: statusStepDescription(task.task) } : {},
           ...task.context ? { context: task.context } : {},
           ...task.phase ?? step.phase ? { phase: task.phase ?? step.phase } : {},
@@ -3313,6 +3366,7 @@ export async function runSubagent(config, childSessions) {
           return omitUndefinedProperties({ agent: task.agent, ...task.sessionName ? { sessionName: task.sessionName } : {}, context: task.context, output: "(skipped — fail-fast)", exitCode: -1, skipped: true });
         }
         const taskStartTime = Date.now();
+        launchedFlatIndices.add(fi);
         statusPayload.currentStep = fi;
         requiredStatusStep(statusPayload, fi).status = "running";
         delete requiredStatusStep(statusPayload, fi).error;
@@ -3339,6 +3393,7 @@ export async function runSubagent(config, childSessions) {
           flatIndex: fi,
           flatStepCount: Math.max(statusPayload.steps.length, 1),
           outputFile: path.join(asyncDir, `output-${fi}.log`),
+          projectTrusted: config.projectTrusted,
           piPackageRoot: config.piPackageRoot,
           childSessions,
           inheritedChildRuntime: config.inheritedChildRuntime,
@@ -3384,7 +3439,7 @@ export async function runSubagent(config, childSessions) {
         if (singleResult.toolBudgetBlocked)
           statusPayload.toolBudgetBlocked = true;
         setOptionalProperty(requiredStatusStep(statusPayload, fi), "sessionName", singleResult.sessionName);
-        setOptionalProperty(requiredStatusStep(statusPayload, fi), "model", singleResult.model);
+        setOptionalProperty(requiredStatusStep(statusPayload, fi), "model", requiredStatusStep(statusPayload, fi).model ?? singleResult.model);
         setOptionalProperty(requiredStatusStep(statusPayload, fi), "thinking", resolveEffectiveThinking(singleResult.model, requiredStatusStep(statusPayload, fi).thinking));
         setOptionalProperty(requiredStatusStep(statusPayload, fi), "requestedModel", singleResult.requestedModel);
         setOptionalProperty(requiredStatusStep(statusPayload, fi), "contextOverflow", singleResult.contextOverflow);
@@ -3449,6 +3504,7 @@ export async function runSubagent(config, childSessions) {
           runtimeAcknowledgedExtensions: pr.runtimeAcknowledgedExtensions,
           output: pr.output,
           outputState: pr.outputState,
+          outputPartial: pr.outputPartial,
           error: pr.error,
           success: pr.stopped !== true && pr.interrupted !== true && pr.exitCode === 0 && pr.execution?.status !== "partial",
           exitCode: pr.interrupted === true ? 0 : pr.exitCode,
@@ -3467,6 +3523,7 @@ export async function runSubagent(config, childSessions) {
           totalCost: pr.totalCost,
           usage: pr.usage,
           artifactPaths: pr.artifactPaths,
+          savedOutputPath: pr.savedOutputPath,
           outputSaveError: pr.outputSaveError,
           artifactOutputSaveFailed: pr.artifactOutputSaveFailed,
           transcriptPath: pr.transcriptPath,
@@ -3741,6 +3798,7 @@ export async function runSubagent(config, childSessions) {
             return omitUndefinedProperties({ agent: task.agent, ...task.sessionName ? { sessionName: task.sessionName } : {}, context: task.context, output: "(skipped — fail-fast)", exitCode: -1, skipped: true });
           }
           const taskStartTime = Date.now();
+          launchedFlatIndices.add(fi);
           statusPayload.currentStep = fi;
           requiredStatusStep(statusPayload, fi).status = "running";
           delete requiredStatusStep(statusPayload, fi).error;
@@ -3776,6 +3834,7 @@ export async function runSubagent(config, childSessions) {
             id,
             flatIndex: fi,
             flatStepCount: Math.max(statusPayload.steps.length, 1),
+            projectTrusted: config.projectTrusted,
             outputFile: path.join(asyncDir, `output-${fi}.log`),
             piPackageRoot: config.piPackageRoot,
             childSessions,
@@ -3826,7 +3885,7 @@ export async function runSubagent(config, childSessions) {
           if (singleResult.toolBudgetBlocked)
             statusPayload.toolBudgetBlocked = true;
           setOptionalProperty(requiredStatusStep(statusPayload, fi), "sessionName", singleResult.sessionName);
-          setOptionalProperty(requiredStatusStep(statusPayload, fi), "model", singleResult.model);
+          setOptionalProperty(requiredStatusStep(statusPayload, fi), "model", requiredStatusStep(statusPayload, fi).model ?? singleResult.model);
           setOptionalProperty(requiredStatusStep(statusPayload, fi), "thinking", resolveEffectiveThinking(singleResult.model, requiredStatusStep(statusPayload, fi).thinking));
           setOptionalProperty(requiredStatusStep(statusPayload, fi), "requestedModel", singleResult.requestedModel);
           setOptionalProperty(requiredStatusStep(statusPayload, fi), "contextOverflow", singleResult.contextOverflow);
@@ -3908,6 +3967,7 @@ export async function runSubagent(config, childSessions) {
             launchResolvedExtensions: pr.launchResolvedExtensions,
             output: pr.output,
             outputState: pr.outputState,
+            outputPartial: pr.outputPartial,
             error: pr.error,
             success: pr.stopped !== true && pr.interrupted !== true && pr.exitCode === 0 && pr.execution?.status !== "partial",
             exitCode: pr.interrupted === true ? 0 : pr.exitCode,
@@ -3926,6 +3986,7 @@ export async function runSubagent(config, childSessions) {
             totalCost: pr.totalCost,
             usage: pr.usage,
             artifactPaths: pr.artifactPaths,
+            savedOutputPath: pr.savedOutputPath,
             outputSaveError: pr.outputSaveError,
             artifactOutputSaveFailed: pr.artifactOutputSaveFailed,
             transcriptPath: pr.transcriptPath,
@@ -4127,6 +4188,7 @@ ${formatParallelHandoffError(error)}`;
       }
       const singleCwd = singleWorktreeSetup?.worktrees[0]?.agentCwd ?? cwd;
       const stepStartTime = Date.now();
+      launchedFlatIndices.add(flatIndex);
       statusPayload.currentStep = flatIndex;
       requiredStatusStep(statusPayload, flatIndex).status = "running";
       delete requiredStatusStep(statusPayload, flatIndex).activityState;
@@ -4160,6 +4222,7 @@ ${formatParallelHandoffError(error)}`;
           artifactsDir,
           artifactConfig,
           id,
+          projectTrusted: config.projectTrusted,
           flatIndex,
           flatStepCount: Math.max(statusPayload.steps.length, 1),
           outputFile: path.join(asyncDir, `output-${flatIndex}.log`),
@@ -4212,6 +4275,7 @@ ${formatParallelHandoffError(error)}`;
         runtimeAcknowledgedExtensions: singleResult.runtimeAcknowledgedExtensions,
         output: stopped || childStopped ? stopMessage : timedOut ? singleResult.output || (timeoutMessage ?? "Subagent timed out.") : singleResult.output,
         outputState: singleResult.outputState,
+        outputPartial: singleResult.outputPartial,
         error: stopped || childStopped ? stopMessage : timedOut ? timeoutMessage ?? "Subagent timed out." : singleResult.error,
         success: !stopped && !childStopped && !timedOut && singleResult.interrupted !== true && singleResult.exitCode === 0 && singleResult.execution?.status !== "partial",
         exitCode: stopped || childStopped ? 1 : timedOut ? 1 : singleResult.interrupted === true ? 0 : singleResult.exitCode,
@@ -4297,7 +4361,7 @@ ${formatParallelHandoffError(error)}`;
       if (singleResult.toolBudgetBlocked)
         statusPayload.toolBudgetBlocked = true;
       setOptionalProperty(requiredStatusStep(statusPayload, flatIndex), "sessionName", singleResult.sessionName);
-      setOptionalProperty(requiredStatusStep(statusPayload, flatIndex), "model", singleResult.model);
+      setOptionalProperty(requiredStatusStep(statusPayload, flatIndex), "model", requiredStatusStep(statusPayload, flatIndex).model ?? singleResult.model);
       setOptionalProperty(requiredStatusStep(statusPayload, flatIndex), "thinking", resolveEffectiveThinking(singleResult.model, requiredStatusStep(statusPayload, flatIndex).thinking));
       setOptionalProperty(requiredStatusStep(statusPayload, flatIndex), "requestedModel", singleResult.requestedModel);
       setOptionalProperty(requiredStatusStep(statusPayload, flatIndex), "contextOverflow", singleResult.contextOverflow);
@@ -4496,6 +4560,11 @@ ${r.output || (r.exitCode !== 0 ? r.error : undefined) || "(no output)"}`).join(
     timedOut = true;
   }
   disposeControlInbox();
+  try {
+    closeStopInbox(asyncDir);
+  } catch (error) {
+    appendJsonl(eventsPath, JSON.stringify({ type: "subagent.run.stop_inbox_close_failed", ts: Date.now(), runId: id, message: error instanceof Error ? error.message : String(error) }));
+  }
   for (const request of consumeStopRequestPayloads(asyncDir))
     stopChildStep(request);
   const signalTerminated = !stopped && !timedOut && !interrupted && results.some((result) => result.exitCode !== 0 && isUnexplainedProcessSignal(omitUndefinedProperties({
@@ -4578,6 +4647,7 @@ ${r.output || (r.exitCode !== 0 ? r.error : undefined) || "(no output)"}`).join(
     runPersistence.write(resultPath, {
       lifecycleArtifactVersion: SUBAGENT_LIFECYCLE_ARTIFACT_VERSION,
       id,
+      ...config.toolCallId ? { toolCallId: config.toolCallId } : {},
       agent: agentName,
       mode: resultMode,
       success: statusPayload.state === "complete",
@@ -4595,6 +4665,7 @@ ${r.output || (r.exitCode !== 0 ? r.error : undefined) || "(no output)"}`).join(
         context: r.context,
         output: r.output,
         outputState: r.outputState,
+        outputPartial: r.outputPartial,
         error: r.error,
         success: r.success,
         skipped: r.skipped || undefined,
@@ -4669,9 +4740,9 @@ ${r.output || (r.exitCode !== 0 ? r.error : undefined) || "(no output)"}`).join(
       shareError,
       ...taskIndex !== undefined && { taskIndex },
       ...totalTasks !== undefined && { totalTasks }
-    }, (filePath, payload) => {
+    }, (filePath, payload) => publishRunResult(filePath, () => {
       writeAsyncResultFile(filePath, payload);
-    });
+    }));
     if (!finalResultCommitted)
       await Promise.all([publication, disposeChildSessions()]);
   } catch (err) {
@@ -4696,6 +4767,25 @@ ${r.output || (r.exitCode !== 0 ? r.error : undefined) || "(no output)"}`).join(
     totalCost: finalTotalCost,
     usageBudget: statusPayload.usageBudget
   }));
+  for (const historyEntry of planBackgroundRunHistory({
+    steps,
+    resultMode,
+    statusSteps: statusPayload.steps.map((step, index) => ({
+      agent: step.agent,
+      status: step.status,
+      durationMs: step.durationMs,
+      timedOut: step.timedOut,
+      stopped: step.stopped,
+      launched: launchedFlatIndices.has(index)
+    })),
+    stepResults: results,
+    runDurationMs: runEndedAt - overallStartTime,
+    stopped,
+    interrupted,
+    timedOut
+  })) {
+    recordRun(historyEntry.agent, historyEntry.task, historyEntry.exitCode, historyEntry.durationMs, historyEntry.terminal);
+  }
   writeRunLog(logPath, omitUndefinedProperties({
     id,
     mode: statusPayload.mode,