@leing2021/super-pi 0.20.0 → 0.22.0

package/README.md

@@ -91,7 +91,7 @@ Breaks requirements into implementation units, each following strict **RED → G
 
 ### 03-work: Build Right
 
-**Parallel execution**: `task_splitter` uses a Union-Find algorithm to analyze file dependencies, feeds conflict-free units to `parallel_subagent` for concurrent execution.
+**Parallel execution**: `task_splitter` uses a Union-Find algorithm to analyze file dependencies, feeds conflict-free units to `subagent` (parallel mode, via pi-subagents) for concurrent execution.
 
 **Checkpoint resume**: After each unit, a checkpoint is saved. Interrupted? Next startup auto-loads, skips completed work, continues from the breakpoint. Failed? `fail` records the error → `retry` suggests a recovery strategy (timeout? extend timeout. Permission issue? check permissions first. Code error? fix then retry).
 
@@ -113,24 +113,19 @@ Next time `02-plan` or `04-review` runs, a grep-first search strategy automatica
 
 ---
 
-## Optional: pi-subagents Integration
+## Built-in Subagent Capabilities
 
-For enhanced workflow capabilities, install pi-subagents:
+Super Pi includes pi-subagents (by Nico Bailon) as a built-in extension — no separate install needed. The following capabilities are available out of the box:
 
-```bash
-pi install npm:pi-subagents
-```
-
-This enables:
-
-| Feature | Command | Description |
-|---------|---------|-------------|
-| **CE Agents** | `/run ce-worker "execute plan"` | Pre-configured agents aligned with stages |
-| **CE Chains** | `/run-chain ce-standard -- implement feature` | Scout → Planner → Worker → Reviewer |
-| **Parallel Review** | `/run-chain ce-parallel-review --` | 3-way review: correctness + tests + complexity |
+| Feature | How to Access | Description |
+|---------|--------------|-------------|
+| **Agent Manager TUI** | `/agents` or `Ctrl+Shift+A` | Visual agent browser, configure and launch agents/chains/parallel tasks |
+| **CE Agents** | Via subagent tool | Pre-configured agents aligned with CE stages (ce-scout, ce-planner, etc.) |
+| **CE Chains** | Via subagent tool | Scout → Planner → Worker → Reviewer |
+| **Parallel Review** | Via subagent tool | 3-way review: correctness + tests + complexity |
 | **Stage Model Sync** | Automatic | `modelStrategy` + `thinkingStrategy` synced to agent configs |
-
-Without it, super-pi works normally but CE Agent/Chain features are unavailable.
+| **Subagent Status** | `/subagents-status` | Show active and recent async subagent runs |
+| **Diagnostics** | `/subagents-doctor` | Show subagent diagnostics |
 
 ### How Model/Thinking Sync Works
 
@@ -155,13 +150,21 @@ This ensures your stage-specific models and thinking levels are used when CE Age
 
 ## Technical Architecture
 
