lody 0.103.0 → 0.104.0

package/dist/chunks/{directory-handle-CtdCjbNh.js → directory-handle-DgcESjFj.js}

@@ -1,4 +1,4 @@
-import { o as object, s as string, l as literal, b as boolean, a as _enum, e as union, n as number, d as discriminatedUnion, c as array, r as record, P as tuple, u as unknown } from "./schemas-WuyisFi9.js";
+import { o as object, s as string, l as literal, c as boolean, a as _enum, e as union, n as number, d as discriminatedUnion, b as array, r as record, P as tuple, u as unknown } from "./schemas-D_XLKCXC.js";
 import { execFile } from "node:child_process";
 import { readFile } from "node:fs/promises";
 import path__default from "node:path";
@@ -847,6 +847,17 @@ function bytesToHex(bytes) {
 function assertNever(value) {
   throw new Error(`Unhandled Code Collab value: ${String(value)}`);
 }
+function gitDiffBaseRefCandidates(preferredBaseBranch) {
+  const preferred = preferredBaseBranch?.trim();
+  const refs = [];
+  if (preferred?.startsWith("refs/remotes/")) {
+    refs.push(preferred);
+  } else if (preferred) {
+    const branch = preferred.startsWith("refs/heads/") ? preferred.slice("refs/heads/".length) : preferred;
+    refs.push(`origin/${branch}`, preferred);
+  }
+  return [.../* @__PURE__ */ new Set([...refs, "origin/main", "main", "origin/master", "master", "origin/HEAD"])];
+}
 const execFileAsync = promisify(execFile);
 const GIT_MAX_BUFFER_BYTES = 64 * 1024 * 1024;
 async function isInsideGitWorktree(workspaceRoot) {
@@ -899,7 +910,7 @@ async function runGitLsFiles(cwd) {
   }
 }
 async function computeAllChanges(workspaceRoot, options = {}) {
-  const diffBase = await resolveAllChangesDiffBase(workspaceRoot, options.preferredBaseBranch);
+  const diffBase = options.diffBase ?? await resolveAllChangesDiffBase(workspaceRoot, options.preferredBaseBranch);
   const diffTarget = diffBase ?? "HEAD";
   const [numstat, nameStatus, untracked] = await Promise.all([
     // `--numstat` cannot use `-z`, so disable `core.quotePath` to keep non-ASCII paths
@@ -976,17 +987,10 @@ async function resolveAllChangesDiffBase(workspaceRoot, preferredBaseBranch) {
     }
   }
   const head = await runGit(workspaceRoot, ["rev-parse", "--verify", "HEAD^{commit}"]);
-  return head.ok && head.stdout.trim() ? "HEAD" : null;
+  return head.ok && head.stdout.trim() ? head.stdout.trim() : null;
 }
 async function resolveAllChangesBaseRef(workspaceRoot, preferredBaseBranch) {
-  const candidates = [
-    ...preferredBaseBranch ? [`origin/${preferredBaseBranch}`, preferredBaseBranch] : [],
-    "origin/main",
-    "main",
-    "origin/master",
-    "master",
-    "origin/HEAD"
-  ];
+  const candidates = gitDiffBaseRefCandidates(preferredBaseBranch);
   for (const candidate of candidates) {
     const exists = await runGit(workspaceRoot, ["rev-parse", "--verify", `${candidate}^{commit}`]);
     if (exists.ok) {
@@ -1141,16 +1145,18 @@ async function closeDirectoryQuietly(directory) {
   }
 }
 export {
-  CODE_COLLAB_V2_TEXT_LIMITS as A,
-  CODE_COLLAB_V2_ALL_CHANGES_DIFF_LIMITS as B,
+  buildCodeCollabFileIndexState as A,
+  CODE_COLLAB_V2_TEXT_LIMITS as B,
   CodeCollabV2FileIndexRequestSchema as C,
-  computeAllChanges as D,
-  codeCollabFileIndexStatesEqual as E,
-  scanGitDirectoryEntries as F,
-  closeDirectoryQuietly as G,
-  joinWorkspacePath as H,
-  isInsideGitWorktree as I,
-  pathSegmentComparisonKey as J,
+  CODE_COLLAB_V2_ALL_CHANGES_DIFF_LIMITS as D,
+  resolveAllChangesDiffBase as E,
+  computeAllChanges as F,
+  codeCollabFileIndexStatesEqual as G,
+  scanGitDirectoryEntries as H,
+  closeDirectoryQuietly as I,
+  joinWorkspacePath as J,
+  isInsideGitWorktree as K,
+  pathSegmentComparisonKey as L,
   CodeCollabV2OpenTextRequestSchema as a,
   CodeCollabV2RefreshTextRequestSchema as b,
   CodeCollabV2SaveTextRequestSchema as c,
@@ -1176,6 +1182,6 @@ export {
   readCodeCollabFileIndexSignalFromFlock as w,
   writeCodeCollabFileIndexSignalToFlock as x,
   writeCodeCollabFileIndexToFlock as y,
-  buildCodeCollabFileIndexState as z
+  gitDiffBaseRefCandidates as z
 };
-//# sourceMappingURL=directory-handle-CtdCjbNh.js.map
+//# sourceMappingURL=directory-handle-DgcESjFj.js.map