Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
fix(server): fall back to the remote default branch instead of assuming main (#7078)
Rishet1130be31195883
diff --git a/apps/server/src/git/GitManager.test.ts b/apps/server/src/git/GitManager.test.tsindex 6291b3f33..01a9d4319 100644--- a/apps/server/src/git/GitManager.test.ts+++ b/apps/server/src/git/GitManager.test.ts@@ -2404,6 +2404,57 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {}),);+ it.effect("create_pr targets the remote default branch when it is not main", () =>+ Effect.gen(function* () {+ const repoDir = yield* makeTempDir("t3code-git-manager-");+ yield* initRepo(repoDir);+ const remoteDir = yield* createBareRemote();+ yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);+ // A repository whose default branch is master, with no main anywhere.+ yield* runGit(repoDir, ["push", "origin", "HEAD:master"]);+ yield* runGit(repoDir, ["fetch", "origin"]);+ yield* runGit(repoDir, ["remote", "set-head", "origin", "master"]);++ yield* runGit(repoDir, ["checkout", "-b", "feature/master-default"]);+ NodeFS.writeFileSync(NodePath.join(repoDir, "master-default.txt"), "master default\n");+ yield* runGit(repoDir, ["add", "master-default.txt"]);+ yield* runGit(repoDir, ["commit", "-m", "Master default"]);++ const { manager, ghCalls } = yield* makeManager({+ ghScenario: {+ // Mirrors a provider that cannot report a default branch, as the Azure+ // DevOps CLI does when it cannot detect the repository.+ defaultBranch: "",+ prListSequence: [+ "[]",+ // @effect-diagnostics-next-line preferSchemaOverJson:off+ JSON.stringify([+ {+ number: 505,+ title: "Master default",+ url: "https://github.com/pingdotgg/codething-mvp/pull/505",+ baseRefName: "master",+ headRefName: "feature/master-default",+ },+ ]),+ ],+ },+ });++ const result = yield* runStackedAction(manager, {+ cwd: repoDir,+ action: "create_pr",+ });++ expect(result.pr.status).toBe("created");+ expect(+ ghCalls.some((call) =>+ call.includes("pr create --base master --head feature/master-default"),+ ),+ ).toBe(true);+ }),+ );+it.effect("returns existing PR metadata for commit/push/pr action", () =>Effect.gen(function* () {const repoDir = yield* makeTempDir("t3code-git-manager-");diff --git a/apps/server/src/git/GitManager.ts b/apps/server/src/git/GitManager.tsindex c13505126..0729d2282 100644--- a/apps/server/src/git/GitManager.ts+++ b/apps/server/src/git/GitManager.ts@@ -1489,6 +1489,18 @@ export const make = Effect.gen(function* () {return defaultFromProvider;}+ // The provider lookup can fail for reasons unrelated to the branch, so fall+ // back to what the remote itself records before assuming a name. A repository+ // whose default branch is master would otherwise get a base branch that does+ // not exist.+ const defaultFromRemote = yield* gitCore.resolvePrimaryRemoteName(cwd).pipe(+ Effect.flatMap((remoteName) => gitCore.resolveDefaultBranchName(cwd, remoteName)),+ Effect.orElseSucceed(() => null),+ );+ if (defaultFromRemote) {+ return defaultFromRemote;+ }+return "main";});diff --git a/apps/server/src/vcs/GitVcsDriver.ts b/apps/server/src/vcs/GitVcsDriver.tsindex b9ef99212..0282ffaa4 100644--- a/apps/server/src/vcs/GitVcsDriver.ts+++ b/apps/server/src/vcs/GitVcsDriver.ts@@ -289,6 +289,10 @@ export class GitVcsDriver extends Context.Service<) => Effect.Effect<GitRefreshCheckedOutBranchResult, GitCommandError>;readonly ensureRemote: (input: GitEnsureRemoteInput) => Effect.Effect<string, GitCommandError>;readonly resolvePrimaryRemoteName: (cwd: string) => Effect.Effect<string, GitCommandError>;+ readonly resolveDefaultBranchName: (+ cwd: string,+ remoteName: string,+ ) => Effect.Effect<string | null, GitCommandError>;readonly fetchRemote: (input: GitFetchRemoteInput) => Effect.Effect<void, GitCommandError>;readonly remoteExists: (input: GitRemoteExistsInput) => Effect.Effect<boolean, GitCommandError>;readonly resolveRemoteTrackingCommit: (diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.tsindex cd16c7029..800ec6d4e 100644--- a/apps/server/src/vcs/GitVcsDriverCore.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.ts@@ -3189,6 +3189,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*withListRefsInvalidation(input.cwd, refreshCheckedOutBranch(input)),ensureRemote: (input) => withListRefsInvalidation(input.cwd, ensureRemote(input)),resolvePrimaryRemoteName,+ resolveDefaultBranchName,fetchRemote: (input) => withListRefsInvalidation(input.cwd, fetchRemote(input)),remoteExists,resolveRemoteTrackingCommit,