@open-agent-toolkit/cli 0.3.7 → 0.3.9

package/assets/skills/oat-project-document/references/docs/autonomy-contract.md

@@ -274,7 +274,7 @@ remains immutable baseline evidence for the original p01-t01 verification.
 | `oat-dispatch-subagents/references/provider-claude.md`         | `fbe3a21e9533 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | `oat-dispatch-subagents/references/provider-codex.md`          | `95b0f82018c7 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | `oat-dispatch-subagents/references/provider-cursor.md`         | `f781555295a9 -> NG`; `55ccfef14fd6 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `oat-dispatch-subagents/references/record-schema.md`           | `78f8069274a8 -> NG`; `1c9a84c4d1e0 -> NG`; `2a63da6e3a96 -> NG`; `30762d53b043 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| `oat-dispatch-subagents/references/record-schema.md`           | `78f8069274a8 -> NG`; `1c9a84c4d1e0 -> NG`; `2a63da6e3a96 -> NG`; `30762d53b043 -> NG`; `66bc2f0d4fda -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `oat-project-dispatch-subagents/SKILL.md`                      | `eca03ad1ca12 -> PDISPATCH-01`; `59fbcdc79cea -> PDISPATCH-01`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `oat-project-plan/SKILL.md`                                    | `f99e44b39932 -> PLAN-12`; `7e6a9854504b -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | `oat-project-complete/SKILL.md`                                | `0177956707aa -> NG`; `8305b5bb65ef -> NG`; `3c0b26f0ff1c -> NG`; `8cc1fa5aab1e -> COMPLETE-01`; `4c209fbb4716 -> COMPLETE-01`; `02e4175e1171 -> COMPLETE-01`; `d698d4f98e76 -> COMPLETE-01`; `9f86a7218d93 -> COMPLETE-01`; `024713698d9a -> COMPLETE-01`; `c327995053fa -> COMPLETE-01`; `61f81d4ec7c1 -> COMPLETE-01`; `14fb2e56809f -> COMPLETE-01`; `7d4ff668744d -> COMPLETE-01`; `502a6c141784 -> COMPLETE-01`; `fb7e2db356af -> COMPLETE-01`; `f73f8476360a -> NG`; `1e15f420039f -> NG`; `cc234032ddd7 -> NG`; `1dd54687229b -> NG`; `fc05c8303cd2 -> NG`; `24be721d635e -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |

package/assets/skills/oat-project-implement/SKILL.md

@@ -7,7 +7,7 @@ disable-model-invocation: true
 user-invocable: true
 allowed-tools: Read, Write, Bash(git:*), Bash(oat:*), Bash(oat project log:*), Glob, Grep, AskUserQuestion, Task
 metadata:
-  version: 2.3.12
+  version: 2.3.14
 ---
 
 # Implementation Phase
@@ -102,7 +102,7 @@ record only the gate decision and its review/dispatch provenance.
 After every code commit and after every phase/review-fix completion, you MUST commit the OAT tracking files (project: `implementation.md`, `state.md`, `plan.md`) as a separate bookkeeping commit. Refresh the repo dashboard with `oat state refresh` before staging when available, but do not stage `.oat/state.md`; it is generated dashboard state and is normally gitignored. Do not defer, batch, or skip these commits under the reasoning that they "aren't related to the implementation." Skipping a bookkeeping commit is the primary cause of cross-session state drift and will cause the next implementation run to fail bookkeeping cross-checks. If bookkeeping commits feel frequent, that is the intended design — they are cheap and they prevent drift.
 
 **CRITICAL — Review boundaries require a committed artifact baseline.**
-Do not enter checkpoint review, final review, revise, or PR-final handoff with dirty core project artifacts (`discovery.md`, `spec.md`, `design.md`, `plan.md`, `implementation.md`, `state.md`). If one of those boundaries is next and artifact bookkeeping is still uncommitted, stop and create the bookkeeping commit first.
+Do not enter checkpoint review, final review, revise, or PR-final handoff with dirty core project artifacts (`discovery.md`, `spec.md`, `design.md`, `plan.md`, `implementation.md`, `state.md`). If one of those boundaries is next and artifact bookkeeping is still uncommitted, stop and create the bookkeeping commit first. The per-phase review is such a boundary: commit the phase's task ledger (`references/phase-execution.md` Step 7a) before dispatching the per-phase reviewer, and write review-outcome bookkeeping after the review returns (Step 7b).
 
 **CRITICAL — Intentional artifact divergence must be recorded.**
 If implementation intentionally diverges from `spec.md`, `design.md`, or `plan.md`, record the delta in `implementation.md` before the next phase/review boundary. Include what diverged, why it diverged, whether the implementation or original artifact is now source of truth, and any follow-up artifact updates or explicit deferral. Do not leave accepted design drift only in chat, a review artifact, or code comments; final summary generation depends on `implementation.md` preserving the delta.

package/assets/skills/oat-project-implement/references/completion-and-closeout.md

@@ -384,13 +384,13 @@ and can never be reused as a fresh `allowed` result once the gate is
 re-enabled; the re-enabled gate requires a new configured generation.
 
 New generations persist `implementation_fingerprint` as
-`sha256:effective-delta-v1:<digest>`. Resolve the logical integration base from
+`sha256:effective-delta-v2:<digest>`. Resolve the logical integration base from
 the tracked PR's exact base ref, then the repository's configured remote default
 branch; missing or ambiguous resolution fails closed. Persist the logical base
 ref as `implementation_base_ref`; require exactly one merge base between that
 ref and each compared HEAD.
 
-Prefix the fingerprint input with the bytes `effective-delta-v1\0`. Hash the
+Prefix the fingerprint input with the bytes `effective-delta-v2\0`. Hash the
 exact NUL-delimited byte stream from Git
 `--raw -z --no-renames --no-abbrev` output, which includes both base and final
 modes and full object IDs for blobs, symlinks, deletions, and gitlinks. Run with
@@ -398,13 +398,29 @@ modes and full object IDs for blobs, symlinks, deletions, and gitlinks. Run with
 format owns path framing and byte ordering; do not parse and reserialize it,
 abbreviate object IDs, enable rename detection, or hash human patch output.
 
-Exclude only the exact `$PROJECT_PATH/state.md` checkpoint carrier to avoid a
-self-referential digest. Use Git's literal exclusion pathspec, not a glob.
-Validate that file independently as the structured transition above. Every
-other path remains fingerprinted. Set `freshness_head` to `reviewed_head` and
-`freshness_fingerprint` to `implementation_fingerprint` when the generation
-starts. These rolling fields preserve the accepted tree outcome after later
-authorized closeout transitions without changing the immutable reviewed basis.
+Exclude the exact `$PROJECT_PATH/state.md` checkpoint carrier, which would make
+the digest self-referential, and every path under `.oat/projects/` and
+`.oat/repo/`, whose project artifacts and repository records never make the
+gate stale. Use Git's literal exclusion pathspecs
+`:(exclude,literal)$PROJECT_PATH/state.md`, `:(exclude,literal).oat/projects`,
+and `:(exclude,literal).oat/repo`, not globs. A literal directory pathspec
+excludes that directory and everything beneath it, never a sibling whose name
+merely starts the same way. `.oat/templates/`, `.oat/scripts/`,
+`.oat/config*.json`, and `.oat/sync/` stay fingerprinted, as does every other
+path. The `.oat/projects` exclusion names the default location literally; a
+project whose configured `projects.root` lies outside `.oat/projects/` keeps
+its other artifacts fingerprinted (more staleness, never less). Validate the
+state carrier independently as the structured transition above.
+
+Stored `sha256:effective-delta-v1:<digest>` values keep v1 semantics and are
+never reinterpreted: recompute them with the `effective-delta-v1\0` prefix and
+only the exact `$PROJECT_PATH/state.md` exclusion. A v1 generation stays v1
+until it goes stale; its replacement generation uses v2.
+
+Set `freshness_head` to `reviewed_head` and `freshness_fingerprint` to
+`implementation_fingerprint` when the generation starts. These rolling fields
+preserve the accepted tree outcome after later authorized closeout transitions
+without changing the immutable reviewed basis.
 
 An in-flight `pending` or `blocked` generation reuses its persisted resolved
 configuration and never re-resolves it. Recompute the fingerprint from those
@@ -561,9 +577,14 @@ disposition.
   closeout-only. A path category alone is insufficient: the corresponding
   persisted gate or sequence transition must own that descendant boundary;
   unknown or mixed work is substantive.
-- For a qualified `sha256:effective-delta-v1:<digest>` value, require the
+- For a qualified `sha256:effective-delta-v2:<digest>` or
+  `sha256:effective-delta-v1:<digest>` value, require the
   persisted `implementation_base_ref`, `freshness_head`, one current merge base,
   and 64-character lowercase hexadecimal implementation and freshness digests.
+  Recompute with the stored value's own version prefix and exclusion set.
+  Under v2, a descendant commit whose changes all fall inside the v2 exclusion
+  set leaves the effective delta unchanged; it is neither substantive nor
+  unknown and needs no owning transition.
   Missing or malformed inputs fail closed. Walk descendants after
   `freshness_head` in commit order. Ignore a checkpoint-persistence commit only
   after verifying its diff changes the exact state carrier and nothing else.
@@ -587,7 +608,8 @@ disposition.
   or workflow configuration changes make the prior result `stale`.
 - Every stale transition preserves prior provenance for audit, requires a
   current final lifecycle review for the changed basis, and starts a new
-  generation using the qualified fingerprint format.
+  generation using the current qualified fingerprint format,
+  `effective-delta-v2`.
 
 Before approval-aware sequencing, final HiLL approval, implementation
 completion, or success output, run the configured gate:

package/assets/skills/oat-project-implement/references/dispatch-and-dry-run.md

@@ -513,33 +513,35 @@ Claude rules:
 - Before any managed effort-pinned Claude launch, pass the real completed
   resolver JSON, the selected generated `.claude/agents/<variant>.md`
   definition, and the exact proposed payload through the shipped record
-  producer. Use its managed input form:
-
-  ```json
-  {
-    "claudeLaunch": {
-      "resolution": { "<complete-resolver-field>": "<value>" },
-      "definition": "<the exact generated definition text>",
-      "payload": { "variant": "<the exact native variant>" }
-    },
-    "recordBase": { "<generic-nonderived-field>": "<value>" },
-    "event": { "<canonical-role-resolution-field>": "<value>" }
-  }
-  ```
-
-  Construct this JSON with a JSON-aware tool such as `jq --slurpfile` and
-  `--rawfile`; the placeholder keys illustrate object shapes and are never
-  literal input. Set the pre-launch record base to `launch_status: planned` and
+  producer. Its managed input has three keys: `claudeLaunch` (`resolution`,
+  the resolver's `--json` output verbatim; `definition`, the generated
+  definition text; `payload`, `{ "variant": "<variant>" }`), `recordBase`, and
+  `event`. Produce `event` with
+  `oat project dispatch canonical-role --role <oat-phase-implementer|oat-reviewer> --request-id <recordBase.request_id> --skill-dir "${SKILL_DIR}" --json`,
+  which prints the `canonical-role-resolution` evidence (redacted paths,
+  content digest, tier misses) the recorder accepts unchanged; never write that
+  evidence by hand. A `missing` result is still valid evidence and carries the
+  recovery commands for the absent role: surface those commands to the
+  operator, and note that a later fresh-child fallback still stops under the
+  canonical fallback role rule above. Copy the shape of
+  `${DISPATCH_SKILLS_ROOT}/oat-dispatch-subagents/references/managed-claude-example.json`,
+  one complete validated input per role; its `record-schema.md` section lists
+  the `recordBase` fields and the derived fields `recordBase` must omit.
+
+  Assemble the input with a JSON-aware tool such as `jq --slurpfile` and
+  `--rawfile`. Set the pre-launch record base to `launch_status: planned` and
   `child_outcome: null`, then run
   `oat project dispatch record --event-file <input> --json` without
   `--project`. Require `status: validated-only`. Launch only
   `record.payload.variant` (and `record.payload.model` when present) from that
   result. The producer rejects a missing or stale variant, an absent or drifted
-  generated definition, and a conflicting per-call model. After the terminal
-  child outcome, rebuild through the same managed input with the terminal
-  status; persistence remains subject to the opt-in rule above. Never copy
-  model, effort, selector, candidate, or payload fields into the record base:
-  the accepted envelope owns and derives them.
+  generated definition, and a conflicting per-call model. It reports every
+  violation it finds in one run, one `stage path: message` line each, so fix
+  them together and rerun. After the terminal child outcome, rebuild through
+  the same managed input with the terminal status; persistence remains subject
+  to the opt-in rule above. Never copy model, effort, selector, candidate, or
+  payload fields into the record base: the accepted envelope owns and derives
+  them.
 
 - Derive `model_axis=selected:<model>` and `effort_axis=selected:<effort>` from
   resolver output and the constructed variant payload. Legacy model-only

package/assets/skills/oat-project-implement/references/docs/autonomy-contract.md

@@ -274,7 +274,7 @@ remains immutable baseline evidence for the original p01-t01 verification.
 | `oat-dispatch-subagents/references/provider-claude.md`         | `fbe3a21e9533 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | `oat-dispatch-subagents/references/provider-codex.md`          | `95b0f82018c7 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | `oat-dispatch-subagents/references/provider-cursor.md`         | `f781555295a9 -> NG`; `55ccfef14fd6 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `oat-dispatch-subagents/references/record-schema.md`           | `78f8069274a8 -> NG`; `1c9a84c4d1e0 -> NG`; `2a63da6e3a96 -> NG`; `30762d53b043 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| `oat-dispatch-subagents/references/record-schema.md`           | `78f8069274a8 -> NG`; `1c9a84c4d1e0 -> NG`; `2a63da6e3a96 -> NG`; `30762d53b043 -> NG`; `66bc2f0d4fda -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `oat-project-dispatch-subagents/SKILL.md`                      | `eca03ad1ca12 -> PDISPATCH-01`; `59fbcdc79cea -> PDISPATCH-01`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `oat-project-plan/SKILL.md`                                    | `f99e44b39932 -> PLAN-12`; `7e6a9854504b -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | `oat-project-complete/SKILL.md`                                | `0177956707aa -> NG`; `8305b5bb65ef -> NG`; `3c0b26f0ff1c -> NG`; `8cc1fa5aab1e -> COMPLETE-01`; `4c209fbb4716 -> COMPLETE-01`; `02e4175e1171 -> COMPLETE-01`; `d698d4f98e76 -> COMPLETE-01`; `9f86a7218d93 -> COMPLETE-01`; `024713698d9a -> COMPLETE-01`; `c327995053fa -> COMPLETE-01`; `61f81d4ec7c1 -> COMPLETE-01`; `14fb2e56809f -> COMPLETE-01`; `7d4ff668744d -> COMPLETE-01`; `502a6c141784 -> COMPLETE-01`; `fb7e2db356af -> COMPLETE-01`; `f73f8476360a -> NG`; `1e15f420039f -> NG`; `cc234032ddd7 -> NG`; `1dd54687229b -> NG`; `fc05c8303cd2 -> NG`; `24be721d635e -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |

