baldart 4.63.0 → 4.65.0

package/framework/.claude/skills/new/references/merge-cleanup.md

@@ -6,28 +6,33 @@
 
 (The batch now enters Merge & cleanup. No visibility emission — the internal tracker is the only state surface, see SKILL.md § "State surface — the tracker only". Record merge/cleanup completion in the tracker only.)
 
-After the final review passes AND all cards are committed in the worktree, delegate the entire merge and cleanup to the **worktree-manager** skill (`/mw` in programmatic mode):
+After the final review passes AND all cards are committed in the worktree, run the merge through the **deterministic SSOT script** `scripts/merge-worktree.sh` — the merge analogue of `setup-worktree.sh`. **Why a script, not an inline `/mw` Skill call here:** a `Skill()` runs IN this orchestrator's context, so resolving conflicts inline at end-of-batch re-reads the giant cache on every turn (the measured **~20M-token** regression). The script runs the entire merge (safety commit → rebase → **deterministic** additive conflict resolution → build → land → sync → cleanup → registry) as a **background Bash**, so the orchestrator's only in-context cost is launching it + reading a small status file. The script CANNOT fabricate or stall — it does the work or writes an honest status. The one thing it never does is resolve a **code** conflict (that is irreducible judgment) — it pauses and hands those off, off-context, to the `merge-conflict-resolver` subagent.
 
-1. **BEFORE invoking /mw** — verify no uncommitted files remain in the worktree:
+1. **BEFORE launching** — verify no uncommitted files remain in the worktree (the script also makes a safety commit, but commit here too for belt-and-suspenders):
    ```bash
-   cd <worktree-path>
-   git status --porcelain
+   git -C <worktree-path> status --porcelain
    ```
-   If ANY uncommitted files exist (staged, unstaged, or untracked), commit them NOW with `[safety] Auto-commit remaining files before merge`. Do NOT proceed to `/mw` with a dirty worktree — files WILL be lost during rebase.
-2. **Invoke the worktree-manager skill via the Skill tool — this is the ONLY merge mechanism.** The skill that owns `/mw` is named **`worktree-manager`** (NOT `new`, NOT `new:new`, NOT `mw`). Call it exactly, with a concrete payload — never describe the delegation in prose and hope:
-
-   ```
-   Skill({ skill: "worktree-manager",
-           args: "/mw worktreePath=<absolute worktree path from tracker ## Worktree> checksAlreadyPassed=true" })
+   If ANY uncommitted files exist, commit them NOW with `[safety] Auto-commit remaining files before merge`.
+2. **Resolve + launch the script as a BACKGROUND Bash** (you ARE the orchestrator — launch it detached, end the turn, read the status file on resume — exactly how setup.md step 4 launches `setup-worktree.sh`):
+   ```bash
+   MERGE_SH="$(ls .framework/framework/.claude/skills/worktree-manager/scripts/merge-worktree.sh .claude/skills/worktree-manager/scripts/merge-worktree.sh 2>/dev/null | head -1)"
+   bash "$MERGE_SH" --worktree <absolute worktree path from tracker ## Worktree> \
+     --manifest /tmp/new-merge-status-<FIRST-CARD>.txt --skip-checks
    ```
-
-   - `worktreePath` — the absolute path from the tracker `## Worktree` section (REQUIRED). The skill resolves the branch + the card IDs for the commit message from the worktree/registry itself — do **NOT** invent `branch` / `card_ids` / `worktree_path` payload keys (the real input contract is `{ worktreePath, checksAlreadyPassed }`, worktree-manager/SKILL.md § "/mw programmatic").
-   - `checksAlreadyPassed=true` — the final review + QA already validated the build, so the skill skips re-running quality gates (the safety commit ALWAYS still runs regardless).
-   - **HARD — never hand-merge in this orchestrator.** If the Skill call errors (unknown skill, bad args) or the skill STOPs on a conflict/build failure, do **NOT** fall back to inline `git merge` / `git rebase` / `git push` here. Hand-merging runs the entire Phase 6 in the cached prefix (a measured **~20M-token** regression) and risks a non-isolation-safe `git checkout` on the shared main repo. Instead: surface the skill's error/STOP report verbatim, then — **interactive** → `AskUserQuestion` how to proceed; **AUTONOMOUS** → leave the worktree intact and materialize a follow-up card describing the merge blocker (log `AUTO: merge-delegation-failed → follow-up <id>`). `new:new` and `__phase6_merge__` are hallucinations — there is no such skill or arg; the only valid call is the `worktree-manager` one above.
-3. The skill handles: safety commit of any remaining uncommitted files (step 3), rebasing onto the latest trunk (`$TRUNK` = `git.trunk_branch`) (step 4b — auto-resolves doc conflicts, stops on code conflicts), merging into the trunk via the configured `git.merge_strategy` (step 4c — `pr` uses `gh pr merge`, `local-push` does a direct FF push to `origin/$TRUNK`; NEITHER runs `git checkout` of the trunk on the main repo, respecting the absolute terminal-isolation rule), post-merge verification, worktree removal, registry cleanup, and remote branch deletion.
-4. **If code merge conflicts** → the skill STOPs and reports. Doc-only conflicts (ssot-registry.md, project-status.md, etc.) are auto-resolved by keeping both sides.
-5. **If post-merge build fails** → the skill STOPs and keeps the worktree intact for investigation.
-6. Record the merge commit hash and result in the tracker. **Also record the merge timestamp** under `## Worktree Merges` (`merge_ts: <ISO-8601>`): for `local-push` use the local merge-commit time (`git log --format=%ci <hash>`); for `pr` (`gh pr merge`) use the PR merge completion time, or note `merge_ts: pending` if GitHub has not yet finalized the merge. Phase 8's `cycle_time_mins` reads THIS field as the strategy-independent end anchor (never a raw hash that may be the PR HEAD).
+   `--skip-checks` = checksAlreadyPassed (final review + QA already validated the build; the safety commit still runs regardless). The script resolves branch / trunk / strategy / cards from the registry entry itself — do NOT pass them unless overriding.
+3. **Read the status file** (`/tmp/new-merge-status-<FIRST-CARD>.txt`) and branch on `status:` — **never** inspect the conflicts inline in this orchestrator:
+   - **`success`** → the merge landed (`merge_commit` + `merge_ts` are in the file). Proceed to step 5 (record) → Phase 6b.
+   - **`code_conflict`** → the script paused the rebase; `conflict_files:` lists the UNRESOLVED code/test files (every additive doc/registry/JSONL conflict is ALREADY resolved). Delegate the judgment **off-context** — spawn the resolver subagent (do NOT read the conflicts yourself):
+     ```
+     Task({ subagent_type: "merge-conflict-resolver",
+            description: "Resolve final-merge code conflicts",
+            prompt: "worktreePath=<wt>  statusPath=/tmp/new-merge-status-<FIRST-CARD>.txt  manifestPath=/tmp/new-merge-status-<FIRST-CARD>.txt\nClassify each conflict additive→resolve, semantic→STOP, then run merge-worktree.sh --continue per your agent definition." })
+     ```
+     The subagent resolves the additive code conflicts (build-verified), STOPs on semantic ones, and re-runs the script to land. Read its **COMPACT** return, then run the **anti-fabrication disk gate** (do NOT trust its prose): re-read the status file — it counts as merged ONLY if `status: success` AND `merge_commit:` is non-empty (the script writes `success` only after it has landed AND cleaned up the worktree). Any other terminal status (`code_conflict` still, `build_fail`, `error`) means the resolver did not finish → treat as a blocker (next bullet). "Came to rest" ≠ "done".
+   - **`build_fail` / `error` / `sync_needs_decision`** (or the resolver returned a semantic STOP) → **HARD: never hand-merge in this orchestrator.** Do NOT fall back to inline `git merge` / `git rebase` / `git push` (the ~20M regression + a non-isolation-safe `git checkout` on the shared main repo). Surface the status `error:` verbatim, then — **interactive** → `AskUserQuestion` how to proceed; **AUTONOMOUS** → leave the worktree intact and materialize a follow-up card describing the merge blocker (log `AUTO: merge-blocked → follow-up <id>`).
+   - **FALLBACK — script absent OR Task tool unavailable (Codex / older subtree):** if `$MERGE_SH` is empty, OR the `Task`/Agent tool is not available at runtime, fall back to the legacy `Skill({ skill: "worktree-manager", args: "/mw worktreePath=<path> checksAlreadyPassed=true" })` (the skill runs the same sequence inline — zero regression; the only valid skill name is `worktree-manager`, NOT `new:new` / `mw` / `__phase6_merge__`).
+4. **Transcribe sync markers into the tracker.** Read `sync_marker:` / `sync_detail:` from the status file. If `sync_marker` ≠ `none`, append the marker line to the tracker `## Worktree Merges` section as `[<sync_marker>] <sync_detail>` — Phase 6c parses it from there to run its workspace-hygiene gate. (The legacy `Skill(/mw)` fallback emits the same `[SYNC-…]` marker on stdout; capture it into the tracker the same way.)
+5. Record the merge result in the tracker. **Record the merge timestamp** under `## Worktree Merges` (`merge_ts: <ISO-8601>`) — read it straight from the status file `merge_ts:` (`local-push` and `pr` both stamp it). Phase 8's `cycle_time_mins` reads THIS field as the strategy-independent end anchor (never a raw hash that may be the PR HEAD).
 
 ### Phase 6b — Backlog Card Status Reconciliation (MANDATORY — ZERO TOLERANCE)
 

