prizmkit 1.0.45 → 1.0.66

package/bundled/dev-pipeline/run.sh

@@ -28,8 +28,8 @@ set -euo pipefail
 #   LOG_RETENTION_DAYS    Delete logs older than N days (default: 14)
 #   LOG_MAX_TOTAL_MB      Keep total logs under N MB via oldest-first cleanup (default: 1024)
 #   PIPELINE_MODE         Override mode for all features: lite|standard|full|self-evolve (used by daemon)
-#   USE_WORKTREE          Enable git worktree isolation per session (default: 1). Set to 0 to disable.
-#   AUTO_PUSH             Auto-push to remote after successful worktree merge (default: 0). Set to 1 to enable.
+#   DEV_BRANCH            Custom dev branch name (default: auto-generated dev/pipeline-{run_id})
+#   AUTO_PUSH             Auto-push to remote after successful feature (default: 0). Set to 1 to enable.
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -46,7 +46,7 @@ LOG_RETENTION_DAYS=${LOG_RETENTION_DAYS:-14}
 LOG_MAX_TOTAL_MB=${LOG_MAX_TOTAL_MB:-1024}
 VERBOSE=${VERBOSE:-0}
 MODEL=${MODEL:-""}
-USE_WORKTREE=${USE_WORKTREE:-1}
+DEV_BRANCH=${DEV_BRANCH:-""}
 AUTO_PUSH=${AUTO_PUSH:-0}
 
 # Source shared common helpers (CLI/platform detection + logs + deps)
@@ -56,8 +56,8 @@ prizm_detect_cli_and_platform
 # Source shared heartbeat library
 source "$SCRIPT_DIR/lib/heartbeat.sh"
 
-# Source shared worktree library
-source "$SCRIPT_DIR/lib/worktree.sh"
+# Source shared branch library
+source "$SCRIPT_DIR/lib/branch.sh"
 
 # Detect stream-json support
 detect_stream_json_support "$CLI_CMD"
@@ -65,9 +65,9 @@ detect_stream_json_support "$CLI_CMD"
 # Feature list path (set in main, used by cleanup trap)
 FEATURE_LIST=""
 
-# Active worktree tracking (for cleanup on interrupt)
-_ACTIVE_WORKTREE_PATH=""
-_ACTIVE_WORKTREE_BRANCH=""
+# Branch tracking (for cleanup on interrupt)
+_ORIGINAL_BRANCH=""
+_DEV_BRANCH_NAME=""
 
 # ============================================================
 # Shared: Spawn an AI CLI session and wait for result
@@ -83,7 +83,6 @@ _ACTIVE_WORKTREE_BRANCH=""
 #   $4 - bootstrap_prompt (path)
 #   $5 - session_dir
 #   $6 - max_retries (for status update)
