prizmkit 1.0.35 → 1.0.58

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.35",
-  "bundledAt": "2026-03-17T13:12:38.845Z",
-  "bundledFrom": "2597a15"
+  "frameworkVersion": "1.0.58",
+  "bundledAt": "2026-03-19T03:51:21.257Z",
+  "bundledFrom": "ce2eaa5"
 }

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

@@ -65,7 +65,8 @@ export function convertAgent(agentContent, options = {}) {
     'run `/$1` command'
   );
 
-  // Replace prizmkit.xxx shorthand with /prizmkit-xxx
+  // Legacy fallback: replace any remaining prizmkit.xxx shorthand with /prizmkit-xxx
+  // Core files now use /prizmkit-xxx natively, but this catches any stragglers
   convertedBody = convertedBody.replace(
     /prizmkit\.(\w+)/g,
     (match, sub) => `/prizmkit-${sub.replace(/_/g, '-')}`

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

@@ -56,7 +56,7 @@ export function convertSkillToCommand(skillContent, skillName) {
   const { frontmatter, body } = parseFrontmatter(skillContent);
 
   // Claude Code command frontmatter only uses description
-  // Also convert prizmkit.xxx references in the description field
+  // 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,13 +74,14 @@ export function convertSkillToCommand(skillContent, skillName) {
     `.claude/command-assets/${skillName}`
   );
 
-  // Replace "invoke the X skill" or "prizmkit.X" patterns with /X slash command
+  // 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'
   );
 
