codex-workflow-v2 2.0.0-beta.12.11 → 2.0.0-beta.12.13

package/schemas/corrective-decision-event.schema.json

@@ -50,11 +50,16 @@
       "then": {
         "required": ["recoveryBasis", "planIntegrityEvidence"],
         "properties": { "decision": { "const": "replan-required" } }
-      },
-      "else": {
-        "not": { "anyOf": [{ "required": ["recoveryBasis"] }, { "required": ["planIntegrityEvidence"] }] }
       }
     },
+    {
+      "if": { "required": ["recoveryBasis"] },
+      "then": {
+        "required": ["planIntegrityEvidence"],
+        "properties": { "decision": { "const": "replan-required" } }
+      },
+      "else": { "not": { "required": ["planIntegrityEvidence"] } }
+    },
     {
       "anyOf": [
     { "properties": { "coveredFindingIds": { "minItems": 1 } } },
@@ -74,13 +79,14 @@
       "items": { "type": "string", "minLength": 1 }
     },
     "planIntegrityEvidence": {
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "kind", "taskRevision", "remediationEventId", "remediationEventHash",
-        "manifestPath", "manifestHash", "gitHead", "stepDefinitionHash",
-        "missingScripts", "checkCommands", "changedFiles", "conflictHash"
-      ],
+      "oneOf": [
+        { "$ref": "#/$defs/planIntegrityEvidenceV1" },
+        { "$ref": "#/$defs/planIntegrityEvidenceV2" }
+      ]
+    },
+    "planIntegrityEvidenceV1": {
+      "type": "object", "additionalProperties": false,
+      "required": ["kind", "taskRevision", "remediationEventId", "remediationEventHash", "manifestPath", "manifestHash", "gitHead", "stepDefinitionHash", "missingScripts", "checkCommands", "changedFiles", "conflictHash"],
       "properties": {
         "kind": { "const": "missing-npm-script-outside-allowed-writes" },
         "taskRevision": { "type": "integer", "minimum": 1 },
@@ -95,6 +101,47 @@
         "changedFiles": { "$ref": "#/$defs/stringList" },
         "conflictHash": { "$ref": "#/$defs/hash64" }
       }
+    },
+    "planIntegrityEvidenceV2": {
+      "type": "object", "additionalProperties": false,
+      "required": ["kind", "taskRevision", "remediationEvents", "manifestPath", "manifestHash", "gitHead", "stepDefinitionHash", "conflicts", "changedFiles", "conflictHash"],
+      "properties": {
+        "kind": { "const": "non-executable-npm-check-outside-allowed-writes" },
+        "taskRevision": { "type": "integer", "minimum": 1 },
+        "remediationEvents": {
+          "type": "array", "minItems": 1,
+          "items": {
+            "type": "object", "additionalProperties": false,
+            "required": ["eventId", "eventHash", "attemptOrdinal"],
+            "properties": {
+              "eventId": { "type": "string", "minLength": 1 },
+              "eventHash": { "$ref": "#/$defs/hash64" },
+              "attemptOrdinal": { "type": "integer", "minimum": 1 }
+            }
+          }
+        },
+        "manifestPath": { "const": "package.json" },
+        "manifestHash": { "$ref": "#/$defs/nullableHash64" },
+        "gitHead": { "$ref": "#/$defs/gitOid" },
+        "stepDefinitionHash": { "$ref": "#/$defs/hash64" },
+        "conflicts": {
+          "type": "array", "minItems": 1,
+          "items": {
+            "type": "object", "additionalProperties": false,
+            "required": ["reasonCode", "script", "command", "scriptCommand", "runnerPath", "runnerHash"],
+            "properties": {
+              "reasonCode": { "enum": ["MISSING_NPM_SCRIPT", "REQUIRED_SELECTOR_MISSING"] },
+              "script": { "type": "string", "minLength": 1 },
+              "command": { "type": "string", "minLength": 1 },
+              "scriptCommand": { "type": ["string", "null"] },
+              "runnerPath": { "type": ["string", "null"] },
+              "runnerHash": { "$ref": "#/$defs/nullableHash64" }
+            }
+          }
+        },
+        "changedFiles": { "$ref": "#/$defs/stringList" },
+        "conflictHash": { "$ref": "#/$defs/hash64" }
+      }
     }
   }
 }

package/schemas/corrective-replan-credentials.private.schema.json

