@tianhai/pi-workflow-kit 0.5.1 → 0.5.3

package/docs/plans/2026-04-10-brainstorming-boundary-enforcement-design.md

@@ -0,0 +1,60 @@
+# Brainstorming Skill Boundary Enforcement
+
+**Date:** 2026-04-10
+**Status:** approved
+
+## Problem
+
+The brainstorming skill's boundaries are advisory only — a quiet `## Boundaries` bullet list mid-file that the model reads then ignores once a task "feels" straightforward. There is no structural enforcement (pi doesn't implement `allowed-tools`, no tool-blocking extension API).
+
+In practice, `/skill:brainstorming` was invoked, the skill was loaded, and the agent immediately jumped to reading code, diagnosing the bug, and editing source files — violating every boundary.
+
+## Design
+
+Two changes to `skills/brainstorming/SKILL.md`:
+
+### 1. Add `allowed-tools` frontmatter
+
+```yaml
+allowed-tools: read bash
+```
+
+Pi doesn't parse this field yet, but:
+- It's part of the Agent Skills spec (experimental)
+- Future pi versions may inject it into the system prompt
+- Serves as machine-readable declaration of intent
+- Zero cost today
+
+### 2. Replace quiet Boundaries section with prominent top-of-file block
+
+Move from a mid-file `## Boundaries` section to a visually distinct blockquote immediately after the `# Heading`, before the Overview:
+
+```markdown
+> ⚠️ **BOUNDARY — DO NOT VIOLATE**
+>
+> This skill is **read-only exploration**. You MUST NOT use `edit` or `write` tools.
+> The only tools allowed are `read` and `bash` (for investigation only).
+>
+> - ✅ Read code and docs: yes
+> - ✅ Write to `docs/plans/`: yes (design documents only)
+> - ❌ Edit or create any other files: **absolutely no**
+>
+> If you find yourself reaching for `edit` or `write`, **stop**. Present what
+> you found as a design section and ask the user to approve it first.
+```
+
+Key improvements over current form:
+- **Blockquote + warning emoji** — visually distinct from normal content
+- **"DO NOT VIOLATE"** — strong language models respond to
+- **Names forbidden tools explicitly** (`edit`, `write`) — no ambiguity
+- **Recovery instruction** — "stop, present what you found" — constructive next step
+- **Positioned at the top** — seen before the Overview, not buried mid-file
+
+## Out of scope
+
+- Extension-level enforcement (requires pi core changes to support tool call interception)
+- Changing other skills' boundaries (this is a pattern, but brainstorming is the most frequently violated)
+
+## Testing
+
+Manual verification: invoke `/skill:brainstorming`, confirm the model does not reach for `edit`/`write` during exploration.

package/extensions/plan-tracker.ts

@@ -236,6 +236,12 @@ export default function (pi: ExtensionAPI) {
     }
   };
 
