modelstat 0.0.24 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelstat",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "modelstat companion — reads local AI-tool usage and ships tokenised events to modelstat.",
   "license": "Apache-2.0",
   "type": "module",
@@ -10,28 +10,43 @@
   },
   "files": [
     "dist",
+    "scripts/postinstall.mjs",
     "vendor/tray-mac",
     "README.md",
     "LICENSE"
   ],
+  "scripts": {
+    "dev:connect": "tsx ./src/cli.ts connect",
+    "dev:scan": "tsx ./src/cli.ts scan",
+    "dev:watch": "tsx ./src/cli.ts watch",
+    "dev:discover": "tsx ./src/cli.ts discover",
+    "build": "tsup",
+    "build:tray": "bash ./scripts/build-tray.sh",
+    "prepack": "pnpm run build && pnpm run build:tray",
+    "pack:tarball": "pnpm run build && npm pack --pack-destination ../..",
+    "install:local": "bash ./scripts/install-local.sh",
+    "postinstall": "node ./scripts/postinstall.mjs",
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
     "chokidar": "^4.0.3",
     "conf": "^13.1.0",
     "dotenv": "^16.4.7",
+    "node-llama-cpp": "^3.18.0",
     "ulid": "^2.3.0",
     "undici": "^7.1.0"
   },
   "devDependencies": {
+    "@modelstat/companion-core": "workspace:*",
+    "@modelstat/core": "workspace:*",
+    "@modelstat/parsers": "workspace:*",
     "@types/node": "^22.10.5",
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
-    "typescript": "^5.7.3",
-    "@modelstat/companion-core": "0.0.0",
-    "@modelstat/core": "0.0.0",
-    "@modelstat/parsers": "0.0.0"
+    "typescript": "^5.7.3"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=20.18.0"
   },
   "os": [
     "darwin",
@@ -56,16 +71,5 @@
     "type": "git",
     "url": "git+https://github.com/modelstat/modelstat.git",
     "directory": "apps/agent-dev"
-  },
-  "scripts": {
-    "dev:connect": "tsx ./src/cli.ts connect",
-    "dev:scan": "tsx ./src/cli.ts scan",
-    "dev:watch": "tsx ./src/cli.ts watch",
-    "dev:discover": "tsx ./src/cli.ts discover",
-    "build": "tsup",
-    "build:tray": "bash ./scripts/build-tray.sh",
-    "pack:tarball": "pnpm run build && npm pack --pack-destination ../..",
-    "install:local": "bash ./scripts/install-local.sh",
-    "typecheck": "tsc --noEmit"
   }
-}
+}

package/scripts/postinstall.mjs

