@loucompanion/forge-bridge 0.1.1-dev.eee62899e922 → 0.1.3-dev.04a84914da09

package/dist/session/phase-completion.js

@@ -22,6 +22,60 @@ export const qaCompletionGateOrder = [
     "qa_findings",
     "qa_verdict"
 ];
+export const draftCompletionGateOrder = [
+    "draft_intent",
+    "draft_repo_context",
+    "draft_graph_context",
+    "draft_product_scope",
+    "draft_work_order_plan",
+    "draft_critic",
+    "draft_proposal"
+];
+export const decomposeCompletionGateOrder = [
+    "decompose_subject_intake",
+    "decompose_context_review",
+    "decompose_breakdown_strategy",
+    "decompose_child_items",
+    "decompose_dependency_graph",
+    "decompose_critic",
+    "decompose_proposal"
+];
+const decomposeGateFileNames = {
+    decompose_subject_intake: "decompose.subject-intake.json",
+    decompose_context_review: "decompose.context-review.json",
+    decompose_breakdown_strategy: "decompose.breakdown-strategy.json",
+    decompose_child_items: "decompose.child-items.json",
+    decompose_dependency_graph: "decompose.dependency-graph.json",
+    decompose_critic: "decompose.critic.json",
+    decompose_proposal: "decompose.proposal.json"
+};
+const decomposeGateToolNames = {
+    decompose_subject_intake: "complete_decompose_subject_intake",
+    decompose_context_review: "complete_decompose_context_review",
+    decompose_breakdown_strategy: "complete_decompose_breakdown_strategy",
+    decompose_child_items: "complete_decompose_child_items",
+    decompose_dependency_graph: "complete_decompose_dependency_graph",
+    decompose_critic: "complete_decompose_critic",
+    decompose_proposal: "complete_decompose_proposal"
+};
+const draftGateFileNames = {
+    draft_intent: "draft.intent.json",
+    draft_repo_context: "draft.repo-context.json",
+    draft_graph_context: "draft.graph-context.json",
+    draft_product_scope: "draft.product-scope.json",
+    draft_work_order_plan: "draft.work-order-plan.json",
+    draft_critic: "draft.critic.json",
+    draft_proposal: "draft.proposal.json"
+};
+const draftGateToolNames = {
+    draft_intent: "complete_draft_intent",
+    draft_repo_context: "complete_draft_repo_context",
+    draft_graph_context: "complete_draft_graph_context",
+    draft_product_scope: "complete_draft_product_scope",
+    draft_work_order_plan: "complete_draft_work_order_plan",
+    draft_critic: "complete_draft_critic",
+    draft_proposal: "complete_draft_proposal"
+};
 const qaGateFileNames = {
     qa_plan: "qa.plan.json",
     qa_regression: "qa.regression.json",
@@ -95,6 +149,14 @@ const phaseFiles = {
     architect: {
         jsonFileName: "architect.verdict.json",
         reportFileName: "architect.report.md"
+    },
+    draft: {
+        jsonFileName: "draft.proposal.json",
+        reportFileName: "draft.report.md"
+    },
+    decompose: {
+        jsonFileName: "decompose.proposal.json",
+        reportFileName: "decompose.report.md"
     }
 };
 export function completionPhaseFromDispatch(dispatch) {
@@ -118,6 +180,12 @@ export function normalizeCompletionPhase(value) {
     if (normalized === "architect" || normalized === "architect_plan" || normalized === "planning" || normalized === "plan") {
         return "architect";
     }
+    if (normalized === "draft" || normalized === "drafting" || normalized === "draft_work_order") {
+        return "draft";
+    }
+    if (normalized === "decompose" || normalized === "decomposition" || normalized === "work_order_decomposition" || normalized === "feature_decomposition") {
+        return "decompose";
+    }
     return "implementation";
 }
 export function usesDevelopCycleCompletion(dispatch) {
@@ -154,6 +222,12 @@ export function usesArchitectCycleCompletion(dispatch) {
     return kind === "architect" || role === "architect" || lane === "architect";
 }
 export function completionToolNamesForPhase(phase) {
+    if (phase === "draft") {
+        return completionToolNamesForDraftGate("draft_proposal");
+    }
+    if (phase === "decompose") {
+        return completionToolNamesForDecomposeGate("decompose_proposal");
+    }
     if (isDebugCompletionPhase(phase)) {
         return completionToolNamesForDebugGate(phase);
     }
@@ -176,6 +250,14 @@ export function completionToolNamesForDebugGate(gate) {
     const base = debugGateToolNames[gate];
     return [`forge.${base}`, base];
 }
+export function completionToolNamesForDraftGate(gate) {
+    const base = draftGateToolNames[gate];
+    return [`forge.${base}`, base];
+}
+export function completionToolNamesForDecomposeGate(gate) {
+    const base = decomposeGateToolNames[gate];
+    return [`forge.${base}`, base];
+}
 export function expectedCompletionToolName(phase) {
     return completionToolNamesForPhase(phase)[0];
 }
@@ -185,6 +267,12 @@ export function expectedQaCompletionToolName(gate) {
 export function expectedDebugCompletionToolName(gate) {
     return completionToolNamesForDebugGate(gate)[0];
 }
+export function expectedDraftCompletionToolName(gate) {
+    return completionToolNamesForDraftGate(gate)[0];
+}
+export function expectedDecomposeCompletionToolName(gate) {
+    return completionToolNamesForDecomposeGate(gate)[0];
+}
 export function artifactRootFor(worktreePath, workItemId) {
     return path.join(worktreePath, ".forge", "work-items", safePathSegment(workItemId, "work item id"), "artifacts");
 }
@@ -219,7 +307,12 @@ export async function prepareCompletionToolRuntime(options) {
         developCycle: usesDevelopCycleCompletion(options.dispatch),
         qaCycle: usesQaCycleCompletion(options.dispatch),
         debugCycle: usesDebugCycleCompletion(options.dispatch),
-        architectCycle: usesArchitectCycleCompletion(options.dispatch)
+        architectCycle: usesArchitectCycleCompletion(options.dispatch),
+        draftCycle: (phase === "draft"
+            || options.dispatch.execution.lane.trim().toLowerCase() === "draft"
+            || options.dispatch.cycleRun.kind.trim().toLowerCase() === "draft")
+            && !isDecomposeDispatch(options.dispatch),
+        decomposeCycle: isDecomposeDispatch(options.dispatch)
     });
     const runtime = {
         serverName: toolServerName,
@@ -261,6 +354,12 @@ export function buildCompletionToolServerArgs(config) {
     if (config.architectCycle) {
         args.push("--architect-cycle");
     }
+    if (config.draftCycle) {
+        args.push("--draft-cycle");
+    }
+    if (config.decomposeCycle) {
+        args.push("--decompose-cycle");
+    }
     return args;
 }
 export function codexMcpConfigArgs(runtime) {
@@ -300,6 +399,7 @@ Do not write Architect artifacts by hand. When the plan is complete, call \`${to
 That tool writes \`.forge/work-items/{workItemId}/artifacts/implementation.plan.json\`, \`qa.plan.json\`, \`${artifactName}\`, and \`architect.report.md\`.
 The payload must put \`phases\`, \`tasks\`, \`dependencies\`, and \`phase_gates\` as top-level fields inside \`implementation_plan\`, for example:
 \`{ "status": "pass", "summary": "...", "implementation_plan": { "schema_version": 1, "plan_id": "plan-...", "phases": [{ "id": "phase-1", "tasks": ["task-1"], "gate": "gate-1" }], "tasks": [{ "id": "task-1", "tests": [{ "command": "npm test" }] }], "dependencies": [], "phase_gates": [{ "id": "gate-1", "phase": "phase-1" }] }, "qa_plan": { "schema_version": 1, "final_qa": [{ "id": "qa-1", "coverage": "..." }] }, "report_markdown": "# Architect Report" }\`.
+\`implementation_plan.tasks\` are Develop child tasks only: each task must require a focused repo/product implementation change. Put parent-story QA, sign-off, child-count/materialization inventory, parent plan artifact checks, and final integrated acceptance proof in \`qa_plan.final_qa\`, not as child Develop tasks.
 Dependency entries use canonical \`before\` and \`after\` task ids, for example \`{ "before": "task-1", "after": "task-2" }\`. Forge accepts \`from\`/\`to\` only as aliases and normalizes them before writing artifacts.
 Use \`status: "pass"\` for a valid pending-approval plan, \`needs_revision\` when story/design input must change, or \`blocked\` with a concrete blocker.
 Forge will mirror only the tool-written Architect artifacts; reporting the plan in prose is not enough.`;
@@ -334,6 +434,35 @@ Use \`status: "skipped"\` with a reason for gates that are not applicable. If a
 The final verdict tool writes the canonical QA bundle under \`.forge/work-items/{workItemId}/artifacts/\`: \`qa.plan.json\`, \`qa.evidence.json\`, \`qa.findings.json\`, \`qa.verdict.json\`, and \`qa.report.md\`.
 The legacy \`forge.complete_qa\` one-shot tool is not available in normal QA-cycle mode. Reporting QA completion in prose is not enough.`;
 }
+export function completionPromptForDraftCycle(currentGate = "draft_intent") {
+    return `Forge completion tools are available through the MCP server named \`${toolServerName}\`.
+Do not finish Draft by prose or raw JSON. The tool server enforces Draft gate order and starts at \`${currentGate}\`.
+Complete the Draft cycle in order inside this same provider session:
+1. Call \`forge.complete_draft_intent(...)\` after interpreting user intent and non-goals.
+2. Follow the returned repo-context instruction, inspect selected project/repo assumptions, then call \`forge.complete_draft_repo_context(...)\`.
+3. Follow the returned graph-context instruction, account for DAG/dependency placement, then call \`forge.complete_draft_graph_context(...)\`.
+4. Follow the returned product-scope instruction, choose product scope for the selected project, then call \`forge.complete_draft_product_scope(...)\`.
+5. Follow the returned work-order-plan instruction, draft the requested final JSON shape and any candidate boundaries, then call \`forge.complete_draft_work_order_plan(...)\`.
+6. Follow the returned critic instruction, critique literalism, wrong-project scope, and decomposition quality, then call \`forge.complete_draft_critic(...)\`.
+7. Follow the returned proposal instruction, then call \`forge.complete_draft_proposal(...)\` with the final Draft JSON payload in \`draft_json\`.
+The final proposal tool writes \`draft.proposal.json\` under \`.forge/work-items/{workItemId}/artifacts/\`. Reporting Draft completion in prose is not enough.`;
+}
+export function completionPromptForDecomposeCycle(currentGate = "decompose_subject_intake") {
+    return `# Forge Decompose completion cycle
+You must complete the Decompose gates in order using the Forge MCP tools. Reporting progress in prose is not enough.
+
+Current gate: ${currentGate}
+
+Required order:
+1. Call \`forge.complete_decompose_subject_intake(...)\` after identifying the Work Order/Feature subject, scope, and non-goals.
+2. Follow the returned context-review instruction, inspect injected project/repo/dependency context, then call \`forge.complete_decompose_context_review(...)\`.
+3. Follow the returned breakdown-strategy instruction, choose safe Feature/Story boundaries, then call \`forge.complete_decompose_breakdown_strategy(...)\`.
+4. Follow the returned child-items instruction, draft candidate child items, then call \`forge.complete_decompose_child_items(...)\`.
+5. Follow the returned dependency-graph instruction, validate keys/dependencies/order, then call \`forge.complete_decompose_dependency_graph(...)\`.
+6. Follow the returned critic instruction, critique scope, DAG safety, manual reconciliation risk, and missing acceptance detail, then call \`forge.complete_decompose_critic(...)\`.
+7. Follow the returned proposal instruction, then call \`forge.complete_decompose_proposal(...)\` with final JSON in \`proposal_json\`.
+The final proposal tool writes \`decompose.proposal.json\` under \`.forge/work-items/{workItemId}/artifacts/\`. The proposal_json object must contain summary, optional blockedReason, and candidates.`;
+}
 export function completionPromptForDebugCycle(currentGate = "debug_repro") {
     return `Forge completion tools are available through the MCP server named \`${toolServerName}\`.
 Do not write Debug artifacts by hand. The tool server enforces Debug gate order and starts this run at \`${currentGate}\`.
@@ -346,33 +475,43 @@ Each tool writes a canonical Debug artifact under \`.forge/work-items/{workItemI
 Use a non-pass status with explicit blockers when the current Debug gate cannot pass. Reporting Debug completion in prose is not enough; the relevant MCP completion tool is the transition request.`;
 }
 export function completionToolNamesForServer(config) {
-    return config.debugCycle
-        ? debugCompletionPhaseOrder.flatMap((gate) => completionToolNamesForDebugGate(gate))
-        : config.qaCycle
-            ? qaCompletionGateOrder.flatMap((gate) => completionToolNamesForQaGate(gate))
-            : config.developCycle
-                ? completionPhaseOrder.flatMap((phase) => completionToolNamesForPhase(phase))
-                : config.architectCycle
-                    ? completionToolNamesForPhase("architect")
-                    : completionToolNamesForPhase(config.phase);
+    return config.decomposeCycle
+        ? decomposeCompletionGateOrder.flatMap((gate) => completionToolNamesForDecomposeGate(gate))
+        : config.draftCycle
+            ? draftCompletionGateOrder.flatMap((gate) => completionToolNamesForDraftGate(gate))
+            : config.debugCycle
+                ? debugCompletionPhaseOrder.flatMap((gate) => completionToolNamesForDebugGate(gate))
+                : config.qaCycle
+                    ? qaCompletionGateOrder.flatMap((gate) => completionToolNamesForQaGate(gate))
+                    : config.developCycle
+                        ? completionPhaseOrder.flatMap((phase) => completionToolNamesForPhase(phase))
+                        : config.architectCycle
+                            ? completionToolNamesForPhase("architect")
+                            : completionToolNamesForPhase(config.phase);
 }
 export class CompletionToolServerSession {
     config;
     currentPhase;
     currentQaGate = "qa_plan";
+    currentDraftGate = "draft_intent";
+    currentDecomposeGate = "decompose_subject_intake";
     completed = false;
     constructor(config) {
         this.config = config;
         this.currentPhase = config.phase;
     }
     get instructions() {
-        return this.config.debugCycle
-            ? completionPromptForDebugCycle(asDebugCompletionPhase(this.currentPhase))
-            : this.config.qaCycle
-                ? completionPromptForQaCycle(this.currentQaGate)
-                : this.config.developCycle
-                    ? completionPromptForDevelopCycle(this.currentPhase)
-                    : completionPromptForPhase(this.currentPhase);
+        return this.config.decomposeCycle
+            ? completionPromptForDecomposeCycle(this.currentDecomposeGate)
+            : this.config.draftCycle
+                ? completionPromptForDraftCycle(this.currentDraftGate)
+                : this.config.debugCycle
+                    ? completionPromptForDebugCycle(asDebugCompletionPhase(this.currentPhase))
+                    : this.config.qaCycle
+                        ? completionPromptForQaCycle(this.currentQaGate)
+                        : this.config.developCycle
+                            ? completionPromptForDevelopCycle(this.currentPhase)
+                            : completionPromptForPhase(this.currentPhase);
     }
     toolDefinitions() {
         return completionToolNamesForServer(this.config).map((name) => toolDefinition(name, phaseFromToolName(name), qaGateFromToolName(name)));
@@ -382,6 +521,12 @@ export class CompletionToolServerSession {
         if (this.completed) {
             throw new Error("Forge completion cycle is already complete; no more completion calls are accepted.");
         }
+        if (this.config.decomposeCycle) {
+            return await this.callDecomposeGateTool(toolName, requestedPhase, input);
+        }
+        if (this.config.draftCycle) {
+            return await this.callDraftGateTool(toolName, requestedPhase, input);
+        }
         if (this.config.debugCycle) {
             return await this.callDebugGateTool(toolName, requestedPhase, input);
         }
@@ -422,6 +567,62 @@ export class CompletionToolServerSession {
             }
         };
     }
+    async callDecomposeGateTool(toolName, requestedPhase, input) {
+        const requestedGate = decomposeGateFromToolName(toolName);
+        if (requestedPhase !== "decompose" || !requestedGate) {
+            throw new Error(`Tool ${toolName} is not available in Decompose-cycle mode. Current Forge Decompose gate is ${this.currentDecomposeGate}.`);
+        }
+        if (requestedGate !== this.currentDecomposeGate) {
+            throw new Error(`Tool ${toolName} is out of order. Current Forge Decompose gate is ${this.currentDecomposeGate}.`);
+        }
+        const completedGate = this.currentDecomposeGate;
+        const reference = await writeDecomposeGateCompletionArtifact(this.config, completedGate, toolName, input);
+        const status = reference.status.trim().toLowerCase();
+        const pass = status === "pass";
+        const nextGate = pass ? this.advanceAfterDecomposeGate(completedGate) : completedGate;
+        const nextPhase = pass
+            ? (nextGate ? "decompose" : "sign_off_ready")
+            : "decompose";
+        const nextInstruction = completionToolNextInstructionForDecomposeGate(completedGate, status, nextGate);
+        const reason = pass
+            ? nextGate
+                ? `${completedGate} artifact accepted; continue to ${nextGate}.`
+                : `Decompose proposal artifact accepted with status ${status}.`
+            : `${completedGate} artifact recorded with status ${status}; rework is required before continuing.`;
+        return {
+            content: [{ type: "text", text: `Forge recorded ${completedGate} artifact ${path.relative(reference.repoPath, reference.path)} (${reference.status}, ${reference.contentHash}). ${nextInstruction}` }],
+            structuredContent: {
+                ...reference,
+                gate: { phase: "decompose", decomposeGate: completedGate, status, allowed: pass, reason },
+                nextPhase,
+                nextInstruction
+            }
+        };
+    }
+    async callDraftGateTool(toolName, requestedPhase, input) {
+        const requestedGate = draftGateFromToolName(toolName);
+        if (requestedPhase !== "draft" || !requestedGate) {
+            throw new Error(`Tool ${toolName} is not available in Draft-cycle mode. Current Forge Draft gate is ${this.currentDraftGate}.`);
+        }
+        if (requestedGate !== this.currentDraftGate) {
+            throw new Error(`Tool ${toolName} is out of order. Current Forge Draft gate is ${this.currentDraftGate}.`);
+        }
+        const completedGate = this.currentDraftGate;
+        const reference = await writeDraftGateCompletionArtifact(this.config, completedGate, toolName, input);
+        const status = reference.status.trim().toLowerCase();
+        const nextGate = this.advanceAfterDraftGate(completedGate);
+        const nextPhase = nextGate ? "draft" : "sign_off_ready";
+        const nextInstruction = completionToolNextInstructionForDraftGate(completedGate, status, nextGate);
+        return {
+            content: [{ type: "text", text: `Forge recorded ${completedGate} artifact ${path.relative(reference.repoPath, reference.path)} (${reference.status}, ${reference.contentHash}). ${nextInstruction}` }],
+            structuredContent: {
+                ...reference,
+                gate: { phase: "draft", draftGate: completedGate, status, allowed: status !== "blocked", reason: nextGate ? `${completedGate} artifact accepted; continue to ${nextGate}.` : `Draft proposal artifact accepted with status ${status}.` },
+                nextPhase,
+                nextInstruction
+            }
+        };
+    }
     async callDebugGateTool(toolName, requestedPhase, input) {
         const currentDebugGate = asDebugCompletionPhase(this.currentPhase);
         if (!isDebugCompletionPhase(requestedPhase)) {
@@ -518,6 +719,26 @@ export class CompletionToolServerSession {
         this.completed = true;
         return "dev_test_ready";
     }
+    advanceAfterDecomposeGate(gate) {
+        const index = decomposeCompletionGateOrder.indexOf(gate);
+        const next = index >= 0 ? decomposeCompletionGateOrder[index + 1] ?? null : null;
+        if (next) {
+            this.currentDecomposeGate = next;
+            return next;
+        }
+        this.completed = true;
+        return null;
+    }
+    advanceAfterDraftGate(gate) {
+        const index = draftCompletionGateOrder.indexOf(gate);
+        const next = index >= 0 ? draftCompletionGateOrder[index + 1] ?? null : null;
+        if (next) {
+            this.currentDraftGate = next;
+            return next;
+        }
+        this.completed = true;
+        return null;
+    }
     advanceAfterQaGate(gate) {
         const index = qaCompletionGateOrder.indexOf(gate);
         const next = index >= 0 ? qaCompletionGateOrder[index + 1] ?? null : null;
@@ -539,6 +760,89 @@ export class CompletionToolServerSession {
         return null;
     }
 }
+async function writeDecomposeGateCompletionArtifact(config, gate, toolName, input) {
+    const payload = asRecord(input, "Decompose completion payload");
+    const status = normalizeDraftStatus(optionalString(payload, "status") ?? "pass");
+    if (gate === "decompose_proposal") {
+        const proposalJson = asRecord(payload["proposal_json"] ?? payload["decomposition_json"], "proposal_json");
+        if (!Array.isArray(proposalJson["candidates"])) {
+            throw new Error("proposal_json.candidates: expected array");
+        }
+    }
+    const redactedPayload = redactSecrets({ ...payload, status, phase: "decompose", gate, tool_name: toolName }, config.redactionSecrets ?? []);
+    const root = artifactRootFor(config.worktreePath, config.workItemId);
+    await fs.mkdir(root, { recursive: true });
+    const artifactPath = path.join(root, decomposeGateFileNames[gate]);
+    const reportPath = gate === "decompose_proposal" ? path.join(root, phaseFiles.decompose.reportFileName) : path.join(root, `${gate}.md`);
+    const verdictJson = jsonText(redactedPayload);
+    const report = optionalString(redactedPayload, "report_markdown") ?? `# ${gate.replace(/_/g, " ")}
+
+${optionalString(redactedPayload, "summary") ?? "Decompose gate recorded."}
+`;
+    await writeFileAtomic(artifactPath, verdictJson);
+    await writeFileAtomic(reportPath, report);
+    return {
+        phase: "decompose",
+        workItemId: config.workItemId,
+        ownerType: config.ownerType,
+        ownerId: config.ownerId,
+        repoPath: path.resolve(config.worktreePath),
+        path: artifactPath,
+        reportPath,
+        contentHash: sha256(verdictJson),
+        status,
+        producedBy: config.producedBy ?? "forge-completion-tool"
+    };
+}
+async function writeDraftGateCompletionArtifact(config, gate, toolName, input) {
+    const payload = asRecord(input, "Draft completion payload");
+    const status = normalizeDraftStatus(optionalString(payload, "status") ?? "pass");
+    if (gate === "draft_proposal") {
+        const draftJson = asRecord(payload["draft_json"], "draft_json");
+        validateDraftProposalJson(draftJson);
+    }
+    const redactedPayload = redactSecrets({ ...payload, status, phase: "draft", gate, tool_name: toolName }, config.redactionSecrets ?? []);
+    const root = artifactRootFor(config.worktreePath, config.workItemId);
+    await fs.mkdir(root, { recursive: true });
+    const artifactPath = path.join(root, draftGateFileNames[gate]);
+    const reportPath = gate === "draft_proposal" ? path.join(root, phaseFiles.draft.reportFileName) : path.join(root, `${gate}.md`);
+    const verdictJson = jsonText(redactedPayload);
+    const report = optionalString(redactedPayload, "report_markdown") ?? `# ${gate.replace(/_/g, " ")}\n\n${optionalString(redactedPayload, "summary") ?? "Draft gate recorded."}\n`;
+    await writeFileAtomic(artifactPath, verdictJson);
+    await writeFileAtomic(reportPath, report);
+    return {
+        phase: "draft",
+        workItemId: config.workItemId,
+        ownerType: config.ownerType,
+        ownerId: config.ownerId,
+        repoPath: path.resolve(config.worktreePath),
+        path: artifactPath,
+        reportPath,
+        contentHash: sha256(verdictJson),
+        status,
+        producedBy: config.producedBy ?? "forge-completion-tool"
+    };
+}
+function normalizeDraftStatus(value) {
+    const normalized = value.trim().toLowerCase();
+    return normalized === "blocked" || normalized === "needs_revision" || normalized === "needs_rework" ? normalized : "pass";
+}
+function validateDraftProposalJson(draftJson) {
+    if (isDecompositionDraftJson(draftJson)) {
+        return;
+    }
+    for (const key of ["title", "summary", "objective", "planningPacket", "decompositionContext"]) {
+        if (typeof draftJson[key] !== "string" || draftJson[key].trim().length === 0) {
+            throw new Error(`draft_json.${key}: expected non-empty string`);
+        }
+    }
+}
+function isDecompositionDraftJson(draftJson) {
+    const summary = draftJson["summary"];
+    return typeof summary === "string"
+        && summary.trim().length > 0
+        && Array.isArray(draftJson["candidates"]);
+}
 export async function writeCompletionArtifact(config, toolName, input) {
     const phase = phaseFromToolName(toolName);
     if (phase !== config.phase) {
@@ -550,7 +854,10 @@ export async function writeCompletionArtifact(config, toolName, input) {
     }
     const payload = asRecord(input, "completion payload");
     const status = normalizeCompletionStatus(requiredString(payload, "status"), phase);
-    const validationPayload = { ...payload, status };
+    let validationPayload = { ...payload, status };
+    if (config.qaCycle && qaGate === "qa_verdict") {
+        validationPayload = await synthesizeQaCycleVerdictPayload(config, validationPayload, status);
+    }
     validatePayloadShape(phase, validationPayload);
     validateOptionalWorkItemId(validationPayload, config.workItemId);
     const redactedPayload = redactSecrets(validationPayload, config.redactionSecrets ?? []);
@@ -793,6 +1100,133 @@ async function writeQaCompletionArtifact(config, payload, status, producedBy) {
         producedBy
     };
 }
+async function synthesizeQaCycleVerdictPayload(config, payload, status) {
+    const qaPlan = await readQaGateArtifact(config, "qa_plan");
+    const qaRegression = await readQaGateArtifact(config, "qa_regression");
+    const qaApi = await readQaGateArtifact(config, "qa_api");
+    const qaManualWeb = await readQaGateArtifact(config, "qa_manual_web");
+    const qaBugRepro = await readQaGateArtifact(config, "qa_bug_repro");
+    const qaFindings = await readQaGateArtifact(config, "qa_findings");
+    const evidenceGates = [qaRegression, qaApi, qaManualWeb, qaBugRepro];
+    const payloadEvidence = qaEvidenceSource(payload);
+    const merged = { ...payload };
+    const checklist = qaStringArray(payload, "checklist");
+    if (checklist.length === 0) {
+        const plannedChecklist = qaStringArray(qaPlan, "checklist");
+        merged.checklist = plannedChecklist.length > 0 ? plannedChecklist : defaultQaChecklist(status);
+    }
+    const testedAcceptanceCriteria = qaStringArray(payload, "tested_acceptance_criteria");
+    if (testedAcceptanceCriteria.length === 0) {
+        const plannedAcceptanceCriteria = qaStringArray(qaPlan, "acceptance_criteria");
+        const payloadAcceptanceCriteria = qaStringArray(payload, "acceptance_criteria");
+        const acceptanceCriteria = plannedAcceptanceCriteria.length > 0 ? plannedAcceptanceCriteria : payloadAcceptanceCriteria;
+        if (acceptanceCriteria.length > 0) {
+            merged.tested_acceptance_criteria = acceptanceCriteria;
+        }
+    }
+    const payloadCommands = qaArray(payload, "commands", payloadEvidence);
+    const inheritedCommands = evidenceGates.flatMap((gate) => qaArray(gate, "commands"));
+    const inheritedDiagnosticCommandNotes = status === "pass"
+        ? qaNonPassingCommandNotes(inheritedCommands)
+        : [];
+    merged.commands = dedupeUnknownArray([
+        ...payloadCommands,
+        ...(status === "pass" ? inheritedCommands.filter(isQaPassingCommandEvidence) : inheritedCommands)
+    ]);
+    merged.browser_checks = dedupeUnknownArray([
+        ...qaArray(payload, "browser_checks", payloadEvidence),
+        ...evidenceGates.flatMap((gate) => qaArray(gate, "browser_checks"))
+    ]);
+    merged.sidecars = dedupeUnknownArray([
+        ...qaArray(payload, "sidecars", payloadEvidence),
+        ...evidenceGates.flatMap((gate) => qaArray(gate, "sidecars"))
+    ]);
+    const notes = dedupeStrings([
+        optionalString(payload, "notes"),
+        optionalString(payloadEvidence, "notes"),
+        ...evidenceGates.map((gate) => optionalString(gate, "notes")),
+        ...inheritedDiagnosticCommandNotes
+    ]);
+    if (notes.length > 0) {
+        merged.notes = notes.join("\n");
+    }
+    merged.findings = mergeQaObjectArraysById(qaObjectArray(payload, "findings"), qaObjectArray(qaFindings, "findings"));
+    merged.candidate_bugs = mergeQaObjectArraysById(qaObjectArray(payload, "candidate_bugs"), qaObjectArray(qaFindings, "candidate_bugs"));
+    return merged;
+}
+async function readQaGateArtifact(config, gate) {
+    const ownerFields = artifactOwnerFields(config);
+    const artifactRoot = ownerFields.owner_type && ownerFields.owner_id
+        ? artifactRootForOwner(config.worktreePath, ownerFields.owner_type, ownerFields.owner_id)
+        : artifactRootFor(config.worktreePath, config.workItemId);
+    const artifactPath = path.join(artifactRoot, qaGateFileNames[gate]);
+    const content = await readOptionalFile(artifactPath);
+    return content === null ? {} : parseOptionalJsonObject(content, qaGateFileNames[gate]);
+}
+function dedupeUnknownArray(values) {
+    const seen = new Set();
+    const deduped = [];
+    for (const value of values) {
+        const key = stableStringify(value);
+        if (seen.has(key)) {
+            continue;
+        }
+        seen.add(key);
+        deduped.push(value);
+    }
+    return deduped;
+}
+function isQaPassingCommandEvidence(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return false;
+    }
+    const record = value;
+    return record.exit_code === 0 && normalizedString(record.status) === "pass";
+}
+function qaNonPassingCommandNotes(values) {
+    return values
+        .filter((value) => !isQaPassingCommandEvidence(value))
+        .map((value, index) => {
+        if (!value || typeof value !== "object" || Array.isArray(value)) {
+            return `QA diagnostic command ${index + 1} was omitted from pass evidence because it was not a structured passing command.`;
+        }
+        const record = value;
+        const command = optionalString(record, "command") ?? "<missing command>";
+        const status = optionalString(record, "status") ?? "<missing status>";
+        const exitCode = typeof record.exit_code === "number" && Number.isFinite(record.exit_code)
+            ? String(record.exit_code)
+            : "<missing exit_code>";
+        const summary = optionalString(record, "summary");
+        return `QA diagnostic command omitted from pass evidence: ${command} (status ${status}, exit_code ${exitCode})${summary ? ` — ${summary}` : ""}.`;
+    });
+}
+function mergeQaObjectArraysById(primary, fallback) {
+    const seen = new Set();
+    const merged = [];
+    for (const value of [...primary, ...fallback]) {
+        const id = optionalString(value, "id");
+        const key = id ? `id:${id}` : stableStringify(value);
+        if (seen.has(key)) {
+            continue;
+        }
+        seen.add(key);
+        merged.push(value);
+    }
+    return merged;
+}
+function dedupeStrings(values) {
+    const seen = new Set();
+    const deduped = [];
+    for (const value of values) {
+        const trimmed = value?.trim();
+        if (!trimmed || seen.has(trimmed)) {
+            continue;
+        }
+        seen.add(trimmed);
+        deduped.push(trimmed);
+    }
+    return deduped;
+}
 async function validateQaSidecarReferences(worktreePath, workItemId, sidecars, ownerType, ownerId) {
     if (sidecars.length === 0) {
         return [];
@@ -855,10 +1289,19 @@ export async function readCompletionArtifact(worktreePath, workItemId, phase, ow
     }
     const parsed = parseJsonObject(verdictJson, artifactPath);
     const report = await readOptionalFile(reportPath) ?? fallbackReport(parsed, phase, artifactPath);
+    const artifactRoot = path.dirname(artifactPath);
+    const implementationPlanJson = phase === "architect"
+        ? await readOptionalFile(path.join(artifactRoot, "implementation.plan.json"))
+        : null;
+    const qaPlanJson = phase === "architect"
+        ? await readOptionalFile(path.join(artifactRoot, "qa.plan.json"))
+        : null;
     return {
         repoPath: path.resolve(worktreePath),
         path: artifactPath,
         verdictJson,
+        implementationPlanJson,
+        qaPlanJson,
         report,
         producedBy: optionalString(parsed, "produced_by") ?? optionalString(parsed, "producedBy") ?? "forge-completion-tool",
         status: optionalString(parsed, "status") ?? "unknown",
@@ -897,6 +1340,8 @@ export function parseCompletionMcpArgs(argv) {
     let qaCycle = false;
     let debugCycle = false;
     let architectCycle = false;
+    let draftCycle = false;
+    let decomposeCycle = false;
     for (let index = 1; index < argv.length; index += 1) {
         const arg = argv[index];
         if (arg === "--worktree") {
@@ -918,7 +1363,7 @@ export function parseCompletionMcpArgs(argv) {
             const rawPhase = argv[++index];
             const parsedPhase = parseStrictCompletionPhase(rawPhase);
             if (!parsedPhase) {
-                return { ok: false, error: "mcp --phase must be one of: implementation, self-review, validation, qa, architect, debug-repro, debug-root-cause, debug-fix, debug-regression." };
+                return { ok: false, error: "mcp --phase must be one of: implementation, self-review, validation, qa, architect, draft, debug-repro, debug-root-cause, debug-fix, debug-regression." };
             }
             phase = parsedPhase;
         }
@@ -937,6 +1382,12 @@ export function parseCompletionMcpArgs(argv) {
         else if (arg === "--architect-cycle") {
             architectCycle = true;
         }
+        else if (arg === "--draft-cycle") {
+            draftCycle = true;
+        }
+        else if (arg === "--decompose-cycle") {
+            decomposeCycle = true;
+        }
         else {
             return { ok: false, error: `Unknown mcp argument: ${arg}` };
         }
@@ -944,7 +1395,7 @@ export function parseCompletionMcpArgs(argv) {
     if (!worktreePath?.trim() || !workItemId?.trim()) {
         return { ok: false, error: "mcp requires --worktree and --work-item-id." };
     }
-    if ([developCycle, qaCycle, debugCycle, architectCycle].filter(Boolean).length > 1) {
+    if ([developCycle, qaCycle, debugCycle, architectCycle, draftCycle, decomposeCycle].filter(Boolean).length > 1) {
         return { ok: false, error: "mcp accepts only one cycle mode." };
     }
     if (developCycle && !isDevelopCompletionPhase(phase)) {
@@ -959,6 +1410,12 @@ export function parseCompletionMcpArgs(argv) {
     if (architectCycle && phase !== "architect") {
         return { ok: false, error: "mcp --architect-cycle requires --phase architect." };
     }
+    if (draftCycle && phase !== "draft") {
+        return { ok: false, error: "mcp --draft-cycle requires --phase draft." };
+    }
+    if (decomposeCycle && phase !== "decompose") {
+        return { ok: false, error: "mcp --decompose-cycle requires --phase decompose." };
+    }
     return {
         ok: true,
         config: {
@@ -972,7 +1429,9 @@ export function parseCompletionMcpArgs(argv) {
             developCycle,
             qaCycle,
             debugCycle,
-            architectCycle
+            architectCycle,
+            draftCycle,
+            decomposeCycle
         }
     };
 }
@@ -1110,6 +1569,24 @@ function completionToolNextInstruction(completedPhase, status, nextPhase) {
     }
     return "Validation accepted. Forge has the structured evidence needed to move this work item to QA.";
 }
+function completionToolNextInstructionForDraftGate(completedGate, status, nextGate) {
+    if (status === "blocked") {
+        return `Stay in ${completedGate}; record the blocker and retry the same Draft gate when unblocked.`;
+    }
+    if (!nextGate) {
+        return "Draft proposal accepted. Forge has the structured Work Order draft JSON needed to populate the form.";
+    }
+    const instructions = {
+        draft_intent: "Capture intent/non-goals, then call forge.complete_draft_intent.",
+        draft_repo_context: "Inspect selected repo/project assumptions, then call forge.complete_draft_repo_context.",
+        draft_graph_context: "Account for DAG dependencies and placement, then call forge.complete_draft_graph_context.",
+        draft_product_scope: "Choose product scope for the selected project, then call forge.complete_draft_product_scope.",
+        draft_work_order_plan: "Draft Work Order fields and candidate Feature boundaries, then call forge.complete_draft_work_order_plan.",
+        draft_critic: "Critique literalism/wrong-project scope/decomposition risk, then call forge.complete_draft_critic.",
+        draft_proposal: "Submit final draft_json through forge.complete_draft_proposal."
+    };
+    return `${completedGate} accepted. Continue to ${nextGate}. ${instructions[nextGate]}`;
+}
 function completionToolNextInstructionForQaGate(completedGate, status, nextGate) {
     if (!nextGate) {
         if (status === "blocked") {
@@ -1129,6 +1606,24 @@ function completionToolNextInstructionForQaGate(completedGate, status, nextGate)
             : `${completedGate} accepted. Continue to ${nextGate}.`;
     return `${prefix} ${qaGateInstruction(nextGate)}`;
 }
+function completionToolNextInstructionForDecomposeGate(completedGate, status, nextGate) {
+    if (status !== "pass") {
+        return `Stay in ${completedGate}, address the recorded blockers/rework, then call ${expectedDecomposeCompletionToolName(completedGate)} again.`;
+    }
+    if (!nextGate) {
+        return "Decompose proposal accepted. Forge has the structured child-item proposal JSON needed to populate the proposal row.";
+    }
+    const nextInstructions = {
+        decompose_subject_intake: "Capture subject/scope, then call forge.complete_decompose_subject_intake.",
+        decompose_context_review: "Review project/repo/dependency context, then call forge.complete_decompose_context_review.",
+        decompose_breakdown_strategy: "Choose safe child boundaries, then call forge.complete_decompose_breakdown_strategy.",
+        decompose_child_items: "Draft child candidates, then call forge.complete_decompose_child_items.",
+        decompose_dependency_graph: "Validate dependency DAG, then call forge.complete_decompose_dependency_graph.",
+        decompose_critic: "Critique the decomposition, then call forge.complete_decompose_critic.",
+        decompose_proposal: "Submit final proposal_json through forge.complete_decompose_proposal."
+    };
+    return `${completedGate} accepted. ${nextInstructions[nextGate]}`;
+}
 function completionToolNextInstructionForDebugGate(completedGate, status, nextGate) {
     if (status !== "pass") {
         return `Stay in ${completedGate}, address the recorded blockers, then call ${expectedDebugCompletionToolName(completedGate)} again.`;
@@ -1425,7 +1920,7 @@ function toolInputSchema(phase, qaGate = null) {
                     },
                     tasks: {
                         type: "array",
-                        description: "Required task list. Each task must include id and a non-empty tests array.",
+                        description: "Required Develop child task list. Each task must include id and a non-empty tests array, and must require a focused repo/product implementation change. Do not put parent-story QA/sign-off, child-count/materialization inventory, parent plan artifact checks, or final acceptance proof here; those belong in qa_plan.final_qa.",
                         items: { type: "object", additionalProperties: true }
                     },
                     dependencies: {
@@ -1881,6 +2376,7 @@ function validateQaGatePayloadShape(gate, payload, status) {
         if (commands.length === 0) {
             throw new Error(`${qaGateToolNames[gate]} pass requires commands with at least one entry.`);
         }
+        validateQaGatePassingCommands(commands);
     }
     if (gate === "qa_manual_web" && status === "pass") {
         const browserChecks = qaArray(payload, "browser_checks");
@@ -1890,6 +2386,24 @@ function validateQaGatePayloadShape(gate, payload, status) {
         }
     }
 }
+function validateQaGatePassingCommands(commands) {
+    for (const [index, command] of commands.entries()) {
+        requireEvidenceRecord(command, `commands[${index}]`);
+        const record = command;
+        requireNonEmptyStringRecord(record, "command", `commands[${index}].`);
+        requireNonEmptyStringRecord(record, "status", `commands[${index}].`);
+        requireNonEmptyStringRecord(record, "summary", `commands[${index}].`);
+        if (typeof record.exit_code !== "number" || !Number.isFinite(record.exit_code)) {
+            throw new Error(`commands[${index}].exit_code is required.`);
+        }
+        if (record.exit_code !== 0) {
+            throw new Error(`commands[${index}].exit_code must be 0 when QA gate status is pass.`);
+        }
+        if (normalizedString(record.status) !== "pass") {
+            throw new Error(`commands[${index}].status must be pass when QA gate status is pass.`);
+        }
+    }
+}
 function validateArchitectPayloadShape(payload, status) {
     if (status !== "pass") {
         requireArchitectNonPassEvidence(payload);
@@ -1918,6 +2432,7 @@ function validateArchitectPayloadShape(payload, status) {
             throw new Error(`implementation_plan.tasks: duplicate task id '${taskId}'.`);
         }
         taskIds.add(taskId);
+        validateArchitectTaskDevelopScope(taskRecord, taskId);
         requireArchitectArray(taskRecord, "tests", payload, { path: `implementation_plan.tasks[${optionalString(taskRecord, "id") ?? "?"}].tests` });
         if (arrayLength(taskRecord, "tests") === 0) {
             throw new Error(`implementation_plan.tasks[${optionalString(taskRecord, "id") ?? "?"}].tests: expected non-empty array; correction: include task-specific verification.`);
@@ -1930,6 +2445,124 @@ function validateArchitectPayloadShape(payload, status) {
         throw new Error("qa_plan.final_qa: expected non-empty array; correction: include final QA coverage for the completed plan.");
     }
 }
+function validateArchitectTaskDevelopScope(task, taskId) {
+    const explicitScope = firstOptionalString(task, ["execution_scope", "scope", "task_scope", "task_type", "lane", "kind", "type"]);
+    if (isStoryQaScope(explicitScope)) {
+        throw new Error(`implementation_plan.tasks[${taskId}]: story QA/sign-off work must not be materialized as a Develop child task; correction: move this coverage to qa_plan.final_qa and keep implementation_plan.tasks limited to repo/product changes.`);
+    }
+    if (looksLikeStoryLevelVerificationTask(architectTaskScopeText(task))) {
+        throw new Error(`implementation_plan.tasks[${taskId}]: parent-story materialization or sign-off verification belongs in qa_plan.final_qa, not implementation_plan.tasks; correction: keep child tasks focused on implementation work and put child-count/parent-plan artifact checks in final QA coverage.`);
+    }
+}
+function firstOptionalString(record, keys) {
+    for (const key of keys) {
+        const value = optionalString(record, key);
+        if (value) {
+            return value;
+        }
+    }
+    return null;
+}
+function isStoryQaScope(value) {
+    if (!value) {
+        return false;
+    }
+    const normalized = value.trim().toLowerCase().replace(/[\s-]+/g, "_");
+    return [
+        "qa",
+        "story_qa",
+        "final_qa",
+        "sign_off",
+        "signoff",
+        "story_sign_off",
+        "story_verification",
+        "story_validation"
+    ].includes(normalized);
+}
+function architectTaskScopeText(task) {
+    const parts = [];
+    for (const key of ["id", "title", "summary", "phase", "phase_id"]) {
+        appendOptionalString(parts, task, key);
+    }
+    for (const key of ["acceptance_criteria", "expected_paths", "touched_surfaces", "implementation_notes"]) {
+        appendOptionalStringArray(parts, task, key);
+    }
+    const tests = task.tests;
+    if (Array.isArray(tests)) {
+        for (const test of tests) {
+            if (!test || typeof test !== "object" || Array.isArray(test)) {
+                continue;
+            }
+            const record = test;
+            for (const key of ["id", "command", "purpose", "target", "expected"]) {
+                appendOptionalString(parts, record, key);
+            }
+            appendOptionalStringArray(parts, record, "steps");
+        }
+    }
+    return parts.join(" ");
+}
+function appendOptionalString(parts, record, key) {
+    const value = optionalString(record, key);
+    if (value) {
+        parts.push(value);
+    }
+}
+function appendOptionalStringArray(parts, record, key) {
+    const value = record[key];
+    if (!Array.isArray(value)) {
+        return;
+    }
+    for (const entry of value) {
+        if (typeof entry === "string" && entry.trim().length > 0) {
+            parts.push(entry.trim());
+        }
+    }
+}
+function looksLikeStoryLevelVerificationTask(text) {
+    if (!text.trim()) {
+        return false;
+    }
+    const normalized = text.toLowerCase();
+    const verificationWords = [
+        "verify",
+        "verification",
+        "validate",
+        "validation",
+        "inspect",
+        "audit",
+        "check",
+        "confirm",
+        "prove",
+        "evidence",
+        "sign-off",
+        "sign off"
+    ];
+    if (!verificationWords.some((word) => normalized.includes(word))) {
+        return false;
+    }
+    return [
+        "materialization",
+        "materialized child",
+        "child inventory",
+        "child work-item",
+        "child work item",
+        "created task count",
+        "created_task_count",
+        "parent plan",
+        "parent story",
+        "story sign-off",
+        "story sign off",
+        ".forge/work-items",
+        ".forge\\work-items",
+        ".forge/stories",
+        ".forge\\stories",
+        "implementation.plan.json",
+        "qa.plan.json",
+        "architect plan artifact",
+        "child spec"
+    ].some((needle) => normalized.includes(needle));
+}
 function validateAndNormalizeArchitectDependencies(implementationPlan, taskIds) {
     const dependencies = implementationPlan.dependencies;
     const edges = new Map();
@@ -2251,6 +2884,12 @@ function parseStrictCompletionPhase(value) {
     if (normalized === "architect" || normalized === "architect_plan" || normalized === "planning" || normalized === "plan") {
         return "architect";
     }
+    if (normalized === "draft" || normalized === "drafting" || normalized === "draft_work_order") {
+        return "draft";
+    }
+    if (normalized === "decompose" || normalized === "decomposition" || normalized === "work_order_decomposition" || normalized === "feature_decomposition") {
+        return "decompose";
+    }
     return null;
 }
 function normalizeDebugCompletionPhase(value) {
@@ -2322,6 +2961,12 @@ function phaseFromToolName(toolName) {
     if (normalized === "forge.complete_architect_plan" || normalized === "complete_architect_plan") {
         return "architect";
     }
+    if (draftGateFromToolName(toolName)) {
+        return "draft";
+    }
+    if (decomposeGateFromToolName(toolName)) {
+        return "decompose";
+    }
     const debugGate = debugGateFromToolName(toolName);
     if (debugGate) {
         return debugGate;
@@ -2331,6 +2976,32 @@ function phaseFromToolName(toolName) {
     }
     throw new Error(`Unknown Forge completion tool: ${toolName}`);
 }
+function draftGateFromToolName(toolName) {
+    const normalized = toolName.trim().toLowerCase();
+    for (const gate of draftCompletionGateOrder) {
+        const base = draftGateToolNames[gate];
+        if (normalized === `forge.${base}` || normalized === base) {
+            return gate;
+        }
+    }
+    return null;
+}
+function decomposeGateFromToolName(toolName) {
+    for (const gate of decomposeCompletionGateOrder) {
+        const base = decomposeGateToolNames[gate];
+        if (toolName === base || toolName === `forge.${base}`) {
+            return gate;
+        }
+    }
+    return null;
+}
+function isDecomposeDispatch(dispatch) {
+    const draftKind = dispatch.draft?.kind?.trim().toLowerCase();
+    return dispatch.execution.lane.trim().toLowerCase() === "decompose"
+        || dispatch.session.lane.trim().toLowerCase() === "decompose"
+        || draftKind === "work_order_decomposition"
+        || draftKind === "feature_decomposition";
+}
 function debugGateFromToolName(toolName) {
     const normalized = toolName.trim().toLowerCase();
     for (const gate of debugCompletionPhaseOrder) {