@telorun/kernel 0.77.0 → 0.79.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.
Files changed (110) hide show
  1. package/dist/bundle/module-artifact.d.ts +2 -1
  2. package/dist/bundle/module-artifact.d.ts.map +1 -1
  3. package/dist/bundle/module-artifact.js +14 -10
  4. package/dist/bundle/module-artifact.js.map +1 -1
  5. package/dist/bundle/tar.d.ts +3 -0
  6. package/dist/bundle/tar.d.ts.map +1 -1
  7. package/dist/bundle/tar.js +27 -1
  8. package/dist/bundle/tar.js.map +1 -1
  9. package/dist/controller-loader.d.ts +62 -9
  10. package/dist/controller-loader.d.ts.map +1 -1
  11. package/dist/controller-loader.js +71 -63
  12. package/dist/controller-loader.js.map +1 -1
  13. package/dist/controller-loaders/bundle-loader.d.ts +2 -2
  14. package/dist/controller-loaders/bundle-loader.d.ts.map +1 -1
  15. package/dist/controller-loaders/bundle-loader.js +9 -3
  16. package/dist/controller-loaders/bundle-loader.js.map +1 -1
  17. package/dist/controller-loaders/napi-loader.d.ts +2 -1
  18. package/dist/controller-loaders/napi-loader.d.ts.map +1 -1
  19. package/dist/controller-loaders/napi-loader.js +4 -1
  20. package/dist/controller-loaders/napi-loader.js.map +1 -1
  21. package/dist/controller-loaders/npm-loader.d.ts +2 -1
  22. package/dist/controller-loaders/npm-loader.d.ts.map +1 -1
  23. package/dist/controller-loaders/npm-loader.js +13 -7
  24. package/dist/controller-loaders/npm-loader.js.map +1 -1
  25. package/dist/controller-loaders/source-bundle-builder.d.ts +2 -1
  26. package/dist/controller-loaders/source-bundle-builder.d.ts.map +1 -1
  27. package/dist/controller-loaders/source-bundle-builder.js +4 -1
  28. package/dist/controller-loaders/source-bundle-builder.js.map +1 -1
  29. package/dist/controllers/resource-definition/resource-definition-controller.d.ts.map +1 -1
  30. package/dist/controllers/resource-definition/resource-definition-controller.js +7 -3
  31. package/dist/controllers/resource-definition/resource-definition-controller.js.map +1 -1
  32. package/dist/controllers/resource-definition/resource-template-controller.d.ts.map +1 -1
  33. package/dist/controllers/resource-definition/resource-template-controller.js +12 -5
  34. package/dist/controllers/resource-definition/resource-template-controller.js.map +1 -1
  35. package/dist/dependency-injection.d.ts.map +1 -1
  36. package/dist/dependency-injection.js +7 -7
  37. package/dist/dependency-injection.js.map +1 -1
  38. package/dist/evaluation-context.d.ts +33 -13
  39. package/dist/evaluation-context.d.ts.map +1 -1
  40. package/dist/evaluation-context.js +145 -4
  41. package/dist/evaluation-context.js.map +1 -1
  42. package/dist/index.d.ts +1 -0
  43. package/dist/index.d.ts.map +1 -1
  44. package/dist/index.js +1 -0
  45. package/dist/index.js.map +1 -1
  46. package/dist/instance-declaration.d.ts +8 -0
  47. package/dist/instance-declaration.d.ts.map +1 -0
  48. package/dist/instance-declaration.js +34 -0
  49. package/dist/instance-declaration.js.map +1 -0
  50. package/dist/invocation-contract-binding.d.ts +15 -2
  51. package/dist/invocation-contract-binding.d.ts.map +1 -1
  52. package/dist/invocation-contract-binding.js +39 -4
  53. package/dist/invocation-contract-binding.js.map +1 -1
  54. package/dist/kernel.d.ts.map +1 -1
  55. package/dist/kernel.js +60 -3
  56. package/dist/kernel.js.map +1 -1
  57. package/dist/manifest-schemas.d.ts +1 -1
  58. package/dist/manifest-schemas.d.ts.map +1 -1
  59. package/dist/manifest-schemas.js +1 -1
  60. package/dist/manifest-schemas.js.map +1 -1
  61. package/dist/module-context.d.ts +5 -1
  62. package/dist/module-context.d.ts.map +1 -1
  63. package/dist/module-context.js +13 -1
  64. package/dist/module-context.js.map +1 -1
  65. package/dist/resource-context.d.ts +12 -1
  66. package/dist/resource-context.d.ts.map +1 -1
  67. package/dist/resource-context.js +15 -0
  68. package/dist/resource-context.js.map +1 -1
  69. package/dist/transports/oci/oci-client.d.ts +4 -0
  70. package/dist/transports/oci/oci-client.d.ts.map +1 -1
  71. package/dist/transports/oci/oci-client.js +7 -1
  72. package/dist/transports/oci/oci-client.js.map +1 -1
  73. package/dist/transports/oci/oci-transport.d.ts +8 -3
  74. package/dist/transports/oci/oci-transport.d.ts.map +1 -1
  75. package/dist/transports/oci/oci-transport.js +67 -21
  76. package/dist/transports/oci/oci-transport.js.map +1 -1
  77. package/dist/transports/registry-transport.d.ts +3 -2
  78. package/dist/transports/registry-transport.d.ts.map +1 -1
  79. package/dist/transports/registry-transport.js +10 -0
  80. package/dist/transports/registry-transport.js.map +1 -1
  81. package/dist/transports/transport.d.ts +25 -6
  82. package/dist/transports/transport.d.ts.map +1 -1
  83. package/dist/zone-context.d.ts +16 -1
  84. package/dist/zone-context.d.ts.map +1 -1
  85. package/dist/zone-context.js +61 -1
  86. package/dist/zone-context.js.map +1 -1
  87. package/package.json +3 -3
  88. package/src/bundle/module-artifact.ts +25 -8
  89. package/src/bundle/tar.ts +28 -1
  90. package/src/controller-loader.ts +114 -80
  91. package/src/controller-loaders/bundle-loader.ts +10 -2
  92. package/src/controller-loaders/napi-loader.ts +6 -0
  93. package/src/controller-loaders/npm-loader.ts +14 -4
  94. package/src/controller-loaders/source-bundle-builder.ts +6 -0
  95. package/src/controllers/resource-definition/resource-definition-controller.ts +7 -3
  96. package/src/controllers/resource-definition/resource-template-controller.ts +12 -5
  97. package/src/dependency-injection.ts +7 -7
  98. package/src/evaluation-context.ts +195 -15
  99. package/src/index.ts +6 -0
  100. package/src/instance-declaration.ts +36 -0
  101. package/src/invocation-contract-binding.ts +49 -1
  102. package/src/kernel.ts +77 -2
  103. package/src/manifest-schemas.ts +1 -0
  104. package/src/module-context.ts +24 -3
  105. package/src/resource-context.ts +18 -0
  106. package/src/transports/oci/oci-client.ts +8 -1
  107. package/src/transports/oci/oci-transport.ts +76 -22
  108. package/src/transports/registry-transport.ts +14 -0
  109. package/src/transports/transport.ts +26 -5
  110. package/src/zone-context.ts +70 -1
