pi-subagents 0.70.0 → 0.71.0

package/src/runs/background/subagent-runner.js

@@ -11,12 +11,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { performance } from "node:perf_hooks";
 import { pathToFileURL } from "node:url";
-import { arbitrateCompletionGuardRescue, createTaskMutationArbiter } from "../shared/llm-intent-arbiter.js";
 import { installRunnerHttpDispatcher } from "./runner-http-dispatcher.js";
-const isRunnerEntrypoint = Boolean(process.argv[1] && import.meta.url === pathToFileURL(path.resolve(process.argv[1])).href);
-// Detached Node runners skip Pi's CLI dispatcher setup; install the runner's own.
-if (isRunnerEntrypoint)
-    installRunnerHttpDispatcher({ agentDir: getAgentDir(), cwd: process.cwd() });
 import { writeAtomicJson } from "../../shared/atomic-json.js";
 import { writeAsyncResultFile, writePendingAsyncResultFile } from "./result-files.js";
 import { createFileCoalescer } from "../../shared/file-coalescer.js";
@@ -42,7 +37,7 @@ import { SUBAGENT_CHILD_ENV } from "../shared/child-runtime-config.js";
 import { deriveChildSessionName } from "../../shared/child-session-name.js";
 import { alignForkedSessionCwd } from "../../shared/fork-session-cwd.js";
 import { outputEntryFromAsyncResult, resolveOutputReferences } from "../shared/chain-outputs.js";
-import { clearStructuredOutputCaptures, createStructuredOutputFileCapture, createStructuredOutputRuntime, MISSING_STRUCTURED_OUTPUT_CALL_ERROR, readStructuredOutput, readStructuredOutputAcceptanceReport } from "../shared/structured-output.js";
+import { clearStructuredOutputCaptures, createStructuredOutputFileCapture, createStructuredOutputRuntime, formatStructuredOutputRejectionError, MISSING_STRUCTURED_OUTPUT_CALL_ERROR, readStructuredOutput, readStructuredOutputAcceptanceReport } from "../shared/structured-output.js";
 import { formatMidToolExitError, isOrdinaryToolForMidToolExit, isUnexplainedProcessSignal } from "../shared/process-signal.js";
 import { formatChildToolDiagnostic } from "../shared/tool-availability.js";
 import { buildTimeoutRecoverySummary, collectTrackedMutationEvidence, snapshotTrackedMutations } from "../shared/mutation-evidence.js";
