@open-agent-toolkit/cli 0.2.41 → 0.2.46

package/assets/skills/oat-project-review-provide/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-project-review-provide
-version: 1.4.1
+version: 1.5.1
 description: Use when the user explicitly asks to review an OAT project — e.g. "review project", "review the project", "run project review", or confirms a previously offered review. Do NOT auto-invoke on completed work alone. Resolves a project review scope and offers before running.
 disable-model-invocation: false
 user-invocable: true
@@ -108,10 +108,21 @@ OAT stores active project context in `.oat/config.local.json` (`activeProject`,
 
 ```bash
 PROJECT_PATH=$(oat config get activeProject 2>/dev/null || true)
-PROJECTS_ROOT="${OAT_PROJECTS_ROOT:-$(oat config get projects.root 2>/dev/null || echo ".oat/projects/shared")}"
-PROJECTS_ROOT="${PROJECTS_ROOT%/}"
+if [ -n "$PROJECT_PATH" ]; then
+  PROJECT_SCOPE=$(oat project scope "$PROJECT_PATH" --format value) || { echo "oat: cannot resolve project scope for $PROJECT_PATH; refusing project arrival" >&2; exit 1; }
+  if [ "$PROJECT_SCOPE" = "synced" ]; then
+    PROJECT_SLUG=$(basename "$PROJECT_PATH")
+    if [ -f "$PROJECT_PATH.json" ] || git ls-remote --exit-code origin "refs/oat/projects/$PROJECT_SLUG" >/dev/null 2>&1; then
+      oat project pull "$PROJECT_PATH" || { echo "oat: project pull failed for $PROJECT_PATH; resolve the reported state before continuing" >&2; exit 1; }
+    fi
+  fi
+fi
 ```
 
+The pull runs before directory and `state.md` validation. This materializes an
+absent synced checkout when its discovery record or remote ref exists, adopting
+the remote ref when the current branch does not yet have a record.
+
 Validation rules:
 
 - Prefer `PROJECT_PATH` from `activeProject` when it is set and points to an existing directory.
@@ -259,6 +270,18 @@ Before gathering review context, inspect the core project artifacts:
 - `"$PROJECT_PATH/state.md"`
 - `.oat/state.md` is generated dashboard state; ignore it for committed artifact baseline checks.
 
+Resolve the project scope before the baseline check. For `synced`, inspect the
+nested checkout directly so ignored files cannot hide pending bookkeeping:
+
+```bash
+PROJECT_SCOPE=$(oat project scope "$PROJECT_PATH" --format value) || exit 1
+if [ "$PROJECT_SCOPE" = "synced" ]; then
+  git -C "$PROJECT_PATH" status --porcelain -- discovery.md spec.md design.md plan.md implementation.md state.md
+else
+  git status --porcelain -- "$PROJECT_PATH/discovery.md" "$PROJECT_PATH/spec.md" "$PROJECT_PATH/design.md" "$PROJECT_PATH/plan.md" "$PROJECT_PATH/implementation.md" "$PROJECT_PATH/state.md"
+fi
+```
+
 If any of those files are untracked or modified only because the previous workflow step did not finish its bookkeeping commit:
 
 - Stop and tell the user to commit the pending artifact bookkeeping first, or resume the originating workflow skill so it can do that commit.
@@ -998,7 +1021,7 @@ Findings: {N} critical, {N} important, {N} medium, {N} minor
 
 Run the `oat-project-review-receive` skill to convert findings into plan tasks.
 
-```
+````
 
 ### Step 8.5: Validate Review Orchestration and Append Root Log
 
@@ -1095,6 +1118,21 @@ After writing the review artifact and applying the Step 9 Reviews-table update,
 - Warn that uncommitted review bookkeeping can desync workflow routing/restart behavior
 - In the summary, clearly state: "bookkeeping not committed (user-approved defer)"
 
+Otherwise commit with the fail-closed scope guard:
+
+```bash
+ACTIVE_REVIEW_PATH="$PROJECT_PATH/reviews/$REVIEW_FILENAME"
+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 {scope} review artifact" || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+else
+  git add "$ACTIVE_REVIEW_PATH"
+  [ -f "$PROJECT_PATH/plan.md" ] && git add "$PROJECT_PATH/plan.md"
+  git diff --cached --quiet || git commit -m "chore(oat): record {scope} review artifact"
+fi
+````
+
 ### Step 10: Output Summary
 
 **If subagent used (Tier 1):**
@@ -1152,4 +1190,7 @@ Next: Run the oat-project-review-receive skill to convert findings into plan tas
 - Review artifact + plan bookkeeping committed atomically on the correct branch (or explicitly deferred with user approval)
 - For final scope, deferred findings ledger included in reviewer context
 - User guided to next step (`oat-project-review-receive`)
+
+```
+
 ```

package/assets/skills/oat-project-review-receive/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-project-review-receive
-version: 1.6.0
+version: 1.6.1
 description: Use when the user explicitly asks to receive review findings for an OAT project — e.g. "receive review", "process review", "process the project review", or confirms a previously offered review-receive step. Do NOT auto-invoke merely because a review file exists. Resolves the latest review and offers before acting.
 disable-model-invocation: false
 user-invocable: true
@@ -399,6 +399,9 @@ Expected: {expected outcome}
 git add {files}
 git commit -m "fix({task_id}): {description}"
 ```
+
+Fix tasks that edit synced artifacts use `oat project push` under the scope
+guard instead of the branch commit template above.
 ````
 
 ````
@@ -526,12 +529,18 @@ Rules:
 Commit all modified OAT tracking files atomically:
 
 ```bash
-git add "$PROJECT_PATH/plan.md" "$PROJECT_PATH/implementation.md" "$PROJECT_PATH/state.md"
-# Capture the Step 7.5 archive move: stages both the deletion of the original
-# review path and the new archived location. Scope to the project's reviews/
-# directory — never use repo-wide `git add -A`.
-git add "$PROJECT_PATH/reviews/"
-git diff --cached --quiet || git commit -m "chore(oat): record review findings and add fix tasks ({scope})"
+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 review findings and add fix tasks ({scope})" || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+else
+  git add "$PROJECT_PATH/plan.md" "$PROJECT_PATH/implementation.md" "$PROJECT_PATH/state.md"
+  # Capture the Step 7.5 archive move: stages both the deletion of the original
+  # review path and the new archived location. Scope to the project's reviews/
+  # directory — never use repo-wide `git add -A`.
+  git add "$PROJECT_PATH/reviews/"
+  git diff --cached --quiet || git commit -m "chore(oat): record review findings and add fix tasks ({scope})"
+fi
 ```
 
 Do not use `git add -A` or glob patterns that reach outside `"$PROJECT_PATH/reviews/"`. Do not include unrelated implementation or code files in this commit. Do not defer this commit without explicit user approval — if deferred, clearly state in the summary that bookkeeping is uncommitted so the original agent knows to commit on return.

package/assets/skills/oat-project-review-receive-remote/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-project-review-receive-remote
-version: 1.5.0
+version: 1.5.1
 description: Use when processing GitHub PR review comments within project context. Fetches PR comments, creates plan tasks, and updates project artifacts.
 disable-model-invocation: true
 user-invocable: true
@@ -267,8 +267,14 @@ Update `state.md`:
 Commit all modified OAT tracking files atomically:
 
 ```bash
-git add "$PROJECT_PATH/plan.md" "$PROJECT_PATH/implementation.md" "$PROJECT_PATH/state.md" "$REMOTE_REVIEW_PATH"
-git diff --cached --quiet || git commit -m "chore(oat): record remote review findings and add fix tasks (pr-#$PR_NUMBER)"
+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 remote review findings and add fix tasks (pr-#$PR_NUMBER)" || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+else
+  git add "$PROJECT_PATH/plan.md" "$PROJECT_PATH/implementation.md" "$PROJECT_PATH/state.md" "$REMOTE_REVIEW_PATH"
+  git diff --cached --quiet || git commit -m "chore(oat): record remote review findings and add fix tasks (pr-#$PR_NUMBER)"
+fi
 ```
 
 Do not use `git add -A` or glob patterns. Do not include unrelated implementation or code files. Do not defer this commit without explicit user approval.

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

@@ -1,6 +1,6 @@
 ---
 name: oat-project-revise
-version: 1.0.0
+version: 1.0.1
 description: Use when a project has an open PR and human feedback needs to be incorporated. Creates revision tasks and re-enters implementation.
 disable-model-invocation: true
 user-invocable: true
@@ -185,6 +185,9 @@ Expected: {expected outcome}
 git add {files}
 git commit -m "fix(prev{N}-t01): {description}"
 ```
+
+Fix tasks that edit synced artifacts use `oat project push` under the scope
+guard instead of the branch commit template above.
 ````
 
 ````
@@ -268,8 +271,14 @@ After the delegated skill completes:
 ### Step 6: Commit Bookkeeping
 
 ```bash
-git add "$PROJECT_PATH/plan.md" "$PROJECT_PATH/implementation.md" "$PROJECT_PATH/state.md"
-git diff --cached --quiet || git commit -m "chore(oat): create revision tasks for {project-name}"
+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): create revision tasks for {project-name}" || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+else
+  git add "$PROJECT_PATH/plan.md" "$PROJECT_PATH/implementation.md" "$PROJECT_PATH/state.md"
+  git diff --cached --quiet || git commit -m "chore(oat): create revision tasks for {project-name}"
+fi
 ```
 
 ### Step 7: Output Summary

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

@@ -1,6 +1,6 @@
 ---
 name: oat-project-spec
-version: 2.0.1
+version: 2.0.2
 description: Use when discovery is complete but you're not ready to design yet, and you want to formalize requirements into a structured spec.md as an optional standalone step. Independent of the design workflow — oat-project-design confirms requirements automatically and does not require this skill to be run first.
 disable-model-invocation: true
 user-invocable: true
@@ -437,14 +437,27 @@ Specification - Ready for design phase
 During implementation of OAT itself, use standard commit format.
 
 ```bash
-git add "$PROJECT_PATH/"
-git commit -m "docs: complete specification for {project-name}
+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 "docs: complete specification for {project-name}
+
+Requirements:
+- {N} functional requirements (P0: {n}, P1: {n}, P2: {n})
+- {N} non-functional requirements (P0: {n}, P1: {n}, P2: {n})
+
+Ready for design phase" || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+else
+  PROJECT_OUTPUT_PATHS=("$PROJECT_PATH/spec.md" "$PROJECT_PATH/state.md")
+  git add -- "${PROJECT_OUTPUT_PATHS[@]}"
+  git commit -m "docs: complete specification for {project-name}
 
 Requirements:
 - {N} functional requirements (P0: {n}, P1: {n}, P2: {n})
 - {N} non-functional requirements (P0: {n}, P1: {n}, P2: {n})
 
 Ready for design phase"
+fi
 ```
 
 ### Step 21: Output Summary

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

@@ -1,10 +1,10 @@
 ---
 name: oat-project-summary
-version: 1.5.0
+version: 1.5.1
 description: Use when the user requests or confirms summarizing an active OAT project — e.g. "summarize the project", "generate the summary", "run oat-project-summary", or confirms a previously offered summary run. Do NOT auto-invoke when implementation completes. Generates summary.md from project artifacts as institutional memory.
 disable-model-invocation: false
 user-invocable: true
-allowed-tools: Read, Write, Bash(git:*), Bash(oat config:*), Bash(oat decision:*), Bash(oat project log:*), Bash(oat tools:*), Glob, Grep, AskUserQuestion
+allowed-tools: Read, Write, Bash(git:*), Bash(jq:*), Bash(oat config:*), Bash(oat decision:*), Bash(oat pjm:*), Bash(oat project log:*), Bash(oat project push:*), Bash(oat project scope:*), Bash(oat tools:*), Glob, Grep, AskUserQuestion
 ---
 
 # Project Summary
@@ -323,11 +323,34 @@ Run this step after `summary.md` has been authored or refreshed, including the
 distinct `## Autonomous Execution Learnings` section when its source artifact
 exists.
 
-When Step 2.5 found entries, run:
+Before the roll-up or decision promotion mutates repository-wide outputs,
+preflight the owned paths and snapshot unrelated staged state:
 
 ```bash
-PROJECT_LOG_LEDGER_PATH=$(oat config get workflow.projectLogLedgerPath)
+DECISIONS_ROOT=".oat/repo/reference/decisions"
+DECISION_INDEX_PATH="$DECISIONS_ROOT/index.md"
+PROMOTED_DECISION_PATHS=()
+DECISION_INDEX_CHANGED="false"
 PROJECT_LOG_LEDGER_APPENDED="false"
+PROJECT_LOG_LEDGER_PATH=$(oat config get workflow.projectLogLedgerPath 2>/dev/null || true)
+OWNED_STAGE_PATHS=("$PROJECT_PATH/summary.md" "$PROJECT_PATH/project-log.md" "$DECISIONS_ROOT")
+if [ -n "$PROJECT_LOG_LEDGER_PATH" ]; then
+  OWNED_STAGE_PATHS+=("$PROJECT_LOG_LEDGER_PATH")
+fi
+git diff --cached --quiet -- "${OWNED_STAGE_PATHS[@]}" || {
+  echo "oat: summary-owned output is already staged; refusing to mix staged state" >&2
+  exit 1
+}
+UNRELATED_STAGED_PATCH_BEFORE=$(git diff --cached --binary)
+```
+
+This preflight intentionally leaves unrelated staged paths in place. Step 8
+must reproduce their staged patch byte-for-byte after its exact-path commits.
+
+When Step 2.5 found entries, run:
+
+```bash
+test -n "$PROJECT_LOG_LEDGER_PATH" || exit 1
 PROJECT_LOG_ROLLUP=$(oat project log rollup --project "$PROJECT_PATH" --json)
 ```
 
@@ -414,7 +437,12 @@ is missing, stop decision promotion and recommend `oat pjm init`. Never use
    - Otherwise → create it:
 
      ```bash
-     oat decision new "<title>" --status accepted --context "<context>" --decision "<decision>" --consequences "<consequences>"
+     DECISION_CREATE=$(oat decision new "<title>" --status accepted --context "<context>" --decision "<decision>" --consequences "<consequences>" --json)
+     DECISION_ID=$(printf '%s\n' "$DECISION_CREATE" | jq -er '.id') || exit 1
+     DECISION_RECORD_PATH="$DECISIONS_ROOT/${DECISION_ID}.md"
+     test -f "$DECISION_RECORD_PATH" || exit 1
+     PROMOTED_DECISION_PATHS+=("$DECISION_RECORD_PATH")
+     DECISION_INDEX_CHANGED="true"
      ```
 
      The command generates the deterministic `DR-YYMMDD-slug` ID, fills every decision body section, and regenerates the managed index automatically — do not hand-edit `index.md`. Optionally pass `--created-at "<project completion date>"` when a project completion date is available, so the record's date reflects when the decision was made.
@@ -436,14 +464,75 @@ This is informational only. There is no interactive prompt anywhere in this step
 ### Step 8: Commit
 
 ```bash
-git add "$PROJECT_PATH/summary.md"
-if [ "$PROJECT_LOG_PROMOTION_APPENDED" = "true" ]; then
-  git add "$PROJECT_PATH/project-log.md"
-fi
+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
+
+PARENT_OUTPUT_PATHS=()
 if [ "$PROJECT_LOG_LEDGER_APPENDED" = "true" ]; then
-  git add "$PROJECT_LOG_LEDGER_PATH"
+  PARENT_OUTPUT_PATHS+=("$PROJECT_LOG_LEDGER_PATH")
+fi
+if [ "${#PROMOTED_DECISION_PATHS[@]}" -gt 0 ]; then
+  PARENT_OUTPUT_PATHS+=("${PROMOTED_DECISION_PATHS[@]}")
+fi
+if [ "$DECISION_INDEX_CHANGED" = "true" ]; then
+  PARENT_OUTPUT_PATHS+=("$DECISION_INDEX_PATH")
 fi
-git commit -m "docs: generate summary for {project-name}"
+
+PARENT_DURABILITY_COMMIT=""
+if [ "$PROJECT_SCOPE" = "synced" ] && [ "${#PARENT_OUTPUT_PATHS[@]}" -gt 0 ]; then
+  git add -- "${PARENT_OUTPUT_PATHS[@]}"
+  if [ "$PROJECT_LOG_LEDGER_APPENDED" = "true" ] && [ "$DECISION_INDEX_CHANGED" = "true" ]; then
+    PARENT_COMMIT_MESSAGE="docs: update project log ledger and decisions for {project-name}"
+  elif [ "$PROJECT_LOG_LEDGER_APPENDED" = "true" ]; then
+    PARENT_COMMIT_MESSAGE="docs: update project log ledger for {project-name}"
+  else
+    PARENT_COMMIT_MESSAGE="docs: promote summary decisions for {project-name}"
+  fi
+  git commit --only -m "$PARENT_COMMIT_MESSAGE" -- "${PARENT_OUTPUT_PATHS[@]}"
+  PARENT_DURABILITY_COMMIT=$(git rev-parse HEAD)
+  PARENT_COMMIT_PATHS=$(git diff-tree --no-commit-id --name-only -r "$PARENT_DURABILITY_COMMIT")
+  # Inspect the complete output and require exact set equality with the
+  # de-duplicated PARENT_OUTPUT_PATHS array before continuing.
+fi
+```
+
+Define this fail-closed parser before either synced summary push. On rejection,
+print the full CLI JSON, run `oat project pull "$PROJECT_PATH"`, resolve its
+reported conflict, and retry the original push.
+
+```bash
+parse_synced_push_receipt() {
+  node -e '
+let value;
+try { value = JSON.parse(process.argv[1]); } catch { process.exit(1); }
+if (!["pushed", "up-to-date"].includes(value.status) || !/^[0-9a-f]{40}$/.test(value.sha)) process.exit(1);
+process.stdout.write(value.sha);
+' "$1"
+}
+```
+
+```bash
+if [ "$PROJECT_SCOPE" = "synced" ]; then
+  SUMMARY_PUSH=$(oat project push "$PROJECT_PATH" --message "docs: generate summary for {project-name}" --json) || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+  SUMMARY_COMMIT_SHA=$(parse_synced_push_receipt "$SUMMARY_PUSH") || { printf '%s\n' "$SUMMARY_PUSH" >&2; echo "Recovery: run oat project pull \"$PROJECT_PATH\", resolve conflicts, then retry this push." >&2; exit 1; }
+else
+  PROJECT_OUTPUT_PATHS=("$PROJECT_PATH/summary.md")
+  if [ "$PROJECT_LOG_PROMOTION_APPENDED" = "true" ]; then
+    PROJECT_OUTPUT_PATHS+=("$PROJECT_PATH/project-log.md")
+  fi
+  if [ "${#PARENT_OUTPUT_PATHS[@]}" -gt 0 ]; then
+    PROJECT_OUTPUT_PATHS+=("${PARENT_OUTPUT_PATHS[@]}")
+  fi
+  git add -- "${PROJECT_OUTPUT_PATHS[@]}"
+  git commit --only -m "docs: generate summary for {project-name}" -- "${PROJECT_OUTPUT_PATHS[@]}"
+  SUMMARY_COMMIT_SHA=$(git rev-parse HEAD)
+fi
+
+UNRELATED_STAGED_PATCH_AFTER=$(git diff --cached --binary)
+[ "$UNRELATED_STAGED_PATCH_AFTER" = "$UNRELATED_STAGED_PATCH_BEFORE" ] || {
+  echo "oat: unrelated staged state changed during summary persistence" >&2
+  exit 1
+}
 ```
 
 These conditional paths are required: append-based promotion mutates
@@ -451,12 +540,23 @@ These conditional paths are required: append-based promotion mutates
 repository ledger. A permitted skip or deduplicated ledger does not add a
 ledger staging path.
 
-If decision records were promoted in Step 7, also stage `.oat/repo/reference/decisions/` so the new `DR-*.md` records and the regenerated `index.md` land with the summary.
+For a synced project, repository-wide decision and ledger outputs are committed
+on the parent branch before the summary is pushed to its project ref. A new
+decision with no ledger append therefore receives the dedicated guarded parent
+commit above. Record `PARENT_DURABILITY_COMMIT` and the verified exact paths in
+the output summary. Never stage the whole decisions directory.
 
 If this is a re-run (incremental update):
 
 ```bash
-git commit -m "docs: update summary for {project-name}"
+if [ "$PROJECT_SCOPE" = "synced" ]; then
+  SUMMARY_PUSH=$(oat project push "$PROJECT_PATH" --message "docs: update summary for {project-name}" --json) || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+  SUMMARY_COMMIT_SHA=$(parse_synced_push_receipt "$SUMMARY_PUSH") || { printf '%s\n' "$SUMMARY_PUSH" >&2; echo "Recovery: run oat project pull \"$PROJECT_PATH\", resolve conflicts, then retry this push." >&2; exit 1; }
+else
+  git add -- "${PROJECT_OUTPUT_PATHS[@]}"
+  git commit --only -m "docs: update summary for {project-name}" -- "${PROJECT_OUTPUT_PATHS[@]}"
+  SUMMARY_COMMIT_SHA=$(git rev-parse HEAD)
+fi
 ```
 
 ### Step 9: Output Summary

package/assets/skills/oat-wave-execute/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-wave-execute
-version: 1.8.0
+version: 1.8.2
 description: Use when executing a wave of external implementation plans as a wrapper OAT project — scaffolding, drift refresh, parallel worktree groups, briefs, gates, merge choreography, and closeout.
 argument-hint: '<wave-id> [plan-names...] (e.g. wave-2 http-listener-before-indexing ...)'
 disable-model-invocation: false
@@ -66,6 +66,10 @@ cross-lane synthesis, the end-of-run synthesis, and all user checkpoints.
    that commit can fail silently; the ORCHESTRATOR commits the gate artifact on
    the reviewer's behalf. Keep the tree clean around either path (both consumers:
    stoa waves 2–3; Orc W1–W4).
+   Before persisting a gate artifact, resolve the wrapper project's scope with
+   `oat project scope "$PROJECT_PATH" --format value` and fail closed. A synced
+   wrapper uses `oat project push`; other scopes retain the existing gate-artifact
+   branch commit.
 4. **Pre-declare CUMULATIVE churn in every brief:** declarations cover everything
    landed since each source plan's AUTHORED COMMIT (drift checks compare against
    that commit, not the group base), naming files + rough regions. Zero false
