feat(desktop): worktree bar refactor + open workspace modal base branch by AviPeltz · Pull Request #438 · superset-sh/superset

AviPeltz · 2025-12-20T00:33:49Z

Description

Related Issues

Type of Change

Bug fix
[x ] New feature
Documentation
Refactor
Other (please describe):

Testing

Screenshots (if applicable)

Additional Notes

Summary by CodeRabbit

New Features
- Add branch listing API and base-branch detection to support branch-aware workflows
- Base branch selection added to New Workspace flow; baseBranch persisted on worktrees
UI/UX Improvements
- Redesigned workspace header with integrated open-in app menu and path actions
- Improved workspace tabs spacing and sidebar border for clearer layout
Removals / Simplifications
- Removed legacy branch selector and standalone path display components
Documentation
- Added notes on branch-workspace improvements and testing ideas

_{✏️ Tip: You can customize this high-level summary in your review settings.}

coderabbitai · 2025-12-20T00:33:54Z

Walkthrough

Adds remote-aware branch tooling and UI: a new getBranches endpoint, enhanced git utilities (getDefaultBranch, detectBaseBranch, getCurrentBranch), workspace baseBranch lifecycle (create, persist, expose), NewWorkspaceModal branch picker, WorkspaceHeader consolidation, and related UI/export/layout changes.

Changes

