@fitlab-ai/agent-infra 0.11.2 → 0.11.3

package/lib/internal/task-operation-registry.ts

@@ -22,7 +22,7 @@ export type TaskOperationEffect = TaskViewAccessEffect;
 export type TaskRefSource = 'argv' | 'environment' | 'none' | 'delegated' | 'input';
 
 export type SandboxControlTransportDecision = Readonly<{
-  kind: 'direct-host' | 'broker-client' | 'fail-closed';
+  kind: 'direct-host' | 'sandbox-local' | 'broker-client' | 'fail-closed';
   reasonCode: string | null;
 }>;
 
@@ -277,6 +277,7 @@ export function resolveTaskOperation(
 export function resolveDelegatedTaskOperation(args: readonly string[]): TaskOperationDescriptor | null {
   const [operation, ...rest] = args;
   if (operation !== 'client' || !rest[0]) return null;
+  if (rest[0] === 'task-orchestration') return null;
   return resolveTaskOperation('internal', rest[0], rest.slice(1));
 }
 
@@ -340,7 +341,7 @@ function taskMarkerState(env: NodeJS.ProcessEnv): TaskMarkerState {
 
 export function resolveSandboxControlTransport(
   env: NodeJS.ProcessEnv = process.env,
-  options: Readonly<{ statusMountPath?: string }> = {}
+  options: Readonly<{ statusMountPath?: string; localWorkflow?: boolean }> = {}
 ): SandboxControlTransportDecision {
   const hasAnyMarker = TASK_MARKER_KEYS.some((key) => Boolean(env[key]))
     || Boolean(env.AGENT_INFRA_CONTROL_CONTROLLER_BINDING)
@@ -407,13 +408,15 @@ export function resolveSandboxControlTransport(
     if (!hasCompleteConfig) {
       return { kind: 'fail-closed', reasonCode: 'SANDBOX_CONTROL_CONFIGURATION_INCOMPLETE' };
     }
-    return { kind: 'broker-client', reasonCode: null };
+    return { kind: options.localWorkflow ? 'sandbox-local' : 'broker-client', reasonCode: null };
   }
   if (!hasAnyMarker) return { kind: 'direct-host', reasonCode: null };
   if (!hasCompleteConfig || (taskBound && !runtime) || (!taskBound && runtime)) {
     return { kind: 'fail-closed', reasonCode: 'SANDBOX_CONTROL_CONFIGURATION_INCOMPLETE' };
   }
-  return { kind: 'broker-client', reasonCode: null };
+  return options.localWorkflow
+    ? { kind: 'fail-closed', reasonCode: 'SANDBOX_CONTROL_IDENTITY_MISSING' }
+    : { kind: 'broker-client', reasonCode: null };
 }
 
 export function hasTaskBoundMarker(env: NodeJS.ProcessEnv = process.env): boolean {

package/lib/platform/issue-comments.ts

@@ -27,7 +27,6 @@ import {
 import { projectTaskComment } from './task-comment-projection.ts';
 import {
   canonicalizeCommentBody,
-  canonicalizeSummaryBody,
   escapeHtmlText,
   fenceRanges,
   renderSafeCodeFence
@@ -52,7 +51,6 @@ type SyncOptions = {
   client?: PlatformClient;
   runtimeVersion?: string;
   summaryAuthorization?: { sha256: string };
-  verifyOnly?: boolean;
 };
 
 function providerCommentId(id: string, provider: { identity?: { comment?: string } }): number | string {
@@ -76,8 +74,6 @@ const ARTIFACT_TITLES: Record<string, string> = {
   'review-plan': '技术方案审查',
   code: '实现报告',
   'review-code': '代码审查',
-  'manual-validation': '人工验证报告',
-  'validation-run': '验证运行证据',
   'pr-review': 'PR 审查报告'
 };
 
@@ -154,7 +150,7 @@ function taskCommentLanguage(repoRoot: string): string {
 
 function artifactIdentity(artifact: string): { stem: string; title: string } {
   const stem = path.basename(artifact, '.md');
-  const match = stem.match(/^(analysis|review-analysis|plan|review-plan|code|review-code|manual-validation|validation-run|pr-review)(?:-r(\d+))?$/);
+  const match = stem.match(/^(analysis|review-analysis|plan|review-plan|code|review-code|pr-review)(?:-r(\d+))?$/);
   if (!match) throw new Error(`unsupported artifact '${artifact}'`);
   const base = ARTIFACT_TITLES[match[1]!]!;
   const round = match[2] ? Number(match[2]) : 1;
@@ -483,15 +479,6 @@ function summaryPosition(comments: RemoteComment[], taskId: string): { ok: boole
   return { ok: managed.every((comment) => sequence >= comment.createdSequence!), known: true, summary: summary[0]! };
 }
 
-function summaryDigest(comment: RemoteComment): string {
-  const body = normalizeCommentContent(comment.body)
-    .replace(/^<!-- sync-issue:[^\n]+:summary -->\n## [^\n]+\n\n> [^\n]+\n\n/u, '')
-    .replace(/^<details><summary>恢复元数据<\/summary>[\s\S]*?<\/details>\n\n/u, '')
-    .replace(/\n---\n\*[^\n]*\*$/u, '');
-  const canonical = canonicalizeSummaryBody(body);
-  return canonical.ok ? createHash('sha256').update(canonical.value).digest('hex') : '';
-}
-
 async function listedComments(provider: any, loaded: any, parent: ReturnType<typeof taskIssueIdentity>): Promise<any> {
   return provider.comments?.list
     ? provider.comments.list({ context: providerOperationContext(loaded), parent }).then((response: any) => response.ok
@@ -609,27 +596,6 @@ async function syncPlatformComment(taskRef: string, options: SyncOptions): Promi
     }
   }
 
-  if (options.verifyOnly) {
-    if (options.kind !== 'summary' || !options.summaryAuthorization) {
-      return platformResult('failed', {
-        ...contextFields(context), resource: { kind: 'issue', number: issue },
-        error: { code: 'SUMMARY_VERIFICATION_INVALID', message: 'summary verification requires durable authorization', retryable: false }
-      });
-    }
-    const position = summaryPosition(listed.value, resolved.taskId);
-    if (!position.ok || !position.summary || summaryDigest(position.summary) !== options.summaryAuthorization.sha256) {
-      return platformResult('failed', {
-        ...contextFields(context), resource: { kind: 'issue', number: issue },
-        error: { code: 'SUMMARY_VERIFICATION_FAILED', message: 'summary marker, body digest, or managed comment order is invalid', retryable: true }
-      });
-    }
-    return platformResult('no-op', {
-      ...contextFields(context), changed: false, resource: { kind: 'issue', number: issue },
-      comment: { kind: options.kind, marker: desired[0]!.marker, ids: [position.summary.id], parts: 1 }, error: null
-    });
-  }
-
-
   // Backfill only supplies missing artifact comments; valid existing marker sets stay untouched.
   if (options.kind === 'artifact' && options.backfill && existing.length > 0) {
     const operations = existing.map((comment): PlatformOperation => ({

package/lib/platform/pr-summary.ts

@@ -35,7 +35,7 @@ import type {
   MechanicalChangeReport,
   PrChangeReport
 } from './pr-change-report.ts';
-import { manualValidationFinalSummaryProjectionMatches } from '../task/manual-validation-receipt.ts';
+import { MANUAL_VALIDATION_RECEIPT_PLACEHOLDER, manualValidationFinalSummaryProjectionMatches } from '../task/manual-validation-receipt.ts';
 import { readManualValidationCompletion } from '../task/manual-validation-completion.ts';
 
 type SummaryComment = { id: number | string; body: string };
@@ -582,6 +582,7 @@ async function syncPullRequestSummary(
       const initial = await inspectBoundPullRequest(context, resolved.repoRoot, prIdentity, loaded.value);
       if (!initial.ok) return fail(initial.status, context, initial.error);
       const manual = options.manualValidation;
+      let manualEvidenceDigest: string | null = null;
       const hasFinalManualValidation = /###\s+✅\s+(?:Manual Validation Passed|人工验证已通过)/u.test(options.body);
       if (hasFinalManualValidation && (!manual || manual.phase !== 'final')) return fail('failed', context, { code: 'MANUAL_VALIDATION_TRANSACTION_REQUIRED', message: 'final manual-validation summary requires the transaction coordinator', retryable: false }, prNumber);
       if (manual && (manual.phase === 'pending' ? hasFinalManualValidation : !hasFinalManualValidation)) return fail('failed', context, { code: 'MANUAL_VALIDATION_SUMMARY_PHASE_INVALID', message: 'manual-validation summary phase does not match the requested writer phase', retryable: false }, prNumber);
@@ -599,6 +600,7 @@ async function syncPullRequestSummary(
           });
           if (!completion.ok) return fail('failed', context, platformError(completion.error), prNumber);
           const { receipt, transaction } = completion.value;
+          manualEvidenceDigest = receipt.evidenceDigest;
           if (transaction.phase !== 'final-promotion-in-progress' || !transaction.eventAppended) return fail('failed', context, { code: 'MANUAL_VALIDATION_TRANSACTION_PHASE_INVALID', message: 'final summary requires a receipt-backed promotion intent', retryable: false }, prNumber);
           if (!manualValidationFinalSummaryProjectionMatches(options.body, receipt)) return fail('failed', context, { code: 'MANUAL_VALIDATION_SUMMARY_PROJECTION_INVALID', message: 'final summary body does not match the canonical receipt projection', retryable: false }, prNumber);
         }
@@ -635,7 +637,13 @@ async function syncPullRequestSummary(
       }
       const replaced = replaceCanonicalReportPlaceholder(`${prefix.value}${placeholder}${suffix.value}`, report.value);
       if (!replaced.ok) return fail('failed', context, platformError(replaced.error));
-      const desired = buildPullRequestSummary(resolved.taskId, replaced.value, initial.value.head.sha, renderHumanOverrideAudit(taskContent));
+      const renderedBody = manual?.phase === 'final'
+        ? replaced.value.replace(
+          MANUAL_VALIDATION_RECEIPT_PLACEHOLDER,
+          `<!-- manual-validation-receipt: transaction=${manual.transactionId}; receipt=${manual.receiptDigest}; evidence=${manualEvidenceDigest}; head=${manual.prHeadSha} -->`
+        )
+        : replaced.value;
+      const desired = buildPullRequestSummary(resolved.taskId, renderedBody, initial.value.head.sha, renderHumanOverrideAudit(taskContent));
       if (!isSafeSummaryEnvelope(desired, resolved.taskId)) return fail('failed', context, {
         code: 'PR_SUMMARY_RENDER_INVALID',
         message: 'Summary contains an invalid or duplicated reserved control marker',

package/lib/sandbox/control/client.ts

@@ -11,10 +11,8 @@ import {
   type SandboxControlRequest,
   type SandboxControlResponse,
   type SandboxTaskCreateRequest,
-  type SandboxTaskCommandRequest,
   type SandboxTaskFinalizationRequest,
-  type SandboxCodexControllerRequest,
-  type SandboxTaskWorkflowRequest
+  type SandboxCodexControllerRequest
 } from './protocol.ts';
 import type {
   CodexControllerLeaseProofV1,
@@ -26,8 +24,6 @@ import { readSandboxControlPayload, readSandboxControlStatus } from './state.ts'
 import type { TaskCreateCandidateV1 } from '../../task/create.ts';
 import { accessSandboxTaskView, taskViewFromStatus, type TaskViewAccessEffect } from './task-view.ts';
 import { readSandboxControlIdentitySentinel } from './identity-sentinel.ts';
-import type { TaskWorkflowRequest } from './task-workflow.ts';
-import type { LifecycleAuthorityRequestV1 } from '../../task/control-authority.ts';
 import { configuredShortIdLength, resolveShortIdReadOnly } from '../../task/short-id.ts';
 
 const SANDBOX_CONTROL_RESPONSE_SETTLE_MS = 250;
@@ -119,8 +115,6 @@ function preflight(
 
 function taskViewEffectForRequest(request: SandboxControlRequest): TaskViewAccessEffect | null {
   if (request.family === 'task-lifecycle' || request.family === 'task-finalization') return 'progress';
-  if (request.family === 'task-orchestration') return request.args[1] === 'status' ? 'diagnostic' : 'progress';
-  if (request.family === 'task-workflow') return request.workflow.operation === 'artifact-inspect' || request.workflow.operation === 'decision-next-id' ? 'diagnostic' : 'progress';
   return null;
 }
 
@@ -194,9 +188,7 @@ export function resolveVisibleActiveShortId(ref: string): string | null {
 // may be a documented short id. Compare canonical ids so a bound sandbox keeps
 // refusing other tasks without rejecting its own task's short id.
 function canonicalRequestTask(request: SandboxControlRequest): CanonicalRequestTask {
-  const ref = request.family === 'task-workflow'
-    ? request.workflow.taskId
-    : 'args' in request ? request.args[0] ?? null : null;
+  const ref = 'args' in request ? request.args[0] ?? null : null;
   if (!ref) return { kind: 'none' };
   if (CONTROL_TASK_ID_RE.test(ref)) return { kind: 'task', taskId: ref };
   if (!CONTROL_SHORT_ID_RE.test(ref)) return { kind: 'none' };
@@ -223,7 +215,7 @@ function exchangeSandboxControl(request: SandboxControlRequest, params: Readonly
         || (requestTask.kind === 'task' && requestTask.taskId !== identity.taskId))) {
       clientError('SANDBOX_CONTROL_IDENTITY_TOPOLOGY_MISMATCH', 'request task does not match the sandbox identity', false);
     }
-    if (identity.mode === 'branch-only' && (request.family === 'task-finalization' || request.family === 'task-workflow')) {
+    if (identity.mode === 'branch-only' && request.family === 'task-finalization') {
       clientError('SANDBOX_CONTROL_BRANCH_ONLY', 'branch-only sandboxes cannot finalize tasks', false);
     }
   }
@@ -384,7 +376,7 @@ export function requestSandboxControl(params: Readonly<{
   token?: string; generation?: string; timeoutMs?: number;
 }>): SandboxControlResponse {
   if (!isSandboxControlFamily(params.family)) clientError('SANDBOX_CONTROL_COMMAND_DENIED', `'${params.family}' is not allowed`, false);
-  if (params.family === 'task-create' || params.family === 'codex-controller' || params.family === 'task-finalization' || params.family === 'task-workflow') {
+  if (params.family === 'task-create' || params.family === 'codex-controller' || params.family === 'task-finalization') {
     clientError('SANDBOX_CONTROL_COMMAND_DENIED', `'${params.family}' requires a typed request`, false);
   }
   const auth = authority(params);
@@ -392,41 +384,13 @@ export function requestSandboxControl(params: Readonly<{
   const request: SandboxControlRequest = {
     version: 3, id: randomUUID(), ...auth, issuedAt,
     expiresAt: issuedAt + SANDBOX_CONTROL_ADMISSION_WINDOW_MS,
-    family: params.family as 'task-lifecycle' | 'task-orchestration', args: params.args,
+    family: params.family as 'task-lifecycle', args: params.args,
     controllerProcess: null,
     controllerProof: null
   };
   return exchangeSandboxControl(request, params);
 }
 
-export function requestSandboxTaskControl(params: Readonly<{
-  family: 'task-lifecycle' | 'task-orchestration';
-  args: string[];
-  controllerProof: CodexControllerLeaseProofV1 | null;
-  authority?: LifecycleAuthorityRequestV1;
-  channelDir?: string;
-  statusDir?: string;
-  token?: string;
-  generation?: string;
-  timeoutMs?: number;
-}>): SandboxControlResponse {
-  const auth = authority(params);
-  const issuedAt = Date.now();
-  const request: SandboxTaskCommandRequest = {
-    version: 3,
-    id: params.authority?.requestId ?? randomUUID(),
-    ...auth,
-    issuedAt,
-    expiresAt: issuedAt + SANDBOX_CONTROL_ADMISSION_WINDOW_MS,
-    family: params.family,
-    args: params.args,
-    controllerProcess: null,
-    controllerProof: params.authority ? null : params.controllerProof,
-    ...(params.authority ? { authority: params.authority } : {})
-  };
-  return exchangeSandboxControl(request, params);
-}
-
 export function requestSandboxTaskFinalization(params: Readonly<{
   agent: string;
   channelDir?: string;
@@ -455,33 +419,6 @@ export function requestSandboxTaskFinalization(params: Readonly<{
   return exchangeSandboxControl(request, params);
 }
 
-export function requestSandboxTaskWorkflow(params: Readonly<{
-  workflow: TaskWorkflowRequest;
-  channelDir?: string;
-  statusDir?: string;
-  token?: string;
-  generation?: string;
-  timeoutMs?: number;
-  authority?: LifecycleAuthorityRequestV1;
-}>): SandboxControlResponse {
-  const auth = authority(params);
-  const issuedAt = Date.now();
-  const request: SandboxTaskWorkflowRequest = {
-    version: 3,
-    id: params.workflow.id,
-    ...auth,
-    issuedAt,
-    expiresAt: issuedAt + SANDBOX_CONTROL_ADMISSION_WINDOW_MS,
-    family: 'task-workflow',
-    args: [],
-    controllerProcess: null,
-    controllerProof: null,
-    workflow: params.workflow,
-    ...(params.authority ? { authority: params.authority } : {})
-  };
-  return exchangeSandboxControl(request, params);
-}
-
 type CodexControllerClosed = Readonly<{
   version: 1;
   status: 'closed';

package/lib/sandbox/control/executor.ts

@@ -31,12 +31,8 @@ import {
   createSandboxExecutorExecutionContext,
   dispatchTaskControlOperation,
   parseTaskControlOperation,
-  validateLifecycleRecoveryAttestation,
-  type LifecycleAuthorityResponseV1,
-  type LifecycleRecoveryAttestationV1,
   type TaskControlOperation
 } from '../../task/control-authority.ts';
-import { executeTaskWorkflow } from './workflow-executor.ts';
 import { assertSandboxControlBrokerOwner, readSandboxControlManifest, type BrokerOwner } from './lifecycle.ts';
 import { computeLifecycleBuildIdentity } from '../../agent-clients/adapters/codex-lifecycle/build-identity.ts';
 import {
@@ -45,7 +41,6 @@ import {
   openCodexControllerRegistration,
   resolveCodexControllerBinding
 } from './controller-registration.ts';
-import type { OrchestrationDiagnosticLogger } from '../../task/orchestration.ts';
 
 export type SandboxControlExecutionResult = {
   exitCode: number;
@@ -127,7 +122,6 @@ export async function prepareSandboxControlExecution(params: {
   request: SandboxControlRequest;
   requestPath: string;
   internalCliPath: string;
-  lifecycleAuthority?: LifecycleAuthorityResponseV1;
 }): Promise<PreparedSandboxControlExecution> {
   const nonce = randomUUID();
   const child = spawn(
@@ -181,17 +175,11 @@ export async function prepareSandboxControlExecution(params: {
       if (!canWrite()) throw new Error('SANDBOX_CONTROL_OWNER_LOST');
       atomicWriteJson(executionPath(params.manifest, params.request.id), { ...execution, phase: 'running', updatedAt: Date.now() });
       if (!canWrite()) throw new Error('SANDBOX_CONTROL_OWNER_LOST');
-      const authority = params.lifecycleAuthority?.attestation ?? null;
       child.send({
         version: 2,
         nonce,
         owner: gateOwner,
-        requestId: params.request.id,
-        operationId: authority?.operationId ?? params.request.id,
-        phase: authority?.phase ?? (params.request.family === 'task-workflow'
-          && params.request.workflow?.operation === 'artifact-preflight' ? 'artifact.preflight'
-          : params.request.family === 'task-workflow' ? 'artifact.finalize-local' : 'orchestration.prepare'),
-        authority
+        requestId: params.request.id
       } satisfies SandboxControlExecutorGateV2);
     },
     completion,
@@ -206,7 +194,7 @@ export async function prepareSandboxControlExecution(params: {
   };
 }
 
-function waitForGate(nonce: string, timeoutMs = 2_000): Promise<Readonly<{ owner: BrokerOwner; authority: LifecycleRecoveryAttestationV1 | null; requestId: string; operationId: string; phase: SandboxControlExecutorGateV2['phase'] }>> {
+function waitForGate(nonce: string, timeoutMs = 2_000): Promise<Readonly<{ owner: BrokerOwner; requestId: string }>> {
   return new Promise((resolve, reject) => {
     const timer = setTimeout(() => reject(new Error('SANDBOX_CONTROL_EXECUTOR_GATE_TIMEOUT')), timeoutMs);
     const onDisconnect = () => {
@@ -222,12 +210,9 @@ function waitForGate(nonce: string, timeoutMs = 2_000): Promise<Readonly<{ owner
         nonce?: unknown;
         owner?: Partial<BrokerOwner> | null;
         requestId?: unknown;
-        operationId?: unknown;
-        phase?: unknown;
-        authority?: unknown;
       } | null;
       const owner = value?.owner;
-      if (!value || Object.keys(value).sort().join(',') !== 'authority,nonce,operationId,owner,phase,requestId,version'
+      if (!value || Object.keys(value).sort().join(',') !== 'nonce,owner,requestId,version'
         || value.version !== 2 || value.nonce !== nonce
         || !owner || owner.version !== 3 || !Number.isSafeInteger(owner.pid) || (owner.pid ?? 0) <= 0
         || typeof owner.startTime !== 'number' || !Number.isSafeInteger(owner.startTime)
@@ -236,20 +221,13 @@ function waitForGate(nonce: string, timeoutMs = 2_000): Promise<Readonly<{ owner
         reject(new Error('SANDBOX_CONTROL_EXECUTOR_GATE_INVALID'));
         return;
       }
-      if (typeof value.requestId !== 'string' || typeof value.operationId !== 'string'
-        || !['orchestration.prepare', 'artifact.preflight', 'artifact.finalize-local', 'task-event.completed'].includes(value.phase as string)
-        || (value.authority !== null && value.authority !== undefined && (() => {
-          try { validateLifecycleRecoveryAttestation(value.authority); return false; } catch { return true; }
-        })())) {
+      if (typeof value.requestId !== 'string') {
         reject(new Error('SANDBOX_CONTROL_EXECUTOR_GATE_INVALID'));
         return;
       }
       resolve({
         owner: owner as BrokerOwner,
-        authority: value.authority === null || value.authority === undefined ? null : value.authority as LifecycleRecoveryAttestationV1,
-        requestId: value.requestId,
-        operationId: value.operationId,
-        phase: value.phase as SandboxControlExecutorGateV2['phase']
+        requestId: value.requestId
       });
     });
   });
@@ -273,17 +251,6 @@ function controllerFailure(error: unknown): SandboxControlExecutionResult {
   return { exitCode: 1, stdout: `${JSON.stringify(payload)}\n`, stderr: '' };
 }
 
-function orchestrationFailure(code: string, message: string): SandboxControlExecutionResult {
-  return {
-    exitCode: 1,
-    stdout: `${JSON.stringify({
-      status: 'failed', changed: false, taskId: null, run: null, next: null,
-      error: { code, message }
-    })}\n`,
-    stderr: ''
-  };
-}
-
 function lifecycleFailure(code: string, message: string): SandboxControlExecutionResult {
   return {
     exitCode: 1,
@@ -330,7 +297,6 @@ function finalizationResult(result: Awaited<ReturnType<typeof applyTaskFinalizat
 type ExecuteRequestOptions = Readonly<{
   buildIdentity?: typeof computeLifecycleBuildIdentity;
   resolveControllerBinding?: typeof resolveCodexControllerBinding;
-  lifecycleRecoveryAttestation?: LifecycleRecoveryAttestationV1 | null;
 }>;
 
 async function executeRequestInner(
@@ -406,7 +372,6 @@ async function executeRequestInner(
       return controllerFailure(error);
     }
   }
-  if (request.family === 'task-workflow') return executeTaskWorkflow(manifest, request.workflow, options.lifecycleRecoveryAttestation ?? null);
   if (request.family === 'task-finalization') {
     const operation = parseTaskControlOperation(
       'task-finalization', [manifest.taskId!, 'complete', '--agent', request.agent]
@@ -420,35 +385,21 @@ async function executeRequestInner(
         taskId: manifest.taskId!,
         generation: manifest.generation,
         manifestPath,
-        requestId: request.id,
-        lifecycleRecoveryAttestation: options.lifecycleRecoveryAttestation ?? null
+        requestId: request.id
       }),
       operation
     );
     return finalizationResult(await result);
   }
   const boundArgs = bindSandboxControlTask(request, manifest.taskId!);
-  if (request.family === 'task-orchestration') {
-    boundArgs.push('--git-worktree-root', manifest.worktreeRoot);
-  }
   let operation: TaskControlOperation;
   try {
     operation = parseTaskControlOperation(request.family, boundArgs);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     const code = /^([A-Z][A-Z0-9_]+)/u.exec(message)?.[1] ?? 'TASK_CONTROL_OPERATION_INVALID';
-    return request.family === 'task-lifecycle'
-      ? lifecycleFailure('LIFECYCLE_PAYLOAD_INVALID', message)
-      : orchestrationFailure(code, message);
+    return lifecycleFailure('LIFECYCLE_PAYLOAD_INVALID', `${code}: ${message}`);
   }
-  const diagnosticLog: OrchestrationDiagnosticLogger = (event, fields): void => {
-    appendExecutorAudit(manifest, event.startsWith('orchestration-') ? event : `orchestration-${event}`, {
-      requestId: request.id,
-      requestFamily: request.family,
-      sandboxTaskId: manifest.taskId,
-      ...fields
-    });
-  };
   const context = createSandboxExecutorExecutionContext({
     repoRoot: manifest.repoRoot,
     worktreeRoot: manifest.worktreeRoot,
@@ -456,9 +407,7 @@ async function executeRequestInner(
     taskId: manifest.taskId!,
     generation: manifest.generation,
     manifestPath,
-    requestId: request.id,
-    diagnosticLog,
-    lifecycleRecoveryAttestation: options.lifecycleRecoveryAttestation ?? null
+    requestId: request.id
   });
   const format = (value: unknown): SandboxControlExecutionResult => {
     const result = value as { status?: string };
@@ -468,12 +417,8 @@ async function executeRequestInner(
       stderr: ''
     };
   };
-  if (request.family === 'task-orchestration') {
-    if (operation.family !== 'task-orchestration') throw new Error('SANDBOX_CONTROL_ORCHESTRATION_OPERATION_INVALID');
-    return format(await dispatchTaskControlOperation(context, operation));
-  }
   if (operation.family !== 'task-lifecycle') throw new Error('SANDBOX_CONTROL_LIFECYCLE_OPERATION_INVALID');
-    return format(await dispatchTaskControlOperation(context, operation));
+  return format(await dispatchTaskControlOperation(context, operation));
 }
 
 export async function executeRequest(
@@ -535,12 +480,6 @@ export async function runSandboxControlExecutor(requestPath: string, nonce: stri
   const raw = JSON.parse(fs.readFileSync(requestPath, 'utf8')) as unknown;
   const request = validateSandboxControlRequest(raw, manifest);
   if (gate.requestId !== request.id) throw new Error('SANDBOX_CONTROL_EXECUTOR_GATE_REQUEST_MISMATCH');
-  if (gate.authority !== null
-    && (gate.authority.requestId !== request.id
-      || gate.authority.operationId !== gate.operationId
-      || gate.authority.phase !== gate.phase)) {
-    throw new Error('SANDBOX_CONTROL_EXECUTOR_GATE_AUTHORITY_MISMATCH');
-  }
   appendExecutorAudit(manifest, 'executor-request-validated', requestAuditFields(manifest, request));
   const requestDirectory = path.resolve(path.dirname(requestPath));
   const processingDirectory = path.resolve(path.join(manifest.processingDir, request.id));
@@ -558,7 +497,7 @@ export async function runSandboxControlExecutor(requestPath: string, nonce: stri
   let result: SandboxControlExecutionResult;
   try {
     assertSandboxControlExecutorAuthority(manifest, gateOwner);
-    const operation = request.family === 'task-lifecycle' || request.family === 'task-orchestration'
+    const operation = request.family === 'task-lifecycle'
       ? (() => {
         try { return parseTaskControlOperation(request.family, request.args); } catch { return null; }
       })()
@@ -566,10 +505,8 @@ export async function runSandboxControlExecutor(requestPath: string, nonce: stri
     const context = createSandboxControlAuditContext(manifest, {
       requestId: request.id,
       family: request.family,
-      operation: operation?.family === 'task-orchestration'
-        ? operation.intent
-        : operation?.family === 'task-lifecycle'
-          ? operation.request.intent
+      operation: operation?.family === 'task-lifecycle'
+        ? operation.request.intent
           : request.family === 'task-finalization' ? request.operation : null,
       phase: 'started-committed',
       outcome: 'in-progress'
@@ -578,9 +515,7 @@ export async function runSandboxControlExecutor(requestPath: string, nonce: stri
     writeSandboxControlTransition(manifest, { requestId: request.id, phase: 'started-committed' });
     const execution = readJsonExecution(executionPath(manifest, request.id));
     atomicWriteJson(executionPath(manifest, request.id), { ...execution, phase: 'running', updatedAt: Date.now() });
-    result = await executeRequest(manifest, manifestPath, request, {
-      lifecycleRecoveryAttestation: gate.authority
-    });
+    result = await executeRequest(manifest, manifestPath, request);
   } catch (error) {
     appendExecutorAudit(manifest, 'executor-authority-or-dispatch-failed', {
       ...requestAuditFields(manifest, request),
@@ -599,9 +534,7 @@ export async function runSandboxControlExecutor(requestPath: string, nonce: stri
       }
       : request.family === 'task-create'
         ? taskCreateExecutionFailure(request.id, code, detail)
-        : request.family === 'task-lifecycle'
-        ? lifecycleFailure(code, detail)
-        : orchestrationFailure(code, detail);
+        : lifecycleFailure(code, detail);
   }
   process.stdout.write(result.stdout);
   process.stderr.write(result.stderr);

package/lib/sandbox/control/finalization-response.ts

@@ -5,13 +5,11 @@ export function finalizationTerminalResponse(taskId: string, requestId: string,
   const pendingSteps = [
     receipt.taskComment === 'pending' ? 'task-comment' : null,
     receipt.verification === 'pending' ? 'verification' : null,
-    receipt.summary === 'pending' ? 'summary' : null,
-    receipt.postSummaryVerification === 'pending' ? 'post-summary-verification' : null
+    receipt.summary === 'pending' ? 'summary' : null
   ].filter((step): step is string => step !== null);
   const completedSteps = [
     'lifecycle', receipt.taskComment === 'pending' ? null : 'task-comment',
-    receipt.verification === 'pending' ? null : 'verification', receipt.summary === 'pending' ? null : 'summary',
-    receipt.postSummaryVerification === 'pending' ? null : 'post-summary-verification'
+    receipt.verification === 'pending' ? null : 'verification', receipt.summary === 'pending' ? null : 'summary'
   ]
     .filter((step): step is string => step !== null);
   const warnings = receipt.warnings
@@ -19,11 +17,11 @@ export function finalizationTerminalResponse(taskId: string, requestId: string,
     .map(({ status: _status, resolvedAt: _resolvedAt, ...warning }) => warning);
   const result = {
     status: 'completed', changed: false, taskId,
+    backfill: { status: 'no-op', changed: false, error: null },
     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 },
     summary: receipt.summary === 'pending' ? null : { status: 'no-op', changed: false, error: null },
-    postSummaryVerification: receipt.postSummaryVerification === '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',