modelstat 0.0.12 → 0.0.14

package/README.md

@@ -22,9 +22,9 @@ modelstat connect
 Or via npm / pnpm / bun:
 
 ```bash
-npm install -g modelstat && modelstat connect
-pnpm add -g modelstat && modelstat connect
-bun add -g modelstat && modelstat connect
+npm install -g @modelstat/agent && modelstat connect
+pnpm add -g @modelstat/agent && modelstat connect
+bun add -g @modelstat/agent && modelstat connect
 ```
 
 `modelstat connect` installs a **launchd user agent** on macOS (at `~/Library/LaunchAgents/ai.modelstat.agent.plist`) or a **systemd user unit** on Linux (at `~/.config/systemd/user/modelstat.service`). The daemon starts automatically on login.

package/dist/cli.mjs

@@ -4484,7 +4484,22 @@ var init_schemas = __esm({
 });
 
 // ../../packages/core/src/ids.ts
-import { ulid } from "ulid";
+function ulid(seedTime) {
+  const t = seedTime ?? Date.now();
+  let timeStr = "";
+  let ts = t;
+  for (let i = 9; i >= 0; i--) {
+    timeStr = ULID_ALPHABET[ts % 32] + timeStr;
+    ts = Math.floor(ts / 32);
+  }
+  const bytes = new Uint8Array(16);
+  globalThis.crypto.getRandomValues(bytes);
+  let randStr = "";
+  for (let i = 0; i < 16; i++) {
+    randStr += ULID_ALPHABET[bytes[i] % 32];
+  }
+  return timeStr + randStr;
+}
 function sourceEventId(deviceId, sourceOrFilePath, byteOffsetMaybe) {
   let key;
   if (typeof sourceOrFilePath === "string") {
@@ -4513,10 +4528,11 @@ function segmentId(sessionId, startedAtMs, endedAtMs, sourceEventIds) {
   }
   return `seg_${h.toString(36)}`;
 }
-var batchId;
+var ULID_ALPHABET, batchId;
 var init_ids = __esm({
   "../../packages/core/src/ids.ts"() {
     "use strict";
+    ULID_ALPHABET = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
     batchId = () => ulid();
   }
 });
@@ -7748,7 +7764,7 @@ async function reportDiscovery(report) {
   }
 }
 async function fetchDeviceViewByClaim(claimCode) {
-  const res = await request(`${state.apiUrl}/v1/d/${encodeURIComponent(claimCode)}`, {
+  const res = await request(`${state.apiUrl}/v1/device/${encodeURIComponent(claimCode)}`, {
     method: "GET"
   });
   if (res.statusCode === 404) return null;
@@ -7759,7 +7775,7 @@ async function fetchDeviceViewByClaim(claimCode) {
 }
 async function fetchDeviceViewJobsByClaim(claimCode) {
   const res = await request(
-    `${state.apiUrl}/v1/d/${encodeURIComponent(claimCode)}/jobs`,
+    `${state.apiUrl}/v1/device/${encodeURIComponent(claimCode)}/jobs`,
     { method: "GET" }
   );
   if (res.statusCode === 404) return null;
@@ -7770,7 +7786,7 @@ async function fetchDeviceViewJobsByClaim(claimCode) {
 }
 async function fetchDeviceViewLedgerByClaim(claimCode) {
   const res = await request(
-    `${state.apiUrl}/v1/d/${encodeURIComponent(claimCode)}/ledger`,
+    `${state.apiUrl}/v1/device/${encodeURIComponent(claimCode)}/ledger`,
     { method: "GET" }
   );
   if (res.statusCode === 404) return null;
@@ -8908,6 +8924,7 @@ function generateUuidV7() {
 }
 async function cmdSelfRegister() {
   const deviceUuid = state.deviceUuid ?? generateUuidV7();
+  const fresh = !state.deviceUuid;
   const fingerprint = {
     hostname: hostname2(),
     os_family: osFamily(),
@@ -8916,6 +8933,14 @@ async function cmdSelfRegister() {
     agent: "modelstat-agent-dev",
     agent_version: AGENT_VERSION3
   };
+  if (fresh) {
+    process.stdout.write(`  \x1B[2mgenerated UUIDv7 ${deviceUuid.slice(0, 8)}\u2026\x1B[0m
+`);
+  }
+  process.stdout.write(
+    `  \x1B[2m\u2192 POST ${state.apiUrl}/v1/devices/self-register\x1B[0m
+`
+  );
   const res = await selfRegister({
     device_uuid: deviceUuid,
     fingerprint
@@ -8925,16 +8950,12 @@ async function cmdSelfRegister() {
   state.setBearer(res.device_secret);
   state.setClaimCode(res.claim_code);
   state.setClaimUrl(res.claim_url);
-  console.log(`\u2713 self-registered`);
-  console.log(`  device_uuid:    ${res.device_uuid}`);
-  console.log(`  device_id:      ${res.device_id}`);
-  console.log(`  secret_prefix:  ${res.secret_prefix}\u2026`);
-  console.log();
-  console.log(`  Claim this device to attach it to your account:`);
-  console.log(`    ${res.claim_url}`);
-  console.log(`    code: ${res.claim_code}`);
-  console.log();
-  console.log(`  state: ${state.storePath}`);
+  process.stdout.write(`  \x1B[32m\u2713\x1B[0m registered  device_id=${res.device_id}
+`);
+  process.stdout.write(`  \x1B[32m\u2713\x1B[0m secret      ${res.secret_prefix}\u2026  (hashed on server, never re-sent)
+`);
+  process.stdout.write(`  \x1B[32m\u2713\x1B[0m claim code  ${res.claim_code}
+`);
 }
 async function cmdAwaitClaim() {
   const secret = state.bearer;
@@ -8971,12 +8992,43 @@ function emitEvent(opts, event, fields = {}) {
   );
 }
 async function cmdConnect(opts) {
+  const step = (msg) => {
+    if (opts.json) return;
+    process.stdout.write(`\x1B[1;36m\u25B8\x1B[0m ${msg}
+`);
+  };
+  const ok = (msg) => {
+    if (opts.json) return;
+    process.stdout.write(`  \x1B[32m\u2713\x1B[0m ${msg}
+`);
+  };
+  const warn = (msg) => {
+    if (opts.json) return;
+    process.stdout.write(`  \x1B[33m\u26A0\x1B[0m ${msg}
+`);
+  };
+  const hasLegacyBearer = !!state.bearer && !state.bearer.startsWith("ds_live_");
+  const hasLegacyClaim = !!state.claimUrl && (state.claimUrl.includes("/c/") || /\/d\/[a-z]/.test(state.claimUrl) || !state.claimUrl.includes("/device/"));
+  const hasLegacyCode = !!state.claimCode && !/^[0-9a-hjkmnp-tv-z]{32}$/.test(state.claimCode);
+  if (hasLegacyBearer || hasLegacyClaim || hasLegacyCode) {
+    step("Legacy state detected from an older version \u2014 wiping");
+    state.setBearer(null);
+    state.setDeviceId(null);
+    state.setDeviceUuid(null);
+    state.setClaimCode(null);
+    state.setClaimUrl(null);
+    ok("clean slate");
+  }
   if (!state.deviceUuid || !state.bearer || !state.deviceId) {
+    step("Registering this device with modelstat.ai");
     await cmdSelfRegister();
+  } else {
+    step("Re-using existing device identity");
+    ok(`device ${state.deviceId}`);
   }
   const claimCode = state.claimCode ?? "(unknown)";
-  const claimUrl = state.claimUrl ?? `https://modelstat.ai/d/${claimCode}`;
-  const agentUrl = `https://modelstat.ai/da/${claimCode}`;
+  const claimUrl = state.claimUrl ?? `https://modelstat.ai/device/${claimCode}`;
+  const agentUrl = `https://modelstat.ai/device-agent/${claimCode}`;
   emitEvent(opts, "registered", {
     device_uuid: state.deviceUuid,
     device_id: state.deviceId,
@@ -8985,36 +9037,45 @@ async function cmdConnect(opts) {
     agent_url: agentUrl
   });
   if (platform4() === "darwin") {
+    step("Installing menu-bar tray (macOS)");
     try {
       const src = bundledTrayAppPath();
       if (src) {
         const out = installTrayApp(src);
-        if (out) emitEvent(opts, "tray_installed", { path: out.installedAt });
+        if (out) {
+          emitEvent(opts, "tray_installed", { path: out.installedAt });
+          ok(`tray at ${out.installedAt}`);
+        }
       } else {
         emitEvent(opts, "tray_not_bundled", {});
+        warn("no bundled tray \u2014 skipping (install Xcode CLI tools and re-run to get the icon)");
       }
     } catch (e) {
       emitEvent(opts, "tray_install_failed", { error: e.message });
+      warn(`tray install skipped: ${e.message}`);
     }
   }
+  step("Installing background service so the agent survives reboots");
   let serviceOk = false;
   try {
     const svc = installService();
     serviceOk = true;
     emitEvent(opts, "service_installed", { path: svc.path, logs: svc.logs });
+    ok(`${platform4() === "darwin" ? "launchd" : "systemd --user"}: ${svc.path}`);
   } catch (e) {
     emitEvent(opts, "service_install_failed", { error: e.message });
+    warn(`couldn't install service: ${e.message}`);
+    warn("will run in the foreground instead \u2014 don't close this terminal");
   }
   if (!opts.json) {
     const tray = trayStatus();
-    const svcOk = serviceOk;
     const line = "\u2501".repeat(60);
     console.log();
     console.log(line);
     console.log(`  \u2713 Device registered \u2014 streaming your AI usage to modelstat.`);
     console.log();
     console.log(
-      `    service : \x1B[${svcOk ? "32" : "33"}m${svcOk ? "installed" : "foreground"}\x1B[0m`
+      `    service : \x1B[${serviceOk ? "32" : "33"}m${serviceOk ? "installed" : "foreground"}\x1B[0m`
     );
     if (platform4() === "darwin") {
       console.log(