@smartmemory/compose 0.2.8-beta → 0.2.10-beta

package/lib/step-prompt.js

@@ -162,6 +162,12 @@ function buildConflictSection(conflicts) {
   return lines.join('\n');
 }
 
+// COMP-PAR-MERGE-QUEUE note: pre-merge bounce context (gate_failed / merge_conflict)
+// is injected into a re-dispatched task's prompt SERVER-SIDE, in Stratum's
+// ParallelExecutor._render_prompt — because the server re-resolves the task list
+// from flow state on each re-dispatch, so a Compose-side prompt edit here would
+// never reach the re-run task. See parallel_exec.py `_format_bounce_for_prompt`.
+
 /**
  * Build a retry prompt when postconditions failed.
  *

package/lib/stratum-mcp-client.js

@@ -444,7 +444,9 @@ export class StratumMcpClient {
    *
    * @param {string} flowId
    * @param {string} stepId
-   * @param {'clean'|'conflict'} mergeStatus
+   * @param {'clean'|'conflict'|{status:'clean'|'conflict',bounced_tasks?:object[]}} mergeStatus
+   *   COMP-PAR-MERGE-QUEUE: either a bare status string (back-compat) or a
+   *   structured object carrying merge_conflict bounce records. Serializes as-is.
    * @returns {Promise<object>}
    */
   async parallelAdvance(flowId, stepId, mergeStatus) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartmemory/compose",
-  "version": "0.2.8-beta",
+  "version": "0.2.10-beta",
   "description": "Structured AI dev pipeline — goal-to-product orchestration with gates, iteration loops, and feature lifecycle management.",
   "author": "SmartMemory",
   "license": "MIT",

package/pipelines/gsd.stratum.yaml

@@ -18,6 +18,9 @@ workflow:
     gateCommands:
       type: array
       required: true   # injected by runGsd from loadProjectConfig() with default fallback
+    pre_merge_gate:
+      type: array
+      required: false  # COMP-PAR-MERGE-QUEUE: fast per-task enforced gate (lint+build); injected by runGsd
 
 contracts:
   PhaseResult:
@@ -36,6 +39,7 @@ flows:
     input:
       featureCode: {type: string}
       gateCommands: {type: array}
+      pre_merge_gate: {type: array}   # COMP-PAR-MERGE-QUEUE
     output: PhaseResult
     max_rounds: 10
     steps:
@@ -61,7 +65,7 @@ flows:
             - "Upstream tasks (spec-level summary; their code lands at end-of-step
               merge):" + one line per upstream task listing its declared produces
             - "GATES — you MUST run each command and they MUST pass before
-              declaring done:" + each command from the gateCommands array
+              declaring done:" + each command from the pre_merge_gate array
             - "Fix and re-run within this invocation. Do NOT declare done while
               gates are red."
 
@@ -75,10 +79,12 @@ flows:
           has no matching task or its File Plan files are split across
           multiple tasks.
 
-          gateCommands to embed: {input.gateCommands}
+          pre_merge_gate commands to embed (the fast per-task gate; the full
+          test suite runs once at ship): {input.pre_merge_gate}
         inputs:
-          featureCode:  "$.input.featureCode"
-          gateCommands: "$.input.gateCommands"
+          featureCode:    "$.input.featureCode"
+          gateCommands:   "$.input.gateCommands"
+          pre_merge_gate: "$.input.pre_merge_gate"
         output_contract: TaskGraph
         ensure:
           - "no_file_conflicts(result.tasks)"
@@ -93,6 +99,8 @@ flows:
         max_concurrent: 1
         isolation: worktree
         capture_diff: true
+        defer_advance: true   # COMP-PAR-MERGE-QUEUE: consumer merges + reports status, enabling conflict-bounce
+        pre_merge_verify: "$.input.pre_merge_gate"   # COMP-PAR-MERGE-QUEUE: enforced fast gate per task worktree
         require: all
         merge: sequential_apply
         retries: 2

package/dist/assets/channel-D_RXsFFT.js

@@ -1 +0,0 @@
-import{ai as o,aj as n}from"./App-D3ehVPvi.js";const t=(a,r)=>o.lang.round(n.parse(a)[r]);export{t as c};

package/dist/assets/classDiagram-4FO5ZUOK-K6wdB4ic.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-727SXJPM-fAH0QO9v.js";import{_ as i}from"./App-D3ehVPvi.js";import"./chunk-FMBD7UC4-BnboGO5t.js";import"./chunk-ND2GUHAM-Di9tYXme.js";import"./chunk-55IACEB6-Dsy9RYvI.js";import"./chunk-2J33WTMH-CKk_RN3A.js";import"./mobile-CG5tLa2S.js";import"./index-ClX6LVAf.js";import"./graph-Cs_vqCR0.js";var b={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{b as diagram};

package/dist/assets/classDiagram-v2-Q7XG4LA2-K6wdB4ic.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-727SXJPM-fAH0QO9v.js";import{_ as i}from"./App-D3ehVPvi.js";import"./chunk-FMBD7UC4-BnboGO5t.js";import"./chunk-ND2GUHAM-Di9tYXme.js";import"./chunk-55IACEB6-Dsy9RYvI.js";import"./chunk-2J33WTMH-CKk_RN3A.js";import"./mobile-CG5tLa2S.js";import"./index-ClX6LVAf.js";import"./graph-Cs_vqCR0.js";var b={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{b as diagram};

package/dist/assets/stateDiagram-v2-BHNVJYJU-Cf84VDiH.js

@@ -1 +0,0 @@
-import{s as r,b as e,a,S as s}from"./chunk-AQP2D5EJ-DyZYerFP.js";import{_ as i}from"./App-D3ehVPvi.js";import"./chunk-55IACEB6-Dsy9RYvI.js";import"./chunk-2J33WTMH-CKk_RN3A.js";import"./mobile-CG5tLa2S.js";import"./index-ClX6LVAf.js";import"./graph-Cs_vqCR0.js";var n={parser:a,get db(){return new s(2)},renderer:e,styles:r,init:i(t=>{t.state||(t.state={}),t.state.arrowMarkerAbsolute=t.arrowMarkerAbsolute},"init")};export{n as diagram};