@turri-dev/cli 0.1.3-next.f74e98a → 0.1.4-next.01530aa
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/README.md +22 -1
- package/dist/ask.js +34 -15
- package/dist/cli-options.js +12 -6
- package/dist/config-edit.js +1 -0
- package/dist/config.js +5 -2
- package/dist/extension.js +97 -42
- package/dist/genome.js +1 -1
- package/dist/init-config.js +5 -0
- package/dist/loop-cli.js +13 -1
- package/dist/loop-tools.js +31 -12
- package/dist/pi-launch.js +5 -0
- package/dist/pi.js +76 -19
- package/dist/question-dialog.js +9 -3
- package/dist/questioning.js +1 -1
- package/dist/regenerate/activity.js +23 -0
- package/dist/regenerate/conform.js +5 -5
- package/dist/regenerate/conformance-agents.js +28 -8
- package/dist/regenerate/conformance.js +24 -10
- package/dist/regenerate/list-arguments.js +121 -0
- package/dist/regenerate/loop.js +137 -18
- package/dist/regenerate/notes.js +66 -17
- package/dist/regenerate/prompt.js +3 -1
- package/dist/regenerate/regenerate.js +16 -10
- package/dist/regenerate/regression.js +2 -1
- package/dist/regenerate/requires.js +55 -2
- package/dist/regenerate/self-check.js +13 -6
- package/dist/regenerate/side-panel.js +1 -1
- package/dist/regenerate/test-scripts.js +54 -10
- package/dist/regenerate/unit-review.js +12 -1
- package/dist/regenerate-cli.js +11 -5
- package/dist/release-tools.js +1 -1
- package/dist/resume-line.js +4 -0
- package/dist/review/live.js +2 -1
- package/dist/run-report.js +39 -1
- package/dist/spec-tools.js +10 -45
- package/docs/authoring-plain.md +12 -7
- package/docs/config.md +3 -2
- package/docs/headless.md +33 -3
- package/docs/installation.md +3 -0
- package/docs/regenerating.md +70 -20
- package/docs/skills-and-gates.md +5 -3
- package/docs/using.md +28 -14
- package/genome/rules/func-specs.md +1 -0
- package/genome/rules/project-model.md +5 -3
- package/genome/rules/turri-regeneration.md +76 -0
- package/genome/skills/bud/SKILL.md +67 -36
- package/genome/skills/bud/references/intent.md +4 -0
- package/genome/skills/refactor-module/SKILL.md +24 -2
- package/package.json +3 -3
- package/genome/skills/bud/references/checklist.md +0 -44
|
@@ -9,7 +9,7 @@ import { abandonWork, diffSinceSnapshot, moduleDirOf, recordHistory, startWork,
|
|
|
9
9
|
import { createWorkLedger, describeAccounts, SUBMIT_WORK_NOTE, unanswered, unansweredPrompt } from "./submit-work.js";
|
|
10
10
|
import { CONFORMANCE_COMPACTION } from "./compaction.js";
|
|
11
11
|
import { NOTES_TURN, notesForSession, passedOutcome, readNotes, reflectOnReview, withNotes } from "./notes.js";
|
|
12
|
-
import { labelsPrompt, labelsPromptFor, misplacedConformanceTests, misplacedTestsPrompt, missingTestLabels } from "./test-kinds.js";
|
|
12
|
+
import { acceptanceLabel, acceptanceText, labelsPrompt, labelsPromptFor, misplacedConformanceTests, misplacedTestsPrompt, missingTestLabels } from "./test-kinds.js";
|
|
13
13
|
import { createScriptTool, findTestScripts, projectRootFor, requireTestScripts, runConformanceScript, runUnitScript, failureSignature, STUCK_ROUNDS, scriptFailure, staticChecksOnly, withTestingScripts, } from "./test-scripts.js";
|
|
14
14
|
import { createWebTools, WEB_TOOLS } from "./web.js";
|
|
15
15
|
import { createMyDiffTool } from "./self-check.js";
|
|
@@ -157,9 +157,11 @@ export async function renderConformanceTests(options) {
|
|
|
157
157
|
// may read the code but writes only tests. An explorer reads the code first and writes down how the
|
|
158
158
|
// software is invoked, which is what the tests are written against.
|
|
159
159
|
const label = `${moduleName} ${options.diff !== undefined ? "spec change" : frid}`;
|
|
160
|
-
const specContext = { moduleName, text: specText(specifications, moduleName, frids, required, options.change ?? options.diff, sectionModules(tree, moduleName)) };
|
|
161
160
|
// For a spec change: the functionalities it touches, whose acceptance tests are labelled, checked and reviewed.
|
|
162
161
|
const touched = forChange ? touchedFunctionalities(tree, frids, options.diff) : [];
|
|
162
|
+
// The acceptance tests the run's tests carry out: every functionality the change touches, or the one under test.
|
|
163
|
+
const carriedOut = forChange ? touched : [{ frid: frid, acceptanceTests: specifications[ACCEPTANCE_TESTS] ?? [] }];
|
|
164
|
+
const specContext = { moduleName, text: specText(specifications, moduleName, frids, required, carriedOut, options.change ?? options.diff, sectionModules(tree, moduleName)) };
|
|
163
165
|
// Any functionality of the codebase - this module's, and those of the modules it requires. A
|
|
164
166
|
// functionality's run may raise a spec conflict only with that functionality; a spec diff's, between any two.
|
|
165
167
|
const own = (forChange ? frids : frids.slice(0, frids.indexOf(frid) + 1)).map((id) => ({ module: moduleName, frid: id }));
|
|
@@ -223,11 +225,15 @@ export async function renderConformanceTests(options) {
|
|
|
223
225
|
};
|
|
224
226
|
stage(`exploring the code for how it is invoked${options.model ? ` (${options.model})` : ""}`);
|
|
225
227
|
// The explorer reads the conformance testing script too: it is how the tests are built and run, and so how they reach the software.
|
|
228
|
+
// The prepare script, where there is one, runs on the build before it - and only once it passes does the suite run.
|
|
226
229
|
const testingScripts = [
|
|
230
|
+
...(scripts.prepare !== undefined
|
|
231
|
+
? [{ path: relative(root, scripts.prepare), runs: "<script> <copy of the build>, before every run of the conformance testing script", content: readFileSync(scripts.prepare, "utf8"), prepare: true }]
|
|
232
|
+
: []),
|
|
227
233
|
{ path: relative(root, scripts.conformance), runs: "<script> <copy of the build> <copy of the whole conformance suite>", content: readFileSync(scripts.conformance, "utf8") },
|
|
228
234
|
];
|
|
229
235
|
// The acceptance tests the explorer's plan has to carry out, step by step.
|
|
230
|
-
const toCarryOut =
|
|
236
|
+
const toCarryOut = carriedOut
|
|
231
237
|
.map((item) => ({ module: moduleName, frid: item.frid, count: item.acceptanceTests.length }))
|
|
232
238
|
.filter((item) => item.count > 0);
|
|
233
239
|
let invocation = await exploreInvocation({ buildDir, spec: specContext, scope, testingScripts, acceptance: toCarryOut, label, model: options.model, onDelta: options.onDelta });
|
|
@@ -272,6 +278,7 @@ export async function renderConformanceTests(options) {
|
|
|
272
278
|
cwd: conformanceDir,
|
|
273
279
|
customTools: [
|
|
274
280
|
notes.tool,
|
|
281
|
+
notes.gapTool,
|
|
275
282
|
work.tool,
|
|
276
283
|
...createWebTools(),
|
|
277
284
|
...fence.tools,
|
|
@@ -285,7 +292,7 @@ export async function renderConformanceTests(options) {
|
|
|
285
292
|
}),
|
|
286
293
|
createCopyResourceTool({ resources: linkedResources, dir: conformanceDir }),
|
|
287
294
|
],
|
|
288
|
-
tools: [...fence.names, "run_conformance_tests", "my_diff", "ask_explorer", "update_notes", "submit_work", "copy_resource", ...WEB_TOOLS],
|
|
295
|
+
tools: [...fence.names, "run_conformance_tests", "my_diff", "ask_explorer", "update_notes", "report_spec_gap", "submit_work", "copy_resource", ...WEB_TOOLS],
|
|
289
296
|
model: options.model,
|
|
290
297
|
label: `${label} conformance agent`,
|
|
291
298
|
role: "conformance",
|
|
@@ -313,12 +320,14 @@ export async function renderConformanceTests(options) {
|
|
|
313
320
|
// The unit tests, and the conformance suite - to reproduce the failure and check the fix, seeing only its output.
|
|
314
321
|
tools: [
|
|
315
322
|
fixerNotes.tool,
|
|
323
|
+
fixerNotes.gapTool,
|
|
316
324
|
createScriptTool({ kind: "unit", script: scripts.unit, run: () => runUnitScript(buildDir, scripts.unit), runs: unitRuns }),
|
|
317
325
|
fixerConformanceRuns.tool,
|
|
318
326
|
...fixerServices.tools,
|
|
319
327
|
],
|
|
320
|
-
toolNames: ["run_unit_tests", "run_conformance_tests", ...fixerServices.names, "update_notes"],
|
|
328
|
+
toolNames: ["run_unit_tests", "run_conformance_tests", ...fixerServices.names, "update_notes", "report_spec_gap"],
|
|
321
329
|
checkEnvironment: { run: () => runUnitScript(buildDir, scripts.unit), script: scripts.unit },
|
|
330
|
+
testingScripts: { scripts, root },
|
|
322
331
|
});
|
|
323
332
|
fixerConformanceRuns.newTurn();
|
|
324
333
|
return ask(fixer, withNotes(text, buildDir), options.onDelta);
|
|
@@ -687,7 +696,7 @@ export async function renderConformanceTests(options) {
|
|
|
687
696
|
buildDir,
|
|
688
697
|
conformanceDir,
|
|
689
698
|
spec: specContext,
|
|
690
|
-
functionalities:
|
|
699
|
+
functionalities: carriedOut,
|
|
691
700
|
forChange,
|
|
692
701
|
invocation,
|
|
693
702
|
label,
|
|
@@ -947,9 +956,10 @@ export function failureLine(run) {
|
|
|
947
956
|
}
|
|
948
957
|
/**
|
|
949
958
|
* The spec as the explorer, the judge and the coding agent are shown it - its functional specs
|
|
950
|
-
* numbered with their ids, so a spec conflict can name them
|
|
959
|
+
* numbered with their ids, so a spec conflict can name them, and the acceptance tests the run carries
|
|
960
|
+
* out labelled as their tests are, so a verdict can quote them.
|
|
951
961
|
*/
|
|
952
|
-
function specText(specifications, moduleName, frids, required, diff, modules) {
|
|
962
|
+
function specText(specifications, moduleName, frids, required, acceptance, diff, modules) {
|
|
953
963
|
// Every functionality in the codebase, each with its module: the required modules' first, then this one's.
|
|
954
964
|
const numbered = (key, items) => key === FUNCTIONAL_REQUIREMENTS
|
|
955
965
|
? [
|
|
@@ -957,10 +967,14 @@ function specText(specifications, moduleName, frids, required, diff, modules) {
|
|
|
957
967
|
]
|
|
958
968
|
: items;
|
|
959
969
|
// Each section in its tag, as every agent is shown it (see specPrimer).
|
|
960
|
-
const sections = [DEFINITIONS, NON_FUNCTIONAL_REQUIREMENTS, TEST_REQUIREMENTS, FUNCTIONAL_REQUIREMENTS
|
|
970
|
+
const sections = [DEFINITIONS, NON_FUNCTIONAL_REQUIREMENTS, TEST_REQUIREMENTS, FUNCTIONAL_REQUIREMENTS]
|
|
961
971
|
.map((key) => [key, specifications[key] ?? []])
|
|
962
972
|
.filter(([, items]) => items.length > 0)
|
|
963
|
-
.map(([key, items]) => (key === FUNCTIONAL_REQUIREMENTS
|
|
973
|
+
.map(([key, items]) => (key === FUNCTIONAL_REQUIREMENTS ? section(key, numbered(key, items)) : moduleSection(key, items, moduleName, modules)));
|
|
974
|
+
// Not only the last functionality's: a spec change's run carries out the acceptance tests of every one it touches.
|
|
975
|
+
const tests = acceptance.flatMap((item) => item.acceptanceTests.map((test, index) => `${acceptanceLabel(item.frid, index + 1)}: ${acceptanceText(test)}`));
|
|
976
|
+
if (tests.length > 0)
|
|
977
|
+
sections.push(section(ACCEPTANCE_TESTS, tests));
|
|
964
978
|
if (diff !== undefined)
|
|
965
979
|
sections.push(specChangeBlock(diff));
|
|
966
980
|
return sections.join("\n\n");
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
const isObject = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
|
|
2
|
+
/** The tool's arguments that take a list of objects. */
|
|
3
|
+
function listArguments(schema) {
|
|
4
|
+
const required = new Set(schema.required ?? []);
|
|
5
|
+
return Object.entries(schema.properties ?? {})
|
|
6
|
+
.filter(([, property]) => property.type === "array" && property.items?.type === "object")
|
|
7
|
+
.map(([name, property]) => ({ name, required: required.has(name), item: property.items }));
|
|
8
|
+
}
|
|
9
|
+
/** JSON text, fenced or not, as what it holds; anything else as it is. */
|
|
10
|
+
function parsed(value) {
|
|
11
|
+
if (typeof value !== "string")
|
|
12
|
+
return value;
|
|
13
|
+
const text = value
|
|
14
|
+
.trim()
|
|
15
|
+
.replace(/^```(?:json)?\s*/i, "")
|
|
16
|
+
.replace(/\s*```$/, "");
|
|
17
|
+
if (!/^[[{]/.test(text))
|
|
18
|
+
return value;
|
|
19
|
+
try {
|
|
20
|
+
return JSON.parse(text);
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
return value;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
const escaped = (name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
27
|
+
/**
|
|
28
|
+
* Arguments the model wrote inside another argument's text - `answer</a>\n<b>[...]</b>\n<c>...` - taken out of it and
|
|
29
|
+
* given as their own, where they were not given already. Which argument each was found in, for the refusal.
|
|
30
|
+
*/
|
|
31
|
+
function untucked(args, names) {
|
|
32
|
+
const out = { ...args };
|
|
33
|
+
const foundIn = new Map();
|
|
34
|
+
const anyTag = names.map(escaped).join("|");
|
|
35
|
+
for (const [key, value] of Object.entries(args)) {
|
|
36
|
+
if (typeof value !== "string")
|
|
37
|
+
continue;
|
|
38
|
+
let cut = value.search(new RegExp(`</${escaped(key)}>`));
|
|
39
|
+
for (const name of names) {
|
|
40
|
+
if (name === key || (out[name] !== undefined && out[name] !== ""))
|
|
41
|
+
continue;
|
|
42
|
+
const match = new RegExp(`<${escaped(name)}>([\\s\\S]*?)(?:</${escaped(name)}>|(?=<(?:${anyTag})>)|$)`).exec(value);
|
|
43
|
+
if (match === null)
|
|
44
|
+
continue;
|
|
45
|
+
out[name] = match[1].trim();
|
|
46
|
+
foundIn.set(name, key);
|
|
47
|
+
cut = cut === -1 ? match.index : Math.min(cut, match.index);
|
|
48
|
+
}
|
|
49
|
+
if (cut !== -1)
|
|
50
|
+
out[key] = value.slice(0, cut).trim();
|
|
51
|
+
}
|
|
52
|
+
return { args: out, foundIn };
|
|
53
|
+
}
|
|
54
|
+
/** What an entry of the list looks like, as JSON: its fields, the optional ones marked. */
|
|
55
|
+
function shapeOf(item) {
|
|
56
|
+
const required = new Set(item.required ?? []);
|
|
57
|
+
const entries = Object.entries(item.properties ?? {});
|
|
58
|
+
const fields = entries.map(([name, field]) => `"${name}"${required.has(name) ? "" : "?"}: ${field.type ?? "value"}`).join(", ");
|
|
59
|
+
const sample = (field) => (field.type === "number" || field.type === "integer" ? "1" : field.type === "boolean" ? "true" : field.type === "string" ? '"..."' : "...");
|
|
60
|
+
const example = entries
|
|
61
|
+
.filter(([name]) => required.has(name))
|
|
62
|
+
.map(([name, field]) => `"${name}": ${sample(field)}`)
|
|
63
|
+
.join(", ");
|
|
64
|
+
return { fields: `{${fields}}`, example: `{${example}}` };
|
|
65
|
+
}
|
|
66
|
+
/** Why a list argument is not one, said so a model can make the call right next time - or undefined when it is. */
|
|
67
|
+
function problemOf(list, value, foundIn) {
|
|
68
|
+
if (value === undefined)
|
|
69
|
+
return list.required ? "you left it out" : undefined;
|
|
70
|
+
if (!Array.isArray(value)) {
|
|
71
|
+
if (foundIn !== undefined)
|
|
72
|
+
return `you wrote it inside \`${foundIn}\``;
|
|
73
|
+
return typeof value === "string" ? "you sent it as text, not a list" : `you sent ${isObject(value) ? "an object" : `a ${typeof value}`}, not a list`;
|
|
74
|
+
}
|
|
75
|
+
const bad = value.findIndex((entry) => !isObject(entry));
|
|
76
|
+
if (bad === -1)
|
|
77
|
+
return undefined;
|
|
78
|
+
return `entry ${bad + 1} is ${typeof value[bad] === "string" ? "text" : `a ${typeof value[bad]}`}, not an object`;
|
|
79
|
+
}
|
|
80
|
+
/** The arguments with their lists made lists where they plainly are; refused, saying what is wanted, where they are not. */
|
|
81
|
+
export function prepareListArguments(toolName, schema, raw) {
|
|
82
|
+
const lists = listArguments(schema);
|
|
83
|
+
if (lists.length === 0 || !isObject(raw))
|
|
84
|
+
return raw;
|
|
85
|
+
const { args, foundIn } = untucked(raw, Object.keys(schema.properties ?? {}));
|
|
86
|
+
const problems = [];
|
|
87
|
+
for (const list of lists) {
|
|
88
|
+
let value = parsed(args[list.name]);
|
|
89
|
+
if (isObject(value))
|
|
90
|
+
value = [value];
|
|
91
|
+
if (Array.isArray(value))
|
|
92
|
+
value = value.map(parsed);
|
|
93
|
+
if (value !== undefined)
|
|
94
|
+
args[list.name] = value;
|
|
95
|
+
const problem = problemOf(list, value, foundIn.get(list.name));
|
|
96
|
+
if (problem === undefined)
|
|
97
|
+
continue;
|
|
98
|
+
const { fields, example } = shapeOf(list.item);
|
|
99
|
+
problems.push(`- \`${list.name}\`: ${problem}. It is a list of objects, each ${fields} - e.g. "${list.name}": [${example}].`);
|
|
100
|
+
}
|
|
101
|
+
if (problems.length === 0)
|
|
102
|
+
return args;
|
|
103
|
+
throw new Error([
|
|
104
|
+
`${toolName} was not run - its arguments are not in the shape it takes:`,
|
|
105
|
+
...problems,
|
|
106
|
+
"Each argument is a field of its own in the call, at the top level: a list is a JSON array of objects, never text, and never written inside another argument's text.",
|
|
107
|
+
].join("\n"));
|
|
108
|
+
}
|
|
109
|
+
/** The tools, each that takes a list of objects preparing its arguments so before they are checked. */
|
|
110
|
+
export function withListArguments(tools) {
|
|
111
|
+
return tools.map((tool) => {
|
|
112
|
+
const schema = tool.parameters;
|
|
113
|
+
if (listArguments(schema).length === 0)
|
|
114
|
+
return tool;
|
|
115
|
+
const before = tool.prepareArguments;
|
|
116
|
+
return {
|
|
117
|
+
...tool,
|
|
118
|
+
prepareArguments: (args) => prepareListArguments(tool.name, schema, before !== undefined ? before(args) : args),
|
|
119
|
+
};
|
|
120
|
+
});
|
|
121
|
+
}
|
package/dist/regenerate/loop.js
CHANGED
|
@@ -16,7 +16,7 @@ import { modulesRoot } from "./paths.js";
|
|
|
16
16
|
import { budgetFor, choosingWhen, configForSpec, conformanceSwitchedOn } from "../config.js";
|
|
17
17
|
import { describeSpecChange } from "./prompt.js";
|
|
18
18
|
import { resolveTemplateDirs } from "./paths.js";
|
|
19
|
-
import { builtTips, copyRequiredCode, newlyRequired, resolveRequiresChain, startFromScratch } from "./requires.js";
|
|
19
|
+
import { builtTips, copyRequiredCode, importingModules, isImportModule, newlyRequired, resolveRequiresChain, startFromScratch } from "./requires.js";
|
|
20
20
|
import { withTryItLine } from "./delivery.js";
|
|
21
21
|
import { describeSpecDiff, renderSpecDiff, specFilesOf } from "./regenerate.js";
|
|
22
22
|
import { locateDiffLines } from "./diff-view.js";
|
|
@@ -85,6 +85,23 @@ function chainsFor(plainFile) {
|
|
|
85
85
|
const tips = builtTips(plainFile);
|
|
86
86
|
return tips.length > 0 ? tips : [resolveRequiresChain(plainFile, [], undefined, { allowNoFunctionalities: true })];
|
|
87
87
|
}
|
|
88
|
+
/**
|
|
89
|
+
* The modules a .plain file is built as: itself - or, an import module, the modules importing it whose code is started.
|
|
90
|
+
* An import module is no codebase; one no started module imports has nothing to build yet - its reqs are built with the
|
|
91
|
+
* first module that imports it.
|
|
92
|
+
*/
|
|
93
|
+
function codebasesOf(plainFile) {
|
|
94
|
+
if (!isImportModule(plainFile))
|
|
95
|
+
return [plainFile];
|
|
96
|
+
return importingModules(plainFile).filter((file) => {
|
|
97
|
+
try {
|
|
98
|
+
return builtTips(file).length > 0 || started(resolveRequiresChain(file, [], undefined, { allowNoFunctionalities: true }).at(-1));
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
}
|
|
88
105
|
/** How many functional specs of its own a codebase has built - none when it was only started from the code below it. */
|
|
89
106
|
function ownBuilt(entry) {
|
|
90
107
|
return (readRecord(entry.buildDir)?.[FUNCTIONAL_REQUIREMENTS] ?? []).length;
|
|
@@ -361,6 +378,8 @@ export function createWorkLoop(options) {
|
|
|
361
378
|
const waiting = (why) => ({ module: entry.moduleName, why: `waiting for ${entry.moduleName}: ${why}` });
|
|
362
379
|
if (below.running !== undefined)
|
|
363
380
|
return waiting(below.running.planned.track === "conformance" ? "its conformance tests are being written" : "the code it is built on is not built yet");
|
|
381
|
+
if (below.held !== undefined)
|
|
382
|
+
return waiting("you halted it - nothing is built on it until it is asked for again");
|
|
364
383
|
const spec = chainSpec(below.chain);
|
|
365
384
|
if (codeWork(builtOf(below), spec.tree).length > 0)
|
|
366
385
|
return waiting("the code it is built on is not built yet");
|
|
@@ -469,6 +488,11 @@ export function createWorkLoop(options) {
|
|
|
469
488
|
/** A dry run's first jobs, by codebase: what each would start. */
|
|
470
489
|
const firsts = new Map();
|
|
471
490
|
const startJob = (state, spec, from, planned) => {
|
|
491
|
+
// Halted while it was being planned: the plan is made, nothing starts.
|
|
492
|
+
if (state.held !== undefined) {
|
|
493
|
+
state.why = state.held.why;
|
|
494
|
+
return;
|
|
495
|
+
}
|
|
472
496
|
const tip = tipEntry(state);
|
|
473
497
|
if (options.dryRun === true) {
|
|
474
498
|
firsts.set(tip.buildDir, { spec: planned.track === "conformance" ? spec : { ...spec, tree: planned.step.tree }, planned });
|
|
@@ -573,7 +597,14 @@ export function createWorkLoop(options) {
|
|
|
573
597
|
}
|
|
574
598
|
return {
|
|
575
599
|
report: released !== undefined ? `${report}\n\n${released}` : report,
|
|
576
|
-
details: {
|
|
600
|
+
details: {
|
|
601
|
+
passed: result.landed,
|
|
602
|
+
landed: result.landed,
|
|
603
|
+
...(released !== undefined ? { released: true } : {}),
|
|
604
|
+
...(result.story !== undefined ? { story: result.story } : {}),
|
|
605
|
+
// The spec gaps its agents met, for a headless run to say - in the chat the report puts them to the person.
|
|
606
|
+
...(result.specGaps !== undefined && result.specGaps.length > 0 ? { specGaps: result.specGaps } : {}),
|
|
607
|
+
},
|
|
577
608
|
};
|
|
578
609
|
},
|
|
579
610
|
});
|
|
@@ -756,16 +787,37 @@ export function createWorkLoop(options) {
|
|
|
756
787
|
}
|
|
757
788
|
return states;
|
|
758
789
|
};
|
|
790
|
+
/** A codebase the loop no longer looks after: nothing of it is shown, planned or waited for. */
|
|
791
|
+
const forget = (state) => {
|
|
792
|
+
const key = tipEntry(state).buildDir;
|
|
793
|
+
modules.delete(key);
|
|
794
|
+
order.splice(order.indexOf(key), 1);
|
|
795
|
+
};
|
|
759
796
|
const lookAll = async () => {
|
|
797
|
+
// A .plain file taken out of the project is asked for no more, and a codebase whose module's file is gone is
|
|
798
|
+
// forgotten - nothing running there - rather than shown waiting for a plan it will never have.
|
|
799
|
+
for (const file of [...asked.keys()])
|
|
800
|
+
if (!existsSync(file))
|
|
801
|
+
asked.delete(file);
|
|
802
|
+
for (const key of [...order]) {
|
|
803
|
+
const state = modules.get(key);
|
|
804
|
+
if (state.running === undefined && !existsSync(tipEntry(state).plainFile))
|
|
805
|
+
forget(state);
|
|
806
|
+
}
|
|
760
807
|
const now = active();
|
|
761
808
|
looking = now;
|
|
762
809
|
for (const key of order) {
|
|
763
810
|
const state = modules.get(key);
|
|
764
|
-
// A codebase left behind - built on since - is not looked at, unless a job of it is still running
|
|
811
|
+
// A codebase left behind - built on since - is not looked at, unless a job of it is still running; what it had
|
|
812
|
+
// planned, or waited for, is no longer shown.
|
|
765
813
|
if (now.has(state) || state.running !== undefined)
|
|
766
814
|
await look(state);
|
|
767
|
-
else
|
|
815
|
+
else {
|
|
768
816
|
state.why = "left behind: the code is built on further up the chain, where changes to it are made";
|
|
817
|
+
state.waitsFor = undefined;
|
|
818
|
+
state.plan = undefined;
|
|
819
|
+
state.conformancePlan = undefined;
|
|
820
|
+
}
|
|
769
821
|
}
|
|
770
822
|
};
|
|
771
823
|
const look = async (state) => {
|
|
@@ -776,6 +828,12 @@ export function createWorkLoop(options) {
|
|
|
776
828
|
}
|
|
777
829
|
catch (error) {
|
|
778
830
|
state.why = `its spec does not parse: ${error instanceof Error ? error.message : String(error)}`;
|
|
831
|
+
// Not planned from a spec that does not parse: what it waited for, and the plan, were the spec's before.
|
|
832
|
+
state.waitsFor = undefined;
|
|
833
|
+
if (state.running === undefined) {
|
|
834
|
+
state.plan = undefined;
|
|
835
|
+
state.conformancePlan = undefined;
|
|
836
|
+
}
|
|
779
837
|
return;
|
|
780
838
|
}
|
|
781
839
|
const specKey = keyOf(spec);
|
|
@@ -828,6 +886,11 @@ export function createWorkLoop(options) {
|
|
|
828
886
|
return;
|
|
829
887
|
}
|
|
830
888
|
hashResources(state, spec);
|
|
889
|
+
if (state.held !== undefined) {
|
|
890
|
+
state.why = state.held.why;
|
|
891
|
+
state.waitsFor = undefined;
|
|
892
|
+
return;
|
|
893
|
+
}
|
|
831
894
|
if (state.halted !== undefined) {
|
|
832
895
|
if (state.halted.specKey === specKey) {
|
|
833
896
|
state.why = state.halted.why;
|
|
@@ -988,13 +1051,18 @@ export function createWorkLoop(options) {
|
|
|
988
1051
|
return state;
|
|
989
1052
|
};
|
|
990
1053
|
const loop = {
|
|
991
|
-
async bringUp(plainFile,
|
|
992
|
-
const
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
|
|
996
|
-
|
|
1054
|
+
async bringUp(plainFile, given = {}) {
|
|
1055
|
+
const { specChange, ...request } = given;
|
|
1056
|
+
const files = codebasesOf(resolve(options.cwd, plainFile));
|
|
1057
|
+
for (const file of files)
|
|
1058
|
+
asked.set(file, { ...asked.get(file), ...request });
|
|
1059
|
+
const states = withParseCache(() => files.flatMap((file) => chainsFor(file).flatMap((chain) => toBuild(chain).map((entry) => track(chain.slice(0, chain.indexOf(entry) + 1), file, request)))));
|
|
1060
|
+
// Asked again, a halted codebase is tried again - one the person halted too, unless only its spec changed.
|
|
1061
|
+
for (const state of states) {
|
|
997
1062
|
state.halted = undefined;
|
|
1063
|
+
if (specChange !== true)
|
|
1064
|
+
state.held = undefined;
|
|
1065
|
+
}
|
|
998
1066
|
await tick();
|
|
999
1067
|
return [...new Set(states)].map(statusOf);
|
|
1000
1068
|
},
|
|
@@ -1062,7 +1130,7 @@ export function createWorkLoop(options) {
|
|
|
1062
1130
|
report.scheduled = (state.scheduled ?? []).map((group) => ({ frids: group.specs.map((touched) => touched.frid), unbuilt: group.unbuilt }));
|
|
1063
1131
|
if (state.running !== undefined)
|
|
1064
1132
|
report.running = { jobId: state.running.jobId, title: state.running.planned.title };
|
|
1065
|
-
const halted = state.halted?.why ?? state.conformanceHalted?.why;
|
|
1133
|
+
const halted = state.held?.why ?? state.halted?.why ?? state.conformanceHalted?.why;
|
|
1066
1134
|
if (halted !== undefined)
|
|
1067
1135
|
report.why = halted;
|
|
1068
1136
|
if (state.startOver !== undefined)
|
|
@@ -1149,6 +1217,7 @@ export function createWorkLoop(options) {
|
|
|
1149
1217
|
}
|
|
1150
1218
|
state.conformanceHalted = undefined;
|
|
1151
1219
|
state.halted = undefined;
|
|
1220
|
+
state.held = undefined;
|
|
1152
1221
|
}
|
|
1153
1222
|
await tick();
|
|
1154
1223
|
return [...new Set(states)].map((state) => {
|
|
@@ -1178,19 +1247,67 @@ export function createWorkLoop(options) {
|
|
|
1178
1247
|
startAgain(entry, `it now requires ${requires.join(", ")}, which its code was not built on`);
|
|
1179
1248
|
return loop.bringUp(plainFile, request);
|
|
1180
1249
|
},
|
|
1181
|
-
async fromScratch(plainFile, request = {}) {
|
|
1250
|
+
async fromScratch(plainFile, { chain, ...request } = {}) {
|
|
1182
1251
|
const file = resolve(options.cwd, plainFile);
|
|
1183
|
-
// Where its code lives: the tips its module is built in, or - none built yet - its own codebase.
|
|
1184
|
-
|
|
1252
|
+
// Where its code lives: the tips its module is built in, or - none built yet - its own codebase. The whole chain:
|
|
1253
|
+
// every codebase in those chains, bottom first - a tip taken back to nothing is otherwise started from a copy of
|
|
1254
|
+
// the code below it.
|
|
1255
|
+
const chains = chainsFor(file);
|
|
1256
|
+
const codebases = [...new Map((chain === true ? chains.flat() : chains.map(tipOf)).map((entry) => [entry.buildDir, entry])).values()];
|
|
1185
1257
|
for (const entry of codebases) {
|
|
1186
1258
|
if (modules.get(entry.buildDir)?.running !== undefined)
|
|
1187
1259
|
throw new Error(`${entry.moduleName} has a pulse running: halt it, or ask again once it is done.`);
|
|
1188
1260
|
}
|
|
1261
|
+
const why = chain === true ? "asked to be regenerated from scratch, with its whole chain" : "asked to be regenerated from scratch";
|
|
1189
1262
|
for (const entry of codebases)
|
|
1190
1263
|
if (started(entry))
|
|
1191
|
-
startAgain(entry,
|
|
1264
|
+
startAgain(entry, why);
|
|
1192
1265
|
return loop.bringUp(plainFile, request);
|
|
1193
1266
|
},
|
|
1267
|
+
halt(target, reason) {
|
|
1268
|
+
const named = target.trim();
|
|
1269
|
+
// A planned row's module - the longest name its id starts with, as a name may hold a hyphen - or a module by its name.
|
|
1270
|
+
const state = order
|
|
1271
|
+
.map((key) => modules.get(key))
|
|
1272
|
+
.filter((candidate) => {
|
|
1273
|
+
const name = tipEntry(candidate).moduleName;
|
|
1274
|
+
return named === name || named.startsWith(`planned-${name}-`);
|
|
1275
|
+
})
|
|
1276
|
+
.sort((a, b) => tipEntry(b).moduleName.length - tipEntry(a).moduleName.length)[0];
|
|
1277
|
+
if (state === undefined)
|
|
1278
|
+
return undefined;
|
|
1279
|
+
const tip = tipEntry(state);
|
|
1280
|
+
if (state.running === undefined && !existsSync(tip.plainFile)) {
|
|
1281
|
+
forget(state);
|
|
1282
|
+
asked.delete(tip.plainFile);
|
|
1283
|
+
return `${tip.moduleName} is no longer in the project - ${basename(tip.plainFile)} is gone - so nothing was to be built there: it is dropped from the regeneration.`;
|
|
1284
|
+
}
|
|
1285
|
+
const planned = statusOf(state).planned.length;
|
|
1286
|
+
const said = reason !== undefined && reason.trim() !== "" ? ` (${reason.trim()})` : "";
|
|
1287
|
+
state.held = { why: `you halted it${said} - nothing runs here until it is asked for again` };
|
|
1288
|
+
state.why = state.held.why;
|
|
1289
|
+
state.waitsFor = undefined;
|
|
1290
|
+
state.plan = undefined;
|
|
1291
|
+
state.conformancePlan = undefined;
|
|
1292
|
+
const running = state.running;
|
|
1293
|
+
if (running !== undefined && running.stopping !== true) {
|
|
1294
|
+
running.stopping = true;
|
|
1295
|
+
options.registry.stop(running.jobId, `Halted by you${said}: what it had done is rolled back, and nothing more runs in ${tip.moduleName} until it is asked for again.`);
|
|
1296
|
+
}
|
|
1297
|
+
const above = order
|
|
1298
|
+
.map((key) => modules.get(key))
|
|
1299
|
+
.filter((other) => other !== state && looking.has(other) && other.chain.some((entry) => entry.buildDir === tip.buildDir))
|
|
1300
|
+
.map((other) => tipEntry(other).moduleName);
|
|
1301
|
+
void tick();
|
|
1302
|
+
return [
|
|
1303
|
+
`Halted ${tip.moduleName}${said}:`,
|
|
1304
|
+
running !== undefined ? ` its running pulse ${running.jobId} is being stopped, and what it had done rolled back;` : "",
|
|
1305
|
+
planned > 0 ? ` its ${planned} planned pulse${planned === 1 ? "" : "s"} will not start.` : " nothing more is planned there.",
|
|
1306
|
+
" Pulses that landed stay.",
|
|
1307
|
+
above.length > 0 ? ` ${above.join(", ")} ${above.length === 1 ? "waits" : "wait"} for it.` : "",
|
|
1308
|
+
` It runs again only when asked for - regenerate ${basename(tip.plainFile)} - a spec change does not start it.`,
|
|
1309
|
+
].join("");
|
|
1310
|
+
},
|
|
1194
1311
|
status() {
|
|
1195
1312
|
return order.map((key) => statusOf(modules.get(key)));
|
|
1196
1313
|
},
|
|
@@ -1405,7 +1522,7 @@ export function describeModules(statuses, options = {}) {
|
|
|
1405
1522
|
` Ask the user whether to start ${codebases.join(", ")} over, and say why: ${codebases.join(", ")} was built without ` +
|
|
1406
1523
|
`${requires.join(", ")}, so no change to its code can bring ${requires.join(", ")} in - its code and conformance ` +
|
|
1407
1524
|
"tests are taken out, kept in its history, and built again from the bottom of the chain. Only if they agree, " +
|
|
1408
|
-
`call regenerate with ${basename(status.plainFile)} and from_scratch.`,
|
|
1525
|
+
`call regenerate with ${basename(status.plainFile)} and from_scratch: "module".`,
|
|
1409
1526
|
];
|
|
1410
1527
|
};
|
|
1411
1528
|
return statuses
|
|
@@ -1459,7 +1576,7 @@ const defaultConformanceRunner = async (job, onDelta) => {
|
|
|
1459
1576
|
writeTestsRecord(result.conformanceDir, job.planned.step.tree);
|
|
1460
1577
|
recordHistory(job.buildDir, `conformance tests: ${job.planned.title}`);
|
|
1461
1578
|
}
|
|
1462
|
-
return { landed: result.passed, report: describeSpecDiffConformance(result) };
|
|
1579
|
+
return { landed: result.passed, report: describeSpecDiffConformance(result), ...(result.specGaps !== undefined ? { specGaps: result.specGaps } : {}) };
|
|
1463
1580
|
};
|
|
1464
1581
|
/** A job as a spec diff render, landed on its unit tests: conformance is a track of its own. */
|
|
1465
1582
|
const defaultRunner = async (job, onDelta) => {
|
|
@@ -1475,7 +1592,9 @@ const defaultRunner = async (job, onDelta) => {
|
|
|
1475
1592
|
onDelta,
|
|
1476
1593
|
});
|
|
1477
1594
|
// Landed code can be tried.
|
|
1478
|
-
return { landed: result.passed, report: withTryItLine(describeSpecDiff(result), result.passed && result.restructured !== true), story: codeStory(result)
|
|
1595
|
+
return { landed: result.passed, report: withTryItLine(describeSpecDiff(result), result.passed && result.restructured !== true), story: codeStory(result),
|
|
1596
|
+
...(result.specGaps !== undefined ? { specGaps: result.specGaps } : {}),
|
|
1597
|
+
};
|
|
1479
1598
|
};
|
|
1480
1599
|
/** How a code pulse went, for its line in the notes: the rounds it took, its test runs, what the debugger found. */
|
|
1481
1600
|
export function codeStory(result) {
|