@@ -0,0 +1,120 @@
+#!/usr/bin/env node
+/**
+ * Post-install hook for the @modelstat/agent CLI.
+ *
+ * Runs after `npm install -g modelstat` (or `npx modelstat` cache
+ * population) and downloads the bundled summariser GGUF (~2.7 GB)
+ * with visible progress, so the user sees the heavy download
+ * attached to the install they just kicked off — not as a surprise
+ * 7-minute hang the first time they run `modelstat scan`.
+ *
+ * Skipped when:
+ *   - Running inside this repo's pnpm workspace (we don't want every
+ *     dev `pnpm install` to pull 2.7 GB; the developer can opt in by
+ *     running `modelstat connect` once or pre-pulling the model).
+ *   - `MODELSTAT_SKIP_POSTINSTALL=1` is set (CI escape hatch, or for
+ *     packagers who handle the model out-of-band).
+ *   - `CI=true` is set (most CI providers; avoids blocking automated
+ *     installs on a multi-GB pull).
+ *   - stdout isn't a TTY AND CI isn't set (likely a scripted
+ *     install that doesn't want long-running side-effects).
+ *
+ * In all skip cases the model still downloads lazily on first
+ * `modelstat scan` — the agent always preflights the summariser
+ * before producing any segments (see src/pipeline.ts), so users in
+ * skip-mode just see the download then, instead of now.
+ */
+
+import { existsSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+function inThisMonorepo() {
+  // Walk up from this script looking for the repo's pnpm-workspace.yaml.
+  // When npm installs us into a global node_modules, this file isn't an
+  // ancestor — so we know we're in a real install and should download.
+  let dir = dirname(fileURLToPath(import.meta.url));
+  for (let i = 0; i < 10; i++) {
+    if (existsSync(join(dir, "pnpm-workspace.yaml"))) return true;
+    const up = resolve(dir, "..");
+    if (up === dir) return false;
+    dir = up;
+  }
+  return false;
+}
+
+async function main() {
+  if (process.env.MODELSTAT_SKIP_POSTINSTALL === "1") {
+    console.log(
+      "[modelstat] postinstall skipped (MODELSTAT_SKIP_POSTINSTALL=1) — model downloads lazily on first scan",
+    );
+    return;
+  }
+  if (process.env.CI === "true" || process.env.CI === "1") {
+    console.log(
+      "[modelstat] postinstall skipped (CI=1) — model downloads lazily on first scan",
+    );
+    return;
+  }
+  if (inThisMonorepo()) {
+    // Dev environment — don't pull 2.7 GB on every workspace install.
+    return;
+  }
+  if (!process.stdout.isTTY) {
+    console.log(
+      "[modelstat] postinstall: non-TTY — model will download lazily on first `modelstat scan`",
+    );
+    return;
+  }
+
+  // Resolve the helper from the workspace package the bundle uses.
+  // companion-core is bundled into dist/cli.mjs by tsup, but we need
+  // the helper as a standalone import here (postinstall runs against
+  // the unbundled source layout).
+  let ensureLlamaModel;
+  let defaultLlamaConfig;
+  try {
+    ({ ensureLlamaModel, defaultLlamaConfig } = await import(
+      "@modelstat/companion-core/node"
+    ));
+  } catch (err) {
+    console.warn(
+      `[modelstat] postinstall: couldn't import summariser helper (${err && err.message ? err.message : err}); model will download lazily on first scan`,
+    );
+    return;
+  }
+
+  console.log("");
+  console.log("━".repeat(60));
+  console.log("  Pre-downloading the local summariser model");
+  console.log("");
+  console.log("  modelstat ships with a small LLM that runs ON YOUR MACHINE");
+  console.log("  to summarise every coding session. The model is ~2.7 GB —");
+  console.log("  pulling it now so the first `modelstat scan` is instant.");
+  console.log("━".repeat(60));
+  console.log("");
+
+  try {
+    await ensureLlamaModel(defaultLlamaConfig());
+    console.log("");
+    console.log("[modelstat] ✓ summariser ready — run `modelstat connect` next");
+  } catch (err) {
+    // Don't fail the npm install. The model will retry-download on
+    // first scan; better to leave the user with a working binary
+    // than to abort because their network blipped.
+    console.warn(
+      `[modelstat] ⚠ couldn't pre-download summariser (${err && err.message ? err.message : err})`,
+    );
+    console.warn(
+      "[modelstat]   the model will download lazily on first `modelstat scan` instead",
+    );
+  }
+}
+
+main().catch((err) => {
+  console.warn(
+    `[modelstat] postinstall failed: ${err && err.message ? err.message : err}`,
+  );
+  // Never fail the install for a postinstall problem.
+  process.exit(0);
+});

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

@@ -149,12 +149,17 @@ final class TrayController: NSObject {
       return
     }
     let p = Process()
+    // --force: the tray owns the daemon. If a stale lock from a prior
+    // run (crash, kill -9, OS reboot mid-write) is left behind, the
+    // unforced `start` exits in <1s with "already running" and the
+    // tray's terminationHandler retries it forever. With --force we
+    // claim the lock unconditionally and become the live daemon.
     if cli.pathExtension == "mjs" {
       p.launchPath = "/usr/bin/env"
-      p.arguments = ["node", cli.path, "start"]
+      p.arguments = ["node", cli.path, "start", "--force"]
     } else {
       p.launchPath = cli.path
-      p.arguments = ["start"]
+      p.arguments = ["start", "--force"]
     }
     // Bolt stdout/stderr onto the same log the launchd plist uses so
     // `modelstat status` still sees the same tail.
@@ -208,6 +213,10 @@ final class TrayController: NSObject {
     do {
       try p.run()
     } catch {
+      // Surface the failure in the menu instead of leaving the title
+      // stuck on whatever it was last (e.g. "Starting…" forever). Most
+      // likely cause is `node` not being on the launchd-inherited PATH.
+      statusMI.title = "stats failed: \(error.localizedDescription)"
       return
     }
     // Run on a background queue so we don't block the main loop.
@@ -336,11 +345,23 @@ final class TrayController: NSObject {
 // TrayController is @MainActor, so its init must run on the main
 // actor. We wrap the bootstrap in a main-actor function to satisfy
 // Swift 6's strict concurrency without bloating the controller.
+//
+// IMPORTANT: nothing in AppKit retains TrayController for us. The
+// NSStatusItem holds the menu, and NSMenuItem.target is a weak
+// reference, so the controller has no strong owners. Without a
+// global anchor, ARC deallocates the controller as soon as init
+// returns — which leaves the timer's `[weak self]` callback firing
+// against nil and the menu title frozen on "Starting…" forever.
+// The `controller` global below is the strong reference that keeps
+// the controller alive for the entire app lifetime.
+@MainActor
+private var controller: TrayController?
+
 @MainActor
 func bootstrap() {
   let app = NSApplication.shared
   app.setActivationPolicy(.accessory)
-  _ = TrayController()
+  controller = TrayController()
   app.run()
 }
 

package/LICENSE

@@ -1,87 +0,0 @@
-Copyright (c) 2026 ModelState Inc
-
-Source-Available License
-
-1. Grant of Rights
-
-Subject to the terms of this License, you are granted a non-exclusive, worldwide,
-non-transferable, non-sublicensable license to:
-
-- View, read, and inspect the source code
-- Build, modify, and run the software
-- Use the software internally, including in production, solely to access or interact
-  with ModelState Inc’s hosted services
-
-2. Permitted Use
-
-You may use the software as a client, agent, or self-hosted component that connects
-to and depends on ModelState Inc’s cloud or hosted services.
-
-3. Restrictions
-
-You may NOT, without explicit prior written permission from ModelState Inc:
-
-- Use the software to provide a hosted, managed, or SaaS service to third parties
-- Use the software in any product or service that competes with ModelState Inc
-- Use the software to build or operate an alternative to ModelState Inc’s services
-- Redistribute, sublicense, sell, license, or commercially exploit the software
-- Offer the software (modified or unmodified) as part of a commercial offering
-- Make the software available to third parties as a service
-- Use the software for the benefit of third parties (including multi-tenant or shared environments)
-- Circumvent or attempt to circumvent the limitations of this License
-- Remove or alter any licensing, copyright, or attribution notices
-
-4. Definition of Competing Service
-
-“Competing Service” means any product or service that provides substantially similar
-functionality to ModelState Inc’s offerings, including but not limited to:
-
-- AI or LLM usage tracking, monitoring, or observability systems
-- Model analytics platforms or dashboards
-- Inference tracking, logging, or telemetry pipelines
-- Evaluation, benchmarking, or quality analysis systems for AI/ML models
-- Cost tracking, performance tracking, or optimization systems for model inference
-- Any system that collects, processes, analyzes, or visualizes usage or behavior of AI or machine learning models, including large language models (LLMs), when offered as a product or service
-
-5. Internal Use
-
-Use of the software is permitted only for your internal business or personal use,
-and not for the benefit of third parties.
-
-6. Network Use Restriction
-
-You may not use the software to expose APIs, endpoints, dashboards, or services to external
-users except as part of accessing ModelState Inc’s services.
-
-7. Data Extraction Restriction
-
-You may not use the software to replicate, extract, reverse engineer, or reconstruct
-ModelState Inc’s service behavior, APIs, data models, or system design for the purpose
-of building, improving, or operating a competing system or service.
-
-8. Ownership
-
-All rights, title, and interest in the software remain exclusively with ModelState Inc.
-The software is licensed, not sold.
-
-9. Contributions
-
-Unless explicitly agreed otherwise in writing, any contributions submitted to the software
-grant ModelState Inc a perpetual, irrevocable, worldwide, royalty-free license to use,
-modify, and distribute those contributions.
-
-10. Termination
-
-This License terminates automatically if you violate any of its terms.
-Upon termination, you must immediately cease all use and delete all copies of the software.
-
-11. Disclaimer of Warranty
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED.
-
-12. Limitation of Liability
-
-IN NO EVENT SHALL MODELSTATE INC BE LIABLE FOR ANY CLAIM, DAMAGES,
-OR OTHER LIABILITY ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE
-OR ITS USE OR OTHER DEALINGS IN THE SOFTWARE.