-  // Replace prizmkit.xxx with /prizmkit-xxx for Claude Code
+  // Legacy fallback: replace any remaining prizmkit.xxx with /prizmkit-xxx for Claude Code
+  // Core files now use /prizmkit-xxx natively, but this catches any stragglers
   convertedBody = convertedBody.replace(
     /prizmkit\.(\w+)/g,
     (_match, sub) => {

package/bundled/agents/prizm-dev-team-dev.md

@@ -18,7 +18,7 @@ skills: prizmkit-implement, prizmkit-prizm-docs
 
 ### 项目上下文
 
-项目文档在 `.prizm-docs/`。实现前先读 `root.prizm` 了解规则和已知陷阱（TRAPS），修改某模块时读该模块的文档。
+项目文档在 `.prizm-docs/`。实现前先读 `context-snapshot.md`（若存在于 `.prizmkit/specs/###-feature-name/`），其 Section 3 含 Prizm Context、Section 4 含源文件，无需再读 `.prizm-docs/` 或原始源文件。若 snapshot 不存在，则读 `root.prizm` 了解规则和已知陷阱（TRAPS），修改某模块时读该模块的文档。
 
 ### 制品路径
 
@@ -32,22 +32,22 @@ skills: prizmkit-implement, prizmkit-prizm-docs
 1. 按照分配的任务和 plan.md 中的接口设计实现功能模块
 2. 遵循 TDD 方式：先写测试，再实现，再验证
 3. 产出的代码必须通过本模块的单元测试
-4. 发现接口设计歧义时，立即通过 Coordinator 上报 PM（不自行假设）
+4. 发现接口设计歧义时，立即上报给 Orchestrator（不自行假设）
 5. 遵循 `/prizmkit-implement` 工作流：读取 plan.md（含 Tasks section）+ spec.md，逐任务实现
 6. 每个任务完成后**立即**标记 plan.md Tasks section 中的 `[x]`（不批量标记）
-7. 实现前读取 `.prizm-docs/` TRAPS 段避免已知陷阱
+7. 实现前读取 TRAPS 段避免已知陷阱：优先从 `context-snapshot.md` Section 3 获取，若 snapshot 不存在则读 `.prizm-docs/`
 8. 检查点任务须验证构建通过和测试通过后才能继续下一阶段
 9. 顺序任务按序执行，失败则停止；并行 `[P]` 任务可继续
 10. 新建子模块时，生成对应的 `.prizm-docs/` L2 文档
 
 ### 绝不做 (NEVER)
 
-- 不修改 plan.md 中的接口设计（修改需通过 PM）
+- 不修改 plan.md 中的接口设计（修改需通过 Orchestrator）
 - 不修改其他 Dev Agent 负责的模块代码
 - 不进行集成测试（Reviewer 的职责）
 - **不执行任何 git 操作**（git commit / git add / git reset / git push 均禁止 — 由 Orchestrator 通过 /prizmkit-committer 统一提交）
 - 不修改 `.prizmkit/specs/` 中除 `plan.md`（标记 Tasks section [x]）以外的任何文件
-- 不为 bug 修复创建新的文档条目；bug 修复是现有功能的完善，应更新原始功能的文档而非在 REGISTRY.md 中创建新条目
+- 不为 bug 修复创建新的文档条目；bug 修复是现有功能的完善，应更新原始功能的文档
 - 不使用 TaskCreate/TaskUpdate 创建或修改 Orchestrator 层的任务（Task 工具仅用于内部进度追踪，且任务 ID 在各 agent 子会话中互不共享）
 
 ### 行为规则
@@ -62,7 +62,7 @@ DEV-06: 不得引入未在任务描述中声明的外部依赖
 DEV-07: 遵循 /prizmkit-implement 工作流
 DEV-08: 每个任务完成后立即标记 plan.md Tasks section [x]
 DEV-09: TDD：先写测试 → 再实现 → 再验证
-DEV-10: 实现每个模块前必须读取 .prizm-docs/ TRAPS 段
+DEV-10: 实现每个模块前必须读取 TRAPS 段：优先从 context-snapshot.md Section 3 获取，无 snapshot 时读 .prizm-docs/
 DEV-11: 检查点任务必须验证构建通过和测试通过
 DEV-12: 新建子模块时生成 L2 .prizm-docs/ 文档
 DEV-13: 禁止执行任何 git 命令（git add/commit/reset/push 全部禁止）
@@ -72,13 +72,13 @@ DEV-14: 若 `npm test` 中存在 pre-existing 失败，不得忽略——必须
 ### 工作流程
 
 1. 接收任务分配
-2. 读取 `.prizm-docs/root.prizm` 和相关模块文档
+2. 读取 `.prizmkit/specs/###-feature-name/context-snapshot.md`（若存在）——Section 3 含 Prizm Context，Section 4 含源文件。若 snapshot 不存在，则读取 `.prizm-docs/root.prizm` 和相关模块文档
 3. 读取 `.prizmkit/specs/###-feature-name/` 中的 `plan.md`（含 Tasks section）、`spec.md`
 4. 对每个分配的任务，按 plan.md Tasks 顺序执行：
-   a. 读取目标文件模块的文档（检查 TRAPS 和 DECISIONS）
+   a. 从 context-snapshot.md 获取目标文件上下文和 TRAPS（若无 snapshot 则读取目标文件模块的文档）
    b. TDD：基于验收标准编写测试 → 实现功能代码 → 运行测试验证
    c. 在 plan.md Tasks section 中标记该任务为 `[x]`
-   d. 发送 STATUS_UPDATE 给 Coordinator
+   d. 发送 STATUS_UPDATE 给 Orchestrator
 5. 如遇检查点任务，验证构建通过和测试通过后才继续
 6. 遇到接口设计歧义，发送 ESCALATION（不自行假设）
 7. 如新建了子模块，生成对应 `.prizm-docs/` L2 文档
@@ -88,14 +88,14 @@ DEV-14: 若 `npm test` 中存在 pre-existing 失败，不得忽略——必须
 
 | 场景 | 策略 |
 |------|------|
-| 接口设计歧义 | 标记 BLOCKED → ESCALATION → 等待 PM 裁定 |
+| 接口设计歧义 | 标记 BLOCKED → ESCALATION → 等待 Orchestrator 裁定 |
 | 单元测试失败 | 最多重试修复 3 次 → 仍失败则 ISSUE_REPORT |
 | 外部依赖不可用 | 使用 Mock → 标注说明 |
-| 任务超出预估 | ESCALATION → 建议 PM 拆分任务 |
+| 任务超出预估 | ESCALATION → 建议 Orchestrator 拆分任务 |
 
 ### 通信规则
 
-允许 Agent 之间直接通信，但关键消息和结论必须通知 Coordinator。
+允许 Agent 之间直接通信，但关键消息和结论必须通知 Orchestrator。
 - 发送 STATUS_UPDATE 汇报每个子任务完成
 - 发送 COMPLETION_SIGNAL 标志所有任务完成
 - 发送 ESCALATION 上报接口歧义或任务阻塞

package/bundled/agents/prizm-dev-team-reviewer.md

@@ -16,7 +16,7 @@ skills: prizmkit-code-review, prizmkit-analyze, prizmkit-prizm-docs
 
 ### 项目上下文
 
-项目文档在 `.prizm-docs/`。审查前先读 `root.prizm` 了解项目规则（RULES）、模式（PATTERNS）和已知陷阱（TRAPS），需要时读取模块级文档。
+项目文档在 `.prizm-docs/`。审查前先读 `context-snapshot.md`（若存在于 `.prizmkit/specs/###-feature-name/`），其 Section 3 含 Prizm Context（RULES、PATTERNS、TRAPS），无需再读 `.prizm-docs/` 或原始源文件。若 snapshot 不存在，则读 `root.prizm` 了解项目规则（RULES）、模式（PATTERNS）和已知陷阱（TRAPS），需要时读取模块级文档。
 
 ### 制品路径
 
@@ -40,8 +40,8 @@ skills: prizmkit-code-review, prizmkit-analyze, prizmkit-prizm-docs
 ### 绝不做 (NEVER)
 
 - 不编写实现代码（Dev 的职责）
-- 不分解任务（PM 的职责）
-- 不进行任务调度（Coordinator 的职责）
+- 不分解任务（Orchestrator 的职责）
+- 不进行任务调度（Orchestrator 的职责）
 - **不执行任何 git 操作**（git commit / git add / git reset / git push 均禁止）
 - 不使用 TaskCreate/TaskUpdate 创建或修改 Orchestrator 层的任务（Task 工具仅用于内部进度追踪，且任务 ID 在各 agent 子会话中互不共享）
 
@@ -62,21 +62,21 @@ REV-10: 禁止使用 timeout 命令（macOS 不兼容）。运行测试时直接
 
 ### Phase 4 工作流程：交叉校验
 
-**前置条件**: PM 已完成 spec.md / plan.md（含 Tasks section）
+**前置条件**: Orchestrator 已完成 spec.md / plan.md（含 Tasks section）
 
 1. 调用 `/prizmkit-analyze` skill（**不是 CLI 命令**，使用 Skill 工具或 `/prizmkit-analyze` 指令调用）
    - 输入: spec.md, plan.md（含 Tasks section）
    - 6 个检测通道: 重复检测、歧义检测、不完整检测、Prizm 规则对齐、覆盖缺口、不一致性
    - 输出: 一致性分析报告（仅对话输出）
    - 若 Skill 工具不可用，则根据 6 个检测通道手动执行交叉一致性分析
-2. 如发现 CRITICAL 问题，报告给 Coordinator 退回 PM 修复
+2. 如发现 CRITICAL 问题，报告给 Orchestrator 退回修复
 3. 发送 COMPLETION_SIGNAL（含分析结果）
 
 ### Phase 6 工作流程：评审
 
 **前置条件**: Dev 已完成实现，所有任务标记 `[x]`
 
-1. 读取 `.prizm-docs/root.prizm`，重点关注 RULES 和 PATTERNS
+1. 读取 `context-snapshot.md`（若存在），其 Section 3 含 RULES 和 PATTERNS。若 snapshot 不存在，则读 `.prizm-docs/root.prizm`
 2. 运行 `/prizmkit-code-review`（只读）
    - 6 个审查维度: 规格符合度、计划遵循度、代码质量、安全性、一致性、测试覆盖
    - 判定: PASS | PASS WITH WARNINGS | NEEDS FIXES
@@ -109,15 +109,15 @@ REV-10: 禁止使用 timeout 命令（macOS 不兼容）。运行测试时直接
 
 | 场景 | 策略 |
 |------|------|
-| analyze 发现 CRITICAL | 报告 Coordinator → 退回 PM 修复 |
-| code-review 发现 CRITICAL | 报告 Coordinator → 退回 Dev 修复 |
-| 集成测试失败 | 分类严重级别 → ISSUE_REPORT → Coordinator 派发给 Dev |
+| analyze 发现 CRITICAL | 报告 Orchestrator → 退回修复 |
+| code-review 发现 CRITICAL | 报告 Orchestrator → 退回 Dev 修复 |
+| 集成测试失败 | 分类严重级别 → ISSUE_REPORT → Orchestrator 派发给 Dev |
 | 审查发现超过 30 个 | 只保留最严重的 30 个 |
 | Prizm RULES 违规 | 自动标记为 CRITICAL |
 
 ### 通信规则
 
-允许 Agent 之间直接通信，但关键消息和结论必须通知 Coordinator。
+允许 Agent 之间直接通信，但关键消息和结论必须通知 Orchestrator。
 - 发送 COMPLETION_SIGNAL（含判定结果）标志完成
 - 发送 ISSUE_REPORT 报告 CRITICAL 发现
 - 接收 TASK_ASSIGNMENT 获取分配的工作

package/bundled/dev-pipeline/README.md

@@ -221,12 +221,9 @@ run.sh main loop
   ├─ AI CLI session            # cbc --print -y < prompt (CodeBuddy)
   │   │                        # claude --print -p "$(cat prompt)" --yes (Claude Code)
   │   └─ prizm-dev-team       # Multi-agent team implements the feature
-  │       ├─ Coordinator      # Orchestrates the 10-phase pipeline
-  │       ├─ PM               # Phase 1-4: specify → plan → tasks → analyze
-  │       ├─ Dev x N           # Phase 6: implement with TDD
-  │       ├─ QA               # Phase 7: integration tests + code review
-  │       ├─ Review           # Phase 7: code consistency audit
-  │       └─ Coordinator      # Phase 9: summarize → commit → retrospective
+  │       ├─ Orchestrator    # Main agent: init, plan, schedule, retrospective, commit
+  │       ├─ Dev x N          # Implementation with TDD
+  │       └─ Reviewer        # Analyze + code review
   │
   ├─ check-session-status.py  # Parse session outcome
   ├─ update-feature-status.py # Update feature state (completed/failed/retry)
@@ -238,19 +235,19 @@ run.sh main loop
 
 Each AI CLI session drives the prizm-dev-team through these phases. **All phases are mandatory** — the bootstrap prompt enforces sequential execution.
 
-> **Note**: The Coordinator Agent definition describes a simplified **8-phase** view (Phase 0-7) where Phases 1-3 and Phase 5 are consolidated. The bootstrap prompt adapts these phases based on complexity mode (lite/standard/full). The 10-phase breakdown below is the most granular view for pipeline monitoring.
+> **Note**: The bootstrap prompt adapts these phases based on complexity mode (lite/standard/full). The 10-phase breakdown below is the most granular view for pipeline monitoring.
 
 | Phase | Name | Agent | PrizmKit Skills | Artifacts |
 |-------|------|-------|----------------|-----------|
-| 0 | Init | Coordinator | `prizmkit-init` | `.prizm-docs/root.prizm`, `.prizmkit/config.json` |
-| 1 | Specify | PM | `prizmkit-specify`, `prizmkit-clarify` | `.prizmkit/specs/spec.md` |
-| 2 | Plan + Tasks | PM | `prizmkit-plan` | `.prizmkit/specs/plan.md` (含 Tasks section) |
-| 3 | Analyze | PM | `prizmkit-analyze` | Analysis report (no CRITICAL issues) |
-| 4 | Schedule | Coordinator | — | TaskList entries assigned |
+| 0 | Init | Orchestrator | `prizmkit-init` | `.prizm-docs/root.prizm`, `.prizmkit/config.json` |
+| 1 | Specify | Orchestrator | `prizmkit-specify`, `prizmkit-clarify` | `.prizmkit/specs/spec.md` |
+| 2 | Plan + Tasks | Orchestrator | `prizmkit-plan` | `.prizmkit/specs/plan.md` (含 Tasks section) |
+| 3 | Analyze | Reviewer | `prizmkit-analyze` | Analysis report (no CRITICAL issues) |
+| 4 | Schedule | Orchestrator | — | TaskList entries assigned |
 | 5 | Implement | Dev x N | `prizmkit-implement` | Code + tests, plan.md Tasks marked `[x]` |
-| 6 | Review | QA + Review | `prizmkit-code-review` | Integration tests, review report |
+| 6 | Review | Reviewer | `prizmkit-code-review` | Integration tests, review report |
 | 7 | Fix Loop | Dev | — | Max 3 rounds of fixes |
-| 8 | Summarize & Commit | Coordinator | `prizmkit-summarize`, `prizmkit-committer`, `prizmkit-retrospective` | REGISTRY.md, git commit, .prizm-docs/ updated |
+| 8 | Retrospective & Commit | Orchestrator | `prizmkit-retrospective`, `prizmkit-committer` | .prizm-docs/ synced + enriched, git commit |
 
 ### Feature Dependency Resolution
 
@@ -386,7 +383,6 @@ Each feature generates artifacts in a dedicated subdirectory under `.prizmkit/sp
 .prizmkit/
 ├── config.json                          # PrizmKit configuration
 └── specs/
-    ├── REGISTRY.md                      # Feature registry (Phase 9 appends here)
     ├── 001-project-infrastructure-setup/
     │   ├── spec.md                      # Phase 1: Feature specification
     │   ├── checklists/
@@ -461,7 +457,7 @@ The pipeline expects:
 
 | Resource | Location | Description |
 |----------|----------|-------------|
-| Agent Definitions | `.codebuddy/agents/prizm-dev-team-*.md` | 4 agent types: coordinator, pm, dev, reviewer |
+| Agent Definitions | `.codebuddy/agents/prizm-dev-team-*.md` | 2 agent types: dev, reviewer |
 | Team Config | `~/.codebuddy/teams/prizm-dev-team/config.json` | Team runtime configuration |
 | Team Inboxes | `~/.codebuddy/teams/prizm-dev-team/inboxes/` | Agent message inboxes |
 
@@ -469,7 +465,7 @@ The pipeline expects:
 
 | Resource | Location | Description |
 |----------|----------|-------------|
-| Agent Definitions | `.claude/agents/prizm-dev-team-*.md` | 4 agent types: coordinator, pm, dev, reviewer |
+| Agent Definitions | `.claude/agents/prizm-dev-team-*.md` | 2 agent types: dev, reviewer |
 | Team Config | `.claude/team-info.json` | Team runtime configuration (project-level) |
 
 The `generate-bootstrap-prompt.py` script resolves these paths automatically. If paths are incorrect, check the `build_replacements()` function in that script.
@@ -576,8 +572,8 @@ dev-pipeline/bugfix-state/        # Runtime state (gitignored)
 | State dir | `state/` | N/A (in-session) | `bugfix-state/` |
 | 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 | Coordinator + PM + Dev + Reviewer | Dev + Reviewer only | Dev + Reviewer only |
-| Artifacts | spec.md, plan.md, tasks.md, REGISTRY.md | refactor-analysis.md, plan.md, tasks.md | fix-plan.md, fix-report.md only |
+| 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 |
 | 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

@@ -13,18 +13,14 @@ dev-pipeline (outer loop)
     ├── scripts/                  Python state management scripts
     ├── templates/bootstrap-prompt.md  Session prompt template
     │
-    └── [per session] CodeBuddy CLI
+    └── [per session] AI CLI
             │
-            ├── TeamCreate("prizm-dev-team-F-NNN")
-            ├── Spawn Coordinator agent
-            │       │
-            │       ├── Phase 0: Init
-            │       ├── Phase 1-4: PM (specify/plan/tasks/analyze)
-            │       ├── Phase 5: Schedule & Assign
-            │       ├── Phase 6: Dev x N (parallel implement)
-            │       ├── Phase 7: QA + Review (parallel)
-            │       ├── Phase 8: Fix Loop (max 3 rounds)
-            │       └── Phase 9: Summarize & Commit
+            ├── 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)
             │
             └── Write session-status.json → exit
 ```
@@ -33,16 +29,14 @@ dev-pipeline (outer loop)
 
 | Agent | Definition Path | Type |
 |-------|----------------|------|
-| Coordinator | `agent-team-master/prizm-dev-team/prizm-dev-team-coordinator/subagent.md` | prizm-dev-team-coordinator |
-| PM | `agent-team-master/prizm-dev-team/prizm-dev-team-pm/subagent.md` | prizm-dev-team-pm |
-| Dev | `agent-team-master/prizm-dev-team/prizm-dev-team-dev/subagent.md` | prizm-dev-team-dev |
-| QA | `agent-team-master/prizm-dev-team/prizm-dev-team-qa/subagent.md` | prizm-dev-team-qa |
-| Review | `agent-team-master/prizm-dev-team/prizm-dev-team-review/subagent.md` | prizm-dev-team-review |
-| Doc-Reader | `agent-team-master/prizm-dev-team/prizm-dev-team-doc-reader/subagent.md` | prizm-dev-team-doc-reader |
+| Dev | `core/agents/prizm-dev-team-dev.md` | prizm-dev-team-dev |
+| Reviewer | `core/agents/prizm-dev-team-reviewer.md` | prizm-dev-team-reviewer |
+
+Note: The Orchestrator role is handled by the main agent (session orchestrator) directly — no separate agent definition needed.
 
 ## Validator Scripts
 
-Located at `agent-team-master/prizm-dev-team/prizm-dev-team-coordinator/scripts/`:
+Located at `dev-pipeline/scripts/`:
 
 | Script | Checkpoint | Purpose |
 |--------|-----------|---------|
@@ -62,7 +56,6 @@ Located at `agent-team-master/prizm-dev-team/prizm-dev-team-coordinator/scripts/
 | 2 | `plans/plan.md` | Technical plan (architecture, API, tests) |
 | 3 | `tasks/tasks.md` | Executable task list with `[ ]` / `[x]` |
 | 4 | `analysis/analyze-report.md` | Consistency analysis |
-| 9 | `specs/REGISTRY.md` | Completed features archive |
 
 ### Dev-Team Artifacts (.dev-team/)
 
@@ -82,13 +75,13 @@ Located at `agent-team-master/prizm-dev-team/prizm-dev-team-coordinator/scripts/
 ### 1. Session Start
 
 The bootstrap prompt instructs the agent to:
-- Create a team named `prizm-dev-team-{FEATURE_ID}`
-- Spawn the Coordinator with the full subagent.md prompt
-- Coordinator then spawns PM, Dev, QA, Review as needed
+- Execute phases directly as the session orchestrator
+- Spawn Dev and Reviewer agents as subagents for implementation and review phases
+- The orchestrator handles context building, planning, retrospective, and commit phases directly
 
 ### 2. Pipeline Execution
 
-The Coordinator drives the 10-phase pipeline with 8 checkpoints (CP-0 through CP-7). Each checkpoint validates artifacts using the validator scripts.
+The Orchestrator drives the pipeline phases with checkpoints (CP-0 through CP-3). Each checkpoint validates artifacts.
 
 ### 3. Session End
 

package/bundled/dev-pipeline/launch-bugfix-daemon.sh

@@ -430,6 +430,14 @@ Examples:
   ./launch-bugfix-daemon.sh logs --follow                 # Live log tailing
   ./launch-bugfix-daemon.sh stop                          # Graceful shutdown
   ./launch-bugfix-daemon.sh restart                       # Stop + start
+
+Environment Variables (pass via --env):
+  MAX_RETRIES           Max retries per bug (default: 3)
+  SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
+  VERBOSE               Set to 1 for verbose AI CLI output
+  HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)
+  DEV_BRANCH            Custom dev branch name (default: auto-generated)
+  AUTO_PUSH             Auto-push to remote after successful bug fix (default: 0, set 1 to enable)
 HELP
 }
 