@@ -18,7 +18,7 @@
18
18
  * otherwise, and this sits on the SQL hot path.
19
19
  */
20
20
  import { InvokeError, RuntimeError, UNCANCELLABLE_CONTEXT, deriveContext, getRefIdentity, sameResource, } from "@telorun/sdk";
21
- import { readProvidesZone, readRequiresZone } from "@telorun/analyzer";
21
+ import { effectiveAuthorSchema, readProvidesZone, readRequiresZone, } from "@telorun/analyzer";
22
22
  import { isRefSentinel } from "@telorun/templating";
23
23
  import { ambientInvokeContext, runWithAmbientContext } from "./evaluation-context.js";
24
24
  import { handleOfInstance } from "./resource-handle.js";
@@ -28,6 +28,10 @@ export class ZoneContext {
28
28
  #requirements = new Map();
29
29
  /** Slot → resolved correlation handle for a providing slot. */
30
30
  #providers = new Map();
31
+ /** Providing kind → what the zone it provides declares about its contents.
32
+ * Keyed by kind rather than by slot because the question a caller asks is
33
+ * about an OPEN zone, which is reached by its entry's kind. */
34
+ #attributes = new Map();
31
35
  constructor(host) {
32
36
  this.#host = host;
33
37
  }
@@ -74,6 +78,62 @@ export class ZoneContext {
74
78
  }
75
79
  return out;
76
80
  }
