poke-gate 0.1.8 → 0.2.0

package/clients/Poke macOS Gate/Poke macOS Gate/Poke_macOS_GateApp.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import ServiceManagement
 
 class AppDelegate: NSObject, NSApplicationDelegate {
     var service: GateService?
@@ -17,13 +18,16 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 struct Poke_macOS_GateApp: App {
     @StateObject private var service = GateService()
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
-
     var body: some Scene {
         MenuBarExtra {
             PopoverContent(service: service)
                 .onAppear {
                     service.autoStartIfNeeded()
                     appDelegate.service = service
+                    service.startPermissionPolling()
+                }
+                .onDisappear {
+                    service.stopPermissionPolling()
                 }
         } label: {
             Image(systemName: menuBarIcon)
@@ -35,6 +39,11 @@ struct Poke_macOS_GateApp: App {
         }
         .defaultSize(width: 560, height: 400)
 
+        Window("Setup", id: "setup") {
+            SetupView(service: service)
+        }
+        .windowResizability(.contentSize)
+
         Window("Settings", id: "settings") {
             SettingsView(service: service)
         }
@@ -51,6 +60,37 @@ struct Poke_macOS_GateApp: App {
         .windowResizability(.contentSize)
     }
 
+    private func checkLoginItemPrompt() {
+        let dismissed = UserDefaults.standard.bool(forKey: "loginItemPromptDismissed")
+        let alreadyEnabled = SMAppService.mainApp.status == .enabled
+        if dismissed || alreadyEnabled { return }
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
+            let alert = NSAlert()
+            alert.messageText = "Start on login?"
+            alert.informativeText = "Would you like Poke Gate to start automatically when you log in?"
+            alert.addButton(withTitle: "Enable")
+            alert.addButton(withTitle: "Not now")
+            alert.addButton(withTitle: "Don't ask again")
+            alert.alertStyle = .informational
+
+            NSApp.activate(ignoringOtherApps: true)
+            let response = alert.runModal()
+
+            switch response {
+            case .alertFirstButtonReturn:
+                try? SMAppService.mainApp.register()
+                UserDefaults.standard.set(true, forKey: "loginItemPromptDismissed")
+            case .alertSecondButtonReturn:
+                break
+            case .alertThirdButtonReturn:
+                UserDefaults.standard.set(true, forKey: "loginItemPromptDismissed")
+            default:
+                break
+            }
+        }
+    }
+
     private var menuBarIcon: String {
         switch service.status {
         case .connected: "door.left.hand.open"
@@ -64,56 +104,89 @@ struct Poke_macOS_GateApp: App {
 struct PopoverContent: View {
     @ObservedObject var service: GateService
     @Environment(\.openWindow) private var openWindow
+    @State private var pendingFullMode = false
 
     var body: some View {
-        VStack(spacing: 0) {
-            VStack(spacing: 6) {
-                HStack(spacing: 8) {
-                    Circle()
-                        .fill(statusColor)
-                        .frame(width: 10, height: 10)
+        if !service.hasCompletedSetup {
+            SetupView(service: service)
+        } else {
+            VStack(spacing: 10) {
+                statusSection
+                recentActivitySection
+                accessModeSection
+                actionsSection
+                footerSection
+            }
+            .frame(width: 320)
+            .padding(10)
+            .onChange(of: service.hasSystemPermissionsGranted) { _, granted in
+                if granted && pendingFullMode {
+                    pendingFullMode = false
+                    service.setPermissionMode(.full)
+                }
+            }
+        }
+    }
 
-                    Text(statusText)
-                        .font(.system(.body, weight: .medium))
+    private var statusSection: some View {
+        VStack(alignment: .leading, spacing: 6) {
+            HStack(spacing: 8) {
+                Circle()
+                    .fill(statusColor)
+                    .frame(width: 10, height: 10)
 
-                    Spacer()
-                }
+                Text(statusText)
+                    .font(.system(.body, weight: .medium))
 
-                if service.status == .connected {
-                    Text("This machine is accessible via Poke. Ask your Poke to run commands or read files.")
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                        .fixedSize(horizontal: false, vertical: true)
-                } else if service.status == .starting {
-                    Text("Establishing connection…")
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                } else if service.status == .error {
-                    Text("Check Logs for details.")
-                        .font(.caption)
-                        .foregroundStyle(.red.opacity(0.8))
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                }
+                Spacer()
             }
-            .padding(12)
 
-            Divider()
+            statusMessage
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding(12)
+        .macPanelStyle(.neutral, cornerRadius: 12)
+    }
 
-            VStack(alignment: .leading, spacing: 4) {
-                Text("Recent activity")
-                    .font(.caption2)
-                    .foregroundStyle(.tertiary)
-                    .textCase(.uppercase)
-
-                if service.logs.isEmpty {
-                    Text("No activity yet")
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                } else {
-                    ForEach(Array(service.logs.suffix(4).enumerated()), id: \.offset) { _, line in
-                        Text(line)
+    @ViewBuilder
+    private var statusMessage: some View {
+        switch service.status {
+        case .connected:
+            Text("This machine is accessible via Poke. Ask your Poke to run commands or read files.")
+                .font(.caption)
+                .foregroundStyle(.secondary)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .fixedSize(horizontal: false, vertical: true)
+        case .starting:
+            Text("Establishing connection…")
+                .font(.caption)
+                .foregroundStyle(.secondary)
+                .frame(maxWidth: .infinity, alignment: .leading)
+        case .error:
+            Text("Check Logs for details.")
+                .font(.caption)
+                .foregroundStyle(.red.opacity(0.8))
+                .frame(maxWidth: .infinity, alignment: .leading)
+        case .disconnected, .stopped:
+            EmptyView()
+        }
+    }
+
+    private var recentActivitySection: some View {
+        VStack(alignment: .leading, spacing: 6) {
+            sectionTitle("Recent activity")
+
+            if service.terminalPreviews.isEmpty {
+                Text("No activity yet")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            } else {
+                ForEach(Array(service.terminalPreviews.suffix(4).enumerated()), id: \.element.id) { _, entry in
+                    HStack(spacing: 6) {
+                        Circle()
+                            .fill(entry.exitCode == 0 ? Color.green : (entry.exitCode == nil ? Color.gray : Color.red))
+                            .frame(width: 5, height: 5)
+                        Text("$ \(entry.command)")
                             .font(.system(size: 9, design: .monospaced))
                             .foregroundStyle(.tertiary)
                             .lineLimit(1)
@@ -121,71 +194,117 @@ struct PopoverContent: View {
                     }
                 }
             }
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(12)
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding(12)
+        .macPanelStyle(.neutral, cornerRadius: 12)
+    }
 
-            Divider()
+    private var accessModeSection: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            HStack {
+                sectionTitle("Access mode")
+                Spacer()
+                Text(service.permissionMode.title)
+                    .font(.caption2)
+                    .foregroundStyle(.secondary)
+            }
 
-            HStack(spacing: 12) {
-                ActionButton(icon: "text.alignleft", label: "Logs") {
-                    NSApp.activate(ignoringOtherApps: true)
-                    openWindow(id: "logs")
+            HStack(spacing: 6) {
+                ForEach(GateService.PermissionMode.allCases) { mode in
+                    let isActive = service.permissionMode == mode || (mode == .full && pendingFullMode)
+                    Button {
+                        handleModeSelection(mode)
+                    } label: {
+                        Text(modeChipTitle(mode))
+                            .font(.system(size: 10, weight: .semibold))
+                            .foregroundStyle(isActive ? .white : .secondary)
+                            .padding(.vertical, 5)
+                            .padding(.horizontal, 8)
+                            .background(isActive ? MacVisualStyle.chipActiveFill : MacVisualStyle.chipInactiveFill)
+                            .clipShape(Capsule())
+                    }
+                    .buttonStyle(.plain)
                 }
+            }
 
-                ActionButton(icon: "bolt.fill", label: "Agents") {
-                    NSApp.activate(ignoringOtherApps: true)
-                    openWindow(id: "agents")
-                }
+            if service.permissionMode == .full || pendingFullMode {
+                AccessibilityPermissionView(service: service)
+            }
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding(12)
+        .macPanelStyle(.neutral, cornerRadius: 12)
+    }
 
-                ActionButton(icon: "gearshape", label: "Settings") {
-                    NSApp.activate(ignoringOtherApps: true)
-                    openWindow(id: "settings")
-                }
+    private var actionsSection: some View {
+        HStack(spacing: 12) {
+            ActionButton(icon: "text.alignleft", label: "Logs") {
+                NSApp.activate(ignoringOtherApps: true)
+                openWindow(id: "logs")
+            }
 
-                if service.status == .connected || service.status == .starting || service.status == .disconnected {
-                    ActionButton(icon: "arrow.counterclockwise", label: "Restart") {
-                        service.restart()
-                    }
-                } else {
-                    ActionButton(icon: "play.fill", label: "Start") {
-                        service.start()
-                    }
-                }
+            ActionButton(icon: "bolt.fill", label: "Agents") {
+                NSApp.activate(ignoringOtherApps: true)
+                openWindow(id: "agents")
+            }
 
-                Spacer()
+            ActionButton(icon: "gearshape", label: "Settings") {
+                NSApp.activate(ignoringOtherApps: true)
+                openWindow(id: "settings")
+            }
 
-                ActionButton(icon: "xmark.circle", label: "Quit", tint: .secondary) {
-                    service.stop()
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                        NSApp.terminate(nil)
-                    }
+            if service.status == .connected || service.status == .starting || service.status == .disconnected {
+                ActionButton(icon: "arrow.counterclockwise", label: "Restart") {
+                    service.restart()
+                }
+            } else {
+                ActionButton(icon: "play.fill", label: "Start") {
+                    service.start()
                 }
             }
-            .padding(12)
 
-            Divider()
+            Spacer()
 
-            HStack {
-                Button {
-                    NSApp.activate(ignoringOtherApps: true)
-                    openWindow(id: "about")
-                } label: {
-                    Text("Poke Gate v0.0.8")
-                        .font(.caption2)
-                        .foregroundStyle(.tertiary)
+            ActionButton(icon: "xmark.circle", label: "Quit", tint: .secondary) {
+                service.stop()
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                    NSApp.terminate(nil)
                 }
-                .buttonStyle(.plain)
-
-                Spacer()
+            }
+        }
+        .padding(12)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .macPanelStyle(.neutral, cornerRadius: 12)
+    }
 
-                Text("Not affiliated with Poke")
+    private var footerSection: some View {
+        HStack {
+            Button {
+                NSApp.activate(ignoringOtherApps: true)
+                openWindow(id: "about")
+            } label: {
+                Text(appVersionText)
                     .font(.caption2)
-                    .foregroundStyle(.quaternary)
+                    .foregroundStyle(MacVisualStyle.sectionTitleColor)
             }
-            .padding(.horizontal, 12)
-            .padding(.vertical, 8)
+            .buttonStyle(.plain)
+
+            Spacer()
+
+            Text("Not affiliated with Poke")
+                .font(.caption2)
+                .foregroundStyle(MacVisualStyle.sectionTitleColor.opacity(0.7))
         }
-        .frame(width: 320)
+        .padding(.horizontal, 6)
+    }
+
+    private func sectionTitle(_ text: String) -> some View {
+        Text(text)
+            .font(.caption2)
+            .foregroundStyle(MacVisualStyle.sectionTitleColor)
+            .textCase(.uppercase)
+            .tracking(0.5)
     }
 
     private var statusText: String {
@@ -210,6 +329,37 @@ struct PopoverContent: View {
         case .stopped: .gray.opacity(0.5)
         }
     }
+
+    private func modeChipTitle(_ mode: GateService.PermissionMode) -> String {
+        switch mode {
+        case .full: return "Full"
+        case .limited: return "Limited"
+        case .sandbox: return "Sandbox"
+        }
+    }
+
+    private func handleModeSelection(_ mode: GateService.PermissionMode) {
+        guard mode != service.permissionMode else { return }
+
+        if mode == .full && !service.hasSystemPermissionsGranted {
+            pendingFullMode = true
+            service.openSystemPermission(.accessibility)
+        } else {
+            pendingFullMode = false
+            service.setPermissionMode(mode)
+        }
+    }
+
+    private var appVersionText: String {
+        let short = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "0.0.0"
+        let build = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String
+
+        if let build, !build.isEmpty, build != short {
+            return "Poke Gate v\(short) (\(build))"
+        }
+
+        return "Poke Gate v\(short)"
+    }
 }
 
 struct ActionButton: View {

package/clients/Poke macOS Gate/Poke macOS Gate/SettingsView.swift

@@ -1,101 +1,167 @@
 import SwiftUI
+import ServiceManagement
 
 struct SettingsView: View {
     @ObservedObject var service: GateService
     @Environment(\.dismiss) private var dismiss
+    @State private var launchAtLogin = SMAppService.mainApp.status == .enabled
 
     var body: some View {
         VStack(alignment: .leading, spacing: 16) {
+            authenticationSection
+            accessModeSection
+            connectionSection
+
             VStack(alignment: .leading, spacing: 8) {
-                Text("AUTHENTICATION")
+                Text("GENERAL")
                     .font(.caption2)
-                    .foregroundStyle(.tertiary)
+                    .foregroundStyle(MacVisualStyle.sectionTitleColor)
                     .textCase(.uppercase)
                     .tracking(0.5)
 
-                HStack(spacing: 8) {
-                    Image(systemName: service.hasPokeLoginCredentials
-                          ? "checkmark.shield.fill" : "shield.slash")
-                        .foregroundStyle(service.hasPokeLoginCredentials ? .green : .orange)
-                        .font(.title3)
-
-                    VStack(alignment: .leading, spacing: 2) {
-                        Text(service.hasPokeLoginCredentials
-                             ? "Signed in via Poke"
-                             : "Not signed in")
-                            .font(.subheadline)
-                            .fontWeight(.medium)
-
-                        if service.hasPokeLoginCredentials {
-                            Text("Your Poke session is active.")
-                                .font(.caption)
-                                .foregroundStyle(.secondary)
-                        } else {
-                            Text("Run this command in Terminal to sign in:")
-                                .font(.caption)
-                                .foregroundStyle(.secondary)
+                Toggle("Start Poke Gate on login", isOn: $launchAtLogin)
+                    .font(.subheadline)
+                    .onChange(of: launchAtLogin) { _, newValue in
+                        do {
+                            if newValue {
+                                try SMAppService.mainApp.register()
+                            } else {
+                                try SMAppService.mainApp.unregister()
+                            }
+                        } catch {
+                            launchAtLogin = !newValue
                         }
                     }
+            }
+
+            HStack {
+                Spacer()
+                Button("Close") {
+                    dismiss()
                 }
-                .padding(10)
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .background(.quaternary.opacity(0.5))
-                .cornerRadius(8)
-
-                if !service.hasPokeLoginCredentials {
-                    Button {
-                        service.runPokeLogin()
-                    } label: {
-                        Label("Sign in with Poke", systemImage: "person.crop.circle.badge.plus")
-                    }
-                    .controlSize(.large)
+                .keyboardShortcut(.cancelAction)
+            }
+        }
+        .padding(20)
+        .frame(width: 430)
+    }
+
+    private var authenticationSection: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            sectionTitle("AUTHENTICATION")
 
-                    Text("Opens a browser window to sign in.")
+            HStack(spacing: 8) {
+                Image(systemName: service.hasPokeLoginCredentials ? "checkmark.shield.fill" : "shield.slash")
+                    .foregroundStyle(service.hasPokeLoginCredentials ? .green : .orange)
+                    .font(.title3)
+
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(service.hasPokeLoginCredentials ? "Signed in via Poke" : "Not signed in")
+                        .font(.subheadline)
+                        .fontWeight(.medium)
+
+                    Text(service.hasPokeLoginCredentials ? "Your Poke session is active." : "Run this command in Terminal to sign in:")
                         .font(.caption)
                         .foregroundStyle(.secondary)
                 }
             }
+            .padding(10)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .macPanelStyle(.neutral, cornerRadius: 8)
 
-            VStack(alignment: .leading, spacing: 8) {
-                Text("CONNECTION")
-                    .font(.caption2)
-                    .foregroundStyle(.tertiary)
-                    .textCase(.uppercase)
-                    .tracking(0.5)
+            if !service.hasPokeLoginCredentials {
+                Button {
+                    service.runPokeLogin()
+                } label: {
+                    Label("Sign in with Poke", systemImage: "person.crop.circle.badge.plus")
+                }
+                .controlSize(.large)
+
+                Text("Opens a browser window to sign in.")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            }
+        }
+    }
 
-                HStack(spacing: 8) {
-                    Circle()
-                        .fill(connectionColor)
-                        .frame(width: 8, height: 8)
+    private var accessModeSection: some View {
+        VStack(alignment: .leading, spacing: 10) {
+            sectionTitle("ACCESS MODE")
 
-                    Text(service.status.rawValue)
-                        .font(.subheadline)
+            VStack(spacing: 8) {
+                ForEach(GateService.PermissionMode.allCases) { mode in
+                    permissionModeRow(mode)
+                }
+            }
 
-                    Spacer()
+            if service.permissionMode == .full {
+                AccessibilityPermissionView(service: service)
+            }
+        }
+    }
 
-                    Button {
-                        service.restart()
-                    } label: {
-                        Label("Reconnect", systemImage: "arrow.counterclockwise")
-                            .font(.caption)
-                    }
+    private func permissionModeRow(_ mode: GateService.PermissionMode) -> some View {
+        Button {
+            service.setPermissionMode(mode)
+        } label: {
+            HStack(alignment: .top, spacing: 10) {
+                Image(systemName: service.permissionMode == mode ? "checkmark.circle.fill" : "circle")
+                    .font(.headline)
+                    .foregroundStyle(service.permissionMode == mode ? .green : .secondary)
+
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(mode.title)
+                        .font(.subheadline)
+                        .fontWeight(.medium)
+                        .foregroundStyle(.primary)
+
+                    Text(mode.subtitle)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
                 }
-                .padding(10)
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .background(.quaternary.opacity(0.5))
-                .cornerRadius(8)
+
+                Spacer()
             }
+            .padding(10)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .macPanelStyle(service.permissionMode == mode ? .selected : .neutral)
+        }
+        .buttonStyle(.plain)
+    }
+
+    private var connectionSection: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            sectionTitle("CONNECTION")
+
+            HStack(spacing: 8) {
+                Circle()
+                    .fill(connectionColor)
+                    .frame(width: 8, height: 8)
+
+                Text(service.status.rawValue)
+                    .font(.subheadline)
 
-            HStack {
                 Spacer()
-                Button("Close") {
-                    dismiss()
+
+                Button {
+                    service.restart()
+                } label: {
+                    Label("Reconnect", systemImage: "arrow.counterclockwise")
+                        .font(.caption)
                 }
-                .keyboardShortcut(.cancelAction)
             }
+            .padding(10)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .macPanelStyle(.neutral, cornerRadius: 8)
         }
-        .padding(20)
-        .frame(width: 380)
+    }
+
+    private func sectionTitle(_ text: String) -> some View {
+        Text(text)
+            .font(.caption2)
+            .foregroundStyle(MacVisualStyle.sectionTitleColor)
+            .textCase(.uppercase)
+            .tracking(0.5)
     }
 
     private var connectionColor: Color {