@feigi/fleet-ctl 3.66.0 → 3.66.1
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/package.json +1 -1
- package/scripts/closeout.mjs +3 -3
- package/scripts/fleet-event.mjs +2 -2
- package/scripts/fleet-tick.mjs +5 -4
- package/scripts/phase0-receipt.mjs +12 -14
- package/scripts/phase0.mjs +16 -9
package/package.json
CHANGED
package/scripts/closeout.mjs
CHANGED
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
//
|
|
23
23
|
// `finish` steps, in order, because the order is the point:
|
|
24
24
|
//
|
|
25
|
-
// tick `fleet-tick.mjs`, with the In-flight bound
|
|
26
|
-
// `.fleet/phase0.json` records
|
|
25
|
+
// tick `fleet-tick.mjs`, with the In-flight bound
|
|
26
|
+
// `.fleet/phase0.json` records, when it records one.
|
|
27
27
|
// Failed unless its last line is `ACTION: run over`.
|
|
28
28
|
// scrape `member-outcomes.mjs <dir>` for every session directory
|
|
29
29
|
// omp keeps for this cwd, each scraper's own yield line as the
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
// so a run that ended here leaves no phase-0 receipt for the
|
|
51
51
|
// next run in this session to resume, and that run's rotation
|
|
52
52
|
// files it as `phase0.<UTC stamp>.json` beside the ledger
|
|
53
|
-
// archive. After the tick, which reads the
|
|
53
|
+
// archive. After the tick, which reads the bound from it, and
|
|
54
54
|
// before the stop. No `phase0.json` is nothing to move and is
|
|
55
55
|
// `ok`; a held receipt already there that is not this one is
|
|
56
56
|
// a failed step.
|
package/scripts/fleet-event.mjs
CHANGED
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
//
|
|
7
7
|
// Reached through the Resolver and run from the main checkout. Every kind
|
|
8
8
|
// performs its writes, then runs `fleet-tick.mjs --apply` with the In-flight
|
|
9
|
-
// bound — `--in-flight` as given, else the one `.fleet/phase0.json`
|
|
10
|
-
//
|
|
9
|
+
// bound — `--in-flight` as given, else the one `.fleet/phase0.json` records,
|
|
10
|
+
// else the tick's own default — and prints one
|
|
11
11
|
// `event: <kind>: <summary>` line with the tick's output verbatim after it.
|
|
12
12
|
// Every kind is idempotent: a second run finds its writes made and only ticks
|
|
13
13
|
// again.
|
package/scripts/fleet-tick.mjs
CHANGED
|
@@ -1285,7 +1285,7 @@ import { gitEnv } from "./git-env.mjs";
|
|
|
1285
1285
|
import { fleetFile, FleetDirUnresolvable, scratchRoot } from "./fleet-dir.mjs";
|
|
1286
1286
|
import { statePath, readState, writeState, assessBeat, isStalled, isReported, stallReport, stallOwner } from "./fleet-state.mjs";
|
|
1287
1287
|
import { checkMainCheckout, describe } from "./main-checkout.mjs";
|
|
1288
|
-
import { readRunReceipt, phase0Gate } from "./phase0-receipt.mjs";
|
|
1288
|
+
import { readRunReceipt, phase0Gate, IN_FLIGHT_DEFAULT } from "./phase0-receipt.mjs";
|
|
1289
1289
|
import { judgeRecord, ProcUnreadable } from "./proc.mjs";
|
|
1290
1290
|
import { reportPath, reportsDir } from "./report-files.mjs";
|
|
1291
1291
|
|
|
@@ -1334,9 +1334,10 @@ const die = makeDie(NAME);
|
|
|
1334
1334
|
// is left is configuration, and all of it defaults.
|
|
1335
1335
|
const OPTIONS = {
|
|
1336
1336
|
// The In-flight bound: the most tickets between Claim and merge at once. The
|
|
1337
|
-
// default
|
|
1338
|
-
// goes through the guard below, where a hand-passed default
|
|
1339
|
-
|
|
1337
|
+
// default is phase0-receipt.mjs's, the one phase 0 also takes, declared this
|
|
1338
|
+
// way so it still goes through the guard below, where a hand-passed default
|
|
1339
|
+
// went round it.
|
|
1340
|
+
"in-flight": { type: "string", default: String(IN_FLIGHT_DEFAULT) },
|
|
1340
1341
|
// `--fold-unchanged` prints ONE line instead of the rows when this tick asks
|
|
1341
1342
|
// for nothing and says exactly what the last one said — what makes an
|
|
1342
1343
|
// unattended night affordable. Opt-in because folding is wrong on an edge:
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
// after every step (its header gives the shape); this module is its readers'
|
|
3
3
|
// half: the tick's dispatch gate, the session directory tier-check.mjs
|
|
4
4
|
// and ticket-router.mjs take when their own flag is omitted, and the In-flight
|
|
5
|
-
// bound the drivers hand the tick. One reading of the file,
|
|
6
|
-
// the session readers cannot disagree about what a receipt is.
|
|
5
|
+
// bound the drivers hand the tick, with its default. One reading of the file,
|
|
6
|
+
// so the gate and the session readers cannot disagree about what a receipt is.
|
|
7
7
|
//
|
|
8
8
|
// Zero deps: node builtins and sibling modules only.
|
|
9
9
|
|
|
@@ -145,18 +145,17 @@ export function sessionFromReceipt(opts) {
|
|
|
145
145
|
throw new Error(`no session given and none in the phase-0 receipt ${path} (${why}) — give one, or run ${phase0Command(null)} first`);
|
|
146
146
|
}
|
|
147
147
|
|
|
148
|
-
//
|
|
149
|
-
//
|
|
150
|
-
|
|
151
|
-
const
|
|
148
|
+
// The In-flight bound a run takes when nobody gives one: the most tickets
|
|
149
|
+
// between Claim and merge at once. Its one definition — phase0.mjs and the
|
|
150
|
+
// tick's own flag default both read it from here.
|
|
151
|
+
export const IN_FLIGHT_DEFAULT = 5;
|
|
152
152
|
|
|
153
153
|
/**
|
|
154
154
|
* The bound the receipt in `fleetDir` records, as the tick's own flag:
|
|
155
|
-
* `{ args }
|
|
156
|
-
*
|
|
157
|
-
*
|
|
158
|
-
*
|
|
159
|
-
* defaulted to.
|
|
155
|
+
* `{ args }` — `--in-flight <B>` for the `inFlight` phase 0 ran with, none
|
|
156
|
+
* when there is no receipt or it records no bound — or `{ error }` for a
|
|
157
|
+
* receipt that is there and cannot be read. The caps the receipt records
|
|
158
|
+
* play no part: the bound counts tickets, not members.
|
|
160
159
|
*/
|
|
161
160
|
export function tickCaps(fleetDir) {
|
|
162
161
|
let phase0;
|
|
@@ -166,7 +165,6 @@ export function tickCaps(fleetDir) {
|
|
|
166
165
|
if (e.code === "ENOENT") return { args: [] };
|
|
167
166
|
return { error: `cannot read ${join(fleetDir, RECEIPT)}: ${e.message}` };
|
|
168
167
|
}
|
|
169
|
-
const
|
|
170
|
-
|
|
171
|
-
return { args: ["--in-flight", String((impl ?? RETIRED_IMPL_CAP) + (review ?? RETIRED_REVIEW_CAP))] };
|
|
168
|
+
const bound = phase0?.inFlight;
|
|
169
|
+
return { args: bound == null ? [] : ["--in-flight", String(bound)] };
|
|
172
170
|
}
|
package/scripts/phase0.mjs
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Phase 0 as one command: the run's start sequence, in order, with a receipt.
|
|
3
3
|
//
|
|
4
4
|
// phase0.mjs --session <dir> [--implementer-cap n] [--reviewer-cap n]
|
|
5
|
-
// [--plugin-checkout <dir>] [--spend-dir <dir>]
|
|
5
|
+
// [--in-flight n] [--plugin-checkout <dir>] [--spend-dir <dir>]
|
|
6
6
|
// [--workflow <name> | --declare-no-ci]
|
|
7
7
|
//
|
|
8
8
|
// Reached through the Resolver and run from the MAIN checkout (a linked
|
|
@@ -31,7 +31,11 @@
|
|
|
31
31
|
// output), exit 2 or anything else `unanswered`; neither stops
|
|
32
32
|
// the run — reconciling is a write to the gate and the
|
|
33
33
|
// maintainer's.
|
|
34
|
-
// tier-roles `tier-roles.mjs --check
|
|
34
|
+
// tier-roles `tier-roles.mjs --check --in-flight <B>`. <B> is `--in-flight`
|
|
35
|
+
// when given, else the In-flight bound's default
|
|
36
|
+
// (IN_FLIGHT_DEFAULT in phase0-receipt.mjs); the caps play no
|
|
37
|
+
// part in it. A notice tier-roles prints on a pass is part of
|
|
38
|
+
// the step's output.
|
|
35
39
|
// metrics `metrics-refresh.mjs`. A non-zero exit fails the step.
|
|
36
40
|
// cockpit `board.mjs serve --open` launched detached, `--spend-dir`
|
|
37
41
|
// passed through. Recorded; never fails the run.
|
|
@@ -55,7 +59,7 @@
|
|
|
55
59
|
// THE RECEIPT is `.fleet/phase0.json` (resolved through fleet-dir.mjs, so a
|
|
56
60
|
// worktree and the main checkout name one file):
|
|
57
61
|
//
|
|
58
|
-
// { run, session, scratch, caps: {impl, review},
|
|
62
|
+
// { run, session, scratch, caps: {impl, review}, inFlight,
|
|
59
63
|
// steps: { <name>: { status, at, output } } }
|
|
60
64
|
//
|
|
61
65
|
// `status` is ok, pending, failed, drift or unanswered; `at` an ISO time;
|
|
@@ -66,7 +70,8 @@
|
|
|
66
70
|
// run. `session` is `--session`, the one place the controller states its
|
|
67
71
|
// session directory. `scratch` is what `scratch-root.mjs` prints. `caps` are
|
|
68
72
|
// the flags as given, null for one not given: the tick's own defaults apply to
|
|
69
|
-
// a cap nobody set, and a number here would pretend somebody had.
|
|
73
|
+
// a cap nobody set, and a number here would pretend somebody had. `inFlight`
|
|
74
|
+
// is the In-flight bound this run used — `--in-flight`, or its default.
|
|
70
75
|
//
|
|
71
76
|
// RESUMABLE. A re-run reads the receipt. It continues it — skipping every `ok`
|
|
72
77
|
// step and re-running the rest — only when its `run` equals the `at` the
|
|
@@ -124,6 +129,7 @@ import { readState, stateFileIn } from "./fleet-state.mjs";
|
|
|
124
129
|
import { gitEnv } from "./git-env.mjs";
|
|
125
130
|
import { isCLI } from "./is-cli.mjs";
|
|
126
131
|
import { RECEIPT, RECEIPT_HELD, archiveStamp, receiptArchiveName, rowNums } from "./ledger-grammar.mjs";
|
|
132
|
+
import { IN_FLIGHT_DEFAULT } from "./phase0-receipt.mjs";
|
|
127
133
|
|
|
128
134
|
const NAME = "phase0";
|
|
129
135
|
const SCRIPTS = dirname(fileURLToPath(import.meta.url));
|
|
@@ -222,10 +228,10 @@ function ruleset({ cwd }) {
|
|
|
222
228
|
return { status: "unanswered", output: withText(`apply-ruleset.sh --check could not answer (${r.how})`, r) };
|
|
223
229
|
}
|
|
224
230
|
|
|
225
|
-
function tierRoles({ cwd }) {
|
|
226
|
-
const r = node("tier-roles.mjs", ["--check"], { cwd });
|
|
231
|
+
function tierRoles({ cwd, receipt }) {
|
|
232
|
+
const r = node("tier-roles.mjs", ["--check", "--in-flight", String(receipt.inFlight)], { cwd });
|
|
227
233
|
if (r.status !== 0) return refusal("tier-roles.mjs --check failed:", r);
|
|
228
|
-
return ok(
|
|
234
|
+
return ok(withText(`every tier route resolves (in-flight bound ${receipt.inFlight})`, r));
|
|
229
235
|
}
|
|
230
236
|
|
|
231
237
|
function metrics({ cwd }) {
|
|
@@ -430,7 +436,7 @@ function main() {
|
|
|
430
436
|
const die = makeDie(NAME);
|
|
431
437
|
const F = defineFlags(die, {
|
|
432
438
|
flags: {
|
|
433
|
-
session: "value", "implementer-cap": "value", "reviewer-cap": "value", "plugin-checkout": "value",
|
|
439
|
+
session: "value", "implementer-cap": "value", "reviewer-cap": "value", "in-flight": "value", "plugin-checkout": "value",
|
|
434
440
|
"spend-dir": "value", workflow: "value", "declare-no-ci": "bool",
|
|
435
441
|
},
|
|
436
442
|
});
|
|
@@ -451,6 +457,7 @@ function main() {
|
|
|
451
457
|
return n;
|
|
452
458
|
};
|
|
453
459
|
const caps = { impl: positive("implementer-cap"), review: positive("reviewer-cap") };
|
|
460
|
+
const inFlight = positive("in-flight") ?? IN_FLIGHT_DEFAULT;
|
|
454
461
|
if (F.has("declare-no-ci") && !absent("workflow")) die("--workflow and --declare-no-ci are alternatives, not a pair");
|
|
455
462
|
const ci = F.has("declare-no-ci") ? "CI: declared absent (--declare-no-ci)" : absent("workflow") ? null : `CI: workflow ${F.arg("workflow")} (--workflow)`;
|
|
456
463
|
const pathOf = (name) => (absent(name) ? null : resolve(F.arg(name)));
|
|
@@ -514,7 +521,7 @@ function main() {
|
|
|
514
521
|
renameSync(receiptPath, held);
|
|
515
522
|
}
|
|
516
523
|
|
|
517
|
-
const receipt = { run: resumed ? previous.run : null, session, scratch, caps, steps: {} };
|
|
524
|
+
const receipt = { run: resumed ? previous.run : null, session, scratch, caps, inFlight, steps: {} };
|
|
518
525
|
for (const name of STEP_NAMES) {
|
|
519
526
|
const was = resumed ? previous.steps[name] : undefined;
|
|
520
527
|
receipt.steps[name] = was?.status === "ok" ? was : { status: "pending", at: now, output: "not run" };
|