@sagentlab/navarch-runtime 0.1.60 → 0.1.62

package/README.md

@@ -8,8 +8,9 @@ machine.
 
 The machine operator selects **Claude Code**, **OpenAI Codex**, **Google
 Gemini CLI**, **OpenCode**, or an **Agent Client Protocol (ACP)** agent when connecting a worker. Any selected agent can
-run any project task; task eligibility depends on capabilities and project
-gates, not agent type — see "Choosing an agent" below.
+run any unpinned project task; task eligibility depends on capabilities and
+project gates. A task pinned to a runtime waits for a worker that advertises
+that adapter and runs on it — see "Choosing an agent" below.
 
 See [`docs/agent-platform-project-plan.md`](../docs/agent-platform-project-plan.md)
 §3.8/§3.9/§3.11 and [`docs/navarch/implementation-plan.md`](../docs/navarch/implementation-plan.md)
@@ -369,7 +370,7 @@ unchanged across the deployment.
 | `NAVARCH_SANDBOX_EGRESS_NETWORK` | _(unset)_ | Docker network that enforces a profile's egress allowlist. Docker cannot filter by domain itself, so an allowlist profile without this fails closed to `--network=none` and records the denial. |
 | `NAVARCH_DOCKER_IMAGE` | `ghcr.io/sagentlab/navarch-sandbox-agent:0.1.0` | Version-pinned per-session image with Node 20, git, GitHub CLI, ripgrep, jq, SSH, and Claude Code 2.1.218. Override with an image tag or digest you control. |
 | `NAVARCH_AGENT` | saved choice, then `claude-code` | Local choice of agent adapter: `claude-code`, `codex`, `gemini`, `opencode`, `acp`, or `qoder`. Overrides the choice saved by `connect`/`register`; `start --agent` has highest priority. |
-| `NAVARCH_RUNTIMES` | resolved local agent choice | Comma list of installed/authenticated adapters advertised to dispatch. The control plane chooses among these per project/task. |
+| `NAVARCH_RUNTIMES` | resolved local agent choice | Comma list of installed/authenticated adapters advertised to dispatch. Unpinned tasks run on the preferred agent; a task runtime pin selects the matching adapter. |
 | `NAVARCH_UPDATE_CHANNEL` | `stable` | Release channel advertised by the worker (`stable` or `canary`); the server-managed machine channel remains authoritative. |
 | `NAVARCH_AUTO_UPDATE` | on under `supervise` | Set `off`, `false`, or `0` to report releases without staging or activating them. Automatic activation is always off under plain `start`. |
 | `NAVARCH_CLAUDE_BIN` | `claude` | Path/name of the Claude Code CLI binary. |
@@ -530,8 +531,13 @@ export NAVARCH_RUNTIMES=claude-code,codex,gemini,opencode,acp,qoder
 For the legacy single-runtime setting, priority is `start --agent` →
 `NAVARCH_AGENT` → the locally saved choice → `claude-code`.
 `NAVARCH_RUNTIMES` expands what the worker advertises. For normal projects,
-the locally selected `NAVARCH_AGENT` handles every claimed task. Sandbox
-projects remain constrained to Claude Code.
+the locally selected `NAVARCH_AGENT` handles every unpinned task. A task with a
+runtime override (for example `gemini`) is claimed only by a worker that
+advertises that adapter, and the claim returns it as the session runtime.
+Sandbox projects remain constrained to Claude Code, so they claim only unpinned
+or `claude-code`-pinned tasks. List only adapters this worker can really run:
+in Docker mode that means CLIs installed in `NAVARCH_DOCKER_IMAGE`, otherwise
+pinned tasks for a missing adapter are claimed and then fail.
 
 All five BYO adapters implement the same `AgentAdapter` interface
 (`src/adapters/types.cts`) and run either directly on the host or via

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.62",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through local coding agents.",
   "type": "commonjs",
   "license": "MIT",