@genroc/eval-node 0.0.0-edge.e4b0e52 → 0.0.0-edge.e516465b

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/import.ts CHANGED
@@ -1,18 +1,12 @@
1
1
  #!/usr/bin/env node
2
- // The code-phase resolver: manifest on stdin, `{"code": [...]}` on stdout, non-zero exit
3
- // with the diagnostic on stderr. genctl never parses TypeScript and this never parses YAML
4
- // — the manifest is the whole contract. See specs/source-resolution.md.
5
- //
6
- // Two modes, one binary: "types" writes the declarations an editor needs and returns no
7
- // code; "build" typechecks and bundles. A separate types hook would mean a second `tsc`
8
- // over the same project.
9
-
10
- import { spawn } from "node:child_process";
2
+ // The typed-phase resolver: manifest on stdin, `{"values": [...]}` on stdout, diagnostic on stderr
3
+ // with a non-zero exit (specs/source-resolution.md). Two modes share one `tsc` pass: "generate"
4
+ // writes declarations only, "resolve" typechecks and bundles.
5
+
11
6
  import { existsSync } from "node:fs";
12
- import { access, mkdir, writeFile } from "node:fs/promises";
7
+ import { access, writeFile } from "node:fs/promises";
13
8
  import { builtinModules } from "node:module";
14
- import { dirname, join, relative, resolve } from "node:path";
15
- import { fileURLToPath } from "node:url";
9
+ import { dirname, join, resolve } from "node:path";
16
10
 
17
11
  import commonjs from "@rollup/plugin-commonjs";
18
12
  import json from "@rollup/plugin-json";
@@ -51,8 +45,7 @@ type ManifestProcess = {
51
45
  };
52
46
 
53
47
  type Manifest = {
54
- mode: "types" | "build";
55
- root: string;
48
+ mode: "generate" | "resolve";
56
49
  processes: ManifestProcess[];
57
50
  };
58
51
 
@@ -70,12 +63,6 @@ async function exists(path: string): Promise<boolean> {
70
63
  }
71
64
  }
72
65
 
73
- /** Creates the parent directory, which `.genroc-cache/` relies on: nothing else makes it. */
74
- async function write(path: string, content: string): Promise<void> {
75
- await mkdir(dirname(path), { recursive: true });
76
- await writeFile(path, content);
77
- }
78
-
79
66
  // ── JSON Schema → TypeScript ───────────────────────────────────────────────────
80
67
 
81
68
  /** Only genroc's keyword set is handled; anything else its strict decoder would have
@@ -137,16 +124,21 @@ function objectType(s: Schema, used: Set<string>): string {
137
124
  ? ` /** ${sub.description} */\n`
138
125
  : "";
139
126
  lines.push(
140
- `${doc} ${propKey(key)}${required.has(key) ? "" : "?"}: ${tsType(sub, used)};`,
127
+ `${doc} ${propKey(key)}${required.has(key) ? "" : "?"}: ${nest(tsType(sub, used))};`,
141
128
  );
142
129
  }
143
130
  if (s.additionalProperties && typeof s.additionalProperties === "object") {
144
- lines.push(` [key: string]: ${tsType(s.additionalProperties, used)};`);
131
+ lines.push(
132
+ ` [key: string]: ${nest(tsType(s.additionalProperties, used))};`,
133
+ );
145
134
  }
146
135
  if (lines.length === 0) return "Record<string, unknown>";
147
136
  return `{\n${lines.join("\n")}\n}`;
148
137
  }
149
138
 
139
+ /** Every line but the first, which is already placed by the property that opens it. */
140
+ const nest = (t: string) => t.replace(/\n/g, "\n ");
141
+
150
142
  function union(parts: string[]): string {
151
143
  const seen = [...new Set(parts)];
152
144
  return seen.length === 0 ? "unknown" : seen.join(" | ");
@@ -157,17 +149,6 @@ const propKey = (k: string) => (IDENT.test(k) ? k : JSON.stringify(k));
157
149
  const identifier = (n: string) =>
158
150
  IDENT.test(n) ? n : `Def_${n.replace(/[^A-Za-z0-9_$]/g, "_")}`;
159
151
 
160
- function deref(
161
- s: Schema | undefined,
162
- defs: Record<string, Schema>,
163
- ): Schema | undefined {
164
- let cur = s;
165
- for (let i = 0; cur && typeof cur.$ref === "string" && i < 16; i++) {
166
- cur = defs[cur.$ref.replace(/^#\/\$defs\//, "")];
167
- }
168
- return cur;
169
- }
170
-
171
152
  /** Emits one named type per reachable $def rather than inlining: a task output may
172
153
  * reference itself (specs/recursive-type-inference.md) and inlining would not terminate. */
173
154
  function declarations(at: Located): string {
@@ -188,7 +169,7 @@ function declarations(at: Located): string {
188
169
  }
189
170
 
190
171
  return [
191
- "// Generated by genroc. Do not edit - regenerate with `genctl types`.",
172
+ "// Generated by genroc. Do not edit - regenerate with `genctl generate`.",
192
173
  `// ${where.name} (${address(site.pointer)})`,
