claude-plugin-viban 1.3.14 → 1.3.16

package/.claude-plugin/plugin.json

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

package/README.md

@@ -135,6 +135,35 @@ Assigns N issues (default 3, max 5) and spawns one agent per issue in isolated g
 → Each commits on its own branch, coordinator creates PRs
 ```
 
+### `/viban:review` — Checkout for IDE review
+
+Checks out the issue branch and soft-resets so all changes appear as staged diffs in your IDE.
+
+```
+/viban:review
+→ Finds first review card, checks out branch, staged diffs ready in IDE
+/viban:review 12
+→ Checks out branch for issue #12
+```
+
+### `/viban:approve` — Approve and merge
+
+Merges the issue branch, cleans up the worktree, and marks the card as done.
+
+```
+/viban:approve 12
+→ Squash-merges PR, removes worktree/branch, marks #12 done
+```
+
+### `/viban:reject` — Reject with feedback
+
+Returns the issue to in_progress with optional feedback for the agent to address.
+
+```
+/viban:reject 12 "Missing error handling in auth flow"
+→ Moves #12 back to in_progress, records feedback as comment
+```
+
 ### `/viban:setup` — Install and configure
 
 Installs dependencies, detects your project conventions, and generates a workflow file.
@@ -175,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>
@@ -317,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/bin/viban

@@ -221,7 +221,7 @@ main() {
     [[ "${1:-}" != "archive" ]] && auto_archive
     case "${1:-}" in
         list)   shift; cmd_list "$@";;
-        history) cmd_history;;
+        history) shift; cmd_history "$@";;
         add)    shift; _with_lock cmd_add "$@";;
         attach) shift; _with_lock cmd_attach "$@";;
         assign) shift; _with_lock cmd_assign "$@";;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-plugin-viban",
-  "version": "1.3.14",
+  "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. Merges the branch, cleans up 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)
 
@@ -31,22 +31,17 @@ Confirm the issue is in `review` status. If not, tell the user and exit.
 ```bash
 REPO_ROOT=$(git rev-parse --show-toplevel)
 BRANCH="issue-$ID"
-PREV_BRANCH=$(git branch --show-current)
-```
-
-If `$PREV_BRANCH` is empty (detached HEAD from `/viban:review`), determine the main branch:
-
-```bash
-PREV_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@')
-[ -z "$PREV_BRANCH" ] && PREV_BRANCH="main"
+WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
 ```
 
 ---
 
-## Step 2: Return to main branch
+## Step 2: Return to Main
+
+Detached HEAD from `/viban:review` — branch is intact, just switch back:
 
 ```bash
-git checkout "$PREV_BRANCH"
+git checkout main
 ```
 
 ---
@@ -63,26 +58,11 @@ If PR found:
 
 ```bash
 gh pr merge "$PR_NUM" --squash --delete-branch
-```
-
-Clean up worktree if it still exists:
-
-```bash
-WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
-[ -d "$WT_DIR" ] && git worktree remove "$WT_DIR" --force 2>/dev/null
+git pull origin main
 ```
 
 ### If no PR (branch only)
 
-Remove worktree to free the branch:
-
-```bash
-WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
-[ -d "$WT_DIR" ] && git worktree remove "$WT_DIR" --force 2>/dev/null
-```
-
-Merge locally:
-
 ```bash
 git merge "$BRANCH" --no-ff -m "Merge issue-$ID: <title>"
 git branch -d "$BRANCH"
@@ -96,17 +76,36 @@ Nothing to merge. Proceed to Step 4.
 
 ---
 
-## Step 4: Complete
+## Step 4: Cleanup Worktree
+
+```bash
+[ -d "$WT_DIR" ] && git worktree remove "$WT_DIR" --force 2>/dev/null
+```
+
+---
+
+## Step 5: Complete
 
 ```bash
 viban done $ID
 ```
 
-Restore stash if one was created during `/viban:review`:
+---
+
+## Step 6: Restore User State
+
+Check for stash:
 
 ```bash
-STASH=$(git stash list | grep "viban-review: before reviewing #$ID" | head -1 | cut -d: -f1)
+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

@@ -30,19 +30,41 @@ Confirm the issue is in `review` status. If not, tell the user and exit.
 
 Parse `$ARGUMENTS`: first token is `$ID`, rest is `$FEEDBACK`.
 
+```bash
+REPO_ROOT=$(git rev-parse --show-toplevel)
+BRANCH="issue-$ID"
+WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
+```
+
+---
+
+## Step 2: Return to Main
+
+Detached HEAD from `/viban:review` — branch is intact, just switch back:
+
+```bash
+git checkout main
+```
+
 ---
 
-## Step 2: Return to main branch
+## 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
-PREV_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@')
-[ -z "$PREV_BRANCH" ] && PREV_BRANCH="main"
-git checkout "$PREV_BRANCH"
+[ ! -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
@@ -50,7 +72,7 @@ viban move $ID in_progress
 
 ---
 
-## Step 4: Record feedback
+## Step 5: Record Feedback
 
 If `$FEEDBACK` is provided:
 
@@ -61,7 +83,6 @@ viban comment $ID "$FEEDBACK"
 Also comment on PR if one exists:
 
 ```bash
