@sagentlab/navarch-runtime 0.1.60 → 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([

package/package.json

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