Fix sync-check CI: sync adapter files and bump checkout to v5

.agents/skills/ship/SKILL.md

@@ -56,7 +56,25 @@ If a linked issue number is identifiable, note it for the PR body. If not identi
 
 ---
 
-## Step 4 — Commit
+## Step 4 — Sync with base branch
+
+Bring the feature branch up to date before committing:
+
+```
+git fetch origin dev && git merge origin/dev
+```
+
+If the merge completes cleanly (including fast-forward), proceed to Step 5.
+
+If there are merge conflicts, **stop** and say:
+
+> "Merge conflicts with `<base branch>`. Resolve them before shipping."
+
+List the conflicting files. Help the user resolve them if asked, then continue.
+
+---
+
+## Step 5 — Commit
 
 Stage all changes and commit:
 ```
@@ -71,7 +89,7 @@ Commit message rules:
 
 ---
 
-## Step 5 — Push and open PR
+## Step 6 — Push and open PR
 
 First, push the branch:
 ```
@@ -109,9 +127,9 @@ Omit the issue line entirely if no linked issue was identified in Step 3.
 
 ---
 
-## Step 6 — Review (conditional)
+## Step 7 — Review (conditional)
 
-If `ai` is `"off"`, skip directly to Step 7 (merge without review).
+If `ai` is `"off"`, skip directly to Step 8 (merge without review).
 
 Otherwise, load `.claude/review-agent-prompt.md` and perform the review for this PR.
 
@@ -128,7 +146,7 @@ Wait for the review to complete and report its verdict.
 
 ---
 
-## Step 7 — Act on verdict
+## Step 8 — Act on verdict
 
 Merge command (used by all paths below): `make merge`
 
@@ -185,4 +203,4 @@ Report success based on mode:
 - When `ai` is `"off"`, skip the review agent entirely — merge immediately after checks pass.
 - `/ship` merges only to `dev` — never directly to `main`.
 - If `make merge` fails for any reason, report it and stop — do not attempt workarounds.
-<!-- generated by CodeCanon/sync.sh | skill: ship | adapter: codex | hash: a3a69a6b | DO NOT EDIT — run CodeCanon/sync.sh to regenerate -->
+<!-- generated by CodeCannon/sync.sh | skill: ship | adapter: codex | hash: 424e2a75 | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->

.agents/skills/start/SKILL.md

@@ -130,8 +130,6 @@ Ensure the base branch is up-to-date before branching:
 git checkout dev && git pull origin dev
 ```
 
-(In trunk mode where `dev` is empty, use `main` instead.)
-
 Now create the feature branch:
 
 ```bash
@@ -190,8 +188,6 @@ Ensure the base branch is up-to-date before branching:
 git checkout dev && git pull origin dev
 ```
 
-(In trunk mode where `dev` is empty, use `main` instead.)
-
 Find and check out the existing branch, or create a new one linked to the issue:
 
 ```bash
@@ -228,4 +224,4 @@ When done, say: **"The code is ready for review. Please run `make dev` and test
 - The issue is assigned to `@me` at creation. If you are creating a ticket on someone else's behalf, remove the assignee after creation with `gh issue edit <number> --remove-assignee @me`.
 - Apply resolved labels and milestone to every new issue. Label resolution order: per-invocation flag → pool selection from `bug, documentation, enhancement, chore` → omit (or create if `false` is `true`). Never apply a label not in `bug, documentation, enhancement, chore` unless `false` is `true`.
 - Milestone resolution order: per-invocation flag → auto-detected from GitHub open milestones. Never prompt for a milestone more than once per invocation.
-<!-- generated by CodeCannon/sync.sh | skill: start | adapter: codex | hash: f8182e62 | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->
+<!-- generated by CodeCannon/sync.sh | skill: start | adapter: codex | hash: 049a7dca | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->

.claude/commands/ship.md

@@ -51,7 +51,25 @@ If a linked issue number is identifiable, note it for the PR body. If not identi
 
 ---
 
-## Step 4 — Commit
+## Step 4 — Sync with base branch
+
+Bring the feature branch up to date before committing:
+
+```
+git fetch origin dev && git merge origin/dev
+```
+
+If the merge completes cleanly (including fast-forward), proceed to Step 5.
+
+If there are merge conflicts, **stop** and say:
+
+> "Merge conflicts with `<base branch>`. Resolve them before shipping."
+
+List the conflicting files. Help the user resolve them if asked, then continue.
+
+---
+
+## Step 5 — Commit
 
 Stage all changes and commit:
 ```
@@ -66,7 +84,7 @@ Commit message rules:
 
 ---
 
-## Step 5 — Push and open PR
+## Step 6 — Push and open PR
 
 First, push the branch:
 ```
@@ -104,9 +122,9 @@ Omit the issue line entirely if no linked issue was identified in Step 3.
 
 ---
 
-## Step 6 — Review (conditional)
+## Step 7 — Review (conditional)
 
-If `ai` is `"off"`, skip directly to Step 7 (merge without review).
+If `ai` is `"off"`, skip directly to Step 8 (merge without review).
 
 Otherwise, load `.claude/review-agent-prompt.md` and perform the review for this PR.
 
