@ngockhoale/ukit 1.5.14 → 1.5.16

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to UKit are documented here.
 
+## 1.5.16 - 2026-06-06
+
+### Changed
+
+- `clear-handoff`: added Step 2 — stage `docs/AI_HANDOFF/`, commit planning artifacts, merge `handoff/integration → $BASE`, push, delete integration branch. This is the **only** git commit+push in the entire handoff flow.
+- `review-handoff`: removed all merge/push instructions from Step 3. Reviewer now stops at "Run /ukit:clear-handoff" after all tasks approved.
+- Rule enforced: `create-handoff`, `implement-handoff`, `review-handoff` may only change files inside `docs/AI_HANDOFF/`. No commits to main, no pushes.
+
+## 1.5.15 - 2026-06-06
+
+### Changed
+
+- `review-handoff`: removed automatic `git merge handoff/integration → $BASE`. Reviewer now stops after all tasks are approved and instructs the human to merge manually. Only the end user (or an explicit human prompt) may commit to the base branch.
+
 ## 1.5.14 - 2026-06-05
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngockhoale/ukit",
-  "version": "1.5.14",
+  "version": "1.5.16",
   "description": "Install/update an index-first AI workspace for Claude Code, Antigravity, OpenAI Codex, and OpenCode.",
   "license": "MIT",
   "type": "module",

package/templates/.claude/commands/ukit/clear-handoff.md

@@ -27,26 +27,45 @@ Fix all tasks first, then re-run /ukit:clear-handoff.
 
 Only continue if ALL tasks are `done`.
 
-## Step 2 — Cleanup branches (safety net)
+## Step 2 — Merge + commit + push to $BASE
 
-Task worktrees are deleted immediately during implement — none should remain.
-This step is a safety net + integration branch cleanup:
+This is the **only step in the entire handoff that commits and pushes to the base branch.**
+
+```bash
+git checkout $BASE
+
+# Stage handoff planning docs (written to workspace during create-handoff, never committed yet)
+git add docs/AI_HANDOFF/
+if ! git diff --staged --quiet; then
+  git commit -m "docs(handoff): add cycle planning artifacts"
+fi
+
+# Merge integration branch (code changes from implement-handoff worktrees)
+if git merge handoff/integration --no-ff -m "feat: complete handoff cycle"; then
+  git push origin $BASE
+  git branch -D handoff/integration
+else
+  git merge --abort
+  echo "⛔ Merge conflict on handoff/integration → $BASE. Resolve manually, then re-run /ukit:clear-handoff."
+  exit 1
+fi
+```
+
+## Step 3 — Cleanup stray worktrees (safety net)
+
+Task worktrees are deleted immediately during implement — none should remain. Safety net only:
 
 ```bash
-# Safety net: remove any stray task worktrees (should already be gone)
 git worktree list | grep '.worktrees/task-' | awk '{print $1}' | while read wt; do
   name=$(basename $wt)
   git worktree remove $wt --force 2>/dev/null
   git branch -D handoff/$name 2>/dev/null
 done
 
-# Integration branch cleanup (removed by review-handoff on success, but safety net here too)
-git branch -D handoff/integration 2>/dev/null
-
 git worktree prune
 ```
 
-## Step 3 — Archive cycle
+## Step 4 — Archive cycle
 
 Read INDEX.md for cycle ID and task list.
 Write `docs/AI_HANDOFF/archive/cycle-NNN.md`:
@@ -57,7 +76,7 @@ Write `docs/AI_HANDOFF/archive/cycle-NNN.md`:
 ```
 If `archive/` has > 3 files → delete oldest, append 1-line summary to `HISTORY.md`.
 
-## Step 4 — Reset state files
+## Step 5 — Reset state files
 
 ```
 PLAN.md  → "# PLAN\n_(empty)_"
@@ -66,11 +85,11 @@ ACTIVE.md → "# ACTIVE\n_(no active cycle)_"
 tasks/TASK-*.md → delete all (keep _TEMPLATE.md)
 ```
 
-## Step 5 — Report
+## Step 6 — Report
 
-Cycle NNN archived. X tasks completed. Base was $BASE. Worktrees removed. Ready for new cycle.
+Cycle NNN merged + pushed to $BASE. X tasks completed. Worktrees removed. Ready for new cycle.
 
-> Claude Code: spawn `ukit-small-task-maintainer` (haiku) with steps 1–5.
-> Other tools: use lite model, follow steps 1–5 above.
+> Claude Code: spawn `ukit-small-task-maintainer` (haiku) with steps 1–6.
+> Other tools: use lite model, follow steps 1–6 above.
 
 **Next:** `/ukit:create-handoff <new problem description>`

package/templates/.claude/commands/ukit/review-handoff.md

@@ -77,31 +77,32 @@ Set `status = NEXT_STATUS_FOR_INDEX`. Orchestrator writes INDEX, not the reviewe
 ## Step 3 — After all tasks reviewed
 
 **All `approved` or `approved_minor`:**
-```bash
-git checkout $BASE
-if git merge handoff/integration --no-ff -m "feat: handoff cycle complete"; then
-  git branch -D handoff/integration
-  # INDEX.md: all approved tasks → done
-else
-  git merge --abort
-  # Report: conflict on integration→BASE. Human must resolve manually.
-fi
+
+Update INDEX.md: all approved tasks → `done`.
+
+**STOP. Do not commit, do not push, do not merge.** Only `docs/AI_HANDOFF/` was touched during this entire cycle. The merge + commit + push happens exclusively in `/ukit:clear-handoff`.
+
+Report:
+
+```
+✅ All tasks approved. Cycle ready to finalize.
+Run: /ukit:clear-handoff
 ```
 
 **Any `changes_requested` or `critical_block`:**
-Keep `handoff/integration` open for next implement round. Report which tasks need fixes.
+Keep `handoff/integration` open. Report which tasks need fixes.
 
 ## Step 4 — Report
 
 ```
 Review summary:
-  TASK-001: approved — merged into BASE
+  TASK-001: approved
   TASK-002: changes_requested — see §Discussion
-  Integration: merged to BASE | pending (fix TASK-002 first)
+  Integration: ready for clear-handoff | pending (fix TASK-002 first)
 ```
 
 **Next:**
-- All done → `/ukit:clear-handoff`
+- All approved → `/ukit:clear-handoff` (does the merge + commit + push)
 - Has fixes → executor re-runs `/ukit:implement-handoff TASK-xxx`
 
 > Claude Code: spawn `code-reviewer` (opus) per task for 2a–2d. Orchestrator handles 1, 2e, 3.