fix: preserve canonical targets across recovery

Author: rockyshi1993

changelogs/releases/v1.20.0.md

@@ -21,7 +21,7 @@ v1.20.0 是一次面向长任务可靠性的控制面升级。它让正式任务
 - 用户可见响应、报告和进度以人类结论为主；大体量机器证据保留在索引和证据层，不再倾倒到主阅读面。
 - 历史 audit-state 按 current、legacy、non-audit、unsupported 和 invalid 分型；历史字节保持不变，当前无效状态仍严格失败。
 - Profile 分节读取按同一 source digest 累计全部必需标题，单节命中不再错误标记完整。
-- Windows 上任务操作记录复用产物决策层的 canonical 目标集，短路径、真实路径或大小写别名不再造成目标摘要误漂移并阻断合法写入与恢复。
+- Windows 上产物决策、任务操作校验与恢复统一使用同一目标身份算法；压缩恢复通过路径表保存封存后的 canonical 目标集，8.3 短路径、真实路径、大小写或词法别名不再造成目标摘要误漂移并阻断合法写入与恢复。
 - 验证修复期新增 `RepairConvergenceStateV1`：先冻结完整问题集、批量修复，再统一 affected；独立失败一次收齐，相同绿色候选零执行复用，避免每修一个问题就重跑近全量。
 - 验证执行支持有界并发、候选证据缓存、关键路径 ETA 与项目 `.tmp` 临时数据治理；发布、安全、恢复、真实宿主与共享状态节点继续现场验证。
 

hooks/_runtime/artifact-slot-decision.cjs

@@ -8,6 +8,9 @@ const {
   extractMutationFootprint,
   validateMutationFootprint
 } = require('./mutation-footprint.cjs')
