codex-workflow-v2 2.0.0-beta.13.13 → 2.0.0-beta.13.15

package/dist/src/version.d.ts

@@ -1,2 +1,2 @@
 export declare const PACKAGE_NAME = "codex-workflow-v2";
-export declare const PACKAGE_VERSION = "2.0.0-beta.13.13";
+export declare const PACKAGE_VERSION = "2.0.0-beta.13.15";

package/dist/src/version.js

@@ -1,3 +1,3 @@
 export const PACKAGE_NAME = 'codex-workflow-v2';
-export const PACKAGE_VERSION = '2.0.0-beta.13.13';
+export const PACKAGE_VERSION = '2.0.0-beta.13.15';
 //# sourceMappingURL=version.js.map

package/dist/src/workflow-blocker-route.d.ts

@@ -0,0 +1,8 @@
+type ObjectValue = Record<string, unknown>;
+export declare function nextBetaPatchVersion(version: string): string;
+/**
+ * Describes a cross-project incident when Core has no executable, repair, or Human route.
+ * The descriptor grants no authority: gateway/App orchestration owns chat creation and release work.
+ */
+export declare function withWorkflowBlockerRoute(next: ObjectValue, packageVersion: string): ObjectValue;
+export {};

package/dist/src/workflow-blocker-route.js

@@ -0,0 +1,106 @@
+import { isCliCommand } from './cli-actions.js';
+import { hashCanonical } from './lifecycle/fingerprint.js';
+const object = (value) => value !== null && typeof value === 'object' && !Array.isArray(value) ? value : {};
+export function nextBetaPatchVersion(version) {
+    const beta = /^(.*-beta(?:\.\d+)*\.)(\d+)$/u.exec(version);
+    if (beta)
+        return `${beta[1]}${Number(beta[2]) + 1}`;
+    const stable = /^(\d+)\.(\d+)\.(\d+)$/u.exec(version);
+    if (stable)
+        return `${stable[1]}.${stable[2]}.${Number(stable[3]) + 1}`;
+    throw new TypeError(`Workflow package version has no incrementable patch: ${version}`);
+}
+function requiresHuman(next) {
+    const visit = (value) => {
+        if (Array.isArray(value))
+            return value.some(visit);
+        const record = object(value);
+        return Object.entries(record).some(([key, child]) => (key === 'humanApprovalRequired' && child === true)
+            || (key === 'requiredHumanGate' && child !== null && child !== undefined)
+            || visit(child));
+    };
+    return visit(next);
+}
+/**
+ * Describes a cross-project incident when Core has no executable, repair, or Human route.
+ * The descriptor grants no authority: gateway/App orchestration owns chat creation and release work.
+ */
+export function withWorkflowBlockerRoute(next, packageVersion) {
+    const observation = object(next.observation);
+    const route = object(next.route);
+    const blockedAction = next.blockedAction;
+    if (next.action !== 'doctor'
+        || typeof blockedAction !== 'string'
+        || !isCliCommand(blockedAction)
+        || observation.kind !== 'assessment'
+        || observation.availableRepairTransitionId !== null
+        || observation.repair !== null
+        || route.actionSupport !== 'unwitnessed'
+        || requiresHuman(next))
+        return next;
+    const patchVersion = nextBetaPatchVersion(packageVersion);
+    const source = {
+        scope: typeof next.scope === 'string' ? next.scope : null,
+        id: typeof next.id === 'string' ? next.id : null,
+        revision: Number.isInteger(next.revision) ? next.revision : null,
+        status: typeof next.status === 'string' ? next.status : null,
+        stepId: typeof next.stepId === 'string' ? next.stepId : null,
+        action: 'doctor',
+        blockedAction,
+        routeId: typeof route.routeId === 'string' ? route.routeId : null,
+        routeFingerprint: typeof route.routeFingerprint === 'string' ? route.routeFingerprint : null,
+        reasonCodes: Array.isArray(observation.reasonCodes)
+            ? observation.reasonCodes.filter((value) => typeof value === 'string')
+            : [],
+    };
+    const blockerId = hashCanonical({ domain: 'codex-workflow/workflow-blocker-route/v1', packageVersion, source });
+    return {
+        ...next,
+        workflowBlockerRoute: {
+            schemaVersion: 1,
+            state: 'gateway-confirmation-required',
+            blockerId,
+            packageVersion,
+            source,
+            confirmation: {
+                required: true,
+                checks: [
+                    'Refresh status and next without mutation.',
+                    'Confirm that no executable Core, repair, or Human route exists.',
+                    'Confirm that the responsible product chat is not actively progressing the blocked action.',
+                ],
+            },
+            dispatch: {
+                owner: 'originating-coordinator-via-gateway',
+                projectName: 'codex-workflow-v2',
+                chatType: 'workflow-blocker',
+                title: patchVersion,
+                modelRequest: { phase: 'implementation', complexity: 'complex', highRisk: false },
+                requiredPacketFields: [
+                    'blockerId', 'packageVersion', 'sourceProject', 'sourceThreadId', 'source',
+                    'freshStatusHash', 'freshNextHash', 'repositoryState', 'expectedContinuation',
+                ],
+            },
+            patchChatResponsibilities: [
+                'Reproduce and identify the state-machine cause.',
+                'Implement the smallest general fix and regression coverage.',
+                'Run release checks and publish the exact patch version.',
+                'Send a closed callback report to the originating Coordinator without being polled.',
+            ],
+            callback: {
+                target: 'originating-coordinator-thread',
+                requiredFields: [
+                    'blockerId', 'publishedVersion', 'verification', 'downstreamUpdateRoute',
+                    'expectedFreshNext', 'residualBlockers',
+                ],
+            },
+            authority: {
+                core: ['describe', 'bind-current-navigation', 'suggest-patch-version'],
+                coordinator: ['confirm', 'dispatch', 'verify-created-instructions', 'receive-callback', 'resume-product'],
+                patchChat: ['analyze', 'implement', 'verify', 'publish', 'send-callback'],
+                coreEffects: 'none',
+            },
+        },
+    };
+}
+//# sourceMappingURL=workflow-blocker-route.js.map

