@sagentlab/navarch-runtime 0.1.59 → 0.1.61

package/dist/git-worktree.cjs

@@ -37,6 +37,8 @@ class GitWorktree {
     sessionTokenMarker;
     hostedCheckpointRef;
     hostedCheckpointLocalRef;
+    /** Set when the resumed remote branch had lost its ownership commit and must be re-marked. */
+    adoptedUnmarkedBranch = false;
     constructor(options) {
         const projectKey = safePathSegment(options.projectId);
         const sessionKey = safePathSegment(options.sessionId);
@@ -185,7 +187,9 @@ class GitWorktree {
             this.worktreePath,
             startRef,
         ], false);
-        if (!taskRef && !staleTip)
+        // An adopted branch gets its marker back, or the pre-push guard refuses
+        // every delivery push and the next retry is stuck again.
+        if ((!taskRef && !staleTip) || this.adoptedUnmarkedBranch)
             await this.createTaskOwnershipCommit();
         if (checkpoint)
             await this.applyHostedCheckpoint(checkpoint);
@@ -293,6 +297,7 @@ class GitWorktree {
         if (tip.code !== 0 || !/^[0-9a-f]{40,64}$/i.test(staleSha))
             return null;
         const owned = this.branch.endsWith(this.legacyTaskBranchSuffix) ||
+            this.adoptedUnmarkedBranch ||
             (await this.hasTaskOwnershipMarker(localRef));
         if (!owned) {
             throw new Error(`Local branch ${this.branch} already exists in the cached repository but does not ` +
@@ -360,6 +365,9 @@ class GitWorktree {
         const matches = [...ownedShortMatches, ...legacyMatches];
         if (matches.length === 0) {
             if (shortMatches.length > 0) {
+                const adopted = await this.adoptUnmarkedOwnBranch(shortMatches);
+                if (adopted)
+                    return adopted;
                 throw new Error(`Remote branch ${shortMatches[0]} shares task suffix ${this.taskBranchSuffix} but does not ` +
                     `contain ownership marker ${this.taskOwnershipTrailer}; refusing to resume or fork.`);
             }
@@ -372,6 +380,36 @@ class GitWorktree {
         this.branch = remoteRef.replace(/^refs\/remotes\/origin\//, "");
         return remoteRef;
     }
+    /**
+     * An agent that amends, resets, or rebases away the empty claim commit and
+     * pushes leaves this task's branch without its marker, and every retry then
+     * refused it (carova #10). The branch is still ours when it carries exactly
+     * the name this task allocates (slug and suffix) and none of its own commits
+     * claim another task; anything else stays refused.
+     */
+    async adoptUnmarkedOwnBranch(shortMatches) {
+        const ownRef = `refs/remotes/origin/${this.branch}`;
+        if (shortMatches.length !== 1 || shortMatches[0] !== ownRef)
+            return null;
+        const base = await this.resolveStartRef().catch(() => null);
+        if (!base)
+            return null;
+        const log = await this.runner.run("git", [
+            "--git-dir",
+            this.repositoryPath,
+            "log",
+            "--format=%B",
+            ownRef,
+            "--not",
+            base,
+        ]);
+        if (log.code !== 0)
+            return null;
+        if (log.stdout.split("\n").some((line) => /^Navarch-Task-ID:/i.test(line.trim())))
+            return null;
+        this.adoptedUnmarkedBranch = true;
+        return ownRef;
+    }
     /** Short branch names are ambiguous without a full task-ID marker in their history. */
     async hasTaskOwnershipMarker(ref) {
         const log = await this.runGit([
@@ -387,6 +425,14 @@ class GitWorktree {
             .split("\n")
             .some((line) => line.trim() === this.taskOwnershipTrailer);
     }
+    /**
+     * The ownership line a push to the delivery branch must keep, for the
+     * pre-push guard (`NAVARCH_DELIVERY_TASK_MARKER`). Null for a resumed legacy
+     * full-UUID branch, whose name alone proves ownership.
+     */
+    get deliveryTaskMarker() {
+        return this.branch.endsWith(this.legacyTaskBranchSuffix) ? null : this.taskOwnershipTrailer;
+    }
     /** Records full task ownership without lengthening the human-facing branch name. */
     async createTaskOwnershipCommit() {
         await this.runGit([
@@ -657,6 +703,11 @@ async function pathExists(value) {
  * the allocated `navarch/...` branch (for example onto Codex's default
  * `codex/...` prefix). `--no-verify` bypasses any hook, so
  * `resolveDeliveryHead` also repairs the worktree before completion.
+ *
+ * With `NAVARCH_DELIVERY_TASK_MARKER` it also refuses a delivery-branch push
+ * whose history lost the task's ownership commit (an amend, reset, or rebase
+ * drops the empty claim commit). A retry only resumes a short-suffix branch
+ * that carries the marker, so an unmarked push strands the task.
  */
 const DELIVERY_BRANCH_GUARD_HOOK = `#!/bin/sh
 # Managed by @sagentlab/navarch-runtime (git-worktree.cts).
@@ -672,6 +723,18 @@ while read -r local_ref local_sha remote_ref remote_sha; do
   if [ "$branch" != "$allowed" ]; then
     printf '%s\\n' "navarch: refusing to push '$branch'; this task's delivery branch is '$allowed'." >&2
     status=1
+    continue
+  fi
+  marker="\${NAVARCH_DELIVERY_TASK_MARKER:-}"
+  [ -n "$marker" ] || continue
+  case "$local_sha" in
+    *[!0]*) ;;
+    *) continue ;;
+  esac
+  if [ -z "$(git log -1 --format=%H --fixed-strings --grep="$marker" "$local_sha" 2>/dev/null)" ]; then
+    printf '%s\\n' "navarch: refusing to push '$branch'; its history no longer contains the task ownership line '$marker' (the empty 'chore(navarch): claim task branch' commit was amended, reset, or rebased away)." >&2
+    printf '%s\\n' "navarch: restore it with: git commit --allow-empty -m 'chore(navarch): claim task branch' -m '$marker' && git push" >&2
+    status=1
   fi
 done
 exit "$status"

package/dist/session.cjs

@@ -420,8 +420,12 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
             await node_fs_1.promises.writeFile(node_path_1.default.join(workDir, "prompt.md"), promptText, "utf8");
         }
         // Preparation may resume an existing task branch with an older slug or ID format.
-        if (!allowBranchRename)
+        if (!allowBranchRename) {
             sessionEnv.NAVARCH_DELIVERY_BRANCH = gitWorktree.branch;
+            const marker = gitWorktree.deliveryTaskMarker;
+            if (marker)
+                sessionEnv.NAVARCH_DELIVERY_TASK_MARKER = marker;
+        }
         if (sandbox) {
             await sandbox.create();
             // Security-policy refusals (a mount outside the allowlist, an egress

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.59",
+  "version": "0.1.61",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through local coding agents.",
   "type": "commonjs",
   "license": "MIT",