@ericsanchezok/meta-synergy 1.1.21 → 1.1.23

package/app/darwin/assets/app-icon.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="286.018" height="285.468" viewBox="0 0 286.018 285.468">
+<defs>
+<clipPath id="clip_0">
+<path transform="matrix(1,0,0,-1,0,285.468)" d="M0 0H286.018V285.468H0Z" clip-rule="evenodd"/>
+</clipPath>
+</defs>
+<g clip-path="url(#clip_0)">
+<path transform="matrix(.1,0,0,-.1,0,285.468)" d="M668.574 1077.45C596.992 1022.7 503.922 907.094 566.523 814.824 626.691 726.133 764.281 785.473 821.723 849.152 907.395 944.133 995.523 1120.89 1045.99 1239.64 1046.98 1241.98 1052.8 1254.61 1051.72 1255.7 916.191 1213.88 782.164 1164.36 668.574 1077.45"/>
+<path transform="matrix(.1,0,0,-.1,0,285.468)" d="M1343.13 409.57C1313.08 409.57 1298.06 390.859 1298.06 353.48 1298.06 335.129 1301.74 321.09 1309.1 311.352 1316.45 301.609 1327.13 296.738 1341.1 296.738 1371.35 296.738 1386.48 315.648 1386.48 353.48 1386.48 390.859 1372.03 409.57 1343.13 409.57"/>
+<path transform="matrix(.1,0,0,-.1,0,285.468)" d="M1617.59 409.57C1587.55 409.57 1572.52 390.859 1572.52 353.48 1572.52 335.129 1576.21 321.09 1583.57 311.352 1590.91 301.609 1601.59 296.738 1615.57 296.738 1645.82 296.738 1660.95 315.648 1660.95 353.48 1660.95 390.859 1646.5 409.57 1617.59 409.57"/>
+<path transform="matrix(.1,0,0,-.1,0,285.468)" d="M2375.91 1799.1C2230.6 1625.99 2021.51 1530.97 1812.66 1456.75 1753.3 1309.8 1696.05 1159.21 1675.72 1000.71 1666.08 925.543 1650.54 772.953 1770.55 791.652 1866.13 806.551 1969.66 929.641 2027.17 1002.49 2048.79 1029.88 2069.83 1064.05 2091.9 1089.57 2132.09 1136.06 2205.48 1098.69 2190.65 1038.91 2185.66 1018.79 2145.83 968.063 2131.54 949.223 2040.22 828.914 1876.8 652.543 1716.83 642.453 1616.27 636.102 1533.28 669.434 1487.84 762.141 1411.94 916.98 1462.83 1133.13 1512.78 1289.92 1522.07 1319.08 1536.68 1351.72 1544.08 1380.37 1544.43 1381.72 1545.7 1384.88 1543.97 1384.98L1321.54 1329.34C1275.68 1215.84 1223.88 1104.2 1159.07 1000.3 1033.16 798.441 836.422 593.023 573.441 645.883 443.293 672.051 370.621 771.543 386.055 904.531 407.914 1092.87 649.063 1228.8 805.711 1296.55 905.621 1339.76 1010.25 1370.82 1114.83 1400.77 1185.18 1556.7 1253.02 1714.2 1341.8 1860.72 1342.28 1862.78 1341.69 1863.55 1339.6 1862.92 1329.25 1859.81 1317.99 1853.92 1306.9 1850.52 1191.84 1815.22 1041.09 1819.91 1007.37 1960.63 999.914 1991.78 1001.29 2056.21 981.121 2078.67 960.082 2102.1 914.652 2080.51 893.434 2065.58 831.055 2021.7 786.414 1946.36 754.332 1878.51 736.652 1841.14 725.824 1786.67 673.633 1786.23 645.074 1785.99 610.363 1809.79 612.844 1841.14 614.895 1867.02 635.902 1915.87 647.613 1940.14 695.203 2038.74 772.773 2139.48 869.824 2192.91 974.012 2250.26 1144.47 2270.65 1200.8 2139.02 1216.45 2102.43 1217.04 2061.12 1229.18 2024.62 1239.48 1993.66 1267.92 1986.87 1297.46 1989.23 1361.92 1994.38 1440.95 2060.04 1489.15 2101.16 1537.36 2142.31 1610.38 2227.15 1670.95 2239.52 1724.02 2250.37 1758.43 2222.56 1752 2167.48 1747.78 2131.27 1703.27 2108.72 1677.81 2086.86 1615.66 2033.53 1578.38 1961.71 1543.45 1889.04 1477.81 1752.47 1427.13 1609.19 1373.4 1467.64L1600.32 1525.54C1649.8 1625.11 1696.93 1723.91 1758.15 1817.13 1855.39 1965.2 2031.4 2181.42 2208.78 2227.77 2322.12 2257.38 2449.36 2238.19 2475.91 2106.46 2498.35 1995.21 2445.84 1882.42 2375.91 1799.1M1823.88 283.301C1813.46 274.652 1798.89 270.332 1780.14 270.332 1760.66 270.332 1746.36 273.391 1737.24 279.504 1728.13 285.613 1722.12 295.461 1719.22 309.031L1749.99 313.852C1751.44 306.703 1754.51 301.57 1759.23 298.473 1763.94 295.352 1770.71 293.801 1779.51 293.801 1787.49 293.801 1793.94 295.504 1798.85 298.934 1803.78 302.344 1806.24 307.883 1806.24 315.563 1806.24 320.211 1805.15 324.082 1802.97 327.133 1800.8 330.191 1797.56 332.82 1793.26 335.063 1788.96 337.273 1780.6 340.063 1768.16 343.363 1756.77 346.371 1748.31 349.762 1742.76 353.543 1737.21 357.332 1732.94 362.094 1729.94 367.844 1726.93 373.602 1725.43 380.664 1725.43 389.051 1725.43 403.863 1730.07 415.391 1739.34 423.621 1748.62 431.863 1762.15 435.98 1779.97 435.98 1796.45 435.98 1809.11 432.941 1817.97 426.902 1826.83 420.844 1832.4 411.543 1834.68 399.012L1803.6 395.73C1802.45 401.844 1799.95 406.141 1796.06 408.641 1792.18 411.121 1786.91 412.363 1780.29 412.363 1765.68 412.363 1758.38 405.941 1758.38 393.102 1758.38 388.961 1759.28 385.531 1761.1 382.832 1762.9 380.152 1765.55 377.852 1769.02 375.922 1772.49 374.004 1780.39 371.293 1792.72 367.781 1806.29 363.922 1815.92 360.07 1821.62 356.203 1827.32 352.301 1831.72 347.41 1834.84 341.504 1837.93 335.594 1839.49 328.203 1839.49 319.281 1839.49 303.961 1834.28 291.961 1823.88 283.301M1676.72 292.402C1662.26 277.684 1641.99 270.332 1615.88 270.332 1590.6 270.332 1570.82 277.793 1556.52 292.711 1542.22 307.633 1535.07 327.891 1535.07 353.48 1535.07 379.461 1542.24 399.723 1556.6 414.242 1570.94 428.742 1591.02 435.98 1616.81 435.98 1643.44 435.98 1663.69 428.914 1677.57 414.773 1691.45 400.633 1698.39 380.191 1698.39 353.48 1698.39 327.473 1691.17 307.102 1676.72 292.402M1496.97 273.434H1461.23V499.371H1496.97ZM1402.25 292.402C1387.8 277.684 1367.52 270.332 1341.41 270.332 1316.13 270.332 1296.35 277.793 1282.05 292.711 1267.75 307.633 1260.6 327.891 1260.6 353.48 1260.6 379.461 1267.78 399.723 1282.13 414.242 1296.48 428.742 1316.55 435.98 1342.34 435.98 1368.97 435.98 1389.23 428.914 1403.1 414.773 1416.98 400.633 1423.92 380.191 1423.92 353.48 1423.92 327.473 1416.71 307.102 1402.25 292.402M1219.9 273.434H1183.54V370.871H1078.18V273.434H1040.42V492.402H1078.18V402.262H1183.54V492.402H1219.9ZM1432.58 2843.11C649.824 2843.11 15.2617 2208.55 15.2617 1425.79 15.2617 643.031 649.824 8.48047 1432.58 8.48047 2215.35 8.48047 2849.91 643.031 2849.91 1425.79 2849.91 2208.55 2215.35 2843.11 1432.58 2843.11"/>
+<path transform="matrix(.1,0,0,-.1,0,285.468)" d="M2225.69 2092.12C2153.21 2059.05 2073.45 1947.94 2031.12 1880.86 1978.69 1797.78 1931.61 1709.42 1888.95 1620.97 1975.49 1652.62 2059.38 1693.64 2133.79 1748.12 2213.71 1806.64 2305.65 1897.29 2333.11 1995.22 2358.83 2086.97 2316.13 2133.38 2225.69 2092.12"/>
+</g>
+</svg>

