@telorun/kernel 0.59.0 → 0.61.0

package/dist/directory-lock.js

@@ -0,0 +1,205 @@
+import { NOOP_LOGGER } from "@telorun/sdk";
+import * as fs from "fs/promises";
+import * as os from "os";
+import * as path from "path";
+/**
+ * The cross-process lock guarding mutation of a shared cache directory.
+ *
+ * Two consumers hold it for the same reason — several Telo processes (and, in
+ * one process, several concurrent resolutions) may decide to populate the same
+ * directory at the same moment: `NpmControllerLoader` around its install root,
+ * and `ModuleArtifact` around a module's extracted layers. One implementation
+ * rather than two, because the reclaim rule below is subtle enough that two
+ * copies would drift.
+ */
+/**
+ * A held lock is refreshed (its mtime bumped) every {@link LOCK_HEARTBEAT_MS}
+ * by the holder. Staleness is judged purely by mtime age — a lock older than
+ * this means the holder stopped heartbeating (crashed, was killed, or its
+ * container vanished), so it is safe to reclaim. This deliberately does NOT
+ * probe the recorded PID for liveness: PID identity is meaningless across
+ * container restarts and PID namespaces (deterministic PID reuse makes an
+ * unrelated process look like the dead holder on the same hostname), which is
+ * exactly what deadlocked container boots. The `{pid, host}` in the lock body
+ * is diagnostics for humans, never a reclaim signal. Must be comfortably
+ * larger than the heartbeat interval so a briefly-descheduled holder (GC
+ * pause, busy event loop) is not reclaimed out from under itself.
+ */
+const LOCK_STALE_MS = 30000;
+/** How often the holder refreshes the lock mtime while `fn` runs. Well under
+ *  {@link LOCK_STALE_MS} so several heartbeats are missed before a live holder
+ *  is ever judged stale. */
+const LOCK_HEARTBEAT_MS = 5000;
+/**
+ * Total wall-clock cap for waiting on the lock — enough for a slow first
+ * populate on a peer process to finish, short enough that a genuinely
+ * deadlocked CI job fails loudly rather than hanging for hours. The retry
+ * interval trades wakeup latency vs. wasted polls; 500ms is well below the
+ * lock holder's typical hold time.
+ */
+const LOCK_WAIT_MAX_MS = 5 * 60000;
+const LOCK_RETRY_MS = 500;
+/** After this long waiting on a lock, emit one line so a slow wait is visible
+ *  instead of looking like a silent hang. */
+const LOCK_WAIT_NOTICE_MS = 2000;
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+/**
+ * In-process serialization ahead of the filesystem lock.
+ *
+ * Without it, N concurrent callers for the same directory all reach the fs lock,
+ * N-1 sit in the retry loop, and each crossing {@link LOCK_WAIT_NOTICE_MS}
+ * prints the wait notice — a notice whose whole point is "another *process* is
+ * populating this", printed when the holder is us. (`telo install` fanning 52
+ * controllers out through one `Promise.allSettled` printed 51 of them.)
+ *
+ * Queuing here means exactly one caller per process reaches the fs lock, so the
+ * notice regains its cross-process meaning and the losers do no I/O at all. The
+ * fs lock is untouched and still provides the cross-process guarantee.
+ */
+const localQueues = new Map();
+function withLocalQueue(dir, fn) {
+    const prev = localQueues.get(dir) ?? Promise.resolve();
+    // Run on both settle paths: one failure must not wedge the queue.
+    const run = prev.then(fn, fn);
+    // The stored tail never rejects — a failure neither poisons followers nor
+    // surfaces as an unhandled rejection on the chain copy.
+    const tail = run.then(() => { }, () => { });
+    localQueues.set(dir, tail);
+    // Drop the entry once nothing further is queued, so a long-lived process that
+    // touches many directories doesn't retain a promise per directory forever.
+    void tail.then(() => {
+        if (localQueues.get(dir) === tail)
+            localQueues.delete(dir);
+    });
+    return run;
+}
+/**
+ * Acquire the lock for `dir` and run `fn` under it: first the in-process queue
+ * above, then the cross-process filesystem lock. `label` names the operation in
+ * the wait notice and timeout error (e.g. "controller install", "module layer").
+ */
+export async function withDirectoryLock(dir, label, fn, log = NOOP_LOGGER) {
+    return withLocalQueue(dir, () => withFileLock(dir, label, fn, log));
+}
+/**
+ * Acquire a process-portable lock on `<dir>/.lock` and execute fn while
+ * holding it. `fs.open(path, 'wx')` is atomic on POSIX and Windows, so
+ * concurrent processes serialize naturally.
+ *
+ * Liveness is a heartbeat: the holder bumps the lock's mtime every
+ * {@link LOCK_HEARTBEAT_MS} while `fn` runs, and a waiter reclaims a lock whose
+ * mtime is older than {@link LOCK_STALE_MS} (holder crashed/killed/vanished).
+ * mtime age is the *only* reclaim signal — the recorded `{pid, host}` is
+ * diagnostics, never probed for liveness, because PID identity is unreliable
+ * across container restarts and PID namespaces (the failure that deadlocked
+ * container boots). Reclaim is via atomic rename to a unique tombstone so two
+ * waiters that both see the lock stale can't both win.
+ *
+ * The lock guards *writes* into the directory. It does NOT serialize reads of
+ * already-populated content — those run lock-free against a stable tree.
+ */
+async function withFileLock(dir, label, fn, log) {
+    const lockPath = path.join(dir, ".lock");
+    await fs.mkdir(dir, { recursive: true });
+    const lockBody = JSON.stringify({ pid: process.pid, host: os.hostname(), startedAt: Date.now() });
+    let handle = null;
+    const waitedSince = Date.now();
+    let noticed = false;
+    while (true) {
+        try {
+            handle = await fs.open(lockPath, "wx");
+            await handle.writeFile(lockBody);
+            break;
+        }
+        catch (err) {
+            if (err?.code !== "EEXIST")
+                throw err;
+            // Lock exists. Reclaim it only if its heartbeat has gone silent.
+            if (await reclaimIfStale(lockPath))
+                continue;
+            const waited = Date.now() - waitedSince;
+            if (waited > LOCK_WAIT_MAX_MS) {
+                throw new Error(`[telo] timed out waiting for ${label} lock at ${lockPath} ` +
+                    `(held >${LOCK_WAIT_MAX_MS / 60000} min with a live heartbeat). ` +
+                    `Inspect the lock file or remove it manually if no other Telo process is running.`);
+            }
+            if (!noticed && waited > LOCK_WAIT_NOTICE_MS) {
+                noticed = true;
+                log.info(`waiting for ${label} lock`, { "telo.lock.path": lockPath });
+            }
+            await sleep(LOCK_RETRY_MS);
+        }
+    }
+    // Keep the lock fresh while `fn` runs so a slow-but-live operation is never
+    // reclaimed. `unref` so the heartbeat can't by itself keep the process alive.
+    const heartbeat = setInterval(() => {
+        const now = new Date();
+        fs.utimes(lockPath, now, now).catch(() => { });
+    }, LOCK_HEARTBEAT_MS);
+    heartbeat.unref?.();
+    try {
+        return await fn();
+    }
+    finally {
+        clearInterval(heartbeat);
+        // The fd close races nothing important: if it fails, the FD is reaped on
+        // process exit. The unlink is the dangerous one — a non-ENOENT failure
+        // (permissions, read-only mount) means every subsequent kernel waits
+        // LOCK_STALE_MS before reclaiming. Surface it so the cause is visible
+        // rather than hiding behind a silent hang.
+        await handle.close().catch(() => { });
+        try {
+            await fs.rm(lockPath, { force: true });
+        }
+        catch (err) {
+            if (err?.code !== "ENOENT") {
+                log.warn(`failed to release ${label} lock`, { "telo.lock.path": lockPath }, { error: err });
+            }
+        }
+    }
+}
+/**
+ * If the lock at `lockPath` is stale (mtime older than {@link LOCK_STALE_MS}, so
+ * its holder stopped heartbeating), atomically claim and remove it and return
+ * true; otherwise return false. The claim is a `rename` to a unique tombstone:
+ * `rename` is atomic and fails for all but one racer, so two processes that
+ * both observe the same stale lock cannot both reclaim it — the loser's rename
+ * throws ENOENT (the file is already gone) and it simply retries the open.
+ */
+async function reclaimIfStale(lockPath) {
+    let stat;
+    try {
+        stat = await fs.stat(lockPath);
+    }
+    catch (err) {
+        // Race: lock vanished while we inspected it. Retry the open immediately.
+        if (err?.code === "ENOENT")
+            return true;
+        throw err;
+    }
+    if (Date.now() - stat.mtimeMs < LOCK_STALE_MS)
+        return false;
+    // Stale — the holder's heartbeat is silent. Claim via atomic rename; only one
+    // racer wins, the rest get ENOENT and fall back to retrying the open.
+    const tombstone = `${lockPath}.stale.${process.pid}.${stat.mtimeMs}`;
+    try {
+        await fs.rename(lockPath, tombstone);
+    }
+    catch (err) {
+        if (err?.code === "ENOENT")
+            return true; // another waiter reclaimed it first
+        throw err;
+    }
+    await fs.rm(tombstone, { force: true });
+    return true;
+}
+/**
+ * Internals exposed for the lock's own tests (acquire/release, stale reclaim,
+ * heartbeat, in-process queuing). Not part of the kernel's public API.
+ */
+export const __testing__ = {
+    reclaimIfStale,
+    LOCK_STALE_MS,
+    LOCK_HEARTBEAT_MS,
+};
+//# sourceMappingURL=directory-lock.js.map

