@fitlab-ai/agent-infra 0.11.2 → 0.11.4

package/dist/lib/task/capabilities.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { parseArtifactName } from './artifact-name.js';
 import { invalidationBlocks, isArtifactInvalidated, parseInvalidationDocument } from './invalidation.js';
-import { receiptForOutput } from './artifact-receipts.js';
+import { parseArtifactReceipts, receiptForOutput } from './artifact-receipts.js';
 import { parseTypedTaskFrontmatter } from './frontmatter.js';
 import { parseLedgerDocument, summarizeLedgerStage, validateLedgerRows } from './ledger.js';
 import { parseReviewSummary, resolveCanonicalVerdict } from './review-artifacts.js';
@@ -10,6 +10,8 @@ import { parseReworkIntentDocument } from './rework-intent.js';
 import { sha256File } from './artifact-receipts.js';
 import { hasOpenLifecycleExecution } from './activity-log.js';
 import { parseQualificationAudit, parseTaskQualification } from './qualification-audit.js';
+import { parseLifecyclePathDecision, pathIncludes } from './lifecycle-path.js';
+import { parseImplementationInputs } from './implementation-inputs.js';
 const ARTIFACT_AUDIT_FAMILIES = new Set(['analysis', 'review-analysis', 'plan', 'review-plan', 'code', 'review-code']);
 const REASONS = new Set([
     'user-request', 'new-requirement', 'upstream-fact-doubt', 'review-finding', 'retry', 'validation-rerun'
@@ -23,6 +25,11 @@ function allow(...evidence) {
 function hasArtifact(facts, action) {
     return (facts.artifacts[action]?.length ?? 0) > 0;
 }
+function effectiveReworkTarget(target, pathState) {
+    if (target === 'plan' && pathState?.status === 'valid' && !pathIncludes(pathState, 'plan'))
+        return 'analysis';
+    return target;
+}
 function canStart(action, facts, trigger) {
     if (!trigger || trigger.requestedAction !== action)
         return deny('TRIGGER_ACTION_MISMATCH', `requested=${trigger?.requestedAction ?? 'missing'}`);
@@ -45,11 +52,30 @@ function canStart(action, facts, trigger) {
         return deny('TASK_NOT_ACTIVE', `state=${facts.taskState}`);
     if (invalidationBlocks(facts.invalidation))
         return deny('INVALIDATION_INCOMPLETE');
-    if (facts.qualificationStale && facts.recommendedAction !== action) {
-        return deny('QUALIFICATION_STALE', ...(facts.qualificationStaleArtifacts ?? ['qualification audit is stale']));
-    }
     if (facts.executionBusy)
         return deny('EXECUTION_BUSY');
+    const pendingIntent = (facts.reworkIntents ?? []).find((intent) => intent.status === 'pending');
+    if (pendingIntent) {
+        const target = effectiveReworkTarget(pendingIntent.target, facts.pathState);
+        const requirementRestart = action === 'analysis' && trigger.reasonCode === 'new-requirement';
+        if (!requirementRestart && (target === 'pause' || target !== action)) {
+            return deny(target === 'pause' ? 'REWORK_PAUSED' : 'REWORK_INTENT_TARGET_MISMATCH', pendingIntent.intentId);
+        }
+    }
+    if (facts.pathState && facts.pathState.status !== 'valid') {
+        return action === 'analysis'
+            ? allow(`lifecycle-path-${facts.pathState.status}`)
+            : deny('LIFECYCLE_PATH_INVALID', facts.pathState.message);
+    }
+    if (facts.pathState?.status === 'valid'
+        && ['analysis', 'review-analysis', 'plan', 'review-plan', 'code', 'review-code'].includes(action)
+        && !pathIncludes(facts.pathState, action)) {
+        return deny('ARTIFACT_STAGE_NOT_SELECTED', `path=${facts.pathState.decision.path}`, `stage=${action}`);
+    }
+    if (facts.reworkClassificationRequired?.includes(action)
+        && !(facts.reworkIntents ?? []).some((intent) => intent.status === 'pending')) {
+        return deny('REWORK_CLASSIFICATION_REQUIRED', `stage=${action}`);
+    }
     const implicit = trigger.explicitRequest === false;
     if (action === 'analysis') {
         if (!implicit || hasArtifact(facts, 'analysis') || facts.recommendedAction === 'analysis')
@@ -60,6 +86,9 @@ function canStart(action, facts, trigger) {
         return hasArtifact(facts, 'analysis') ? allow('analysis-artifact') : deny('ANALYSIS_ARTIFACT_REQUIRED');
     }
     if (action === 'plan') {
+        if (facts.pathState?.status === 'valid' && facts.pathState.decision.path === 'standard') {
+            return hasArtifact(facts, 'analysis') ? allow('analysis-artifact') : deny('ANALYSIS_ARTIFACT_REQUIRED');
+        }
         if (!hasArtifact(facts, 'review-analysis'))
             return deny('ANALYSIS_REVIEW_REQUIRED');
         if (!reviewMatchesLatest(facts, 'analysis', 'review-analysis'))
@@ -75,6 +104,8 @@ function canStart(action, facts, trigger) {
     }
     if (action === 'code') {
         if (trigger.implementationInput) {
+            if (facts.resolvedHumanDecisions?.code === 'implementation')
+                return allow('human-decision-implementation-input');
             if (!hasArtifact(facts, 'review-code'))
                 return deny('CODE_REVIEW_REQUIRED');
             if (!reviewMatchesLatest(facts, 'code', 'review-code'))
@@ -83,6 +114,20 @@ function canStart(action, facts, trigger) {
                 return deny('CODE_REVIEW_NOT_APPROVED');
             return allow('implementation-input');
         }
+        if (facts.pathState?.status === 'valid' && facts.pathState.decision.path === 'streamlined') {
+            if (!hasArtifact(facts, 'analysis'))
+                return deny('ANALYSIS_ARTIFACT_REQUIRED');
+            if (facts.unresolvedLedger.analysis > 0)
+                return deny('ANALYSIS_LEDGER_BLOCKED', `unresolved=${facts.unresolvedLedger.analysis}`);
+            return allow('analysis-path-approved');
+        }
+        if (facts.pathState?.status === 'valid' && facts.pathState.decision.path === 'standard') {
+            if (!hasArtifact(facts, 'plan'))
+                return deny('PLAN_ARTIFACT_REQUIRED');
+            if (facts.unresolvedLedger.plan > 0)
+                return deny('PLAN_LEDGER_BLOCKED', `unresolved=${facts.unresolvedLedger.plan}`);
+            return allow('plan-path-approved');
+        }
         if (!hasArtifact(facts, 'review-plan'))
             return deny('PLAN_REVIEW_REQUIRED');
         if (!reviewMatchesLatest(facts, 'plan', 'review-plan'))
@@ -113,14 +158,6 @@ function latestArtifact(names) {
     return names.map(parseArtifactName).filter((identity) => identity !== null)
         .sort((left, right) => right.round - left.round || left.name.localeCompare(right.name))[0]?.name ?? null;
 }
-function reviewedInputName(content, expectedFamily) {
-    const header = content.split(/\r?\n/).findIndex((line) => /\*\*(?:审查输入|Review Input)\*\*[:：]/.test(line));
-    if (header < 0)
-        return null;
-    const referenceBlock = content.split(/\r?\n/).slice(header, header + 12).join('\n');
-    const expected = new RegExp('`' + expectedFamily + '(?:-r[2-9]|-r[1-9]\\d+)?\\.md`');
-    return expected.exec(referenceBlock)?.[0].slice(1, -1) ?? null;
-}
 function reviewMatchesLatest(facts, source, review) {
     const latestSource = latestArtifact(facts.artifacts[source] ?? []);
     return Boolean(latestSource && facts.reviewedInputs?.[review] === latestSource);
@@ -133,30 +170,56 @@ function qualificationCandidateSnapshotMatches(audit, qualification) {
             && candidate.evidence === row.evidence && candidate.constraintIds.join(',') === row.constraintIds.join(','));
     });
 }
-const QUALIFICATION_RECOVERY_ORDER = [
-    { action: 'analysis', pattern: /^analysis(?:-r\d+)?\.md$/ },
-    { action: 'review-analysis', pattern: /^review-analysis(?:-r\d+)?\.md$/ },
-    { action: 'plan', pattern: /^plan(?:-r\d+)?\.md$/ },
-    { action: 'review-plan', pattern: /^review-plan(?:-r\d+)?\.md$/ },
-    { action: 'code', pattern: /^code(?:-r\d+)?\.md$/ },
-    { action: 'review-code', pattern: /^review-code(?:-r\d+)?\.md$/ }
-];
-function qualificationRecoveryAction(facts) {
-    const stale = facts.qualificationStaleArtifacts ?? [];
-    return QUALIFICATION_RECOVERY_ORDER.find(({ pattern }) => stale.some((name) => pattern.test(name)))?.action ?? null;
-}
 function recommendNext(facts) {
-    if (facts.qualificationStale) {
-        const action = qualificationRecoveryAction(facts);
-        return {
-            action,
-            reasonCode: 'QUALIFICATION_RECOVERY_REQUIRED',
-            evidence: facts.qualificationStaleArtifacts ?? ['qualification audit is stale']
-        };
+    if ((facts.reworkClassificationRequired?.length ?? 0) > 0
+        && !(facts.reworkIntents ?? []).some((intent) => intent.status === 'pending')) {
+        return { action: null, reasonCode: 'REWORK_CLASSIFICATION_REQUIRED', evidence: facts.reworkClassificationRequired ?? [] };
     }
     const pendingIntent = (facts.reworkIntents ?? []).find((intent) => intent.status === 'pending');
-    if (pendingIntent)
-        return { action: pendingIntent.target, reasonCode: 'REWORK_INTENT_PENDING', evidence: [pendingIntent.intentId, pendingIntent.findingId] };
+    if (pendingIntent) {
+        const target = effectiveReworkTarget(pendingIntent.target, facts.pathState);
+        return { action: target === 'pause' ? null : target, reasonCode: target === 'pause' ? 'REWORK_PAUSED' : 'REWORK_INTENT_PENDING', evidence: [pendingIntent.intentId, pendingIntent.findingId] };
+    }
+    if (facts.pathState && facts.pathState.status !== 'valid') {
+        return { action: 'analysis', reasonCode: facts.pathState.status === 'missing' ? 'LIFECYCLE_PATH_MISSING' : 'LIFECYCLE_PATH_INVALID', evidence: [facts.pathState.message] };
+    }
+    if (facts.pathState?.status === 'valid') {
+        for (const stage of facts.pathState.decision.stages) {
+            if (stage === 'analysis' && !hasArtifact(facts, stage))
+                return { action: stage, reasonCode: 'ANALYSIS_ARTIFACT_MISSING', evidence: ['analysis artifact is absent'] };
+            if (stage === 'review-analysis' && (!reviewMatchesLatest(facts, 'analysis', stage) || facts.reviews[stage] !== 'approved')) {
+                if (facts.reviews[stage] === 'changes-requested' && facts.resolvedHumanDecisions?.analysis === 'review') {
+                    return { action: stage, reasonCode: 'HUMAN_DECISION_REVIEW_REQUIRED', evidence: ['analysis decision was resolved'] };
+                }
+                return facts.reviews[stage] === 'changes-requested'
+                    ? { action: 'analysis', reasonCode: 'ANALYSIS_REWORK_REQUIRED', evidence: ['analysis review is not approved'] }
+                    : { action: stage, reasonCode: 'ANALYSIS_REVIEW_MISSING', evidence: ['analysis review does not bind the latest analysis artifact'] };
+            }
+            if (stage === 'plan' && !hasArtifact(facts, stage))
+                return { action: stage, reasonCode: 'PLAN_ARTIFACT_MISSING', evidence: ['plan artifact is absent'] };
+            if (stage === 'review-plan' && (!reviewMatchesLatest(facts, 'plan', stage) || facts.reviews[stage] !== 'approved')) {
+                if (facts.reviews[stage] === 'changes-requested' && facts.resolvedHumanDecisions?.plan === 'review') {
+                    return { action: stage, reasonCode: 'HUMAN_DECISION_REVIEW_REQUIRED', evidence: ['plan decision was resolved'] };
+                }
+                return facts.reviews[stage] === 'changes-requested'
+                    ? { action: 'plan', reasonCode: 'PLAN_REWORK_REQUIRED', evidence: ['plan review is not approved'] }
+                    : { action: stage, reasonCode: 'PLAN_REVIEW_MISSING', evidence: ['plan review does not bind the latest plan artifact'] };
+            }
+            if (stage === 'code' && !hasArtifact(facts, stage))
+                return { action: stage, reasonCode: 'CODE_ARTIFACT_MISSING', evidence: ['code artifact is absent'] };
+            if (stage === 'review-code' && (!reviewMatchesLatest(facts, 'code', stage) || facts.reviews[stage] !== 'approved')) {
+                if (facts.reviews[stage] === 'changes-requested' && facts.resolvedHumanDecisions?.code) {
+                    return facts.resolvedHumanDecisions.code === 'implementation'
+                        ? { action: 'code', reasonCode: 'HUMAN_DECISION_IMPLEMENTATION_REQUIRED', evidence: ['code decision requires implementation'] }
+                        : { action: stage, reasonCode: 'HUMAN_DECISION_REVIEW_REQUIRED', evidence: ['code decision requires no implementation'] };
+                }
+                return facts.reviews[stage] === 'changes-requested'
+                    ? { action: 'code', reasonCode: 'CODE_REWORK_REQUIRED', evidence: ['code review is not approved'] }
+                    : { action: stage, reasonCode: 'CODE_REVIEW_MISSING', evidence: ['code review does not bind the latest code artifact'] };
+            }
+        }
+        return { action: null, reasonCode: 'LIFECYCLE_REVIEWED', evidence: ['selected lifecycle path is complete'] };
+    }
     if (!hasArtifact(facts, 'analysis'))
         return { action: 'analysis', reasonCode: 'ANALYSIS_ARTIFACT_MISSING', evidence: ['analysis artifact is absent'] };
     if (!hasArtifact(facts, 'review-analysis') || !reviewMatchesLatest(facts, 'analysis', 'review-analysis')) {
@@ -213,9 +276,12 @@ function buildLifecycleFacts(taskDir, content, taskState = 'active', executionBu
             const family = familyFor(name);
             return !family || !isArtifactInvalidated(invalidation.document, family, name);
         });
+        const allArtifactHashes = {};
+        for (const name of files)
+            allArtifactHashes[name] = sha256File(path.join(taskDir, name));
         const artifactHashes = {};
         for (const name of activeFiles)
-            artifactHashes[name] = sha256File(path.join(taskDir, name));
+            artifactHashes[name] = allArtifactHashes[name];
         const artifacts = Object.fromEntries(artifactFamilies.map((family) => [
             family, activeFiles.filter((name) => familyFor(name) === family)
         ]));
@@ -264,9 +330,12 @@ function buildLifecycleFacts(taskDir, content, taskState = 'active', executionBu
                 continue;
             const reviewContent = fs.readFileSync(path.join(taskDir, latest), 'utf8');
             const expectedFamily = family === 'review-analysis' ? 'analysis' : family === 'review-plan' ? 'plan' : 'code';
-            const input = reviewedInputName(reviewContent, expectedFamily);
-            const receipt = input ? receiptForOutput(content, latest) : null;
-            if (input && receipt?.input === input && artifactHashes[input] === receipt.inputSha256)
+            const receipt = receiptForOutput(content, latest);
+            const input = receipt?.input;
+            if (input
+                && parseArtifactName(input)?.family === expectedFamily
+                && (artifacts[expectedFamily] ?? []).includes(input)
+                && artifactHashes[input] === receipt.inputSha256)
                 reviewedInputs[family] = input;
             const parsed = parseReviewSummary(reviewContent);
             if (!parsed.ok)
@@ -275,11 +344,58 @@ function buildLifecycleFacts(taskDir, content, taskState = 'active', executionBu
             if (verdict.ok)
                 reviews[family] = verdict.verdict === 'Approved' ? 'approved' : verdict.verdict === 'Changes Requested' ? 'changes-requested' : 'rejected';
         }
+        const reworkClassificationRequired = [];
+        const receipts = parseArtifactReceipts(content).rows;
+        for (const [reviewFamily, stage] of [['review-analysis', 'analysis'], ['review-plan', 'plan'], ['review-code', 'code']]) {
+            const cycles = receipts.filter((receipt) => receipt.event === `${reviewFamily}.completed` && files.includes(receipt.output)
+                && allArtifactHashes[receipt.input] === receipt.inputSha256).map((receipt) => {
+                const parsed = parseReviewSummary(fs.readFileSync(path.join(taskDir, receipt.output), 'utf8'));
+                const verdict = parsed.ok ? resolveCanonicalVerdict(parsed.summary) : null;
+                return {
+                    input: receipt.input,
+                    output: receipt.output,
+                    outputRound: parseArtifactName(receipt.output)?.round ?? 0,
+                    inputRound: parseArtifactName(receipt.input)?.round ?? 0,
+                    verdict: verdict?.ok ? verdict.verdict : null
+                };
+            }).sort((left, right) => left.inputRound - right.inputRound || left.outputRound - right.outputRound || left.output.localeCompare(right.output));
+            const latest = cycles.at(-1);
+            const trailingInputRounds = new Set();
+            for (let index = cycles.length - 1; index >= 0 && cycles[index].verdict === 'Changes Requested'; index -= 1) {
+                trailingInputRounds.add(cycles[index].inputRound);
+            }
+            const handled = latest && (rework.intents ?? []).some((intent) => intent.sourceArtifact === latest.output
+                && intent.sourceSha256 === allArtifactHashes[latest.output]);
+            const latestActiveReview = latestArtifact(artifacts[reviewFamily] ?? []);
+            const latestActiveInput = latestArtifact(artifacts[stage] ?? []);
+            const latestCycleIsActive = latest?.output === latestActiveReview && latest.input === latestActiveInput;
+            if (latestCycleIsActive && latest.verdict === 'Changes Requested' && trailingInputRounds.size >= 2 && !handled)
+                reworkClassificationRequired.push(stage);
+        }
         const unresolvedLedger = { analysis: 0, plan: 0, code: 0 };
         if (ledger.present) {
             for (const stage of ['analysis', 'plan', 'code'])
                 unresolvedLedger[stage] = summarizeLedgerStage(ledger.rows, stage).unresolved.length;
         }
+        const latestAnalysis = latestArtifact(artifacts.analysis ?? []);
+        const pathState = latestAnalysis
+            ? parseLifecyclePathDecision(fs.readFileSync(path.join(taskDir, latestAnalysis), 'utf8'), latestAnalysis, artifactHashes[latestAnalysis] ?? '')
+            : { status: 'missing', decision: null, message: 'analysis artifact is missing' };
+        const resolvedHumanDecisions = {};
+        const implementationInputs = parseImplementationInputs(content).rows;
+        for (const stage of ['analysis', 'plan', 'code']) {
+            const reviewFamily = `review-${stage}`;
+            const latestReview = latestArtifact(artifacts[reviewFamily] ?? []);
+            if (!latestReview || reviews[reviewFamily] !== 'changes-requested')
+                continue;
+            const latestHash = artifactHashes[latestReview];
+            const decision = rework.intents.find((intent) => intent.status === 'consumed'
+                && intent.classification === 'human-decision' && intent.sourceArtifact === latestReview && intent.sourceSha256 === latestHash);
+            if (!decision)
+                continue;
+            const implementationInput = implementationInputs.find((input) => input.ledgerId === decision.findingId);
+            resolvedHumanDecisions[stage] = stage === 'code' && implementationInput?.status === 'pending' ? 'implementation' : 'review';
+        }
         const facts = {
             taskState, currentStep: String(metadata.current_step ?? ''), artifacts, reviews,
             staleArtifacts, reviewedInputs, artifactHashes,
@@ -288,7 +404,10 @@ function buildLifecycleFacts(taskDir, content, taskState = 'active', executionBu
             executionBusy: executionBusy || hasOpenLifecycleExecution(content),
             recommendedAction: null,
             qualificationStale: qualificationStaleArtifacts.length > 0,
-            qualificationStaleArtifacts
+            qualificationStaleArtifacts,
+            pathState,
+            reworkClassificationRequired,
+            resolvedHumanDecisions
         };
         facts.recommendedAction = recommendNext(facts).action;
         return { ok: true, facts };
@@ -297,5 +416,5 @@ function buildLifecycleFacts(taskDir, content, taskState = 'active', executionBu
         return { ok: false, code: 'TASK_CAPABILITY_FACTS_INVALID', message: error instanceof Error ? error.message : String(error) };
     }
 }
-export { buildLifecycleFacts, canStart, recommendNext };
+export { buildLifecycleFacts, canStart, effectiveReworkTarget, recommendNext };
 //# sourceMappingURL=capabilities.js.map

package/dist/lib/task/commands/status.js

@@ -325,7 +325,11 @@ function renderStatus(model) {
         ['processed', `${model.invalidation?.processed ?? 0}/${model.invalidation?.total ?? 0}`],
         ['pending_intents', String(model.invalidation?.pendingIntents ?? 0)]
     ]));
-    lines.push('', 'Recommendation', ...renderPairs([['action', model.recommendation ?? DASH]]));
+    lines.push('', 'Recommendation', ...renderPairs([
+        ['path', model.lifecyclePath ?? DASH],
+        ['action', model.recommendation ?? DASH],
+        ['reason', model.recommendationReason ?? DASH]
+    ]));
     lines.push('', 'Orchestration', ...renderPairs([
         ['status', model.orchestration.status],
         ['run_id', model.orchestration.runId],
@@ -411,7 +415,8 @@ function buildFromResolved(input) {
             pendingIntents
         };
     const facts = buildLifecycleFacts(input.taskDir, content, fm.status ?? 'active');
-    const recommendation = facts.ok ? (recommendNext(facts.facts).action ?? DASH) : DASH;
+    const next = facts.ok ? recommendNext(facts.facts) : null;
+    const recommendation = next?.action ?? DASH;
     return {
         taskId: input.taskId,
         shortId: input.shortId ?? loadShortIdByTaskId(input.repoRoot).get(input.taskId) ?? DASH,
@@ -424,6 +429,8 @@ function buildFromResolved(input) {
         orchestration: collectOrchestration(input.taskDir),
         invalidation: invalidationInfo,
         recommendation,
+        recommendationReason: next?.reasonCode ?? 'TASK_CAPABILITY_FACTS_INVALID',
+        lifecyclePath: facts.ok && facts.facts.pathState?.status === 'valid' ? facts.facts.pathState.decision.path : facts.ok ? facts.facts.pathState?.status ?? DASH : DASH,
         git: collectGit(fm.branch ?? '', run)
     };
 }

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

@@ -3,12 +3,11 @@ import crypto from 'node:crypto';
 import fs from 'node:fs';
 import { normalizeAgentToken } from '../agent-clients/tokens.js';
 import { isAgentClientId } from '../agent-clients/types.js';
+import { getAgentClientAdapter } from '../agent-clients/registry.js';
 import { consumeHumanOverride, failureId, overrideDryRunConflict } from './human-override.js';
 import { activateMatchingOrchestrationDelegation, activateOrchestrationDelegation, advanceOrchestration, awaitOrchestrationDelegationActivation, beginOrResumeOrchestration, dispatchOrchestrationDelegation, OrchestrationStateError, pauseOrchestration, prepareOrchestrationDelegation, recoverPreparedOrchestrationDelegation, routeOrchestration, sealMatchingOrchestrationDelegation, sealOrchestrationDelegation, statusOrchestration } from './orchestration.js';
-import { prepareCodexOrchestrationDelegation } from './codex-orchestration.js';
-import { applyTaskFinalization } from './finalization.js';
+import { applyTaskFinalization, commitPreparedTaskFinalization } 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';
@@ -407,7 +406,6 @@ export function createSandboxExecutorExecutionContext(params) {
         generation: params.generation,
         manifestPath: absolute('manifestPath', params.manifestPath),
         requestId: params.requestId,
-        ...(params.diagnosticLog === undefined ? {} : { diagnosticLog: params.diagnosticLog }),
         ...(params.controllerBinding === undefined ? {} : { controllerBinding: binding(params.controllerBinding) }),
         ...(params.lifecycleRecoveryAttestation === undefined ? {} : {
             lifecycleRecoveryAttestation: params.lifecycleRecoveryAttestation === null
@@ -450,11 +448,7 @@ function operationTaskId(context, taskRef) {
 function domainOptions(context, options) {
     return {
         ...options,
-        repoRoot: context.repoRoot,
-        ...(context.source === 'sandbox-executor' && context.diagnosticLog !== undefined
-            ? { diagnosticLog: context.diagnosticLog }
-            : {}),
-        ...(context.source === 'sandbox-executor' ? { gitWorktreeRoot: context.worktreeRoot } : {})
+        repoRoot: context.repoRoot
     };
 }
 function lifecycleTaskId(request, repoRoot) {
@@ -475,7 +469,17 @@ async function applyLifecycleWithAuthority(context, request) {
     }
     const execute = async () => {
         if (request.intent === 'recover-started') {
-            return recoverStartedLifecycleUnderLock(request, { repoRoot: context.repoRoot });
+            const adapter = isAgentClientId(request.agent)
+                ? getAgentClientAdapter(request.agent).orchestrationAdapter
+                : undefined;
+            if (!adapter?.recoverStarted) {
+                return {
+                    status: 'no-op', changed: false, targetState: 'active',
+                    requestRef: request.taskRef, intent: 'recover-started', taskId: null,
+                    receiptId: null, childId: null, error: null
+                };
+            }
+            return adapter.recoverStarted(request, { repoRoot: context.repoRoot });
         }
         const lifecycleResult = applyTaskLifecycle(request, { repoRoot: context.repoRoot });
         if (lifecycleResult.status !== 'failed' || !request.overrideTicket)
@@ -511,7 +515,12 @@ async function applyLifecycleWithAuthority(context, request) {
         if (!(error instanceof TaskExecutionLockError))
             throw error;
         if (request.intent === 'recover-started') {
-            return recoveryFailure(request, 'owner-unknown', error.code, error.message);
+            return {
+                status: 'owner-unknown', changed: false, targetState: 'active',
+                requestRef: request.taskRef, intent: 'recover-started', taskId,
+                receiptId: null, childId: null,
+                error: { code: error.code, message: error.message }
+            };
         }
         return taskLifecycleFailure(request, { code: error.code, message: error.message }, taskId);
     }
@@ -536,8 +545,10 @@ function orchestration(context, operation) {
                 requestedModel: input.requestedModel,
                 requestedReasoningEffort: input.requestedReasoningEffort,
             };
-            if (prepareInput.client === 'codex') {
-                return prepareCodexOrchestrationDelegation(operation.taskRef, prepareInput, {
+            const prepareDelegation = getAgentClientAdapter(prepareInput.client)
+                .orchestrationAdapter?.prepareDelegation;
+            if (prepareDelegation) {
+                return prepareDelegation(operation.taskRef, prepareInput, {
                     repoRoot: context.repoRoot,
                     orchestrationOptions: options,
                 });
@@ -579,7 +590,8 @@ export function dispatchTaskControlOperation(context, operation) {
     }
     if (operation.family === 'task-finalization') {
         operationTaskId(context, operation.request.taskRef);
-        return applyTaskFinalization(operation.request, {
+        const finalize = context.source === 'sandbox-executor' ? commitPreparedTaskFinalization : applyTaskFinalization;
+        return finalize(operation.request, {
             repoRoot: context.repoRoot,
             ...(context.source === 'sandbox-executor' ? {
                 controlBinding: { generation: context.generation, requestId: context.requestId }
@@ -617,7 +629,7 @@ function operationInvalid(message) {
 }
 const LIFECYCLE_FLAGS = new Set([
     '--agent', '--reason', '--unblock-condition', '--note', '--alert-number', '--staging-dir', '--issue-number',
-    '--stage', '--round', '--artifact', '--override-ticket', '--override-target', '--override-scope', '--dry-run'
+    '--auto', '--override-ticket', '--override-target', '--override-scope', '--dry-run'
 ]);
 const FINALIZATION_FLAGS = new Set(['--agent']);
 const ORCHESTRATION_FLAGS = new Set([
@@ -626,13 +638,13 @@ const ORCHESTRATION_FLAGS = new Set([
     '--parent-id', '--before-fingerprint', '--stage', '--round', '--artifact', '--role',
     '--native-agent', '--child-id', '--spawn-mode', '--actual-model', '--actual-reasoning-effort',
     '--model-fallback-reason', '--reasoning-effort-fallback-reason', '--exit-code', '--after-fingerprint',
-    '--changed-paths', '--code', '--message', '--recoverable', '--git-worktree-root'
+    '--changed-paths', '--code', '--message', '--recoverable'
 ]);
 function parseValues(args, start, flags) {
     const values = {};
     for (let index = start; index < args.length; index += 1) {
         const flag = args[index];
-        if (flag === '--dry-run') {
+        if (flag === '--dry-run' || flag === '--auto') {
             if (!flags.has(flag))
                 operationInvalid(`unknown option '${flag}'`);
             if (values[flag] !== undefined)
@@ -693,31 +705,21 @@ 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['--auto'] === true ? { auto: true } : {}),
             ...(values['--dry-run'] === true ? { dryRun: true } : {})
         };
         if (intent === 'recover-started') {
-            const recoveryFlags = new Set(['--agent', '--stage', '--round', '--artifact', '--reason']);
+            const recoveryFlags = new Set(['--agent', '--auto']);
             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');
-            }
+            if (values['--auto'] !== true)
+                operationInvalid('--auto is required for recover-started');
+            return { family, request: input };
         }
-        else if (values['--stage'] !== undefined || values['--round'] !== undefined || values['--artifact'] !== undefined) {
-            operationInvalid('--stage, --round, and --artifact are only supported for recover-started');
+        else if (values['--auto'] !== undefined) {
+            operationInvalid('--auto is only supported for recover-started');
         }
         return { family, request: input };
     }
@@ -820,9 +822,6 @@ export function parseTaskControlOperation(family, args) {
         input.message = value(values, '--message');
         input.recoverable = recoverable === 'true';
     }
-    const options = value(values, '--git-worktree-root') === undefined
-        ? undefined
-        : { gitWorktreeRoot: value(values, '--git-worktree-root') };
-    return { family, taskRef, intent: parsedIntent, input, ...(options ? { options } : {}) };
+    return { family, taskRef, intent: parsedIntent, input };
 }
 //# sourceMappingURL=control-authority.js.map

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

@@ -1,7 +1,4 @@
 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)
@@ -20,20 +17,10 @@ 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', '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'
-];
 export const SANDBOX_CONTROL_RECOVERY_OPERATIONS = Object.freeze([
     ...LIFECYCLE_INTENTS.map((intent) => ({ family: 'task-lifecycle', intent, class: 'lifecycle-mutation' })),
     { family: 'task-finalization', intent: 'complete', class: 'finalization' },
-    ...ORCHESTRATION_INTENTS.map((intent) => ({
-        family: 'task-orchestration',
-        intent,
-        class: intent === 'route.clean-completion' ? 'route.clean-completion' : intent === 'route.read' || intent === 'status' ? 'read-only' : 'orchestration'
-    })),
     { family: 'task-create', intent: 'create', class: 'task-create' },
-    ...TASK_WORKFLOW_OPERATIONS.map((intent) => ({ family: 'task-workflow', intent, class: intent === 'artifact-inspect' || intent === 'decision-next-id' ? 'read-only' : 'workflow' })),
     ...['open', 'close', 'verify'].map((intent) => ({ family: 'codex-controller', intent, class: 'codex-controller' }))
 ]);
 export function digestControlRecoveryIntent(family, intent) {
@@ -53,30 +40,8 @@ function domainEvidenceMatches(operation, result, domain) {
         return false;
     if (domain.consistent !== true)
         return false;
-    if (operation.class === 'route.clean-completion') {
-        const completion = domain.completionEvidence;
-        const snapshot = domain.snapshot;
-        const lastReviewedCommit = domain.lastReviewedCommit;
-        return result.status === 'completed'
-            && domain.status === 'completed'
-            && domain.pendingDelegation === null
-            && isCompletionEvidence(completion)
-            && snapshot?.head === completion.head
-            && snapshot.headTree === completion.headTree
-            && 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;
+    if (operation.family === 'task-lifecycle' && operation.intent === 'recover-started')
+        return false;
     return true;
 }
 export function classifySandboxControlRecovery(input) {
@@ -127,11 +92,7 @@ export function classifySandboxControlRecovery(input) {
     return {
         outcome: 'success',
         responseReconstructable: true,
-        reasonCode: input.operation.class === 'route.clean-completion' && result.changed === false
-            ? 'RECOVERY_ROUTE_COMPLETION_NOOP'
-            : input.operation.intent === 'recover-started' && input.domain?.recoveryState === 'retry-required'
-                ? 'RECOVERY_RELEASE_RETRY_REQUIRED'
-                : 'RECOVERY_TERMINAL_AND_DOMAIN_MATCH'
+        reasonCode: 'RECOVERY_TERMINAL_AND_DOMAIN_MATCH'
     };
 }
 export function operationRecoveryBinding(requestId, generation, taskId, family, intent) {

package/dist/lib/task/decision-intents.js

@@ -7,6 +7,7 @@ import { resolveTaskContext } from './resolve-ref.js';
 import { extractSection, extractSubSection, findSectionHeading } from './sections.js';
 import { captureTaskWriteMetadata, writeTask } from './write.js';
 import { allowsManualOverride } from './guard-override.js';
+import { consumeHumanDecisionReworkIntents, parseReworkIntentDocument, reworkIntentMutation } from './rework-intent.js';
 const DECISION_ALIASES = ['人工裁决', 'Human Rulings', 'Human Decisions', 'Human Decision'];
 const ACTIVITY_ALIASES = ['活动日志', 'Activity Log'];
 function failed(code, message, taskId = null, ledgerId = null) {
@@ -160,6 +161,17 @@ function applyHumanDecision(request, options = {}) {
         kind: 'section', aliases: ACTIVITY_ALIASES, heading: activity.heading,
         body: appendActivityEntry(activity, { time: metadata.timestamp, step: 'Human Decision', agent: 'human', note: `${row.id} decided → ${recordId}` })
     });
+    try {
+        const parsedRework = parseReworkIntentDocument(content);
+        if (!parsedRework.ok)
+            return failed('DECISION_DOCUMENT_INVALID', parsedRework.message, resolved.taskId, row.id);
+        const consumed = consumeHumanDecisionReworkIntents(parsedRework.intents, row.id, metadata.timestamp);
+        if (consumed.changed)
+            mutations.push(reworkIntentMutation(content, consumed.intents));
+    }
+    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 }, {
         ...options,
         taskLocation: { repoRoot: resolved.repoRoot, taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, state: resolved.state },

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

@@ -149,7 +149,7 @@ function hasStatusBoundEvidence(receipt) {
             && host !== undefined
             && Number.isSafeInteger(host.stopRevision)
             && host.stopRevision > host.startRevision
-            && host.consumer === `lifecycle-recovery:${receipt.taskId}:${receipt.id}`
+            && host.consumer === receipt.id
             && exactText(host.consumedAt);
     }
     if (!exactText(receipt.agent)
@@ -405,7 +405,7 @@ function abortActivatedDelegation(receipt, event) {
     if (event.childId !== receipt.childId
         || !Number.isSafeInteger(event.stopRevision)
         || event.stopRevision <= receipt.hostEvidence.startRevision
-        || event.consumer !== `lifecycle-recovery:${receipt.taskId}:${receipt.id}`
+        || event.consumer !== receipt.id
         || !exactText(event.consumedAt)) {
         return fail('DELEGATION_RECOVERY_EVIDENCE_INVALID', 'recovery stop evidence does not match the activated delegation');
     }