@@ -234,6 +238,31 @@ carry the stored verification records required by the fix-disposition contract b
 `passed` is the only
 terminal state for gate rows (Orc operator-audit S8).
 
+Persist the gate artifact and its dispositions through the wrapper project's
+scope-aware bookkeeping route:
+
+```bash
+PROJECT_PATH=$(oat config get activeProject 2>/dev/null || true)
+if [ -z "$PROJECT_PATH" ]; then
+  echo "oat: no active wrapper project; refusing wave gate bookkeeping" >&2
+  exit 1
+fi
+PROJECT_SCOPE=$(oat project scope "$PROJECT_PATH" --format value) || { echo "oat: cannot resolve project scope for $PROJECT_PATH; refusing wave gate bookkeeping" >&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 wave plan gate" || { echo "oat: project push failed; run oat project pull, resolve the reported state, and retry" >&2; exit 1; }
+else
+  PROJECT_OUTPUT_PATHS=()
+  while IFS= read -r output_path; do
+    PROJECT_OUTPUT_PATHS+=("$output_path")
+  done < <(git diff --name-only -- "$PROJECT_PATH")
+  [ "${#PROJECT_OUTPUT_PATHS[@]}" -gt 0 ] || exit 1
+  git add -- "${PROJECT_OUTPUT_PATHS[@]}"
+  git diff --cached --quiet -- "${PROJECT_OUTPUT_PATHS[@]}" ||
+    git commit --only -m "chore(oat): record wave plan gate" -- "${PROJECT_OUTPUT_PATHS[@]}"
+fi
+```
+
 ### Step 5: Execute via `oat-project-implement`
 
 The lifecycle skill owns execution. This skill contributes the templates it uses:
