From e139972a8e9de0a0cf70f1152fb11fc7c1630ecf Mon Sep 17 00:00:00 2001 From: Satya Patel Date: Thu, 1 Oct 2026 18:24:36 -0700 Subject: [PATCH 1/2] fix(desktop): move the ship controls back into the workspace tab bar Reverses #7958. The Changes/PR control and the open-in button return to the pane tab bar's trailing slot, before the sidebar toggle, so they stay reachable while the right sidebar is closed. The sidebar's top strip is back to Pages and Run. - Closing Changes takes the sidebar down with it again when the sidebar is on the Changes tab; getWorkspaceSidebarTab and its test return. - The strip keeps its 48px height from #8023 and still sizes the Run hotkey hint off the strip width. Co-Authored-By: Claude --- .../ChangesControl/ChangesControl.tsx | 8 +++--- .../PRStatusGroup/PRStatusGroup.tsx | 2 +- .../components/ShipControl/ShipControl.tsx | 2 +- .../WorkspaceSidebar/WorkspaceSidebar.tsx | 9 +----- .../PRActionHeader/PRActionHeader.tsx | 15 ++-------- .../useWorkspacePaneOpeners.ts | 17 +++++++++-- .../v2-workspace/$workspaceId/page.tsx | 28 +++++++++---------- .../utils/setWorkspaceSidebarTab/index.ts | 1 + .../setWorkspaceSidebarTab.test.ts | 16 ++++++++++- .../setWorkspaceSidebarTab.ts | 17 +++++++++++ 10 files changed, 70 insertions(+), 45 deletions(-) diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/ChangesControl/ChangesControl.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/ChangesControl/ChangesControl.tsx index 374f09471ff..6f8c88409b5 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/ChangesControl/ChangesControl.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/ChangesControl/ChangesControl.tsx @@ -20,7 +20,7 @@ interface ChangesControlProps { } /** - * Sidebar-strip Changes control: one bordered button with a single face covering + * Tab-bar Changes control: one bordered button with a single face covering * the branch's whole lifecycle. Before a PR exists the face is the diff * stats with the ship actions (commit → push → create PR) in the chevron — * or the ship action itself once the tree is clean; once a PR exists the @@ -64,7 +64,7 @@ export const ChangesControl = memo(function ChangesControl({ !hasPr && stats != null && stats.fileCount > 0 ? stats : null; return ( -
+
{visibleStats && (