modelstat 0.0.50 → 0.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelstat",
-  "version": "0.0.50",
+  "version": "0.0.52",
   "description": "modelstat companion — reads local AI-tool usage and ships tokenised events to modelstat.",
   "license": "Apache-2.0",
   "type": "module",
@@ -11,6 +11,7 @@
   "files": [
     "dist",
     "scripts/postinstall.mjs",
+    "vendor/ModelstatTray.app",
     "vendor/tray-mac",
     "README.md",
     "LICENSE"
@@ -28,9 +29,9 @@
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
     "typescript": "^5.7.3",
-    "@modelstat/companion-core": "0.0.0",
+    "@modelstat/parsers": "0.0.0",
     "@modelstat/core": "0.0.0",
-    "@modelstat/parsers": "0.0.0"
+    "@modelstat/companion-core": "0.0.0"
   },
   "engines": {
     "node": ">=20.18.0"

package/vendor/ModelstatTray.app/Contents/Info.plist

@@ -0,0 +1,42 @@
+<?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>Modelstat</string>
+  <key>CFBundleExecutable</key>
+  <string>modelstat-tray</string>
+  <key>CFBundleIdentifier</key>
+  <string>ai.modelstat.tray</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>Modelstat</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>
+  <!-- Agent-style app: no Dock icon, no window at launch, just the
+       menu-bar item. -->
+  <key>LSUIElement</key>
+  <true/>
+  <!-- Launch at login when the installer drops us into
+       ~/Library/LaunchAgents (actually driven by the launchd plist). -->
+  <key>LSBackgroundOnly</key>
+  <false/>
+  <key>NSHighResolutionCapable</key>
+  <true/>
+  <key>NSSupportsAutomaticTermination</key>
+  <false/>
+  <key>NSSupportsSuddenTermination</key>
+  <true/>
+  <key>NSHumanReadableCopyright</key>
+  <string>© 2026 modelstat</string>
+</dict>
+</plist>

package/vendor/ModelstatTray.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPL????

package/vendor/ModelstatTray.app/Contents/_CodeSignature/CodeResources

@@ -0,0 +1,115 @@
+<?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>files</key>
+	<dict/>
+	<key>files2</key>
+	<dict/>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/vendor/tray-mac/Sources/ModelstatTray/main.swift

@@ -275,10 +275,14 @@ final class TrayController: NSObject {
     }
     guard !ensureInFlight else { return }
     ensureInFlight = true
-    superviseQueue.async { [weak self] in
+    superviseQueue.async {
       // Probe off-main: the health command boots node (~100-300ms).
       let decision = Self.queryDaemonHealth(cli: cli) ?? "spawn"
-      DispatchQueue.main.async {
+      // Capture self on the closure that actually hops back to @MainActor,
+      // not the supervise-queue closure (which only touches statics) — a weak
+      // *var* captured across the actor hop is a data race the CI toolchain
+      // rejects outright.
+      DispatchQueue.main.async { [weak self] in
         MainActor.assumeIsolated {
           guard let self else { return }
           self.ensureInFlight = false
@@ -343,14 +347,17 @@ final class TrayController: NSObject {
     let err = FileHandle(forWritingAtPath: "\(logsDir)/err.log") ?? FileHandle.standardError
     p.standardOutput = out
     p.standardError = err
-    p.terminationHandler = { [weak self] proc in
+    p.terminationHandler = { proc in
       // Daemon exited — re-converge via the health check, which adopts
       // a replacement daemon instead of counter-killing it. A clean
       // sub-5s exit means "another daemon owns the lock" (or an equally
       // immediate no-op); skip the hot retry and let the 30s watchdog
       // re-check, so a stale CLI can't put us in a 2s spawn loop.
       let status = proc.terminationStatus
-      Task { @MainActor in
+      // Capture weak self on the @MainActor Task, not the (non-isolated)
+      // terminationHandler — capturing the outer weak var across the actor
+      // boundary is a data race the CI toolchain rejects.
+      Task { @MainActor [weak self] in
         guard let self else { return }
         let uptime = self.daemonSpawnedAt.map { Date().timeIntervalSince($0) } ?? .infinity
         self.daemon = nil
@@ -442,11 +449,13 @@ final class TrayController: NSObject {
       return
     }
     // Run on a background queue so we don't block the main loop.
-    DispatchQueue.global(qos: .utility).async { [weak self] in
+    DispatchQueue.global(qos: .utility).async {
       p.waitUntilExit()
       let data = pipe.fileHandleForReading.readDataToEndOfFile()
       let stats = try? JSONDecoder().decode(AgentStats.self, from: data)
-      DispatchQueue.main.async {
+      // Hand self to the main-queue closure (which mutates @MainActor state),
+      // not the background closure that only does blocking IO.
+      DispatchQueue.main.async { [weak self] in
         self?.latest = stats
         self?.renderStats()
       }

package/vendor/tray-mac/build-app.sh

@@ -2,16 +2,24 @@
 # Build ModelstatTray.app from the Swift package.
 #
 # Output:
-#   .build/release/modelstat-tray     (raw executable)
-#   build/ModelstatTray.app           (bundle ready to drop into /Applications)
+#   build/ModelstatTray.app           (ad-hoc-signed bundle, ready to run/ship)
 #
-# Usage:
-#   ./build-app.sh                    (release build, universal when running on arm64)
-#   SWIFT_ARCH=x86_64 ./build-app.sh  (cross-build for Intel)
+# Modes (env):
+#   TRAY_BUILD_CONFIG=release|debug   build config       (default: release)
+#   TRAY_UNIVERSAL=1                  arm64 + x86_64 fat  (default: host arch)
+#                                     — universal needs FULL Xcode (xcbuild);
+#                                       host-arch builds on Command Line Tools
+#                                       alone, which is the on-device fallback.
 #
-# We deliberately DO NOT codesign here — the installer pipeline takes
-# care of that with the team's Developer ID. This script just has to
-# produce a runnable bundle; `codesign` + `create-dmg` happen in CI.
+# Signing: we ad-hoc sign (`codesign -s -`). That is enough to RUN — arm64
+# requires at least an ad-hoc signature, and an app delivered inside the npm
+# tarball is not quarantined, so Gatekeeper's notarization gate never fires.
+# To distribute a DOWNLOADED build (a DMG off the website) without a Gatekeeper
+# prompt, re-sign with a Developer ID cert + Hardened Runtime and notarize:
+#   codesign --force --options runtime --timestamp \
+#            --sign "Developer ID Application: …" build/ModelstatTray.app
+#   xcrun notarytool submit … && xcrun stapler staple build/ModelstatTray.app
+# That is purely additive and slots into CI once the Apple account exists.
 
 set -euo pipefail
 
@@ -20,24 +28,52 @@ cd "$HERE"
 
 APP_NAME="ModelstatTray"
 BUNDLE="build/${APP_NAME}.app"
+CONFIG="${TRAY_BUILD_CONFIG:-release}"
 
-# Clean prior bundle; leave the .build/ cache so incremental swift
-# compiles stay fast.
-rm -rf "$BUNDLE"
-mkdir -p "$BUNDLE/Contents/MacOS" "$BUNDLE/Contents/Resources"
+BUILD_ARGS=(-c "$CONFIG")
+if [[ "${TRAY_UNIVERSAL:-}" == "1" ]]; then
+  BUILD_ARGS+=(--arch arm64 --arch x86_64)
+fi
+
+echo "▶ swift build ${BUILD_ARGS[*]}"
+swift build "${BUILD_ARGS[@]}"
 
-echo "▶ swift build -c release"
-swift build -c release
+# Locate the produced binary. Universal builds land under
+# .build/apple/Products/<Config>/; single-arch under .build/<config>/ (a
+# triple-prefixed dir that SwiftPM also symlinks as .build/<config>).
+BIN=""
+for cand in \
+  ".build/apple/Products/Release/modelstat-tray" \
+  ".build/apple/Products/Debug/modelstat-tray" \
+  ".build/${CONFIG}/modelstat-tray" \
+  ".build/release/modelstat-tray" \
+  ".build/debug/modelstat-tray"; do
+  if [[ -f "$cand" ]]; then BIN="$cand"; break; fi
+done
+if [[ -z "$BIN" ]]; then
+  echo "✗ could not find a built modelstat-tray binary under .build/" >&2
+  exit 1
+fi
+echo "▶ binary: $BIN"
+lipo -archs "$BIN" 2>/dev/null | sed 's/^/  arches: /' || true
 
-cp ".build/release/modelstat-tray" "$BUNDLE/Contents/MacOS/modelstat-tray"
+# Assemble the bundle fresh (leave .build/ so incremental compiles stay fast).
+rm -rf "$BUNDLE"
+mkdir -p "$BUNDLE/Contents/MacOS" "$BUNDLE/Contents/Resources"
+cp "$BIN" "$BUNDLE/Contents/MacOS/modelstat-tray"
 chmod +x "$BUNDLE/Contents/MacOS/modelstat-tray"
 cp "Resources/Info.plist" "$BUNDLE/Contents/Info.plist"
 
-# Embedded PkgInfo file — AppKit used to be picky about this. Costs
-# four bytes to include and silences a startup warning on older macOS.
+# Embedded PkgInfo file — AppKit used to be picky about this. Costs four
+# bytes to include and silences a startup warning on older macOS.
 printf "APPL????" > "$BUNDLE/Contents/PkgInfo"
 
+# Ad-hoc sign the assembled bundle (seals it; required to launch on arm64).
+echo "▶ codesign --force --sign - (ad-hoc)"
+codesign --force --sign - "$BUNDLE"
+
 echo
 echo "✓ Built $BUNDLE"
+codesign -dv "$BUNDLE" 2>&1 | grep -iE "signature|identifier" | sed 's/^/  /' || true
 echo "  run:  open '$BUNDLE'"
 echo "  install: cp -R '$BUNDLE' /Applications/"