toga-ai 1.0.979 → 1.0.980

package/knowledge/standalone/apps/claude/workflows/clickup-ticket-workflow.md

@@ -101,11 +101,19 @@ All tested 2026-10-08:
   `_production`, varies) — resolve with `gh repo view <owner/repo> --json defaultBranchRef`.
 - **The KB repo (`toga-tech`) works on `_main`.** No branch check and no PRs there; `/finish`
   still does the ticket check.
+- **Re-check the branch, never repeat it.** When the developer says they switched (or before
+  repeating any mismatch), run `branch-check` / `git -C <repo> branch --show-current` fresh in
+  that turn. Never state a branch from memory or an earlier check.
+- **`/finish` offers to commit.** Uncommitted session files → it asks once "Run /commit for them
+  now?"; yes = it runs the `/commit` steps itself, then continues; no = stop. `gh` not logged in
+  → "Run `gh auth login` in a terminal, then tell me 'done'", then re-check `gh auth status`.
 
 ## Change history
 
 - 2026-10-08 — Created: ClickUp-tied sessions (`/start`, `/commit`, `/pseudocode`, `/finish`)
   replace `/kickoff`, `/capture`, `/plan-ticket`, `/work-ticket`, `/rework-ticket`. (jcardinal)
+- 2026-10-08 — Branch claims always re-checked fresh; `/finish` runs `/commit` on yes and
+  guides `gh auth login`. (jcardinal)
 
 ## Related
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toga-ai",
-  "version": "1.0.979",
+  "version": "1.0.980",
   "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/rules/common/git-workflow.md

@@ -33,6 +33,8 @@ describes. It does not authorize publishing anything else in the session.
 
 - `/commit` — local commits of only the files this session changed. Never pushes.
 - `/finish` — the KB push to `_main`, the ticket-branch pushes, the PRs, and the ticket writes.
+  If this session's files are uncommitted, `/finish` asks once and, on "yes", runs the
+  `/commit` steps itself (same rules as `/commit`).
 - `/ship`, `/land-and-deploy` — the commits, pushes, and PRs they describe.
 
 Force-pushing is never automatic in any repo, including the knowledge repo.
@@ -92,6 +94,10 @@ git -C <repo> log -1 --format="%h %ad %s" --date=short -- <file>
 - For push state, check `git -C <repo> status -sb` (ahead/behind) — do not assume.
 - If Claude did not check, it says **nothing** about commit or push state. No habit reminders
   like "still not committed" at the end of a summary.
+- **Branch state too.** Never say a repo is "on branch X" or "on the wrong branch" from memory
+  or an earlier check. Run `git -C <repo> branch --show-current` (or `start-helper.js
+  branch-check`) fresh in the same turn first. When the developer says they switched, re-check
+  before you answer.
 
 ## Branch protection
 

package/skills/commit/SKILL.md

@@ -37,7 +37,8 @@ Run `helper status --session=<id>`. For each repo, tell the developer in plain w
 4. **Branch mismatch:** `branchMismatch` files were last edited on another branch
    (`entryBranch`). They are NOT in `toCommit`. If the list is not empty, **stop** for that
    repo: say which files were edited on which branch, and ask the developer to switch
-   branches themselves.
+   branches themselves. When they say they switched, run `status` again fresh in that turn
+   and report only what it shows now — never repeat a mismatch from memory.
 5. **Possibly yours from before a resume:** list `sameBranchOtherSessions` (time, file count).
    If the developer says one is theirs, run `status` with that id too and merge the lists.
 6. **Ticket:** use the repo's `ticket`. `ticketSource` says where it came from:

package/skills/finish/SKILL.md

@@ -322,8 +322,10 @@ comment.
 development finished)"
 
 **No** → stop. Report what is left local: for each repo from `START repos-with-work`, the
-unpushed commit count, and any uncommitted Claude changes from `COMMIT status`. Say:
-"Run /finish again when the ticket is done."
+unpushed commit count, and any uncommitted Claude changes from `COMMIT status`. If there are
+uncommitted Claude changes, ask once: "These files aren't committed: <list>. Run /commit for
+them now?" Yes → run the `/commit` skill's steps (same rules as `skills/commit/SKILL.md`).
+Then say: "Run /finish again when the ticket is done."
 
 **KB / harness repo work (toga-tech / agilantsolutions/claude, on `_main`):** `knowledge/` was
 published in Part 1. Other harness files committed with `/commit` are pushed now:
@@ -343,10 +345,15 @@ skip Steps 12–14 and go to Step 15 (PM comment) and Step 16 (status).
    `origin/<TICKET>` if pushed). This includes commits from other sessions — that is intended.
    Keep for each: repo path, `owner/repo`, ahead count, pushed or not.
 2. `COMMIT status --session=<sid> --root="$CLAUDE_PROJECT_DIR"`. If any repo has `toCommit`
-   files: stop and say "There are uncommitted changes from this session in `<repo>`. Run
-   /commit first, then /finish again." (Changes outside Claude's list, `otherChanged`, are the
-   developer's — mention them, do not block.)
-3. If `gh auth status` fails: stop and say "Run `gh auth login`, then /finish again."
+   files: ask once — "These files aren't committed: <list>. Run /commit for them now?"
+   **Yes** → run the `/commit` skill's steps yourself (same rules as `skills/commit/SKILL.md`:
+   only this session's files, the `Claude-Notes: v1` format), then re-run step 1 and continue.
+   **No** → stop and say "Run /finish again when they are committed." (Changes outside
+   Claude's list, `otherChanged`, are the developer's — mention them, do not block.)
+3. If `gh auth status` fails, say exactly: "Run `gh auth login` in a terminal, then tell me
+   'done'". When they say done, run `gh auth status` again and continue only if it passes.
+   Before saying any repo is on the wrong branch, re-check it fresh in that turn
+   (`git -C <repo> branch --show-current`) — never from memory or an earlier check.
 4. No repo with work → check whether this session committed on another branch. Per repo under
    the root: `git -C "<repo>" log --all --grep="Claude-Session: <sid>" --format=%h`, then for
    each hash `git -C "<repo>" branch --contains <hash>`. If any show up, list repo + branch,

package/skills/start/SKILL.md

@@ -112,6 +112,10 @@ explicit "continue anyway":
 node ".../start-helper.js" override-branch --session <sid>
 ```
 
+**Re-check, never repeat.** When the developer says they switched — or before you repeat any
+mismatch — run `branch-check` again, fresh, in that same turn. Report only what it shows now.
+Never state a repo's branch from memory or from an earlier check.
+
 ## Step 5 — GitHub login (warn only)
 
 Run `gh auth status`. If not logged in, say: "Run `gh auth login` before /finish." Keep going.