Fix add button. Fix hotkeys in settings. Add Workspace hotkeys

Downterm/CommandNotch/Managers/ScreenManager.swift

@@ -9,6 +9,7 @@ final class ScreenManager: ObservableObject {
     static let shared = ScreenManager()
 
     private let screenRegistry = ScreenRegistry.shared
+    private let workspaceRegistry = WorkspaceRegistry.shared
     private let windowCoordinator = WindowCoordinator()
     private lazy var orchestrator = NotchOrchestrator(screenRegistry: screenRegistry, host: self)
 
@@ -55,6 +56,12 @@ final class ScreenManager: ObservableObject {
         hotkeyManager.onPreviousTab = { [weak self] in
             MainActor.assumeIsolated { self?.activeWorkspace().previousTab() }
         }
+        hotkeyManager.onNextWorkspace = { [weak self] in
+            MainActor.assumeIsolated { self?.switchWorkspace(offset: 1) }
+        }
+        hotkeyManager.onPreviousWorkspace = { [weak self] in
+            MainActor.assumeIsolated { self?.switchWorkspace(offset: -1) }
+        }
         hotkeyManager.onDetachTab = { [weak self] in
             MainActor.assumeIsolated { self?.detachActiveTab() }
         }
@@ -64,6 +71,9 @@ final class ScreenManager: ObservableObject {
         hotkeyManager.onSwitchToTab = { [weak self] index in
             MainActor.assumeIsolated { self?.activeWorkspace().switchToTab(at: index) }
         }
+        hotkeyManager.onSwitchToWorkspace = { [weak self] workspaceID in
+            MainActor.assumeIsolated { self?.switchActiveScreen(to: workspaceID) }
+        }
 
         hotkeyManager.start()
     }
@@ -92,6 +102,33 @@ final class ScreenManager: ObservableObject {
         }
     }
 
+    private func switchWorkspace(offset: Int) {
+        guard let screenID = screenRegistry.activeScreenID() else { return }
+        let currentWorkspaceID = screenRegistry.screenContext(for: screenID)?.workspaceID ?? workspaceRegistry.defaultWorkspaceID
+        let nextWorkspaceID = offset >= 0
+            ? workspaceRegistry.nextWorkspaceID(after: currentWorkspaceID)
+            : workspaceRegistry.previousWorkspaceID(before: currentWorkspaceID)
+
+        guard let nextWorkspaceID else { return }
+        switchScreen(screenID, to: nextWorkspaceID)
+    }
+
+    private func switchActiveScreen(to workspaceID: WorkspaceID) {
+        guard let screenID = screenRegistry.activeScreenID() else { return }
+        switchScreen(screenID, to: workspaceID)
+    }
+
+    private func switchScreen(_ screenID: ScreenID, to workspaceID: WorkspaceID) {
+        screenRegistry.assignWorkspace(workspaceID, to: screenID)
+
+        guard let context = screenRegistry.screenContext(for: screenID),
+              context.notchState == .open else {
+            return
+        }
+
+        orchestrator.open(screenID: screenID)
+    }
+
     func applySizePreset(_ preset: TerminalSizePreset) {
         guard let context = screenRegistry.allScreens().first(where: { $0.notchState == .open }) else {
             AppSettingsController.shared.update {