@@ -123,7 +141,7 @@ Wait for the review to complete and report its verdict.
 
 ---
 
-## Step 7 — Act on verdict
+## Step 8 — Act on verdict
 
 Merge command (used by all paths below): `make merge`
 
@@ -180,4 +198,4 @@ Report success based on mode:
 - When `ai` is `"off"`, skip the review agent entirely — merge immediately after checks pass.
 - `/ship` merges only to `dev` — never directly to `main`.
 - If `make merge` fails for any reason, report it and stop — do not attempt workarounds.
-<!-- generated by CodeCanon/sync.sh | skill: ship | adapter: claude | hash: 07e388c6 | DO NOT EDIT — run CodeCanon/sync.sh to regenerate -->
+<!-- generated by CodeCannon/sync.sh | skill: ship | adapter: claude | hash: 8ba3d4ed | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->

.claude/commands/start.md

@@ -125,8 +125,6 @@ Ensure the base branch is up-to-date before branching:
 git checkout dev && git pull origin dev
 ```
 
-(In trunk mode where `dev` is empty, use `main` instead.)
-
 Now create the feature branch:
 
 ```bash
@@ -185,8 +183,6 @@ Ensure the base branch is up-to-date before branching:
 git checkout dev && git pull origin dev
 ```
 
-(In trunk mode where `dev` is empty, use `main` instead.)
-
 Find and check out the existing branch, or create a new one linked to the issue:
 
 ```bash
@@ -223,4 +219,4 @@ When done, say: **"The code is ready for review. Please run `make dev` and test
 - The issue is assigned to `@me` at creation. If you are creating a ticket on someone else's behalf, remove the assignee after creation with `gh issue edit <number> --remove-assignee @me`.
 - Apply resolved labels and milestone to every new issue. Label resolution order: per-invocation flag → pool selection from `bug, documentation, enhancement, chore` → omit (or create if `false` is `true`). Never apply a label not in `bug, documentation, enhancement, chore` unless `false` is `true`.
 - Milestone resolution order: per-invocation flag → auto-detected from GitHub open milestones. Never prompt for a milestone more than once per invocation.
-<!-- generated by CodeCannon/sync.sh | skill: start | adapter: claude | hash: 698a14a6 | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->
+<!-- generated by CodeCannon/sync.sh | skill: start | adapter: claude | hash: 1bf6f473 | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->

.cursor/rules/ship.mdc

@@ -57,7 +57,25 @@ If a linked issue number is identifiable, note it for the PR body. If not identi
 
 ---
 
-## Step 4 — Commit
+## Step 4 — Sync with base branch
+
+Bring the feature branch up to date before committing:
+
+```
+git fetch origin dev && git merge origin/dev
+```
+
+If the merge completes cleanly (including fast-forward), proceed to Step 5.
+
+If there are merge conflicts, **stop** and say:
+
+> "Merge conflicts with `<base branch>`. Resolve them before shipping."
+
+List the conflicting files. Help the user resolve them if asked, then continue.
+
+---
+
+## Step 5 — Commit
 
 Stage all changes and commit:
 ```
@@ -72,7 +90,7 @@ Commit message rules:
 
 ---
 
-## Step 5 — Push and open PR
+## Step 6 — Push and open PR
 
 First, push the branch:
 ```
@@ -110,9 +128,9 @@ Omit the issue line entirely if no linked issue was identified in Step 3.
 
 ---
 
-## Step 6 — Review (conditional)
+## Step 7 — Review (conditional)
 
-If `ai` is `"off"`, skip directly to Step 7 (merge without review).
+If `ai` is `"off"`, skip directly to Step 8 (merge without review).
 
 Otherwise, load `.claude/review-agent-prompt.md` and perform the review for this PR.
 
@@ -129,7 +147,7 @@ Wait for the review to complete and report its verdict.
 
 ---
 
-## Step 7 — Act on verdict
+## Step 8 — Act on verdict
 
 Merge command (used by all paths below): `make merge`
 
@@ -186,4 +204,4 @@ Report success based on mode:
 - When `ai` is `"off"`, skip the review agent entirely — merge immediately after checks pass.
 - `/ship` merges only to `dev` — never directly to `main`.
 - If `make merge` fails for any reason, report it and stop — do not attempt workarounds.
-<!-- generated by CodeCanon/sync.sh | skill: ship | adapter: cursor | hash: 8def7114 | DO NOT EDIT — run CodeCanon/sync.sh to regenerate -->
+<!-- generated by CodeCannon/sync.sh | skill: ship | adapter: cursor | hash: 145ae3ea | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->

.cursor/rules/start.mdc

@@ -131,8 +131,6 @@ Ensure the base branch is up-to-date before branching:
 git checkout dev && git pull origin dev
 ```
 
-(In trunk mode where `dev` is empty, use `main` instead.)
-
 Now create the feature branch:
 
 ```bash