package/assets/skills/oat-project-implement/references/phase-execution.md

@@ -684,8 +684,11 @@ degradation is forbidden for the invalid run.
 ### Per-Phase Review
 
 The root workflow owns implementation review. After validating the phase
-report, resolve and dispatch exactly one fresh `oat-reviewer` round at the
-configured review ceiling:
+report (sequential phases; see the parallel-group note below), commit Step 7a
+pre-review bookkeeping before resolving or dispatching the reviewer, so the
+reviewed head carries the phase's current task ledger. Then resolve and
+dispatch exactly one fresh `oat-reviewer` round at the configured review
+ceiling:
 
 ```bash
 oat project dispatch-ceiling resolve \
@@ -703,6 +706,17 @@ commit range, task IDs and boundaries, artifacts, verification evidence,
 configured axes, selection reason, and candidates. Require a timestamped review
 artifact under the project's `reviews/` directory.
 
+The Review Scope names review-outcome bookkeeping as out of scope: this
+review's `## Reviews` row and its disposition, the Orchestration Run entry for
+this review's outcome, the deferred phase-outcome and review-orchestration
+project-log entries, and the ledger's record of any review-fix commit. Step 7b
+writes all of them after the review returns, so their absence at the reviewed
+head is not a finding. The task ledger itself stays in scope and must be
+current at the reviewed head, because Step 7a committed it before dispatch.
+In a parallel group the phase worktree under review does not carry the root
+ledger (step 10 of Parallel Group Execution commits it once after fan-in), so
+that phase's Review Scope also names the task ledger as out of scope.
+
 For a managed capped review, bind the exact provider argument to the actual
 invocation: `providers.codex.dispatchArgs.variant`,
 `providers.claude.dispatchArgs.variant` for an effort-pinned target,