@@ -50,11 +45,10 @@ import { collectDynamicResults, DynamicFanoutError, materializeDynamicParallelSt
 import { claimRunFanoutBatch, getRunFanoutBudgetSnapshot } from "../shared/run-fanout-budget.js";
 import { nestedSummaryFromAsyncStatus, projectNestedEvents, resolveNestedAsyncDir, writeNestedEvent } from "../shared/nested-events.js";
 import { isContextOverflow } from "../shared/model-resolution.js";
-import { markProcessTerminalCandidateLeaseRelease, processTerminalPath, writeProcessTerminalCandidate } from "./process-terminal.js";
+import { processTerminalPath, writeProcessTerminalCandidate } from "./process-terminal.js";
+import { persistRunnerStartupFailure } from "./runner-startup-failure.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 { evaluateCompletionMutationGuard, expectsImplementationMutation, hasMutationToolCapability, validateImplementationToolContract } from "../shared/completion-guard.js";
-import { planCompletionEvidence, projectSettlementDiagnostic } from "../shared/completion-evidence.js";
 import { planAbortRecovery } from "../shared/abort-recovery.js";
 import { createMutatingFailureState, didMutatingToolFail, isMutatingTool, nextLongRunningTrigger, recordMutatingFailure, resetMutatingFailureState, resolveCurrentPath, shouldEscalateMutatingFailures, summarizeRecentMutatingFailures, } from "../shared/long-running-guard.js";
 import { parseSessionTokens } from "../../shared/session-tokens.js";
@@ -74,7 +68,6 @@ import { toolTimeoutCallKey } from "../shared/tool-timeout.js";
 import { usageBudgetExceededMessage, usageBudgetState } from "../shared/usage-budget.js";
 import { formatParallelHandoffError, formatParallelHandoffReference, parallelHandoffPath, writeParallelHandoffGroup, writeWorktreeSetupHandoff } from "../shared/parallel-handoff.js";
 import { resolveWatchdogConfig } from "../../watchdog/settings.js";
-import { acquireSessionLease } from "../shared/session-lease.js";
 import { buildExternalCliPrompt, runExternalCli } from "../shared/external-cli-runner.js";
 import { resolveClaudeCodeLaunch } from "../shared/claude-code-adapter.js";
 import { resolveCodexExecLaunch } from "../shared/codex-exec-adapter.js";
@@ -507,7 +500,6 @@ export async function runSingleStepInner(step, ctx) {
     let task = step.task.replace(placeholderRegex, () => ctx.previousOutput);
     if (ctx.outputs)
         task = resolveOutputReferences(task, ctx.outputs);
-    const taskForCompletionGuard = task;
     let resolvedTaskToolPlan;
     if (!step.runner) {
         resolvedTaskToolPlan = resolvePiLaunchToolPlan(omitUndefinedProperties({
@@ -527,28 +519,6 @@ export async function runSingleStepInner(step, ctx) {
             requiredExtensions: step.requiredExtensions ?? ctx.inheritedChildRuntime?.requiredExtensions,
             permissionRules: step.permissionRules,
         }));
-        const contractTools = resolvedTaskToolPlan.explicitToolAllowlist ? resolvedTaskToolPlan.effectiveToolAllowlist : undefined;
-        const contractError = validateImplementationToolContract({
-            agent: step.agent,
-            task: taskForCompletionGuard,
-            tools: contractTools,
-            mcpDirectTools: resolvedTaskToolPlan.effectiveMcpTools,
-            configuredExtensions: resolvedTaskToolPlan.configuredExtensions,
-            requestedTools: resolvedTaskToolPlan.requestedBuiltinTools,
-            acceptanceRole: step.acceptanceRole,
-            completionGuard: step.completionGuard,
-        });
-        if (contractError) {
-            return omitUndefinedProperties({
-                agent: step.agent,
-                context: step.context,
-                output: contractError,
-                error: contractError,
-                exitCode: 1,
-                capabilityCeiling: resolvedTaskToolPlan.capabilityCeiling,
-                capabilityAudit: resolvedTaskToolPlan.capabilityAudit,
-            });
-        }
     }
     // Derive from the pre-acceptance task so internal acceptance/recovery
     // instructions never leak into the display name.
@@ -818,7 +788,6 @@ export async function runSingleStepInner(step, ctx) {
     let finalOutputSnapshot;
     let structuredAcceptanceReport;
     let structuredAcceptanceReportError;
-    let completionGuardTriggeredFinal = false;
     let toolBudget = step.toolBudget ? initialToolBudgetState(step.toolBudget) : undefined;
     let toolBudgetBlocked = false;
     let actualLaunchContractDigest = step.launchContractDigest;
@@ -980,9 +949,9 @@ export async function runSingleStepInner(step, ctx) {
         aggregateUsage.cacheWrite += run.usage.cacheWrite;
         aggregateUsage.cost += run.usage.cost;
         aggregateUsage.turns += run.usage.turns;
-        // A parked run still owes completion evidence when it actually finishes.
-        // Stopped/timedOut runs already have terminal failures; checking completion evidence there is meaningless.
-        const completionDiagnosticsEligible = !run.interrupted && !run.stopped && !run.timedOut;
+        // A parked run still owes output diagnostics when it actually finishes.
+        // Stopped/timedOut runs already have terminal failures, so terminal output diagnostics are deferred.
+        const terminalDiagnosticsEligible = !run.interrupted && !run.stopped && !run.timedOut;
         const toolDiagnostic = run.exitCode === 0 && !run.error ? launch.capture.toolDiagnostic() : undefined;
         const toolAvailabilityError = toolDiagnostic ? formatChildToolDiagnostic(toolDiagnostic) : undefined;
         const runtimeAcknowledgedExtensions = launch.capture.runtimeAcknowledgedExtensions();
@@ -997,18 +966,24 @@ export async function runSingleStepInner(step, ctx) {
         let structuredOutput;
         let structuredError;
         let validatedStructuredOutput = false;
-        if (completionDiagnosticsEligible && effectiveStructuredOutput && run.exitCode === 0 && !run.error && !toolAvailabilityError && !midToolExitError) {
-            if (!run.structuredOutputToolInvoked) {
+        if (effectiveStructuredOutput) {
+            const otherwiseSuccessful = terminalDiagnosticsEligible && run.exitCode === 0 && !run.error && !toolAvailabilityError && !midToolExitError;
+            if (!run.structuredOutputToolInvoked && otherwiseSuccessful) {
                 structuredError = MISSING_STRUCTURED_OUTPUT_CALL_ERROR;
             }
-            else {
+            else if (run.structuredOutputToolInvoked) {
                 const structured = await readStructuredOutput({
                     schema: effectiveStructuredOutput.schema,
                     schemaPath: effectiveStructuredOutput.schemaPath,
                     outputPath: effectiveStructuredOutput.outputPath,
                 });
-                if (structured.error)
-                    structuredError = structured.error;
+                if (structured.error) {
+                    if (otherwiseSuccessful) {
+                        structuredError = structured.error === MISSING_STRUCTURED_OUTPUT_CALL_ERROR
+                            ? formatStructuredOutputRejectionError(run.messages)
+                            : structured.error;
+                    }
+                }
                 else {
                     structuredOutput = structured.value;
                     const acceptanceReport = readStructuredOutputAcceptanceReport(effectiveStructuredOutput);
@@ -1021,13 +996,13 @@ export async function runSingleStepInner(step, ctx) {
         const errorMessages = validatedStructuredOutput
             ? run.messages.slice(run.structuredOutputMessageStartIndex ?? run.messages.length)
             : run.messages;
-        const hiddenError = completionDiagnosticsEligible && run.exitCode === 0 && !run.error && !toolAvailabilityError && !structuredError && !midToolExitError
+        const hiddenError = terminalDiagnosticsEligible && run.exitCode === 0 && !run.error && !toolAvailabilityError && !structuredError && !midToolExitError
             ? detectSubagentError(errorMessages)
             : null;
         const terminalEmptyAfterUsefulWork = !validatedStructuredOutput
             && hasEmptyTerminalAssistantResponse(run.messages)
             && (run.toolCount > 0 || Boolean(run.finalOutput.trim()));
-        const emptyOutputError = completionDiagnosticsEligible && run.exitCode === 0
+        const emptyOutputError = terminalDiagnosticsEligible && run.exitCode === 0
             && !run.error
             && !toolAvailabilityError
             && !structuredError
@@ -1036,48 +1011,10 @@ export async function runSingleStepInner(step, ctx) {
             && (!hiddenError?.hasError || hasEmptyTerminalAssistantResponse(run.messages))
             ? formatEmptyTerminalAssistantResponseError(run.messages)
             : undefined;
-        const completionGuardEnabled = isAgentContract(step.agentContract) ? step.completionGuard === true : step.completionGuard !== false;
-        const completionToolPlan = resolvedTaskToolPlan;
-        const completionTools = completionToolPlan ? (completionToolPlan.explicitToolAllowlist ? completionToolPlan.effectiveToolAllowlist : undefined) : step.tools;
         const remoteGitChanged = run.nativeMachine?.initialGit && run.nativeMachine.finalGit ? run.nativeMachine.initialGit.head !== run.nativeMachine.finalGit.head || run.nativeMachine.initialGit.dirty !== run.nativeMachine.finalGit.dirty : undefined;
         const mutationEvidence = run.nativeMachine ? { source: "tracked-files", trackedOnly: true, changedFiles: [], attemptedMutation: remoteGitChanged === true, ...(remoteGitChanged === undefined ? { unavailable: "Remote Git before/after evidence was incomplete." } : {}) } : collectTrackedMutationEvidence(mutationSnapshot, step.cwd ?? ctx.cwd);
         finalMutationEvidence = mutationEvidence;
-        const completionMutationEvidence = ctx.trackedMutationEvidenceForCompletionGuard === false ? undefined : mutationEvidence;
-        const completionGuard = completionDiagnosticsEligible && run.exitCode === 0 && !run.error && !structuredError && !hiddenError?.hasError && !midToolExitError && !emptyOutputError && completionGuardEnabled
-            ? evaluateCompletionMutationGuard(omitUndefinedProperties({
-                agent: step.agent,
-                task: taskForCompletionGuard,
-                messages: run.messages,
-                tools: completionTools,
-                mcpDirectTools: completionToolPlan?.effectiveMcpTools ?? step.mcpDirectTools,
-                mutationTools: step.mutationTools,
-                toolAvailabilityError,
-                mutationEvidence: completionMutationEvidence,
-            }))
-            : undefined;
-        const mutationAttemptObserved = run.observedMutationAttempt === true || completionMutationEvidence?.attemptedMutation === true;
-        let arbitration = { triggered: completionGuard?.triggered === true && !mutationAttemptObserved, rescued: false };
-        if (arbitration.triggered) {
-            const modelContext = launch.capture.completionIntentContext?.();
-            arbitration = await arbitrateCompletionGuardRescue({
-                guardTriggered: true,
-                task: taskForCompletionGuard,
-                // Construct lazily too: the shared gate refuses overlength tasks before
-                // registry/auth/model work. The child has already shut down normally.
-                arbiter: modelContext ? async (task) => createTaskMutationArbiter(modelContext)?.(task) ?? "unavailable" : undefined,
-            });
-        }
-        const completionEvidence = planCompletionEvidence({
-            guard: completionGuard,
-            guardTriggered: arbitration.triggered,
-            arbiterRescued: arbitration.rescued,
-            completionGuardEnabled,
-            mutationCapable: hasMutationToolCapability(completionTools, completionToolPlan?.effectiveMcpTools ?? step.mcpDirectTools),
-            implementationMutationExpected: expectsImplementationMutation(step.agent, taskForCompletionGuard),
-            mutationAttemptObserved,
-            mutationEvidence: completionMutationEvidence,
-            agentContractEnabled: isAgentContract(step.agentContract),
-        });
+        const mutationAttemptObserved = run.observedMutationAttempt === true || mutationEvidence.attemptedMutation === true;
         const finalOutputHasPersistableFileContent = run.exitCode === 0 && !run.error && !emptyOutputError && Boolean(stripAcceptanceReport(run.finalOutput).trim());
         const requiredOutput = step.outputMode === "file-only" && step.outputPath
             ? { kind: "file-only", path: step.outputPath, missing: !fs.existsSync(step.outputPath) && !finalOutputHasPersistableFileContent }
@@ -1085,9 +1022,9 @@ export async function runSingleStepInner(step, ctx) {
                 ? { kind: "structured", path: effectiveStructuredOutput.outputPath, missing: !fs.existsSync(effectiveStructuredOutput.outputPath) }
                 : undefined;
         finalRequiredOutputMissing = requiredOutput?.missing;
-        const missingRequiredOutputError = completionDiagnosticsEligible ? formatRequiredOutputError(requiredOutput) : undefined;
+        const missingRequiredOutputError = terminalDiagnosticsEligible ? formatRequiredOutputError(requiredOutput) : undefined;
         const missingRequiredOutputAfterMutation = Boolean(missingRequiredOutputError) && (mutationAttemptObserved || Boolean(mutationEvidence.changedFiles.length));
-        const effectiveExitCode = toolAvailabilityError || completionEvidence.legacyFailureError || midToolExitError || structuredError || emptyOutputError || missingRequiredOutputError
+        const effectiveExitCode = toolAvailabilityError || midToolExitError || structuredError || emptyOutputError || missingRequiredOutputError
             ? 1
             : hiddenError?.hasError
                 ? (hiddenError.exitCode ?? 1)
@@ -1105,8 +1042,7 @@ export async function runSingleStepInner(step, ctx) {
                     ? `${hiddenError.errorType} failed (exit ${effectiveExitCode}): ${hiddenError.details}`
                     : `${hiddenError.errorType} failed with exit code ${effectiveExitCode}`
                 : undefined);
-        const error = underlyingError ?? missingRequiredOutputError ?? completionEvidence.legacyFailureError;
-        completionGuardTriggeredFinal = completionEvidence.guardTriggered && !underlyingError && !missingRequiredOutputError;
+        const error = underlyingError ?? missingRequiredOutputError;
         finalOutputSnapshot = outputSnapshot;
         if (step.toolBudget) {
             const toolMessages = run.messages.filter((message) => message.role === "toolResult");
@@ -1114,21 +1050,18 @@ export async function runSingleStepInner(step, ctx) {
             toolBudgetBlocked = Boolean(blockedMessage);
             toolBudget = toolBudgetState(step.toolBudget, toolMessages.length, blockedMessage ? blockedMessage.toolName : undefined);
         }
-        const settlementDiagnostic = projectSettlementDiagnostic(completionEvidence, {
-            terminalFailed: effectiveExitCode !== 0,
+        const settlementDiagnostic = effectiveExitCode !== 0 ? {
             finalTextPresent: Boolean(stripAcceptanceReport(run.finalOutput).trim()),
-            mutationObserved: mutationEvidence.attemptedMutation,
-            requiredOutput,
+            mutation: { attempted: mutationAttemptObserved, observed: mutationEvidence.attemptedMutation },
+            ...(requiredOutput ? { requiredOutput } : {}),
             afterCompactionSettlement: run.afterCompactionSettlement === true,
-        });
-        const fileMutationEffect = completionEvidence.fileMutation ?? (missingRequiredOutputAfterMutation ? { status: "observed", expected: completionEvidence.mutationExpected, attempted: true, evidence: mutationEvidence } : undefined);
-        finalResult = { ...run, exitCode: effectiveExitCode, model: candidate ?? run.model, error, structuredOutput, runtimeAcknowledgedExtensions, ...(step.agentContract ? { agentContract: step.agentContract } : {}), ...(fileMutationEffect || settlementDiagnostic ? { effects: { ...(fileMutationEffect ? { fileMutation: fileMutationEffect } : {}), ...(settlementDiagnostic ? { settlementDiagnostic } : {}) } } : {}) };
+        } : 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 } : {}) } } : {}) };
         if (run.stopped || run.timedOut || ctx.timeoutSignal?.aborted || ctx.stopSignal?.aborted || ctx.skipAcceptance?.())
             break singleLaunch;
         if (effectiveExitCode === 0 && !error)
             break singleLaunch;
-        if (completionEvidence.guardTriggered)
-            break singleLaunch;
         const recovery = planAbortRecovery({
             messages: run.messages,
             error,
@@ -1330,11 +1263,11 @@ export async function runSingleStepInner(step, ctx) {
         timeoutRecovery,
         toolBudget,
         toolBudgetBlocked: toolBudgetBlocked || undefined,
-        completionGuardTriggered: completionGuardTriggeredFinal,
         ...(finalResult?.effects ? { effects: finalResult.effects } : {}),
-        structuredOutput: timedOutAfterAcceptance || stoppedAfterAcceptance ? undefined : finalResult?.structuredOutput,
-        structuredOutputPath: timedOutAfterAcceptance || stoppedAfterAcceptance ? undefined : effectiveStructuredOutput?.outputPath,
-        structuredOutputSchemaPath: timedOutAfterAcceptance || stoppedAfterAcceptance ? undefined : effectiveStructuredOutput?.schemaPath,
+        structuredOutput: finalResult?.structuredOutput,
+        structuredOutputFailed: finalResult?.structuredOutputFailed,
+        structuredOutputPath: effectiveStructuredOutput?.outputPath,
+        structuredOutputSchemaPath: effectiveStructuredOutput?.schemaPath,
         acceptance: effectiveAcceptance,
         watchdog: finalResult?.watchdog,
         ...(capabilityAudit ? { capabilityCeiling: capabilityAudit.ceiling, capabilityAudit } : {}),
@@ -3546,7 +3479,6 @@ export async function runSubagent(config, childSessions) {
                     onSteerOutcome: (request, delivery) => applySteerDelivery(request.id, fi, delivery),
                     timeoutSignal: timeoutAbortController.signal,
                     stopSignal: stopAbortController.signal,
-                    trackedMutationEvidenceForCompletionGuard: false,
                     timeoutMessage,
                     stopMessage,
                     toolTimeoutMs: task.toolTimeoutMs ?? config.toolTimeoutMs,
@@ -3665,6 +3597,7 @@ export async function runSubagent(config, childSessions) {
                     review: pr.review,
                     timeoutRecovery: pr.timeoutRecovery,
                     structuredOutput: pr.structuredOutput,
+                    structuredOutputFailed: pr.structuredOutputFailed,
                     structuredOutputPath: pr.structuredOutputPath,
                     structuredOutputSchemaPath: pr.structuredOutputSchemaPath,
                     acceptance: pr.acceptance,
@@ -3969,7 +3902,6 @@ export async function runSubagent(config, childSessions) {
                         onSteerOutcome: (request, delivery) => applySteerDelivery(request.id, fi, delivery),
                         timeoutSignal: timeoutAbortController.signal,
                         stopSignal: stopAbortController.signal,
-                        trackedMutationEvidenceForCompletionGuard: Boolean(worktreeSetup),
                         timeoutMessage,
                         stopMessage,
                         toolTimeoutMs: taskForRun.toolTimeoutMs ?? config.toolTimeoutMs,
@@ -4048,19 +3980,6 @@ export async function runSubagent(config, childSessions) {
                     }));
                     if (stopped || childStopped)
                         appendTerminalChildStatusEvent(fi, taskEndTime);
-                    if (singleResult.completionGuardTriggered) {
-                        const event = buildControlEvent(omitUndefinedProperties({
-                            from: requiredStatusStep(statusPayload, fi).activityState,
-                            to: "needs_attention",
-                            runId: id,
-                            agent: task.agent,
-                            index: fi,
-                            ts: taskEndTime,
-                            message: `${task.agent} completed without making edits for an implementation task`,
-                            reason: "completion_guard",
-                        }));
-                        appendControlEvent(event);
-                    }
                     if (singleResult.exitCode !== 0 && failFast && !childStopped)
                         aborted = true;
                     return stopped || childStopped ? { ...singleResult, output: stopMessage, error: stopMessage, exitCode: 1, interrupted: false, timedOut: false, stopped: true, skipped: false } : timedOut ? { ...singleResult, output: singleResult.output || (timeoutMessage ?? "Subagent timed out."), error: singleResult.error ?? timeoutMessage ?? "Subagent timed out.", exitCode: 1, interrupted: false, timedOut: true, skipped: false } : { ...singleResult, skipped: false };
@@ -4128,6 +4047,7 @@ export async function runSubagent(config, childSessions) {
                         review: pr.review,
                         timeoutRecovery: pr.timeoutRecovery,
                         structuredOutput: pr.structuredOutput,
+                        structuredOutputFailed: pr.structuredOutputFailed,
                         structuredOutputPath: pr.structuredOutputPath,
                         structuredOutputSchemaPath: pr.structuredOutputSchemaPath,
                         acceptance: pr.acceptance,
@@ -4433,6 +4353,7 @@ export async function runSubagent(config, childSessions) {
                 review: singleResult.review,
                 timeoutRecovery: singleResult.timeoutRecovery,
                 structuredOutput: singleResult.structuredOutput,
+                structuredOutputFailed: singleResult.structuredOutputFailed,
                 structuredOutputPath: singleResult.structuredOutputPath,
                 structuredOutputSchemaPath: singleResult.structuredOutputSchemaPath,
                 acceptance: singleResult.acceptance,
@@ -4595,19 +4516,6 @@ export async function runSubagent(config, childSessions) {
                     writeStatusPayload();
                 });
             }
-            if (singleResult.completionGuardTriggered) {
-                const event = buildControlEvent(omitUndefinedProperties({
-                    from: requiredStatusStep(statusPayload, flatIndex).activityState,
-                    to: "needs_attention",
-                    runId: id,
-                    agent: seqStep.agent,
-                    index: flatIndex,
-                    ts: stepEndTime,
-                    message: `${seqStep.agent} completed without making edits for an implementation task`,
-                    reason: "completion_guard",
-                }));
-                appendControlEvent(event);
-            }
             flatIndex++;
             if (isAgentContract(seqStep.agentContract) && seqStep.gateOn === "acceptance" && singleResult.acceptance?.status === "rejected") {
                 statusPayload.error = acceptanceFailureMessage(singleResult.acceptance) ?? "Chain acceptance gate rejected the step.";
@@ -4856,6 +4764,7 @@ export async function runSubagent(config, childSessions) {
                 review: r.review,
                 effects: r.effects,
                 structuredOutput: r.structuredOutput,
+                structuredOutputFailed: r.structuredOutputFailed,
                 structuredOutputPath: r.structuredOutputPath,
                 structuredOutputSchemaPath: r.structuredOutputSchemaPath,
                 acceptance: r.acceptance,
@@ -4973,162 +4882,46 @@ export async function runSubagent(config, childSessions) {
         }
     }
 }
-async function waitForStartupControl(controlPath, token, action, timeoutMs = 30_000) {
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() <= deadline) {
-        if (fs.existsSync(controlPath)) {
-            let payload;
-            try {
-                payload = JSON.parse(fs.readFileSync(controlPath, "utf-8"));
-            }
-            catch (error) {
-                throw new Error(`Failed to read runner startup control '${controlPath}': ${error instanceof Error ? error.message : String(error)}`);
-            }
-            if (payload.token !== token)
-                throw new Error("Runner startup control token does not match.");
-            if (payload.action === action)
-                return;
-            if (payload.action !== "ack" && payload.action !== "confirm" && payload.action !== "proceed")
-                throw new Error("Runner startup control action is invalid.");
-        }
-        await new Promise((resolve) => setTimeout(resolve, 20));
-    }
-    throw new Error(`Timed out after ${timeoutMs}ms waiting for runner startup control '${action}'.`);
-}
-// Both hosts enter here: startup authorization, revival leases and disposal stay shared.
-export async function runConfiguredSubagent(config, options) {
-    let lease;
-    let startupCommitted = config.revivalLease === undefined && config.launchBarrierToken === undefined;
-    const startupPath = path.join(config.asyncDir, "runner-startup.json");
-    const startupAckPath = path.join(config.asyncDir, "runner-startup-ack.json");
-    const startupConfirmPath = path.join(config.asyncDir, "runner-startup-confirm.json");
-    const startupProceedPath = path.join(config.asyncDir, "runner-startup-proceed.json");
-    const releaseOnExit = () => {
-        try {
-            lease?.release();
-        }
-        catch {
-            // Exit cleanup is best effort; a dead-owner lease is reclaimed on the next revival.
-        }
-    };
-    process.once("exit", releaseOnExit);
+/** Heavy execution entry loaded by the bootstrap only after startup commits. */
+export async function runConfiguredSubagentExecution(config, options) {
+    let childSessions;
     try {
-        if (config.launchBarrierToken) {
-            await waitForStartupControl(startupProceedPath, config.launchBarrierToken, "proceed");
-            startupCommitted = true;
-            try {
-                fs.rmSync(startupProceedPath, { force: true });
-            }
-            catch {
-                // Startup control cleanup is best effort after the parent commits the run.
-            }
-        }
-        else if (config.revivalLease) {
-            lease = acquireSessionLease(config.revivalLease);
-            config.revivalLeaseToken = lease.owner.token;
-            writeAtomicJson(startupPath, { state: "ready", token: lease.owner.token, pid: process.pid, owner: lease.owner });
-            await waitForStartupControl(startupAckPath, lease.owner.token, "ack");
-            writeAtomicJson(startupPath, { state: "acknowledged", token: lease.owner.token, pid: process.pid });
-            await waitForStartupControl(startupConfirmPath, lease.owner.token, "confirm");
-            writeAtomicJson(startupPath, { state: "confirmed", token: lease.owner.token, pid: process.pid });
-            await waitForStartupControl(startupProceedPath, lease.owner.token, "proceed");
-            startupCommitted = true;
-            for (const controlPath of [startupAckPath, startupConfirmPath, startupProceedPath]) {
-                try {
-                    fs.rmSync(controlPath, { force: true });
-                }
-                catch {
-                    // Startup control cleanup is best effort after the parent commits the run.
-                }
-            }
-        }
-        const childSessions = await loadRunnerChildSessionFactory(config, options);
-        try {
-            await runSubagent(config, childSessions);
-        }
-        finally {
-            try {
-                await childSessions.dispose();
-            }
-            catch (error) {
-                console.error("Failed to dispose runner child sessions:", error);
-            }
-        }
+        // Detached Node runners do not receive Pi's CLI dispatcher setup. Binary
+        // hosts install the same dispatcher before entering the shared bootstrap.
+        if (!options?.loadPiCodingAgent)
+            installRunnerHttpDispatcher({ agentDir: getAgentDir(), cwd: process.cwd() });
+        childSessions = await loadRunnerChildSessionFactory(config, options);
     }
     catch (error) {
-        if (!startupCommitted) {
-            try {
-                writeAtomicJson(startupPath, { state: "error", pid: process.pid, error: error instanceof Error ? error.message : String(error) });
-            }
-            catch {
-                // The parent will time out and terminate this runner if the handshake cannot be written.
-            }
+        try {
+            persistRunnerStartupFailure({
+                asyncDir: config.asyncDir,
+                runId: config.id,
+                runnerProcessInstanceId: config.runnerProcessInstanceId ?? "unknown-runner-instance",
+                message: `Subagent runner startup failed: ${error instanceof Error ? error.message : String(error)}`,
+                ...(config.sessionId ? { sessionId: config.sessionId } : {}),
+                ...(config.completionOwnerId ? { completionOwnerId: config.completionOwnerId } : {}),
+                candidate: {
+                    ...(config.revivalLease?.sessionFile ? { sessionFile: config.revivalLease.sessionFile } : {}),
+                    ...(config.revivalLeaseToken ? { revivalLeaseToken: config.revivalLeaseToken } : {}),
+                },
+            });
+        }
+        catch (persistenceError) {
+            console.error("Failed to persist runner setup failure:", persistenceError);
         }
         throw error;
     }
-    finally {
-        process.off("exit", releaseOnExit);
-        if (lease) {
-            let acknowledged = false;
-            try {
-                acknowledged = lease.release();
-            }
-            catch (error) {
-                console.error("Failed to release session revival lease:", error);
-            }
-            try {
-                markProcessTerminalCandidateLeaseRelease(config.asyncDir, lease.owner.token, acknowledged);
-            }
-            catch (error) {
-                console.error("Failed to record session revival lease release:", error);
-            }
-        }
+    try {
+        await runSubagent(config, childSessions);
     }
-}
-function startConfiguredSubagent(config) {
-    // Child sessions and the extensions loaded into them may leave handles
-    // behind even after shutdown; the run is fully persisted by now, so exit
-    // explicitly instead of waiting for the event loop to drain.
-    runConfiguredSubagent(config).then(() => process.exit(0), (runErr) => {
-        console.error("Subagent runner error:", runErr);
-        process.exit(1);
-    });
-}
-if (isRunnerEntrypoint) {
-    const configArg = process.argv[2];
-    if (configArg) {
+    finally {
         try {
-            const configJson = fs.readFileSync(configArg, "utf-8");
-            const config = JSON.parse(configJson);
-            try {
-                fs.unlinkSync(configArg);
-            }
-            catch {
-                // Temp config cleanup is best effort.
-            }
-            startConfiguredSubagent(config);
+            await childSessions.dispose();
         }
-        catch (err) {
-            console.error("Subagent runner error:", err);
-            process.exit(1);
+        catch (error) {
+            console.error("Failed to dispose runner child sessions:", error);
         }
     }
-    else {
-        let input = "";
-        process.stdin.setEncoding("utf-8");
-        process.stdin.on("data", (chunk) => {
-            input += chunk;
-        });
-        process.stdin.on("end", () => {
-            try {
-                const config = JSON.parse(input);
-                startConfiguredSubagent(config);
-            }
-            catch (err) {
-                console.error("Subagent runner error:", err);
-                process.exit(1);
-            }
-        });
-    }
 }
 //# sourceMappingURL=subagent-runner.js.map