@fitlab-ai/agent-infra 0.9.15 → 0.11.0

package/dist/lib/task/artifact-repair-intent.js

@@ -1,11 +1,15 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { isDeepStrictEqual } from 'node:util';
-function intentRoot(repoRoot) {
+import { parseArtifactName } from './artifact-name.js';
+export function artifactRecoveryIntentRoot(repoRoot) {
     return path.join(repoRoot, '.agents', 'workspace', '.local-artifact-finalization-intents');
 }
+export function artifactRecoveryRoot(taskDir, stagingId) {
+    return path.join(taskDir, '.local-artifact-recovery', stagingId);
+}
 function intentPath(repoRoot, taskId, family, artifact) {
-    return path.join(intentRoot(repoRoot), `${taskId}-${family}-${artifact}.json`);
+    return path.join(artifactRecoveryIntentRoot(repoRoot), `${taskId}-${family}-${artifact}.json`);
 }
 function validDigest(value) {
     return typeof value === 'string' && /^[a-f0-9]{64}$/u.test(value);
@@ -13,35 +17,82 @@ function validDigest(value) {
 function validTaskId(value) {
     return typeof value === 'string' && /^TASK-\d{8}-\d{6}$/u.test(value);
 }
+function validToken(value) {
+    return typeof value === 'string' && value.length > 0 && !/[\r\n]/u.test(value);
+}
+function validRecoveryId(value) {
+    return typeof value === 'string' && /^[a-f0-9-]{16,64}$/u.test(value);
+}
+function validArtifact(value, family, round) {
+    if (typeof value !== 'string' || path.basename(value) !== value || !value.endsWith('.md'))
+        return false;
+    const parsed = parseArtifactName(value);
+    return Boolean(parsed && parsed.family === family && parsed.round === round);
+}
 function exactKeys(value, keys) {
     return Object.keys(value).sort().join(',') === [...keys].sort().join(',');
 }
-export function isArtifactRepairIntent(value) {
+export function isArtifactRecoveryIntent(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
         return false;
     const intent = value;
     return exactKeys(intent, [
-        'artifact', 'artifactSha256', 'authorityDigest', 'baselineSemanticDigest', 'createdAt',
-        'family', 'phase', 'recoveryOperationId', 'requestId', 'semanticDigest', 'state',
-        'taskId', 'updatedAt', 'version'
+        'activeGenerationSemanticDigest', 'activeGenerationSha256', 'artifact', 'authorityDigest', 'baselineSemanticDigest', 'baselineSha256', 'candidateSha256',
+        'createdAt', 'errorCode', 'errorMessage', 'family', 'finalArtifactSha256', 'finalSemanticDigest',
+        'pendingGenerationSemanticDigest', 'pendingGenerationSha256', 'phase', 'preflightArtifactSha256', 'preflightSemanticDigest', 'recoveryOperationId', 'requestId', 'round', 'stagingId', 'state', 'taskId', 'updatedAt',
+        'version'
     ])
-        && intent.version === 2
+        && intent.version === 4
         && validTaskId(intent.taskId)
         && typeof intent.family === 'string'
         && ['analysis', 'review-analysis', 'plan', 'review-plan', 'code', 'review-code'].includes(intent.family)
-        && typeof intent.artifact === 'string' && intent.artifact.length > 0
-        && ['awaiting-repair', 'finalize-ready', 'commit-started', 'passed', 'consumed'].includes(String(intent.state))
-        && (intent.baselineSemanticDigest === null || validDigest(intent.baselineSemanticDigest))
-        && validDigest(intent.artifactSha256)
-        && validDigest(intent.semanticDigest)
-        && (intent.recoveryOperationId === null || (typeof intent.recoveryOperationId === 'string' && /^[a-f0-9-]{16,64}$/u.test(intent.recoveryOperationId)))
+        && Number.isSafeInteger(intent.round) && intent.round > 0
+        && validArtifact(intent.artifact, intent.family, intent.round)
+        && ['awaiting-preflight-recovery', 'preflight-ready', 'preflight-commit-started', 'preflight-passed', 'full-finalizer-ready', 'commit-started', 'passed', 'consumption-started', 'consumed', 'aborted'].includes(String(intent.state))
+        && validDigest(intent.baselineSha256)
+        && validDigest(intent.baselineSemanticDigest)
+        && validRecoveryId(intent.stagingId)
+        && (intent.candidateSha256 === null || validDigest(intent.candidateSha256))
+        && (intent.preflightArtifactSha256 === null || validDigest(intent.preflightArtifactSha256))
+        && (intent.preflightSemanticDigest === null || validDigest(intent.preflightSemanticDigest))
+        && (intent.activeGenerationSha256 === null || validDigest(intent.activeGenerationSha256))
+        && (intent.activeGenerationSemanticDigest === null || validDigest(intent.activeGenerationSemanticDigest))
+        && (intent.pendingGenerationSha256 === null || validDigest(intent.pendingGenerationSha256))
+        && (intent.pendingGenerationSemanticDigest === null || validDigest(intent.pendingGenerationSemanticDigest))
+        && (intent.finalArtifactSha256 === null || validDigest(intent.finalArtifactSha256))
+        && (intent.finalSemanticDigest === null || validDigest(intent.finalSemanticDigest))
+        && validRecoveryId(intent.recoveryOperationId)
+        && intent.stagingId === intent.recoveryOperationId
         && (intent.phase === null || ['orchestration.prepare', 'artifact.finalize-local', 'task-event.completed'].includes(String(intent.phase)))
         && (intent.authorityDigest === null || validDigest(intent.authorityDigest))
-        && typeof intent.requestId === 'string' && intent.requestId.length > 0 && !/[\r\n]/u.test(intent.requestId)
-        && Number.isSafeInteger(intent.createdAt) && Number.isSafeInteger(intent.updatedAt)
-        && (intent.state === 'awaiting-repair' ? intent.baselineSemanticDigest === intent.semanticDigest : true);
+        && validToken(intent.requestId)
+        && (intent.errorCode === null || validToken(intent.errorCode))
+        && (intent.errorMessage === null || validToken(intent.errorMessage))
+        && Number.isSafeInteger(intent.createdAt)
+        && Number.isSafeInteger(intent.updatedAt)
+        && (intent.state === 'awaiting-preflight-recovery'
+            ? intent.preflightArtifactSha256 === null && intent.preflightSemanticDigest === null
+                && intent.activeGenerationSha256 === null && intent.activeGenerationSemanticDigest === null
+                && intent.pendingGenerationSha256 === null && intent.pendingGenerationSemanticDigest === null
+                && intent.finalArtifactSha256 === null && intent.finalSemanticDigest === null
+            : true)
+        && (intent.state === 'preflight-ready' || intent.state === 'preflight-commit-started' || intent.state === 'preflight-passed' || intent.state === 'full-finalizer-ready' || intent.state === 'commit-started' || intent.state === 'passed' || intent.state === 'consumed'
+            ? validDigest(intent.candidateSha256) && validDigest(intent.preflightArtifactSha256) && validDigest(intent.preflightSemanticDigest)
+                && validDigest(intent.activeGenerationSha256) && validDigest(intent.activeGenerationSemanticDigest)
+            : true)
+        && (intent.state === 'full-finalizer-ready' || intent.state === 'commit-started'
+            ? validDigest(intent.pendingGenerationSha256) && validDigest(intent.pendingGenerationSemanticDigest)
+                && validDigest(intent.finalArtifactSha256) && validDigest(intent.finalSemanticDigest)
+            : true)
+        && (intent.state === 'passed' || intent.state === 'consumption-started' || intent.state === 'consumed'
+            ? validDigest(intent.finalArtifactSha256) && validDigest(intent.finalSemanticDigest)
+            : true)
+        && (intent.state === 'aborted' ? intent.errorCode !== null && intent.errorMessage !== null : true);
 }
-function readArtifactRepairIntent(repoRoot, taskId, family, artifact) {
+export function readArtifactRecoveryIntent(repoRoot, taskId, family, artifact) {
+    if (!validTaskId(taskId) || !validArtifact(artifact, family, parseArtifactName(artifact)?.round)) {
+        throw new Error('ARTIFACT_RECOVERY_INTENT_INVALID: recovery journal identity is invalid');
+    }
     const target = intentPath(repoRoot, taskId, family, artifact);
     if (!fs.existsSync(target))
         return null;
@@ -50,19 +101,20 @@ function readArtifactRepairIntent(repoRoot, taskId, family, artifact) {
         value = JSON.parse(fs.readFileSync(target, 'utf8'));
     }
     catch (error) {
-        throw new Error(`ARTIFACT_REPAIR_INTENT_INVALID: ${String(error)}`);
+        throw new Error(`ARTIFACT_RECOVERY_INTENT_INVALID: ${String(error)}`);
     }
-    if (!isArtifactRepairIntent(value) || value.taskId !== taskId || value.family !== family || value.artifact !== artifact) {
-        throw new Error('ARTIFACT_REPAIR_INTENT_INVALID: repair provenance schema is invalid');
+    if (!isArtifactRecoveryIntent(value) || value.taskId !== taskId || value.family !== family || value.artifact !== artifact) {
+        throw new Error('ARTIFACT_RECOVERY_INTENT_INVALID: recovery journal schema is invalid');
     }
     return value;
 }
-export function writeArtifactRepairIntent(repoRoot, value, options = {}) {
-    if (!isArtifactRepairIntent(value))
-        throw new Error('ARTIFACT_REPAIR_INTENT_INVALID: repair provenance schema is invalid');
-    const directory = intentRoot(repoRoot);
+export function writeArtifactRecoveryIntent(repoRoot, value, options = {}) {
+    if (!isArtifactRecoveryIntent(value))
+        throw new Error('ARTIFACT_RECOVERY_INTENT_INVALID: recovery journal schema is invalid');
+    const intent = value;
+    const directory = artifactRecoveryIntentRoot(repoRoot);
     fs.mkdirSync(directory, { recursive: true, mode: 0o700 });
-    const target = intentPath(repoRoot, value.taskId, value.family, value.artifact);
+    const target = intentPath(repoRoot, intent.taskId, intent.family, intent.artifact);
     const lock = `${target}.lock`;
     let descriptor;
     try {
@@ -70,19 +122,19 @@ export function writeArtifactRepairIntent(repoRoot, value, options = {}) {
     }
     catch (error) {
         if (error.code === 'EEXIST') {
-            throw new Error('ARTIFACT_REPAIR_INTENT_CONFLICT: another provenance writer owns the intent');
+            throw new Error('ARTIFACT_RECOVERY_INTENT_CONFLICT: another journal writer owns the intent');
         }
         throw error;
     }
     try {
         const current = fs.existsSync(target)
-            ? readArtifactRepairIntent(repoRoot, value.taskId, value.family, value.artifact)
+            ? readArtifactRecoveryIntent(repoRoot, intent.taskId, intent.family, intent.artifact)
             : null;
         if (!isDeepStrictEqual(current, options.expected ?? null)) {
-            throw new Error('ARTIFACT_REPAIR_INTENT_CONFLICT: repair provenance changed during finalization');
+            throw new Error('ARTIFACT_RECOVERY_INTENT_CONFLICT: recovery journal changed during finalization');
         }
         const temporary = `${target}.${process.pid}.${Date.now()}.tmp`;
-        fs.writeFileSync(temporary, `${JSON.stringify(value)}\n`, { encoding: 'utf8', mode: 0o600, flag: 'wx' });
+        fs.writeFileSync(temporary, `${JSON.stringify(intent)}\n`, { encoding: 'utf8', mode: 0o600, flag: 'wx' });
         try {
             fs.renameSync(temporary, target);
         }
@@ -90,7 +142,7 @@ export function writeArtifactRepairIntent(repoRoot, value, options = {}) {
             try {
                 fs.unlinkSync(temporary);
             }
-            catch { /* preserve primary error */ }
+            catch { /* preserve the primary error */ }
             throw error;
         }
     }
@@ -102,11 +154,10 @@ export function writeArtifactRepairIntent(repoRoot, value, options = {}) {
         catch { /* preserve the primary result */ }
     }
 }
-export function findArtifactRepairIntentsByOperation(repoRoot, operationId) {
-    if (!operationId || /[\r\n]/u.test(operationId)) {
-        throw new Error('ARTIFACT_REPAIR_OPERATION_INVALID: recovery operation id is invalid');
-    }
-    const directory = intentRoot(repoRoot);
+export function findArtifactRecoveryIntentsByOperation(repoRoot, operationId) {
+    if (!validToken(operationId))
+        throw new Error('ARTIFACT_RECOVERY_OPERATION_INVALID: recovery operation id is invalid');
+    const directory = artifactRecoveryIntentRoot(repoRoot);
     if (!fs.existsSync(directory))
         return Object.freeze([]);
     return Object.freeze(fs.readdirSync(directory)
@@ -118,13 +169,13 @@ export function findArtifactRepairIntentsByOperation(repoRoot, operationId) {
             value = JSON.parse(fs.readFileSync(target, 'utf8'));
         }
         catch (error) {
-            throw new Error(`ARTIFACT_REPAIR_INTENT_INVALID: ${String(error)}`);
+            throw new Error(`ARTIFACT_RECOVERY_INTENT_INVALID: ${String(error)}`);
         }
-        if (!isArtifactRepairIntent(value))
-            throw new Error('ARTIFACT_REPAIR_INTENT_INVALID: repair provenance schema is invalid');
+        if (!isArtifactRecoveryIntent(value))
+            throw new Error('ARTIFACT_RECOVERY_INTENT_INVALID: recovery journal schema is invalid');
         return value;
     })
         .filter((value) => value.recoveryOperationId === operationId));
 }
-export { readArtifactRepairIntent };
+export { intentPath as artifactRecoveryIntentPath };
 //# sourceMappingURL=artifact-repair-intent.js.map

package/dist/lib/task/commit-operation.js

@@ -181,6 +181,16 @@ function checkpointIdentity(input, task, delivery) {
 function checkpointTimestamp() {
     return new Date().toISOString();
 }
+function samePreparedCheckpointIdentity(pending, identity) {
+    return pending.state === 'prepared'
+        && pending.taskId === identity.taskId
+        && pending.branch === identity.branch
+        && pending.mode === identity.mode
+        && pending.expectedHead === identity.expectedHead
+        && pending.message === identity.message
+        && pending.round === identity.round
+        && JSON.stringify(pending.paths) === JSON.stringify(identity.paths);
+}
 function executeUnlocked(input, task, mode) {
     const inspected = inspectGitWorkflow(input.cwd);
     if (!inspected.snapshot)
@@ -214,11 +224,28 @@ function executeUnlocked(input, task, mode) {
                     error: { code: 'COMMIT_INTENT_INVALID', message: error instanceof Error ? error.message : String(error) }
                 };
             }
-            if (pendingIntent && !sameCheckpointIntent(pendingIntent, identity))
-                return {
-                    status: 'failed', changed: false, snapshot: inspected.snapshot, operations: [],
-                    error: { code: 'COMMIT_INTENT_CONFLICT', message: 'A different checkpoint intent is still pending for this task' }
+            if (pendingIntent && !sameCheckpointIntent(pendingIntent, identity)) {
+                if (!input.recoverPreparedIntent || !samePreparedCheckpointIdentity(pendingIntent, identity))
+                    return {
+                        status: 'failed', changed: false, snapshot: inspected.snapshot, operations: [],
+                        error: { code: 'COMMIT_INTENT_CONFLICT', message: 'A different checkpoint intent is still pending for this task' }
+                    };
+                pendingIntent = {
+                    ...pendingIntent,
+                    expectedTree: identity.expectedTree,
+                    digest: checkpointIntentDigest(identity),
+                    updatedAt: checkpointTimestamp()
                 };
+                try {
+                    writeCheckpointIntent(task.repoRoot, pendingIntent);
+                }
+                catch (error) {
+                    return {
+                        status: 'failed', changed: false, snapshot: inspected.snapshot, operations: [],
+                        error: { code: 'COMMIT_INTENT_WRITE_FAILED', message: error instanceof Error ? error.message : String(error) }
+                    };
+                }
+            }
             if (!pendingIntent) {
                 const timestamp = checkpointTimestamp();
                 pendingIntent = {

package/dist/lib/task/control-authority.js

@@ -8,12 +8,13 @@ import { activateMatchingOrchestrationDelegation, activateOrchestrationDelegatio
 import { prepareCodexOrchestrationDelegation } from './codex-orchestration.js';
 import { applyTaskFinalization } from './finalization.js';
 import { applyTaskLifecycle, taskLifecycleFailure } from './lifecycle.js';
+import { recoverStartedLifecycleUnderLock, recoveryFailure } from './lifecycle-recovery.js';
 import { locateActivityLog } from './activity-log.js';
 import { resolveTaskRef, TASK_ID_RE } from './resolve-ref.js';
 import { TaskExecutionLockError, withTaskExecutionLock } from './task-execution-lock.js';
 import { verifyTaskEvent } from './verification.js';
 import { createCodexCapabilityStore } from '../agent-clients/adapters/codex-lifecycle/capability-store.js';
-import { findArtifactRepairIntentsByOperation, writeArtifactRepairIntent } from './artifact-repair-intent.js';
+import { findArtifactRecoveryIntentsByOperation, writeArtifactRecoveryIntent } from './artifact-repair-intent.js';
 import { computeLifecycleBuildIdentity, verifyLifecycleBuildIdentity } from '../agent-clients/adapters/codex-lifecycle/build-identity.js';
 const lifecycleAuthorityPhases = [
     'orchestration.prepare', 'artifact.finalize-local', 'task-event.completed'
@@ -184,7 +185,7 @@ export function queryLifecycleRecoveryOperation(operationId, options = {}) {
     const store = options.capabilityStore ?? createCodexCapabilityStore();
     const registry = authorityOperationMap.get(store);
     const known = [...(registry?.values() ?? [])].filter((value) => value.operationId === operationId);
-    const intents = options.repoRoot ? findArtifactRepairIntentsByOperation(options.repoRoot, operationId) : [];
+    const intents = options.repoRoot ? findArtifactRecoveryIntentsByOperation(options.repoRoot, operationId) : [];
     const capabilities = store.findByRecoveryOperation(operationId);
     const phaseMap = new Map();
     for (const capability of capabilities) {
@@ -265,7 +266,7 @@ function lifecycleRecoveryIntentMatches(intent, selector) {
     return intent.taskId === selector.taskId
         && intent.family === selector.family
         && intent.artifact === selector.artifact
-        && (intent.state === 'commit-started' || intent.state === 'consumed');
+        && (intent.state === 'commit-started' || intent.state === 'consumption-started' || intent.state === 'consumed');
 }
 /**
  * Completes only the durable tail of a committed task event after a process
@@ -312,19 +313,19 @@ export function recoverLifecycleRecoveryOperation(input, options) {
     if (!phase) {
         throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_PHASE_MISSING', 'durable task completion phase is missing');
     }
-    const intents = findArtifactRepairIntentsByOperation(options.repoRoot, selector.operationId)
+    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 repair intent does not identify this task event');
+        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 repair intent does not match the recovery request');
+        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');
@@ -339,7 +340,7 @@ export function recoverLifecycleRecoveryOperation(input, options) {
         throw lifecycleRecoveryCompensationError('LIFECYCLE_RECOVERY_STATE_INVALID', 'consumed capability has an unconsumed completion phase');
     }
     if (intent.state !== 'consumed') {
-        writeArtifactRepairIntent(options.repoRoot, {
+        writeArtifactRecoveryIntent(options.repoRoot, {
             ...intent,
             state: 'consumed',
             updatedAt: (options.now ?? Date.now)()
@@ -473,6 +474,9 @@ async function applyLifecycleWithAuthority(context, request) {
         return taskLifecycleFailure(request, { code: 'LIFECYCLE_PAYLOAD_INVALID', message: conflict.message });
     }
     const execute = async () => {
+        if (request.intent === 'recover-started') {
+            return recoverStartedLifecycleUnderLock(request, { repoRoot: context.repoRoot });
+        }
         const lifecycleResult = applyTaskLifecycle(request, { repoRoot: context.repoRoot });
         if (lifecycleResult.status !== 'failed' || !request.overrideTicket)
             return lifecycleResult;
@@ -506,6 +510,9 @@ async function applyLifecycleWithAuthority(context, request) {
     catch (error) {
         if (!(error instanceof TaskExecutionLockError))
             throw error;
+        if (request.intent === 'recover-started') {
+            return recoveryFailure(request, 'owner-unknown', error.code, error.message);
+        }
         return taskLifecycleFailure(request, { code: error.code, message: error.message }, taskId);
     }
 }
@@ -616,7 +623,7 @@ function operationInvalid(message) {
 }
 const LIFECYCLE_FLAGS = new Set([
     '--agent', '--reason', '--unblock-condition', '--note', '--alert-number', '--staging-dir', '--issue-number',
-    '--override-ticket', '--override-target', '--override-scope', '--dry-run'
+    '--stage', '--round', '--artifact', '--override-ticket', '--override-target', '--override-scope', '--dry-run'
 ]);
 const FINALIZATION_FLAGS = new Set(['--agent']);
 const ORCHESTRATION_FLAGS = new Set([
@@ -692,8 +699,32 @@ export function parseTaskControlOperation(family, args) {
             ...(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')) } : {}),
+            ...(value(values, '--stage') ? { stage: value(values, '--stage') } : {}),
+            ...(value(values, '--round') ? { round: Number(value(values, '--round')) } : {}),
+            ...(value(values, '--artifact') ? { artifact: value(values, '--artifact') } : {}),
             ...(values['--dry-run'] === true ? { dryRun: true } : {})
         };
+        if (intent === 'recover-started') {
+            const recoveryFlags = new Set(['--agent', '--stage', '--round', '--artifact', '--reason']);
+            for (const flag of Object.keys(values)) {
+                if (!recoveryFlags.has(flag))
+                    operationInvalid(`option '${flag}' is not supported for recover-started`);
+            }
+            required(values, ['--stage', '--round', '--artifact', '--reason']);
+            const stage = value(values, '--stage');
+            if (!['analysis', 'review-analysis', 'plan', 'review-plan', 'code', 'review-code'].includes(stage ?? '')) {
+                operationInvalid('--stage must be a supported lifecycle stage');
+            }
+            const round = Number(value(values, '--round'));
+            if (!Number.isSafeInteger(round) || round < 1)
+                operationInvalid('--round must be a positive integer');
+            if (value(values, '--reason').includes('\n') || value(values, '--reason').includes('\r')) {
+                operationInvalid('--reason must be a single line');
+            }
+        }
+        else if (values['--stage'] !== undefined || values['--round'] !== undefined || values['--artifact'] !== undefined) {
+            operationInvalid('--stage, --round, and --artifact are only supported for recover-started');
+        }
         return { family, request: input };
     }
     const values = parseValues(args, 2, ORCHESTRATION_FLAGS);

package/dist/lib/task/control-recovery.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import { isCompletionEvidence } from './orchestration.js';
 import { TASK_WORKFLOW_OPERATIONS } from './workflow-command.js';
+import { sameRecoveryWarning } from './recovery-warning.js';
 /** Normalize the command result once at the control transport boundary. */
 export function parseControlOutput(output) {
     if (output === null)
@@ -18,7 +19,7 @@ export function parseControlOutput(output) {
 export const SANDBOX_CONTROL_REQUIRED_COMPLETION_PHASES = Object.freeze([
     'completed', 'evidence-written', 'publish-authorized'
 ]);
-const LIFECYCLE_INTENTS = ['block', 'activate', 'cancel', 'complete', 'close-codescan', 'close-dependabot', 'restore'];
+const LIFECYCLE_INTENTS = ['block', 'activate', 'cancel', 'complete', 'close-codescan', 'close-dependabot', 'restore', 'recover-started'];
 const ORCHESTRATION_INTENTS = [
     'begin-or-resume', 'route.read', 'route.clean-completion', 'status', 'prepare', 'dispatch',
     'await-activation', 'recover-prepared', 'hook-start', 'hook-stop', 'advance', 'pause'
@@ -65,6 +66,15 @@ function domainEvidenceMatches(operation, result, domain) {
             && snapshot.worktreeTree === completion.worktreeTree
             && lastReviewedCommit === completion.lastReviewedCommit;
     }
+    if (operation.family === 'task-lifecycle' && operation.intent === 'recover-started') {
+        const retryRequired = domain.recoveryState === 'retry-required'
+            && sameRecoveryWarning(domain.warning, result.warning);
+        return result.targetState === 'active'
+            && ['applied', 'no-op'].includes(String(result.status))
+            && domain.recovery === true
+            && domain.targetState === 'active'
+            && (domain.recoveryState === 'released' || retryRequired);
+    }
     if (operation.class === 'read-only')
         return result.changed === false && domain.snapshotValid === true;
     return true;
@@ -119,7 +129,9 @@ export function classifySandboxControlRecovery(input) {
         responseReconstructable: true,
         reasonCode: input.operation.class === 'route.clean-completion' && result.changed === false
             ? 'RECOVERY_ROUTE_COMPLETION_NOOP'
-            : 'RECOVERY_TERMINAL_AND_DOMAIN_MATCH'
+            : input.operation.intent === 'recover-started' && input.domain?.recoveryState === 'retry-required'
+                ? 'RECOVERY_RELEASE_RETRY_REQUIRED'
+                : 'RECOVERY_TERMINAL_AND_DOMAIN_MATCH'
     };
 }
 export function operationRecoveryBinding(requestId, generation, taskId, family, intent) {

package/dist/lib/task/create-service.js

@@ -1,5 +1,3 @@
-import fs from 'node:fs';
-import path from 'node:path';
 import { syncPlatformComment } from '../platform/issue-comments.js';
 import { createPlatformIssue, syncPlatformIssue } from '../platform/issues.js';
 import { VERSION } from '../version.js';
@@ -139,11 +137,6 @@ function platformOperations(prefix, operations) {
         reasonCode: operation.reasonCode ?? null
     }));
 }
-function issueFromTask(repoRoot, taskId) {
-    const content = fs.readFileSync(path.join(repoRoot, '.agents', 'workspace', 'active', taskId, 'task.md'), 'utf8');
-    const match = /^issue_number:\s*(\d+)\s*$/m.exec(content);
-    return match ? { number: Number(match[1]), url: '' } : null;
-}
 async function createTask(value, options) {
     const dependencies = { ...DEFAULT_DEPENDENCIES, ...options.dependencies };
     let candidate;
@@ -163,7 +156,7 @@ async function createTask(value, options) {
     const operations = [{
             name: 'task:local', status: local.status, reasonCode: null
         }];
-    let issue = issueFromTask(options.repoRoot, local.task.id);
+    let issue = null;
     const created = await dependencies.createIssue(local.task.id, { cwd: options.repoRoot, agent: candidate.agent });
     operations.push(...platformOperations('platform-create', created.operations));
     if (created.issue)

package/dist/lib/task/delegation-receipts.js

@@ -92,7 +92,8 @@ function hasCurrentCodexEvidence(receipt) {
     const provenance = receipt.lifecycleProvenance;
     if (!provenance)
         return false;
-    const activated = ['activated', 'stage-completed', 'sealed', 'consumed'].includes(receipt.status);
+    const activated = ['activated', 'stage-completed', 'sealed', 'consumed'].includes(receipt.status)
+        || (receipt.status === 'aborted' && receipt.activatedAt !== null);
     if (!activated)
         return receipt.hostEvidence === null;
     const host = receipt.hostEvidence;
@@ -124,6 +125,12 @@ function hasCurrentCodexEvidence(receipt) {
             && host.consumer === receipt.id
             && exactText(host.consumedAt);
     }
+    if (receipt.status === 'aborted') {
+        return Number.isSafeInteger(host.stopRevision)
+            && host.stopRevision > host.startRevision
+            && host.consumer === `lifecycle-recovery:${receipt.taskId}:${receipt.id}`
+            && exactText(host.consumedAt);
+    }
     return host.stopRevision === null && host.consumer === null && host.consumedAt === null;
 }
 const RECEIPT_KEYS = [
@@ -147,7 +154,8 @@ function hasStatusBoundEvidence(receipt) {
     const dispatchComplete = dispatchFields.every((field) => field !== null);
     if (!dispatchEmpty && !dispatchComplete)
         return false;
-    const beforeActivation = ['prepared', 'aborted', 'expired'].includes(receipt.status);
+    const beforeActivation = ['prepared', 'expired'].includes(receipt.status)
+        || (receipt.status === 'aborted' && receipt.activatedAt === null);
     if (beforeActivation) {
         return receipt.parentId === null
             && receipt.childId === null
@@ -181,6 +189,20 @@ function hasStatusBoundEvidence(receipt) {
             && receipt.sealedAt === null
             && receipt.consumedAt === null;
     }
+    if (receipt.status === 'aborted') {
+        const host = receipt.hostEvidence;
+        return receipt.agent === null
+            && receipt.afterFingerprint === null
+            && receipt.changedPaths.length === 0
+            && receipt.sealedAt === null
+            && receipt.consumedAt === null
+            && host !== null
+            && host !== undefined
+            && Number.isSafeInteger(host.stopRevision)
+            && host.stopRevision > host.startRevision
+            && host.consumer === `lifecycle-recovery:${receipt.taskId}:${receipt.id}`
+            && exactText(host.consumedAt);
+    }
     if (!exactText(receipt.agent)
         || normalizeAgentToken(receipt.agent) !== normalizeAgentToken(receipt.client))
         return false;
@@ -429,6 +451,45 @@ function abortPreparedDelegation(receipt) {
         receipt: Object.freeze({ ...receipt, status: 'aborted' })
     };
 }
+function abortActivatedDelegation(receipt, event) {
+    if (receipt.status !== 'activated') {
+        return fail('DELEGATION_STATE_INVALID', `delegation ${receipt.id} is ${receipt.status}, expected activated`);
+    }
+    if (receipt.client !== 'codex'
+        || !receipt.lifecycleProvenance
+        || receipt.hostEvidence?.kind !== 'codex-lifecycle-v2'
+        || typeof receipt.lifecycleProvenance.controllerInstanceDigest !== 'string'
+        || typeof receipt.lifecycleProvenance.controlGeneration !== 'string'
+        || typeof receipt.hostEvidence.controllerInstanceDigest !== 'string'
+        || typeof receipt.hostEvidence.controlGeneration !== 'string') {
+        return fail('DELEGATION_RECOVERY_EVIDENCE_INVALID', 'activated delegation lacks the current Codex controller binding');
+    }
+    if (event.childId !== receipt.childId
+        || !Number.isSafeInteger(event.stopRevision)
+        || event.stopRevision <= receipt.hostEvidence.startRevision
+        || event.consumer !== `lifecycle-recovery:${receipt.taskId}:${receipt.id}`
+        || !exactText(event.consumedAt)) {
+        return fail('DELEGATION_RECOVERY_EVIDENCE_INVALID', 'recovery stop evidence does not match the activated delegation');
+    }
+    return {
+        ok: true,
+        receipt: Object.freeze({
+            ...receipt,
+            status: 'aborted',
+            agent: null,
+            afterFingerprint: null,
+            changedPaths: Object.freeze([]),
+            sealedAt: null,
+            consumedAt: null,
+            hostEvidence: Object.freeze({
+                ...receipt.hostEvidence,
+                stopRevision: event.stopRevision,
+                consumer: event.consumer,
+                consumedAt: event.consumedAt
+            })
+        })
+    };
+}
 function completeDelegationStage(receipt, event) {
     if (receipt.status !== 'activated')
         return fail('DELEGATION_STATE_INVALID', `delegation ${receipt.id} is ${receipt.status}, expected activated`);
@@ -494,5 +555,5 @@ function consumeDelegation(receipt, options = {}) {
             consumedAt: (options.now ?? (() => new Date().toISOString()))()
         }) };
 }
-export { activateDelegation, abortPreparedDelegation, completeDelegationStage, consumeDelegation, dispatchDelegation, foldBlankToNull, isDelegationReceipt, managedDelegationRole, prepareDelegation, sealDelegation };
+export { activateDelegation, abortActivatedDelegation, abortPreparedDelegation, completeDelegationStage, consumeDelegation, dispatchDelegation, foldBlankToNull, isDelegationReceipt, managedDelegationRole, prepareDelegation, sealDelegation };
 //# sourceMappingURL=delegation-receipts.js.map