@@ -326,7 +355,10 @@ The lifecycle skill owns execution. This skill contributes the templates it uses
   `.oat/config.json` keys remain present; this check originated with
   `BL-260715-investigate-oat-config-json` in the source program's repo. Update
   canonical sections in place, the run-entry table, review rows, and state;
-  remove worktrees + branches after merge.
+  remove worktrees + branches after merge. Wrapper-project artifact bookkeeping
+  at this boundary uses the same fail-closed scope guard and `oat project push`
+  when the wrapper is synced; code merge commits remain on the integration
+  branch unchanged.
 
 ### Step 6: Closeout
 

package/assets/skills/oat-worktree-bootstrap/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-worktree-bootstrap
-version: 1.2.1
+version: 1.3.1
 description: Use when creating or resuming a git worktree for OAT implementation. Creates or validates a worktree and runs OAT bootstrap checks.
 argument-hint: '<branch-name> [--base <ref>] [--path <root>] [--existing]'
 disable-model-invocation: true
@@ -161,11 +161,23 @@ After config propagation, sync configured `localPaths` into the worktree:
 
 ```bash
 oat local sync "{target-path}" 2>/dev/null || true
+TARGET_ACTIVE_PROJECT=$(cd "{target-path}" && oat config get activeProject 2>/dev/null || true)
+if [ -n "$TARGET_ACTIVE_PROJECT" ]; then
+  (
+    cd "{target-path}"
+    PROJECT_SCOPE=$(oat project scope "$TARGET_ACTIVE_PROJECT" --format value) || exit 1
+    if [ "$PROJECT_SCOPE" = "synced" ]; then
+      oat project pull "$TARGET_ACTIVE_PROJECT"
+    fi
+  )
+fi
 ```
 
 - Uses the `localPaths` array from `.oat/config.json` to copy local-only directories (e.g., `.oat/ideas/`, `.oat/projects/local/`) into the worktree.
 - Non-blocking: if sync fails or no `localPaths` are configured, bootstrap continues.
 - Does not overwrite existing paths in the target (use `--force` to override).
