@north-light/crouter 0.3.311 → 0.3.313

package/dist/core/__tests__/inline-memory-refs.test.js

@@ -7,9 +7,11 @@
 // metadata-only rows, and stable ordering, all over real on-disk fixtures.
 import { test, describe, before, beforeEach, after } from 'node:test';
 import assert from 'node:assert/strict';
-import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
+import { mkdtempSync, mkdirSync, realpathSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
+import { ensureScopeInitialized } from '../config.js';
+import { closeScopedStores } from '../scoped-state/db.js';
 import { resetScopeCache } from '../scope.js';
 import { clearSessionCache } from '../substrate/session-cache.js';
 import { memoryDir as nodeMemoryDir } from '../runtime/memory.js';
@@ -70,8 +72,9 @@ describe('buildRefInventory (fixture-backed corpus)', () => {
         prevCwd = process.cwd();
     });
     beforeEach(() => {
+        closeScopedStores();
         canvasHome = mkdtempSync(join(tmpdir(), 'crtr-inline-ref-canvas-'));
-        userHome = mkdtempSync(join(tmpdir(), 'crtr-inline-ref-user-'));
+        userHome = realpathSync(mkdtempSync(join(tmpdir(), 'crtr-inline-ref-user-')));
         projectBase = mkdtempSync(join(tmpdir(), 'crtr-inline-ref-project-'));
         projectRoot = join(projectBase, 'root');
         mkdirSync(projectRoot, { recursive: true });
@@ -84,9 +87,11 @@ describe('buildRefInventory (fixture-backed corpus)', () => {
         process.env['CRTR_NODE_ID'] = NODE_ID;
         process.chdir(projectRoot);
         resetScopeCache();
+        ensureScopeInitialized('user', join(userHome, '.crouter'));
         clearSessionCache();
     });
     after(() => {
+        closeScopedStores();
         process.chdir(prevCwd);
         resetScopeCache();
         clearSessionCache();

package/dist/core/__tests__/integration/broker-fork-seam.test.js

@@ -34,7 +34,9 @@ import { tmpdir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createNode } from '../../canvas/canvas.js';
-import { closeDb } from '../../canvas/db.js';
+import { closeDb, migrate, openDb } from '../../canvas/db.js';
+import { closeScopedStores } from '../../scoped-state/db.js';
+import { initializeFreshScopedStore } from '../../scoped-state/migrate.js';
 import { resolveForkSource } from '../../runtime/spawn.js';
 import { createAgentSessionServices, createAgentSessionFromServices, SessionManager, VERSION, } from '../../runtime/broker-sdk.js';
 import { buildBrokerSession } from '../../runtime/broker.js';
@@ -56,11 +58,41 @@ const realEngine = {
     VERSION,
 };
 let dir;
+let home;
+let agentDir;
+const previousHome = process.env['HOME'];
+const previousCanvasHome = process.env['CRTR_HOME'];
+const previousAgentDir = process.env['PI_CODING_AGENT_DIR'];
 before(() => {
     dir = mkdtempSync(join(tmpdir(), 'crtr-fork-seam-'));
+    home = mkdtempSync(join(tmpdir(), 'crtr-fork-home-'));
+    closeDb();
+    closeScopedStores();
+    process.env['HOME'] = home;
+    process.env['CRTR_HOME'] = join(home, '.crouter', 'canvas');
+    agentDir = join(home, '.pi', 'agent');
+    process.env['PI_CODING_AGENT_DIR'] = agentDir;
+    migrate(openDb());
+    initializeFreshScopedStore({ kind: 'user', root: join(home, '.crouter') });
+    initializeFreshScopedStore({ kind: 'provider', root: agentDir });
 });
 after(() => {
+    closeDb();
+    closeScopedStores();
+    if (previousHome === undefined)
+        delete process.env['HOME'];
+    else
+        process.env['HOME'] = previousHome;
+    if (previousCanvasHome === undefined)
+        delete process.env['CRTR_HOME'];
+    else
+        process.env['CRTR_HOME'] = previousCanvasHome;
+    if (previousAgentDir === undefined)
+        delete process.env['PI_CODING_AGENT_DIR'];
+    else
+        process.env['PI_CODING_AGENT_DIR'] = previousAgentDir;
     rmSync(dir, { recursive: true, force: true });
+    rmSync(home, { recursive: true, force: true });
 });
 /** A minimal but VALID pi session .jsonl (the exact on-disk shape v3 emits): a
  *  `session` header line + two `message` entries. This is what a node that has
@@ -135,10 +167,8 @@ function nodeRow(id, over = {}) {
     };
 }
 test('resolveForkSource refuses every reference that resolves to no forkable session file', () => {
-    const home = mkdtempSync(join(tmpdir(), 'crtr-fork-resolve-'));
     const sessions = mkdtempSync(join(tmpdir(), 'crtr-pi-agent-'));
-    const previousHome = process.env['CRTR_HOME'];
-    process.env['CRTR_HOME'] = home;
+    const previousSessions = process.env['PI_CODING_AGENT_DIR'];
     process.env['PI_CODING_AGENT_DIR'] = sessions;
     try {
         // Broker-cut contract (U6/§B.broker): the broker forks an absolute .jsonl
@@ -154,13 +184,10 @@ test('resolveForkSource refuses every reference that resolves to no forkable ses
         assert.throws(() => resolveForkSource('   '), /requires a node id/);
     }
     finally {
-        closeDb();
-        delete process.env['PI_CODING_AGENT_DIR'];
-        if (previousHome === undefined)
-            delete process.env['CRTR_HOME'];
+        if (previousSessions === undefined)
+            delete process.env['PI_CODING_AGENT_DIR'];
         else
-            process.env['CRTR_HOME'] = previousHome;
-        rmSync(home, { recursive: true, force: true });
+            process.env['PI_CODING_AGENT_DIR'] = previousSessions;
         rmSync(sessions, { recursive: true, force: true });
     }
 });

package/dist/core/__tests__/integration/broker-sdk-wiring.test.js

@@ -31,6 +31,9 @@ import { isLeadingEngineCommand, resolveSteerCall, chooseGuidanceDeliveryMode, p
 import { isHiddenJsonlBranchEntry, stripHiddenEntriesFromJsonlExport, } from '../../runtime/broker/frame-session.js';
 import { CANVAS_EXTENSIONS } from '../../runtime/launch.js';
 import { prepareAdvertisedCommandPersistence, promptWithAdvertisedCommandInvocation, } from '../../runtime/advertised-command-invocation.js';
+import { closeDb, migrate, openDb } from '../../canvas/db.js';
+import { closeScopedStores } from '../../scoped-state/db.js';
+import { initializeFreshScopedStore } from '../../scoped-state/migrate.js';
 // The REAL engine, assembled from broker-sdk's static SDK re-exports — bypasses
 // the CRTR_BROKER_ENGINE seam entirely so these tests can never accidentally hit
 // the fake (the whole point: prove the wiring the mock hid).
@@ -46,7 +49,22 @@ const C5_EXT = join(HERE, 'fixtures', 'c5-command-boundary-ext.ts');
 const priorModelIntent = process.env['CRTR_MODEL_INTENT'];
 const priorNodeCwd = process.env['CRTR_NODE_CWD'];
 const priorProfileId = process.env['CRTR_PROFILE_ID'];
+const priorHome = process.env['HOME'];
+const priorCanvasHome = process.env['CRTR_HOME'];
+const priorAgentDir = process.env['PI_CODING_AGENT_DIR'];
+let home;
+let agentDir;
 before(() => {
+    home = mkdtempSync(join(tmpdir(), 'crtr-sdk-wiring-home-'));
+    agentDir = join(home, '.pi', 'agent');
+    closeDb();
+    closeScopedStores();
+    process.env['HOME'] = home;
+    process.env['CRTR_HOME'] = join(home, '.crouter', 'canvas');
+    process.env['PI_CODING_AGENT_DIR'] = agentDir;
+    migrate(openDb());
+    initializeFreshScopedStore({ kind: 'user', root: join(home, '.crouter') });
+    initializeFreshScopedStore({ kind: 'provider', root: agentDir });
     // buildBrokerSession normally receives its environment through buildBrokerEnv,
     // which strips the launcher's CRTR_* values before applying the target recipe.
     // These direct SDK tests bypass that boundary, so clear the ambient node's
@@ -56,6 +74,8 @@ before(() => {
     delete process.env['CRTR_PROFILE_ID'];
 });
 after(() => {
+    closeDb();
+    closeScopedStores();
     if (priorModelIntent === undefined)
         delete process.env['CRTR_MODEL_INTENT'];
     else
@@ -68,6 +88,19 @@ after(() => {
         delete process.env['CRTR_PROFILE_ID'];
     else
         process.env['CRTR_PROFILE_ID'] = priorProfileId;
+    if (priorHome === undefined)
+        delete process.env['HOME'];
+    else
+        process.env['HOME'] = priorHome;
+    if (priorCanvasHome === undefined)
+        delete process.env['CRTR_HOME'];
+    else
+        process.env['CRTR_HOME'] = priorCanvasHome;
+    if (priorAgentDir === undefined)
+        delete process.env['PI_CODING_AGENT_DIR'];
+    else
+        process.env['PI_CODING_AGENT_DIR'] = priorAgentDir;
+    rmSync(home, { recursive: true, force: true });
 });
 function brokerExts() {
     return [...CANVAS_EXTENSIONS, C3_EXT];
@@ -157,10 +190,19 @@ test('C3c — mandatory canvas extensions must be loaded, not merely passed in a
 function runIsolatedManagedLaunch(pool) {
     const home = mkdtempSync(join(tmpdir(), 'crtr-c3-managed-home-'));
     const cwd = mkdtempSync(join(tmpdir(), 'crtr-c3-managed-cwd-'));
+    const canvasHome = join(home, '.crouter', 'canvas');
+    const agentDir = join(home, '.pi', 'agent');
     const script = `
+    process.env.CRTR_HOME = ${JSON.stringify(canvasHome)};
+    process.env.PI_CODING_AGENT_DIR = ${JSON.stringify(agentDir)};
     const { createAgentSessionServices, createAgentSessionFromServices, SessionManager, VERSION } = await import(${JSON.stringify(new URL('../../runtime/broker-sdk.ts', import.meta.url).href)});
     const { buildBrokerSession } = await import(${JSON.stringify(new URL('../../runtime/broker.ts', import.meta.url).href)});
+    const { migrate, openDb } = await import(${JSON.stringify(new URL('../../canvas/db.ts', import.meta.url).href)});
+    const { initializeFreshScopedStore } = await import(${JSON.stringify(new URL('../../scoped-state/migrate.ts', import.meta.url).href)});
     const { writeSubscriptionPool } = await import(${JSON.stringify(new URL('../../subscription-state.ts', import.meta.url).href)});
+    migrate(openDb());
+    initializeFreshScopedStore({ kind: 'user', root: ${JSON.stringify(join(home, '.crouter'))} });
+    initializeFreshScopedStore({ kind: 'provider', root: ${JSON.stringify(agentDir)} });
     await writeSubscriptionPool('anthropic', ${JSON.stringify(pool)});
     const realEngine = { createAgentSessionServices, createAgentSessionFromServices, SessionManager, VERSION };
     const engine = {

package/dist/core/__tests__/integration/broker-snapshot-history.test.js

@@ -23,7 +23,7 @@
 // SIMULATES pi's retry slice by popping the last assistant off the live
 // `agent.state.messages` (leaving the persisted tree intact), and asserts the
 // snapshot follows the persisted history, not the sliced live array.
-import { test } from 'node:test';
+import { afterEach, beforeEach, test } from 'node:test';
 import assert from 'node:assert/strict';
 import { mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
@@ -33,7 +33,10 @@ import { createAgentSessionServices, createAgentSessionFromServices, SessionMana
 import { CANVAS_EXTENSIONS } from '../../runtime/launch.js';
 import { buildBrokerSession, snapshotMessages } from '../../runtime/broker.js';
 import { createNode } from '../../canvas/canvas.js';
-import { closeDb } from '../../canvas/db.js';
+import { closeDb, migrate, openDb } from '../../canvas/db.js';
+import { resetSession } from '../../canvas/sessions.js';
+import { closeScopedStores } from '../../scoped-state/db.js';
+import { initializeFreshScopedStore } from '../../scoped-state/migrate.js';
 import { readNodeMessagesPage, transcriptMarkdown } from '../../runtime/node-read.js';
 // M-9 (broker.ts fault-and-die model gate): a boot with no cfg.model now calls
 // the REAL SDK's modelRegistry.getAvailable() and faults if it's empty, which it
@@ -49,6 +52,40 @@ const realEngine = {
     SessionManager,
     VERSION,
 };
+let home;
+let agentDir;
+const previousHome = process.env['HOME'];
+const previousCanvasHome = process.env['CRTR_HOME'];
+const previousAgentDir = process.env['PI_CODING_AGENT_DIR'];
+beforeEach(() => {
+    home = mkdtempSync(join(tmpdir(), 'crtr-snaphist-home-'));
+    agentDir = join(home, '.pi', 'agent');
+    closeDb();
+    closeScopedStores();
+    process.env['HOME'] = home;
+    process.env['CRTR_HOME'] = join(home, '.crouter', 'canvas');
+    process.env['PI_CODING_AGENT_DIR'] = agentDir;
+    migrate(openDb());
+    initializeFreshScopedStore({ kind: 'user', root: join(home, '.crouter') });
+    initializeFreshScopedStore({ kind: 'provider', root: agentDir });
+});
+afterEach(() => {
+    closeDb();
+    closeScopedStores();
+    if (previousHome === undefined)
+        delete process.env['HOME'];
+    else
+        process.env['HOME'] = previousHome;
+    if (previousCanvasHome === undefined)
+        delete process.env['CRTR_HOME'];
+    else
+        process.env['CRTR_HOME'] = previousCanvasHome;
+    if (previousAgentDir === undefined)
+        delete process.env['PI_CODING_AGENT_DIR'];
+    else
+        process.env['PI_CODING_AGENT_DIR'] = previousAgentDir;
+    rmSync(home, { recursive: true, force: true });
+});
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function userMsg(text) {
     return { role: 'user', content: [{ type: 'text', text }] };
@@ -129,11 +166,7 @@ test('broker welcome snapshot serves the persisted history, not pi\u2019s sliced
     }
 });
 test('readNodeMessagesPage keeps a tool call with all following tool results across cursor pages', async () => {
-    const home = mkdtempSync(join(tmpdir(), 'crtr-page-tools-home-'));
     const sessionCwd = mkdtempSync(join(tmpdir(), 'crtr-page-tools-session-'));
-    const prevHome = process.env['CRTR_HOME'];
-    process.env['CRTR_HOME'] = home;
-    closeDb();
     try {
         const seed = SessionManager.create(sessionCwd);
         seed.appendMessage(userMsg('before the tool run'));
@@ -161,6 +194,7 @@ test('readNodeMessagesPage keeps a tool call with all following tool results acr
             status: 'active',
             pi_session_file: sessionFile,
         });
+        resetSession(nodeId, { sessionId: seed.getSessionId(), transcriptPath: sessionFile });
         const newest = await readNodeMessagesPage(nodeId, { limit: 3 });
         assert.equal(newest.messages[0].role, 'assistant', 'the page walks back from the tool-result cut to its call');
         assert.deepEqual(newest.messages.slice(1, 3).map((message) => message.role), ['toolResult', 'toolResult'], 'all tool results share the page with their call');
@@ -171,11 +205,6 @@ test('readNodeMessagesPage keeps a tool call with all following tool results acr
         assert.deepEqual([...(older.messageIds ?? []), ...(newest.messageIds ?? [])], SessionManager.open(sessionFile).getEntries().map(({ id }) => id), 'stable ids remain aligned across the widened page boundary');
     }
     finally {
-        closeDb();
-        process.env['CRTR_HOME'] = prevHome;
-        if (prevHome === undefined)
-            delete process.env['CRTR_HOME'];
-        rmSync(home, { recursive: true, force: true });
         rmSync(sessionCwd, { recursive: true, force: true });
     }
 });
@@ -187,11 +216,7 @@ test('readNodeMessagesPage keeps a tool call with all following tool results acr
 // carve-out — while leaving the raw, verbatim human turn (including a literal
 // `/dev`-shaped token that resembles a memory reference) completely untouched.
 test('transcriptMarkdown keeps verbatim user text while excluding display:false custom messages', async () => {
-    const home = mkdtempSync(join(tmpdir(), 'crtr-transcript-home-'));
     const sessionCwd = mkdtempSync(join(tmpdir(), 'crtr-transcript-session-'));
-    const prevHome = process.env['CRTR_HOME'];
-    process.env['CRTR_HOME'] = home;
-    closeDb();
     try {
         const seed = SessionManager.create(sessionCwd);
         seed.appendMessage(userMsg('read /dev before starting'));
@@ -220,17 +245,13 @@ test('transcriptMarkdown keeps verbatim user text while excluding display:false
             status: 'active',
             pi_session_file: sessionFile,
         });
+        resetSession(nodeId, { sessionId: seed.getSessionId(), transcriptPath: sessionFile });
         const markdown = await transcriptMarkdown(nodeId);
         assert.ok(markdown.includes('read /dev before starting'), 'raw human text (including the literal /dev token) remains verbatim');
         assert.ok(markdown.includes('acknowledged'), 'ordinary assistant turn still renders');
         assert.ok(!markdown.includes('hidden guidance the human never typed'), 'display:false custom content is excluded from the transcript');
     }
     finally {
-        closeDb();
-        process.env['CRTR_HOME'] = prevHome;
-        if (prevHome === undefined)
-            delete process.env['CRTR_HOME'];
-        rmSync(home, { recursive: true, force: true });
         rmSync(sessionCwd, { recursive: true, force: true });
     }
 });
@@ -238,11 +259,7 @@ test('transcriptMarkdown keeps verbatim user text while excluding display:false
 // decide whether content is empty, never to alter the emitted bytes of
 // nonempty human text (leading/trailing whitespace included).
 test('transcriptMarkdown emits nonempty human text with leading/trailing whitespace unchanged', async () => {
-    const home = mkdtempSync(join(tmpdir(), 'crtr-transcript-home-'));
     const sessionCwd = mkdtempSync(join(tmpdir(), 'crtr-transcript-session-'));
-    const prevHome = process.env['CRTR_HOME'];
-    process.env['CRTR_HOME'] = home;
-    closeDb();
     try {
         const seed = SessionManager.create(sessionCwd);
         seed.appendMessage(userMsg('  read /dev before starting  '));
@@ -261,15 +278,11 @@ test('transcriptMarkdown emits nonempty human text with leading/trailing whitesp
             status: 'active',
             pi_session_file: sessionFile,
         });
+        resetSession(nodeId, { sessionId: seed.getSessionId(), transcriptPath: sessionFile });
         const markdown = await transcriptMarkdown(nodeId);
         assert.ok(markdown.includes('  read /dev before starting  \n'), 'human text keeps its leading/trailing whitespace byte-identical');
     }
     finally {
-        closeDb();
-        process.env['CRTR_HOME'] = prevHome;
-        if (prevHome === undefined)
-            delete process.env['CRTR_HOME'];
-        rmSync(home, { recursive: true, force: true });
         rmSync(sessionCwd, { recursive: true, force: true });
     }
 });

package/dist/core/__tests__/integration/broker-wedge-supervision.test.js

@@ -1,39 +1,41 @@
 // Run with: npm run test:integration
 //
-// Regression coverage for #938/#1081. The busy marker survives an interrupted
-// turn for recovery, but supervision must only treat a marker written after the
-// current broker launch as that broker's progress clock. The daemon also must
-// revalidate that clock after asynchronous ps sampling and report a failed
-// SIGTERM honestly.
+// Regression coverage for #938/#1081. Supervision only trusts progress from the
+// current execution, revalidates it after asynchronous ps sampling, and reports
+// a failed SIGTERM honestly.
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import { readFileSync, utimesSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { createHeadlessHarness } from '../helpers/harness.js';
-import { getRow, recordLaunch, recordPid, subscribe } from '../../canvas/canvas.js';
-import { jobDir } from '../../canvas/paths.js';
-import { markBusy } from '../../runtime/busy.js';
+import { listNodes, recordLaunch, subscribe } from '../../canvas/index.js';
+import { openDb } from '../../canvas/db.js';
+import { beginExecution, abortExecution, recordExecutionPid } from '../../canvas/executions.js';
+import { openTurn, recordTurnProgress } from '../../canvas/recovery.js';
 import { BrokerSupervisionReconciler, WEDGE_QUIET_MS } from '../../../daemon/reconcilers/broker-supervision.js';
-const T0 = 20_000_000;
-function setBusyAt(id, at) {
-    markBusy(id);
-    utimesSync(join(jobDir(id), 'busy'), at / 1_000, at / 1_000);
-}
 function context(h, id) {
     return {
-        rows: [getRow(id)],
+        rows: listNodes().filter((row) => row.node_id === id),
         fleet: h.fleet,
         lifecycle: { acceptsDetachedWork: () => false, registerDetached: () => { } },
     };
 }
-test('wedge supervision discards a busy marker refreshed while ps sampling', async () => {
+function startBusyExecution(h, id) {
+    recordLaunch(id, new Date().toISOString());
+    const executionId = beginExecution(id, { daemonEpoch: h.fleet.epoch() });
+    recordExecutionPid(executionId, id, process.pid);
+    openTurn(executionId, { reason: 'agent-start' });
+    h.fleet.register(id, { pid: process.pid, exited: new Promise(() => { }) });
+    return executionId;
+}
+test('wedge supervision discards current-execution progress refreshed while ps sampling', async () => {
     const h = await createHeadlessHarness({ sessionPrefix: 'crtr-wedge-sample' });
     try {
         const id = h.fabricateBrokerNode({ status: 'active', pi_session_id: 'wedge-sample' });
-        recordLaunch(id, new Date(T0 - WEDGE_QUIET_MS - 1).toISOString());
-        recordPid(id, process.pid);
-        h.fleet.register(id, { pid: process.pid, exited: new Promise(() => { }) });
-        setBusyAt(id, T0 - WEDGE_QUIET_MS);
+        const executionId = startBusyExecution(h, id);
+        // Ensure the first observation is older than the later progress update even
+        // when both production calls would otherwise share an ISO millisecond.
+        openDb().prepare('UPDATE executions SET turn_progress_at = ? WHERE execution_id = ?').run(new Date(Date.now() - 1).toISOString(), executionId);
         let finishSample;
         const sampled = new Promise((resolve) => { finishSample = resolve; });
         const signals = [];
@@ -41,23 +43,25 @@ test('wedge supervision discards a busy marker refreshed while ps sampling', asy
             readTreeSample: async () => sampled,
             signal: (_pid, signal) => { signals.push(signal); },
         });
-        const running = supervisor.run(T0, context(h, id));
-        setBusyAt(id, T0 - 1);
+        const running = supervisor.run(Date.now() + WEDGE_QUIET_MS + 1, context(h, id));
+        recordTurnProgress(executionId);
         finishSample({ cpuPercent: 0, hasDescendants: false });
         await running;
-        assert.deepEqual(signals, [], 'a marker updated while ps ran cannot produce a wedge SIGTERM');
+        assert.deepEqual(signals, [], 'progress updated while ps ran cannot produce a wedge SIGTERM');
     }
     finally {
         await h.dispose();
     }
 });
-test('wedge supervision does not attribute a predecessor busy marker to a new broker', async () => {
+test('wedge supervision does not attribute a predecessor turn to a new broker', async () => {
     const h = await createHeadlessHarness({ sessionPrefix: 'crtr-wedge-predecessor' });
     try {
         const id = h.fabricateBrokerNode({ status: 'active', pi_session_id: 'wedge-predecessor' });
-        setBusyAt(id, T0 - WEDGE_QUIET_MS - 1);
-        recordLaunch(id, new Date(T0).toISOString());
-        recordPid(id, process.pid);
+        const predecessor = startBusyExecution(h, id);
+        abortExecution(predecessor, { reason: 'test replacement' });
+        h.fleet.forget(id);
+        const replacement = beginExecution(id, { daemonEpoch: h.fleet.epoch() });
+        recordExecutionPid(replacement, id, process.pid);
         h.fleet.register(id, { pid: process.pid, exited: new Promise(() => { }) });
         let samples = 0;
         const supervisor = new BrokerSupervisionReconciler({
@@ -65,10 +69,10 @@ test('wedge supervision does not attribute a predecessor busy marker to a new br
                 samples += 1;
                 return { cpuPercent: 0, hasDescendants: false };
             },
-            signal: () => { throw new Error('a predecessor marker must not reach the signal path'); },
+            signal: () => { throw new Error('a predecessor turn must not reach the signal path'); },
         });
-        await supervisor.run(T0, context(h, id));
-        assert.equal(samples, 0, 'the old marker is not a progress observation for the new broker');
+        await supervisor.run(Date.now() + WEDGE_QUIET_MS + 1, context(h, id));
+        assert.equal(samples, 0, 'the old execution is not a progress observation for the replacement');
     }
     finally {
         await h.dispose();
@@ -80,15 +84,12 @@ test('wedge supervision reports a throwing SIGTERM as an attempted, failed kick'
         const parent = h.fabricateBrokerNode({ status: 'active' });
         const id = h.fabricateBrokerNode({ status: 'active', pi_session_id: 'wedge-signal' });
         subscribe(parent, id);
-        recordLaunch(id, new Date(T0 - WEDGE_QUIET_MS - 1).toISOString());
-        recordPid(id, process.pid);
-        h.fleet.register(id, { pid: process.pid, exited: new Promise(() => { }) });
-        setBusyAt(id, T0 - WEDGE_QUIET_MS);
+        startBusyExecution(h, id);
         const supervisor = new BrokerSupervisionReconciler({
             readTreeSample: async () => ({ cpuPercent: 0, hasDescendants: false }),
             signal: () => { throw new Error('EPERM'); },
         });
-        await supervisor.run(T0, context(h, id));
+        await supervisor.run(Date.now() + WEDGE_QUIET_MS + 1, context(h, id));
         const notice = h.inbox(parent).at(-1);
         assert.match(notice.label, /attempted SIGTERM to the broker, but the signal call failed/);
         assert.equal(notice.data?.['kick_attempted'], true);

package/dist/core/__tests__/integration/command-plugins.test.js

@@ -38,6 +38,9 @@ import { renderRoot, renderBranch, renderLeafArgv } from '../../help.js';
 import { renderResult } from '../../render.js';
 import { CrtrError } from '../../errors.js';
 import { resetScopeCache } from '../../scope.js';
+import { readConfig, updateRawConfigAtomically, writeRawConfig } from '../../config.js';
+import { closeScopedStores } from '../../scoped-state/db.js';
+import { initializeFreshScopedStore } from '../../scoped-state/migrate.js';
 import { createProfile } from '../../profiles/manifest.js';
 import { listInstalledPluginsInRoot } from '../../resolver.js';
 import { pluginShow } from '../../../commands/pkg/plugin-inspect.js';
@@ -198,7 +201,12 @@ function installPlugin(scopeRoot, name, opts = {}) {
         ...(opts.sourceMarketplace !== undefined ? { source_marketplace: opts.sourceMarketplace } : {}),
     };
     if (Object.keys(config).length > 0) {
-        writeFileSync(join(scopeRoot, 'config.json'), JSON.stringify({ plugins: { [name]: config } }));
+        if (scopeRoot === userRoot) {
+            updateRawConfigAtomically('user', (raw) => ({ ...raw, plugins: { ...raw.plugins, [name]: config } }));
+        }
+        else {
+            writeFileSync(join(scopeRoot, 'config.json'), JSON.stringify({ plugins: { [name]: config } }));
+        }
     }
     return root;
 }
@@ -227,7 +235,7 @@ after(() => {
 // after(...[home, ...]) would only see the LAST test's set and leak the rest).
 const tempDirs = [];
 function mintDir(prefix) {
-    const d = mkdtempSync(join(tmpdir(), prefix));
+    const d = realpathSync(mkdtempSync(join(tmpdir(), prefix)));
     tempDirs.push(d);
     return d;
 }
@@ -235,6 +243,7 @@ beforeEach(() => {
     home = mintDir('crtr-cmdplugin-home-');
     process.env['HOME'] = home;
     userRoot = join(home, '.crouter');
+    initializeFreshScopedStore({ kind: 'user', root: userRoot });
     mkdirSync(join(userRoot, 'plugins'), { recursive: true });
     projectDir = mintDir('crtr-cmdplugin-proj-');
     projectRoot = join(projectDir, '.crouter');
@@ -243,6 +252,7 @@ beforeEach(() => {
     resetScopeCache();
 });
 after(() => {
+    closeScopedStores();
     for (const d of tempDirs) {
         try {
             rmSync(d, { recursive: true, force: true });
@@ -743,10 +753,10 @@ describe('lifecycle without restart', () => {
         installPlugin(userRoot, 'deploy-tools');
         assert.equal(discover().length, 1);
         // disable (config edit only — no restart)
-        writeFileSync(join(userRoot, 'config.json'), JSON.stringify({ plugins: { 'deploy-tools': { enabled: false } } }));
+        writeRawConfig('user', { plugins: { 'deploy-tools': { enabled: false } } });
         assert.equal(discover().length, 0);
         // re-enable + edit the declaration (rename the top-level command)
-        writeFileSync(join(userRoot, 'config.json'), JSON.stringify({ plugins: { 'deploy-tools': { enabled: true } } }));
+        writeRawConfig('user', { plugins: { 'deploy-tools': { enabled: true } } });
         writeFileSync(join(userRoot, 'plugins', 'deploy-tools', 'commands.json'), JSON.stringify(commandsJson('deploy')));
         const afterEdit = discover();
         assert.equal(afterEdit.length, 1);
@@ -1046,8 +1056,7 @@ describe('memory corpus gate across the plugin lifecycle', () => {
         return root;
     }
     function userConfig() {
-        const path = join(userRoot, 'config.json');
-        return existsSync(path) ? JSON.parse(readFileSync(path, 'utf8')) : { plugins: {} };
+        return readConfig('user');
     }
     test('a local install migrates the caller-owned linked corpus in place and reports it', async () => {
         const source = pluginSource('memfix');