unitbob 0.4.5 → 0.5.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/files/guardrails.js +19 -9
- package/dist/files/suiteBuild.js +16 -1
- package/dist/files/suiteBuildUpload.js +71 -0
- package/dist/files/workerPlan.js +20 -3
- package/dist/runner/bootcheck.js +47 -9
- package/dist/runner/precheck.js +104 -36
- package/dist/runner/provision.js +326 -26
- package/dist/runner/pytest.js +25 -20
- package/dist/runner/rspec.js +19 -11
- package/dist/runner/toolchain.js +122 -0
- package/dist/runner/vitest.js +64 -30
- package/dist/surfaces/routeInventory.js +15 -3
- package/dist/verbs/codexInstall.js +1 -1
- package/dist/verbs/putSuiteBuild.js +32 -75
- package/dist/verbs/run.js +15 -6
- package/dist/verbs/runLocal.js +19 -7
- package/dist/verbs/suitePrepare.js +43 -7
- package/dist/verbs/validateBuild.js +140 -456
- package/dist/wire.js +21 -3
- package/package.json +1 -1
- package/plugin/codex/agents/suite-repair-worker.toml +1 -1
- package/plugin/codex/agents/suite-reviewer.toml +157 -0
- package/plugin/codex/agents/suite-worker.toml +9 -3
package/dist/runner/vitest.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { existsSync, writeFileSync } from 'node:fs';
|
|
2
|
-
import { join } from 'node:path';
|
|
1
|
+
import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { dirname, join } from 'node:path';
|
|
3
3
|
import { runProcess } from "../proc.js";
|
|
4
4
|
import { GUARDRAILS_DIR } from "../files/guardrails.js";
|
|
5
|
+
import { locateRunner } from "./toolchain.js";
|
|
5
6
|
import { readReport } from "./types.js";
|
|
6
7
|
export const VITEST_TIMEOUT_MS = 10 * 60 * 1000;
|
|
7
8
|
export const VITEST_RESULT_FILE = join(GUARDRAILS_DIR, 'vitest_result.json');
|
|
@@ -28,27 +29,44 @@ const PROJECT_CONFIGS = [
|
|
|
28
29
|
'vite.config.cjs',
|
|
29
30
|
];
|
|
30
31
|
// Run the materialised Unitbob guardrail suite with the project's own Vitest
|
|
31
|
-
// (spec 30). Only the guardrail
|
|
32
|
+
// (spec 30). Only the guardrail files run — the path arguments filter the run.
|
|
32
33
|
//
|
|
33
|
-
// A bare `vitest run <file>` treats
|
|
34
|
+
// A bare `vitest run <file>` treats each path as a filter that is intersected
|
|
34
35
|
// with the project's `test.include`, so a project whose include does not cover
|
|
35
|
-
// `.unitbob/` would collect no tests.
|
|
36
|
-
//
|
|
37
|
-
//
|
|
38
|
-
//
|
|
39
|
-
//
|
|
36
|
+
// `.unitbob/` would collect no tests. So the config Unitbob writes names every
|
|
37
|
+
// file of the branch in `include`, and the positional filters keep the run to
|
|
38
|
+
// exactly those files.
|
|
39
|
+
//
|
|
40
|
+
// Named files rather than a directory glob, since spec 42, §6.5 made a branch
|
|
41
|
+
// several files: the artifact already says which files it is, and a glob would
|
|
42
|
+
// have to guess a naming convention nothing enforces. `include` is written even
|
|
43
|
+
// when the project has no config of its own — Vitest's default include only
|
|
44
|
+
// covers `.unitbob/` for a file that happens to be named `*.test.ts`, which is a
|
|
45
|
+
// trap set for whoever names a slice after its capability.
|
|
40
46
|
//
|
|
41
47
|
// The JSON report goes to --outputFile, not stdout, so app logging can never
|
|
42
48
|
// corrupt it. The command is connector-owned: the suite artifact never carries
|
|
43
49
|
// a command string.
|
|
44
|
-
export async function runVitestSuite(projectRoot,
|
|
45
|
-
const configArgs = writeMergedConfig(projectRoot,
|
|
46
|
-
|
|
47
|
-
|
|
50
|
+
export async function runVitestSuite(projectRoot, suitePaths) {
|
|
51
|
+
const configArgs = writeMergedConfig(projectRoot, suitePaths);
|
|
52
|
+
// An installed vitest — the sidecar's, else the project's — is spawned by
|
|
53
|
+
// path. `npx` stays as the last resort it has always been: it is the only
|
|
54
|
+
// option that can conjure a runner out of nothing, which is right here at the
|
|
55
|
+
// end and wrong everywhere else (see `locateRunner`, which does not offer it).
|
|
56
|
+
const located = locateRunner(projectRoot, 'vitest');
|
|
57
|
+
const command = located?.command ?? 'npx';
|
|
58
|
+
const args = [
|
|
59
|
+
...(located ? located.args : ['vitest']),
|
|
60
|
+
'run',
|
|
61
|
+
...suitePaths,
|
|
62
|
+
...configArgs,
|
|
63
|
+
'--reporter=json',
|
|
64
|
+
`--outputFile=${VITEST_RESULT_FILE}`,
|
|
65
|
+
];
|
|
48
66
|
const result = await runProcess(command, args, {
|
|
49
67
|
cwd: projectRoot,
|
|
50
68
|
timeoutMs: VITEST_TIMEOUT_MS,
|
|
51
|
-
env: { ...process.env, UNITBOB_REPO_ROOT: projectRoot },
|
|
69
|
+
env: { ...process.env, ...located?.env, UNITBOB_REPO_ROOT: projectRoot },
|
|
52
70
|
});
|
|
53
71
|
return {
|
|
54
72
|
...result,
|
|
@@ -58,31 +76,47 @@ export async function runVitestSuite(projectRoot, suitePath) {
|
|
|
58
76
|
report: readReport(join(projectRoot, VITEST_RESULT_FILE)),
|
|
59
77
|
};
|
|
60
78
|
}
|
|
61
|
-
// Returns the `--config` args to add, writing the
|
|
62
|
-
//
|
|
63
|
-
//
|
|
64
|
-
function writeMergedConfig(projectRoot,
|
|
79
|
+
// Returns the `--config` args to add, writing the config first. Always written:
|
|
80
|
+
// the branch's files have to be in `include` or nothing is collected, and the
|
|
81
|
+
// names a worker gives its slice are not something to bet a whole run on.
|
|
82
|
+
function writeMergedConfig(projectRoot, suitePaths) {
|
|
65
83
|
const projectConfig = PROJECT_CONFIGS.find((name) => existsSync(join(projectRoot, name)));
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
writeFileSync(
|
|
84
|
+
const path = join(projectRoot, VITEST_CONFIG_FILE);
|
|
85
|
+
mkdirSync(dirname(path), { recursive: true });
|
|
86
|
+
writeFileSync(path, configSource(projectConfig, suitePaths));
|
|
69
87
|
return ['--config', VITEST_CONFIG_FILE];
|
|
70
88
|
}
|
|
71
89
|
// The .unitbob/ config sits one level below the project root, so the project
|
|
72
|
-
// config is a `../` import.
|
|
73
|
-
//
|
|
74
|
-
//
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
90
|
+
// config is a `../` import. A function-form config is resolved first, and
|
|
91
|
+
// everything the project set — plugins, aliases, setup files, environment — is
|
|
92
|
+
// carried through; only `test.include` is replaced, with exactly this branch's
|
|
93
|
+
// files. Replacing rather than concatenating is the point: the run must be these
|
|
94
|
+
// files and no others, and the positional filters then say the same thing twice.
|
|
95
|
+
//
|
|
96
|
+
// Nothing is imported from `vitest` itself, and that is deliberate. Vite
|
|
97
|
+
// re-imports this generated file from a temporary module beside it, so every
|
|
98
|
+
// bare `import` here resolves by walking up from `.unitbob/` — while a project
|
|
99
|
+
// whose only vitest is the one Unitbob installed keeps it at
|
|
100
|
+
// `.unitbob/runners/node_modules`, which is not on that path. An
|
|
101
|
+
// `import { mergeConfig } from 'vitest/config'` there dies with
|
|
102
|
+
// ERR_MODULE_NOT_FOUND before a single test is collected, on exactly the
|
|
103
|
+
// projects the sidecar exists for. A spread does the same job with no import,
|
|
104
|
+
// and `defineConfig` is a typing helper that buys a generated file nothing.
|
|
105
|
+
function configSource(projectConfig, suitePaths) {
|
|
106
|
+
const include = `include: ${JSON.stringify(suitePaths)}`;
|
|
107
|
+
const header = '// Written by the unitbob connector before each vitest run — do not edit.';
|
|
108
|
+
if (!projectConfig) {
|
|
109
|
+
return `${header}
|
|
110
|
+
export default { test: { ${include} } };
|
|
111
|
+
`;
|
|
112
|
+
}
|
|
113
|
+
return `${header}
|
|
78
114
|
import projectConfig from ${JSON.stringify(`../${projectConfig}`)};
|
|
79
115
|
|
|
80
116
|
const base = typeof projectConfig === 'function'
|
|
81
117
|
? await projectConfig({ command: 'serve', mode: 'test' })
|
|
82
118
|
: projectConfig;
|
|
83
119
|
|
|
84
|
-
export default
|
|
85
|
-
test: { include: [${JSON.stringify(suitePath)}] },
|
|
86
|
-
});
|
|
120
|
+
export default { ...base, test: { ...(base.test ?? {}), ${include} } };
|
|
87
121
|
`;
|
|
88
122
|
}
|
|
@@ -2,6 +2,7 @@ import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node
|
|
|
2
2
|
import { dirname, join } from 'node:path';
|
|
3
3
|
import { runProcess } from "../proc.js";
|
|
4
4
|
import { firstErrorLine } from "../runner/bootcheck.js";
|
|
5
|
+
import { detectStructuralRunner } from "../runner/precheck.js";
|
|
5
6
|
import { graphPath } from "../files/mapBuild.js";
|
|
6
7
|
// Reading a router means booting the application, which on a large Rails app is
|
|
7
8
|
// tens of seconds. The same budget the other boot-shaped step uses.
|
|
@@ -20,7 +21,7 @@ export function routeInventoryPath(projectRoot) {
|
|
|
20
21
|
// records why Django, FastAPI and Flask come next and why Express cannot follow
|
|
21
22
|
// at all (its addresses are registered by arbitrary code at run time).
|
|
22
23
|
export async function extractRouteInventory(projectRoot, deps = defaultDeps) {
|
|
23
|
-
if (!
|
|
24
|
+
if (!canAskTheRouter(projectRoot))
|
|
24
25
|
return silent(projectRoot, 'unsupported_stack');
|
|
25
26
|
const asked = await askTheRouter(projectRoot, deps);
|
|
26
27
|
if ('reason' in asked)
|
|
@@ -150,8 +151,19 @@ function becauseOf(result) {
|
|
|
150
151
|
function plural(count, one, many) {
|
|
151
152
|
return count === 1 ? one : many;
|
|
152
153
|
}
|
|
153
|
-
|
|
154
|
-
|
|
154
|
+
// Which stack this is, is not this module's question — one answer to it already
|
|
155
|
+
// exists and this file now asks it. `config/routes.rb` stays as a second-level
|
|
156
|
+
// condition inside the Ruby branch, because a Rails application without a route
|
|
157
|
+
// file has no router to ask.
|
|
158
|
+
//
|
|
159
|
+
// It used to be the whole test, which made it a fourth independent way of
|
|
160
|
+
// deciding "is this Rails?" — and one that was wrong at both edges: a Rails app
|
|
161
|
+
// that keeps its routes elsewhere was refused, and any project that happens to
|
|
162
|
+
// carry a `config/routes.rb` was asked to boot Rails. There are still several
|
|
163
|
+
// stack detectors in this package; this removes the one that had a single caller
|
|
164
|
+
// and no excuse.
|
|
165
|
+
function canAskTheRouter(projectRoot) {
|
|
166
|
+
return (detectStructuralRunner(projectRoot) === 'rspec' && existsSync(join(projectRoot, 'config', 'routes.rb')));
|
|
155
167
|
}
|
|
156
168
|
// The question, asked of the router object rather than of the `rails routes`
|
|
157
169
|
// command line. `--expanded` was the earlier reading, and it cost this project
|
|
@@ -2,7 +2,7 @@ import { copyFileSync, existsSync, mkdirSync, readFileSync } from 'node:fs';
|
|
|
2
2
|
import { homedir } from 'node:os';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { fileURLToPath } from 'node:url';
|
|
5
|
-
const AGENT_NAMES = ['suite-worker', 'suite-repair-worker', 'fact-finder'];
|
|
5
|
+
const AGENT_NAMES = ['suite-worker', 'suite-repair-worker', 'fact-finder', 'suite-reviewer'];
|
|
6
6
|
const bundledAgentsDir = fileURLToPath(new URL('../../plugin/codex/agents/', import.meta.url));
|
|
7
7
|
export function installCodexAgents(args, deps = { home: homedir(), stdout: process.stdout }) {
|
|
8
8
|
if (args.length > 0)
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { collectBuildProblems
|
|
1
|
+
import { readHostSuiteOutputsPerBranch, readSuiteBuildRequest, } from "../files/suiteBuild.js";
|
|
2
|
+
import { collectBuildProblems } from "./validateBuild.js";
|
|
3
|
+
import { PUBLISHED, uploadItem, withReview } from "../files/suiteBuildUpload.js";
|
|
3
4
|
import { Wire } from "../wire.js";
|
|
4
5
|
// Read the task and the host's answers, verify each branch parses and carries a
|
|
5
6
|
// safe-path artifact envelope, then upload both peer branches in one batch
|
|
@@ -28,7 +29,6 @@ export async function putSuiteBuild(config, _args = [], deps) {
|
|
|
28
29
|
stdout: process.stdout,
|
|
29
30
|
...deps,
|
|
30
31
|
};
|
|
31
|
-
const digestFor = new Map(request.branches.map((branch) => [branch.suite_kind, branch.source_digest]));
|
|
32
32
|
const items = [];
|
|
33
33
|
const blocked = unreadable.map((entry) => ({
|
|
34
34
|
suite_kind: entry.suite_kind,
|
|
@@ -39,26 +39,19 @@ export async function putSuiteBuild(config, _args = [], deps) {
|
|
|
39
39
|
// skipped by going straight to the upload — but reported the way every other
|
|
40
40
|
// local failure here is reported: against the branch it belongs to.
|
|
41
41
|
//
|
|
42
|
+
// Since spec 42 that check is exactly one question, and it is about a branch
|
|
43
|
+
// the answer has *no* entry for: everything else it used to ask is now asked
|
|
44
|
+
// of the server, by a dry run, before this command runs at all. So its
|
|
45
|
+
// problems can never land on a branch this loop visits, and they are reported
|
|
46
|
+
// below rather than inside it.
|
|
47
|
+
//
|
|
42
48
|
// An earlier draft threw and stopped the command, which quietly undid spec
|
|
43
|
-
// 32-5 Phase 4: one
|
|
44
|
-
//
|
|
45
|
-
//
|
|
46
|
-
// batch. That also bounds what a false positive in a local check can cost —
|
|
47
|
-
// one branch, with the peer still going up and the server still the authority.
|
|
48
|
-
const problemsFor = new Map();
|
|
49
|
-
for (const problem of collectBuildProblems(request, outputs, unreadable)) {
|
|
50
|
-
problemsFor.set(problem.branch, [...(problemsFor.get(problem.branch) ?? []), problem.message]);
|
|
51
|
-
}
|
|
49
|
+
// 32-5 Phase 4: one behavioral problem would have left a finished structural
|
|
50
|
+
// suite unpublished. Every problem here is named against a branch, so it
|
|
51
|
+
// blocks that branch and never the batch.
|
|
52
52
|
for (const output of outputs) {
|
|
53
|
-
const failed = problemsFor.get(output.suite_kind);
|
|
54
|
-
problemsFor.delete(output.suite_kind);
|
|
55
|
-
if (failed) {
|
|
56
|
-
blocked.push({ suite_kind: output.suite_kind, status: BLOCKED_STATUS, error: formatBranchProblems(failed) });
|
|
57
|
-
continue;
|
|
58
|
-
}
|
|
59
|
-
const sourceDigest = digestFor.get(output.suite_kind) ?? '';
|
|
60
53
|
if (output.build_error) {
|
|
61
|
-
items.push(
|
|
54
|
+
items.push(uploadItem(request, output, undefined));
|
|
62
55
|
continue;
|
|
63
56
|
}
|
|
64
57
|
let testMetadata = output.test_metadata;
|
|
@@ -71,23 +64,14 @@ export async function putSuiteBuild(config, _args = [], deps) {
|
|
|
71
64
|
continue;
|
|
72
65
|
}
|
|
73
66
|
}
|
|
74
|
-
items.push(
|
|
75
|
-
suite_kind: output.suite_kind,
|
|
76
|
-
source_digest: sourceDigest,
|
|
77
|
-
artifacts: {
|
|
78
|
-
suite_file: output.suite_file,
|
|
79
|
-
runner_manifest: output.runner_manifest,
|
|
80
|
-
test_metadata: testMetadata,
|
|
81
|
-
},
|
|
82
|
-
});
|
|
67
|
+
items.push(uploadItem(request, output, testMetadata));
|
|
83
68
|
}
|
|
84
|
-
//
|
|
85
|
-
//
|
|
86
|
-
// upload and nothing to roll back, so it costs its peer nothing — but it is
|
|
69
|
+
// A branch the request asked for and the answer never mentions. It has nothing
|
|
70
|
+
// to upload and nothing to roll back, so it costs its peer nothing — but it is
|
|
87
71
|
// exactly the branch that used to leave no trace anywhere, and the one line it
|
|
88
72
|
// prints here is the whole point of noticing it (spec 32-6, a2time 2026-08-04).
|
|
89
|
-
for (const
|
|
90
|
-
blocked.push({ suite_kind:
|
|
73
|
+
for (const problem of collectBuildProblems(request, outputs, unreadable)) {
|
|
74
|
+
blocked.push({ suite_kind: problem.branch, status: BLOCKED_STATUS, error: problem.message });
|
|
91
75
|
}
|
|
92
76
|
// Every branch is blocked, so there is nothing to upload. Asking the server to
|
|
93
77
|
// publish an empty batch would turn a local, already-explained problem into a
|
|
@@ -103,46 +87,6 @@ export async function putSuiteBuild(config, _args = [], deps) {
|
|
|
103
87
|
// malformed. Not a server status — it never reaches the server — but it travels
|
|
104
88
|
// as one so a single rule decides what counts as published (see `PUBLISHED`).
|
|
105
89
|
const BLOCKED_STATUS = 'not_ready';
|
|
106
|
-
// The behavioral branch's uploaded metadata, with the independent review and the
|
|
107
|
-
// connector's own run evidence folded in.
|
|
108
|
-
//
|
|
109
|
-
// Throws for anything that leaves this branch unpublishable — a missing review,
|
|
110
|
-
// one bound to a different candidate, a defect the review called not_supplied.
|
|
111
|
-
// The caller turns that into one unpublished branch rather than a failed
|
|
112
|
-
// command: a blocked review is a fact about the behavioral suite, and the
|
|
113
|
-
// structural peer next to it is finished and correct. Sinking the whole upload
|
|
114
|
-
// with it forced the one workaround this contract exists to prevent — hand-editing
|
|
115
|
-
// the answer down to a single branch, which loses the peer candidate for real.
|
|
116
|
-
function withReview(config, request, output) {
|
|
117
|
-
const review = readBehavioralReview(config.projectRoot, output);
|
|
118
|
-
const probe = review.known_defect_probe;
|
|
119
|
-
const qualityReview = review.bdd_quality_review;
|
|
120
|
-
if (!qualityReview || typeof qualityReview !== 'object') {
|
|
121
|
-
throw new Error('The separate behavioral review must contain a bdd_quality_review object.');
|
|
122
|
-
}
|
|
123
|
-
if (request.known_defect_context.status === 'supplied' && probe?.status === 'not_supplied') {
|
|
124
|
-
throw new Error('A known defect was supplied to suite-prepare, but the behavioral review marked it not_supplied.');
|
|
125
|
-
}
|
|
126
|
-
return {
|
|
127
|
-
...output.test_metadata,
|
|
128
|
-
bdd_quality_review: {
|
|
129
|
-
...qualityReview,
|
|
130
|
-
candidate_digest: review.candidate_digest,
|
|
131
|
-
},
|
|
132
|
-
...(review.selection_review ? { selection_review: review.selection_review } : {}),
|
|
133
|
-
known_defect_probe: review.known_defect_probe,
|
|
134
|
-
known_defect_context: request.known_defect_context,
|
|
135
|
-
candidate_run: review.candidate_run,
|
|
136
|
-
...(review.fixed_candidate_run ? { fixed_candidate_run: review.fixed_candidate_run } : {}),
|
|
137
|
-
};
|
|
138
|
-
}
|
|
139
|
-
// The three outcomes that leave a branch published and current: a new version, an
|
|
140
|
-
// identical version already stored, or a reactivated one. Each returns the
|
|
141
|
-
// identity to run. Everything else — a rejected branch, a branch the host could
|
|
142
|
-
// not build, or a status this connector has never seen — fails closed and is
|
|
143
|
-
// never run, so a newer server can never trick an older connector into running
|
|
144
|
-
// something it does not understand.
|
|
145
|
-
const PUBLISHED = new Set(['created', 'unchanged', 'restored']);
|
|
146
90
|
export function classifyPublication(results) {
|
|
147
91
|
const split = { digests: [], unpublished: [] };
|
|
148
92
|
for (const result of results) {
|
|
@@ -176,7 +120,20 @@ function printResult(result) {
|
|
|
176
120
|
.join(', ')
|
|
177
121
|
: '';
|
|
178
122
|
const digest = result.suite_digest ? ` (${result.suite_digest})` : '';
|
|
179
|
-
return `${result.suite_kind}: ${result.status}${digest}${tallies ? ` — ${tallies}` : ''}
|
|
123
|
+
return (`${result.suite_kind}: ${result.status}${digest}${tallies ? ` — ${tallies}` : ''}.` + printDowngrades(result));
|
|
124
|
+
}
|
|
125
|
+
// Spec 42, §7. A capability every one of whose Scenarios the review objected to
|
|
126
|
+
// is stored `unguarded` by the publish. The run is standing right here when that
|
|
127
|
+
// is decided, so it is told here, in the server's own words — finding it on the
|
|
128
|
+
// map afterwards is how a run finishes believing it published a guarantee it did
|
|
129
|
+
// not.
|
|
130
|
+
function printDowngrades(result) {
|
|
131
|
+
const downgraded = result.unguarded_by_review ?? [];
|
|
132
|
+
if (downgraded.length === 0)
|
|
133
|
+
return '';
|
|
134
|
+
return (`\n ${downgraded.length} capability(ies) published unguarded, because the review objected to every ` +
|
|
135
|
+
'Scenario guarding them:\n' +
|
|
136
|
+
downgraded.map((entry) => ` - ${entry.capability_id}: ${entry.reason}`).join('\n'));
|
|
180
137
|
}
|
|
181
138
|
// The server's own words when it sent any; otherwise the best true thing that can
|
|
182
139
|
// be said. A status this connector does not know is quoted rather than guessed
|
package/dist/verbs/run.js
CHANGED
|
@@ -27,9 +27,12 @@ function resolve(config, deps) {
|
|
|
27
27
|
return {
|
|
28
28
|
getSuites: () => wire.getSuites(),
|
|
29
29
|
postRunsBatch: (runs) => wire.postRunsBatch(runs),
|
|
30
|
+
// The whole envelope, support files and all: a branch is a set of files
|
|
31
|
+
// since spec 42, §6, and picking `path` and `content` out of it here was
|
|
32
|
+
// where the rest of them used to be lost.
|
|
30
33
|
materializeStructural: (projectRoot, item) => materializeGuardrails(projectRoot, {
|
|
31
34
|
suite_digest: item.suite_digest,
|
|
32
|
-
suite_file:
|
|
35
|
+
suite_file: item.suite_file,
|
|
33
36
|
runner_manifest: item.runner_manifest,
|
|
34
37
|
}),
|
|
35
38
|
materializeBehavioral: (projectRoot, item) => materializeBehavioral(projectRoot, item.suite_file, item.runner_manifest.runner).mainPath,
|
|
@@ -98,7 +101,7 @@ async function buildRunPayload(config, d, item) {
|
|
|
98
101
|
}
|
|
99
102
|
else {
|
|
100
103
|
d.materializeStructural(config.projectRoot, item);
|
|
101
|
-
result = await d.runStructural(config.projectRoot, runner, item.suite_file
|
|
104
|
+
result = await d.runStructural(config.projectRoot, runner, artifactPaths(item.suite_file));
|
|
102
105
|
}
|
|
103
106
|
}
|
|
104
107
|
catch (err) {
|
|
@@ -121,18 +124,24 @@ async function buildRunPayload(config, d, item) {
|
|
|
121
124
|
// Exported for `run-local`, which runs these same strategies against the files
|
|
122
125
|
// the host just wrote rather than against a published suite. One dispatch table,
|
|
123
126
|
// so the command the loop iterates on is the command that runs after publishing.
|
|
124
|
-
export function runStructuralByRunner(projectRoot, runner,
|
|
127
|
+
export function runStructuralByRunner(projectRoot, runner, suitePaths) {
|
|
125
128
|
switch (runner) {
|
|
126
129
|
case 'rspec':
|
|
127
|
-
return runRspecSuite(projectRoot,
|
|
130
|
+
return runRspecSuite(projectRoot, suitePaths);
|
|
128
131
|
case 'vitest':
|
|
129
|
-
return runVitestSuite(projectRoot,
|
|
132
|
+
return runVitestSuite(projectRoot, suitePaths);
|
|
130
133
|
case 'pytest':
|
|
131
|
-
return runPytestSuite(projectRoot,
|
|
134
|
+
return runPytestSuite(projectRoot, suitePaths);
|
|
132
135
|
default:
|
|
133
136
|
return Promise.reject(new Error(`Unsupported runner "${runner}" — rebuild the suite.`));
|
|
134
137
|
}
|
|
135
138
|
}
|
|
139
|
+
// Every file of the branch, in the order the envelope carries them. A structural
|
|
140
|
+
// branch is one file per assignment since spec 42, §6, and running only the main
|
|
141
|
+
// one would execute a fraction of what the map says is guarded.
|
|
142
|
+
function artifactPaths(file) {
|
|
143
|
+
return [file.path, ...(file.support_files ?? []).map((entry) => entry.path)];
|
|
144
|
+
}
|
|
136
145
|
function suiteError(suiteDigest, message) {
|
|
137
146
|
return {
|
|
138
147
|
suite_digest: suiteDigest,
|
package/dist/verbs/runLocal.js
CHANGED
|
@@ -102,10 +102,10 @@ async function runOneBranch(config, d, suiteKind, output) {
|
|
|
102
102
|
return null;
|
|
103
103
|
}
|
|
104
104
|
let runner;
|
|
105
|
-
let
|
|
105
|
+
let suitePaths;
|
|
106
106
|
try {
|
|
107
107
|
runner = branchRunner(output);
|
|
108
|
-
|
|
108
|
+
suitePaths = artifactPathsOf(output);
|
|
109
109
|
}
|
|
110
110
|
catch (err) {
|
|
111
111
|
d.stdout.write(`Cannot run this branch: ${err.message}\n`);
|
|
@@ -120,8 +120,8 @@ async function runOneBranch(config, d, suiteKind, output) {
|
|
|
120
120
|
try {
|
|
121
121
|
result =
|
|
122
122
|
suiteKind === 'behavioral'
|
|
123
|
-
? await d.runBehavioral(config.projectRoot, runner,
|
|
124
|
-
: await d.runStructural(config.projectRoot, runner,
|
|
123
|
+
? await d.runBehavioral(config.projectRoot, runner, suitePaths[0])
|
|
124
|
+
: await d.runStructural(config.projectRoot, runner, suitePaths);
|
|
125
125
|
}
|
|
126
126
|
catch (err) {
|
|
127
127
|
d.stdout.write(`The runner could not start: ${err.message}\n`);
|
|
@@ -161,14 +161,26 @@ function outputTail(result) {
|
|
|
161
161
|
const joined = bits.join('\n');
|
|
162
162
|
return joined.length > OUTPUT_TAIL_CHARS ? joined.slice(-OUTPUT_TAIL_CHARS) : joined;
|
|
163
163
|
}
|
|
164
|
-
// The suite blob's own project-relative
|
|
165
|
-
|
|
164
|
+
// The suite blob's own project-relative paths, exactly as the runners expect
|
|
165
|
+
// them: the main file first, then every other file of the branch. The main file
|
|
166
|
+
// stopped being the whole suite in spec 42, §6 — a branch is one file per
|
|
167
|
+
// assignment now — and running it alone would exercise a fraction of what the
|
|
168
|
+
// answer claims to guard.
|
|
169
|
+
//
|
|
170
|
+
// The behavioral runners are given the main `.feature` and find the rest
|
|
171
|
+
// themselves: all three are pointed at the directory (`bdd.ts`), which is why a
|
|
172
|
+
// multi-file behavioral branch already worked before this spec.
|
|
173
|
+
function artifactPathsOf(output) {
|
|
166
174
|
const file = output.suite_file;
|
|
167
175
|
const path = file?.path;
|
|
168
176
|
if (typeof path !== 'string' || !path) {
|
|
169
177
|
throw new Error('this branch names no suite file to run.');
|
|
170
178
|
}
|
|
171
|
-
|
|
179
|
+
const support = Array.isArray(file?.support_files) ? file.support_files : [];
|
|
180
|
+
const rest = support
|
|
181
|
+
.map((entry) => entry?.path)
|
|
182
|
+
.filter((candidate) => typeof candidate === 'string' && candidate.length > 0);
|
|
183
|
+
return [path, ...rest];
|
|
172
184
|
}
|
|
173
185
|
function branchRoot(config, suiteKind) {
|
|
174
186
|
const request = readSuiteBuildRequest(config.projectRoot);
|
|
@@ -3,9 +3,9 @@ import { materializeHelper } from "../files/guardrails.js";
|
|
|
3
3
|
import { materializeBehavioralWorld } from "../files/behavioral.js";
|
|
4
4
|
import { recipeNameFor, writeSuiteBuildRequest, } from "../files/suiteBuild.js";
|
|
5
5
|
import { bootCheck, SIGNAL_STRENGTH } from "../runner/bootcheck.js";
|
|
6
|
-
import { anyStackPrecheck, detectBddRunner, detectStructuralRunner } from "../runner/precheck.js";
|
|
6
|
+
import { anyStackPrecheck, detectBddRunner, detectStructuralRunner, runnerReadyPrecheck } from "../runner/precheck.js";
|
|
7
7
|
import { selectRunnerEnvelope, withInstalledRunnerVersion } from "../runner/manifest.js";
|
|
8
|
-
import { ensureRunner } from "../runner/provision.js";
|
|
8
|
+
import { ensureRunner, ensureStructuralRunner } from "../runner/provision.js";
|
|
9
9
|
import { probeBehavioralWorld } from "../runner/worldProbe.js";
|
|
10
10
|
import { Wire } from "../wire.js";
|
|
11
11
|
// The complete envelope for one branch, or null when this machine cannot
|
|
@@ -46,7 +46,8 @@ function runnerEnvelopeFor(packet, runner, projectRoot) {
|
|
|
46
46
|
: envelope;
|
|
47
47
|
}
|
|
48
48
|
// Confirm at least one supported stack is present, materialize the Ruby boot
|
|
49
|
-
// helper
|
|
49
|
+
// helper an RSpec suite would need — only in a Ruby project — then fetch both
|
|
50
|
+
// peer assignments
|
|
50
51
|
// (spec 32) and each branch's recipe, and write the host's task to
|
|
51
52
|
// `.unitbob/suite-build/request.json`. No model is called and no source is read
|
|
52
53
|
// here — that is the host's job, framed by the two generation recipes. An
|
|
@@ -60,8 +61,10 @@ export async function suitePrepare(config, args = [], deps) {
|
|
|
60
61
|
getRecipe: (name) => wire.getRecipe(name),
|
|
61
62
|
getSuitePacketsBatch: () => wire.getSuitePacketsBatch(),
|
|
62
63
|
precheck: anyStackPrecheck,
|
|
64
|
+
confirmRunner: (projectRoot, runner) => runnerReadyPrecheck(projectRoot, runner),
|
|
63
65
|
bootCheck: (projectRoot, runner) => bootCheck(projectRoot, runner),
|
|
64
66
|
ensureRunner: deps?.ensureRunner ?? ensureRunner,
|
|
67
|
+
ensureStructuralRunner: deps?.ensureStructuralRunner ?? ensureStructuralRunner,
|
|
65
68
|
worldProbe: deps?.worldProbe ?? probeBehavioralWorld,
|
|
66
69
|
runnerEnvelope: runnerEnvelopeFor,
|
|
67
70
|
stdout: process.stdout,
|
|
@@ -70,7 +73,36 @@ export async function suitePrepare(config, args = [], deps) {
|
|
|
70
73
|
const check = actual.precheck(config.projectRoot);
|
|
71
74
|
if (!check.ok)
|
|
72
75
|
throw new Error(check.message ?? 'Unsupported runtime.');
|
|
73
|
-
|
|
76
|
+
// Ruby only. This wrote `unitbob_helper.rb` and `rspec.opts` into every
|
|
77
|
+
// project it touched, so a Flask app and a NestJS app each came away with a
|
|
78
|
+
// Ruby file they never asked for and cannot run — the product leaving another
|
|
79
|
+
// stack's litter in someone's repository.
|
|
80
|
+
if (detectStructuralRunner(config.projectRoot) === 'rspec')
|
|
81
|
+
materializeHelper(config.projectRoot);
|
|
82
|
+
// The stack is known; now make it runnable. A vibecoder who has never
|
|
83
|
+
// installed a test runner is the ordinary customer, not an edge case, so the
|
|
84
|
+
// runner (and, where the language allows it, the application's own
|
|
85
|
+
// dependencies) is installed under `.unitbob/` rather than reported as a
|
|
86
|
+
// reason they cannot use the product. Nothing in their project is written to.
|
|
87
|
+
//
|
|
88
|
+
// A project that already has its runner is left completely alone — see
|
|
89
|
+
// `ensureStructuralRunner` — so this costs nothing on a set-up machine.
|
|
90
|
+
const setupNotices = [];
|
|
91
|
+
if (check.runner) {
|
|
92
|
+
const provisioned = await actual.ensureStructuralRunner(config.projectRoot, check.runner);
|
|
93
|
+
if (provisioned.status === 'fixable') {
|
|
94
|
+
const steps = provisioned.checklist?.length ? `\n - ${provisioned.checklist.join('\n - ')}` : '';
|
|
95
|
+
throw new Error(`The ${check.runner} runner could not be installed under .unitbob/, and nothing can run without it: ` +
|
|
96
|
+
`${provisioned.message ?? 'provisioning failed'}${steps}\nNothing was written and nothing was uploaded.`);
|
|
97
|
+
}
|
|
98
|
+
setupNotices.push(...(provisioned.checklist ?? []));
|
|
99
|
+
// Confirm rather than assume. Provisioning reporting success and the runner
|
|
100
|
+
// actually being startable are two different facts, and this is the cheap
|
|
101
|
+
// one to check before a whole generation is built on it.
|
|
102
|
+
const ready = actual.confirmRunner(config.projectRoot, check.runner);
|
|
103
|
+
if (!ready.ok)
|
|
104
|
+
throw new Error(ready.message ?? `The ${check.runner} runner is not available.`);
|
|
105
|
+
}
|
|
74
106
|
// Spec 32-6. Before anything is fetched or written, find out whether the suite
|
|
75
107
|
// would get off the ground at all. It runs here, after the boot helper exists
|
|
76
108
|
// and before the network, so a project whose suite cannot start costs one
|
|
@@ -170,6 +202,9 @@ export async function suitePrepare(config, args = [], deps) {
|
|
|
170
202
|
`then run ${nextCommand}.\n`);
|
|
171
203
|
// A fixable runner blocker is not a failure: the structural suite still builds this run. Tell the
|
|
172
204
|
// vibecoder the one command that unblocks the behavioral peer, then re-run suite-prepare.
|
|
205
|
+
if (setupNotices.length > 0) {
|
|
206
|
+
actual.stdout.write('\nOne setup step is worth knowing about before you generate:\n - ' + setupNotices.join('\n - ') + '\n');
|
|
207
|
+
}
|
|
173
208
|
if (fixableNotices.length > 0) {
|
|
174
209
|
actual.stdout.write('\nBehavioral suite skipped this run — its runner or connector-owned World profile is not ready. ' +
|
|
175
210
|
'This is a fixable setup step, not a build failure, and it does not affect the structural suite:\n' +
|
|
@@ -224,9 +259,10 @@ function bootFinding(boot, runner) {
|
|
|
224
259
|
// the one the vibecoder can paste into a search.
|
|
225
260
|
const next = boot.cause === 'defect_in_code'
|
|
226
261
|
? 'Fix that, then run `unitbob suite-prepare` again.'
|
|
227
|
-
:
|
|
228
|
-
'
|
|
229
|
-
'`pip install -r requirements.txt`),
|
|
262
|
+
: 'Unitbob installs the runner, and your declared dependencies with it, into `.unitbob/runners/` — ' +
|
|
263
|
+
'it never writes to your project. Something outside that file is still missing here. Run the ' +
|
|
264
|
+
'install your project needs (`bundle install`, `npm install`, `pip install -r requirements.txt`), ' +
|
|
265
|
+
'then run `unitbob suite-prepare` again.';
|
|
230
266
|
return (`${headline}\n\n` +
|
|
231
267
|
` ${boot.message}\n\n` +
|
|
232
268
|
`${boot.detail}\n\n` +
|