@pi-unipi/workflow 0.1.3 → 0.1.5

package/commands.ts

@@ -54,6 +54,27 @@ function suggestSpecFiles(prefix: string): { value: string; label: string; descr
   }
 }
 
+/**
+ * Suggest plan files from .unipi/docs/plans/ for work and review-work commands.
+ */
+function suggestPlanFiles(prefix: string): { value: string; label: string; description: string }[] {
+  const plansDir = join(process.cwd(), ".unipi", "docs", "plans");
+  if (!existsSync(plansDir)) return [];
+
+  try {
+    const files = readdirSync(plansDir).filter((f) => f.endsWith(".md"));
+    return files
+      .filter((f) => !prefix || f.includes(prefix))
+      .map((f) => ({
+        value: `plan:${f}`,
+        label: basename(f, ".md"),
+        description: `Plan: ${f}`,
+      }));
+  } catch {
+    return [];
+  }
+}
+
 /**
  * Suggest existing worktree names for merge/list commands.
  */
@@ -96,7 +117,7 @@ const COMMANDS: WorkflowCommand[] = [
     description:
       "Execute plan — implement in worktree, test, commit on done",
     skillName: "work",
-    argumentHint: "<task description>",
+    argumentHint: "plan:<file> <description>",
     ralphHint: "Ralph detected. Use /unipi:ralph-start for long-running tasks.",
   },
   {
@@ -104,7 +125,7 @@ const COMMANDS: WorkflowCommand[] = [
     description:
       "Review work — check task completion, run lint/build, mark reviewer remarks",
     skillName: "review-work",
-    argumentHint: "<worktree>",
+    argumentHint: "plan:<file> <scope>",
   },
   {
     name: WORKFLOW_COMMANDS.CONSOLIDATE,
@@ -183,6 +204,16 @@ export function registerWorkflowCommands(
           return suggestSpecFiles(prefix);
         }
 
+        // Work command: suggest plan files
+        if (cmd.name === WORKFLOW_COMMANDS.WORK) {
+          return suggestPlanFiles(prefix);
+        }
+
+        // Review-work command: suggest plan files
+        if (cmd.name === WORKFLOW_COMMANDS.REVIEW_WORK) {
+          return suggestPlanFiles(prefix);
+        }
+
         // Worktree merge: suggest existing worktrees
         if (cmd.name === WORKFLOW_COMMANDS.WORKTREE_MERGE) {
           return suggestWorktrees();

package/index.ts

@@ -86,7 +86,16 @@ export default function (pi: ExtensionAPI) {
         systemPrompt:
           event.systemPrompt +
           base +
-          `\nThe write tool is available but restricted to .unipi/docs/specs/ only.\nDo NOT attempt to call blocked tools. Do NOT output tool call XML for them.\nIf the user requests an action that requires a blocked tool, respond that you do not have access.\n</sandbox>`,
+          `\nThe write tool is available but restricted to .unipi/docs/specs/ only.\nbash is available ONLY for specific setup use case (e.g., git init, mkdir). Do NOT use bash for reading files or listing directories — use grep, find, ls instead.\nDo NOT attempt to call blocked tools. Do NOT output tool call XML for them.\nIf the user requests an action that requires a blocked tool, respond that you do not have access.\n</sandbox>`,
+      };
+    }
+
+    if (currentSandboxLevel === "write_unipi") {
+      return {
+        systemPrompt:
+          event.systemPrompt +
+          base +
+          `\nWrite tool is restricted to .unipi/docs/ only (specs and plans).\nUse grep, find, ls for file discovery — do NOT guess filenames.\nbash is blocked — use read, write, edit, grep, find, ls only.\nDo NOT attempt to call blocked tools. Do NOT output tool call XML for them.\nIf the user requests an action that requires a blocked tool, respond that you do not have access.\n</sandbox>`,
       };
     }
 
@@ -94,7 +103,7 @@ export default function (pi: ExtensionAPI) {
       systemPrompt:
         event.systemPrompt +
         base +
-        `\nDo NOT attempt to call blocked tools. Do NOT output tool call XML for them.\nIf the user requests an action that requires a blocked tool, respond that you do not have access.\n</sandbox>`,
+        `\nDo NOT attempt to call blocked tools. Do NOT output tool call XML for them.\nIf the user requires an action that requires a blocked tool, respond that you do not have access.\n</sandbox>`,
     };
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/workflow",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Structured development workflow commands for Pi coding agent",
   "type": "module",
   "license": "MIT",

package/skills/brainstorm/SKILL.md

@@ -145,6 +145,7 @@ The `## Implementation Checklist` section uses `- [ ]` markdown checkboxes. Thes
 
 - **`[ ]` = unplanned** — not yet covered by a plan
 - **`[x]` = planned** — marked when `/unipi:plan` covers this item
+- **`[x]` does NOT mean done** — implementation progress is tracked in the plan file (`unstarted:` / `in-progress:` / `completed:`)
 - Agent MUST fill in checklist items based on the design
 - Each item should be a discrete, implementable task
 - Items should be ordered by dependency (earlier items don't depend on later ones)

package/skills/plan/SKILL.md

@@ -70,6 +70,7 @@ Structure the plan with heart of gold style:
 title: "{Topic} — Implementation Plan"
 type: plan
 date: YYYY-MM-DD
+workbranch: {branch-name or empty if on main}
 specs:
   - path/to/spec.md
 ---
@@ -81,16 +82,19 @@ specs:
 
 ## Tasks
 
-### Task 1: {Task Name}
-**Description:** {What needs to be done}
-**Dependencies:** {None, or list of tasks}
-**Acceptance Criteria:** {How to verify done}
-**Steps:**
-1. {Concrete step}
-2. {Concrete step}
+- unstarted: Task 1 — {Task Name}
+  - Description: {What needs to be done}
+  - Dependencies: {None, or list of tasks}
+  - Acceptance Criteria: {How to verify done}
+  - Steps:
+    1. {Concrete step}
+    2. {Concrete step}
 
-### Task 2: {Task Name}
-...
+- unstarted: Task 2 — {Task Name}
+  - Description: ...
+  - Dependencies: ...
+  - Acceptance Criteria: ...
+  - Steps: ...
 
 ## Sequencing
 {Order of execution, dependency graph if complex}
@@ -129,6 +133,8 @@ After plan is complete:
 
 This creates the link between brainstorm and plan — plan covers some items, others remain for future plans.
 
+**Semantics:** Spec `[x]` means "planned" (covered by a plan). It does NOT mean "done". Implementation progress is tracked in the plan file, not the spec.
+
 ---
 
 ## Phase 5: Review Plan
@@ -138,10 +144,11 @@ Self-check before presenting:
 - [ ] Every task has clear acceptance criteria
 - [ ] Dependencies are correct (no circular, no missing)
 - [ ] Steps are bite-sized (agent can follow without guessing)
-- [ ] Brainstorm checkboxes updated correctly
 - [ ] String greedy scope respected (if provided)
 - [ ] Plan is focused enough for single `/unipi:work` session
 
+Do NOT re-read or re-edit the spec checkboxes — Phase 4 already wrote them.
+
 ---
 
 ## Phase 6: Present & Handoff
@@ -164,6 +171,5 @@ Recommend starting a **new session** for work — it will switch pi's internal w
 ## Resumability
 
 If user runs `/unipi:plan` on an existing plan:
-1. Read the plan
-2. Check what's already marked done
-3. Ask user if they want to add tasks, modify existing, or plan new scope
+1. Read the plan — look for `completed:` tasks
+2. Ask user if they want to add tasks, modify existing, or plan new scope

package/skills/review-work/SKILL.md

@@ -25,13 +25,17 @@ Review what was built, verify task completion, run codebase checks, add reviewer
 
 ---
 
-## Phase 1: Load Plan
+## Phase 1: Load Plan & Switch Branch
 
 1. If `plan:` arg provided, read that plan
 2. If not, list plans in `.unipi/docs/plans/` and ask user
 3. Read plan fully — understand tasks, acceptance criteria, current status
+4. **Read `workbranch:` from plan frontmatter:**
+   - If `workbranch:` exists and is not empty → switch to that branch/worktree
+   - If `workbranch:` missing or empty → review on current branch (main)
+   - To switch: `git checkout {workbranch}` or use worktree path
 
-**Exit:** Plan loaded. Know what to review.
+**Exit:** On correct branch. Plan loaded.
 
 ---
 

package/skills/work/SKILL.md

@@ -39,6 +39,7 @@ If args not provided, ask user interactively:
    - "Do you want to work on current branch or create a worktree?"
    - If worktree: "What branch name?" (suggest based on spec topic)
    - Create worktree if not exists
+   - **After creating/confirming worktree:** write `workbranch: {branch-name}` to the plan file frontmatter
 
 2. **Specs:**
    - List available plans in `.unipi/docs/plans/`
@@ -58,7 +59,7 @@ If args not provided, ask user interactively:
 1. Read plan file(s)
 2. Review critically — identify questions or concerns
 3. If concerns: raise with user before starting
-4. Identify which tasks are already `[x]` (done) vs `[ ]` (pending)
+4. Identify task status: `unstarted:` (pending), `in-progress:` (started), `completed:` (done)
 
 **Exit:** Plan reviewed, ready to execute.
 
@@ -66,12 +67,12 @@ If args not provided, ask user interactively:
 
 ## Phase 3: Execute Tasks
 
-For each task in order:
+For each `unstarted:` task in order:
 
-1. Mark task as `in_progress` in plan
+1. Change `unstarted:` to `in-progress:` in plan
 2. Follow each step exactly (plan has bite-sized steps)
 3. Run verifications as specified in acceptance criteria
-4. Mark as `[x]` when complete
+4. Change `in-progress:` to `completed:` when complete
 5. Update plan file with progress
 
 ### When to Stop and Ask
@@ -107,12 +108,11 @@ Don't wait until end to commit — incremental commits are safer.
 
 ## Phase 5: Complete
 
-When all tasks marked `[x]`:
+When all tasks are `completed:`:
 
 1. Run final verification (tests, lint, build)
 2. Commit all remaining changes
-3. Update plan with completion status
-4. Inform user:
+3. Inform user:
 
 > "All tasks complete. Worktree: `feat/<branch>`. Recommend reviewing before merge."
 
@@ -127,9 +127,9 @@ Suggest next step:
 
 ## Resumability
 
-If user runs `/unipi:work` and plan has partial `[x]` marks:
+If user runs `/unipi:work` and plan has `completed:` or `in-progress:` tasks:
 1. Read plan
-2. Identify first `[ ]` task
+2. Identify first `unstarted:` task
 3. Ask user: "Resume from Task N: {name}?"
 4. Continue from there
 

package/skills/worktree-list/SKILL.md

@@ -9,8 +9,8 @@ List all git worktrees created by unipi.
 
 ## Boundaries
 
-**This skill MAY:** run git worktree commands, read filesystem.
-**This skill MAY NOT:** edit anything, create worktrees, merge branches.
+**This skill MAY:** read filesystem (ls, read), grep for git info.
+**This skill MAY NOT:** edit anything, create worktrees, merge branches, run bash.
 
 ## Command Format
 
@@ -24,17 +24,27 @@ No arguments. Lists all unipi worktrees.
 
 ## Process
 
-### Phase 1: Gather Worktrees
+### Phase 1: Discover Worktrees
 
-1. Run `git worktree list --porcelain`
-2. Filter for worktrees under `.unipi/worktrees/`
-3. For each worktree, collect:
-   - Branch name
-   - Path
-   - HEAD commit
-   - Whether it has uncommitted changes
+1. `ls .unipi/worktrees/` — list worktree directories
+2. For each directory:
+   - Read `.unipi/worktrees/<branch>/.git` file to get gitdir path
+   - Check for uncommitted changes: `ls .unipi/worktrees/<branch>/` and read key files
+3. If `.unipi/worktrees/` doesn't exist or is empty → no worktrees
 
-### Phase 2: Present
+**Exit:** List of worktrees discovered.
+
+### Phase 2: Determine Status
+
+For each worktree directory:
+
+1. Check if `HEAD` file exists in gitdir
+2. Check for modified files by reading directory listing
+3. Determine status:
+   - **clean** — no uncommitted changes
+   - **dirty** — has uncommitted changes
+
+### Phase 3: Present
 
 Display in table format:
 
@@ -51,7 +61,7 @@ Worktrees:
 If no worktrees:
 > "No unipi worktrees. Create one with `/unipi:worktree-create`"
 
-### Phase 3: Suggest Actions
+### Phase 4: Suggest Actions
 
 Based on state:
 - If dirty worktrees exist → suggest reviewing or committing
@@ -65,3 +75,4 @@ Based on state:
 - Only shows worktrees under `.unipi/worktrees/`
 - Ignores worktrees in other locations
 - Status: `clean` = no uncommitted changes, `dirty` = has changes
+- No bash required — uses ls, read, grep for all discovery

package/skills/worktree-merge/SKILL.md

@@ -46,8 +46,16 @@ For each source branch (in dependency order if specs indicate ordering):
 3. **If conflict:**
    - Report which files conflict
    - Reference the spec/plan context: "This branch was working on: <description>"
-   - Ask user how to resolve (do NOT force merge)
-   - Skip to next branch if user says so
+   - **Structured conflict resolution:**
+     1. **Check finalized plan** — read the plan for this branch, understand intended changes
+     2. **Brainstorm resolution** — reason about which changes align with the plan's intent
+     3. **Read codebase** — read the conflicting files to understand current state
+     4. **Ask user** — present options and ask for final decision (always ask, never force)
+   - Options to present:
+     - Accept incoming (their changes)
+     - Accept current (main branch)
+     - Manual merge (describe what each side does, ask user to decide)
+     - Skip this branch
 4. **If success:**
    - Remove worktree: `git worktree remove .unipi/worktrees/<branch-name>`
    - Delete branch: `git branch -d <branch>`