@north-light/crouter 0.3.304 → 0.3.306

package/dist/daemon/api/__tests__/seam/leaf-api-parity.test.js

@@ -19,7 +19,7 @@
 // in-process server exactly as a real `crtr push` CLI process would.
 import { test, before, after } from 'node:test';
 import assert from 'node:assert/strict';
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { createHeadlessHarness } from '../../../../core/__tests__/helpers/harness.js';
@@ -87,16 +87,19 @@ async function runPushAs(caller, tier, body, input = {}) {
     }
 }
 // The `node worktree close` leaf, resolved from the real command tree exactly as
-// the CLI dispatcher would, and driven as the given caller node.
-async function runCloseAs(caller) {
+// the CLI dispatcher would.
+function closeLeaf() {
     const worktree = registerNode().children.find((c) => c.name === 'worktree');
     assert.ok(worktree !== undefined && worktree.kind === 'branch', 'node worktree branch resolves');
     const close = worktree.children.find((c) => c.name === 'close');
     assert.ok(close !== undefined && close.kind === 'leaf', 'node worktree close leaf resolves');
+    return close;
+}
+async function runCloseAs(caller) {
     const prev = process.env['CRTR_NODE_ID'];
     process.env['CRTR_NODE_ID'] = caller;
     try {
-        return (await close.run({}));
+        return (await closeLeaf().run({}));
     }
     finally {
         if (prev === undefined)
@@ -300,6 +303,35 @@ test('`crtr push final` keeps an absent managed worktree open when its branch is
         rmSync(repo, { recursive: true, force: true });
     }
 });
+test('`crtr node worktree close` warns with the retained stash SHA when base-checkout changes conflict (#1066)', async () => {
+    const repo = initRepo();
+    try {
+        writeFileSync(join(repo, 'conflict.txt'), 'base\n');
+        writeFileSync(join(repo, 'disjoint.txt'), 'base\n');
+        git(['add', '.'], repo);
+        git(['commit', '-m', 'tracked base files'], repo);
+        const id = 'wt-close-stash-warning';
+        const wt = createManagedWorktree(repo, id);
+        createNode(worktreeNode(id, wt.path, wt));
+        writeFileSync(join(wt.path, 'conflict.txt'), 'child\n');
+        git(['add', 'conflict.txt'], wt.path);
+        git(['commit', '-m', 'child conflict'], wt.path);
+        writeFileSync(join(repo, 'conflict.txt'), 'base live edit\n');
+        writeFileSync(join(repo, 'disjoint.txt'), 'disjoint live edit\n');
+        const out = await runCloseAs(id);
+        const stashSha = gitSync(['rev-parse', 'refs/stash'], repo).stdout.trim();
+        const rendered = closeLeaf().render?.(out) ?? '';
+        assert.match(out['base_checkout_stash'], new RegExp(`stash ${stashSha}`), 'the API result identifies the exact retained stash');
+        assert.match(rendered, new RegExp(`stash ${stashSha}`), 'the CLI output identifies the exact retained stash');
+        assert.match(rendered, new RegExp(`git -C '${realpathSync(repo)}' stash apply ${stashSha}`), 'the CLI output gives the exact recovery command');
+        assert.match(rendered, /shared base checkout was reset to landed commit/, 'the CLI output states that the shared checkout was reset');
+        assert.doesNotMatch(rendered, /nothing was lost/i, 'the CLI does not claim all concurrent work was preserved');
+        assert.equal(readFileSync(join(repo, 'disjoint.txt'), 'utf8'), 'base\n', 'the reset removes the disjoint live edit from the checkout but leaves it in the reported stash');
+    }
+    finally {
+        rmSync(repo, { recursive: true, force: true });
+    }
+});
 // `node worktree close` error parity — the SPECIFIC WorktreeError code + its
 // `next` remediation round-trip verbatim through the server → ApiError → the
 // bespoke CLI mapper in node-worktree.ts, instead of collapsing to a generic

package/dist/daemon/api/handlers/messages.js

@@ -1,6 +1,7 @@
 // Message handler (spec §6.2). `POST /v1/nodes/{id}/messages` delivers an
 // inbox message now (201) or fresh-revives with no inbox entry. `{id}` is the
 // target node.
+import { join } from 'node:path';
 import { appendInbox, cancelPendingHumanMessages } from '../../../core/feed/inbox.js';
 import { reviveNode } from '../../../core/runtime/revive.js';
 import { BrokerUnreachableError } from '../../../core/runtime/broker-request.js';
@@ -8,9 +9,10 @@ import { isBrokerLive } from '../../../core/runtime/model-swap.js';
 import { deliverLive, interruptLive } from '../../../core/runtime/interactive-deliver.js';
 import { isProfilePaused } from '../../../core/profiles/manifest.js';
 import { getNode, withFreshTerminalGuard } from '../../../core/canvas/canvas.js';
+import { reportsDir } from '../../../core/canvas/paths.js';
 import { withCanvasWrite } from '../../../core/canvas/db.js';
 import { cancelCronsOnWake } from '../../../core/canvas/crons.js';
-import { assertNotFinalized, assertFinalizedForReopen, commitReopen, commitReopenResident, } from '../../../core/runtime/reopen.js';
+import { assertNotFinalized, assertFinalizedForReopen, commitReopenResident, } from '../../../core/runtime/reopen.js';
 import { writeOutputSchema } from '../../../core/runtime/structured-output.js';
 import { appendSituationalContext, formatSituationalProse } from '../../../core/runtime/situational-context.js';
 import { formatDataCard } from '../../../shared/generated-context.js';
@@ -162,6 +164,12 @@ function parseSchema(raw) {
 function label(text) {
     return text.split('\n')[0].slice(0, 120);
 }
+function previousFinalReportCard(nodeId, finalReport) {
+    if (finalReport === null)
+        return '';
+    const path = join(reportsDir(nodeId), finalReport);
+    return formatDataCard('reopen-final-report', { path }, 'This node previously completed work. Read this final report before acting on the new instruction.');
+}
 /** The fail-loud rejection for a deferred immediate message aimed at a
  *  target with no natural cycle ahead of it (done/canceled/finalized). Thrown as
  *  an InputError so `toErrorBody` round-trips the FULL structured payload
@@ -212,7 +220,7 @@ async function handleMessage(ctx) {
         ? parseSchema(req.output_schema)
         : null;
     // Fresh revive: no inbox entry, resume:false (spec §7.7).
-    // Mirrors the CLI's immediate --fresh: validate/clear the finalization latch
+    // Mirrors the CLI's immediate --fresh: validate the finalization latch
     // (--reopen) and upsert the situational sidecar BEFORE the revive, so the
     // fresh kickoff picks up the update. The goal/roadmap recoverable-state guard
     // stays a pure CLI-side pre-check.
@@ -224,7 +232,7 @@ async function handleMessage(ctx) {
         if (hasSidecar)
             appendSituationalContext(id, sidecar);
         if (req.reopen)
-            commitReopen(id, expectedFinalReport);
+            commitReopenResident(id, expectedFinalReport);
         // A fresh revive appends no inbox entry, so nothing survives a freeze for
         // the daemon to act on later: at the cap the caller is told, not ignored.
         const result = await reviveNode(id, { resume: false, capacity: 'refuse' });
@@ -243,8 +251,9 @@ async function handleMessage(ctx) {
     // An interactive reopen commits before even choosing its engine-or-inbox
     // route. A live transport race then falls back with this same committed state.
     let reopenCommitted = false;
+    let previousFinalCard = '';
     if (req.delivery === 'interactive' && req.reopen) {
-        commitReopenResident(id);
+        previousFinalCard = previousFinalReportCard(id, commitReopenResident(id));
         reopenCommitted = true;
     }
     // --- Interactive delivery: route via the LIVE broker's serialized frame
@@ -258,7 +267,11 @@ async function handleMessage(ctx) {
             if (hasSidecar)
                 appendSituationalContext(id, sidecar);
             await deliverLive(id, req.body, {
-                cards: [...(hasSidecar ? [sidecar] : []), ...oneShotCards],
+                cards: [
+                    ...(previousFinalCard === '' ? [] : [previousFinalCard]),
+                    ...(hasSidecar ? [sidecar] : []),
+                    ...oneShotCards,
+                ],
                 // Same authorship the durable route would record for this send, so a
                 // reader cannot tell live from inbox delivery by the stamp.
                 origin: from === 'human'
@@ -295,9 +308,13 @@ async function handleMessage(ctx) {
         if (hasSidecar)
             appendSituationalContext(id, sidecar);
         if (req.reopen && !reopenCommitted) {
-            commitReopenResident(id);
+            previousFinalCard = previousFinalReportCard(id, commitReopenResident(id));
         }
-        const cards = oneShotCards.length > 0 ? { cards: oneShotCards } : {};
+        const cards = [
+            ...(previousFinalCard === '' ? [] : [previousFinalCard]),
+            ...oneShotCards,
+        ];
+        const cardData = cards.length > 0 ? { cards } : {};
         if (hasBody || schema !== null) {
             const messageBody = hasBody
                 ? req.body
@@ -307,7 +324,7 @@ async function handleMessage(ctx) {
                 tier,
                 kind: 'message',
                 label: label(messageBody),
-                data: { body: messageBody, ...(hasSidecar ? { situational: true } : {}), ...cards },
+                data: { body: messageBody, ...(hasSidecar ? { situational: true } : {}), ...cardData },
             });
         }
         // Context-only: a hidden wake marker excluded from the visible digest. Its
@@ -318,7 +335,7 @@ async function handleMessage(ctx) {
             tier,
             kind: 'message',
             label: hasSidecar ? '(ambient context updated)' : '(context delivered)',
-            data: { ...(hasSidecar ? { situational: true } : {}), situationalOnly: true, ...cards },
+            data: { ...(hasSidecar ? { situational: true } : {}), situationalOnly: true, ...cardData },
         });
     };
     // Deferred guard: a done/canceled/finalized target has no natural

package/dist/daemon/reconcilers/broker-supervision.js

@@ -573,6 +573,14 @@ export class BrokerSupervisionReconciler {
         const name = meta !== null ? fullName(meta) : id;
         const isAuth = fault.kind === 'auth';
         const firstLine = (fault.message.split('\n')[0] ?? '').slice(0, 200);
+        const providerError = fault.providerError;
+        const providerDetail = providerError === undefined
+            ? ''
+            : ` Provider: ${providerError.provider}/${providerError.model}.` +
+                (providerError.status === undefined ? '' : ` HTTP status: ${providerError.status}.`) +
+                (providerError.errno === undefined ? '' : ` Errno: ${providerError.errno}.`) +
+                (providerError.code === undefined ? '' : ` Code: ${providerError.code}.`) +
+                (providerError.body === undefined ? '' : ` Body: ${providerError.body.slice(0, 200)}.`);
         const terminalOverflow = fault.kind === 'context-overflow';
         const label = terminalOverflow
             ? `Child failed — ${name} (${id}) exceeded its model context window and is now dead. ` +
@@ -582,7 +590,7 @@ export class BrokerSupervisionReconciler {
                 (isAuth
                     ? `Its provider credential is dead — re-authenticate (\`/login\`, or re-auth crtr); the child recovers on its next wake once the auth reloads. `
                     : ``) +
-                `Error: ${firstLine}`;
+                `Error: ${firstLine}.${providerDetail}`;
         if (terminalOverflow) {
             try {
                 transition(id, 'crash', {
@@ -618,6 +626,7 @@ export class BrokerSupervisionReconciler {
             child: id,
             kind: fault.kind,
             message: firstLine,
+            ...(providerError === undefined ? {} : { provider_error: providerError }),
         });
     }
     async handleAuthReload(fleet) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.304",
+  "version": "0.3.306",
   "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.304",
+  "version": "0.3.306",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.304",
+      "version": "0.3.306",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
@@ -5206,17 +5206,17 @@
     },
     "packages/crouter-api": {
       "name": "@north-light/crouter-api",
-      "version": "0.3.304",
+      "version": "0.3.306",
       "license": "UNLICENSED"
     },
     "packages/crouter-env-docker": {
       "name": "@north-light/crouter-env-docker",
-      "version": "0.3.304",
+      "version": "0.3.306",
       "license": "UNLICENSED"
     },
     "packages/crouter-sdk": {
       "name": "@north-light/crouter-sdk",
-      "version": "0.3.304",
+      "version": "0.3.306",
       "license": "UNLICENSED",
       "dependencies": {
         "@north-light/crouter-api": "^0.3.295"