193
174
  "",
194
175
  ...emitted,
@@ -208,9 +189,8 @@ function typesPathFor(scriptPath: string): string {
208
189
 
209
190
  // ── typecheck ──────────────────────────────────────────────────────────────────
210
191
 
211
- /** The nearest tsconfig above the script — the one the author's editor already reads. Two
212
- * different configs mean a red editor over a clean apply, or the reverse. The walk stops at
213
- * the project root: above it is not this project. */
192
+ /** The tsconfig the author's editor reads, so editor and apply agree. Stops at the project
193
+ * root. */
214
194
  async function nearestTsconfig(
215
195
  from: string,
216
196
  root: string,
@@ -223,12 +203,7 @@ async function nearestTsconfig(
223
203
  }
224
204
 
225
205
  async function typecheck(sites: Located[]): Promise<void> {
226
- // NOT `.genroc`: that is the project config FILE, and a directory of the same name cannot
227
- // coexist with it. The suffix is what keeps the scratch area out of its way.
228
- const dir = join(root, ".genroc-cache");
229
- await write(join(dir, ".gitignore"), "*\n");
230
-
231
- // One tsc per distinct base config: `extends` takes a single base, so merging two would
206
+ // One program per distinct base config: `extends` takes a single base, so merging two would
232
207
  // check each script under the other author's options.
233
208
  const groups = new Map<string, Located[]>();
234
209
  for (const at of sites) {
@@ -238,10 +213,10 @@ async function typecheck(sites: Located[]): Promise<void> {
238
213
  else groups.set(base, [at]);
239
214
  }
240
215
 
241
- let n = 0;
216
+ const diagnostics: ts.Diagnostic[] = [];
242
217
  for (const [base, group] of groups) {
243
218
  const config: Record<string, unknown> = {
244
- ...(base ? { extends: relative(dir, base) } : {}),
219
+ ...(base ? { extends: base } : {}),
245
220
  compilerOptions: {
246
221
  noEmit: true,
247
222
  strict: true,
@@ -252,46 +227,45 @@ async function typecheck(sites: Located[]): Promise<void> {
252
227
  // `lib` DESCRIBES the realm and is written after `extends` so a base cannot widen it:
253
228
  // a worker thread has no document, whatever an author's config claims.
254
229
  lib: ["esnext", "webworker"],
255
- // `types` is the author's, and it is how a script opts into the node globals —
256
- // the worker realm has them, so refusing the declarations would only lie. With no
257
- // base config there is nothing to opt in with, so the default stays none.
230
+ // `types` is the author's opt-in to node globals, which the realm has. With no base
231
+ // config there is nothing to opt in with, so it stays none.
258
232
  ...(base ? {} : { types: [] }),
259
233
  },
260
- files: group.flatMap((s) => [
261
- relative(dir, s.file),
262
- relative(dir, typesPathFor(s.file)),
263
- ]),
234
+ files: group.flatMap((s) => [s.file, typesPathFor(s.file)]),
264
235
  // `files` overrides the base's, but a base `include` survives beside it and would
265
236
  // drag the author's whole tree in, to be checked under the worker lib.
266
237
  include: [],
267
238
  };
268
- const configPath = join(
269
- dir,
270
- groups.size === 1 ? "tsconfig.json" : `tsconfig.${n++}.json`,
239
+ // Never written; anchors `@types` lookup at the root. Not `tsconfig.json`: that is often the
240
+ // base it extends, and tsc refuses a circular extends.
241
+ const parsed = ts.parseJsonConfigFileContent(
242
+ config,
243
+ ts.sys,
244
+ root,
245
+ undefined,
246
+ join(root, "tsconfig.genroc.json"),
271
247
  );
272
- await write(configPath, JSON.stringify(config, null, 2));
273
- await runTsc(root, configPath);
248
+ const program = ts.createProgram({
249
+ rootNames: parsed.fileNames,
250
+ options: parsed.options,
251
+ projectReferences: parsed.projectReferences,
252
+ configFileParsingDiagnostics: parsed.errors,
253
+ });
254
+ diagnostics.push(...parsed.errors, ...ts.getPreEmitDiagnostics(program));
274
255
  }
275
- }
276
256
 
277
- async function runTsc(root: string, configPath: string): Promise<void> {
278
- const tsc = fileURLToPath(import.meta.resolve("typescript/bin/tsc"));
279
- const proc = spawn(process.execPath, [tsc, "--noEmit", "-p", configPath], {
280
- cwd: root,
281
- stdio: ["ignore", "pipe", "pipe"],
282
- });
283
- let out = "";
284
- let err = "";
285
- proc.stdout.on("data", (c: Buffer) => (out += c));
286
- proc.stderr.on("data", (c: Buffer) => (err += c));
287
- const code = await new Promise<number>((resolve, reject) => {
288
- proc.on("error", reject);
289
- proc.on("close", (c) => resolve(c ?? 1));
290
- });
291
- if (code !== 0) {
292
- // tsc reports on stdout; the exit code IS the type check, so this is the diagnostic
293
- // genctl surfaces and the reason a failed import never produces a string.
294
- die([out, err].filter(Boolean).join("\n").trimEnd());
257
+ if (diagnostics.length > 0) {
258
+ // The diagnostics are the whole type check: this is what genctl surfaces, and the reason a
259
+ // failed import never produces a string.
260
+ die(
261
+ ts
262
+ .formatDiagnostics(diagnostics, {
263
+ getCanonicalFileName: (f) => f,
264
+ getCurrentDirectory: () => root,
265
+ getNewLine: () => "\n",
266
+ })
267
+ .trimEnd(),
268
+ );
295
269
  }
296
270
  }
297
271
 
@@ -321,11 +295,9 @@ const BUILTIN = new Set([
321
295
  ...builtinModules.map((m) => `node:${m}`),
322
296
  ]);
323
297
 
324
- /** Resolves imports through TYPESCRIPT, using the same config the typecheck ran under, so a
325
- * `paths` alias that compiles also bundles. Reimplementing `paths` here would be a second
326
- * resolver to keep in agreement with tsc; this one cannot disagree.
327
- * A package resolving to a `.d.ts` is declined — that is a type, not the implementation —
328
- * which leaves node_modules to nodeResolve. */
298
+ /** Resolves through TYPESCRIPT under the typecheck's config, so a `paths` alias that compiles
299
+ * also bundles. A `.d.ts` resolution is declined (a type, not code), leaving node_modules to
300
+ * nodeResolve. */
329
301
  function tsResolve(configPath: string | null): Plugin {
330
302
  let options: ts.CompilerOptions = {};
331
303
  if (configPath) {
@@ -355,14 +327,12 @@ function tsResolve(configPath: string | null): Plugin {
355
327
  };
356
328
  }
357
329
 
358
- /** Bundles to a self-contained ES module, which is what the evaluator imports: the default
359
- * export it calls is the author's own, so nothing wraps or rewrites the code between the two.
360
- * Bundling is entirely the importer's job, so a definition version pins its code forever. */
330
+ /** A self-contained ES module whose default export is the author's own, unwrapped. Bundling here
331
+ * means a definition version pins its code forever. */
361
332
  async function bundle(at: Located): Promise<string> {
362
333
  const site = at.site;
363
- // Builtins are EXTERNALISED as imports the realm resolves natively. Anything else
364
- // unresolved is a REFUSAL, not an external: rollup's default is to leave it as an import
365
- // of a module that will not be there, which bundles clean and fails at runtime.
334
+ // Builtins are externalised; anything else unresolved is a REFUSAL, since rollup's default
335
+ // leaves an import that bundles clean and fails at runtime.
366
336
  const built = await rollup({
367
337
  input: at.file,
368
338
  external: (id) => BUILTIN.has(id),
@@ -370,8 +340,7 @@ async function bundle(at: Located): Promise<string> {
370
340
  tsResolve(await nearestTsconfig(dirname(at.file), root)),
371
341
  nodeResolve({ extensions: [".ts", ".tsx", ".mjs", ".js", ".json"] }),
372
342
  commonjs(),
373
- // A `.json` import is a data file inlined at build time, which the previous bundler
374
- // did natively; without it rollup hands the JSON to the JS parser.
343
+ // Inlines `.json` imports; without it rollup hands JSON to the JS parser.
375
344
  json(),
376
345
  transpile,
377
346
  ],
@@ -414,10 +383,8 @@ const root = process.cwd();
414
383
  if (!manifest || !Array.isArray(manifest.processes))
415
384
  die("stdin is not a genroc resolver manifest");
416
385
 
417
- /** Every site with the process it sits in and the file its argument names, in the manifest's own
418
- * order — which is the order `code` must answer in. genctl passes the argument verbatim, so
419
- * joining it to the definition's directory is this resolver's business: only it knows the
420
- * argument is a path at all. */
386
+ /** Sites in manifest order, the order `code` must answer in. The argument is joined to the
387
+ * definition's directory here: only this resolver knows it is a path. */
421
388
  type Located = { site: Site; where: ManifestProcess; file: string };
422
389
 
423
390
  /** A pointer as the address it is, so a generated comment or an error can be pasted into
@@ -440,15 +407,10 @@ const located: Located[] = manifest.processes.flatMap((where) =>
440
407
  })),
441
408
  );
442
409
 
443
- // genctl is agnostic about what a script is for; the contract that an evaluation request carries
444
- // its module in `code` is THIS resolver's, so it is the one that checks a directive landed there.
445
- // `child` is the shape the scaffold uses — a call to a process that forwards to the evaluator —
446
- // and `external` is the same request made directly.
410
+ // The `code`-field contract is this resolver's, not genctl's, so it checks the directive landed
411
+ // there: in a child call (the scaffold's shape) or an external task's input.
447
412
  for (const at of located) {
448
- // Two halves, from the two places that carry them: the action's KIND is a field, and WHERE in
449
- // it the directive sits is the pointer. A child call is the shape the scaffold generates — to a
450
- // process that forwards to the evaluator — and an external task is the same request made
451
- // directly.
413
+ // The action's kind is a field; where in it the directive sits is the pointer.
452
414
  const kind = at.site.level === "action" ? (at.site.action ?? "") : "";
453
415
  const slot = at.site.pointer.slice(-2).join(".");
454
416
  if ((kind !== "child" && kind !== "external") || slot !== "input.code") {
@@ -460,8 +422,7 @@ for (const at of located) {
460
422
  }
461
423
  }
462
424
 
463
- // genctl no longer stats the argument — it does not know it is a file — so the resolver that
464
- // does is the one that must say when it is not there.
425
+ // genctl does not know the argument is a file, so this resolver reports a missing one.
465
426
  for (const at of located) {
466
427
  if (!existsSync(at.file)) {
467
428
  die(
@@ -490,18 +451,17 @@ for (const at of located) {
490
451
  }
491
452
 
492
453
  for (const at of byPath.values()) {
493
- await write(typesPathFor(at.file), declarations(at));
454
+ await writeFile(typesPathFor(at.file), declarations(at));
494
455
  }
495
456
 
496
- if (manifest.mode === "types") {
497
- console.log(JSON.stringify(manifest, null, 2));
457
+ if (manifest.mode === "generate") {
498
458
  process.exit(0);
499
459
  }
500
460
 
501
461
  await typecheck([...byPath.values()]);
502
462
 
503
- const code: string[] = [];
463
+ const values: string[] = [];
504
464
  for (const at of located) {
505
- code.push(await bundle(at));
465
+ values.push(await bundle(at));
506
466
  }
507
- process.stdout.write(JSON.stringify({ code }));
467
+ process.stdout.write(JSON.stringify({ values }));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@genroc/eval-node",
3
- "version": "0.0.0-edge.e4b0e52",
3
+ "version": "0.0.0-edge.e516465b",
4
4
  "type": "module",
5
5
  "engines": {
6
6
  "node": ">=24"
package/realm.ts CHANGED
@@ -1,18 +1,13 @@
1
- // The evaluation realm. One Worker per execution: a fresh global object per script, and a
2
- // thread the host can kill mid-loop — the only thing that bounds a synchronous busy loop.
3
- // eval.ts owns the budget and does the killing; nothing here knows about time.
4
- //
5
- // Everything that touches the script's VALUE lives on this side of the boundary — loading,
6
- // classifying, serialising — because this is the only realm the value exists in.
1
+ // The evaluation realm: one Worker per execution, killable mid-loop by eval.ts, which owns the
2
+ // budget. Everything touching the script's VALUE lives here, the only realm it exists in.
7
3
 
8
4
  import { registerHooks } from "node:module";
9
5
  import { parentPort } from "node:worker_threads";
10
6
 
11
7
  import type { EvalFailure, FailureKind, WorkerReply, WorkerRequest } from "./eval.ts";
12
8
 
13
- // The script is IMPORTED as a module under a URL of our own, not compiled from a string: its
14
- // frames then carry the author's own line numbers, and an `import` of a node builtin resolves
15
- // the way it does everywhere else.
9
+ // IMPORTED under our own URL rather than compiled from a string, so frames carry the author's
10
+ // line numbers and builtin imports resolve normally.
16
11
  const SCRIPT_URL = "script:main";
17
12
  const STACK_BYTES = 2_048;
18
13
 
@@ -54,9 +49,8 @@ function safeText(v: unknown): string {
54
49
  }
55
50
  }
56
51
 
57
- /** A module that will not parse, or names an import nothing resolves, is broken code — only
58
- * editing it helps. Anything else thrown by the import is the module's top level running,
59
- * which is the script throwing. */
52
+ /** Unparseable code or an unresolvable import is broken code; anything else the import throws is
53
+ * the module's top level running, i.e. the script throwing. */
60
54
  function unloadable(err: unknown): boolean {
61
55
  const code = (err as { code?: unknown } | null)?.code;
62
56
  return err instanceof SyntaxError || (typeof code === "string" && code.startsWith("ERR_MODULE"));
@@ -99,10 +93,8 @@ async function run(req: WorkerRequest): Promise<WorkerReply> {
99
93
  }
100
94
  }
101
95
 
102
- // The realm's stdio is a pipe to the host thread, and eval.ts terminates this thread the moment
103
- // the reply lands — so whatever a script wrote last is still in the pipe when it dies. An empty
104
- // write's callback fires once the queue ahead of it has drained, which makes the reply a barrier
105
- // for `console` and a direct process.stdout.write alike: both are this stream.
96
+ // eval.ts terminates this thread the moment the reply lands, while stdio may still be in the
97
+ // pipe. An empty write's callback fires once the queue drains, making the reply a barrier.
106
98
  function flush(stream: NodeJS.WriteStream): Promise<void> {
107
99
  return new Promise((resolve) => stream.write("", () => resolve()));
108
100
  }
package/worker.ts CHANGED
@@ -1,34 +1,21 @@
1
1
  #!/usr/bin/env node
2
- // The queue worker: claims parked `external` script tasks from genroc, evaluates each in its
3
- // own realm, and answers. This is the whole genroc-facing half — eval.ts and realm.ts know
4
- // nothing about the queue, which is what keeps the containment strategy swappable.
5
- //
6
- // See README.md for the contract, and specs/external-task-queue.md for the queue itself.
2
+ // The queue worker: claims parked `external` script tasks, evaluates each in its own realm, and
3
+ // answers. The only genroc-facing half (README.md; specs/external-task-queue.md).
7
4
 
8
5
  import { readFileSync } from "node:fs";
9
6
  import { Cancelled, evaluate, type EvalRequest, type FailureKind } from "./eval.ts";
10
7
 
11
8
  const SERVER = (process.env.GENROC_SERVER ?? "http://localhost:8448").replace(/\/$/, "");
12
9
  const WORKER_ID = process.env.WORKER_ID ?? `evaluator-${process.pid}`;
13
- // The credential, when the server runs with --auth token. A worker needs exactly the `worker`
14
- // permission — the four queue verbs plus GET /api/objects — so mint it scoped rather than
15
- // handing a worker an admin token: this is the credential most likely to sit on a machine you
16
- // trust least. specs/api-auth.md §5.
17
- //
18
- // Sent as a header rather than in the URL because Node's fetch REFUSES a URL carrying
19
- // credentials ("Request cannot be constructed from a URL that includes credentials"), so the
20
- // basic-auth-in-the-URL trick that works for genctl is not available here.
21
- // GENROC_TOKEN_FILE is the mounted-secret shape: a credential in a file rather than an
22
- // environment variable, so it stays out of `docker inspect` and out of the process environment
23
- // any child inherits. The inline variable wins when both are set.
10
+ // Needs only the `worker` permission (specs/api-auth.md §5): this credential sits on the machine
11
+ // you trust least. A header, because Node's fetch refuses credentials in a URL. The file form
12
+ // keeps it out of `docker inspect` and child environments; the inline variable wins.
24
13
  const TOKEN =
25
14
  process.env.GENROC_TOKEN ??
26
15
  (process.env.GENROC_TOKEN_FILE ? readFileSync(process.env.GENROC_TOKEN_FILE, "utf8").trim() : "");
27
16
  const authHeaders: Record<string, string> = TOKEN ? { authorization: `Bearer ${TOKEN}` } : {};
28
- // Concurrency is the worker's to set, and that is the point of pulling: under the old fetch
29
- // shape genroc decided how many scripts ran at once (--max-concurrent, default 200) and the
30
- // evaluator accepted every one of them. Here it claims what it can run and no more, so a
31
- // backlog is a queue rather than 200 threads fighting over a core.
17
+ // The worker claims only what it can run, so a backlog is a queue rather than threads fighting
18
+ // over a core.
32
19
  const CONCURRENCY = Number(process.env.CONCURRENCY ?? 4);
33
20
  const POLL_MS = Number(process.env.POLL_MS ?? 250);
34
21
  // The visibility timeout. Short, and renewed while work is in flight: a worker that dies
@@ -43,23 +30,21 @@ type ObjectEntry = { path: (string | number)[]; ref: string; size: number };
43
30
  type QueueTask = {
44
31
  token: string;
45
32
  process: string;
46
- task_id: string;
47
- input: unknown;
33
+ task: string;
34
+ external_input: unknown;
48
35
  objects?: ObjectEntry[];
49
36
  raises?: Record<string, unknown>;
50
37
  };
51
38
 
52
- // Values too large to ship inline are listed rather than carried, and a bundle is exactly that:
53
- // one object shared by every instance of a definition version, fetched once instead of copied
54
- // into each task. A ref is a content hash, so it is immutable — the cache never invalidates.
39
+ // Large values arrive as refs; a bundle is one object per definition version, fetched once.
40
+ // Refs are content hashes, so the cache never invalidates.
55
41
  const objectCache = new Map<string, unknown>();
56
42
 
57
43
  async function fetchObject(ref: string): Promise<unknown> {
58
44
  const cached = objectCache.get(ref);
59
45
  if (cached !== undefined) return cached;
60
- // Left to throw on purpose: this runs while a task is IN FLIGHT, and a task whose input
61
- // cannot be fetched must fail rather than silently run against a missing value. The caller
62
- // releases the claim, so the task returns to the queue.
46
+ // Left to throw: a task whose input cannot be fetched must not run against a missing value.
47
+ // The caller releases the claim.
63
48
  const res = await fetch(`${SERVER}/api/objects/${encodeURIComponent(ref)}`, { headers: authHeaders });
64
49
  if (!res.ok) throw new Error(`fetch object ${ref}: HTTP ${res.status}`);
65
50
  const { data } = (await res.json()) as { data: string };
@@ -76,15 +61,15 @@ async function fetchObject(ref: string): Promise<unknown> {
76
61
  /** Put each listed value back where its path says it belongs. Paths are arrays of keys, so this
77
62
  * needs no parser: the whole reason they are not JSON Pointer strings. */
78
63
  async function resolveObjects(job: QueueTask): Promise<unknown> {
79
- let input: any = job.input;
64
+ let input: any = job.external_input;
80
65
  for (const e of job.objects ?? []) {
81
66
  const value = await fetchObject(e.ref);
82
67
  if (e.path.length === 0) {
83
68
  input = value;
84
69
  continue;
85
70
  }
86
- // The path is rooted at the entry and starts with "input", which is the value being rebuilt.
87
- const rest = e.path[0] === "input" ? e.path.slice(1) : e.path;
71
+ // The path is rooted at the entry and starts with "external_input", the value being rebuilt.
72
+ const rest = e.path[0] === "external_input" ? e.path.slice(1) : e.path;
88
73
  if (rest.length === 0) {
89
74
  input = value;
90
75
  continue;
@@ -97,10 +82,8 @@ async function resolveObjects(job: QueueTask): Promise<unknown> {
97
82
  }
98
83
 
99
84
  async function call(path: string, body: unknown): Promise<{ ok: boolean; status: number; data: any }> {
100
- // A network error is a REPLY, not a throw. A worker outlives the server it polls — a
101
- // restart, a rolling deploy, a container coming up before genroc is listening — and an
102
- // unhandled rejection here kills it for a condition the next poll would clear. Status 0
103
- // says "never reached the server", which is distinct from anything genroc answers.
85
+ // A network error is a REPLY (status 0, "never reached the server"), not a throw: a worker
86
+ // outlives restarts and deploys, and an unhandled rejection would kill it.
104
87
  let res: Response;
105
88
  try {
106
89
  res = await fetch(SERVER + path, {
@@ -121,9 +104,8 @@ async function call(path: string, body: unknown): Promise<{ ok: boolean; status:
121
104
  return { ok: res.ok, status: res.status, data };
122
105
  }
123
106
 
124
- /** The task input IS an EvalRequest: `code` required, `input` and `timeout_ms` optional. A task
125
- * whose input is not that shape is the definition's fault, not the script's, and is reported
126
- * as a compile_error — the nearest permanent kind, since no retry can fix the definition. */
107
+ /** A task input that is not an EvalRequest is the definition's fault, reported as compile_error:
108
+ * the nearest permanent kind, since no retry fixes the definition. */
127
109
  function asEvalRequest(input: unknown): EvalRequest | string {
128
110
  if (typeof input !== "object" || input === null) return "the task input is not an object";
129
111
  const r = input as Record<string, unknown>;
@@ -135,18 +117,15 @@ function asEvalRequest(input: unknown): EvalRequest | string {
135
117
  };
136
118
  }
137
119
 
138
- /** A claim this worker is currently serving. The controller is how the renewal loop reaches
139
- * the evaluation: genroc cannot call us, so a cancellation arrives as an answer to our own
140
- * heartbeat and has to be delivered inward from there. */
120
+ /** genroc cannot call us, so a cancellation arrives on our own heartbeat and reaches the
121
+ * evaluation through the controller. */
141
122
  type Running = { job: QueueTask; abort: AbortController };
142
123
 
143
124
  const inFlight = new Map<string, Running>();
144
125
  let running = true;
145
126
 
146
- // Whether the last claim reached genroc. A worker polls several times a second, so an
147
- // unreachable server would otherwise emit a line per poll — thousands during a restart, which
148
- // buries the one line that mattered. Announce the TRANSITIONS instead: going away, and coming
149
- // back. Silence in between is the report that nothing changed.
127
+ // Announce reachability TRANSITIONS only: polling several times a second would otherwise emit
128
+ // thousands of lines during a restart.
150
129
  let serverReachable = true;
151
130
 
152
131
  async function claim(n: number): Promise<QueueTask[]> {
@@ -158,9 +137,8 @@ async function claim(n: number): Promise<QueueTask[]> {
158
137
  ...(TASK_FILTER ? { task: TASK_FILTER } : {}),
159
138
  });
160
139
  if (!ok) {
161
- // A credential problem is not transient, and polling through it looks like a healthy
162
- // worker that never picks anything up — the worst shape for an operator to debug. Exit
163
- // instead, so a supervisor restarts it and the failure is visible where it happened.
140
+ // A credential problem is not transient, and polling through it looks like a healthy idle
141
+ // worker. Exit, so a supervisor restarts it visibly.
164
142
  if (status === 401 || status === 403) {
165
143
  console.error(
166
144
  `claim rejected (${status}): ${JSON.stringify(data)}\n` +
@@ -169,9 +147,7 @@ async function claim(n: number): Promise<QueueTask[]> {
169
147
  );
170
148
  process.exit(1);
171
149
  }
172
- // status 0 is "never reached the server" (see call): a restart, a rolling deploy, a
173
- // network blip. Not an error to act on — the next poll clears it — so it is reported once
174
- // and then waited out.
150
+ // status 0 (see call): a restart or blip the next poll clears, so it is reported once.
175
151
  if (status === 0) {
176
152
  if (serverReachable) {
177
153
  serverReachable = false;
@@ -197,10 +173,8 @@ async function release(token: string): Promise<void> {
197
173
  if (!ok) console.error(`release failed: ${JSON.stringify(data)}`);
198
174
  }
199
175
 
200
- /** answer submits the outcome. A refusal is NOT retried with a different one: the definition
201
- * declared a contract this worker does not satisfy (an undeclared code, a payload that does
202
- * not fit `raises`), and guessing again would only pick a second wrong answer. Release it, so
203
- * the task returns to the queue and an operator sees it waiting rather than silently gone. */
176
+ /** A refused outcome is not retried with another: the worker does not satisfy the declared
177
+ * contract. Released, so an operator sees the task waiting rather than gone. */
204
178
  async function answer(token: string, outcome: Record<string, unknown>): Promise<void> {
205
179
  const { ok, data } = await call("/api/external-tasks/resolve", { token, ...outcome });
206
180
  if (ok) return;
@@ -231,18 +205,15 @@ async function run(job: QueueTask, signal: AbortSignal): Promise<void> {
231
205
  try {
232
206
  result = await evaluate(req, signal);
233
207
  } catch (err) {
234
- // Cancelled is not a fault: the process was stopped while this ran. The claim still goes
235
- // back — the row is terminal, so nothing re-claims it, and the release is what stops it
236
- // waiting out a lease nobody is serving.
208
+ // Cancelled is not a fault. Still released: the row is terminal so nothing re-claims it,
209
+ // but the release stops it waiting out a lease nobody serves.
237
210
  if (err instanceof Cancelled) {
238
211
  console.log(`cancelled: ${job.token}`);
239
212
  await release(job.token);
240
213
  return;
241
214
  }
242
- // The RUNNER faulted, not the script — the one class where a retry can help. There is no
243
- // error code for it on purpose: releasing the claim is how a queue spells "retryable", and
244
- // it puts the task in front of a different worker instead of burning the definition's
245
- // on_error budget on this one's bad day.
215
+ // The RUNNER faulted, the one retryable class. Releasing is how a queue spells "retryable",
216
+ // and it reaches another worker without spending the definition's on_error budget.
246
217
  console.error(`evaluator fault on ${job.token}: ${err instanceof Error ? err.message : String(err)}`);
247
218
  await release(job.token);
248
219
  return;
@@ -278,17 +249,13 @@ async function renewLoop(): Promise<void> {
278
249
  });
279
250
  if (!ok) continue;
280
251
 
281
- // Cancelled: the process was stopped, so the evaluation is abandoned and the claim handed
282
- // back. Aborting first is the point of the list — waiting for the script to finish would
283
- // keep burning a core on work an operator has already stopped. The release rides run()'s
284
- // own catch, so nothing is released twice.
252
+ // Abort first rather than let a stopped script burn a core; the release rides run()'s
253
+ // catch, so nothing is released twice.
285
254
  for (const token of (data?.cancelled ?? []) as string[]) {
286
255
  inFlight.get(token)?.abort.abort();
287
256
  }
288
- // Lost: someone else holds this claim now. The work continues and its answer will be
289
- // refused — that is not fixable here — but say so, because it is the signal that LEASE_MS
290
- // is too short for what these scripts actually take. Deliberately NOT released: the claim
291
- // is the new holder's, and releasing would bump the epoch out from under it.
257
+ // Lost: another worker holds it now and our answer will be refused; logged as the sign that
258
+ // LEASE_MS is too short. NOT released: that would bump the epoch out from under the holder.
292
259
  const lost = (data?.lost ?? []) as string[];
293
260
  if (lost.length) {
294
261
  console.error(`lost ${lost.length}/${tokens.length} claims; a lease lapsed under load`);