81
+ zoneAttributes(ctx) {
82
+ const zones = (ctx ?? ambientInvokeContext())?.zones;
83
+ if (!zones || zones.length === 0)
84
+ return [];
85
+ const out = [];
86
+ // Innermost first, matching `match` and `zonesFor` — a nested zone's
87
+ // constraint is the one a controller meets first.
88
+ for (let i = zones.length - 1; i >= 0; i--) {
89
+ const entry = zones[i];
90
+ out.push({ kind: entry.kind, attributes: this.attributesOfKind(entry.kind), entry });
91
+ }
92
+ return out;
93
+ }
94
+ /**
95
+ * What the zone a kind provides declares, read off that kind's own schema.
96
+ *
97
+ * NOT off the entry: a `ZoneEntry` is three identities precisely so it stays
98
+ * ABI-serializable and no module can read another's private state off the
99
+ * stack, and an attributes field on it would trade that away for every zone.
100
+ * The kernel is the one place the declaring kind's schema is already
101
+ * reachable, so it resolves and hands the values over — branching on no name,
102
+ * exactly as `readRefSlot` returns `use` without acting on it.
103
+ *
104
+ * Memoized per kind: this sits behind every dispatch a durable step engine
105
+ * makes, and the answer is fixed once definitions are registered.
106
+ */
107
+ attributesOfKind(kind) {
108
+ const cached = this.#attributes.get(kind);
109
+ if (cached)
110
+ return cached;
111
+ const def = this.#host.resolveDefinition(kind);
112
+ // A kind that does not resolve is NOT cached: definitions are registered
113
+ // during init and this is called at dispatch, so an unresolved lookup is a
114
+ // transient state — caching the empty answer would make it permanent, and a
115
+ // zone would silently declare nothing for the life of the process.
116
+ if (!def)
117
+ return {};
118
+ // Resolved along `extends`, so a child that inherits its parent's
119
+ // zone-providing slot reports the attributes that slot declares. Reading the
120
+ // own schema alone would have a child's zone silently constrain nothing.
121
+ const properties = effectiveAuthorSchema(def, (k) => this.#host.resolveDefinition(k))?.properties;
122
+ const merged = {};
123
+ for (const slotSchema of Object.values(properties ?? {})) {
124
+ // Every providing slot of one kind provides that same kind's zone — the
125
+ // annotation never names a zone — so their attributes describe one region
126
+ // and merge. First declaration wins, so the reading is stable rather than
127
+ // dependent on property order.
128
+ for (const [name, reason] of Object.entries(readProvidesZone(slotSchema)?.attributes ?? {})) {
129
+ if (!(name in merged) && typeof reason === "string")
130
+ merged[name] = reason;
131
+ }
132
+ }
133
+ const attributes = merged;
134
+ this.#attributes.set(kind, attributes);
135
+ return attributes;
136
+ }
77
137
  // ── resolution ────────────────────────────────────────────────────────────
78
138
  resolveProvider(slot) {
79
139
  const cached = this.#providers.get(slot);
@@ -1 +1 @@
1
- {"version":3,"file":"zone-context.js","sourceRoot":"","sources":["../src/zone-context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"zone-context.js","sourceRoot":"","sources":["../src/zone-context.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@telorun/kernel",
3
- "version": "0.77.0",
3
+ "version": "0.79.0",
4
4
  "description": "Telo Runtime - A lightweight, polyglot execution host.",
5
5
  "keywords": [
6
6
  "telo",
@@ -61,7 +61,7 @@
61
61
  "dependencies": {
62
62
  "@marcbachmann/cel-js": "^7.6.1",
63
63
  "@sinclair/typebox": "^0.34.48",
64
- "@telorun/analyzer": "0.62.0",
64
+ "@telorun/analyzer": "0.63.0",
65
65
  "@telorun/glob": "0.2.0",
66
66
  "@telorun/templating": "0.16.0",
67
67
  "ajv": "^8.17.1",
@@ -75,7 +75,7 @@
75
75
  "@types/tar-stream": "^3.1.3",
76
76
  "typescript": "^5.0.0",
77
77
  "vitest": "^2.1.8",
78
- "@telorun/sdk": "0.77.0"
78
+ "@telorun/sdk": "0.79.0"
79
79
  },
80
80
  "optionalDependencies": {
81
81
  "esbuild": "^0.25.12"
@@ -14,6 +14,9 @@ import * as fs from "fs/promises";
14
14
  import * as path from "path";
15
15
  import { fileURLToPath } from "url";
16
16
 
17
+ // Type-only: the loader that supplies this reporter imports the artifact, so
18
+ // the cycle is erased at compile time.
19
+ import type { ControllerWorkReporter } from "../controller-loader.js";
17
20
  import { withDirectoryLock } from "../directory-lock.js";
18
21
  import { cachePathForCanonical } from "../manifest-sources/local-manifest-cache-source.js";
19
22
  import type { TransportRegistry } from "../transports/transport-registry.js";
@@ -189,8 +192,9 @@ export class ModuleArtifact {
189
192
  */
190
193
  async materializeController(
191
194
  selector: ArtifactSelector,
195
+ report?: ControllerWorkReporter,
192
196
  ): Promise<ResolvedControllerLayer | undefined> {
193
- return this.materializeCode(selector, ["controller", "library"]);
197
+ return this.materializeCode(selector, ["controller", "library"], report);
194
198
  }
195
199
 
196
200
  /**
@@ -209,19 +213,20 @@ export class ModuleArtifact {
209
213
  private async materializeCode(
210
214
  selector: ArtifactSelector,
211
215
  roles: ReadonlyArray<"controller" | "library">,
216
+ report?: ControllerWorkReporter,
212
217
  ): Promise<ResolvedControllerLayer | undefined> {
213
218
  const wanted = roles
214
219
  .map((role) => codeLayerFor(this.layers, role, selector))
215
220
  .filter((l): l is ArtifactLayer => l !== undefined);
216
221
  if (wanted.length === 0) return undefined;
217
- const common = await this.materializeCommonTracked();
222
+ const common = await this.materializeCommonTracked(report);
218
223
  let transferred = common?.transferred ?? false;
219
224
  const files: string[] = [];
220
225
  for (const layer of wanted) {
221
226
  // Every half is a transfer the caller waited on: the common layer's bytes
222
227
  // come down on this call too, so they are as much of a wait as the code
223
228
  // layer's.
224
- const resolved = await this.materializeTracked(layer);
229
+ const resolved = await this.materializeTracked(layer, report);
225
230
  transferred = resolved.transferred || transferred;
226
231
  files.push(...resolved.layer.files);
227
232
  }
@@ -256,9 +261,11 @@ export class ModuleArtifact {
256
261
  /** As `materializeCommon`, reporting whether this call transferred it — the
257
262
  * controller path rides the common layer along and has to count its bytes as
258
263
  * part of the wait. One lookup, so "common comes too" is encoded once. */
259
- private async materializeCommonTracked(): Promise<ResolvedControllerLayer | undefined> {
264
+ private async materializeCommonTracked(
265
+ report?: ControllerWorkReporter,
266
+ ): Promise<ResolvedControllerLayer | undefined> {
260
267
  const layer = singletonLayer(this.layers, "common");
261
- return layer ? this.materializeTracked(layer) : undefined;
268
+ return layer ? this.materializeTracked(layer, report) : undefined;
262
269
  }
263
270
 
264
271
  /**
@@ -298,10 +305,13 @@ export class ModuleArtifact {
298
305
  * transfer to all of them would print one progress line per candidate for a
299
306
  * single download. The call that started the work owns the report.
300
307
  */
301
- private materializeTracked(layer: ArtifactLayer): Promise<ResolvedControllerLayer> {
308
+ private materializeTracked(
309
+ layer: ArtifactLayer,
310
+ report?: ControllerWorkReporter,
311
+ ): Promise<ResolvedControllerLayer> {
302
312
  const pending = this.inFlight.get(layer.blob);
303
313
  if (pending) return pending.then((r) => ({ layer: r.layer, transferred: false }));
304
- const work = this.materializeUncached(layer).catch((err) => {
314
+ const work = this.materializeUncached(layer, report).catch((err) => {
305
315
  // Drop the rejection so a transient fetch failure is retried rather than
306
316
  // cached for the lifetime of the module.
307
317
  this.inFlight.delete(layer.blob);
@@ -319,7 +329,10 @@ export class ModuleArtifact {
319
329
  return path.join(this.dir, `.telo-layer-${layer.role}-${short}`);
320
330
  }
321
331
 
322
- private async materializeUncached(layer: ArtifactLayer): Promise<ResolvedControllerLayer> {
332
+ private async materializeUncached(
333
+ layer: ArtifactLayer,
334
+ report?: ControllerWorkReporter,
335
+ ): Promise<ResolvedControllerLayer> {
323
336
  const marker = this.markerPath(layer);
324
337
  if (existsSync(marker)) {
325
338
  return { layer: { dir: this.dir, files: await readMarker(marker) }, transferred: false };
@@ -335,6 +348,10 @@ export class ModuleArtifact {
335
348
  return { layer: { dir: this.dir, files: await readMarker(marker) }, transferred: false };
336
349
  }
337
350
 
351
+ // Both re-checks are behind us, so this call really does go to the
352
+ // network — the one point at which a transfer is a fact rather than a
353
+ // possibility, and the same place `transferred: true` is decided.
354
+ await report?.("layer-fetch");
338
355
  const files = await this.transports.fetchLayer(this.pinnedRef, layer.blob);
339
356
  const actual = await computeFilesIntegrity(files);
340
357
  if (actual !== layer.integrity) {
package/src/bundle/tar.ts CHANGED
@@ -19,12 +19,39 @@ export function toPayloadFiles(entries: BundleEntry[]): PayloadFile[] {
19
19
  }));
20
20
  }
21
21
 
22
+ /**
23
+ * Every tar header field that is not the file's own name or contents, pinned.
24
+ *
25
+ * **The archive has to be a pure function of the files in it**, because a
26
+ * layer's `blob` digest covers these bytes and that digest is written into the
27
+ * published `telo.yaml` — which a dependent hashes to derive its import pin,
28
+ * before anything is pushed. A header carrying the wall clock (tar-stream
29
+ * defaults `mtime` to `new Date()`) makes the same file set frame to different
30
+ * bytes on every run, so the predicted digest and the pushed one would agree
31
+ * only by accident.
32
+ *
33
+ * Reproducibility is the same property seen from outside: re-running publish on
34
+ * one commit produces byte-identical layers. Node's gzip already writes no
35
+ * timestamp, so the tar header is the whole of it.
36
+ */
37
+ const FIXED_HEADER = {
38
+ mtime: new Date(0),
39
+ mode: 0o644,
40
+ uid: 0,
41
+ gid: 0,
42
+ uname: "",
43
+ gname: "",
44
+ } as const;
45
+
22
46
  /**
23
47
  * Pack `entries` into a gzipped tar (`module.tar.gz`) — the module-artifact
24
48
  * writer shared by `telo publish` and the transports. Artifacts are small (a
25
49
  * manifest plus a built frontend), so buffering the whole archive before gzip
26
50
  * is fine. (Distinct from `apps/k8s-runner/src/tar.ts`, which is coupled to
27
51
  * `@telorun/runner-core`'s `RunBundle`.)
52
+ *
53
+ * Deterministic: identical entries in identical order produce identical bytes
54
+ * (see {@link FIXED_HEADER}).
28
55
  */
29
56
  export async function makeTarGz(entries: BundleEntry[]): Promise<Buffer> {
30
57
  const pack = tarPack();
@@ -39,7 +66,7 @@ export async function makeTarGz(entries: BundleEntry[]): Promise<Buffer> {
39
66
  for (const entry of entries) {
40
67
  const buf = typeof entry.content === "string" ? Buffer.from(entry.content, "utf-8") : entry.content;
41
68
  await new Promise<void>((resolve, reject) => {
42
- pack.entry({ name: entry.name }, buf, (err) => (err ? reject(err) : resolve()));
69
+ pack.entry({ name: entry.name, ...FIXED_HEADER }, buf, (err) => (err ? reject(err) : resolve()));
43
70
  });
44
71
  }
45
72
  pack.finalize();
@@ -39,10 +39,44 @@ export interface ResolvedController {
39
39
  purl: string;
40
40
  source: ControllerResolveSource;
41
41
  importInstance: () => Promise<ControllerInstance>;
42
+ /**
43
+ * How long the caller has waited for this controller, measured from the
44
+ * first {@link ControllerWorkKind} branch it entered — or, when it entered
45
+ * none, from the `importInstance()` call. Resolution is what installs,
46
+ * compiles and fetches, so timing only the import reports a 40-second
47
+ * install as a few milliseconds.
48
+ */
49
+ waitedMs: () => number;
42
50
  }
43
51
 
52
+ /**
53
+ * A branch that makes the caller wait: a registry install, a compile, or a
54
+ * layer transfer. Reported by the sub-loader that is about to enter it, which
55
+ * is the only place that knows — a resolve's `source` is a verdict available
56
+ * only afterwards, and a warm start enters no branch at all, so nothing is
57
+ * announced for it. Reported for work in the resolve *and* the import phase:
58
+ * a dev-mode `pkg:telo` build and a `cargo build` are both paid inside
59
+ * `importInstance`.
60
+ */
61
+ export type ControllerWorkKind = "npm-install" | "cargo-build" | "source-build" | "layer-fetch";
62
+
63
+ /**
64
+ * Sub-loader hook, invoked immediately before entering a {@link
65
+ * ControllerWorkKind} branch. Awaited, so a consumer that renders progress has
66
+ * its line on screen before the wait starts rather than after it.
67
+ */
68
+ export type ControllerWorkReporter = (work: ControllerWorkKind) => void | Promise<void>;
69
+
44
70
  export type ControllerLoaderEvent =
45
- | { name: "ControllerLoading"; payload: { purl: string } }
71
+ /**
72
+ * A resolved controller is about to be imported. `source` names the branch
73
+ * the resolve took, so a consumer can tell a warm start (`cache` / `local`)
74
+ * from work someone waited for (`npm-install`, `cargo-build`, `bundle`)
75
+ * *before* rendering anything. The event is emitted after resolution
76
+ * precisely so this is known: resolution is what fetches, installs and
77
+ * builds, and an event emitted ahead of it could only speculate.
78
+ */
79
+ | { name: "ControllerLoading"; payload: { purl: string; source: ControllerResolveSource } }
46
80
  | {
47
81
  name: "ControllerLoaded";
48
82
  payload: { purl: string; source: ControllerResolveSource; durationMs: number };
@@ -55,7 +89,15 @@ export type ControllerLoaderEvent =
55
89
  * which is non-recoverable. Consumers that opened a UI element on the
56
90
  * matching `ControllerLoading` should close it out here.
57
91
  */
58
- | { name: "ControllerLoadSkipped"; payload: { purl: string; reason: string } };
92
+ | { name: "ControllerLoadSkipped"; payload: { purl: string; reason: string } }
93
+ /**
94
+ * Real work has started for `purl` — an install, a compile or a transfer is
95
+ * about to run. This is the *only* in-progress signal, and it fires solely
96
+ * on the branch that does the work, so a warm start emits nothing rather
97
+ * than something a consumer has to take back. Closed by the matching
98
+ * `ControllerLoaded` / `ControllerLoadFailed`.
99
+ */
100
+ | { name: "ControllerWorkStarted"; payload: { purl: string; work: ControllerWorkKind } };
59
101
 
60
102
  /**
61
103
  * The dispatcher awaits each emission, so the callback may be async without
@@ -104,9 +146,13 @@ export interface ControllerLoaderOptions {
104
146
  * next candidate. User-code failures (`RuntimeError("ERR_CONTROLLER_BUILD_FAILED" | "ERR_CONTROLLER_INVALID")`)
105
147
  * fail hard regardless of remaining candidates.
106
148
  *
107
- * Lifecycle events are emitted per *attempt*, so a fallback chain produces one
108
- * `ControllerLoading` per candidate tried plus a final `ControllerLoaded` (or
109
- * `ControllerLoadFailed`) for the one that won.
149
+ * Lifecycle events follow resolution: a candidate this environment cannot host
150
+ * produces a `ControllerLoadSkipped` and nothing else, and only the candidate
151
+ * that resolved gets a `ControllerLoading` (carrying its resolve `source`)
152
+ * followed by `ControllerLoaded` / `ControllerLoadFailed`. In between, the
153
+ * sub-loader announces each branch that makes the caller wait as
154
+ * `ControllerWorkStarted` — the only in-progress signal, and the only one that
155
+ * cannot be emitted for a warm start.
110
156
  */
111
157
  export class ControllerLoader {
112
158
  private readonly emit: ControllerLoaderEmit | undefined;
@@ -132,56 +178,28 @@ export class ControllerLoader {
132
178
  artifact?: ModuleArtifact,
133
179
  libraries: SiblingLibraryMap = NO_SIBLING_LIBRARIES,
134
180
  ): Promise<ControllerInstance> {
135
- if (!purlCandidates || purlCandidates.length === 0) {
136
- throw new RuntimeError("ERR_CONTROLLER_NOT_FOUND", "Missing controller PURL candidates");
137
- }
138
- const effectivePolicy = policy ?? DEFAULT_POLICY;
139
- const ordered = orderCandidates(purlCandidates, effectivePolicy);
140
- if (ordered.length === 0) {
141
- throw new RuntimeError(
142
- "ERR_CONTROLLER_NOT_FOUND",
143
- `No controllers match runtime selection [${effectivePolicy.load.join(", ")}]; declared: ${purlCandidates.join(", ")}`,
144
- );
145
- }
146
-
147
- const errors: string[] = [];
148
- for (const purl of ordered) {
149
- await this.emit?.({ name: "ControllerLoading", payload: { purl } });
150
- const startedAt = Date.now();
151
- try {
152
- const { instance, source } = await this.dispatchOne(purl, baseUri, artifact, libraries);
153
- await this.emit?.({
154
- name: "ControllerLoaded",
155
- payload: { purl, source, durationMs: Date.now() - startedAt },
156
- });
157
- return instance;
158
- } catch (err) {
159
- if (err instanceof ControllerEnvMissingError) {
160
- errors.push(`${purl}: ${err.message}`);
161
- // Env-missing isn't a hard failure — the dispatcher will try the
162
- // next candidate. We still emit a terminal event for *this* attempt
163
- // so consumers (notably the CLI progress renderer) can close out
164
- // the UI state opened by the matching ControllerLoading. Without
165
- // this, every fallback attempt would leak a pending `⬇` line.
166
- await this.emit?.({
167
- name: "ControllerLoadSkipped",
168
- payload: { purl, reason: err.message },
169
- });
170
- continue;
171
- }
172
- await this.emit?.({
173
- name: "ControllerLoadFailed",
174
- payload: { purl, error: err instanceof Error ? err.message : String(err) },
175
- });
176
- throw err;
177
- }
178
- }
179
- const aggregated = `No controller resolved. Tried ${ordered.length} candidate(s):\n${errors.join("\n")}`;
181
+ // Resolution which is what installs, compiles and fetches — reports its
182
+ // own work and its own candidate fallthrough, so this is the import half
183
+ // and the announcement of what resolution decided.
184
+ const resolved = await this.resolve(purlCandidates, baseUri, policy, artifact, libraries);
180
185
  await this.emit?.({
181
- name: "ControllerLoadFailed",
182
- payload: { purl: ordered[ordered.length - 1], error: aggregated },
186
+ name: "ControllerLoading",
187
+ payload: { purl: resolved.purl, source: resolved.source },
183
188
  });
184
- throw new RuntimeError("ERR_CONTROLLER_NOT_FOUND", aggregated);
189
+ try {
190
+ const instance = await resolved.importInstance();
191
+ await this.emit?.({
192
+ name: "ControllerLoaded",
193
+ payload: { purl: resolved.purl, source: resolved.source, durationMs: resolved.waitedMs() },
194
+ });
195
+ return instance;
196
+ } catch (err) {
197
+ await this.emit?.({
198
+ name: "ControllerLoadFailed",
199
+ payload: { purl: resolved.purl, error: err instanceof Error ? err.message : String(err) },
200
+ });
201
+ throw err;
202
+ }
185
203
  }
186
204
 
187
205
  /**
@@ -194,10 +212,12 @@ export class ControllerLoader {
194
212
  * registers fine and errors only when a resource of it is declared (matching
195
213
  * the Rust kernel's deferral).
196
214
  *
197
- * Silent by design no lifecycle events here; the caller emits
198
- * ControllerLoading/Loaded around `importInstance` so the events fire when the
199
- * load actually happens. A total resolution failure throws, mirroring
200
- * {@link load}'s aggregated error.
215
+ * Emits `ControllerWorkStarted` whenever a sub-loader enters a branch that
216
+ * makes the caller wait, and `ControllerLoadSkipped` per candidate this
217
+ * environment cannot host. It does NOT announce the load itself: the caller
218
+ * emits ControllerLoading/Loaded around `importInstance`, so those fire when
219
+ * the load actually happens, with the resolved `source` already in hand. A
220
+ * total resolution failure throws, mirroring {@link load}'s aggregated error.
201
221
  */
202
222
  async resolve(
203
223
  purlCandidates: string[],
@@ -219,41 +239,54 @@ export class ControllerLoader {
219
239
  }
220
240
  const errors: string[] = [];
221
241
  for (const purl of ordered) {
242
+ // First work only: an install followed by a compile is one wait, and the
243
+ // clock the caller reads has to start where that wait did. The reporter
244
+ // outlives resolution because the import phase does work too.
245
+ let workStartedAt: number | undefined;
246
+ const report: ControllerWorkReporter = async (work) => {
247
+ workStartedAt ??= Date.now();
248
+ await this.emit?.({ name: "ControllerWorkStarted", payload: { purl, work } });
249
+ };
222
250
  try {
223
251
  const { source, importInstance } = await this.dispatchResolveOne(
224
252
  purl,
225
253
  baseUri,
226
254
  artifact,
227
255
  libraries,
256
+ report,
228
257
  );
229
- return { purl, source, importInstance };
258
+ let importStartedAt: number | undefined;
259
+ return {
260
+ purl,
261
+ source,
262
+ importInstance: () => {
263
+ importStartedAt ??= Date.now();
264
+ return importInstance();
265
+ },
266
+ waitedMs: () => Date.now() - (workStartedAt ?? importStartedAt ?? Date.now()),
267
+ };
230
268
  } catch (err) {
231
269
  if (err instanceof ControllerEnvMissingError) {
232
270
  errors.push(`${purl}: ${err.message}`);
271
+ await this.emit?.({
272
+ name: "ControllerLoadSkipped",
273
+ payload: { purl, reason: err.message },
274
+ });
233
275
  continue;
234
276
  }
277
+ await this.emit?.({
278
+ name: "ControllerLoadFailed",
279
+ payload: { purl, error: err instanceof Error ? err.message : String(err) },
280
+ });
235
281
  throw err;
236
282
  }
237
283
  }
238
- throw new RuntimeError(
239
- "ERR_CONTROLLER_NOT_FOUND",
240
- `No controller resolved. Tried ${ordered.length} candidate(s):\n${errors.join("\n")}`,
241
- );
242
- }
243
-
244
- private async dispatchOne(
245
- purl: string,
246
- baseUri: string,
247
- artifact: ModuleArtifact | undefined,
248
- libraries: SiblingLibraryMap,
249
- ): Promise<{ instance: ControllerInstance; source: ControllerResolveSource }> {
250
- const { source, importInstance } = await this.dispatchResolveOne(
251
- purl,
252
- baseUri,
253
- artifact,
254
- libraries,
255
- );
256
- return { instance: await importInstance(), source };
284
+ const aggregated = `No controller resolved. Tried ${ordered.length} candidate(s):\n${errors.join("\n")}`;
285
+ await this.emit?.({
286
+ name: "ControllerLoadFailed",
287
+ payload: { purl: ordered[ordered.length - 1], error: aggregated },
288
+ });
289
+ throw new RuntimeError("ERR_CONTROLLER_NOT_FOUND", aggregated);
257
290
  }
258
291
 
259
292
  private async dispatchResolveOne(
@@ -261,15 +294,16 @@ export class ControllerLoader {
261
294
  baseUri: string,
262
295
  artifact: ModuleArtifact | undefined,
263
296
  libraries: SiblingLibraryMap,
297
+ report: ControllerWorkReporter,
264
298
  ): Promise<{ source: ControllerResolveSource; importInstance: () => Promise<ControllerInstance> }> {
265
299
  if (purl.startsWith("pkg:npm")) {
266
- return this.npmLoader.resolve(purl, baseUri);
300
+ return this.npmLoader.resolve(purl, baseUri, report);
267
301
  }
268
302
  if (purl.startsWith("pkg:cargo")) {
269
- return this.napiLoader.resolve(purl, baseUri);
303
+ return this.napiLoader.resolve(purl, baseUri, report);
270
304
  }
271
305
  if (purl.startsWith("pkg:telo")) {
272
- return this.bundleLoader.resolve(purl, baseUri, artifact, libraries);
306
+ return this.bundleLoader.resolve(purl, baseUri, artifact, libraries, report);
273
307
  }
274
308
  throw new ControllerEnvMissingError(`Unsupported PURL scheme: ${purl}`);
275
309
  }
@@ -7,7 +7,7 @@ import { PackageURL } from "packageurl-js";
7
7
  import * as path from "path";
8
8
  import { fileURLToPath, pathToFileURL } from "url";
9
9
  import { hostPlatformTarget, type ModuleArtifact } from "../bundle/module-artifact.js";
10
- import type { ControllerResolveSource } from "../controller-loader.js";
10
+ import type { ControllerResolveSource, ControllerWorkReporter } from "../controller-loader.js";
11
11
  import { ControllerEnvMissingError } from "./napi-loader.js";
12
12
  import { REALM_COLLAPSE_NAMES } from "./realm.js";
13
13
  import {
@@ -485,6 +485,7 @@ export class BundleControllerLoader {
485
485
  baseUri: string,
486
486
  artifact?: ModuleArtifact,
487
487
  libraries: SiblingLibraryMap = NO_SIBLING_LIBRARIES,
488
+ report?: ControllerWorkReporter,
488
489
  ): Promise<{ source: ControllerResolveSource; importInstance: () => Promise<ControllerInstance> }> {
489
490
  let parsed: PackageURL;
490
491
  try {
@@ -578,10 +579,17 @@ export class BundleControllerLoader {
578
579
  importInstance: async () => {
579
580
  let built: string;
580
581
  try {
582
+ // A dev build is a compile the caller waits on, and it is paid here
583
+ // rather than at resolve — which is why the work signal is not tied
584
+ // to the resolve phase. The reporter goes INTO the builder rather
585
+ // than wrapping the call: only the builder knows whether its
586
+ // content-addressed cache answered, and reporting a cache hit would
587
+ // put a line on screen for work nobody waited for.
581
588
  built = await buildControllerFromSource(
582
589
  sourceFile!,
583
590
  cacheRoot!,
584
591
  buildExternals(libraries, format),
592
+ report,
585
593
  );
586
594
  } catch (err) {
587
595
  if (!(err instanceof ControllerEnvMissingError)) throw err;
@@ -607,7 +615,7 @@ export class BundleControllerLoader {
607
615
  if (artifact) {
608
616
  // By its own selector, not by re-matching the host: this candidate IS one
609
617
  // selector, and it is exactly the key of the layer that carries it.
610
- const resolved = await artifact.materializeController(selector);
618
+ const resolved = await artifact.materializeController(selector, report);
611
619
  if (!resolved) {
612
620
  throw new ControllerEnvMissingError(
613
621
  `pkg:telo controller "${purl}": the module artifact ships no layer for ` +
@@ -8,6 +8,8 @@ import { fileURLToPath } from "url";
8
8
  import { promisify } from "util";
9
9
 
10
10
  import { hostEnv } from "../host-env.js";
11
+ // Type-only, so the cycle with the dispatcher that imports this loader is erased.
12
+ import type { ControllerWorkReporter } from "../controller-loader.js";
11
13
 
12
14
  const execFileAsync = promisify(execFile);
13
15
  const requireFromHere = createRequire(import.meta.url);
@@ -140,6 +142,7 @@ export class NapiControllerLoader {
140
142
  async resolve(
141
143
  purl: string,
142
144
  baseUri: string,
145
+ report?: ControllerWorkReporter,
143
146
  ): Promise<{ source: NapiResolveSource; importInstance: () => Promise<ControllerInstance> }> {
144
147
  const [, , name, , qualifiers, entry] = PackageURL.parseString(purl);
145
148
  const localPath = (qualifiers as any)?.get("local_path");
@@ -199,6 +202,9 @@ export class NapiControllerLoader {
199
202
  const { rawModule } = await existingInFlight;
200
203
  return project(rawModule, entry, cratePath);
201
204
  }
205
+ // Nothing above this line compiles — the cache and the in-flight gate
206
+ // both return without cargo running.
207
+ await report?.("cargo-build");
202
208
  const buildPromise = build(cratePath, crateName, cacheKey);
203
209
  _napiInFlight.set(cacheKey, buildPromise);
204
210
  let rawModule: any;