[AviPeltz]

Summary

• Replace folder icon with laptop icon (LuLaptop) for branch workspaces in the sidebar
• Show "local" as the title with branch name displayed below for the default branch workspace
• Update collapsed tooltip to show "local" + branch name
• Adjust layout so single-line items (title matches branch) stay vertically centered, while two-line items top-align the icon

Test plan

• Verify the branch workspace shows a laptop icon in both collapsed and expanded sidebar
• Verify the title reads "local" with the branch name below
• Verify worktree workspaces are unaffected (still show LuFolderGit2 icon and original title logic)
• Verify collapsed sidebar tooltip shows "local" and the branch name
• Verify single-line worktree items remain vertically centered

Summary by CodeRabbit

• Improvements
  • Replaced branch workspace icon from folder to laptop in collapsed view
  • Show "local" as the title for branch workspaces and display branch as subtitle when applicable
  • Simplified tooltip/hover content to a consistent local/branch presentation
  • Improved spacing and alignment in the workspace sidebar for better visual balance
  • Adjusted status indicator positioning for consistent alignment with subtitle changes

[coderabbitai]

📝 Walkthrough

Walkthrough

WorkspaceListItem rendering was updated: branch workspaces now use a Laptop icon and show a "local" title/tooltip; subtitle visibility logic was inverted to show for branch workspaces, layout spacing and status indicator positions were adjusted; no public API changes.

Changes

Cohort / File(s)

Summary

Branch Workspace Rendering apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx

Replaced branch icon from LuFolder to LuLaptop; inverted showBranchSubtitle so subtitle displays when isBranchWorkspace is true; title/tooltip now show "local" for branch workspaces and the branch beneath in hover; removed fixed width constraint, added small top margin to icon wrapper when subtitle visible, expanded collapsed button container, and nudged status/indicator positions. Drag/drop and props unchanged.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

• fix(desktop): show branch subtitle for main workspace list item when branch name differs #1201: Modifies showBranchSubtitle and collapsed tooltip/subtitle rendering in WorkspaceListItem.tsx.
• feature (desktop): sidebar style and close functionality #618: Adjusts icon and tooltip rendering in the same WorkspaceSidebar/WorkspaceListItem component.
• PR #1198: Related edits to WorkspaceSidebar hover card and branch display logic that overlap branch display changes.

Poem

🐰 A laptop perch where folders once lay,
Local whispers lead the branch display,
Icons lifted, margins aligned just so,
Subtitles bloom where branch breezes blow,
Hops of joy — the sidebar's ready to go!

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title 'feat(desktop): redesign branch workspace sidebar display' directly describes the main change—updating the UI presentation of branch workspaces in the sidebar.
Description check	✅ Passed	The description includes a clear summary of changes, a comprehensive test plan, and covers all critical aspects of the PR. It aligns well with the provided template structure.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch feat/branch-workspace-sidebar-redesign

---

No actionable comments were generated in the recent review. 🎉

🧹 Recent nitpick comments

apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx (1)

361-363: Consider extracting the "local" label to a named constant.

The string "local" is used as the display title in both the collapsed tooltip (Line 361) and the expanded title (Line 529). Extracting it to a module-level constant (e.g., BRANCH_WORKSPACE_LABEL) would keep these in sync and make future copy changes a single-line edit.

♻️ Suggested refactor

Add near the top of the file (e.g., after Line 55):

 const WORKSPACE_TYPE = "WORKSPACE";
+const BRANCH_WORKSPACE_LABEL = "local";

Then replace usages:

-						<span className="font-medium">local</span>
+						<span className="font-medium">{BRANCH_WORKSPACE_LABEL}</span>

-								{isBranchWorkspace ? "local" : name || branch}
+								{isBranchWorkspace ? BRANCH_WORKSPACE_LABEL : name || branch}

As per coding guidelines, "Extract hardcoded magic numbers, strings, and enums to named constants at module top instead of leaving them inline in logic".

Also applies to: 529-529

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[github-actions]

🧹 Preview Cleanup Complete

The following preview resources have been cleaned up:

• ⚠️ Neon database branch
• ⚠️ Electric Fly.io app
• ⚠️ Streams Fly.io app

Thank you for your contribution! 🎉