@bivy/bivy 0.17.3-staging.31 → 0.17.3-staging.32

package/dist/worktree.js

@@ -4,6 +4,7 @@ import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import fs from "node:fs";
 import path from "node:path";
+import { gitNonInteractiveEnv } from "./git-auth.js";
 import { cowProvisionDeps, provisionDepsByInstall } from "./worktree-provision.js";
 const exec = promisify(execFile);
 /** Slugify arbitrary text into a safe git branch / directory segment. */
@@ -86,7 +87,7 @@ export async function createWorktree(opts) {
     const localExists = await refExists(repoRoot, `refs/heads/${branch}`);
     const remoteExists = !localExists && await refExists(repoRoot, `refs/remotes/origin/${branch}`);
     if (localExists) {
-        await exec("git", ["-C", repoRoot, "worktree", "add", wtPath, branch]);
+        await worktreeAdd(repoRoot, [wtPath, branch]);
     }
     else {
         if (remoteExists)
@@ -98,10 +99,10 @@ export async function createWorktree(opts) {
             // Empty repo (e.g. a freshly created GitHub repo with no commits): HEAD is
             // unborn, so it can't seed a worktree. Start the branch as an orphan —
             // the session's first commit becomes the repo's root commit.
-            await exec("git", ["-C", repoRoot, "worktree", "add", "--orphan", "-b", branch, wtPath]);
+            await worktreeAdd(repoRoot, ["--orphan", "-b", branch, wtPath]);
         }
         else {
-            await exec("git", ["-C", repoRoot, "worktree", "add", "-b", branch, wtPath, base]);
+            await worktreeAdd(repoRoot, ["-b", branch, wtPath, base]);
         }
     }
     // Opportunistically reuse a sibling worktree's installed deps (node_modules,
@@ -120,6 +121,42 @@ export async function createWorktree(opts) {
     }
     return { path: wtPath, branch, repoRoot };
 }
+/**
+ * `git worktree add`, non-interactively. Managed repos are partial clones
+ * (`--filter=blob:none`), so the checkout lazily fetches blobs from origin and
+ * needs credentials. The daemon has no TTY: without GIT_TERMINAL_PROMPT=0 a
+ * credential miss falls through to git's terminal prompt, which fails with the
+ * cryptic "could not read Username …: Device not configured" (macOS ENXIO).
+ */
+async function worktreeAdd(repoRoot, args) {
+    try {
+        await exec("git", ["-C", repoRoot, "worktree", "add", ...args], { env: gitNonInteractiveEnv() });
+    }
+    catch (error) {
+        const stderr = String(error.stderr ?? "");
+        const friendly = describeWorktreeAddError(stderr);
+        if (friendly)
+            throw new Error(friendly, { cause: error });
+        throw error;
+    }
+}
+/**
+ * Turn a `git worktree add` failure caused by the lazy blob fetch into a message
+ * a person can act on, with git's output kept below as details. Returns
+ * undefined for any other failure (the raw error is already specific).
+ */
+export function describeWorktreeAddError(stderr) {
+    const detail = stderr.trim();
+    const auth = /could not read (Username|Password)|terminal prompts disabled|Authentication failed|Invalid username or (password|token)|Permission to .* denied/i.test(detail);
+    const promisor = /from promisor remote/i.test(detail);
+    if (auth) {
+        return `Couldn't create the session's worktree: git had to download repository files from GitHub, but no GitHub credentials were available on this machine. Reconnect GitHub for this machine in Bivy, then start the session again.\n\n${detail}`;
+    }
+    if (promisor) {
+        return `Couldn't create the session's worktree: git had to download repository files from the remote and the download failed. Check this machine's network connection, then start the session again.\n\n${detail}`;
+    }
+    return undefined;
+}
 /** True if `ref` (a fully-qualified ref) resolves in the repo. */
 async function refExists(repoRoot, ref) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.17.3-staging.31",
+  "version": "0.17.3-staging.32",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",