feat(workspaces): add workspace base branch functionality

apps/desktop/src/lib/trpc/routers/changes/branches.ts

@@ -4,6 +4,11 @@ import { localDb } from "main/lib/local-db";
 import simpleGit from "simple-git";
 import { z } from "zod";
 import { publicProcedure, router } from "../..";
+import {
+	getBranchBaseConfig,
+	setBranchBaseConfig,
+	unsetBranchBaseConfig,
+} from "../workspaces/utils/base-branch-config";
 import { getCurrentBranch } from "../workspaces/utils/git";
 import {
 	assertRegisteredWorktree,
@@ -31,12 +36,25 @@ export const createBranchesRouter = () => {
 
 					const branchSummary = await git.branch(["-a"]);
 					const currentBranch = await getCurrentBranch(input.worktreePath);
-
-					const gitConfigBase = currentBranch
-						? await git
-								.raw(["config", `branch.${currentBranch}.base`])
-								.catch(() => "")
-						: "";
+					const { baseBranch: configuredBaseBranch } = currentBranch
+						? await getBranchBaseConfig({
+								repoPath: input.worktreePath,
+								branch: currentBranch,
+							})
+						: { baseBranch: null };
+					const persistedWorktree = localDb
+						.select({
+							branch: worktrees.branch,
+							baseBranch: worktrees.baseBranch,
+						})
+						.from(worktrees)
+						.where(eq(worktrees.path, input.worktreePath))
+						.get();
+					const persistedBaseBranch =
+						persistedWorktree &&
+						(!currentBranch || persistedWorktree.branch === currentBranch)
+							? (persistedWorktree.baseBranch?.trim() ?? null)
+							: null;
 
 					const localBranches: string[] = [];
 					const remote: string[] = [];
@@ -63,7 +81,7 @@ export const createBranchesRouter = () => {
 						remote: remote.sort(),
 						defaultBranch,
 						checkedOutBranches,
-						worktreeBaseBranch: gitConfigBase.trim() || null,
+						worktreeBaseBranch: configuredBaseBranch ?? persistedBaseBranch,
 					};
 				},
 			),
@@ -87,6 +105,7 @@ export const createBranchesRouter = () => {
 					.update(worktrees)
 					.set({
 						branch: input.branch,
+						baseBranch: null,
 						gitStatus,
 					})
 					.where(eq(worktrees.path, input.worktreePath))
@@ -105,24 +124,31 @@ export const createBranchesRouter = () => {
 			.mutation(async ({ input }): Promise<{ success: boolean }> => {
 				assertRegisteredWorktree(input.worktreePath);
 
-				const git = simpleGit(input.worktreePath);
 				const currentBranch = await getCurrentBranch(input.worktreePath);
 				if (!currentBranch) {
 					throw new Error("Could not determine current branch");
 				}
 
 				if (input.baseBranch) {
-					await git.raw([
-						"config",
-						`branch.${currentBranch}.base`,
-						input.baseBranch,
-					]);
+					await setBranchBaseConfig({
+						repoPath: input.worktreePath,
+						branch: currentBranch,
+						baseBranch: input.baseBranch,
+						isExplicit: true,
+					});
 				} else {
-					await git
-						.raw(["config", "--unset", `branch.${currentBranch}.base`])
-						.catch(() => {});
+					await unsetBranchBaseConfig({
+						repoPath: input.worktreePath,
+						branch: currentBranch,
+					});
 				}
 
+				localDb
+					.update(worktrees)
+					.set({ baseBranch: input.baseBranch })
+					.where(eq(worktrees.path, input.worktreePath))
+					.run();
+
 				return { success: true };
 			}),
 	});

apps/desktop/src/lib/trpc/routers/projects/projects.ts

@@ -812,6 +812,7 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 							.optional(),
 						branchPrefixMode: z.enum(BRANCH_PREFIX_MODES).nullable().optional(),
 						branchPrefixCustom: z.string().nullable().optional(),
+						workspaceBaseBranch: z.string().nullable().optional(),
 						hideImage: z.boolean().optional(),
 						defaultApp: z.enum(EXTERNAL_APPS).nullable().optional(),
 					}),
@@ -840,6 +841,9 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 						...(input.patch.branchPrefixCustom !== undefined && {
 							branchPrefixCustom: input.patch.branchPrefixCustom,
 						}),
+						...(input.patch.workspaceBaseBranch !== undefined && {
+							workspaceBaseBranch: input.patch.workspaceBaseBranch,
+						}),
 						...(input.patch.hideImage !== undefined && {
 							hideImage: input.patch.hideImage,
 						}),

apps/desktop/src/lib/trpc/routers/workspaces/procedures/create.ts

@@ -6,9 +6,10 @@ import { track } from "main/lib/analytics";
 import { localDb } from "main/lib/local-db";
 import { workspaceInitManager } from "main/lib/workspace-init-manager";
 import { SUPERSET_DIR_NAME, WORKTREES_DIR_NAME } from "shared/constants";
-import simpleGit from "simple-git";
 import { z } from "zod";
 import { publicProcedure, router } from "../../..";
+import { resolveWorkspaceBaseBranch } from "../utils/base-branch";
+import { setBranchBaseConfig } from "../utils/base-branch-config";
 import {
 	activateProject,
 	findOrphanedWorktreeByBranch,
@@ -170,6 +171,21 @@ interface HandleNewWorktreeParams {
 	workspaceName: string;
 }
 
+async function getKnownBranchesSafe(
+	repoPath: string,
+): Promise<string[] | undefined> {
+	try {
+		const { local, remote } = await listBranches(repoPath);
+		return [...local, ...remote];
+	} catch (error) {
+		console.warn(
+			`[workspaces/create] Failed to list branches for ${repoPath}:`,
+			error,
+		);
+		return undefined;
+	}
+}
+
 async function handleNewWorktree({
 	project,
 	prInfo,
@@ -206,15 +222,20 @@ async function handleNewWorktree({
 		localBranchName,
 	});
 
-	const defaultBranch = project.defaultBranch || "main";
+	const knownBranches = await getKnownBranchesSafe(project.mainRepoPath);
+	const baseBranch = resolveWorkspaceBaseBranch({
+		workspaceBaseBranch: project.workspaceBaseBranch,
+		defaultBranch: project.defaultBranch,
+		knownBranches,
+	});
 
 	const worktree = localDb
 		.insert(worktrees)
 		.values({
 			projectId: project.id,
 			path: worktreePath,
 			branch: localBranchName,
-			baseBranch: defaultBranch,
+			baseBranch,
 			gitStatus: null,
 		})
 		.returning()
@@ -233,14 +254,18 @@ async function handleNewWorktree({
 		workspace_id: workspace.id,
 		project_id: project.id,
 		branch: localBranchName,
+		base_branch: baseBranch,
 		source: "pr",
 		pr_number: prInfo.number,
 		is_fork: prInfo.isCrossRepository,
 	});
 
-	await simpleGit(project.mainRepoPath)
-		.raw(["config", `branch.${localBranchName}.base`, defaultBranch])
-		.catch(() => {});
+	await setBranchBaseConfig({
+		repoPath: project.mainRepoPath,
+		branch: localBranchName,
+		baseBranch,
+		isExplicit: false,
+	});
 
 	workspaceInitManager.startJob(workspace.id, project.id);
 	initializeWorkspaceWorktree({
@@ -420,8 +445,12 @@ export const createCreateProcedures = () => {
 					branch,
 				);
 
-				const defaultBranch = project.defaultBranch || "main";
-				const targetBranch = input.baseBranch || defaultBranch;
+				const targetBranch = resolveWorkspaceBaseBranch({
+					explicitBaseBranch: input.baseBranch,
+					workspaceBaseBranch: project.workspaceBaseBranch,
+					defaultBranch: project.defaultBranch,
+					knownBranches: existingBranches,
+				});
 
 				const worktree = localDb
 					.insert(worktrees)
@@ -462,9 +491,12 @@ export const createCreateProcedures = () => {
 					use_existing_branch: input.useExistingBranch ?? false,
 				});
 
-				await simpleGit(project.mainRepoPath)
-					.raw(["config", `branch.${branch}.base`, targetBranch])
-					.catch(() => {});
+				await setBranchBaseConfig({
+					repoPath: project.mainRepoPath,
+					branch,
+					baseBranch: targetBranch,
+					isExplicit: Boolean(input.baseBranch?.trim()),
+				});
 
 				workspaceInitManager.startJob(workspace.id, input.projectId);
 				initializeWorkspaceWorktree({
@@ -805,14 +837,20 @@ export const createCreateProcedures = () => {
 					};
 				}
 
-				const defaultBranch = project.defaultBranch || "main";
+				const knownBranches = await getKnownBranchesSafe(project.mainRepoPath);
+				const baseBranch = resolveWorkspaceBaseBranch({
+					workspaceBaseBranch: project.workspaceBaseBranch,
+					defaultBranch: project.defaultBranch,
+					knownBranches,
+				});
+
 				const worktree = localDb
 					.insert(worktrees)
 					.values({
 						projectId: input.projectId,
 						path: input.worktreePath,
 						branch: input.branch,
-						baseBranch: defaultBranch,
+						baseBranch,
 						gitStatus: {
 							branch: input.branch,
 							needsRebase: false,
@@ -841,10 +879,6 @@ export const createCreateProcedures = () => {
 				setLastActiveWorkspace(workspace.id);
 				activateProject(project);
 
-				await simpleGit(project.mainRepoPath)
-					.raw(["config", `branch.${input.branch}.base`, defaultBranch])
-					.catch(() => {});
-
 				copySupersetConfigToWorktree(project.mainRepoPath, input.worktreePath);
 				const setupConfig = loadSetupConfig({
 					mainRepoPath: project.mainRepoPath,
@@ -856,9 +890,17 @@ export const createCreateProcedures = () => {
 					workspace_id: workspace.id,
 					project_id: project.id,
 					branch: input.branch,
+					base_branch: baseBranch,
 					source: "external_import",
 				});
 
+				await setBranchBaseConfig({
+					repoPath: project.mainRepoPath,
+					branch: input.branch,
+					baseBranch,
+					isExplicit: false,
+				});
+
 				return {
 					workspace,
 					initialCommands: setupConfig?.setup || null,
@@ -933,6 +975,12 @@ export const createCreateProcedures = () => {
 				if (!project) {
 					throw new Error(`Project ${input.projectId} not found`);
 				}
+				const knownBranches = await getKnownBranchesSafe(project.mainRepoPath);
+				const baseBranch = resolveWorkspaceBaseBranch({
+					workspaceBaseBranch: project.workspaceBaseBranch,
+					defaultBranch: project.defaultBranch,
+					knownBranches,
+				});
 
 				let imported = 0;
 
@@ -982,7 +1030,6 @@ export const createCreateProcedures = () => {
 					project.mainRepoPath,
 				);
 				const trackedPaths = new Set(projectWorktrees.map((wt) => wt.path));
-				const defaultBranch = project.defaultBranch || "main";
 
 				const externalWorktrees = allExternalWorktrees.filter((wt) => {
 					if (wt.path === project.mainRepoPath) return false;
@@ -1003,7 +1050,7 @@ export const createCreateProcedures = () => {
 							projectId: input.projectId,
 							path: ext.path,
 							branch,
-							baseBranch: defaultBranch,
+							baseBranch,
 							gitStatus: {
 								branch,
 								needsRebase: false,
@@ -1028,6 +1075,13 @@ export const createCreateProcedures = () => {
 						})
 						.run();
 
+					await setBranchBaseConfig({
+						repoPath: project.mainRepoPath,
+						branch,
+						baseBranch,
+						isExplicit: false,
+					});
+
 					copySupersetConfigToWorktree(project.mainRepoPath, ext.path);
 					imported++;
 				}