codex-workflow-v2 2.0.0-beta.12.9 → 2.0.0-beta.13

package/docs/validation-report.md

@@ -1,104 +1,161 @@
-# V2 beta.12.9 Validation Report
+# V2 beta.13 Validation Report
 
-Release candidate `2.0.0-beta.12.9` was validated on 2026-08-30 (Europe/Moscow) with
+Release candidate `2.0.0-beta.13` was validated during 2026-09-02--03 (Europe/Moscow) with
 Node.js 24.17.0.
 
 ## Automated release evidence
 
-- `npm ci` completed from the exact lockfile with 0 reported vulnerabilities.
-- `npm run validate` passed typecheck and `343/343` sequential tests with no failures, skips,
-  cancellations, or todos in 1,894,344.070542 ms.
-- The focused Signal-shaped E2E proves both recovery entry points. It preserves the active dirty
-  worktree and HEAD, registers the exact historical Step commit, reaches fresh
-  `task step-complete`, completes that Step with a new Core-owned commit, and validates the resulting
-  Task history.
-- Negative cases reject pending or damaged strict review, absent final acceptance, multiple or wrong
-  commits, unrelated dirty paths, changed dirty content, active/stale leases, transactions, version
-  divergence, and a dependency candidate wider than package/lock.
-- Corrective-replan executor tests prove that future replacement Plans retain evidence commits of
-  omitted completed Steps in `invalidatedStepCommits`.
-- `npm run pack:check` built the exact beta.12.9 package with 278 files, 1.0 MB packed and 4.1 MB
-  unpacked. The initial sandboxed invocation could not write the user npm cache (`EPERM`); the exact
-  authorized retry passed.
-- `npm run smoke:downstream` packed and installed the tarball in a disposable consumer project and
-  returned `ok=true`. The sandboxed attempt could not resolve the npm registry (`ENOTFOUND`); the
-  exact network-authorized retry passed.
-- `npm run plugin:check` passed for bundled gateway
-  `0.1.0+codex.20260830183000`.
-- `npm run docs:pdf:check` reported an empty stale set and exact beta.12.9 package binding.
-- `RELEASE_TAG=v2.0.0-beta.12.9 npm run release:check`, JSON parsing and `git diff --check` passed.
-
-## Root cause corrected by beta.12.9
-
-The corrective-replan paths replaced `task.steps` but did not preserve evidence commits belonging to
-completed Steps omitted from the new Plan. Git correctly retained those commits, while Task history
-authority no longer named them. A later `task step-complete` therefore rejected a legitimate,
-previously reviewed and accepted commit as unregistered history.
-
-Increasing implementation or review attempts cannot correct this condition. The historical Step had
-already passed strict review and final acceptance; the defect was loss of provenance during Plan
-replacement.
-
-## Implemented lifecycle contract
-
-- Both legacy `setTaskPlan` and journaled corrective-replan execution now retain omitted completed
-  Step evidence commits in `invalidatedStepCommits`.
-- `task historical-step-provenance-preflight/recover` repairs an already-installed beta.12.9 state
-  only when Core proves exactly one omitted commit, one active Step, confined dirty paths, a complete
-  hash-valid passed strict Step Review chain, verified reviewer isolation, and matching prior
-  hash-bound final acceptance.
-- `update historical-step-dependency-preflight/recover` handles installation itself when the exact
-  beta.12.9 dependency-only commit is the unregistered HEAD. It binds `HEAD^`, dependency `HEAD`, all
-  version surfaces, active Plan/Step, historical SHA, dirty paths/content hash, and the absence of
-  leases or pending operations.
-- The update transition records the dependency commit and retained historical commit in one Task
-  revision. Neither recovery rewrites Git, changes product bytes, adopts the old completed Step into
-  the current Plan, or weakens ordinary strict review.
-- Fresh `next` advertises these routes before ordinary dependency recovery and returns to the normal
-  credential/`task step-complete` flow after successful registration.
-- The public handshake exposes `historical-step-provenance-recovery-v1`.
-
-## Exact Signal diagnosis evidence
-
-At release-candidate validation time the Signal project
-`/Users/home-pc/htdocs/projects/signal_v4` was on exact beta.12.8 with Task
-`TASK-01M0WXJAD4GZGVNRJ284ND95C6` at revision 136 and status `in_progress`. Current Plan hash was
-`1ba67296f352cb67fa4d46c3ec9cd2ee2f50059903a5fffc7b0b2198f6dbae4e`; HEAD was
-`272d6258e4ce169aa9f5cf2b5a4de29970d82eb7`.
-
-The active Step `STEP-004-DIRECT-LOGIN-PRIVILEGE-DENIAL` had exactly five dirty files, all inside its
-`allowedWrites`. Historical commit `f7ba8533314ee27f176968a6314bf3df40285ef2` had a passed strict
-Step Review and prior final acceptance, but was absent from current Step evidence and retained
-history authority. No active/stale lease, pending/corrupt transaction, or Core operation remained.
-Milestone progress was `2/8` merged Tasks and T04 remained blocked by T03.
-
-The recurring Signal audit automation that had created an unrelated dirty journal was paused, and
-its latest journal was archived outside the checkout with matching SHA-256. The release process did
-not rewrite Signal history or mutate its five product files. Live package transport and recovery are
-separate post-publication actions and must follow the exact advertised beta.12.9 route.
-
-## PDF release documentation evidence
-
-- All three tracked Russian PDFs were regenerated from the beta.12.9 Markdown sources.
-- Architecture is 8 pages, the delegated chat-only guide is 9 pages, and the technical reference is
-  12 pages. All pages were rendered to PNG contact sheets; changed recovery/update pages were also
-  inspected at full page resolution.
-- Titles, version headers, Cyrillic text, tables, command names, margins, page footers and section
-  transitions have no visible clipping, overlap, unreadable content, or orphaned tail page.
-
-## Existing boundaries and non-claims
-
-- Recovery is intentionally unavailable for arbitrary or multiple commits, pending/failed review,
-  missing final acceptance, post-assessment drift, unrelated dirty paths, or active ownership.
-- Protocol version remains 2 and state schema remains 2; the optional audit fields are backward
-  compatible and no semantic migration is introduced.
-- Structural replacement remains disabled. beta.12.9 does not implement P04-B, topology rewiring,
-  completed-Step adoption, or a wider delegation surface.
-- No Git commit, tag, remote push, npm publication, Signal dependency transport, or Signal Task
-  completion is claimed by this pre-publication validation report.
-
-Confidence is high for the package implementation, prevention path, bounded legacy recovery,
-dependency-install compatibility, negative evidence gates, complete Step continuation, tarball,
-downstream installation, plugin and documentation. Live Signal confidence remains conditional on
-publishing beta.12.9, transporting only package/lock commits to its active base and Task branch, and
-following fresh project-local `status -> next` without manual history or state edits.
+- A clean `npm ci` completed from the exact lockfile. A network-enabled `npm audit --json` reported
+  zero vulnerabilities at every severity across all eight installed dependencies.
+- `npm run validate` passed typecheck and `408/408` sequential tests with no failures, skips,
+  cancellations or todos in 2,761,796.900458 ms.
+- `npm run test:signal-t10-check-support-e2e` passed `8/8` after the final clean install in
+  203,155.332125 ms. It covers an impossible selector-less check, machine-derived support scope,
+  Knowledge rebind, historical evidence reuse and exact compatibility from both beta.12.11 and
+  beta.12.15 into beta.13.
+- `npm run test:signal-remediation-e2e` passed `2/2` in 9,220.225709 ms. The audited remediation
+  adds the required upstream Task and resumes the original Task through a later Step without
+  auto-approving unrelated Knowledge drift.
+- `npm run test:signal-t03-replan-e2e` passed `1/1` in 45,253.2055 ms. The Signal-shaped flow
+  recovers an accidental rebind, replans and completes the consolidated guarded Step.
+- `npm run test:signal-t04-recovery` passed `11/11` in 22,021.439625 ms. It preserves only exact
+  reviewed Step provenance and rejects pending, corrupt, unrelated or stale recovery evidence.
+- `npm run pack:check` produced the exact `2.0.0-beta.13` tarball with 309 files, package size
+  1.2 MB and unpacked size 4.8 MB. It includes the shared gateway-handshake module and the
+  hash-verifiable reviewer runtime build manifest.
+- `npm run smoke:downstream` packed the release, installed it into an empty project and returned
+  `ok=true`. The first sandboxed attempt could not resolve the npm registry; the identical
+  network-enabled invocation passed.
+- `npm run plugin:check`, `npm run docs:pdf:check`, `npm run typecheck` and `git diff --check` all
+  passed. The PDF checker reported no stale generated document. `npm run release:check` passed
+  `103/103` tests in 300,945.515375 ms and returned the exact package/version assertion.
+
+## Release-candidate regressions found and closed
+
+The first complete candidate run reported `352/380` passing tests. A common precedence defect was
+found: explicit beta.13 unclassified reviewer findings (`causeBindings: []`) had been confused with
+legacy events where `causeBindings` is absent. The corrected contract keeps the former on the same
+Task, sends only a repeated authoritative cause to root-cause replan, and preserves an explicit
+current corrective decision over ordinary rolling continuation. Read-only remediation observation
+no longer requires a live bearer, while execution still requires exact actor and credential
+authority.
+
+The second complete run reported `375/380`. These five failures exposed three release-boundary
+defects that focused tests run before the version bump had missed:
+
+- Step comparison still admitted runtime-only fields into Plan semantics and could demote an
+  unchanged completed Step to `planned` during replan;
+- a synthetic pre-beta.13 remediation event retained the new `causeBindings` field and therefore
+  no longer represented legacy data;
+- the dependency compatibility preflight parsed only `beta.12.<patch>` runners, so the actual
+  beta.13 release candidate could not consume the supported beta.12.11+ recovery surface.
+
+Production Plan comparison now canonicalizes only executable Step fields in both ordinary and
+journaled replan paths. Legacy recovery remains limited to events where `causeBindings` is absent.
+Compatibility compares the beta train and patch and still requires an exact beta.12 source at or
+after beta.12.11, a newer runner, matching declared/locked/installed/base versions and every existing
+dirty, lease and evidence guard. Repeated focused and parallel regressions passed before the final
+candidate expansion.
+
+A later complete run of the expanded candidate reported `387/396`. It exposed four distinct issues
+rather than one product defect:
+
+- an autonomous-retry fixture was incorrectly labelled `runtime-composition` and therefore invoked
+  the new structural production-edge gate;
+- legacy stop-override fixtures accidentally retained native beta.13 cause bindings;
+- assertions still expected direct submit/merge after credential release and retained a completed
+  dependent Step after its predecessor was invalidated;
+- external sealed-review preflight spawned the full CLI graph with 15-second and 60-second deadlines;
+  under scheduler pressure a valid exact repository-local runtime could exhaust both deadlines and
+  produce a false infrastructure blocker.
+
+The first three were corrected only at their stale fixtures/expectations; production authority was
+not weakened. The reviewer defect was fixed structurally: CLI and preflight now share one pure
+gateway descriptor, and preflight synchronously loads the exact installed gateway, reviewer and
+workflow graph through Node after manifest/hash verification. It does not spawn a schedulable child,
+cache trust, install or build dependencies. Missing transitive dependencies, byte drift, unsafe paths,
+symlinks and contract mismatch remain fail-closed. Five concurrent preflights under eight CPU burners
+passed, and the exact five-file regression that had failed passed `88/88`. The final complete run then
+passed `399/399`.
+
+An independent agnostic release audit then reproduced one additional production defect in a long-lived
+process: after one successful preflight, Node's warm module cache could hide a subsequently deleted
+transitive dependency and still allow a sealed packet. The fix does not clear or reinterpret the module
+cache. Instead, every preflight now resolves the actual recursive dependency graph from each parent
+package using nested-first Node lookup and re-hashes exact package manifests plus every attested
+`.js`, `.cjs`, `.mjs`, `.json` and `.node` runtime file before any cached module can be trusted. Missing,
+tampered, conflicting, path-escaped or symlink-redirected state fails before load and before packet
+issuance. Exact Ajv runtime transitives are direct pins so the built attestation and npm layout are
+deterministic. Same-process ready-delete-fail-restore-ready, warm tamper, nested version conflict and
+stale nearer-copy regressions expanded the complete suite.
+
+A real native reviewer preflight then exposed an API-level Structured Output incompatibility: every
+declared object property must also be present in `required`. The reviewer schema now makes nullable
+optional semantics explicit, while the semantic parser still rejects absent or contradictory
+cause/plan-conflict evidence. The complete suite consequently reached `408/408`, and the expanded
+release check reached `103/103`.
+
+The same real-agent exercise corrected the release proof boundary without weakening Core. A nested
+`codex exec` reviewer is not treated as independent production evidence: the Coordinator stops at a
+read-only sealed packet, a distinct Codex App task performs each Step/Task review, and an external
+conductor binds the four-field review object to the packet hash, repository seal and actual reviewer
+task ID before the original persistent Coordinator resumes. The disposable release grant is limited
+to `task.execution_authorize` and `task.final_accept`; both authorizations, credential recovery and
+merge therefore use one delegate actor without an intermediate Human approval. A diagnostic harness
+attempt is never resumed or promoted after a failed binding.
+
+The first fully merged delegated fixture also found a fail-closed validator inventory gap:
+`discovery show` was logged as a mutation, so a harmless read between CLI help and fresh `next` was
+rejected as `HELP_REQUIRES_FRESH_NEXT`. The packaged transcript validator now classifies this command
+as a read-only observation and carries a regression for help -> read-only observation -> next ->
+mutation. This changes release-evidence interpretation only; it grants no lifecycle authority.
+
+## Implemented beta.13 contract
+
+- Failed Step checks and failed strict Step reviews enter an atomic continuation pause: evidence,
+  Task state and writer/C1 release either commit together or recover through the transaction journal.
+- Distinct normalized causes continue in the same Task without a numeric retry ceiling. A repeated
+  authoritative cause after a claimed fix requires root-cause replan; volatile output cannot create
+  a new cause identity.
+- Corrective replan preserves an unchanged completed Step and its reviewed commit only when every
+  dependency is also retained with the exact executable definition. A changed or omitted Step and
+  its transitive completed descendants are invalidated rather than silently adopted; independent
+  unchanged branches remain retained.
+- For multi-Step runtime composition, structural production edges are independently triggered by
+  the PRA classification rather than a planner-owned flag, and checked for a transitive owner,
+  consumer and exact executable consumer check. Simple one-Step runtime is exempt. This is bounded
+  structural authority, not a claim of full product-semantic correctness.
+- Writer credentials are stored in private local references and are never serialized as raw bearer
+  material in public CLI output, status, diagnostics or reviewer packets.
+- Compact status, reviewer runtime preflight, explicit review mode, App-owned operational preflight
+  and the observed Signal route matrix are packaged capabilities. Its class-level claim covers all
+  13 route classes observed in Signal with one exact production transition or terminal observation
+  per class. Action-level metadata remains explicit about witnessed, unwitnessed and unsupported
+  actions; unknown or malformed advertised actions fail closed.
+- Reviewer runtime preflight requires exact declared, locked and installed package versions, a
+  hash-verified build manifest, byte equality for the running/installed CLI, gateway, reviewer and
+  workflow entrypoints, and a disk-fresh recursive dependency attestation on every call. It loads the
+  exact installed runtime graph in-process only after that attestation and issues no sealed review
+  packet when any readiness or contract check fails.
+
+## Boundaries and non-claims
+
+- beta.13 does not introduce generic shadow-history import, completed-Step adoption from an
+  unrelated Task, or unchecked Workflow-state reconstruction.
+- P02 Step-validity authority, P03 generic context reuse and P04-B structural Task replacement remain
+  outside this release unless an exact implemented capability says otherwise.
+- App-owned effects such as chat creation, consent UI and polling remain outside Core. Core exposes
+  diagnostic preflights but does not claim those effects occurred.
+- The package tests prove the supported compatibility and lifecycle contracts. They do not prove a
+  future Milestone's product requirements or replace independent product review.
+- The required real-agent transcript is external release evidence bound to the final tarball and source
+  commit. This tracked report does not claim that gate before its append-only log, actual-agent
+  cross-check, product test, clean Git boundary and credential-residue checks have all passed.
+- This report does not claim commit/tag/push, npm publication, installation into Signal or Milestone
+  4 readiness until those operations receive exact readback.
+
+Confidence is high for package behavior and the stated compatibility boundary: the final `408/408`
+run, `103/103` release check, four Signal-shaped E2E suites, package/downstream smoke, CPU-saturation,
+warm-cache and fail-closed negative cases agree. Live Signal readiness remains conditional on
+publication, exact repository-local installation, safe
+closure of the frozen Milestone 3 authority and a fresh read-only `status`/`next` observation.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-workflow-v2",
-  "version": "2.0.0-beta.12.9",
+  "version": "2.0.0-beta.13",
   "description": "Requirements-first Codex development workflow with local state and explicit Git ownership.",
   "repository": {
     "type": "git",
@@ -33,7 +33,10 @@
     "roles",
     "references",
     "plugins",
-    "docs",
+    "docs/*.md",
+    "docs/lifecycle",
+    "docs/pdf",
+    "docs/problem-briefs",
     "scripts/generate-pdf-docs.py",
     "scripts/run-pdf-docs.mjs",
     "README.md"
@@ -45,6 +48,8 @@
     "test": "node scripts/with-validation-lock.mjs test",
     "test:signal-t04-recovery": "node scripts/with-validation-lock.mjs test-signal-t04",
     "test:signal-t03-replan-e2e": "node scripts/with-validation-lock.mjs test-signal-t03-replan",
+    "test:signal-remediation-e2e": "node scripts/with-validation-lock.mjs test-signal-remediation-topology",
+    "test:signal-t10-check-support-e2e": "node scripts/with-validation-lock.mjs test-signal-t10-check-support",
     "validate": "npm run typecheck && npm test",
     "pack:check": "npm run build && npm pack --dry-run",
     "smoke:downstream": "npm run build && node scripts/downstream-smoke.mjs",
@@ -55,7 +60,11 @@
     "publish:release": "node scripts/publish.mjs"
   },
   "dependencies": {
-    "ajv": "8.20.0"
+    "ajv": "8.20.0",
+    "fast-deep-equal": "3.1.3",
+    "fast-uri": "3.1.7",
+    "json-schema-traverse": "1.0.0",
+    "require-from-string": "2.0.2"
   },
   "devDependencies": {
     "@types/node": "24.10.1",

package/plugins/codex-workflow-gateway/skills/codex-workflow-gateway/SKILL.md

@@ -132,6 +132,46 @@ into Plan `acceptance` as exact array members; semantic prose may be added but c
 IDs. Bind the Plan to the returned `briefHash` and active `knowledgeMap` revision/hash. Stop if the
 contract is absent or conflicts with the current Task/Knowledge state.
 
+When fresh repository `next` reports `planRiskAuditDecision.state=recorded-blocking`, decision
+`stop-escalate`, and an `auditedRemediation` object, do not retry authorization and do not invent a
+free-form Milestone scope change. Follow only the advertised route:
+
+1. If action is `discovery start`, create one Discovery for the exact missing upstream capability
+   proved by the audit. Preserve the current Milestone outcome, success signal, acceptance, checks,
+   and original Task scope. Resolve factual unknowns from repository evidence; a genuine unresolved
+   product decision remains a semantic blocker.
+2. If action is `discovery update`, complete that same remediation Discovery until it is
+   `ready_to_materialize`; do not reuse an unrelated Discovery.
+3. If action is `milestone remediation-materialize`, use its exact Milestone/Task revisions and
+   audit binding. The JSON input contains only `discoveryId`, `expectedDiscoveryRevision`, `title`,
+   and `predecessorTaskIds`; the predecessor list must exactly equal
+   `auditedRemediation.requiredPredecessorTaskIds`. No actor, confirmation code, delegation grant,
+   replacement Milestone Plan, or human approval is accepted.
+4. Run sequential `status` then repository `next`. Core must prioritize the new remediation Task.
+   Plan, audit, hand off, implement, review, accept, and merge it normally. At Task execution
+   authorization and final acceptance, use the exact `correctiveDerivedApproval.actor` returned by
+   fresh `next`; `humanApprovalRequired` must be false. Do not pass a delegation grant.
+5. After the remediation Task is `merged`, fresh `next` must return the original blocked Task to
+   `task plan-set` with `auditedRemediation.state=merged-replan-required`. Replace its rejected Plan,
+   record a fresh Risk Audit, use the same current derived approval only when advertised, and
+   continue through at least the next ordinary Step boundary.
+
+An exact package update may make the approved Knowledge Map stale while this route is active. Continue
+without a Human approval only when fresh `next` includes
+`auditedRemediation.dependencyKnowledgeRefresh.eligible=true`. Core must prove that `package.json` is
+the sole changed Knowledge source, every version surface equals the repository-local runtime, and every
+Git commit that changed the approved manifest content altered only the exact Workflow dependency in
+`package.json`/`package-lock.json`. Do not run standalone reconcile first. The refresh is committed
+atomically by `milestone remediation-materialize` with corrective-derived evidence. Any other Knowledge
+path, classification, gap, conflict, dirty checkout, unaligned version or wider commit returns to the
+ordinary explicit Knowledge flow.
+
+This is an idempotent, additive topology transition bound to one exact Plan Risk Audit. Dirty Git,
+any lease/transaction/Core operation, a started blocked Task, stale Task/Milestone/audit bindings,
+non-merged or non-exact predecessors, duplicate use of the audit, or any changed Milestone semantic
+field is a hard stop. Generic `stop-escalate` shapes without `auditedRemediation` remain terminal
+user attention. Final Milestone acceptance remains an ordinary human/delegated gate.
+
 When `next` returns top-level `action: task context-refresh`, use only that atomic action for
 the returned Task/map revisions, actor, and grant. Do not run standalone `project-memory reconcile`
 first: Core rejects it because it would create a human-approval gap and strand the Task. A
@@ -505,7 +545,8 @@ Plan audit based only on count. Follow fresh `next`: ordinary findings default t
 `route=replan` is valid only with the exact Plan clause, obstruction, and minimal Plan change
 retained by Core. A remediation Plan may change implementation Steps but must preserve the Task
 objective, requirements, and acceptance. Explicit split or stop decisions still stop ordinary
-continuation.
+continuation; only an exact Core-advertised audited-remediation route may turn a pre-execution
+`stop-escalate` into additive upstream work.
 
 When `next.strictStepReview.recommendedMode` is `external-sealed`, do not launch the nested local
 reviewer from inside a Codex App sandbox. Run the advertised read-only `task step-review-packet`,

package/schemas/authorization-event.schema.json

@@ -19,7 +19,7 @@
     "evidenceHash": { "$ref": "#/$defs/nullableHash" },
     "headCommit": { "$ref": "#/$defs/nullableHash" },
     "reason": { "type": "string" },
-    "authorizationMode": { "enum": ["human", "delegated"] },
+    "authorizationMode": { "enum": ["human", "delegated", "corrective-derived"] },
     "delegation": { "$ref": "#/$defs/delegation" },
     "mechanicalFeasibility": { "$ref": "#/$defs/mechanicalFeasibility" }
   },