+- `oat local sync` skips nested synced-project checkouts; the explicit pull
+  above materializes or reconciles the active synced project instead.
 
 ### Step 3: Resolve and Run the Repository Bootstrap
 

package/assets/skills/oat-worktree-bootstrap-auto/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-worktree-bootstrap-auto
-version: 1.5.6
+version: 1.6.1
 description: Use when an orchestrator/subagent needs autonomous worktree bootstrap. Non-interactive companion to oat-worktree-bootstrap.
 argument-hint: '<branch-name> [--base <ref>] [--path <root>] [--baseline-policy <strict|allow-failing>]'
 disable-model-invocation: false
@@ -210,10 +210,22 @@ fi
 
 ```bash
 oat local sync "$TARGET_PATH" 2>/dev/null || true
+TARGET_ACTIVE_PROJECT=$(cd "$TARGET_PATH" && oat config get activeProject 2>/dev/null || true)
+if [ -n "$TARGET_ACTIVE_PROJECT" ]; then
+  (
+    cd "$TARGET_PATH"
+    PROJECT_SCOPE=$(oat project scope "$TARGET_ACTIVE_PROJECT" --format value) || exit 1
+    if [ "$PROJECT_SCOPE" = "synced" ]; then
+      oat project pull "$TARGET_ACTIVE_PROJECT"
+    fi
+  )
+fi
 ```
 
 - Copies configured `localPaths` (e.g., `.oat/ideas/`, `.oat/projects/local/`) into the worktree.
 - Non-blocking: if sync fails or no `localPaths` are configured, bootstrap continues.
