@fitlab-ai/agent-infra 0.11.4 → 0.11.6

package/lib/sandbox/task-resolver.ts

@@ -36,7 +36,9 @@ function stripQuotes(value: string): string {
 
 function readTaskContent(repoRoot: string, taskId: string): { content: string; state: TaskWorkspaceState; taskMd: string } {
   for (const state of TASK_WORKSPACE_STATES) {
-    const taskPath = path.join(repoRoot, '.agents', 'workspace', state, taskId, 'task.md');
+    const taskPath = state === 'archive'
+      ? path.join(repoRoot, '.agents', 'workspace', state, ...findArchiveTaskParts(repoRoot, taskId), 'local', 'task.md')
+      : path.join(repoRoot, '.agents', 'workspace', state, taskId, 'task.md');
     if (fs.existsSync(taskPath)) {
       return { content: fs.readFileSync(taskPath, 'utf8'), state, taskMd: taskPath };
     }
@@ -45,7 +47,7 @@ function readTaskContent(repoRoot: string, taskId: string): { content: string; s
 }
 
 function taskWorkspaceCandidates(repoRoot: string, taskId: string): TaskWorkspace[] {
-  return TASK_WORKSPACE_STATES.flatMap((state) => {
+  const hot = TASK_WORKSPACE_STATES.filter((state) => state !== 'archive').flatMap((state) => {
     const taskMd = path.join(repoRoot, '.agents', 'workspace', state, taskId, 'task.md');
     if (!fs.existsSync(taskMd)) return [];
     const content = fs.readFileSync(taskMd, 'utf8');
@@ -56,6 +58,32 @@ function taskWorkspaceCandidates(repoRoot: string, taskId: string): TaskWorkspac
       taskMd
     }];
   });
+  const parts = findArchiveTaskParts(repoRoot, taskId);
+  if (parts.length === 0) return hot;
+  const taskMd = path.join(repoRoot, '.agents', 'workspace', 'archive', ...parts, 'local', 'task.md');
+  if (!fs.existsSync(taskMd)) return hot;
+  const content = fs.readFileSync(taskMd, 'utf8');
+  return [...hot, {
+    taskId,
+    branch: resolveBranchFromTaskContent(content, taskId),
+    state: 'archive',
+    taskMd
+  }];
+}
+
+function findArchiveTaskParts(repoRoot: string, taskId: string): string[] {
+  const archiveRoot = path.join(repoRoot, '.agents', 'workspace', 'archive');
+  if (!fs.existsSync(archiveRoot)) return [];
+  for (const year of fs.readdirSync(archiveRoot).sort().reverse()) {
+    if (!/^\d{4}$/.test(year)) continue;
+    for (const month of fs.readdirSync(path.join(archiveRoot, year)).sort().reverse()) {
+      if (!/^\d{2}$/.test(month)) continue;
+      for (const day of fs.readdirSync(path.join(archiveRoot, year, month)).sort().reverse()) {
+        if (/^\d{2}$/.test(day) && fs.existsSync(path.join(archiveRoot, year, month, day, taskId, 'local', 'task.md'))) return [year, month, day, taskId];
+      }
+    }
+  }
+  return [];
 }
 
 function resolveBranchFromTaskContent(content: string, taskId: string): string {
@@ -102,6 +130,27 @@ export function resolveTaskWorkspace(taskId: string, repoRoot: string): TaskWork
 
 export function listTaskWorkspaces(repoRoot: string, state: TaskWorkspaceState): TaskWorkspace[] {
   const stateRoot = path.join(repoRoot, '.agents', 'workspace', state);
+  if (state === 'archive') {
+    if (!fs.existsSync(stateRoot)) return [];
+    const rows: TaskWorkspace[] = [];
+    for (const year of fs.readdirSync(stateRoot).sort()) {
+      if (!/^\d{4}$/.test(year)) continue;
+      for (const month of fs.readdirSync(path.join(stateRoot, year)).sort()) {
+        if (!/^\d{2}$/.test(month)) continue;
+        for (const day of fs.readdirSync(path.join(stateRoot, year, month)).sort()) {
+          if (!/^\d{2}$/.test(day)) continue;
+          for (const taskId of fs.readdirSync(path.join(stateRoot, year, month, day)).sort()) {
+            if (!TASK_ID_RE.test(taskId)) continue;
+            const taskMd = path.join(stateRoot, year, month, day, taskId, 'local', 'task.md');
+            if (!fs.existsSync(taskMd)) continue;
+            const content = fs.readFileSync(taskMd, 'utf8');
+            rows.push({ taskId, branch: resolveBranchFromTaskContent(content, taskId), state, taskMd });
+          }
+        }
+      }
+    }
+    return rows;
+  }
   if (!fs.existsSync(stateRoot)) return [];
   return fs.readdirSync(stateRoot, { withFileTypes: true })
     .filter((entry) => entry.isDirectory() && TASK_ID_RE.test(entry.name))

package/lib/task/activity-intent.ts

@@ -14,7 +14,6 @@ import { TaskExecutionLockError, withTaskExecutionLock } from './task-execution-
 import type { TaskExecutionLockOptions } from './task-execution-lock.ts';
 import { captureTaskWriteMetadata, writeTask } from './write.ts';
 import type { TaskMutation, TaskOperationSummary, TaskWriteOptions } from './write.ts';
-import { allowsManualOverride } from './guard-override.ts';
 
 type PrReviewVerdict = 'approved' | 'changes-requested' | 'commented';
 type PrReviewOutcome = 'aborted' | 'superseded';
@@ -398,7 +397,7 @@ export function applyPrReviewActivityIntent(intent: PrReviewActivityIntent, opti
   if ('code' in validated) return failed(intent, validated.code, validated.message);
   const resolved = resolveTaskRef(intent.taskRef, { repoRoot: options.repoRoot });
   if (!resolved.ok) return failed(intent, resolved.code, resolved.message, resolved.taskId);
-  if (resolved.state !== 'active' && !allowsManualOverride(options.manualOverride, 'activity-intent', 'TASK_STATE_MISMATCH')) {
+  if (resolved.state !== 'active') {
     return failed(intent, 'TASK_STATE_MISMATCH', `task ${resolved.taskId} is ${resolved.state}, expected active`, resolved.taskId);
   }
   if (options.lockAlreadyHeld) return applyLocked(intent, validated.agent, { ...options, repoRoot: resolved.repoRoot });

package/lib/task/artifact-operations.ts

@@ -27,6 +27,7 @@ type ArtifactStructuralDiagnosticCode =
   | 'ARTIFACT_EMPTY_SECTION'
   | 'ARTIFACT_SECTION_ORDER_INVALID'
   | 'ARTIFACT_HEADING_TRAILING_PUNCTUATION'
+  | 'ARTIFACT_STATE_CHECK_PATTERN_MISSING'
   | 'ARTIFACT_REQUIRED_PATTERN_MISSING';
 
 type ArtifactStructuralDiagnostic = Readonly<{
@@ -254,13 +255,68 @@ function inspectArtifactPatterns(
   };
 }
 
+function inspectArtifactStateCheck(
+  content: string,
+  schema: ArtifactSchema,
+  scopeToStateCheckSection: boolean
+): ArtifactStructureResult {
+  const stateCheck = schema.sections.find((section) => section.id === 'state-check');
+  if (!stateCheck || schema.stateCheckPatterns.length === 0) {
+    return { ok: true, family: schema.family, semanticDigest: canonicalSemanticDigest(content), diagnostics: [] };
+  }
+
+  if (!scopeToStateCheckSection) {
+    const diagnostics = schema.stateCheckPatterns
+      .filter((pattern) => !new RegExp(pattern, 'm').test(content))
+      .map((pattern) => diagnostic(
+        'ARTIFACT_STATE_CHECK_PATTERN_MISSING',
+        `artifact is missing required state-check command '${pattern}'`,
+        stateCheck.id,
+        null
+      ));
+    return {
+      ok: diagnostics.length === 0,
+      family: schema.family,
+      semanticDigest: canonicalSemanticDigest(content),
+      diagnostics
+    };
+  }
+
+  const scanned = scanVisibleMarkdown(content);
+  const headings = scanned.headings.filter((heading) => (
+    heading.level === 2 && sectionHeadings(schema, stateCheck).includes(heading.text)
+  ));
+  if (headings.length !== 1) {
+    return { ok: true, family: schema.family, semanticDigest: canonicalSemanticDigest(content), diagnostics: [] };
+  }
+
+  const bodyBounds = sectionBodyBounds(content, headings[0]!, scanned);
+  const body = content.slice(bodyBounds.start, bodyBounds.end);
+  const diagnostics = schema.stateCheckPatterns
+    .filter((pattern) => !new RegExp(pattern, 'm').test(body))
+    .map((pattern) => diagnostic(
+      'ARTIFACT_STATE_CHECK_PATTERN_MISSING',
+      `state-check section is missing required command '${pattern}'`,
+      stateCheck.id,
+      lineNumber(content, headings[0]!.start)
+    ));
+  return {
+    ok: diagnostics.length === 0,
+    family: schema.family,
+    semanticDigest: canonicalSemanticDigest(content),
+    diagnostics
+  };
+}
+
 function inspectArtifactContract(
   content: string,
-  schema: ArtifactSchema
+  schema: ArtifactSchema,
+  options: { scopeStateCheckSection?: boolean } = {}
 ): ArtifactStructureResult {
   const structure = inspectArtifactStructure(content, schema);
+  const stateCheck = inspectArtifactStateCheck(content, schema, options.scopeStateCheckSection === true);
   const patterns = inspectArtifactPatterns(content, schema);
-  const diagnostics = [...structure.diagnostics, ...patterns.diagnostics];
+  const diagnostics = [...structure.diagnostics, ...stateCheck.diagnostics, ...patterns.diagnostics];
   return {
     ok: diagnostics.length === 0,
     family: schema.family,

package/lib/task/artifact-schema.ts

@@ -13,6 +13,7 @@ type ArtifactSchema = Readonly<{
   family: ArtifactSchemaFamily;
   title: Readonly<{ zh: string; en: string }>;
   sections: readonly ArtifactSection[];
+  stateCheckPatterns: readonly string[];
   requiredPatterns: readonly string[];
 }>;
 type ArtifactSkeletonInput = Readonly<{
@@ -106,21 +107,22 @@ function buildSections(family: ArtifactSchemaFamily): readonly ArtifactSection[]
   }));
 }
 
+const TASK_SNAPSHOT_PATTERN = 'agent-infra-internal[ \\t]+task-snapshot\\b';
+
 const ARTIFACT_SCHEMAS: readonly ArtifactSchema[] = [
-  { family: 'analysis', title: { zh: '需求分析报告', en: 'Requirements Analysis' }, sections: buildSections('analysis'), requiredPatterns: ['^\\$ '] },
-  { family: 'review-analysis', title: { zh: '需求分析审查报告', en: 'Analysis Review Report' }, sections: buildSections('review-analysis'), requiredPatterns: ['^### (?:审查决定|Approval Decision)$', '^\\$ '] },
-  { family: 'plan', title: { zh: '技术方案', en: 'Technical Plan' }, sections: buildSections('plan'), requiredPatterns: ['^\\$ '] },
-  { family: 'review-plan', title: { zh: '技术方案审查报告', en: 'Plan Review Report' }, sections: buildSections('review-plan'), requiredPatterns: ['^### (?:审查决定|Approval Decision)$', '^\\$ '] },
-  { family: 'code', title: { zh: '实现报告', en: 'Implementation Report' }, sections: buildSections('code'), requiredPatterns: ['^\\$ '] },
+  { family: 'analysis', title: { zh: '需求分析报告', en: 'Requirements Analysis' }, sections: buildSections('analysis'), stateCheckPatterns: [TASK_SNAPSHOT_PATTERN], requiredPatterns: [] },
+  { family: 'review-analysis', title: { zh: '需求分析审查报告', en: 'Analysis Review Report' }, sections: buildSections('review-analysis'), stateCheckPatterns: [TASK_SNAPSHOT_PATTERN], requiredPatterns: ['^### (?:审查决定|Approval Decision)$'] },
+  { family: 'plan', title: { zh: '技术方案', en: 'Technical Plan' }, sections: buildSections('plan'), stateCheckPatterns: [TASK_SNAPSHOT_PATTERN], requiredPatterns: [] },
+  { family: 'review-plan', title: { zh: '技术方案审查报告', en: 'Plan Review Report' }, sections: buildSections('review-plan'), stateCheckPatterns: [TASK_SNAPSHOT_PATTERN], requiredPatterns: ['^### (?:审查决定|Approval Decision)$'] },
+  { family: 'code', title: { zh: '实现报告', en: 'Implementation Report' }, sections: buildSections('code'), stateCheckPatterns: [TASK_SNAPSHOT_PATTERN], requiredPatterns: [] },
   { family: 'review-code', title: { zh: '代码审查报告', en: 'Code Review Report' }, sections: buildSections('review-code'), requiredPatterns: [
     '^### (?:审查决定|Approval Decision)$',
-    '^\\$ ',
     '^- \\*\\*(?:总体结论|Overall Verdict)\\*\\*[:：]\\s*(?:通过|需要修改|拒绝|Approved|Changes Requested|Rejected)\\s*$',
     '^- \\*\\*(?:审查基线提交|Review Baseline Commit)\\*\\*[:：]\\s*\\S',
     '^- \\*\\*(?:审查差异基线|Reviewed Diff Base)\\*\\*[:：]\\s*[0-9a-f]{40,64}\\s*$',
     '^- \\*\\*(?:审查差异指纹|Reviewed Diff Fingerprint)\\*\\*[:：]\\s*sha256:[0-9a-f]{64}\\s*$',
     '^- \\*\\*(?:审查快照树|Reviewed Snapshot Tree)\\*\\*[:：]\\s*[0-9a-f]{40,64}\\s*$'
-  ] }
+  ], stateCheckPatterns: [TASK_SNAPSHOT_PATTERN] }
 ];
 
 function getArtifactSchema(family: string): ArtifactSchema | null {

package/lib/task/control-authority.ts

@@ -1,12 +1,10 @@
 import path from 'node:path';
 import crypto from 'node:crypto';
-import fs from 'node:fs';
 
 import { normalizeAgentToken } from '../agent-clients/tokens.ts';
 import { isAgentClientId } from '../agent-clients/types.ts';
 import type { AgentClientId } from '../agent-clients/types.ts';
 import { getAgentClientAdapter } from '../agent-clients/registry.ts';
-import { consumeHumanOverride, failureId, overrideDryRunConflict } from './human-override.ts';
 import {
   activateMatchingOrchestrationDelegation,
   activateOrchestrationDelegation,
@@ -40,19 +38,12 @@ import type {
   AgentClientLifecycleRecoveryRequest as LifecycleRecoveryRequest,
   AgentClientLifecycleRecoveryResult as LifecycleRecoveryResult
 } from '../agent-clients/adapter.ts';
-import { locateActivityLog } from './activity-log.ts';
 import { resolveTaskRef, TASK_ID_RE } from './resolve-ref.ts';
 import { TaskExecutionLockError, withTaskExecutionLock } from './task-execution-lock.ts';
 import { verifyTaskEvent } from './verification.ts';
 import { createCodexCapabilityStore } from '../agent-clients/adapters/codex-lifecycle/capability-store.ts';
-import {
-  findArtifactRecoveryIntentsByOperation,
-  writeArtifactRecoveryIntent,
-  type ArtifactRecoveryIntent
-} from './artifact-repair-intent.ts';
 import {
   computeLifecycleBuildIdentity,
-  verifyLifecycleBuildIdentity,
   type LifecycleBuildIdentity
 } from '../agent-clients/adapters/codex-lifecycle/build-identity.ts';
 
@@ -324,7 +315,6 @@ export function consumeLifecycleRecoveryAttestation(
 export function queryLifecycleRecoveryOperation(
   operationId: string,
   options: Readonly<{
-    repoRoot?: string;
     capabilityStore?: ReturnType<typeof createCodexCapabilityStore>;
   }> = {}
 ): LifecycleRecoveryOperationQueryV1 {
@@ -334,7 +324,6 @@ export function queryLifecycleRecoveryOperation(
   const store = options.capabilityStore ?? createCodexCapabilityStore();
   const registry = authorityOperationMap.get(store);
   const known = [...(registry?.values() ?? [])].filter((value) => value.operationId === operationId);
-  const intents = options.repoRoot ? findArtifactRecoveryIntentsByOperation(options.repoRoot, operationId) : [];
   const capabilities = store.findByRecoveryOperation(operationId);
   const phaseMap = new Map<string, LifecycleRecoveryOperationQueryV1['phases'][number]>();
   for (const capability of capabilities) {
@@ -358,21 +347,10 @@ export function queryLifecycleRecoveryOperation(
         ? 'consumed' : 'issued'
     });
   }
-  for (const intent of intents) {
-    if (!intent.phase) continue;
-    const key = `${intent.phase}\0${intent.requestId}`;
-    if (phaseMap.has(key)) continue;
-    phaseMap.set(key, {
-      phase: intent.phase,
-      requestId: intent.requestId,
-      attestationId: null,
-      state: intent.state === 'consumed' ? 'consumed' : 'observed'
-    });
-  }
   const capabilityState = capabilities.some((record) => record.recoveryState === 'consumed')
     ? 'consumed'
     : capabilities.some((record) => record.recoveryState === 'reserved') ? 'reserved' : 'unknown';
-  const committed = capabilityState === 'consumed' || intents.some((intent) => intent.state === 'consumed');
+  const committed = capabilityState === 'consumed';
   return {
     version: 1,
     operationId,
@@ -382,133 +360,6 @@ export function queryLifecycleRecoveryOperation(
   };
 }
 
-type LifecycleRecoveryCompensationOptions = Readonly<{
-  repoRoot: string;
-  controllerBinding: TaskControlControllerBinding;
-  capabilityStore?: ReturnType<typeof createCodexCapabilityStore>;
-  buildIdentity?: LifecycleBuildIdentity;
-  now?: () => number;
-}>;
-
-function lifecycleRecoveryCompensationError(code: string, message: string): Error {
-  const error = new Error(`${code}: ${message}`);
-  error.name = code;
-  return error;
-}
-
-function lifecycleRecoveryEventCommitted(
-  selector: LifecycleAuthorityRequestV1,
-  repoRoot: string
-): boolean {
-  const resolved = resolveTaskRef(selector.taskId, { repoRoot });
-  if (!resolved.ok || resolved.taskId !== selector.taskId) return false;
-  let content: string;
-  try { content = fs.readFileSync(resolved.taskMdPath, 'utf8'); }
-  catch { return false; }
-  const section = locateActivityLog(content);
-  if (!section) return false;
-  const labels = { analysis: 'Analyze Task', plan: 'Plan Task', code: 'Code Task' } as const;
-  const prefix = `${labels[selector.family]} (Round ${selector.round}`;
-  return section.entries.some((entry) => {
-    if (entry.step.endsWith(' [started]') || !entry.step.startsWith(prefix)) return false;
-    const delimiter = entry.step[prefix.length];
-    return (delimiter === ',' || delimiter === ')') && entry.note.endsWith(`→ ${selector.artifact}`);
-  });
-}
-
-function lifecycleRecoveryIntentMatches(
-  intent: ArtifactRecoveryIntent,
-  selector: LifecycleAuthorityRequestV1
-): boolean {
-  return intent.taskId === selector.taskId
-    && intent.family === selector.family
-    && intent.artifact === selector.artifact
-    && (intent.state === 'commit-started' || intent.state === 'consumption-started' || intent.state === 'consumed');
-}
-
-/**
- * Completes only the durable tail of a committed task event after a process
- * restart. The task event itself is the commit boundary and is never replayed.
- */
-export function recoverLifecycleRecoveryOperation(
-  input: LifecycleAuthorityRequestV1,
-  options: LifecycleRecoveryCompensationOptions
-): LifecycleRecoveryOperationQueryV1 {
-  const selector = validateLifecycleAuthorityRequest(input);
-  if (selector.phase !== 'task-event.completed') {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_PHASE_UNSUPPORTED', 'only task-event.completed supports durable compensation');
-  }
-  const buildIdentity = options.buildIdentity ?? computeLifecycleBuildIdentity(options.repoRoot);
-  if (selector.expectedBuildIdentityDigest !== lifecycleAuthorityBuildDigest(buildIdentity)) {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_AUTHORITY_BUILD_MISMATCH', 'current lifecycle build does not match the recovery request');
-  }
-  if (selector.expectedControlGeneration !== options.controllerBinding.controlGeneration
-    || selector.expectedControllerInstanceDigest !== options.controllerBinding.instanceDigest) {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_AUTHORITY_CONTROLLER_MISMATCH', 'current controller binding does not match the recovery request');
-  }
-  const store = options.capabilityStore ?? createCodexCapabilityStore();
-  const expected = {
-    taskId: selector.taskId,
-    hookDefinitionHash: selector.expectedHookDefinitionHash,
-    buildIdentity,
-    controller: options.controllerBinding
-  };
-  const capabilities = store.findByRecoveryOperation(selector.operationId);
-  if (capabilities.length !== 1 || capabilities[0]!.capabilityRefDigest !== lifecycleAuthorityDigest(selector.authorityRef)) {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_PROVENANCE_INVALID', 'durable capability provenance does not identify this operation');
-  }
-  const capability = capabilities[0]!;
-  const build = verifyLifecycleBuildIdentity(capability.buildIdentity, buildIdentity);
-  const expiredReserved = capability.status === 'expired' && capability.recoveryState === 'reserved';
-  if (!build.ok
-    || capability.taskId !== selector.taskId
-    || capability.hookDefinitionHash !== selector.expectedHookDefinitionHash
-    || capability.controller?.controlGeneration !== options.controllerBinding.controlGeneration
-    || capability.controller?.instanceDigest !== options.controllerBinding.instanceDigest
-    || capability.recoveryState === 'unreserved'
-    || capability.recoveryOperationId !== selector.operationId
-    || (!['attested', 'consumed'].includes(capability.status) && !expiredReserved)) {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_PROVENANCE_INVALID', 'durable capability provenance does not match the recovery request');
-  }
-  const phase = capability.recoveryPhases.find((entry) => entry.phase === selector.phase);
-  if (!phase) {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_PHASE_MISSING', 'durable task completion phase is missing');
-  }
-  const intents = findArtifactRecoveryIntentsByOperation(options.repoRoot, selector.operationId)
-    .filter((intent) => intent.taskId === selector.taskId
-      && intent.family === selector.family
-      && intent.artifact === selector.artifact);
-  if (intents.length !== 1) {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_INTENT_INVALID', 'durable artifact recovery intent does not identify this task event');
-  }
-  const intent = intents[0]!;
-  if (!lifecycleRecoveryIntentMatches(intent, selector)
-    || intent.phase !== selector.phase
-    || intent.requestId !== selector.lifecycleRequestId
-    || intent.authorityDigest === null) {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_INTENT_INVALID', 'durable artifact recovery intent does not match the recovery request');
-  }
-  if (!lifecycleRecoveryEventCommitted(selector, options.repoRoot)) {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_COMMIT_UNCONFIRMED', 'task completion is not durably present; compensation is not allowed');
-  }
-  if (capability.recoveryState === 'reserved') {
-    if (phase.state === 'issued') {
-      store.consumeRecoveryPhase(selector.authorityRef, selector.operationId, selector.phase, phase.requestId, expected, { allowExpiredReserved: true });
-    }
-    store.consumeReference(selector.authorityRef, selector.operationId, expected, { allowExpiredReserved: true });
-  } else if (phase.state !== 'consumed') {
-    throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_STATE_INVALID', 'consumed capability has an unconsumed completion phase');
-  }
-  if (intent.state !== 'consumed') {
-    writeArtifactRecoveryIntent(options.repoRoot, {
-      ...intent,
-      state: 'consumed',
-      updatedAt: (options.now ?? Date.now)()
-    }, { expected: intent });
-  }
-  return queryLifecycleRecoveryOperation(selector.operationId, { repoRoot: options.repoRoot, capabilityStore: store });
-}
-
 function authorityRejected(request: LifecycleAuthorityRequestV1, code: string, message: string): LifecycleAuthorityResponseV1 {
   return { version: 1, requestId: request.requestId, operationId: request.operationId, phase: request.phase, status: 'rejected', attestation: null, error: { code, message } };
 }
@@ -537,6 +388,7 @@ export type TaskControlExecutionContext =
       generation: string;
       manifestPath: string;
       requestId: string;
+      handoffDirectory: string;
       controllerBinding?: TaskControlControllerBinding | null;
       lifecycleRecoveryAttestation?: LifecycleRecoveryAttestationV1 | null;
     }>;
@@ -575,11 +427,7 @@ export function taskControlOperationKey(operation: TaskControlOperation): string
     : operation.intent;
 }
 
-export type TaskLifecycleControlRequest = TaskLifecycleRequest & Readonly<{
-  overrideTicket?: string;
-  overrideTarget?: string;
-  overrideScope?: string;
-}>;
+export type TaskLifecycleControlRequest = TaskLifecycleRequest;
 
 function invalidContext(message: string): never {
   throw new Error(`TASK_CONTROL_CONTEXT_INVALID: ${message}`);
@@ -625,6 +473,7 @@ export function createSandboxExecutorExecutionContext(params: Readonly<{
   generation: string;
   manifestPath: string;
   requestId: string;
+  handoffDirectory?: string;
   controllerBinding?: TaskControlControllerBinding | null;
   lifecycleRecoveryAttestation?: LifecycleRecoveryAttestationV1 | null;
 }>): TaskControlExecutionContext {
@@ -645,6 +494,7 @@ export function createSandboxExecutorExecutionContext(params: Readonly<{
     generation: params.generation,
     manifestPath: absolute('manifestPath', params.manifestPath),
     requestId: params.requestId,
+    handoffDirectory: absolute('handoffDirectory', params.handoffDirectory ?? path.join(params.worktreeRoot, '.agent-infra-handoff')),
     ...(params.controllerBinding === undefined ? {} : { controllerBinding: binding(params.controllerBinding) }),
     ...(params.lifecycleRecoveryAttestation === undefined ? {} : {
       lifecycleRecoveryAttestation: params.lifecycleRecoveryAttestation === null
@@ -670,6 +520,7 @@ export function assertTaskControlExecutionContext(context: TaskControlExecutionC
   absolute('worktreeRoot', context.worktreeRoot);
   absolute('runtimeDir', context.runtimeDir);
   absolute('manifestPath', context.manifestPath);
+  absolute('handoffDirectory', context.handoffDirectory);
   if (path.resolve(context.runtimeDir) !== path.join(path.dirname(path.resolve(context.manifestPath)), 'runtime')) {
     invalidContext('runtimeDir is not bound to the manifest control root');
   }
@@ -706,12 +557,8 @@ function lifecycleTaskId(request: TaskLifecycleControlRequest, repoRoot: string)
 async function applyLifecycleWithAuthority(
   context: TaskControlExecutionContext,
   request: TaskLifecycleControlRequest
-): Promise<(TaskLifecycleResult | LifecycleRecoveryResult) & { humanOverride?: unknown }> {
-  const conflict = overrideDryRunConflict(request as unknown as Record<string, unknown>);
-  if (conflict) {
-    return taskLifecycleFailure(request, { code: 'LIFECYCLE_PAYLOAD_INVALID', message: conflict.message });
-  }
-  const execute = async (): Promise<(TaskLifecycleResult | LifecycleRecoveryResult) & { humanOverride?: unknown }> => {
+): Promise<TaskLifecycleResult | LifecycleRecoveryResult> {
+  const execute = async (): Promise<TaskLifecycleResult | LifecycleRecoveryResult> => {
     if (request.intent === 'recover-started') {
       const adapter = isAgentClientId(request.agent)
         ? getAgentClientAdapter(request.agent).orchestrationAdapter
@@ -725,27 +572,7 @@ async function applyLifecycleWithAuthority(
       }
       return adapter.recoverStarted(request as LifecycleRecoveryRequest, { repoRoot: context.repoRoot });
     }
-    const lifecycleResult = applyTaskLifecycle(request, { repoRoot: context.repoRoot });
-    if (lifecycleResult.status !== 'failed' || !request.overrideTicket) return lifecycleResult;
-    if (!request.overrideTarget || !request.overrideScope) {
-      return {
-        ...lifecycleResult,
-        error: { code: 'OVERRIDE_PAYLOAD_INVALID', message: 'override ticket requires --override-target and --override-scope' }
-      };
-    }
-    const override = await consumeHumanOverride({
-      taskRef: request.taskRef,
-      ticketId: request.overrideTicket,
-      failureId: failureId('lifecycle.apply', lifecycleResult.error?.code ?? 'LIFECYCLE_FAILED'),
-      target: request.overrideTarget,
-      scope: request.overrideScope,
-      intent: request.intent,
-      ...('alertNumber' in request && request.alertNumber ? { alertNumber: request.alertNumber } : {}),
-      ...('issueNumber' in request && request.issueNumber ? { issueNumber: request.issueNumber } : {}),
-      ...('stagingDir' in request && request.stagingDir ? { stagingDir: request.stagingDir } : {})
-    }, { repoRoot: context.repoRoot });
-    if (override.status === 'failed') return { ...lifecycleResult, humanOverride: override };
-    return { ...lifecycleResult, ...override, humanOverride: override, error: null };
+    return applyTaskLifecycle(request, { repoRoot: context.repoRoot });
   };
   const taskId = lifecycleTaskId(request, context.repoRoot);
   if (!taskId) return await execute();
@@ -840,7 +667,7 @@ function orchestrationFailure(error: unknown): OrchestrationResult {
 export function dispatchTaskControlOperation(
   context: TaskControlExecutionContext,
   operation: Extract<TaskControlOperation, { family: 'task-lifecycle' }>
-): Promise<(TaskLifecycleResult | LifecycleRecoveryResult) & { humanOverride?: unknown }>;
+): Promise<TaskLifecycleResult | LifecycleRecoveryResult>;
 export function dispatchTaskControlOperation(
   context: TaskControlExecutionContext,
   operation: Extract<TaskControlOperation, { family: 'task-finalization' }>
@@ -865,7 +692,9 @@ export function dispatchTaskControlOperation(
     return finalize(operation.request, {
       repoRoot: context.repoRoot,
       ...(context.source === 'sandbox-executor' ? {
-        controlBinding: { generation: context.generation, requestId: context.requestId }
+        controlBinding: { generation: context.generation, requestId: context.requestId },
+        handoffDirectory: context.handoffDirectory,
+        manifestPath: context.manifestPath
       } : {}),
       preflight: (request, options) => verifyTaskEvent(
         { ...request, event: 'complete-task.hard-preflight' }, options
@@ -904,7 +733,7 @@ function operationInvalid(message: string): never {
 
 const LIFECYCLE_FLAGS = new Set([
   '--agent', '--reason', '--unblock-condition', '--note', '--alert-number', '--staging-dir', '--issue-number',
-  '--auto', '--override-ticket', '--override-target', '--override-scope', '--dry-run'
+  '--auto', '--dry-run'
 ]);
 
 const FINALIZATION_FLAGS = new Set(['--agent']);
@@ -979,9 +808,6 @@ export function parseTaskControlOperation(
       ...(value(values, '--unblock-condition') ? { unblockCondition: value(values, '--unblock-condition') } : {}),
       ...(value(values, '--note') ? { note: value(values, '--note') } : {}),
       ...(value(values, '--staging-dir') ? { stagingDir: value(values, '--staging-dir') } : {}),
-      ...(value(values, '--override-ticket') ? { overrideTicket: value(values, '--override-ticket') } : {}),
-      ...(value(values, '--override-target') ? { overrideTarget: value(values, '--override-target') } : {}),
-      ...(value(values, '--override-scope') ? { overrideScope: value(values, '--override-scope') } : {}),
       ...(value(values, '--alert-number') ? { alertNumber: Number(value(values, '--alert-number')) } : {}),
       ...(value(values, '--issue-number') ? { issueNumber: Number(value(values, '--issue-number')) } : {}),
       ...(values['--auto'] === true ? { auto: true } : {}),

package/lib/task/decision-intents.ts

@@ -16,7 +16,6 @@ import { resolveTaskContext } from './resolve-ref.ts';
 import { extractSection, extractSubSection, findSectionHeading } from './sections.ts';
 import { captureTaskWriteMetadata, writeTask } from './write.ts';
 import type { TaskMutation, TaskOperationSummary, TaskWriteOptions } from './write.ts';
-import { allowsManualOverride } from './guard-override.ts';
 import { consumeHumanDecisionReworkIntents, parseReworkIntentDocument, reworkIntentMutation } from './rework-intent.ts';
 
 type HumanDecisionRequest = {
@@ -87,8 +86,7 @@ function applyHumanDecision(request: HumanDecisionRequest, options: TaskWriteOpt
   if (!request.selector || !request.decision.trim()) return failed('DECISION_PAYLOAD_INVALID', 'selector and decision are required');
   const resolved = resolveTaskContext(request.taskRef, { repoRoot: options.repoRoot });
   if (!resolved.ok) return failed(resolved.code, resolved.message, resolved.taskId);
-  const stateOverride = allowsManualOverride(options.manualOverride, 'decision-intent', 'TASK_STATE_MISMATCH');
-  if (resolved.state !== 'active' && !stateOverride) return failed('TASK_STATE_MISMATCH', `task ${resolved.taskId} is ${resolved.state}, expected active`, resolved.taskId);
+  if (resolved.state !== 'active') return failed('TASK_STATE_MISMATCH', `task ${resolved.taskId} is ${resolved.state}, expected active`, resolved.taskId);
   let content: string;
   let rows: LedgerRow[];
   try {
@@ -186,7 +184,7 @@ function applyHumanDecision(request: HumanDecisionRequest, options: TaskWriteOpt
   } catch (error) {
     return failed('DECISION_DOCUMENT_INVALID', error instanceof Error ? error.message : String(error), resolved.taskId, row.id);
   }
-  const writeResult = writeTask({ taskRef: resolved.taskId, expectedState: stateOverride ? resolved.state : 'active', mutations, dryRun: request.dryRun }, {
+  const writeResult = writeTask({ taskRef: resolved.taskId, expectedState: 'active', mutations, dryRun: request.dryRun }, {
     ...options,
     taskLocation: { repoRoot: resolved.repoRoot, taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, state: resolved.state },
     metadataProvider: () => metadata