package/bundled/dev-pipeline/launch-daemon.sh

@@ -576,6 +576,8 @@ Environment Variables (pass via --env):
   SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
   VERBOSE               Set to 1 for verbose AI CLI output
   HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)
+  DEV_BRANCH            Custom dev branch name (default: auto-generated)
+  AUTO_PUSH             Auto-push to remote after successful feature (default: 0, set 1 to enable)
 HELP
 }
 

package/bundled/dev-pipeline/lib/branch.sh

@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+# ============================================================
+# dev-pipeline/lib/branch.sh - Git Branch Lifecycle Library
+#
+# Shared by run.sh and run-bugfix.sh for branch-based serial
+# development. Each pipeline run creates a dev branch and all
+# features/bugs commit directly on it in sequence.
+#
+# Functions:
+#   branch_create  — Create and checkout a new branch
+#   branch_return  — Checkout back to original branch
+#
+# Environment:
+#   DEV_BRANCH    — Optional custom branch name override
+#   AUTO_PUSH     — Set to 1 to auto-push after successful feature
+# ============================================================
+
+# branch_create <project_root> <branch_name> <source_branch>
+#
+# Creates a new branch from source_branch and checks it out.
+# If the branch already exists, checks it out instead.
+#
+# Returns 0 on success, 1 on failure.
+branch_create() {
+    local project_root="$1"
+    local branch_name="$2"
+    local source_branch="$3"
+
+    # Check if branch already exists
+    if git -C "$project_root" rev-parse --verify "$branch_name" >/dev/null 2>&1; then
+        log_info "Branch already exists: $branch_name — checking out"
+        if ! git -C "$project_root" checkout "$branch_name" 2>/dev/null; then
+            log_error "Failed to checkout existing branch: $branch_name"
+            return 1
+        fi
+        return 0
+    fi
+
+    # Create and checkout new branch
+    if ! git -C "$project_root" checkout -b "$branch_name" "$source_branch" 2>/dev/null; then
+        log_error "Failed to create branch: $branch_name from $source_branch"
+        return 1
+    fi
+
+    log_info "Created and checked out branch: $branch_name (from $source_branch)"
+    return 0
+}
+
+# branch_return <project_root> <original_branch>
+#
+# Checks out the original branch after pipeline completes.
+# Safe to call even if already on the original branch.
+#
+# Returns 0 on success, 1 on failure.
+branch_return() {
+    local project_root="$1"
+    local original_branch="$2"
+
+    local current_branch
+    current_branch=$(git -C "$project_root" rev-parse --abbrev-ref HEAD 2>/dev/null) || {
+        log_error "Failed to determine current branch"
+        return 1
+    }
+
+    if [[ "$current_branch" == "$original_branch" ]]; then
+        return 0
+    fi
+
+    if ! git -C "$project_root" checkout "$original_branch" 2>/dev/null; then
+        log_error "Failed to checkout original branch: $original_branch"
+        return 1
+    fi
+
+    log_info "Returned to branch: $original_branch"
+    return 0
+}