@@ -755,7 +769,9 @@ and workers never write `project-log.md` or append this entry.
 
 No project-log write happens anywhere between a reviewer returning and a fix
 child being dispatched. The deferred orchestration entry is appended with the
-phase-outcome entry at Step 7 and committed by that step's bookkeeping.
+phase-outcome entry at Step 7b and committed by that half's bookkeeping. Step
+7a's commit lands before the reviewer is dispatched, so it cannot dirty that
+window either.
 
 After successful signal and orchestration validation, validate the review
 artifact scope and commit range.
@@ -796,8 +812,10 @@ worktree in Outstanding Items.
 
 ### Optional External Phase Review Gate
 
-After the root-owned per-phase reviewer passes and phase bookkeeping is clean,
-run `oat_phase_review_gate` for selected phases:
+After the root-owned per-phase reviewer passes and both halves of Step 7
+bookkeeping are committed, run `oat_phase_review_gate` for selected phases. The
+gate reviews the committed ledger after both Step 7 halves — which, after a fix
+loop or in a parallel group, is newer than the head the per-phase reviewer saw:
 
 ```bash
 oat --json gate review \
@@ -817,6 +835,11 @@ and `handoff` is non-null.
   implementer under the bounded loop, then re-run root review and the gate.
 - target execution, artifact validation, or missing-artifact failure: stop.
 
+The phase row stays `in_progress` until this gate passes and every review
+disposition is settled; the bookkeeping that records the passing gate sets it
+`complete`, and gate retry exhaustion sets it `blocked` (see Step 7b's phase
+row transitions).
+
 Gate retry rounds use the same orchestration retry limit. Gate independence,
 configured provenance, liveness telemetry, and fail-closed behavior are
 unchanged.
@@ -879,7 +902,65 @@ target-preserving execution and must be recorded.
 
 ### Step 7: Artifact Updates After Each Phase (or Group)
 
-After each phase or parallel group:
+After each phase or parallel group, Step 7 runs in two halves around the
+per-phase review, each with its own commit.
+The split exists so the reviewer never evaluates a head whose task ledger is
+stale by construction, while the tree stays clean for a bounded fix child.
+
+#### Step 7a: Pre-Review Bookkeeping
+
+Run after the phase report validates and before Per-Phase Review dispatches the
+reviewer. Write the phase's task ledger:
+
+- the `implementation.md` task and phase completion rows: each planned task's
+  status and commit; keep the phase row `in_progress` (tasks complete, review
+  pending), because the phase's terminal status depends on its review;
+- the `state.md` resume pointer (`oat_current_task`, last commit, and
+  timestamp), advanced consistently with `implementation.md` so the two
+  resume pointers never disagree;
+- when the phase report carried a recovery attempt, after the matching
+  handoff-matrix row validates, clear the terminal `pending_attempt` marker,
+  preserve `used_attempts`, and append the validated canonical recovery event
+  to `implementation.md`;
+- remove legacy `oat_execution_mode: subagent-driven`; and
+- preserve any configured retry override.
+
+The task rows, resume pointer, and recovery settlement do not depend on the
+review outcome, which is why they can move ahead of the review; the recovery
+settlement is validated from the phase report, not from the review. A
+terminal-stop branch that ends without a review (`failed-attempt`,
+`direction-required`, or `BLOCKED`) records its event and marker disposition
+through the Step 7a commit block and then stops; it has no Step 7b. Commit it
+through the same scope-resolving branch as Step 7b, including the synced-scope
+`oat project push` path. Why this keeps the fix-child
+preflight clean: the pre-review writes are committed before the reviewer is
+dispatched, so the tree is clean when a bounded fix child is dispatched after
+the review. The Optional External Phase Review Gate later sees this committed
+ledger plus Step 7b's writes.
+
+Pre-review bookkeeping is mandatory:
+
+```bash
+oat state refresh
+PROJECT_SCOPE=$(oat project scope "{PROJECT_PATH}" --format value) || { echo "oat: cannot resolve project scope for {PROJECT_PATH}; refusing to commit artifacts" >&2; exit 1; }
+# fail closed: never fall back to branch bookkeeping when scope resolution fails
+if [ "$PROJECT_SCOPE" = "synced" ]; then
+  oat project push "{PROJECT_PATH}" --message "chore(oat): record {pNN} task ledger before review" || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+else
+  git add {PROJECT_PATH}/implementation.md {PROJECT_PATH}/state.md {PROJECT_PATH}/plan.md
+  [ -f {PROJECT_PATH}/project-log.md ] && git add {PROJECT_PATH}/project-log.md
+  git commit -m "chore(oat): record {pNN} task ledger before review"
+fi
+```
+
+A parallel group makes this commit once after fan-in, together with Step 7b
+(step 10 of Parallel Group Execution), because its phase worktrees do not carry
+the root ledger.
+
+#### Step 7b: Post-Review Bookkeeping
+
+Run after the phase's terminal review outcome (pass, or retry exhaustion).
+Write the review-outcome bookkeeping that Step 7a leaves out:
 
 - append an Orchestration Run with phase outcomes, task commits, phase/root
   review result, fix iterations, dispatch stamps, selection reasons,
@@ -891,10 +972,30 @@ After each phase or parallel group:
   move an event status backward;
 - apply the Reviews Ledger Mutation Contract above before every disposition or
   archive re-point;
-- update `state.md` current task, last commit, and timestamp;
-- remove legacy `oat_execution_mode: subagent-driven`; and
+- set the phase's `implementation.md` row from the review outcome: `blocked`
+  on retry exhaustion; on a passing review, keep the row nonterminal
+  (`in_progress`) while any review-fix task added by review-receive is open or
+  a selected Optional External Phase Review Gate has not yet passed, and set
+  `complete` only under the rule below; update the phase summary for any
+  review-fix commits;
+- append the deferred phase-outcome and review-orchestration entries through
+  `oat project log append`;
+- update `state.md` last commit and timestamp for any review-fix commit, and
+  its current task when the phase outcome changes it; and
 - preserve any configured retry override.
 
+Phase row transitions: a passing root review (zero Critical and zero High) can
+still queue Medium or Low fix tasks through review-receive, and the selected
+phase gate runs after this step, so neither makes the phase complete by itself.
+An added review-fix task keeps the row `in_progress` and names the queued task;
+the bookkeeping that completes that task re-evaluates the row. A `blocked` gate
+keeps the row `in_progress` through the bounded fix loop; gate retry exhaustion
+sets it `blocked`. Set the row `complete` only when every review disposition is
+settled and every selected phase gate has passed, in whichever bookkeeping
+commit observes that last condition: this Step 7b commit when nothing is
+queued and no gate is selected, otherwise the commit that records the final
+review-fix task or the passing gate.
+
 Bookkeeping is mandatory:
 
 ```bash

