prizmkit 1.0.35 → 1.0.58

package/bundled/dev-pipeline/run.sh

@@ -28,6 +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)
+#   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)"
@@ -44,6 +46,8 @@ LOG_RETENTION_DAYS=${LOG_RETENTION_DAYS:-14}
 LOG_MAX_TOTAL_MB=${LOG_MAX_TOTAL_MB:-1024}
 VERBOSE=${VERBOSE:-0}
 MODEL=${MODEL:-""}
+DEV_BRANCH=${DEV_BRANCH:-""}
+AUTO_PUSH=${AUTO_PUSH:-0}
 
 # Source shared common helpers (CLI/platform detection + logs + deps)
 source "$SCRIPT_DIR/lib/common.sh"
@@ -52,12 +56,19 @@ prizm_detect_cli_and_platform
 # Source shared heartbeat library
 source "$SCRIPT_DIR/lib/heartbeat.sh"
 
+# Source shared branch library
+source "$SCRIPT_DIR/lib/branch.sh"
+
 # Detect stream-json support
 detect_stream_json_support "$CLI_CMD"
 
 # Feature list path (set in main, used by cleanup trap)
 FEATURE_LIST=""
 
+# Branch tracking (for cleanup on interrupt)
+_ORIGINAL_BRANCH=""
+_DEV_BRANCH_NAME=""
+
 # ============================================================
 # Shared: Spawn an AI CLI session and wait for result
 # ============================================================
@@ -203,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
@@ -254,6 +265,12 @@ cleanup() {
     # Kill all child processes (claude-internal, heartbeat, progress parser, etc.)
     kill 0 2>/dev/null || true
 
+    # 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
         python3 "$SCRIPTS_DIR/update-feature-status.py" \
             --feature-list "$FEATURE_LIST" \
@@ -588,17 +605,44 @@ sys.exit(1)
         log_warn "Interrupted. Killing session..."
         # Kill all child processes
         kill 0 2>/dev/null || true
+        # 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
     }
     trap cleanup_single_feature SIGINT SIGTERM
 
     _SPAWN_RESULT=""
+
+    # 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
     local session_status="$_SPAWN_RESULT"
 
+    # Auto-push after successful session
+    if [[ "$session_status" == "success" && "$AUTO_PUSH" == "1" ]]; then
+        local _proj_root
+        _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        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 ""
     if [[ "$session_status" == "success" ]]; then
         # Self-evolve mode: run framework validation after successful session
@@ -708,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
 
@@ -746,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
@@ -842,11 +907,20 @@ os.replace(tmp, target)
         # Spawn session and wait
         log_info "Spawning AI CLI session: $session_id"
         _SPAWN_RESULT=""
+
         spawn_and_wait_session \
             "$feature_id" "$feature_list" "$session_id" \
             "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
         local session_status="$_SPAWN_RESULT"
 
+        # Auto-push after successful session
+        if [[ "$session_status" == "success" && "$AUTO_PUSH" == "1" ]]; then
+            local _proj_root
+            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+            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))
 
         # Brief pause before next iteration

package/bundled/dev-pipeline/scripts/check-session-status.py

@@ -66,7 +66,7 @@ def determine_status(data):
     """Determine the single-line status string from the parsed data.
 
     Returns one of: success, partial_resumable, partial_not_resumable,
-    failed, commit_missing, docs_missing.
+    failed, commit_missing, docs_missing, merge_conflict.
     """
     status = data.get("status", "")
 
@@ -84,6 +84,8 @@ def determine_status(data):
         return "commit_missing"
     elif status == "docs_missing":
         return "docs_missing"
+    elif status == "merge_conflict":
+        return "merge_conflict"
     else:
         # Unknown status value — treat as crashed
         return "crashed"

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

@@ -408,12 +408,6 @@ def build_replacements(args, feature, features, global_context, script_dir):
         )
 
     # Agent definitions are .md files in the platform-specific agents dir
-    coordinator_subagent = os.path.join(
-        agents_dir, "prizm-dev-team-coordinator.md",
-    )
-    pm_subagent = os.path.join(
-        agents_dir, "prizm-dev-team-pm.md",
-    )
     dev_subagent = os.path.join(
         agents_dir, "prizm-dev-team-dev.md",
     )
@@ -475,8 +469,6 @@ def build_replacements(args, feature, features, global_context, script_dir):
         ),
         "{{GLOBAL_CONTEXT}}": format_global_context(global_context),
         "{{TEAM_CONFIG_PATH}}": team_config_path,
-        "{{COORDINATOR_SUBAGENT_PATH}}": coordinator_subagent,
-        "{{PM_SUBAGENT_PATH}}": pm_subagent,
         "{{DEV_SUBAGENT_PATH}}": dev_subagent,
         "{{REVIEWER_SUBAGENT_PATH}}": reviewer_subagent,
         "{{VALIDATOR_SCRIPTS_DIR}}": validator_scripts_dir,

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

@@ -32,7 +32,7 @@ PHASE_KEYWORDS = {
     "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/scripts/update-bug-status.py

@@ -39,6 +39,7 @@ SESSION_STATUS_VALUES = [
     "failed",
     "crashed",
     "timed_out",
+    "merge_conflict",
 ]
 
 TERMINAL_STATUSES = {"completed", "failed", "skipped", "needs_info"}
@@ -237,6 +238,25 @@ def action_update(args, bug_list_path, state_dir):
         if err:
             error_out("Failed to update bug-fix-list.json: {}".format(err))
             return
+    elif session_status == "merge_conflict":
+        # Degraded outcome: keep artifacts for retry (branch preserves work)
+        bs["retry_count"] = bs.get("retry_count", 0) + 1
+
+        if bs["retry_count"] >= max_retries:
+            bs["status"] = "failed"
+            target_status = "failed"
+        else:
+            bs["status"] = "merge_conflict"
+            target_status = "merge_conflict"
+
+        bs["resume_from_phase"] = None
+        bs["sessions"] = []
+        bs["last_session_id"] = None
+
+        err = update_bug_in_list(bug_list_path, bug_id, target_status)
+        if err:
+            error_out("Failed to update bug-fix-list.json: {}".format(err))
+            return
     else:
         bs["retry_count"] = bs.get("retry_count", 0) + 1
 
@@ -285,7 +305,10 @@ def action_update(args, bug_list_path, state_dir):
         "resume_from_phase": bs.get("resume_from_phase"),
         "updated_at": bs["updated_at"],
     }
