@staff0rd/assist 0.485.3 → 0.486.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.485.3",
+  version: "0.486.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -9245,6 +9245,7 @@ function toGitCwd(cwd) {
 // src/commands/sessions/web/defaultBranchRef.ts
 var ORIGIN_HEAD_REF = "refs/remotes/origin/HEAD";
 var ORIGIN_REF_PREFIX = "refs/remotes/origin/";
+var FALLBACK_BRANCHES = ["main", "master"];
 function configuredDefaultBranch(cwd) {
   try {
     return loadConfigFrom(toGitCwd(cwd)).branch?.defaultBranch;
@@ -9261,16 +9262,28 @@ async function originHeadBranch(cwd) {
     return void 0;
   }
 }
-async function defaultBranchRef(cwd) {
-  const branch2 = configuredDefaultBranch(cwd) ?? await originHeadBranch(cwd);
-  if (!branch2) return void 0;
-  const ref = `origin/${branch2}`;
+async function candidateBranches(cwd) {
+  const configured = configuredDefaultBranch(cwd);
+  const originHead = configured ? void 0 : await originHeadBranch(cwd);
+  const candidates = [configured, originHead, ...FALLBACK_BRANCHES].filter(
+    (branch2) => Boolean(branch2)
+  );
+  return [...new Set(candidates)];
+}
+async function refExists2(cwd, ref) {
   try {
     await execGit(cwd, ["rev-parse", "--verify", "--quiet", `${ref}^{commit}`]);
-    return ref;
+    return true;
   } catch {
-    return void 0;
+    return false;
+  }
+}
+async function defaultBranchRef(cwd) {
+  for (const branch2 of await candidateBranches(cwd)) {
+    const ref = `origin/${branch2}`;
+    if (await refExists2(cwd, ref)) return ref;
   }
+  return void 0;
 }
 
 // src/commands/sessions/web/branchDiffBase.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.485.3",
+	"version": "0.486.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {