@north-light/crouter 0.3.311 → 0.3.313

package/dist/core/__tests__/canvas-inbox-watcher-naming.test.js

@@ -27,9 +27,12 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import registerCanvasInboxWatcher from '../../pi-extensions/canvas-inbox-watcher.js';
 import { createNode } from '../canvas/canvas.js';
-import { closeDb } from '../canvas/db.js';
+import { closeDb, migrate, openDb } from '../canvas/db.js';
+import { acknowledgeNodeMail, claimNodeMail } from '../canvas/deliveries.js';
+import { beginExecution } from '../canvas/executions.js';
 import { apiSocketPath } from '../canvas/paths.js';
-import { appendInbox } from '../feed/inbox.js';
+import { enqueueNodeMail } from '../feed/messages.js';
+import { nodeMailEntry } from '../feed/inbox.js';
 import { BROKER_IDLE_TURN_START } from '../runtime/broker/held-deferred-inbox.js';
 const TICK_MS = 20;
 const DEBOUNCE_MS = 25;
@@ -107,19 +110,35 @@ function registerWatcher(pi) {
 function freshNode(id) {
     process.env['CRTR_NODE_ID'] = id;
     createNode(node(id));
+    process.env['CRTR_EXECUTION_ID'] = beginExecution(id, { daemonEpoch: 'test' });
+}
+function publishMail(nodeId, input) {
+    return enqueueNodeMail(nodeId, {
+        kind: input.kind,
+        label: input.label,
+        senderNodeId: input.from,
+        bodyRef: input.ref,
+        bodyJson: input.data,
+        disposition: input.disposition,
+        urgency: input.tier,
+        wake: 1,
+    });
 }
 let origHome;
 let origNode;
+let origExecution;
 let origTick;
 let origDebounce;
 before(async () => {
     origHome = process.env['CRTR_HOME'];
     origNode = process.env['CRTR_NODE_ID'];
+    origExecution = process.env['CRTR_EXECUTION_ID'];
     origTick = process.env['CRTR_WATCHER_TICK_MS'];
     origDebounce = process.env['CRTR_WATCHER_DEBOUNCE_MS'];
     home = mkdtempSync(join(tmpdir(), 'crtr-inbox-naming-'));
     mkdirSync(join(home, 'nodes'), { recursive: true });
     process.env['CRTR_HOME'] = home;
+    migrate(openDb());
     process.env['CRTR_WATCHER_TICK_MS'] = String(TICK_MS);
     process.env['CRTR_WATCHER_DEBOUNCE_MS'] = String(DEBOUNCE_MS);
     socket = createServer((connection) => {
@@ -151,9 +170,35 @@ before(async () => {
                 respond(connection, '200 OK', { applied: false });
                 return;
             }
-            // Everything else (e.g. advanceBrokerInboxCursor) — a harmless error is
-            // fine: the watcher retries cursor commits later and never blocks
-            // visible delivery on them.
+            const nodeId = nodeIdFromPath(path ?? '');
+            const bodyText = raw.split('\r\n\r\n')[1] ?? '';
+            const body = JSON.parse(bodyText);
+            if (method === 'POST' && path?.endsWith('/mail/claim')) {
+                const result = claimNodeMail(nodeId, body['execution_id'], body['channel']);
+                respond(connection, '200 OK', {
+                    action: result.action,
+                    deliveries: result.deliveries.map((delivery) => ({
+                        delivery_id: delivery.deliveryId,
+                        attempts: delivery.attempts,
+                        handoff: delivery.handoff,
+                        entry: nodeMailEntry(delivery),
+                    })),
+                });
+                return;
+            }
+            if (method === 'POST' && path?.endsWith('/mail/acknowledge')) {
+                const receipts = body['deliveries'];
+                const result = acknowledgeNodeMail(nodeId, body['execution_id'], receipts.map((receipt) => ({
+                    deliveryId: receipt.delivery_id,
+                    attempts: receipt.attempts,
+                    disposition: receipt.disposition,
+                })));
+                respond(connection, '200 OK', {
+                    action: result.action,
+                    results: result.results.map((receipt) => ({ delivery_id: receipt.deliveryId, outcome: receipt.outcome })),
+                });
+                return;
+            }
             respond(connection, '500 Internal Server Error', { error: { code: 'internal', message: 'stub daemon' } });
         });
     });
@@ -175,6 +220,10 @@ after(async () => {
         delete process.env['CRTR_NODE_ID'];
     else
         process.env['CRTR_NODE_ID'] = origNode;
+    if (origExecution === undefined)
+        delete process.env['CRTR_EXECUTION_ID'];
+    else
+        process.env['CRTR_EXECUTION_ID'] = origExecution;
     if (origTick === undefined)
         delete process.env['CRTR_WATCHER_TICK_MS'];
     else
@@ -189,7 +238,7 @@ test('an inbox-delivered human first message reaches the naming pipeline and cap
     const pi = makeFakePi();
     disposers.push(registerWatcher(pi));
     await wait(TICK_MS + 100);
-    appendInbox('inbox-human-unnamed', {
+    publishMail('inbox-human-unnamed', {
         from: 'human',
         tier: 'normal',
         kind: 'message',
@@ -209,7 +258,7 @@ test('a card/envelope delivery never reaches naming or goal capture', async () =
     const pi = makeFakePi();
     const dispose = registerWatcher(pi);
     await wait(TICK_MS + 100);
-    appendInbox('inbox-card-only', { from: 'child-9', tier: 'normal', kind: 'update', label: 'phase one done' });
+    publishMail('inbox-card-only', { from: 'child-9', tier: 'normal', kind: 'update', label: 'phase one done' });
     await waitFor(() => pi.injected.length >= 1, 3000);
     assert.equal(pi.injected.length, 1, 'the card still reaches the digest as a visible send');
     dispose(); // release ownership of this node id before a second watcher binds a new one
@@ -221,7 +270,7 @@ test('a card/envelope delivery never reaches naming or goal capture', async () =
     const clockPi = makeFakePi();
     disposers.push(registerWatcher(clockPi));
     await wait(TICK_MS + 100);
-    appendInbox('inbox-card-clock', { from: 'human', tier: 'normal', kind: 'message', label: 'clock', data: { body: 'clock' } });
+    publishMail('inbox-card-clock', { from: 'human', tier: 'normal', kind: 'message', label: 'clock', data: { body: 'clock' } });
     await waitFor(() => getRequests.some((line) => line.includes('inbox-card-clock')));
     // Exactly the one startup GET (report-node seed) — no second, naming-triggered fetch.
     assert.equal(getRequestCount('inbox-card-only'), 1, 'a card/envelope delivery never asks the naming pipeline to name the node');
@@ -233,7 +282,7 @@ test('an already-described node fetches state but never commits a new name', asy
     const pi = makeFakePi();
     const dispose = registerWatcher(pi);
     await wait(TICK_MS + 100);
-    appendInbox('inbox-already-named', {
+    publishMail('inbox-already-named', {
         from: 'human',
         tier: 'normal',
         kind: 'message',
@@ -254,7 +303,7 @@ test('an already-described node fetches state but never commits a new name', asy
     const clockPi = makeFakePi();
     disposers.push(registerWatcher(clockPi));
     await wait(TICK_MS + 100);
-    appendInbox('inbox-commit-clock', { from: 'human', tier: 'normal', kind: 'message', label: 'clock', data: { body: 'clock' } });
+    publishMail('inbox-commit-clock', { from: 'human', tier: 'normal', kind: 'message', label: 'clock', data: { body: 'clock' } });
     await waitFor(() => getRequests.some((line) => line.includes('inbox-commit-clock')));
     await wait(DEBOUNCE_MS + 100);
     assert.equal(postRequests.some((line) => line.includes('inbox-already-named')), false, 'an already-described node is untouched: the guard short-circuits before any generated-name commit');

package/dist/core/__tests__/canvas-inbox-watcher.test.js

@@ -12,13 +12,17 @@ import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import registerCanvasInboxWatcher from '../../pi-extensions/canvas-inbox-watcher.js';
-import { createNode } from '../canvas/canvas.js';
+import { createNode, getNode } from '../canvas/canvas.js';
+import { claimNodeMail } from '../canvas/deliveries.js';
 import { reportsDir } from '../canvas/paths.js';
-import { closeDb } from '../canvas/db.js';
-import { appendInbox, coalesce, finalizeInboxEntry } from '../feed/inbox.js';
+import { closeDb, migrate, openDb } from '../canvas/db.js';
+import { beginExecution } from '../canvas/executions.js';
+import { enqueueNodeMail } from '../feed/messages.js';
+import { coalesce, nodeMailEntry } from '../feed/inbox.js';
 import { appendSituationalContext, SITUATIONAL_CONTEXT_CUSTOM_TYPE } from '../runtime/situational-context.js';
 import { parseCard } from '../../shared/generated-context.js';
 import { BROKER_IDLE_TURN_START } from '../runtime/broker/held-deferred-inbox.js';
+import { createApiServer } from '../../daemon/api/server.js';
 // Drive the watcher's injectable cadence seam (CRTR_WATCHER_TICK_MS /
 // CRTR_WATCHER_DEBOUNCE_MS) at a fast tempo so the watcher delivers in tens of
 // milliseconds, not seconds — exactly the resolve+seed tick, read tick, and
@@ -29,15 +33,53 @@ const TICK_MS = 20;
 const DEBOUNCE_MS = 25;
 let origHome;
 let origNode;
+let origExecution;
 const homes = [];
+let server;
 const disposers = [];
 /** Point CRTR_HOME at a fresh temp canvas root and bind CRTR_NODE_ID. */
 function freshNode(nodeId) {
-    const home = join(tmpdir(), `crtr-canvas-watcher-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+    closeDb();
+    const home = join(tmpdir(), `cw-${Date.now()}-${Math.random().toString(36).slice(2)}`);
     mkdirSync(home, { recursive: true });
     homes.push(home);
     process.env['CRTR_HOME'] = home;
     process.env['CRTR_NODE_ID'] = nodeId;
+    migrate(openDb());
+}
+function ensureWatcherNode(nodeId) {
+    if (getNode(nodeId) !== null)
+        return;
+    createNode({
+        node_id: nodeId,
+        name: nodeId,
+        created: new Date().toISOString(),
+        cwd: '/tmp/work',
+        kind: 'general',
+        mode: 'base',
+        lifecycle: 'resident',
+        status: 'active',
+    });
+}
+function publishMail(nodeId, input) {
+    ensureWatcherNode(nodeId);
+    return enqueueNodeMail(nodeId, {
+        kind: input.kind,
+        label: input.label,
+        senderNodeId: input.from,
+        bodyRef: input.ref,
+        bodyJson: input.data,
+        disposition: input.disposition,
+        urgency: input.tier,
+        wake: 1,
+    });
+}
+function claimedMail(nodeId, input) {
+    publishMail(nodeId, input);
+    const claim = claimNodeMail(nodeId, beginExecution(nodeId, { daemonEpoch: 'test' }), 'wake');
+    assert.equal(claim.action, 'claimed');
+    assert.equal(claim.deliveries.length, 1);
+    return nodeMailEntry(claim.deliveries[0]);
 }
 function makeFakePi() {
     const handlers = {};
@@ -63,8 +105,12 @@ function onlyDelivery(deliveries) {
 // registerCanvasInboxWatcher() alone only wires up handlers; without this the
 // watcher never polls or sends anything.
 function registerWatcher(pi) {
+    const nodeId = process.env['CRTR_NODE_ID'];
+    ensureWatcherNode(nodeId);
+    process.env['CRTR_EXECUTION_ID'] = beginExecution(nodeId, { daemonEpoch: 'test' });
     const dispose = registerCanvasInboxWatcher(pi);
-    pi.fire('session_start', { type: 'session_start' }, undefined);
+    server ??= createApiServer();
+    void server.ready.then(() => pi.fire('session_start', { type: 'session_start' }, undefined));
     return dispose;
 }
 // Poll `predicate` until it holds or `timeoutMs` elapses, then return either
@@ -100,7 +146,7 @@ test('coalesce renders one inbox card whose entries inline short report bodies a
     mkdirSync(reportsDir(child.node_id), { recursive: true });
     writeFileSync(reportPath, '---\nnode: child\nkind: update\n---\nshort report body', 'utf8');
     const digest = onlyDelivery(coalesce([
-        finalizeInboxEntry({ from: 'child', tier: 'normal', kind: 'update', label: 'short report', ref: 'child:reports/short-update.md' }),
+        claimedMail('child', { from: 'child', tier: 'normal', kind: 'update', label: 'short report', ref: 'child:reports/short-update.md' }),
     ]));
     // The envelope is the whole message: a reader that finds it anywhere else
     // attributes the digest to the person.
@@ -121,7 +167,7 @@ test('coalesce renders one inbox card whose entries inline short report bodies a
     const canonical = parseCard({
         role: 'user',
         content: onlyDelivery(coalesce([
-            finalizeInboxEntry({ from: 'child', tier: 'normal', kind: 'final', label: 'done', ref: 'child:reports/final.md' }),
+            claimedMail('child', { from: 'child', tier: 'normal', kind: 'final', label: 'done', ref: 'child:reports/final.md' }),
         ])),
     });
     assert.deepEqual(canonical.senders[0].entries, [
@@ -131,7 +177,7 @@ test('coalesce renders one inbox card whose entries inline short report bodies a
     const spilled = parseCard({
         role: 'user',
         content: onlyDelivery(coalesce([
-            finalizeInboxEntry({ from: 'child', tier: 'normal', kind: 'message', label: 'long', ref: '/tmp/message.md', data: { body: 'long body' } }),
+            claimedMail('child', { from: 'child', tier: 'normal', kind: 'message', label: 'long', ref: '/tmp/message.md', data: { body: 'long body' } }),
         ])),
     });
     assert.deepEqual(spilled.senders[0].entries, [
@@ -143,13 +189,14 @@ test('a human message coalesces verbatim — a conversation turn, not a digest',
     // A human typing directly into a node's box is a CONVERSATION TURN, so the
     // dormant wake path must read identically to the live path: no card, no
     // `<from>` section. Every other sender is digest content.
+    freshNode('human');
     const body = 'first line\n\nsecond paragraph';
     const human = onlyDelivery(coalesce([
-        finalizeInboxEntry({ from: 'human', tier: 'normal', kind: 'message', label: 'first line', data: { body } }),
+        claimedMail('human', { from: 'human', tier: 'normal', kind: 'message', label: 'first line', data: { body } }),
     ]));
     assert.equal(human, body);
     const agent = onlyDelivery(coalesce([
-        finalizeInboxEntry({ from: 'mqifzplr-0753bde3', tier: 'normal', kind: 'message', label: 'go', data: { body: 'go' } }),
+        claimedMail('agent', { from: 'mqifzplr-0753bde3', tier: 'normal', kind: 'message', label: 'go', data: { body: 'go' } }),
     ]));
     assert.equal(agent.startsWith('<runtime kind="inbox"'), true);
     assert.match(agent, /<from id="mqifzplr-0753bde3">/);
@@ -157,8 +204,9 @@ test('a human message coalesces verbatim — a conversation turn, not a digest',
 test('a mixed batch splits: human words verbatim, node reports in one card, order preserved', () => {
     // Concatenating the two into one message left `parseCard` unable to see the
     // envelope, so the whole delivery read as the person's words.
-    const humanEntry = (body) => finalizeInboxEntry({ from: 'human', tier: 'normal', kind: 'message', label: body, data: { body } });
-    const nodeEntry = (from, body) => finalizeInboxEntry({ from, tier: 'normal', kind: 'update', label: body, data: { body } });
+    freshNode('mixed');
+    const humanEntry = (body) => claimedMail('mixed-human', { from: 'human', tier: 'normal', kind: 'message', label: body, data: { body } });
+    const nodeEntry = (from, body) => claimedMail('mixed-node', { from, tier: 'normal', kind: 'update', label: body, data: { body } });
     for (const [name, entries] of [
         ['human first', [humanEntry('do the thing'), nodeEntry('mqifzplr-0753bde3', 'phase one done')]],
         ['node first', [nodeEntry('mqifzplr-0753bde3', 'phase one done'), humanEntry('do the thing')]],
@@ -182,14 +230,18 @@ let origDebounce;
 before(() => {
     origHome = process.env['CRTR_HOME'];
     origNode = process.env['CRTR_NODE_ID'];
+    origExecution = process.env['CRTR_EXECUTION_ID'];
     origTick = process.env['CRTR_WATCHER_TICK_MS'];
     origDebounce = process.env['CRTR_WATCHER_DEBOUNCE_MS'];
     process.env['CRTR_WATCHER_TICK_MS'] = String(TICK_MS);
     process.env['CRTR_WATCHER_DEBOUNCE_MS'] = String(DEBOUNCE_MS);
 });
-afterEach(() => {
+afterEach(async () => {
     while (disposers.length > 0)
         disposers.pop()();
+    await server?.close();
+    server = undefined;
+    closeDb();
 });
 after(() => {
     if (origHome === undefined)
@@ -200,6 +252,10 @@ after(() => {
         delete process.env['CRTR_NODE_ID'];
     else
         process.env['CRTR_NODE_ID'] = origNode;
+    if (origExecution === undefined)
+        delete process.env['CRTR_EXECUTION_ID'];
+    else
+        process.env['CRTR_EXECUTION_ID'] = origExecution;
     if (origTick === undefined)
         delete process.env['CRTR_WATCHER_TICK_MS'];
     else
@@ -223,7 +279,7 @@ describe('canvas inbox watcher — finished-node delivery', () => {
         // Subscriber is actively streaming when the worker finishes.
         pi.fire('agent_start', { type: 'agent_start' }, { isIdle: () => false });
         await wait(TICK_MS + 100);
-        appendInbox('node-final', { from: 'child-1', tier: 'normal', kind: 'final', label: 'all done' });
+        publishMail('node-final', { from: 'child-1', tier: 'normal', kind: 'final', label: 'all done' });
         await waitFor(() => pi.injected.length >= 1);
         assert.equal(pi.injected.length, 1, 'one coalesced injection');
         assert.equal(pi.injected[0].deliverAs, 'steer', 'a finished node steers, not follows up');
@@ -233,8 +289,8 @@ describe('canvas inbox watcher — finished-node delivery', () => {
         const pi = makeFakePi();
         disposers.push(registerWatcher(pi));
         await wait(TICK_MS + 100);
-        appendInbox('node-mixed', { from: 'human', tier: 'normal', kind: 'message', label: 'do the thing', data: { body: 'do the thing' } });
-        appendInbox('node-mixed', { from: 'child-9', tier: 'normal', kind: 'update', label: 'phase one done' });
+        publishMail('node-mixed', { from: 'human', tier: 'normal', kind: 'message', label: 'do the thing', data: { body: 'do the thing' } });
+        publishMail('node-mixed', { from: 'child-9', tier: 'normal', kind: 'update', label: 'phase one done' });
         // One visible send per cycle, so the second part lands a tick later.
         await waitFor(() => pi.injected.length >= 2);
         assert.equal(pi.injected.length, 2, 'the batch split into two visible messages');
@@ -250,7 +306,7 @@ describe('canvas inbox watcher — finished-node delivery', () => {
         disposers.push(registerWatcher(pi));
         pi.fire('agent_start', { type: 'agent_start' }, { isIdle: () => false });
         await wait(TICK_MS + 100);
-        appendInbox('node-update', { from: 'child-2', tier: 'normal', kind: 'update', label: 'still working' });
+        publishMail('node-update', { from: 'child-2', tier: 'normal', kind: 'update', label: 'still working' });
         await waitFor(() => pi.injected.length >= 1);
         assert.equal(pi.injected.length, 1);
         assert.equal(pi.injected[0].deliverAs, 'followUp', 'a normal update is not urgent → followUp');
@@ -262,7 +318,7 @@ describe('canvas inbox watcher — hidden situational-context delivery', () => {
         appendSituationalContext('node-situational-only', 'the user is mid-checkout on the store applet');
         const pi = makeFakePi();
         disposers.push(registerWatcher(pi));
-        appendInbox('node-situational-only', {
+        publishMail('node-situational-only', {
             from: null,
             tier: 'normal',
             kind: 'message',
@@ -288,7 +344,7 @@ describe('canvas inbox watcher — hidden situational-context delivery', () => {
         appendSituationalContext('node-situational-combined', 'the hidden ambient checkout state');
         const pi = makeFakePi();
         disposers.push(registerWatcher(pi));
-        appendInbox('node-situational-combined', {
+        publishMail('node-situational-combined', {
             from: 'child-3',
             tier: 'normal',
             kind: 'message',
@@ -323,7 +379,7 @@ describe('canvas inbox watcher — hidden situational-context delivery', () => {
             realSendMessage(message, options);
         };
         disposers.push(registerWatcher(pi));
-        appendInbox('node-situational-retry', {
+        publishMail('node-situational-retry', {
             from: null,
             tier: 'normal',
             kind: 'message',

package/dist/core/__tests__/canvas.test.js

@@ -1,10 +1,10 @@
 import { test, before, after, beforeEach } from 'node:test';
 import assert from 'node:assert/strict';
-import { mkdtempSync, rmSync, existsSync, readFileSync, writeFileSync, statSync } from 'node:fs';
+import { mkdtempSync, rmSync, existsSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { createNode, getNode, getRow, updateNode, setStatus, subscribe, unsubscribe, setSubscriptionActive, recordSpawn, subscribersOf, subscriptionsOf, view, hasActiveLiveSubscription, rebuildIndex, } from '../canvas/canvas.js';
-import { closeDb } from '../canvas/db.js';
+import { createNode, getNode, getRow, updateNode, setStatus, subscribe, unsubscribe, setSubscriptionActive, recordSpawn, subscribersOf, subscriptionsOf, view, hasActiveLiveSubscription, } from '../canvas/canvas.js';
+import { closeDb, migrate, openDb } from '../canvas/db.js';
 import { nodeMetaPath } from '../canvas/paths.js';
 let home;
 function node(id, over = {}) {
@@ -28,25 +28,22 @@ beforeEach(() => {
     // Fresh db + dirs per test for isolation.
     closeDb();
     rmSync(home, { recursive: true, force: true });
+    migrate(openDb());
 });
 after(() => {
     closeDb();
     rmSync(home, { recursive: true, force: true });
     delete process.env['CRTR_HOME'];
 });
-test('meta.json is the source of truth on disk', () => {
+test('SQL is the source of truth; a node directory contains artifacts only', () => {
     createNode(node('a', { kind: 'developer' }));
-    const raw = JSON.parse(readFileSync(nodeMetaPath('a'), 'utf8'));
-    assert.equal(raw.kind, 'developer');
+    assert.equal(getNode('a')?.kind, 'developer');
+    assert.equal(existsSync(nodeMetaPath('a')), false, 'creating a node does not write a metadata authority file');
 });
-// Regression: cycle_pending is an IDENTITY field (meta.json-only, no db
-// column — like pi_session_file) written by reviveNode/canvas-stophook and
-// read back by reviveNode's locked launch arbitration. writeMeta only persists
-// keys listed in IDENTITY_KEYS; if cycle_pending is missing from that whitelist,
-// updateNode silently drops it and a competing caller can request strict resume.
+// cycle_pending is stored on the node row and read by revive launch arbitration.
 test('cycle_pending survives the updateNode/getNode meta.json round-trip', () => {
     createNode(node('a'));
-    assert.equal(getNode('a')?.cycle_pending, undefined); // never set
+    assert.equal(getNode('a')?.cycle_pending, false); // SQL default
     updateNode('a', { cycle_pending: true });
     assert.equal(getNode('a')?.cycle_pending, true);
     updateNode('a', { cycle_pending: false });
@@ -118,50 +115,24 @@ test('recordSpawn writes the audit-only spawned_by edge', () => {
     assert.equal(subscriptionsOf('child').length, 0);
     assert.equal(subscribersOf('parent').length, 0);
 });
-// Durability contract: meta.json is durable and never truncated
-// writeMeta uses atomic rename with fsync on both the temp file and parent
-// directory to ensure atomicity and durability. readMeta/rebuildIndex tolerate
-// an empty/corrupt meta.json as MISSING (returning null) rather than throwing,
-// gracefully handling rare disk/NFS anomalies without breaking recovery.
-test('writeMeta produces a durable, non-empty, atomically-named meta.json', () => {
+test('artifact metadata does not alter a SQL node', () => {
     createNode(node('a'));
-    const p = nodeMetaPath('a');
-    assert.ok(statSync(p).size > 0, 'meta.json must be non-empty');
-    assert.ok(!existsSync(`${p}.tmp`), 'temp file must be renamed away, not left behind');
-    assert.equal(getNode('a')?.node_id, 'a');
-});
-test('getNode returns null (not throw) on a 0-byte meta.json', () => {
-    createNode(node('a'));
-    writeFileSync(nodeMetaPath('a'), ''); // the observed NFS 0-byte corruption
-    assert.equal(getNode('a'), null);
+    writeFileSync(nodeMetaPath('a'), JSON.stringify({ node_id: 'a', kind: 'other' }));
+    assert.equal(getNode('a')?.kind, 'general');
 });
-test('getNode returns null (not throw) on an unparseable meta.json', () => {
+test('corrupt artifact metadata does not make a SQL node unreadable', () => {
     createNode(node('a'));
     writeFileSync(nodeMetaPath('a'), '{ broken json');
-    assert.equal(getNode('a'), null);
-});
-test('rebuildIndex skips a corrupt-meta node instead of throwing', () => {
-    createNode(node('good'));
-    createNode(node('bad'));
-    writeFileSync(nodeMetaPath('bad'), ''); // 0-byte corruption on one node
-    closeDb();
-    rmSync(join(home, 'canvas.db'), { force: true });
-    rmSync(join(home, 'canvas.db-wal'), { force: true });
-    rmSync(join(home, 'canvas.db-shm'), { force: true });
-    assert.doesNotThrow(() => rebuildIndex());
-    assert.equal(getRow('good')?.node_id, 'good'); // healthy node reindexed
-    assert.equal(getRow('bad'), null); // corrupt node skipped, no crash
+    assert.equal(getNode('a')?.node_id, 'a');
 });
-test('rebuildIndex reconstructs node rows from on-disk metas', () => {
+test('deleting the database does not rebuild nodes from artifact directories', () => {
     createNode(node('a', { parent: null }));
     createNode(node('b', { parent: 'a' }));
-    // wipe just the db, keep the node dirs
     closeDb();
     rmSync(join(home, 'canvas.db'), { force: true });
     rmSync(join(home, 'canvas.db-wal'), { force: true });
     rmSync(join(home, 'canvas.db-shm'), { force: true });
-    assert.equal(getRow('a'), null); // gone from index
-    rebuildIndex();
-    assert.equal(getRow('a')?.node_id, 'a');
-    assert.equal(getRow('b')?.parent, 'a');
+    migrate(openDb());
+    assert.equal(getRow('a'), null);
+    assert.equal(getRow('b'), null);
 });

package/dist/core/__tests__/child-death-wake.test.js

@@ -6,14 +6,18 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { spawnSync } from 'node:child_process';
 import { createNode, getNode, subscribe } from '../canvas/canvas.js';
-import { closeDb } from '../canvas/db.js';
-import { readInboxSince } from '../feed/inbox.js';
+import { closeDb, openDb, migrate } from '../canvas/db.js';
+import { beginExecution, recordExecutionPid } from '../canvas/executions.js';
+import { bindSession } from '../canvas/sessions.js';
+import { ensureScopeInitialized } from '../config.js';
+import { closeScopedStores } from '../scoped-state/db.js';
 import { closeNode } from '../runtime/close.js';
 import { superviseTick } from '../../daemon/crtrd.js';
 import { bindTestFleet } from './helpers/fleet.js';
 import { resetFleetForTests } from '../runtime/fleet.js';
 import { headlessBrokerHost } from '../runtime/host.js';
 let home;
+let priorUserHome;
 let tf;
 function node(id, over = {}) {
     return {
@@ -55,21 +59,30 @@ function deadEngineChild(id, over = {}) {
         pane: GONE_PANE,
         tmux_session: 'crtr-cdw',
         window: '@1',
-        pi_pid: deadPid(),
-        pi_session_id: 'booted',
         intent: null,
         status: 'active',
         ...over,
     }));
+    const executionId = beginExecution(id, { daemonEpoch: 'test' });
+    assert.equal(bindSession(id, { executionId, sessionId: 'booted', transcriptPath: withSession(id) }), 'bound');
+    assert.equal(recordExecutionPid(executionId, id, deadPid()), 'recorded');
 }
 /** A dormant inbox-waiting PARENT — only ever the wake TARGET, asserted via its
  *  inbox. */
 function inboxWaitingParent(id) {
     createNode(node(id, { status: 'active' }));
 }
-const wakeFromChild = (parent, child) => readInboxSince(parent).find((e) => e.from === child);
+function nodeMail(nodeId) {
+    return openDb().prepare(`SELECT m.sender_node_id AS "from", m.label
+    FROM deliveries d JOIN messages m ON m.message_id = d.message_id
+    WHERE d.destination_kind = 'node_inbox' AND d.destination_id = ?
+    ORDER BY m.seq`).all(nodeId);
+}
+const wakeFromChild = (parent, child) => nodeMail(parent).find((entry) => entry.from === child);
 before(() => {
     home = mkdtempSync(join(tmpdir(), 'crtr-child-death-wake-'));
+    priorUserHome = process.env['HOME'];
+    process.env['HOME'] = home;
     process.env['CRTR_HOME'] = home;
     // superviseTick requires a bound fleet (D-2). It starts empty: none of these
     // fabricated rows has a live broker.
@@ -78,11 +91,18 @@ before(() => {
 beforeEach(() => {
     closeDb();
     rmSync(home, { recursive: true, force: true });
+    ensureScopeInitialized('user', join(home, '.crouter'));
+    migrate(openDb());
 });
 after(() => {
     closeDb();
+    closeScopedStores();
     rmSync(home, { recursive: true, force: true });
     delete process.env['CRTR_HOME'];
+    if (priorUserHome === undefined)
+        delete process.env['HOME'];
+    else
+        process.env['HOME'] = priorUserHome;
     resetFleetForTests();
 });
 test('a dead-engine booted child enters durable backoff before recovery, is NOT reaped, and fans NO wake to its dormant parent', async () => {
@@ -108,7 +128,7 @@ test('a dead-engine booted child enters durable backoff before recovery, is NOT
         // the row is relaunched on its saved session, never reaped to dead/done/idle.
         assert.deepEqual(launches, ['CHILD'], 'the matured tick recovers the dead engine through the policy table');
         assert.equal(getNode('CHILD').status, 'active', 'CHILD is recovered, NOT reaped');
-        assert.equal(readInboxSince('PARENT').length, 0, 'PARENT inbox EMPTY — no daemon liveness wake');
+        assert.equal(nodeMail('PARENT').length, 0, 'PARENT has no delivery from daemon liveness');
     }
     finally {
         headlessBrokerHost.launch = originalLaunch;
@@ -118,7 +138,9 @@ test('a dead-engine booted child enters durable backoff before recovery, is NOT
 test('node close of a child wakes its SURVIVING manager (the parent outside the closing set)', async () => {
     inboxWaitingParent('PARENT');
     // A booted child; closeNode tears its (paneless-for-the-test) engine down.
-    createNode(node('CHILD', { pane: GONE_PANE, tmux_session: 'crtr-cdw', window: '@1', pi_session_id: 'booted', pi_session_file: withSession('CHILD'), status: 'active' }));
+    createNode(node('CHILD', { pane: GONE_PANE, tmux_session: 'crtr-cdw', window: '@1', status: 'active' }));
+    const executionId = beginExecution('CHILD', { daemonEpoch: 'test' });
+    assert.equal(bindSession('CHILD', { executionId, sessionId: 'booted', transcriptPath: withSession('CHILD') }), 'bound');
     subscribe('PARENT', 'CHILD', true); // PARENT is a manager OUTSIDE the close set
     // Closing CHILD: closingSet({CHILD}) cannot pull in PARENT (PARENT is a
     // SUBSCRIBER of CHILD, never a descendant), so PARENT survives + must wake.

package/dist/core/__tests__/cli-help-contract.test.js

@@ -14,6 +14,7 @@ import { mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { buildRoot } from '../../build-root.js';
+import { ensureScopeInitialized } from '../config.js';
 import { resetScopeCache } from '../scope.js';
 // buildRoot() composes external command-plugin branches from the effective
 // enabled plugins. Pin HOME to an isolated no-plugin home: a third party's
@@ -28,6 +29,7 @@ before(() => {
     delete process.env['CRTR_PROFILE_ID'];
     process.env['HOME'] = home;
     resetScopeCache();
+    ensureScopeInitialized('user', join(home, '.crouter'));
 });
 after(() => {
     if (realHome !== undefined)