@fitlab-ai/agent-infra 0.9.13 → 0.9.14

package/dist/lib/sandbox/control/server.js

@@ -1,3 +1,4 @@
+import { completedReentryView } from './completed-reentry.js';
 import fs from 'node:fs';
 import path from 'node:path';
 import { createHash, randomUUID } from 'node:crypto';
@@ -5,13 +6,66 @@ import { getProcessStartTime } from '../../server/process-state.js';
 import { assertGitWorktreeBinding } from '../../git/worktree-identity.js';
 import { controlError, DEFAULT_SANDBOX_CONTROL_TIMING, SANDBOX_CONTROL_MAX_RESPONSE_BYTES, SANDBOX_CONTROL_MAX_TERMINAL_RECORD_BYTES } from './protocol.js';
 import { prepareSandboxControlExecution } from './executor.js';
-import { appendSandboxControlAudit, atomicWriteJsonNoReplace, createSandboxControlPayload, cleanupStaleSandboxControlLease, executionPath, readJsonFile, readActiveLease, readExecution, readSandboxControlPayload, readSandboxControlResultEvidence, sandboxControlEncodedJsonBytes, sandboxControlGenerationUsage, sanitizeSandboxControlOutput, sanitizeSandboxControlResult, payloadPath, writeSandboxControlPayload, writeSandboxControlReservation, writeSandboxControlResultEvidence, terminateSandboxControlExecution, writeSandboxControlStatus } from './state.js';
+import { appendSandboxControlAudit, atomicWriteJsonNoReplace, createSandboxControlPayload, cleanupStaleSandboxControlLease, executionPath, readJsonFile, readActiveLease, readExecution, readSandboxControlPayload, readSandboxControlResultEvidence, sandboxControlEncodedJsonBytes, sandboxControlGenerationUsage, sanitizeSandboxControlOutput, sanitizeSandboxControlResult, payloadPath, writeSandboxControlPayload, writeSandboxControlReservation, writeSandboxControlResultEvidence, terminateSandboxControlExecution, writeSandboxControlStatus, readSandboxControlStatus } from './state.js';
 import { validateSandboxControlRequest } from './protocol.js';
 import { inspectSandboxControlContainer } from './container-identity.js';
 import { acquireSandboxControlBrokerStartup, garbageCollectSandboxControlRoot, isSandboxControlRootQuiescing, readSandboxControlManifest } from './lifecycle.js';
 import { nextSandboxControlBackoff } from './timing.js';
 import { readTaskFinalizationReceipt } from '../../task/finalization.js';
 import { resolveTaskRef } from '../../task/resolve-ref.js';
+import { mergeSandboxTaskView, taskViewAfterFinalization, taskViewForManifest } from './task-view.js';
+import { taskCreateOutputUnavailableResult } from '../../task/create-service.js';
+function safeRealpath(value) {
+    try {
+        return fs.realpathSync.native(value);
+    }
+    catch {
+        return null;
+    }
+}
+function appendBrokerAudit(manifest, event, fields = {}) {
+    try {
+        appendSandboxControlAudit(manifest, event, { source: 'broker', ...fields });
+    }
+    catch {
+        // Diagnostics must never change the control protocol.
+    }
+}
+function requestAuditFields(manifest, manifestPath, request) {
+    const args = 'args' in request ? request.args : [];
+    const encodedArgs = JSON.stringify(args);
+    return {
+        requestId: request.id,
+        requestFamily: request.family,
+        sandboxTaskId: manifest.taskId,
+        requestGeneration: request.generation,
+        requestIssuedAt: request.issuedAt,
+        requestExpiresAt: request.expiresAt,
+        requestArgCount: args.length,
+        requestArgsSha256: createHash('sha256').update(encodedArgs, 'utf8').digest('hex'),
+        requestTaskRef: args[0] ?? null,
+        requestCommand: args[1] ?? null,
+        controllerProofPresent: request.controllerProof !== null,
+        hostCwd: process.cwd(),
+        manifestPath,
+        manifestPathRealpath: safeRealpath(manifestPath),
+        repoRoot: manifest.repoRoot,
+        repoRootRealpath: safeRealpath(manifest.repoRoot),
+        worktreeRoot: manifest.worktreeRoot,
+        worktreeRootRealpath: safeRealpath(manifest.worktreeRoot),
+        runtimeDir: manifest.runtimeDir,
+        runtimeDirRealpath: safeRealpath(manifest.runtimeDir)
+    };
+}
+function resultAuditFields(result) {
+    return {
+        exitCode: result.exitCode,
+        stdoutBytes: Buffer.byteLength(result.stdout, 'utf8'),
+        stderrBytes: Buffer.byteLength(result.stderr, 'utf8'),
+        stdoutSha256: createHash('sha256').update(result.stdout, 'utf8').digest('hex'),
+        stderrSha256: createHash('sha256').update(result.stderr, 'utf8').digest('hex')
+    };
+}
 function assertRealDirectory(directory, parent) {
     const stat = fs.lstatSync(directory);
     if (!stat.isDirectory() || stat.isSymbolicLink())
@@ -120,6 +174,29 @@ function finalizationRecoveryResponse(manifest, requestId, exitCode) {
         }
     };
 }
