@bivy/bivy 0.10.1-staging.241 → 0.10.1-staging.243

package/dist/repo-workspace.js

@@ -215,6 +215,43 @@ export async function resolveAdoptBaseRef(repoDir, branch) {
         return resolveDefaultBaseRef(repoDir);
     }
 }
+/**
+ * Resolve the best base for a same-node fork without assuming the source branch
+ * ref still exists. Prefer the live source checkout because it preserves its
+ * exact committed tip, including commits that were never pushed. Then try the
+ * local and remote branch refs before degrading to the repository default.
+ */
+export async function resolveForkBaseRef(repoDir, branch, sourceWorktree) {
+    if (sourceWorktree) {
+        try {
+            const { stdout } = await exec("git", ["-C", sourceWorktree, "rev-parse", "--verify", "HEAD"], { cwd: sourceWorktree });
+            const head = stdout.trim();
+            if (head)
+                return head;
+        }
+        catch {
+            // The source checkout may have been pruned; continue through the refs.
+        }
+    }
+    if (branch) {
+        try {
+            await exec("git", ["-C", repoDir, "rev-parse", "--verify", "--quiet", `refs/heads/${branch}`], { cwd: repoDir });
+            return branch;
+        }
+        catch {
+            // The local branch may have been pruned or lost in a re-clone.
+        }
+        await fetchOrigin(repoDir);
+        try {
+            await exec("git", ["-C", repoDir, "rev-parse", "--verify", "--quiet", `refs/remotes/origin/${branch}`], { cwd: repoDir });
+            return `origin/${branch}`;
+        }
+        catch {
+            // A never-pushed branch is expected to be absent remotely.
+        }
+    }
+    return resolveDefaultBaseRef(repoDir);
+}
 /**
  * Whether an existing Bivy-owned checkout at `dest` can be reused as-is, i.e. it
  * has a `.git` entry AND `git rev-parse` accepts it as a real repository. A

package/dist/server.js

@@ -76,7 +76,7 @@ import { checkDiskAdmission } from "./harness/disk-admission.js";
 import { sandboxTier, setConfiguredSandboxTier, normalizeSandboxTier } from "./harness/sandbox.js";
 import { setConfiguredAutoAttachToolImages } from "./harness/tool-image-attachments.js";
 import { injectMcpProxyForSession, injectBivyToolsForSession } from "./harness/mcp-inject.js";
-import { parseRepo, isGitHubSlugPart, inferGitHubRepoFromWorkspace, isSharedCloneRoot, resolveGitHubToken, ghCliInstalled, cloneOrUpdateRepo, resolveDefaultBaseRef, resolveBranchBaseRef, resolveAdoptBaseRef, fetchOrigin } from "./repo-workspace.js";
+import { parseRepo, isGitHubSlugPart, inferGitHubRepoFromWorkspace, isSharedCloneRoot, resolveGitHubToken, ghCliInstalled, cloneOrUpdateRepo, resolveDefaultBaseRef, resolveBranchBaseRef, resolveAdoptBaseRef, resolveForkBaseRef, fetchOrigin } from "./repo-workspace.js";
 import { configureGitAuth, writeGitCredentialEndpoint } from "./git-auth.js";
 import { GitHubTaskPoller, resolveGitHubTaskConfig, buildTaskPrompt, buildResumePrompt, buildInteractiveResumePrompt, DEFAULT_ISSUE_INSTRUCTIONS, parseBivyDirectives, commitAll, pushBranch, mergeBaseIntoBranch, completeMerge, abortMerge, findOpenPullRequestForBranch, findPullRequestsForBranch, findMergedPullRequestForBranch, issueBranchName, getPullRequest, commentIssueOnce, listOpenLabelledIssues, selectActionableIssues, getIssue, getIssueCommentBody, addLabel, removeLabel, announcePickup, } from "./github-tasks.js";
 import { buildLinearTaskPrompt, getLinearIssue, linearBranchName } from "./linear-tasks.js";
@@ -8045,6 +8045,7 @@ const forkStandUp = createForkStandUp({
     createWorktree,
     resolveDefaultBaseRef,
     resolveAdoptBaseRef,
+    resolveForkBaseRef,
     applyDirtyPatch,
     gitRepoRoot,
     materializeFork,

package/dist/session/fork-standup.js

@@ -77,10 +77,11 @@ export function createForkStandUp(deps) {
             // pickups don't race on `git worktree add` or clobber each other's trees.
             const wt = await deps.withRepoLock(repoDir, async () => {
                 if (opts.worktree === "fresh") {
-                    // Same-node fork: cut a NEW branch from the source's LOCAL branch (which
-                    // holds its latest, possibly-unpushed commits) or the repo default.
+                    // Same-node fork: preserve the live source tip when possible, but do
+                    // not fail when its checkout or branch ref has already been pruned.
                     const forkBranch = `${srcBranch ?? "fork"}-fork-${randomBytes(4).toString("hex")}`;
-                    return deps.createWorktree({ repoDir, id: forkBranch, branch: forkBranch, base: srcBranch ?? await deps.resolveDefaultBaseRef(repoDir) });
+                    const base = await deps.resolveForkBaseRef(repoDir, srcBranch, bundle.record.worktree);
+                    return deps.createWorktree({ repoDir, id: forkBranch, branch: forkBranch, base });
                 }
                 // Cross-node adopt: the source branch has no LOCAL ref here. Base the
                 // adopted branch on the pushed `origin/<branch>` so committed work travels

package/dist/worktree.js

@@ -77,16 +77,26 @@ export async function createWorktree(opts) {
         // first, then check the existing branch out into a fresh worktree.
         const localExists = await refExists(repoRoot, `refs/heads/${branch}`);
         const remoteExists = !localExists && (await refExists(repoRoot, `refs/remotes/origin/${branch}`));
-        if (!localExists && !remoteExists)
-            throw error;
-        await removeWorktree(repoRoot, wtPath);
-        fs.rmSync(wtPath, { recursive: true, force: true });
-        if (localExists) {
-            await exec("git", ["-C", repoRoot, "worktree", "add", wtPath, branch]);
+        if (localExists || remoteExists) {
+            await removeWorktree(repoRoot, wtPath);
+            fs.rmSync(wtPath, { recursive: true, force: true });
+            if (localExists) {
+                await exec("git", ["-C", repoRoot, "worktree", "add", wtPath, branch]);
+            }
+            else {
+                // Recreate the local branch from origin, then check it out in the worktree.
+                await exec("git", ["-C", repoRoot, "worktree", "add", "-b", branch, wtPath, `origin/${branch}`]);
+            }
+        }
+        else if (base !== "HEAD" && !(await refExists(repoRoot, base))) {
+            // Defense in depth for stale internal metadata: callers should resolve a
+            // fork base first, but a missing ref must not prevent session stand-up.
+            await removeWorktree(repoRoot, wtPath);
+            fs.rmSync(wtPath, { recursive: true, force: true });
+            await exec("git", ["-C", repoRoot, "worktree", "add", "-b", branch, wtPath, "HEAD"]);
         }
         else {
-            // Recreate the local branch from origin, then check it out in the worktree.
-            await exec("git", ["-C", repoRoot, "worktree", "add", "-b", branch, wtPath, `origin/${branch}`]);
+            throw error;
         }
     }
     // Opportunistically reuse a sibling worktree's installed deps (node_modules,

package/package.json

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