package/framework/.claude/skills/worktree-manager/SKILL.md

@@ -699,6 +699,25 @@ if [ -z "$WORKTREE_PATH" ] || [ -z "$BRANCH" ] || [ -z "$TRUNK" ] || [ -z "$MAIN
 fi
 ```
 
+### 1b. Delegate to the SSOT script (PREFERRED — steps 2–7 below are the fallback)
+
+The ENTIRE merge sequence (safety commit → rebase → **deterministic** additive conflict resolution → build → land via `git.merge_strategy` → sync → cleanup → registry) lives **once** in `scripts/merge-worktree.sh`, the SAME script `/new` Phase 6 and `new2` run — the merge analogue of `setup-worktree.sh`. Do NOT hand-roll the bash: a re-authored copy is the duplication CLAUDE.md forbids, and the script cannot fabricate a merge or stall. Steps 2–7 below remain as the literal **fallback** for when the script is absent (older subtree) and as the human-readable SSOT the script mirrors.
+
+```bash
+MERGE_SH="$(ls "$MAIN/.framework/framework/.claude/skills/worktree-manager/scripts/merge-worktree.sh" "$MAIN/.claude/skills/worktree-manager/scripts/merge-worktree.sh" 2>/dev/null | head -1)"
+```
+
+- **If `$MERGE_SH` is found** — run it and SKIP steps 2–7 (the script does them). Interactive `/mw` runs the pre-merge quality gates (omit `--skip-checks`); **programmatic** `/mw` (orchestrator passed `checksAlreadyPassed=true`) adds `--skip-checks`:
+  ```bash
+  bash "$MERGE_SH" --worktree "$WORKTREE_PATH" --manifest /tmp/mw-status-$(basename "$BRANCH").txt [--skip-checks]
+  ```
+  Then read the status file and act on `status:`:
+  - **`success`** → report the merge (`merge_commit` / `merge_ts` / `strategy` from the file). Done.
+  - **`code_conflict`** → the rebase is paused; `conflict_files:` lists the UNRESOLVED code/test files (all additive doc/registry/JSONL conflicts are already resolved). **Programmatic** (orchestrator): the caller spawns the `merge-conflict-resolver` subagent (see `framework/.claude/skills/new/references/merge-cleanup.md` Phase 6). **Interactive standalone `/mw`**: surface `conflict_files` to the user, or — if asked — spawn `merge-conflict-resolver` yourself; after it resolves, re-run with `--continue`. Never resolve a code conflict by guessing.
+  - **`build_fail` / `error` / `sync_needs_decision`** → surface `error:` verbatim and STOP (the worktree is left intact). Do NOT hand-roll a merge.
+  - The script writes `sync_marker:` / `sync_detail:` into the status file (NOT stdout) — an orchestrator routes them through its workspace-hygiene gate; standalone `/mw` just reports them.
+- **If `$MERGE_SH` is empty** (older subtree) — fall through to steps 2–7 below (the inline fallback).
+
 ### 2. Env sync check
 
 Compare the NEWEST modification time among the `stack.env_files` artifacts in the

package/framework/.claude/skills/worktree-manager/scripts/merge-worktree.sh

@@ -0,0 +1,518 @@
+#!/usr/bin/env bash
+#
+# merge-worktree.sh — SSOT deterministic CODE-worktree MERGE + land + cleanup.
+#
+# The single source of truth for the worktree MERGE sequence, consumed identically
+# by three callers (no per-caller duplication — the sin CLAUDE.md forbids):
+#   • /mw  (worktree-manager § "/mw") — interactive + programmatic
+#   • /new (skill: framework/.claude/skills/new/references/merge-cleanup.md Phase 6)
+#   • new2 (framework/.claude/workflows/new2.js Merge phase)
+#
+# Why a deterministic script instead of a model-driven subagent (the SAME rationale
+# as setup-worktree.sh): the merge is MOSTLY PURE PLUMBING (safety-commit → rebase →
+# strip ADDITIVE conflicts → build → land → sync → cleanup → registry). Driving that
+# through a model put a model in the loop for mechanical work — which either FABRICATES
+# a well-formed "merged, all good" with nothing on disk, or STALLS mid-flight. A
+# deterministic script cannot fabricate or stall: it does the work or fails honestly
+# with a status file the caller string-matches (never the script's word).
+#
+# The ONE thing the script does NOT do is resolve a CODE conflict: classifying a code
+# hunk as additive-vs-semantic is irreducible JUDGMENT. On a code/test conflict the
+# script PAUSES the rebase, records the conflicted files, and exits status:code_conflict
+# — the caller spawns the `merge-conflict-resolver` agent (a fresh, isolated context,
+# NOT the bloated orchestrator) to adjudicate, then re-invokes this script with
+# `--continue`. Everything additive (docs, registries, JSONL) is resolved here,
+# deterministically, with zero model involvement.
+#
+# Usage:
+#   merge-worktree.sh --worktree <abs> --manifest <path> [opts]      # fresh merge
+#   merge-worktree.sh --worktree <abs> --manifest <path> --continue  # after agent resolved code conflicts
+#
+# Required:
+#   --worktree <abs>       absolute worktree path (its registry entry supplies
+#                          branch / trunk / main / cards unless overridden)
+#   --manifest <path>      status file written on EVERY exit path (the caller reads
+#                          THIS — never the bg stdout — and runs its own disk gate)
+#
+# Optional (each falls back to the registry entry / baldart.config.yml / autodetect):
+#   --continue             resume a paused rebase after the resolver agent ran
+#   --branch <branch>      feature branch          (default: registry entry)
+#   --trunk <branch>       git.trunk_branch        (default: registry / config / autodetect)
+#   --main <path>          main repo root          (default: registry / resolve from worktree)
+#   --strategy <pr|local-push>  git.merge_strategy (default: registry/config / pr)
+#   --skip-checks          checksAlreadyPassed — skip pre-merge lint/tsc/build (Phase 3)
+#                          (the safety commit + post-merge build still run)
+#   --metrics-dir <dir>    paths.metrics           (default: config / docs/metrics)
+#   --tc-typecheck <cmd>   toolchain typecheck cmd (default: config / npx tsc --noEmit)
+#   --tc-lint <cmd>        toolchain lint cmd      (default: config / npx eslint --max-warnings=0)
+#   --tc-build <cmd>       toolchain build cmd     (default: config / npm run build)
+#   --log <path>           build/merge log sink    (default: /tmp/wt-merge-<slug>.log)
+#   --build-timeout <s>    hard build timeout sec  (default: 600)
+#
+# Status file written (parsed by callers — STABLE contract):
+#   status: success | code_conflict | build_fail | sync_needs_decision | error
+#   phase: identify | safety | rebase | build | land | sync | cleanup | done
+#   error: <message | ->
+#   worktree_path: <abs | ->
+#   branch: <branch | ->
+#   trunk: <branch | ->
+#   strategy: <pr | local-push | ->
+#   merge_commit: <sha | ->
+#   merge_ts: <ISO-8601 | ->
+#   conflict_files: <csv | ->          (set ONLY on status:code_conflict — the UNRESOLVED code/test files)
+#   sync_marker: <none | SYNC-DEFERRED | SYNC-NEEDS-DECISION>
+#   sync_detail: <message | ->
+#   build_log: <path | ->
+#
+# Exit: 0 ONLY on status:success. Non-zero otherwise (the exit code mirrors the
+# status: 10=code_conflict, 11=build_fail, 12=sync_needs_decision, 1/2=error). The
+# caller NEVER trusts the exit code or the status file as sole evidence — it
+# re-verifies on disk (no residual markers, build green, push landed).
+
+set -u
+
+err() { printf '%s\n' "$*" >&2; }
+
+# --- args ------------------------------------------------------------------
+WORKTREE= MANIFEST= CONTINUE=0 BRANCH= TRUNK= MAIN= STRATEGY= SKIP_CHECKS=0
+METRICS_DIR= TC_TC= TC_LINT= TC_BUILD= LOG= BUILD_TIMEOUT=600
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --worktree) WORKTREE="${2:-}"; shift 2 ;;
+    --manifest) MANIFEST="${2:-}"; shift 2 ;;
+    --continue) CONTINUE=1; shift ;;
+    --branch) BRANCH="${2:-}"; shift 2 ;;
+    --trunk) TRUNK="${2:-}"; shift 2 ;;
+    --main) MAIN="${2:-}"; shift 2 ;;
+    --strategy) STRATEGY="${2:-}"; shift 2 ;;
+    --skip-checks) SKIP_CHECKS=1; shift ;;
+    --metrics-dir) METRICS_DIR="${2:-}"; shift 2 ;;
+    --tc-typecheck) TC_TC="${2:-}"; shift 2 ;;
+    --tc-lint) TC_LINT="${2:-}"; shift 2 ;;
+    --tc-build) TC_BUILD="${2:-}"; shift 2 ;;
+    --log) LOG="${2:-}"; shift 2 ;;
+    --build-timeout) BUILD_TIMEOUT="${2:-}"; shift 2 ;;
+    *) err "ERROR: unknown arg: $1"; exit 2 ;;
+  esac
+done
+
+# --- status writer (called on EVERY exit path) -----------------------------
+M_STATUS="error" M_PHASE="identify" M_ERROR="-" M_MERGE="-" M_MERGETS="-"
+M_CONFLICTS="-" M_SYNCMARK="none" M_SYNCDETAIL="-" M_BLOG="-"
+write_status() {
+  [ -n "$MANIFEST" ] || return 0
+  {
+    printf 'status: %s\n' "$M_STATUS"
+    printf 'phase: %s\n' "$M_PHASE"
+    printf 'error: %s\n' "$M_ERROR"
+    printf 'worktree_path: %s\n' "${WORKTREE:--}"
+    printf 'branch: %s\n' "${BRANCH:--}"
+    printf 'trunk: %s\n' "${TRUNK:--}"
+    printf 'strategy: %s\n' "${STRATEGY:--}"
+    printf 'merge_commit: %s\n' "$M_MERGE"
+    printf 'merge_ts: %s\n' "$M_MERGETS"
+    printf 'conflict_files: %s\n' "$M_CONFLICTS"
+    printf 'sync_marker: %s\n' "$M_SYNCMARK"
+    printf 'sync_detail: %s\n' "$M_SYNCDETAIL"
+    printf 'build_log: %s\n' "$M_BLOG"
+  } > "$MANIFEST" 2>/dev/null || true
+}
+fail()          { M_STATUS="error";         M_ERROR="$1"; write_status; err "ERROR: $1"; exit "${2:-1}"; }
+emit_conflict() { M_STATUS="code_conflict"; M_PHASE="rebase"; M_CONFLICTS="$1"; M_ERROR="code/test conflict needs judgment — spawn merge-conflict-resolver then re-run with --continue"; write_status; err "CODE_CONFLICT: $1"; exit 10; }
+emit_buildfail(){ M_STATUS="build_fail";    M_ERROR="$1"; M_BLOG="${2:-$LOG}"; write_status; err "BUILD_FAIL: $1"; exit 11; }
+
+[ -n "$WORKTREE" ] || { err "ERROR: --worktree is required"; exit 2; }
+[ -n "$MANIFEST" ] || { err "ERROR: --manifest is required"; exit 2; }
+
+# --- canonical worktree→main resolver (mirrors setup-worktree.sh resolve_main /
+#     SKILL.md step 4c: cd INTO the worktree so `git -C ..` resolves the MAIN repo
+#     toplevel; NEVER --git-common-dir+/..). ------------------------------------
+resolve_main_from_wt() {
+  (cd "$WORKTREE" 2>/dev/null && git -C .. rev-parse --show-toplevel 2>/dev/null)
+}
+
+# --- is a rebase paused for THIS worktree? For a linked worktree the rebase
+#     state lives in $MAIN/.git/worktrees/<name>/rebase-{merge,apply}, NOT in
+#     $WORKTREE/.git (which is a gitdir-pointer FILE). --absolute-git-dir
+#     returns that per-worktree gitdir. -----------------------------------------
+rebase_in_progress() {
+  local gd
+  gd="$(git -C "$WORKTREE" rev-parse --absolute-git-dir 2>/dev/null)" || return 1
+  [ -d "$gd/rebase-merge" ] || [ -d "$gd/rebase-apply" ]
+}
+
+# --- read a paths.* / git.* scalar from baldart.config.yml ------------------
+config_scalar() {
+  local block="$1" key="$2" cfg="$MAIN/baldart.config.yml"
+  [ -f "$cfg" ] || return 0
+  grep -A60 "^${block}:" "$cfg" 2>/dev/null \
+    | grep -m1 "[[:space:]]*${key}:" \
+    | sed -E "s/.*${key}:[[:space:]]*\"?([^\"#]*)\"?.*/\1/" \
+    | sed -E 's/[[:space:]]+$//'
+}
+
+# --- registry entry field reader (by worktree path) via node ----------------
+REG=""
+registry_field() {
+  [ -n "$REG" ] && [ -f "$REG" ] || return 0
+  REG_FILE="$REG" R_PATH="$WORKTREE" R_KEY="$1" node -e '
+    const fs = require("fs");
+    try {
+      const j = JSON.parse(fs.readFileSync(process.env.REG_FILE, "utf8"));
+      const w = (j.worktrees || []).find(x => x && x.path === process.env.R_PATH);
+      if (!w) process.exit(0);
+      const v = w[process.env.R_KEY];
+      if (v == null) process.exit(0);
+      process.stdout.write(Array.isArray(v) ? v.join(",") : String(v));
+    } catch (_) {}
+  ' 2>/dev/null
+}
+registry_remove() {
+  [ -n "$REG" ] && [ -f "$REG" ] || return 0
+  REG_FILE="$REG" R_PATH="$WORKTREE" node -e '
+    const fs = require("fs");
+    const f = process.env.REG_FILE;
+    try {
+      const j = JSON.parse(fs.readFileSync(f, "utf8"));
+      if (!Array.isArray(j.worktrees)) process.exit(0);
+      j.worktrees = j.worktrees.filter(w => !(w && w.path === process.env.R_PATH));
+      const tmp = f + ".tmp";
+      fs.writeFileSync(tmp, JSON.stringify(j, null, 2) + "\n");
+      fs.renameSync(tmp, f);
+    } catch (_) {}
+  ' 2>>"$LOG"
+}
+
+# --- resolve MAIN (arg → registry → derive from worktree) -------------------
+[ -d "$WORKTREE" ] || fail "worktree path '$WORKTREE' does not exist on disk" 1
+if [ -z "$MAIN" ]; then
+  # bootstrap REG from a best-effort main guess so registry_field can read mainRoot
+  _guess_main="$(resolve_main_from_wt)"
+  if [ -n "$_guess_main" ]; then
+    MAIN="$_guess_main"; REG="$MAIN/.worktrees/registry.json"
+    _reg_main="$(registry_field mainRoot)"; [ -n "$_reg_main" ] && MAIN="$_reg_main"
+  fi
+fi
+[ -n "$MAIN" ] || fail "cannot resolve \$MAIN (not inside a git repo + registry empty)" 1
+[ -d "$MAIN/.git" ] || [ -e "$MAIN/.git" ] || fail "resolved main '$MAIN' is not a git repo" 1
+REG="$MAIN/.worktrees/registry.json"
+
+# --- resolve BRANCH (arg → registry → worktree HEAD) ------------------------
+[ -n "$BRANCH" ] || BRANCH="$(registry_field branch)"
+[ -n "$BRANCH" ] || BRANCH="$(git -C "$WORKTREE" rev-parse --abbrev-ref HEAD 2>/dev/null)"
+[ -n "$BRANCH" ] || fail "cannot resolve feature branch for worktree '$WORKTREE'" 1
+
+# --- resolve TRUNK (arg → registry → config → origin/HEAD → develop/main/master)
+[ -n "$TRUNK" ] || TRUNK="$(registry_field trunkBranch)"
+[ -n "$TRUNK" ] || TRUNK="$(config_scalar git trunk_branch)"
+[ -n "$TRUNK" ] || TRUNK="$(git -C "$MAIN" symbolic-ref --quiet refs/remotes/origin/HEAD 2>/dev/null | sed -E 's#^refs/remotes/origin/##' || true)"
+if [ -z "$TRUNK" ]; then
+  for cand in develop main master; do
+    if git -C "$MAIN" show-ref --verify --quiet "refs/heads/$cand"; then TRUNK="$cand"; break; fi
+  done
+fi
+[ -n "$TRUNK" ] || fail "git.trunk_branch unresolved (arg + registry + config + origin/HEAD + develop/main/master)" 1
+
+# --- resolve STRATEGY (arg → config → pr) -----------------------------------
+[ -n "$STRATEGY" ] || STRATEGY="$(config_scalar git merge_strategy)"
+STRATEGY="${STRATEGY:-pr}"
+case "$STRATEGY" in pr|local-push) : ;; *) fail "unknown git.merge_strategy '$STRATEGY' (expected pr|local-push)" 1 ;; esac
+
+# --- resolve metrics dir + toolchain commands -------------------------------
+[ -n "$METRICS_DIR" ] || { METRICS_DIR="$(config_scalar paths metrics)"; [ -n "$METRICS_DIR" ] || METRICS_DIR="docs/metrics"; }
+# toolchain.commands.* only when features.has_toolchain: true; else defaults (same _tc as setup-worktree.sh)
+_tc() {
+  local cfg="$MAIN/baldart.config.yml" raw
+  grep -E '^[[:space:]]*has_toolchain:[[:space:]]*true' "$cfg" >/dev/null 2>&1 || return 0
+  raw="$(grep -A20 '^toolchain:' "$cfg" 2>/dev/null | grep -A15 '^[[:space:]]*commands:' \
+    | grep -E "^[[:space:]]+$1:" | head -1 \
+    | sed -E "s/^[[:space:]]*$1:[[:space:]]*//" \
+    | sed -E 's/[[:space:]]+#.*$//; s/[[:space:]]+$//')"
+  case "$raw" in \"*\") raw="${raw#\"}"; raw="${raw%\"}" ;; \'*\') raw="${raw#\'}"; raw="${raw%\'}" ;; esac
+  case "$raw" in '~'|null|Null|NULL) raw="" ;; esac
+  printf '%s' "$raw"
+}
+[ -n "$TC_TC" ]    || TC_TC="$(_tc typecheck)";   [ -n "$TC_TC" ]    || TC_TC="npx tsc --noEmit"
+[ -n "$TC_LINT" ]  || TC_LINT="$(_tc lint)";      [ -n "$TC_LINT" ]  || TC_LINT="npx eslint --max-warnings=0 src/"
+BUILD_FROM_CONFIG=1
+[ -n "$TC_BUILD" ] || TC_BUILD="$(_tc build)"
+[ -n "$TC_BUILD" ] || { TC_BUILD="npm run build"; BUILD_FROM_CONFIG=0; }
+
+# --- log sink + timeout binary ---------------------------------------------
+SLUG="$(printf '%s' "$BRANCH" | tr '/' '-')"
+[ -n "$LOG" ] || LOG="/tmp/wt-merge-${SLUG}.log"
+[ "$CONTINUE" = 1 ] || : > "$LOG" 2>/dev/null || true
+TIMEOUT_BIN=""
+command -v timeout  >/dev/null 2>&1 && TIMEOUT_BIN="timeout"
+[ -z "$TIMEOUT_BIN" ] && command -v gtimeout >/dev/null 2>&1 && TIMEOUT_BIN="gtimeout"
+
+# --- portable in-place sed (BSD needs '', GNU does not) ---------------------
+strip_markers() {
+  sed -i '' '/^<<<<<<< /d; /^=======$/d; /^>>>>>>> /d' "$1" 2>/dev/null \
+    || sed -i '/^<<<<<<< /d; /^=======$/d; /^>>>>>>> /d' "$1" 2>/dev/null || return 1
+}
+
+# --- structural validation of a registry-md after auto-strip (SKILL.md:891) -
+validate_structured_md() {
+  local f="$1"
+  if grep -qE '^(<{7}|={7}|>{7})' "$f"; then return 1; fi
+  if awk 'prev~/^\|[ -:|]+\|$/ && $0~/^\|[ -:|]+\|$/{found=1; exit} {prev=$0} END{exit !found}' "$f"; then return 1; fi
+  if [ "$(grep -cE '^---[[:space:]]*$' "$f")" -gt 2 ]; then return 1; fi
+  return 0
+}
+
+# --- DETERMINISTIC conflict resolution over the currently-conflicted files.
+#     Resolves ADDITIVE classes (docs / structured registries / metrics JSONL)
+#     in place + `git add`. Collects code/test/other into UNRESOLVED. Returns
+#     the UNRESOLVED list on stdout (empty = all additive, safe to continue).
+#     NEVER aborts the rebase — the caller decides (continue vs emit_conflict). -
+resolve_additive_conflicts() {
+  local unresolved="" file basename
+  local conflicted
+  conflicted="$(git -C "$WORKTREE" diff --name-only --diff-filter=U 2>/dev/null)"
+  for file in $conflicted; do
+    basename="$(basename "$file")"
+    # 1. Code / tests — JUDGMENT required, never auto-resolved here.
+    case "$file" in
+      src/*.ts|src/*.tsx|src/*.js|src/*.jsx|*.test.*|*.spec.*)
+        unresolved="$unresolved $file"; continue ;;
+    esac
+    # 2. Structured registries — strip + structural validation.
+    case "$basename" in
+      project-status.md|ssot-registry.md|traceability-matrix.md|REGISTRY.md)
+        if strip_markers "$WORKTREE/$file" && validate_structured_md "$WORKTREE/$file"; then
+          git -C "$WORKTREE" add "$file" 2>>"$LOG"; continue
+        else
+          unresolved="$unresolved $file"; continue   # malformed after strip → needs judgment
+        fi ;;
+      field-registry.*)
+        unresolved="$unresolved $file"; continue ;;   # strict JSON — cannot auto-strip
+    esac
+    # 3. JSONL — only auto-resolve under $METRICS_DIR/ (line-oriented, additive).
+    case "$file" in
+      "$METRICS_DIR"/*.jsonl)
+        strip_markers "$WORKTREE/$file" && git -C "$WORKTREE" add "$file" 2>>"$LOG"; continue ;;
+      *.jsonl)
+        unresolved="$unresolved $file"; continue ;;   # fixtures/seeds — may corrupt
+    esac
+    # 4. Generic docs/config (.md/.json/.yml outside src/) — additive merge.
+    case "$file" in
+      *.md|*.json|*.yml|*.yaml)
+        strip_markers "$WORKTREE/$file" && git -C "$WORKTREE" add "$file" 2>>"$LOG"; continue ;;
+      *)
+        unresolved="$unresolved $file"; continue ;;    # unknown binary/other → judgment
+    esac
+  done
+  printf '%s' "$(printf '%s' "$unresolved" | sed -E 's/^[[:space:]]+//; s/[[:space:]]+/,/g')"
+}
+
+# --- run the rebase loop: resolve additive each round; on code conflict that
+#     survives, emit_conflict (PAUSED on disk for the resolver agent). --------
+rebase_loop() {
+  # $1 = "start" | "continue"
+  local mode="$1" rc unresolved
+  M_PHASE="rebase"
+  if [ "$mode" = "start" ]; then
+    git -C "$WORKTREE" fetch origin "$TRUNK" --quiet 2>>"$LOG" || err "WARN: fetch origin $TRUNK failed — rebasing onto possibly-stale ref"
+    git -C "$WORKTREE" rebase "origin/$TRUNK" >>"$LOG" 2>&1; rc=$?
+  else
+    # resolver agent already `git add`-ed its code resolutions; continue the paused rebase
+    git -C "$WORKTREE" -c core.editor=true rebase --continue >>"$LOG" 2>&1; rc=$?
+  fi
+  while [ "$rc" -ne 0 ]; do
+    # Are we actually mid-rebase with conflicts, or a real error?
+    if ! rebase_in_progress \
+       && [ -z "$(git -C "$WORKTREE" diff --name-only --diff-filter=U 2>/dev/null)" ]; then
+      fail "rebase failed without conflicts (see $LOG)" 1
+    fi
+    unresolved="$(resolve_additive_conflicts)"
+    if [ -n "$unresolved" ]; then
+      emit_conflict "$unresolved"   # PAUSE: hand the code/test files to the resolver agent
+    fi
+    # all conflicts this round were additive → continue
+    git -C "$WORKTREE" -c core.editor=true rebase --continue >>"$LOG" 2>&1; rc=$?
+  done
+}
+
+# ===========================================================================
+# 0. Guards
+if git -C "$WORKTREE" rev-parse --git-dir >/dev/null 2>&1; then :; else fail "'$WORKTREE' is not a git worktree" 1; fi
+
+# Provisional NON-terminal status — written BEFORE any mutation so a KILL mid-rebase
+# or mid-build never leaves a stale 'success' on disk (mirrors setup-worktree.sh's
+# provisional manifest). The caller's disk gate treats anything that is NOT
+# 'status: success' as not-merged → fallback, never a false pass.
+M_STATUS="error"; M_ERROR="merge incomplete (interrupted before completion)"
+write_status
+
+# ---------------------------------------------------------------------------
+# CONTINUE path: a resolver agent resolved the code conflicts + git-add'd them.
+# Resume the paused rebase, then fall through to build/land/sync/cleanup.
+# ---------------------------------------------------------------------------
+if [ "$CONTINUE" = 1 ]; then
+  if ! rebase_in_progress; then
+    err "WARN: --continue but no rebase in progress — assuming already past rebase; proceeding to build/land."
+  else
+    # Any UNRESOLVED conflict still on disk means the agent left work undone → re-emit.
+    still="$(git -C "$WORKTREE" diff --name-only --diff-filter=U 2>/dev/null | tr '\n' ',' | sed 's/,$//')"
+    [ -z "$still" ] || emit_conflict "$still"
+    rebase_loop continue
+  fi
+else
+  # -------------------------------------------------------------------------
+  # FRESH path: safety commit → (checks) → rebase
+  # -------------------------------------------------------------------------
+  # 1. Safety commit (ALWAYS — never skippable; files lost after rebase are unrecoverable)
+  M_PHASE="safety"
+  CHANGED="$(git -C "$WORKTREE" diff --name-only HEAD 2>/dev/null)"
+  UNTRACKED="$(git -C "$WORKTREE" ls-files --others --exclude-standard 2>/dev/null)"
+  if [ -n "$CHANGED" ] || [ -n "$UNTRACKED" ]; then
+    for f in $CHANGED $UNTRACKED; do git -C "$WORKTREE" add "$f" 2>>"$LOG"; done
+    git -C "$WORKTREE" commit -m "[safety] Auto-commit uncommitted files before merge
+
+Files were uncommitted when merge-worktree.sh started. This safety commit
+prevents file loss during rebase.
+
+Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>" --quiet >>"$LOG" 2>&1 \
+      || err "WARN: safety commit produced no commit (nothing staged?)"
+  fi
+
+  # 2. Pre-merge checks (skipped when --skip-checks / checksAlreadyPassed)
+  if [ "$SKIP_CHECKS" = 0 ]; then
+    M_PHASE="build"
+    CHANGED_TS="$(git -C "$WORKTREE" diff --name-only "origin/$TRUNK" -- '*.ts' '*.tsx' 2>/dev/null | tr '\n' ' ')"
+    ( cd "$WORKTREE" && CI=1 bash -c "${TC_LINT} ${CHANGED_TS}" </dev/null >>"$LOG" 2>&1 ) || err "WARN: pre-merge lint failed (see $LOG)"
+    ( cd "$WORKTREE" && CI=1 bash -c "$TC_TC" </dev/null >>"$LOG" 2>&1 ) || err "WARN: pre-merge typecheck failed (see $LOG)"
+  fi
+
+  # 3. Rebase onto origin/$TRUNK (deterministic additive resolution; pause on code)
+  rebase_loop start
+fi
+
+# ===========================================================================
+# Past the rebase (clean, or all-additive-resolved, or agent-resolved+continued).
+# 4. Build verification (toolchain-aware, hard timeout). SKIP tier honored.
+M_PHASE="build"
+RUN_BUILD=1
+if [ "$BUILD_FROM_CONFIG" = 0 ] && [ -f "$WORKTREE/package.json" ]; then
+  ( cd "$WORKTREE" && node -e 'const s=(require("./package.json").scripts)||{};process.exit(s.build?0:1)' 2>/dev/null ) \
+    || { RUN_BUILD=0; err "… post-rebase build SKIPPED (no toolchain build cmd + no 'build' script → no-build project)"; }
+fi
+if [ "$RUN_BUILD" = 1 ]; then
+  err "… post-rebase build ($TC_BUILD, timeout ${BUILD_TIMEOUT}s)"
+  if [ -n "$TIMEOUT_BIN" ]; then
+    ( cd "$WORKTREE" && CI=1 "$TIMEOUT_BIN" "$BUILD_TIMEOUT" bash -c "$TC_BUILD" </dev/null >>"$LOG" 2>&1 ); BUILD_RC=$?
+  else
+    err "WARN: no timeout binary — running build unbounded."
+    ( cd "$WORKTREE" && CI=1 bash -c "$TC_BUILD" </dev/null >>"$LOG" 2>&1 ); BUILD_RC=$?
+  fi
+  if [ "$BUILD_RC" -eq 124 ] && [ -n "$TIMEOUT_BIN" ]; then
+    emit_buildfail "post-rebase build TIMED OUT after ${BUILD_TIMEOUT}s — partial log at $LOG" "$LOG"
+  elif [ "$BUILD_RC" -ne 0 ]; then
+    emit_buildfail "post-rebase build FAILED — the rebase introduced an incompatibility; see $LOG" "$LOG"
+  fi
+fi
+
+# 5. Land the feature branch onto $TRUNK via the configured strategy.
+M_PHASE="land"
+if [ "$STRATEGY" = "local-push" ]; then
+  git -C "$WORKTREE" fetch origin "$TRUNK" --quiet 2>>"$LOG" || true
+  BEHIND="$(git -C "$WORKTREE" rev-list --count "$BRANCH..origin/$TRUNK" 2>/dev/null || echo 0)"
+  AHEAD="$(git -C "$WORKTREE" rev-list --count "origin/$TRUNK..$BRANCH" 2>/dev/null || echo 0)"
+  if [ "${BEHIND:-0}" -ne 0 ]; then
+    fail "local-push aborted: $BRANCH is $BEHIND commit(s) behind origin/$TRUNK (re-run rebase)" 1
+  fi
+  if [ "${AHEAD:-0}" -eq 0 ]; then
+    err "ℹ️ nothing to push — $BRANCH == origin/$TRUNK"
+  else
+    if ! PUSH_OUT="$(git -C "$WORKTREE" push origin "$BRANCH:$TRUNK" 2>&1)"; then
+      err "$PUSH_OUT"
+      if printf '%s' "$PUSH_OUT" | grep -qiE "protected branch|required status|review required"; then
+        fail "local-push rejected: '$TRUNK' is protected on origin — switch git.merge_strategy: pr" 1
+      fi
+      fail "local-push failed (see above)" 1
+    fi
+  fi
+  git -C "$WORKTREE" push origin --delete "$BRANCH" 2>/dev/null || true
+  M_MERGE="$(git -C "$WORKTREE" rev-parse HEAD 2>/dev/null)"
+else
+  # pr strategy — requires gh
+  command -v gh >/dev/null 2>&1 || fail "git.merge_strategy=pr but 'gh' CLI is not installed (brew install gh; gh auth login)" 1
+  git -C "$WORKTREE" push --force-with-lease origin "$BRANCH" >>"$LOG" 2>&1 || fail "failed to push feature branch '$BRANCH' to origin" 1
+  REPO="$(gh repo view --json nameWithOwner -q .nameWithOwner 2>/dev/null)"
+  PR_NUMBER="$(gh -R "$REPO" pr list --head "$BRANCH" --state open --json number -q '.[0].number' 2>/dev/null || true)"
+  if [ -z "$PR_NUMBER" ]; then
+    PR_URL="$(gh pr create --base "$TRUNK" --head "$BRANCH" \
+      --title "[$BRANCH] $(printf '%s' "$BRANCH" | sed 's|.*/||')" \
+      --body "Auto-merged by merge-worktree.sh after final review + QA passed." --repo "$REPO" 2>>"$LOG")" \
+      || fail "gh pr create failed (see $LOG)" 1
+    PR_NUMBER="$(printf '%s' "$PR_URL" | grep -oE '[0-9]+$')"
+  fi
+  gh pr merge "$PR_NUMBER" --merge --delete-branch >>"$LOG" 2>&1 || true
+  PR_STATE="$(gh pr view "$PR_NUMBER" --json state -q .state 2>/dev/null)"
+  if [ "$PR_STATE" != "MERGED" ]; then
+    gh api -X PUT "repos/$REPO/pulls/$PR_NUMBER/merge" -f merge_method=merge \
+      -f commit_title="[$BRANCH] Merge $BRANCH into $TRUNK" >>"$LOG" 2>&1 || true
+    PR_STATE="$(gh pr view "$PR_NUMBER" --json state -q .state 2>/dev/null)"
+  fi
+  [ "$PR_STATE" = "MERGED" ] || fail "PR #$PR_NUMBER did not merge — inspect manually (see $LOG)" 1
+  M_MERGE="$(gh pr view "$PR_NUMBER" --json mergeCommit -q .mergeCommit.oid 2>/dev/null)"
+  [ -n "$M_MERGE" ] && [ "$M_MERGE" != "null" ] || M_MERGE="$(git -C "$WORKTREE" rev-parse HEAD 2>/dev/null)"
+fi
+M_MERGETS="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+
+# 6. Sync local trunk ref — record the marker in the STATUS FILE (callers read
+#    it from there, NOT from stdout). NEVER `git checkout $TRUNK` on the main repo.
+M_PHASE="sync"
+CURRENT_BRANCH="$(git -C "$MAIN" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")"
+if [ "$CURRENT_BRANCH" = "$TRUNK" ]; then
+  if git -C "$MAIN" pull --ff-only origin "$TRUNK" >>"$LOG" 2>&1; then
+    M_SYNCMARK="none"; M_SYNCDETAIL="-"
+  else
+    METRICS_LOG="$METRICS_DIR/skill-runs.jsonl"
+    DIRTY="$(git -C "$MAIN" status --porcelain --untracked-files=no | sed 's/^...//')"
+    FOREIGN="" OWNED=""
+    for f in $DIRTY; do
+      case "$f" in
+        "$METRICS_LOG") OWNED="$OWNED $f" ;;
+        .baldart/generated/*|.baldart/state.json|.baldart/skill-conflicts.json) OWNED="$OWNED $f" ;;
+        *) FOREIGN="$FOREIGN $f" ;;
+      esac
+    done
+    if [ -n "$FOREIGN" ]; then
+      M_SYNCMARK="SYNC-NEEDS-DECISION"; M_SYNCDETAIL="main repo $TRUNK cannot fast-forward; foreign uncommitted files:${FOREIGN}"
+    elif [ -n "$OWNED" ]; then
+      git -C "$MAIN" add $OWNED 2>>"$LOG"
+      git -C "$MAIN" commit -m "chore(baldart): reconcile framework-managed artifacts before $TRUNK sync" --quiet >>"$LOG" 2>&1
+      if git -C "$MAIN" pull --rebase origin "$TRUNK" >>"$LOG" 2>&1; then
+        git -C "$MAIN" push origin "$TRUNK" >>"$LOG" 2>&1 || true
+        M_SYNCMARK="none"; M_SYNCDETAIL="reconciled framework-managed artifacts"
+      else
+        git -C "$MAIN" rebase --abort 2>/dev/null || true
+        M_SYNCMARK="SYNC-NEEDS-DECISION"; M_SYNCDETAIL="framework-managed reconcile rebase conflict on $TRUNK"
+      fi
+    else
+      M_SYNCMARK="SYNC-NEEDS-DECISION"; M_SYNCDETAIL="main repo $TRUNK cannot fast-forward and the working tree is clean (diverged?)"
+    fi
+  fi
+else
+  git -C "$MAIN" fetch origin "$TRUNK" --quiet 2>>"$LOG" || true
+  M_SYNCMARK="SYNC-DEFERRED"; M_SYNCDETAIL="main repo HEAD=${CURRENT_BRANCH}, local $TRUNK not fast-forwarded"
+fi
+
+# 7. Cleanup worktree + registry (only after a verified land). Individual cmds.
+M_PHASE="cleanup"
+git -C "$MAIN" worktree remove "$WORKTREE" --force >>"$LOG" 2>&1 || err "WARN: git worktree remove failed (see $LOG)"
+git -C "$MAIN" branch -d "$BRANCH" >>"$LOG" 2>&1 || err "WARN: local branch -d '$BRANCH' failed (already gone / not merged?)"
+git -C "$MAIN" worktree prune >>"$LOG" 2>&1 || true
+registry_remove
+# release backlog-ID reservations (best-effort; high-water mark stays monotonic)
+ALLOC_SH="$MAIN/.framework/framework/.claude/skills/worktree-manager/scripts/allocate-id.sh"
+[ -f "$ALLOC_SH" ] || ALLOC_SH="$MAIN/.claude/skills/worktree-manager/scripts/allocate-id.sh"
+[ -f "$ALLOC_SH" ] && bash "$ALLOC_SH" release "$WORKTREE" 2>/dev/null || true
+
+# 8. Done.
+M_STATUS="success"; M_PHASE="done"; M_ERROR="-"; M_BLOG="-"
+write_status
+err "✓ merged: $BRANCH → $TRUNK ($STRATEGY, $M_MERGE)"
+exit 0