@sagentlab/navarch-runtime 0.1.111 → 0.1.112

package/dist/conversation/loop.cjs

@@ -209,9 +209,9 @@ class ConversationLoop {
             ...(shutdownSignal ? { signal: shutdownSignal } : {}),
             ...this.options.turnOverrides,
             log: this.log,
-            prepareWorkspace: async ({ conversationId, repositoryUrl, mode, signal }) => {
+            prepareWorkspace: async ({ conversationId, repositoryUrl, workingBranch, mode, signal }) => {
                 const workspace = await (0, workspace_cjs_1.prepareConversationWorkspace)({
-                    workspaceRoot: config.workspaceRoot, conversationId, repositoryUrl, env, signal, mode,
+                    workspaceRoot: config.workspaceRoot, conversationId, repositoryUrl, workingBranch, env, signal, mode,
                     ...(this.options.gitRunner ? { runner: this.options.gitRunner } : {}),
                 });
                 const guard = await (0, worktree_guard_cjs_1.prepareWorktreeGuard)({

package/dist/conversation/turn-runner.cjs

@@ -298,7 +298,9 @@ async function runConversationTurn(deps, conversationId, turnId) {
             if (snapshot.mode === "workspace" && !deps.workspaceEnabled)
                 throw new Error("Workspace chat is disabled on this machine");
             prompt = (0, prompt_cjs_1.buildConversationPrompt)(snapshot, journal.turnId);
-            prepared = await deps.prepareWorkspace({ conversationId, repositoryUrl, mode: snapshot.mode ?? "read_only", signal: controller.signal });
+            // Older servers omit the working branch: the checkout stays on the default branch.
+            const workingBranch = (0, workspace_cjs_1.validWorkingBranch)(claim.workingBranch);
+            prepared = await deps.prepareWorkspace({ conversationId, repositoryUrl, workingBranch, mode: snapshot.mode ?? "read_only", signal: controller.signal });
         }
         catch (error) {
             if (!run.lost)

package/dist/conversation/workspace.cjs

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.conversationEnv = conversationEnv;
 exports.validRepositoryUrl = validRepositoryUrl;
+exports.validWorkingBranch = validWorkingBranch;
 exports.conversationRoot = conversationRoot;
 exports.prepareConversationWorkspace = prepareConversationWorkspace;
 exports.removeConversationWorkspace = removeConversationWorkspace;
@@ -50,6 +51,22 @@ function validRepositoryUrl(value) {
         return null;
     return `https://github.com/${fullName}.git`;
 }
+/**
+ * The project's working branch from the claim, checked as strictly as the
+ * hosted path's `buildWorkingBranchCheckoutCommand`
+ * (worker/hosted-agent/delivery.ts): a plain ref name that cannot be read as a
+ * git option. Absent (an older server, or no working branch) is null; anything
+ * else that is not a plain name throws, so the turn never runs on a branch it
+ * was not given.
+ */
+function validWorkingBranch(value) {
+    if (value === undefined || value === null)
+        return null;
+    if (typeof value !== "string" || value.length > 255 || !/^[A-Za-z0-9][A-Za-z0-9._/-]*$/.test(value) || value.includes("..")) {
+        throw new Error("working branch is not a valid branch name");
+    }
+    return value;
+}
 function conversationRoot(workspaceRoot, conversationId) {
     return node_path_1.default.join(workspaceRoot, "conversations", (0, journal_cjs_1.assertUuid)(conversationId, "conversation id"));
 }
@@ -67,6 +84,11 @@ async function prepareConversationWorkspace(options) {
     const url = validRepositoryUrl(options.repositoryUrl);
     if (!url)
         throw new Error("repository URL is not a plain https URL");
+    const branch = validWorkingBranch(options.workingBranch);
+    // The marker records what the checkout was cloned from, so a changed
+    // repository or working branch is noticed. Default-branch checkouts keep the
+    // bare URL that earlier runtimes wrote.
+    const identity = branch ? `${url}\nbranch=${branch}` : url;
     const runner = options.runner ?? sandbox_cjs_1.nodeCommandRunner;
     const root = options.mode === "workspace"
         ? node_path_1.default.join(options.workspaceRoot, "chat-workspaces", (0, journal_cjs_1.assertUuid)(options.conversationId, "conversation id"))
@@ -83,7 +105,7 @@ async function prepareConversationWorkspace(options) {
     if (options.mode === "workspace") {
         await node_fs_1.promises.writeFile(node_path_1.default.join(workspace.metaDir, "preserve-workspace"), "Workspace chat: retain until the operator removes it.\n", { mode: 0o600 });
     }
-    if (hasCheckout && recorded === url)
+    if (hasCheckout && recorded === identity)
         return workspace;
     if (options.mode === "workspace") {
         const exists = await node_fs_1.promises.lstat(workspace.checkout).then(() => true, (error) => {
@@ -94,7 +116,7 @@ async function prepareConversationWorkspace(options) {
         if (exists)
             throw new Error("Checkout identity changed; preserving the existing workspace. Start a new conversation.");
     }
-    // New conversation, a changed repository URL, or an interrupted clone.
+    // New conversation, a changed repository URL or working branch, or an interrupted clone.
     await node_fs_1.promises.rm(workspace.checkout, { recursive: true, force: true });
     const env = {
         ...options.env,
@@ -104,12 +126,12 @@ async function prepareConversationWorkspace(options) {
         GIT_CONFIG_KEY_0: "core.hooksPath",
         GIT_CONFIG_VALUE_0: process.platform === "win32" ? "NUL" : "/dev/null",
     };
-    const result = await runner.run("git", ["clone", "--quiet", "--filter=blob:none", "--no-tags", "--", url, workspace.checkout], { cwd: root, env, timeoutMs: CLONE_TIMEOUT_MS, signal: options.signal });
+    const result = await runner.run("git", ["clone", "--quiet", "--filter=blob:none", "--no-tags", ...(branch ? ["--branch", branch] : []), "--", url, workspace.checkout], { cwd: root, env, timeoutMs: CLONE_TIMEOUT_MS, signal: options.signal });
     if (result.code !== 0) {
         await node_fs_1.promises.rm(workspace.checkout, { recursive: true, force: true }).catch(() => undefined);
         throw new Error(`git clone failed with exit ${result.code}: ${result.stderr.slice(-500)}`);
     }
-    await node_fs_1.promises.writeFile(marker, url, { encoding: "utf8", mode: 0o600 });
+    await node_fs_1.promises.writeFile(marker, identity, { encoding: "utf8", mode: 0o600 });
     return workspace;
 }
 async function removeConversationWorkspace(workspaceRoot, conversationId) {

package/package.json

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