TabManager decomposition: Wave 3+4 sub-models (Browser/Notifications/Sidebar/Workspaces/Panes/FocusHistory) + settings convergence; TabManager becomes a composition root

[azooz2003-bit]

Stacked diff on purpose: this PR targets feat-sidebar-git (#5907), the CmuxSidebarGit extraction it builds on. Do not retarget to main and do not rebase onto the 3c branch.

Wave-3 + Wave-4 drain of Sources/TabManager.swift per the TabManager decomposition blueprint. TabManager at this PR's base: 8,366 lines. Now: 6,067 lines (original god object: 11,841). TabManager is now a per-window composition root: it owns the window (NSWindow, chrome/title), presents NSAlerts, calls session persistence, keeps the DEBUG UI-test scaffolding, and composes the per-domain sub-models below, hosting their seams and forwarding its legacy API one-to-one (zero call-site churn outside TabManager.swift in the Wave-4 tranches).

What moved where

Wave 3 (landed earlier in this PR):

1. CmuxSettings convergence: the FooSettings namespace-enum UserDefaults keys converge onto catalog DefaultsKey<Value> entries through a synchronous SettingsReading/SettingsWriting seam (UserDefaultsSettingsClient). Key strings byte-identical (wire format).
2. CmuxBrowser: @MainActor @Observable BrowserModel + bounded RecentlyClosedBrowserStack behind BrowserManaging.
3. CmuxNotifications: per-panel NotificationDismissalModel behind NotificationDismissing with synchronous NotificationDismissalHosting.
4. CmuxSidebar: SidebarMultiSelectionModel + typed multi-selection events + pure detail-visibility resolvers.

Wave 4:

5. CmuxWorkspaceNavigation: @MainActor @Observable FocusHistoryModel owns the focus-history back/forward stack behind FocusHistoryNavigating, hosted through the synchronous FocusHistoryHosting seam. 15 package tests.
6. CmuxPanes: SplitDirection/ResizeDirection values + pure split-geometry planning (equalizeDividerPlan, resizeDividerAdjustment) with a stateless PaneLayoutService applying plans to BonsplitController (plan-vs-apply). 10 package tests.
7. CmuxWorkspaces — WorkspacesModel storage move (tranche 4a): TabManager's @Published tabs / workspaceGroups / selectedTabId stored state moved into @MainActor @Observable WorkspacesModel<Tab>, generic over the WorkspaceTabRepresenting seam (id/groupId/isPinned/currentDirectory) that Workspace satisfies. The legacy @Published property-observer semantics are preserved exactly through the synchronous WorkspacesHosting hooks: objectWillChange plus the legacy Combine bridge publishers (tabsPublisher/selectedTabIdPublisher, CurrentValueSubject = new-value-at-willSet + replay-on-subscribe, the Published.Publisher contract) fire in willSet; the selection didSet side-effect chain runs verbatim from the didSet hook; hooks fire on every assignment including equal values (@Published never compared). The eleven remaining $tabs/$selectedTabId Combine subscribers (AppDelegate, CmuxConfig, ContentView, BackgroundWorkspacePrimeCoordinator, MobileWorkspaceListObserver, DEBUG scaffolding) moved to the bridge publishers after per-site analysis (dropFirst/throttle/switchToLatest/replay all subject-compatible; sinks that read tabManager.tabs during emission still observe the pre-change value).
   Boundary: tabs/groups/selection is the window's workspace-list domain state; the bridge publishers are one documented legacy seam, deleted when those subscribers modernize to @observable observation.
8. CmuxWorkspaces — group + reorder flows (tranche 4b): the ~1,500-line group/reorder cluster left TabManager.
   • WorkspacesModel owns the invariant/traversal layer for the data it stores: top-level row derivation, pin-tier clamps, anchor-first ordering, group-run/contiguity normalization, group-order sync, membership assignment, anchor-close dissolve, selection auto-expand.
   • WorkspaceReorderCoordinator: move-to-top, single/before-after/batch reorders (owns WorkspaceReorderPlanner), sidebar drag planning, drag-inferred group membership, pin toggles/batch pinning.
   • WorkspaceGroupCoordinator: group creation (fresh anchor + child adoption + stable creation placement), createWorkspaceInGroup, member add/remove, ungroup/delete, rename, collapse/pin/color/icon/anchor, group-slot moves, auto-naming via host-provided localized format.
   • Seams: WorkspaceOrderHosting (the legacy order-change NotificationCenter + event-bus publication stays app-side) and WorkspaceGroupHosting (workspace creation/teardown on the Workspace god, selection entry point, sidebar multi-selection sync, String(localized:) format, settings read, RenderableSystemSymbol normalization).
   • 20 package tests: hook parity, tier ordering, batch-reorder validation, batch-unpin order parity, group creation/dissolve/anchor invariants, collapse focus/selection stripping.
     Boundary justification (per package): CmuxWorkspaces owns one full domain — the window's workspace list, ordering, grouping, and selection — as model + coordinators; it depends only on CmuxSettings (for the WorkspaceGroupNewPlacement value type). It does not absorb pane or navigation state (separate domains, separate packages), and nothing in it imports AppKit.

Verification

Per tranche: package swift build + swift test green (CmuxWorkspaces: 20 tests); swift_file_length_budget.py and lint-ios-package-conventions.sh exit 0; tagged cloud app build green (tabmod). Adversarial machine-diff per tranche against the pre-deletion file state: tranche 4a's moved selection willSet/didSet bodies appear as unchanged context lines in the git diff itself; tranche 4b compared all 57 moved method bodies after mechanical normalization (model./host. prefixes, Tab type substitution) — 50 byte-identical, 7 differing only at the intended host-seam inversions (workspace creation/close/select/sidebar-sync/localized-format/settings/icon-normalization hooks). Defaults keys/codecs untouched.

What stays in TabManager, and why (composition-root residue)

• Window ownership + chrome: NSWindow weak ref, title/backdrop updates, tab-bar inset sync (blueprint-sanctioned residue).
• NSAlert presentation + the synchronous close-confirmation flow: converting confirmClose to the planned async CloseConfirming protocol requires migrating the six Bool-returning close entry points (closeWorkspaceWithConfirmation, tab-close gestures, etc.) and their UI callers off the nested-runloop runModal contract — a behavior change (gesture handlers would return before the user decides), not a faithful lift. It needs its own observer-analysis commit; doing it by keeping a parallel sync path would create two sources of truth. The group-bookkeeping half of close (dissolveGroupsAnchoredBy) already lives in WorkspacesModel.
• Workspace creation/close/detach choreography (addWorkspace, closeWorkspace, detachWorkspace/attachWorkspace, TabManager+DetachedWorkspace.swift): these sequence Workspace.init, panel/bonsplit access, AppDelegate, Sentry/UITestRecorder, and service wiring. Until the Workspace god decomposes (separate PR fleet), lifting them would be pure host-hook ping-pong that has to be redone when Workspace changes shape. The pure parts (placement resolution, creation snapshots, insert-index clamps) are already value-typed.
• Session persistence extension: sessionSnapshot/restoreSessionSnapshot/sessionAutosaveFingerprint are projections over deep Workspace state; the encode/decode + file write live in SessionPersistence.swift driven by AppDelegate (app lifecycle). The SessionSnapshotRepository/SessionSnapshotStoring extraction therefore lands with the AppDelegate/Workspace fleet, where the store and its callers both live.
• DEBUG UI-test scaffolding (~1,000 lines) and VsyncIOSurfaceTimelineState (#if DEBUG, sanctioned).
• Domain forwarders: sidebar git/PR, browser zoom/devtools, find/search, split ops — one-line forwards into the owned sub-models/services.

Remaining (stacked slices, not this PR)

• PaneTreeModel (CmuxPanes): the Bonsplit pane-tree state lives in Workspace/BonsplitController, not TabManager — the TabManager-side pane work (geometry planning + PaneLayoutService apply seam) is complete in this PR; the tree model itself is blocked on the Workspace god fleet.
• Async CloseConfirming + close-coordinator (see residue note above).
• SessionSnapshotRepository behind SessionSnapshotStoring (AppDelegate fleet).
• UI packages (CmuxWorkspacesUI/CmuxPanesUI) once the corresponding views leave ContentView.

Hard rules followed: faithful lift first; one source of truth (legacy types deleted, call sites converged); no free functions, no namespace enums in packages; String(localized:) app-side only.

🤖 Generated with Claude Code

Summary by CodeRabbit

• New Features

  • Recently closed browser panels can now be restored.
  • Workspace grouping in the sidebar with collapsible groups and customizable anchors.
  • Improved focus history navigation with back/forward menu support.
  • Split panel equalization and keyboard resizing improvements.
  • Enhanced workspace color palette customization.
  • Refined notification dismissal handling for better unread state management.

• Improvements

  • Better sidebar detail visibility controls and workspace organization.

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
cmux	Ready	Preview, Comment	Jun 13, 2026 7:45pm
cmux-staging	Building	Preview, Comment	Jun 13, 2026 7:45pm

[coderabbitai]

📝 Walkthrough

Walkthrough

New packages extract browser history, notification dismissal, pane geometry, settings, sidebar, workspace navigation, and workspaces logic into reusable modules. The app target and tests are rewired to those package APIs, new catalog-backed settings are introduced, and the Xcode project is updated for the added packages and source files.

Changes

Package extraction and app adoption

Layer / File(s)	Summary
Browser, notifications, and panes foundations Packages/CmuxBrowser/*, Packages/CmuxNotifications/*, Packages/CmuxPanes/*	BrowserModel, RecentlyClosedBrowserStack, notification dismissal types, and pane split planning/result types are added with their package manifests and tests.
Settings and sidebar shared primitives Packages/CmuxSettings/*, Packages/CmuxSidebar/*	Typed settings access, new catalog sections, sidebar visibility structs, and sidebar multi-selection event/model types are added with package tests.
Workspace navigation focus history Packages/CmuxWorkspaceNavigation/*, Sources/FocusHistory.swift	Focus-history host/model/menu types move into CmuxWorkspaceNavigation, and the app-side file drops the relocated value types.
Workspaces domain model, coordinators, and reorder engine Packages/CmuxWorkspaces/*	Workspace tab/group contracts, the observable model, invariants, reorder planner/coordinators, and package tests are added in CmuxWorkspaces.
App integration with extracted modules Sources/AppDelegate*, Sources/CmuxConfig.swift, Sources/CommandPalette/*, Sources/ContentView.swift, Sources/Feed/*, Sources/KeyboardShortcutSettingsFileStore*, Sources/Mobile/*, Sources/Sidebar/*, Sources/TerminalController*, Sources/TerminalNotificationStore.swift, Sources/VerticalTabsSidebar+WorkspaceGroups.swift, Sources/Workspace.swift, Sources/WorkspaceIndicatorStyle+Display.swift, Sources/WorkspacePlacement+Resolution.swift, Sources/WorkspaceTabColor*, Sources/cmuxApp*, Sources/GhosttyTerminalView.swift, Sources/AppleScriptSupport.swift	The app target switches to the new modules, publisher-based observation, typed multi-selection events, catalog-backed settings reads, workspace placement resolution, indicator style display, and workspace tab color handling.
Project and dependency wiring updates cmux.xcodeproj/project.pbxproj	The project adds the new local package references, product dependencies, framework links, and source entries for the extracted files.
App test migration to package APIs and settings catalog cmuxTests/*	Tests are updated to use the new package types, disambiguate duplicate symbols, and assert through SettingCatalog/UserDefaultsSettingsClient instead of legacy helpers.

Sequence Diagram(s)

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch feat-tabmanager-models

[greptile-apps]

Greptile Summary

Wave 3+4 TabManager decomposition extracting six sub-models (BrowserModel, NotificationDismissalModel, SidebarMultiSelectionModel, FocusHistoryModel, PaneLayoutService, and a synchronous UserDefaultsSettingsClient) into dedicated SwiftPM packages, while converging legacy namespace-enum UserDefaults keys onto the typed SettingCatalog. TabManager becomes a pure composition root that attaches each model to itself as its host seam.

• New sub-models (@MainActor @Observable) replace ~1 500 lines of inline TabManager state; all navigation loops, suppression depth guards, and invalidation logic are faithful one-for-one lifts — no behavioral change intended or observed.
• Settings convergence: SidebarBranchLayoutSettings, SidebarWorkspaceDetailSettings, SidebarPullRequestClickabilitySettings, WorkspaceAutoReorderSettings, and the sidebar indicator-style resolver are deleted and replaced by catalog reads through UserDefaultsSettingsClient; legacy indicator strings ("rail", "wash", …) map through WorkspaceIndicatorStyle.decodeFromUserDefaults exactly as before.
• New CmuxPanes package extracts split-equalize and resize-divider geometry into pure, tested ExternalTreeNode extensions applied by a stateless PaneLayoutService.

Confidence Score: 5/5

This PR is safe to merge; all logic lifts are faithful and the new sub-models correctly attach to their host seams with no new mutable shared state introduced.

The decomposition is structurally sound: sub-models are @mainactor @observable, weak host references prevent retain cycles, suppression depth is guarded against underflow, and the settings key strings are treated as wire-format constants. Navigation loop invariants in FocusHistoryModel and the atomic latch read-then-clear in NotificationDismissalModel both match the original TabManager behavior. The one edge case flagged (overflow removing a just-inserted entry in the preservingForwardBranch path when historyIndex is −1 with non-empty history) is a pre-existing condition carried over faithfully from the original code and is unreachable in normal operation.

No files require special attention; the largest new file (FocusHistoryModel.swift at 433 lines) is well-decomposed and covered by dedicated tests.

Important Files Changed

Filename	Overview
Sources/TabManager.swift	~1500 lines removed; TabManager now composes FocusHistoryModel, NotificationDismissalModel, BrowserModel, SidebarMultiSelectionModel, and PaneLayoutService as sub-models; focusHistoryRevision @published preserved for downstream observers; attach calls present in init.
Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/FocusHistoryModel.swift	433-line faithful lift of focus-history sub-model from TabManager; @mainactor @observable; navigation loops, invalidation, and menu snapshot logic all correct. Suppression depth guard against underflow is present.
Packages/CmuxNotifications/Sources/CmuxNotifications/NotificationDismissalModel.swift	Per-window notification dismissal sub-model; correctly implements atomic read-then-clear of suppressFocusFlash in dismissFocusedPanelNotificationIfActive while preserving the latch for the explicit-focus path.
Sources/TabManager+NotificationDismissalHosting.swift	New hosting conformance; all store accesses forward through AppDelegate.shared?.notificationStore (matching legacy pattern); no new global state.
Sources/TabManager+FocusHistoryHosting.swift	New hosting conformance for focus history; workspace/panel existence checks and selection mutations mirror legacy optional-chained reads; private members (focusSelectedTabPanel, revision counter) remain in TabManager.swift as required.
Packages/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsClient.swift	Synchronous SettingsWriting conformer; nonisolated(unsafe) for the UserDefaults property is correctly justified; reads primary key only (not legacyUserDefaultsKeys), matching stated scope.
Packages/CmuxBrowser/Sources/CmuxBrowser/RecentlyClosed/RecentlyClosedBrowserStack.swift	Bounded LIFO stack; capacity clamped to ≥1 at init; push, pop, purge-by-workspace all correct; Sendable and value-type.
Packages/CmuxPanes/Sources/CmuxPanes/PaneLayoutService.swift	Stateless @mainactor service wrapping equalize and resize geometry plans; delegates plan computation to ExternalTreeNode extension; output is identical to removed TabManager inline logic.
Sources/WorkspaceTabColorSettings.swift	280-line verbatim lift of workspace tab color settings from TabManager; migration correctly erases legacy keys on persist; nextCustomColorName while-true loop is bounded by user-owned collection size (practical limit ~100).
Packages/CmuxSidebar/Sources/CmuxSidebar/MultiSelection/SidebarMultiSelectionModel.swift	@observable model replacing @published sidebarSelectedWorkspaceIds; collapseSelection unconditionally posts notification matching legacy clearSidebarMultiSelection(except:); all mutation paths (subtract, intersect, replace) faithfully lifted.
Sources/ContentView.swift	SidebarTabItemSettingsSnapshot migrated to SettingCatalog/UserDefaultsSettingsClient; notification handlers updated to match new SidebarMultiSelectionModel object identity check; SidebarWorkspaceAuxiliaryDetailVisibility type moved to CmuxSidebar package.
Sources/cmuxApp.swift	DebugWindowConfigSnapshot and debug views migrated to catalog keys; @AppStorage initializers use inline SidebarCatalogSection()/WorkspaceColorsCatalogSection() struct instantiation per property; WorkspaceIndicatorStyle.decodeFromUserDefaults now used for legacy-string resolution.
Packages/CmuxSettings/Sources/CmuxSettings/Values/WorkspaceIndicatorStyle.swift	Adds legacy-string mapping (rail→leftRail, border/wash/lift/…→solidFill) identical to the removed SidebarActiveTabIndicatorSettings.resolvedStyle; SettingCodable conformance added.

Class Diagram

%%{init: {'theme': 'neutral'}}%%
classDiagram
    class TabManager {
        +let notificationDismissal: any NotificationDismissing
        +let browserModel: BrowserModel
        +let sidebarMultiSelection: SidebarMultiSelectionModel
        +let focusHistoryNavigation: any FocusHistoryNavigating
        +let paneLayout: PaneLayoutService
    }
    class FocusHistoryModel {
        -focusHistory: [FocusHistoryRecord]
        -historyIndex: Int
        -suppressionDepth: Int
        +navigateBack() Bool
        +navigateForward() Bool
        +recordFocusInHistory()
    }
    class NotificationDismissalModel {
        -suppressFocusFlash: Bool
        -pendingSelectionContext
        +dismissFocusedPanelNotificationIfActive()
        +dismissNotification()
    }
    class BrowserModel {
        -recentlyClosedBrowsers: RecentlyClosedBrowserStack
        +recordClosedBrowserPanel()
        +popMostRecentlyClosedBrowserPanel()
    }
    class SidebarMultiSelectionModel {
        -selectedWorkspaceIds: Set~UUID~
        +collapseSelection()
        +postDidHide()
    }
    class PaneLayoutService {
        +equalizeSplits()
        +resizeSplit()
    }
    class FocusHistoryHosting
    class NotificationDismissalHosting
    TabManager --> FocusHistoryModel : owns
    TabManager --> NotificationDismissalModel : owns
    TabManager --> BrowserModel : owns
    TabManager --> SidebarMultiSelectionModel : owns
    TabManager --> PaneLayoutService : owns
    TabManager ..|> FocusHistoryHosting
    TabManager ..|> NotificationDismissalHosting
    FocusHistoryModel ..> FocusHistoryHosting : weak host
    NotificationDismissalModel ..> NotificationDismissalHosting : weak host

Loading

_{Reviews (4): Last reviewed commit: "Wave-4 tranche 3: CmuxWorkspaces package..." | Re-trigger Greptile}

[greptile-apps]

Reset-on-default contract has no type-level enforcement

The comment says "preserve that by resetting the key when re-enabling the dialog" — but SettingsWriting.set(_:for:) doesn't prevent writing false explicitly. During the migration window when legacy TabManager code still reads this key by absence (absent → show dialog, true → suppress), a migrated call site that writes client.set(false, ...) instead of client.reset(...) will store explicit false. A legacy UserDefaults.bool(forKey:) call returns false in both cases, so the UI behaves identically — but if any legacy code specifically branches on defaults.object(forKey:) != nil to distinguish "user has dismissed this once" from "never shown", it would see a spurious non-nil entry and behave differently. The same risk applies to newWorkspacePlacement (line 21–25). A brief doc comment on SettingsWriting.reset (or a dedicated migration helper) would make the write-by-removal invariant explicit enough that call sites won't accidentally reach for set.

[greptile-apps]

WorkspaceGroupNewPlacement duplicates all three cases of WorkspacePlacement

Both enums declare case afterCurrent, case top, case end with the same semantics and the same rawValue strings. WorkspaceGroupNewPlacement adds the tolerant parser and Identifiable, but the case set is identical. If WorkspacePlacement grows a case in a future PR (e.g., .pinned or .beforeCurrent), WorkspaceGroupNewPlacement will silently diverge and the group-placement setting will reject values the top-level setting accepts. Either extending WorkspacePlacement with the tolerant init?(rawString:) and Identifiable, or making WorkspaceGroupNewPlacement a typealias, would keep the two in sync with a single source of truth.

[greptile-apps]

DefaultsKey.suite is silently ignored by all read/write methods

DefaultsKey carries an optional suite field so a key can target a custom UserDefaults suite (e.g., an App Group container). UserDefaultsSettingsClient always reads and writes against the single defaults instance it was constructed with, ignoring key.suite entirely. This is consistent with UserDefaultsSettingsStore.value(for:) and set(_:for:) (both of which also skip suite), but the inconsistency with UserDefaultsSettingsStore.resetAll — which does switch suites per key — means a key declared with suite: will silently read/write the wrong domain through this client. A doc note on the value(for:) / set(_:for:) declarations (matching the pattern in resetAll) would prevent future callers from assuming suite routing works end-to-end.

[coderabbitai]

Actionable comments posted: 7

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

Sources/SidebarWorkspaceGroupHeaderView.swift (1)

142-145: ⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Use plural keys for the unread accessibility label.

%lld unread is wrong for 1 and bypasses the repo’s .one / .other pluralization convention. Split this into singular/plural localization keys.

Based on learnings: pluralized Swift strings should use ICU .one / .other keys.

🌐 Proposed fix

-                        .accessibilityLabel(Text(String.localizedStringWithFormat(
-                            String(localized: "workspaceGroup.unread.a11y", defaultValue: "%lld unread"),
-                            anchorUnreadCount
-                        )))
+                        .accessibilityLabel(Text(
+                            anchorUnreadCount == 1
+                                ? String(localized: "workspaceGroup.unread.a11y.one", defaultValue: "1 unread")
+                                : String(localized: "workspaceGroup.unread.a11y.other", defaultValue: "\(anchorUnreadCount) unread")
+                        ))

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Sources/SidebarWorkspaceGroupHeaderView.swift` around lines 142 - 145, The
accessibility label is using a non-pluralized format string; change it to use
ICU plural keys and a proper integer specifier and then format with the count.
Add a pluralized localization key (workspaceGroup.unread.a11y) with .one and
.other variants (e.g. ".one" -> "%d unread", ".other" -> "%d unread"), replace
the current String(localized: "workspaceGroup.unread.a11y", defaultValue: "%lld
unread") usage in the accessibilityLabel with a formatted call that uses
anchorUnreadCount (e.g. call String.localizedStringWithFormat(String(localized:
"workspaceGroup.unread.a11y"), anchorUnreadCount) and use %d instead of %lld) so
singular/plural forms are chosen correctly.

Sources: Coding guidelines, Learnings

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/FocusHistoryModel.swift`:
- Around line 34-35: Clamp maxHistorySize to a positive integer in the
FocusHistoryModel initializer (e.g., set self.maxHistorySize = max(1,
maxHistorySize)) and update any places that drop oldest entries (the code paths
computing and calling removeFirst in the methods that prune history) to use a
safe removal count (e.g., let toRemove = min(history.count, computedRemoveCount)
before calling removeFirst(toRemove)) so removeFirst is never invoked with n >
count; change the init and the two prune sites accordingly to use these guards.

In
`@Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceGroupCoordinator.swift`:
- Around line 52-55: The current eligibleChildren computation does an O(n²) scan
because childWorkspaceIds.compactMap calls model.tabs.contains(where:) for each
id; to fix, build a Set of existing tab IDs once (e.g., let tabIdSet =
Set(model.tabs.map { $0.id })) then change the compactMap to check
tabIdSet.contains(id) and !existingAnchorIds.contains(id) so eligibleChildren
uses O(1) membership tests; update the code around eligibleChildren,
childWorkspaceIds, and model.tabs accordingly.

In
`@Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Model/WorkspacesModel`+Ordering.swift:
- Around line 109-125: clampedTopLevelReorderIndex currently uses
sidebarTopLevelPinnedWorkspaceIds() directly which can include ids not present
in the provided topLevelIds (or miss promoted rows); update the function to
first limit the pinned set to only those present in the supplied topLevelIds
(e.g. pinnedSet =
Set(sidebarTopLevelPinnedWorkspaceIds()).intersection(Set(topLevelIds))) and
then use that pinnedSet when computing pinnedCount and when testing if the
workspaceId is pinned; this ensures both the count and the workspaceId check are
based on the same topLevel snapshot passed into clampedTopLevelReorderIndex.

In
`@Packages/CmuxWorkspaces/Tests/CmuxWorkspacesTests/WorkspaceCoordinatorTests.swift`:
- Line 213: Replace the forced-try usages of "try!
`#require`(model.workspaceGroups.first(where: { $0.id == groupId }))" (and the
same pattern at the other four occurrences) by making the enclosing test
functions throw (change their signatures to "func ...() throws") and using "try
`#require`(...)" instead of "try!"; ensure each test function that contains these
expressions is updated to include "throws" so the tests propagate failures
rather than crash.

In `@Sources/SidebarWorkspaceGroupHeaderView.swift`:
- Around line 1-3: The file references WorkspaceGroup and
WorkspaceGroupNewPlacement but only imports CmuxSettings; add import
CmuxWorkspaces at the top of Sources/SidebarWorkspaceGroupHeaderView.swift so
those types resolve (i.e., include the new module import alongside the existing
imports).

In `@Sources/TabManager`+FocusHistoryHosting.swift:
- Around line 40-43: The selectWorkspace(_:) method currently assigns
selectedTabId without checking that the given workspaceId exists in tabs; update
selectWorkspace(_:) to first verify the workspaceId is present in tabs (e.g.,
via tabs.contains { $0.id == workspaceId } or appropriate lookup) and return
early (no-op) if it’s missing, only setting selectedTabId when the workspace is
actually found.

---

Outside diff comments:
In `@Sources/SidebarWorkspaceGroupHeaderView.swift`:
- Around line 142-145: The accessibility label is using a non-pluralized format
string; change it to use ICU plural keys and a proper integer specifier and then
format with the count. Add a pluralized localization key
(workspaceGroup.unread.a11y) with .one and .other variants (e.g. ".one" -> "%d
unread", ".other" -> "%d unread"), replace the current String(localized:
"workspaceGroup.unread.a11y", defaultValue: "%lld unread") usage in the
accessibilityLabel with a formatted call that uses anchorUnreadCount (e.g. call
String.localizedStringWithFormat(String(localized:
"workspaceGroup.unread.a11y"), anchorUnreadCount) and use %d instead of %lld) so
singular/plural forms are chosen correctly.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 803ed18f-1950-4f50-9bb5-5d57ce41dc4d

📥 Commits

Reviewing files that changed from the base of the PR and between 94408ca and f8d9fb9.

⛔ Files ignored due to path filters (1)

• .github/swift-file-length-budget.tsv is excluded by !**/*.tsv

📒 Files selected for processing (116)

• Packages/CmuxBrowser/Package.swift
• Packages/CmuxBrowser/Sources/CmuxBrowser/BrowserModel.swift
• Packages/CmuxBrowser/Sources/CmuxBrowser/RecentlyClosed/BrowserManaging.swift
• Packages/CmuxBrowser/Sources/CmuxBrowser/RecentlyClosed/BrowserPanelRestoreSnapshot.swift
• Packages/CmuxBrowser/Sources/CmuxBrowser/RecentlyClosed/RecentlyClosedBrowserStack.swift
• Packages/CmuxBrowser/Tests/CmuxBrowserTests/RecentlyClosedBrowserStackTests.swift
• Packages/CmuxNotifications/Package.swift
• Packages/CmuxNotifications/Sources/CmuxNotifications/NotificationDismissalContext.swift
• Packages/CmuxNotifications/Sources/CmuxNotifications/NotificationDismissalHosting.swift
• Packages/CmuxNotifications/Sources/CmuxNotifications/NotificationDismissalModel.swift
• Packages/CmuxNotifications/Sources/CmuxNotifications/NotificationDismissing.swift
• Packages/CmuxNotifications/Tests/CmuxNotificationsTests/NotificationDismissalModelTests.swift
• Packages/CmuxPanes/Package.swift
• Packages/CmuxPanes/Sources/CmuxPanes/Geometry/ExternalTreeNode+SplitGeometry.swift
• Packages/CmuxPanes/Sources/CmuxPanes/Geometry/SplitDividerAdjustment.swift
• Packages/CmuxPanes/Sources/CmuxPanes/Geometry/SplitEqualizePlan.swift
• Packages/CmuxPanes/Sources/CmuxPanes/PaneLayoutService.swift
• Packages/CmuxPanes/Sources/CmuxPanes/SplitEqualizeResult.swift
• Packages/CmuxPanes/Sources/CmuxPanes/Values/ResizeDirection.swift
• Packages/CmuxPanes/Sources/CmuxPanes/Values/SplitDirection.swift
• Packages/CmuxPanes/Tests/CmuxPanesTests/SplitGeometryTests.swift
• Packages/CmuxSettings/Sources/CmuxSettings/Keys/SettingCatalog.swift
• Packages/CmuxSettings/Sources/CmuxSettings/Keys/WorkspaceGroupsCatalogSection.swift
• Packages/CmuxSettings/Sources/CmuxSettings/Stores/SettingsReading.swift
• Packages/CmuxSettings/Sources/CmuxSettings/Stores/SettingsWriting.swift
• Packages/CmuxSettings/Sources/CmuxSettings/Stores/UserDefaultsSettingsClient.swift
• Packages/CmuxSettings/Sources/CmuxSettings/Values/WorkspaceGroupNewPlacement.swift
• Packages/CmuxSettings/Sources/CmuxSettings/Values/WorkspaceIndicatorStyle.swift
• Packages/CmuxSettings/Tests/CmuxSettingsTests/UserDefaultsSettingsClientTests.swift
• Packages/CmuxSidebar/Package.swift
• Packages/CmuxSidebar/Sources/CmuxSidebar/Detail/SidebarWorkspaceAuxiliaryDetailVisibility.swift
• Packages/CmuxSidebar/Sources/CmuxSidebar/Detail/SidebarWorkspaceDetailVisibility.swift
• Packages/CmuxSidebar/Sources/CmuxSidebar/MultiSelection/SidebarMultiSelectionDidHideEvent.swift
• Packages/CmuxSidebar/Sources/CmuxSidebar/MultiSelection/SidebarMultiSelectionModel.swift
• Packages/CmuxSidebar/Sources/CmuxSidebar/MultiSelection/SidebarMultiSelectionShouldCollapseEvent.swift
• Packages/CmuxSidebar/Tests/CmuxSidebarTests/SidebarDetailVisibilityTests.swift
• Packages/CmuxSidebar/Tests/CmuxSidebarTests/SidebarMultiSelectionModelTests.swift
• Packages/CmuxWorkspaceNavigation/Package.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/FocusHistoryEntry.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/FocusHistoryHosting.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/FocusHistoryModel.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/FocusHistoryNavigating.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/FocusHistoryRecord.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/Menu/FocusHistoryMenuDirection.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/Menu/FocusHistoryMenuItem.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/Menu/FocusHistoryMenuPosition.swift
• Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/Menu/FocusHistoryMenuSnapshot.swift
• Packages/CmuxWorkspaceNavigation/Tests/CmuxWorkspaceNavigationTests/FocusHistoryModelTests.swift
• Packages/CmuxWorkspaces/Package.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceGroupCoordinator.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceGroupHosting.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceOrderHosting.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceReorderCoordinator.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Model/WorkspaceTabRepresenting.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Model/WorkspacesHosting.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Model/WorkspacesModel+GroupInvariants.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Model/WorkspacesModel+Ordering.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Model/WorkspacesModel.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Reorder/WorkspaceBatchReorderError.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Reorder/WorkspaceOrderSnapshot.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Reorder/WorkspaceReorderPlanItem.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Reorder/WorkspaceReorderPlanner.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Values/NewWorkspaceInitialSurface.swift
• Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Values/WorkspaceGroup.swift
• Packages/CmuxWorkspaces/Tests/CmuxWorkspacesTests/WorkspaceCoordinatorTests.swift
• Packages/CmuxWorkspaces/Tests/CmuxWorkspacesTests/WorkspaceReorderPlannerTests.swift
• Packages/CmuxWorkspaces/Tests/CmuxWorkspacesTests/WorkspacesModelTests.swift
• Sources/AppDelegate+FocusHistoryContextMenu.swift
• Sources/AppDelegate+MoveTabToNewWorkspace.swift
• Sources/AppDelegate.swift
• Sources/AppleScriptSupport.swift
• Sources/BackgroundWorkspacePrimeCoordinator.swift
• Sources/CmuxConfig.swift
• Sources/CommandPalette/CommandPaletteSettingsToggle.swift
• Sources/ContentView+ForkAgentConversation.swift
• Sources/ContentView.swift
• Sources/Feed/FeedCoordinator.swift
• Sources/FocusHistory.swift
• Sources/GhosttyTerminalView.swift
• Sources/KeyboardShortcutSettingsFileStore+Template.swift
• Sources/KeyboardShortcutSettingsFileStore.swift
• Sources/Mobile/MobileWorkspaceListObserver.swift
• Sources/Sidebar/SidebarAppearanceSupport.swift
• Sources/Sidebar/SidebarState.swift
• Sources/SidebarWorkspaceGroupHeaderView.swift
• Sources/SidebarWorkspaceRenderItem.swift
• Sources/SplitEqualizer.swift
• Sources/TabManager+CompatibilityTypes.swift
• Sources/TabManager+DetachedWorkspace.swift
• Sources/TabManager+EqualizeSplits.swift
• Sources/TabManager+FocusHistoryHosting.swift
• Sources/TabManager+NotificationDismissalHosting.swift
• Sources/TabManager.swift
• Sources/TerminalController+ControlWorkspaceContext.swift
• Sources/TerminalController+ControlWorkspaceGroupContext.swift
• Sources/TerminalController+MobileWorkspaceList.swift
• Sources/TerminalController.swift
• Sources/TerminalNotificationStore.swift
• Sources/VerticalTabsSidebar+WorkspaceGroups.swift
• Sources/Workspace.swift
• Sources/WorkspaceIndicatorStyle+Display.swift
• Sources/WorkspacePlacement+Resolution.swift
• Sources/WorkspaceTabColorEntry.swift
• Sources/WorkspaceTabColorSettings.swift
• Sources/cmuxApp+HistoryMenu.swift
• Sources/cmuxApp.swift
• cmux.xcodeproj/project.pbxproj
• cmuxTests/BrowserConfigTests.swift
• cmuxTests/GhosttyConfigTests.swift
• cmuxTests/KeyboardShortcutContextTests.swift
• cmuxTests/ShortcutAndCommandPaletteTests.swift
• cmuxTests/SidebarOrderingTests.swift
• cmuxTests/SidebarWorkspaceSnapshotRefreshPolicyTests.swift
• cmuxTests/TabManagerSessionSnapshotTests.swift
• cmuxTests/WorkspaceGroupTests.swift
• cmuxTests/WorkspaceUnitTests.swift

💤 Files with no reviewable changes (2)

• Sources/TabManager+CompatibilityTypes.swift
• Sources/SplitEqualizer.swift

👮 Files not reviewed due to content moderation or server errors (1)

• Sources/TerminalController.swift

[coderabbitai]

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Clamp maxHistorySize to a positive value to avoid removeFirst runtime traps.

Line 34 accepts any Int; with maxHistorySize <= 0, the overflow math at Lines 101-104 and Lines 123-125 can call removeFirst with n > count, which traps.

Suggested fix

 public init(maxHistorySize: Int = 50) {
-    self.maxHistorySize = maxHistorySize
+    self.maxHistorySize = max(1, maxHistorySize)
 }

Also applies to: 101-104, 123-125

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@Packages/CmuxWorkspaceNavigation/Sources/CmuxWorkspaceNavigation/FocusHistoryModel.swift`
around lines 34 - 35, Clamp maxHistorySize to a positive integer in the
FocusHistoryModel initializer (e.g., set self.maxHistorySize = max(1,
maxHistorySize)) and update any places that drop oldest entries (the code paths
computing and calling removeFirst in the methods that prune history) to use a
safe removal count (e.g., let toRemove = min(history.count, computedRemoveCount)
before calling removeFirst(toRemove)) so removeFirst is never invoked with n >
count; change the init and the two prune sites accordingly to use these guards.

[coderabbitai]

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Avoid quadratic filtering when resolving eligible child workspaces.

Line 53 does model.tabs.contains(where:) inside childWorkspaceIds.compactMap, which rescans the full tabs collection per child id. In large multi-select operations this becomes O(n²) and can noticeably slow group creation.

⚡ Proposed fix

-        let eligibleChildren = childWorkspaceIds.compactMap { id -> UUID? in
-            guard model.tabs.contains(where: { $0.id == id }),
-                  !existingAnchorIds.contains(id) else { return nil }
-            return id
-        }
+        let tabIds = Set(model.tabs.map(\.id))
+        let eligibleChildren = childWorkspaceIds.compactMap { id -> UUID? in
+            guard tabIds.contains(id),
+                  !existingAnchorIds.contains(id) else { return nil }
+            return id
+        }

As per coding guidelines, .github/review-bot-rules/algorithmic-complexity.md requires flagging nested full-collection scans on scalable user-data paths.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

	let eligibleChildren = childWorkspaceIds.compactMap { id -> UUID? in
	guard model.tabs.contains(where: { $0.id == id }),
	!existingAnchorIds.contains(id) else { return nil }
	return id
	let tabIds = Set(model.tabs.map(\.id))
	let eligibleChildren = childWorkspaceIds.compactMap { id -> UUID? in
	guard tabIds.contains(id),
	!existingAnchorIds.contains(id) else { return nil }
	return id
	}

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceGroupCoordinator.swift`
around lines 52 - 55, The current eligibleChildren computation does an O(n²)
scan because childWorkspaceIds.compactMap calls model.tabs.contains(where:) for
each id; to fix, build a Set of existing tab IDs once (e.g., let tabIdSet =
Set(model.tabs.map { $0.id })) then change the compactMap to check
tabIdSet.contains(id) and !existingAnchorIds.contains(id) so eligibleChildren
uses O(1) membership tests; update the code around eligibleChildren,
childWorkspaceIds, and model.tabs accordingly.

Source: Coding guidelines

[coderabbitai]

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Batch pin updates currently rescan/re-normalize per workspace, causing quadratic work.

In grouped windows, bulk pin/unpin executes reorderTabForPinnedState once per changed id. That repeatedly traverses/normalizes tabs, so multi-select batch updates degrade to O(m×n). Apply all pin-state flips first, then run one normalization/reorder pass before publishing.

As per coding guidelines, batch actions over scalable collections should avoid per-target rescans and repeated full-collection work in production paths.

Source: Coding guidelines

[coderabbitai]

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Top-level clamp uses a pinned snapshot that can exclude promoted rows.

clampedTopLevelReorderIndex bases pin-tier classification on sidebarTopLevelPinnedWorkspaceIds(), but promotion flows pass a custom topLevelIds that may include a promoted workspace not present in that pinned snapshot. This can clamp a promoted pinned workspace as if it were unpinned.

Suggested fix

 func clampedTopLevelReorderIndex(
     forWorkspaceId workspaceId: UUID,
     targetIndex: Int,
     topLevelIds: [UUID]
 ) -> Int {
     let clamped = max(0, min(targetIndex, max(0, topLevelIds.count - 1)))
-    let pinnedIds = sidebarTopLevelPinnedWorkspaceIds()
+    let groupsByAnchorId = Dictionary(uniqueKeysWithValues: workspaceGroups.map { ($0.anchorWorkspaceId, $0) })
+    let tabsById = Dictionary(uniqueKeysWithValues: tabs.map { ($0.id, $0) })
+
+    func isPinnedTopLevelId(_ id: UUID) -> Bool {
+        if let group = groupsByAnchorId[id] { return group.isPinned }
+        return tabsById[id]?.isPinned == true
+    }
+
     let pinnedCount = topLevelIds.reduce(into: 0) { count, id in
-        if pinnedIds.contains(id) {
+        if isPinnedTopLevelId(id) {
             count += 1
         }
     }
-    if pinnedIds.contains(workspaceId) {
+    if isPinnedTopLevelId(workspaceId) {
         return min(clamped, max(0, pinnedCount - 1))
     }
     return max(clamped, pinnedCount)
 }

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Model/WorkspacesModel`+Ordering.swift
around lines 109 - 125, clampedTopLevelReorderIndex currently uses
sidebarTopLevelPinnedWorkspaceIds() directly which can include ids not present
in the provided topLevelIds (or miss promoted rows); update the function to
first limit the pinned set to only those present in the supplied topLevelIds
(e.g. pinnedSet =
Set(sidebarTopLevelPinnedWorkspaceIds()).intersection(Set(topLevelIds))) and
then use that pinnedSet when computing pinnedCount and when testing if the
workspaceId is pinned; this ensures both the count and the workspaceId check are
based on the same topLevel snapshot passed into clampedTopLevelReorderIndex.

[coderabbitai]

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Replace try! #require(...) with throwing test flow.

Lines 213, 244, 263, 278, and 317 use forced tries, which triggers the force_try lint error and can crash the test instead of reporting a normal assertion failure. Mark those tests as throws and use try #require(...).

✅ Suggested patch pattern

-    func createWorkspaceGroupAdoptsChildrenAndKeepsSectionContiguous() {
+    func createWorkspaceGroupAdoptsChildrenAndKeepsSectionContiguous() throws {
@@
-        let group = try! `#require`(model.workspaceGroups.first(where: { $0.id == groupId }))
+        let group = try `#require`(model.workspaceGroups.first(where: { $0.id == groupId }))

-    func deleteWorkspaceGroupClosesMembersAndClearsLastHoldout() {
+    func deleteWorkspaceGroupClosesMembersAndClearsLastHoldout() throws {
@@
-        let groupId = try! `#require`(groups.createWorkspaceGroup(name: "G", childWorkspaceIds: [a.id, b.id]))
+        let groupId = try `#require`(groups.createWorkspaceGroup(name: "G", childWorkspaceIds: [a.id, b.id]))

-    func ungroupKeepsMemberPositionsAndDropsMembership() {
+    func ungroupKeepsMemberPositionsAndDropsMembership() throws {
@@
-        let groupId = try! `#require`(groups.createWorkspaceGroup(name: "G", childWorkspaceIds: [a.id]))
+        let groupId = try `#require`(groups.createWorkspaceGroup(name: "G", childWorkspaceIds: [a.id]))

-    func collapseToggleMovesFocusToAnchorAndStripsHiddenSelection() {
+    func collapseToggleMovesFocusToAnchorAndStripsHiddenSelection() throws {
@@
-        let groupId = try! `#require`(groups.createWorkspaceGroup(name: "G", childWorkspaceIds: [a.id]))
+        let groupId = try `#require`(groups.createWorkspaceGroup(name: "G", childWorkspaceIds: [a.id]))

-    func setWorkspaceGroupAnchorHoistsNewAnchorToSectionFront() {
+    func setWorkspaceGroupAnchorHoistsNewAnchorToSectionFront() throws {
@@
-        let groupId = try! `#require`(groups.createWorkspaceGroup(name: "G", childWorkspaceIds: [a.id, b.id]))
+        let groupId = try `#require`(groups.createWorkspaceGroup(name: "G", childWorkspaceIds: [a.id, b.id]))

Also applies to: 244-244, 263-263, 278-278, 317-317

🧰 Tools

🪛 SwiftLint (0.63.3)

[Error] 213-213: Force tries should be avoided

(force_try)

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@Packages/CmuxWorkspaces/Tests/CmuxWorkspacesTests/WorkspaceCoordinatorTests.swift`
at line 213, Replace the forced-try usages of "try!
`#require`(model.workspaceGroups.first(where: { $0.id == groupId }))" (and the
same pattern at the other four occurrences) by making the enclosing test
functions throw (change their signatures to "func ...() throws") and using "try
`#require`(...)" instead of "try!"; ensure each test function that contains these
expressions is updated to include "throws" so the tests propagate failures
rather than crash.

Source: Linters/SAST tools

[coderabbitai]

⚠️ Potential issue | 🔴 Critical | ⚡ Quick win

Add the CmuxWorkspaces import.

WorkspaceGroup and WorkspaceGroupNewPlacement now come from the extracted workspaces module, but this file only imports CmuxSettings. That leaves the new type references unresolved unless they’re re-exported elsewhere.

🛠️ Proposed fix

 import AppKit
 import SwiftUI
+import CmuxWorkspaces
 import CmuxSettings

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Sources/SidebarWorkspaceGroupHeaderView.swift` around lines 1 - 3, The file
references WorkspaceGroup and WorkspaceGroupNewPlacement but only imports
CmuxSettings; add import CmuxWorkspaces at the top of
Sources/SidebarWorkspaceGroupHeaderView.swift so those types resolve (i.e.,
include the new module import alongside the existing imports).

[coderabbitai]

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Guard selectWorkspace(_:) when the workspace no longer exists.

On Line 42, selectedTabId is set without verifying workspaceId is still present in tabs. That breaks this file’s own no-op-on-missing-target contract and can leave selection pointing at a non-existent workspace.

💡 Proposed fix

     func selectWorkspace(_ workspaceId: UUID) {
-        if selectedTabId != workspaceId {
+        guard tabs.contains(where: { $0.id == workspaceId }) else { return }
+        if selectedTabId != workspaceId {
             selectedTabId = workspaceId
         }
     }

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Sources/TabManager`+FocusHistoryHosting.swift around lines 40 - 43, The
selectWorkspace(_:) method currently assigns selectedTabId without checking that
the given workspaceId exists in tabs; update selectWorkspace(_:) to first verify
the workspaceId is present in tabs (e.g., via tabs.contains { $0.id ==
workspaceId } or appropriate lookup) and return early (no-op) if it’s missing,
only setting selectedTabId when the workspace is actually found.