From 573cec4a75c79c520dfbec673aaff68b5779229a Mon Sep 17 00:00:00 2001
From: Lawrence Chen <54008264+lawrencecchen@users.noreply.github.com>
Date: Fri, 20 Feb 2026 14:58:58 -0800
Subject: [PATCH] Fix inconsistent Tab/Workspace terminology in settings and
 menus (#187)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unify user-facing labels to consistently use "Workspace" instead of
mixing "Tab" and "Workspace":

- Settings: "New Tab" → "New Workspace" (keyboard shortcuts section)
- Menu: "Tab 1"–"Tab 9" → "Workspace 1"–"Workspace 9" (Cmd+1–9)
- Sidebar context menu: "Close Tabs" → "Close Workspaces",
  "Close Tabs Below/Above" → "Close Workspaces Below/Above"

Fixes https://github.com/manaflow-ai/cmux/issues/182

Co-authored-by: austinpower1258 <austinwang115@gmail.com>
---
 Sources/ContentView.swift              | 6 +++---
 Sources/KeyboardShortcutSettings.swift | 2 +-
 Sources/cmuxApp.swift                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift
index 6c35a10b..e5b5bea3 100644
--- a/Sources/ContentView.swift
+++ b/Sources/ContentView.swift
@@ -1988,7 +1988,7 @@ private struct TabItemView: View {
 
             Divider()
 
-            Button("Close Tabs") {
+            Button("Close Workspaces") {
                 closeTabs(targetIds, allowPinned: true)
             }
             .disabled(targetIds.isEmpty)
@@ -1998,12 +1998,12 @@ private struct TabItemView: View {
             }
             .disabled(tabManager.tabs.count <= 1 || targetIds.count == tabManager.tabs.count)
 
-            Button("Close Tabs Below") {
+            Button("Close Workspaces Below") {
                 closeTabsBelow(tabId: tab.id)
             }
             .disabled(index >= tabManager.tabs.count - 1)
 
-            Button("Close Tabs Above") {
+            Button("Close Workspaces Above") {
                 closeTabsAbove(tabId: tab.id)
             }
             .disabled(index == 0)
diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift
index 82a7fe84..6ecc0e6c 100644
--- a/Sources/KeyboardShortcutSettings.swift
+++ b/Sources/KeyboardShortcutSettings.swift
@@ -35,7 +35,7 @@ enum KeyboardShortcutSettings {
         var label: String {
             switch self {
             case .toggleSidebar: return "Toggle Sidebar"
-            case .newTab: return "New Tab"
+            case .newTab: return "New Workspace"
             case .newWindow: return "New Window"
             case .showNotifications: return "Show Notifications"
             case .jumpToUnread: return "Jump to Latest Unread"
diff --git a/Sources/cmuxApp.swift b/Sources/cmuxApp.swift
index f0966a8c..3a2e5264 100644
--- a/Sources/cmuxApp.swift
+++ b/Sources/cmuxApp.swift
@@ -467,7 +467,7 @@ struct cmuxApp: App {
 
                 // Cmd+1 through Cmd+9 for workspace selection (9 = last workspace)
                 ForEach(1...9, id: \.self) { number in
-                    Button("Tab \(number)") {
+                    Button("Workspace \(number)") {
                         let manager = (AppDelegate.shared?.tabManager ?? tabManager)
                         if let targetIndex = WorkspaceShortcutMapper.workspaceIndex(forCommandDigit: number, workspaceCount: manager.tabs.count) {
                             manager.selectTab(at: targetIndex)