@@ -12,14 +12,16 @@
     },
     "bindingValues": {
       "type": "object", "additionalProperties": false,
-      "required": ["transitionId", "runtimeFingerprint", "catalogHash", "lifecycleEpoch", "taskId", "revision", "currentPlanHash", "briefHash", "knowledgeRevision", "knowledgeHash", "gitHead", "guardedStepId", "correctiveDecisionEventId", "correctiveDecisionHash", "attemptCount", "remediationTailHash", "candidatePlanHash", "candidateStepSetHash", "planAuthorIdentityHash", "planValidationHash", "planValidatorIdentityHash", "riskAuditHash", "riskAuditorIdentityHash", "actorIdentityHash", "actorRole", "humanPrincipalIdentityHash", "capabilityId", "capabilityVersion"],
+      "required": ["transitionId", "runtimeFingerprint", "catalogHash", "lifecycleEpoch", "taskId", "revision", "currentPlanHash", "briefHash", "knowledgeRevision", "knowledgeHash", "targetKnowledgeRevision", "targetKnowledgeHash", "gitHead", "guardedStepId", "correctiveDecisionEventId", "correctiveDecisionHash", "attemptCount", "remediationTailHash", "candidatePlanHash", "candidateStepSetHash", "planAuthorIdentityHash", "planValidationHash", "planValidatorIdentityHash", "riskAuditHash", "riskAuditorIdentityHash", "actorIdentityHash", "actorRole", "humanPrincipalIdentityHash", "capabilityId", "capabilityVersion"],
       "properties": {
         "transitionId": { "const": "task.plan.corrective-replan" },
         "runtimeFingerprint": { "$ref": "#/$defs/hash" }, "catalogHash": { "$ref": "#/$defs/hash" },
         "lifecycleEpoch": { "const": 2 }, "taskId": { "$ref": "#/$defs/id" },
         "revision": { "type": "integer", "minimum": 0, "maximum": 9007199254740991 }, "currentPlanHash": { "$ref": "#/$defs/hash" },
         "briefHash": { "$ref": "#/$defs/hash" }, "knowledgeRevision": { "type": "integer", "minimum": 0, "maximum": 9007199254740991 },
-        "knowledgeHash": { "$ref": "#/$defs/hash" }, "gitHead": { "type": "string", "pattern": "^(?:[a-f0-9]{40}|[a-f0-9]{64})$" },
+        "knowledgeHash": { "$ref": "#/$defs/hash" },
+        "targetKnowledgeRevision": { "type": "integer", "minimum": 0, "maximum": 9007199254740991 },
+        "targetKnowledgeHash": { "$ref": "#/$defs/hash" }, "gitHead": { "type": "string", "pattern": "^(?:[a-f0-9]{40}|[a-f0-9]{64})$" },
         "guardedStepId": { "$ref": "#/$defs/id" }, "correctiveDecisionEventId": { "$ref": "#/$defs/id" },
         "correctiveDecisionHash": { "$ref": "#/$defs/hash" }, "attemptCount": { "type": "integer", "minimum": 2, "maximum": 9007199254740991 },
         "remediationTailHash": { "$ref": "#/$defs/hash" }, "candidatePlanHash": { "$ref": "#/$defs/hash" },

package/schemas/task.schema.json

@@ -177,6 +177,29 @@
               "retainedCommitSha": { "type": "string", "pattern": "^[a-f0-9]{40}$" }
             },
             "additionalProperties": false
+          },
+          "planIntegrity": {
+            "type": "object",
+            "required": ["stepId", "planHash", "conflictHash", "dirtyFiles", "dirtyWorktreeHash", "remediationEventIds"],
+            "properties": {
+              "stepId": { "type": "string", "pattern": "^STEP-[A-Z0-9][A-Z0-9-]{2,63}$" },
+              "planHash": { "type": "string", "pattern": "^[a-f0-9]{64}$" },
+              "conflictHash": { "type": "string", "pattern": "^[a-f0-9]{64}$" },
+              "dirtyFiles": {
+                "type": "array",
+                "minItems": 1,
+                "uniqueItems": true,
+                "items": { "type": "string", "minLength": 1 }
+              },
+              "dirtyWorktreeHash": { "type": "string", "pattern": "^[a-f0-9]{64}$" },
+              "remediationEventIds": {
+                "type": "array",
+                "minItems": 1,
+                "uniqueItems": true,
+                "items": { "type": "string", "minLength": 1 }
+              }
+            },
+            "additionalProperties": false
           }
         },
         "additionalProperties": false

package/schemas/transition-definition.schema.json

@@ -436,6 +436,8 @@
           "projection.corrective-replan.candidate@1:field.plan-validator-identity-hash",
           "projection.corrective-replan.candidate@1:field.risk-audit-hash",
           "projection.corrective-replan.candidate@1:field.risk-auditor-identity-hash",
+          "projection.corrective-replan.candidate@1:field.target-knowledge-hash",
+          "projection.corrective-replan.candidate@1:field.target-knowledge-revision",
           "projection.corrective-replan.execution-receipt@1:field.actor-identity-hash",
           "projection.corrective-replan.execution-receipt@1:field.actor-role",
           "projection.corrective-replan.execution-receipt@1:field.attempt-count",
@@ -461,6 +463,8 @@
           "projection.corrective-replan.execution-receipt@1:field.risk-audit-hash",
           "projection.corrective-replan.execution-receipt@1:field.risk-auditor-identity-hash",
           "projection.corrective-replan.execution-receipt@1:field.runtime-fingerprint",
+          "projection.corrective-replan.execution-receipt@1:field.target-knowledge-hash",
+          "projection.corrective-replan.execution-receipt@1:field.target-knowledge-revision",
           "projection.corrective-replan.execution-receipt@1:field.task-id",
           "projection.corrective-replan.execution-receipt@1:field.task-revision",
           "projection.corrective-replan.execution-receipt@1:field.transition-id",
@@ -535,6 +539,8 @@
           "projection.input.execution-receipt@1:field.risk-audit-hash",
           "projection.input.execution-receipt@1:field.risk-auditor-identity-hash",
           "projection.input.execution-receipt@1:field.runtime-fingerprint",
+          "projection.input.execution-receipt@1:field.target-knowledge-hash",
+          "projection.input.execution-receipt@1:field.target-knowledge-revision",
           "projection.input.execution-receipt@1:field.task-id",
           "projection.input.execution-receipt@1:field.task-revision",
           "projection.input.execution-receipt@1:field.transition-id",
@@ -620,6 +626,8 @@
         "field.runtime-fingerprint",
         "field.step-id",
         "field.step-status",
+        "field.target-knowledge-hash",
+        "field.target-knowledge-revision",
         "field.task-id",
         "field.task-plan-hash",
         "field.task-revision",