package/dist/src/workflow-blocker-route.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-blocker-route.js","sourceRoot":"","sources":["../../src/workflow-blocker-route.ts"],"names":[],"mappings":"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"}

package/dist/src/workflow.d.ts

@@ -424,6 +424,7 @@ export declare class WorkflowService {
     private listMilestonesObserved;
     private taskGitNavigationOverride;
     private carriedPlanIntegrityUpdateCompatibility;
+    private navigationFixDirtyCarryoverCompatibility;
     private postRebindCheckSupportCompatibility;
     private carriedPostRebindCheckSupportDirtyCarryover;
     private assessPostRebindCheckSupportDirtyCarryover;

package/dist/src/workflow.js

@@ -1,3 +1,5 @@
+import { correctiveDecisionCheckoutEligible } from './alpha6/corrective-decision-boundary.js';
+import { prepareCapturedCheckEvidence, assertCapturedCheckEvidence } from './alpha6/captured-check-evidence.js';
 import { readCorrectivePlanningAudit, readFailedStepPlanningRecovery } from './alpha6/failed-step-planning-recovery.js';
 import { explainChange } from './change-explanation.js';
 import { pendingReviewRunnerFingerprint, PENDING_REVIEW_UPDATE_SIDECAR, preparePendingReviewUpdateEvent, PENDING_REVIEW_SOURCE_VERSION, pendingReviewSourceBinding, pendingReviewBindingHash, assertPendingReviewTransport, verifiedPendingReviewTransport } from './pending-review-update.js';
@@ -15,6 +17,7 @@ import { deriveCompletedStepCarryover, normalizePlanStepDefinition, } from './do
 import { pathAllowed, validatePlan } from './domain/validation.js';
 import { WorkflowError } from './errors.js';
 import { withObservedRouteMetadata } from './observed-routes.js';
+import { withWorkflowBlockerRoute } from './workflow-blocker-route.js';
 import { bindGraphEvidence, createGraphRefreshRequest, fallbackGraphBinding, inspectGraphBinding, validateGraphRequestCurrent, } from './graph.js';
 import { inspectLocalDependency, inspectWorkflowVersions } from './diagnostics.js';
 import { appendTaskClaim, appendTaskHandback, appendTaskHandoff, appendTaskWriterCredentialReplacement, assertTaskClaimAllowed, assertTaskMutationAllowedByC1, defaultTaskWorkerActor, prepareTaskCorrectiveYield, readTaskC1Posture, readTaskHandoffEvents, } from './alpha6/handoff.js';
@@ -22,7 +25,7 @@ import { assessDownstreamProofCarryover, assessDownstreamProofReplanRecovery, as
 import { applyAdoptionPosture, assertAdoptionBaselinePreserved, buildAdoptionPreparation, initializeProjectRegistrationAdoption, readCurrentAdoptionPosture, } from './alpha6/adoption.js';
 import { appendCurrentPlanRiskAudit, appendReboundPlanRiskAudit, buildCandidatePlanRiskAuditEvent, buildPlanRiskAuditEvent, readCurrentPlanRiskAudit, readCurrentPlanningObstructionAudit, readPlanRiskAuditEvents, validatePlanRiskAuditCandidate, } from './alpha6/plan-risk.js';
 import { hashCompletedSteps, hashExecutionAuthorization, preparePreExecutionReplanEvent, preExecutionReplanSidecar, readCurrentPreExecutionReplan, } from './alpha6/preexecution-replan.js';
-import { assessRootCauseReplanDirtyCarryover, matchesTerminalCorrectiveYield, } from './alpha6/root-cause-replan-carryover.js';
+import { assessRootCauseReplanDirtyCarryover, isRootCauseReplacementStart, matchesTerminalCorrectiveYield, } from './alpha6/root-cause-replan-carryover.js';
 import { appendCorrectiveDecisionEvent, appendPlanIntegrityRecoveryDecision, appendRemediationModeRecovery, appendStopEscalateOverride, assertCorrectiveAuditorIndependence, assertGuardedRemediationAttemptAllowed, defaultCorrectiveAuditorActor, effectiveStepAllowedWrites, isKnowledgeReboundSupportDecision, findCurrentGuardedRemediationPosture, findRemediationModeRecoveryCandidate, findFailedGuardedStepRequiringCorrectiveDecision, readGuardedRemediationPostureForStep, readCorrectiveDecisionEvents, readRemediationEvents, deriveRollingCauseDecision, deriveCurrentCauseDecisionForTask, prepareRemediationEvent, prepareStopEscalateOverride, stopEscalateOverrideDecisionEventIds, } from './alpha6/remediation.js';
 import { assessPlanIntegrityRecovery, defaultPlanIntegrityRecoveryActor, } from './alpha6/plan-integrity.js';
 import { eligiblePlanIntegrityUpdateSource } from './alpha6/plan-integrity-update.js';
@@ -51,7 +54,7 @@ import { PACKAGE_NAME, PACKAGE_VERSION } from './version.js';
 import { correctiveReplanBlockedNavigation, correctiveReplanNavigation, evaluateTaskCorrectiveReplanAvailability, evaluateTaskCorrectiveReplanCandidate, identifyCorrectiveReplanPosture, prepareCorrectiveReplanCandidate, TASK_CORRECTIVE_REPLAN_TRANSITION_ID, } from './lifecycle/corrective-replan.js';
 const MAX_STRICT_REVIEW_INFRASTRUCTURE_FAILURES = 2;
 // Release-reviewed exact compatibility target; never infer support from PACKAGE_VERSION.
-const CONSUMED_CARRYOVER_TARGET_VERSION = '2.0.0-beta.13.13';
+const CONSUMED_CARRYOVER_TARGET_VERSION = '2.0.0-beta.13.15';
 export class WorkflowService {
     store;
     now;
@@ -2847,7 +2850,7 @@ export class WorkflowService {
         const planIntegrityDirtyCarryover = step.status === 'planned' && dirty.length > 0
             ? this.assessPostRebindCheckSupportDirtyCarryover(context.identity.repositoryRoot, task, stepId)
             : null;
-        const rootCauseReplanDirtyCarryover = step.status === 'planned' && dirty.length > 0
+        const rootCauseReplanDirtyCarryover = isRootCauseReplacementStart(step.status, dirty.length > 0)
             ? this.assessCurrentRootCauseReplanDirtyCarryover(context.identity.repositoryRoot, task, stepId)
             : null;
         if (step.status === 'planned'
@@ -3099,12 +3102,14 @@ export class WorkflowService {
             // Bind useful uncommitted work to this failure without treating it as
             // completed-Step authority.
             const dirtyFiles = changedFiles(context.identity.repositoryRoot).sort();
+            const capturedEvidence = prepareCapturedCheckEvidence(this.store, task, checks);
             const failurePause = {
                 recordedAt: now.toISOString(),
                 dirtyFiles,
                 dirtyWorktreeHash: hashDirtyWorktree(context.identity.repositoryRoot, dirtyFiles),
                 checksHash: sha256Hex(canonicalJsonStringify(checks)),
                 failedChecks: normalizedFailures,
+                checksEvidence: capturedEvidence.reference,
             };
             const preparedRemediation = reviewRequired && planRiskAudit
                 ? prepareRemediationEvent(this.store, task, stepId, 'checks-failed', {
@@ -3161,6 +3166,7 @@ export class WorkflowService {
                     : 'failed-step-continuation',
                 now,
                 targets: [
+                    ...(capturedEvidence.target ? [capturedEvidence.target] : []),
                     ...(preparedRemediation?.postimage
                         ? [{
                                 path: relative(path.join(taskRoot, 'remediation-events.jsonl')),
@@ -3176,6 +3182,7 @@ export class WorkflowService {
                 validate: () => {
                     const saved = this.store.readTask(task.projectId, task.id);
                     const savedStep = requireStep(saved, stepId);
+                    assertCapturedCheckEvidence(this.store, saved, savedStep.failurePause, checks);
                     const readbackDirtyFiles = changedFiles(context.identity.repositoryRoot).sort();
                     const remediationHash = preparedRemediation
                         ? readRemediationEvents(this.store, saved).find((event) => event.eventId === preparedRemediation.event.eventId)?.eventHash ?? null
@@ -3779,6 +3786,9 @@ export class WorkflowService {
                 resolution: currentCycle,
             });
         }
+        if (!correctiveDecisionCheckoutEligible(this.store, identity.repositoryRoot, task, stepId)) {
+            throw new WorkflowError('TRANSITION_BLOCKED', 'Corrective decision requires the Task checkout to be clean or match its exact in-scope failed checkpoint.', { taskId, stepId });
+        }
         assertCorrectiveAuditorIndependence(this.store, task, stepId, correctiveAudit.auditor);
         return appendCorrectiveDecisionEvent(this.store, task, stepId, correctiveAudit, planRiskAudit, task.planHash, this.now());
     }
@@ -4863,7 +4873,12 @@ export class WorkflowService {
                 mode: 'post-rebind-dirty-carryover',
             }
             : null;
-        const deferredKnowledge = this.deferredPlanIntegrityKnowledge(snapshot.identity.repositoryRoot, task, assessment?.stepId ?? adoptedCompatibility?.stepId ?? dirtyCarryoverCompatibility?.stepId ?? null, assessment?.evidence?.changedFiles ?? adoptedCompatibility?.dirtyFiles ?? dirtyCarryoverCompatibility?.dirtyFiles ?? []);
+        const navigationFixCompatibility = assessment || adoptedCompatibility || dirtyCarryoverCompatibility
+            ? null
+            : this.navigationFixDirtyCarryoverCompatibility(snapshot.identity.repositoryRoot, task);
+        const deferredKnowledge = this.deferredPlanIntegrityKnowledge(snapshot.identity.repositoryRoot, task, assessment?.stepId ?? adoptedCompatibility?.stepId ?? dirtyCarryoverCompatibility?.stepId
+            ?? navigationFixCompatibility?.stepId ?? null, assessment?.evidence?.changedFiles ?? adoptedCompatibility?.dirtyFiles ?? dirtyCarryoverCompatibility?.dirtyFiles
+            ?? navigationFixCompatibility?.dirtyFiles ?? []);
         const versions = inspectWorkflowVersions(snapshot.identity.repositoryRoot, [task.baseBranch]);
         const versionSurfaces = {
             declared: versions.declared,
@@ -4876,7 +4891,9 @@ export class WorkflowService {
         const sourceBetaVersion = parseWorkflowBetaVersion(sourceVersion);
         const targetBetaVersion = parseWorkflowBetaVersion(PACKAGE_VERSION);
         const hasRunningStep = snapshot.tasks.some((candidate) => candidate.steps.some((step) => step.status === 'in_progress'));
-        const sourceIsEligible = eligiblePlanIntegrityUpdateSource(sourceBetaVersion, assessment, hasRunningStep);
+        const sourceIsEligible = navigationFixCompatibility
+            ? sourceBetaVersion?.train === 13 && sourceBetaVersion.patch === 14 && !hasRunningStep
+            : eligiblePlanIntegrityUpdateSource(sourceBetaVersion, assessment, hasRunningStep);
         const targetIsNewer = sourceBetaVersion !== null
             && targetBetaVersion !== null
             && (targetBetaVersion.train > sourceBetaVersion.train
@@ -4884,10 +4901,23 @@ export class WorkflowService {
                     && targetBetaVersion.patch !== null
                     && sourceBetaVersion.patch !== null
                     && targetBetaVersion.patch > sourceBetaVersion.patch));
+        const c1 = readTaskC1Posture(this.store, task);
+        const now = this.now().getTime();
+        const activeLeases = snapshot.leases.filter((lease) => Date.parse(lease.expiresAt) > now);
+        const staleLeases = snapshot.leases.filter((lease) => Date.parse(lease.expiresAt) <= now);
+        const repairableNavigationLease = navigationFixCompatibility
+            && c1.state === 'claimed'
+            && activeLeases.length === 0
+            && staleLeases.length === 1
+            && staleLeases[0].entityId === task.id
+            && staleLeases[0].owner === c1.claimant
+            && createHash('sha256').update(staleLeases[0].token).digest('hex') === c1.writerLeaseTokenHash
+            ? staleLeases[0]
+            : null;
         const blockers = [
             ...deferredKnowledge.blockers,
             ...(assessments.length > 1 ? ['Exactly one failed Step may expose a Plan-integrity conflict.'] : []),
-            ...(assessment?.blockers ?? (adoptedCompatibility || dirtyCarryoverCompatibility
+            ...(assessment?.blockers ?? (adoptedCompatibility || dirtyCarryoverCompatibility || navigationFixCompatibility
                 ? []
                 : (dirtyCarryoverAssessment?.blockers.length
                     ? dirtyCarryoverAssessment.blockers
@@ -4901,19 +4931,29 @@ export class WorkflowService {
             ...Object.entries(versionSurfaces)
                 .filter(([, version]) => version !== sourceVersion)
                 .map(([surface, version]) => `${surface} Workflow version ${version ?? 'missing'} must equal the declared source ${sourceVersion ?? 'missing'}.`),
-            ...(snapshot.leases.length > 0 ? ['No active or stale Task writer lease may exist.'] : []),
+            ...(!navigationFixCompatibility && snapshot.leases.length > 0
+                ? ['No active or stale Task writer lease may exist.'] : []),
+            ...(navigationFixCompatibility && activeLeases.length > 0
+                ? ['No active writer lease may exist during navigation-fix transport.'] : []),
+            ...(navigationFixCompatibility && staleLeases.length > 0 && !repairableNavigationLease
+                ? ['Only the exact expired claimed Worker lease may be repaired before navigation-fix transport.'] : []),
+            ...(repairableNavigationLease
+                ? ['Repair the exact expired claimant lease with source locks repair, then repeat this preflight.'] : []),
             ...observationPreflightBlockers(snapshot.observation),
         ];
         return {
             readOnly: true,
-            eligible: Boolean(assessment?.eligible || adoptedCompatibility || dirtyCarryoverCompatibility) && blockers.length === 0,
-            action: (assessment?.eligible || adoptedCompatibility || dirtyCarryoverCompatibility) && blockers.length === 0
+            eligible: Boolean(assessment?.eligible || adoptedCompatibility || dirtyCarryoverCompatibility || navigationFixCompatibility)
+                && blockers.length === 0,
+            action: (assessment?.eligible || adoptedCompatibility || dirtyCarryoverCompatibility || navigationFixCompatibility)
+                && blockers.length === 0
                 ? 'update plan-integrity-transport'
                 : null,
             projectId: task.projectId,
             taskId: task.id,
             taskRevision: task.revision,
-            stepId: assessment?.stepId ?? adoptedCompatibility?.stepId ?? dirtyCarryoverCompatibility?.stepId ?? null,
+            stepId: assessment?.stepId ?? adoptedCompatibility?.stepId ?? dirtyCarryoverCompatibility?.stepId
+                ?? navigationFixCompatibility?.stepId ?? null,
             sourceVersion,
             targetVersion: PACKAGE_VERSION,
             taskBranch: task.taskBranch,
@@ -4921,19 +4961,28 @@ export class WorkflowService {
             dirtyFiles: assessment?.evidence?.changedFiles
                 ?? adoptedCompatibility?.dirtyFiles
                 ?? dirtyCarryoverCompatibility?.dirtyFiles
+                ?? navigationFixCompatibility?.dirtyFiles
                 ?? [],
             conflictHash: assessment?.evidence?.conflictHash
                 ?? adoptedCompatibility?.conflictHash
                 ?? dirtyCarryoverCompatibility?.conflictHash
+                ?? navigationFixCompatibility?.conflictHash
                 ?? null,
             compatibilityMode: adoptedCompatibility?.mode
                 ?? dirtyCarryoverCompatibility?.mode
+                ?? navigationFixCompatibility?.mode
                 ?? 'failed-step-conflict',
             deferredKnowledgeRefresh: deferredKnowledge.deferred ? {
                 action: 'task context-refresh', mode: 'delegated-content-only',
                 productPaths: deferredKnowledge.productPaths, delegatedApprovalOptions: deferredKnowledge.options,
                 application: 'after-provenance-and-scope-recovery', approvalDeferred: true,
             } : null,
+            staleLeaseRepair: repairableNavigationLease ? [{
+                    action: 'locks repair',
+                    entityId: task.id,
+                    owner: repairableNavigationLease.owner,
+                    expiresAt: repairableNavigationLease.expiresAt,
+                }] : [],
             requiredTransport: [
                 'Commit only package.json and package-lock.json on the active Milestone base.',
                 'Fast-forward or apply only that dependency commit to the Task branch while preserving all product bytes.',
@@ -4978,10 +5027,15 @@ export class WorkflowService {
         const carriedCompatibility = !assessment?.evidence && task.planHash
             ? this.carriedPlanIntegrityUpdateCompatibility(snapshot, task)
             : null;
+        const navigationFixCompatibility = assessment?.evidence || adoptedCompatibility
+            || dirtyCarryoverCompatibility || carriedCompatibility
+            ? null
+            : this.navigationFixDirtyCarryoverCompatibility(snapshot.identity.repositoryRoot, task);
         if ((!assessment?.evidence
             && !carriedCompatibility
             && !adoptedCompatibility
-            && !dirtyCarryoverCompatibility) || !task.planHash) {
+            && !dirtyCarryoverCompatibility
+            && !navigationFixCompatibility) || !task.planHash) {
             const ordinary = this.inspectDependencyProvenanceCandidate(snapshot, task);
             return {
                 ...ordinary,
@@ -4998,6 +5052,7 @@ export class WorkflowService {
         const compatibility = carriedCompatibility
             ?? adoptedCompatibility
             ?? dirtyCarryoverCompatibility
+            ?? navigationFixCompatibility
             ?? {
                 stepId: assessment.stepId,
                 planHash: task.planHash,
@@ -5499,7 +5554,7 @@ export class WorkflowService {
         return explainChange(input, repository, effectiveTask, navigation);
     }
     next(repository, taskId = null) {
-        return withObservedRouteMetadata(this.nextFromStatus(repository, taskId, this.statusFromSnapshot(this.observationSnapshot(repository))));
+        return withWorkflowBlockerRoute(withObservedRouteMetadata(this.nextFromStatus(repository, taskId, this.statusFromSnapshot(this.observationSnapshot(repository)))), PACKAGE_VERSION);
     }
     nextFromStatus(repository, taskId, status) {
         if (status.observation.kind === 'blocked') {
@@ -6570,7 +6625,8 @@ export class WorkflowService {
             : null;
         let rootCauseReplanDirtyCarryover = ['task run', 'task handoff-prepare', 'task claim'].includes(String(next.action))
             && rootCauseStepId
-            && changedFiles(repositoryRoot).length > 0
+            // Match runStep: historical carryover admits a replacement start, never a failed retry.
+            && isRootCauseReplacementStart(task.steps.find(step => step.id === rootCauseStepId)?.status, changedFiles(repositoryRoot).length > 0)
             ? this.assessCurrentRootCauseReplanDirtyCarryover(repositoryRoot, task, rootCauseStepId)
             : null;
         if (rootCauseReplanDirtyCarryover?.eligible) {
@@ -7329,7 +7385,7 @@ export class WorkflowService {
             && failedStepRemediations.length >= 2
             && handoffPosture.state !== 'pending'
             && !readCorrectiveDecisionEvents(this.store, task).some(event => event.stepId === failedStep.id && event.triggeringAttemptCount === correctiveDecisionOrdinal)
-            && currentBranch(repositoryRoot) === task.taskBranch && isClean(repositoryRoot)
+            && correctiveDecisionCheckoutEligible(this.store, repositoryRoot, task, failedStep.id)
             ? {
                 command: 'task corrective-decision',
                 state: 'eligible',
@@ -7725,6 +7781,64 @@ export class WorkflowService {
         });
         return candidates.length === 1 ? structuredClone(candidates[0].planIntegrity) : null;
     }
+    navigationFixDirtyCarryoverCompatibility(repositoryRoot, task) {
+        if (task.status !== 'ready' || !task.planHash
+            || task.steps.some((step) => step.status === 'in_progress'))
+            return null;
+        const dirtyFiles = changedFiles(repositoryRoot).sort();
+        if (dirtyFiles.length === 0)
+            return null;
+        const steps = task.steps.filter((step) => step.status === 'planned'
+            && step.evidence === null
+            && dirtyFiles.every((file) => pathAllowed(file, step.allowedWrites)
+                && !pathAllowed(file, step.forbiddenScope)));
+        if (steps.length !== 1)
+            return null;
+        const step = steps[0];
+        const failures = readRemediationEvents(this.store, task)
+            .filter((event) => event.stepId === step.id && event.failureKind === 'checks-failed');
+        const terminal = failures.at(-1);
+        if (!terminal)
+            return null;
+        const yields = readTaskHandoffEvents(this.store, task)
+            .filter((event) => matchesTerminalCorrectiveYield(event, terminal, task.id));
+        if (yields.length !== 0 || readTaskC1Posture(this.store, task).state !== 'claimed')
+            return null;
+        const dirtyWorktreeHash = hashDirtyWorktree(repositoryRoot, dirtyFiles);
+        if (!terminal.failureEvidence.dirtyWorktreeHash
+            || terminal.failureEvidence.dirtyWorktreeHash !== dirtyWorktreeHash)
+            return null;
+        const currentHead = headCommit(repositoryRoot);
+        const dependencyCommit = inspectBoundedWorkflowDependencyCommit(repositoryRoot, currentHead);
+        const authorization = [...task.authorizations].reverse().find((event) => event.kind === 'execution'
+            && event.decision === 'approved'
+            && event.briefHash === task.briefHash
+            && event.planHash === task.planHash
+            && event.mechanicalFeasibility);
+        if (!authorization || (authorization.headCommit !== currentHead
+            && dependencyCommit?.parentCommitSha !== authorization.headCommit))
+            return null;
+        const conflictHash = createHash('sha256').update(canonicalJsonStringify({
+            domain: 'codex-workflow/navigation-fix-dirty-carryover/v1',
+            taskId: task.id,
+            taskRevision: task.revision,
+            stepId: step.id,
+            planHash: task.planHash,
+            terminalFailureEventId: terminal.eventId,
+            terminalFailureEventHash: terminal.eventHash,
+            dirtyFiles,
+            dirtyWorktreeHash,
+        })).digest('hex');
+        return {
+            stepId: step.id,
+            planHash: task.planHash,
+            conflictHash,
+            dirtyFiles,
+            dirtyWorktreeHash,
+            remediationEventIds: failures.map((event) => event.eventId),
+            mode: 'navigation-fix-dirty-carryover',
+        };
+    }
     postRebindCheckSupportCompatibility(snapshot, task) {
         if (task.status !== 'awaiting_execution_authorization'
             || !task.planHash
@@ -7985,10 +8099,18 @@ export class WorkflowService {
         }
         const candidates = task.steps
             .filter((step) => step.status === 'planned' && (!stepId || step.id === stepId))
-            .flatMap((step) => [...new Set(readRemediationEvents(this.store, task)
-                .filter((event) => event.stepId === step.id && event.failureKind === 'checks-failed')
-                .map((event) => event.failureEvidence.completionCommit))]
-            .map((historyHead) => assessRootCauseReplanDirtyCarryover(this.store, repositoryRoot, task, step.id, { historyHead })))
+            .flatMap((step) => {
+            const failures = readRemediationEvents(this.store, task)
+                .filter((event) => event.stepId === step.id && event.failureKind === 'checks-failed');
+            const terminal = failures.at(-1);
+            if (!terminal)
+                return [];
+            const yields = readTaskHandoffEvents(this.store, task)
+                .filter((event) => matchesTerminalCorrectiveYield(event, terminal, task.id));
+            if (yields.length !== 1)
+                return [];
+            return [assessRootCauseReplanDirtyCarryover(this.store, repositoryRoot, task, step.id, { historyHead: terminal.failureEvidence.completionCommit })];
+        })
             .filter((assessment) => assessment.applicable);
         const eligible = candidates.filter((assessment) => assessment.eligible && assessment.compatibility);
         if (eligible.length === 1)