agendex-cli 0.5.0 → 0.6.0

package/dist/cli.js

@@ -2127,11 +2127,13 @@ function normalizeStoredConfig(raw) {
   const token = typeof raw.token === "string" && raw.token.trim() ? raw.token : undefined;
   const cloudToken = typeof raw.cloudToken === "string" && raw.cloudToken.trim() ? raw.cloudToken : undefined;
   const convexUrl = typeof raw.convexUrl === "string" && raw.convexUrl.trim() ? raw.convexUrl : undefined;
+  const deviceId = typeof raw.deviceId === "string" && raw.deviceId.trim() ? raw.deviceId : undefined;
   return {
     configVersion: 3,
     token,
     cloudToken,
     convexUrl,
+    deviceId,
     enabledAdapters: normalizeAdapterIds(raw.enabledAdapters)
   };
 }
@@ -2145,6 +2147,7 @@ function saveConfig(config) {
     token: config.token,
     cloudToken: config.cloudToken,
     convexUrl: config.convexUrl,
+    deviceId: config.deviceId,
     enabledAdapters: sanitizeEnabledAdapterIds(config.enabledAdapters)
   };
   writeFileSync(configPath, JSON.stringify(payload, null, 2));
@@ -2170,6 +2173,19 @@ function loadOrCreateToken() {
 `);
   return token;
 }
+function loadOrCreateDeviceId() {
+  const existing = loadConfig();
+  if (existing?.deviceId)
+    return existing.deviceId;
+  const deviceId = randomBytes(16).toString("hex");
+  saveConfig({
+    ...existing ?? {},
+    configVersion: 3,
+    deviceId,
+    enabledAdapters: existing?.enabledAdapters ?? []
+  });
+  return deviceId;
+}
 async function loadOrInitConfig(options = {}) {
   const configureAdapters = Boolean(options.configureAdapters);
   const existing = loadConfig();
@@ -2195,11 +2211,13 @@ async function loadOrInitConfig(options = {}) {
     if (enabledAdapters.length === 0)
       enabledAdapters = getDefaultAdapterIds();
   }
+  const deviceId = existing?.deviceId || randomBytes(16).toString("hex");
   const nextConfig = {
     configVersion: 3,
     token: tokenFromEnv ? existing?.token : currentToken,
     cloudToken: existing?.cloudToken,
     convexUrl: existing?.convexUrl,
+    deviceId,
     enabledAdapters
   };
   saveConfig(nextConfig);
@@ -2477,11 +2495,17 @@ function startWatching(onChange) {
 // src/auth.ts
 import { spawn } from "node:child_process";
 import { createServer } from "node:http";
-var DEFAULT_SITE_URL = "https://app.agendex.dev";
+var PROD_SITE_URL = "https://app.agendex.dev";
+var DEV_SITE_URL = "http://app.agendex.local:5174";
+function getDefaultSiteUrl() {
+  if (process.env.AGENDEX_SITE_URL)
+    return process.env.AGENDEX_SITE_URL;
+  return process.env.AGENDEX_DEV === "1" ? DEV_SITE_URL : PROD_SITE_URL;
+}
 async function login(siteUrlOverride) {
   const { port, result } = await startCallbackServer();
   const callbackUrl = `http://127.0.0.1:${port}/callback`;
-  const siteUrl = siteUrlOverride ?? DEFAULT_SITE_URL;
+  const siteUrl = siteUrlOverride ?? getDefaultSiteUrl();
   const authUrl = `${siteUrl}/auth/cli?callback=${encodeURIComponent(callbackUrl)}`;
   console.log(`[agendex] Opening browser for authentication...`);
   console.log(`[agendex] If it doesn't open, visit: ${authUrl}`);
@@ -2670,6 +2694,56 @@ import { fileURLToPath } from "node:url";
 // src/api.ts
 import { request as httpRequest } from "node:http";
 import { request as httpsRequest } from "node:https";
+import { hostname as osHostname } from "node:os";
+
+// src/pid.ts
+import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync3, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { homedir as homedir9, hostname } from "node:os";
+import { dirname, join as join10 } from "node:path";
+var pidPath = join10(homedir9(), ".agendex", "daemon.pid");
+function writePid() {
+  mkdirSync2(dirname(pidPath), { recursive: true });
+  const info = {
+    pid: process.pid,
+    startedAtMs: Date.now(),
+    hostname: hostname()
+  };
+  writeFileSync2(pidPath, JSON.stringify(info));
+}
+function readPidInfo() {
+  if (!existsSync6(pidPath))
+    return null;
+  const raw = readFileSync3(pidPath, "utf-8").trim();
+  const asNumber = Number(raw);
+  if (Number.isFinite(asNumber) && asNumber > 0 && !raw.startsWith("{")) {
+    return { pid: asNumber };
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (Number.isFinite(parsed.pid) && parsed.pid > 0)
+      return parsed;
+  } catch {}
+  return null;
+}
+function readPid() {
+  return readPidInfo()?.pid ?? null;
+}
+function removePid() {
+  try {
+    unlinkSync(pidPath);
+  } catch {}
+}
+function isRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/api.ts
+var cachedDeviceId;
 function getCloudConfig() {
   const config = loadConfig();
   if (!config?.cloudToken)
@@ -2724,6 +2798,12 @@ async function refreshStoredToken(currentToken, convexUrl) {
 async function sendHeartbeat() {
   try {
     const { token, convexUrl } = getCloudConfig();
+    const pidInfo = readPidInfo();
+    const heartbeatBody = JSON.stringify({
+      deviceId: cachedDeviceId ??= loadOrCreateDeviceId(),
+      hostname: pidInfo?.hostname ?? osHostname(),
+      startedAtMs: pidInfo?.startedAtMs
+    });
     let activeToken = token;
     let res = await requestText(`${convexUrl}/api/cli/heartbeat`, {
       method: "POST",
@@ -2731,7 +2811,8 @@ async function sendHeartbeat() {
         Authorization: `Bearer ${activeToken}`,
         Connection: "close",
         "Content-Type": "application/json"
-      }
+      },
+      body: heartbeatBody
     });
     if (res.status === 401) {
       const refreshedToken = await refreshStoredToken(activeToken, convexUrl);
@@ -2744,7 +2825,8 @@ async function sendHeartbeat() {
           Authorization: `Bearer ${activeToken}`,
           Connection: "close",
           "Content-Type": "application/json"
-        }
+        },
+        body: heartbeatBody
       });
     }
     if (res.status === 401) {
@@ -2798,52 +2880,6 @@ function requestText(urlString, options) {
   });
 }
 
