toga-ai 1.0.27 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toga-ai",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "TOGA Technology Team Claude Knowledge System — shared AI coding harness with skills, knowledge base CLI, and project installer for Claude Code.",
   "keywords": [
     "claude",

package/skills/capture/SKILL.md

@@ -163,17 +163,40 @@ git -C "<TEAM_REPO>" status --short knowledge/
 ```
 If empty — report "No new knowledge to push" and exit cleanly.
 
-**Push:**
+**Commit:**
 ```bash
 git -C "<TEAM_REPO>" add knowledge/
 git -C "<TEAM_REPO>" diff --cached --quiet || \
   git -C "<TEAM_REPO>" commit -m "knowledge: <one-line summary>"
-git -C "<TEAM_REPO>" push origin HEAD:feature/ai-harness-improvements
 ```
 
 Never stage files outside `knowledge/`. If `git diff --cached` includes anything outside
 `knowledge/`, abort and warn before committing.
 
+**Sync, then push (rebase BEFORE pushing — this prevents the version-bump conflict):**
+
+Every push to this branch triggers a CI job that commits a `chore: bump version [skip ci]`
+back to the branch. So after *any* prior push (e.g. an earlier capture in the same session),
+your local branch is one commit behind the remote, and a naive push is rejected as a
+non-fast-forward. Rebase your fresh commit onto the remote **before** pushing — this pulls in
+commits that already exist (no waiting on CI), so the push fast-forwards cleanly:
+
+```bash
+git -C "<TEAM_REPO>" fetch origin
+git -C "<TEAM_REPO>" rebase origin/feature/ai-harness-improvements
+git -C "<TEAM_REPO>" push origin HEAD:feature/ai-harness-improvements
+```
+
+> **Do NOT "pull after push" instead** — the bump commit for *this* push is created
+> asynchronously by CI a few seconds later, so pulling immediately afterward races CI and
+> usually grabs nothing. Rebasing *before* the push is what reliably avoids the conflict,
+> with zero dependency on npm build/publish timing.
+
+**If the push is still rejected** (a bump commit landed in the brief window between your
+rebase and push), simply repeat `fetch` → `rebase` → `push`, up to 2 more times. This is an
+expected occasional race, not an error — do not report it as a failure unless all retries are
+exhausted.
+
 **If push succeeds:**
 > "✓ Pushed to `feature/ai-harness-improvements` — CI publishes new npm version. Teammates get it on `npx toga-ai`."