package/dist/directory-lock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"directory-lock.js","sourceRoot":"","sources":["../src/directory-lock.ts"],"names":[],"mappings":"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"}

package/dist/evaluation-context.d.ts

@@ -59,6 +59,11 @@ export declare class EvaluationContext implements IEvaluationContext {
     }>;
     /** Resources queued for initialization on this context node. */
     private pendingResources;
+    /** Per-resource dependency names, captured at create() time — BEFORE Phase-5
+     *  injection swaps refs for live instances, so the walk sees plain objects and
+     *  cannot wander into a controller's (possibly cyclic) object graph. Read only
+     *  when init fails, to attribute each failure to its cause. */
+    private readonly resourceDependencies;
     /**
      * Optional hook called between create() and init() for each resource.
      * Set by the kernel to inject live instances into reference fields.

package/dist/evaluation-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluation-context.d.ts","sourceRoot":"","sources":["../src/evaluation-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,WAAW,EAEX,KAAK,iBAAiB,IAAI,kBAAkB,EAC5C,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAGlB,KAAK,WAAW,EAChB,KAAK,MAAM,EACZ,MAAM,cAAc,CAAC;AAStB,OAAO,EAAE,WAAW,EAAE,CAAC;AA+EvB,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GACxB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA6CzB;AA2CD;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,kBAAkB,GAAG,SAAS,CAAC,GAAG,SAAS,GAC5E,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAclC;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,aAAa,GAAG,SAAS,CAEhE;AA0DD;;;;;;;;;;GAUG;AACH,qBAAa,iBAAkB,YAAW,kBAAkB;IAiFxD,QAAQ,CAAC,MAAM,EAAE,MAAM;IAhFzB,QAAQ,CAAC,EAAE,SAA0C;IACrD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAC3C,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAEzB,sCAAsC;IACtC,MAAM,EAAE,kBAAkB,GAAG,SAAS,CAAa;IACnD,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,CAAM;IAE7C,oDAAoD;IACpD,KAAK,EAAE,cAAc,CAAa;IAElC,6EAA6E;IAC7E,QAAQ,CAAC,iBAAiB;kBAEZ,gBAAgB;kBAAY,gBAAgB;OACtD;IAEJ,iFAAiF;IACjF,SAAS,CAAC,QAAQ,CAAC,gBAAgB;kBAErB,gBAAgB;kBAAY,gBAAgB;aAAO,GAAG;OAChE;IAEJ,gEAAgE;IAChE,OAAO,CAAC,gBAAgB,CAA0B;IAElD;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,kBAAkB,GAAG,SAAS,CAAC;IAEjE;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC;IAEtB;uFACmF;IACnF,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,wEAAwE;IACxE,OAAO,CAAC,UAAU;IAIlB;;;yEAGqE;IACrE,OAAO,CAAC,WAAW;gBAQR,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,cAAc,EAAE,eAAe,YAAmB,EAClD,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,IAAI,EAAE,SAAS;IAQjB,IAAI,cAAc,IAAI,eAAe,CAEpC;IAED;iFAC6E;IAC7E,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIlF;;4CAEwC;IACxC,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAE5F;;mCAE+B;YACjB,WAAW;IAMzB;;;;;;;;OAQG;IACG,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBrF;;;8EAG0E;IAC1E,OAAO,CAAC,cAAc;IAKtB;;;;;OAKG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlD,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAErC;IAED,IAAI,YAAY,IAAI,GAAG,CAAC,MAAM,CAAC,CAE9B;IAED;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IASnC;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQlC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAWlD;;;OAGG;IACH,UAAU,CAAC,CAAC,SAAS,kBAAkB,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC;IAuBrD;;;;;;4DAMwD;IACxD,iBAAiB,IAAI,iBAAiB;IAatC;;;;;OAKG;IACH,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAIlF;;;;;;;;;;;;;;;;;;OAkBG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4I1C,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAuBlD;;;;;;;;OAQG;IACH,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,WAAW;IA2G7D;;;;;OAKG;IAEG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6DxC;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,aAAa;IAWrB,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,iBAAiB;IAU/D;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,GAAG,CAAC;IA6Bf;;;;;OAKG;IACG,cAAc,CAAC,OAAO,EAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,GAAG,CAAC;IAUf;;;;;;;;;;OAUG;IACH;;;;;;OAMG;IACH,SAAS,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;IAI/D,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,UAAU,EAAE,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,EACpD,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,OAAO,EAAE,IAAI,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,EAC/D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;YAkBZ,SAAS;IA0IvB;;;;;;OAMG;IACH;;;gFAG4E;IAC5E,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI/C;;;0EAGsE;IACtE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;IAErD,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,qBAAqB;IAgBvB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3D;;;;;OAKG;IACG,WAAW,CACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,IAAI,CAAC;IAUhB;;;;;OAKG;IACG,QAAQ,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;YAoD3E,WAAW;IAgGzB;;;;;;;;OAQG;IACH,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAIhD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;IAS/B;;;;;;;;OAQG;IACH,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO;IAsB1E;mEAC+D;IAC/D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAGxB;IAEN;;;;SAIK;IACH,WAAW,CACT,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,KAAK,EAAE,MAAM,EAAE,EACf,YAAY,GAAE,MAAM,EAAO,GAC1B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAmB3B;AA4ED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAIf;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAIf"}
+{"version":3,"file":"evaluation-context.d.ts","sourceRoot":"","sources":["../src/evaluation-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,WAAW,EAEX,KAAK,iBAAiB,IAAI,kBAAkB,EAC5C,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAGlB,KAAK,WAAW,EAChB,KAAK,MAAM,EACZ,MAAM,cAAc,CAAC;AAetB,OAAO,EAAE,WAAW,EAAE,CAAC;AAyFvB,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GACxB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA6CzB;AA2CD;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,kBAAkB,GAAG,SAAS,CAAC,GAAG,SAAS,GAC5E,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAclC;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,aAAa,GAAG,SAAS,CAEhE;AA0DD;;;;;;;;;;GAUG;AACH,qBAAa,iBAAkB,YAAW,kBAAkB;IAuFxD,QAAQ,CAAC,MAAM,EAAE,MAAM;IAtFzB,QAAQ,CAAC,EAAE,SAA0C;IACrD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAC3C,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAEzB,sCAAsC;IACtC,MAAM,EAAE,kBAAkB,GAAG,SAAS,CAAa;IACnD,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,CAAM;IAE7C,oDAAoD;IACpD,KAAK,EAAE,cAAc,CAAa;IAElC,6EAA6E;IAC7E,QAAQ,CAAC,iBAAiB;kBAEZ,gBAAgB;kBAAY,gBAAgB;OACtD;IAEJ,iFAAiF;IACjF,SAAS,CAAC,QAAQ,CAAC,gBAAgB;kBAErB,gBAAgB;kBAAY,gBAAgB;aAAO,GAAG;OAChE;IAEJ,gEAAgE;IAChE,OAAO,CAAC,gBAAgB,CAA0B;IAElD;;;mEAG+D;IAC/D,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA+B;IAEpE;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,kBAAkB,GAAG,SAAS,CAAC;IAEjE;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC;IAEtB;uFACmF;IACnF,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,wEAAwE;IACxE,OAAO,CAAC,UAAU;IAIlB;;;yEAGqE;IACrE,OAAO,CAAC,WAAW;gBAQR,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,cAAc,EAAE,eAAe,YAAmB,EAClD,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,IAAI,EAAE,SAAS;IAQjB,IAAI,cAAc,IAAI,eAAe,CAEpC;IAED;iFAC6E;IAC7E,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIlF;;4CAEwC;IACxC,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAE5F;;mCAE+B;YACjB,WAAW;IAMzB;;;;;;;;OAQG;IACG,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBrF;;;8EAG0E;IAC1E,OAAO,CAAC,cAAc;IAKtB;;;;;OAKG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlD,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAErC;IAED,IAAI,YAAY,IAAI,GAAG,CAAC,MAAM,CAAC,CAE9B;IAED;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IASnC;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQlC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAWlD;;;OAGG;IACH,UAAU,CAAC,CAAC,SAAS,kBAAkB,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC;IAuBrD;;;;;;4DAMwD;IACxD,iBAAiB,IAAI,iBAAiB;IAatC;;;;;OAKG;IACH,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAIlF;;;;;;;;;;;;;;;;;;OAkBG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgJ1C,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAuBlD;;;;;;;;OAQG;IACH,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,WAAW;IA8G7D;;;;;OAKG;IAEG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6DxC;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,aAAa;IAWrB,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,iBAAiB;IAU/D;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,GAAG,CAAC;IA6Bf;;;;;OAKG;IACG,cAAc,CAAC,OAAO,EAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,OAAO,EACf,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,GAAG,CAAC;IAUf;;;;;;;;;;OAUG;IACH;;;;;;OAMG;IACH,SAAS,CAAC,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;IAI/D,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,UAAU,EAAE,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,EACpD,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,OAAO,EAAE,IAAI,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,EAC/D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;YAkBZ,SAAS;IA0IvB;;;;;;OAMG;IACH;;;gFAG4E;IAC5E,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI/C;;;0EAGsE;IACtE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;IAErD,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,qBAAqB;IAgBvB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3D;;;;;OAKG;IACG,WAAW,CACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,GAAG,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,IAAI,CAAC;IAUhB;;;;;OAKG;IACG,QAAQ,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;YAoD3E,WAAW;IAgGzB;;;;;;;;OAQG;IACH,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAIhD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;IAS/B;;;;;;;;OAQG;IACH,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO;IAsB1E;mEAC+D;IAC/D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAGxB;IAEN;;;;SAIK;IACH,WAAW,CACT,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,KAAK,EAAE,MAAM,EAAE,EACf,YAAY,GAAE,MAAM,EAAO,GAC1B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAmB3B;AA4ED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAIf;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAIf"}

package/dist/evaluation-context.js

@@ -3,6 +3,7 @@ import { formatSpanCounter } from "./logging/span-id.js";
 import { getRefIdentity, isCompiledValue, isInvokeError, isCancellationError, resourceKey, UNCANCELLABLE_CONTEXT, } from "@telorun/sdk";
 import { RuntimeError } from "@telorun/sdk";
 import { evalPathCovers } from "@telorun/analyzer";
+import { classifyInitFailures, renderInitFailureText, summarizeInitFailures, } from "./init-failure-diagnostics.js";
 import { acceptReportedStatus, buildPublishedProps, diagnoseObservedStateAccess, } from "./observed-state.js";
 export { resourceKey };
 /** A pure resolved reference is a `{ kind, name, alias? }` object and nothing
@@ -65,6 +66,15 @@ function collectResourceRefs(resource) {
     }
     return [...found.values()];
 }
+/**
+ * Project resource refs onto the names they depend on IN THIS CONTEXT. A local
+ * ref is its own name; a cross-module `Alias.name` ref depends on the local
+ * `Telo.Import` resource named by the alias, since that is the resource whose
+ * failure would strand it. Used to attribute an init failure to its cause.
+ */
+function localDependencyNames(refs) {
+    return refs.map((r) => (r.alias && r.alias !== "Self" ? r.alias : r.name));
+}
 /**
  * Build a resource's resolved properties for the debug stream — its config "after
  * templating", with `${{ }}` / `!cel` reduced to concrete values. The manifest is
@@ -308,6 +318,11 @@ export class EvaluationContext {
         this.createdInstances = new Map();
         /** Resources queued for initialization on this context node. */
         this.pendingResources = [];