+const {
+  taskOperationTargetSetDigest
+} = require('./lifecycle-turn-liveness.cjs')
 const {
   createArtifactTemplateBinding,
   findArtifactTemplateQualification,
@@ -519,7 +522,7 @@ function decideArtifactMutation(input = {}, options = {}) {
       operation: footprint.operation,
       sourceTargets: footprint.sourceTargets,
       targetTargets: footprint.targetTargets,
-      targetSetDigest: digest(footprint.normalizedTargets),
+      targetSetDigest: taskOperationTargetSetDigest(footprint.normalizedTargets),
       footprintDigest: footprint.footprintDigest,
       adapterDigest: footprint.adapterDigest || null,
       plannedSetDigest: footprint.plannedSetDigest || null,
@@ -672,7 +675,7 @@ function decideArtifactMutation(input = {}, options = {}) {
     operation: footprint.operation,
     sourceTargets: sourceCanonical,
     targetTargets: targetCanonical,
-    targetSetDigest: digest([...sourceCanonical, ...targetCanonical].map(comparable).sort()),
+    targetSetDigest: taskOperationTargetSetDigest([...sourceCanonical, ...targetCanonical]),
     footprintDigest: footprint.footprintDigest,
     adapterDigest: footprint.adapterDigest,
     plannedSetDigest: footprint.plannedSetDigest,
@@ -727,7 +730,7 @@ function validateArtifactSlotDecision(value, binding = null, options = {}) {
     }
   }
   if (Array.isArray(value?.sourceTargets) && Array.isArray(value?.targetTargets) &&
-      digest([...value.sourceTargets, ...value.targetTargets].map(comparable).sort()) !== value.targetSetDigest) {
+      taskOperationTargetSetDigest([...value.sourceTargets, ...value.targetTargets]) !== value.targetSetDigest) {
     errors.push('artifact-decision-target-set-digest-mismatch')
   }
   const { decisionDigest, ...semantic } = value || {}
@@ -759,7 +762,7 @@ function reconcileArtifactSlotDecision(decision, input = {}, options = {}) {
       : target
   const observedSourceTargets = footprint.sourceTargets.map(canonicalObserved)
   const observedTargetTargets = footprint.targetTargets.map(canonicalObserved)
-  const observedTargets = [...observedSourceTargets, ...observedTargetTargets].map(comparable).sort()
+  const observedTargets = [...observedSourceTargets, ...observedTargetTargets]
   const errors = []
   if (decision.projectionKind === 'digest-only') {
     if (decision.status !== 'active') errors.push(`artifact-decision-not-active:${decision.status}`)
@@ -770,7 +773,7 @@ function reconcileArtifactSlotDecision(decision, input = {}, options = {}) {
     if (!validation.valid) errors.push(...validation.errors)
   }
   if (input.success === false) errors.push('artifact-tool-reported-failure')
-  if (digest(observedTargets) !== decision.targetSetDigest) errors.push('artifact-post-target-set-drift')
+  if (taskOperationTargetSetDigest(observedTargets) !== decision.targetSetDigest) errors.push('artifact-post-target-set-drift')
   const sourceTargets = Array.isArray(decision.sourceTargets) ? decision.sourceTargets : observedSourceTargets
   const targetTargets = Array.isArray(decision.targetTargets) ? decision.targetTargets : observedTargetTargets
   const exists = target => {

hooks/_runtime/evidence/codex-skill-route-pass.v1.json

@@ -5,24 +5,24 @@
   "hostVariant": "codex-cli/exec-user-global-local-stdio",
   "testedVersion": "codex-cli 0.145.0",
   "protocol": "MCP 2024-11-05",
-  "runtimeContractDigest": "97e5638c9b666255fab6ca28cff86359ac0ab8ca0872a8735f12657c13601e5e",
+  "runtimeContractDigest": "071668e4e49b6388d70dbeca26062bc0f6b32edf07cbc83f8ef1b47027071578",
   "hostAdapterDigest": "8e13dda7dd8f6e38235228bc620829cfac653b7bd0ad4f37f96bf16609e559fc",
-  "sourceEvidenceDigest": "82683379a269fced1b8eb1b435fc1b7f94257185fd55af96965646dd84dd28f8",
+  "sourceEvidenceDigest": "c0b3cc6a4a3532042fda26633be3ba3a3bc97c2f219f16521d469a4e8736abfc",
   "sourceProbe": {
     "schemaVersion": "SkillRouteS15EvidenceV1",
-    "probeRunId": "s15-codex-probe-698fbe27-4c2a-4e8e-8f37-0fb24d1038ff",
+    "probeRunId": "s15-codex-probe-123c8110-db0d-46c7-ba09-5c871f0229c1",
     "authorizationSource": "isolated-probe-authority",
     "contextSource": "host-hooks",
     "observationMode": "hook-post-history",
     "receiptStatus": "relevant-complete",
-    "completedAt": "2026-09-06T17:13:58.595Z"
+    "completedAt": "2026-09-06T18:07:40.605Z"
   },
   "runtimeBinding": {
     "source": "isolated-source-candidate",
-    "expectedDigest": "97e5638c9b666255fab6ca28cff86359ac0ab8ca0872a8735f12657c13601e5e",
-    "generationDigest": "97e5638c9b666255fab6ca28cff86359ac0ab8ca0872a8735f12657c13601e5e",
-    "modeReceiptDigest": "97e5638c9b666255fab6ca28cff86359ac0ab8ca0872a8735f12657c13601e5e",
-    "routeEnvelopeDigest": "97e5638c9b666255fab6ca28cff86359ac0ab8ca0872a8735f12657c13601e5e"
+    "expectedDigest": "071668e4e49b6388d70dbeca26062bc0f6b32edf07cbc83f8ef1b47027071578",
+    "generationDigest": "071668e4e49b6388d70dbeca26062bc0f6b32edf07cbc83f8ef1b47027071578",
+    "modeReceiptDigest": "071668e4e49b6388d70dbeca26062bc0f6b32edf07cbc83f8ef1b47027071578",
+    "routeEnvelopeDigest": "071668e4e49b6388d70dbeca26062bc0f6b32edf07cbc83f8ef1b47027071578"
   },
   "probe": {
     "schemaVersion": "SkillRouteProbeSummaryV1",

hooks/_runtime/host-skill-route-capabilities.v1.json

@@ -13,10 +13,10 @@
       "status": "PASS",
       "testedVersion": "codex-cli 0.145.0",
       "protocol": "MCP 2024-11-05",
-      "runtimeContractDigest": "97e5638c9b666255fab6ca28cff86359ac0ab8ca0872a8735f12657c13601e5e",
+      "runtimeContractDigest": "071668e4e49b6388d70dbeca26062bc0f6b32edf07cbc83f8ef1b47027071578",
       "hostAdapterDigest": "8e13dda7dd8f6e38235228bc620829cfac653b7bd0ad4f37f96bf16609e559fc",
       "evidenceRef": "hooks/_runtime/evidence/codex-skill-route-pass.v1.json",
-      "evidenceDigest": "c6afb6446d68e02abb9c9569c13f915279d7c4a21bb654b3213884779c6c0db9",
+      "evidenceDigest": "42d97ad0ef5f71f7e53207f766dcfe47b234877a5ad80c5adcd757fd5ca31c82",
       "entrySurface": "codex exec --ephemeral",
       "bootstrapDelivery": "stable user-global Hook launcher UserPromptSubmit or profile_context_plan fallback",
       "defaultEligible": true

hooks/_runtime/task-recovery-store-v5.cjs

@@ -2850,6 +2850,14 @@ function buildMutationRecoveryPreflightV2(
   ownerAuthority = null,
   taskOperationSet = null
 ) {
+  const sealedOperationTargets = taskOperationSet?.unresolved?.exactTargets || []
+  const decisionTargets = [
+    ...(decision.sourceTargets || []),
+    ...(decision.targetTargets || [])
+  ]
+  const operationExactTargets = sealedOperationTargets.length
+    ? sealedOperationTargets
+    : (decisionTargets.length ? decisionTargets : footprint.normalizedTargets)
   const roots = [
     boundedRecoveryString(decision.activeRootIdentity?.canonicalPath, 1024),
     boundedRecoveryString(decision.projectRootIdentity?.canonicalPath, 1024)
@@ -2953,15 +2961,21 @@ function buildMutationRecoveryPreflightV2(
       preObservation.observedAt,
       compactRecoveryDigest(preObservation.receiptDigest)
     ],
-    o: buildTaskOperationRecoveryV1(taskOperationSet, {
-      currentOperationId: lease.operationId,
-      priorOperationIds: ownerAuthority?.usage?.[4] || [],
-      kind: footprint.operation,
-      exactTargets: footprint.normalizedTargets,
-      targetSetDigest: decision.targetSetDigest,
-      beforeDigest: preObservation.snapshotDigest,
-      dispatchedAt: lease.issuedAt
-    }),
+    o: {
+      ...buildTaskOperationRecoveryV1(taskOperationSet, {
+        currentOperationId: lease.operationId,
+        priorOperationIds: ownerAuthority?.usage?.[4] || [],
+        kind: footprint.operation,
+        // TaskOperationRecordV1 seals the canonical target spellings before the
+        // compact decision projection drops its path arrays. The footprint may
+        // retain an equivalent Windows short-path, case alias, or lexical alias.
+        exactTargets: operationExactTargets,
+        targetSetDigest: decision.targetSetDigest,
+        beforeDigest: preObservation.snapshotDigest,
+        dispatchedAt: lease.issuedAt
+      }),
+      x: encodePaths(operationExactTargets)
+    },
     ...(ownerAuthority ? { a: ownerAuthority } : {})
   }
   return record
@@ -3113,11 +3127,17 @@ function materializeMutationRecoveryPreflightV2(record) {
     receiptDigest: materializeRecoveryDigest(preValue.receiptDigest)
   }
   const ownerAuthority = compactV2 ? record.a : record.ownerAuthority
+  const hasOperationTargetRefs = compactV2 && Object.prototype.hasOwnProperty.call(record.o || {}, 'x')
+  const operationExactTargets = hasOperationTargetRefs
+    ? decodePaths(record.o.x)
+    : footprint.normalizedTargets
+  if (hasOperationTargetRefs &&
+      (!Array.isArray(record.o.x) || operationExactTargets.length !== record.o.x.length)) return null
   const taskOperation = materializeTaskOperationRecoveryV1(compactV2 ? record.o : record.taskOperation, {
     currentOperationId: lease.operationId,
     priorOperationIds: ownerAuthority?.usage?.[4] || [],
     kind: footprint.operation,
-    exactTargets: footprint.normalizedTargets,
+    exactTargets: operationExactTargets,
     targetSetDigest: decision.targetSetDigest,
     beforeDigest: preObservation.snapshotDigest,
     dispatchedAt: lease.issuedAt

scripts/test-artifact-mutation-authority.js

@@ -45,6 +45,7 @@ const {
 } = require('../hooks/_runtime/artifact-mutation-reconciliation.cjs')
 const { compactLifecycleStateV5 } = require('../hooks/_runtime/lifecycle-state-projection-v5.cjs')
 const { sha256, stableStringify } = require('../hooks/_runtime/content-identity.cjs')
+const { taskOperationTargetSetDigest } = require('../hooks/_runtime/lifecycle-turn-liveness.cjs')
 const {
   createArtifactTemplateBinding,
   projectArtifactTemplateBinding,
@@ -541,6 +542,18 @@ try {
   assert.strictEqual(readOnlyFootprint.coverage, 'not-applicable')
   assert.deepStrictEqual(readOnlyFootprint.normalizedTargets, [])
 
+  const nonFormalTarget = path.join(path.dirname(tempRoot), `Case-Sensitive-Target-${process.pid}.js`)
+  const nonFormal = decisionFor({
+    tool_name: 'Write',
+    tool_input: { file_path: nonFormalTarget, content: 'module.exports = true\n' }
+  })
+  assert.strictEqual(nonFormal.decision.decisionStatus, 'not-applicable')
+  assert.strictEqual(
+    nonFormal.decision.targetSetDigest,
+    taskOperationTargetSetDigest(nonFormal.decision.targetTargets),
+    'non-formal target digest must use the same Windows path identity as task-operation recovery'
+  )
+
   for (const fixture of [
     { command: 'npm install', commandClass: 'package-manager' },
     { command: 'openapi-generator generate', commandClass: 'codegen' },
@@ -599,6 +612,13 @@ try {
   assert.strictEqual(allowed.decision.slotId, 'bug-cp2')
   assert.strictEqual(allowed.decision.slotIds.includes('bug-cp2'), true)
   assert.strictEqual(allowed.decision.mergedRegistryDigest, layered.mergedRegistryDigest)
+  assert.strictEqual(
+    allowed.decision.targetSetDigest,
+    taskOperationTargetSetDigest([
+      ...allowed.decision.sourceTargets,
+      ...allowed.decision.targetTargets
+    ])
+  )
   assert.strictEqual(validateArtifactSlotDecision(allowed.decision).valid, true)
   const suppliedDecision = decisionFor(
     { tool_name: 'Edit', tool_input: { file_path: cp2 } },

scripts/test-task-recovery-store-v5.js

@@ -295,21 +295,26 @@ function tasklessIngressState() {
   return value
 }
 
-function mutationStateV2Ephemeral(operationIdOverride = 'ephemeral-mutation-v2', targetCount = 1) {
+function mutationStateV2Ephemeral(operationIdOverride = 'ephemeral-mutation-v2', targetCount = 1, fixtureOptions = {}) {
   const value = state('00000000-0000-4000-8000-000000000099', 'implementation')
   value.taskRecoveryBinding = null
   const operationId = operationIdOverride
-  const targetPaths = targetCount === 1
-    ? [path.join(tempRoot, 'src', 'ephemeral-source.js')]
-    : Array.from({ length: targetCount }, (_, index) =>
-        path.join(tempRoot, 'src', `ephemeral-source-${String(index).padStart(3, '0')}.js`))
+  const targetPaths = Array.isArray(fixtureOptions.targetPaths)
+    ? fixtureOptions.targetPaths
+    : (targetCount === 1
+        ? [path.join(tempRoot, 'src', 'ephemeral-source.js')]
+        : Array.from({ length: targetCount }, (_, index) =>
+            path.join(tempRoot, 'src', `ephemeral-source-${String(index).padStart(3, '0')}.js`)))
+  const decisionTargetPaths = Array.isArray(fixtureOptions.decisionTargetPaths)
+    ? fixtureOptions.decisionTargetPaths
+    : targetPaths
   const targetPath = targetPaths[0]
   const decisionDigest = 'a'.repeat(64)
   const footprintDigest = 'b'.repeat(64)
   const plannedSetDigest = 'c'.repeat(64)
   const adapterDigest = 'd'.repeat(64)
   const registryDigest = 'e'.repeat(64)
-  const operationTargetSetDigest = taskOperationTargetSetDigest(targetPaths)
+  const operationTargetSetDigest = taskOperationTargetSetDigest(decisionTargetPaths)
   value.stickyProject = {
     schemaVersion: 'ProjectTargetLeaseV2',
     targetDigest: '0'.repeat(64),
@@ -421,6 +426,8 @@ function mutationStateV2Ephemeral(operationIdOverride = 'ephemeral-mutation-v2',
       taskRecoveryKey: null,
       contextEpoch: 'ctx-test',
       operation: 'create-or-update',
+      sourceTargets: [],
+      targetTargets: decisionTargetPaths,
       targetSetDigest: operationTargetSetDigest,
       footprintDigest,
       adapterDigest,
@@ -501,7 +508,7 @@ function mutationStateV2Ephemeral(operationIdOverride = 'ephemeral-mutation-v2',
     writerGeneration: 0,
     expectedStateSequence: 0,
     kind: 'create-or-update',
-    exactTargets: targetPaths,
+    exactTargets: decisionTargetPaths,
     targetSetDigest: value.turnLiveness.inFlightOperation.artifactDecision.targetSetDigest,
     beforeDigest: value.turnLiveness.inFlightOperation.mutationPreObservation.snapshotDigest
   }, baseOptions)
@@ -1586,6 +1593,31 @@ try {
     taskOperationTargetSetDigest(recoveredExactTargets)
   )
 
+  const lexicalAliasMeta = path.join(tempRoot, 'ephemeral-preflight-lexical-alias-hooks')
+  const lexicalAliasTarget = `${path.join(tempRoot, 'src', 'alias-segment')}${path.sep}..${path.sep}ephemeral-alias.js`
+  const canonicalAliasTarget = path.join(tempRoot, 'src', 'ephemeral-alias.js')
+  const lexicalAliasState = mutationStateV2Ephemeral(
+    'ephemeral-lexical-alias',
+    1,
+    { targetPaths: [lexicalAliasTarget], decisionTargetPaths: [canonicalAliasTarget] }
+  )
+  const lexicalAliasPreflight = commitTaskRecoveryState({
+    metaDir: lexicalAliasMeta,
+    identity: { activeRoot, project: 'devcodex' },
+    sessionKey: 'ephemeral-lexical-alias-session',
+    state: lexicalAliasState
+  }, { ...baseOptions, reason: 'mutation-preflight', force: true })
+  assert.strictEqual(lexicalAliasPreflight.status, 'ephemeral-stub', JSON.stringify(lexicalAliasPreflight))
+  const lexicalAliasRead = readTaskRecoveryState({
+    metaDir: lexicalAliasMeta,
+    sessionKey: 'ephemeral-lexical-alias-session'
+  })
+  assert.deepStrictEqual(
+    lexicalAliasRead.state.turnLiveness.taskOperationSet.unresolved.exactTargets,
+    [canonicalAliasTarget],
+    'recovery must persist the canonical decision target instead of a lexical footprint alias'
+  )
+
   const secondUseMeta = path.join(tempRoot, 'ephemeral-preflight-second-use-hooks')
   const priorOperationId = `simple-prior-${'p'.repeat(80)}`
   const currentOperationId = `simple-current-${'c'.repeat(80)}`