+function publishFinalizationTaskView(manifest, broker, requestId, state, reasonCode, activeRequestId) {
+    let view;
+    try {
+        const resolved = resolveTaskRef(manifest.taskId ?? '', { repoRoot: manifest.repoRoot });
+        const receipt = readTaskFinalizationReceipt(manifest.repoRoot, manifest.taskId ?? '');
+        view = resolved.ok && resolved.state === 'completed'
+            ? taskViewAfterFinalization({
+                taskId: manifest.taskId ?? '', generation: manifest.generation, requestId, receipt
+            })
+            : {
+                state: 'unknown', taskId: manifest.taskId, observedSource: 'unknown', receipt: null,
+                reasonCode: 'SANDBOX_TASK_VIEW_SOURCE_UNCONFIRMED'
+            };
+    }
+    catch {
+        view = {
+            state: 'unknown', taskId: manifest.taskId, observedSource: 'unknown', receipt: null,
+            reasonCode: 'SANDBOX_TASK_VIEW_RECEIPT_INVALID'
+        };
+    }
+    writeSandboxControlStatus(manifest, broker, state, reasonCode, activeRequestId, Date.now(), view);
+    return view;
+}
 function payloadReference(payload) {
     return {
         version: payload.version,
@@ -143,14 +220,17 @@ function outputMatchesEvidence(output, bytes, sha256) {
     return Buffer.byteLength(output, 'utf8') === bytes
         && createHash('sha256').update(output, 'utf8').digest('hex') === sha256;
 }
-function genericRecoveryResponse(requestId, evidence, payload) {
+function genericRecoveryResponse(request, exitCode, payload, cause = 'recovery') {
+    const outputUnavailable = request.family === 'task-create' && !payload;
     return {
         version: 2,
-        id: requestId,
+        id: request.id,
         phase: 'completed',
-        exitCode: evidence.exitCode,
-        stdout: '',
-        stderr: payload ? '' : 'SANDBOX_CONTROL_OUTPUT_UNAVAILABLE: broker restarted after executor completion\n',
+        exitCode,
+        stdout: outputUnavailable ? `${JSON.stringify(taskCreateOutputUnavailableResult(request.id))}\n` : '',
+        stderr: payload ? '' : cause === 'publish'
+            ? 'SANDBOX_CONTROL_OUTPUT_UNAVAILABLE: output payload was not retained\n'
+            : 'SANDBOX_CONTROL_OUTPUT_UNAVAILABLE: broker restarted after executor completion\n',
         error: null,
         outputState: payload ? 'available' : 'unavailable',
         payload: payload ? payloadReference(payload) : null
@@ -161,7 +241,7 @@ function recoveryResponse(manifest, request, evidence, payload) {
         const finalization = finalizationRecoveryResponse(manifest, request.id, evidence.exitCode);
         return finalization.status === 'matched' ? finalization.response ?? null : null;
     }
-    return genericRecoveryResponse(request.id, evidence, payload);
+    return genericRecoveryResponse(request, evidence.exitCode, payload);
 }
 function terminalMatchesEvidence(manifest, request, response, evidence, payload, payloadInvalid) {
     if (request.family === 'task-finalization' && evidence.exitCode === 0) {
@@ -192,8 +272,10 @@ function terminalMatchesEvidence(manifest, request, response, evidence, payload,
         };
     }
     if (response.outputState === 'unavailable') {
-        const expected = genericRecoveryResponse(request.id, evidence, null);
-        return { valid: JSON.stringify(response) === JSON.stringify(expected), payloadReferenced: false };
+        const causes = ['recovery', 'publish'];
+        const valid = causes.some((cause) => JSON.stringify(response)
+            === JSON.stringify(genericRecoveryResponse(request, evidence.exitCode, null, cause)));
+        return { valid, payloadReferenced: false };
     }
     return {
         valid: response.payload === undefined
@@ -202,7 +284,7 @@ function terminalMatchesEvidence(manifest, request, response, evidence, payload,
         payloadReferenced: false
     };
 }
-function publishExecutionResult(manifest, request, result, brokerOwns) {
+function publishExecutionResult(manifest, request, result, broker, brokerOwns) {
     const normalized = sanitizeSandboxControlResult(manifest, result);
     let terminal = null;
     if (request.family === 'task-finalization') {
@@ -234,21 +316,16 @@ function publishExecutionResult(manifest, request, result, brokerOwns) {
             catch {
                 payload = null;
             }
-            terminal = {
-                version: 2,
-                id: request.id,
-                phase: 'completed',
-                exitCode: normalized.exitCode,
-                stdout: '',
-                stderr: payload ? '' : 'SANDBOX_CONTROL_OUTPUT_UNAVAILABLE: output payload was not retained\n',
-                error: null,
-                outputState: payload ? 'available' : 'unavailable',
-                payload: payload ? payloadReference(payload) : null
-            };
+            terminal = genericRecoveryResponse(request, normalized.exitCode, payload, 'publish');
         }
     }
     if (!brokerOwns())
         return false;
+    if (request.family === 'task-finalization' && normalized.exitCode === 0) {
+        const view = publishFinalizationTaskView(manifest, broker, request.id, 'healthy', null, null);
+        if (view.state === 'unknown')
+            return false;
+    }
     return writeSandboxControlResponse(manifest, terminal);
 }
 function writeAcceptedResponse(manifest, response) {
@@ -309,7 +386,7 @@ function bindingReason(manifest) {
         return 'SANDBOX_WORKTREE_BINDING_LOST';
     }
 }
-function recoverProcessing(manifest, brokerOwns) {
+function recoverProcessing(manifest, broker, brokerOwns) {
     for (const entry of fs.readdirSync(manifest.processingDir, { withFileTypes: true })) {
         if (!entry.isDirectory() || !/^[a-f0-9-]{16,64}$/.test(entry.name))
             continue;
@@ -385,7 +462,7 @@ function recoverProcessing(manifest, brokerOwns) {
                             throw new Error('payload missing or mismatched');
                         payloadReferenced = true;
                     }
-                    else if (terminal && (response.outputState !== undefined
+                    else if (terminal && ((response.outputState !== undefined && response.outputState !== 'unavailable')
                         || response.payload !== undefined && response.payload !== null)) {
                         throw new Error('payload state invalid');
                     }
@@ -403,6 +480,11 @@ function recoverProcessing(manifest, brokerOwns) {
                 if (!reconciliation.valid)
                     continue;
                 payloadReferenced = reconciliation.payloadReferenced;
+                if (request.family === 'task-finalization' && resultEvidence.exitCode === 0) {
+                    const view = publishFinalizationTaskView(manifest, broker, request.id, 'starting', null, null);
+                    if (view.state === 'unknown')
+                        continue;
+                }
             }
             if (!terminal) {
                 if (!brokerOwns())
@@ -412,6 +494,11 @@ function recoverProcessing(manifest, brokerOwns) {
                 const recovered = recoveryResponse(manifest, request, resultEvidence, payload);
                 if (!recovered)
                     continue;
+                if (request.family === 'task-finalization' && resultEvidence.exitCode === 0) {
+                    const view = publishFinalizationTaskView(manifest, broker, request.id, 'starting', null, null);
+                    if (view.state === 'unknown')
+                        continue;
+                }
                 writeSandboxControlResponse(manifest, recovered);
                 payloadReferenced = Boolean(payload) && request.family !== 'task-finalization';
             }
@@ -434,7 +521,13 @@ function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 export function sandboxControlSafeEnv(env = process.env) {
-    return Object.fromEntries(Object.entries(env).filter(([key]) => !key.toUpperCase().startsWith('AGENT_INFRA_CONTROL_')));
+    return Object.fromEntries(Object.entries(env).filter(([key]) => {
+        const normalized = key.toUpperCase();
+        return !normalized.startsWith('AGENT_INFRA_CONTROL_')
+            && normalized !== 'AGENT_INFRA_TASK_ID'
+            && normalized !== 'AGENT_INFRA_RUNTIME_DIR'
+            && normalized !== 'AGENT_INFRA_EXECUTOR_MANIFEST';
+    }));
 }
 export async function serveSandboxControl(manifestPath, signal = new AbortController().signal, options = {}) {
     const timing = options.timing ?? DEFAULT_SANDBOX_CONTROL_TIMING;
@@ -490,6 +583,28 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
         releaseStartup();
     }
     let active = null;
+    let startupReceipt = null;
+    if (manifest.taskId) {
+        try {
+            startupReceipt = readTaskFinalizationReceipt(manifest.repoRoot, manifest.taskId);
+        }
+        catch {
+            // Preserve malformed receipt evidence as unknown rather than treating it as no receipt.
+            startupReceipt = {};
+        }
+    }
+    let taskView = taskViewForManifest({
+        ...manifest,
+        receipt: startupReceipt
+    });
+    try {
+        const previous = readSandboxControlStatus(manifest.publicStatusDir);
+        if (previous.generation === manifest.generation)
+            taskView = mergeSandboxTaskView(taskView, previous.taskView);
+    }
+    catch {
+        // A fresh control root has no previous task-view projection.
+    }
     let lastState = '';
     let lastStatusAt = 0;
     let nextBindingCheckAt = 0;
@@ -501,12 +616,49 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
     try {
         if (!brokerOwns())
             return;
-        writeSandboxControlStatus(manifest, broker, 'starting', null, null);
+        if (taskView.state === 'current' && taskView.observedSource === 'completed') {
+            // Recheck durable re-entry evidence before publishing a trusted startup view.
+            const unverified = { ...taskView, state: 'unknown',
+                reasonCode: 'SANDBOX_COMPLETED_REENTRY_EVIDENCE_INVALID' };
+            try {
+                taskView = await completedReentryView(manifest, inspectContainer) ?? unverified;
+            }
+            catch {
+                taskView = unverified;
+            }
+            if (!brokerOwns())
+                return;
+        }
+        writeSandboxControlStatus(manifest, broker, 'starting', null, null, Date.now(), taskView);
         if (!brokerOwns())
             return;
-        appendSandboxControlAudit(manifest, 'broker-start', { pid: broker.pid });
-        if (!recoverProcessing(manifest, brokerOwns))
+        appendBrokerAudit(manifest, 'broker-start', {
+            pid: broker.pid,
+            brokerId: broker.brokerId,
+            hostCwd: process.cwd(),
+            manifestPath,
+            manifestPathRealpath: safeRealpath(manifestPath),
+            repoRoot: manifest.repoRoot,
+            repoRootRealpath: safeRealpath(manifest.repoRoot),
+            worktreeRoot: manifest.worktreeRoot,
+            worktreeRootRealpath: safeRealpath(manifest.worktreeRoot),
+            runtimeDir: manifest.runtimeDir,
+            runtimeDirRealpath: safeRealpath(manifest.runtimeDir),
+            channelDir: manifest.channelDir,
+            publicStatusDir: manifest.publicStatusDir,
+            processingDir: manifest.processingDir,
+            internalCliPath: options.internalCliPath ?? process.argv[1] ?? null
+        });
+        if (!recoverProcessing(manifest, broker, brokerOwns))
             return;
+        try {
+            const published = readSandboxControlStatus(manifest.publicStatusDir);
+            if (published.generation === manifest.generation)
+                taskView = published.taskView;
+        }
+        catch {
+            // The regular heartbeat will publish an invalid or missing projection as unknown.
+        }
         while (!signal.aborted) {
             let settledExecution = null;
             if (!brokerOwns())
@@ -589,7 +741,7 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                 if (cleanupStaleSandboxControlLease(manifest)) {
                     if (!brokerOwns())
                         break;
-                    appendSandboxControlAudit(manifest, 'lease-stale-cleanup');
+                    appendBrokerAudit(manifest, 'lease-stale-cleanup');
                 }
                 if (readActiveLease(manifest))
                     reasonCode = 'SANDBOX_CONTROL_HANDOFF_ACTIVE';
@@ -612,14 +764,25 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
             }
             reasonCode ??= containerReasonCode;
             reasonCode ??= bindingReasonCode;
+            if (!reasonCode && !active && taskView.state !== 'current') {
+                try {
+                    const reentered = await completedReentryView(manifest, inspectContainer);
+                    if (reentered && brokerOwns() && !readActiveLease(manifest) && !bindingCheck(manifest)) {
+                        taskView = reentered;
+                    }
+                }
+                catch {
+                    // Invalid or changed re-entry evidence never clears the existing task view.
+                }
+            }
             const state = reasonCode ? 'parked' : active ? 'busy' : 'healthy';
             const stateKey = `${state}:${reasonCode ?? ''}:${active?.request.id ?? ''}`;
             if (brokerOwns() && (stateKey !== lastState || now - lastStatusAt >= timing.controlTickMs)) {
-                writeSandboxControlStatus(manifest, broker, state, reasonCode, active?.request.id ?? null, now);
+                writeSandboxControlStatus(manifest, broker, state, reasonCode, active?.request.id ?? null, now, taskView);
                 lastStatusAt = now;
             }
             if (brokerOwns() && stateKey !== lastState) {
-                appendSandboxControlAudit(manifest, 'broker-state', { state, reasonCode, requestId: active?.request.id ?? null });
+                appendBrokerAudit(manifest, 'broker-state', { state, reasonCode, requestId: active?.request.id ?? null });
                 lastState = stateKey;
             }
             if (settledExecution) {
@@ -627,13 +790,29 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                     break;
                 let terminalCommitted = false;
                 if (settledExecution.result && settledExecution.resultEvidenceWritten) {
-                    terminalCommitted = publishExecutionResult(manifest, settledExecution.request, settledExecution.result, brokerOwns);
+                    terminalCommitted = publishExecutionResult(manifest, settledExecution.request, settledExecution.result, broker, brokerOwns);
+                    if (terminalCommitted && settledExecution.request.family === 'task-finalization') {
+                        try {
+                            const published = readSandboxControlStatus(manifest.publicStatusDir);
+                            if (published.generation === manifest.generation)
+                                taskView = published.taskView;
+                        }
+                        catch {
+                            taskView = { state: 'unknown', taskId: manifest.taskId, observedSource: 'unknown', receipt: null, reasonCode: 'SANDBOX_TASK_VIEW_STATUS_INVALID' };
+                        }
+                    }
                 }
                 else {
                     terminalCommitted = writeSandboxControlResponse(manifest, unknown(settledExecution.request.id));
                 }
                 if (!terminalCommitted)
                     return;
+                appendBrokerAudit(manifest, 'executor-result-published', {
+                    ...requestAuditFields(manifest, manifestPath, settledExecution.request),
+                    resultAvailable: settledExecution.result !== null,
+                    resultEvidenceWritten: settledExecution.resultEvidenceWritten,
+                    ...(settledExecution.result ? resultAuditFields(settledExecution.result) : {})
+                });
                 if (!brokerOwns())
                     break;
                 removeAcceptedResponse(manifest, settledExecution.request.id);
@@ -646,12 +825,19 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                 const id = name.slice(0, -5);
                 const source = path.join(requestsDir, name);
                 let claimed = null;
+                let validatedRequest = null;
                 try {
                     if (!brokerOwns()) {
                         retiring = true;
                         break;
                     }
                     claimed = claimRequest(manifest, source, id);
+                    appendBrokerAudit(manifest, 'request-claimed', {
+                        requestId: id,
+                        requestSourcePath: source,
+                        requestClaimedPath: claimed,
+                        requestProcessingDir: path.dirname(claimed)
+                    });
                     if (!brokerOwns()) {
                         retiring = true;
                         break;
@@ -666,30 +852,85 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                     if (active)
                         throw new Error('SANDBOX_CONTROL_BUSY');
                     const request = validateSandboxControlRequest(JSON.parse(fs.readFileSync(claimed, 'utf8')), manifest);
+                    validatedRequest = request;
+                    appendBrokerAudit(manifest, 'request-validated', {
+                        ...requestAuditFields(manifest, manifestPath, request),
+                        requestPath: claimed
+                    });
                     if (bindingCheck(manifest))
                         throw new Error('SANDBOX_WORKTREE_BINDING_LOST');
                     if (readActiveLease(manifest))
                         throw new Error('SANDBOX_CONTROL_HANDOFF_ACTIVE');
+                    appendBrokerAudit(manifest, 'request-gates-passed', {
+                        ...requestAuditFields(manifest, manifestPath, request),
+                        requestPath: claimed,
+                        bindingChecked: true,
+                        handoffLeaseChecked: true
+                    });
                     writeSandboxControlReservation(manifest, request.id, sandboxControlGenerationUsage(manifest));
+                    appendBrokerAudit(manifest, 'executor-reservation-written', {
+                        ...requestAuditFields(manifest, manifestPath, request),
+                        requestPath: claimed,
+                        executionPath: executionPath(manifest, request.id)
+                    });
+                    appendBrokerAudit(manifest, 'executor-prepare-start', {
+                        ...requestAuditFields(manifest, manifestPath, request),
+                        requestPath: claimed,
+                        executorCwd: manifest.repoRoot,
+                        executorEntry: options.internalCliPath ?? process.argv[1] ?? null
+                    });
                     const prepared = await prepareExecution({
                         manifest, manifestPath, request, requestPath: claimed,
                         internalCliPath: options.internalCliPath ?? process.argv[1]
                     });
+                    appendBrokerAudit(manifest, 'executor-prepared', {
+                        ...requestAuditFields(manifest, manifestPath, request),
+                        requestPath: claimed,
+                        executorCwd: manifest.repoRoot,
+                        childPid: prepared.execution.child.pid,
+                        childStartTime: prepared.execution.child.startTime,
+                        childProcessGroupId: prepared.execution.child.processGroupId,
+                        executionPath: executionPath(manifest, request.id)
+                    });
                     const execution = {
                         request, prepared, result: null, resultEvidenceWritten: false, failure: null, settled: false
                     };
                     active = execution;
                     prepared.completion.then((result) => {
                         execution.result = sanitizeSandboxControlResult(manifest, result);
+                        appendBrokerAudit(manifest, 'executor-completed', {
+                            ...requestAuditFields(manifest, manifestPath, request),
+                            ...resultAuditFields(execution.result),
+                            childPid: prepared.execution.child.pid,
+                            childStartTime: prepared.execution.child.startTime
+                        });
                         try {
                             writeSandboxControlResultEvidence(manifest, request.id, execution.result);
                             execution.resultEvidenceWritten = true;
                             execution.settled = true;
+                            appendBrokerAudit(manifest, 'executor-result-evidence-written', {
+                                ...requestAuditFields(manifest, manifestPath, request),
+                                resultPath: path.join(manifest.processingDir, request.id, 'result.json'),
+                                ...resultAuditFields(execution.result)
+                            });
                         }
                         catch (error) {
                             execution.failure = error;
+                            appendBrokerAudit(manifest, 'executor-result-evidence-failed', {
+                                ...requestAuditFields(manifest, manifestPath, request),
+                                errorType: error instanceof Error ? error.name : typeof error,
+                            });
                         }
-                    }, (error) => { execution.failure = error; execution.settled = true; });
+                    }, (error) => {
+                        execution.failure = error;
+                        execution.settled = true;
+                        appendBrokerAudit(manifest, 'executor-failed', {
+                            ...requestAuditFields(manifest, manifestPath, request),
+                            childPid: prepared.execution.child.pid,
+                            childStartTime: prepared.execution.child.startTime,
+                            errorType: error instanceof Error ? error.name : typeof error,
+                        });
+                    });
                     if (!brokerOwns()) {
                         prepared.terminate(false);
                         active = null;
@@ -705,6 +946,11 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                     writeAcceptedResponse(manifest, {
                         version: 2, id, phase: 'accepted', exitCode: null, stdout: '', stderr: '', error: null
                     });
+                    appendBrokerAudit(manifest, 'request-accepted', {
+                        ...requestAuditFields(manifest, manifestPath, request),
+                        acceptedPath: acceptedResponsePath(manifest, id),
+                        executionPhase: 'prepared'
+                    });
                     if (!brokerOwns()) {
                         prepared.terminate(false);
                         active = null;
@@ -712,9 +958,19 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                         break;
                     }
                     try {
+                        appendBrokerAudit(manifest, 'executor-start', {
+                            ...requestAuditFields(manifest, manifestPath, request),
+                            childPid: prepared.execution.child.pid,
+                            childStartTime: prepared.execution.child.startTime,
+                            executionPath: executionPath(manifest, request.id)
+                        });
                         prepared.start(brokerOwns);
                     }
                     catch (error) {
+                        appendBrokerAudit(manifest, 'executor-start-failed', {
+                            ...requestAuditFields(manifest, manifestPath, request),
+                            errorType: error instanceof Error ? error.name : typeof error,
+                        });
                         const owned = brokerOwns();
                         prepared.terminate(owned);
                         if (!owned || !brokerOwns()) {
@@ -736,7 +992,7 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                             retiring = true;
                             break;
                         }
-                        appendSandboxControlAudit(manifest, 'executor-gate-failed', { requestId: id });
+                        appendBrokerAudit(manifest, 'executor-gate-failed', { requestId: id });
                         continue;
                     }
                 }
@@ -745,6 +1001,16 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                         retiring = true;
                         break;
                     }
+                    const detail = controlError(error);
+                    appendBrokerAudit(manifest, 'request-rejected', {
+                        requestId: id,
+                        requestFamily: validatedRequest?.family ?? null,
+                        sandboxTaskId: manifest.taskId,
+                        requestPath: claimed,
+                        errorCode: detail.code,
+                        errorRetryable: detail.retryable,
+                        errorType: error instanceof Error ? error.name : typeof error,
+                    });
                     writeSandboxControlResponse(manifest, rejected(id, error));
                     if (!brokerOwns()) {
                         retiring = true;
@@ -775,7 +1041,7 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                 }
             }
             if (owned && active.result && active.resultEvidenceWritten) {
-                if (publishExecutionResult(manifest, active.request, active.result, brokerOwns)) {
+                if (publishExecutionResult(manifest, active.request, active.result, broker, brokerOwns)) {
                     if (brokerOwns()) {
                         removeAcceptedResponse(manifest, active.request.id);
                         fs.rmSync(path.join(manifest.processingDir, active.request.id), { recursive: true, force: true });
@@ -787,7 +1053,11 @@ export async function serveSandboxControl(manifestPath, signal = new AbortContro
                 const terminationConfirmed = active.prepared.terminate(owned);
                 if (owned && brokerOwns() && active.request.family === 'task-finalization') {
                     const recovered = finalizationRecoveryResponse(manifest, active.request.id, 0);
-                    if (recovered.status === 'matched' && recovered.response && writeSandboxControlResponse(manifest, recovered.response)) {
+                    const view = recovered.status === 'matched'
+                        ? publishFinalizationTaskView(manifest, broker, active.request.id, 'healthy', null, null)
+                        : null;
+                    if (view?.state !== 'unknown' && recovered.status === 'matched' && recovered.response
+                        && writeSandboxControlResponse(manifest, recovered.response)) {
                         if (terminationConfirmed && brokerOwns()) {
                             removeAcceptedResponse(manifest, active.request.id);
                             fs.rmSync(path.join(manifest.processingDir, active.request.id), { recursive: true, force: true });

package/dist/lib/sandbox/control/state.js

@@ -5,6 +5,7 @@ import { createHash, randomUUID } from 'node:crypto';
 import { buildProcessTreeStopCommand } from '../../server/process-control.js';
 import { getProcessIdentityState } from '../../server/process-state.js';
 import { parseSandboxControlResultEvidence, parseSandboxControlPayload, parseSandboxControlReservation, SANDBOX_CONTROL_MAX_RESPONSE_BYTES, SANDBOX_CONTROL_MAX_LOGICAL_RECORDS, SANDBOX_CONTROL_MAX_TERMINAL_RECORD_BYTES, SANDBOX_CONTROL_RESERVATION_BYTES } from './protocol.js';
+import { parseSandboxTaskView, taskViewForManifest } from './task-view.js';
 export const SANDBOX_CONTROL_AUDIT_MAX_BYTES = 1024 * 1024;
 export const SANDBOX_CONTROL_EXECUTION_STOP_MS = 2_000;
 function assertRegularFile(filePath) {
@@ -233,16 +234,16 @@ export function sandboxControlGenerationUsage(manifest) {
 export function statusPath(manifest) {
     return path.join(manifest.publicStatusDir, 'status.json');
 }
-export function writeSandboxControlStatus(manifest, broker, state, reasonCode, activeRequestId, now = Date.now()) {
+export function writeSandboxControlStatus(manifest, broker, state, reasonCode, activeRequestId, now = Date.now(), taskView = taskViewForManifest(manifest)) {
     const status = {
-        version: 2, generation: manifest.generation, broker, state, reasonCode, activeRequestId, updatedAt: now
+        version: 3, generation: manifest.generation, broker, state, reasonCode, activeRequestId, updatedAt: now, taskView
     };
     atomicWriteJson(statusPath(manifest), status, 0o600, false);
     return status;
 }
 export function parseSandboxControlStatus(value) {
     const status = value;
-    if (!status || status.version !== 2 || typeof status.generation !== 'string'
+    if (!status || status.version !== 3 || typeof status.generation !== 'string'
         || !status.broker || !Number.isSafeInteger(status.broker.pid) || typeof status.broker.startTime !== 'number'
         || !Number.isSafeInteger(status.broker.startTime) || typeof status.broker.brokerId !== 'string'
         || status.broker.brokerId.length === 0
@@ -251,6 +252,7 @@ export function parseSandboxControlStatus(value) {
         || (status.activeRequestId !== null && typeof status.activeRequestId !== 'string')
         || !Number.isSafeInteger(status.updatedAt))
         throw new Error('SANDBOX_CONTROL_STATUS_INVALID');
+    parseSandboxTaskView(status.taskView);
     return status;
 }
 export function readSandboxControlStatus(directory) {