@zigrivers/scaffold 3.24.2 → 3.24.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/commands/complete.d.ts.map +1 -1
- package/dist/cli/commands/complete.js +7 -0
- package/dist/cli/commands/complete.js.map +1 -1
- package/dist/cli/commands/next.d.ts.map +1 -1
- package/dist/cli/commands/next.js +47 -15
- package/dist/cli/commands/next.js.map +1 -1
- package/dist/cli/commands/next.test.js +184 -0
- package/dist/cli/commands/next.test.js.map +1 -1
- package/dist/cli/commands/reset.d.ts.map +1 -1
- package/dist/cli/commands/reset.js +7 -0
- package/dist/cli/commands/reset.js.map +1 -1
- package/dist/cli/commands/run.d.ts.map +1 -1
- package/dist/cli/commands/run.js +10 -0
- package/dist/cli/commands/run.js.map +1 -1
- package/dist/cli/commands/run.test.js +1 -0
- package/dist/cli/commands/run.test.js.map +1 -1
- package/dist/cli/commands/skip.d.ts.map +1 -1
- package/dist/cli/commands/skip.js +10 -0
- package/dist/cli/commands/skip.js.map +1 -1
- package/dist/cli/commands/skip.test.js +61 -0
- package/dist/cli/commands/skip.test.js.map +1 -1
- package/dist/cli/commands/status.d.ts.map +1 -1
- package/dist/cli/commands/status.js +102 -46
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/status.test.js +294 -10
- package/dist/cli/commands/status.test.js.map +1 -1
- package/dist/core/pipeline/reconcile-input.d.ts +28 -0
- package/dist/core/pipeline/reconcile-input.d.ts.map +1 -0
- package/dist/core/pipeline/reconcile-input.js +46 -0
- package/dist/core/pipeline/reconcile-input.js.map +1 -0
- package/dist/core/pipeline/reconcile-input.test.d.ts +2 -0
- package/dist/core/pipeline/reconcile-input.test.d.ts.map +1 -0
- package/dist/core/pipeline/reconcile-input.test.js +117 -0
- package/dist/core/pipeline/reconcile-input.test.js.map +1 -0
- package/dist/state/state-manager.d.ts.map +1 -1
- package/dist/state/state-manager.js +6 -0
- package/dist/state/state-manager.js.map +1 -1
- package/dist/state/state-manager.test.js +19 -0
- package/dist/state/state-manager.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/complete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/complete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,OAAO,CAAA;AAehD,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,CA8IzE,CAAA;AAED,eAAe,eAAe,CAAA"}
|
|
@@ -6,6 +6,7 @@ import { acquireLock, getLockPath, releaseLock } from '../../state/lock-manager.
|
|
|
6
6
|
import { findClosestMatch } from '../../utils/levenshtein.js';
|
|
7
7
|
import { loadPipelineContext } from '../../core/pipeline/context.js';
|
|
8
8
|
import { resolvePipeline } from '../../core/pipeline/resolver.js';
|
|
9
|
+
import { pipelineStepsForReconcile } from '../../core/pipeline/reconcile-input.js';
|
|
9
10
|
import { shutdown } from '../shutdown.js';
|
|
10
11
|
import { guardStepCommand } from '../guards.js';
|
|
11
12
|
import { StatePathResolver } from '../../state/state-path-resolver.js';
|
|
@@ -68,6 +69,12 @@ const completeCommand = {
|
|
|
68
69
|
}
|
|
69
70
|
}, async () => {
|
|
70
71
|
const stateManager = new StateManager(projectRoot, pipeline.computeEligible, () => context.config ?? undefined, pathResolver, pipeline.globalSteps, pipeline.getPipelineHash(service ? 'service' : 'global'));
|
|
72
|
+
// Reconcile state with the current pipeline before the existence
|
|
73
|
+
// check — `scaffold complete <new-step>` should work for a step
|
|
74
|
+
// added in a recent scaffold upgrade, even though status/next no
|
|
75
|
+
// longer reconcile on read (see v3.24.3 / PR #311). The helper
|
|
76
|
+
// handles scope filtering for service / multi-service-root / flat.
|
|
77
|
+
stateManager.reconcileWithPipeline(pipelineStepsForReconcile(context, pipeline, service));
|
|
71
78
|
const state = stateManager.loadState();
|
|
72
79
|
// Check step exists in state
|
|
73
80
|
if (!(argv.step in state.steps)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete.js","sourceRoot":"","sources":["../../../src/cli/commands/complete.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AAYtE,MAAM,eAAe,GAAyD;IAC5E,OAAO,EAAE,iBAAiB;IAC1B,QAAQ,EAAE,oEAAoE;IAC9E,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,KAAK;aACT,UAAU,CAAC,MAAM,EAAE;YAClB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;YAC7C,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,8CAA8C;SACzD,CAAkC,CAAA;IACvC,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAA;YAC/F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACf,OAAM;QACR,CAAC;QAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,MAAM,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAA;QAE9C,MAAM,OAAO,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,OAA6B,CAAA;QAClD,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;QAEzE,oCAAoC;QACpC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAEpE,gDAAgD;QAChD,gBAAgB,CACd,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,CACpG,CAAA;QACD,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC;YAAE,OAAM;QAElC,eAAe;QACf,MAAM,YAAY,GAAG,IAAI,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAChE,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QAChF,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACxC,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YACtE,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;YAChD,CAAC;YACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAM;QACR,CAAC;QAED,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;YAC3D,QAAQ,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAA;QAC9C,CAAC;QAED,MAAM,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE;YACvC,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACxB,MAAM,YAAY,GAAG,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;gBAC3D,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;gBACtC,QAAQ,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;YAC7C,CAAC;QACH,CAAC,EAAE,KAAK,IAAI,EAAE;YACZ,MAAM,YAAY,GAAG,IAAI,YAAY,CACnC,WAAW,EACX,QAAQ,CAAC,eAAe,EACxB,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,IAAI,SAAS,EACjC,YAAY,EACZ,QAAQ,CAAC,WAAW,EACpB,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CACzD,CAAA;YACD,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,EAAE,CAAA;YAEtC,6BAA6B;YAC7B,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;gBACxE,MAAM,GAAG,GAAG,UAAU;oBACpB,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,8BAA8B,UAAU,IAAI;oBAChE,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,aAAa,CAAA;gBACnC,MAAM,CAAC,KAAK,CAAC;oBACX,IAAI,EAAE,oBAAoB;oBAC1B,OAAO,EAAE,GAAG;oBACZ,QAAQ,EAAE,CAAC;oBACX,QAAQ,EAAE,4CAA4C;iBACvD,CAAC,CAAA;gBACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;gBACpB,OAAM;YACR,CAAC;YAED,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAExC,8CAA8C;YAC9C,IAAI,SAAS,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBACrC,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;oBAC1B,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAA;gBACjF,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,wBAAwB,CAAC,CAAA;gBACzD,CAAC;gBACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;gBACpB,OAAM;YACR,CAAC;YAED,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CAAA;YAEvC,oBAAoB;YACpB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;gBACvB,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,UAAU;gBACtC,QAAQ,EAAE,SAAS,CAAC,QAAQ,IAAI,EAAE;gBAClC,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBAC5B,YAAY,EAAE,MAAM;aACrB,CAAA;YAED,+CAA+C;YAC/C,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC1C,KAAK,CAAC,WAAW,GAAG,IAAI,CAAA;YAC1B,CAAC;YAED,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAE7B,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gBAC1B,MAAM,CAAC,MAAM,CAAC;oBACZ,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,cAAc;oBACd,SAAS,EAAE,WAAW;iBACvB,CAAC,CAAA;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,8BAA8B,cAAc,GAAG,CAAC,CAAA;gBACjF,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAA;YAC1D,CAAC;YACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACtB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAED,eAAe,eAAe,CAAA"}
|
|
1
|
+
{"version":3,"file":"complete.js","sourceRoot":"","sources":["../../../src/cli/commands/complete.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/next.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAgB1C,UAAU,QAAQ;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,QAAA,MAAM,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/next.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAgB1C,UAAU,QAAQ;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,QAAA,MAAM,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CA+KjE,CAAA;AAED,eAAe,WAAW,CAAA"}
|
|
@@ -47,20 +47,23 @@ const nextCommand = {
|
|
|
47
47
|
return;
|
|
48
48
|
const pathResolver = new StatePathResolver(projectRoot, service);
|
|
49
49
|
const stateManager = new StateManager(projectRoot, pipeline.computeEligible, () => context.config ?? undefined, pathResolver, pipeline.globalSteps, pipeline.getPipelineHash(service ? 'service' : 'global'));
|
|
50
|
-
//
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
enabled: pipeline.overlay.steps[m.frontmatter.name]?.enabled ?? false,
|
|
58
|
-
}));
|
|
59
|
-
stateManager.reconcileWithPipeline(pipelineSteps);
|
|
50
|
+
// `scaffold next` is a read-only inspection. We deliberately do NOT
|
|
51
|
+
// call reconcileWithPipeline here — eligibility is derived live from
|
|
52
|
+
// the pipeline graph + state, and `computeEligible` treats steps
|
|
53
|
+
// missing from state as pending (the same default reconcile would
|
|
54
|
+
// pre-populate). Skipping reconcile prevents committed state.json
|
|
55
|
+
// from churning every time the user runs `scaffold next` after a
|
|
56
|
+
// version upgrade or methodology change.
|
|
60
57
|
const state = stateManager.loadState();
|
|
58
|
+
// Multi-service root: when config defines services[] and no
|
|
59
|
+
// --service was passed, root state holds only global steps; tell
|
|
60
|
+
// computeEligible to filter to globals-only via scope: 'global'.
|
|
61
|
+
const isMultiServiceRoot = !service && (context.config?.project?.services?.length ?? 0) > 0;
|
|
61
62
|
const scopeOptions = service
|
|
62
63
|
? { scope: 'service', globalSteps: pipeline.globalSteps }
|
|
63
|
-
:
|
|
64
|
+
: isMultiServiceRoot
|
|
65
|
+
? { scope: 'global', globalSteps: pipeline.globalSteps }
|
|
66
|
+
: undefined;
|
|
64
67
|
const eligible = readEligible(state, pipeline, scopeOptions, service ? () => readRootSaveCounter(projectRoot) : undefined);
|
|
65
68
|
// 4. Apply --count limit
|
|
66
69
|
const count = argv.count ?? eligible.length;
|
|
@@ -78,10 +81,39 @@ const nextCommand = {
|
|
|
78
81
|
crossDepMap.set(slug, resolveCrossReadReadiness(crossReads, context.config, projectRoot, pipeline.globalSteps, sharedForeignCache));
|
|
79
82
|
}
|
|
80
83
|
}
|
|
81
|
-
// 5. Check pipeline completion
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
84
|
+
// 5. Check pipeline completion. Now that we don't reconcile, the
|
|
85
|
+
// pipeline-graph is the source of truth for "what steps exist";
|
|
86
|
+
// state may have no entry for newly-enabled steps. Compute from
|
|
87
|
+
// the enabled pipeline ∩ state intersection: pending if missing
|
|
88
|
+
// or status === 'pending', done if 'completed' or 'skipped'.
|
|
89
|
+
//
|
|
90
|
+
// "Enabled" = explicitly set to `true` in the overlay (presets
|
|
91
|
+
// enumerate every known pipeline step, so a step absent from
|
|
92
|
+
// overlay is "not in this project"). This matches the prior
|
|
93
|
+
// reconciliation default (`?? false`).
|
|
94
|
+
//
|
|
95
|
+
// Scope-aware filter — three modes (matches readEligible scope
|
|
96
|
+
// above):
|
|
97
|
+
// - service mode (--service <name>): exclude global steps.
|
|
98
|
+
// - multi-service root mode (config.services[] present, no
|
|
99
|
+
// --service): include only global steps; service-local steps
|
|
100
|
+
// live in per-service state and shouldn't gate root completion.
|
|
101
|
+
// - flat / single-project mode: include everything.
|
|
102
|
+
const inScope = (slug) => {
|
|
103
|
+
if (service)
|
|
104
|
+
return !pipeline.globalSteps.has(slug);
|
|
105
|
+
if (isMultiServiceRoot)
|
|
106
|
+
return pipeline.globalSteps.has(slug);
|
|
107
|
+
return true;
|
|
108
|
+
};
|
|
109
|
+
const enabledPipelineSlugs = [...context.metaPrompts.keys()]
|
|
110
|
+
.filter(slug => pipeline.overlay.steps[slug]?.enabled === true)
|
|
111
|
+
.filter(inScope);
|
|
112
|
+
const allDone = enabledPipelineSlugs.length > 0 &&
|
|
113
|
+
enabledPipelineSlugs.every(slug => {
|
|
114
|
+
const status = state.steps[slug]?.status;
|
|
115
|
+
return status === 'completed' || status === 'skipped';
|
|
116
|
+
});
|
|
85
117
|
if (outputMode === 'json') {
|
|
86
118
|
output.result({
|
|
87
119
|
eligible: shown.map(s => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next.js","sourceRoot":"","sources":["../../../src/cli/commands/next.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AACtE,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACpG,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAA;AAaxE,MAAM,WAAW,GAAqD;IACpE,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,4BAA4B;IACtC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,KAAK;aACT,MAAM,CAAC,OAAO,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,kCAAkC;SAChD,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,8CAA8C;SACzD,CAAC,CAAA;IACN,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,0BAA0B;QAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,oEAAoE,CACrE,CAAA;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,sDAAsD,CACvD,CAAA;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACf,OAAM;QACR,CAAC;QAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,MAAM,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAA;QAE9C,qDAAqD;QACrD,MAAM,OAAO,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,OAA6B,CAAA;QAClD,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;QAEzE,oCAAoC;QACpC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAEpE,cAAc;QACd,oBAAoB,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;QACpF,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC;YAAE,OAAM;QAElC,MAAM,YAAY,GAAG,IAAI,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAChE,MAAM,YAAY,GAAG,IAAI,YAAY,CACnC,WAAW,EACX,QAAQ,CAAC,eAAe,EACxB,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,IAAI,SAAS,EACjC,YAAY,EACZ,QAAQ,CAAC,WAAW,EACpB,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CACzD,CAAA;QAED,
|
|
1
|
+
{"version":3,"file":"next.js","sourceRoot":"","sources":["../../../src/cli/commands/next.ts"],"names":[],"mappings":"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"}
|
|
@@ -180,7 +180,191 @@ describe('next command', () => {
|
|
|
180
180
|
await nextCommand.handler(defaultArgv());
|
|
181
181
|
expect(exitSpy).toHaveBeenCalledWith(1);
|
|
182
182
|
});
|
|
183
|
+
it('does NOT call reconcileWithPipeline — next is a read-only inspection', async () => {
|
|
184
|
+
// `scaffold next` must not modify state.json (avoids unwanted git
|
|
185
|
+
// diffs from running an inspection command). Eligibility is computed
|
|
186
|
+
// live from the pipeline graph + state, with no need to pre-populate
|
|
187
|
+
// pending entries for new steps.
|
|
188
|
+
const reconcileFn = vi.fn(() => false);
|
|
189
|
+
MockStateManager.mockImplementation(() => ({
|
|
190
|
+
loadState: vi.fn(() => makeState({ steps: {} })),
|
|
191
|
+
reconcileWithPipeline: reconcileFn,
|
|
192
|
+
}));
|
|
193
|
+
await nextCommand.handler(defaultArgv());
|
|
194
|
+
expect(reconcileFn).not.toHaveBeenCalled();
|
|
195
|
+
});
|
|
196
|
+
it('pipeline_complete in multi-service root mode (no --service) limits to global steps', async () => {
|
|
197
|
+
// Round-4 Codex P1: in a multi-service project, root state holds
|
|
198
|
+
// only global steps. Without restricting completion to globals,
|
|
199
|
+
// the handler would check every enabled pipeline slug and report
|
|
200
|
+
// pipeline_complete: false forever because per-service steps are
|
|
201
|
+
// tracked in service state, not root state.
|
|
202
|
+
vi.mocked(loadConfig).mockReturnValue({
|
|
203
|
+
config: {
|
|
204
|
+
version: 2, methodology: 'deep', platforms: ['claude-code'],
|
|
205
|
+
project: {
|
|
206
|
+
services: [
|
|
207
|
+
{ name: 'api', projectType: 'backend', backendConfig: { apiStyle: 'rest' } },
|
|
208
|
+
],
|
|
209
|
+
},
|
|
210
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
211
|
+
},
|
|
212
|
+
errors: [], warnings: [],
|
|
213
|
+
});
|
|
214
|
+
const metaPrompts = new Map([
|
|
215
|
+
['global-step', makeFrontmatter('global-step', 'g', 'pre', 1)],
|
|
216
|
+
['service-step', makeFrontmatter('service-step', 's', 'pre', 2)],
|
|
217
|
+
]);
|
|
218
|
+
mockDiscoverMetaPrompts.mockReturnValue(metaPrompts);
|
|
219
|
+
vi.mocked(resolvePipeline).mockReturnValueOnce({
|
|
220
|
+
graph: { nodes: new Map(), edges: new Map() },
|
|
221
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
222
|
+
preset: {},
|
|
223
|
+
overlay: {
|
|
224
|
+
steps: { 'global-step': { enabled: true }, 'service-step': { enabled: true } },
|
|
225
|
+
knowledge: {}, reads: {}, dependencies: {}, crossReads: {},
|
|
226
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
227
|
+
},
|
|
228
|
+
stepMeta: new Map([
|
|
229
|
+
['global-step', makeFrontmatter('global-step', 'g', 'pre', 1).frontmatter],
|
|
230
|
+
['service-step', makeFrontmatter('service-step', 's', 'pre', 2).frontmatter],
|
|
231
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
232
|
+
]),
|
|
233
|
+
computeEligible: mockComputeEligible,
|
|
234
|
+
globalSteps: new Set(['global-step']),
|
|
235
|
+
getPipelineHash: vi.fn((_scope) => 'test-hash-multi'),
|
|
236
|
+
});
|
|
237
|
+
// Root state has only global-step completed. service-step lives
|
|
238
|
+
// in per-service state, absent here.
|
|
239
|
+
const steps = {
|
|
240
|
+
'global-step': { status: 'completed', source: 'pipeline', produces: [] },
|
|
241
|
+
};
|
|
242
|
+
mockStateWith(MockStateManager, steps);
|
|
243
|
+
mockComputeEligible.mockReturnValue([]);
|
|
244
|
+
mockResolveOutputMode.mockReturnValue('json');
|
|
245
|
+
await nextCommand.handler(defaultArgv({ format: 'json' }));
|
|
246
|
+
const envelope = JSON.parse(writtenLines.join(''));
|
|
247
|
+
const parsed = envelope.data ?? envelope;
|
|
248
|
+
expect(parsed.pipeline_complete).toBe(true);
|
|
249
|
+
});
|
|
250
|
+
it('pipeline_complete in --service mode excludes global steps', async () => {
|
|
251
|
+
// Round-3 Codex P1: service-scoped state intentionally omits global
|
|
252
|
+
// steps. With reconcile dropped, allDone was computed across every
|
|
253
|
+
// enabled pipeline slug — so a completed service pipeline could
|
|
254
|
+
// report `pipeline_complete: false` purely because the global step
|
|
255
|
+
// had no entry in service state.
|
|
256
|
+
vi.mocked(loadConfig).mockReturnValue({
|
|
257
|
+
config: {
|
|
258
|
+
version: 2, methodology: 'deep', platforms: ['claude-code'],
|
|
259
|
+
project: {
|
|
260
|
+
services: [
|
|
261
|
+
{ name: 'api', projectType: 'backend', backendConfig: { apiStyle: 'rest' } },
|
|
262
|
+
],
|
|
263
|
+
},
|
|
264
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
265
|
+
},
|
|
266
|
+
errors: [], warnings: [],
|
|
267
|
+
});
|
|
268
|
+
vi.mocked(resolveOverlayState).mockReturnValue({
|
|
269
|
+
steps: {
|
|
270
|
+
'service-step': { enabled: true },
|
|
271
|
+
'global-step': { enabled: true },
|
|
272
|
+
},
|
|
273
|
+
knowledge: {}, reads: {}, dependencies: {}, crossReads: {},
|
|
274
|
+
});
|
|
275
|
+
const metaPrompts = new Map([
|
|
276
|
+
['service-step', makeFrontmatter('service-step', 's', 'pre', 1)],
|
|
277
|
+
['global-step', makeFrontmatter('global-step', 'g', 'pre', 2)],
|
|
278
|
+
]);
|
|
279
|
+
mockDiscoverMetaPrompts.mockReturnValue(metaPrompts);
|
|
280
|
+
// Make resolvePipeline mark global-step as global so the service-mode
|
|
281
|
+
// filter excludes it from the completion check.
|
|
282
|
+
vi.mocked(resolvePipeline).mockReturnValueOnce({
|
|
283
|
+
graph: { nodes: new Map(), edges: new Map() },
|
|
284
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
285
|
+
preset: {},
|
|
286
|
+
overlay: {
|
|
287
|
+
steps: { 'service-step': { enabled: true }, 'global-step': { enabled: true } },
|
|
288
|
+
knowledge: {}, reads: {}, dependencies: {}, crossReads: {},
|
|
289
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
290
|
+
},
|
|
291
|
+
stepMeta: new Map([
|
|
292
|
+
['service-step', makeFrontmatter('service-step', 's', 'pre', 1).frontmatter],
|
|
293
|
+
['global-step', makeFrontmatter('global-step', 'g', 'pre', 2).frontmatter],
|
|
294
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
295
|
+
]),
|
|
296
|
+
computeEligible: mockComputeEligible,
|
|
297
|
+
globalSteps: new Set(['global-step']),
|
|
298
|
+
getPipelineHash: vi.fn((_scope) => 'test-hash-svc'),
|
|
299
|
+
});
|
|
300
|
+
// Service state has only service-step completed; global-step is in
|
|
301
|
+
// root state and absent here. allDone should be true.
|
|
302
|
+
const steps = {
|
|
303
|
+
'service-step': { status: 'completed', source: 'pipeline', produces: [] },
|
|
304
|
+
};
|
|
305
|
+
mockStateWith(MockStateManager, steps);
|
|
306
|
+
mockComputeEligible.mockReturnValue([]);
|
|
307
|
+
mockResolveOutputMode.mockReturnValue('json');
|
|
308
|
+
await nextCommand.handler(defaultArgv({ format: 'json', service: 'api' }));
|
|
309
|
+
const envelope = JSON.parse(writtenLines.join(''));
|
|
310
|
+
const parsed = envelope.data ?? envelope;
|
|
311
|
+
expect(parsed.pipeline_complete).toBe(true);
|
|
312
|
+
});
|
|
313
|
+
it('pipeline_complete is false when an enabled pipeline step is missing from state', async () => {
|
|
314
|
+
// Round-1 Codex P1: with reconcile dropped, allDone was computed from
|
|
315
|
+
// state.steps alone. If state was all completed/skipped but the
|
|
316
|
+
// pipeline had a newly-added step missing from state, allDone went
|
|
317
|
+
// true incorrectly. Compute completion from enabled pipeline ∩ state.
|
|
318
|
+
vi.mocked(loadConfig).mockReturnValue({
|
|
319
|
+
config: {
|
|
320
|
+
version: 2, methodology: 'deep', platforms: ['claude-code'],
|
|
321
|
+
project: { projectType: 'web-app' },
|
|
322
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
323
|
+
},
|
|
324
|
+
errors: [], warnings: [],
|
|
325
|
+
});
|
|
326
|
+
vi.mocked(resolveOverlayState).mockReturnValue({
|
|
327
|
+
steps: {
|
|
328
|
+
'old-step': { enabled: true },
|
|
329
|
+
'newly-added-step': { enabled: true },
|
|
330
|
+
},
|
|
331
|
+
knowledge: {}, reads: {}, dependencies: {}, crossReads: {},
|
|
332
|
+
});
|
|
333
|
+
const metaPrompts = new Map([
|
|
334
|
+
['old-step', makeFrontmatter('old-step', 'old', 'pre', 1)],
|
|
335
|
+
['newly-added-step', makeFrontmatter('newly-added-step', 'new', 'pre', 2)],
|
|
336
|
+
]);
|
|
337
|
+
mockDiscoverMetaPrompts.mockReturnValue(metaPrompts);
|
|
338
|
+
// State has only old-step (completed); newly-added-step has no entry
|
|
339
|
+
const steps = {
|
|
340
|
+
'old-step': { status: 'completed', source: 'pipeline', produces: [] },
|
|
341
|
+
};
|
|
342
|
+
mockStateWith(MockStateManager, steps);
|
|
343
|
+
mockComputeEligible.mockReturnValue(['newly-added-step']);
|
|
344
|
+
mockResolveOutputMode.mockReturnValue('json');
|
|
345
|
+
await nextCommand.handler(defaultArgv({ format: 'json' }));
|
|
346
|
+
const envelope = JSON.parse(writtenLines.join(''));
|
|
347
|
+
const parsed = envelope.data ?? envelope;
|
|
348
|
+
expect(parsed.pipeline_complete).toBe(false);
|
|
349
|
+
});
|
|
183
350
|
it('shows "Pipeline complete!" when all steps are completed or skipped', async () => {
|
|
351
|
+
const metaPrompts = new Map([
|
|
352
|
+
['step-a', makeFrontmatter('step-a', 'a', 'pre', 1)],
|
|
353
|
+
['step-b', makeFrontmatter('step-b', 'b', 'pre', 2)],
|
|
354
|
+
]);
|
|
355
|
+
mockDiscoverMetaPrompts.mockReturnValue(metaPrompts);
|
|
356
|
+
vi.mocked(loadConfig).mockReturnValue({
|
|
357
|
+
config: {
|
|
358
|
+
version: 2, methodology: 'deep', platforms: ['claude-code'],
|
|
359
|
+
project: { projectType: 'web-app' },
|
|
360
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
361
|
+
},
|
|
362
|
+
errors: [], warnings: [],
|
|
363
|
+
});
|
|
364
|
+
vi.mocked(resolveOverlayState).mockReturnValue({
|
|
365
|
+
steps: { 'step-a': { enabled: true }, 'step-b': { enabled: true } },
|
|
366
|
+
knowledge: {}, reads: {}, dependencies: {}, crossReads: {},
|
|
367
|
+
});
|
|
184
368
|
const steps = {
|
|
185
369
|
'step-a': { status: 'completed', source: 'pipeline', produces: [] },
|
|
186
370
|
'step-b': { status: 'skipped', source: 'pipeline', produces: [] },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next.test.js","sourceRoot":"","sources":["../../../src/cli/commands/next.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"next.test.js","sourceRoot":"","sources":["../../../src/cli/commands/next.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/reset.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/reset.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,OAAO,CAAA;AAkBhD,UAAU,SAAS;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,QAAA,MAAM,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAgDnE,CAAA;AA6QD,eAAe,YAAY,CAAA"}
|
|
@@ -9,6 +9,7 @@ import { shutdown } from '../shutdown.js';
|
|
|
9
9
|
import { findClosestMatch } from '../../utils/levenshtein.js';
|
|
10
10
|
import { loadPipelineContext } from '../../core/pipeline/context.js';
|
|
11
11
|
import { resolvePipeline } from '../../core/pipeline/resolver.js';
|
|
12
|
+
import { pipelineStepsForReconcile } from '../../core/pipeline/reconcile-input.js';
|
|
12
13
|
import { guardStepCommand, guardSteplessCommand } from '../guards.js';
|
|
13
14
|
import { StatePathResolver } from '../../state/state-path-resolver.js';
|
|
14
15
|
import { ensureV3Migration } from '../../state/ensure-v3-migration.js';
|
|
@@ -81,6 +82,12 @@ async function resetStep(step, projectRoot, outputMode, output, argv, service, p
|
|
|
81
82
|
const context = loadPipelineContext(projectRoot);
|
|
82
83
|
const resolvedPipeline = pipeline ?? resolvePipeline(context);
|
|
83
84
|
const stateManager = new StateManager(projectRoot, resolvedPipeline.computeEligible, () => context.config ?? undefined, pathResolver, resolvedPipeline.globalSteps, resolvedPipeline.getPipelineHash(service ? 'service' : 'global'));
|
|
85
|
+
// Reconcile state with the current pipeline before the existence
|
|
86
|
+
// check — `scaffold reset <new-step>` should resolve a step added
|
|
87
|
+
// in a recent scaffold upgrade, even though status/next no longer
|
|
88
|
+
// reconcile on read (see v3.24.3 / PR #311). The helper handles
|
|
89
|
+
// scope filtering for service / multi-service-root / flat.
|
|
90
|
+
stateManager.reconcileWithPipeline(pipelineStepsForReconcile(context, resolvedPipeline, service));
|
|
84
91
|
const state = stateManager.loadState();
|
|
85
92
|
// Check step exists in state
|
|
86
93
|
if (!(step in state.steps)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/cli/commands/reset.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/cli/commands/reset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,aAAa,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,aAAa,EAAE,MAAM,OAAO,CAAA;AA+BhD,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,QAAA,MAAM,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAokB/D,CAAA;AAED,eAAe,UAAU,CAAA"}
|
package/dist/cli/commands/run.js
CHANGED
|
@@ -13,6 +13,7 @@ import { detectMethodologyChange } from '../../core/assembly/methodology-change.
|
|
|
13
13
|
import { detectCycles } from '../../core/dependency/dependency.js';
|
|
14
14
|
import { loadPipelineContext } from '../../core/pipeline/context.js';
|
|
15
15
|
import { resolvePipeline } from '../../core/pipeline/resolver.js';
|
|
16
|
+
import { pipelineStepsForReconcile } from '../../core/pipeline/reconcile-input.js';
|
|
16
17
|
import { findProjectRoot } from '../../cli/middleware/project-root.js';
|
|
17
18
|
import { createOutputContext } from '../../cli/output/context.js';
|
|
18
19
|
import { displayErrors } from '../../cli/output/error-display.js';
|
|
@@ -138,6 +139,15 @@ const runCommand = {
|
|
|
138
139
|
// Step 4: Load and validate state
|
|
139
140
|
// -----------------------------------------------------------------------
|
|
140
141
|
const stateManager = new StateManager(projectRoot, pipeline.computeEligible, () => config, pathResolver, pipeline.globalSteps, pipeline.getPipelineHash(service ? 'service' : 'global'));
|
|
142
|
+
// Reconcile state with the current pipeline before reading. With
|
|
143
|
+
// status/next no longer reconciling on read (v3.24.3 / PR #311),
|
|
144
|
+
// explicit user actions are now the only path that updates state
|
|
145
|
+
// for new pipeline steps. setInProgress auto-creates entries
|
|
146
|
+
// anyway, but reconciling here keeps state coherent for things
|
|
147
|
+
// like crash-recovery analysis and dependency checks before the
|
|
148
|
+
// setInProgress call. The helper handles scope filtering for
|
|
149
|
+
// service / multi-service-root / flat.
|
|
150
|
+
stateManager.reconcileWithPipeline(pipelineStepsForReconcile(context, pipeline, service));
|
|
141
151
|
let state = stateManager.loadState();
|
|
142
152
|
// Crash recovery: in_progress is non-null from a previous run
|
|
143
153
|
if (state.in_progress !== null) {
|