@feigi/fleet-ctl 3.138.1 → 3.139.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/package.json +1 -1
- package/scripts/metrics-refresh.mjs +6 -16
- package/scripts/pull-attribution.mjs +12 -5
- package/scripts/pull.mjs +1 -3
- package/scripts/ticket-router.mjs +106 -13
- package/scripts/ticket-text.mjs +3 -0
package/package.json
CHANGED
|
@@ -16,7 +16,10 @@
|
|
|
16
16
|
// deletes the pending file. A crash between the write and the delete leaves
|
|
17
17
|
// rows the next drain finds already there, so a second run changes nothing.
|
|
18
18
|
// A corpus written before a column the pending file carries — one the row
|
|
19
|
-
// grammar names
|
|
19
|
+
// grammar names, `objective`, `parent`, `named_paths`, `named_lines`, `dirs`,
|
|
20
|
+
// `title` or `plugin_version` — gains that column, blank on every row it
|
|
21
|
+
// already holds. A pending file begun before one of them drains its rows
|
|
22
|
+
// blank in it.
|
|
20
23
|
// A pending file that is empty, or blank lines only, is removed with its own
|
|
21
24
|
// line: an append created it and never wrote.
|
|
22
25
|
// The drain takes no lock by design: it assumes only the run's controller
|
|
@@ -91,7 +94,7 @@ import { COLUMNS as MEMBER_COLUMNS, ENDINGS, isImplementer, parseTsv as parseMem
|
|
|
91
94
|
import { blobId } from "./pr-cost.mjs";
|
|
92
95
|
import { FEATURE_COLUMNS, parseFeatures } from "./pull-attribution.mjs";
|
|
93
96
|
import { REPORT_STATUSES } from "./report-files.mjs";
|
|
94
|
-
import { DEFAULT_TABLE, fitTable, readGuard, validateTable } from "./ticket-router.mjs";
|
|
97
|
+
import { DEFAULT_TABLE, INSTALL_PACKAGE, fitTable, installVersion, readGuard, validateTable } from "./ticket-router.mjs";
|
|
95
98
|
import { parseTierOutcomes } from "./tier-outcomes.mjs";
|
|
96
99
|
|
|
97
100
|
const NAME = "metrics-refresh";
|
|
@@ -103,8 +106,6 @@ const TIERS = join("docs", "metrics", "tier-outcomes.tsv");
|
|
|
103
106
|
const CORPUS = [MEMBERS, TIERS, FEATURES];
|
|
104
107
|
const GUARD = join(".fleet", "cost-guard.json");
|
|
105
108
|
const PREVIEW = join(".fleet", "router-preview.json");
|
|
106
|
-
// The install's own package.json, whose `version` names the prior.
|
|
107
|
-
const PACKAGE = fileURLToPath(new URL("../package.json", import.meta.url));
|
|
108
109
|
// pr-cost.mjs --guard: 0 no cell tripped, 3 a cell tripped, 4 no verdict yet —
|
|
109
110
|
// all three are verdicts its readers consume; anything else is a failure.
|
|
110
111
|
const GUARD_VERDICT_EXITS = new Set([0, 3, 4]);
|
|
@@ -275,23 +276,12 @@ function costGuard(repo) {
|
|
|
275
276
|
return g;
|
|
276
277
|
}
|
|
277
278
|
|
|
278
|
-
// The install's `package.json` `version`, or null when it names none or cannot be read:
|
|
279
|
-
// the prior is named by it, and the fit does not need it.
|
|
280
|
-
function installVersion(path) {
|
|
281
|
-
try {
|
|
282
|
-
const v = JSON.parse(readFileSync(path, "utf8"))?.version;
|
|
283
|
-
return typeof v === "string" ? v : null;
|
|
284
|
-
} catch {
|
|
285
|
-
return null;
|
|
286
|
-
}
|
|
287
|
-
}
|
|
288
|
-
|
|
289
279
|
// The Preview fit over `repo`'s working-tree TSVs and `written`, the guard file the
|
|
290
280
|
// guard duty just wrote (parsed), with the router table at `tablePath` as its
|
|
291
281
|
// prior, written to `.fleet/router-preview.json` through a temp file and a
|
|
292
282
|
// rename. Throws on anything it cannot read, fit or write, before the rename, so
|
|
293
283
|
// the old file stays as it was.
|
|
294
|
-
export function writePreview(repo, written, { tablePath = DEFAULT_TABLE, packagePath =
|
|
284
|
+
export function writePreview(repo, written, { tablePath = DEFAULT_TABLE, packagePath = INSTALL_PACKAGE, now = new Date() } = {}) {
|
|
295
285
|
const guard = readGuard(written);
|
|
296
286
|
if (guard === null) throw new Error(`${GUARD} is not a guard the router reads`);
|
|
297
287
|
let prior;
|
|
@@ -88,16 +88,23 @@ import { parseMemberName } from "./member-record.mjs";
|
|
|
88
88
|
import { isImplementer } from "./member-outcomes.mjs";
|
|
89
89
|
import { DATE, isDerivedNote, rulingFor, rulingsByTicket } from "./tier-outcomes.mjs";
|
|
90
90
|
|
|
91
|
-
// The ticket-features row, one per Pull, in this order. `objective`
|
|
92
|
-
//
|
|
93
|
-
//
|
|
94
|
-
// a ticket that is no Slice (ticket-router.mjs's sliceParent).
|
|
91
|
+
// The ticket-features row, one per Pull, in this order. `objective`, `parent`
|
|
92
|
+
// and every column after them came last and are optional on read: a file whose
|
|
93
|
+
// header lacks one reads it blank. `parent` is a Slice's parent issue number,
|
|
94
|
+
// blank for a ticket that is no Slice (ticket-router.mjs's sliceParent).
|
|
95
|
+
// `named_paths` is the paths the brief names (ticket-text.mjs's briefPaths),
|
|
96
|
+
// space-separated as named; `named_lines` one entry per path, aligned: the
|
|
97
|
+
// file's line count, `dir` for a directory, `-` for a path that does not exist
|
|
98
|
+
// or lies outside the checkout; `dirs` the number of distinct directories they
|
|
99
|
+
// span. Those three are blank when the brief names no path. `title` is the
|
|
100
|
+
// issue's title, and `plugin_version` the install's `package.json` `version`.
|
|
95
101
|
export const FEATURE_COLUMNS = Object.freeze([
|
|
96
102
|
"run_date", "session", "agent", "ticket", "policy_cell", "chosen_cell", "exploration_draw",
|
|
97
103
|
"sizing_src", "sizing_pre", "router_usd", "brief_chars", "criteria", "comments", "age_days",
|
|
98
104
|
"paths", "test_paths", "xrefs", "kind", "objective", "parent",
|
|
105
|
+
"named_paths", "named_lines", "dirs", "title", "plugin_version",
|
|
99
106
|
]);
|
|
100
|
-
export const OPTIONAL_COLUMNS = new Set(
|
|
107
|
+
export const OPTIONAL_COLUMNS = new Set(FEATURE_COLUMNS.slice(FEATURE_COLUMNS.indexOf("objective")));
|
|
101
108
|
|
|
102
109
|
// The quality floor's margin, in points of fail rate.
|
|
103
110
|
export const TRIP_POINTS = 15;
|
package/scripts/pull.mjs
CHANGED
|
@@ -141,7 +141,7 @@ import { isCLI } from "./is-cli.mjs";
|
|
|
141
141
|
import { LabelMapUnreadable, readLabelMap } from "./label-map.mjs";
|
|
142
142
|
import { EXCLUDED_REASON, POLICY_CELL, memberTokens, parseRouting, premisesOf, pullEnded, tierValues } from "./ledger-grammar.mjs";
|
|
143
143
|
import { sessionFromReceipt } from "./phase0-receipt.mjs";
|
|
144
|
-
import { briefPaths, briefText, defang, outOfScope, strandedRuling, ticketText } from "./ticket-text.mjs";
|
|
144
|
+
import { LINE_REF, briefPaths, briefText, defang, outOfScope, strandedRuling, ticketText } from "./ticket-text.mjs";
|
|
145
145
|
|
|
146
146
|
const NAME = "pull";
|
|
147
147
|
const SCRIPTS = dirname(fileURLToPath(import.meta.url));
|
|
@@ -251,8 +251,6 @@ export function issueRefs(section) {
|
|
|
251
251
|
|
|
252
252
|
// ── the collision scan ───────────────────────────────────────────────────────
|
|
253
253
|
|
|
254
|
-
// A brief path's trailing line reference, `:N` or `:N-M`.
|
|
255
|
-
const LINE_REF = /:(\d+)(?:-(\d+))?$/;
|
|
256
254
|
const MARKDOWN = /\.(md|markdown|mdx)$/i;
|
|
257
255
|
// The byte each one-letter escape of a C-quoted diff path stands for.
|
|
258
256
|
const ESC = { n: 10, t: 9, '"': 34, "\\": 92, a: 7, b: 8, f: 12, r: 13, v: 11 };
|
|
@@ -14,9 +14,11 @@
|
|
|
14
14
|
// REASON=<reason>`,
|
|
15
15
|
// routing by the objective's row set, and appends the Pull's
|
|
16
16
|
// ticket-features row to the pending TSV (by default
|
|
17
|
-
// `ticket-features.pending.tsv` beside `--guard`, in the run's `.fleet/`).
|
|
18
|
-
//
|
|
19
|
-
//
|
|
17
|
+
// `ticket-features.pending.tsv` beside `--guard`, in the run's `.fleet/`).
|
|
18
|
+
// The paths its brief names are looked up under the working directory,
|
|
19
|
+
// the checkout, for `named_lines`. Exit 0 on every data degradation — a
|
|
20
|
+
// missing or unreadable issue, sizing or guard file degrades the line,
|
|
21
|
+
// never the exit. Exit 2 only on a usage error or
|
|
20
22
|
// an unreadable/invalid table: the caller does not dispatch then. With no
|
|
21
23
|
// `--session`, the session is the one the phase-0 receipt
|
|
22
24
|
// `.fleet/phase0.json` records, and with no `--objective` the objective
|
|
@@ -43,9 +45,9 @@
|
|
|
43
45
|
// the guard are files the caller wrote, and a fitted commit is fetched by the
|
|
44
46
|
// caller.
|
|
45
47
|
|
|
46
|
-
import { readFileSync, writeFileSync, renameSync, appendFileSync, mkdirSync, statSync } from "node:fs";
|
|
48
|
+
import { readFileSync, writeFileSync, renameSync, appendFileSync, mkdirSync, statSync, realpathSync } from "node:fs";
|
|
47
49
|
import { spawnSync } from "node:child_process";
|
|
48
|
-
import { basename, dirname, join, resolve } from "node:path";
|
|
50
|
+
import { basename, dirname, isAbsolute, join, posix, relative, resolve, sep } from "node:path";
|
|
49
51
|
import { fileURLToPath } from "node:url";
|
|
50
52
|
import { isDeepStrictEqual } from "node:util";
|
|
51
53
|
import { isCLI } from "./is-cli.mjs";
|
|
@@ -58,11 +60,13 @@ import {
|
|
|
58
60
|
AttributionError, FEATURE_COLUMNS, OPTIONAL_COLUMNS, TRIP_POINTS, attribute, bootUnit, bootstrapDiffCI, generations, parseFeatures, tally, underFloor,
|
|
59
61
|
} from "./pull-attribution.mjs";
|
|
60
62
|
import { RulingError, parseTierOutcomes } from "./tier-outcomes.mjs";
|
|
61
|
-
import { briefPaths, briefText } from "./ticket-text.mjs";
|
|
63
|
+
import { LINE_REF, briefPaths, briefText } from "./ticket-text.mjs";
|
|
62
64
|
|
|
63
65
|
const NAME = "ticket-router";
|
|
64
66
|
const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
|
|
65
67
|
export const DEFAULT_TABLE = join(SCRIPT_DIR, "router-table.json");
|
|
68
|
+
// The install's own package.json, whose `version` names the plugin a Pull was routed by.
|
|
69
|
+
export const INSTALL_PACKAGE = join(SCRIPT_DIR, "..", "package.json");
|
|
66
70
|
|
|
67
71
|
// The free classifier's thresholds: heavy past the median brief length of
|
|
68
72
|
// the tickets whose sizing verdict is known, or past five criteria.
|
|
@@ -109,6 +113,25 @@ export function sliceParent(body) {
|
|
|
109
113
|
return ref === null ? "" : ref[1] ?? ref[2];
|
|
110
114
|
}
|
|
111
115
|
|
|
116
|
+
/** The install's `package.json` `version`, or null when it names none or cannot be read. */
|
|
117
|
+
export function installVersion(path = INSTALL_PACKAGE) {
|
|
118
|
+
try {
|
|
119
|
+
const v = JSON.parse(readFileSync(path, "utf8"))?.version;
|
|
120
|
+
return typeof v === "string" ? v : null;
|
|
121
|
+
} catch {
|
|
122
|
+
return null;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
// The directory a brief path names: its parent once a line reference and any
|
|
127
|
+
// trailing `/` are dropped, or the path itself when it ended in `/`; `.` for a
|
|
128
|
+
// bare filename.
|
|
129
|
+
function pathDir(token) {
|
|
130
|
+
const t = token.replace(LINE_REF, "");
|
|
131
|
+
const q = t.replace(/\/+$/, "");
|
|
132
|
+
return posix.normalize(q === t ? posix.dirname(q) : q || "/");
|
|
133
|
+
}
|
|
134
|
+
|
|
112
135
|
/** The metric columns for a parsed `gh issue view --json title,body,comments,labels,createdAt`, or null when it is not one. */
|
|
113
136
|
export function issueMetrics(issue, now = Date.now()) {
|
|
114
137
|
if (issue === null || typeof issue !== "object" || Array.isArray(issue) || typeof issue.body !== "string") return null;
|
|
@@ -127,9 +150,64 @@ export function issueMetrics(issue, now = Date.now()) {
|
|
|
127
150
|
xrefs: String(new Set([...brief.matchAll(/#(\d+)/g)].map((m) => m[1])).size),
|
|
128
151
|
kind,
|
|
129
152
|
parent: sliceParent(issue.body),
|
|
153
|
+
// briefPaths' tokens hold no whitespace, so one space separates them unambiguously.
|
|
154
|
+
named_paths: paths.join(" "),
|
|
155
|
+
dirs: paths.length === 0 ? "" : String(new Set(paths.map(pathDir)).size),
|
|
156
|
+
title: typeof issue.title === "string" ? issue.title : "",
|
|
130
157
|
};
|
|
131
158
|
}
|
|
132
159
|
|
|
160
|
+
// Whether `abs` is `root` or lies below it. Posix `relative` resolves both
|
|
161
|
+
// first and never answers with an absolute path.
|
|
162
|
+
function within(root, abs) {
|
|
163
|
+
const r = relative(root, abs);
|
|
164
|
+
return r !== ".." && !r.startsWith(`..${sep}`);
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
// One `named_lines` entry: a line reference dropped, the path resolved against
|
|
168
|
+
// `root`, absolute, whose realpath is `realRoot`. One that is absolute, starts
|
|
169
|
+
// with `~` or lies outside `root` — as spelled, or once its symlinks are
|
|
170
|
+
// followed — is `-` and never read; so is one that does not exist, a file
|
|
171
|
+
// named with a trailing `/`, or one that is neither a file nor a directory.
|
|
172
|
+
function lineEntry(token, root, realRoot) {
|
|
173
|
+
const t = token.replace(LINE_REF, "");
|
|
174
|
+
if (isAbsolute(t) || t.startsWith("~")) return "-";
|
|
175
|
+
const at = join(root, t);
|
|
176
|
+
if (!within(root, at)) return "-";
|
|
177
|
+
try {
|
|
178
|
+
const real = realpathSync(at);
|
|
179
|
+
if (!within(realRoot, real)) return "-";
|
|
180
|
+
// `at`, not `real`: realpath drops a trailing `/`, which stat keeps, so a
|
|
181
|
+
// file named as a directory is ENOTDIR here.
|
|
182
|
+
const st = statSync(at);
|
|
183
|
+
if (st.isDirectory()) return "dir";
|
|
184
|
+
if (!st.isFile()) return "-";
|
|
185
|
+
const bytes = readFileSync(real);
|
|
186
|
+
let n = 0;
|
|
187
|
+
for (const b of bytes) if (b === 0x0a) n += 1;
|
|
188
|
+
return String(bytes.length > 0 && bytes[bytes.length - 1] !== 0x0a ? n + 1 : n);
|
|
189
|
+
} catch {
|
|
190
|
+
return "-";
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
/**
|
|
195
|
+
* The `named_lines` value for `named`, a `named_paths` value, resolved against
|
|
196
|
+
* the checkout `root`: per path, aligned and space-separated, the file's line
|
|
197
|
+
* count (its `\n`s, plus one when its last line has none), `dir` for a
|
|
198
|
+
* directory, `-` for anything else (lineEntry). Blank when `named` is.
|
|
199
|
+
*/
|
|
200
|
+
export function namedLines(named, root) {
|
|
201
|
+
if (named === "") return "";
|
|
202
|
+
const paths = named.split(" ");
|
|
203
|
+
let realRoot;
|
|
204
|
+
// A root that cannot be resolved — null when the CLI's working directory is
|
|
205
|
+
// gone — reads every path `-`.
|
|
206
|
+
try { realRoot = realpathSync(root); } catch { return paths.map(() => "-").join(" "); }
|
|
207
|
+
const abs = resolve(root);
|
|
208
|
+
return paths.map((p) => lineEntry(p, abs, realRoot)).join(" ");
|
|
209
|
+
}
|
|
210
|
+
|
|
133
211
|
/**
|
|
134
212
|
* The `rule` classifier, over a row's metric columns: blank metrics are
|
|
135
213
|
* `unknown`, a Slice (a row with a `parent`) is `heavy`, and any other row is
|
|
@@ -280,21 +358,28 @@ export function sessionDate(session) {
|
|
|
280
358
|
}
|
|
281
359
|
|
|
282
360
|
/**
|
|
283
|
-
* One Pull's routing, by `objective`'s row set.
|
|
284
|
-
*
|
|
361
|
+
* One Pull's routing, by `objective`'s row set. Every input is already read
|
|
362
|
+
* but the paths the brief names, which `named_lines` reads under `root`, the
|
|
363
|
+
* checkout. `version` is the install's, `plugin_version` on the row. The
|
|
364
|
+
* exploration draw ignores the objective: it leaves out the cell
|
|
285
365
|
* the `cost` set routes the Pull to — by the sizing when arm B is live for
|
|
286
366
|
* the `cost` set, whichever set routes the Pull — so a Pull draws the same
|
|
287
367
|
* cell under both.
|
|
288
368
|
* @returns {{ line: string, row: Record<string,string> }}
|
|
289
369
|
*/
|
|
290
|
-
export function route({
|
|
370
|
+
export function route({
|
|
371
|
+
session, ticket, arm, implRow, chainHead = false, issue, sizing = null, guard, table, objective, now = Date.now(),
|
|
372
|
+
root = process.cwd(), version = installVersion(),
|
|
373
|
+
}) {
|
|
291
374
|
let reason = null;
|
|
292
375
|
const degrade = (r) => { reason ??= r; };
|
|
293
376
|
|
|
294
377
|
const metrics = issueMetrics(issue, now);
|
|
295
378
|
if (metrics === null) degrade("no-issue-json");
|
|
296
|
-
const blank = Object.fromEntries(
|
|
297
|
-
|
|
379
|
+
const blank = Object.fromEntries(FEATURE_COLUMNS
|
|
380
|
+
.slice(FEATURE_COLUMNS.indexOf("brief_chars"), FEATURE_COLUMNS.indexOf("plugin_version"))
|
|
381
|
+
.filter((c) => c !== "objective").map((c) => [c, ""]));
|
|
382
|
+
const m = metrics === null ? blank : { ...metrics, named_lines: namedLines(metrics.named_paths, root) };
|
|
298
383
|
const ruleS = ruleStratum(m);
|
|
299
384
|
|
|
300
385
|
let stratum = ruleS;
|
|
@@ -345,7 +430,7 @@ export function route({ session, ticket, arm, implRow, chainHead = false, issue,
|
|
|
345
430
|
const row = {
|
|
346
431
|
run_date: sessionDate(session), session, agent: `impl-${ticket}`, ticket: String(ticket),
|
|
347
432
|
policy_cell: policy, chosen_cell: cell, exploration_draw: draw === null ? "" : `${draw.k}/${draw.K}`,
|
|
348
|
-
sizing_src: sizingSrc, sizing_pre: sizingPre, router_usd: routerUsd, ...m, objective,
|
|
433
|
+
sizing_src: sizingSrc, sizing_pre: sizingPre, router_usd: routerUsd, ...m, objective, plugin_version: version ?? "",
|
|
349
434
|
};
|
|
350
435
|
const line = formatRouting({
|
|
351
436
|
policy, cell, draw, by, stratum,
|
|
@@ -754,9 +839,17 @@ function main() {
|
|
|
754
839
|
} else if (!OBJECTIVES.includes(objective)) {
|
|
755
840
|
die(`--objective ${objective} is not ${OBJECTIVES.join(" or ")}`);
|
|
756
841
|
}
|
|
842
|
+
// A working directory removed under the run, or an install `package.json`
|
|
843
|
+
// with no readable version, degrades the row and warns, never the exit.
|
|
844
|
+
let root = null;
|
|
845
|
+
try { root = process.cwd(); } catch (e) {
|
|
846
|
+
process.stderr.write(`${NAME}: WARNING cannot resolve the working directory: ${e.message} — every named path reads \`-\`\n`);
|
|
847
|
+
}
|
|
848
|
+
const version = installVersion();
|
|
849
|
+
if (version === null) process.stderr.write(`${NAME}: WARNING ${INSTALL_PACKAGE} names no readable version — plugin_version is blank\n`);
|
|
757
850
|
const { line, row } = route({
|
|
758
851
|
session, ticket: Number(ticket), arm, implRow: Number(implRowArg), chainHead: F.has("chain-head"),
|
|
759
|
-
issue: readJson(issuePath), sizing: readJson(F.arg("sizing")), guard: readGuard(readJson(guardPath)), table, objective,
|
|
852
|
+
issue: readJson(issuePath), sizing: readJson(F.arg("sizing")), guard: readGuard(readJson(guardPath)), table, objective, root, version,
|
|
760
853
|
});
|
|
761
854
|
const pending = F.arg("pending") ?? join(dirname(guardPath), "ticket-features.pending.tsv");
|
|
762
855
|
// The header decision and the append are not atomic and take no lock. That is
|
package/scripts/ticket-text.mjs
CHANGED
|
@@ -75,6 +75,9 @@ export function defang(text, names) {
|
|
|
75
75
|
return names.reduce((t, n) => t.split(`<${n}>`).join(`‹${n}›`), text);
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
+
/** A brief path's trailing line reference, `:N` or `:N-M`. */
|
|
79
|
+
export const LINE_REF = /:(\d+)(?:-(\d+))?$/;
|
|
80
|
+
|
|
78
81
|
/**
|
|
79
82
|
* The file paths a brief names: every backticked token without whitespace that
|
|
80
83
|
* holds a `/` or ends in an extension, in first-seen order, each once. The
|