+### Extensions
+
+| Extension | Description |
+|-----------|------------|
+| `ce-core` | 15 CE tools (task_splitter, session_checkpoint, brainstorm_dialog, etc.) + hooks + filters |
+| `super-pi-extension` | CE Agents/Chains + model strategy sync |
+| `subagent` | Full subagent runtime (serial, parallel, chain, async, TUI, agent CRUD) — based on [pi-subagents](https://github.com/nicobailon/pi-subagents) |
+
 ### 10 Skills (workflow nodes)
 
 | Skill | One-liner | Core Tool |
 |-------|-----------|-----------|
 | `01-brainstorm` | Deep requirements mining in three modes | `brainstorm_dialog` |
 | `02-plan` | Break into units, TDD gates, incremental updates | `plan_diff` |
-| `03-work` | Parallel execution, checkpoint resume, error recovery | `session_checkpoint`, `task_splitter`, `parallel_subagent` |
+| `03-work` | Parallel execution, checkpoint resume, error recovery | `session_checkpoint`, `task_splitter`, `subagent` (pi-subagents) |
 | `04-review` | Persona-routed review + live browser testing | `review_router` |
 | `05-learn` | Pattern extraction → knowledge card compounding | `pattern_extractor` |
 | `06-next` | Not sure what to do next? Ask this | `workflow_state`, `session_history` |
@@ -177,7 +180,7 @@ This ensures your stage-specific models and thinking levels are used when CE Age
 | `task_splitter` | Union-Find algorithm analyzes file dependencies, auto-groups parallel-safe units |
 | `session_checkpoint` | JSON-persisted checkpoints with save/load/fail/retry operations |
 | `plan_diff` | Incremental plans: compare detects diffs, patch applies changes |
-| `parallel_subagent` | `Promise.allSettled`-style parallel subagent execution with context slimming |
+| `subagent` | Parallel & serial subagent execution (built-in, based on pi-subagents) |
 | `review_router` | Auto-assign reviewer personas from diff metadata |
 | `pattern_extractor` | Extract and categorize patterns from artifacts |
 | `brainstorm_dialog` | Multi-round dialog state machine (start → refine × N → summarize) |
@@ -397,6 +400,7 @@ The goal isn't making AI write code faster — it's making AI think before writi
 
 The following projects directly inspired this work:
 
+- **[pi-subagents](https://github.com/nicobailon/pi-subagents)** (by Nico Bailon) → Full subagent runtime integrated as built-in extension (serial, parallel, chain, async, TUI, agent CRUD)
 - **[everything-claude-code](https://github.com/affaan-m/everything-claude-code)** (162K★) → Parallel subagent orchestration, checkpoint resume, continuous learning
 - **[superpowers](https://github.com/obra/superpowers)** (161K★) → Strict TDD gates, design checklists, review discipline
 - **[gstack](https://github.com/garrytan/gstack)** (78K★) → YC-style forcing questions, CEO Review frameworks, browser QA
@@ -421,6 +425,23 @@ Not a fork. Not a wrapper. Methodologies extracted and rebuilt with Pi's native
 
 ## Changelog
 
+### 0.22.0 — Source-integrated pi-subagents
+- Integrated pi-subagents v0.20.1 source code into `extensions/subagent/` — single package install (`pi install npm:@leing2021/super-pi`).
+- Moved `typebox` from peerDependencies to dependencies.
+- Removed `pi-subagents` peer dependency — no longer needed.
+- Simplified `super-pi-extension/index.ts`: removed faulty installation detection and auto-install logic.
+- Pruned slash commands: removed `/run`, `/chain`, `/run-chain`, `/parallel`; kept `/agents` (TUI), `/subagents-status`, `/subagents-doctor`, and `Ctrl+Shift+A` shortcut.
+- Added 8 new tests covering subagent extension structure, agent counts, and integration integrity.
+- 169 tests passing.
+
+### 0.21.0 — Delegate subagent tools to pi-subagents
+- Removed `subagent` and `parallel_subagent` tool registrations from `ce-core` extension.
+- Subagent capabilities (serial, parallel, chain, async, TUI, agent CRUD) now provided by the `pi-subagents` package.
+- Removed `AsyncMutex`, `subagent-depth-guard` exports — no longer needed in this package.
+- Added `pi-subagents` as a peer dependency in `package.json`.
+- Updated `03-work` skill, `ce-worker` agent, and all README references from `parallel_subagent` to `subagent` (pi-subagents).
+- Renamed internal `path` variable to `filePath` in read-output-filter to avoid shadowing.
+
 ### 0.20.0 — Extension API migration + v0.19.7 rework
 - Migrated `super-pi-extension` from legacy `export default { load() }` object format to Pi-native factory function `(pi: ExtensionAPI) => void`.
 - Replaced hardcoded `ExtensionContext` import with `ExtensionAPI`-only — context now provided via event handler.
@@ -530,7 +551,7 @@ Not a fork. Not a wrapper. Methodologies extracted and rebuilt with Pi's native
 - New session_checkpoint tool
 
 ### 0.5.0 — Parallel execution
-- New parallel_subagent tool
+- New parallel_subagent tool (now delegated to pi-subagents)
 
 ### 0.4.0 — Smart review
 - New review_router tool

package/extensions/ce-core/index.ts

@@ -4,11 +4,9 @@ import type { ExtensionAPI } from "@mariozechner/pi-coding-agent"
 import { Type } from "typebox"
 import { createArtifactHelperTool, type ArtifactType } from "./tools/artifact-helper"
 import { createAskUserQuestionTool } from "./tools/ask-user-question"
-import { createSubagentTool } from "./tools/subagent"
 import { createWorkflowStateTool } from "./tools/workflow-state"
 import { createWorktreeManagerTool } from "./tools/worktree-manager"
 import { createReviewRouterTool } from "./tools/review-router"
-import { createParallelSubagentTool } from "./tools/parallel-subagent"
 import { createSessionCheckpointTool } from "./tools/session-checkpoint"
 import { createTaskSplitterTool } from "./tools/task-splitter"
 import { createBrainstormDialogTool } from "./tools/brainstorm-dialog"
@@ -18,10 +16,11 @@ import { createPatternExtractorTool } from "./tools/pattern-extractor"
 import { filterBashOutput } from "./tools/bash-output-filter"
 import { filterReadOutput } from "./tools/read-output-filter"
 import { COMPACTION_FOCUS_INSTRUCTIONS } from "./tools/compaction-optimizer"
-import { AsyncMutex } from "./tools/async-mutex"
-import type { SubagentExecOptions, SubagentRunner } from "./tools/subagent"
 
-const _subagentEnvMutex = new AsyncMutex()
+// NOTE: subagent and parallel_subagent tool registration removed.
+// Subagent capabilities are provided by the pi-subagents package.
+// super-pi focuses on CE-specific tools only.
+
 const PIPELINE_STAGE_KEYS = new Set([
   "01-brainstorm",
   "02-plan",
@@ -82,47 +81,6 @@ function parseModelRef(
   }
 }
 
-/**
- * Create a subagent runner that handles env injection with mutex protection
- * for concurrency safety when multiple parallel subagents share the process.
- */
-function createSubagentRunner(
-  pi: ExtensionAPI,
-  signal?: AbortSignal,
-): SubagentRunner {
-  return async (prompt: string, options?: SubagentExecOptions) => {
-    const args = ["--no-session", ...(options?.extraFlags ?? []), "-p", prompt]
-    const release = await _subagentEnvMutex.acquire()
-    const savedEnv: Record<string, string | undefined> = {}
-    const extraEnv = options?.extraEnv ?? {}
-    for (const [key, value] of Object.entries(extraEnv)) {
-      savedEnv[key] = process.env[key]
-      process.env[key] = value
-    }
-    try {
-      const execResult = await pi.exec("pi", args, {
-        signal,
-        timeout: 10 * 60 * 1000,
-      })
-
-      if (execResult.code !== 0) {
-        throw new Error(execResult.stderr || execResult.stdout || `Subagent failed for prompt: ${prompt}`)
-      }
-
-      return (execResult.stdout || "").trim()
-    } finally {
-      for (const [key, oldValue] of Object.entries(savedEnv)) {
-        if (oldValue === undefined) {
-          delete process.env[key]
-        } else {
-          process.env[key] = oldValue
-        }
-      }
-      release()
-    }
-  }
-}
-
 const artifactHelperParams = Type.Object({
   repoRoot: Type.String({ description: "Repository root where workflow artifacts should be created" }),
   artifactType: Type.Union([
@@ -145,18 +103,6 @@ const askUserQuestionParams = Type.Object({
   allowCustom: Type.Optional(Type.Boolean({ description: "Allow a custom answer when options are present" })),
 })
 
-const subagentTaskSchema = Type.Object({
-  agent: Type.String({ description: "Skill name to invoke via /skill:<name>" }),
-  task: Type.String({ description: "Task text passed to the subagent" }),
-})
-
-const subagentParams = Type.Object({
-  agent: Type.Optional(Type.String({ description: "Single subagent skill name" })),
-  task: Type.Optional(Type.String({ description: "Single subagent task" })),
-  chain: Type.Optional(Type.Array(subagentTaskSchema, { description: "Serial subagent chain with optional {previous} placeholder" })),
-  inheritSkills: Type.Optional(Type.Boolean({ description: "Whether the subagent should inherit skills. Default: true" })),
-})
-
 const workflowStateParams = Type.Object({
   repoRoot: Type.String({ description: "Repository root to scan for workflow artifacts" }),
 })
@@ -179,19 +125,6 @@ const reviewRouterParams = Type.Object({
   deletions: Type.Number({ description: "Number of lines removed" }),
 })
 
-const parallelSubagentTaskSchema = Type.Object({
-  agent: Type.String({ description: "Skill name to invoke via /skill:<name>" }),
-  task: Type.String({ description: "Task text passed to the subagent" }),
-})
-
-const parallelSubagentParams = Type.Object({
-  tasks: Type.Union([
-    Type.Array(parallelSubagentTaskSchema),
-    Type.String({ description: "JSON stringified array of tasks" }),
-  ], { description: "Array of independent tasks to run concurrently (can be a JSON string)" }),
-  inheritSkills: Type.Optional(Type.Boolean({ description: "Whether subagents should inherit skills. Default: false" })),
-})
-
 const sessionCheckpointParams = Type.Object({
   operation: Type.Union([
     Type.Literal("save"),
@@ -342,11 +275,9 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
 
   const artifactHelper = createArtifactHelperTool()
   const askUserQuestion = createAskUserQuestionTool()
-  const subagent = createSubagentTool()
   const workflowState = createWorkflowStateTool()
   const worktreeManager = createWorktreeManagerTool()
   const reviewRouter = createReviewRouterTool()
-  const parallelSubagent = createParallelSubagentTool()
   const sessionCheckpoint = createSessionCheckpointTool()
   const taskSplitter = createTaskSplitterTool()
   const brainstormDialog = createBrainstormDialogTool()
@@ -419,29 +350,6 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
     },
   })
 
-  pi.registerTool({
-    name: subagent.name,
-    label: "Subagent",
-    description: "Run a single skill-based subagent or a serial chain in an isolated Pi process.",
-    parameters: subagentParams,
-    async execute(_toolCallId, params, signal, _onUpdate, ctx) {
-      const result = await subagent.execute(
-        {
-          agent: params.agent,
-          task: params.task,
-          chain: params.chain,
-          inheritSkills: params.inheritSkills,
-        },
-        createSubagentRunner(pi, signal),
-      )
-
-      return {
-        content: [{ type: "text", text: result.outputs[result.outputs.length - 1] ?? "" }],
-        details: result,
-      }
-    },
-  })
-
   pi.registerTool({
     name: workflowState.name,
     label: "Workflow State",
@@ -513,39 +421,6 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
     },
   })
 
-  pi.registerTool({
-    name: parallelSubagent.name,
-    label: "Parallel Subagent",
-    description: "Run multiple skill-based subagent tasks concurrently. IMPORTANT: Provide 'tasks' as a clean JSON array object. If the environment forces a string, provide a valid JSON array string.",
-    parameters: parallelSubagentParams,
-    async execute(_toolCallId, params, signal) {
-      let tasks: any[]
-      if (typeof params.tasks === "string") {
-        try {
-          const cleaned = params.tasks.replace(/^```json\s*|```$/g, "").trim()
-          tasks = JSON.parse(cleaned)
-        } catch (e) {
-          throw new Error(`Failed to parse tasks string as JSON: ${e instanceof Error ? e.message : String(e)}`)
-        }
-      } else {
-        tasks = params.tasks
-      }
-
-      const result = await parallelSubagent.execute(
-        {
-          tasks,
-          inheritSkills: params.inheritSkills,
-        },
-        createSubagentRunner(pi, signal),
-      )
-
-      return {
-        content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-        details: result,
-      }
-    },
-  })
-
   pi.registerTool({
     name: sessionCheckpoint.name,
     label: "Session Checkpoint",
@@ -712,8 +587,8 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
     if (event.toolName !== "read") return undefined
 
     // Extract path from input
-    const path = (event.input as any)?.path ?? ""
-    if (!path) return undefined
+    const filePath = (event.input as any)?.path ?? ""
+    if (!filePath) return undefined
 
     // Extract text content from tool result
     const textBlocks = (event.content as Array<any>)?.filter((b: any) => b.type === "text") ?? []
@@ -723,7 +598,7 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
     const isImage = (event.content as Array<any>)?.some((b: any) => b.type === "image") ?? false
 
     const result = filterReadOutput({
-      path,
+      path: filePath,
       output,
       isError: event.isError ?? false,
       isImage,
@@ -756,13 +631,9 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
 
 export { createArtifactHelperTool } from "./tools/artifact-helper"
 export { createAskUserQuestionTool } from "./tools/ask-user-question"
-export { createSubagentTool } from "./tools/subagent"
-export { checkSubagentDepth, getChildDepthEnv, DEFAULT_MAX_SUBAGENT_DEPTH } from "./tools/subagent-depth-guard"
-export { AsyncMutex } from "./tools/async-mutex"
 export { createWorkflowStateTool } from "./tools/workflow-state"
 export { createWorktreeManagerTool } from "./tools/worktree-manager"
 export { createReviewRouterTool } from "./tools/review-router"
-export { createParallelSubagentTool } from "./tools/parallel-subagent"
 export { createSessionCheckpointTool } from "./tools/session-checkpoint"
 export { createTaskSplitterTool } from "./tools/task-splitter"
 export { createBrainstormDialogTool } from "./tools/brainstorm-dialog"