@caddis/cli 0.4.53 → 0.4.54

package/bundles/antigravity-plugin/skills/pr-merge/SKILL.md

@@ -82,12 +82,12 @@ Run `python "${CLAUDE_PLUGIN_ROOT}/scripts/caddis_gate.py" review-tier --range <
 
 Watch the PR's checks job-by-job until completion:
 - Gitea lane: poll the run for the PR's head SHA via the API (`deploy-local` skill procedure).
-- GitHub lane: first record the head you are about to watch, then wait for PR checks outside the Claude session via `ci-watch`:
+- GitHub lane: wait for PR checks outside the Claude session via `ci-watch`:
   ```bash
-  gh pr view <pr> --json headRefOid        # write down headRefOid as <watched-sha>
   python "${CLAUDE_PLUGIN_ROOT}/scripts/caddis_lanes.py" ci-watch --pr <pr>
   ```
-  Exit codes: **0** pass → continue; **1** fail → read `FAILING:` and the gh output, classify the cause, apply the minimum source fix, and re-push (stop before merging); **3** could not tell → stop and report, do not merge.
+  `RESULT: pass` means every check of the PR's head commit is complete and green (cancelled, failed or unfinished is never a pass). `HEAD:` names that commit: it is the `<watched-sha>`; merge with `--match-head-commit <watched-sha>`.
+  Exit codes: **0** pass → continue; **1** fail → read `FAILING:` and the gh output, classify the cause, apply the minimum source fix, and re-push (stop before merging); **3** could not tell (also: gh finished but a check is still unfinished, the head's checks could not be read, or the head moved during the watch — `FAILING:` says which) → run `ci-watch` again; if it stays 3, stop and report, do not merge.
   Fallback when `caddis_lanes.py` is not available: watch in-session with `gh pr checks <pr> --watch` / `gh run watch` (`gh-cli` skill).
 - If any check fails (red check): report the failure, classify the cause, and **stop before merging**.
   Do not merge a failing PR. Apply the minimum source fix and re-push.
@@ -98,6 +98,14 @@ Small work that does not meet a trigger skips its block.
 
 **Trigger: Always, when the repo deploys on push.** No merge while a push run on the default branch is in progress. Check `gh run list --branch <default> --event push --status in_progress`; if a run is listed, wait for it. `python "${CLAUDE_PLUGIN_ROOT}/scripts/caddis_merge_chain.py"` does this check.
 
+**Trigger: Two or more reviewed, green PRs wait to merge on one repo.** Each separate merge costs update-branch, CI and deploy, and puts every other open PR behind the default branch (measured on one fleet repo, 10 Oct 2026: about 15 to 20 minutes per PR, about 2 hours for six). Combine them:
+1. Merge their branches into one release branch made from `origin/<default>`. Resolve overlaps once.
+2. Run the full gates once, in an environment that matches CI's install.
+3. Open ONE release PR that links each component PR (their review and test evidence stays on them).
+4. After it merges, close each component PR with a link to the release PR.
+
+Keep separate: work that needs its own owner approval, a schema or DDL change that may need its own revert, and docs-only PRs. Still one merge at a time, never while a push run on the default branch is in progress. Tell any peer session that merges to the same repo.
+
 ## Step 7 — Merge to default branch
 
 Once all required checks are **green**, there are no merge conflicts, and review requirements are satisfied:
@@ -105,13 +113,13 @@ Once all required checks are **green**, there are no merge conflicts, and review
   ```bash
   gh pr view <pr> --json headRefOid,mergeStateStatus
   ```
-  Merge only when `headRefOid` equals `<watched-sha>`, the head recorded before the watch started and `mergeStateStatus` is `CLEAN` (or `HAS_HOOKS`/`UNSTABLE` only if the repo's own rules allow it; else stop and report). The ci-watch report is a signal, not proof.
+  Merge only when `headRefOid` equals `<watched-sha>` (the `HEAD:` line of the `ci-watch` run that printed `RESULT: pass`) and `mergeStateStatus` is `CLEAN` (or `HAS_HOOKS`/`UNSTABLE` only if the repo's own rules allow it; else stop and report). If the head moved, run `ci-watch` again.
 - Use the repo's configured **merge strategy** — read it from repo settings (Gitea repo settings API /
   `gh repo view --json squashMergeAllowed,mergeCommitAllowed,rebaseMergeAllowed`) and `AGENTS.md`;
   an explicit argument wins. Options: **squash**, **merge-commit**, rebase-merge. **Don't assume** —
   if detection is inconclusive, use merge-commit (never silently squash someone's history without evidence).
 - Execute merge:
-  - GitHub: `gh pr merge <pr> --<strategy>` (e.g. `gh pr merge <pr> --squash`).
+  - GitHub: `gh pr merge <pr> --<strategy> --match-head-commit <watched-sha>` (e.g. `gh pr merge <pr> --squash --match-head-commit <watched-sha>`; the full SHA). GitHub refuses the merge if the head moved.
   - Gitea: call the Gitea PR merge API with the chosen strategy.
 - Record the merge SHA.
 
@@ -131,11 +139,17 @@ If the default branch triggers an automated deployment pipeline:
 ## Step 9 — Close feature-branch lifecycle (Clean up)
 
 **Only after** the merge is complete and deployment (if any) is validated green:
+- Run `git status --short`. If it shows changes you did not make, do not switch, stash, reset or commit:
+  leave them, report them, and stop cleanup here (a shared checkout often holds a peer's edits).
+- Fetch and prune: `git fetch --prune`.
 - Switch to the default branch: `git switch <default-branch>`.
 - Fast-forward to the merge commit: `git pull --ff-only origin <default-branch>`.
 - Delete the **local** feature branch: `git branch -d <branch>` (use `-D` only if squashed after verifying tree contents match).
 - Delete the **remote** feature branch: `git push origin --delete <branch>` (if not deleted by forge).
 - Drop the temporary `backup/<branch>-preship` ref if one was created in Step 4.
+- If the repo has a roadmap (`.caddis/roadmaps/`), re-render its page, because the merge changed a Tracker on origin:
+  `python "${CLAUDE_PLUGIN_ROOT}/scripts/caddis_roadmap.py" render --all` (best effort; a failure is a note, not a
+  stop). The page is `~/.caddis/roadmap-pages/<repo>/<slug>.html`.
 
 If deploy validation failed: **skip cleanup** entirely and report why — never delete a branch whose
 work may need re-work.
@@ -154,7 +168,7 @@ Cleanup:       remote branch deleted / local branch deleted / backup ref dropped
 
 - Never merge a PR whose required checks are red or absent.
 - Never delete a feature branch before its merge is confirmed and any deploy validated.
-- Never `git add -A` without reviewing `git status` first (stage named files only).
+- Never `git add -A`, `git add .` or `git add <dir>`, even after reading `git status`: stage named files only (the guard denies the first two).
 - Never force-push without a `backup/*-preship` recovery ref; force pushes are `--force-with-lease` only.
 - Never edit a workflow file (`.gitea/workflows/`, `.github/workflows/`) to make a gate pass — fix the source.
 - Local-only lane: refuse + point at `/ship`. On the default branch: stop + point at `/ship`.

package/bundles/antigravity-plugin/skills/refactoring/SKILL.md

@@ -126,7 +126,8 @@ Activate when:
 
 4. **Commit current state**
    ```bash
-   git add .
+   git status --short          # stage the files you changed, by name
+   git add tests/test_<module>.py
    git commit -m "chore: add tests before refactoring"
    ```
 

package/bundles/antigravity-plugin/skills/review-pr/SKILL.md

@@ -64,7 +64,7 @@ not know to look:
   to attribute. It manufactures confidence. Worse than no check.
 - **A wall-clock assertion.** A timing threshold on a shared runner measures load, not the code.
   Assert ordering instead.
-- **Staged directories.** `git add -A` / `git add .` sweeps in files nobody reviewed.
+- **Staged directories.** `git add -A` / `git add .` / `git add <dir>` sweeps in files nobody reviewed.
 - **CI shell assumptions.** The runner may be Windows PowerShell 5.1, where a native command's
   stderr becomes a terminating error under `$ErrorActionPreference='Stop'`, and where `Should -Be`
   (Pester 4 syntax) fails on a Pester 3 runner.

package/bundles/antigravity-plugin/skills/roadmap/SKILL.md

@@ -70,6 +70,7 @@ process tree on timeout.
 
 ```bash
 python scripts/caddis_roadmap.py status  --roadmap <slug> [--json]   # "<done> of <total> done; next <id>; ..."
+python scripts/caddis_roadmap.py render  --roadmap <slug> | --all [--out <html>]   # page: ~/.caddis/roadmap-pages/<repo>/<slug>.html; hub of every repo: ~/.caddis/roadmap-pages/index.html
 python scripts/caddis_roadmap.py next    --roadmap <slug> [--json]   # exit 0 found, 1 nothing ready (reasons)
 python scripts/caddis_roadmap.py check   --roadmap <slug>            # parse errors, unknown refs or types
 python scripts/caddis_roadmap.py set     --roadmap <slug> --id S1 --col Status|Owner|Target --value <v> [--by-owner] [--reason "<r>"]

package/bundles/antigravity-plugin/skills/ship/SKILL.md

@@ -36,7 +36,7 @@ names, branch, and service identifiers — never assume.
 - Tests: run only if the user says they're needed or a gate explicitly requires them
 - Fix any failures before proceeding. Do not commit broken code.
 
-**2. STAGE + COMMIT** — Stage only the intended files (never `git add -A` blindly):
+**2. STAGE + COMMIT** — Stage only the intended files, by name (never `git add -A`, `git add .` or a folder):
 ```
 git status --short      # confirm what's staged
 git add <specific files>
@@ -119,7 +119,7 @@ Small work that does not meet a trigger skips its block.
 
 ## Rules
 - Never push before preflight gates are green.
-- Never use `git add -A` without reviewing `git status` first.
+- Never `git add -A`, `git add .` or `git add <dir>`, even after reading `git status`: stage named files only (the guard denies the first two).
 - Do not edit a workflow file (`.gitea/workflows/` or `.github/workflows/`) to make a failing gate
   pass — fix the source.
 - Gitea lane: tag-triggered runs after `release_metadata` are expected; verify `deploy_prod` is

package/bundles/antigravity-plugin/skills/ship-merge/SKILL.md

@@ -71,8 +71,9 @@ an explicit argument wins. Options: **squash**, **merge-commit**, **rebase-merge
 if detection is inconclusive, say so and use merge-commit (never silently squash someone's history).
 
 Then merge:
-- GitHub: `gh pr merge <pr>` with `--squash` (squash), `--merge` (merge-commit) or `--rebase` (rebase-merge).
-- Gitea: call the Gitea PR merge API with the chosen strategy.
+- GitHub: `gh pr merge <pr> --match-head-commit <head-sha>` (the full SHA) with `--squash` (squash), `--merge`
+  (merge-commit) or `--rebase` (rebase-merge). GitHub refuses the merge if the head moved.
+- Gitea: call the Gitea PR merge API with the chosen strategy and `head_commit_id: <head-sha>`.
 
 Record the merge SHA.
 
@@ -99,8 +100,11 @@ attempt a silent re-deploy — and **skip cleanup** (Step 6).
 ## Step 6 — Branch cleanup — only after a confirmed-green deploy
 
 **Only after** Step 5 is green:
-- Delete the **remote** feature branch; delete the **local** feature branch.
-- Switch to the default branch and fast-forward it to the merge commit.
+- Run `git status --short`. If it shows changes you did not make, do not switch, stash, reset or commit:
+  leave them, report them, and stop cleanup here.
+- `git fetch --prune`, then switch to the default branch and fast-forward it to the merge commit.
+- Delete the **remote** feature branch; delete the **local** feature branch (for a squash merge, compare
+  the branch tree with the merged tree first, not ancestry).
 - Drop the `backup/<branch>-preship` ref `/ship-pr` created.
 
 If deploy validation failed: **skip cleanup** entirely and say so — never delete a branch whose
@@ -119,7 +123,7 @@ Cleanup:       remote branch ✗ deleted / local ✗ deleted / backup ref droppe
 ## Rules
 - Never merge without: green required checks **and** the explicit human deploy-confirm.
 - Never delete a branch before its deploy is validated green.
-- Never `git add -A` without reviewing `git status`; never edit a workflow file to make a gate pass.
+- Never `git add -A`, `git add .` or `git add <dir>`, even after reading `git status`: stage named files only (the guard denies the first two). Never edit a workflow file to make a gate pass.
 - Local-only lane: no PR, no merge — refuse and point at `/ship`.
 
 ## Skill reference

package/bundles/antigravity-plugin/skills/ship-pr/SKILL.md

@@ -126,7 +126,8 @@ scope-guard check when present:
   ```bash
   python "${CLAUDE_PLUGIN_ROOT}/scripts/caddis_lanes.py" ci-watch --pr <pr>
   ```
-  Exit codes: **0** pass → continue; **1** fail → read `FAILING:` and the gh output, classify, apply the minimum source fix, then re-push (through Step 4's safety if history must change); **3** could not tell → stop and report, do not merge.
+  `RESULT: pass` means every check of the PR's head commit is complete and green; `HEAD:` names that commit.
+  Exit codes: **0** pass → continue; **1** fail → read `FAILING:` and the gh output, classify, apply the minimum source fix, then re-push (through Step 4's safety if history must change); **3** could not tell (also: a check still unfinished, or the head's checks unreadable) → run `ci-watch` again; if it stays 3, stop and report, do not merge.
   Fallback when `caddis_lanes.py` is not available: watch in-session with `gh pr checks <pr> --watch` / `gh run watch` (`gh-cli` skill).
 On a red check, classify the failure and apply the minimum **source** fix, then re-push (through
 Step 4's safety if history must change).
@@ -145,7 +146,7 @@ human-confirmed door.
 
 ## Rules
 - **Never merges, never deploys** — no merge action exists in this command, by design.
-- Never `git add -A` without reviewing `git status` first.
+- Never `git add -A`, `git add .` or `git add <dir>`, even after reading `git status`: stage named files only (the guard denies the first two).
 - Never force-push without a `backup/*-preship` recovery ref; force pushes are `--force-with-lease` only.
 - Never edit a workflow file (`.gitea/workflows/`, `.github/workflows/`) to make a gate pass — fix the source.
 - Local-only lane: refuse + point at `/ship`. On the default branch: stop + point at `/ship`.

package/bundles/codex/.codex/skills/coding/refactoring/SKILL.md

@@ -126,7 +126,8 @@ Activate when:
 
 4. **Commit current state**
    ```bash
-   git add .
+   git status --short          # stage the files you changed, by name
+   git add tests/test_<module>.py
    git commit -m "chore: add tests before refactoring"
    ```
 

package/bundles/codex/.codex/skills/devops/gh-cli/SKILL.md

@@ -167,7 +167,8 @@ gh alias set review 'pr list --search "review-requested:@me"'
 
 ```bash
 gh issue develop 42 --branch fix/issue-42
-git add . && git commit -m "fix: resolve login bug" && git push -u origin HEAD
+git add src/auth/login.py tests/test_login.py   # named files only, never `git add .`
+git commit -m "fix: resolve login bug" && git push -u origin HEAD
 gh pr create --title "fix: resolve login bug" --body "Closes #42"
 gh pr checks --watch
 gh pr merge --squash --delete-branch

package/bundles/codex/.codex/skills/workflow/roadmap/SKILL.md

@@ -70,6 +70,7 @@ process tree on timeout.
 
 ```bash
 python scripts/caddis_roadmap.py status  --roadmap <slug> [--json]   # "<done> of <total> done; next <id>; ..."
+python scripts/caddis_roadmap.py render  --roadmap <slug> | --all [--out <html>]   # page: ~/.caddis/roadmap-pages/<repo>/<slug>.html; hub of every repo: ~/.caddis/roadmap-pages/index.html
 python scripts/caddis_roadmap.py next    --roadmap <slug> [--json]   # exit 0 found, 1 nothing ready (reasons)
 python scripts/caddis_roadmap.py check   --roadmap <slug>            # parse errors, unknown refs or types
 python scripts/caddis_roadmap.py set     --roadmap <slug> --id S1 --col Status|Owner|Target --value <v> [--by-owner] [--reason "<r>"]

package/bundles/manifest.json

@@ -1,7 +1,7 @@
 {
-  "poolVersion": "1.3.139",
+  "poolVersion": "1.3.140",
   "bundles": {
-    "antigravity-plugin": "1.3.139",
+    "antigravity-plugin": "1.3.140",
     "antigravity-plugin-extras": "1.3.43",
     "codex": "unknown"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caddis/cli",
-  "version": "0.4.53",
+  "version": "0.4.54",
   "description": "Install, update and diagnose the caddis dev harness across every coding agent you use (Claude Code, agy/Antigravity, and more).",
   "keywords": [
     "caddis",