@@ -30,6 +30,13 @@
         "required": ["authorizationMode"]
       },
       "then": { "required": ["delegation"] }
+    },
+    {
+      "if": {
+        "properties": { "authorizationMode": { "const": "corrective-derived" } },
+        "required": ["authorizationMode"]
+      },
+      "then": { "not": { "required": ["delegation"] } }
     }
   ],
   "$defs": {
@@ -91,7 +98,7 @@
       "required": ["analyzerId", "analyzerVersion"],
       "properties": {
         "analyzerId": {
-          "enum": ["wf2.root-npm-script", "wf2.exact-output-path", "wf2.exact-predecessor-path"]
+          "enum": ["wf2.root-npm-script", "wf2.root-npm-script-arguments", "wf2.check-support-anchor", "wf2.exact-output-path", "wf2.exact-predecessor-path"]
         },
         "analyzerVersion": { "const": 1 }
       }
@@ -104,7 +111,7 @@
       ],
       "properties": {
         "analyzerId": {
-          "enum": ["wf2.root-npm-script", "wf2.exact-output-path", "wf2.exact-predecessor-path"]
+          "enum": ["wf2.root-npm-script", "wf2.root-npm-script-arguments", "wf2.check-support-anchor", "wf2.exact-output-path", "wf2.exact-predecessor-path"]
         },
         "analyzerVersion": { "const": 1 },
         "result": { "enum": ["pass", "blocked", "unverified"] },

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

@@ -49,10 +49,30 @@
       "if": { "properties": { "triggeringAttemptCount": { "const": 2 } }, "required": ["triggeringAttemptCount"] },
       "then": {
         "required": ["recoveryBasis", "planIntegrityEvidence"],
-        "properties": { "decision": { "const": "replan-required" } }
+        "properties": { "decision": { "enum": ["continue-fix", "replan-required"] } }
+      }
+    },
+    {
+      "if": { "required": ["recoveryBasis"] },
+      "then": {
+        "required": ["planIntegrityEvidence"]
+      },
+      "else": { "not": { "required": ["planIntegrityEvidence"] } }
+    },
+    {
+      "if": {
+        "properties": {
+          "planIntegrityEvidence": {
+            "properties": { "kind": { "enum": ["check-support-anchor-outside-allowed-writes", "failed-check-component-owner-outside-allowed-writes"] } },
+            "required": ["kind"]
+          }
+        },
+        "required": ["planIntegrityEvidence"]
       },
+      "then": { "properties": { "decision": { "const": "continue-fix" } } },
       "else": {
-        "not": { "anyOf": [{ "required": ["recoveryBasis"] }, { "required": ["planIntegrityEvidence"] }] }
+        "if": { "required": ["recoveryBasis"] },
+        "then": { "properties": { "decision": { "const": "replan-required" } } }
       }
     },
     {
@@ -74,13 +94,16 @@
       "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" },
