@sagentlab/navarch-runtime 0.1.143 → 0.1.144

package/dist/conversation/loop.cjs

@@ -225,9 +225,11 @@ class ConversationLoop {
             ...(shutdownSignal ? { signal: shutdownSignal } : {}),
             ...this.options.turnOverrides,
             log: this.log,
-            prepareWorkspace: async ({ conversationId, repositoryUrl, workingBranch, mode, signal }) => {
+            prepareWorkspace: async ({ conversationId, repositoryUrl, workingBranch, gitCredential, mode, signal }) => {
+                if (!gitCredential)
+                    throw new Error("Control plane did not provide the conversation Git credential");
                 const workspace = await (0, workspace_cjs_1.prepareConversationWorkspace)({
-                    workspaceRoot: config.workspaceRoot, conversationId, repositoryUrl, workingBranch, env, signal, mode,
+                    workspaceRoot: config.workspaceRoot, conversationId, repositoryUrl, workingBranch, gitCredential, env, signal, mode,
                     ...(this.options.gitRunner ? { runner: this.options.gitRunner } : {}),
                     ...(this.mirrors ? { mirrors: this.mirrors } : {}),
                 });

package/dist/conversation/turn-runner.cjs

@@ -300,7 +300,7 @@ async function runConversationTurn(deps, conversationId, turnId) {
             prompt = (0, prompt_cjs_1.buildConversationPrompt)(snapshot, journal.turnId, deps.adapter.agentType === "codex");
             // 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 });
+            prepared = await deps.prepareWorkspace({ conversationId, repositoryUrl, workingBranch, gitCredential: claim.gitCredential, mode: snapshot.mode ?? "read_only", signal: controller.signal });
         }
         catch (error) {
             if (!run.lost)

package/dist/conversation/workspace.cjs

@@ -76,9 +76,8 @@ function conversationRoot(workspaceRoot, conversationId) {
  * The first turn clones; later turns of the same conversation reuse the
  * checkout so a follow-up sees the same revision as the first answer.
  *
- * The clone uses the machine's own git credentials (the same ones a local
- * `git clone` would use), never a Navarch server-side provider credential.
- * A repository this machine cannot read fails the turn instead of falling back.
+ * The control plane's project credential is used only by Git checkout subprocesses.
+ * It never enters the checkout URL, git config, journal or agent environment.
  * With `mirrors`, a new checkout is seeded from this machine's refreshed
  * mirror of the repository instead of a full network clone (see mirror.cts).
  */
@@ -127,15 +126,36 @@ async function prepareConversationWorkspace(options) {
         GIT_CONFIG_COUNT: "1",
         GIT_CONFIG_KEY_0: "core.hooksPath",
         GIT_CONFIG_VALUE_0: process.platform === "win32" ? "NUL" : "/dev/null",
+        ...(options.gitCredential ? {
+            NAVARCH_CONVERSATION_GIT_TOKEN: options.gitCredential,
+            GIT_CONFIG_COUNT: "5",
+            GIT_CONFIG_KEY_1: "credential.helper", GIT_CONFIG_VALUE_1: "",
+            GIT_CONFIG_KEY_2: `credential.${url}.helper`,
+            GIT_CONFIG_VALUE_2: `!f() { if [ "$1" = get ]; then printf '%s\\n' 'username=x-access-token' "password=$NAVARCH_CONVERSATION_GIT_TOKEN"; fi; }; f`,
+            GIT_CONFIG_KEY_3: "credential.useHttpPath", GIT_CONFIG_VALUE_3: "true",
+            GIT_CONFIG_KEY_4: "http.followRedirects", GIT_CONFIG_VALUE_4: "false",
+        } : {}),
     };
-    const seeded = await options.mirrors?.seedCheckout({ url, branch, checkout: workspace.checkout, env, signal: options.signal }) ?? false;
+    let seeded;
+    try {
+        seeded = await options.mirrors?.seedCheckout({ url, branch, checkout: workspace.checkout, env, signal: options.signal }) ?? false;
+    }
+    catch {
+        throw new Error("Conversation git mirror checkout could not run");
+    }
     if (!seeded) {
-        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 });
+        let result;
+        try {
+            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 });
+        }
+        catch {
+            // A command runner or credential helper can put secrets in an exception.
+            throw new Error("Conversation git clone could not run");
+        }
         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)}`);
+            throw new Error(`git clone failed with exit ${result.code}; check the project's GitHub connection and repository access`);
         }
-        // This machine can read the repository: build the mirror for the next conversation.
         void options.mirrors?.warm(url, env, options.signal);
     }
     await node_fs_1.promises.writeFile(marker, identity, { encoding: "utf8", mode: 0o600 });

package/package.json

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