@ericsanchezok/meta-synergy 1.1.24 → 1.1.26

package/app/darwin/main.swift

@@ -1,12 +1,48 @@
 import AppKit
 import Foundation
 
+private struct CLIEnvelope<Payload: Decodable>: Decodable {
+  let ok: Bool
+  let data: Payload?
+}
+
+private struct StatusPayload: Decodable {
+  let auth: AuthPayload
+  let state: StatePayload
+  let session: SessionPayload?
+  let envID: String?
+  let service: ServicePayload
+}
+
+private struct AuthPayload: Decodable {
+  let loggedIn: Bool
+  let agentID: String?
+}
+
+private struct StatePayload: Decodable {
+  let collaborationEnabled: Bool
+  let connectionStatus: String
+  let currentSession: SessionPayload?
+  let envID: String?
+}
+
+private struct SessionPayload: Decodable {
+  let sessionID: String?
+  let remoteAgentID: String?
+}
+
+private struct ServicePayload: Decodable {
+  let running: Bool
+  let runtimeStatus: String
+  let pid: Int?
+}
+
 final class AppDelegate: NSObject, NSApplicationDelegate {
   private var statusItem: NSStatusItem!
   private var menu: NSMenu!
-  private var hostProcess: Process?
   private var pollTimer: Timer?
   private var statusImage: NSImage?
+  private var lastStatus: StatusPayload?
 
   private let agentItem = NSMenuItem(title: "Agent ID: unknown", action: #selector(copyAgentID), keyEquivalent: "")
   private let envItem = NSMenuItem(title: "Env ID: unknown", action: #selector(copyEnvID), keyEquivalent: "")
@@ -19,7 +55,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
   private var currentAgentID: String?
   private var currentEnvID: String?
-  private var hostStarted = false
 
   private lazy var runtimeURL: URL? = {
     Bundle.main.resourceURL?.appendingPathComponent("meta-synergy-runtime")
@@ -57,7 +92,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
     statusItem.menu = menu
 
-    startHostIfPossible()
+    startServiceIfPossible()
     refreshStatus()
 
     pollTimer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { [weak self] _ in
@@ -67,106 +102,110 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
   @objc private func login() {
     _ = runCommand(["login"])
-    startHostIfPossible()
+    startServiceIfPossible()
     refreshStatus()
   }
 
   @objc private func reconnect() {
-    if hostProcess == nil {
-      startHostIfPossible()
-    } else {
+    let status = lastStatus ?? loadStatus()
+    let serviceRunning = status?.service.running ?? false
+    if serviceRunning {
       _ = runCommand(["reconnect"])
+    } else {
+      startServiceIfPossible()
     }
     refreshStatus()
   }
 
   @objc private func refreshStatus() {
-    guard let output = runCommand(["status"]) else {
+    guard let status = loadStatus() else {
+      lastStatus = nil
+      currentAgentID = nil
+      currentEnvID = nil
+      agentItem.isHidden = true
+      envItem.isHidden = true
+      loginItem.isHidden = false
+      connectionItem.isHidden = false
       connectionItem.title = "Holos: unavailable"
       connectionItem.isEnabled = false
       collaborationItem.isHidden = true
       terminateItem.isHidden = true
-      refreshItem.isHidden = true
+      refreshItem.isHidden = false
+      applyStatusAppearance(textFallback: "Meta", toolTip: "MetaSynergy")
       return
     }
 
-    guard
-      let data = output.data(using: .utf8),
-      let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
-    else {
-      connectionItem.title = "Holos: unparsable"
-      connectionItem.isEnabled = false
-      return
-    }
+    lastStatus = status
+
+    let loggedIn = status.auth.loggedIn
+    let agentID = status.auth.agentID
+    let envID = status.envID ?? status.state.envID
+    let connectionStatus = status.state.connectionStatus
+    let collaborationEnabled = status.state.collaborationEnabled
+    let session = status.session ?? status.state.currentSession
+    let serviceRunning = status.service.running
+    let serviceTransitioning = status.service.runtimeStatus == "starting" || status.service.runtimeStatus == "stopping"
+
+    currentAgentID = loggedIn ? agentID : nil
+    currentEnvID = loggedIn ? envID : nil
 
-    let auth = json["auth"] as? [String: Any]
-    let state = json["state"] as? [String: Any]
-    let session = json["session"] as? [String: Any]
-    let envID = json["envID"] as? String
-    let agentID = auth?["agentID"] as? String
-    let agentSecret = auth?["agentSecret"] as? String
-    let hasAuth = !(agentID?.isEmpty ?? true) && !(agentSecret?.isEmpty ?? true)
-    currentAgentID = hasAuth ? agentID : nil
-    currentEnvID = hasAuth ? envID : nil
-
-    let connected = state?["connectionStatus"] as? String ?? "disconnected"
-    let collaborationEnabled = (state?["collaborationEnabled"] as? Bool) ?? true
-    let isConnected = connected == "connected"
-
-    agentItem.isHidden = !hasAuth
-    envItem.isHidden = !hasAuth
-    loginItem.isHidden = hasAuth
-
-    if hasAuth {
+    agentItem.isHidden = !loggedIn
+    envItem.isHidden = !loggedIn
+    loginItem.isHidden = loggedIn
+
+    if loggedIn {
       agentItem.title = "Agent ID: \(truncateID(agentID))"
       envItem.title = "Env ID: \(truncateID(envID))"
     }
 
-    connectionItem.isHidden = !hasAuth
-    collaborationItem.isHidden = !hasAuth
-    terminateItem.isHidden = !hasAuth
-    refreshItem.isHidden = !hasAuth
+    connectionItem.isHidden = !loggedIn
+    collaborationItem.isHidden = !loggedIn
+    terminateItem.isHidden = !loggedIn
+    refreshItem.isHidden = false
+
+    let connectionSummary = serviceRunning ? connectionStatus : "service \(status.service.runtimeStatus)"
+    connectionItem.title = "Holos: \(connectionSummary)"
+    connectionItem.isEnabled = loggedIn && !serviceTransitioning && (!serviceRunning || connectionStatus != "connected")
 
-    connectionItem.title = "Holos: \(connected)"
-    connectionItem.isEnabled = hasAuth && !isConnected
     collaborationItem.title = collaborationEnabled ? "Collaboration: on" : "Collaboration: off"
-    collaborationItem.isEnabled = hasAuth
+    collaborationItem.isEnabled = loggedIn
 
-    if let sessionID = session?["sessionID"] as? String,
-       let remoteAgentID = session?["remoteAgentID"] as? String {
+    if let sessionID = session?.sessionID,
+       let remoteAgentID = session?.remoteAgentID {
       terminateItem.title = "Terminate Collaboration (\(truncateID(remoteAgentID)), \(sessionID.prefix(8)))"
       terminateItem.isEnabled = true
       applyStatusAppearance(textFallback: "Meta Busy", toolTip: "MetaSynergy: busy")
     } else {
       terminateItem.title = "Terminate Collaboration"
       terminateItem.isEnabled = false
-      if hasAuth {
+
+      if !loggedIn {
+        applyStatusAppearance(textFallback: "Meta", toolTip: "MetaSynergy")
+      } else if !serviceRunning {
+        applyStatusAppearance(textFallback: "Meta", toolTip: "MetaSynergy: service \(status.service.runtimeStatus)")
+      } else {
         applyStatusAppearance(
           textFallback: collaborationEnabled ? "Meta" : "Meta Off",
-          toolTip: collaborationEnabled ? "MetaSynergy: collaboration on" : "MetaSynergy: collaboration off",
+          toolTip: collaborationEnabled
+            ? "MetaSynergy: Holos \(connectionStatus)"
+            : "MetaSynergy: collaboration off"
         )
-      } else {
-        applyStatusAppearance(textFallback: "Meta", toolTip: "MetaSynergy")
       }
     }
   }
 
   @objc private func toggleCollaboration() {
-    guard let output = runCommand(["status"]),
-          let data = output.data(using: .utf8),
-          let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
-          let state = json["state"] as? [String: Any],
-          let enabled = state["collaborationEnabled"] as? Bool
-    else {
+    let enabled = lastStatus?.state.collaborationEnabled ?? loadStatus()?.state.collaborationEnabled
+    guard let enabled else {
       return
     }
 
-    _ = runCommand([enabled ? "disable" : "enable"])
+    _ = runCommand(["collaboration", enabled ? "disable" : "enable"])
     refreshStatus()
   }
 
   @objc private func terminateCollaboration() {
-    _ = runCommand(["kick"])
+    _ = runCommand(["session", "kick"])
     refreshStatus()
   }
 
@@ -179,45 +218,21 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
   }
 
   @objc private func quitApp() {
-    hostProcess?.terminate()
+    _ = runCommand(["stop"])
     NSApplication.shared.terminate(nil)
   }
 
-  private func startHostIfPossible() {
-    guard hostProcess == nil, !hostStarted else { return }
+  private func startServiceIfPossible() {
     guard hasAuth() else { return }
-    guard let runtimeURL else { return }
-
-    let process = Process()
-    process.executableURL = runtimeURL
-    process.arguments = ["start"]
-    process.terminationHandler = { [weak self] _ in
-      DispatchQueue.main.async {
-        self?.hostStarted = false
-        self?.hostProcess = nil
-      }
-    }
-
-    do {
-      try process.run()
-      hostProcess = process
-      hostStarted = true
-    } catch {
-      connectionItem.title = "Holos: failed to start host"
+    let status = lastStatus ?? loadStatus()
+    if status?.service.running == true {
+      return
     }
+    _ = runCommand(["start"])
   }
 
   private func hasAuth() -> Bool {
-    guard let output = runCommand(["status"]),
-          let data = output.data(using: .utf8),
-          let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
-          let auth = json["auth"] as? [String: Any],
-          let agentID = auth["agentID"] as? String,
-          let agentSecret = auth["agentSecret"] as? String
-    else {
-      return false
-    }
-    return !agentID.isEmpty && !agentSecret.isEmpty
+    (lastStatus ?? loadStatus())?.auth.loggedIn == true
   }
 
   @discardableResult
@@ -241,6 +256,23 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     }
   }
 
+  private func loadStatus() -> StatusPayload? {
+    runJSONCommand(["status"], as: StatusPayload.self)
+  }
+
+  private func runJSONCommand<Payload: Decodable>(_ args: [String], as type: Payload.Type) -> Payload? {
+    guard let output = runCommand(args + ["--json"]),
+          let data = output.data(using: .utf8),
+          let envelope = try? JSONDecoder().decode(CLIEnvelope<Payload>.self, from: data),
+          envelope.ok,
+          let payload = envelope.data
+    else {
+      return nil
+    }
+
+    return payload
+  }
+
   private func copyValue(_ value: String?) {
     guard let value, !value.isEmpty else { return }
     let pasteboard = NSPasteboard.general

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@ericsanchezok/meta-synergy",
-  "version": "1.1.24",
+  "version": "1.1.26",
   "type": "module",
   "license": "MIT",
   "bin": {