Cohort / File(s)	Summary
Projects router `apps/desktop/src/lib/trpc/routers/projects/projects.ts`	New `getBranches` publicProcedure returning normalized local/remote branches with lastCommitDate and computed defaultBranch (with fallbacks and error handling).
Workspaces git utilities `apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts`	Reworked `getDefaultBranch` with multi-fallbacks; added `detectBaseBranch(worktreePath, currentBranch, defaultBranch)` and `getCurrentBranch(repoPath)` exports for base-branch detection and current-branch retrieval.
Workspaces router `apps/desktop/src/lib/trpc/routers/workspaces/workspaces.ts`	Added optional `baseBranch` input to `create`; validates/fetches remote branch, sets/persists `baseBranch` on create and getActive (uses detectBaseBranch); exposes `baseBranch` in worktree payloads.
DB schema `apps/desktop/src/main/lib/db/schemas.ts`	`Worktree` interface extended with optional `baseBranch?: string
New workspace UI `apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx`	Adds branch fetching (uses `getBranches`), searchable popover branch picker, loading/error handling, auto-default selection, and sends `baseBranch` in create payload.
WorkspaceHeader redesign `apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/WorkspaceHeader.tsx`	Replaces prior PathDisplay/BranchSelector pieces with an integrated header: branch/base-branch display, app-open dropdown, copy-path action, and TRPC-backed mutations.
Removed header subcomponents `apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/BranchSelector/` `apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/PathDisplay/`	Deleted `BranchSelector` and `PathDisplay` components and their index re-exports.
UI layout & visuals `apps/desktop/src/renderer/screens/main/components/WorkspaceView/index.tsx` `apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/index.tsx`	Moved WorkspaceHeader placement relative to ContentView; added sidebar right border styling and container sizing adjustments.
Workspace tab UI `apps/desktop/src/renderer/screens/main/components/TopBar/WorkspaceTabs/WorkspaceItem.tsx`	Adjusted padding and conditionally hide delete/close button for branch workspaces; simplified tooltip/aria-label.
Open-in exports `apps/desktop/src/renderer/components/OpenInButton/OpenInButton.tsx` `apps/desktop/src/renderer/components/OpenInButton/index.ts`	Made `APP_OPTIONS` and `JETBRAINS_OPTIONS` public exports and re-exported alongside existing APIs.
Docs `apps/desktop/docs/BRANCH_WORKSPACE_IMPROVEMENTS.md`	New docs describing further branch-workspace improvement ideas and testing notes.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Pay extra attention to:
- getDefaultBranch and detectBaseBranch logic (remote vs local fallbacks, merge-base/ahead-count calculations).
- Workspaces create and getActive code paths that validate/fetch remote branches and persist baseBranch to DB.
- New UI interactions in NewWorkspaceModal and WorkspaceHeader: TRPC calls, loading/error states, and selection propagation.
- Removal of BranchSelector/PathDisplay and the integration correctness in the new header layout.

Possibly related PRs

feat(desktop): main terminal vs worktrees terminal #437 — Adds/overlaps branch-management APIs and git utilities (getBranches, getCurrentBranch) used by this PR.
Add dropdown create modal #391 — Modifies workspaces.create flow and adds base-branch selection UI; strongly related to baseBranch propagation here.
Add 'Open in...' dropdown for external apps #175 — Changes WorkspaceHeader and open-in-app flows; touches the same TRPC procedures and UI areas consolidated in this PR.

Poem

🐰 I nibble branches, sniff the git, and hum,
I find the base where new worktrees come from.
Header stitched, old bits retired,
Base branches tracked and freshly wired.
Thump—new branches, hop to the drum!

Pre-merge checks and finishing touches

❌ Failed checks (2 warnings)

Check name	Status	Explanation	Resolution
Description check	⚠️ Warning	The PR description is incomplete. It only contains the template structure with no actual details filled in—no description of changes, related issues, testing steps, or additional context provided.	Fill in the Description section with details about the base branch feature and worktree bar refactor, add any related issues, describe testing performed, and provide additional context as needed.
Docstring Coverage	⚠️ Warning	Docstring coverage is 11.11% which is insufficient. The required threshold is 80.00%.	You can run `@coderabbitai generate docstrings` to improve docstring coverage.

✅ Passed checks (1 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately describes the main changes: a worktree bar refactor and base branch selection in the workspace modal, both of which are central to the changeset.

✨ Finishing touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch scientific-toad-d97ce2

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 1

🧹 Nitpick comments (3)

apps/desktop/src/lib/trpc/routers/projects/projects.ts (2)
181-195: Consider wrapping git.branch(["-a"]) in try-catch for resilience.

If the repository path is invalid or inaccessible, this call will throw and propagate an unhandled error to the client. Other git operations in this procedure have try-catch blocks for graceful degradation.
Proposed fix
-				// Get all branches (local and remote)
-				const branchSummary = await git.branch(["-a"]);
-
-				const localBranches: string[] = [];
-				const remoteBranches: string[] = [];
-
-				for (const name of Object.keys(branchSummary.branches)) {
+				// Get all branches (local and remote)
+				let branchSummary;
+				try {
+					branchSummary = await git.branch(["-a"]);
+				} catch {
+					// If we can't get branches, return empty with default
+					const defaultBranch = project.defaultBranch ?? await getDefaultBranch(project.mainRepoPath);
+					return { branches: [], defaultBranch };
+				}
+
+				const localBranches: string[] = [];
+				const remoteBranches: string[] = [];
+
+				for (const name of Object.keys(branchSummary.branches)) {
212-235: Add defensive check for malformed git output lines.

If a line doesn't contain a space (unexpected format), lastSpaceIdx will be -1, causing substring(0, -1) to return an empty string and parseInt to return NaN. Consider adding a guard.
Proposed fix
 					for (const line of branchInfo.trim().split("\n")) {
 						if (!line) continue;
 						const lastSpaceIdx = line.lastIndexOf(" ");
+						if (lastSpaceIdx === -1) continue; // Skip malformed lines
 						let branch = line.substring(0, lastSpaceIdx);
 						const timestamp = Number.parseInt(
 							line.substring(lastSpaceIdx + 1),
 							10,
 						);
+						if (Number.isNaN(timestamp)) continue; // Skip if timestamp is invalid
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/WorkspaceHeader.tsx (1)

156-162: Consider cross-platform keyboard shortcut display.

The hardcoded ⌘O and ⌘⇧C shortcuts are macOS-specific. If the desktop app targets Windows/Linux, consider using a utility to render platform-appropriate shortcuts (e.g., Ctrl+O on Windows).

📜 Review details

Configuration used: defaults

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b2ecbc3 and 9c80f28.

📒 Files selected for processing (15)

apps/desktop/src/lib/trpc/routers/projects/projects.ts (1 hunks)
apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts (2 hunks)
apps/desktop/src/lib/trpc/routers/workspaces/workspaces.ts (7 hunks)
apps/desktop/src/main/lib/db/schemas.ts (1 hunks)
apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx (9 hunks)
apps/desktop/src/renderer/components/OpenInButton/OpenInButton.tsx (2 hunks)
apps/desktop/src/renderer/components/OpenInButton/index.ts (1 hunks)
apps/desktop/src/renderer/screens/main/components/TopBar/WorkspaceTabs/WorkspaceItem.tsx (2 hunks)
apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/index.tsx (1 hunks)
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/WorkspaceHeader.tsx (1 hunks)
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/BranchSelector/BranchSelector.tsx (0 hunks)
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/BranchSelector/index.ts (0 hunks)
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/PathDisplay/PathDisplay.tsx (0 hunks)
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/PathDisplay/index.ts (0 hunks)
apps/desktop/src/renderer/screens/main/components/WorkspaceView/index.tsx (1 hunks)

💤 Files with no reviewable changes (4)

apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/BranchSelector/index.ts
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/BranchSelector/BranchSelector.tsx
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/PathDisplay/index.ts
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/components/PathDisplay/PathDisplay.tsx

🧰 Additional context used

📓 Path-based instructions (10)

apps/desktop/**/*.{ts,tsx,js,jsx}

📄 CodeRabbit inference engine (apps/desktop/AGENTS.md)

apps/desktop/**/*.{ts,tsx,js,jsx}: For Electron interprocess communication, ALWAYS use trpc as defined in src/lib/trpc
Use alias as defined in tsconfig.json when possible
Prefer zustand for state management if it makes sense. Do not use effect unless absolutely necessary.

Files:

apps/desktop/src/lib/trpc/routers/projects/projects.ts
apps/desktop/src/renderer/screens/main/components/WorkspaceView/WorkspaceHeader/WorkspaceHeader.tsx
apps/desktop/src/renderer/screens/main/components/WorkspaceView/index.tsx
apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
apps/desktop/src/main/lib/db/schemas.ts
apps/desktop/src/renderer/screens/main/components/WorkspaceView/Sidebar/index.tsx
apps/desktop/src/renderer/components/OpenInButton/OpenInButton.tsx
apps/desktop/src/lib/trpc/routers/workspaces/workspaces.ts
apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts
apps/desktop/src/renderer/screens/main/components/TopBar/WorkspaceTabs/WorkspaceItem.tsx
apps/desktop/src/renderer/components/OpenInButton/index.ts

**/*.{ts,tsx}