@fitlab-ai/agent-infra 0.9.14 → 0.10.0

package/lib/sandbox/control/server.ts

@@ -1,3 +1,5 @@
+import { finalizationTerminalResponse } from './finalization-response.ts';
+import { isDeepStrictEqual } from 'node:util';
 import { completedReentryView } from './completed-reentry.ts';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -10,13 +12,13 @@ import {
   SANDBOX_CONTROL_MAX_RESPONSE_BYTES,
   SANDBOX_CONTROL_MAX_TERMINAL_RECORD_BYTES,
   type SandboxControlManifest,
+  type SandboxControlRecoveryWarning,
   type SandboxControlRequest,
   type SandboxControlResponse,
   type SandboxControlTimingPolicy
 } from './protocol.ts';
 import { prepareSandboxControlExecution, type PreparedSandboxControlExecution, type SandboxControlExecutionResult } from './executor.ts';
 import {
-  appendSandboxControlAudit,
   atomicWriteJsonNoReplace,
   createSandboxControlPayload,
   cleanupStaleSandboxControlLease,
@@ -26,6 +28,8 @@ import {
   readExecution,
   readSandboxControlPayload,
   readSandboxControlResultEvidence,
+  readSandboxControlTerminalResult,
+  createSandboxControlTerminalResult,
   sandboxControlEncodedJsonBytes,
   sandboxControlGenerationUsage,
   sanitizeSandboxControlOutput,
@@ -34,11 +38,37 @@ import {
   writeSandboxControlPayload,
   writeSandboxControlReservation,
   writeSandboxControlResultEvidence,
+  writeSandboxControlTerminalResult,
+  appendSandboxControlAudit,
   terminateSandboxControlExecution,
   writeSandboxControlStatus,
   readSandboxControlStatus
 } from './state.ts';
 import { validateSandboxControlRequest } from './protocol.ts';
+import {
+  requestAuditFields,
+  resultAuditFields,
+  appendCriticalAudit,
+  appendDiagnosticAudit,
+  createSandboxControlAuditContext,
+  writeSandboxControlTransition,
+  readSandboxControlTransition
+} from './audit.ts';
+import { parseTaskControlOperation } from '../../task/control-authority.ts';
+import {
+  parseControlOutput,
+  classifySandboxControlRecovery,
+  findSandboxControlRecoveryOperation,
+  operationRecoveryBinding,
+  SANDBOX_CONTROL_REQUIRED_COMPLETION_PHASES
+} from '../../task/control-recovery.ts';
+import { readRun } from '../../task/orchestration.ts';
+import { readLifecycleRecoveryDomainEvidence } from '../../task/lifecycle-recovery.ts';
+import { captureRepositorySnapshot } from '../../task/workspace-snapshot.ts';
+import { parseTypedTaskFrontmatter } from '../../task/frontmatter.ts';
+import { readLifecycleJournalEvidence } from '../../task/lifecycle.ts';
+import { resolveTaskRef } from '../../task/resolve-ref.ts';
+import { loadShortIdByTaskId } from '../../task/short-id.ts';
 import { inspectSandboxControlContainer, type ContainerObservation } from './container-identity.ts';
 import {
   acquireSandboxControlBrokerStartup,
@@ -49,7 +79,8 @@ import {
 import type { BrokerOwner } from './lifecycle.ts';
 import { nextSandboxControlBackoff } from './timing.ts';
 import { readTaskFinalizationReceipt } from '../../task/finalization.ts';
-import { resolveTaskRef } from '../../task/resolve-ref.ts';
+import { readCodexControllerRegistration } from './controller-registration.ts';
+import { validateSandboxControlIdentity } from './identity-sentinel.ts';
 import {
   mergeSandboxTaskView,
   taskViewAfterFinalization,
@@ -57,22 +88,68 @@ import {
   type SandboxTaskView
 } from './task-view.ts';
 import { taskCreateOutputUnavailableResult } from '../../task/create-service.ts';
+import {
+  consumeLifecycleRecoveryAttestation,
+  issueLifecycleRecoveryAttestation,
+  recoverLifecycleRecoveryOperation,
+  type LifecycleAuthorityResponseV1
+} from '../../task/control-authority.ts';
+import { createCodexCapabilityStore } from '../../agent-clients/adapters/codex-lifecycle/capability-store.ts';
+import { computeLifecycleBuildIdentity } from '../../agent-clients/adapters/codex-lifecycle/build-identity.ts';
 
 type ActiveExecution = {
   request: SandboxControlRequest;
   prepared: PreparedSandboxControlExecution;
+  lifecycleAuthority: LifecycleAuthorityResponseV1 | undefined;
   result: SandboxControlExecutionResult | null;
   resultEvidenceWritten: boolean;
   failure: unknown;
   settled: boolean;
 };
 
-function safeRealpath(value: string): string | null {
+function consumeLifecycleAuthorityForResult(
+  manifest: SandboxControlManifest,
+  execution: ActiveExecution
+): boolean {
+  const authority = execution.lifecycleAuthority?.attestation;
+  if (!authority || execution.result?.exitCode !== 0) return true;
+  try {
+    consumeLifecycleRecoveryAttestation(authority);
+    return true;
+  } catch (error) {
+    appendBrokerAudit(manifest, 'lifecycle-authority-consume-retry', {
+      ...requestAuditFields(manifest, execution.request),
+      errorCode: error instanceof Error ? error.name : 'LIFECYCLE_AUTHORITY_CONSUME_FAILED'
+    });
+    return false;
+  }
+}
+
+function lifecycleAuthorityForRequest(
+  manifest: SandboxControlManifest,
+  manifestPath: string,
+  request: SandboxControlRequest
+): LifecycleAuthorityResponseV1 | undefined {
+  const selector = request.family === 'task-workflow' || request.family === 'task-orchestration'
+    ? request.authority
+    : undefined;
+  if (!selector) return undefined;
+  let controllerBinding: { instanceDigest: string; controlGeneration: string } | null = null;
   try {
-    return fs.realpathSync.native(value);
+    const registration = readCodexControllerRegistration(manifestPath);
+    controllerBinding = {
+      instanceDigest: registration.controllerInstanceDigest,
+      controlGeneration: registration.controlGeneration
+    };
   } catch {
-    return null;
+    // The issuer reports the stable unavailable result; the broker never trusts
+    // a controller binding supplied by the request.
   }
+  return issueLifecycleRecoveryAttestation(selector, {
+    controllerBinding,
+    capabilityStore: createCodexCapabilityStore(),
+    buildIdentity: computeLifecycleBuildIdentity(manifest.repoRoot)
+  });
 }
 
 function appendBrokerAudit(
@@ -80,53 +157,72 @@ function appendBrokerAudit(
   event: string,
   fields: Record<string, string | number | boolean | null> = {}
 ): void {
+  appendDiagnosticAudit(manifest, event, { source: 'broker', ...fields });
+}
+
+function operationKey(request: SandboxControlRequest, output?: string): string | null {
+  if (request.family === 'task-finalization') return request.operation;
+  if (request.family === 'task-create') return 'create';
+  if (request.family === 'codex-controller') return request.command;
+  if (request.family === 'task-workflow') return request.workflow.operation;
+  if (request.family !== 'task-lifecycle' && request.family !== 'task-orchestration') return null;
+  if (request.family === 'task-orchestration' && request.args[1] === 'route') {
+    if (!output) return 'route';
+    const result = parseControlOutput(output);
+    return result?.changed === true && result.status === 'completed' ? 'route.clean-completion' : 'route.read';
+  }
   try {
-    appendSandboxControlAudit(manifest, event, { source: 'broker', ...fields });
+    const operation = parseTaskControlOperation(request.family, request.args);
+    return operation.family === 'task-orchestration' ? operation.intent : operation.request.intent;
   } catch {
-    // Diagnostics must never change the control protocol.
+    return null;
   }
 }
 
-function requestAuditFields(
+function recoveryOperationKey(
+  request: SandboxControlRequest,
+  terminalResult: ReturnType<typeof readSandboxControlTerminalResult> | null,
+  output: string | undefined
+): string | null {
+  const operation = operationKey(request, output);
+  if (operation !== 'route') return operation;
+  const digest = terminalResult?.intentDigest;
+  for (const candidate of ['route.read', 'route.clean-completion'] as const) {
+    const expected = operationRecoveryBinding(request.id, request.generation, null, request.family, candidate).intentDigest;
+    if (digest === expected) return candidate;
+  }
+  return null;
+}
+
+function terminalResultMatchesRequest(
+  request: SandboxControlRequest,
+  terminalResult: ReturnType<typeof readSandboxControlTerminalResult>
+): boolean {
+  const operation = operationKey(request);
+  const candidates = operation === 'route'
+    ? ['route.read', 'route.clean-completion']
+    : operation ? [operation] : [];
+  return candidates.some((candidate) => createHash('sha256').update(`${request.family}\0${candidate}`, 'utf8').digest('hex') === terminalResult.intentDigest);
+}
+
+function criticalRequestPhase(
   manifest: SandboxControlManifest,
-  manifestPath: string,
-  request: SandboxControlRequest
-): Record<string, string | number | boolean | null> {
-  const args = 'args' in request ? request.args : [];
-  const encodedArgs = JSON.stringify(args);
-  return {
+  request: SandboxControlRequest,
+  phase: Parameters<typeof createSandboxControlAuditContext>[1]['phase'],
+  outcome: Parameters<typeof createSandboxControlAuditContext>[1]['outcome'],
+  reference?: string | null
+): void {
+  const context = createSandboxControlAuditContext(manifest, {
     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)
-  };
+    family: request.family,
+    operation: operationKey(request),
+    phase,
+    outcome
+  });
+  appendCriticalAudit(manifest, context, { reference: reference ?? null });
+  writeSandboxControlTransition(manifest, { requestId: request.id, phase, reference });
 }
 
-function resultAuditFields(result: SandboxControlExecutionResult): Record<string, string | number | boolean | null> {
-  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: string, parent?: string): void {
   const stat = fs.lstatSync(directory);
@@ -212,33 +308,7 @@ function finalizationRecoveryResponse(
   } catch {
     return { status: 'deferred' };
   }
-  const pendingSteps = [
-    receipt.taskComment === 'pending' ? 'task-comment' : null,
-    receipt.verification === 'pending' ? 'verification' : null
-  ].filter((step): step is string => step !== null);
-  const completedSteps = ['lifecycle', receipt.taskComment === 'pending' ? null : 'task-comment', receipt.verification === 'pending' ? null : 'verification']
-    .filter((step): step is string => step !== null);
-  const warnings = receipt.warnings
-    .filter((warning) => warning.status === 'open')
-    .map(({ status: _status, resolvedAt: _resolvedAt, ...warning }) => warning);
-  const result = {
-    status: 'completed', changed: false, taskId: manifest.taskId,
-    lifecycle: { status: 'no-op', changed: false, error: null },
-    taskComment: receipt.taskComment === 'pending' ? null : { status: 'no-op', changed: false, error: null },
-    verification: receipt.verification === 'pending' ? null : { status: 'no-op', changed: false, error: null },
-    completedSteps, pendingSteps,
-    result: pendingSteps.length > 0 || receipt.warningProjection === 'pending' || warnings.length > 0
-      ? 'completed_with_warnings' : 'completed',
-    warnings, error: null
-  };
-  return {
-    status: 'matched',
-    response: {
-      version: 2, id: requestId, phase: 'completed', exitCode: 0,
-      stdout: `${JSON.stringify({ version: 1, status: 'completed', changed: false, accepted: true, result, error: null })}\n`,
-      stderr: '', error: null
-    }
-  };
+  return { status: 'matched', response: finalizationTerminalResponse(manifest.taskId, requestId, receipt) };
 }
 
 function publishFinalizationTaskView(
@@ -300,11 +370,12 @@ function outputMatchesEvidence(output: string, bytes: number, sha256: string): b
     && createHash('sha256').update(output, 'utf8').digest('hex') === sha256;
 }
 
-function genericRecoveryResponse(
+export function genericRecoveryResponse(
   request: SandboxControlRequest,
   exitCode: number,
   payload: ReturnType<typeof readSandboxControlPayload> | null,
-  cause: 'publish' | 'recovery' = 'recovery'
+  cause: 'publish' | 'recovery' = 'recovery',
+  warning: SandboxControlRecoveryWarning | null = null
 ): SandboxControlResponse {
   const outputUnavailable = request.family === 'task-create' && !payload;
   return {
@@ -313,38 +384,295 @@ function genericRecoveryResponse(
     phase: 'completed',
     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',
+    stderr: payload ? '' : warning
+      ? `${warning.code}: ${warning.message}\nAction: ${warning.action}\n`
+      : 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
   };
 }
 
-function recoveryResponse(
+type RecoveryDomainEvidence = Readonly<{
+  domain: Readonly<Record<string, unknown>> | null;
+  journal?: ReturnType<typeof readLifecycleJournalEvidence>;
+}>;
+
+function taskCreateDomainEvidence(
+  manifest: SandboxControlManifest,
+  output: Record<string, unknown> | null
+): Readonly<Record<string, unknown>> {
+  if (!output || !['applied', 'no-op', 'degraded'].includes(String(output.status))) {
+    return { consistent: false };
+  }
+  const task = output.task && typeof output.task === 'object' && !Array.isArray(output.task)
+    ? output.task as Record<string, unknown> : null;
+  const taskId = typeof task?.id === 'string' ? task.id : null;
+  const shortId = typeof task?.shortId === 'string' ? task.shortId : null;
+  if (!taskId || !shortId) return { consistent: false };
+  try {
+    const resolved = resolveTaskRef(taskId, { repoRoot: manifest.repoRoot });
+    const shortIds = loadShortIdByTaskId(manifest.repoRoot);
+    return {
+      consistent: resolved.ok && resolved.taskId === taskId && resolved.state === 'active' && shortIds.get(taskId) === shortId,
+      taskId,
+      shortId
+    };
+  } catch {
+    return { consistent: false };
+  }
+}
+
+function controllerDomainEvidence(
+  manifest: SandboxControlManifest,
+  manifestPath: string,
+  request: SandboxControlRequest,
+  output: Record<string, unknown> | null
+): Readonly<Record<string, unknown>> {
+  if (!output || output.error !== null || typeof output.status !== 'string') return { consistent: false };
+  try {
+    const registration = readCodexControllerRegistration(manifestPath);
+    if (request.family !== 'codex-controller') return { consistent: false };
+    if (request.command === 'open') {
+      const lease = output.lease && typeof output.lease === 'object' && !Array.isArray(output.lease)
+        ? output.lease as Record<string, unknown> : null;
+      return {
+        consistent: output.status === 'opened' && output.changed === true
+          && lease?.taskId === registration.taskId
+          && lease.controlGeneration === registration.controlGeneration
+          && lease.controllerInstanceDigest === registration.controllerInstanceDigest
+          && registration.taskId === manifest.taskId
+          && registration.controlGeneration === manifest.generation
+      };
+    }
+    if (request.command === 'verify') {
+      const binding = output.binding && typeof output.binding === 'object' && !Array.isArray(output.binding)
+        ? output.binding as Record<string, unknown> : null;
+      return {
+        consistent: output.status === 'verified' && output.changed === false
+          && binding?.taskId === registration.taskId
+          && binding.controlGeneration === registration.controlGeneration
+          && binding.controllerInstanceDigest === registration.controllerInstanceDigest
+      };
+    }
+    return { consistent: false };
+  } catch (error) {
+    return { consistent: request.family === 'codex-controller' && request.command === 'close'
+      && (error as { code?: string }).code === 'CODEX_SANDBOX_CONTROLLER_REGISTRATION_MISSING'
+      && output?.status === 'closed' && typeof output.changed === 'boolean' };
+  }
+}
+
+function orchestrationDomainEvidence(
+  operation: ReturnType<typeof findSandboxControlRecoveryOperation>,
+  terminalResult: ReturnType<typeof readSandboxControlTerminalResult>,
+  output: Record<string, unknown> | null,
+  run: ReturnType<typeof readRun> | null
+): Readonly<Record<string, unknown>> {
+  if (!operation || !output) return { consistent: false };
+  const outputRun = output.run && typeof output.run === 'object' && !Array.isArray(output.run)
+    ? output.run as Record<string, unknown> : null;
+  const runMatches = outputRun === null ? run === null : run !== null && JSON.stringify(run) === JSON.stringify(outputRun);
+  if (operation.class === 'read-only') {
+    return {
+      consistent: output.status === terminalResult.status && output.changed === terminalResult.changed && runMatches,
+      snapshotValid: true,
+      status: run?.status ?? terminalResult.status,
+      pendingDelegation: run?.pendingDelegation ?? null
+    };
+  }
+  if (!run || !outputRun) return { consistent: false };
+  return {
+    consistent: output.status === terminalResult.status && output.changed === terminalResult.changed && runMatches,
+    status: run.status,
+    pendingDelegation: run.pendingDelegation
+  };
+}
+
+function readRecoveryDomain(
   manifest: SandboxControlManifest,
+  manifestPath: string,
+  request: SandboxControlRequest,
+  operation: ReturnType<typeof findSandboxControlRecoveryOperation>,
+  terminalResult: ReturnType<typeof readSandboxControlTerminalResult>,
+  payloadOutput: string | null
+): RecoveryDomainEvidence {
+  if (!operation) return { domain: null };
+  const taskRef = request.family === 'task-finalization' || request.family === 'task-workflow'
+    ? manifest.taskId
+    : 'args' in request ? request.args[0] ?? null : manifest.taskId;
+  const output = parseControlOutput(payloadOutput);
+  if (!taskRef && operation.family !== 'task-create' && operation.family !== 'codex-controller') {
+    return { domain: null };
+  }
+
+  if (operation.family === 'task-lifecycle') {
+    if (operation.intent === 'recover-started') {
+      try {
+        if (!('args' in request)) return { domain: null };
+        const parsed = parseTaskControlOperation('task-lifecycle', request.args);
+        if (parsed.family !== 'task-lifecycle' || parsed.request.intent !== 'recover-started') {
+          return { domain: null };
+        }
+        return {
+          domain: readLifecycleRecoveryDomainEvidence(manifest.repoRoot, parsed.request, terminalResult),
+          journal: readLifecycleJournalEvidence(manifest.repoRoot, taskRef!)
+        };
+      } catch {
+        return { domain: null };
+      }
+    }
+    if (!taskRef || !terminalResult.targetState) return { domain: null };
+    const journal = readLifecycleJournalEvidence(manifest.repoRoot, taskRef);
+    try {
+      const resolved = resolveTaskRef(taskRef, { repoRoot: manifest.repoRoot });
+      const shortIds = loadShortIdByTaskId(manifest.repoRoot);
+      const shortIdMatches = terminalResult.targetState === 'active'
+        ? shortIds.has(resolved.ok ? resolved.taskId : taskRef)
+        : !shortIds.has(resolved.ok ? resolved.taskId : taskRef);
+      return {
+        domain: { consistent: resolved.ok && resolved.state === terminalResult.targetState && shortIdMatches },
+        journal
+      };
+    } catch {
+      return { domain: { consistent: false }, journal };
+    }
+  }
+
+  if (operation.family === 'task-orchestration') {
+    if (!taskRef) return { domain: null };
+    try {
+      const resolved = resolveTaskRef(taskRef, { repoRoot: manifest.repoRoot });
+      if (!resolved.ok) return { domain: { consistent: false } };
+      const run = readRun(resolved.taskDir);
+      if (!run && operation.class !== 'read-only') return { domain: { consistent: false } };
+      if (operation.class === 'route.clean-completion') {
+        const snapshot = captureRepositorySnapshot(manifest.repoRoot);
+        const metadata = parseTypedTaskFrontmatter(fs.readFileSync(resolved.taskMdPath, 'utf8'));
+        const completion = run?.completionEvidence ?? null;
+        const consistent = run !== null && completion !== null
+          && terminalResult.completionEvidence !== null
+          && isDeepStrictEqual(completion, terminalResult.completionEvidence);
+        return {
+          domain: {
+            consistent,
+            status: run?.status ?? null,
+            pendingDelegation: run?.pendingDelegation ?? null,
+            completionEvidence: completion,
+            snapshot,
+            lastReviewedCommit: metadata.last_reviewed_commit
+          }
+        };
+      }
+      return { domain: orchestrationDomainEvidence(operation, terminalResult, output, run) };
+    } catch {
+      return { domain: { consistent: false } };
+    }
+  }
+
+  if (operation.family === 'task-create') {
+    return { domain: taskCreateDomainEvidence(manifest, output) };
+  }
+  if (operation.family === 'codex-controller') {
+    return { domain: controllerDomainEvidence(manifest, manifestPath, request, output) };
+  }
+  if (operation.family === 'task-workflow') {
+    return {
+      domain: { consistent: output?.status === terminalResult.status && output.changed === terminalResult.changed, snapshotValid: true }
+    };
+  }
+  return { domain: null };
+}
+
+function readCommittedCriticalPhases(manifest: SandboxControlManifest, requestId: string): readonly string[] {
+  return SANDBOX_CONTROL_REQUIRED_COMPLETION_PHASES.filter((phase) => {
+    try {
+      readSandboxControlTransition(manifest, requestId, phase);
+      return true;
+    } catch {
+      return false;
+    }
+  });
+}
+
+export function recoveryResponse(
+  manifest: SandboxControlManifest,
+  manifestPath: string,
   request: SandboxControlRequest,
   evidence: ReturnType<typeof readSandboxControlResultEvidence>,
-  payload: ReturnType<typeof readSandboxControlPayload> | null
+  payload: ReturnType<typeof readSandboxControlPayload> | null,
+  terminalResult: ReturnType<typeof readSandboxControlTerminalResult>
 ): SandboxControlResponse | null {
+  const operationName = recoveryOperationKey(request, terminalResult, payload?.stdout);
+  const operation = operationName ? findSandboxControlRecoveryOperation(request.family, operationName) : null;
+  if (!operation) return null;
+  if (payload) {
+    const payloadTerminal = createSandboxControlTerminalResult(manifest, {
+      id: request.id, family: request.family, operation: operationName
+    }, payload.stdout);
+    if (JSON.stringify(payloadTerminal) !== JSON.stringify(terminalResult)) return unknown(request.id);
+  }
+  const finalization = request.family === 'task-finalization' ? finalizationRecoveryResponse(manifest, request.id, 0) : null;
+  if (evidence.exitCode === 0 && finalization?.status === 'deferred') return null;
+  if (evidence.exitCode === 0 && request.family === 'task-workflow' && request.authority?.phase === 'task-event.completed') {
+    try {
+      const registration = readCodexControllerRegistration(manifestPath);
+      const recovered = recoverLifecycleRecoveryOperation(request.authority, {
+        repoRoot: manifest.repoRoot,
+        capabilityStore: createCodexCapabilityStore(),
+        buildIdentity: computeLifecycleBuildIdentity(manifest.repoRoot),
+        controllerBinding: {
+          instanceDigest: registration.controllerInstanceDigest,
+          controlGeneration: registration.controlGeneration
+        }
+      });
+      if (recovered.status !== 'committed') return null;
+    } catch (error) {
+      appendBrokerAudit(manifest, 'lifecycle-authority-recovery-failed', {
+        ...requestAuditFields(manifest, request),
+        errorCode: error instanceof Error ? error.name : 'LIFECYCLE_AUTHORITY_RECOVERY_FAILED'
+      });
+      return null;
+    }
+  }
+  const recovery: RecoveryDomainEvidence = finalization
+    ? { domain: { consistent: finalization.status === 'matched' } }
+    : readRecoveryDomain(manifest, manifestPath, request, operation, terminalResult, payload?.stdout ?? null);
+  const binding = operationRecoveryBinding(request.id, manifest.generation, manifest.taskId, request.family, operationName!);
+  const decision = classifySandboxControlRecovery({
+    operation,
+    binding,
+    startedCommitted: true,
+    terminalResult,
+    criticalPhases: readCommittedCriticalPhases(manifest, request.id),
+    domain: recovery.domain,
+    journal: recovery.journal
+  });
+  if (decision.outcome === 'unknown' || decision.outcome === 'in-progress') return unknown(request.id);
+  if (decision.outcome === 'not-executed') return notExecuted(request.id);
+  if (decision.outcome !== 'success' && decision.outcome !== 'failure') return null;
   if (request.family === 'task-finalization' && evidence.exitCode === 0) {
-    const finalization = finalizationRecoveryResponse(manifest, request.id, evidence.exitCode);
-    return finalization.status === 'matched' ? finalization.response ?? null : null;
+    if (finalization?.status !== 'matched') return null;
+    return finalization.response ?? null;
   }
-  return genericRecoveryResponse(request, evidence.exitCode, payload);
+  return genericRecoveryResponse(request, evidence.exitCode, payload, 'recovery', terminalResult.warning ?? null);
 }
 
 function terminalMatchesEvidence(
   manifest: SandboxControlManifest,
+  manifestPath: string,
   request: SandboxControlRequest,
   response: SandboxControlResponse,
   evidence: ReturnType<typeof readSandboxControlResultEvidence>,
   payload: ReturnType<typeof readSandboxControlPayload> | null,
-  payloadInvalid: boolean
+  payloadInvalid: boolean,
+  terminalResult: ReturnType<typeof readSandboxControlTerminalResult> | null
 ): { valid: boolean; payloadReferenced: boolean } {
   if (request.family === 'task-finalization' && evidence.exitCode === 0) {
-    const expected = recoveryResponse(manifest, request, evidence, payload);
+    if (!terminalResult) return { valid: false, payloadReferenced: false };
+    const expected = recoveryResponse(manifest, manifestPath, request, evidence, payload, terminalResult);
     return {
       valid: expected !== null && JSON.stringify(response) === JSON.stringify(expected),
       payloadReferenced: false
@@ -373,7 +701,7 @@ function terminalMatchesEvidence(
   if (response.outputState === 'unavailable') {
     const causes = ['recovery', 'publish'] as const;
     const valid = causes.some((cause) => JSON.stringify(response)
-      === JSON.stringify(genericRecoveryResponse(request, evidence.exitCode, null, cause)));
+      === JSON.stringify(genericRecoveryResponse(request, evidence.exitCode, null, cause, terminalResult?.warning ?? null)));
     return { valid, payloadReferenced: false };
   }
   return {
@@ -392,6 +720,16 @@ function publishExecutionResult(
   brokerOwns: () => boolean
 ): boolean {
   const normalized = sanitizeSandboxControlResult(manifest, result);
+  const terminalResult = writeSandboxControlTerminalResult(manifest, {
+    id: request.id,
+    family: request.family,
+    operation: operationKey(request, normalized.stdout)
+  }, normalized.stdout);
+  if (fs.existsSync(path.join(manifest.processingDir, request.id, 'transitions'))) {
+    criticalRequestPhase(manifest, request, 'completed', normalized.exitCode === 0 ? 'success' : 'failure');
+    criticalRequestPhase(manifest, request, 'evidence-written', normalized.exitCode === 0 ? 'success' : 'failure');
+    criticalRequestPhase(manifest, request, 'publish-authorized', normalized.exitCode === 0 ? 'success' : 'failure');
+  }
   let terminal: SandboxControlResponse | null = null;
   if (request.family === 'task-finalization') {
     const finalization = finalizationRecoveryResponse(manifest, request.id, normalized.exitCode);
@@ -419,7 +757,7 @@ function publishExecutionResult(
       } catch {
         payload = null;
       }
-      terminal = genericRecoveryResponse(request, normalized.exitCode, payload, 'publish');
+      terminal = genericRecoveryResponse(request, normalized.exitCode, payload, 'publish', terminalResult.warning ?? null);
     }
   }
   if (!brokerOwns()) return false;
@@ -427,7 +765,11 @@ function publishExecutionResult(
     const view = publishFinalizationTaskView(manifest, broker, request.id, 'healthy', null, null);
     if (view.state === 'unknown') return false;
   }
-  return writeSandboxControlResponse(manifest, terminal);
+  const committed = writeSandboxControlResponse(manifest, terminal);
+  if (committed && fs.existsSync(path.join(manifest.processingDir, request.id, 'transitions'))) {
+    criticalRequestPhase(manifest, request, 'published-committed', normalized.exitCode === 0 ? 'success' : 'failure');
+  }
+  return committed;
 }
 
 function writeAcceptedResponse(manifest: SandboxControlManifest, response: SandboxControlResponse): void {
@@ -492,21 +834,40 @@ function bindingReason(manifest: SandboxControlManifest): string | null {
   }
 }
 
-function recoverProcessing(manifest: SandboxControlManifest, broker: BrokerOwner, brokerOwns: () => boolean): boolean {
+function assertCurrentSandboxControlIdentity(manifest: SandboxControlManifest, manifestPath: string): void {
+  const result = validateSandboxControlIdentity({
+    publicStatusDir: manifest.publicStatusDir,
+    root: path.dirname(path.resolve(manifestPath)),
+    mode: manifest.mode,
+    taskId: manifest.taskId,
+    generation: manifest.generation,
+    controlRootId: manifest.controlRootId
+  });
+  if (result.state !== 'valid') {
+    throw new Error(`SANDBOX_CONTROL_IDENTITY_${result.state.replaceAll('-', '_').toUpperCase()}`);
+  }
+}
+
+function recoverProcessing(manifest: SandboxControlManifest, manifestPath: string, broker: BrokerOwner, brokerOwns: () => boolean): boolean {
   for (const entry of fs.readdirSync(manifest.processingDir, { withFileTypes: true })) {
     if (!entry.isDirectory() || !/^[a-f0-9-]{16,64}$/.test(entry.name)) continue;
     if (!brokerOwns()) return false;
     const descriptor = executionPath(manifest, entry.name);
     const existingResponse = responsePath(manifest, entry.name);
     const processingDirectory = path.join(manifest.processingDir, entry.name);
+    const transitionsDirectory = path.join(processingDirectory, 'transitions');
+    const transitionProtocolActive = fs.existsSync(transitionsDirectory);
+    const startedCommitted = fs.existsSync(path.join(transitionsDirectory, 'started-committed.json'));
     let payloadReferenced = false;
     if (fs.existsSync(descriptor)) {
       const execution = readExecution(descriptor);
       let resultEvidence: ReturnType<typeof readSandboxControlResultEvidence> | null = null;
+      let terminalResult: ReturnType<typeof readSandboxControlTerminalResult> | null = null;
       let payload: ReturnType<typeof readSandboxControlPayload> | null = null;
       let payloadInvalid = false;
       let request: SandboxControlRequest | null = null;
       let existingTerminalResponse: SandboxControlResponse | null = null;
+      let terminalReconciled = false;
       try {
         const rawRequest = JSON.parse(fs.readFileSync(path.join(processingDirectory, 'request.json'), 'utf8')) as Record<string, unknown>;
         request = validateSandboxControlRequest(rawRequest, manifest, {
@@ -526,6 +887,18 @@ function recoverProcessing(manifest: SandboxControlManifest, broker: BrokerOwner
           resultEvidence = null;
         }
       }
+      const terminalResultPathValue = path.join(processingDirectory, 'terminal-result.json');
+      if (fs.existsSync(terminalResultPathValue)) {
+        try {
+          terminalResult = readSandboxControlTerminalResult(terminalResultPathValue);
+          if (terminalResult.requestId !== entry.name || terminalResult.generation !== manifest.generation
+            || !request || !terminalResultMatchesRequest(request, terminalResult)) {
+            terminalResult = null;
+          }
+        } catch {
+          terminalResult = null;
+        }
+      }
       const publishedPayloadPath = payloadPath(manifest, entry.name);
       if (fs.existsSync(publishedPayloadPath)) {
         try {
@@ -538,11 +911,21 @@ function recoverProcessing(manifest: SandboxControlManifest, broker: BrokerOwner
           payloadInvalid = true;
         }
       }
+      if (transitionProtocolActive && startedCommitted && !terminalResult) {
+        if (!brokerOwns()) return false;
+        if (!terminateSandboxControlExecution(execution)) {
+          throw new Error(`SANDBOX_CONTROL_EXECUTION_STILL_RUNNING: ${entry.name}`);
+        }
+        appendDiagnosticAudit(manifest, 'orphan-tree-terminated', { requestId: entry.name });
+        writeSandboxControlResponse(manifest, unknown(entry.name));
+        continue;
+      }
+      if (transitionProtocolActive && !startedCommitted && terminalResult) continue;
       if (!terminateSandboxControlExecution(execution)) {
         throw new Error(`SANDBOX_CONTROL_EXECUTION_STILL_RUNNING: ${entry.name}`);
       }
       if (!brokerOwns()) return false;
-      appendSandboxControlAudit(manifest, 'orphan-tree-terminated', { requestId: entry.name });
+      appendDiagnosticAudit(manifest, 'orphan-tree-terminated', { requestId: entry.name });
       let terminal = false;
       if (fs.existsSync(existingResponse)) {
         try {
@@ -571,28 +954,61 @@ function recoverProcessing(manifest: SandboxControlManifest, broker: BrokerOwner
       }
       if (terminal && (!request || !resultEvidence)) continue;
       if (terminal && request && resultEvidence) {
-        const reconciliation = terminalMatchesEvidence(manifest, request, existingTerminalResponse!, resultEvidence, payload, payloadInvalid);
+        if (!terminalResult && request.family !== 'task-create') continue;
+        const reconciliation = terminalMatchesEvidence(
+          manifest,
+          manifestPath,
+          request,
+          existingTerminalResponse!,
+          resultEvidence,
+          payload,
+          payloadInvalid,
+          terminalResult
+        );
         if (!reconciliation.valid) continue;
+        terminalReconciled = true;
         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 (!terminalResult && !terminalReconciled) {
+        if (terminal) continue;
+        if (!brokerOwns()) return false;
+        if (!resultEvidence || !request || payloadInvalid) continue;
+        if (request.family === 'task-create' && resultEvidence.exitCode === 0 && payload === null) {
+          writeSandboxControlResponse(manifest, genericRecoveryResponse(request, resultEvidence.exitCode, null));
+          terminalReconciled = true;
+          terminal = true;
+        } else {
+          writeSandboxControlResponse(manifest, unknown(entry.name));
+          continue;
+        }
+      }
       if (!terminal) {
         if (!brokerOwns()) return false;
         if (!resultEvidence || !request || payloadInvalid) continue;
-        const recovered = recoveryResponse(manifest, request, resultEvidence, payload);
+        const recovered = recoveryResponse(manifest, manifestPath, request, resultEvidence, payload, terminalResult!);
         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);
+        const preserveRecoveryEvidence = recovered.error?.code === 'SANDBOX_CONTROL_RESULT_UNKNOWN';
+        if (transitionProtocolActive && !preserveRecoveryEvidence) {
+          writeSandboxControlTransition(manifest, { requestId: entry.name, phase: 'recovered' });
+        }
+        if (preserveRecoveryEvidence) continue;
         payloadReferenced = Boolean(payload) && request.family !== 'task-finalization';
       }
     } else {
       if (!brokerOwns()) return false;
+      if (transitionProtocolActive && startedCommitted) {
+        writeSandboxControlResponse(manifest, unknown(entry.name));
+        continue;
+      }
       writeSandboxControlResponse(manifest, notExecuted(entry.name));
     }
     if (!brokerOwns()) return false;
@@ -634,6 +1050,7 @@ export async function serveSandboxControl(
   const prepareExecution = options.prepareExecution ?? prepareSandboxControlExecution;
   const manifest = readSandboxControlManifest(manifestPath);
   const root = path.dirname(manifestPath);
+  assertCurrentSandboxControlIdentity(manifest, manifestPath);
   const startTime = getProcessStartTime(process.pid);
   if (!startTime) throw new Error('SANDBOX_CONTROL_BROKER_IDENTITY_UNAVAILABLE');
   const brokerId = randomUUID();
@@ -721,22 +1138,9 @@ export async function serveSandboxControl(
     if (!brokerOwns()) return;
     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
+      brokerId: broker.brokerId
     });
-    if (!recoverProcessing(manifest, broker, brokerOwns)) return;
+    if (!recoverProcessing(manifest, manifestPath, broker, brokerOwns)) return;
     try {
       const published = readSandboxControlStatus(manifest.publicStatusDir);
       if (published.generation === manifest.generation) taskView = published.taskView;
@@ -749,6 +1153,7 @@ export async function serveSandboxControl(
       let current: SandboxControlManifest;
       try {
         current = readSandboxControlManifest(manifestPath);
+        assertCurrentSandboxControlIdentity(current, manifestPath);
       } catch {
         break;
       }
@@ -779,7 +1184,7 @@ export async function serveSandboxControl(
           nextContainerHeartbeatAt = Date.now() + timing.containerHeartbeatMs;
         } else if (observation.state === 'unknown') {
           containerReasonCode = 'SANDBOX_CONTROL_CONTAINER_UNKNOWN';
-          appendSandboxControlAudit(manifest, 'container-heartbeat-unknown', { reason: observation.reason });
+          appendDiagnosticAudit(manifest, 'container-heartbeat-unknown', { reason: observation.reason });
           const backoff = nextSandboxControlBackoff(containerBackoffMs, timing.slowCheckMs);
           nextContainerHeartbeatAt = Date.now() + backoff.delayMs;
           containerBackoffMs = backoff.nextDelayMs;
@@ -795,7 +1200,7 @@ export async function serveSandboxControl(
           } catch (error) {
             if (!brokerOwns()) break;
             containerReasonCode = 'SANDBOX_CONTROL_CONTAINER_ABSENT_GC_FAILED';
-            appendSandboxControlAudit(manifest, 'container-gc-failed', { reason: controlError(error).code });
+            appendDiagnosticAudit(manifest, 'container-gc-failed', { reason: controlError(error).code });
             const backoff = nextSandboxControlBackoff(containerBackoffMs, timing.slowCheckMs);
             nextContainerHeartbeatAt = Date.now() + backoff.delayMs;
             containerBackoffMs = backoff.nextDelayMs;
@@ -858,6 +1263,10 @@ export async function serveSandboxControl(
         if (!brokerOwns()) break;
         let terminalCommitted = false;
         if (settledExecution.result && settledExecution.resultEvidenceWritten) {
+          if (!consumeLifecycleAuthorityForResult(manifest, settledExecution)) {
+            active = settledExecution;
+            continue;
+          }
           terminalCommitted = publishExecutionResult(manifest, settledExecution.request, settledExecution.result, broker, brokerOwns);
           if (terminalCommitted && settledExecution.request.family === 'task-finalization') {
             try {
@@ -872,7 +1281,7 @@ export async function serveSandboxControl(
         }
         if (!terminalCommitted) return;
         appendBrokerAudit(manifest, 'executor-result-published', {
-          ...requestAuditFields(manifest, manifestPath, settledExecution.request),
+          ...requestAuditFields(manifest, settledExecution.request),
           resultAvailable: settledExecution.result !== null,
           resultEvidenceWritten: settledExecution.resultEvidenceWritten,
           ...(settledExecution.result ? resultAuditFields(settledExecution.result) : {})
@@ -889,6 +1298,7 @@ export async function serveSandboxControl(
         const source = path.join(requestsDir, name);
         let claimed: string | null = null;
         let validatedRequest: SandboxControlRequest | null = null;
+        let prepared: PreparedSandboxControlExecution | null = null;
         try {
           if (!brokerOwns()) {
             retiring = true;
@@ -914,69 +1324,84 @@ export async function serveSandboxControl(
           if (active) throw new Error('SANDBOX_CONTROL_BUSY');
           const request = validateSandboxControlRequest(JSON.parse(fs.readFileSync(claimed, 'utf8')), manifest);
           validatedRequest = request;
+          criticalRequestPhase(manifest, request, 'validated', 'in-progress');
           appendBrokerAudit(manifest, 'request-validated', {
-            ...requestAuditFields(manifest, manifestPath, request),
+            ...requestAuditFields(manifest, request),
             requestPath: claimed
           });
           if (bindingCheck(manifest)) throw new Error('SANDBOX_WORKTREE_BINDING_LOST');
           if (readActiveLease(manifest)) throw new Error('SANDBOX_CONTROL_HANDOFF_ACTIVE');
+          criticalRequestPhase(manifest, request, 'gated', 'in-progress');
           appendBrokerAudit(manifest, 'request-gates-passed', {
-            ...requestAuditFields(manifest, manifestPath, request),
+            ...requestAuditFields(manifest, request),
             requestPath: claimed,
             bindingChecked: true,
             handoffLeaseChecked: true
           });
+          criticalRequestPhase(manifest, request, 'reserved', 'in-progress');
           writeSandboxControlReservation(manifest, request.id, sandboxControlGenerationUsage(manifest));
           appendBrokerAudit(manifest, 'executor-reservation-written', {
-            ...requestAuditFields(manifest, manifestPath, request),
+            ...requestAuditFields(manifest, request),
             requestPath: claimed,
             executionPath: executionPath(manifest, request.id)
           });
           appendBrokerAudit(manifest, 'executor-prepare-start', {
-            ...requestAuditFields(manifest, manifestPath, request),
+            ...requestAuditFields(manifest, request),
             requestPath: claimed,
             executorCwd: manifest.repoRoot,
             executorEntry: options.internalCliPath ?? process.argv[1] ?? null
           });
-          const prepared = await prepareExecution({
+          const lifecycleAuthority = lifecycleAuthorityForRequest(manifest, manifestPath, request);
+          if (lifecycleAuthority?.status === 'rejected') {
+            throw Object.assign(
+              new Error(lifecycleAuthority.error?.message ?? 'lifecycle authority was rejected'),
+              { code: lifecycleAuthority.error?.code ?? 'LIFECYCLE_AUTHORITY_REJECTED' }
+            );
+          }
+          prepared = await prepareExecution({
             manifest, manifestPath, request, requestPath: claimed,
-            internalCliPath: options.internalCliPath ?? process.argv[1]!
+            internalCliPath: options.internalCliPath ?? process.argv[1]!,
+            ...(lifecycleAuthority ? { lifecycleAuthority } : {})
           });
+          const preparedExecution = prepared;
+          if (!preparedExecution) throw new Error('SANDBOX_CONTROL_EXECUTION_PREPARE_INVALID');
+          criticalRequestPhase(manifest, request, 'prepared', 'in-progress', `${preparedExecution.execution.child.pid}`);
           appendBrokerAudit(manifest, 'executor-prepared', {
-            ...requestAuditFields(manifest, manifestPath, request),
+            ...requestAuditFields(manifest, request),
             requestPath: claimed,
             executorCwd: manifest.repoRoot,
-            childPid: prepared.execution.child.pid,
-            childStartTime: prepared.execution.child.startTime,
-            childProcessGroupId: prepared.execution.child.processGroupId,
+            childPid: preparedExecution.execution.child.pid,
+            childStartTime: preparedExecution.execution.child.startTime,
+            childProcessGroupId: preparedExecution.execution.child.processGroupId,
             executionPath: executionPath(manifest, request.id)
           });
           const execution: ActiveExecution = {
-            request, prepared, result: null, resultEvidenceWritten: false, failure: null, settled: false
+            request, prepared: preparedExecution, lifecycleAuthority, result: null,
+            resultEvidenceWritten: false, failure: null, settled: false
           };
           active = execution;
-          prepared.completion.then(
+          preparedExecution.completion.then(
             (result) => {
               execution.result = sanitizeSandboxControlResult(manifest, result);
               appendBrokerAudit(manifest, 'executor-completed', {
-                ...requestAuditFields(manifest, manifestPath, request),
+                ...requestAuditFields(manifest, request),
                 ...resultAuditFields(execution.result),
-                childPid: prepared.execution.child.pid,
-                childStartTime: prepared.execution.child.startTime
+                childPid: preparedExecution.execution.child.pid,
+                childStartTime: preparedExecution.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),
+                  ...requestAuditFields(manifest, 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),
+                  ...requestAuditFields(manifest, request),
                   errorType: error instanceof Error ? error.name : typeof error,
                 });
               }
@@ -985,9 +1410,9 @@ export async function serveSandboxControl(
               execution.failure = error;
               execution.settled = true;
               appendBrokerAudit(manifest, 'executor-failed', {
-                ...requestAuditFields(manifest, manifestPath, request),
-                childPid: prepared.execution.child.pid,
-                childStartTime: prepared.execution.child.startTime,
+                ...requestAuditFields(manifest, request),
+                childPid: preparedExecution.execution.child.pid,
+                childStartTime: preparedExecution.execution.child.startTime,
                 errorType: error instanceof Error ? error.name : typeof error,
               });
             }
@@ -1004,11 +1429,13 @@ export async function serveSandboxControl(
             retiring = true;
             continue;
           }
+          criticalRequestPhase(manifest, request, 'accepted-authorized', 'in-progress');
           writeAcceptedResponse(manifest, {
             version: 2, id, phase: 'accepted', exitCode: null, stdout: '', stderr: '', error: null
           });
+          writeSandboxControlTransition(manifest, { requestId: request.id, phase: 'accepted-committed' });
           appendBrokerAudit(manifest, 'request-accepted', {
-            ...requestAuditFields(manifest, manifestPath, request),
+            ...requestAuditFields(manifest, request),
             acceptedPath: acceptedResponsePath(manifest, id),
             executionPhase: 'prepared'
           });
@@ -1019,8 +1446,9 @@ export async function serveSandboxControl(
             break;
           }
           try {
+            criticalRequestPhase(manifest, request, 'start-authorized', 'in-progress', `${prepared.execution.child.pid}`);
             appendBrokerAudit(manifest, 'executor-start', {
-              ...requestAuditFields(manifest, manifestPath, request),
+              ...requestAuditFields(manifest, request),
               childPid: prepared.execution.child.pid,
               childStartTime: prepared.execution.child.startTime,
               executionPath: executionPath(manifest, request.id)
@@ -1028,7 +1456,7 @@ export async function serveSandboxControl(
             prepared.start(brokerOwns);
           } catch (error) {
             appendBrokerAudit(manifest, 'executor-start-failed', {
-              ...requestAuditFields(manifest, manifestPath, request),
+              ...requestAuditFields(manifest, request),
               errorType: error instanceof Error ? error.name : typeof error,
             });
             const owned = brokerOwns();
@@ -1056,6 +1484,11 @@ export async function serveSandboxControl(
             continue;
           }
         } catch (error) {
+          if (prepared) {
+            try { prepared.terminate(brokerOwns()); } catch { /* cleanup is best effort after a failed admission */ }
+            prepared = null;
+            active = null;
+          }
           if (!brokerOwns()) {
             retiring = true;
             break;
@@ -1075,6 +1508,7 @@ export async function serveSandboxControl(
             retiring = true;
             break;
           }
+          removeAcceptedResponse(manifest, id);
           if (claimed) fs.rmSync(path.dirname(claimed), { recursive: true, force: true });
         }
       }
@@ -1096,7 +1530,8 @@ export async function serveSandboxControl(
         }
       }
       if (owned && active.result && active.resultEvidenceWritten) {
-        if (publishExecutionResult(manifest, active.request, active.result, broker, brokerOwns)) {
+        if (consumeLifecycleAuthorityForResult(manifest, active)
+          && 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 });
@@ -1126,7 +1561,7 @@ export async function serveSandboxControl(
       }
     }
     if (brokerOwns()) {
-      appendSandboxControlAudit(manifest, 'broker-stop', { pid: broker.pid, brokerId: broker.brokerId });
+      appendDiagnosticAudit(manifest, 'broker-stop', { pid: broker.pid, brokerId: broker.brokerId });
       try {
         if (fs.readFileSync(brokerPath, 'utf8') === brokerRecord) fs.unlinkSync(brokerPath);
       } catch {