package/bundled/dev-pipeline/retry-bug.sh

@@ -232,17 +232,20 @@ if [[ -n "${MODEL:-}" ]]; then
     MODEL_FLAG="--model $MODEL"
 fi
 
+unset CLAUDECODE 2>/dev/null || true
+
 case "$CLI_CMD" in
     *claude*)
+        # Claude Code: prompt via -p argument, --dangerously-skip-permissions for auto-accept
         "$CLI_CMD" \
-            --print \
             -p "$(cat "$BOOTSTRAP_PROMPT")" \
-            --yes \
+            --dangerously-skip-permissions \
             $STREAM_JSON_FLAG \
             $MODEL_FLAG \
             > "$SESSION_LOG" 2>&1 &
         ;;
     *)
+        # CodeBuddy (cbc) and others: prompt via stdin
         "$CLI_CMD" \
             --print \
             -y \

package/bundled/dev-pipeline/retry-feature.sh

@@ -233,17 +233,20 @@ if [[ -n "${MODEL:-}" ]]; then
     MODEL_FLAG="--model $MODEL"
 fi
 
+unset CLAUDECODE 2>/dev/null || true
+
 case "$CLI_CMD" in
     *claude*)
+        # Claude Code: prompt via -p argument, --dangerously-skip-permissions for auto-accept
         "$CLI_CMD" \