-    if session_status != "success":
+    if session_status == "merge_conflict":
+        summary["degraded_reason"] = "merge_conflict"
+        summary["restart_policy"] = "finalization_retry"
+    elif session_status != "success":
         summary["restart_policy"] = "full_restart"
         summary["cleanup_performed"] = cleaned
 

package/bundled/dev-pipeline/scripts/update-feature-status.py

@@ -44,6 +44,7 @@ SESSION_STATUS_VALUES = [
     "timed_out",
     "commit_missing",
     "docs_missing",
+    "merge_conflict",
 ]
 
 TERMINAL_STATUSES = {"completed", "failed", "skipped"}
@@ -441,7 +442,7 @@ def action_update(args, feature_list_path, state_dir):
         if err:
             error_out("Failed to update feature-list.json: {}".format(err))
             return
-    elif session_status in ("commit_missing", "docs_missing"):
+    elif session_status in ("commit_missing", "docs_missing", "merge_conflict"):
         # Degraded outcome: keep artifacts for retry and expose specific status.
         fs["retry_count"] = fs.get("retry_count", 0) + 1
 
@@ -509,7 +510,7 @@ def action_update(args, feature_list_path, state_dir):
         "resume_from_phase": fs.get("resume_from_phase"),
         "updated_at": fs["updated_at"],
     }
-    if session_status in ("commit_missing", "docs_missing"):
+    if session_status in ("commit_missing", "docs_missing", "merge_conflict"):
         summary["degraded_reason"] = session_status
         summary["restart_policy"] = "finalization_retry"
     elif session_status != "success":

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

@@ -37,7 +37,6 @@ 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
 ```
 
 ---
@@ -72,7 +71,7 @@ If MISSING — build it now:
    - **Section 1 — Feature Brief**: feature description + acceptance criteria (copy from above)
    - **Section 2 — Project Structure**: output of relevant `ls src/` calls
    - **Section 3 — Prizm Context**: content of root.prizm and relevant L1/L2 docs
-   - **Section 4 — Existing Source Files**: full content of each related file as code block
+   - **Section 4 — Existing Source Files**: **full verbatim content** of each related file in fenced code blocks (with `### path/to/file` heading and line count). Include ALL files needed for implementation and review — downstream phases read this section instead of re-reading individual source files
    - **Section 5 — Existing Tests**: full content of related test files as code block
 
 ### Phase 2: Plan & Tasks
@@ -81,7 +80,7 @@ If MISSING — build it now:
 ls .prizmkit/specs/{{FEATURE_SLUG}}/ 2>/dev/null
 ```
 
-If plan.md or tasks.md missing, write them directly (no PM needed):
+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
 
@@ -111,33 +110,20 @@ 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
-- Mark feature complete:
-  ```bash
-  python3 {{VALIDATOR_SCRIPTS_DIR}}/update-feature-status.py \
-    --feature-list "{{FEATURE_LIST_PATH}}" \
-    --state-dir "{{PROJECT_ROOT}}/dev-pipeline/state" \
-    --feature-id "{{FEATURE_ID}}" --session-id "{{SESSION_ID}}" --action complete
-  ```
 - 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.
 
 ---
 
@@ -180,11 +166,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

@@ -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. You may spawn agents directly via the Task tool or use TeamCreate for coordination — choose based on the situation.
 
 ### Feature Description
 
@@ -37,7 +37,6 @@ 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
 ```
 
 **`context-snapshot.md`** is the shared knowledge base. You write it once; Dev and Reviewer read it instead of re-scanning individual files.
@@ -83,7 +82,7 @@ If MISSING — build it now:
    - **Section 1 — Feature Brief**: feature description + acceptance criteria (copy from above)
    - **Section 2 — Project Structure**: relevant `ls src/` output
    - **Section 3 — Prizm Context**: full content of root.prizm and relevant L1/L2 docs
-   - **Section 4 — Existing Source Files**: full content of each related file as code block
+   - **Section 4 — Existing Source Files**: **full verbatim content** of each related file in fenced code blocks (with `### path/to/file` heading and line count). Include ALL files needed for implementation and review — downstream subagents read this section instead of re-reading individual source files
    - **Section 5 — Existing Tests**: full content of related test files as code blocks
 
 ### Phase 2: Plan & Tasks (you, the orchestrator)
@@ -138,33 +137,20 @@ Wait for Reviewer to return.
 
 **CP-2**: Tests pass, verdict is not NEEDS_FIXES.
 
-### 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
-- Mark feature complete:
-  ```bash
-  python3 {{VALIDATOR_SCRIPTS_DIR}}/update-feature-status.py \
-    --feature-list "{{FEATURE_LIST_PATH}}" \
-    --state-dir "{{PROJECT_ROOT}}/dev-pipeline/state" \
-    --feature-id "{{FEATURE_ID}}" --session-id "{{SESSION_ID}}" --action complete
-  ```
 - 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.
 
 ---
 
@@ -207,11 +193,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.
@@ -229,7 +215,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 Task spawn or TeamCreate as appropriate
 - 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