@north-light/crouter 0.3.289 → 0.3.290

package/dist/commands/push.js

@@ -172,7 +172,7 @@ function makePushLeaf(kind) {
                 ...(kind === 'final'
                     ? [
                         'Marks the node done (status + intent) server-side; its engine shuts down on next stop.',
-                        'When this node owns a clean managed worktree already contained in its local base, the server auto-drops it instead of blocking on `node worktree close`. A clean worktree whose exact branch tip is already on origin may also finalize while retaining its branch and checkout; uncommitted changes or a branch tip not on origin still block with open_managed_worktree.',
+                        'When this node owns a clean managed worktree already contained in its local base, the server auto-drops it instead of blocking on `node worktree close`. A clean worktree whose exact tip exists on any branch on origin may also finalize while retaining its branch and checkout; uncommitted changes or a tip absent from origin still block with open_managed_worktree.',
                     ]
                     : []),
             ],

package/dist/core/worktree.js

@@ -970,18 +970,22 @@ export async function branchIsPushedAtCurrentTip(wt) {
     const initialTip = cleanCurrentBranchTip(wt);
     if (initialTip === null)
         return false;
-    // A cached origin/<branch> can be stale in either direction. Query origin's
-    // branch ref directly and require exact-tip equality: a remote that has an
-    // older commit would still leave newer local work stranded at finalization.
+    // A cached origin branch can be stale in either direction. Query origin's
+    // heads directly and require exact-tip equality: a remote that has an older
+    // commit would still leave newer local work stranded at finalization. The
+    // branch name is deliberately irrelevant because PR workflows publish this
+    // managed checkout's tip under a human-readable branch name.
     // This runs asynchronously with a bounded, non-interactive Git invocation so
     // an unreachable remote never stalls crtrd's event loop.
     const ssh = process.env['GIT_SSH_COMMAND'] ?? process.env['GIT_SSH'] ?? 'ssh';
-    const remote = await gitAsync(['ls-remote', '--exit-code', '--heads', 'origin', `refs/heads/${wt.branch}`], wt.path, undefined, { timeoutMs: 10_000, env: { ...process.env, GIT_TERMINAL_PROMPT: '0', GIT_SSH_COMMAND: `${ssh} -o BatchMode=yes` } });
+    const remote = await gitAsync(['ls-remote', '--exit-code', '--heads', 'origin'], wt.path, undefined, { timeoutMs: 10_000, env: { ...process.env, GIT_TERMINAL_PROMPT: '0', GIT_SSH_COMMAND: `${ssh} -o BatchMode=yes` } });
     if (remote.status !== 0)
         return false;
-    const expectedRef = `refs/heads/${wt.branch}`;
-    const matchingLine = remote.stdout.split('\n').find((line) => line.endsWith(`\t${expectedRef}`));
-    if (matchingLine?.slice(0, matchingLine.indexOf('\t')) !== initialTip)
+    const remotelyPushed = remote.stdout.split('\n').some((line) => {
+        const [sha, ref] = line.split('\t', 2);
+        return sha === initialTip && ref?.startsWith('refs/heads/') === true;
+    });
+    if (!remotelyPushed)
         return false;
     // The remote proof is useful only if the local checkout is still the exact
     // clean tip it inspected when finalization begins.

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

@@ -187,6 +187,34 @@ test('re-homed guard: `crtr push final` on a node with a managed worktree holdin
         rmSync(repo, { recursive: true, force: true });
     }
 });
+test('`crtr push final` concludes a clean managed worktree whose tip exists on origin only under a different branch name (#912)', async () => {
+    const repo = initRepo();
+    const remote = mkdtempSync(join(tmpdir(), 'crtr-leafparity-remote-'));
+    try {
+        git(['init', '--bare'], remote);
+        git(['remote', 'add', 'origin', remote], repo);
+        git(['push', '-u', 'origin', 'main'], repo);
+        const id = 'wt-912-differently-named-remote-branch';
+        const wt = createManagedWorktree(repo, id);
+        writeFileSync(join(wt.path, 'delivered-via-pr.txt'), 'delivered via a PR branch\n');
+        git(['add', '.'], wt.path);
+        git(['commit', '-m', 'delivered via differently named branch'], wt.path);
+        const tip = gitSync(['rev-parse', 'HEAD'], wt.path).stdout.trim();
+        const remoteBranch = 'fix/issue-912-worktree-final';
+        git(['push', 'origin', `HEAD:refs/heads/${remoteBranch}`], wt.path);
+        assert.equal(gitSync(['ls-remote', '--exit-code', '--heads', 'origin', `refs/heads/${wt.branch}`], wt.path).status, 2, 'the recorded crtr branch is absent from origin');
+        assert.equal(gitSync(['ls-remote', '--exit-code', '--heads', 'origin', `refs/heads/${remoteBranch}`], wt.path).stdout.split('\t')[0], tip, 'origin carries the exact tip under the PR branch name');
+        createNode(worktreeNode(id, wt.path, wt));
+        const out = await runPushAs(id, 'final', 'delivered through a differently named PR branch');
+        assert.equal(out['worktree_auto_dropped'], undefined, 'the remote-tip allowance retains the open worktree');
+        assert.equal(getNode(id)?.managed_worktree?.state, 'open', 'the remote-tip allowance does not close the worktree');
+        assert.equal(getNode(id)?.status, 'done', 'the node finalizes when origin carries its exact tip under the PR branch name');
+    }
+    finally {
+        rmSync(repo, { recursive: true, force: true });
+        rmSync(remote, { recursive: true, force: true });
+    }
+});
 test('auto-drop: `crtr push final` on a node with a CLEAN, zero-commit managed worktree auto-drops it server-side, surfaces worktree_auto_dropped(+path) on the leaf output, and finalizes normally', async () => {
     const repo = initRepo();
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.289",
+  "version": "0.3.290",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",
@@ -94,7 +94,7 @@
     "test": "CRTR_NO_DAEMON_AUTOSTART=1 node --conditions=crtr-src --import tsx/esm --import ./scripts/test-env-scrub.mjs --test --test-force-exit --test-concurrency=$(node -p 'Math.max(4, require(`node:os`).availableParallelism() - 1)') --test-timeout=10000 'src/**/__tests__/*.test.ts'",
     "test:integration": "CRTR_NO_DAEMON_AUTOSTART=1 node --conditions=crtr-src --import tsx/esm --import ./scripts/test-env-scrub.mjs --test --test-concurrency=$(node -p 'Math.min(8, Math.max(2, require(`node:os`).availableParallelism() - 1))') --test-timeout=60000 'src/**/__tests__/integration/*.test.ts'",
     "test:seam": "npm run build && npm run test:seam:built",
-    "test:seam:built": "CRTR_NO_DAEMON_AUTOSTART=1 node --import ./scripts/test-env-scrub.mjs --test --test-concurrency=4 --test-timeout=180000 'dist/**/__tests__/seam/*.test.js'",
+    "test:seam:built": "CRTR_NO_DAEMON_AUTOSTART=1 node --import ./scripts/test-env-scrub.mjs --test --test-concurrency=$(node -p 'Math.min(4, Math.max(2, require(`node:os`).availableParallelism() - 2))') --test-timeout=180000 'dist/**/__tests__/seam/*.test.js'",
     "test:all": "npm test && npm run test:integration && npm run test:seam"
   },
   "overrides": {

package/runtime.lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.289",
+  "version": "0.3.290",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.289",
+      "version": "0.3.290",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
@@ -4244,17 +4244,17 @@
     },
     "packages/crouter-api": {
       "name": "@north-light/crouter-api",
-      "version": "0.3.289",
+      "version": "0.3.290",
       "license": "UNLICENSED"
     },
     "packages/crouter-env-docker": {
       "name": "@north-light/crouter-env-docker",
-      "version": "0.3.289",
+      "version": "0.3.290",
       "license": "UNLICENSED"
     },
     "packages/crouter-sdk": {
       "name": "@north-light/crouter-sdk",
-      "version": "0.3.289",
+      "version": "0.3.290",
       "license": "UNLICENSED",
       "dependencies": {
         "@north-light/crouter-api": "*"