@north-light/crouter 0.3.310 → 0.3.311

package/dist/core/canvas/render-source.d.ts

@@ -13,8 +13,8 @@ export interface NodeTelemetry {
 export declare function readNodeTelemetry(nodeId: string): NodeTelemetry;
 /** Format a token count as `Nk` (rounded down to nearest 1 k). */
 export declare function fmtCtx(tokensIn: number | undefined): string;
-export declare function renderTreeFromSource(source: CanvasSource, rootId: string): Promise<string>;
-export declare function renderForestFromSource(source: CanvasSource): Promise<string>;
+export declare function renderTreeFromSource(source: CanvasSource, rootId: string, snapshot?: readonly NodeRow[], ticketSnapshot?: Record<string, number>, ticketUnavailable?: string): Promise<string>;
+export declare function renderForestFromSource(source: CanvasSource, snapshot?: readonly NodeRow[], ticketSnapshot?: Record<string, number>, ticketUnavailable?: string): Promise<string>;
 export interface DashboardRow {
     node_id: string;
     /** Full display label: explicit handle plus generated description. */
@@ -183,13 +183,13 @@ export declare function dashboardRowFromNodeRow(row: NodeRow, focusedNodeIds: Re
  *  entirely through the source — the openDb-free sibling of `dashboardRows`.
  *  Ticket counts come from ONE `source.ticketCountsForView(rootId)` call (the
  *  API/remote attention projection), never `countTickets` (openDb). */
-export declare function dashboardRowsFromSource(source: CanvasSource, rootId: string): Promise<DashboardRow[]>;
+export declare function dashboardRowsFromSource(source: CanvasSource, rootId: string, snapshot?: readonly NodeRow[], ticketSnapshot?: Record<string, number>): Promise<DashboardRow[]>;
 /** CHEAP boot builder over a source — one row per node across the whole canvas,
  *  fields that need no per-node meta/session read. Local API callers may supply
  *  the node ids from one `listFocuses()` query so `viewed` remains visible without
  *  coupling the canvas source to local viewer state. Remote sources ignore that
  *  set. Local disk telemetry/fault/streaming are likewise suppressed remotely. */
-export declare function dashboardRowsAllFromSource(source: CanvasSource, localFocusedNodeIds?: ReadonlySet<string>, liveOnly?: boolean): Promise<DashboardRow[]>;
+export declare function dashboardRowsAllFromSource(source: CanvasSource, localFocusedNodeIds?: ReadonlySet<string>, liveOnly?: boolean, snapshot?: readonly NodeRow[]): Promise<DashboardRow[]>;
 export declare function enrichRowsFromSource(_source: CanvasSource, rows: DashboardRow[], asks?: Record<string, number>): Promise<void>;
 /** goal (initial-prompt.md) and session parts are local disk reads — suppressed
  *  to undefined for a remote source. */

package/dist/core/canvas/render-source.js

@@ -60,9 +60,8 @@ export function fmtCtx(tokensIn) {
 // LOCAL disk reads (telemetry.json / fault.json), valid for a same-host source
 // but meaningless for a truly remote canvas, so both are suppressed when the
 // source is a `RemoteCanvasSource`.
-async function nodeLineFromSource(source, nodeId, indent, connector, remote, tickets) {
-    const node = await source.getNode(nodeId);
-    if (node === null)
+function nodeLineFromSource(node, nodeId, indent, connector, remote, tickets) {
+    if (node === undefined)
         return `${indent}${connector}? <missing meta: ${nodeId}>`;
     const hanging = remote ? null : hangingFor(node);
     const glyph = resolveNodeVisual(node.status, { hanging, frozen: isFrozenRow(node) }).glyph;
@@ -72,12 +71,12 @@ async function nodeLineFromSource(source, nodeId, indent, connector, remote, tic
     const faultSuffix = hanging !== null ? ` · ${faultSummary(hanging)}` : '';
     return `${indent}${connector}${glyph} ${fullName(node)} [${node.kind}/${node.mode}] ctx ${ctx}${askSuffix}${faultSuffix}`;
 }
-async function walkTreeFromSource(source, nodeId, indent, isLast, visited, out, remote, tickets) {
+async function walkTreeFromSource(source, nodes, nodeId, indent, isLast, visited, out, remote, tickets) {
     if (visited.has(nodeId))
         return;
     visited.add(nodeId);
     const connector = isLast ? '└─ ' : '├─ ';
-    out.push(await nodeLineFromSource(source, nodeId, indent, connector, remote, tickets));
+    out.push(nodeLineFromSource(nodes.get(nodeId), nodeId, indent, connector, remote, tickets));
     const childIndent = indent + (isLast ? '   ' : '│  ');
     let children;
     try {
@@ -95,22 +94,25 @@ async function walkTreeFromSource(source, nodeId, indent, isLast, visited, out,
             out.push(`${childIndent}${cycleConnector}↺ <cycle: ${child.node_id}>`);
             continue;
         }
-        await walkTreeFromSource(source, child.node_id, childIndent, childIsLast, visited, out, remote, tickets);
+        await walkTreeFromSource(source, nodes, child.node_id, childIndent, childIsLast, visited, out, remote, tickets);
     }
 }
-export async function renderTreeFromSource(source, rootId) {
+export async function renderTreeFromSource(source, rootId, snapshot, ticketSnapshot, ticketUnavailable) {
     const remote = source instanceof RemoteCanvasSource;
-    const node = await source.getNode(rootId);
-    if (node === null)
+    const nodes = new Map((snapshot ?? await source.listNodes()).map((node) => [node.node_id, node]));
+    const node = nodes.get(rootId);
+    if (node === undefined)
         return `? <missing node: ${rootId}>`;
-    let tickets;
-    let ticketsUnavailable = null;
-    try {
-        tickets = await source.ticketCountsForView(rootId);
-    }
-    catch (err) {
-        tickets = {};
-        ticketsUnavailable = err instanceof Error ? err.message : String(err);
+    let tickets = ticketSnapshot;
+    let ticketsUnavailable = ticketUnavailable ?? null;
+    if (tickets === undefined) {
+        try {
+            tickets = await source.ticketCountsForView(rootId);
+        }
+        catch (err) {
+            tickets = {};
+            ticketsUnavailable = err instanceof Error ? err.message : String(err);
+        }
     }
     const ctx = remote ? '0k' : fmtCtx(readNodeTelemetry(rootId).tokens_in);
     const asks = tickets[rootId] ?? 0;
@@ -132,14 +134,14 @@ export async function renderTreeFromSource(source, rootId) {
     for (let i = 0; i < children.length; i++) {
         const child = children[i];
         const isLast = i === children.length - 1;
-        await walkTreeFromSource(source, child.node_id, '', isLast, visited, out, remote, tickets);
+        await walkTreeFromSource(source, nodes, child.node_id, '', isLast, visited, out, remote, tickets);
     }
     if (ticketsUnavailable !== null)
         out.push(`Tickets: unavailable (${ticketsUnavailable}).`);
     return out.join('\n');
 }
-export async function renderForestFromSource(source) {
-    const all = await source.listNodes();
+export async function renderForestFromSource(source, snapshot, ticketSnapshot, ticketUnavailable) {
+    const all = snapshot ?? await source.listNodes();
     if (all.length === 0)
         return '(canvas is empty)';
     const roots = all.filter((n) => n.parent === null && (n.status === 'active' || n.status === 'idle'));
@@ -147,7 +149,7 @@ export async function renderForestFromSource(source) {
         return '(no live roots)';
     const parts = [];
     for (const r of roots) {
-        parts.push(await renderTreeFromSource(source, r.node_id));
+        parts.push(await renderTreeFromSource(source, r.node_id, all, ticketSnapshot, ticketUnavailable));
     }
     return parts.join('\n\n');
 }
@@ -563,44 +565,43 @@ export function dashboardRowFromNodeRow(row, focusedNodeIds, remote) {
  *  entirely through the source — the openDb-free sibling of `dashboardRows`.
  *  Ticket counts come from ONE `source.ticketCountsForView(rootId)` call (the
  *  API/remote attention projection), never `countTickets` (openDb). */
-export async function dashboardRowsFromSource(source, rootId) {
+export async function dashboardRowsFromSource(source, rootId, snapshot, ticketSnapshot) {
     const remote = source instanceof RemoteCanvasSource;
-    const tickets = await source.ticketCountsForView(rootId).catch(() => ({}));
+    const tickets = ticketSnapshot ?? await source.ticketCountsForView(rootId).catch(() => ({}));
+    const nodes = new Map((snapshot ?? await source.listNodes()).map((node) => [node.node_id, node]));
     const ids = [rootId, ...(await source.view(rootId))];
-    const rows = [];
-    for (const id of ids) {
-        const node = await source.getNode(id);
-        if (node === null)
-            continue;
+    return ids.flatMap((id) => {
+        const node = nodes.get(id);
+        if (node === undefined)
+            return [];
         const tel = remote ? {} : readNodeTelemetry(id);
-        rows.push({
-            node_id: id,
-            name: fullName(node),
-            handle: node.name,
-            description: node.description,
-            status: node.status,
-            frozen_at: node.frozen_at ?? null,
-            terminal_reason: node.terminal_reason ?? null,
-            kind: node.kind,
-            mode: node.mode,
-            ctx_tokens: tel.tokens_in ?? 0,
-            asks: tickets[id] ?? 0,
-            cwd: node.cwd,
-            profile_id: node.profile_id,
-            created: node.created,
-        });
-    }
-    return rows;
+        return [{
+                node_id: id,
+                name: fullName(node),
+                handle: node.name,
+                description: node.description,
+                status: node.status,
+                frozen_at: node.frozen_at ?? null,
+                terminal_reason: node.terminal_reason ?? null,
+                kind: node.kind,
+                mode: node.mode,
+                ctx_tokens: tel.tokens_in ?? 0,
+                asks: tickets[id] ?? 0,
+                cwd: node.cwd,
+                profile_id: node.profile_id,
+                created: node.created,
+            }];
+    });
 }
 /** CHEAP boot builder over a source — one row per node across the whole canvas,
  *  fields that need no per-node meta/session read. Local API callers may supply
  *  the node ids from one `listFocuses()` query so `viewed` remains visible without
  *  coupling the canvas source to local viewer state. Remote sources ignore that
  *  set. Local disk telemetry/fault/streaming are likewise suppressed remotely. */
-export async function dashboardRowsAllFromSource(source, localFocusedNodeIds = new Set(), liveOnly = false) {
+export async function dashboardRowsAllFromSource(source, localFocusedNodeIds = new Set(), liveOnly = false, snapshot) {
     const remote = source instanceof RemoteCanvasSource;
     const focusedNodeIds = remote ? new Set() : localFocusedNodeIds;
-    const rows = await source.listNodes(liveOnly ? { status: ['active', 'idle'] } : undefined);
+    const rows = snapshot ?? await source.listNodes(liveOnly ? { status: ['active', 'idle'] } : undefined);
     return rows.map((row) => dashboardRowFromNodeRow(row, focusedNodeIds, remote));
 }
 // Lazy enrichment (source-driven) — fold the per-node reads the cheap boot skips

package/dist/core/canvas/source.d.ts

@@ -9,6 +9,7 @@ export interface CanvasSource {
     subscriptionsOf(subscriber: string): Promise<SubscriptionRef[]>;
     subscribersOf(publisher: string): Promise<SubscriptionRef[]>;
     view(root: string): Promise<string[]>;
+    ticketCountsForNodes(nodeIds: readonly string[]): Promise<Record<string, number>>;
     ticketCountsForView(root: string): Promise<Record<string, number>>;
     hasActiveLiveSubscription(nodeId: string): Promise<boolean>;
 }
@@ -21,6 +22,7 @@ export declare class LocalCanvasSource implements CanvasSource {
     subscriptionsOf(subscriber: string): Promise<SubscriptionRef[]>;
     subscribersOf(publisher: string): Promise<SubscriptionRef[]>;
     view(root: string): Promise<string[]>;
+    ticketCountsForNodes(nodeIds: readonly string[]): Promise<Record<string, number>>;
     ticketCountsForView(root: string): Promise<Record<string, number>>;
     hasActiveLiveSubscription(nodeId: string): Promise<boolean>;
 }

package/dist/core/canvas/source.js

@@ -22,8 +22,11 @@ export class LocalCanvasSource {
     async view(root) {
         return view(root);
     }
+    async ticketCountsForNodes(nodeIds) {
+        return ticketCountsForNodes([...nodeIds]);
+    }
     async ticketCountsForView(root) {
-        return ticketCountsForNodes([root, ...view(root)]);
+        return this.ticketCountsForNodes([root, ...view(root)]);
     }
     async hasActiveLiveSubscription(nodeId) {
         return hasActiveLiveSubscription(nodeId);

package/dist/daemon/cron-run.js

@@ -35,14 +35,14 @@
 // promises for graceful-teardown drain but never blocks on a slow run.
 import { spawn } from 'node:child_process';
 import { createHash, randomUUID } from 'node:crypto';
-import { CRON_KILL_GRACE_MS, CRON_OUTPUT_HEAD_BYTES, EMPTY_STDOUT_SHA256, newHeadCapture, } from './cron/capture.js';
+import { CRON_DEATH_POLL_MS, CRON_KILL_GRACE_MS, CRON_OUTPUT_HEAD_BYTES, EMPTY_STDOUT_SHA256, newHeadCapture, } from './cron/capture.js';
 import { clearLiveRun, cronDaemonInstanceId, liveRunFor, registerLiveRun } from './cron/live-runs.js';
 import { buildArmedRunContext } from './cron/armed-context.js';
 import { decideHeldSettle, EXIT_HELD, HELD_DELIVERED } from './cron/held.js';
 import { settleRun } from './cron/settle.js';
 import { applyOverlapPolicies, expireDueCrons, } from './cron/passes.js';
 import { dueClockCrons, acquireCronRunLease, advanceCron, setCronState, } from '../core/canvas/crons.js';
-import { killProcessGroup } from '../core/canvas/pid.js';
+import { captureTeardownSnapshot, isAnyPidAlive, killProcessTreePids } from '../core/canvas/pid.js';
 import { emitEvent } from '../core/events/emit.js';
 import { nextSlotAfter } from '../core/wake.js';
 import { resolveAdmittedHostCommand } from '../core/runtime/spawn-env.js';
@@ -239,6 +239,9 @@ export function executeCron(c, opts) {
         let settled = false;
         let timer;
         let killTimer;
+        let deathTimer;
+        let closeCode;
+        let killed = false;
         let timedOut = false;
         let leaseLost = false;
         let processError = null;
@@ -259,19 +262,8 @@ export function executeCron(c, opts) {
         child.stderr?.on('data', (chunk) => {
             stderr.take(chunk);
         });
-        const killWithEscalation = (pid) => {
-            killProcessGroup(pid);
-            if (killTimer === undefined) {
-                killTimer = setTimeout(() => killProcessGroup(pid, 'SIGKILL'), CRON_KILL_GRACE_MS);
-                killTimer.unref?.();
-            }
-        };
-        // A signal, not settlement: 'close' always follows 'error'.
-        child.on('error', (err) => {
-            if (processError == null)
-                processError = err;
-        });
-        child.on('close', (code) => {
+        let teardown;
+        const settleClosedChild = (code) => {
             if (settled)
                 return;
             settled = true;
@@ -279,6 +271,8 @@ export function executeCron(c, opts) {
                 clearTimeout(timer);
             if (killTimer !== undefined)
                 clearTimeout(killTimer);
+            if (deathTimer !== undefined)
+                clearTimeout(deathTimer);
             const stdoutHead = stdout.decode();
             const stderrHead = stderr.decode();
             const live = liveRunFor(c.cron_id);
@@ -306,6 +300,46 @@ export function executeCron(c, opts) {
                 wasReplaced,
                 wasSelfCanceled,
             }).then(resolve, reject);
+        };
+        const awaitTeardownDeath = () => {
+            if (teardown === undefined || !isAnyPidAlive(teardown.tree)) {
+                if (closeCode !== undefined)
+                    settleClosedChild(closeCode);
+                return;
+            }
+            deathTimer = setTimeout(awaitTeardownDeath, CRON_DEATH_POLL_MS);
+        };
+        const killWithEscalation = (pid) => {
+            teardown ??= captureTeardownSnapshot(pid, null);
+            killProcessTreePids(teardown.tree, 'SIGTERM', teardown.identities);
+            if (killTimer === undefined) {
+                killTimer = setTimeout(() => {
+                    if (isAnyPidAlive(teardown.tree))
+                        killProcessTreePids(teardown.tree, 'SIGKILL', teardown.identities);
+                    killed = true;
+                    if (closeCode !== undefined)
+                        awaitTeardownDeath();
+                }, CRON_KILL_GRACE_MS);
+                killTimer.unref?.();
+            }
+        };
+        // A signal, not settlement: 'close' always follows 'error'.
+        child.on('error', (err) => {
+            if (processError == null)
+                processError = err;
+        });
+        child.on('close', (code) => {
+            if (settled)
+                return;
+            closeCode = code;
+            if (timer !== undefined)
+                clearTimeout(timer);
+            if (teardown !== undefined && isAnyPidAlive(teardown.tree)) {
+                if (killed)
+                    awaitTeardownDeath();
+                return;
+            }
+            settleClosedChild(code);
         });
         if (child.pid == null ||
             !acquireCronRunLease(c.cron_id, cronDaemonInstanceId, child.pid, startedAtIso, outOfBand)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.310",
+  "version": "0.3.311",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",

package/runtime.lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.310",
+  "version": "0.3.311",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.310",
+      "version": "0.3.311",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
@@ -5206,17 +5206,17 @@
     },
     "packages/crouter-api": {
       "name": "@north-light/crouter-api",
-      "version": "0.3.310",
+      "version": "0.3.311",
       "license": "UNLICENSED"
     },
     "packages/crouter-env-docker": {
       "name": "@north-light/crouter-env-docker",
-      "version": "0.3.310",
+      "version": "0.3.311",
       "license": "UNLICENSED"
     },
     "packages/crouter-sdk": {
       "name": "@north-light/crouter-sdk",
-      "version": "0.3.310",
+      "version": "0.3.311",
       "license": "UNLICENSED",
       "dependencies": {
         "@north-light/crouter-api": "^0.3.295"