Add guarded Close Tab UX

CLI/cmux.swift

@@ -6805,7 +6805,8 @@ struct CMUXCLI {
             guard let target = optionValue(commandArgs, name: "--window"), let windowID = try normalizeWindowHandle(target, client: client) else {
                 throw CLIError(message: "close-window requires --window")
             }
-            let response = try sendV1Command("close_window \(windowID)", client: client)
+            let force = commandArgs.contains("--force")
+            let response = try sendV1Command("close_window \(windowID)\(force ? " --force" : "")", client: client)
             print(response)
 
         case "resize-window":
@@ -7321,6 +7322,7 @@ struct CMUXCLI {
                 sfId = try normalizeSurfaceHandle(surfaceRaw, client: client, workspaceHandle: wsId, windowHandle: winId)
             }
             if let sfId { params["surface_id"] = sfId }
+            params["force"] = commandArgs.contains("--force")
             let payload = try client.sendV2(method: "surface.close", params: params)
             if let closedWorkspaceId = (payload["workspace_id"] as? String) ?? wsId,
                let closedSurfaceId = (payload["surface_id"] as? String) ?? sfId {
@@ -10451,7 +10453,7 @@ struct CMUXCLI {
         let (descriptionOpt, rem4) = parseOption(rem3, name: "--description")
         let (windowOpt, rem5) = parseOption(rem4, name: "--window")
 
-        var positional = rem5
+        var positional = rem5.filter { $0 != "--force" }
         let actionRaw: String
         if let actionOpt {
             actionRaw = actionOpt
@@ -10515,6 +10517,7 @@ struct CMUXCLI {
         if let description, !description.isEmpty {
             params["description"] = description
         }
+        params["force"] = commandArgs.contains("--force")
 
         let payload = try client.sendV2(method: "workspace.action", params: params)
         var summaryParts = ["OK", "action=\(action)"]
@@ -10552,7 +10555,7 @@ struct CMUXCLI {
         let (focusOpt, rem6) = parseOption(rem5, name: "--focus")
         let (windowOpt, rem7) = parseOption(rem6, name: "--window")
 
-        var positional = rem7
+        var positional = rem7.filter { $0 != "--force" }
         let actionRaw: String
         if let actionOpt {
             actionRaw = actionOpt
@@ -10617,6 +10620,7 @@ struct CMUXCLI {
         if let urlOpt, !urlOpt.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
             params["url"] = urlOpt.trimmingCharacters(in: .whitespacesAndNewlines)
         }
+        params["force"] = commandArgs.contains("--force")
         try applyTabActionFocusOption(focusOpt, to: &params)
         let payload = try client.sendV2(method: "tab.action", params: params)
         var summaryParts = ["OK", "action=\(action)"]
@@ -10927,10 +10931,12 @@ struct CMUXCLI {
         }
 
         var params: [String: Any] = [:]
+        let force = commandArgs.contains("--force")
         let winId = try normalizeWindowHandle(windowFromArgsOrOverride(commandArgs, windowOverride: windowOverride), client: client)
         if let winId { params["window_id"] = winId }
         let wsId = try normalizeWorkspaceHandle(target, client: client, windowHandle: winId)
         if let wsId { params["workspace_id"] = wsId }
+        if force { params["force"] = true }
         let payload = try client.sendV2(method: "workspace.close", params: params)
         if let closedWorkspaceId = (payload["workspace_id"] as? String) ?? wsId {
             try? tmuxPruneCompatWorkspaceState(workspaceId: closedWorkspaceId)
@@ -19431,12 +19437,13 @@ struct CMUXCLI {
             """
         case "close-window":
             return """
-            Usage: cmux close-window --window <id|ref|index>
+            Usage: cmux close-window --window <id|ref|index> [--force]
 
             Close the specified window.
 
             Flags:
               --window <id|ref|index>   Window to close (required)
+              --force                   Close even when live processes would be terminated
 
             Example:
               cmux close-window --window 0
@@ -19608,6 +19615,7 @@ struct CMUXCLI {
               --title <text>               Title for rename
               --color <name|#hex>          Color for set-color (name or #RRGGBB hex)
               --description <text>         Description for set-description
+              --force                      Close even when a live process would be killed
 
             Named colors:
               Red, Crimson, Orange, Amber, Olive, Green, Teal, Aqua,
@@ -19647,6 +19655,7 @@ struct CMUXCLI {
               --title <text>               Title for rename (or pass trailing title text)
               --url <url>                  Optional URL for new-browser-right
               --focus <true|false>         Focus the destination when supported (default: false for move-to-new-workspace)
+              --force                      Close even when a live process would be killed
 
             Example:
               cmux tab-action --tab tab:3 --action pin
@@ -20113,6 +20122,7 @@ struct CMUXCLI {
               --panel <id|ref|index>      Alias for --surface
               --workspace <id|ref|index>  Workspace context (default: $CMUX_WORKSPACE_ID)
               --window <id|ref|index>     Window context for workspace/surface refs and indexes
+              --force                     Close even when a live process would be killed
 
             Example:
               cmux close-surface

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Sidebar/ControlCommandCoordinator+SidebarPaneV1.swift

@@ -248,14 +248,19 @@ extension ControlCommandCoordinator {
             return "ERROR: TabManager not available"
         }
 
-        let trimmed = args.trimmingCharacters(in: .whitespacesAndNewlines)
-        switch sidebarContext?.controlSidebarCloseSurface(surfaceArg: trimmed.isEmpty ? nil : trimmed) ?? .noTabSelected {
+        let parts = args.split(whereSeparator: { $0.isWhitespace }).map(String.init)
+        let force = parts.contains("--force")
+        let surfaceParts = parts.filter { $0 != "--force" }
+        let trimmed = surfaceParts.joined(separator: " ")
+        switch sidebarContext?.controlSidebarCloseSurface(surfaceArg: trimmed.isEmpty ? nil : trimmed, force: force) ?? .noTabSelected {
         case .noTabSelected, .closeFailed:
-            return "ERROR: Failed to close surface"
+            return "ERROR: \(sidebarContext?.controlSidebarCloseStrings().failed ?? "Failed to close surface")"
         case .surfaceNotFound:
             return "ERROR: Surface not found"
         case .lastSurface:
             return "ERROR: Cannot close the last surface"
+        case .confirmationRequired:
+            return "ERROR: \(sidebarContext?.controlSidebarCloseStrings().confirmationRequired ?? "Surface has a running process; retry with --force")"
         case .closed:
             return "OK"
         }

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Sidebar/ControlSidebarCloseStrings.swift

@@ -0,0 +1,21 @@
+public import Foundation
+
+/// App-bundle-resolved messages for the legacy `close_surface` command.
+public struct ControlSidebarCloseStrings: Sendable, Equatable {
+    public let failed: String
+    public let confirmationRequired: String
+
+    public init(failed: String, confirmationRequired: String) {
+        self.failed = failed
+        self.confirmationRequired = confirmationRequired
+    }
+}
+
+public extension ControlSidebarContext {
+    func controlSidebarCloseStrings() -> ControlSidebarCloseStrings {
+        ControlSidebarCloseStrings(
+            failed: "Failed to close surface",
+            confirmationRequired: "Surface has a running process; retry with --force"
+        )
+    }
+}

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Sidebar/ControlSidebarCloseSurfaceResolution.swift

@@ -8,6 +8,8 @@ public enum ControlSidebarCloseSurfaceResolution: Sendable, Equatable {
     case surfaceNotFound
     /// Refused: the surface is the workspace's last.
     case lastSurface
+    /// The surface has a live foreground process and requires `force`.
+    case confirmationRequired
     /// The surface closed.
     case closed
     /// The close call returned failure.

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Sidebar/ControlSidebarContext.swift

@@ -46,6 +46,9 @@ public protocol ControlSidebarContext: AnyObject {
     /// `guard let tabManager` head of several v1 bodies).
     func controlSidebarTabManagerAvailable() -> Bool
 
+    /// App-bundle-resolved messages for the legacy close command.
+    func controlSidebarCloseStrings() -> ControlSidebarCloseStrings
+
     // MARK: Scheduled sidebar mutations (status / agent / blocks)
 
     /// Enqueues the `set_status`/`report_meta` upsert mutation.
@@ -315,7 +318,7 @@ public protocol ControlSidebarContext: AnyObject {
     func controlSidebarNewSurface(isBrowser: Bool, paneArg: String?, url: URL?) -> ControlSidebarNewSurfaceResolution
 
     /// Closes a surface (`close_surface`; empty argument = focused surface).
-    func controlSidebarCloseSurface(surfaceArg: String?) -> ControlSidebarCloseSurfaceResolution
+    func controlSidebarCloseSurface(surfaceArg: String?, force: Bool) -> ControlSidebarCloseSurfaceResolution
 
     // MARK: Misc ops
 
@@ -333,3 +336,10 @@ public protocol ControlSidebarContext: AnyObject {
     /// can't resolve.
     func controlSidebarSurfaceHealth(tabArg: String) -> [ControlSidebarSurfaceHealthRow]?
 }
+
+public extension ControlSidebarContext {
+    /// Backward-compatible non-forced close for legacy socket callers.
+    func controlSidebarCloseSurface(surfaceArg: String?) -> ControlSidebarCloseSurfaceResolution {
+        controlSidebarCloseSurface(surfaceArg: surfaceArg, force: false)
+    }
+}

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Surface/ControlCommandCoordinator+Surface.swift

@@ -644,7 +644,8 @@ extension ControlCommandCoordinator {
         let resolution = context.controlSurfaceClose(
             routing: routing,
             surfaceID: surfaceID,
-            hasSurfaceIDParam: hasSurfaceIDParam
+            hasSurfaceIDParam: hasSurfaceIDParam,
+            force: bool(params, "force") ?? false
         )
         switch resolution {
         case .tabManagerUnavailable:
@@ -663,10 +664,16 @@ extension ControlCommandCoordinator {
             )
         case .lastSurface:
             return .err(code: "invalid_state", message: "Cannot close the last surface", data: nil)
+        case .confirmationRequired(let id):
+            return .err(
+                code: "confirmation_required",
+                message: context.controlSurfaceCloseStrings().confirmationRequired,
+                data: .object(["surface_id": .string(id.uuidString)])
+            )
         case .closeFailed(let id):
             return .err(
                 code: "internal_error",
-                message: "Failed to close surface",
+                message: context.controlSurfaceCloseStrings().failed,
                 data: .object(["surface_id": .string(id.uuidString)])
             )
         case .closed(let windowID, let workspaceID, let closedSurfaceID):

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Surface/ControlSurfaceCloseResolution.swift

@@ -22,6 +22,8 @@ public enum ControlSurfaceCloseResolution: Sendable, Equatable {
     /// The workspace has only one surface left (legacy `invalid_state` / "Cannot
     /// close the last surface").
     case lastSurface
+    /// The surface has a live foreground process and requires `force`.
+    case confirmationRequired(UUID)
     /// The close call failed (legacy `internal_error` / "Failed to close surface",
     /// `data: {"surface_id": …}`). Carries the surface id.
     case closeFailed(UUID)

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Surface/ControlSurfaceCloseStrings.swift

@@ -0,0 +1,21 @@
+public import Foundation
+
+/// App-bundle-resolved messages returned by `surface.close`.
+public struct ControlSurfaceCloseStrings: Sendable, Equatable {
+    public let confirmationRequired: String
+    public let failed: String
+
+    public init(confirmationRequired: String, failed: String) {
+        self.confirmationRequired = confirmationRequired
+        self.failed = failed
+    }
+}
+
+public extension ControlSurfaceContext {
+    func controlSurfaceCloseStrings() -> ControlSurfaceCloseStrings {
+        ControlSurfaceCloseStrings(
+            confirmationRequired: "Surface has a running process; retry with force=true",
+            failed: "Failed to close surface"
+        )
+    }
+}

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Surface/ControlSurfaceContext.swift

@@ -60,6 +60,9 @@ public protocol ControlSurfaceContext: AnyObject {
     /// - Returns: The localized surface-not-found message.
     func controlSurfaceNotFoundMessage() -> String
 
+    /// App-bundle-resolved messages for close failures.
+    func controlSurfaceCloseStrings() -> ControlSurfaceCloseStrings
+
     // MARK: - focus / split / respawn / create / close
 
     /// Focuses a surface for `surface.focus`.
@@ -120,7 +123,8 @@ public protocol ControlSurfaceContext: AnyObject {
     func controlSurfaceClose(
         routing: ControlRoutingSelectors,
         surfaceID: UUID?,
-        hasSurfaceIDParam: Bool
+        hasSurfaceIDParam: Bool,
+        force: Bool
     ) -> ControlSurfaceCloseResolution
 
     // MARK: - move / reorder
@@ -429,3 +433,19 @@ public protocol ControlSurfaceContext: AnyObject {
     /// - Returns: The bridged payload, or `nil` when unavailable.
     func controlDebugTerminals() -> JSONValue?
 }
+
+public extension ControlSurfaceContext {
+    /// Backward-compatible non-forced close for app-owned callers.
+    func controlSurfaceClose(
+        routing: ControlRoutingSelectors,
+        surfaceID: UUID?,
+        hasSurfaceIDParam: Bool
+    ) -> ControlSurfaceCloseResolution {
+        controlSurfaceClose(
+            routing: routing,
+            surfaceID: surfaceID,
+            hasSurfaceIDParam: hasSurfaceIDParam,
+            force: false
+        )
+    }
+}

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/System/ControlCommandCoordinator+SystemTabAction.swift

@@ -34,6 +34,7 @@ extension ControlCommandCoordinator {
             rawURL: string(params, "url"),
             surfaceID: surfaceID ?? tabID,
             requestedFocus: bool(params, "focus") ?? false,
+            force: bool(params, "force") ?? false,
             moveParams: params
         )
 
@@ -86,6 +87,15 @@ extension ControlCommandCoordinator {
             return .err(code: "invalid_state", message: "Failed to toggle full-width tab mode", data: nil)
         case .tabNotFoundInPane:
             return .err(code: "not_found", message: "Tab not found in pane", data: nil)
+        case .confirmationRequired(let surfaceIDs):
+            return .err(
+                code: "confirmation_required",
+                message: context?.controlSystemCloseStrings().confirmationRequired
+                    ?? "One or more surfaces have a running process; retry with force=true",
+                data: .object([
+                    "surface_ids": .array(surfaceIDs.map { .string($0.uuidString) })
+                ])
+            )
         case .createFailed:
             return .err(code: "internal_error", message: "Failed to create tab", data: nil)
         case .duplicateFailed:

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/System/ControlSystemCloseStrings.swift

@@ -0,0 +1,18 @@
+public import Foundation
+
+/// App-bundle-resolved messages for system tab-action close failures.
+public struct ControlSystemCloseStrings: Sendable, Equatable {
+    public let confirmationRequired: String
+
+    public init(confirmationRequired: String) {
+        self.confirmationRequired = confirmationRequired
+    }
+}
+
+public extension ControlSystemContext {
+    func controlSystemCloseStrings() -> ControlSystemCloseStrings {
+        ControlSystemCloseStrings(
+            confirmationRequired: "One or more surfaces have a running process; retry with force=true"
+        )
+    }
+}

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/System/ControlSystemContext.swift

@@ -111,6 +111,7 @@ public protocol ControlSystemContext: AnyObject {
     ///   - surfaceID: The explicit `surface_id` / `tab_id`, if any.
     ///   - requestedFocus: The requested `focus` flag (the app applies the
     ///     focus-allowance policy).
+    ///   - force: Whether a close batch may terminate active processes.
     ///   - moveParams: The raw request params, passed through to the
     ///     still-app-side move-to-new-workspace family.
     /// - Returns: The action resolution.
@@ -121,6 +122,7 @@ public protocol ControlSystemContext: AnyObject {
         rawURL: String?,
         surfaceID: UUID?,
         requestedFocus: Bool,
+        force: Bool,
         moveParams: [String: JSONValue]
     ) -> ControlTabActionResolution
 
@@ -136,6 +138,9 @@ public protocol ControlSystemContext: AnyObject {
     /// - Returns: The localized tab-not-found message.
     func controlSystemTabNotFoundMessage() -> String
 
+    /// App-bundle-resolved message for active-process batch close refusal.
+    func controlSystemCloseStrings() -> ControlSystemCloseStrings
+
     /// Splits a surface off into its own pane for `surface.split_off` /
     /// `surface.drag_to_split`, delegating to the shared app-side
     /// `v2SurfaceSplitOff` (also driven by the v1 `drag_surface_to_split`

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/System/ControlTabActionResolution.swift

@@ -92,6 +92,9 @@ public enum ControlTabActionResolution: Sendable, Equatable {
     case fullWidthTabToggleFailed
     /// The anchor tab was not found in its pane (`close_left` / `close_right`).
     case tabNotFoundInPane
+    /// A non-forced close batch would terminate one or more active processes.
+    /// Carries the affected surface ids so callers can retry with `force`.
+    case confirmationRequired([UUID])
     /// Surface creation failed (`new_terminal_right` / `new_browser_right`).
     case createFailed
     /// Browser duplication failed.

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Window/ControlCommandCoordinator+Window.swift

@@ -151,14 +151,29 @@ extension ControlCommandCoordinator {
         guard let windowID = uuid(params, "window_id") else {
             return .err(code: "invalid_params", message: "Missing or invalid window_id", data: nil)
         }
-        let ok = context?.controlCloseWindow(id: windowID) ?? false
         let identity: JSONValue = .object([
             "window_id": .string(windowID.uuidString),
             "window_ref": ref(.window, windowID),
         ])
-        return ok
-            ? .ok(identity)
-            : .err(code: "not_found", message: "Window not found", data: identity)
+        let force = bool(params, "force") ?? false
+        switch context?.controlCloseWindow(id: windowID, force: force) ?? .notFound {
+        case .resolved:
+            return .ok(identity)
+        case .notFound:
+            return .err(code: "not_found", message: "Window not found", data: identity)
+        case .confirmationRequired(let workspaceIDs):
+            var data: [String: JSONValue] = [
+                "window_id": .string(windowID.uuidString),
+                "window_ref": ref(.window, windowID),
+            ]
+            data["workspace_ids"] = .array(workspaceIDs.map { .string($0.uuidString) })
+            return .err(
+                code: "confirmation_required",
+                message: context?.controlWindowCloseStrings().confirmationRequired
+                    ?? "One or more workspaces or Dock surfaces have a running process; retry with --force",
+                data: .object(data)
+            )
+        }
     }
 
     /// `window.displays` — every connected display.