-            --print \
             -p "$(cat "$BOOTSTRAP_PROMPT")" \
-            --yes \
+            --dangerously-skip-permissions \
             $STREAM_JSON_FLAG \
             $MODEL_FLAG \
             > "$SESSION_LOG" 2>&1 &
         ;;
     *)
+        # CodeBuddy (cbc) and others: prompt via stdin
         "$CLI_CMD" \
             --print \
             -y \

package/bundled/dev-pipeline/run-bugfix.sh

@@ -25,6 +25,8 @@ set -euo pipefail
 #   LOG_CLEANUP_ENABLED   Run periodic log cleanup (default: 1)
 #   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)
+#   DEV_BRANCH            Custom dev branch name (default: auto-generated bugfix/pipeline-{run_id})
+#   AUTO_PUSH             Auto-push to remote after successful bug fix (default: 0). Set to 1 to enable.
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -40,6 +42,8 @@ LOG_CLEANUP_ENABLED=${LOG_CLEANUP_ENABLED:-1}
 LOG_RETENTION_DAYS=${LOG_RETENTION_DAYS:-14}
 LOG_MAX_TOTAL_MB=${LOG_MAX_TOTAL_MB:-1024}
 VERBOSE=${VERBOSE:-0}
+DEV_BRANCH=${DEV_BRANCH:-""}
+AUTO_PUSH=${AUTO_PUSH:-0}
 
 # Source shared common helpers (CLI/platform detection + logs + deps)
 source "$SCRIPT_DIR/lib/common.sh"
