@coralai/sps-cli 0.23.15 → 0.23.17

package/README.md

@@ -4,14 +4,16 @@
 
 > **中文文档**: See `README-CN.md` in the source repository for Chinese documentation.
 
-**v0.23.14**
+**v0.23.17**
 
 SPS (Smart Pipeline System) is a fully automated development pipeline CLI tool driven by AI Agents. From task card creation to code merging, the entire process runs unattended.
 
 ```
-Create cards -> Start pipeline -> AI auto-codes -> Serial merge queue -> Notify completion
+Create cards -> Start pipeline -> Development worker completes branch work -> QA worker integrates branch -> Notify completion
 ```
 
+Current design direction: SPS is converging on a worker-owned two-phase execution model. `Inprogress` is the development phase, `QA` is the integration/merge phase, and label-driven skill profile injection remains part of worker prompt construction. `v0.23.16` added per-worktree `.sps/development_prompt.txt` and `.sps/integration_prompt.txt`, plus phase-aware recovery prompt selection. `v0.23.17` moves the main integration path into the `QA` worker phase: development completion hands tasks to QA, and QA now launches or resumes an integration worker instead of relying on a fixed merge script as the primary path.
+
 ## Table of Contents
 
 - [Installation](#installation)
@@ -108,20 +110,21 @@ Each task card progresses through the following state machine, fully driven by S
 
 ### MR_MODE=none (Default, Recommended)
 
-After completing coding, the Worker pushes the feature branch. SPS then serializes final integration to the target branch, skipping MR/CI/QA stages:
+The main path is now a worker-owned two-phase flow:
 
 ```
-Planning -> Backlog -> Todo -> Inprogress -> Done
+Planning -> Backlog -> Todo -> Inprogress -> QA -> Done
 ```
 
 | Phase | Trigger Engine | Action |
 |-------|---------------|--------|
 | Planning -> Backlog | SchedulerEngine | Select card for queue, check admission criteria |
-| Backlog -> Todo | ExecutionEngine | Create branch, create worktree, generate fallback `.sps/merge.sh` |
-| Todo -> Inprogress | ExecutionEngine | Assign Worker slot, build task context, launch AI Worker |
-| Inprogress -> Done | PostActions + MergeMutex | Detect Worker completion, serialize merge to target branch, release resources, clean up worktree |
+| Backlog -> Todo | ExecutionEngine | Create branch, create worktree, generate phase prompts |
+| Todo -> Inprogress | ExecutionEngine | Assign Worker slot, launch development worker |
+| Inprogress -> QA | PostActions | Detect development completion, release slot, move card to QA |
+| QA -> Done | CloseoutEngine | Launch/resume integration worker, verify merge evidence, release resources, clean up worktree |
 
-The Worker no longer executes `.sps/merge.sh` as the normal path. In `MR_MODE=none`, the Worker commits and pushes the feature branch, then SPS closeout performs a serialized merge. Final integration now runs inside a temporary detached merge worktree, which avoids `main already used by worktree` failures and keeps the user's main checkout untouched. `.sps/merge.sh` remains only as a manual fallback. See `docs/design/10-acp-worker-runtime-design.md` for the persistent Agent transport model, the full worker state breakdown, and the local same-user OAuth reuse boundary. See `docs/design/11-runtime-state-authority-and-recovery-redesign.md` for the redesign that demotes `state.json` / `acp-state.json` to projections and re-centers recovery around PM state plus worktree/git evidence. See `docs/design/12-unified-runtime-state-machine.md` for the next-step module cleanup plan that converges `Execution`, `Recovery`, `Monitor`, `Closeout`, and `PostActions` into one state machine authority plus a single runtime coordinator/write path.
+In this model, the development worker stops at “implementation complete and committed on the task branch”. The QA worker owns integration: it must inspect the current worktree, rebase/merge the task branch back into the target branch, resolve conflicts, and finish the integration. `.sps/merge.sh` remains only as a legacy/manual fallback while the old merge helpers are being removed. See `docs/design/10-acp-worker-runtime-design.md` for the persistent Agent transport model, the full worker state breakdown, and the local same-user OAuth reuse boundary. See `docs/design/11-runtime-state-authority-and-recovery-redesign.md` for the redesign that demotes `state.json` / `acp-state.json` to projections and re-centers recovery around PM state plus worktree/git evidence. See `docs/design/12-unified-runtime-state-machine.md` for the next-step module cleanup plan that converges `Execution`, `Recovery`, `Monitor`, `Closeout`, and `PostActions` into one state machine authority plus a single runtime coordinator/write path.
 
 PTY transport now extends the same session/run model into the default CLI-backed worker path, but the restart boundary is now explicit. Within a running `tick` process, `WORKER_TRANSPORT=pty` still uses `sessionId/runId` for retries and conflict follow-up runs. Across a `tick` restart, SPS no longer pretends it can recover the old PTY session; it recovers the task from `TaskLease + WorktreeEvidence`, judges completion from git/worktree evidence first, and starts a fresh PTY run in the same worktree only if work remains. `WORKER_TRANSPORT=acp` still keeps its session-based model. The PTY hardening sequence remains: v0.23.5 upgrades `node-pty` to a macOS-safe build, auto-restores missing execute permissions on `spawn-helper`, and auto-skips the benign Codex update notice during PTY boot so `ensureSession()` can reach `ready`; v0.23.6 fixes PTY run lifecycle tracking so newly submitted conflict-resolution runs no longer get marked `completed` during the first inspect cycle before the CLI actually leaves the prompt; v0.23.7 switches `sps worker dashboard` from raw PTY pane dumps to structured worker summaries; v0.23.9 validates persisted PTY sessions by PID before treating them as alive; v0.23.10 aligns PM and read-only views around runtime-owned cards; v0.23.11 introduces PM + worktree + session-first runtime projection; v0.23.12 moves recovery/execution onto `TaskLease + WorktreeEvidence`; v0.23.13 pulls monitor/closeout onto the same lease-first model; v0.23.14 completes the write-path migration through `RuntimeStore`; and v0.23.15 finalizes PTY restart behavior as task-level recovery instead of fake session-level recovery. Codex has been verified on launch, task-level recovery, direct merge, same-process resume, PTY conflict fallback, spawn-helper self-heal, immediate post-launch run-state inspection, summary-style dashboard rendering, cold-state liveness validation, runtime-owned PM reconciliation, read-only snapshot rendering, and lease-first recovery/execution/monitor/closeout flow; Claude still depends on host-side `claude auth login` before reaching `ready`.
 
@@ -393,7 +396,7 @@ sps tick <project> [project2] [project3] ... [--once] [--json] [--dry-run]
 **Execution order (per tick cycle):**
 
 1. **scheduler tick** -- Planning -> Backlog (select cards for queue)
-2. **qa tick** -- QA -> merge -> Done (prioritize freeing Worker slots)
+2. **qa tick** -- QA -> integration worker -> Done (prioritize finishing branch integration and freeing Worker slots)
 3. **pipeline tick** -- Backlog -> Todo -> Inprogress (prepare environment + launch Worker)
 4. **monitor tick** -- Anomaly inspection and alignment
 
@@ -540,7 +543,7 @@ sps pipeline tick <project> [--json] [--dry-run]
 **Internal steps:**
 
 1. **Check Inprogress cards** -- Detect Worker completion status. MR_MODE=none pushes directly to Done; MR_MODE=create confirms MR then pushes to Done
-2. **Process Backlog cards** -- Create branch + create worktree + generate `.sps/merge.sh` -> push to Todo
+2. **Process Backlog cards** -- Create branch + create worktree + generate phase prompts -> push to Todo
 3. **Process Todo cards** -- Assign Worker slot + build task context + launch Worker -> push to Inprogress
 
 Limited by `MAX_ACTIONS_PER_TICK` (default 1) to prevent launching too many Workers in a single tick cycle. There is a delay between multiple Worker launches (2 seconds in print mode, 10 seconds in interactive mode).
@@ -765,9 +768,9 @@ QA close-out and worktree cleanup.
 sps qa tick <project> [--json]
 ```
 
-**When MR_MODE=none:** The QA phase primarily handles worktree cleanup. After Worker completion, the ExecutionEngine pushes directly to Done.
+**When MR_MODE=none:** QA is the integration phase. The QA worker must inspect the task worktree, continue merge/rebase work, resolve conflicts, and drive the branch back into the target branch. `qa tick` launches or resumes that integration worker and only moves the card to `Done` after merge evidence is observed.
 
-**When MR_MODE=create:** QA serves as a legacy compatibility path, processing cards that reach QA state (auto-creates MR or tags `NEEDS-FIX`).
+**When MR_MODE=create:** QA remains a compatibility path while MR flow is still being converged on the same worker-owned model.
 
 **Automatic worktree cleanup:**
 
@@ -823,8 +826,10 @@ sps monitor tick my-project --json
 |------|---------|-----------------|
 | `CLAUDE.md` | Project rules for Claude Code Worker | Yes |
 | `AGENTS.md` | Project rules for Codex Worker | Yes |
-| `.sps/task_prompt.txt` | Specific task description per assignment (generated independently in each worktree) | No (.gitignore) |
-| `.sps/merge.sh` | Merge script (git merge for MR_MODE=none, GitLab API MR creation for MR_MODE=create) | No (.gitignore) |
+| `.sps/task_prompt.txt` | Development-phase compatibility prompt alias | No (.gitignore) |
+| `.sps/development_prompt.txt` | Development-phase worker prompt | No (.gitignore) |
+| `.sps/integration_prompt.txt` | Integration-phase worker prompt | No (.gitignore) |
+| `.sps/merge.sh` | Legacy/manual merge fallback script | No (.gitignore) |
 | `docs/DECISIONS.md` | Project knowledge base -- architecture decisions and technical choices | Yes (Worker auto-maintained) |
 | `docs/CHANGELOG.md` | Project knowledge base -- change log | Yes (Worker auto-maintained) |
 
@@ -841,8 +846,9 @@ Prompt assembly order: Skill Profile -> CLAUDE.md/AGENTS.md -> DECISIONS.md/CHAN
 1. `CLAUDE.md` and `AGENTS.md` are committed to the repository's main branch
 2. When creating a git worktree, these files are automatically inherited
 3. On startup, the Worker reads CLAUDE.md to understand project rules (auto-discovered in interactive mode; auto-loaded from cwd in print mode)
-4. Task-specific information (seq, branch name, description) is written to `.sps/task_prompt.txt`, passed to the Worker via stdin (print mode) or tmux paste (interactive mode)
-5. `.sps/merge.sh` is auto-generated in each worktree. After pushing, the Worker runs this script to complete the merge or MR creation
+4. Task-specific information is written into `.sps/development_prompt.txt` and `.sps/integration_prompt.txt` inside each worktree; `.sps/task_prompt.txt` remains as a development-phase compatibility alias
+5. Development workers use the development prompt and stop at a committed task branch; QA workers use the integration prompt and complete merge/conflict work
+6. `.sps/merge.sh` remains only as a legacy/manual fallback while the fixed merge path is being removed
 
 ### Project Knowledge Base
 
@@ -905,7 +911,7 @@ Project conf can reference global variables (e.g., `${PLANE_URL}`).
 |-------|----------|---------|-------------|
 | `PM_TOOL` | No | `trello` | PM backend type: `plane` / `trello` / `markdown` |
 | `PIPELINE_LABEL` | No | `AI-PIPELINE` | Pipeline card label |
-| `MR_MODE` | No | `none` | Merge mode: `none` (direct merge to target branch) / `create` (create MR, review flow under development) |
+| `MR_MODE` | No | `none` | Merge mode: `none` (worker-owned QA integration back to target branch) / `create` (create MR, review flow under development) |
 
 #### Worker
 
@@ -972,7 +978,7 @@ MAX_CONCURRENT_WORKERS=3
 MAX_ACTIONS_PER_TICK=1
 
 # Merge mode
-MR_MODE="none"                   # none (direct merge) or create (create MR)
+MR_MODE="none"                   # none (worker-owned QA integration) or create (create MR)
 ```
 
 ---
@@ -1027,7 +1033,7 @@ Layer 0  Core Runtime          Configuration, paths, state, locks, logging
 | Engine | Responsibility |
 |--------|---------------|
 | SchedulerEngine | Planning -> Backlog (card selection, sorting, admission checks) |
-| ExecutionEngine | Backlog -> Todo -> Inprogress -> Done (prepare environment, launch Worker, detect completion, release resources) |
+| ExecutionEngine | Backlog -> Todo -> Inprogress (prepare environment, launch development Worker, detect completion handoff to QA) |
 | CloseoutEngine | Worktree cleanup (legacy QA card handling when MR_MODE=create) |
 | MonitorEngine | Anomaly detection (orphan cleanup, timeouts, blocks, state alignment, dead Worker completion detection) |
 

package/dist/core/taskPrompts.d.ts

@@ -0,0 +1,29 @@
+import type { CardState } from '../models/types.js';
+import type { TaskLeasePhase } from './state.js';
+export type WorkerTaskPhase = 'development' | 'integration';
+export declare const DEVELOPMENT_PROMPT_FILE = "development_prompt.txt";
+export declare const INTEGRATION_PROMPT_FILE = "integration_prompt.txt";
+export declare const LEGACY_TASK_PROMPT_FILE = "task_prompt.txt";
+interface SharedPromptContext {
+    taskSeq: string;
+    taskTitle: string;
+    taskDescription: string;
+    cardId: string;
+    worktreePath: string;
+    branchName: string;
+    targetBranch: string;
+    mergeMode: 'none' | 'create';
+    gitlabProjectId: string;
+    skillContent?: string;
+    projectRules?: string;
+    knowledge?: string;
+}
+interface PhasePromptContext extends SharedPromptContext {
+    phase: WorkerTaskPhase;
+}
+export declare function selectWorkerPhase(pmState: CardState | null | undefined, leasePhase?: TaskLeasePhase | null): WorkerTaskPhase;
+export declare function promptFileForPhase(phase: WorkerTaskPhase): string;
+export declare function buildPhasePrompt(ctx: PhasePromptContext): string;
+export declare function buildResumePrompt(phase: WorkerTaskPhase, worktreePath: string, branchName: string, originalPrompt: string | null): string;
+export {};
+//# sourceMappingURL=taskPrompts.d.ts.map

package/dist/core/taskPrompts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"taskPrompts.d.ts","sourceRoot":"","sources":["../../src/core/taskPrompts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG,aAAa,CAAC;AAE5D,eAAO,MAAM,uBAAuB,2BAA2B,CAAC;AAChE,eAAO,MAAM,uBAAuB,2BAA2B,CAAC;AAChE,eAAO,MAAM,uBAAuB,oBAAoB,CAAC;AAEzD,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,kBAAmB,SAAQ,mBAAmB;IACtD,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,EACrC,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,GACjC,eAAe,CAMjB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,CAEjE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAsBhE;AA6ED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,eAAe,EACtB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GAAG,IAAI,GAC5B,MAAM,CAuBR"}

package/dist/core/taskPrompts.js

@@ -0,0 +1,126 @@
+export const DEVELOPMENT_PROMPT_FILE = 'development_prompt.txt';
+export const INTEGRATION_PROMPT_FILE = 'integration_prompt.txt';
+export const LEGACY_TASK_PROMPT_FILE = 'task_prompt.txt';
+export function selectWorkerPhase(pmState, leasePhase) {
+    if (pmState === 'QA')
+        return 'integration';
+    if (leasePhase && ['merging', 'resolving_conflict'].includes(leasePhase)) {
+        return 'integration';
+    }
+    return 'development';
+}
+export function promptFileForPhase(phase) {
+    return phase === 'integration' ? INTEGRATION_PROMPT_FILE : DEVELOPMENT_PROMPT_FILE;
+}
+export function buildPhasePrompt(ctx) {
+    const sections = [];
+    if (ctx.skillContent?.trim()) {
+        sections.push(ctx.skillContent.trim());
+        sections.push('---');
+    }
+    if (ctx.projectRules?.trim()) {
+        sections.push(ctx.projectRules.trim());
+        sections.push('---');
+    }
+    if (ctx.knowledge?.trim()) {
+        sections.push(ctx.knowledge.trim());
+        sections.push('---');
+    }
+    sections.push(buildTaskSection(ctx));
+    sections.push(buildPhaseInstructions(ctx));
+    return sections.join('\n\n').trim() + '\n';
+}
+function buildTaskSection(ctx) {
+    return `# Current Task
+
+Task ID: ${ctx.taskSeq}
+Task: ${ctx.taskTitle}
+Branch: ${ctx.branchName}
+Target Branch: ${ctx.targetBranch}
+Card Full ID: ${ctx.cardId}
+GitLab Project ID: ${ctx.gitlabProjectId}
+MR Mode: ${ctx.mergeMode}
+Worktree: ${ctx.worktreePath}
+
+Description:
+${ctx.taskDescription || '(no description)'}`;
+}
+function buildPhaseInstructions(ctx) {
+    if (ctx.phase === 'integration') {
+        return `# Integration Phase Instructions
+
+You are in the integration phase for this task.
+
+Your responsibility in this phase is to integrate the current task branch back into the target branch.
+
+First inspect the repository state yourself in this worktree:
+1. Confirm the current branch
+2. Check git status
+3. Check whether a rebase or merge is already in progress
+4. Inspect conflicts if they exist
+5. Determine the exact next step required to finish integration
+
+Rules:
+1. Work only in the current worktree: ${ctx.worktreePath}
+2. Integrate branch ${ctx.branchName} back into target branch ${ctx.targetBranch}
+3. If there are conflicts, resolve them carefully based on the task intent and current codebase
+4. Complete any required git add / rebase --continue / merge follow-up steps
+5. If the integration requires pushing the target branch or the task branch, do it as part of this phase
+6. Validate the repository state before finishing
+7. Do not restart development from scratch unless the repository state clearly requires code changes to complete integration
+8. If you are blocked by permissions, confirmations, or external policy, report the exact blocker instead of looping forever
+9. Say "done" only after integration work is complete or you have identified a concrete external blocker
+
+Completion rule:
+- The preferred outcome of this phase is: branch ${ctx.branchName} has been successfully merged back into ${ctx.targetBranch}, and any required pushes have completed.
+- Do not treat this phase as a fresh development task.`;
+    }
+    return `# Development Phase Instructions
+
+You are in the development phase for this task.
+
+Your responsibility in this phase is to complete the implementation work in the current task branch.
+
+First inspect the repository state yourself in this worktree:
+1. Confirm the current branch
+2. Check git status
+3. Check whether a rebase or merge is already in progress
+4. Inspect the current code and determine what remains to finish the task
+
+Rules:
+1. Work only in the current worktree: ${ctx.worktreePath}
+2. Complete the implementation for this task
+3. Run appropriate validation or tests when needed
+4. Commit the finished work to the current task branch ${ctx.branchName}
+5. Do not merge into the target branch ${ctx.targetBranch} in this phase
+6. Do not run merge scripts or perform integration work in this phase
+7. Do not push or update the target branch in this phase
+8. If you are blocked by permissions, confirmations, or missing environment requirements, report the exact blocker
+9. Say "done" only after the implementation work is complete and committed on ${ctx.branchName}
+
+Completion rule:
+- The intended end of this phase is: the implementation is complete and committed on branch ${ctx.branchName}.
+- Do not merge into ${ctx.targetBranch} in this phase.`;
+}
+export function buildResumePrompt(phase, worktreePath, branchName, originalPrompt) {
+    const phaseLabel = phase === 'integration' ? 'QA' : 'Inprogress';
+    const phaseGoal = phase === 'integration'
+        ? 'Continue the integration work for this task in the current worktree.'
+        : 'Continue the development work for this task in the current worktree.';
+    const header = [
+        'The previous SPS tick process stopped. The old worker session is gone.',
+        'Recover this task at the task level in the existing worktree.',
+        `Current PM State: ${phaseLabel}`,
+        `Worktree: ${worktreePath}`,
+        `Branch: ${branchName}`,
+        '',
+        phaseGoal,
+        'First inspect the current repository state yourself before changing anything.',
+        'Then continue the same task from the current repository state instead of starting over.',
+    ].join('\n');
+    if (!originalPrompt?.trim()) {
+        return header;
+    }
+    return `${header}\n\nPhase task context:\n---\n${originalPrompt.trim()}`;
+}
+//# sourceMappingURL=taskPrompts.js.map

package/dist/core/taskPrompts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"taskPrompts.js","sourceRoot":"","sources":["../../src/core/taskPrompts.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,uBAAuB,GAAG,wBAAwB,CAAC;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAAG,wBAAwB,CAAC;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAAG,iBAAiB,CAAC;AAqBzD,MAAM,UAAU,iBAAiB,CAC/B,OAAqC,EACrC,UAAkC;IAElC,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,aAAa,CAAC;IAC3C,IAAI,UAAU,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACzE,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAsB;IACvD,OAAO,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,uBAAuB,CAAC;AACrF,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAuB;IACtD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,IAAI,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC;QAC7B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC;QAC7B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QACvC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QACpC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC;IAE3C,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;AAC7C,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAwB;IAChD,OAAO;;WAEE,GAAG,CAAC,OAAO;QACd,GAAG,CAAC,SAAS;UACX,GAAG,CAAC,UAAU;iBACP,GAAG,CAAC,YAAY;gBACjB,GAAG,CAAC,MAAM;qBACL,GAAG,CAAC,eAAe;WAC7B,GAAG,CAAC,SAAS;YACZ,GAAG,CAAC,YAAY;;;EAG1B,GAAG,CAAC,eAAe,IAAI,kBAAkB,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAuB;IACrD,IAAI,GAAG,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;QAChC,OAAO;;;;;;;;;;;;;;wCAc6B,GAAG,CAAC,YAAY;sBAClC,GAAG,CAAC,UAAU,4BAA4B,GAAG,CAAC,YAAY;;;;;;;;;;mDAU7B,GAAG,CAAC,UAAU,2CAA2C,GAAG,CAAC,YAAY;uDACrE,CAAC;IACtD,CAAC;IAED,OAAO;;;;;;;;;;;;;wCAa+B,GAAG,CAAC,YAAY;;;yDAGC,GAAG,CAAC,UAAU;yCAC9B,GAAG,CAAC,YAAY;;;;gFAIuB,GAAG,CAAC,UAAU;;;8FAGA,GAAG,CAAC,UAAU;sBACtF,GAAG,CAAC,YAAY,iBAAiB,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,KAAsB,EACtB,YAAoB,EACpB,UAAkB,EAClB,cAA6B;IAE7B,MAAM,UAAU,GAAG,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;IACjE,MAAM,SAAS,GAAG,KAAK,KAAK,aAAa;QACvC,CAAC,CAAC,sEAAsE;QACxE,CAAC,CAAC,sEAAsE,CAAC;IAE3E,MAAM,MAAM,GAAG;QACb,wEAAwE;QACxE,+DAA+D;QAC/D,qBAAqB,UAAU,EAAE;QACjC,aAAa,YAAY,EAAE;QAC3B,WAAW,UAAU,EAAE;QACvB,EAAE;QACF,SAAS;QACT,+EAA+E;QAC/E,yFAAyF;KAC1F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,MAAM,iCAAiC,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC;AAC3E,CAAC"}

package/dist/engines/CloseoutEngine.d.ts

@@ -6,18 +6,12 @@ import type { Notifier } from '../interfaces/Notifier.js';
 import type { AgentRuntime } from '../interfaces/AgentRuntime.js';
 import type { CommandResult } from '../models/types.js';
 /**
- * CloseoutEngine handles the QA → merge → Done → resource release pipeline.
+ * CloseoutEngine handles the QA → Done pipeline.
  *
- * Decision tree per 01 §10.3.2:
- *   QA card → check MR exists?
- *     ├─ MR not found → NEEDS-FIX
- *     └─ MR exists → check MR state
- *         ├─ already merged → resource release → Done
- *         ├─ open + CI success + can_be_merged → attempt merge
- *         ├─ open + CI failed → self-repair or NEEDS-FIX
- *         ├─ open + CI running/pending → skip
- *         ├─ open + cannot_be_merged → CONFLICT
- *         └─ closed (not merged) → NEEDS-FIX
+ * In the worker-owned two-phase model, QA means integration:
+ * - the worker performs rebase / merge / conflict resolution
+ * - SPS only checks evidence, starts or resumes the integration worker,
+ *   and finalizes the task after the branch is merged.
  */
 export declare class CloseoutEngine {
     private ctx;
@@ -31,6 +25,8 @@ export declare class CloseoutEngine {
     constructor(ctx: ProjectContext, taskBackend: TaskBackend, repoBackend: RepoBackend, workerProvider: WorkerProvider, notifier?: Notifier | undefined, agentRuntime?: AgentRuntime | null);
     tick(): Promise<CommandResult>;
     private processQaCard;
+    private inspectQaWorker;
+    private startIntegrationWorker;
     private processOpenMr;
     private handleCiFailure;
     private attemptMerge;
@@ -67,5 +63,8 @@ export declare class CloseoutEngine {
     private notifySafe;
     private resumeAcpWorker;
     private logEvent;
+    private resolveIntegrationPrompt;
+    private isMergedToBase;
+    private releaseQaSlot;
 }
 //# sourceMappingURL=CloseoutEngine.d.ts.map

package/dist/engines/CloseoutEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloseoutEngine.d.ts","sourceRoot":"","sources":["../../src/engines/CloseoutEngine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,oBAAoB,CAAC;AAK/F;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAc;IAKvB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,YAAY;IATtB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,YAAY,CAAe;gBAGzB,GAAG,EAAE,cAAc,EACnB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,QAAQ,YAAA,EACnB,YAAY,GAAE,YAAY,GAAG,IAAW;IAM5C,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC;YAoEtB,aAAa;YAwEb,aAAa;YAqHb,eAAe;YAkIf,YAAY;IAyC1B;;;;;;;;;;OAUG;YACW,cAAc;IAsH5B;;;;;OAKG;YACW,eAAe;IA0I7B;;;;;OAKG;YACW,gBAAgB;IA4C9B,OAAO,CAAC,eAAe;YAST,YAAY;YAMZ,YAAY;YASZ,WAAW;YASX,UAAU;YAYV,eAAe;IAyD7B,OAAO,CAAC,QAAQ;CAcjB"}
+{"version":3,"file":"CloseoutEngine.d.ts","sourceRoot":"","sources":["../../src/engines/CloseoutEngine.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAyC,MAAM,oBAAoB,CAAC;AAM/F;;;;;;;GAOG;AACH,qBAAa,cAAc;IAKvB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,YAAY;IATtB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,YAAY,CAAe;gBAGzB,GAAG,EAAE,cAAc,EACnB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,QAAQ,YAAA,EACnB,YAAY,GAAE,YAAY,GAAG,IAAW;IAM5C,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC;YAoEtB,aAAa;YAqDb,eAAe;YA6Hf,sBAAsB;YAyJtB,aAAa;YAqHb,eAAe;YAkIf,YAAY;IAyC1B;;;;;;;;;;OAUG;YACW,cAAc;IAsH5B;;;;;OAKG;YACW,eAAe;IA0I7B;;;;;OAKG;YACW,gBAAgB;IA4C9B,OAAO,CAAC,eAAe;YAST,YAAY;YAMZ,YAAY;YASZ,WAAW;YASX,UAAU;YAYV,eAAe;IAyD7B,OAAO,CAAC,QAAQ;IAehB,OAAO,CAAC,wBAAwB;IAUhC,OAAO,CAAC,cAAc;YAmBR,aAAa;CAiB5B"}