@north-light/crouter 0.3.274 → 0.3.276

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

@@ -9,7 +9,7 @@ import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import { getNode } from '../../../core/canvas/canvas.js';
 import { push, FinalizationError } from '../../../core/feed/feed.js';
-import { autoDropCleanManagedWorktree, hasOpenManagedWorktree, missingWorktreeRecoveryHint } from '../../../core/worktree.js';
+import { autoDropCleanManagedWorktree, branchIsPushedAtCurrentTip, hasOpenManagedWorktree, missingWorktreeRecoveryHint } from '../../../core/worktree.js';
 import { reportsDir } from '../../../core/canvas/paths.js';
 import { notFound, usage } from '../../../core/errors.js';
 import { InputError } from '../../../core/io.js';
@@ -51,14 +51,19 @@ async function handlePush(ctx) {
     // `final` with an OPEN managed worktree, BEFORE the push/transition (spec
     // §6.2 — worktree fs ops are server-side). A provably-clean, zero-commit
     // worktree is auto-dropped so a read-only or already-landed node
-    // can finish without an explicit `node worktree close`; any real unlanded
-    // work instead blocks with the parity `open_managed_worktree` error,
+    // can finish without an explicit `node worktree close`; a clean worktree
+    // whose exact tip is already on origin can also finish while retaining its
+    // branch and checkout. Any work that is neither locally landed nor remotely
+    // retained instead blocks with the parity `open_managed_worktree` error,
     // round-tripped via CrtrError.details so the CLI renders the same InputError
     // (next-hint included) it surfaced before B-5 re-homed this to the server.
     let autoDroppedPath;
     if (req.tier === 'final' && hasOpenManagedWorktree(getNode(id))) {
         const dropped = autoDropCleanManagedWorktree(id);
-        if (dropped === null) {
+        if (dropped !== null) {
+            autoDroppedPath = dropped.worktree_path;
+        }
+        else if (!(await branchIsPushedAtCurrentTip(getNode(id).managed_worktree))) {
             // Thrown as InputError so `toErrorBody` round-trips the FULL structured
             // payload (code + message + next) into `ApiError.details`, and the CLI's
             // shared `apiErrorToCliError` reconstructs it byte-for-byte — no
@@ -70,11 +75,10 @@ async function handlePush(ctx) {
                     const wt = getNode(id)?.managed_worktree;
                     return wt !== null && wt !== undefined && wt.state === 'open' && !existsSync(wt.path)
                         ? missingWorktreeRecoveryHint(wt)
-                        : 'Commit the remaining work in the worktree, run `crtr node worktree close`, then rerun `crtr push final`.';
+                        : 'Commit the remaining work in the worktree, push its branch to origin at its current tip, then rerun `crtr push final`; or run `crtr node worktree close` to land it locally.';
                 })(),
             });
         }
-        autoDroppedPath = dropped.worktree_path;
     }
     const result = await pushOrRethrow(id, req);
     const transitioned = req.tier === 'final' && before !== undefined
@@ -100,7 +104,7 @@ async function pushOrRethrow(id, req) {
             throw new InputError({
                 error: 'already_finalized',
                 message: 'This node already submitted its canonical final result.',
-                next: 'Do not push another final from this node.',
+                next: 'Push an update with the new information, then stop.',
             });
         }
         if (err instanceof FinalizationError && err.code === 'finalization_forbidden') {

package/dist/types.d.ts

@@ -97,7 +97,7 @@ export interface PluginManifest {
     commands?: string;
     /** Plugin-root-relative path to a declarative hook manifest (`hooks.json`).
      *  Must be declared together with `hookExecutable`; hooks are trusted local
-     *  code and are unavailable to endpoint archive plugins. */
+     *  code. */
     hooks?: string;
     /** Plugin-root-relative executable that dispatches declarations in `hooks`.
      *  Must be a regular file with a POSIX executable permission bit. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.274",
+  "version": "0.3.276",
   "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.274",
+  "version": "0.3.276",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.274",
+      "version": "0.3.276",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {