@north-light/crouter 0.3.301 → 0.3.302

package/dist/core/worktree.js

@@ -954,12 +954,9 @@ export function autoDropCleanManagedWorktreeLocked(nodeId, wt, proof) {
  *  `open_managed_worktree` guard then still applies unchanged — real
  *  commits, real uncommitted changes, and a lost race all require the
  *  explicit path. */
-function cleanCurrentBranchTip(wt) {
+function cleanCurrentCheckoutTip(wt) {
     if (wt.state !== 'open' || !existsSync(wt.path) || isRebaseInProgress(wt.path))
         return null;
-    const branch = gitSync(['rev-parse', '--abbrev-ref', 'HEAD'], wt.path);
-    if (branch.status !== 0 || branch.stdout.trim() !== wt.branch)
-        return null;
     const status = gitSync(['status', '--porcelain'], wt.path);
     if (status.status !== 0 || status.stdout.trim() !== '')
         return null;
@@ -967,7 +964,7 @@ function cleanCurrentBranchTip(wt) {
     return head.status === 0 ? head.stdout.trim() : null;
 }
 export async function branchIsPushedAtCurrentTip(wt) {
-    const initialTip = cleanCurrentBranchTip(wt);
+    const initialTip = cleanCurrentCheckoutTip(wt);
     if (initialTip === null)
         return false;
     // A cached origin branch can be stale in either direction. Query origin's
@@ -989,7 +986,7 @@ export async function branchIsPushedAtCurrentTip(wt) {
         return false;
     // The remote proof is useful only if the local checkout is still the exact
     // clean tip it inspected when finalization begins.
-    return cleanCurrentBranchTip(wt) === initialTip;
+    return cleanCurrentCheckoutTip(wt) === initialTip;
 }
 export function autoDropCleanManagedWorktree(nodeId) {
     const wt = openManagedWorktreeForNode(nodeId);

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

@@ -29,7 +29,7 @@ import { CrtrClient } from '../../../../api/index.js';
 import { registerPush } from '../../../../commands/push.js';
 import { registerNode } from '../../../../commands/node.js';
 import { createNode, getNode } from '../../../../core/canvas/canvas.js';
-import { createManagedWorktree } from '../../../../core/worktree.js';
+import { branchIsPushedAtCurrentTip, createManagedWorktree } from '../../../../core/worktree.js';
 import { readInboxSince } from '../../../../core/feed/inbox.js';
 import { gitSync } from '../../../../core/git.js';
 import { InputError } from '../../../../core/io.js';
@@ -187,28 +187,38 @@ 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 () => {
+test('`crtr push final` retains a clean managed worktree checked out on a pushed PR branch (#1109, #1061)', 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 id = 'wt-pushed-pr-branch-final';
         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);
+        git(['commit', '-m', 'delivered via PR 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');
+        const prBranch = 'fix/pushed-pr-worktree-final';
+        git(['switch', '-c', prBranch], wt.path);
+        git(['push', 'origin', `HEAD:refs/heads/${wt.branch}`], wt.path);
+        git(['push', 'origin', `HEAD:refs/heads/${prBranch}`], wt.path);
+        assert.equal(gitSync(['rev-parse', `refs/heads/${wt.branch}`], wt.path).stdout.trim(), tip, 'the recorded branch remains at the checkout tip');
+        assert.equal(gitSync(['rev-parse', '--abbrev-ref', 'HEAD'], wt.path).stdout.trim(), prBranch, 'the checkout uses the PR branch instead of the recorded branch');
+        assert.equal(gitSync(['ls-remote', '--exit-code', '--heads', 'origin', `refs/heads/${wt.branch}`], wt.path).stdout.split('\t')[0], tip, 'origin carries the recorded branch tip');
+        assert.equal(gitSync(['ls-remote', '--exit-code', '--heads', 'origin', `refs/heads/${prBranch}`], wt.path).stdout.split('\t')[0], tip, 'origin carries the PR branch tip');
+        const untracked = join(wt.path, 'generated.uid');
+        writeFileSync(untracked, 'untracked generated file\n');
+        assert.equal(await branchIsPushedAtCurrentTip(wt), false, 'an untracked file still rejects the origin-retention proof');
+        rmSync(untracked);
         createNode(worktreeNode(id, wt.path, wt));
-        const out = await runPushAs(id, 'final', 'delivered through a differently named PR branch');
+        const out = await runPushAs(id, 'final', 'delivered through a 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');
+        assert.equal(getNode(id)?.managed_worktree?.state, 'open', 'the remote-tip allowance does not close the worktree record');
+        assert.equal(getNode(id)?.managed_worktree?.branch, wt.branch, 'the retained record keeps its recorded branch');
+        assert.equal(gitSync(['rev-parse', '--abbrev-ref', 'HEAD'], wt.path).stdout.trim(), prBranch, 'finalization does not change the checked-out PR branch');
+        assert.equal(getNode(id)?.status, 'done', 'the node finalizes when both pushed branches have its exact tip');
     }
     finally {
         rmSync(repo, { recursive: true, force: true });

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

@@ -100,7 +100,7 @@ async function guardFinalWorktree(id) {
     // command-local mapper needed (plan C-5).
     throw new InputError({
         error: 'open_managed_worktree',
-        message: 'This node still owns an open managed worktree — `push final` is blocked until it is closed.',
+        message: 'This node still owns an open managed worktree that is neither clean and locally landed nor clean with its exact tip on origin — `push final` cannot finish.',
         next: (() => {
             const wt = getNode(id)?.managed_worktree;
             return wt !== null && wt !== undefined && wt.state === 'open' && !existsSync(wt.path)

package/dist/daemon/api/map.d.ts

@@ -1,7 +1,7 @@
 import type { ManagedWorktree, NodeMeta, NodeRow, NodeRuntime, SubscriptionRef } from '../../core/canvas/types.js';
 import type { OutcomeDeliveryRecord } from '../../core/canvas/node-outcome-deliveries.js';
 import type { ReviewComment, ReviewCommentEvent, ReviewErrorCode, ReviewRecord, ReviewResult } from '../../core/review/types.js';
-import type { Cron, CronRunRecord } from '../../core/canvas/crons.js';
+import { type Cron, type CronRunRecord } from '../../core/canvas/crons.js';
 import type { ProfileEntry } from '../../core/profiles/manifest.js';
 import type { ReviveResult } from '../../core/runtime/revive.js';
 import type { CloseNodeResult } from '../../core/runtime/close.js';

package/dist/daemon/api/map.js

@@ -12,6 +12,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { outputResultPath } from '../../core/runtime/structured-output.js';
 import { ReviewOperationError as ReviewOperationErrorClass } from '../../core/review/types.js';
+import { cronSinkDisplay } from '../../core/canvas/crons.js';
 import { isProfilePaused, sanitizeProfileMetadata } from '../../core/profiles/manifest.js';
 import { contextDir, inboxPath, nodeDir, nodeMetaPath, reportsDir, reviewResultPath, transcriptPath, viewSocketPath, } from '../../core/canvas/paths.js';
 import { FinalizationError } from '../../core/feed/feed.js';
@@ -21,7 +22,6 @@ import { CrtrError } from '../../core/errors.js';
 import { WorktreeError } from '../../core/worktree.js';
 import { ApiError } from '../../api/errors.js';
 import { ExitCode } from '../../types.js';
-import { sinkDisplay } from '../cron-sink.js';
 import { responsePath } from '../../core/human/convention.js';
 import { ticketDir } from '../../core/human/root.js';
 // Node projections
@@ -314,7 +314,7 @@ export function toCronDTO(c, lastRun) {
         run_timeout_s: c.run_timeout_s,
         overlap: c.overlap,
         on_output: c.on_output,
-        sink: sinkDisplay(c.sink),
+        sink: cronSinkDisplay(c.sink),
         tier: c.tier,
         state: c.state,
         held: c.held,

package/dist/daemon/cron/sinks.d.ts

@@ -1,2 +1,2 @@
-import type { Cron } from '../../core/canvas/crons.js';
+import { type Cron } from '../../core/canvas/crons.js';
 export declare function deliverToSink(c: Cron, stdout: string): Promise<string>;

package/dist/daemon/cron/sinks.js

@@ -13,7 +13,7 @@ import { reviveNode } from '../../core/runtime/revive.js';
 import { isBrokerLive } from '../../core/runtime/model-swap.js';
 import { spawnChild } from '../../core/runtime/spawn.js';
 import { cronWakeOrigin } from '../../core/runtime/bearings.js';
-import { parseSink } from '../cron-sink.js';
+import { parseCronSink } from '../../core/canvas/crons.js';
 import { resolveLiveProfile, resolveLiveProfileName } from './armed-context.js';
 async function deliverNodeSink(c, target, stdout) {
     const meta = getNode(target);
@@ -89,7 +89,7 @@ function deliverHumanSink(c, stdout) {
     publishPage(ticketDir(id), prepared);
 }
 export async function deliverToSink(c, stdout) {
-    const sink = parseSink(c.sink);
+    const sink = parseCronSink(c.sink);
     if (sink === null)
         return 'no sink armed — nothing delivered';
     if (sink.kind === 'node') {

package/dist/daemon/reconcilers/live-obligation.js

@@ -1,4 +1,4 @@
-import { newestReportRef, hasActiveLiveSubscription, hasLiveMessageWait, hasLiveSubscriber, hasPendingCancelOnWakeCron, subscribersOf, } from '../../core/canvas/index.js';
+import { newestReportRef, hasActiveLiveSubscription, hasLiveMessageWait, hasLiveSubscriber, hasPendingCronWake, subscribersOf, } from '../../core/canvas/index.js';
 import { fullName } from '../../core/canvas/labels.js';
 import { countTickets } from '../../core/canvas/attention.js';
 import { hasUnseenWakeMail, readCursor, readInboxSince } from '../../core/feed/inbox.js';
@@ -12,7 +12,7 @@ import { transition } from '../../core/runtime/lifecycle.js';
 export function hasLiveObligation(nodeId) {
     return hasActiveLiveSubscription(nodeId)
         || hasLiveMessageWait(nodeId)
-        || hasPendingCancelOnWakeCron(nodeId)
+        || hasPendingCronWake(nodeId)
         || countTickets(nodeId) > 0
         || readOutputRequest(nodeId).state !== 'absent';
 }

package/package.json

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

package/dist/daemon/cron-sink.d.ts

@@ -1,26 +0,0 @@
-/** The one decoder for a cron's stored sink JSON.
- *
- *  A sink is armed as a CLI spec string (`node:<id>` | `spawn:<kind>` |
- *  `human`), validated and encoded to JSON once at arm time
- *  (`api/handlers/crons.ts`), and thereafter read back in exactly two places:
- *  the runner, which dispatches a delivery on it, and the DTO mapper, which
- *  renders it. Both go through here so the stored shape has a single reader.
- *
- *  A malformed stored value decodes as no-sink rather than throwing: a cron
- *  that cannot deliver must still run, and must still list.
- */
-export type ParsedSink = {
-    kind: 'node';
-    node: string;
-} | {
-    kind: 'spawn';
-    spawn: string;
-} | {
-    kind: 'human';
-} | null;
-/** Stored JSON → typed shape. `{}`, malformed JSON, and an unrecognised shape
- *  all read as null (no sink). */
-export declare function parseSink(sinkJson: string): ParsedSink;
-/** Stored JSON → the display spec the CLI armed with, or null when the cron
- *  never delivers. The exact inverse of the arm-time encoding. */
-export declare function sinkDisplay(sinkJson: string): string | null;

package/dist/daemon/cron-sink.js

@@ -1,43 +0,0 @@
-/** The one decoder for a cron's stored sink JSON.
- *
- *  A sink is armed as a CLI spec string (`node:<id>` | `spawn:<kind>` |
- *  `human`), validated and encoded to JSON once at arm time
- *  (`api/handlers/crons.ts`), and thereafter read back in exactly two places:
- *  the runner, which dispatches a delivery on it, and the DTO mapper, which
- *  renders it. Both go through here so the stored shape has a single reader.
- *
- *  A malformed stored value decodes as no-sink rather than throwing: a cron
- *  that cannot deliver must still run, and must still list.
- */
-/** Stored JSON → typed shape. `{}`, malformed JSON, and an unrecognised shape
- *  all read as null (no sink). */
-export function parseSink(sinkJson) {
-    try {
-        const s = JSON.parse(sinkJson);
-        if (typeof s['node'] === 'string')
-            return { kind: 'node', node: s['node'] };
-        if (typeof s['spawn'] === 'string')
-            return { kind: 'spawn', spawn: s['spawn'] };
-        if (s['human'] === true)
-            return { kind: 'human' };
-    }
-    catch {
-        // malformed stored sink reads as no-sink; callers report it in their own terms
-    }
-    return null;
-}
-/** Stored JSON → the display spec the CLI armed with, or null when the cron
- *  never delivers. The exact inverse of the arm-time encoding. */
-export function sinkDisplay(sinkJson) {
-    const sink = parseSink(sinkJson);
-    if (sink === null)
-        return null;
-    switch (sink.kind) {
-        case 'node':
-            return `node:${sink.node}`;
-        case 'spawn':
-            return `spawn:${sink.spawn}`;
-        case 'human':
-            return 'human';
-    }
-}