-BRANCH="issue-$ID"
 PR_NUM=$(gh pr list --head "$BRANCH" --json number --jq '.[0].number' 2>/dev/null)
 [ -n "$PR_NUM" ] && gh pr comment "$PR_NUM" --body "$FEEDBACK"
 ```
@@ -72,11 +93,20 @@ If no feedback provided, ask the user: "Any feedback for the developer?"
 
 ---
 
-## Step 5: Restore stash
+## Step 6: Restore User State
+
+Check for stash:
 
 ```bash
-STASH=$(git stash list | grep "viban-review: before reviewing #$ID" | head -1 | cut -d: -f1)
+STASH=$(git stash list | grep "viban-review: before #$ID" | head -1 | cut -d: -f1)
 [ -n "$STASH" ] && git stash pop "$STASH"
 ```
 
-Report: "Issue #$ID rejected and moved to in_progress. Worktree is intact for the agent to continue."
+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: "Checkout a review issue's branch for IDE review"
+description: "Checkout a review issue's branch for IDE diff review"
 ---
 
 # /review
 
-Checkout a review-status issue's branch into the main working directory so the user can review changes in their IDE.
+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: Detect Review Mode
+## Step 2: Prepare Branch
 
 ```bash
 REPO_ROOT=$(git rev-parse --show-toplevel)
@@ -48,101 +48,53 @@ BRANCH="issue-$ID"
 WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
 ```
 
-Check in priority order — first match wins:
-
-### Mode W: Worktree exists
-
-```bash
-[ -d "$WT_DIR" ]
-```
-
-If worktree exists → **Worktree mode**.
-
-### Mode A: PR exists (no worktree)
-
-```bash
-gh pr list --head "$BRANCH" --json number,url --jq '.[0]' 2>/dev/null
-```
-
-If PR found → **PR mode**.
-
-### Mode B: Branch exists (no PR, no worktree)
+If worktree exists, detach it to free the branch:
 
 ```bash
-git rev-parse --verify "$BRANCH" 2>/dev/null
+[ -d "$WT_DIR" ] && git -C "$WT_DIR" checkout --detach 2>/dev/null
 ```
 
-If branch exists → **Branch mode**.
-
-### Mode C: No branch
-
-No branch → **Commit mode**.
-
 ---
 
-## Step 3: Present for Review
-
-### Mode W (worktree exists)
-
-Show changes against main:
-
-```bash
-git -C "$WT_DIR" log main.."$BRANCH" --oneline
-git -C "$WT_DIR" diff main..."$BRANCH" --stat
-```
-
-Check if PR exists:
+## Step 3: Handle Dirty Working Tree
 
 ```bash
-PR_INFO=$(gh pr list --head "$BRANCH" --json number,url --jq '.[0]' 2>/dev/null)
+git status --porcelain
 ```
 
-### Mode A / B (no worktree, branch exists)
-
-Stash if dirty:
+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"`
 
-```bash
-git status --porcelain
-```
+If clean, proceed directly.
 
-If dirty, ask user: "You have uncommitted changes. Stash them to proceed?"
-- Yes → `git stash push -m "viban-review: before reviewing #$ID"`
-- No → exit
+---
 
-Detached HEAD checkout:
+## Step 4: Detached Checkout and Reset
 
 ```bash
-PREV_BRANCH=$(git branch --show-current)
 git checkout --detach "$BRANCH"
+git reset --soft main
 ```
 
-Show changes:
-
-```bash
-git log "$PREV_BRANCH".."$BRANCH" --oneline
-git diff "$PREV_BRANCH"..."$BRANCH" --stat
-```
+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.
 
-### Mode C (no branch)
+---
 
-Show recent commits:
+## Step 5: Report and Exit
 
 ```bash
-git log --oneline -10
+PR_INFO=$(gh pr list --head "$BRANCH" --json number,url --jq '.[0]' 2>/dev/null)
 ```
 
----
-
-## Step 4: Report and Exit
-
 Tell the user:
 
-**Mode W**: "Issue #$ID worktree is at `$WT_DIR`. Open it in your IDE to review. {PR #N link if PR exists.} Run `/viban:approve $ID` or `/viban:reject $ID` when ready."
-
-**Mode A**: "PR #N for issue #$ID is checked out. Review in your IDE. Run `/viban:approve $ID` or `/viban:reject $ID` when ready."
-
-**Mode B**: "Branch `issue-$ID` is checked out. Review in your IDE. Run `/viban:approve $ID` or `/viban:reject $ID` when ready."
-
-**Mode C**: "Issue #$ID was worked on main directly. Run `/viban:approve $ID` or `/viban:reject $ID` when ready."
+```
+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.
+```
 
 **Done.** Do not wait for user input. The skill exits here.