package/assets/skills/oat-project-lite/SKILL.md

@@ -7,7 +7,7 @@ disable-model-invocation: true
 user-invocable: true
 allowed-tools: Read, Write, Bash, Glob, Grep, AskUserQuestion
 metadata:
-  version: 1.1.5
+  version: 1.1.6
 ---
 
 # Lite Project
@@ -159,6 +159,28 @@ PROJECT_PATH=$(oat config get activeProject)
 Confirm `state.md` reports `oat_workflow_mode: lite`, `oat_phase: plan`, and
 `oat_phase_status: in_progress`. Do not create discovery or design artifacts.
 
+**Consolidating earlier scaffolds.** When this new Lite project absorbs work
+that earlier project scaffolds already started — those directories are being
+retired into this one rather than continued — record what was absorbed in
+`"$PROJECT_PATH/state.md"` frontmatter as one frontmatter write immediately
+after the scaffold above, before Step 1. `PROJECT_PATH` here is the value
+re-resolved after `oat project new`, never the pre-scaffold value, which still
+names the previously active project. The fields have the same shapes that
+`oat-project-quick-start` records:
+
+- `absorbed_projects: [<slug>]` — the project slug of every retired scaffold,
+  which also names the scaffold directory under the projects root that this
+  project supersedes.
+- `absorbed_backlog_ids: [<BL-id>]` — every backlog ID those scaffolds carried
+  into this project.
+
+Record both fields only when a consolidation actually happened; an absent field
+and an empty list are equivalent. A resumed Lite project keeps whatever it
+already recorded. These two fields are the only inputs the absorbed-project
+retirement sweep reads at completion, where retiring a scaffold is treated as a
+semantic claim about the planning surfaces rather than the physical removal of
+a directory. The write travels with this project's next `state.md` commit.
+
 ### Step 1: Read Repository Knowledge
 
 Read repository instructions and the minimum durable context needed for the

