@manehorizons/cadence-core 1.6.1 → 1.8.0
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/build.d.ts.map +1 -1
- package/dist/cli/commands/build.js +10 -77
- package/dist/cli/commands/build.js.map +1 -1
- package/dist/cli/commands/doctor.d.ts +3 -0
- package/dist/cli/commands/doctor.d.ts.map +1 -0
- package/dist/cli/commands/doctor.js +44 -0
- package/dist/cli/commands/doctor.js.map +1 -0
- package/dist/cli/commands/draft-new.d.ts.map +1 -1
- package/dist/cli/commands/draft-new.js +11 -97
- package/dist/cli/commands/draft-new.js.map +1 -1
- package/dist/cli/commands/draft.d.ts.map +1 -1
- package/dist/cli/commands/draft.js +15 -104
- package/dist/cli/commands/draft.js.map +1 -1
- package/dist/cli/commands/mcp.d.ts +3 -0
- package/dist/cli/commands/mcp.d.ts.map +1 -0
- package/dist/cli/commands/mcp.js +35 -0
- package/dist/cli/commands/mcp.js.map +1 -0
- package/dist/cli/commands/progress.d.ts.map +1 -1
- package/dist/cli/commands/progress.js +5 -13
- package/dist/cli/commands/progress.js.map +1 -1
- package/dist/cli/commands/recommend.d.ts.map +1 -1
- package/dist/cli/commands/recommend.js +5 -15
- package/dist/cli/commands/recommend.js.map +1 -1
- package/dist/cli/commands/recommendation.d.ts.map +1 -1
- package/dist/cli/commands/recommendation.js +52 -1
- package/dist/cli/commands/recommendation.js.map +1 -1
- package/dist/cli/commands/settle.d.ts.map +1 -1
- package/dist/cli/commands/settle.js +5 -442
- package/dist/cli/commands/settle.js.map +1 -1
- package/dist/cli/commands/spec.d.ts.map +1 -1
- package/dist/cli/commands/spec.js +19 -197
- package/dist/cli/commands/spec.js.map +1 -1
- package/dist/cli/commands/status.d.ts.map +1 -1
- package/dist/cli/commands/status.js +5 -14
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/register.d.ts.map +1 -1
- package/dist/cli/register.js +4 -0
- package/dist/cli/register.js.map +1 -1
- package/dist/doctor/model.d.ts +27 -0
- package/dist/doctor/model.d.ts.map +1 -0
- package/dist/doctor/model.js +10 -0
- package/dist/doctor/model.js.map +1 -0
- package/dist/doctor/run.d.ts +3 -0
- package/dist/doctor/run.d.ts.map +1 -0
- package/dist/doctor/run.js +141 -0
- package/dist/doctor/run.js.map +1 -0
- package/dist/intelligence/store/recommendations.d.ts +7 -1
- package/dist/intelligence/store/recommendations.d.ts.map +1 -1
- package/dist/intelligence/store/recommendations.js +53 -0
- package/dist/intelligence/store/recommendations.js.map +1 -1
- package/dist/mcp/server.d.ts +12 -0
- package/dist/mcp/server.d.ts.map +1 -0
- package/dist/mcp/server.js +42 -0
- package/dist/mcp/server.js.map +1 -0
- package/dist/mcp/tools.d.ts +20 -0
- package/dist/mcp/tools.d.ts.map +1 -0
- package/dist/mcp/tools.js +189 -0
- package/dist/mcp/tools.js.map +1 -0
- package/dist/services/build-task.d.ts +12 -0
- package/dist/services/build-task.d.ts.map +1 -0
- package/dist/services/build-task.js +78 -0
- package/dist/services/build-task.js.map +1 -0
- package/dist/services/draft-approve.d.ts +14 -0
- package/dist/services/draft-approve.d.ts.map +1 -0
- package/dist/services/draft-approve.js +74 -0
- package/dist/services/draft-approve.js.map +1 -0
- package/dist/services/draft-check.d.ts +10 -0
- package/dist/services/draft-check.d.ts.map +1 -0
- package/dist/services/draft-check.js +47 -0
- package/dist/services/draft-check.js.map +1 -0
- package/dist/services/draft-new.d.ts +14 -0
- package/dist/services/draft-new.d.ts.map +1 -0
- package/dist/services/draft-new.js +98 -0
- package/dist/services/draft-new.js.map +1 -0
- package/dist/services/io.d.ts +39 -0
- package/dist/services/io.d.ts.map +1 -0
- package/dist/services/io.js +36 -0
- package/dist/services/io.js.map +1 -0
- package/dist/services/progress.d.ts +7 -0
- package/dist/services/progress.d.ts.map +1 -0
- package/dist/services/progress.js +21 -0
- package/dist/services/progress.js.map +1 -0
- package/dist/services/recommend.d.ts +9 -0
- package/dist/services/recommend.d.ts.map +1 -0
- package/dist/services/recommend.js +23 -0
- package/dist/services/recommend.js.map +1 -0
- package/dist/services/settle.d.ts +24 -0
- package/dist/services/settle.d.ts.map +1 -0
- package/dist/services/settle.js +366 -0
- package/dist/services/settle.js.map +1 -0
- package/dist/services/spec-approve.d.ts +11 -0
- package/dist/services/spec-approve.d.ts.map +1 -0
- package/dist/services/spec-approve.js +133 -0
- package/dist/services/spec-approve.js.map +1 -0
- package/dist/services/spec-new.d.ts +9 -0
- package/dist/services/spec-new.d.ts.map +1 -0
- package/dist/services/spec-new.js +62 -0
- package/dist/services/spec-new.js.map +1 -0
- package/dist/services/status.d.ts +9 -0
- package/dist/services/status.d.ts.map +1 -0
- package/dist/services/status.js +22 -0
- package/dist/services/status.js.map +1 -0
- package/package.json +3 -2
|
@@ -0,0 +1,366 @@
|
|
|
1
|
+
import { execSync } from 'node:child_process';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { readFile, stat } from 'node:fs/promises';
|
|
4
|
+
import { existsSync } from 'node:fs';
|
|
5
|
+
import { TaskStatusZ } from '@manehorizons/cadence-types';
|
|
6
|
+
import { parseDraftMd } from '../parse/draft-parser.js';
|
|
7
|
+
import { renderSummaryMd } from '../parse/summary-writer.js';
|
|
8
|
+
import { SimpleStateBackend } from '../state/simple.js';
|
|
9
|
+
import { atomicWriteJSON, atomicWriteText } from '../state/atomic-write.js';
|
|
10
|
+
import { LoopViolationError } from '../errors.js';
|
|
11
|
+
import { deriveAcResults } from '../status.js';
|
|
12
|
+
import { loadConfig } from '../config/loader.js';
|
|
13
|
+
import { effectiveGateSet } from '../gates/engine.js';
|
|
14
|
+
import { selectVerifier } from '../verify/factory.js';
|
|
15
|
+
import { scanTestCoverage } from '../verify/coverage.js';
|
|
16
|
+
import { resolveEffectiveProvider, MOCK_FALLBACK_BANNER, } from '../verify/verifier-factory.js';
|
|
17
|
+
import { runSettleGates } from '../gates/registry.js';
|
|
18
|
+
import { runSkillAuditCheck } from '../checks/skill-audit.js';
|
|
19
|
+
import { ScriptedPrompter, StdinPrompter } from '../verify/prompter.js';
|
|
20
|
+
import { selectNotifier } from '../notify/factory.js';
|
|
21
|
+
import { collectAnomalies } from '../notify/collect.js';
|
|
22
|
+
import { emitLoopViolation } from '../notify/loop-violation.js';
|
|
23
|
+
import { selectCodeReviewVerifier } from '../verify/code-review-factory.js';
|
|
24
|
+
import { emitCodeReviewHigh, emitCodeReviewUnconverged } from '../notify/code-review.js';
|
|
25
|
+
import { emitSkillAuditMiss } from '../notify/skill-audit.js';
|
|
26
|
+
import { selectSecurityAuditVerifier } from '../verify/security-audit-factory.js';
|
|
27
|
+
function parseAcArg(arg) {
|
|
28
|
+
const eqIdx = arg.indexOf('=');
|
|
29
|
+
if (eqIdx === -1)
|
|
30
|
+
throw new Error(`bad --ac syntax: ${arg}`);
|
|
31
|
+
const id = arg.slice(0, eqIdx);
|
|
32
|
+
const rest = arg.slice(eqIdx + 1);
|
|
33
|
+
const colonIdx = rest.indexOf(':');
|
|
34
|
+
const verdict = colonIdx === -1 ? rest : rest.slice(0, colonIdx);
|
|
35
|
+
const note = colonIdx === -1 ? undefined : rest.slice(colonIdx + 1).trim();
|
|
36
|
+
return { id, pass: verdict === 'pass', ...(note ? { note } : {}) };
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* `cadence settle run` — close the loop: run the settle gate stack, write
|
|
40
|
+
* SUMMARY.{json,md}, and return to IDLE. Faithful extraction of the former CLI
|
|
41
|
+
* action body (process streams + exit code routed through `io`/the result).
|
|
42
|
+
*/
|
|
43
|
+
export async function settleService(repoRoot, opts, io) {
|
|
44
|
+
const cwd = repoRoot;
|
|
45
|
+
try {
|
|
46
|
+
const backend = new SimpleStateBackend(cwd);
|
|
47
|
+
const state = await backend.readState();
|
|
48
|
+
if (state.loopPosition !== 'BUILD' || !state.activeDraft || !state.activePhase) {
|
|
49
|
+
throw new LoopViolationError('settle run requires loopPosition=BUILD with an active draft', { expected: 'BUILD', actual: state.loopPosition });
|
|
50
|
+
}
|
|
51
|
+
const draftPath = join(cwd, '.cadence/phases', state.activePhase, `${state.activeDraft}-DRAFT.md`);
|
|
52
|
+
const draft = parseDraftMd(await readFile(draftPath, 'utf8'));
|
|
53
|
+
const progPath = join(cwd, '.cadence/phases', state.activePhase, `${state.activeDraft}-PROGRESS.json`);
|
|
54
|
+
const progress = existsSync(progPath)
|
|
55
|
+
? JSON.parse(await readFile(progPath, 'utf8'))
|
|
56
|
+
: { draftId: state.activeDraft, tasks: {} };
|
|
57
|
+
const explicit = (opts.ac ?? []).map(parseAcArg);
|
|
58
|
+
const explicitIds = new Set(explicit.map((a) => a.id));
|
|
59
|
+
let cadenceConfig = null;
|
|
60
|
+
try {
|
|
61
|
+
cadenceConfig = await loadConfig(cwd);
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
cadenceConfig = null;
|
|
65
|
+
}
|
|
66
|
+
const gateSet = effectiveGateSet(state, cadenceConfig, draft);
|
|
67
|
+
if (opts.deep &&
|
|
68
|
+
resolveEffectiveProvider(cadenceConfig?.verifier).provider === 'mock') {
|
|
69
|
+
io.err(MOCK_FALLBACK_BANNER + '\n');
|
|
70
|
+
}
|
|
71
|
+
// DESIGN.md §4 M2 — soft cap on auto × complex.
|
|
72
|
+
if (gateSet.softCap && !opts.allowAutoComplex) {
|
|
73
|
+
io.err('settle run refused: auto × complex is soft-capped (DESIGN.md §4 M2). Pass --allow-auto-complex to override.\n');
|
|
74
|
+
return { exitCode: 1 };
|
|
75
|
+
}
|
|
76
|
+
if (gateSet.softCap && opts.allowAutoComplex) {
|
|
77
|
+
io.err('settle: --allow-auto-complex set; proceeding past soft cap (auto × complex).\n');
|
|
78
|
+
}
|
|
79
|
+
const touchedFiles = Array.from(new Set(draft.tasks.flatMap((t) => t.files)));
|
|
80
|
+
let coverageMemo;
|
|
81
|
+
let draftMtimeMemo;
|
|
82
|
+
let deepVerifierMemo;
|
|
83
|
+
let codeReviewVerifierMemo;
|
|
84
|
+
let securityAuditVerifierMemo;
|
|
85
|
+
let diffMemo;
|
|
86
|
+
const codeReviewSidecarPath = join(cwd, '.cadence/phases', state.activePhase, `${state.activeDraft}-CODE-REVIEW.json`);
|
|
87
|
+
const ctx = {
|
|
88
|
+
cwd,
|
|
89
|
+
state,
|
|
90
|
+
draft,
|
|
91
|
+
progress,
|
|
92
|
+
config: cadenceConfig,
|
|
93
|
+
gateSet,
|
|
94
|
+
opts: {
|
|
95
|
+
...(opts.force !== undefined ? { force: opts.force } : {}),
|
|
96
|
+
...(opts.auto !== undefined ? { auto: opts.auto } : {}),
|
|
97
|
+
...(opts.deep !== undefined ? { deep: opts.deep } : {}),
|
|
98
|
+
...(opts.allowMissingCoverage !== undefined ? { allowMissingCoverage: opts.allowMissingCoverage } : {}),
|
|
99
|
+
...(opts.allowVerifierFailure !== undefined ? { allowVerifierFailure: opts.allowVerifierFailure } : {}),
|
|
100
|
+
...(opts.allowStaleDraft !== undefined ? { allowStaleDraft: opts.allowStaleDraft } : {}),
|
|
101
|
+
...(opts.allowOpenTasks !== undefined ? { allowOpenTasks: opts.allowOpenTasks } : {}),
|
|
102
|
+
...(opts.allowFailingBuild !== undefined ? { allowFailingBuild: opts.allowFailingBuild } : {}),
|
|
103
|
+
...(opts.interactive !== undefined ? { interactive: opts.interactive } : {}),
|
|
104
|
+
...(opts.allowCodeReviewFailure !== undefined ? { allowCodeReviewFailure: opts.allowCodeReviewFailure } : {}),
|
|
105
|
+
...(opts.allowSecurityAuditFailure !== undefined ? { allowSecurityAuditFailure: opts.allowSecurityAuditFailure } : {}),
|
|
106
|
+
...(opts.allowSkillAuditMiss !== undefined ? { allowSkillAuditMiss: opts.allowSkillAuditMiss } : {}),
|
|
107
|
+
},
|
|
108
|
+
explicitIds,
|
|
109
|
+
touchedFiles,
|
|
110
|
+
coverage: () => {
|
|
111
|
+
if (!coverageMemo) {
|
|
112
|
+
const globs = cadenceConfig?.verification?.testGlobs;
|
|
113
|
+
coverageMemo = scanTestCoverage(cwd, globs ? { globs } : {});
|
|
114
|
+
}
|
|
115
|
+
return coverageMemo;
|
|
116
|
+
},
|
|
117
|
+
draftMtimeMs: () => {
|
|
118
|
+
if (!draftMtimeMemo) {
|
|
119
|
+
draftMtimeMemo = stat(draftPath)
|
|
120
|
+
.then((s) => s.mtime.getTime())
|
|
121
|
+
.catch(() => null);
|
|
122
|
+
}
|
|
123
|
+
return draftMtimeMemo;
|
|
124
|
+
},
|
|
125
|
+
diff: () => {
|
|
126
|
+
if (diffMemo === undefined) {
|
|
127
|
+
diffMemo = collectDiffForCodeReview(cwd, touchedFiles);
|
|
128
|
+
}
|
|
129
|
+
return diffMemo;
|
|
130
|
+
},
|
|
131
|
+
verifiers: {
|
|
132
|
+
deep: {
|
|
133
|
+
verify: (input) => {
|
|
134
|
+
if (!deepVerifierMemo) {
|
|
135
|
+
deepVerifierMemo = selectVerifier(cadenceConfig);
|
|
136
|
+
}
|
|
137
|
+
return deepVerifierMemo.verify(input);
|
|
138
|
+
},
|
|
139
|
+
},
|
|
140
|
+
codeReview: {
|
|
141
|
+
verify: (input) => {
|
|
142
|
+
if (!codeReviewVerifierMemo) {
|
|
143
|
+
codeReviewVerifierMemo = selectCodeReviewVerifier(cadenceConfig);
|
|
144
|
+
}
|
|
145
|
+
return codeReviewVerifierMemo.verify(input);
|
|
146
|
+
},
|
|
147
|
+
},
|
|
148
|
+
securityAudit: {
|
|
149
|
+
verify: (input) => {
|
|
150
|
+
if (!securityAuditVerifierMemo) {
|
|
151
|
+
securityAuditVerifierMemo = selectSecurityAuditVerifier(cadenceConfig);
|
|
152
|
+
}
|
|
153
|
+
return securityAuditVerifierMemo.verify(input);
|
|
154
|
+
},
|
|
155
|
+
},
|
|
156
|
+
},
|
|
157
|
+
emit: {
|
|
158
|
+
anomalies: async (events) => {
|
|
159
|
+
void events;
|
|
160
|
+
},
|
|
161
|
+
codeReviewHigh: (findings, info) => emitCodeReviewHigh(selectNotifier(cadenceConfig), findings, info),
|
|
162
|
+
codeReviewUnconverged: (info) => emitCodeReviewUnconverged(selectNotifier(cadenceConfig), info),
|
|
163
|
+
skillAuditMiss: (payload) => emitSkillAuditMiss(selectNotifier(cadenceConfig), payload),
|
|
164
|
+
},
|
|
165
|
+
runner: {
|
|
166
|
+
test: async () => {
|
|
167
|
+
const command = cadenceConfig?.verification?.testCommand;
|
|
168
|
+
if (!command)
|
|
169
|
+
return { ran: false, ok: true };
|
|
170
|
+
try {
|
|
171
|
+
execSync(command, { cwd, stdio: 'ignore' });
|
|
172
|
+
return { ran: true, ok: true, exitCode: 0, command };
|
|
173
|
+
}
|
|
174
|
+
catch (e) {
|
|
175
|
+
const status = e.status;
|
|
176
|
+
const exitCode = typeof status === 'number' ? status : 1;
|
|
177
|
+
return { ran: true, ok: false, exitCode, command };
|
|
178
|
+
}
|
|
179
|
+
},
|
|
180
|
+
},
|
|
181
|
+
prompter: {
|
|
182
|
+
create: () => {
|
|
183
|
+
const scripted = process.env.CADENCE_PROMPTER_SCRIPT;
|
|
184
|
+
if (scripted !== undefined) {
|
|
185
|
+
const answers = scripted.split('\n').filter((s) => s.length > 0 || s === '');
|
|
186
|
+
return new ScriptedPrompter(answers);
|
|
187
|
+
}
|
|
188
|
+
return new StdinPrompter();
|
|
189
|
+
},
|
|
190
|
+
},
|
|
191
|
+
codeReviewSidecar: {
|
|
192
|
+
read: async () => {
|
|
193
|
+
if (!existsSync(codeReviewSidecarPath)) {
|
|
194
|
+
return { attemptsSoFar: 0, history: [] };
|
|
195
|
+
}
|
|
196
|
+
try {
|
|
197
|
+
const prior = JSON.parse(await readFile(codeReviewSidecarPath, 'utf8'));
|
|
198
|
+
return {
|
|
199
|
+
attemptsSoFar: typeof prior.attempts === 'number' ? prior.attempts : 0,
|
|
200
|
+
history: Array.isArray(prior.history) ? prior.history : [],
|
|
201
|
+
};
|
|
202
|
+
}
|
|
203
|
+
catch {
|
|
204
|
+
return { attemptsSoFar: 0, history: [] };
|
|
205
|
+
}
|
|
206
|
+
},
|
|
207
|
+
write: (text) => atomicWriteText(codeReviewSidecarPath, text),
|
|
208
|
+
},
|
|
209
|
+
io: { err: (s) => io.err(s) },
|
|
210
|
+
};
|
|
211
|
+
const { acc, refused } = await runSettleGates(ctx);
|
|
212
|
+
if (refused) {
|
|
213
|
+
return { exitCode: 1 };
|
|
214
|
+
}
|
|
215
|
+
const coverageBypassed = acc.flags.coverageBypassed === true;
|
|
216
|
+
const interactiveRequested = opts.interactive === true ||
|
|
217
|
+
(opts.interactive !== false && gateSet.gates.includes('interactive-verdict'));
|
|
218
|
+
const interactiveVerify = acc.interactiveVerify;
|
|
219
|
+
const deepVerify = acc.deepVerify;
|
|
220
|
+
const verifierFailure = acc.flags.verifierFailure;
|
|
221
|
+
const codeReviewFindings = acc.codeReview;
|
|
222
|
+
const securityAuditFindings = acc.securityAudit;
|
|
223
|
+
const interactiveIds = new Set(interactiveVerify ? Object.keys(interactiveVerify) : []);
|
|
224
|
+
const userVerdictedIds = new Set([...explicitIds, ...interactiveIds]);
|
|
225
|
+
let acResults = [...explicit];
|
|
226
|
+
if (interactiveVerify) {
|
|
227
|
+
for (const [id, v] of Object.entries(interactiveVerify)) {
|
|
228
|
+
if (explicitIds.has(id))
|
|
229
|
+
continue;
|
|
230
|
+
acResults.push({
|
|
231
|
+
id,
|
|
232
|
+
pass: v.verdict === 'pass',
|
|
233
|
+
...(v.note ? { note: v.note } : {}),
|
|
234
|
+
});
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
if (opts.auto || interactiveRequested) {
|
|
238
|
+
const derived = deriveAcResults(draft, progress);
|
|
239
|
+
const offenders = derived.filter((d) => d.verdict !== 'pass' && !userVerdictedIds.has(d.id));
|
|
240
|
+
if (offenders.length > 0 && !opts.force) {
|
|
241
|
+
for (const o of offenders) {
|
|
242
|
+
const tasks = o.blockers.length > 0 ? ` (tasks: ${o.blockers.join(', ')})` : '';
|
|
243
|
+
io.err(`auto: ${o.id} ${o.verdict}${tasks}\n`);
|
|
244
|
+
}
|
|
245
|
+
io.err('settle run --auto refused: complete the blocking tasks or rerun with --force.\n');
|
|
246
|
+
return { exitCode: 1 };
|
|
247
|
+
}
|
|
248
|
+
const merged = [...acResults];
|
|
249
|
+
for (const d of derived) {
|
|
250
|
+
if (userVerdictedIds.has(d.id))
|
|
251
|
+
continue;
|
|
252
|
+
if (d.verdict === 'pass') {
|
|
253
|
+
merged.push({ id: d.id, pass: true });
|
|
254
|
+
}
|
|
255
|
+
else if (d.verdict === 'blocked') {
|
|
256
|
+
merged.push({ id: d.id, pass: false, note: `auto: ${d.blockers.join(', ')} blocked` });
|
|
257
|
+
}
|
|
258
|
+
else if (d.verdict === 'needs-context') {
|
|
259
|
+
merged.push({ id: d.id, pass: false, note: `auto: ${d.blockers.join(', ')} needs context` });
|
|
260
|
+
}
|
|
261
|
+
else {
|
|
262
|
+
merged.push({
|
|
263
|
+
id: d.id,
|
|
264
|
+
pass: false,
|
|
265
|
+
note: d.blockers.length > 0 ? `auto: ${d.blockers.join(', ')} incomplete` : 'auto: no linked tasks',
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
acResults = merged;
|
|
270
|
+
}
|
|
271
|
+
if (gateSet.gates.includes('anomaly-notify')) {
|
|
272
|
+
const anomalies = collectAnomalies({
|
|
273
|
+
draft,
|
|
274
|
+
progress,
|
|
275
|
+
coverageBypassed,
|
|
276
|
+
force: opts.force === true,
|
|
277
|
+
root: cwd,
|
|
278
|
+
...(deepVerify ? { deepVerify } : {}),
|
|
279
|
+
...(interactiveVerify ? { interactiveVerify } : {}),
|
|
280
|
+
...(verifierFailure ? { verifierFailure } : {}),
|
|
281
|
+
});
|
|
282
|
+
if (anomalies.length > 0) {
|
|
283
|
+
const notifier = selectNotifier(cadenceConfig);
|
|
284
|
+
try {
|
|
285
|
+
await notifier.notify(anomalies);
|
|
286
|
+
}
|
|
287
|
+
catch (err) {
|
|
288
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
289
|
+
io.err(`notify: ${notifier.name} transport failed — ${msg} (continuing)\n`);
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
{
|
|
294
|
+
const res = await runSkillAuditCheck(ctx);
|
|
295
|
+
if (res.outcome === 'refuse') {
|
|
296
|
+
return { exitCode: 1 };
|
|
297
|
+
}
|
|
298
|
+
state.skillAudit.required = res.effectiveRequired;
|
|
299
|
+
}
|
|
300
|
+
const summary = {
|
|
301
|
+
schemaVersion: 1,
|
|
302
|
+
draftId: state.activeDraft,
|
|
303
|
+
completedAt: new Date().toISOString(),
|
|
304
|
+
acResults,
|
|
305
|
+
taskResults: draft.tasks.map((t) => ({
|
|
306
|
+
id: t.id,
|
|
307
|
+
status: (TaskStatusZ.safeParse(progress.tasks[t.id]?.status).success
|
|
308
|
+
? progress.tasks[t.id].status
|
|
309
|
+
: 'BLOCKED'),
|
|
310
|
+
notes: progress.tasks[t.id]?.notes ?? '',
|
|
311
|
+
})),
|
|
312
|
+
decisions: [],
|
|
313
|
+
deferred: [],
|
|
314
|
+
skillAudit: state.skillAudit,
|
|
315
|
+
...(deepVerify ? { deepVerify } : {}),
|
|
316
|
+
...(interactiveVerify ? { interactiveVerify } : {}),
|
|
317
|
+
...(codeReviewFindings ? { codeReview: codeReviewFindings } : {}),
|
|
318
|
+
...(securityAuditFindings ? { securityAudit: securityAuditFindings } : {}),
|
|
319
|
+
};
|
|
320
|
+
const summaryBase = join(cwd, '.cadence/phases', state.activePhase, `${state.activeDraft}-SUMMARY`);
|
|
321
|
+
await atomicWriteJSON(`${summaryBase}.json`, summary);
|
|
322
|
+
await atomicWriteText(`${summaryBase}.md`, renderSummaryMd(summary));
|
|
323
|
+
const draftId = state.activeDraft;
|
|
324
|
+
state.openDrafts = state.openDrafts.filter((d) => d.id !== draftId);
|
|
325
|
+
state.activeDraft = null;
|
|
326
|
+
state.activeTask = null;
|
|
327
|
+
state.loopPosition = 'IDLE';
|
|
328
|
+
state.tier = null;
|
|
329
|
+
await backend.commit(state);
|
|
330
|
+
io.out(`Settled ${draftId}\n`);
|
|
331
|
+
return { exitCode: 0, data: { settled: draftId, acResults } };
|
|
332
|
+
}
|
|
333
|
+
catch (err) {
|
|
334
|
+
io.err(`settle run failed: ${err instanceof Error ? err.message : String(err)}\n`);
|
|
335
|
+
if (err instanceof LoopViolationError) {
|
|
336
|
+
await emitLoopViolation(cwd, err, 'settle.run');
|
|
337
|
+
}
|
|
338
|
+
return { exitCode: 1 };
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
/**
|
|
342
|
+
* `git diff --no-color HEAD -- <files>` via execSync. Returns empty
|
|
343
|
+
* string on any error (non-git workdir, no diff, exec failure).
|
|
344
|
+
*/
|
|
345
|
+
function collectDiffForCodeReview(cwd, files) {
|
|
346
|
+
if (files.length === 0)
|
|
347
|
+
return '';
|
|
348
|
+
try {
|
|
349
|
+
const args = ['diff', '--no-color', 'HEAD', '--', ...files];
|
|
350
|
+
return execSync(`git ${args.map(shellQuote).join(' ')}`, {
|
|
351
|
+
cwd,
|
|
352
|
+
encoding: 'utf8',
|
|
353
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
354
|
+
maxBuffer: 16 * 1024 * 1024,
|
|
355
|
+
});
|
|
356
|
+
}
|
|
357
|
+
catch {
|
|
358
|
+
return '';
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
function shellQuote(arg) {
|
|
362
|
+
if (/^[A-Za-z0-9._/=:@+-]+$/.test(arg))
|
|
363
|
+
return arg;
|
|
364
|
+
return `"${arg.replace(/(["\\$`])/g, '\\$1')}"`;
|
|
365
|
+
}
|
|
366
|
+
//# sourceMappingURL=settle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settle.js","sourceRoot":"","sources":["../../src/services/settle.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { CommandIO, CommandResult } from './io.js';
|
|
2
|
+
/**
|
|
3
|
+
* `cadence spec approve <phase> <num>` — run the convergent spec-review gate;
|
|
4
|
+
* on pass mark APPROVED and leave the spec stage (SPEC→IDLE).
|
|
5
|
+
*/
|
|
6
|
+
export declare function specApproveService(repoRoot: string, args: {
|
|
7
|
+
phase: string;
|
|
8
|
+
num: string;
|
|
9
|
+
allowSpecReviewFailure?: boolean;
|
|
10
|
+
}, io: CommandIO): Promise<CommandResult>;
|
|
11
|
+
//# sourceMappingURL=spec-approve.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spec-approve.d.ts","sourceRoot":"","sources":["../../src/services/spec-approve.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExD;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,EACtE,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,aAAa,CAAC,CAiIxB"}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
import { readFile } from 'node:fs/promises';
|
|
2
|
+
import { existsSync } from 'node:fs';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { parseSpecMd } from '../parse/spec-parser.js';
|
|
5
|
+
import { SimpleStateBackend } from '../state/simple.js';
|
|
6
|
+
import { atomicWriteText } from '../state/atomic-write.js';
|
|
7
|
+
import { loadConfig } from '../config/loader.js';
|
|
8
|
+
import { selectNotifier } from '../notify/factory.js';
|
|
9
|
+
import { selectSpecReviewVerifier } from '../verify/spec-review-factory.js';
|
|
10
|
+
import { nextConvergence } from '../verify/converge.js';
|
|
11
|
+
import { emitSpecReviewUnconverged } from '../notify/spec-review.js';
|
|
12
|
+
/**
|
|
13
|
+
* `cadence spec approve <phase> <num>` — run the convergent spec-review gate;
|
|
14
|
+
* on pass mark APPROVED and leave the spec stage (SPEC→IDLE).
|
|
15
|
+
*/
|
|
16
|
+
export async function specApproveService(repoRoot, args, io) {
|
|
17
|
+
try {
|
|
18
|
+
const backend = new SimpleStateBackend(repoRoot);
|
|
19
|
+
const state = await backend.readState();
|
|
20
|
+
const padded = args.num.padStart(2, '0');
|
|
21
|
+
const id = `${args.phase.slice(0, 2)}-${padded}`;
|
|
22
|
+
if (state.loopPosition !== 'SPEC') {
|
|
23
|
+
io.err(`spec approve refused: loopPosition is ${state.loopPosition}, not SPEC.\n`);
|
|
24
|
+
return { exitCode: 1 };
|
|
25
|
+
}
|
|
26
|
+
const specPath = join(repoRoot, '.cadence', 'phases', args.phase, `${id}-SPEC.md`);
|
|
27
|
+
if (!existsSync(specPath)) {
|
|
28
|
+
io.err(`spec approve refused: ${specPath} not found.\n`);
|
|
29
|
+
return { exitCode: 1 };
|
|
30
|
+
}
|
|
31
|
+
const rawSpec = await readFile(specPath, 'utf8');
|
|
32
|
+
const spec = parseSpecMd(rawSpec);
|
|
33
|
+
const cfg = await loadConfig(repoRoot).catch(() => null);
|
|
34
|
+
const verifier = selectSpecReviewVerifier(cfg);
|
|
35
|
+
const sidecarPath = join(repoRoot, '.cadence', 'phases', args.phase, `${id}-SPEC-REVIEW.json`);
|
|
36
|
+
let attemptsSoFar = 0;
|
|
37
|
+
let history = [];
|
|
38
|
+
if (existsSync(sidecarPath)) {
|
|
39
|
+
try {
|
|
40
|
+
const prior = JSON.parse(await readFile(sidecarPath, 'utf8'));
|
|
41
|
+
if (typeof prior.attempts === 'number')
|
|
42
|
+
attemptsSoFar = prior.attempts;
|
|
43
|
+
if (Array.isArray(prior.history))
|
|
44
|
+
history = prior.history;
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
/* corrupt/legacy → fresh */
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const res = await verifier.verify({ spec });
|
|
51
|
+
const maxAttempts = cfg?.convergence?.maxAttempts ?? 3;
|
|
52
|
+
const nv = nextConvergence(res.pass, attemptsSoFar, maxAttempts);
|
|
53
|
+
const now = new Date().toISOString();
|
|
54
|
+
const bypassed = !res.pass && args.allowSpecReviewFailure === true;
|
|
55
|
+
history.push({
|
|
56
|
+
at: now,
|
|
57
|
+
pass: res.pass,
|
|
58
|
+
findingsCount: res.findings.length,
|
|
59
|
+
provider: res.provider,
|
|
60
|
+
...(res.model ? { model: res.model } : {}),
|
|
61
|
+
verdict: nv.verdict,
|
|
62
|
+
...(bypassed ? { bypassed: true } : {}),
|
|
63
|
+
});
|
|
64
|
+
await atomicWriteText(sidecarPath, JSON.stringify({
|
|
65
|
+
specId: id,
|
|
66
|
+
converged: res.pass,
|
|
67
|
+
attempts: nv.verdict === 'pass' ? attemptsSoFar : nv.attempt,
|
|
68
|
+
maxAttempts,
|
|
69
|
+
history,
|
|
70
|
+
pass: res.pass,
|
|
71
|
+
provider: res.provider,
|
|
72
|
+
...(res.model ? { model: res.model } : {}),
|
|
73
|
+
findings: res.findings.length,
|
|
74
|
+
at: now,
|
|
75
|
+
}, null, 2) + '\n');
|
|
76
|
+
if (!res.pass) {
|
|
77
|
+
for (const f of res.findings) {
|
|
78
|
+
io.err(`spec-review: ${f.severity} — ${f.message}\n`);
|
|
79
|
+
if (f.suggestedEdit) {
|
|
80
|
+
io.err(` ↳ suggested: ${f.suggestedEdit}\n`);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (args.allowSpecReviewFailure) {
|
|
84
|
+
if (nv.verdict === 'escalate') {
|
|
85
|
+
await emitSpecReviewUnconverged(selectNotifier(cfg), {
|
|
86
|
+
specId: id,
|
|
87
|
+
attempts: nv.attempt,
|
|
88
|
+
maxAttempts,
|
|
89
|
+
findings: res.findings.length,
|
|
90
|
+
provider: res.provider,
|
|
91
|
+
...(res.model ? { model: res.model } : {}),
|
|
92
|
+
bypassed: true,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
io.err(`spec-review: --allow-spec-review-failure set; proceeding past ` +
|
|
96
|
+
`${res.findings.length} finding(s).\n`);
|
|
97
|
+
// fall through to APPROVED + IDLE.
|
|
98
|
+
}
|
|
99
|
+
else if (nv.verdict === 'reloop') {
|
|
100
|
+
io.err(`spec-review: attempt ${nv.attempt}/${maxAttempts} did not pass — ` +
|
|
101
|
+
`fix the SPEC and re-run \`cadence spec approve\`, ` +
|
|
102
|
+
`or pass --allow-spec-review-failure to proceed anyway.\n`);
|
|
103
|
+
return { exitCode: 1 };
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
await emitSpecReviewUnconverged(selectNotifier(cfg), {
|
|
107
|
+
specId: id,
|
|
108
|
+
attempts: nv.attempt,
|
|
109
|
+
maxAttempts,
|
|
110
|
+
findings: res.findings.length,
|
|
111
|
+
provider: res.provider,
|
|
112
|
+
...(res.model ? { model: res.model } : {}),
|
|
113
|
+
});
|
|
114
|
+
io.err(`spec approve refused: spec-review did NOT converge after ` +
|
|
115
|
+
`${maxAttempts} attempts — a human decision is required. ` +
|
|
116
|
+
`Re-scope the spec, or pass --allow-spec-review-failure to proceed anyway.\n`);
|
|
117
|
+
return { exitCode: 1 };
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
// Converged (or bypassed): mark APPROVED, leave the spec stage.
|
|
121
|
+
await atomicWriteText(specPath, rawSpec.replace(/^status: PENDING$/m, 'status: APPROVED'));
|
|
122
|
+
state.loopPosition = 'IDLE';
|
|
123
|
+
state.activeSpec = null;
|
|
124
|
+
await backend.commit(state);
|
|
125
|
+
io.out(`Approved spec ${id}; loopPosition=IDLE\n`);
|
|
126
|
+
return { exitCode: 0, data: { id, approved: true, converged: res.pass, bypassed } };
|
|
127
|
+
}
|
|
128
|
+
catch (err) {
|
|
129
|
+
io.err(`spec approve failed: ${err instanceof Error ? err.message : String(err)}\n`);
|
|
130
|
+
return { exitCode: 1 };
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
//# sourceMappingURL=spec-approve.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spec-approve.js","sourceRoot":"","sources":["../../src/services/spec-approve.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { CommandIO, CommandResult } from './io.js';
|
|
2
|
+
/** `cadence spec new <phase> <num>` — scaffold a SPEC.md (IDLE→SPEC). */
|
|
3
|
+
export declare function specNewService(repoRoot: string, args: {
|
|
4
|
+
phase: string;
|
|
5
|
+
num: string;
|
|
6
|
+
title?: string;
|
|
7
|
+
fromRec?: string;
|
|
8
|
+
}, io: CommandIO): Promise<CommandResult>;
|
|
9
|
+
//# sourceMappingURL=spec-new.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spec-new.d.ts","sourceRoot":"","sources":["../../src/services/spec-new.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExD,yEAAyE;AACzE,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EACtE,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,aAAa,CAAC,CA2DxB"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { mkdir, writeFile } from 'node:fs/promises';
|
|
2
|
+
import { existsSync } from 'node:fs';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { SimpleStateBackend } from '../state/simple.js';
|
|
5
|
+
import { readRecommendationLedger } from '../intelligence/store/io.js';
|
|
6
|
+
import { runRecommendationTransition } from '../intelligence/store/recommendations.js';
|
|
7
|
+
/** `cadence spec new <phase> <num>` — scaffold a SPEC.md (IDLE→SPEC). */
|
|
8
|
+
export async function specNewService(repoRoot, args, io) {
|
|
9
|
+
const title = args.title ?? 'Untitled';
|
|
10
|
+
try {
|
|
11
|
+
const backend = new SimpleStateBackend(repoRoot);
|
|
12
|
+
const state = await backend.readState();
|
|
13
|
+
if (state.loopPosition !== 'IDLE') {
|
|
14
|
+
io.err(`spec new refused: loopPosition is ${state.loopPosition}, not IDLE. ` +
|
|
15
|
+
`Approve/settle/discard the active unit first.\n`);
|
|
16
|
+
return { exitCode: 1 };
|
|
17
|
+
}
|
|
18
|
+
if (args.fromRec !== undefined) {
|
|
19
|
+
const recLedger = await readRecommendationLedger(repoRoot);
|
|
20
|
+
const rec = recLedger.recommendations.find((r) => r.id === args.fromRec);
|
|
21
|
+
if (!rec) {
|
|
22
|
+
io.err(`spec new refused: recommendation ${args.fromRec} not found\n`);
|
|
23
|
+
return { exitCode: 1 };
|
|
24
|
+
}
|
|
25
|
+
if (rec.status !== 'candidate' && rec.status !== 'accepted') {
|
|
26
|
+
io.err(`spec new refused: cannot convert recommendation in status ${rec.status}\n`);
|
|
27
|
+
return { exitCode: 1 };
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
const dir = join(repoRoot, '.cadence', 'phases', args.phase);
|
|
31
|
+
const padded = args.num.padStart(2, '0');
|
|
32
|
+
const id = `${args.phase.slice(0, 2)}-${padded}`;
|
|
33
|
+
const path = join(dir, `${id}-SPEC.md`);
|
|
34
|
+
if (existsSync(path)) {
|
|
35
|
+
io.err(`SPEC already exists: ${path}\n`);
|
|
36
|
+
return { exitCode: 2 };
|
|
37
|
+
}
|
|
38
|
+
await mkdir(dir, { recursive: true });
|
|
39
|
+
const body = `---\nphase: ${args.phase}\nid: ${id}\nstatus: PENDING\n---\n\n# ${id} — ${title}\n\n## Objective\n\n_(one sentence)_\n\n## Acceptance Criteria\n\n### AC-1: _(name)_\nGiven _(precondition)_\nWhen _(action)_\nThen _(outcome)_\n\n## Constraints\n\n- _(constraint)_\n\n## Open Questions\n\n- _(question)_\n`;
|
|
40
|
+
await writeFile(path, body);
|
|
41
|
+
state.activePhase = args.phase;
|
|
42
|
+
state.activeSpec = id;
|
|
43
|
+
state.loopPosition = 'SPEC';
|
|
44
|
+
await backend.commit(state);
|
|
45
|
+
io.out(`Created ${path}\n`);
|
|
46
|
+
if (args.fromRec !== undefined) {
|
|
47
|
+
const convertRes = await runRecommendationTransition(repoRoot, args.fromRec, 'convert', args.phase);
|
|
48
|
+
if (!convertRes.ok) {
|
|
49
|
+
io.err(`spec new: scaffold succeeded but convert failed: ${convertRes.error}. ` +
|
|
50
|
+
`Run \`cadence recommendation convert ${args.fromRec} --to-phase ${args.phase}\` to retry.\n`);
|
|
51
|
+
return { exitCode: 1, data: { path, id, converted: false } };
|
|
52
|
+
}
|
|
53
|
+
io.out(`recommendation ${args.fromRec} → converted (to ${args.phase})\n`);
|
|
54
|
+
}
|
|
55
|
+
return { exitCode: 0, data: { path, id, converted: args.fromRec !== undefined } };
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
io.err(`spec new failed: ${err instanceof Error ? err.message : String(err)}\n`);
|
|
59
|
+
return { exitCode: 1 };
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=spec-new.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spec-new.js","sourceRoot":"","sources":["../../src/services/spec-new.ts"],"names":[],"mappings":"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"}
|