@sagentlab/navarch-runtime 0.1.18 → 0.1.19

package/dist/git-worktree.cjs

@@ -23,13 +23,19 @@ class GitWorktree {
     runner;
     cloneUrl;
     githubToken;
+    taskBranchSuffix;
     constructor(options) {
         const projectKey = safePathSegment(options.projectId);
         const sessionKey = safePathSegment(options.sessionId);
+        const taskKey = safePathSegment(options.taskId);
         this.sessionRoot = node_path_1.default.join(options.workspaceRoot, "sessions", sessionKey);
         this.worktreePath = node_path_1.default.join(this.sessionRoot, "repo");
         this.repositoryPath = node_path_1.default.join(options.workspaceRoot, "repositories", `${projectKey}.git`);
-        this.branch = `navarch/${branchSlug(options)}-${sessionKey.toLowerCase().slice(0, 8)}`;
+        // One delivery task owns one remote branch across every retry. A
+        // session-scoped branch lets a failed attempt push useful work, then makes
+        // the retry start from main and open a second PR for the same task.
+        this.taskBranchSuffix = `-${taskKey.toLowerCase()}`;
+        this.branch = `navarch/${branchSlug(options)}${this.taskBranchSuffix}`;
         this.runner = options.runner ?? sandbox_cjs_1.nodeCommandRunner;
         this.cloneUrl = options.cloneUrl;
         this.githubToken = options.githubToken;
@@ -75,7 +81,10 @@ class GitWorktree {
         ], true);
     }
     async addSessionWorktree() {
-        const startRef = await this.resolveStartRef();
+        // A failed session may have pushed before it could report completion. The
+        // next session must resume that task-owned branch, not fork again from the
+        // default branch and create a competing delivery PR.
+        const startRef = (await this.resolveTaskBranchRef()) ?? (await this.resolveStartRef());
         if (!startRef) {
             // Empty remote (no commits yet): there is nothing to base the session on,
             // so bootstrap an orphan branch the session can push as the first commit.
@@ -93,6 +102,22 @@ class GitWorktree {
             startRef,
         ], false);
     }
+    /** Returns the fetched task-owned remote branch when an earlier attempt pushed it. */
+    async resolveTaskBranchRef() {
+        const refs = await this.runGit(["--git-dir", this.repositoryPath, "for-each-ref", "--format=%(refname)", "refs/remotes/origin/navarch"], false);
+        const matches = refs.stdout
+            .split("\n")
+            .map((line) => line.trim())
+            .filter((ref) => ref.endsWith(this.taskBranchSuffix));
+        if (matches.length === 0)
+            return null;
+        if (matches.length > 1) {
+            throw new Error(`Multiple remote branches claim task suffix ${this.taskBranchSuffix}; refusing to fork another delivery branch.`);
+        }
+        const remoteRef = matches[0];
+        this.branch = remoteRef.replace(/^refs\/remotes\/origin\//, "");
+        return remoteRef;
+    }
     /**
      * Resolves the remote-tracking ref new session branches start from, or null
      * when the remote has no branches at all (a freshly provisioned empty repo).
@@ -211,8 +236,8 @@ async function pathExists(value) {
     }
 }
 /**
- * Kebab-case slug for the session branch, derived from the task summary so
- * branch names read like `navarch/fix-login-redirect-a1b2c3d4` instead of a
+ * Kebab-case slug for the task branch, derived from the task summary so
+ * branch names read like `navarch/fix-login-redirect-<task-id>` instead of a
  * UUID mash. Falls back to the task type, then a task-id prefix, when the
  * summary yields nothing. Output contains only [a-z0-9-] with no leading or
  * trailing dash, so it is always a valid git ref component (no `..`, no
@@ -239,7 +264,7 @@ function branchSlug(options) {
 function safePathSegment(value) {
     const safe = value.replace(/[^A-Za-z0-9_.-]/g, "-").replace(/^-+|-+$/g, "");
     if (!safe)
-        throw new Error("Cannot create a git worktree without a valid project/session identifier.");
+        throw new Error("Cannot create a git worktree without a valid identifier.");
     return safe;
 }
 function normalizeCloneUrl(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through Claude Code, Codex, or Gemini CLI.",
   "type": "commonjs",
   "license": "MIT",