@@ -48,12 +52,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"
 
 # Bug list path (set in main, used by cleanup trap)
 BUG_LIST=""
 
+# Branch tracking (for cleanup on interrupt)
+_ORIGINAL_BRANCH=""
+_DEV_BRANCH_NAME=""
+
 # ============================================================
 # Shared: Spawn AI CLI session and wait for result
 # ============================================================
@@ -206,6 +217,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 "$BUG_LIST" && -f "$BUG_LIST" ]]; then
         python3 "$SCRIPTS_DIR/update-bug-status.py" \
             --bug-list "$BUG_LIST" \
@@ -386,17 +403,44 @@ sys.exit(1)
         echo ""
         log_warn "Interrupted. Killing session..."
         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_bug SIGINT SIGTERM
 
     _SPAWN_RESULT=""
+
+    # Branch lifecycle: create and checkout bugfix 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:-bugfix/${bug_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 \
         "$bug_id" "$bug_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
         log_success "════════════════════════════════════════════════════"
@@ -472,6 +516,23 @@ main() {
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
     echo ""
 
+    # Branch lifecycle: create bugfix 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:-bugfix/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 bugfix branch; running on current branch: $_source_branch"
+    fi
+
     local session_count=0
 
     while true; do
@@ -488,6 +549,10 @@ main() {
             log_success "════════════════════════════════════════════════════"
             log_success "  All bugs processed! Bug fix 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
@@ -557,10 +622,19 @@ os.replace(tmp, target)
         # Spawn session
         log_info "Spawning AI CLI session: $session_id"
         _SPAWN_RESULT=""
+
         spawn_and_wait_session \
             "$bug_id" "$bug_list" "$session_id" \
             "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
 
+        # Auto-push after successful session
+        if [[ "$_SPAWN_RESULT" == "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))
 
         log_info "Pausing 5s before next bug..."