-// src/pid.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync3, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { homedir as homedir9, hostname } from "node:os";
-import { dirname, join as join10 } from "node:path";
-var pidPath = join10(homedir9(), ".agendex", "daemon.pid");
-function writePid() {
-  mkdirSync2(dirname(pidPath), { recursive: true });
-  const info = {
-    pid: process.pid,
-    startedAtMs: Date.now(),
-    hostname: hostname()
-  };
-  writeFileSync2(pidPath, JSON.stringify(info));
-}
-function readPidInfo() {
-  if (!existsSync6(pidPath))
-    return null;
-  const raw = readFileSync3(pidPath, "utf-8").trim();
-  const asNumber = Number(raw);
-  if (Number.isFinite(asNumber) && asNumber > 0 && !raw.startsWith("{")) {
-    return { pid: asNumber };
-  }
-  try {
-    const parsed = JSON.parse(raw);
-    if (Number.isFinite(parsed.pid) && parsed.pid > 0)
-      return parsed;
-  } catch {}
-  return null;
-}
-function readPid() {
-  return readPidInfo()?.pid ?? null;
-}
-function removePid() {
-  try {
-    unlinkSync(pidPath);
-  } catch {}
-}
-function isRunning(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 // src/daemon.ts
 var MAX_RESTARTS = 5;
 var RESTART_WINDOW_MS = 60000;
@@ -3029,7 +3065,7 @@ import { join as join11 } from "node:path";
 // package.json
 var package_default = {
   name: "agendex-cli",
-  version: "0.5.0",
+  version: "0.6.0",
   description: "Agendex CLI for login, sync, and daemon workflows",
   homepage: "https://github.com/Tyru5/Agendex#readme",
   repository: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agendex-cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Agendex CLI for login, sync, and daemon workflows",
   "homepage": "https://github.com/Tyru5/Agendex#readme",
   "repository": {