sneakoscope 6.7.0 → 7.0.0

package/dist/native/sks-menubar/Sources/MCPServersViewController.swift

@@ -65,7 +65,7 @@ private struct McpRow {
 
 private struct McpDraft { let scope: String; let payload: [String: Any] }
 
-final class MCPServersViewController: NSViewController, NSTableViewDataSource, NSTableViewDelegate {
+final class MCPServersViewController: NSViewController, NSTableViewDataSource, NSTableViewDelegate, ControlCenterPage {
     private let processClient: ProcessClient
     private let operations: OperationCoordinator
     private let notifications: NotificationCoordinator
@@ -197,11 +197,18 @@ final class MCPServersViewController: NSViewController, NSTableViewDataSource, N
         }
     }
 
+    func refreshOnAppear() { refresh() }
+
     @objc private func testConnection() {
-        guard let selection = selected(), isWritable(selection.row) else { return }
+        guard let selection = selected(), selection.row.managedBy != "plugin" else { return }
         status.stringValue = "Testing \(selection.row.name) with bounded initialize and tools/list…"
-        processClient.run(["mcp", "config", "test", selection.row.name, "--scope", selection.row.scope] + scopeContext(selection.row.scope, mutation: false) + ["--json"]) { [weak self] result in
-            guard let self = self, let json = self.json(result.output) else { self?.status.stringValue = "Connection test failed without a readable receipt."; return }
+        processClient.run(["mcp", "config", "test", selection.row.name, "--scope", selection.row.scope] + scopeContext(selection.row.scope, mutation: false) + ["--json"], timeout: NativeView.mutationTimeout) { [weak self] result in
+            guard let self = self, let json = self.json(result.output) else {
+                self?.status.stringValue = result.code == 0
+                    ? "Connection test failed without a readable receipt."
+                    : "Connection test failed · \(NativeView.redactPreview(result.output))"
+                return
+            }
             let state = json["status"] as? String ?? "unknown"
             let latency = json["latency_ms"] as? Int
             let tools = json["tool_count"] as? Int
@@ -363,6 +370,8 @@ private final class McpEditorSheet: NSObject {
 
     private func build() {
         panel.title = row == nil ? "Add MCP Server" : "Edit \(row!.name)"
+        panel.styleMask = [.titled, .resizable]
+        panel.minSize = NSSize(width: 560, height: 480)
         let grid = NSGridView(views: [
             pair("Scope", scope), pair("Transport", transport), pair("Name", name), pair("Executable", command), pair("Remote URL", url),
             pair("Arguments — one per line", area(args, "Command arguments")), pair("Working directory", cwd), pair("Environment names — no values", area(env, "Environment-variable names")),
@@ -399,20 +408,52 @@ private final class McpEditorSheet: NSObject {
         guard (payload["startup_timeout_sec"] as? Int).map({ 1...30 ~= $0 }) == true, (payload["tool_timeout_sec"] as? Int).map({ 1...3600 ~= $0 }) == true else { return nil }
         if selectedTransport == "stdio" {
             let executable = command.stringValue.trimmingCharacters(in: .whitespacesAndNewlines); if row == nil || row?.transport != selectedTransport { guard !executable.isEmpty else { return nil } }; if !executable.isEmpty { payload["command"] = executable }
-            let argv = lines(args.string); if argv.contains(where: { $0.contains("=") || $0.lowercased().contains("token") || $0.lowercased().contains("secret") }) { return nil }; if !argv.isEmpty { payload["args"] = argv }
-            let names = lines(env.string); guard names.allSatisfy({ $0.range(of: #"^[A-Za-z_][A-Za-z0-9_]*$"#, options: .regularExpression) != nil }) else { return nil }; if !names.isEmpty { payload["env_vars"] = names }
+            let argv = orderedLines(args.string); if argv.contains(where: { $0.contains("=") || $0.lowercased().contains("token") || $0.lowercased().contains("secret") }) { return nil }; if !argv.isEmpty { payload["args"] = argv }
+            let names = uniqueSortedLines(env.string); guard names.allSatisfy({ $0.range(of: #"^[A-Za-z_][A-Za-z0-9_]*$"#, options: .regularExpression) != nil }) else { return nil }; if !names.isEmpty { payload["env_vars"] = names }
             let directory = cwd.stringValue.trimmingCharacters(in: .whitespacesAndNewlines); if !directory.isEmpty { guard directory.hasPrefix("/") else { return nil }; payload["cwd"] = directory }
             if remote.state == .on { payload["experimental_environment"] = "remote" }
         } else {
             let endpoint = url.stringValue.trimmingCharacters(in: .whitespacesAndNewlines); if row == nil || row?.transport != selectedTransport { guard !endpoint.isEmpty else { return nil } }; if !endpoint.isEmpty { guard let parsed = URL(string: endpoint), ["http", "https"].contains(parsed.scheme?.lowercased() ?? ""), parsed.user == nil, parsed.password == nil else { return nil }; payload["url"] = endpoint }
             let envName = bearer.stringValue.trimmingCharacters(in: .whitespacesAndNewlines); if !envName.isEmpty { guard envName.range(of: #"^[A-Za-z_][A-Za-z0-9_]*$"#, options: .regularExpression) != nil else { return nil }; payload["bearer_token_env_var"] = envName }
         }
-        let allow = lines(enabledTools.string); let deny = lines(disabledTools.string); guard Set(allow).isDisjoint(with: Set(deny)) else { return nil }; if !allow.isEmpty { payload["enabled_tools"] = allow }; if !deny.isEmpty { payload["disabled_tools"] = deny }
+        let allow = uniqueSortedLines(enabledTools.string); let deny = uniqueSortedLines(disabledTools.string); guard Set(allow).isDisjoint(with: Set(deny)) else { return nil }; if !allow.isEmpty { payload["enabled_tools"] = allow }; if !deny.isEmpty { payload["disabled_tools"] = deny }
         return McpDraft(scope: scope.titleOfSelectedItem?.lowercased() ?? "global", payload: payload)
     }
 
-    private func validationMessage() -> String { "Check the server name, selected connection field, timeout ranges, environment names, tool lists, and secret-free arguments before review." }
+    private func validationMessage() -> String {
+        let server = name.stringValue.trimmingCharacters(in: .whitespacesAndNewlines)
+        if server.range(of: #"^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$"#, options: .regularExpression) == nil {
+            return "Fix the server name: use 1–64 letters, numbers, underscores, or hyphens."
+        }
+        if transport.indexOfSelectedItem == 0 {
+            let executable = command.stringValue.trimmingCharacters(in: .whitespacesAndNewlines)
+            if (row == nil || row?.transport != "stdio") && executable.isEmpty { return "Executable is required for a local command server." }
+            if orderedLines(args.string).contains(where: { $0.contains("=") || $0.lowercased().contains("token") || $0.lowercased().contains("secret") }) {
+                return "Arguments must stay secret-free. Remove token/secret values and inline assignments."
+            }
+            if !uniqueSortedLines(env.string).allSatisfy({ $0.range(of: #"^[A-Za-z_][A-Za-z0-9_]*$"#, options: .regularExpression) != nil }) {
+                return "Environment names must be bare variable names with no values."
+            }
+        } else {
+            let endpoint = url.stringValue.trimmingCharacters(in: .whitespacesAndNewlines)
+            if (row == nil || row?.transport != "streamable-http") && endpoint.isEmpty { return "Remote URL is required for a remote MCP server." }
+        }
+        let startupSec = Int(startup.stringValue) ?? 0
+        let toolSec = Int(tool.stringValue) ?? 0
+        if !(1...30 ~= startupSec) { return "Startup timeout must be between 1 and 30 seconds." }
+        if !(1...3600 ~= toolSec) { return "Tool timeout must be between 1 and 3600 seconds." }
+        let allow = uniqueSortedLines(enabledTools.string); let deny = uniqueSortedLines(disabledTools.string)
+        if !Set(allow).isDisjoint(with: Set(deny)) { return "Enabled and disabled tool lists must not overlap." }
+        return "Check the selected connection field, timeout ranges, environment names, tool lists, and secret-free arguments before review."
+    }
     private func pair(_ label: String, _ control: NSView) -> [NSView] { [NSTextField(labelWithString: label), control] }
     private func area(_ text: NSTextView, _ label: String) -> NSScrollView { text.isRichText = false; text.font = NSFont.systemFont(ofSize: 12); text.setAccessibilityLabel(label); let scroll = NSScrollView(); scroll.documentView = text; scroll.hasVerticalScroller = true; scroll.borderType = .bezelBorder; scroll.heightAnchor.constraint(equalToConstant: 52).isActive = true; return scroll }
-    private func lines(_ value: String) -> [String] { Array(Set(value.split(whereSeparator: \.isNewline).map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }.filter { !$0.isEmpty })).sorted() }
+    private func uniqueSortedLines(_ value: String) -> [String] { Array(Set(rawLines(value))).sorted() }
+    private func orderedLines(_ value: String) -> [String] {
+        var seen = Set<String>()
+        return rawLines(value).filter { seen.insert($0).inserted }
+    }
+    private func rawLines(_ value: String) -> [String] {
+        value.split(whereSeparator: \.isNewline).map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }.filter { !$0.isEmpty }
+    }
 }

package/dist/native/sks-menubar/Sources/OverviewViewController.swift

@@ -1,6 +1,14 @@
 import Cocoa
 
+/// Pages that should reload local status whenever the Control Center section becomes visible.
+protocol ControlCenterPage: AnyObject {
+    func refreshOnAppear()
+}
+
 enum NativeView {
+    static let statusTimeout: TimeInterval = 8
+    static let mutationTimeout: TimeInterval = 90
+
     static func title(_ value: String) -> NSTextField {
         let field = NSTextField(labelWithString: value)
         field.font = NSFont.systemFont(ofSize: 18, weight: .semibold)
@@ -29,6 +37,35 @@ enum NativeView {
         stack.edgeInsets = NSEdgeInsets(top: 22, left: 24, bottom: 22, right: 24)
         return stack
     }
+
+    static func scrollable(_ document: NSView) -> NSScrollView {
+        let scroll = NSScrollView()
+        scroll.drawsBackground = false
+        scroll.hasVerticalScroller = true
+        scroll.hasHorizontalScroller = false
+        scroll.borderType = .noBorder
+        scroll.autohidesScrollers = true
+        scroll.translatesAutoresizingMaskIntoConstraints = false
+        document.translatesAutoresizingMaskIntoConstraints = false
+        scroll.documentView = document
+        if let content = scroll.contentView.documentView {
+            NSLayoutConstraint.activate([
+                content.leadingAnchor.constraint(equalTo: scroll.contentView.leadingAnchor),
+                content.trailingAnchor.constraint(equalTo: scroll.contentView.trailingAnchor),
+                content.topAnchor.constraint(equalTo: scroll.contentView.topAnchor)
+            ])
+        }
+        return scroll
+    }
+
+    static func redactPreview(_ output: String, limit: Int = 160) -> String {
+        let compact = output
+            .replacingOccurrences(of: "\n", with: " ")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !compact.isEmpty else { return "No public detail was returned." }
+        if compact.count <= limit { return compact }
+        return String(compact.prefix(limit)) + "…"
+    }
 }
 
 enum OverviewSummary {
@@ -182,12 +219,14 @@ enum OverviewSummary {
     }
 }
 
-final class OverviewViewController: NSViewController {
+final class OverviewViewController: NSViewController, ControlCenterPage {
     private let processClient: ProcessClient
     private let operations: OperationCoordinator
     private let status = NativeView.detail("Loading local SKS status…")
     private let notificationInbox = NativeView.detail("Notifications: checking authorization…")
     private var generation = 0
+    private var doctorButton: NSButton!
+    private var refreshButton: NSButton!
 
     init(processClient: ProcessClient, operations: OperationCoordinator) {
         self.processClient = processClient
@@ -197,9 +236,9 @@ final class OverviewViewController: NSViewController {
     required init?(coder: NSCoder) { nil }
 
     override func loadView() {
-        let runDoctor = NativeView.button("Run Doctor", target: self, action: #selector(doctor))
-        let refresh = NativeView.button("Refresh", target: self, action: #selector(refreshStatus))
-        let buttons = NSStackView(views: [runDoctor, refresh])
+        doctorButton = NativeView.button("Run Doctor", target: self, action: #selector(doctor))
+        refreshButton = NativeView.button("Refresh", target: self, action: #selector(refreshStatus))
+        let buttons = NSStackView(views: [doctorButton, refreshButton])
         buttons.orientation = .horizontal
         buttons.spacing = 8
         view = NativeView.stack([
@@ -212,6 +251,10 @@ final class OverviewViewController: NSViewController {
         loadStatus(forceUpdateRefresh: false)
     }
 
+    func refreshOnAppear() {
+        loadStatus(forceUpdateRefresh: false)
+    }
+
     func setNotificationAuthorizationDenied(_ denied: Bool) {
         notificationInbox.stringValue = denied
             ? "Notifications: permission denied — operation results remain available in this Control Center inbox."
@@ -225,6 +268,7 @@ final class OverviewViewController: NSViewController {
     private func loadStatus(forceUpdateRefresh: Bool) {
         generation += 1
         let requestGeneration = generation
+        refreshButton?.isEnabled = false
         status.stringValue = "Checking versions, MCP servers, Telegram Hub, remote fleet, and operations…"
         var update: [String: Any]?
         var mcp: [String: Any]?
@@ -234,7 +278,7 @@ final class OverviewViewController: NSViewController {
         var updateArguments = ["update", "status"]
         if forceUpdateRefresh { updateArguments.append("--refresh") }
         updateArguments.append("--json")
-        processClient.run(updateArguments) { [weak self] result in
+        processClient.run(updateArguments, timeout: NativeView.statusTimeout) { [weak self] result in
             update = result.code == 0 ? self?.json(result.output) : nil
             group.leave()
         }
@@ -247,24 +291,33 @@ final class OverviewViewController: NSViewController {
             group.leave()
         }
         group.enter()
-        processClient.run(["telegram", "status", "--project-root", AppRuntime.projectRoot, "--json"]) { [weak self] result in
+        processClient.run(["telegram", "status", "--project-root", AppRuntime.projectRoot, "--json"], timeout: NativeView.statusTimeout) { [weak self] result in
             telegram = result.code == 0 ? self?.json(result.output) : nil
             group.leave()
         }
         group.notify(queue: .main) { [weak self] in
             guard let self = self, self.generation == requestGeneration else { return }
+            self.refreshButton?.isEnabled = true
             self.status.stringValue = self.summary(update: update, mcp: mcp, telegram: telegram)
         }
         DispatchQueue.main.asyncAfter(deadline: .now() + 5) { [weak self] in
             guard let self = self, self.generation == requestGeneration else { return }
+            self.refreshButton?.isEnabled = true
             self.status.stringValue = self.summary(update: update, mcp: mcp, telegram: telegram)
         }
     }
 
     @objc private func doctor() {
+        doctorButton?.isEnabled = false
         status.stringValue = "Doctor is running…"
-        processClient.run(["doctor", "--json"]) { [weak self] result in
-            self?.status.stringValue = result.code == 0 ? "Doctor completed. No blocking issue was reported." : "Doctor found an issue. Open Diagnostics or the operation log."
+        processClient.run(["doctor", "--json"], timeout: NativeView.mutationTimeout) { [weak self] result in
+            guard let self = self else { return }
+            self.doctorButton?.isEnabled = true
+            if result.code == 0 {
+                self.status.stringValue = "Doctor completed. No blocking issue was reported."
+            } else {
+                self.status.stringValue = "Doctor found an issue. Open Diagnostics · \(NativeView.redactPreview(result.output))"
+            }
         }
     }
 

package/dist/native/sks-menubar/Sources/ProvidersViewController.swift

@@ -1,51 +1,120 @@
 import Cocoa
 
-final class ProvidersViewController: NSViewController {
+final class ProvidersViewController: NSViewController, ControlCenterPage {
     private let processClient: ProcessClient
+    private let operations: OperationCoordinator
     private let providerStatus = NativeView.detail("Provider status unchecked.")
     private let fastStatus = NativeView.detail("Fast Mode: checking current desktop setting…")
-    init(processClient: ProcessClient) { self.processClient = processClient; super.init(nibName: nil, bundle: nil) }
+    private var actionButtons: [NSButton] = []
+    private var busy = false
+
+    init(processClient: ProcessClient, operations: OperationCoordinator) {
+        self.processClient = processClient
+        self.operations = operations
+        super.init(nibName: nil, bundle: nil)
+    }
     required init?(coder: NSCoder) { nil }
 
     override func loadView() {
-        let credentials = NSStackView(views: [
-            NativeView.button("Set Domain and Key…", target: self, action: #selector(setDomainAndKey)),
-            NativeView.button("Replace Key…", target: self, action: #selector(replaceKey))
-        ])
+        let setDomain = NativeView.button("Set Domain and Key…", target: self, action: #selector(setDomainAndKey))
+        let replace = NativeView.button("Replace Key…", target: self, action: #selector(replaceKey))
+        let useOAuth = NativeView.button("Use ChatGPT OAuth", target: self, action: #selector(useOAuth))
+        let useLb = NativeView.button("Use codex-lb", target: self, action: #selector(useCodexLb))
+        let fastOn = NativeView.button("Fast Mode On", target: self, action: #selector(fastOn))
+        let fastOff = NativeView.button("Fast Mode Off", target: self, action: #selector(fastOff))
+        actionButtons = [setDomain, replace, useOAuth, useLb, fastOn, fastOff]
+        let credentials = NSStackView(views: [setDomain, replace])
         credentials.orientation = .horizontal; credentials.spacing = 8
-        let buttons = NSStackView(views: [
-            NativeView.button("Use ChatGPT OAuth", target: self, action: #selector(useOAuth)),
-            NativeView.button("Use codex-lb", target: self, action: #selector(useCodexLb)),
-            NativeView.button("Fast Mode On", target: self, action: #selector(fastOn)),
-            NativeView.button("Fast Mode Off", target: self, action: #selector(fastOff))
-        ])
+        let buttons = NSStackView(views: [useOAuth, useLb, fastOn, fastOff])
         buttons.orientation = .horizontal; buttons.spacing = 8
         view = NativeView.stack([
             NativeView.title("Providers"),
-            NativeView.detail("Provider changes use typed SKS commands and verified Codex restarts. Credentials stay out of logs and notifications."),
+            NativeView.detail("Set Domain and Key only stores credentials. Use codex-lb activates them with a shared OpenAI routing guard so sk-clb keys never hit api.openai.com. Secrets stay on stdin and out of logs."),
             credentials, providerStatus, fastStatus, buttons
         ])
         refresh()
     }
 
-    private func run(_ args: [String], title: String, completion: (() -> Void)? = nil) {
+    func refreshOnAppear() { refresh() }
+
+    private func setBusy(_ value: Bool) {
+        busy = value
+        for button in actionButtons { button.isEnabled = !value }
+    }
+
+    private func run(_ args: [String], title: String, kind: String, group: String?, timeout: TimeInterval = NativeView.mutationTimeout, completion: (() -> Void)? = nil) {
+        guard !busy else {
+            providerStatus.stringValue = "Another provider action is already running."
+            return
+        }
+        guard let snapshot = operations.begin(kind: kind, mutationGroup: group, summary: title) else {
+            providerStatus.stringValue = "Another guarded mutation is already running. Wait or open Diagnostics."
+            return
+        }
+        setBusy(true)
         providerStatus.stringValue = "\(title)…"
-        processClient.run(args) { [weak self] result in
-            self?.providerStatus.stringValue = result.code == 0 ? "\(title) complete." : "\(title) failed. See Diagnostics."
+        _ = operations.update(snapshot, state: .running, stage: "running", progress: nil, summary: title)
+        processClient.run(args, timeout: timeout) { [weak self] result in
+            guard let self = self else { return }
+            self.setBusy(false)
+            _ = self.operations.update(
+                snapshot,
+                state: result.code == 0 ? .succeeded : .failed,
+                stage: "complete",
+                progress: 1,
+                summary: result.code == 0 ? "\(title) completed" : "\(title) failed"
+            )
+            if result.code != 0 {
+                self.providerStatus.stringValue = "\(title) failed · \(NativeView.redactPreview(result.output))"
+            }
+            self.refresh()
             completion?()
         }
     }
 
     private func refresh() {
-        processClient.run(["codex-lb", "status", "--json"]) { [weak self] result in
-            self?.providerStatus.stringValue = result.code == 0 ? "Provider status loaded." : "Provider status unavailable."
+        processClient.run(["codex-lb", "status", "--json"], timeout: NativeView.statusTimeout) { [weak self] result in
+            guard let self = self else { return }
+            guard result.code == 0, let json = self.json(result.output) else {
+                if !self.busy { self.providerStatus.stringValue = "Provider status unavailable. Retry or open Diagnostics." }
+                return
+            }
+            if !self.busy { self.providerStatus.stringValue = self.describeProviderStatus(json) }
         }
         refreshFastStatus()
     }
 
+    private func describeProviderStatus(_ json: [String: Any]) -> String {
+        let configured = json["provider_configured"] as? Bool == true
+        let selected = json["selected"] as? Bool == true
+        let ok = json["ok"] as? Bool == true
+        let authMode = json["auth_mode"] as? String ?? "unknown"
+        let coherent = json["auth_routing_coherent"] as? Bool
+        let routing = json["shared_openai_routing"] as? [String: Any]
+        let routingSafe = routing?["safe"] as? Bool
+        let keyInShared = json["codex_lb_key_in_shared_auth"] as? Bool == true
+
+        if !configured {
+            return "Codex LB: not configured. Use Set Domain and Key, then Use codex-lb."
+        }
+        if routingSafe == false || (keyInShared && coherent == false) {
+            return "Codex LB: routing unsafe — shared key can hit api.openai.com. Click Use codex-lb to repair."
+        }
+        if selected && ok {
+            return "Codex LB: active (auth=\(authMode), routing guarded)."
+        }
+        if selected && !ok {
+            return "Codex LB: selected but not ready. Click Use codex-lb or check Diagnostics."
+        }
+        if keyInShared {
+            return "Codex LB: credentials in shared auth but provider not selected. Click Use ChatGPT OAuth or Use codex-lb."
+        }
+        return "Codex LB: credentials stored, not selected (auth=\(authMode)). Click Use codex-lb to activate."
+    }
+
     private func refreshFastStatus() {
-        fastStatus.stringValue = "Fast Mode: checking current desktop setting…"
-        processClient.run(["fast-mode", "status", "--json"]) { [weak self] result in
+        if !busy { fastStatus.stringValue = "Fast Mode: checking current desktop setting…" }
+        processClient.run(["fast-mode", "status", "--json"], timeout: NativeView.statusTimeout) { [weak self] result in
             guard let self = self else { return }
             guard result.code == 0, let json = self.json(result.output),
                   let global = json["global"] as? [String: Any], let on = global["on"] as? Bool else {
@@ -66,27 +135,49 @@ final class ProvidersViewController: NSViewController {
         guard let window = view.window else { return }
         AlertFactory.textSheet(window: window, title: "Codex LB Domain", message: "Enter a codex-lb domain or base URL.") { [weak self] host in
             guard let self = self, let host = host else { return }
-            self.promptForKey(window: window, args: ["codex-lb", "setup", "--host", host, "--api-key-stdin", "--yes", "--no-default-provider", "--preserve-auth", "--no-keychain", "--no-restart-app", "--json"])
+            self.promptForKey(window: window, args: ["codex-lb", "setup", "--host", host, "--api-key-stdin", "--yes", "--no-default-provider", "--preserve-auth", "--no-keychain", "--no-restart-app", "--json"], kind: "codex-lb-setup", title: "Save Codex LB credentials")
         }
     }
 
     @objc private func replaceKey() {
         guard let window = view.window else { return }
-        promptForKey(window: window, args: ["codex-lb", "set-key", "--api-key-stdin", "--preserve-auth", "--restart-app", "--json"])
+        promptForKey(window: window, args: ["codex-lb", "set-key", "--api-key-stdin", "--preserve-auth", "--restart-app", "--json"], kind: "codex-lb-set-key", title: "Replace Codex LB API key")
     }
 
-    private func promptForKey(window: NSWindow, args: [String]) {
+    private func promptForKey(window: NSWindow, args: [String], kind: String, title: String) {
         AlertFactory.textSheet(window: window, title: "Codex LB API Key", message: "Paste a new key. It is sent through stdin and never shown again.", secure: true) { [weak self] key in
             guard let self = self, let key = key else { return }
+            guard !self.busy else {
+                self.providerStatus.stringValue = "Another provider action is already running."
+                return
+            }
+            guard let snapshot = self.operations.begin(kind: kind, mutationGroup: "codex-config", summary: title) else {
+                self.providerStatus.stringValue = "Another guarded mutation is already running. Wait or open Diagnostics."
+                return
+            }
+            self.setBusy(true)
             self.providerStatus.stringValue = "Saving Codex LB API key…"
-            self.processClient.run(args, stdin: key + "\n") { [weak self] result in
-                self?.providerStatus.stringValue = result.code == 0 ? "Codex LB API key saved." : "Codex LB API key save failed. See Diagnostics."
+            _ = self.operations.update(snapshot, state: .running, stage: "running", progress: nil, summary: title)
+            self.processClient.run(args, stdin: key + "\n", timeout: NativeView.mutationTimeout) { [weak self] result in
+                guard let self = self else { return }
+                self.setBusy(false)
+                _ = self.operations.update(
+                    snapshot,
+                    state: result.code == 0 ? .succeeded : .failed,
+                    stage: "complete",
+                    progress: 1,
+                    summary: result.code == 0 ? "Codex LB API key saved" : "Codex LB API key save failed"
+                )
+                if result.code != 0 {
+                    self.providerStatus.stringValue = "Codex LB API key save failed · \(NativeView.redactPreview(result.output))"
+                }
+                self.refresh()
             }
         }
     }
 
-    @objc private func useOAuth() { run(["codex-lb", "use-oauth", "--restart-app", "--json"], title: "Use ChatGPT OAuth") }
-    @objc private func useCodexLb() { run(["codex-lb", "use-codex-lb", "--restart-app", "--json"], title: "Use codex-lb") }
-    @objc private func fastOn() { run(["fast-mode", "on", "--json"], title: "Fast Mode On") { [weak self] in self?.refreshFastStatus() } }
-    @objc private func fastOff() { run(["fast-mode", "off", "--json"], title: "Fast Mode Off") { [weak self] in self?.refreshFastStatus() } }
+    @objc private func useOAuth() { run(["codex-lb", "use-oauth", "--restart-app", "--json"], title: "Use ChatGPT OAuth", kind: "codex-lb-use-oauth", group: "codex-config") }
+    @objc private func useCodexLb() { run(["codex-lb", "use-codex-lb", "--restart-app", "--json"], title: "Use codex-lb", kind: "codex-lb-use-lb", group: "codex-config") }
+    @objc private func fastOn() { run(["fast-mode", "on", "--json"], title: "Fast Mode On", kind: "fast-mode-on", group: "codex-config", timeout: NativeView.statusTimeout) { [weak self] in self?.refreshFastStatus() } }
+    @objc private func fastOff() { run(["fast-mode", "off", "--json"], title: "Fast Mode Off", kind: "fast-mode-off", group: "codex-config", timeout: NativeView.statusTimeout) { [weak self] in self?.refreshFastStatus() } }
 }

package/dist/native/sks-menubar/Sources/RemoteTelegramViewController.swift

@@ -1,61 +1,96 @@
 import Cocoa
 
-final class RemoteTelegramViewController: NSViewController {
+final class RemoteTelegramViewController: NSViewController, ControlCenterPage {
     private let processClient: ProcessClient
     private let status = NativeView.detail("Remote readiness has not been checked.")
     private var generation = 0
+    private var checkButton: NSButton!
+
     init(processClient: ProcessClient) { self.processClient = processClient; super.init(nibName: nil, bundle: nil) }
     required init?(coder: NSCoder) { nil }
 
     override func loadView() {
-        let refresh = NativeView.button("Check Readiness", target: self, action: #selector(check))
+        checkButton = NativeView.button("Check Readiness", target: self, action: #selector(check))
         view = NativeView.stack([
             NativeView.title("Remote & Telegram"),
             NativeView.detail("OpenAI Remote remains the high-fidelity coding surface. Telegram is limited to proof-aware fleet status and typed approvals; arbitrary remote shell is never enabled."),
-            status, refresh
+            status, checkButton
         ])
         check()
     }
 
+    func refreshOnAppear() { check() }
+
     @objc private func check() {
         generation += 1
         let requestGeneration = generation
+        checkButton?.isEnabled = false
         status.stringValue = "Checking official Remote compatibility and Telegram Hub state…"
         var remote: [String: Any]?
         var telegram: [String: Any]?
+        var remoteFailed = false
+        var telegramFailed = false
         let group = DispatchGroup()
         group.enter()
-        processClient.run(["remote", "readiness", "--project-root", AppRuntime.projectRoot, "--json"]) { [weak self] result in
+        processClient.run(["remote", "readiness", "--project-root", AppRuntime.projectRoot, "--json"], timeout: NativeView.statusTimeout) { [weak self] result in
             remote = self?.json(result.output)
+            remoteFailed = result.code != 0 || remote == nil
             group.leave()
         }
         group.enter()
-        processClient.run(["telegram", "status", "--project-root", AppRuntime.projectRoot, "--json"]) { [weak self] result in
-            telegram = self?.json(result.output)
+        processClient.run(["telegram", "status", "--project-root", AppRuntime.projectRoot, "--json"], timeout: NativeView.statusTimeout) { [weak self] result in
+            telegram = result.code == 0 ? self?.json(result.output) : nil
+            telegramFailed = result.code != 0 || telegram == nil
             group.leave()
         }
         group.notify(queue: .main) { [weak self] in
             guard let self = self, self.generation == requestGeneration else { return }
-            self.status.stringValue = self.summary(remote: remote, telegram: telegram)
+            self.checkButton?.isEnabled = true
+            self.status.stringValue = self.summary(remote: remote, telegram: telegram, remoteFailed: remoteFailed, telegramFailed: telegramFailed)
         }
     }
 
-    private func summary(remote: [String: Any]?, telegram: [String: Any]?) -> String {
-        let host = remote?["host"] as? [String: Any]
-        let project = remote?["project"] as? [String: Any]
-        let mcp = remote?["mcp"] as? [String: Any]
-        let sks = remote?["sks"] as? [String: Any]
-        let remoteBlockers = remote?["blockers"] as? [String] ?? []
-        let remoteWarnings = remote?["warnings"] as? [String] ?? []
-        let owner = telegram?["owner"] as? [String: Any]
-        let telegramIssues = (telegram?["config_issues"] as? [String] ?? []) + (telegram?["remote_config_issues"] as? [String] ?? [])
-        let lines = [
-            "Official Remote compatibility: \(remote?["ok"] as? Bool == true ? "Ready" : "Needs attention") · Codex app \(host?["codex_app_found"] as? Bool == true ? "found" : "missing") · CLI \(host?["codex_cli_found"] as? Bool == true ? "found" : "missing")",
-            "Project: Git \(project?["git_repo"] as? Bool == true ? "ready" : "missing") · worktree \(project?["worktree"] as? Bool == true ? "yes" : "no") · dirty \(project?["dirty"] as? Bool == true ? "yes" : "no") · allowlist \(project?["allowed"] as? Bool == true ? "ready" : "blocked")",
-            "MCP: \(mcp?["effective_count"] as? Int ?? 0) effective · \(mcp?["failed_count"] as? Int ?? 0) failed · SKS proof \(sks?["proof_surfaces_ready"] as? Bool == true ? "ready" : "missing")",
-            "Telegram Hub: \(owner == nil ? "Stopped" : "Running") · \(telegram?["topic_count"] as? Int ?? 0) topics · \(telegram?["machine_count"] as? Int ?? 0) machines · \(telegram?["target_count"] as? Int ?? 0) targets",
-            "Remote blockers \(remoteBlockers.count) · warnings \(remoteWarnings.count) · Telegram issues \(telegramIssues.count)"
-        ]
+    private func summary(remote: [String: Any]?, telegram: [String: Any]?, remoteFailed: Bool, telegramFailed: Bool) -> String {
+        if remoteFailed && telegramFailed {
+            return "Remote readiness and Telegram status are unavailable. Retry Check Readiness, or open Diagnostics for the redacted log."
+        }
+        var lines: [String] = []
+        if remoteFailed || remote == nil {
+            lines.append("Official Remote compatibility: unavailable — probe failed or returned no readable JSON.")
+        } else if let remote = remote {
+            let host = remote["host"] as? [String: Any]
+            let project = remote["project"] as? [String: Any]
+            let mcp = remote["mcp"] as? [String: Any]
+            let sks = remote["sks"] as? [String: Any]
+            let remoteBlockers = remote["blockers"] as? [String] ?? []
+            let remoteWarnings = remote["warnings"] as? [String] ?? []
+            lines.append("Official Remote compatibility: \(remote["ok"] as? Bool == true ? "Ready" : "Needs attention") · Codex app \(host?["codex_app_found"] as? Bool == true ? "found" : "missing") · CLI \(host?["codex_cli_found"] as? Bool == true ? "found" : "missing")")
+            lines.append("Project: Git \(project?["git_repo"] as? Bool == true ? "ready" : "missing") · worktree \(project?["worktree"] as? Bool == true ? "yes" : "no") · dirty \(project?["dirty"] as? Bool == true ? "yes" : "no") · allowlist \(project?["allowed"] as? Bool == true ? "ready" : "blocked")")
+            lines.append("MCP: \(mcp?["effective_count"] as? Int ?? 0) effective · \(mcp?["failed_count"] as? Int ?? 0) failed · SKS proof \(sks?["proof_surfaces_ready"] as? Bool == true ? "ready" : "missing")")
+            if !remoteBlockers.isEmpty {
+                lines.append("Remote blockers: \(remoteBlockers.prefix(3).joined(separator: "; "))\(remoteBlockers.count > 3 ? "…" : "")")
+            } else if !remoteWarnings.isEmpty {
+                lines.append("Remote warnings: \(remoteWarnings.prefix(3).joined(separator: "; "))\(remoteWarnings.count > 3 ? "…" : "")")
+            } else {
+                lines.append("Remote blockers 0 · warnings 0")
+            }
+        }
+
+        if telegramFailed || telegram == nil {
+            lines.append("Telegram Hub: unavailable — status probe failed.")
+            lines.append("Remote fleet: unavailable until Telegram status succeeds.")
+        } else if let telegram = telegram {
+            let owner = telegram["owner"] as? [String: Any]
+            let configured = telegram["configured"] as? Bool
+            let hubState = owner != nil ? "Running" : configured == true ? "Stopped" : configured == false ? "Not configured" : "Unknown"
+            let telegramIssues = (telegram["config_issues"] as? [String] ?? []) + (telegram["remote_config_issues"] as? [String] ?? [])
+            lines.append("Telegram Hub: \(hubState) · \(telegram["topic_count"] as? Int ?? 0) topics · \(telegram["machine_count"] as? Int ?? 0) machines · \(telegram["target_count"] as? Int ?? 0) targets")
+            if telegramIssues.isEmpty {
+                lines.append("Telegram issues 0")
+            } else {
+                lines.append("Telegram issues \(telegramIssues.count): \(telegramIssues.prefix(2).joined(separator: "; "))\(telegramIssues.count > 2 ? "…" : "")")
+            }
+        }
         return lines.joined(separator: "\n")
     }