+- `oat local sync` skips nested synced-project checkouts; the explicit pull
+  above materializes or reconciles the active synced project non-interactively.
 
 ### Step 2.7: Verify Resolved Base in Worktree HEAD
 

package/dist/commands/config/index.d.ts

@@ -9,6 +9,7 @@ interface ConfigCommandDependencies {
     buildCommandContext: (options: Parameters<typeof buildCommandContext>[0]) => CommandContext;
     resolveProjectRoot: (cwd: string) => Promise<string>;
     readOatConfig: (repoRoot: string) => Promise<OatConfig>;
+    readOatConfigForDefaultScopeRepair: (repoRoot: string) => Promise<OatConfig>;
     writeOatConfig: (repoRoot: string, config: OatConfig) => Promise<void>;
     readOatLocalConfig: (repoRoot: string) => Promise<OatLocalConfig>;
     writeOatLocalConfig: (repoRoot: string, config: OatLocalConfig) => Promise<void>;

package/dist/commands/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/config/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AAmBzC,OAAO,EAML,KAAK,SAAS,EACd,KAAK,cAAc,EAGnB,KAAK,UAAU,EAehB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAGL,KAAK,8BAA8B,EACnC,KAAK,yBAAyB,EAC/B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EACL,mCAAmC,EACnC,0BAA0B,EAC3B,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyGpC,UAAU,yBAAyB;IACjC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAC/C,cAAc,CAAC;IACpB,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,kBAAkB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAClE,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,KACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,cAAc,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/D,eAAe,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7B,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,kBAAkB,EAAE,CAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC7C,mCAAmC,EAAE,OAAO,mCAAmC,CAAC;IAChF,0BAA0B,EAAE,OAAO,0BAA0B,CAAC;IAC9D,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AAgiFD,wBAAgB,mBAAmB,CACjC,SAAS,GAAE,OAAO,CAAC,yBAAyB,CAAM,GACjD,OAAO,CAsKT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/config/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGhF,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AAmBzC,OAAO,EAML,KAAK,SAAS,EACd,KAAK,cAAc,EAGnB,KAAK,UAAU,EAgBhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAGL,KAAK,8BAA8B,EACnC,KAAK,yBAAyB,EAC/B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EACL,mCAAmC,EACnC,0BAA0B,EAC3B,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0GpC,UAAU,yBAAyB;IACjC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAC/C,cAAc,CAAC;IACpB,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,kCAAkC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7E,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,kBAAkB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAClE,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,KACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,cAAc,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/D,eAAe,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7B,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,kBAAkB,EAAE,CAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC7C,mCAAmC,EAAE,OAAO,mCAAmC,CAAC;IAChF,0BAA0B,EAAE,OAAO,0BAA0B,CAAC;IAC9D,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AAqkFD,wBAAgB,mBAAmB,CACjC,SAAS,GAAE,OAAO,CAAC,yBAAyB,CAAM,GACjD,OAAO,CAsKT"}