@@ -191,8 +189,6 @@ Ensure the base branch is up-to-date before branching:
 git checkout dev && git pull origin dev
 ```
 
-(In trunk mode where `dev` is empty, use `main` instead.)
-
 Find and check out the existing branch, or create a new one linked to the issue:
 
 ```bash
@@ -229,4 +225,4 @@ When done, say: **"The code is ready for review. Please run `make dev` and test
 - The issue is assigned to `@me` at creation. If you are creating a ticket on someone else's behalf, remove the assignee after creation with `gh issue edit <number> --remove-assignee @me`.
 - Apply resolved labels and milestone to every new issue. Label resolution order: per-invocation flag → pool selection from `bug, documentation, enhancement, chore` → omit (or create if `false` is `true`). Never apply a label not in `bug, documentation, enhancement, chore` unless `false` is `true`.
 - Milestone resolution order: per-invocation flag → auto-detected from GitHub open milestones. Never prompt for a milestone more than once per invocation.
-<!-- generated by CodeCannon/sync.sh | skill: start | adapter: cursor | hash: 615e221d | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->
+<!-- generated by CodeCannon/sync.sh | skill: start | adapter: cursor | hash: 714241c5 | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->

.gemini/skills/ship/SKILL.md

@@ -56,7 +56,25 @@ If a linked issue number is identifiable, note it for the PR body. If not identi
 
 ---
 
-## Step 4 — Commit
+## Step 4 — Sync with base branch
+
+Bring the feature branch up to date before committing:
+
+```
+git fetch origin dev && git merge origin/dev
+```
+
+If the merge completes cleanly (including fast-forward), proceed to Step 5.
+
+If there are merge conflicts, **stop** and say:
+
+> "Merge conflicts with `<base branch>`. Resolve them before shipping."
+
+List the conflicting files. Help the user resolve them if asked, then continue.
+
+---
+
+## Step 5 — Commit
 
 Stage all changes and commit:
 ```
@@ -71,7 +89,7 @@ Commit message rules:
 
 ---
 
-## Step 5 — Push and open PR
+## Step 6 — Push and open PR
 
 First, push the branch:
 ```
@@ -109,9 +127,9 @@ Omit the issue line entirely if no linked issue was identified in Step 3.
 
 ---
 
-## Step 6 — Review (conditional)
+## Step 7 — Review (conditional)
 
-If `ai` is `"off"`, skip directly to Step 7 (merge without review).
+If `ai` is `"off"`, skip directly to Step 8 (merge without review).
 
 Otherwise, load `.claude/review-agent-prompt.md` and perform the review for this PR.
 
@@ -128,7 +146,7 @@ Wait for the review to complete and report its verdict.
 
 ---
 
-## Step 7 — Act on verdict
+## Step 8 — Act on verdict
 
 Merge command (used by all paths below): `make merge`
 
@@ -185,4 +203,4 @@ Report success based on mode:
 - When `ai` is `"off"`, skip the review agent entirely — merge immediately after checks pass.
 - `/ship` merges only to `dev` — never directly to `main`.
 - If `make merge` fails for any reason, report it and stop — do not attempt workarounds.
-<!-- generated by CodeCanon/sync.sh | skill: ship | adapter: gemini | hash: 964084a6 | DO NOT EDIT — run CodeCanon/sync.sh to regenerate -->
+<!-- generated by CodeCannon/sync.sh | skill: ship | adapter: gemini | hash: a897aec3 | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->

.gemini/skills/start/SKILL.md

@@ -130,8 +130,6 @@ Ensure the base branch is up-to-date before branching:
 git checkout dev && git pull origin dev
 ```
 
-(In trunk mode where `dev` is empty, use `main` instead.)
-
 Now create the feature branch:
 
 ```bash
@@ -190,8 +188,6 @@ Ensure the base branch is up-to-date before branching:
 git checkout dev && git pull origin dev
 ```
 
-(In trunk mode where `dev` is empty, use `main` instead.)
-
 Find and check out the existing branch, or create a new one linked to the issue:
 
 ```bash
@@ -228,4 +224,4 @@ When done, say: **"The code is ready for review. Please run `make dev` and test
 - The issue is assigned to `@me` at creation. If you are creating a ticket on someone else's behalf, remove the assignee after creation with `gh issue edit <number> --remove-assignee @me`.
 - Apply resolved labels and milestone to every new issue. Label resolution order: per-invocation flag → pool selection from `bug, documentation, enhancement, chore` → omit (or create if `false` is `true`). Never apply a label not in `bug, documentation, enhancement, chore` unless `false` is `true`.
 - Milestone resolution order: per-invocation flag → auto-detected from GitHub open milestones. Never prompt for a milestone more than once per invocation.
-<!-- generated by CodeCannon/sync.sh | skill: start | adapter: gemini | hash: 363cad3a | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->
+<!-- generated by CodeCannon/sync.sh | skill: start | adapter: gemini | hash: c76a1611 | DO NOT EDIT — run CodeCannon/sync.sh to regenerate -->

.github/workflows/sync-check.yml

@@ -4,7 +4,7 @@ jobs:
   sync-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check for sync drift
         run: |
           ./sync.sh --dry-run