prizmkit 1.0.58 → 1.0.67

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.58",
-  "bundledAt": "2026-03-19T03:51:21.257Z",
-  "bundledFrom": "ce2eaa5"
+  "frameworkVersion": "1.0.67",
+  "bundledAt": "2026-03-19T14:55:15.775Z",
+  "bundledFrom": "9977edd"
 }

package/bundled/adapters/claude/command-adapter.js

@@ -56,7 +56,6 @@ export function convertSkillToCommand(skillContent, skillName) {
   const { frontmatter, body } = parseFrontmatter(skillContent);
 
   // Claude Code command frontmatter only uses description
-  // Also convert any remaining prizmkit.xxx references in the description field (legacy fallback)
   let desc = frontmatter.description || `PrizmKit ${skillName} command`;
   desc = desc.replace(/prizmkit\.(\w+)/g, (_m, sub) => `/${toClaudePrizmkitCommand(sub)}`);
 
@@ -74,7 +73,7 @@ export function convertSkillToCommand(skillContent, skillName) {
     `.claude/command-assets/${skillName}`
   );
 
-  // Replace "invoke the X skill" or "prizmkit.X" patterns with /X slash command (legacy fallback)
+  // Replace "invoke the X skill" or "/prizmkit-X" patterns with /X slash command (legacy fallback)
   convertedBody = convertedBody.replace(
     /invoke\s+(?:the\s+)?[`"]?(\w[\w-]*)[`"]?\s+skill/gi,
     'run the `/$1` command'

package/bundled/dev-pipeline/README.md

@@ -85,7 +85,7 @@ When a feature is stuck (e.g. retry count exceeded, bad artifacts), use `reset-f
 
 What gets cleaned with `--clean`:
 - `state/features/F-XXX/sessions/` — all session logs and prompts
-- `.prizmkit/specs/{feature-slug}/` — spec.md, plan.md, tasks.md, contracts/
+- `.prizmkit/specs/{feature-slug}/` — spec.md, plan.md (with Tasks section), contracts/
 
 What is always reset (with or without `--clean`):
 - `status.json` — status → pending, retry_count → 0
@@ -389,8 +389,7 @@ Each feature generates artifacts in a dedicated subdirectory under `.prizmkit/sp
     │   │   └── requirements.md          # Phase 1: Spec quality checklist
     │   ├── plan.md                      # Phase 2: Implementation plan
     │   ├── data-model.md               # Phase 2: Data model (if applicable)
-    │   ├── contracts/                   # Phase 2: API contracts (if applicable)
-    │   └── tasks.md                     # Phase 3: Task breakdown
+    │   └── contracts/                   # Phase 2: API contracts (if applicable)
     ├── 002-core-encryption-vault/
     │   └── ...
     └── ...
@@ -437,7 +436,7 @@ The AI CLI session exited without producing a `session-status.json`. This typica
 
 ### .prizmkit/specs/ is empty after feature completion
 
-The session skipped the PrizmKit artifact generation phases (spec.md, plan.md, tasks.md). This can happen if:
+The session skipped the PrizmKit artifact generation phases (spec.md, plan.md). This can happen if:
 
 1. **Agent definitions not found**: Check that agent definition files exist
    - CodeBuddy: `.codebuddy/agents/prizm-dev-team-*.md`
@@ -573,7 +572,7 @@ dev-pipeline/bugfix-state/        # Runtime state (gitignored)
 | Ordering | Dependencies DAG → priority | N/A (single refactor per session) | Severity → priority (no dependencies) |
 | Phases | 10-phase (specify → plan → tasks → implement → review) | 6-phase (analyze → plan → tasks → implement → review → commit) | 5-phase (triage → reproduce → fix → verify → commit) |
 | Agents | Orchestrator + Dev + Reviewer | Dev + Reviewer only | Dev + Reviewer only |
-| Artifacts | spec.md, plan.md, tasks.md | refactor-analysis.md, plan.md, tasks.md | fix-plan.md, fix-report.md only |
+| Artifacts | spec.md, plan.md (with Tasks section) | refactor-analysis.md, plan.md (with Tasks section) | fix-plan.md, fix-report.md only |
 | Commit prefix | `feat(<scope>):` | `refactor(<scope>):` | `fix(<scope>):` |
 | Scope Guard | N/A | ✅ (behavior change → STOP) | N/A |
 | Test Strategy | TDD per task | Full suite after EVERY task | Reproduction test |

package/bundled/dev-pipeline/assets/prizm-dev-team-integration.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-dev-pipeline drives the prizm-dev-team multi-agent team through an outer shell loop. Each iteration spawns a new CodeBuddy CLI session with a bootstrap prompt that instructs the agent to create and orchestrate the team for one feature.
+dev-pipeline drives the prizm-dev-team multi-agent team through an outer shell loop. Each iteration spawns a new AI CLI session with a bootstrap prompt that instructs the agent to create and orchestrate the team for one feature.
 
 ## Architecture
 
@@ -16,11 +16,11 @@ dev-pipeline (outer loop)
     └── [per session] AI CLI
             │
             ├── Phase 0: Init (Orchestrator)
-            ├── Phase 1-2: Context snapshot + Plan & Tasks (Orchestrator)
-            ├── Phase 3-4: Analyze (Reviewer agent)
-            ├── Phase 5: Implement (Dev agent)
-            ├── Phase 6: Review (Reviewer agent)
-            └── Phase 7: Retrospective & Commit (Orchestrator)
+            ├── Phase 1-2: Context snapshot + Specify + Plan (Orchestrator)
+            ├── Phase 3: Analyze (Reviewer agent) [tier2] / Phase 4: Analyze [tier3]
+            ├── Phase 4: Implement (Dev agent) [tier2] / Phase 5: Implement [tier3]
+            ├── Phase 4.5/6: Review (Reviewer agent)
+            └── Phase 5/7: Retrospective & Commit (Orchestrator)
             │
             └── Write session-status.json → exit
 ```
@@ -34,17 +34,24 @@ dev-pipeline (outer loop)
 
 Note: The Orchestrator role is handled by the main agent (session orchestrator) directly — no separate agent definition needed.
 
-## Validator Scripts
+## Pipeline Scripts
 
 Located at `dev-pipeline/scripts/`:
 
-| Script | Checkpoint | Purpose |
-|--------|-----------|---------|
-| `init-dev-team.py` | CP-0 | Initialize `.dev-team/` + `.prizmkit/` directories |
-| `validate-json-schema.py` | CP-1,2,3 | Validate JSON artifacts against schemas |
-| `validate-dag.py` | CP-3 | Verify dependency graph has no cycles |
-| `validate-report-format.py` | CP-6,7 | Check Markdown reports have required sections |
-| `check-contract-integrity.py` | CP-3,6,7 | SHA-256 hash verification for contracts |
+| Script | Purpose |
+|--------|---------|
+| `init-dev-team.py` | Initialize `.dev-team/` + `.prizmkit/` directories |
+| `init-pipeline.py` | Initialize pipeline state directories and config |
+| `init-bugfix-pipeline.py` | Initialize bugfix pipeline state |
+| `generate-bootstrap-prompt.py` | Render tier-specific bootstrap prompt with feature context |
+| `generate-bugfix-prompt.py` | Render bugfix bootstrap prompt with bug context |
+| `update-feature-status.py` | Update feature status in feature-list.json after session |
+| `update-bug-status.py` | Update bug status in bug-fix-list.json after session |
+| `check-session-status.py` | Read and validate session-status.json output |
+| `detect-stuck.py` | Detect stuck/hung pipeline sessions via heartbeat |
+| `parse-stream-progress.py` | Parse AI CLI output stream for progress tracking |
+| `cleanup-logs.py` | Clean up old pipeline logs and state files |
+| `utils.py` | Shared utility functions for pipeline scripts |
 
 ## Artifact Mapping
 
@@ -54,7 +61,7 @@ Located at `dev-pipeline/scripts/`:
 |-------|------|---------|
 | 1 | `specs/spec.md` | Feature specification (WHAT/WHY) |
 | 2 | `plans/plan.md` | Technical plan (architecture, API, tests) |
-| 3 | `tasks/tasks.md` | Executable task list with `[ ]` / `[x]` |
+| 3 | `tasks/tasks.md` | Executable task list with `[ ]` / `[x]` (legacy — now part of plan.md Tasks section) |
 | 4 | `analysis/analyze-report.md` | Consistency analysis |
 
 ### Dev-Team Artifacts (.dev-team/)
@@ -102,8 +109,7 @@ The agent MUST write `session-status.json` before exiting:
   "resume_from_phase": null,
   "artifacts": {
     "spec_path": ".prizmkit/specs/spec.md",
-    "plan_path": ".prizmkit/plans/plan.md",
-    "tasks_path": ".prizmkit/tasks/tasks.md"
+    "plan_path": ".prizmkit/plans/plan.md"
   },
   "timestamp": "2026-03-04T11:30:00Z"
 }

package/bundled/dev-pipeline/scripts/generate-bootstrap-prompt.py

@@ -344,16 +344,16 @@ def detect_init_status(project_root):
 def detect_existing_artifacts(project_root, feature_slug):
     """Check which planning artifacts already exist for this feature.
 
-    Returns a dict with keys: has_spec, has_plan, has_tasks, all_complete.
+    Returns a dict with keys: has_spec, has_plan, all_complete.
+    Tasks are now part of plan.md (Tasks section), not a separate file.
     """
     specs_dir = os.path.join(project_root, ".prizmkit", "specs", feature_slug)
     result = {
         "has_spec": os.path.isfile(os.path.join(specs_dir, "spec.md")),
         "has_plan": os.path.isfile(os.path.join(specs_dir, "plan.md")),
-        "has_tasks": os.path.isfile(os.path.join(specs_dir, "tasks.md")),
     }
     result["all_complete"] = all([
-        result["has_spec"], result["has_plan"], result["has_tasks"]
+        result["has_spec"], result["has_plan"]
     ])
     return result
 
@@ -414,6 +414,20 @@ def build_replacements(args, feature, features, global_context, script_dir):
     reviewer_subagent = os.path.join(
         agents_dir, "prizm-dev-team-reviewer.md",
     )
+
+    # Verify agent files actually exist — missing files cause confusing
+    # errors when the AI session tries to read them later.
+    for agent_path, agent_name in [
+        (dev_subagent, "dev agent"),
+        (reviewer_subagent, "reviewer agent"),
+    ]:
+        if not os.path.isfile(agent_path):
+            LOGGER.warning(
+                "Agent file not found: %s (%s). "
+                "Subagent spawning may fail. "
+                "Run `npx prizmkit install` to reinstall agent definitions.",
+                agent_path, agent_name,
+            )
     # Validator scripts - check if they exist in .codebuddy/scripts/, otherwise use dev-pipeline/scripts/
     validator_scripts_dir = os.path.join(project_root, "dev-pipeline", "scripts")
     init_script_path = os.path.join(validator_scripts_dir, "init-dev-team.py")
@@ -481,7 +495,6 @@ def build_replacements(args, feature, features, global_context, script_dir):
         "{{INIT_DONE}}": "true" if init_done else "false",
         "{{HAS_SPEC}}": "true" if artifacts["has_spec"] else "false",
         "{{HAS_PLAN}}": "true" if artifacts["has_plan"] else "false",
-        "{{HAS_TASKS}}": "true" if artifacts["has_tasks"] else "false",
         "{{ARTIFACTS_COMPLETE}}": "true" if artifacts["all_complete"] else "false",
         "{{IS_SELF_EVOLVE}}": "true" if is_self_evolve else "false",
     }

package/bundled/dev-pipeline/scripts/parse-stream-progress.py

@@ -28,7 +28,7 @@ from datetime import datetime, timezone
 # Phase keywords for detection
 PHASE_KEYWORDS = {
     "specify": ["prizmkit-specify", "spec.md", "specification", "gathering requirements"],
-    "plan": ["prizmkit-plan", "plan.md", "architecture", "design plan", "task checklist", "task breakdown", "tasks.md"],
+    "plan": ["prizmkit-plan", "plan.md", "architecture", "design plan", "task checklist", "task breakdown"],
     "analyze": ["prizmkit-analyze", "cross-check", "consistency", "analyzing"],
     "implement": ["prizmkit-implement", "implement", "TDD", "coding", "writing code"],
     "code-review": ["prizmkit-code-review", "code review", "review verdict", "reviewing"],

package/bundled/dev-pipeline/templates/bootstrap-tier1.md

@@ -5,7 +5,7 @@
 - **Feature ID**: {{FEATURE_ID}} | **Session**: {{SESSION_ID}} | **Run**: {{RUN_ID}}
 - **Complexity**: {{COMPLEXITY}} | **Retry**: {{RETRY_COUNT}} / {{MAX_RETRIES}}
 - **Previous Status**: {{PREV_SESSION_STATUS}} | **Resume From**: {{RESUME_PHASE}}
-- **Init**: {{INIT_DONE}} | Artifacts: spec={{HAS_SPEC}} plan={{HAS_PLAN}} tasks={{HAS_TASKS}}
+- **Init**: {{INIT_DONE}} | Artifacts: spec={{HAS_SPEC}} plan={{HAS_PLAN}}
 
 ## Your Mission
 
@@ -35,8 +35,7 @@ You are the **session orchestrator**. Implement Feature {{FEATURE_ID}}: "{{FEATU
 
 ```
 .prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md
-.prizmkit/specs/{{FEATURE_SLUG}}/plan.md
-.prizmkit/specs/{{FEATURE_SLUG}}/tasks.md
+.prizmkit/specs/{{FEATURE_SLUG}}/plan.md              ← includes Tasks section
 ```
 
 ---
@@ -80,19 +79,18 @@ If MISSING — build it now:
 ls .prizmkit/specs/{{FEATURE_SLUG}}/ 2>/dev/null
 ```
 
-If plan.md or tasks.md missing, write them directly:
-- `plan.md`: key components, data flow, files to create/modify (under 80 lines)
-- `tasks.md`: checklist with `[ ]` checkboxes, each task = one implementable unit
+If plan.md missing, write it directly:
+- `plan.md`: key components, data flow, files to create/modify, and a Tasks section with `[ ]` checkboxes (each task = one implementable unit). Keep under 80 lines.
 
-**CP-1**: plan.md and tasks.md exist.
+**CP-1**: plan.md exists with Tasks section.
 
 ### Phase 3: Implement
 
-For each task in tasks.md:
+For each task in plan.md Tasks section:
 1. Read the relevant section from `context-snapshot.md` (no need to re-read individual files)
 2. Write/edit the code
 3. Run tests after each task
-4. Mark task `[x]` in tasks.md immediately
+3. Mark task `[x]` in plan.md Tasks section immediately
 
 After all tasks complete, append to `context-snapshot.md`:
 ```
@@ -150,8 +148,7 @@ Write to: `{{SESSION_STATUS_PATH}}`
   "retrospective_done": true,
   "artifacts": {
     "context_snapshot_path": ".prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md",
-    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md",
-    "tasks_path": ".prizmkit/specs/{{FEATURE_SLUG}}/tasks.md"
+    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md"
   },
   "git_commit": "<commit hash>",
   "timestamp": "2026-03-04T10:00:00Z"

package/bundled/dev-pipeline/templates/bootstrap-tier2.md

@@ -5,7 +5,7 @@
 - **Feature ID**: {{FEATURE_ID}} | **Session**: {{SESSION_ID}} | **Run**: {{RUN_ID}}
 - **Complexity**: {{COMPLEXITY}} | **Retry**: {{RETRY_COUNT}} / {{MAX_RETRIES}}
 - **Previous Status**: {{PREV_SESSION_STATUS}} | **Resume From**: {{RESUME_PHASE}}
-- **Init**: {{INIT_DONE}} | Artifacts: spec={{HAS_SPEC}} plan={{HAS_PLAN}} tasks={{HAS_TASKS}}
+- **Init**: {{INIT_DONE}} | Artifacts: spec={{HAS_SPEC}} plan={{HAS_PLAN}}
 
 ## Your Mission
 
@@ -13,7 +13,7 @@ You are the **session orchestrator**. Implement Feature {{FEATURE_ID}}: "{{FEATU
 
 **CRITICAL**: You MUST NOT exit until ALL work is complete and session-status.json is written. When you spawn subagents, wait for each to finish (run_in_background=false).
 
-**Tier 2 — Dual Agent**: You handle context + planning directly. Then spawn Dev and Reviewer subagents. You may spawn agents directly via the Task tool or use TeamCreate for coordination — choose based on the situation.
+**Tier 2 — Dual Agent**: You handle context + planning directly. Then spawn Dev and Reviewer subagents. Spawn Dev and Reviewer agents via the Agent tool.
 
 ### Feature Description
 
@@ -35,8 +35,7 @@ You are the **session orchestrator**. Implement Feature {{FEATURE_ID}}: "{{FEATU
 
 ```
 .prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md  ← written by you, read by Dev + Reviewer
-.prizmkit/specs/{{FEATURE_SLUG}}/plan.md
-.prizmkit/specs/{{FEATURE_SLUG}}/tasks.md
+.prizmkit/specs/{{FEATURE_SLUG}}/plan.md              ← includes Tasks section
 ```
 
 **`context-snapshot.md`** is the shared knowledge base. You write it once; Dev and Reviewer read it instead of re-scanning individual files.
@@ -88,25 +87,23 @@ If MISSING — build it now:
 ### Phase 2: Plan & Tasks (you, the orchestrator)
 
 ```bash
-ls .prizmkit/specs/{{FEATURE_SLUG}}/plan.md .prizmkit/specs/{{FEATURE_SLUG}}/tasks.md 2>/dev/null
+ls .prizmkit/specs/{{FEATURE_SLUG}}/plan.md 2>/dev/null
 ```
 
 If either missing, write them yourself:
-- `plan.md`: architecture — components, interfaces, data flow, files to create/modify, testing approach
-- `tasks.md`: checklist with `[ ]` checkboxes ordered by dependency
-
-**CP-1**: plan.md and tasks.md exist.
+- `plan.md`: architecture — components, interfaces, data flow, files to create/modify, testing approach, and a Tasks section with `[ ]` checkboxes ordered by dependency
+**CP-1**: plan.md exists with Tasks section.
 
 ### Phase 3: Implement — Dev Subagent
 
-Spawn Dev subagent (Task tool, subagent_type="prizm-dev-team-dev", run_in_background=false).
+Spawn Dev subagent (Agent tool, subagent_type="prizm-dev-team-dev", run_in_background=false).
 
 Prompt:
 > "Read {{DEV_SUBAGENT_PATH}}. Implement feature {{FEATURE_ID}} (slug: {{FEATURE_SLUG}}).
 >
 > 1. Read `.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md` FIRST — all project context, source files, and tests are embedded there. Do NOT re-read individual source files.
-> 2. Read `.prizmkit/specs/{{FEATURE_SLUG}}/plan.md` and `.prizmkit/specs/{{FEATURE_SLUG}}/tasks.md`.
-> 3. Implement task-by-task using TDD. Mark each task `[x]` in tasks.md immediately after completion.
+> 2. Read `.prizmkit/specs/{{FEATURE_SLUG}}/plan.md` (including Tasks section).
+> 3. Implement task-by-task using TDD. Mark each task `[x]` in plan.md Tasks section immediately after completion.
 > 4. After ALL tasks complete, append an 'Implementation Log' section to `context-snapshot.md`:
 >    - Files created/modified (with paths)
 >    - Key implementation decisions
@@ -117,7 +114,7 @@ Wait for Dev to return. All tasks must be `[x]`, tests pass.
 
 ### Phase 4: Review — Reviewer Subagent
 
-Spawn Reviewer subagent (Task tool, subagent_type="prizm-dev-team-reviewer", run_in_background=false).
+Spawn Reviewer subagent (Agent tool, subagent_type="prizm-dev-team-reviewer", run_in_background=false).
 
 Prompt:
 > "Read {{REVIEWER_SUBAGENT_PATH}}. Review feature {{FEATURE_ID}} (slug: {{FEATURE_SLUG}}).
@@ -177,8 +174,7 @@ Write to: `{{SESSION_STATUS_PATH}}`
   "retrospective_done": true,
   "artifacts": {
     "context_snapshot_path": ".prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md",
-    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md",
-    "tasks_path": ".prizmkit/specs/{{FEATURE_SLUG}}/tasks.md"
+    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md"
   },
   "git_commit": "<commit hash>",
   "timestamp": "2026-03-04T10:00:00Z"
@@ -215,7 +211,7 @@ Re-check `git status --short` and ensure it is empty before exiting.
 
 ## Reminders
 
-- Tier 2: orchestrator builds context+plan, Dev implements, Reviewer reviews — use direct Task spawn or TeamCreate as appropriate
+- Tier 2: orchestrator builds context+plan, Dev implements, Reviewer reviews — use direct Agent spawn for agents
 - Build context-snapshot.md FIRST; all subagents read it instead of re-reading source files
 - Do NOT use `run_in_background=true` when spawning subagents
 - ALWAYS write session-status.json before exiting

package/bundled/dev-pipeline/templates/bootstrap-tier3.md

@@ -5,7 +5,7 @@
 - **Feature ID**: {{FEATURE_ID}} | **Session**: {{SESSION_ID}} | **Run**: {{RUN_ID}}
 - **Complexity**: {{COMPLEXITY}} | **Retry**: {{RETRY_COUNT}} / {{MAX_RETRIES}}
 - **Previous Status**: {{PREV_SESSION_STATUS}} | **Resume From**: {{RESUME_PHASE}}
-- **Init**: {{INIT_DONE}} | Artifacts: spec={{HAS_SPEC}} plan={{HAS_PLAN}} tasks={{HAS_TASKS}}
+- **Init**: {{INIT_DONE}} | Artifacts: spec={{HAS_SPEC}} plan={{HAS_PLAN}}
 
 ## Your Mission
 
@@ -13,7 +13,7 @@ You are the **session orchestrator**. Implement Feature {{FEATURE_ID}}: "{{FEATU
 
 **CRITICAL**: You MUST NOT exit until ALL work is complete and session-status.json is written. When you spawn subagents, wait for each to finish (run_in_background=false). Do NOT spawn agents in background and exit — that kills the session.
 
-**Tier 3 — Full Team**: For complex features, create a coordinated agent team via TeamCreate. Use the full 7-phase pipeline with Dev + Reviewer agents.
+**Tier 3 — Full Team**: For complex features, use the full pipeline (Phase 0–6) with Dev + Reviewer agents spawned via the Agent tool.
 
 ### Feature Description
 
@@ -116,9 +116,7 @@ $TEST_CMD 2>&1 | tail -20
 Save the list of **pre-existing failing tests** (if any) as `BASELINE_FAILURES`. These are known failures that existed before this session — Dev must NOT be blamed for them, but must list them in COMPLETION_SIGNAL.
 {{END_IF_INIT_DONE}}
 
-### Step 1: Team Setup
-
-Create a coordinated agent team for this feature session:
+### Step 1: Initialize
 
 1. Run init script:
    `python3 {{INIT_SCRIPT_PATH}} --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}`
@@ -126,15 +124,6 @@ Create a coordinated agent team for this feature session:
 2. Check for existing artifacts:
    `ls .prizmkit/specs/{{FEATURE_SLUG}}/ 2>/dev/null`
 
-3. Create the agent team:
-   - Call `TeamCreate` with `team_name="prizm-dev-team-{{FEATURE_ID}}"` and `description="Implementing {{FEATURE_TITLE}}"`
-   - Reference team config at `{{TEAM_CONFIG_PATH}}` for agent definitions
-   - Spawn Dev and Reviewer agents as team members
-
-Agent files are at:
-- Dev: `{{DEV_SUBAGENT_PATH}}`
-- Reviewer: `{{REVIEWER_SUBAGENT_PATH}}`
-
 {{IF_FRESH_START}}
 ```bash
 python3 {{INIT_SCRIPT_PATH}} --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}
@@ -193,32 +182,32 @@ ls .prizmkit/specs/{{FEATURE_SLUG}}/spec.md .prizmkit/specs/{{FEATURE_SLUG}}/pla
 
 **CP-1**: Both spec.md and plan.md exist.
 
-### Phase 4: Analyze — Reviewer Agent
+### Phase 3: Analyze — Reviewer Agent
 
-Spawn Reviewer agent (Task tool, subagent_type="prizm-dev-team-reviewer", run_in_background=false).
+Spawn Reviewer agent (Agent tool, subagent_type="prizm-dev-team-reviewer", run_in_background=false).
 
 Prompt:
 > "Read {{REVIEWER_SUBAGENT_PATH}}. For feature {{FEATURE_ID}} (slug: {{FEATURE_SLUG}}):
 > 1. Read `.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md` FIRST — all source files and project context are there. Do NOT re-read individual source files.
-> 2. Run prizmkit-analyze: cross-check `spec.md`, `plan.md`, and `tasks.md` for consistency.
+> 2. Run prizmkit-analyze: cross-check `spec.md` and `plan.md` (including Tasks section) for consistency.
 > 3. Before flagging CRITICAL or HIGH issues, verify each against Section 4 of the snapshot. Do NOT report based on incomplete information.
 > Report: CRITICAL, HIGH, MEDIUM issues found (or 'No issues found')."
 
 Wait for Reviewer to return.
-- If CRITICAL issues found: fix them yourself — read `.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md` for full project context. Fix ONLY the listed CRITICAL issues in spec.md/plan.md/tasks.md. Then re-run analyze (max 1 round).
+- If CRITICAL issues found: fix them yourself — read `.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md` for full project context. Fix ONLY the listed CRITICAL issues in spec.md/plan.md. Then re-run analyze (max 1 round).
 
 **CP-2**: No CRITICAL issues.
 
-### Phase 5: Implement — Dev Agent
+### Phase 4: Implement — Dev Agent
 
-Before spawning Dev, check tasks.md:
+Before spawning Dev, check plan.md Tasks section:
 ```bash
-grep -c '^\- \[ \]' .prizmkit/specs/{{FEATURE_SLUG}}/tasks.md 2>/dev/null || echo 0
+grep -c '^\- \[ \]' .prizmkit/specs/{{FEATURE_SLUG}}/plan.md 2>/dev/null || echo 0
 ```
-- If result is `0` (all tasks already `[x]`) → **SKIP Phase 5**, go directly to Phase 6. Do NOT spawn Dev.
+- If result is `0` (all tasks already `[x]`) → **SKIP Phase 4**, go directly to Phase 5. Do NOT spawn Dev.
 - If result is non-zero → spawn Dev agent below.
 
-Spawn Dev agent (Task tool, subagent_type="prizm-dev-team-dev", run_in_background=false).
+Spawn Dev agent (Agent tool, subagent_type="prizm-dev-team-dev", run_in_background=false).
 
 {{IF_MODE_SELF_EVOLVE}}
 **Framework Self-Evolve — Dev Extra Instructions**:
@@ -234,8 +223,8 @@ Append the following to the Dev agent prompt:
 Prompt:
 > "Read {{DEV_SUBAGENT_PATH}}. Implement feature {{FEATURE_ID}} (slug: {{FEATURE_SLUG}}) using TDD.
 > 1. Read `.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md` FIRST — all source files and context are there. Do NOT re-read individual source files.
-> 2. Read `plan.md` and `tasks.md` from `.prizmkit/specs/{{FEATURE_SLUG}}/`.
-> 3. Implement task-by-task. Mark each `[x]` in tasks.md **immediately** after completion (do NOT batch).
+> 2. Read `plan.md` (including Tasks section) from `.prizmkit/specs/{{FEATURE_SLUG}}/`.
+> 3. Implement task-by-task. Mark each `[x]` in plan.md Tasks section **immediately** after completion (do NOT batch).
 > 4. Use `TEST_CMD=<TEST_CMD>` to run tests — do NOT explore alternative test commands.
 > 5. After ALL tasks done, append 'Implementation Log' to context-snapshot.md: files changed/created, key decisions, deviations from plan.
 > 6. Do NOT execute any git commands (no git add/commit/reset/push).
@@ -243,11 +232,11 @@ Prompt:
 > Do NOT exit until all tasks are [x] and the Implementation Log is written."
 
 Wait for Dev to return. **If Dev times out before all tasks are `[x]`**:
-1. Check progress: `grep -c '^\- \[ \]' .prizmkit/specs/{{FEATURE_SLUG}}/tasks.md`
+1. Check progress: `grep -c '^\- \[ \]' .prizmkit/specs/{{FEATURE_SLUG}}/plan.md`
 2. If any tasks remain: re-spawn Dev with this recovery prompt:
    > "Read {{DEV_SUBAGENT_PATH}}. You are resuming implementation of feature {{FEATURE_ID}} (slug: {{FEATURE_SLUG}}).
    > 1. Read `.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md` — Section 4 has original source, 'Implementation Log' (if present) has what was already done. Do NOT re-read individual source files.
-   > 2. Read `tasks.md` — complete ONLY the remaining `[ ]` tasks. Do NOT redo completed `[x]` tasks.
+   > 2. Read plan.md Tasks section — complete ONLY the remaining `[ ]` tasks. Do NOT redo completed `[x]` tasks.
    > 3. Use `TEST_CMD=<TEST_CMD>` to run tests.
    > 4. Append progress to 'Implementation Log' in context-snapshot.md.
    > 5. Do NOT execute any git commands."
@@ -255,9 +244,9 @@ Wait for Dev to return. **If Dev times out before all tasks are `[x]`**:
 
 All tasks `[x]`, tests pass.
 
-### Phase 6: Review — Reviewer Agent
+### Phase 5: Review — Reviewer Agent
 
-Spawn Reviewer agent (Task tool, subagent_type="prizm-dev-team-reviewer", run_in_background=false).
+Spawn Reviewer agent (Agent tool, subagent_type="prizm-dev-team-reviewer", run_in_background=false).
 
 {{IF_MODE_SELF_EVOLVE}}
 **Framework Self-Evolve — Reviewer Extra Instructions**:
@@ -291,7 +280,8 @@ Wait for Reviewer to return.
 
 **CP-3**: Integration tests pass, verdict is not NEEDS_FIXES.
 
-### Phase 7: Retrospective & Commit — DO NOT SKIP
+
+### Phase 6: Retrospective & Commit — DO NOT SKIP
 
 {{IF_MODE_SELF_EVOLVE}}
 **Framework Validation Gate (self-evolve mode)**:
@@ -348,8 +338,8 @@ Write to: `{{SESSION_STATUS_PATH}}`
   "feature_slug": "{{FEATURE_SLUG}}",
   "exec_tier": 3,
   "status": "<success|partial|failed|commit_missing|docs_missing>",
-  "completed_phases": [0, 1, 2, 3, 4, 5, 6, 7],
-  "current_phase": 7,
+  "completed_phases": [0, 1, 2, 3, 4, 5, 6],
+  "current_phase": 6,
   "checkpoint_reached": "CP-3",
   "tasks_completed": 0,
   "tasks_total": 0,
@@ -361,8 +351,7 @@ Write to: `{{SESSION_STATUS_PATH}}`
   "artifacts": {
     "context_snapshot_path": ".prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md",
     "spec_path": ".prizmkit/specs/{{FEATURE_SLUG}}/spec.md",
-    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md",
-    "tasks_path": ".prizmkit/specs/{{FEATURE_SLUG}}/tasks.md"
+    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md"
   },
   "git_commit": "<commit hash>",
   "timestamp": "2026-03-04T10:00:00Z"
@@ -386,12 +375,6 @@ git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 
 Re-check `git status --short` and ensure it is empty before exiting.
 
-## Step 4: Team Cleanup
-
-Clean up the agent team created in Step 1:
-- Call `TeamDelete` to remove the team and free resources
-- Only call TeamDelete after all agents have completed and session-status.json is written
-
 ## Critical Paths
 
 | Resource | Path |
@@ -407,7 +390,7 @@ Clean up the agent team created in Step 1:
 
 ## Reminders
 
-- Tier 3: full team — Dev (implementation) → Reviewer (review) — create coordinated team via TeamCreate, clean up with TeamDelete at session end
+- Tier 3: full team — Dev (implementation) → Reviewer (review) — spawn agents directly via Agent tool
 - context-snapshot.md is the team knowledge base: orchestrator writes it once, all agents read it
 - Do NOT use `run_in_background=true` when spawning agents
 - ALWAYS write session-status.json before exiting