+        /** Per-resource dependency names, captured at create() time — BEFORE Phase-5
+         *  injection swaps refs for live instances, so the walk sees plain objects and
+         *  cannot wander into a controller's (possibly cyclic) object graph. Read only
+         *  when init fails, to attribute each failure to its cause. */
+        this.resourceDependencies = new Map();
         /** Cache of compiled walker closures keyed on the manifest subtree they walk.
          *  WeakMap so entries are GC'd if the manifest is reloaded. */
         this.walkerCache = new WeakMap();
@@ -515,6 +530,8 @@ export class EvaluationContext {
                         errors.delete(name);
                         progress = true;
                         const createdRes = created.resource;
+                        const refs = collectResourceRefs(createdRes);
+                        this.resourceDependencies.set(name, localDependencyNames(refs));
                         const payload = {
                             resource: {
                                 kind: createdRes.kind,
@@ -523,7 +540,7 @@ export class EvaluationContext {
                                 id: this.resourceId(createdRes.kind, createdRes.metadata.name),
                             },
                             ...(this.owner ? { owner: this.owner } : {}),
-                            dependencies: this.qualifyDeps(collectResourceRefs(createdRes)),
+                            dependencies: this.qualifyDeps(refs),
                         };
                         // `properties` (the resolved config) is a second full config walk plus
                         // a secret scrub. Build it lazily: the EventBus short-circuits when
@@ -553,7 +570,7 @@ export class EvaluationContext {
                     if (this.preInitHook) {
                         this.preInitHook(resource, (n, alias) => alias && alias !== "Self"
                             ? this.resolveImportedInstance(alias, n)
-                            : this.resourceInstances.get(n)?.instance, (n) => this.hasManifest(n) && !this.resourceInstances.has(n));
+                            : this.resourceInstances.get(n)?.instance, (n) => this.hasManifest(n) && !this.resourceInstances.has(n), this);
                     }
                     if (instance.init)
                         await instance.init(ctx);
@@ -566,6 +583,9 @@ export class EvaluationContext {
                     await this.publishSnapshot(name);
                     this.resourceInstances.set(name, { resource, instance });
                     this.createdInstances.delete(name);
+                    // Read only on failure, and this one succeeded — drop it rather than
+                    // holding a dep-name array per resource for the context's lifetime.
+                    this.resourceDependencies.delete(name);
                     errors.delete(name);
                     progress = true;
                     await this.emit(`${resource.kind}.${resource.metadata.name}.Initialized`, {
@@ -588,36 +608,27 @@ export class EvaluationContext {
                 break;
         } while (pass <= MAX_PASSES);
         if (this.pendingResources.length > 0 || this.createdInstances.size > 0) {
-            const diagnostics = [
-                ...this.pendingResources.map((r) => {
-                    const info = errors.get(r.metadata.name) ?? { message: "Unknown error" };
-                    return {
-                        resource: r.metadata.name,
-                        kind: r.kind,
-                        message: info.message,
-                        details: info.details,
-                        code: info.code,
-                    };
-                }),
-                ...[...this.createdInstances].map(([name, { resource }]) => {
-                    const info = errors.get(name) ?? { message: "Unknown error" };
-                    return {
-                        resource: name,
-                        kind: resource.kind,
-                        message: info.message,
-                        details: info.details,
-                        code: info.code,
-                    };
-                }),
+            const toFailure = (name, kind, deps) => {
+                const info = errors.get(name) ?? { message: "Unknown error" };
+                return {
+                    resource: name,
+                    kind,
+                    message: info.message,
+                    details: info.details,
+                    code: info.code,
+                    children: info.children,
+                    deps,
+                };
+            };
+            const failures = [
+                // A resource that never got created was never injected either, so its
+                // manifest still carries plain `{kind, name}` refs — walk it here rather
+                // than relying on the create-time capture it never reached.
+                ...this.pendingResources.map((r) => toFailure(r.metadata.name, r.kind, localDependencyNames(collectResourceRefs(r)))),
+                ...[...this.createdInstances].map(([name, { resource }]) => toFailure(name, resource.kind, this.resourceDependencies.get(name) ?? [])),
             ];
-            const textDetails = diagnostics
-                .map((d) => {
-                const head = `  ${d.kind ? `${d.kind} ` : ""}${d.resource}: ${d.message}${d.code ? ` [${d.code}]` : ""}`;
-                const extra = d.details ? "\n" + d.details.split("\n").map((l) => `    ${l}`).join("\n") : "";
-                return head + extra;
-            })
-                .join("\n");
-            throw new RuntimeError("ERR_RESOURCE_INITIALIZATION_FAILED", `Unable to process resources:\n${textDetails}`, diagnostics);
+            const diagnostics = classifyInitFailures(failures);
+            throw new RuntimeError("ERR_RESOURCE_INITIALIZATION_FAILED", `${summarizeInitFailures(diagnostics)}:\n${renderInitFailureText(diagnostics)}`, diagnostics);
         }
         this.state = "Initialized";
     }
@@ -664,7 +675,7 @@ export class EvaluationContext {
                 // Propagate injection hook: extend getInstance to also resolve parent singleton instances.
                 if (parent.preInitHook) {
                     const parentHook = parent.preInitHook;
-                    child.preInitHook = (resource, childGetInstance, childIsPending) => {
+                    child.preInitHook = (resource, childGetInstance, childIsPending, owner) => {
                         parentHook(resource, (name, alias) => {
                             if (alias && alias !== "Self")
                                 return parent.resolveImportedInstance(alias, name);
@@ -685,7 +696,10 @@ export class EvaluationContext {
                         }, 
                         // Only a scope-local dependency can still be pending — an outer resource
                         // is live by the time a scope opens — so the child's own predicate suffices.
-                        childIsPending);
+                        childIsPending, 
+                        // Forwarded, not replaced by `child`: a `with:` nested inside a scoped
+                        // resource must still resolve kinds against the scope it opened in.
+                        owner);
                     };
                 }
                 try {
@@ -1446,6 +1460,22 @@ function formatErrorForDiagnostic(err) {
     if (!(err instanceof Error)) {
         return { message: String(err) };
     }
+    // A nested context's aggregate (an import initializing its library's
+    // resources) already carries a classified diagnostic list. Keep it structured
+    // instead of letting the cause-chain walk flatten it into this entry's
+    // message: the child's root causes stay distinguishable from the child's own
+    // cascade, and the error count sees the real leaves rather than one import.
+    // The headline is re-derived from the diagnostics, never recovered by parsing
+    // the message the child already rendered from them.
+    if (err instanceof RuntimeError &&
+        err.code === "ERR_RESOURCE_INITIALIZATION_FAILED" &&
+        err.diagnostics?.length) {
+        return {
+            message: summarizeInitFailures(err.diagnostics),
+            code: err.code,
+            children: err.diagnostics,
+        };
+    }
     const detailLines = [];
     const seen = new Set();
     let current = err;