package/assets/skills/oat-project-lite/references/docs/autonomy-contract.md

@@ -274,7 +274,7 @@ remains immutable baseline evidence for the original p01-t01 verification.
 | `oat-dispatch-subagents/references/provider-claude.md`         | `fbe3a21e9533 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | `oat-dispatch-subagents/references/provider-codex.md`          | `95b0f82018c7 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | `oat-dispatch-subagents/references/provider-cursor.md`         | `f781555295a9 -> NG`; `55ccfef14fd6 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `oat-dispatch-subagents/references/record-schema.md`           | `78f8069274a8 -> NG`; `1c9a84c4d1e0 -> NG`; `2a63da6e3a96 -> NG`; `30762d53b043 -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| `oat-dispatch-subagents/references/record-schema.md`           | `78f8069274a8 -> NG`; `1c9a84c4d1e0 -> NG`; `2a63da6e3a96 -> NG`; `30762d53b043 -> NG`; `66bc2f0d4fda -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `oat-project-dispatch-subagents/SKILL.md`                      | `eca03ad1ca12 -> PDISPATCH-01`; `59fbcdc79cea -> PDISPATCH-01`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `oat-project-plan/SKILL.md`                                    | `f99e44b39932 -> PLAN-12`; `7e6a9854504b -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | `oat-project-complete/SKILL.md`                                | `0177956707aa -> NG`; `8305b5bb65ef -> NG`; `3c0b26f0ff1c -> NG`; `8cc1fa5aab1e -> COMPLETE-01`; `4c209fbb4716 -> COMPLETE-01`; `02e4175e1171 -> COMPLETE-01`; `d698d4f98e76 -> COMPLETE-01`; `9f86a7218d93 -> COMPLETE-01`; `024713698d9a -> COMPLETE-01`; `c327995053fa -> COMPLETE-01`; `61f81d4ec7c1 -> COMPLETE-01`; `14fb2e56809f -> COMPLETE-01`; `7d4ff668744d -> COMPLETE-01`; `502a6c141784 -> COMPLETE-01`; `fb7e2db356af -> COMPLETE-01`; `f73f8476360a -> NG`; `1e15f420039f -> NG`; `cc234032ddd7 -> NG`; `1dd54687229b -> NG`; `fc05c8303cd2 -> NG`; `24be721d635e -> NG`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |