fix(desktop): show base branch in changes view

apps/desktop/src/lib/trpc/routers/changes/file-contents.ts

@@ -14,7 +14,7 @@ export const createFileContentsRouter = () => {
 					worktreePath: z.string(),
 					filePath: z.string(),
 					oldPath: z.string().optional(),
-					category: z.enum(["against-main", "committed", "staged", "unstaged"]),
+					category: z.enum(["against-base", "committed", "staged", "unstaged"]),
 					commitHash: z.string().optional(),
 					defaultBranch: z.string().optional(),
 				}),
@@ -57,7 +57,7 @@ export const createFileContentsRouter = () => {
 	});
 };
 
-type DiffCategory = "against-main" | "committed" | "staged" | "unstaged";
+type DiffCategory = "against-base" | "committed" | "staged" | "unstaged";
 
 interface FileVersions {
 	original: string;
@@ -74,8 +74,8 @@ async function getFileVersions(
 	commitHash?: string,
 ): Promise<FileVersions> {
 	switch (category) {
-		case "against-main":
-			return getAgainstMainVersions(git, filePath, originalPath, defaultBranch);
+		case "against-base":
+			return getAgainstBaseVersions(git, filePath, originalPath, defaultBranch);
 
 		case "committed":
 			if (!commitHash) {
@@ -91,7 +91,7 @@ async function getFileVersions(
 	}
 }
 
-async function getAgainstMainVersions(
+async function getAgainstBaseVersions(
 	git: ReturnType<typeof simpleGit>,
 	filePath: string,
 	originalPath: string,

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

@@ -43,7 +43,7 @@ export const createStatusRouter = () => {
 				return {
 					branch: parsed.branch,
 					defaultBranch,
-					againstMain: branchComparison.againstMain,
+					againstBase: branchComparison.againstBase,
 					commits: branchComparison.commits,
 					staged: parsed.staged,
 					unstaged: parsed.unstaged,
@@ -90,7 +90,7 @@ export const createStatusRouter = () => {
 
 interface BranchComparison {
 	commits: GitChangesStatus["commits"];
-	againstMain: ChangedFile[];
+	againstBase: ChangedFile[];
 	ahead: number;
 	behind: number;
 }
@@ -100,7 +100,7 @@ async function getBranchComparison(
 	defaultBranch: string,
 ): Promise<BranchComparison> {
 	let commits: GitChangesStatus["commits"] = [];
-	let againstMain: ChangedFile[] = [];
+	let againstBase: ChangedFile[] = [];
 	let ahead = 0;
 	let behind = 0;
 
@@ -128,17 +128,17 @@ async function getBranchComparison(
 				"--name-status",
 				`origin/${defaultBranch}...HEAD`,
 			]);
-			againstMain = parseNameStatus(nameStatus);
+			againstBase = parseNameStatus(nameStatus);
 
-			await applyNumstatToFiles(git, againstMain, [
+			await applyNumstatToFiles(git, againstBase, [
 				"diff",
 				"--numstat",
 				`origin/${defaultBranch}...HEAD`,
 			]);
 		}
 	} catch {}
 
-	return { commits, againstMain, ahead, behind };
+	return { commits, againstBase, ahead, behind };
 }
 
 async function applyUntrackedLineCount(

apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/ChangesContent/ChangesContent.tsx

@@ -28,7 +28,7 @@ export function ChangesContent() {
 
 	const selectedFileState = getSelectedFile(worktreePath || "");
 	const selectedFile = selectedFileState?.file ?? null;
-	const selectedCategory = selectedFileState?.category ?? "against-main";
+	const selectedCategory = selectedFileState?.category ?? "against-base";
 	const selectedCommitHash = selectedFileState?.commitHash ?? null;
 
 	const { data: branchData } = trpc.changes.getBranches.useQuery(

apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/ChangesView/ChangesView.tsx

@@ -165,7 +165,7 @@ export function ChangesView() {
 
 	if (
 		!status ||
-		!status.againstMain ||
+		!status.againstBase ||
 		!status.commits ||
 		!status.staged ||
 		!status.unstaged ||
@@ -179,7 +179,7 @@ export function ChangesView() {
 	}
 
 	const hasChanges =
-		status.againstMain.length > 0 ||
+		status.againstBase.length > 0 ||
 		status.commits.length > 0 ||
 		status.staged.length > 0 ||
 		status.unstaged.length > 0 ||
@@ -225,19 +225,19 @@ export function ChangesView() {
 				</div>
 			) : (
 				<div className="flex-1 overflow-y-auto">
-					{/* Against Main */}
+					{/* Against base branch */}
 					<CategorySection
-						title="Against Main"
-						count={status.againstMain.length}
-						isExpanded={expandedSections["against-main"]}
-						onToggle={() => toggleSection("against-main")}
+						title={`Against ${effectiveBaseBranch}`}
+						count={status.againstBase.length}
+						isExpanded={expandedSections["against-base"]}
+						onToggle={() => toggleSection("against-base")}
 					>
 						<FileList
-							files={status.againstMain}
+							files={status.againstBase}
 							viewMode={fileListViewMode}
 							selectedFile={selectedFile}
 							selectedCommitHash={selectedCommitHash}
-							onFileSelect={(file) => handleFileSelect(file, "against-main")}
+							onFileSelect={(file) => handleFileSelect(file, "against-base")}
 						/>
 					</CategorySection>
 

apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/ChangesView/components/CategorySection/CategorySection.tsx

@@ -47,7 +47,9 @@ export function CategorySection({
 					) : (
 						<HiChevronRight className="w-4 h-4 text-muted-foreground shrink-0" />
 					)}
-					<span className="text-sm font-medium">{title}</span>
+					<span className="text-sm font-medium truncate text-ellipsis">
+						{title}
+					</span>
 					<span className="text-xs text-muted-foreground shrink-0">
 						({count})
 					</span>

apps/desktop/src/renderer/stores/changes/store.ts

@@ -44,7 +44,7 @@ const initialState = {
 	viewMode: "side-by-side" as DiffViewMode,
 	fileListViewMode: "grouped" as FileListViewMode,
 	expandedSections: {
-		"against-main": true,
+		"against-base": true,
 		committed: true,
 		staged: true,
 		unstaged: true,
@@ -67,7 +67,7 @@ export const useChangesStore = create<ChangesState>()(
 							[worktreePath]: file
 								? {
 										file,
-										category: category ?? "against-main",
+										category: category ?? "against-base",
 										commitHash: commitHash ?? null,
 									}
 								: null,

apps/desktop/src/shared/changes-types.ts

@@ -13,7 +13,7 @@ export type FileStatus =
 
 /** Change categories for organizing the sidebar */
 export type ChangeCategory =
-	| "against-main"
+	| "against-base"
 	| "committed"
 	| "staged"
 	| "unstaged";
@@ -41,7 +41,7 @@ export interface CommitInfo {
 export interface GitChangesStatus {
 	branch: string;
 	defaultBranch: string; // Default branch (main/master)
-	againstMain: ChangedFile[]; // All files changed vs default branch
+	againstBase: ChangedFile[]; // All files changed vs base branch
 	commits: CommitInfo[]; // Individual commits on branch (not on default)
 	staged: ChangedFile[];
 	unstaged: ChangedFile[];