claude-plugin-viban 1.3.14 → 1.3.15

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "viban",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "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 a review-status issue's branch for inspection in your IDE.
+
+```
+/viban:review
+→ Detects first review card, checks out branch, shows diff summary
+/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.

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.15",
   "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. Restores commits, 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: Restore Branch Commits
+
+If worktree exists and was soft-reset (from `/viban:review`):
 
 ```bash
-git checkout "$PREV_BRANCH"
+[ -d "$WT_DIR" ] && git -C "$WT_DIR" reset --soft ORIG_HEAD
 ```
 
 ---
@@ -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,18 @@ Nothing to merge. Proceed to Step 4.
 
 ---
 
-## Step 4: Complete
+## Step 4: Cleanup Worktree
 
 ```bash
-viban done $ID
+[ -d "$WT_DIR" ] && git worktree remove "$WT_DIR" --force 2>/dev/null
 ```
 
-Restore stash if one was created during `/viban:review`:
+---
+
+## Step 5: Complete
 
 ```bash
-STASH=$(git stash list | grep "viban-review: before reviewing #$ID" | head -1 | cut -d: -f1)
-[ -n "$STASH" ] && git stash pop "$STASH"
+viban done $ID
 ```
 
 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. The worktree stays intact so the agent can address feedback.
+Reject a review-status issue and move it back to in_progress. Restores the worktree so the agent can address feedback.
 
 > **CLI only** (no direct viban.json access)
 
@@ -30,19 +30,27 @@ 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 branch
+## Step 2: Restore Branch Commits
+
+If worktree was soft-reset (from `/viban:review`):
 
 ```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 -C "$WT_DIR" reset --soft ORIG_HEAD
 ```
 
+Worktree stays intact for the agent to continue working.
+
 ---
 
-## Step 3: Move back to in_progress
+## Step 3: Move Back to in_progress
 
 ```bash
 viban move $ID in_progress
@@ -50,7 +58,7 @@ viban move $ID in_progress
 
 ---
 
-## Step 4: Record feedback
+## Step 4: Record Feedback
 
 If `$FEEDBACK` is provided:
 
@@ -61,7 +69,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 +79,6 @@ If no feedback provided, ask the user: "Any feedback for the developer?"
 
 ---
 
-## Step 5: Restore stash
-
-```bash
-STASH=$(git stash list | grep "viban-review: before reviewing #$ID" | head -1 | cut -d: -f1)
-[ -n "$STASH" ] && git stash pop "$STASH"
-```
+## Step 5: Report
 
-Report: "Issue #$ID rejected and moved to in_progress. Worktree is intact for the agent to continue."
+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: "Prepare a review issue for IDE review via staged diffs"
 ---
 
 # /review
 
-Checkout a review-status issue's branch into the main working directory so the user can review changes in their IDE.
+Prepare a review-status issue for IDE review. Soft-resets the worktree so all changes appear as staged diffs.
 
 > **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: Locate Worktree
 
 ```bash
 REPO_ROOT=$(git rev-parse --show-toplevel)
@@ -48,101 +48,38 @@ BRANCH="issue-$ID"
 WT_DIR="$REPO_ROOT/.viban/worktrees/$ID"
 ```
 
-Check in priority order — first match wins:
-
-### Mode W: Worktree exists
+If worktree does not exist:
 
 ```bash
-[ -d "$WT_DIR" ]
+[ ! -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
-```
+Tell the user "No worktree found for #$ID. Cannot review." and exit.
 
-If PR found → **PR mode**.
+---
 
-### Mode B: Branch exists (no PR, no worktree)
+## Step 3: Soft-Reset for IDE Review
 
 ```bash
-git rev-parse --verify "$BRANCH" 2>/dev/null
+git -C "$WT_DIR" reset --soft main
 ```
 
-If branch exists → **Branch mode**.
-
-### Mode C: No branch
-
-No branch → **Commit mode**.
+Now all changes from the issue branch appear as **staged diffs** when the worktree directory is opened in the IDE.
 
 ---
 
-## 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 4: Report and Exit
 
 ```bash
 PR_INFO=$(gh pr list --head "$BRANCH" --json number,url --jq '.[0]' 2>/dev/null)
 ```
 
-### Mode A / B (no worktree, branch exists)
-
-Stash if dirty:
-
-```bash
-git status --porcelain
-```
-
-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:
-
-```bash
-PREV_BRANCH=$(git branch --show-current)
-git checkout --detach "$BRANCH"
-```
-
-Show changes:
+Tell the user:
 
-```bash
-git log "$PREV_BRANCH".."$BRANCH" --oneline
-git diff "$PREV_BRANCH"..."$BRANCH" --stat
 ```
-
-### Mode C (no branch)
-
-Show recent commits:
-
-```bash
-git log --oneline -10
+Reviewing #$ID — open $WT_DIR in your IDE to see staged diffs.
+{PR #N: <url> if PR exists}
+Run /viban:approve $ID or /viban:reject $ID when ready.
 ```
 
----
-
-## 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."
-
 **Done.** Do not wait for user input. The skill exits here.