@fitlab-ai/agent-infra 0.11.3 → 0.11.5

package/lib/task/finalization.ts

@@ -4,12 +4,13 @@ import { createHash, randomUUID } from 'node:crypto';
 
 import { syncPlatformComment } from '../platform/issue-comments.ts';
 import { canonicalizeSummaryBody } from '../platform/comment-safety.ts';
-import { backfillCompletionComments } from '../platform/completion-backfill.ts';
+import { backfillCompletionComments, inspectCompletionBackfillEligibility } from '../platform/completion-backfill.ts';
 import type { PlatformResult } from '../platform/types.ts';
 import { taskIssueIdentity } from '../platform/task-identities.ts';
 import { parseTaskFrontmatter } from './frontmatter.ts';
 import {
   applyTaskLifecycle,
+  inspectTaskLifecycleProgress,
   type TaskLifecycleOptions,
   type TaskLifecycleRequest,
   type TaskLifecycleResult
@@ -25,6 +26,9 @@ import {
   type OperationWarning,
   type OperationWarningSeverity
 } from './operation-outcome.ts';
+import { readTaskFinalizationHandoff } from './finalization-handoff.ts';
+import { readSandboxControlManifest } from '../sandbox/control/lifecycle.ts';
+import { validateSandboxControlIdentity } from '../sandbox/control/identity-sentinel.ts';
 
 const RECEIPT_VERSION = 4 as const;
 const FINALIZATION_STEPS = ['lifecycle', 'task-comment', 'verification', 'summary'] as const;
@@ -55,11 +59,14 @@ type TaskFinalizationRequest = Readonly<{
   taskRef: string;
   intent: 'complete';
   agent: string;
+  handoffSha256?: string;
 }>;
 
 type TaskFinalizationOptions = Readonly<{
   repoRoot: string;
   controlBinding?: Readonly<{ generation: string; requestId: string }>;
+  handoffDirectory?: string;
+  manifestPath?: string;
   metadataProvider?: TaskLifecycleOptions['metadataProvider'];
   lifecycle?: typeof applyTaskLifecycle;
   backfill?: typeof backfillCompletionComments;
@@ -101,7 +108,7 @@ type TaskCommentSyncOutcome = Readonly<{
 }>;
 
 type TaskFinalizationResult = Readonly<{
-  status: 'completed' | 'failed' | 'blocked';
+  status: 'prepared' | 'completed' | 'failed' | 'blocked';
   changed: boolean;
   taskId: string | null;
   backfill: TaskFinalizationStep | null;
@@ -111,7 +118,7 @@ type TaskFinalizationResult = Readonly<{
   summary: TaskFinalizationStep | null;
   completedSteps: readonly FinalizationStep[];
   pendingSteps: readonly FinalizationStep[];
-  result: 'completed' | 'completed_with_warnings' | 'failed' | 'blocked';
+  result: 'prepared' | 'completed' | 'completed_with_warnings' | 'failed' | 'blocked';
   warnings: readonly OperationWarning[];
   error: FinalizationError | null;
 }>;
@@ -198,20 +205,32 @@ function validateReceipt(value: unknown, taskId: string): TaskFinalizationReceip
   const receipt = value as Record<string, unknown>;
   const controlBinding = receipt.controlBinding as Record<string, unknown> | null | undefined;
   const states = ['pending', 'done', 'skipped'];
+  const requiredKeys = [
+    'version', 'taskId', 'intent', 'receiptId', 'revision', 'lifecycle', 'taskComment',
+    'verification', 'summary', 'warningProjection', 'warnings', 'updatedAt', 'lastError'
+  ];
+  if (receipt.controlBinding !== undefined) requiredKeys.push('controlBinding');
   if (
+    Object.keys(receipt).sort().join('\0') !== requiredKeys.sort().join('\0')
+    ||
     receipt.version !== RECEIPT_VERSION || receipt.taskId !== taskId || receipt.intent !== 'complete'
     || typeof receipt.receiptId !== 'string' || receipt.receiptId.length === 0
     || !Number.isSafeInteger(receipt.revision) || Number(receipt.revision) < 0
-    || !states.includes(String(receipt.lifecycle))
-    || !states.includes(String(receipt.taskComment))
-    || !states.includes(String(receipt.verification))
-    || !states.includes(String(receipt.summary))
-    || !['pending', 'done'].includes(String(receipt.warningProjection))
+    || !states.includes(receipt.lifecycle as string)
+    || !states.includes(receipt.taskComment as string)
+    || !states.includes(receipt.verification as string)
+    || !states.includes(receipt.summary as string)
+    || !['pending', 'done'].includes(receipt.warningProjection as string)
     || !Array.isArray(receipt.warnings) || receipt.warnings.some((warning) => !validWarning(warning))
-    || typeof receipt.updatedAt !== 'string'
-    || (receipt.lastError !== null && (typeof receipt.lastError !== 'object' || Array.isArray(receipt.lastError)))
+    || typeof receipt.updatedAt !== 'string' || receipt.updatedAt.length === 0
+    || (receipt.lastError !== null && (typeof receipt.lastError !== 'object' || Array.isArray(receipt.lastError)
+      || Object.keys(receipt.lastError).sort().join('\0') !== ['code', 'message', 'retryable'].join('\0')
+      || typeof (receipt.lastError as Record<string, unknown>).code !== 'string'
+      || typeof (receipt.lastError as Record<string, unknown>).message !== 'string'
+      || typeof (receipt.lastError as Record<string, unknown>).retryable !== 'boolean'))
     || (receipt.controlBinding !== undefined && (!controlBinding || typeof controlBinding !== 'object'
       || Array.isArray(controlBinding)
+      || Object.keys(controlBinding).sort().join('\0') !== ['generation', 'requestId'].join('\0')
       || typeof controlBinding.generation !== 'string' || controlBinding.generation.length === 0
       || typeof controlBinding.requestId !== 'string' || !/^[a-f0-9-]{16,64}$/u.test(controlBinding.requestId)))
   ) throw new Error('receipt schema is invalid');
@@ -243,6 +262,14 @@ function writeReceipt(repoRoot: string, receipt: TaskFinalizationReceipt): void
   }
 }
 
+export function bindTaskFinalizationReceipt(
+  repoRoot: string, taskId: string, controlBinding: Readonly<{ generation: string; requestId: string }>
+): TaskFinalizationReceipt {
+  const receipt = readReceipt(path.resolve(repoRoot), taskId);
+  if (!receipt) throw new Error('TASK_FINALIZATION_PREPARATION_REQUIRED');
+  return updateReceipt(path.resolve(repoRoot), receipt, { controlBinding, lastError: null });
+}
+
 function updateReceipt(
   repoRoot: string,
   receipt: TaskFinalizationReceipt,
@@ -314,7 +341,7 @@ function verificationFailure(result: TaskVerificationResult): FinalizationError
 }
 
 function warningFromError(
-  step: FinalizationStep,
+  step: string,
   error: FinalizationError,
   severity: OperationWarningSeverity = 'ACTION_REQUIRED'
 ): OperationWarning {
@@ -357,6 +384,76 @@ function resolveStepWarnings(receipt: TaskFinalizationReceipt, step: Finalizatio
     : warning);
 }
 
+function verificationWarnings(result: TaskVerificationResult): readonly OperationWarning[] {
+  const warnings: OperationWarning[] = [];
+  for (const invocation of result.invocations) {
+    const checks = Array.isArray(invocation.payload.checks) ? invocation.payload.checks : [invocation.payload];
+    for (const value of checks) {
+      if (!value || typeof value !== 'object' || Array.isArray(value)) continue;
+      const check = value as Record<string, unknown>;
+      const status = check.effectiveStatus ?? check.status;
+      const target = typeof check.checkId === 'string' && check.checkId ? check.checkId : typeof check.type === 'string' ? check.type : null;
+      if (!target || status === 'pass') continue;
+      const blocked = status === 'blocked';
+      const message = [check.reason, check.message, check.action]
+        .filter((item): item is string => typeof item === 'string' && item.length > 0)
+        .join(' - ');
+      warnings.push({
+        step: 'verification', target, code: blocked ? 'CHECK_BLOCKED' : 'CHECK_FAILED',
+        retryable: blocked, severity: 'ACTION_REQUIRED',
+        message: message || `verification ${String(status)}`
+      });
+    }
+  }
+  return mergeOperationWarnings(warnings);
+}
+
+function applyVerificationWarnings(
+  receipt: TaskFinalizationReceipt,
+  result: TaskVerificationResult
+): readonly FinalizationWarning[] {
+  if (result.status === 'pass') return resolveStepWarnings(receipt, 'verification');
+  const observed = new Map<string, 'pass' | OperationWarning>();
+  for (const invocation of result.invocations) {
+    const checks = Array.isArray(invocation.payload.checks) ? invocation.payload.checks : [invocation.payload];
+    for (const value of checks) {
+      if (!value || typeof value !== 'object' || Array.isArray(value)) continue;
+      const check = value as Record<string, unknown>;
+      const target = typeof check.checkId === 'string' && check.checkId ? check.checkId : typeof check.type === 'string' ? check.type : null;
+      if (!target) continue;
+      const status = check.effectiveStatus ?? check.status;
+      if (status === 'pass') observed.set(target, 'pass');
+    }
+  }
+  for (const warning of verificationWarnings(result)) observed.set(warning.target, warning);
+  if (observed.size === 0) {
+    return replaceWarning(receipt, warningFromError('verification', verificationFailure(result)), 'open');
+  }
+  let warnings = [...receipt.warnings];
+  for (const [target, current] of observed) {
+    if (current === 'pass') {
+      warnings = warnings.map((warning) => warning.step === 'verification' && warning.target === target && warning.status === 'open'
+        ? { ...warning, status: 'resolved', resolvedAt: now() }
+        : warning);
+      continue;
+    }
+    warnings = warnings.map((warning) => warning.step === 'verification' && warning.target === target
+      && warning.status === 'open' && warning.code !== current.code
+      ? { ...warning, status: 'resolved', resolvedAt: now() }
+      : warning);
+    const key = warningKey(current);
+    warnings = [...warnings.filter((warning) => warningKey(warning) !== key), warningRecord(current, 'open')];
+  }
+  return warnings;
+}
+
+function shouldRunBackfill(receipt: TaskFinalizationReceipt): boolean {
+  return receipt.lifecycle !== 'done'
+    || receipt.taskComment === 'pending'
+    || receipt.verification === 'pending'
+    || receipt.warnings.some((warning) => warning.step === 'backfill' && warning.status === 'open');
+}
+
 function issueCapability(receipt: TaskFinalizationReceipt, scope: Exclude<FinalizationStep, 'lifecycle'> | 'warning-projection'): FinalizationCapability {
   return {
     receiptId: receipt.receiptId,
@@ -374,6 +471,15 @@ function capabilityError(code: 'FINALIZATION_CAPABILITY_STALE' | 'FINALIZATION_S
   return error;
 }
 
+function hasPreparedTaskDocument(repoRoot: string, taskId: string): boolean {
+  const resolved = resolveTaskRef(taskId, { repoRoot });
+  if (!resolved.ok) return false;
+  if (resolved.state === 'completed') return true;
+  if (resolved.state !== 'active') return false;
+  try { return parseTaskFrontmatter(fs.readFileSync(resolved.taskMdPath, 'utf8')).status === 'completed'; }
+  catch { return false; }
+}
+
 function mutationKeys(value: FinalizationMutation): string[] {
   return Object.keys(value).sort();
 }
@@ -451,9 +557,8 @@ function applyFinalizationReceiptMutationUnderLock(
   mutation: FinalizationMutation,
   consumed: Set<string>
 ): TaskFinalizationReceipt {
-  const resolved = resolveTaskRef(receipt.taskId, { repoRoot });
-  if (!resolved.ok || resolved.state !== 'completed') {
-    throw capabilityError('FINALIZATION_SCOPE_INVALID', 'finalization capability requires a completed task');
+  if (!hasPreparedTaskDocument(repoRoot, receipt.taskId)) {
+    throw capabilityError('FINALIZATION_SCOPE_INVALID', 'finalization capability requires an active prepared task or a completed task');
   }
   const current = readReceipt(repoRoot, receipt.taskId);
   if (!current || current.receiptId !== receipt.receiptId || current.revision !== receipt.revision) {
@@ -471,11 +576,10 @@ function applyFinalizationReceiptMutation(
   capability: FinalizationCapability,
   mutation: FinalizationMutation
 ): TaskFinalizationReceipt {
-  const resolved = resolveTaskRef(receipt.taskId, { repoRoot });
-  if (!resolved.ok || resolved.state !== 'completed') {
-    throw capabilityError('FINALIZATION_SCOPE_INVALID', 'finalization capability requires a completed task');
+  if (!hasPreparedTaskDocument(repoRoot, receipt.taskId)) {
+    throw capabilityError('FINALIZATION_SCOPE_INVALID', 'finalization capability requires an active prepared task or a completed task');
   }
-  return withTaskExecutionLock(repoRoot, resolved.taskId, 'task-finalization.receipt-mutation', () =>
+  return withTaskExecutionLock(repoRoot, receipt.taskId, 'task-finalization.receipt-mutation', () =>
     applyFinalizationReceiptMutationUnderLock(repoRoot, receipt, capability, mutation, new Set<string>())
   );
 }
@@ -489,7 +593,10 @@ function reconcileWarningProjection(repoRoot: string, taskId: string, receipt: T
   const warnings = [...new Map(receipt.warnings.map((warning) => [warningKey(warning), warning])).values()];
   for (const warning of warnings) {
     try {
-      const projected = projectFinalizationWarning(taskId, warning, { repoRoot });
+      const superseded = warning.status === 'resolved' && receipt.warnings.some((item) =>
+        item.status === 'open' && item.step === warning.step && item.target === warning.target && item.code !== warning.code
+      );
+      const projected = projectFinalizationWarning(taskId, warning, { repoRoot, resolution: superseded ? 'superseded' : 'passed' });
       if (projected.status === 'failed') {
         const detail: FinalizationError = {
           code: projected.error?.code || 'FINALIZATION_WARNING_PROJECTION_FAILED',
@@ -595,7 +702,11 @@ async function syncPendingSummary(input: {
   let { receipt } = input;
   try {
     const resolved = resolveTaskRef(input.taskId, { repoRoot: input.repoRoot });
-    if (!resolved.ok || resolved.state !== 'completed') throw Object.assign(new Error('completed task is unavailable for summary sync'), { code: 'SUMMARY_STAGING_INVALID' });
+    if (!resolved.ok || !hasPreparedTaskDocument(input.repoRoot, input.taskId)) throw Object.assign(new Error('prepared task is unavailable for summary sync'), { code: 'SUMMARY_STAGING_INVALID' });
+    if (!fs.existsSync(path.join(resolved.taskDir, '.delivery-summary.json'))) {
+      receipt = updateReceipt(input.repoRoot, receipt, { summary: 'skipped', lastError: null });
+      return { receipt, step: { status: 'skipped', changed: false, error: null }, changed: false, error: null };
+    }
     if (!taskIssueIdentity(parseTaskFrontmatter(fs.readFileSync(resolved.taskMdPath, 'utf8')))) {
       receipt = updateReceipt(input.repoRoot, receipt, {
         summary: 'skipped', lastError: null
@@ -676,7 +787,25 @@ function terminalResult(
   };
 }
 
-async function applyUnderLock(
+function preparedResult(
+  taskId: string,
+  receipt: TaskFinalizationReceipt,
+  steps: Partial<Pick<TaskFinalizationResult, 'backfill' | 'lifecycle' | 'taskComment' | 'verification' | 'summary'>>,
+  changed: boolean
+): TaskFinalizationResult {
+  return {
+    status: 'prepared', changed, taskId,
+    backfill: steps.backfill ?? null,
+    lifecycle: steps.lifecycle ?? null,
+    taskComment: steps.taskComment ?? null,
+    verification: steps.verification ?? null,
+    summary: steps.summary ?? null,
+    completedSteps: completedSteps(receipt), pendingSteps: pendingSteps(receipt),
+    result: 'prepared', warnings: openWarnings(receipt), error: null
+  };
+}
+
+async function prepareUnderLock(
   request: TaskFinalizationRequest,
   taskId: string,
   options: TaskFinalizationOptions
@@ -696,10 +825,16 @@ async function applyUnderLock(
   } catch (error) {
     return failed(taskId, errorOf(error, 'TASK_FINALIZATION_RECEIPT_INVALID'));
   }
-  if (options.controlBinding && (
-    receipt.controlBinding?.generation !== options.controlBinding.generation
-    || receipt.controlBinding.requestId !== options.controlBinding.requestId
-  )) receipt = updateReceipt(repoRoot, receipt, { controlBinding: options.controlBinding });
+  if (options.controlBinding && (receipt.controlBinding?.generation !== options.controlBinding.generation
+    || receipt.controlBinding.requestId !== options.controlBinding.requestId)) {
+    const state = resolveTaskRef(taskId, { repoRoot });
+    if (!(receipt.lifecycle === 'done' && state.ok && state.state === 'completed')) {
+      return failed(taskId, {
+        code: 'TASK_FINALIZATION_RECOVERY_PROOF_UNAVAILABLE',
+        message: 'canonical receipt is not bound to the current sandbox request', retryable: false
+      });
+    }
+  }
 
   const preflightState = resolveTaskRef(taskId, { repoRoot });
   if (options.preflight && preflightState.ok && preflightState.state === 'active') {
@@ -725,7 +860,18 @@ async function applyUnderLock(
 
   let changed = false;
   let backfillResult: TaskFinalizationStep | null = null;
-  try {
+  let runBackfill = shouldRunBackfill(receipt);
+  if (!runBackfill && receipt.lifecycle === 'done') {
+    const eligibility = inspectCompletionBackfillEligibility(taskId, { cwd: repoRoot });
+    if (eligibility.status === 'failed') return failed(taskId, eligibility.error!, {
+      completedSteps: completedSteps(receipt), pendingSteps: pendingSteps(receipt), warnings: openWarnings(receipt)
+    });
+    runBackfill = eligibility.eligible;
+  }
+  if (receipt.lifecycle === 'done' && runBackfill && receipt.summary === 'done') {
+    receipt = updateReceipt(repoRoot, receipt, { summary: 'pending' });
+  }
+  if (runBackfill) try {
     const result = await backfill(taskId, { agent: request.agent, cwd: repoRoot });
     backfillResult = commentStep(result);
     const issueNotLinked = result.status === 'no-op' && result.error?.code === 'ISSUE_NOT_LINKED';
@@ -733,66 +879,57 @@ async function applyUnderLock(
       const detail = backfillResult.error ?? {
         code: 'COMPLETION_BACKFILL_FAILED', message: 'completion artifact backfill did not reach a successful terminal result', retryable: true
       };
-      return failed(taskId, detail, {
+      if (receipt.lifecycle !== 'done') return failed(taskId, detail, {
         backfill: backfillResult,
         completedSteps: completedSteps(receipt),
         pendingSteps: pendingSteps(receipt)
       });
+      const warnings = replaceWarning(receipt, warningFromError('backfill', detail), 'open');
+      receipt = updateReceipt(repoRoot, receipt, { warningProjection: 'pending', warnings, lastError: detail });
+      receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
+      if (!detail.retryable) return failed(taskId, detail, {
+        changed, backfill: backfillResult, completedSteps: completedSteps(receipt),
+        pendingSteps: pendingSteps(receipt), warnings: openWarnings(receipt)
+      });
+      return terminalResult(taskId, receipt, { backfill: backfillResult }, changed, detail);
     }
     changed = result.changed;
+    if (receipt.warnings.some((warning) => warning.step === 'backfill' && warning.status === 'open')) {
+      const warnings = receipt.warnings.map((warning) => warning.step === 'backfill' && warning.status === 'open'
+        ? { ...warning, status: 'resolved' as const, resolvedAt: now() }
+        : warning);
+      receipt = updateReceipt(repoRoot, receipt, { warningProjection: 'pending', warnings, lastError: null });
+    }
     if (result.changed && receipt.taskComment !== 'pending') {
       receipt = updateReceipt(repoRoot, receipt, { taskComment: 'pending' });
     }
   } catch (error) {
     const detail = errorOf(error, 'COMPLETION_BACKFILL_FAILED', true);
+    if (receipt.lifecycle === 'done') {
+      const warnings = replaceWarning(receipt, warningFromError('backfill', detail), 'open');
+      receipt = updateReceipt(repoRoot, receipt, { warningProjection: 'pending', warnings, lastError: detail });
+      receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
+      return terminalResult(taskId, receipt, {
+        backfill: { status: 'blocked', changed: false, error: detail }
+      }, changed, detail);
+    }
     return failed(taskId, detail, {
       backfill: { status: detail.retryable ? 'blocked' : 'failed', changed: false, error: detail },
       completedSteps: completedSteps(receipt),
       pendingSteps: pendingSteps(receipt)
     });
-  }
+  } else backfillResult = { status: 'no-op', changed: false, error: null };
 
   let lifecycleResult: TaskFinalizationStep | null = null;
   try {
     const resolved = resolveTaskRef(taskId, { repoRoot });
-    const registry = resolved.ok && resolved.state === 'completed' ? inspectShortIdRegistry(repoRoot) : null;
-    if (registry && registry.status !== 'valid') {
-      const detail: FinalizationError = {
-        code: 'TASK_FINALIZATION_SHORT_ID_REGISTRY_UNAVAILABLE',
-        message: `cannot verify canonical short-id registry: ${registry.error.code}: ${registry.error.message}`,
-        retryable: false
-      };
-      receipt = updateReceipt(repoRoot, receipt, { lifecycle: 'pending', lastError: detail });
-      return terminalResult(taskId, receipt, {
-        backfill: backfillResult,
-        lifecycle: { status: 'failed', changed: false, error: detail },
-        taskComment: null,
-        verification: null
-      }, changed, detail);
-    }
-    const shortIds = registry?.status === 'valid' ? registry.shortIds : null;
-    if (shortIds?.has(taskId)) {
-      const detail: FinalizationError = {
-        code: 'TASK_FINALIZATION_CANONICAL_STATE_INVALID',
-        message: 'completed task still has an active short-id registry entry',
-        retryable: false
-      };
-      receipt = updateReceipt(repoRoot, receipt, { lifecycle: 'pending', lastError: detail });
-      return terminalResult(taskId, receipt, {
-        backfill: backfillResult,
-        lifecycle: { status: 'failed', changed: false, error: detail },
-        taskComment: null,
-        verification: null
-      }, changed, detail);
-    }
-    const lifecycleDone = receipt.lifecycle === 'done' && resolved.ok && resolved.state === 'completed' && shortIds !== null;
-    if (lifecycleDone) {
+    if (receipt.lifecycle === 'done' && resolved.ok && resolved.state === 'completed') {
       lifecycleResult = { status: 'no-op', changed: false, error: null };
       receipt = updateReceipt(repoRoot, receipt, { lifecycle: 'done', lastError: null });
     } else {
       const result = lifecycle(
         { taskRef: taskId, intent: 'complete', agent: request.agent },
-        { repoRoot, ...(options.metadataProvider ? { metadataProvider: options.metadataProvider } : {}) }
+        { repoRoot, prepareOnly: true, ...(options.metadataProvider ? { metadataProvider: options.metadataProvider } : {}) }
       );
       lifecycleResult = lifecycleStep(result);
       if (result.status !== 'applied' && result.status !== 'no-op') {
@@ -800,7 +937,6 @@ async function applyUnderLock(
         return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment: null, verification: null }, result.changed, lifecycleResult.error);
       }
       changed = changed || result.changed;
-      receipt = updateReceipt(repoRoot, receipt, { lifecycle: 'done', lastError: null });
     }
   } catch (error) {
     const detail = errorOf(error, 'TASK_FINALIZATION_LIFECYCLE_FAILED');
@@ -810,79 +946,64 @@ async function applyUnderLock(
 
   let taskComment: TaskFinalizationStep | null = null;
   receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
-  const initialComment = await syncPendingTaskComment({
-    repoRoot, taskId, agent: request.agent, receipt, commentSync, consumedCapabilities
-  });
-  receipt = initialComment.receipt;
-  taskComment = initialComment.step;
-  changed = changed || initialComment.changed;
-  if (initialComment.error) {
-    return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification: null }, changed, initialComment.error);
-  }
 
   let verification: TaskFinalizationStep | null = null;
-  try {
+  if (receipt.verification !== 'pending') {
+    verification = { status: receipt.verification === 'skipped' ? 'skipped' : 'no-op', changed: false, error: null };
+  } else {
+    try {
     receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
-    const verificationPending = receipt.verification === 'pending';
+    const verificationState = resolveTaskRef(taskId, { repoRoot });
+    const verificationEvent = verificationState.ok && verificationState.state === 'completed'
+      ? 'complete-task.completed'
+      : 'complete-task.prepared';
     const result = await verify(
-      { taskRef: taskId, event: 'complete-task.completed' },
+      { taskRef: taskId, event: verificationEvent },
       { repoRoot }
     );
     verification = verificationStep(result);
     if (result.status === 'pass') {
-      if (verificationPending) {
-        const capability = issueCapability(receipt, 'verification');
-        receipt = applyFinalizationReceiptMutationUnderLock(repoRoot, receipt, capability, {
-          scope: 'verification', operation: 'succeeded'
-        }, consumedCapabilities);
-        receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
-        const finalComment = await syncPendingTaskComment({
-          repoRoot, taskId, agent: request.agent, receipt, commentSync, consumedCapabilities
-        });
-        receipt = finalComment.receipt;
-        if (finalComment.step.status !== 'no-op') taskComment = finalComment.step;
-        changed = changed || finalComment.changed;
-        if (finalComment.error) {
-          return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification }, changed, finalComment.error);
-        }
-      } else {
-        receipt = updateReceipt(repoRoot, receipt, { lastError: null });
+      const resolvedTaskWarning = receipt.warnings.some((warning) => warning.step === 'verification' && warning.status === 'open');
+      const warnings = applyVerificationWarnings(receipt, result);
+      receipt = updateReceipt(repoRoot, receipt, {
+        verification: 'done', taskComment: resolvedTaskWarning ? 'pending' : receipt.taskComment,
+        warningProjection: warnings.length > 0 ? 'pending' : 'done', warnings, lastError: null
+      });
+      receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
+      const finalComment = await syncPendingTaskComment({
+        repoRoot, taskId, agent: request.agent, receipt, commentSync, consumedCapabilities
+      });
+      receipt = finalComment.receipt;
+      if (finalComment.step.status !== 'no-op') taskComment = finalComment.step;
+      changed = changed || finalComment.changed;
+      if (finalComment.error) {
+        return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification }, changed, finalComment.error);
       }
     } else {
       const detail = verification.error ?? { code: 'VERIFY_FAILED', message: 'verification failed', retryable: true };
-      if (verificationPending) {
-        const capability = issueCapability(receipt, 'verification');
-        receipt = applyFinalizationReceiptMutationUnderLock(repoRoot, receipt, capability, {
-          scope: 'verification', operation: 'failed', error: detail
-        }, consumedCapabilities);
-        receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
-      } else {
-        const warnings = replaceWarning(receipt, warningFromError('verification', detail), 'open');
-        receipt = updateReceipt(repoRoot, receipt, {
-          verification: 'pending', taskComment: 'pending', warningProjection: 'pending', warnings, lastError: detail
-        });
-        receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
-        const warningComment = await syncPendingTaskComment({ repoRoot, taskId, agent: request.agent, receipt, commentSync, consumedCapabilities });
-        receipt = warningComment.receipt;
-        if (warningComment.step.status !== 'no-op') taskComment = warningComment.step;
-        changed = changed || warningComment.changed;
+      const warnings = applyVerificationWarnings(receipt, result);
+      receipt = updateReceipt(repoRoot, receipt, {
+        verification: 'pending', taskComment: 'pending', warningProjection: 'pending', warnings, lastError: detail
+      });
+      receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
+      const warningComment = await syncPendingTaskComment({
+        repoRoot, taskId, agent: request.agent, receipt, commentSync, consumedCapabilities
+      });
+      receipt = warningComment.receipt;
+      taskComment = warningComment.step;
+      changed = changed || warningComment.changed;
+      if (warningComment.error) {
+        return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification }, changed, warningComment.error);
       }
       return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification }, changed, detail);
     }
   } catch (error) {
     const detail = errorOf(error, 'VERIFY_FAILED', true);
     try {
-      if (receipt.verification === 'pending') {
-        const capability = issueCapability(receipt, 'verification');
-        receipt = applyFinalizationReceiptMutationUnderLock(repoRoot, receipt, capability, {
-          scope: 'verification', operation: 'failed', error: detail
-        }, consumedCapabilities);
-      } else {
-        const warnings = replaceWarning(receipt, warningFromError('verification', detail), 'open');
-        receipt = updateReceipt(repoRoot, receipt, {
-          verification: 'pending', taskComment: 'pending', warningProjection: 'pending', warnings, lastError: detail
-        });
-      }
+      const warnings = replaceWarning(receipt, warningFromError('verification', detail), 'open');
+      receipt = updateReceipt(repoRoot, receipt, {
+        verification: 'pending', taskComment: 'pending', warningProjection: 'pending', warnings, lastError: detail
+      });
       receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
     } catch (writeError) {
       const persistence = errorOf(writeError, 'FINALIZATION_RECEIPT_WRITE_FAILED', true);
@@ -902,9 +1023,12 @@ async function applyUnderLock(
       changed = changed || warningComment.changed;
     } catch { /* preserve the primary error */ }
     return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification: { status: 'blocked', changed: false, error: detail } }, changed, detail);
+    }
   }
 
-  let summary = await syncPendingSummary({ repoRoot, taskId, agent: request.agent, receipt, commentSync });
+  let summary = receipt.summary === 'pending'
+    ? await syncPendingSummary({ repoRoot, taskId, agent: request.agent, receipt, commentSync })
+    : { receipt, step: { status: 'no-op', changed: false, error: null }, changed: false, error: null };
   receipt = summary.receipt;
   changed = changed || summary.changed;
   if (summary.error) {
@@ -912,10 +1036,21 @@ async function applyUnderLock(
     return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification, summary: summary.step }, changed, summary.error);
   }
   receipt = reconcileWarningProjection(repoRoot, taskId, receipt, consumedCapabilities);
-  return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification, summary: summary.step }, changed);
+  if (receipt.taskComment === 'pending') {
+    const finalComment = await syncPendingTaskComment({
+      repoRoot, taskId, agent: request.agent, receipt, commentSync, consumedCapabilities
+    });
+    receipt = finalComment.receipt;
+    taskComment = finalComment.step;
+    changed = changed || finalComment.changed;
+    if (finalComment.error) {
+      return terminalResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification, summary: summary.step }, changed, finalComment.error);
+    }
+  }
+  return preparedResult(taskId, receipt, { backfill: backfillResult, lifecycle: lifecycleResult, taskComment, verification, summary: summary.step }, changed);
 }
 
-async function applyTaskFinalization(request: TaskFinalizationRequest, options: TaskFinalizationOptions): Promise<TaskFinalizationResult> {
+async function prepareTaskFinalization(request: TaskFinalizationRequest, options: TaskFinalizationOptions): Promise<TaskFinalizationResult> {
   if (request.intent !== 'complete' || !request.taskRef || !request.agent) {
     return failed(null, { code: 'TASK_FINALIZATION_PAYLOAD_INVALID', message: 'complete finalization requires taskRef and agent', retryable: false });
   }
@@ -923,7 +1058,7 @@ async function applyTaskFinalization(request: TaskFinalizationRequest, options:
   const resolved = resolveTaskRef(request.taskRef, { repoRoot });
   if (!resolved.ok) return failed(resolved.taskId, { code: resolved.code, message: resolved.message, retryable: false });
   try {
-    return await withTaskExecutionLock(repoRoot, resolved.taskId, 'task-finalization.complete', () => applyUnderLock(request, resolved.taskId, options));
+    return await withTaskExecutionLock(repoRoot, resolved.taskId, 'task-finalization.prepare', () => prepareUnderLock(request, resolved.taskId, options));
   } catch (error) {
     const detail = error instanceof TaskExecutionLockError
       ? { code: error.code, message: error.message, retryable: error.code === 'ORCHESTRATION_LOCK_BUSY' }
@@ -932,9 +1067,140 @@ async function applyTaskFinalization(request: TaskFinalizationRequest, options:
   }
 }
 
+async function commitPreparedTaskFinalization(request: TaskFinalizationRequest, options: TaskFinalizationOptions): Promise<TaskFinalizationResult> {
+  if (request.intent !== 'complete' || !request.taskRef || !request.agent) {
+    return failed(null, { code: 'TASK_FINALIZATION_PAYLOAD_INVALID', message: 'complete finalization requires taskRef and agent', retryable: false });
+  }
+  const repoRoot = path.resolve(options.repoRoot);
+  const resolved = resolveTaskRef(request.taskRef, { repoRoot });
+  if (!resolved.ok) return failed(resolved.taskId, { code: resolved.code, message: resolved.message, retryable: false });
+  try {
+    return await withTaskExecutionLock(repoRoot, resolved.taskId, 'task-finalization.commit', () => {
+      if (options.controlBinding && options.manifestPath) {
+        try {
+          const manifest = readSandboxControlManifest(options.manifestPath);
+          const identity = validateSandboxControlIdentity({
+            publicStatusDir: manifest.publicStatusDir,
+            root: path.dirname(path.resolve(options.manifestPath)),
+            mode: manifest.mode,
+            taskId: manifest.taskId,
+            generation: manifest.generation,
+            controlRootId: manifest.controlRootId
+          });
+          if (identity.state !== 'valid' || manifest.taskId !== resolved.taskId
+            || manifest.generation !== options.controlBinding.generation
+            || fs.realpathSync.native(manifest.repoRoot) !== fs.realpathSync.native(repoRoot)) {
+            throw new Error('current sandbox manifest does not match finalization request');
+          }
+        } catch (error) {
+          return failed(resolved.taskId, {
+            code: 'TASK_FINALIZATION_RECOVERY_PROOF_UNAVAILABLE',
+            message: error instanceof Error ? error.message : String(error), retryable: false
+          });
+        }
+      }
+      let receipt = readReceipt(repoRoot, resolved.taskId);
+      if (!receipt && options.controlBinding && options.handoffDirectory && request.handoffSha256) {
+        try {
+          const handoff = readTaskFinalizationHandoff(
+            options.handoffDirectory, resolved.taskId, options.controlBinding, request.handoffSha256
+          );
+          receipt = validateReceipt(handoff.receipt, resolved.taskId);
+          if (receipt.lifecycle !== 'pending') throw new Error('handoff lifecycle must be pending');
+          if (inspectTaskLifecycleProgress(repoRoot, resolved.taskId, request.agent) === 'unknown') {
+            throw new Error('TASK_FINALIZATION_RECOVERY_PROOF_UNAVAILABLE');
+          }
+          writeReceipt(repoRoot, receipt);
+          try { handoff.cleanup(); } catch { /* keep the persisted canonical receipt usable */ }
+        } catch (error) {
+          return failed(resolved.taskId, {
+            code: 'TASK_FINALIZATION_HANDOFF_INVALID',
+            message: error instanceof Error ? error.message : String(error), retryable: false
+          });
+        }
+      }
+      if (!receipt) return failed(resolved.taskId, {
+        code: 'TASK_FINALIZATION_PREPARATION_REQUIRED', message: 'sandbox preparation receipt is unavailable', retryable: true
+      });
+      if (receipt.lifecycle === 'done' && resolved.state === 'completed') {
+        return terminalResult(resolved.taskId, receipt, { lifecycle: { status: 'no-op', changed: false, error: null } }, false);
+      }
+      if (options.controlBinding) {
+        const proof = inspectTaskLifecycleProgress(repoRoot, resolved.taskId, request.agent);
+        const oldBinding = receipt.controlBinding;
+        if (!oldBinding || oldBinding.generation !== options.controlBinding.generation || proof === 'unknown') {
+          return failed(resolved.taskId, {
+            code: 'TASK_FINALIZATION_RECOVERY_PROOF_UNAVAILABLE',
+            message: 'canonical receipt has no valid host recovery proof', retryable: false
+          });
+        }
+        if (oldBinding.requestId !== options.controlBinding.requestId && proof === 'not-started') {
+          if (receipt.lifecycle !== 'pending' || !options.handoffDirectory || !request.handoffSha256) {
+            return failed(resolved.taskId, {
+              code: 'TASK_FINALIZATION_RECOVERY_PROOF_UNAVAILABLE',
+              message: 'pending receipt cannot be rebound without a current handoff', retryable: false
+            });
+          }
+          try {
+            const handoff = readTaskFinalizationHandoff(
+              options.handoffDirectory, resolved.taskId, options.controlBinding, request.handoffSha256
+            );
+            const nextReceipt = validateReceipt(handoff.receipt, resolved.taskId);
+            if (nextReceipt.receiptId !== receipt.receiptId || nextReceipt.intent !== receipt.intent
+              || nextReceipt.lifecycle !== 'pending') throw new Error('handoff is not continuous with canonical receipt');
+            receipt = updateReceipt(repoRoot, receipt, { controlBinding: options.controlBinding });
+            try { handoff.cleanup(); } catch { /* keep the persisted canonical receipt usable */ }
+          } catch (error) {
+            return failed(resolved.taskId, {
+              code: 'TASK_FINALIZATION_HANDOFF_INVALID',
+              message: error instanceof Error ? error.message : String(error), retryable: false
+            });
+          }
+        }
+      }
+      if (receipt.taskComment === 'pending' || receipt.verification === 'pending' || receipt.summary === 'pending' || receipt.warningProjection === 'pending') {
+        return failed(resolved.taskId, {
+          code: 'TASK_FINALIZATION_PREPARATION_REQUIRED', message: 'sandbox preparation has pending external steps', retryable: true
+        }, { completedSteps: completedSteps(receipt), pendingSteps: pendingSteps(receipt), warnings: openWarnings(receipt) });
+      }
+      const registry = inspectShortIdRegistry(repoRoot);
+      if (registry.status !== 'valid') return failed(resolved.taskId, {
+        code: 'TASK_FINALIZATION_SHORT_ID_REGISTRY_UNAVAILABLE',
+        message: `cannot verify canonical short-id registry: ${registry.error.code}: ${registry.error.message}`,
+        retryable: false
+      });
+      const lifecycle = options.lifecycle ?? applyTaskLifecycle;
+      const result = lifecycle(
+        { taskRef: resolved.taskId, intent: 'complete', agent: request.agent },
+        { repoRoot, ...(options.metadataProvider ? { metadataProvider: options.metadataProvider } : {}) }
+      );
+      const step = lifecycleStep(result);
+      if (result.status !== 'applied' && result.status !== 'no-op') {
+        const updated = updateReceipt(repoRoot, receipt, { lifecycle: 'pending', lastError: step.error });
+        return terminalResult(resolved.taskId, updated, { lifecycle: step }, result.changed, step.error);
+      }
+      const updated = updateReceipt(repoRoot, receipt, { lifecycle: 'done', lastError: null });
+      return terminalResult(resolved.taskId, updated, { lifecycle: step }, result.changed);
+    });
+  } catch (error) {
+    const detail = error instanceof TaskExecutionLockError
+      ? { code: error.code, message: error.message, retryable: error.code === 'ORCHESTRATION_LOCK_BUSY' }
+      : errorOf(error, 'TASK_FINALIZATION_FAILED');
+    return failed(resolved.taskId, detail);
+  }
+}
+
+async function applyTaskFinalization(request: TaskFinalizationRequest, options: TaskFinalizationOptions): Promise<TaskFinalizationResult> {
+  const prepared = await prepareTaskFinalization(request, options);
+  if (prepared.status !== 'prepared') return prepared;
+  return commitPreparedTaskFinalization(request, options);
+}
+
 export {
   applyFinalizationReceiptMutation,
+  commitPreparedTaskFinalization,
   applyTaskFinalization,
+  prepareTaskFinalization,
   issueCapability as createFinalizationCapability,
   readTaskFinalizationReceipt,
   terminalResult