-#   $7 - worktree_path (optional; if set, AI CLI runs inside this directory)
 spawn_and_wait_session() {
     local feature_id="$1"
     local feature_list="$2"
@@ -91,7 +90,6 @@ spawn_and_wait_session() {
     local bootstrap_prompt="$4"
     local session_dir="$5"
     local max_retries="$6"
-    local worktree_path="${7:-}"
 
     local session_log="$session_dir/logs/session.log"
     local progress_json="$session_dir/logs/progress.json"
@@ -116,14 +114,6 @@ spawn_and_wait_session() {
     # within an existing Claude Code session (e.g. via launch-daemon.sh).
     unset CLAUDECODE 2>/dev/null || true
 
-    # If worktree path is provided, cd into it for the AI CLI session
-    local _saved_pwd=""
-    if [[ -n "$worktree_path" && -d "$worktree_path" ]]; then
-        _saved_pwd="$(pwd)"
-        cd "$worktree_path"
-        log_info "Running AI CLI in worktree: $worktree_path"
-    fi
-
     case "$CLI_CMD" in
         *claude*)
             # Claude Code: prompt via -p argument, --dangerously-skip-permissions for auto-accept
@@ -149,11 +139,6 @@ spawn_and_wait_session() {
     esac
     local cbc_pid=$!
 
-    # Restore original directory if we changed it
-    if [[ -n "$_saved_pwd" ]]; then
-        cd "$_saved_pwd"
-    fi
-
     # Start progress parser (no-op if stream-json not supported)
     start_progress_parser "$session_log" "$progress_json" "$SCRIPTS_DIR"
     local parser_pid="${_PARSER_PID:-}"
@@ -229,9 +214,9 @@ spawn_and_wait_session() {
                 else
                     local docs_changed=""
                     docs_changed=$(git -C "$project_root" log --name-only --format="" -1 2>/dev/null \
-                        | grep -E '(\.prizm-docs/|\.prizmkit/specs/REGISTRY\.md)' | head -1 || true)
+                        | grep -E '\.prizm-docs/' | head -1 || true)
                     if [[ -z "$docs_changed" ]]; then
-                        log_warn "Session committed but no .prizm-docs or REGISTRY.md changes detected."
+                        log_warn "Session committed but no .prizm-docs changes detected."
                         session_status="docs_missing"
                     fi
                 fi
@@ -280,13 +265,10 @@ cleanup() {
     # Kill all child processes (claude-internal, heartbeat, progress parser, etc.)
     kill 0 2>/dev/null || true
 
-    # Clean up active worktree if any
-    if [[ -n "$_ACTIVE_WORKTREE_PATH" ]]; then
-        local _project_root
-        _project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-        worktree_cleanup "$_project_root" "$_ACTIVE_WORKTREE_PATH" "$_ACTIVE_WORKTREE_BRANCH"
-        _ACTIVE_WORKTREE_PATH=""
-        _ACTIVE_WORKTREE_BRANCH=""
+    # Log current branch info for recovery
+    if [[ -n "$_DEV_BRANCH_NAME" ]]; then
+        log_info "Development was on branch: $_DEV_BRANCH_NAME"
+        log_info "Original branch was: $_ORIGINAL_BRANCH"
     fi
 
     if [[ -n "$FEATURE_LIST" && -f "$FEATURE_LIST" ]]; then
@@ -623,13 +605,9 @@ sys.exit(1)
         log_warn "Interrupted. Killing session..."
         # Kill all child processes
         kill 0 2>/dev/null || true
-        # Clean up active worktree if any
-        if [[ -n "$_ACTIVE_WORKTREE_PATH" ]]; then
-            local _proj_root
-            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-            worktree_cleanup "$_proj_root" "$_ACTIVE_WORKTREE_PATH" "$_ACTIVE_WORKTREE_BRANCH"
-            _ACTIVE_WORKTREE_PATH=""
-            _ACTIVE_WORKTREE_BRANCH=""
+        # Log current branch info
+        if [[ -n "$_DEV_BRANCH_NAME" ]]; then
+            log_info "Development was on branch: $_DEV_BRANCH_NAME"
         fi
         log_info "Session log: $session_dir/logs/session.log"
         exit 130
@@ -638,63 +616,31 @@ sys.exit(1)
 
     _SPAWN_RESULT=""
 
-    # Worktree lifecycle: create worktree before session if enabled
-    local _wt_path="" _wt_branch=""
-    if [[ "$USE_WORKTREE" == "1" ]]; then
-        local _proj_root
-        _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-        local _wt_base="$STATE_DIR/worktrees"
-        local _source_branch
-        _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
-
-        # Prune stale worktrees before creating new one
-        worktree_prune_stale "$_proj_root"
-
-        _WORKTREE_PATH=""
-        _WORKTREE_BRANCH=""
-        if worktree_create "$_proj_root" "$_wt_base" "$session_id" "$_source_branch"; then
-            _wt_path="$_WORKTREE_PATH"
-            _wt_branch="$_WORKTREE_BRANCH"
-            _ACTIVE_WORKTREE_PATH="$_wt_path"
-            _ACTIVE_WORKTREE_BRANCH="$_wt_branch"
-        else
-            log_warn "Failed to create worktree; running session in main working tree"
-        fi
+    # Branch lifecycle: create and checkout feature branch
+    local _proj_root
+    _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+    local _source_branch
+    _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+    _ORIGINAL_BRANCH="$_source_branch"
+
+    local _branch_name="${DEV_BRANCH:-dev/${feature_id}-$(date +%s)}"
+    if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
+        _DEV_BRANCH_NAME="$_branch_name"
+    else
+        log_warn "Failed to create branch; running session on current branch"
     fi
 
     spawn_and_wait_session \
         "$feature_id" "$feature_list" "$session_id" \
-        "$bootstrap_prompt" "$session_dir" 999 "$_wt_path"
+        "$bootstrap_prompt" "$session_dir" 999
     local session_status="$_SPAWN_RESULT"
 
-    # Worktree lifecycle: merge and cleanup after session
-    if [[ -n "$_wt_path" && -n "$_wt_branch" ]]; then
+    # Auto-push after successful session
+    if [[ "$session_status" == "success" && "$AUTO_PUSH" == "1" ]]; then
         local _proj_root
         _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-        local _target_branch
-        _target_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
-
-        if [[ "$session_status" == "success" ]]; then
-            _MERGE_RESULT=""
-            worktree_merge "$_proj_root" "$_wt_branch" "$_target_branch" "$feature_id" "$session_id" || true
-            if [[ "$_MERGE_RESULT" == "success" ]]; then
-                if [[ "$AUTO_PUSH" == "1" ]]; then
-                    log_info "AUTO_PUSH enabled; pushing to remote..."
-                    git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
-                fi
-                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
-            elif [[ "$_MERGE_RESULT" == "conflict" ]]; then
-                session_status="merge_conflict"
-                _SPAWN_RESULT="merge_conflict"
-                log_warn "Worktree branch preserved for manual conflict resolution: $_wt_branch"
-            else
-                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
-            fi
-        else
-            worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
-        fi
-        _ACTIVE_WORKTREE_PATH=""
-        _ACTIVE_WORKTREE_BRANCH=""
+        log_info "AUTO_PUSH enabled; pushing to remote..."
+        git -C "$_proj_root" push -u origin "$_DEV_BRANCH_NAME" 2>/dev/null || log_warn "Auto-push failed"
     fi
 
     echo ""
@@ -766,13 +712,6 @@ main() {
     check_dependencies
     run_log_cleanup
 
-    # Prune stale worktree references at startup
-    if [[ "$USE_WORKTREE" == "1" ]]; then
-        local _prune_root
-        _prune_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-        worktree_prune_stale "$_prune_root"
-    fi
-
     # Initialize pipeline state if needed
     if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
         log_info "Initializing pipeline state..."
@@ -813,6 +752,23 @@ main() {
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
     echo ""
 
+    # Branch lifecycle: create dev branch for this pipeline run
+    local _proj_root
+    _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+    local _source_branch
+    _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+    _ORIGINAL_BRANCH="$_source_branch"
+
+    local run_id_for_branch
+    run_id_for_branch=$(jq -r '.run_id' "$STATE_DIR/pipeline.json" 2>/dev/null || echo "$$")
+    local _branch_name="${DEV_BRANCH:-dev/pipeline-${run_id_for_branch}}"
+    if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
+        _DEV_BRANCH_NAME="$_branch_name"
+        log_info "Dev branch: $_branch_name"
+    else
+        log_warn "Failed to create dev branch; running on current branch: $_source_branch"
+    fi
+
     # Main processing loop
     local session_count=0
 
@@ -851,6 +807,10 @@ for f in data.get('stuck_features', []):
             log_success "════════════════════════════════════════════════════"
             log_success "  All features completed! Pipeline finished."
             log_success "  Total sessions: $session_count"
+            if [[ -n "$_DEV_BRANCH_NAME" ]]; then
+                log_success "  Dev branch: $_DEV_BRANCH_NAME"
+                log_success "  Merge with: git checkout $_ORIGINAL_BRANCH && git merge $_DEV_BRANCH_NAME"
+            fi
             log_success "════════════════════════════════════════════════════"
             rm -f "$STATE_DIR/current-session.json"
             break
@@ -948,70 +908,17 @@ os.replace(tmp, target)
         log_info "Spawning AI CLI session: $session_id"
         _SPAWN_RESULT=""
 
-        # Worktree lifecycle: create worktree before session if enabled
-        local _wt_path="" _wt_branch=""
-        if [[ "$USE_WORKTREE" == "1" ]]; then
-            local _proj_root
-            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-            local _wt_base="$STATE_DIR/worktrees"
-            local _source_branch
-            _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
-
-            _WORKTREE_PATH=""
-            _WORKTREE_BRANCH=""
-            if worktree_create "$_proj_root" "$_wt_base" "$session_id" "$_source_branch"; then
-                _wt_path="$_WORKTREE_PATH"
-                _wt_branch="$_WORKTREE_BRANCH"
-                _ACTIVE_WORKTREE_PATH="$_wt_path"
-                _ACTIVE_WORKTREE_BRANCH="$_wt_branch"
-            else
-                log_warn "Failed to create worktree; running session in main working tree"
-            fi
-        fi
-
         spawn_and_wait_session \
             "$feature_id" "$feature_list" "$session_id" \
-            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$_wt_path"
+            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
         local session_status="$_SPAWN_RESULT"
 
-        # Worktree lifecycle: merge and cleanup after session
-        if [[ -n "$_wt_path" && -n "$_wt_branch" ]]; then
+        # Auto-push after successful session
+        if [[ "$session_status" == "success" && "$AUTO_PUSH" == "1" ]]; then
             local _proj_root
             _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-            local _target_branch
-            _target_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
-
-            if [[ "$session_status" == "success" ]]; then
-                _MERGE_RESULT=""
-                worktree_merge "$_proj_root" "$_wt_branch" "$_target_branch" "$feature_id" "$session_id" || true
-                if [[ "$_MERGE_RESULT" == "success" ]]; then
-                    if [[ "$AUTO_PUSH" == "1" ]]; then
-                        log_info "AUTO_PUSH enabled; pushing to remote..."
-                        git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
-                    fi
-                    worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
-                elif [[ "$_MERGE_RESULT" == "conflict" ]]; then
-                    session_status="merge_conflict"
-                    _SPAWN_RESULT="merge_conflict"
-                    log_warn "Worktree branch preserved for manual conflict resolution: $_wt_branch"
-                    # Update feature status to merge_conflict
-                    python3 "$SCRIPTS_DIR/update-feature-status.py" \
-                        --feature-list "$feature_list" \
-                        --state-dir "$STATE_DIR" \
-                        --feature-id "$feature_id" \
-                        --session-status "merge_conflict" \
-                        --session-id "$session_id" \
-                        --max-retries "$MAX_RETRIES" \
-                        --action update >/dev/null 2>&1 || true
-                else
-                    worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
-                fi
-            else
-                # Non-success: cleanup worktree
-                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
-            fi
-            _ACTIVE_WORKTREE_PATH=""
-            _ACTIVE_WORKTREE_BRANCH=""
+            log_info "AUTO_PUSH enabled; pushing to remote..."
+            git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
         fi
 
         session_count=$((session_count + 1))

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,11 +28,11 @@ 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"],
-    "summarize": ["prizmkit-summarize", "REGISTRY.md", "summarize", "summary"],
+    "retrospective": ["prizmkit-retrospective", "retrospective", "knowledge distillation", "TRAPS", ".prizm-docs/ sync", "structural sync"],
     "commit": ["prizmkit-committer", "git commit", "feat(", "fix(", "committing"],
 }
 

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,9 +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/REGISTRY.md
+.prizmkit/specs/{{FEATURE_SLUG}}/plan.md              ← includes Tasks section
 ```
 
 ---
@@ -81,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`:
 ```
@@ -111,24 +108,17 @@ Key decisions: [list]
 
 **CP-2**: All acceptance criteria met, tests pass.
 
-### Phase 4.5: Prizm Doc Update (mandatory for feature sessions)
+### Phase 4.5: Memory Maintenance (mandatory before commit)
 
-Run `/prizmkit-prizm-docs` and sync project docs before commit:
-1. Use `git diff --cached --name-status` (fallback: `git diff --name-status`) to locate changed modules
-2. Update affected `.prizm-docs/` files (L1/L2, changelog.prizm)
-3. Stage documentation updates (`git add .prizm-docs/`) if changed
+Run `/prizmkit-retrospective` — the **sole maintainer** of `.prizm-docs/`:
+1. **Structural sync**: Use `git diff --cached --name-status` to locate changed modules, update KEY_FILES/INTERFACES/DEPENDENCIES/file counts in affected `.prizm-docs/` files
+2. **Knowledge injection** (feature sessions only): Extract TRAPS/RULES/DECISIONS from completed work into `.prizm-docs/`
+3. Stage all doc changes: `git add .prizm-docs/`
 
-Doc maintenance pass condition (pipeline-enforced): `REGISTRY.md` **or** `.prizm-docs/` changed in the final commit.
-
-### Phase 4.7: Retrospective (feature sessions only, before commit)
-
-If this session is a feature (not a bug-fix-only commit), run `/prizmkit-retrospective` now — **before committing**.
-Retrospective must update relevant `.prizm-docs/` sections (TRAPS/RULES/DECISIONS) when applicable, so those changes are included in the feature commit.
-Stage any `.prizm-docs/` changes produced: `git add .prizm-docs/`
+Doc maintenance pass condition (pipeline-enforced): `.prizm-docs/` changed in the final commit.
 
 ### Phase 5: Commit
 
-- Run `/prizmkit-summarize` → archive to REGISTRY.md
 - Run `/prizmkit-committer` → `feat({{FEATURE_ID}}): {{FEATURE_TITLE}}`, do NOT push
 - MANDATORY: commit must be done via `/prizmkit-committer` skill. Do NOT run manual `git add`/`git commit` as a substitute.
 - Do NOT run `update-feature-status.py` here — the pipeline runner handles feature-list.json updates automatically after session exit.
@@ -158,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"
@@ -174,11 +163,11 @@ After writing `session-status.json`, verify repository is clean:
 git status --short
 ```
 
-If any files remain, include them in the last commit:
+If any files remain (e.g. session-status.json), stage and create a follow-up commit:
 
 ```bash
 git add -A
-git commit --amend --no-edit
+git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 ```
 
 Re-check `git status --short` and ensure it is empty before exiting.

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. No TeamCreate required.
+**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,9 +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/REGISTRY.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.
@@ -89,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
@@ -118,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}}).
@@ -138,24 +134,17 @@ Wait for Reviewer to return.
 
 **CP-2**: Tests pass, verdict is not NEEDS_FIXES.
 
-### Phase 4.5: Prizm Doc Update (mandatory for feature sessions)
-
-Run `/prizmkit-prizm-docs` and sync project docs before commit:
-1. Use `git diff --cached --name-status` (fallback: `git diff --name-status`) to locate changed modules
-2. Update affected `.prizm-docs/` files (L1/L2, changelog.prizm)
-3. Stage documentation updates (`git add .prizm-docs/`) if changed
-
-Doc maintenance pass condition (pipeline-enforced): `REGISTRY.md` **or** `.prizm-docs/` changed in the final commit.
+### Phase 4.5: Memory Maintenance (mandatory before commit)
 
-### Phase 4.7: Retrospective (feature sessions only, before commit)
+Run `/prizmkit-retrospective` — the **sole maintainer** of `.prizm-docs/`:
+1. **Structural sync**: Use `git diff --cached --name-status` to locate changed modules, update KEY_FILES/INTERFACES/DEPENDENCIES/file counts in affected `.prizm-docs/` files
+2. **Knowledge injection** (feature sessions only): Extract TRAPS/RULES/DECISIONS from completed work into `.prizm-docs/`
+3. Stage all doc changes: `git add .prizm-docs/`
 
-If this session is a feature (not a bug-fix-only commit), run `/prizmkit-retrospective` now — **before committing**.
-Retrospective must update relevant `.prizm-docs/` sections (TRAPS/RULES/DECISIONS) when applicable, so those changes are included in the feature commit.
-Stage any `.prizm-docs/` changes produced: `git add .prizm-docs/`
+Doc maintenance pass condition (pipeline-enforced): `.prizm-docs/` changed in the final commit.
 
 ### Phase 5: Commit
 
-- Run `/prizmkit-summarize` → archive to REGISTRY.md
 - Run `/prizmkit-committer` → `feat({{FEATURE_ID}}): {{FEATURE_TITLE}}`, do NOT push
 - MANDATORY: commit must be done via `/prizmkit-committer` skill. Do NOT run manual `git add`/`git commit` as a substitute.
 - Do NOT run `update-feature-status.py` here — the pipeline runner handles feature-list.json updates automatically after session exit.
@@ -185,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"
@@ -201,11 +189,11 @@ After writing `session-status.json`, verify repository is clean:
 git status --short
 ```
 
-If any files remain, include them in the last commit:
+If any files remain (e.g. session-status.json), stage and create a follow-up commit:
 
 ```bash
 git add -A
-git commit --amend --no-edit
+git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 ```
 
 Re-check `git status --short` and ensure it is empty before exiting.
@@ -223,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 — no TeamCreate
+- 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