package/app/darwin/assets/status-icon.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+  <rect width="128" height="128" fill="none" />
+  <text
+    x="64"
+    y="92"
+    text-anchor="middle"
+    font-family="BM JUA"
+    font-size="106"
+    letter-spacing="-4"
+    fill="#000"
+  >S</text>
+</svg>

package/{src/menu.swift → app/darwin/main.swift}

@@ -6,15 +6,14 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
   private var menu: NSMenu!
   private var hostProcess: Process?
   private var pollTimer: Timer?
-
-  private let rootPath: String
+  private var statusImage: NSImage?
 
   private let agentItem = NSMenuItem(title: "Agent ID: unknown", action: #selector(copyAgentID), keyEquivalent: "")
   private let envItem = NSMenuItem(title: "Env ID: unknown", action: #selector(copyEnvID), keyEquivalent: "")
   private let loginItem = NSMenuItem(title: "Login with Holos", action: #selector(login), keyEquivalent: "")
   private let connectionItem = NSMenuItem(title: "Holos: disconnected", action: #selector(reconnect), keyEquivalent: "")
   private let collaborationItem = NSMenuItem(title: "Collaboration: on", action: #selector(toggleCollaboration), keyEquivalent: "")
-  private let terminateItem = NSMenuItem(title: "Terminate Collaboration", action: #selector(kickCollaborator), keyEquivalent: "")
+  private let terminateItem = NSMenuItem(title: "Terminate Collaboration", action: #selector(terminateCollaboration), keyEquivalent: "")
   private let refreshItem = NSMenuItem(title: "Refresh", action: #selector(refreshStatus), keyEquivalent: "r")
   private let quitItem = NSMenuItem(title: "Quit", action: #selector(quitApp), keyEquivalent: "q")
 
@@ -22,20 +21,19 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
   private var currentEnvID: String?
   private var hostStarted = false
 
-  override init() {
-    self.rootPath = FileManager.default.currentDirectoryPath
-    super.init()
-  }
+  private lazy var runtimeURL: URL? = {
+    Bundle.main.resourceURL?.appendingPathComponent("meta-synergy-runtime")
+  }()
 
   func applicationDidFinishLaunching(_ notification: Notification) {
     statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
-    statusItem.button?.title = "Meta"
+    statusImage = loadStatusImage()
+    applyStatusAppearance(textFallback: "Meta", toolTip: "MetaSynergy")
 
     menu = NSMenu()
+
     agentItem.target = self
     envItem.target = self
-    configureCopyIcon(for: agentItem)
-    configureCopyIcon(for: envItem)
     loginItem.target = self
     connectionItem.target = self
     collaborationItem.target = self
@@ -43,6 +41,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     refreshItem.target = self
     quitItem.target = self
 
+    configureCopyIcon(for: agentItem)
+    configureCopyIcon(for: envItem)
+
     menu.addItem(agentItem)
     menu.addItem(envItem)
     menu.addItem(loginItem)
@@ -65,23 +66,27 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
   }
 
   @objc private func login() {
-    _ = runCLI(["login"])
+    _ = runCommand(["login"])
     startHostIfPossible()
     refreshStatus()
   }
 
   @objc private func reconnect() {
-    startHostIfPossible()
-    _ = runCLI(["reconnect"])
+    if hostProcess == nil {
+      startHostIfPossible()
+    } else {
+      _ = runCommand(["reconnect"])
+    }
     refreshStatus()
   }
 
   @objc private func refreshStatus() {
-    guard let output = runCLI(["status"]) else {
+    guard let output = runCommand(["status"]) else {
       connectionItem.title = "Holos: unavailable"
       connectionItem.isEnabled = false
       collaborationItem.isHidden = true
       terminateItem.isHidden = true
+      refreshItem.isHidden = true
       return
     }
 
@@ -129,23 +134,25 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
     if let sessionID = session?["sessionID"] as? String,
        let remoteAgentID = session?["remoteAgentID"] as? String {
-      terminateItem.title = "Terminate Collaboration (\(remoteAgentID), \(sessionID.prefix(8)))"
+      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 {
+        applyStatusAppearance(
+          textFallback: collaborationEnabled ? "Meta" : "Meta Off",
+          toolTip: collaborationEnabled ? "MetaSynergy: collaboration on" : "MetaSynergy: collaboration off",
+        )
+      } else {
+        applyStatusAppearance(textFallback: "Meta", toolTip: "MetaSynergy")
+      }
     }
-
-    if !hasAuth {
-      statusItem.button?.title = "Meta"
-      return
-    }
-
-    statusItem.button?.title = session == nil ? (collaborationEnabled ? "Meta" : "Meta Off") : "Meta Busy"
   }
 
   @objc private func toggleCollaboration() {
-    guard let output = runCLI(["status"]),
+    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],
@@ -154,12 +161,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
       return
     }
 
-    _ = runCLI([enabled ? "disable" : "enable"])
+    _ = runCommand([enabled ? "disable" : "enable"])
     refreshStatus()
   }
 
-  @objc private func kickCollaborator() {
-    _ = runCLI(["kick"])
+  @objc private func terminateCollaboration() {
+    _ = runCommand(["kick"])
     refreshStatus()
   }
 
@@ -177,27 +184,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
   }
 
   private func startHostIfPossible() {
-    guard !hostStarted else { return }
-    guard let output = runCLI(["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,
-          !agentID.isEmpty,
-          !agentSecret.isEmpty
-    else {
-      return
-    }
+    guard hostProcess == nil, !hostStarted else { return }
+    guard hasAuth() else { return }
+    guard let runtimeURL else { return }
 
     let process = Process()
-    process.executableURL = URL(fileURLWithPath: "/usr/bin/env")
-    process.arguments = ["bun", "run", "src/cli.ts", "start"]
-    process.currentDirectoryURL = URL(fileURLWithPath: rootPath)
-    process.terminationHandler = { _ in
+    process.executableURL = runtimeURL
+    process.arguments = ["start"]
+    process.terminationHandler = { [weak self] _ in
       DispatchQueue.main.async {
-        self.hostStarted = false
-        self.connectionItem.title = "Holos: disconnected"
+        self?.hostStarted = false
+        self?.hostProcess = nil
       }
     }
 
@@ -206,17 +203,29 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
       hostProcess = process
       hostStarted = true
     } catch {
-      hostStarted = false
       connectionItem.title = "Holos: failed to start host"
     }
   }
 
+  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
+  }
+
   @discardableResult
-  private func runCLI(_ args: [String]) -> String? {
+  private func runCommand(_ args: [String]) -> String? {
+    guard let runtimeURL else { return nil }
     let process = Process()
-    process.executableURL = URL(fileURLWithPath: "/usr/bin/env")
-    process.arguments = ["bun", "run", "src/cli.ts"] + args
-    process.currentDirectoryURL = URL(fileURLWithPath: rootPath)
+    process.executableURL = runtimeURL
+    process.arguments = args
 
     let output = Pipe()
     process.standardOutput = output
@@ -253,9 +262,57 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
       return value
     }
 
-    let prefix = value.prefix(8)
-    let suffix = value.suffix(6)
-    return "\(prefix)...\(suffix)"
+    return "\(value.prefix(8))...\(value.suffix(6))"
+  }
+
+  private func loadStatusImage() -> NSImage? {
+    guard let url = Bundle.main.resourceURL?.appendingPathComponent("StatusIcon.png"),
+          let source = NSImage(contentsOf: url)
+    else {
+      return nil
+    }
+
+    let canvasSize = NSSize(width: 18, height: 18)
+    let image = NSImage(size: canvasSize)
+    image.lockFocus()
+    NSColor.clear.setFill()
+    NSBezierPath(rect: NSRect(origin: .zero, size: canvasSize)).fill()
+
+    let targetRect = fitRect(
+      sourceSize: source.size,
+      into: NSRect(x: 1.75, y: 1.75, width: 14.5, height: 14.5),
+    )
+    source.draw(in: targetRect)
+
+    image.unlockFocus()
+    image.isTemplate = true
+    return image
+  }
+
+  private func applyStatusAppearance(textFallback: String, toolTip: String) {
+    guard let button = statusItem.button else { return }
+    if let statusImage {
+      button.image = statusImage
+      button.imagePosition = .imageOnly
+      button.title = ""
+    } else {
+      button.image = nil
+      button.title = textFallback
+    }
+    button.toolTip = toolTip
+  }
+
+  private func fitRect(sourceSize: NSSize, into rect: NSRect) -> NSRect {
+    guard sourceSize.width > 0, sourceSize.height > 0 else { return rect }
+    let scale = min(rect.width / sourceSize.width, rect.height / sourceSize.height)
+    let width = sourceSize.width * scale
+    let height = sourceSize.height * scale
+    return NSRect(
+      x: rect.midX - width / 2,
+      y: rect.midY - height / 2,
+      width: width,
+      height: height,
+    )
   }
 }
 

package/package.json

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

package/script/build-app.ts

@@ -0,0 +1,181 @@
+#!/usr/bin/env bun
+
+import { $ } from "bun"
+import path from "node:path"
+import fs from "node:fs/promises"
+
+const pkgDir = path.resolve(import.meta.dir, "..")
+const distDir = path.join(pkgDir, "dist", "app")
+const appName = "MetaSynergy"
+const darwinDir = path.join(pkgDir, "app", "darwin")
+const sourcePath = path.join(darwinDir, "main.swift")
+const appIconSourcePath = path.join(darwinDir, "assets", "app-icon.png")
+const statusIconSourcePath = path.join(darwinDir, "assets", "status-icon.png")
+const runtimeEntrypoint = path.join(pkgDir, "src", "cli.ts")
+const signIdentity = process.env.METASYNERGY_SIGN_IDENTITY || "-"
+
+const targets = [
+  {
+    arch: "arm64",
+    bunTarget: "bun-darwin-arm64",
+    swiftTarget: "arm64-apple-macos12.0",
+    suffix: "darwin-arm64",
+  },
+  {
+    arch: "x64",
+    bunTarget: "bun-darwin-x64",
+    swiftTarget: "x86_64-apple-macos12.0",
+    suffix: "darwin-x64",
+  },
+] as const
+
+await $`rm -rf ${distDir}`
+
+for (const target of targets) {
+  await buildTarget(target)
+}
+
+if (signIdentity === "-") {
+  console.log(
+    "Note: this build uses ad-hoc signing. Gatekeeper may reject it until you sign/notarize with a Developer ID.",
+  )
+}
+
+async function buildTarget(target: (typeof targets)[number]) {
+  const targetDir = path.join(distDir, target.suffix)
+  const appDir = path.join(targetDir, `${appName}.app`)
+  const contentsDir = path.join(appDir, "Contents")
+  const macOSDir = path.join(contentsDir, "MacOS")
+  const resourcesDir = path.join(contentsDir, "Resources")
+  const appExecutable = path.join(macOSDir, appName)
+  const runtimeExecutable = path.join(resourcesDir, "meta-synergy-runtime")
+  const infoPlistPath = path.join(contentsDir, "Info.plist")
+  const dmgPath = path.join(distDir, `${appName}-${target.suffix}.dmg`)
+  const tempDir = path.join(targetDir, ".tmp")
+  const iconsetDir = path.join(tempDir, "AppIcon.iconset")
+  const moduleCacheDir = path.join(tempDir, "swift-module-cache")
+
+  await fs.mkdir(macOSDir, { recursive: true })
+  await fs.mkdir(resourcesDir, { recursive: true })
+  await fs.mkdir(tempDir, { recursive: true })
+  await fs.mkdir(moduleCacheDir, { recursive: true })
+
+  console.log(`Building embedded MetaSynergy runtime (${target.suffix})`)
+  const result = await Bun.build({
+    entrypoints: [runtimeEntrypoint],
+    target: "bun",
+    sourcemap: "none",
+    minify: false,
+    compile: {
+      target: target.bunTarget,
+      outfile: runtimeExecutable,
+      execArgv: ["--use-system-ca", "--"],
+    },
+  })
+
+  if (!result.success) {
+    throw new Error(
+      `Failed to build runtime for ${target.suffix}:\n${result.logs.map((log) => log.message).join("\n")}`,
+    )
+  }
+
+  await $`chmod +x ${runtimeExecutable}`
+
+  console.log(`Compiling native macOS menu bar host (${target.suffix})`)
+  await $`env CLANG_MODULE_CACHE_PATH=${moduleCacheDir} swiftc -target ${target.swiftTarget} -O ${sourcePath} -o ${appExecutable}`
+
+  const iconBuilt = await buildIcon(iconsetDir, resourcesDir).catch((error) => {
+    console.warn(
+      `Icon generation skipped for ${target.suffix}: ${error instanceof Error ? error.message : String(error)}`,
+    )
+    return false
+  })
+  await $`cp ${statusIconSourcePath} ${path.join(resourcesDir, "StatusIcon.png")}`
+
+  await fs.writeFile(
+    infoPlistPath,
+    plist({
+      executable: appName,
+      iconFile: iconBuilt ? "AppIcon" : undefined,
+    }),
+  )
+
+  console.log(`Applying code signature (${signIdentity === "-" ? "ad-hoc" : signIdentity}) to ${target.suffix}`)
+  await $`codesign --force --deep --sign ${signIdentity} ${appDir}`.quiet().catch((error) => {
+    console.warn(`codesign skipped for ${target.suffix}: ${error}`)
+  })
+
+  console.log(`Building DMG (${target.suffix})`)
+  const dmgStageDir = path.join(tempDir, "dmg")
+  await fs.mkdir(dmgStageDir, { recursive: true })
+  await $`cp -R ${appDir} ${dmgStageDir}`
+  await $`ln -s /Applications ${path.join(dmgStageDir, "Applications")}`
+  await $`hdiutil create -volname ${appName} -srcfolder ${dmgStageDir} -ov -format UDZO ${dmgPath}`.quiet()
+
+  console.log(`Built ${appDir}`)
+  console.log(`Built ${dmgPath}`)
+}
+
+async function buildIcon(iconsetDir: string, resourcesDir: string) {
+  await fs.mkdir(iconsetDir, { recursive: true })
+  const tempDir = path.dirname(iconsetDir)
+  const flattenedJPG = path.join(tempDir, "app-icon-white.jpg")
+  const sourcePNG = path.join(tempDir, "app-icon-white.png")
+  await $`sips -s format jpeg ${appIconSourcePath} --out ${flattenedJPG}`.quiet()
+  await $`sips -s format png ${flattenedJPG} --out ${sourcePNG}`.quiet()
+
+  const sizes = [
+    ["16", "icon_16x16.png"],
+    ["32", "icon_16x16@2x.png"],
+    ["32", "icon_32x32.png"],
+    ["64", "icon_32x32@2x.png"],
+    ["128", "icon_128x128.png"],
+    ["256", "icon_128x128@2x.png"],
+    ["256", "icon_256x256.png"],
+    ["512", "icon_256x256@2x.png"],
+    ["512", "icon_512x512.png"],
+    ["1024", "icon_512x512@2x.png"],
+  ] as const
+
+  for (const [size, filename] of sizes) {
+    await $`sips -z ${size} ${size} ${sourcePNG} --out ${path.join(iconsetDir, filename)}`.quiet()
+  }
+
+  await $`iconutil -c icns ${iconsetDir} -o ${path.join(resourcesDir, "AppIcon.icns")}`.quiet()
+  return true
+}
+
+function plist(input: { executable: string; iconFile?: string }) {
+  const iconLine = input.iconFile ? `  <key>CFBundleIconFile</key>\n  <string>${input.iconFile}</string>\n` : ""
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleDisplayName</key>
+  <string>MetaSynergy</string>
+  <key>CFBundleExecutable</key>
+  <string>${input.executable}</string>
+  <key>CFBundleIdentifier</key>
+  <string>io.holos.metasynergy</string>
+${iconLine}  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>MetaSynergy</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>0.1.0</string>
+  <key>CFBundleVersion</key>
+  <string>1</string>
+  <key>LSMinimumSystemVersion</key>
+  <string>12.0</string>
+  <key>LSUIElement</key>
+  <true/>
+  <key>NSHighResolutionCapable</key>
+  <true/>
+</dict>
+</plist>
+`
+}

package/src/cli.ts

@@ -48,7 +48,7 @@ async function main() {
       return
     case "menu":
       await new Promise<void>((resolve, reject) => {
-        const child = spawn("swift", ["src/menu.swift"], { stdio: "inherit" })
+        const child = spawn("swift", ["app/darwin/main.swift"], { stdio: "inherit" })
         child.once("exit", (code) => {
           if ((code ?? 0) === 0) resolve()
           else reject(new Error(`Menu exited with code ${code ?? 0}`))