+        { "$ref": "#/$defs/planIntegrityEvidenceV3" },
+        { "$ref": "#/$defs/planIntegrityEvidenceV4" }
+      ]
+    },
+    "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 +118,138 @@
         "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" }
+      }
+    },
+    "planIntegrityEvidenceV3": {
+      "type": "object", "additionalProperties": false,
+      "required": ["kind", "taskRevision", "remediationEvents", "manifestPath", "manifestHash", "gitHead", "stepDefinitionHash", "conflicts", "scopeExtensions", "changedFiles", "conflictHash"],
+      "properties": {
+        "kind": { "const": "check-support-anchor-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", "supportPath", "supportHash", "importSpecifier", "expectedOutputPaths", "anchoredMigrationNames"],
+            "properties": {
+              "reasonCode": { "const": "CHECK_SUPPORT_ANCHOR_OUTSIDE_ALLOWED_WRITES" },
+              "script": { "type": "string", "minLength": 1 },
+              "command": { "type": "string", "minLength": 1 },
+              "scriptCommand": { "type": "string", "minLength": 1 },
+              "runnerPath": { "type": "string", "minLength": 1 },
+              "runnerHash": { "$ref": "#/$defs/hash64" },
+              "supportPath": { "type": "string", "minLength": 1 },
+              "supportHash": { "$ref": "#/$defs/hash64" },
+              "importSpecifier": { "type": "string", "minLength": 1 },
+              "expectedOutputPaths": { "$ref": "#/$defs/stringList", "minItems": 1 },
+              "anchoredMigrationNames": { "$ref": "#/$defs/stringList", "minItems": 1 }
+            }
+          }
+        },
+        "scopeExtensions": { "$ref": "#/$defs/stringList", "minItems": 1 },
+        "changedFiles": { "$ref": "#/$defs/stringList" },
+        "conflictHash": { "$ref": "#/$defs/hash64" }
+      }
+    },
+    "planIntegrityEvidenceV4": {
+      "type": "object", "additionalProperties": false,
+      "required": ["kind", "taskRevision", "remediationEvents", "gitHead", "stepDefinitionHash", "semanticBoundaryHash", "failedCheckCauseFingerprint", "conflicts", "scopeExtensions", "changedFiles", "conflictHash"],
+      "properties": {
+        "kind": { "const": "failed-check-component-owner-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 }
+            }
+          }
+        },
+        "gitHead": { "$ref": "#/$defs/gitOid" },
+        "stepDefinitionHash": { "$ref": "#/$defs/hash64" },
+        "semanticBoundaryHash": { "$ref": "#/$defs/hash64" },
+        "failedCheckCauseFingerprint": { "$ref": "#/$defs/hash64" },
+        "conflicts": {
+          "type": "array", "minItems": 1,
+          "items": {
+            "type": "object", "additionalProperties": false,
+            "required": ["reasonCode", "command", "runnerPath", "ownerPath", "ownerHash", "importChain", "diagnosticPath", "componentRoot"],
+            "properties": {
+              "reasonCode": { "const": "FAILED_CHECK_COMPONENT_OWNER_OUTSIDE_ALLOWED_WRITES" },
+              "command": { "type": "string", "minLength": 1 },
+              "runnerPath": { "type": "string", "minLength": 1 },
+              "ownerPath": { "type": "string", "minLength": 1 },
+              "ownerHash": { "$ref": "#/$defs/hash64" },
+              "importChain": { "$ref": "#/$defs/stringList", "minItems": 2 },
+              "diagnosticPath": { "type": "string", "minLength": 1 },
+              "componentRoot": { "type": "string", "minLength": 1 }
+            }
+          }
+        },
+        "scopeExtensions": { "$ref": "#/$defs/stringList", "minItems": 1 },
+        "changedFiles": { "$ref": "#/$defs/stringList" },
+        "conflictHash": { "$ref": "#/$defs/hash64" }
+      }
     }
   }
 }