agendex-cli 0.5.0 → 0.7.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);
@@ -2474,14 +2492,241 @@ function startWatching(onChange) {
     watchDir(dir, (f) => adapter.matches(f), onChange);
   }
 }
+// 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)
+    throw new Error("Not logged in. Run `agendex login` first.");
+  if (!config.convexUrl)
+    throw new Error("No Convex URL configured. Run `agendex login` first.");
+  return { token: config.cloudToken, convexUrl: config.convexUrl };
+}
+async function syncPlan(plan) {
+  const { token, convexUrl } = getCloudConfig();
+  const url = `${convexUrl}/api/cli/sync`;
+  let activeToken = token;
+  let res = await requestText(url, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${activeToken}`,
+      Connection: "close",
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(plan)
+  });
+  if (res.status === 401) {
+    const refreshed = await refreshStoredToken(activeToken, convexUrl);
+    if (refreshed) {
+      activeToken = refreshed;
+      res = await requestText(url, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${activeToken}`,
+          Connection: "close",
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(plan)
+      });
+    }
+  }
+  if (res.status < 200 || res.status >= 300) {
+    return { ok: false, error: `${res.status}: ${res.body}` };
+  }
+  return { ok: true };
+}
+async function refreshStoredToken(currentToken, convexUrl) {
+  const refreshed = await refreshToken(currentToken, convexUrl);
+  if (!refreshed)
+    return null;
+  const config = loadConfig();
+  if (config) {
+    saveConfig({ ...config, cloudToken: refreshed.token });
+  }
+  return refreshed.token;
+}
+async function sendHeartbeat() {
+  try {
+    const { token, convexUrl } = getCloudConfig();
+    const pidInfo = readPidInfo();
+    cachedDeviceId ??= loadOrCreateDeviceId();
+    const heartbeatBody = JSON.stringify({
+      deviceId: cachedDeviceId,
+      hostname: pidInfo?.hostname ?? osHostname(),
+      startedAtMs: pidInfo?.startedAtMs,
+      pid: pidInfo?.pid
+    });
+    let activeToken = token;
+    let res = await requestText(`${convexUrl}/api/cli/heartbeat`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${activeToken}`,
+        Connection: "close",
+        "Content-Type": "application/json"
+      },
+      body: heartbeatBody
+    });
+    if (res.status === 401) {
+      const refreshedToken = await refreshStoredToken(activeToken, convexUrl);
+      if (!refreshedToken)
+        return;
+      activeToken = refreshedToken;
+      res = await requestText(`${convexUrl}/api/cli/heartbeat`, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${activeToken}`,
+          Connection: "close",
+          "Content-Type": "application/json"
+        },
+        body: heartbeatBody
+      });
+    }
+    if (res.status === 401) {
+      return;
+    }
+  } catch {}
+}
+async function refreshToken(currentToken, convexUrl) {
+  const res = await requestText(`${convexUrl}/api/cli/refresh`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${currentToken}`,
+      Connection: "close",
+      "Content-Type": "application/json"
+    }
+  });
+  if (res.status < 200 || res.status >= 300)
+    return null;
+  const body = JSON.parse(res.body);
+  if (!body.token)
+    return null;
+  return { token: body.token, expiresAt: body.expiresAt ?? 0 };
+}
+function requestText(urlString, options) {
+  const url = new URL(urlString);
+  const request = url.protocol === "https:" ? httpsRequest : httpRequest;
+  return new Promise((resolve4, reject) => {
+    const req = request(url, {
+      agent: false,
+      headers: options.headers,
+      method: options.method
+    }, (res) => {
+      let body = "";
+      res.setEncoding("utf8");
+      res.on("data", (chunk) => {
+        body += chunk;
+      });
+      res.on("end", () => {
+        resolve4({
+          status: res.statusCode ?? 0,
+          body
+        });
+      });
+      res.on("error", reject);
+    });
+    req.on("error", reject);
+    if (options.body) {
+      req.write(options.body);
+    }
+    req.end();
+  });
+}
+async function fetchDevices() {
+  const { token, convexUrl } = getCloudConfig();
+  const url = `${convexUrl}/api/cli/devices`;
+  let activeToken = token;
+  let res = await requestText(url, {
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${activeToken}`,
+      Connection: "close"
+    }
+  });
+  if (res.status === 401) {
+    const refreshed = await refreshStoredToken(activeToken, convexUrl);
+    if (refreshed) {
+      activeToken = refreshed;
+      res = await requestText(url, {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${activeToken}`,
+          Connection: "close"
+        }
+      });
+    }
+  }
+  if (res.status < 200 || res.status >= 300) {
+    return [];
+  }
+  const body = JSON.parse(res.body);
+  return body.devices ?? [];
+}
+
 // 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}`);
@@ -2666,185 +2911,6 @@ function spawnBrowser(command, args, options = {}) {
 import { spawn as spawn2 } from "node:child_process";
 import { resolve as resolve4 } from "node:path";
 import { fileURLToPath } from "node:url";
-
-// src/api.ts
-import { request as httpRequest } from "node:http";
-import { request as httpsRequest } from "node:https";
-function getCloudConfig() {
-  const config = loadConfig();
-  if (!config?.cloudToken)
-    throw new Error("Not logged in. Run `agendex login` first.");
-  if (!config.convexUrl)
-    throw new Error("No Convex URL configured. Run `agendex login` first.");
-  return { token: config.cloudToken, convexUrl: config.convexUrl };
-}
-async function syncPlan(plan) {
-  const { token, convexUrl } = getCloudConfig();
-  const url = `${convexUrl}/api/cli/sync`;
-  let activeToken = token;
-  let res = await requestText(url, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${activeToken}`,
-      Connection: "close",
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify(plan)
-  });
-  if (res.status === 401) {
-    const refreshed = await refreshStoredToken(activeToken, convexUrl);
-    if (refreshed) {
-      activeToken = refreshed;
-      res = await requestText(url, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${activeToken}`,
-          Connection: "close",
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(plan)
-      });
-    }
-  }
-  if (res.status < 200 || res.status >= 300) {
-    return { ok: false, error: `${res.status}: ${res.body}` };
-  }
-  return { ok: true };
-}
-async function refreshStoredToken(currentToken, convexUrl) {
-  const refreshed = await refreshToken(currentToken, convexUrl);
-  if (!refreshed)
-    return null;
-  const config = loadConfig();
-  if (config) {
-    saveConfig({ ...config, cloudToken: refreshed.token });
-  }
-  return refreshed.token;
-}
-async function sendHeartbeat() {
-  try {
-    const { token, convexUrl } = getCloudConfig();
-    let activeToken = token;
-    let res = await requestText(`${convexUrl}/api/cli/heartbeat`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${activeToken}`,
-        Connection: "close",
-        "Content-Type": "application/json"
-      }
-    });
-    if (res.status === 401) {
-      const refreshedToken = await refreshStoredToken(activeToken, convexUrl);
-      if (!refreshedToken)
-        return;
-      activeToken = refreshedToken;
-      res = await requestText(`${convexUrl}/api/cli/heartbeat`, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${activeToken}`,
-          Connection: "close",
-          "Content-Type": "application/json"
-        }
-      });
-    }
-    if (res.status === 401) {
-      return;
-    }
-  } catch {}
-}
-async function refreshToken(currentToken, convexUrl) {
-  const res = await requestText(`${convexUrl}/api/cli/refresh`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${currentToken}`,
-      Connection: "close",
-      "Content-Type": "application/json"
-    }
-  });
-  if (res.status < 200 || res.status >= 300)
-    return null;
-  const body = JSON.parse(res.body);
-  if (!body.token)
-    return null;
-  return { token: body.token, expiresAt: body.expiresAt ?? 0 };
-}
-function requestText(urlString, options) {
-  const url = new URL(urlString);
-  const request = url.protocol === "https:" ? httpsRequest : httpRequest;
-  return new Promise((resolve4, reject) => {
-    const req = request(url, {
-      agent: false,
-      headers: options.headers,
-      method: options.method
-    }, (res) => {
-      let body = "";
-      res.setEncoding("utf8");
-      res.on("data", (chunk) => {
-        body += chunk;
-      });
-      res.on("end", () => {
-        resolve4({
-          status: res.statusCode ?? 0,
-          body
-        });
-      });
-      res.on("error", reject);
-    });
-    req.on("error", reject);
-    if (options.body) {
-      req.write(options.body);
-    }
-    req.end();
-  });
-}
-
-// 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;
 var RESTART_DELAY_MS = 5000;
@@ -3029,7 +3095,7 @@ import { join as join11 } from "node:path";
 // package.json
 var package_default = {
   name: "agendex-cli",
-  version: "0.5.0",
+  version: "0.7.0",
   description: "Agendex CLI for login, sync, and daemon workflows",
   homepage: "https://github.com/Tyru5/Agendex#readme",
   repository: {
@@ -3240,6 +3306,28 @@ async function main() {
         writeStdout(`[agendex] Hostname: n/a`);
       }
       writeStdout(`[agendex] CLI version: ${CLI_VERSION}`);
+      try {
+        if (config?.cloudToken && config?.convexUrl) {
+          const allDevices = await fetchDevices();
+          if (allDevices.length > 0) {
+            const now = Date.now();
+            writeStdout(`[agendex] All daemons:`);
+            for (const device of allDevices) {
+              const age = device.lastSeenAt ? now - device.lastSeenAt : Number.POSITIVE_INFINITY;
+              const status = age < CLI_DAEMON_STALE_AFTER_MS ? "alive" : "stale";
+              const uptimeStr = device.startedAtMs != null ? formatDuration(now - device.startedAtMs) : "~";
+              const pidStr = device.pid != null ? String(device.pid) : "~";
+              const hostnameStr = device.hostname ?? "~";
+              writeStdout(`- hostname: ${hostnameStr}
+  pid: ${pidStr}
+  uptime: ${uptimeStr}
+  status: ${status}`);
+            }
+          } else {
+            writeStdout(`[agendex] All daemons: none`);
+          }
+        }
+      } catch {}
       return 0;
     }
     case "help":

package/package.json

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