sneakoscope 7.3.0 → 7.6.0

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

@@ -74,6 +74,7 @@ final class MCPServersViewController: NSViewController, NSTableViewDataSource, N
     private let scopePopup = NSPopUpButton()
     private var rows: [McpRow] = []
     private var mutating = false
+    private var refreshGeneration = 0
     private var editor: McpEditorSheet?
     private lazy var addButton = actionButton("Add…", #selector(addServer))
     private lazy var editButton = actionButton("Edit…", #selector(editServer))
@@ -93,10 +94,17 @@ final class MCPServersViewController: NSViewController, NSTableViewDataSource, N
     required init?(coder: NSCoder) { nil }
 
     override func loadView() {
-        for (id, title, width) in [("state", "State", 105.0), ("name", "Name", 170.0), ("transport", "Transport", 120.0), ("configuration", "Configuration", 260.0)] {
-            let column = NSTableColumn(identifier: NSUserInterfaceItemIdentifier(id)); column.title = title; column.width = width
+        for (id, title, width, minimum) in [
+            ("state", "State", 90.0, 72.0),
+            ("name", "Name", 150.0, 110.0),
+            ("transport", "Transport", 110.0, 86.0),
+            ("configuration", "Configuration", 230.0, 150.0)
+        ] {
+            let column = NSTableColumn(identifier: NSUserInterfaceItemIdentifier(id))
+            column.title = title; column.width = width; column.minWidth = minimum
             table.addTableColumn(column)
         }
+        table.columnAutoresizingStyle = .lastColumnOnlyAutoresizingStyle
         table.dataSource = self; table.delegate = self; table.usesAlternatingRowBackgroundColors = true
         table.allowsMultipleSelection = false; table.setAccessibilityLabel("Effective MCP servers")
         let scroll = NSScrollView(); scroll.documentView = table; scroll.hasVerticalScroller = true; scroll.hasHorizontalScroller = true
@@ -107,18 +115,24 @@ final class MCPServersViewController: NSViewController, NSTableViewDataSource, N
         scopeRow.orientation = .horizontal; scopeRow.spacing = 8
         // Destructive Remove sits apart from routine edit actions; connection
         // and maintenance actions live on their own labeled row.
-        let primary = ControlKit.actionRow([addButton, editButton, duplicateButton, toggleButton], trailing: [removeButton])
+        let primary = ControlKit.actionRow([addButton, editButton, duplicateButton])
+        let stateActions = ControlKit.actionRow([toggleButton], trailing: [removeButton])
         let manageLabel = NSTextField(labelWithString: "Manage"); manageLabel.textColor = .secondaryLabelColor
         let connectLabel = NSTextField(labelWithString: "Connection"); connectLabel.textColor = .secondaryLabelColor
         for label in [manageLabel, connectLabel] { label.font = NSFont.systemFont(ofSize: 11, weight: .medium) }
-        let secondary = NSStackView(views: [testButton, oauthButton, legacySecretButton, backupsButton, refreshButton])
-        secondary.orientation = .horizontal; secondary.spacing = 8
-        view = NativeView.stack([
-            NativeView.title("MCP Servers"),
-            NativeView.detail("Inspect global, trusted-project, or effective configuration. Effective and plugin entries are read-only until an exact writable scope is selected. New authentication uses OAuth or environment-variable names only."),
-            scopeRow, scroll, status, manageLabel, primary, connectLabel, secondary
+        let secondary = ControlKit.actionRow([testButton, oauthButton, legacySecretButton])
+        let maintenance = ControlKit.actionRow([backupsButton, refreshButton])
+        let inventoryCard = NativeView.card(
+            title: "Server inventory",
+            subtitle: "Select one row before using edit, connection, authentication, or removal actions.",
+            views: [scroll, status, manageLabel, primary, stateActions, connectLabel, secondary, maintenance]
+        )
+        view = NativeView.page([
+            ControlKit.header("MCP Servers", "Inspect global, trusted-project, or effective configuration. Effective and plugin entries are read-only until an exact writable scope is selected. New authentication uses OAuth or environment-variable names only."),
+            scopeRow,
+            inventoryCard
         ])
-        updateButtons(); refresh()
+        updateButtons()
     }
 
     func numberOfRows(in tableView: NSTableView) -> Int { rows.count }
@@ -143,9 +157,14 @@ final class MCPServersViewController: NSViewController, NSTableViewDataSource, N
     @objc private func scopeChanged() { refresh() }
 
     @objc private func refresh() {
-        let scope = selectedScope(); status.stringValue = "Loading \(scope) MCP configuration…"
+        guard !mutating else { return }
+        refreshGeneration += 1
+        let requestGeneration = refreshGeneration
+        let scope = selectedScope()
+        status.stringValue = "Loading \(scope) MCP configuration…"
+        refreshButton.isEnabled = false
         processClient.run(["mcp", "config", "list", "--scope", scope] + scopeContext(scope, mutation: false) + ["--json"], timeout: NativeView.statusTimeout) { [weak self] result in
-            guard let self = self else { return }
+            guard let self = self, self.refreshGeneration == requestGeneration else { return }
             guard let json = self.json(result.output), let servers = json["servers"] as? [[String: Any]] else {
                 self.rows = []; self.table.reloadData(); self.status.stringValue = "MCP inventory unavailable. No configuration was changed."
                 self.updateButtons(); return
@@ -155,7 +174,9 @@ final class MCPServersViewController: NSViewController, NSTableViewDataSource, N
             let enabled = json["enabled_count"] as? Int ?? self.rows.filter(\.enabled).count
             let failed = json["failed_count"] as? Int ?? 0
             let warnings = (json["warnings"] as? [String] ?? []).filter { !$0.hasPrefix("public_error:") }
-            self.status.stringValue = "\(self.rows.count) servers · \(enabled) enabled · \(failed) need attention" + (warnings.isEmpty ? "" : " · \(warnings.count) advisory")
+            self.status.stringValue = self.rows.isEmpty
+                ? "No MCP servers are configured in the \(scope) scope."
+                : "\(self.rows.count) servers · \(enabled) enabled · \(failed) need attention" + (warnings.isEmpty ? "" : " · \(warnings.count) advisory")
             self.updateButtons()
         }
     }
@@ -296,6 +317,7 @@ final class MCPServersViewController: NSViewController, NSTableViewDataSource, N
 
     private func mutate(_ args: [String], stdin: String? = nil) {
         guard !mutating, let operation = operations.begin(kind: "mcp-config", mutationGroup: "mcp", summary: "MCP configuration change") else { status.stringValue = "An update or MCP mutation is already running."; return }
+        refreshGeneration += 1
         mutating = true; updateButtons(); _ = operations.update(operation, state: .running, stage: "apply", progress: nil, summary: "Applying scoped MCP change")
         processClient.run(args, stdin: stdin, timeout: NativeView.mutationTimeout) { [weak self] result in
             guard let self = self else { return }
@@ -326,6 +348,11 @@ final class MCPServersViewController: NSViewController, NSTableViewDataSource, N
     private func actionButton(_ title: String, _ action: Selector) -> NSButton { NativeView.button(title, target: self, action: action) }
     private func updateButtons() {
         let row = selected()?.row; let writable = selectedWritableRow() != nil
+        toggleButton.title = row?.enabled == true ? "Disable Selected" : "Enable Selected"
+        removeButton.title = "Remove Selected"
+        testButton.title = "Test Selected"
+        oauthButton.title = row?.authenticated == true ? "Sign Out OAuth" : "Sign In with OAuth"
+        legacySecretButton.title = "Review Legacy Secret…"
         addButton.isEnabled = !mutating; refreshButton.isEnabled = !mutating; scopePopup.isEnabled = !mutating
         for button in [editButton, duplicateButton, toggleButton, removeButton] { button.isEnabled = !mutating && writable }
         testButton.isEnabled = !mutating && row != nil && row?.managedBy != "plugin"
@@ -391,12 +418,13 @@ private final class McpEditorSheet: NSObject {
             pair("Default approval mode", approval), pair("Environment", remote), pair("Requirement", required)
         ])
         grid.rowSpacing = 6; grid.columnSpacing = 12; grid.column(at: 0).xPlacement = .trailing; grid.column(at: 1).xPlacement = .fill
-        grid.column(at: 1).width = 420
+        grid.column(at: 1).width = 300
         let cancel = NSButton(title: "Cancel", target: self, action: #selector(cancelSheet)); let buttons = NSStackView(views: [cancel, apply])
         buttons.orientation = .horizontal; buttons.spacing = 8
-        let stack = NativeView.stack([NativeView.detail("Connection values are used only for the selected transport. Edit fields may be left blank to preserve existing connection data."), grid, review, buttons])
-        stack.translatesAutoresizingMaskIntoConstraints = false; panel.contentView = NSView(); panel.contentView?.addSubview(stack)
-        NSLayoutConstraint.activate([stack.leadingAnchor.constraint(equalTo: panel.contentView!.leadingAnchor), stack.trailingAnchor.constraint(equalTo: panel.contentView!.trailingAnchor), stack.topAnchor.constraint(equalTo: panel.contentView!.topAnchor), stack.bottomAnchor.constraint(equalTo: panel.contentView!.bottomAnchor)])
+        let stack = NativeView.page([NativeView.detail("Connection values are used only for the selected transport. Edit fields may be left blank to preserve existing connection data."), grid, review, buttons])
+        let scroll = NativeView.scrollable(stack)
+        panel.contentView = NSView(); panel.contentView?.addSubview(scroll)
+        NSLayoutConstraint.activate([scroll.leadingAnchor.constraint(equalTo: panel.contentView!.leadingAnchor), scroll.trailingAnchor.constraint(equalTo: panel.contentView!.trailingAnchor), scroll.topAnchor.constraint(equalTo: panel.contentView!.topAnchor), scroll.bottomAnchor.constraint(equalTo: panel.contentView!.bottomAnchor)])
     }
 
     @objc private func transportChanged() { let local = transport.indexOfSelectedItem == 0; command.isEnabled = local; args.isEditable = local; cwd.isEnabled = local; env.isEditable = local; remote.isEnabled = local; url.isEnabled = !local; bearer.isEnabled = !local; reviewed = nil; apply.title = "Review" }

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

@@ -0,0 +1,162 @@
+import Foundation
+
+enum OverviewSummary {
+    static func render(
+        update: [String: Any]?,
+        mcp: [String: Any]?,
+        telegram: [String: Any]?,
+        menuBarBuild: String,
+        codexRunning: Bool?,
+        operationSummary: String
+    ) -> String {
+        let codexAppState = codexRunning.map { $0 ? "Running" : "Not running" } ?? "Not configured"
+        var lines: [String] = []
+        let update = validatedUpdate(update)
+        let mcp = validatedMCP(mcp)
+        let telegram = validatedTelegram(telegram)
+
+        if let update = update {
+            let sks = update["sks"] as? [String: Any]
+            let codex = update["codex_cli"] as? [String: Any]
+            let menu = update["menubar"] as? [String: Any]
+            lines.append("SKS install: \(versionSummary(sks))")
+            lines.append("Codex CLI: \(versionSummary(codex)) · Codex app: \(codexAppState)")
+            if let inducement = codexUpdateInducement(codex) {
+                lines.append(inducement)
+            }
+
+            var menuParts = ["running build \(menuBarBuild)"]
+            if let expected = menu?["expected_version"] as? String { menuParts.append("expected \(expected)") }
+            if let installed = menu?["installed_version"] as? String, installed != menuBarBuild {
+                menuParts.append("snapshot installed \(installed)")
+            }
+            if let rebuildRequired = menu?["rebuild_required"] as? Bool {
+                menuParts.append(rebuildRequired ? "rebuild required" : "current")
+            } else {
+                menuParts.append("rebuild state unknown")
+            }
+            menuParts.append("signature \(verificationState(menu?["signature_ok"]))")
+            menuParts.append("resources \(verificationState(menu?["resources_ok"]))")
+            lines.append("Menu Bar: \(menuParts.joined(separator: " · "))")
+
+            let source = snapshotSource(update["source"] as? String)
+            var updateParts = [integer(update["update_count"]).map { "\($0) pending" } ?? "pending count unknown", "\(source) snapshot"]
+            if let error = diagnosticNotice(update["public_error"] as? String, update: update) {
+                updateParts.append("notice: \(error)")
+            } else if let warnings = update["warnings"] as? [String], !warnings.isEmpty {
+                updateParts.append("\(warnings.count) warning\(warnings.count == 1 ? "" : "s")")
+            }
+            lines.append("Updates: \(updateParts.joined(separator: " · "))")
+        } else {
+            lines.append("SKS install: unavailable")
+            lines.append("Codex CLI: unavailable · Codex app: \(codexAppState)")
+            lines.append("Menu Bar: running build \(menuBarBuild) · update status unavailable")
+            lines.append("Updates: unavailable")
+        }
+
+        if let mcp = mcp,
+           let enabled = integer(mcp["enabled_count"]),
+           let failed = integer(mcp["failed_count"]) {
+            lines.append("MCP: \(enabled) enabled · \(failed) failed")
+        } else {
+            lines.append("MCP: unavailable")
+        }
+
+        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 machines = integer(telegram["machine_count"]).map { "\($0) registered Macs" } ?? "registered Macs unknown"
+            let targets = integer(telegram["target_count"]).map { "\($0) configured targets" } ?? "configured targets unknown"
+            let issues = ((telegram["config_issues"] as? [String]) ?? []).count
+                + ((telegram["remote_config_issues"] as? [String]) ?? []).count
+            var fleet = "Remote fleet: \(machines) · \(targets)"
+            if issues > 0 { fleet += " · \(issues) issue\(issues == 1 ? "" : "s")" }
+            lines.append("Telegram Hub: \(hubState) · \(fleet)")
+        } else {
+            lines.append("Telegram Hub: unavailable · Remote fleet: unavailable")
+        }
+
+        lines.append("Last operation: \(operationSummary) · Logs and snapshots use mode 0600")
+        return lines.joined(separator: "\n")
+    }
+
+    private static func validatedUpdate(_ value: [String: Any]?) -> [String: Any]? {
+        guard value?["schema"] as? String == "sks.update-status.v3",
+              value?["source"] is String,
+              integer(value?["update_count"]) != nil,
+              let sks = value?["sks"] as? [String: Any],
+              let codex = value?["codex_cli"] as? [String: Any],
+              let menu = value?["menubar"] as? [String: Any],
+              sks["update_available"] is Bool,
+              codex["update_available"] is Bool,
+              menu["expected_version"] is String,
+              menu["rebuild_required"] is Bool else { return nil }
+        return value
+    }
+
+    private static func validatedMCP(_ value: [String: Any]?) -> [String: Any]? {
+        guard value?["schema"] as? String == "sks.mcp-inventory.v2",
+              integer(value?["enabled_count"]) != nil,
+              integer(value?["failed_count"]) != nil else { return nil }
+        return value
+    }
+
+    private static func validatedTelegram(_ value: [String: Any]?) -> [String: Any]? {
+        guard value?["schema"] as? String == "sks.telegram-status.v1",
+              value?["configured"] is Bool,
+              integer(value?["machine_count"]) != nil,
+              integer(value?["target_count"]) != nil,
+              value?["config_issues"] is [String],
+              value?["remote_config_issues"] is [String] else { return nil }
+        return value
+    }
+
+    private static func versionSummary(_ value: [String: Any]?) -> String {
+        guard let current = nonEmpty(value?["current"] as? String) else { return "not detected" }
+        guard let latest = nonEmpty(value?["latest"] as? String) else { return current }
+        if value?["update_available"] as? Bool == true, latest != current { return "\(current) → \(latest) available" }
+        if latest == current { return "\(current) (current)" }
+        return "\(current) · registry last seen \(latest)"
+    }
+
+    private static func codexUpdateInducement(_ value: [String: Any]?) -> String? {
+        guard value?["update_available"] as? Bool == true else { return nil }
+        let current = nonEmpty(value?["current"] as? String) ?? "installed"
+        let latest = nonEmpty(value?["latest"] as? String) ?? "preferred latest"
+        return "Action: update Codex CLI (\(current) → \(latest)) from Updates, or choose Update Codex CLI Now in the menu bar."
+    }
+
+    private static func verificationState(_ value: Any?) -> String {
+        guard let value = value as? Bool else { return "unknown" }
+        return value ? "verified" : "needs attention"
+    }
+
+    private static func snapshotSource(_ value: String?) -> String {
+        guard let value = nonEmpty(value) else { return "unknown" }
+        return value.replacingOccurrences(of: "_", with: " ")
+    }
+
+    private static func diagnosticNotice(_ value: String?, update: [String: Any]) -> String? {
+        guard let value = nonEmpty(value) else { return nil }
+        let versions = [
+            (update["sks"] as? [String: Any])?["current"] as? String,
+            (update["sks"] as? [String: Any])?["latest"] as? String,
+            (update["codex_cli"] as? [String: Any])?["current"] as? String,
+            (update["codex_cli"] as? [String: Any])?["latest"] as? String
+        ].compactMap { $0 }
+        if versions.contains(value) { return nil }
+        if value.range(of: #"^v?\d+(?:\.\d+){1,3}(?:[-+][A-Za-z0-9.-]+)?$"#, options: .regularExpression) != nil { return nil }
+        return value
+    }
+
+    private static func integer(_ value: Any?) -> Int? {
+        if let value = value as? Int { return value }
+        return (value as? NSNumber)?.intValue
+    }
+
+    private static func nonEmpty(_ value: String?) -> String? {
+        guard let value = value?.trimmingCharacters(in: .whitespacesAndNewlines), !value.isEmpty else { return nil }
+        return value
+    }
+}