+  // Listen for clear signal from workflow-monitor's /workflow-reset command.
+  // This allows cross-extension communication without a callTool API.
+  pi.events.on("plan_tracker:clear", () => {
+    tasks = [];
+  });
+
   // Reconstruct state + widget on session events
   // session_start covers startup, reload, new, resume, fork (pi v0.65.0+)
   pi.on("session_start", async (_event, ctx) => {

package/extensions/workflow-monitor/workflow-handler.ts

@@ -88,6 +88,7 @@ export interface WorkflowHandler {
   restoreWorkflowStateFromBranch(branch: SessionEntry[]): void;
   markWorkflowPrompted(phase: Phase): boolean;
   completeCurrentWorkflowPhase(): boolean;
+  completeWorkflowPhase(phase: Phase): boolean;
   advanceWorkflowTo(phase: Phase): boolean;
   skipWorkflowPhases(phases: Phase[]): boolean;
   handleSkillFileRead(path: string): boolean;
@@ -323,6 +324,10 @@ export function createWorkflowHandler(): WorkflowHandler {
       return tracker.completeCurrent();
     },
 
+    completeWorkflowPhase(phase: Phase) {
+      return tracker.completePhase(phase);
+    },
+
     advanceWorkflowTo(phase) {
       return tracker.advanceTo(phase);
     },

package/extensions/workflow-monitor/workflow-tracker.ts

@@ -12,9 +12,31 @@ export interface WorkflowTrackerState {
   prompted: Record<Phase, boolean>;
 }
 
-export type TransitionBoundary = "design_committed" | "plan_ready" | "execution_complete";
+export type TransitionBoundary =
+  | "design_reviewable"
+  | "plan_reviewable"
+  | "design_committed"
+  | "plan_ready"
+  | "execution_complete";
 
 export function computeBoundaryToPrompt(state: WorkflowTrackerState): TransitionBoundary | null {
+  // Reviewable: current phase has its deliverable artifact but hasn't been
+  // user-confirmed as complete. Prompt the user to review before moving on.
+  if (
+    state.currentPhase === "brainstorm" &&
+    state.artifacts.brainstorm &&
+    state.phases.brainstorm === "active" &&
+    !state.prompted.brainstorm
+  ) {
+    return "design_reviewable";
+  }
+  if (state.currentPhase === "plan" && state.artifacts.plan && state.phases.plan === "active" && !state.prompted.plan) {
+    return "plan_reviewable";
+  }
+
+  // Committed: phase is complete but user hasn't been prompted for
+  // transition options yet (e.g. phases completed via skip-confirmation
+  // "mark complete" or execute phase auto-completing on all tasks terminal).
   if (state.phases.brainstorm === "complete" && !state.prompted.brainstorm) {
     return "design_committed";
   }
@@ -96,24 +118,32 @@ export class WorkflowTracker {
 
     if (current) {
       const curIdx = WORKFLOW_PHASES.indexOf(current);
-      if (nextIdx <= curIdx) {
-        // Backward or same-phase navigation = new task. Reset everything.
+      if (nextIdx === curIdx) {
+        // Same-phase navigation is a no-op. This prevents accidental resets
+        // when plan_tracker init is called while already in execute, or when
+        // a skill is re-invoked during its own phase.
+        return false;
+      }
+      if (nextIdx < curIdx) {
+        // Backward navigation = intentional new task. Reset everything.
         this.reset();
         // Fall through to activate the target phase below.
       } else {
-        // Forward advance: auto-complete the current phase.
-        if (this.state.phases[current] === "active") {
-          this.state.phases[current] = "complete";
+        // Forward advance: do NOT auto-complete the current phase.
+        // Phase completion requires explicit user confirmation via
+        // boundary prompts or skip-confirmation "mark complete".
+        // However, refuse to jump over unresolved intermediate phases.
+        for (let i = curIdx + 1; i < nextIdx; i++) {
+          const intermediate = WORKFLOW_PHASES[i]!;
+          const status = this.state.phases[intermediate];
+          if (status !== "complete" && status !== "skipped") {
+            // Can't advance past an unresolved intermediate phase.
+            return false;
+          }
         }
       }
     }
 
-    for (const p of WORKFLOW_PHASES) {
-      if (p !== phase && this.state.phases[p] === "active") {
-        this.state.phases[p] = "complete";
-      }
-    }
-
     this.state.currentPhase = phase;
     if (this.state.phases[phase] === "pending") {
       this.state.phases[phase] = "active";
@@ -138,6 +168,10 @@ export class WorkflowTracker {
   completeCurrent(): boolean {
     const phase = this.state.currentPhase;
     if (!phase) return false;
+    return this.completePhase(phase);
+  }
+
+  completePhase(phase: Phase): boolean {
     if (this.state.phases[phase] === "complete") return false;
     this.state.phases[phase] = "complete";
     return true;
@@ -203,11 +237,9 @@ export class WorkflowTracker {
       }
       let changed = false;
       changed = this.recordArtifact("brainstorm", path) || changed;
-      // Activating and immediately completing: the design doc is the
-      // deliverable that signals brainstorm is done. Do NOT mark prompted
-      // so the agent_end boundary prompt still fires to offer session handoff.
+      // Activate brainstorm phase but do NOT auto-complete.
+      // User confirms completion via the reviewable boundary prompt at agent_end.
       changed = this.advanceTo("brainstorm") || changed;
-      changed = this.completeCurrent() || changed;
       return changed;
     }
 
@@ -219,11 +251,9 @@ export class WorkflowTracker {
       }
       let changed = false;
       changed = this.recordArtifact("plan", path) || changed;
-      // Activating and immediately completing: the implementation plan
-      // is the deliverable that signals plan phase is done. Do NOT mark
-      // prompted so the agent_end boundary prompt still fires.
+      // Activate plan phase but do NOT auto-complete.
+      // User confirms completion via the reviewable boundary prompt at agent_end.
       changed = this.advanceTo("plan") || changed;
-      changed = this.completeCurrent() || changed;
       return changed;
     }
 
@@ -231,6 +261,9 @@ export class WorkflowTracker {
   }
 
   onPlanTrackerInit(): boolean {
+    // Guard: don't advance if already in execute (prevents accidental resets).
+    // Also refuse to jump over unresolved phases (e.g., plan still active).
+    if (this.state.currentPhase === "execute") return false;
     return this.advanceTo("execute");
   }
 

package/extensions/workflow-monitor/workflow-transitions.ts

@@ -1,6 +1,6 @@
 import type { Phase, TransitionBoundary } from "./workflow-tracker";
 
-export type TransitionChoice = "next" | "fresh" | "skip" | "discuss";
+export type TransitionChoice = "next" | "fresh" | "skip" | "revise" | "discuss";
 
 export interface TransitionPrompt {
   boundary: TransitionBoundary;
@@ -17,8 +17,36 @@ const BASE_OPTIONS: TransitionPrompt["options"] = [
   { choice: "discuss", label: "Discuss" },
 ];
 
+// Reviewable options: shown when a phase has its artifact but hasn't
+// been user-confirmed as complete. Includes explicit approval + revision.
+const REVIEWABLE_OPTIONS: TransitionPrompt["options"] = [
+  { choice: "next", label: "✓ Looks good, next step (this session)" },
+  { choice: "fresh", label: "✓ Looks good, fresh session → next step" },
+  { choice: "skip", label: "Skip phase" },
+  { choice: "revise", label: "✗ Needs more work" },
+  { choice: "discuss", label: "Discuss" },
+];
+
 export function getTransitionPrompt(boundary: TransitionBoundary, artifactPath: string | null): TransitionPrompt {
   switch (boundary) {
+    // Reviewable: phase has artifact but user hasn't confirmed completion
+    case "design_reviewable":
+      return {
+        boundary,
+        title: `Design written${artifactPath ? `: ${artifactPath}` : ""}. Ready to proceed?`,
+        nextPhase: "plan",
+        artifactPath,
+        options: REVIEWABLE_OPTIONS,
+      };
+    case "plan_reviewable":
+      return {
+        boundary,
+        title: `Plan written${artifactPath ? `: ${artifactPath}` : ""}. Ready to proceed?`,
+        nextPhase: "execute",
+        artifactPath,
+        options: REVIEWABLE_OPTIONS,
+      };
+    // Committed: phase already complete, user chooses how to proceed
     case "design_committed":
       return {
         boundary,
@@ -53,3 +81,8 @@ export function getTransitionPrompt(boundary: TransitionBoundary, artifactPath:
       };
   }
 }
+
+/** Whether a boundary represents a phase that still needs user confirmation. */
+export function isReviewableBoundary(boundary: TransitionBoundary): boolean {
+  return boundary === "design_reviewable" || boundary === "plan_reviewable";
+}

package/extensions/workflow-monitor.ts

@@ -45,7 +45,7 @@ import {
   WORKFLOW_TRACKER_ENTRY_TYPE,
   type WorkflowTrackerState,
 } from "./workflow-monitor/workflow-tracker";
-import { getTransitionPrompt } from "./workflow-monitor/workflow-transitions";
+import { getTransitionPrompt, isReviewableBoundary } from "./workflow-monitor/workflow-transitions";
 
 type SelectOption<T extends string> = { label: string; value: T };
 
@@ -165,6 +165,8 @@ export default function (pi: ExtensionAPI) {
   }
 
   const boundaryToPhase: Record<TransitionBoundary, keyof typeof phaseToSkill> = {
+    design_reviewable: "brainstorm",
+    plan_reviewable: "plan",
     design_committed: "brainstorm",
     plan_ready: "plan",
     execution_complete: "execute",
@@ -233,12 +235,19 @@ export default function (pi: ExtensionAPI) {
       const missingSkill = phaseToSkill[missing] ?? missing;
       const options = [
         { label: `Do ${missing} now`, value: "do_now" as const },
+        { label: `Mark ${missing} as complete`, value: "mark_complete" as const },
         { label: `Skip ${missing}`, value: "skip" as const },
         { label: "Cancel", value: "cancel" as const },
       ];
       const choice = await selectValue(ctx, `Phase "${missing}" is unresolved. What would you like to do?`, options);
 
-      if (choice === "skip") {
+      if (choice === "mark_complete") {
+        handler.completeWorkflowPhase(missing as Phase);
+        handler.handleInputText(text);
+        persistState();
+        updateWidget(ctx);
+        return;
+      } else if (choice === "skip") {
         handler.skipWorkflowPhases([missing]);
         handler.handleInputText(text);
         persistState();
@@ -280,12 +289,17 @@ export default function (pi: ExtensionAPI) {
       const skill = phaseToSkill[phase] ?? phase;
       const options = [
         { label: `Do ${phase} now`, value: "do_now" as const },
+        { label: `Mark ${phase} as complete`, value: "mark_complete" as const },
         { label: `Skip ${phase}`, value: "skip" as const },
         { label: "Cancel", value: "cancel" as const },
       ];
       const choice = await selectValue(ctx, `Phase "${phase}" is unresolved. What would you like to do?`, options);
 
-      if (choice === "skip") {
+      if (choice === "mark_complete") {
+        handler.completeWorkflowPhase(phase as Phase);
+        persistState();
+        updateWidget(ctx);
+      } else if (choice === "skip") {
         handler.skipWorkflowPhases([phase]);
         persistState();
         updateWidget(ctx);
@@ -312,12 +326,18 @@ export default function (pi: ExtensionAPI) {
       const missingSkill = phaseToSkill[missing] ?? missing;
       const options = [
         { label: `Do ${missing} now`, value: "do_now" as const },
+        { label: `Mark ${missing} as complete`, value: "mark_complete" as const },
         { label: `Skip ${missing}`, value: "skip" as const },
         { label: "Cancel", value: "cancel" as const },
       ];
       const choice = await selectValue(ctx, `Phase "${missing}" is unresolved. What would you like to do?`, options);
 
-      if (choice === "skip") {
+      if (choice === "mark_complete") {
+        handler.completeWorkflowPhase(missing as Phase);
+        persistState();
+        updateWidget(ctx);
+        return "allowed";
+      } else if (choice === "skip") {
         handler.skipWorkflowPhases([missing]);
         persistState();
         updateWidget(ctx);
@@ -356,12 +376,17 @@ export default function (pi: ExtensionAPI) {
       const skill = phaseToSkill[phase] ?? phase;
       const options = [
         { label: `Do ${phase} now`, value: "do_now" as const },
+        { label: `Mark ${phase} as complete`, value: "mark_complete" as const },
         { label: `Skip ${phase}`, value: "skip" as const },
         { label: "Cancel", value: "cancel" as const },
       ];
       const choice = await selectValue(ctx, `Phase "${phase}" is unresolved. What would you like to do?`, options);
 
-      if (choice === "skip") {
+      if (choice === "mark_complete") {
+        handler.completeWorkflowPhase(phase as Phase);
+        persistState();
+        updateWidget(ctx);
+      } else if (choice === "skip") {
         handler.skipWorkflowPhases([phase]);
         persistState();
         updateWidget(ctx);
@@ -608,18 +633,13 @@ export default function (pi: ExtensionAPI) {
 
     const boundaryPhase = boundaryToPhase[boundary];
     const prompt = getTransitionPrompt(boundary, latestState.artifacts[boundaryPhase]);
+    const reviewable = isReviewableBoundary(boundary);
 
     const options = prompt.options.map((o) => o.label);
     const pickedLabel = await ctx.ui.select(prompt.title, options);
 
     const selected = prompt.options.find((o) => o.label === pickedLabel)?.choice ?? null;
 
-    const marked = handler.markWorkflowPrompted(boundaryPhase);
-    if (marked) {
-      persistState();
-      updateWidget(ctx);
-    }
-
     const nextSkill = phaseToSkill[prompt.nextPhase] ?? "writing-plans";
     const nextInSession = `/skill:${nextSkill}`;
     const fresh = `/workflow-next ${prompt.nextPhase}${prompt.artifactPath ? ` ${prompt.artifactPath}` : ""}`;
@@ -628,42 +648,56 @@ export default function (pi: ExtensionAPI) {
       "- Does this work require documentation updates? (README, CHANGELOG, API docs, inline docs)\n" +
       "- What was learned during this implementation? (surprises, codebase knowledge, things to do differently)\n\n";
 
-    if (selected === "next") {
-      const advanced = prompt.nextPhase === "finalize" ? handler.advanceWorkflowTo("finalize") : false;
-      if (advanced) {
-        persistState();
-        updateWidget(ctx);
+    if (selected === "next" || selected === "fresh") {
+      // For reviewable boundaries: mark current phase complete first.
+      // For committed boundaries: phase is already complete.
+      if (reviewable) {
+        handler.completeCurrentWorkflowPhase();
       }
-      ctx.ui.setEditorText(prompt.nextPhase === "finalize" ? finishReminder + nextInSession : nextInSession);
-    } else if (selected === "fresh") {
-      const advanced = prompt.nextPhase === "finalize" ? handler.advanceWorkflowTo("finalize") : false;
-      if (advanced) {
-        persistState();
-        updateWidget(ctx);
+
+      // Advance to the next phase
+      handler.advanceWorkflowTo(prompt.nextPhase);
+      handler.markWorkflowPrompted(boundaryPhase);
+      persistState();
+      updateWidget(ctx);
+
+      if (selected === "next") {
+        ctx.ui.setEditorText(prompt.nextPhase === "finalize" ? finishReminder + nextInSession : nextInSession);
+      } else {
+        ctx.ui.setEditorText(prompt.nextPhase === "finalize" ? finishReminder + fresh : fresh);
       }
-      ctx.ui.setEditorText(prompt.nextPhase === "finalize" ? finishReminder + fresh : fresh);
     } else if (selected === "skip") {
-      // Explicit user-confirmed skip: mark the next phase as skipped, then move on.
-      handler.skipWorkflowPhases([prompt.nextPhase]);
-
-      const nextIdx = WORKFLOW_PHASES.indexOf(prompt.nextPhase);
-      const phaseAfterSkip = WORKFLOW_PHASES[nextIdx + 1] ?? null;
-
-      if (phaseAfterSkip) {
-        const currentState = handler.getWorkflowState();
-        const currentIdx = currentState?.currentPhase ? WORKFLOW_PHASES.indexOf(currentState.currentPhase) : -1;
-        const afterSkipIdx = WORKFLOW_PHASES.indexOf(phaseAfterSkip);
-        if (afterSkipIdx > currentIdx) {
-          handler.advanceWorkflowTo(phaseAfterSkip);
+      if (reviewable) {
+        // Skip the current phase (the one with the artifact) and advance to next.
+        handler.skipWorkflowPhases([boundaryPhase]);
+        handler.advanceWorkflowTo(prompt.nextPhase);
+      } else {
+        // Committed boundary: skip the NEXT phase and advance past it.
+        handler.skipWorkflowPhases([prompt.nextPhase]);
+        const nextIdx = WORKFLOW_PHASES.indexOf(prompt.nextPhase);
+        const phaseAfterSkip = WORKFLOW_PHASES[nextIdx + 1] ?? null;
+
+        if (phaseAfterSkip && handler.advanceWorkflowTo(phaseAfterSkip)) {
           const skipSkill = phaseToSkill[phaseAfterSkip] ?? "writing-plans";
           ctx.ui.setEditorText(`/skill:${skipSkill}`);
         }
       }
 
+      handler.markWorkflowPrompted(boundaryPhase);
       persistState();
       updateWidget(ctx);
+    } else if (selected === "revise") {
+      // Reviewable only: user wants to keep working. Don't set prompted
+      // so the review prompt fires again at the next agent_end.
+      // Don't advance, don't modify phase state.
     } else if (selected === "discuss") {
-      // Don't advance phase. Set editor text to prompt discussion.
+      // For reviewable: don't set prompted (prompt fires again after discussion).
+      // For committed: set prompted (phase is already done, user just wants to chat).
+      if (!reviewable) {
+        handler.markWorkflowPrompted(boundaryPhase);
+        persistState();
+        updateWidget(ctx);
+      }
       ctx.ui.setEditorText(
         `Let's discuss before moving to the next step.\n` +
           `We're at: ${prompt.title}\n` +
@@ -756,10 +790,13 @@ export default function (pi: ExtensionAPI) {
     description: "Reset workflow tracker to fresh state for a new task",
     async handler(_args, ctx) {
       handler.resetState();
-      // Emit a clear signal so plan-tracker also reconstructs to empty.
+      // Emit a clear signal so plan-tracker also reconstructs to empty on next
+      // session reload. Also notify plan-tracker in real time via the shared
+      // event bus so its in-memory state and widget update immediately.
       pi.appendEntry(PLAN_TRACKER_CLEARED_TYPE, { clearedAt: Date.now() });
       persistState();
       updateWidget(ctx);
+      pi.events.emit("plan_tracker:clear");
       if (ctx.hasUI) {
         ctx.ui.notify("Workflow reset. Ready for a new task.", "info");
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tianhai/pi-workflow-kit",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Workflow skills and enforcement extensions for pi",
   "keywords": [
     "pi-package"

package/skills/brainstorming/SKILL.md

@@ -1,23 +1,31 @@
 ---
 name: brainstorming
 description: "You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation."
+allowed-tools: read bash
 ---
 
 > **Related skills:** Consider `/skill:using-git-worktrees` to set up an isolated workspace, then `/skill:writing-plans` for implementation planning.
 
 # Brainstorming Ideas Into Designs
 
+> ⚠️ **BOUNDARY — DO NOT VIOLATE**
+>
+> This skill is **read-only exploration**. You MUST NOT use `edit` or `write` tools.
+> The only tools allowed are `read` and `bash` (for investigation only).
+>
+> - ✅ Read code and docs: yes
+> - ✅ Write to `docs/plans/`: yes (design documents only)
+> - ❌ Edit or create any other files: **absolutely no**
+>
+> If you find yourself reaching for `edit` or `write`, **stop**. Present what
+> you found as a design section and ask the user to approve it first.
+
 ## Overview
 
 Help turn ideas into fully formed designs and specs through natural collaborative dialogue.
 
 Start by understanding the current project context, then ask questions one at a time to refine the idea. Once you understand what you're building, present the design in small sections (200-300 words), checking after each section whether it looks right so far.
 
-## Boundaries
-- Read code and docs: yes
-- Write to docs/plans/: yes
-- Edit or create any other files: no
-
 ## The Process
 
 **Before anything else — check git state:**