claude-plugin-viban 1.3.15 → 1.3.16

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "viban",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "description": "Terminal Kanban TUI for AI-human collaborative issue tracking",
   "author": {
     "name": "happy-nut"

package/README.md

@@ -137,11 +137,11 @@ Assigns N issues (default 3, max 5) and spawns one agent per issue in isolated g
 
 ### `/viban:review` — Checkout for IDE review
 
-Checks out a review-status issue's branch for inspection in your IDE.
+Checks out the issue branch and soft-resets so all changes appear as staged diffs in your IDE.
 
 ```
 /viban:review
-→ Detects first review card, checks out branch, shows diff summary
+→ Finds first review card, checks out branch, staged diffs ready in IDE
 /viban:review 12
 → Checks out branch for issue #12
 ```
@@ -204,8 +204,8 @@ viban attach <id> <file1> [file2...]
 # Workflow
 viban assign                                        # Assign top backlog
 viban review [id]                                   # → review
-viban move <id> <status>                            # → any status
-viban done <id> [--purge] [--dry-run]               # → done
+viban move <id> <status> [--force]                   # → any status
+viban done <id> [--purge] [--force]                  # → done
 
 # Dependencies
 viban link <id> blocks <id>
@@ -346,7 +346,7 @@ Issues are stored in `.viban/viban.json`:
 
 ```bash
 brew install gum jq
-zsh tests/run_all.zsh    # 19 suites, 212 tests
+zsh tests/run_all.zsh    # 20 suites, 237 tests
 ```
 
 See [docs/release.md](docs/release.md) for publishing.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-plugin-viban",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "description": "Terminal Kanban TUI for AI-human collaborative issue tracking",
   "main": "bin/viban",
   "bin": {

package/skills/approve/SKILL.md

@@ -5,7 +5,7 @@ description: "Approve a reviewed issue — merge branch, cleanup worktree, mark
 
 # /approve
 
-Approve a review-status issue after IDE review. Restores commits, merges the branch, removes the worktree, and marks the card done.
+Approve a review-status issue after IDE review. Merges the branch, removes the worktree, and marks the card done.
 
 > **CLI only** (no direct viban.json access)
 
@@ -36,12 +36,12 @@ WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
 
 ---
 
-## Step 2: Restore Branch Commits
+## Step 2: Return to Main
 
-If worktree exists and was soft-reset (from `/viban:review`):
+Detached HEAD from `/viban:review` — branch is intact, just switch back:
 
 ```bash
-[ -d "$WT_DIR" ] && git -C "$WT_DIR" reset --soft ORIG_HEAD
+git checkout main
 ```
 
 ---
@@ -90,4 +90,22 @@ Nothing to merge. Proceed to Step 4.
 viban done $ID
 ```
 
+---
+
+## Step 6: Restore User State
+
+Check for stash:
+
+```bash
+STASH=$(git stash list | grep "viban-review: before #$ID" | head -1 | cut -d: -f1)
+[ -n "$STASH" ] && git stash pop "$STASH"
+```
+
+Check for temp commit:
+
+```bash
+TEMP=$(git log --oneline -1 | grep "viban-review: temp commit before #$ID")
+[ -n "$TEMP" ] && git reset HEAD~1
+```
+
 Report: "Issue #$ID approved and merged."

package/skills/reject/SKILL.md

@@ -5,7 +5,7 @@ description: "Reject a reviewed issue — return to in_progress with feedback"
 
 # /reject
 
-Reject a review-status issue and move it back to in_progress. Restores the worktree so the agent can address feedback.
+Reject a review-status issue and move it back to in_progress. The worktree stays intact so the agent can address feedback.
 
 > **CLI only** (no direct viban.json access)
 
@@ -38,19 +38,33 @@ WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
 
 ---
 
-## Step 2: Restore Branch Commits
+## Step 2: Return to Main
 
-If worktree was soft-reset (from `/viban:review`):
+Detached HEAD from `/viban:review` — branch is intact, just switch back:
 
 ```bash
-[ -d "$WT_DIR" ] && git -C "$WT_DIR" reset --soft ORIG_HEAD
+git checkout main
 ```
 
-Worktree stays intact for the agent to continue working.
+---
+
+## Step 3: Re-attach Worktree
+
+If worktree exists (detached during review), re-attach it to the branch:
+
+```bash
+[ -d "$WT_DIR" ] && git -C "$WT_DIR" checkout "$BRANCH"
+```
+
+If worktree does not exist, recreate it:
+
+```bash
+[ ! -d "$WT_DIR" ] && git worktree add "$WT_DIR" "$BRANCH"
+```
 
 ---
 
-## Step 3: Move Back to in_progress
+## Step 4: Move Back to in_progress
 
 ```bash
 viban move $ID in_progress
@@ -58,7 +72,7 @@ viban move $ID in_progress
 
 ---
 
-## Step 4: Record Feedback
+## Step 5: Record Feedback
 
 If `$FEEDBACK` is provided:
 
@@ -79,6 +93,20 @@ If no feedback provided, ask the user: "Any feedback for the developer?"
 
 ---
 
-## Step 5: Report
+## Step 6: Restore User State
+
+Check for stash:
+
+```bash
+STASH=$(git stash list | grep "viban-review: before #$ID" | head -1 | cut -d: -f1)
+[ -n "$STASH" ] && git stash pop "$STASH"
+```
+
+Check for temp commit:
+
+```bash
+TEMP=$(git log --oneline -1 | grep "viban-review: temp commit before #$ID")
+[ -n "$TEMP" ] && git reset HEAD~1
+```
 
 Report: "Issue #$ID rejected → in_progress. Worktree intact at `$WT_DIR`."

package/skills/review/SKILL.md

@@ -1,11 +1,11 @@
 ---
 name: review
-description: "Prepare a review issue for IDE review via staged diffs"
+description: "Checkout a review issue's branch for IDE diff review"
 ---
 
 # /review
 
-Prepare a review-status issue for IDE review. Soft-resets the worktree so all changes appear as staged diffs.
+Checkout a review-status issue's branch into the main worktree so the user can review all changes as staged diffs in their IDE.
 
 > **CLI only** (no direct viban.json access)
 
@@ -40,7 +40,7 @@ Show the user a one-line summary: `#ID [PRIORITY] Title`.
 
 ---
 
-## Step 2: Locate Worktree
+## Step 2: Prepare Branch
 
 ```bash
 REPO_ROOT=$(git rev-parse --show-toplevel)
@@ -48,27 +48,42 @@ BRANCH="issue-$ID"
 WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
 ```
 
-If worktree does not exist:
+If worktree exists, detach it to free the branch:
 
 ```bash
-[ ! -d "$WT_DIR" ]
+[ -d "$WT_DIR" ] && git -C "$WT_DIR" checkout --detach 2>/dev/null
 ```
 
-Tell the user "No worktree found for #$ID. Cannot review." and exit.
+---
+
+## Step 3: Handle Dirty Working Tree
+
+```bash
+git status --porcelain
+```
+
+If dirty, ask user with AskUserQuestion:
+- "You have uncommitted changes. How should we save them?"
+- Options:
+  - "Stash" → `git stash push -m "viban-review: before #$ID"`
+  - "Temp commit" → `git add -A && git commit -m "viban-review: temp commit before #$ID"`
+
+If clean, proceed directly.
 
 ---
 
-## Step 3: Soft-Reset for IDE Review
+## Step 4: Detached Checkout and Reset
 
 ```bash
-git -C "$WT_DIR" reset --soft main
+git checkout --detach "$BRANCH"
+git reset --soft main
 ```
 
-Now all changes from the issue branch appear as **staged diffs** when the worktree directory is opened in the IDE.
+This checks out the branch's commit without moving the branch pointer. Now all changes appear as **staged diffs** in the IDE, and the `$BRANCH` ref stays intact.
 
 ---
 
-## Step 4: Report and Exit
+## Step 5: Report and Exit
 
 ```bash
 PR_INFO=$(gh pr list --head "$BRANCH" --json number,url --jq '.[0]' 2>/dev/null)
@@ -77,7 +92,7 @@ PR_INFO=$(gh pr list --head "$BRANCH" --json number,url --jq '.[0]' 2>/dev/null)
 Tell the user:
 
 ```
-Reviewing #$ID — open $WT_DIR in your IDE to see staged diffs.
+Reviewing #$ID — all changes are staged in your IDE.
 {PR #N: <url> if PR exists}
 Run /viban:approve $ID or /viban:reject $ID when ready.
 ```