agendex-cli 0.8.5 → 0.9.1

package/README.md

@@ -28,6 +28,33 @@ agendex help                   # Show help message
 agendex --version / -v         # Print CLI version
 ```
 
+## Dev vs prod (config directory)
+
+By default the CLI uses **`~/.agendex/`** for all on-disk state:
+
+- `config.json` — local token, cloud token, Convex URL, device id, enabled adapters
+- `daemon.pid` — supervisor PID and metadata
+- `sync-cache.json` — hashes used to skip unchanged plans on sync
+
+To use a **separate dev environment** (so local cloud / dev login does not overwrite prod credentials), use either:
+
+- **`--dev`** on any command (recommended), or
+- **`AGENDEX_DEV=1`** in the environment
+
+That switches the directory to **`~/.agendex-dev/`** with the same filenames inside it.
+
+`--dev` takes precedence when set programmatically; otherwise `AGENDEX_DEV=1` is read. When you start the daemon with `agendex start --dev`, the background supervisor and worker inherit `AGENDEX_DEV=1` so they stay on the dev config.
+
+Examples:
+
+```bash
+agendex --dev login
+agendex --dev status
+AGENDEX_DEV=1 agendex sync
+```
+
+In dev mode the default OAuth site (when you do not pass `--url` and do not set `AGENDEX_SITE_URL`) points at the local EE app URL used for development.
+
 ## Daemon Cleanup
 
 `agendex cleanup` manages registered daemon devices in the cloud.
@@ -76,6 +103,6 @@ For self-hosted deployments, pass your site URL explicitly:
 agendex login --url https://agendex.yourdomain.com
 ```
 
-This opens your deployment's OAuth flow and stores the returned `cloudToken` and `convexUrl` in `~/.agendex/config.json`.
+This opens your deployment's OAuth flow and stores the returned `cloudToken` and `convexUrl` in your active config directory (`~/.agendex/config.json` for prod, `~/.agendex-dev/config.json` when using `--dev` or `AGENDEX_DEV=1`).
 
-The target can also be set via `AGENDEX_SITE_URL` env var. For local development, set `AGENDEX_DEV=1` to use the local dev server.
+The target can also be set via `AGENDEX_SITE_URL` env var. For local development against the default dev app URL, use `agendex login --dev` or set `AGENDEX_DEV=1` (see [Dev vs prod](#dev-vs-prod-config-directory) above).

package/dist/cli.js

@@ -2253,17 +2253,29 @@ async function promptForAdapterSelection(options = {}) {
 }
 
 // ../shared/src/config.ts
-var configDir = join7(homedir7(), ".agendex");
-var configPath = join7(configDir, "config.json");
+var devModeOverride;
+function setDevMode(dev) {
+  devModeOverride = dev;
+}
+function isDevMode() {
+  if (devModeOverride !== undefined)
+    return devModeOverride;
+  return process.env.AGENDEX_DEV === "1";
+}
+function getConfigDir() {
+  return join7(homedir7(), isDevMode() ? ".agendex-dev" : ".agendex");
+}
 function ensureConfigDir() {
-  if (!existsSync3(configDir))
-    mkdirSync(configDir, { recursive: true });
+  const dir = getConfigDir();
+  if (!existsSync3(dir))
+    mkdirSync(dir, { recursive: true });
 }
 function readStoredConfig() {
-  if (!existsSync3(configPath))
+  const cfgPath = getConfigPath();
+  if (!existsSync3(cfgPath))
     return null;
   try {
-    const raw = JSON.parse(readFileSync3(configPath, "utf-8"));
+    const raw = JSON.parse(readFileSync3(cfgPath, "utf-8"));
     if (!raw || typeof raw !== "object")
       return null;
     return raw;
@@ -2305,7 +2317,7 @@ function saveConfig(config) {
     deviceId: config.deviceId,
     enabledAdapters: sanitizeEnabledAdapterIds(config.enabledAdapters)
   };
-  writeFileSync(configPath, JSON.stringify(payload, null, 2));
+  writeFileSync(getConfigPath(), JSON.stringify(payload, null, 2));
 }
 function generateToken() {
   return randomBytes(32).toString("hex");
@@ -2324,7 +2336,7 @@ function loadOrCreateToken() {
   });
   console.log(`
 [agendex] generated auth token: ${token}`);
-  console.log(`[agendex] saved to ${configPath}
+  console.log(`[agendex] saved to ${getConfigPath()}
 `);
   return token;
 }
@@ -2341,6 +2353,9 @@ function loadOrCreateDeviceId() {
   });
   return deviceId;
 }
+function getConfigPath() {
+  return join7(getConfigDir(), "config.json");
+}
 async function loadOrInitConfig(options = {}) {
   const configureAdapters = Boolean(options.configureAdapters);
   const existing = loadConfig();
@@ -2383,13 +2398,15 @@ async function loadOrInitConfig(options = {}) {
 }
 // ../shared/src/daemon-status.ts
 var CLI_DAEMON_HEARTBEAT_INTERVAL_MS = 30000;
-var CLI_DAEMON_STALE_AFTER_MS = CLI_DAEMON_HEARTBEAT_INTERVAL_MS * 3;
+var CLI_DAEMON_STALE_AFTER_MS = CLI_DAEMON_HEARTBEAT_INTERVAL_MS * 5;
 // ../shared/src/services/plan-service.ts
 import { existsSync as existsSync4, readdirSync as readdirSync3, statSync } from "node:fs";
 import { lstat, mkdir, readdir as readdir2, readFile as readFile6, stat as stat6, writeFile as writeFile3 } from "node:fs/promises";
 import { homedir as homedir8 } from "node:os";
 import { join as join8, resolve as resolve2, sep as sep2 } from "node:path";
-var USER_PLANS_DIR = join8(homedir8(), ".agendex", "plans");
+function getUserPlansDir() {
+  return join8(getConfigDir(), "plans");
+}
 var store = new Map;
 var MAX_DEPTH = 6;
 var DISCOVERY_MAX_DEPTH = 4;
@@ -2496,9 +2513,10 @@ async function walkDir(dir, depth = 0, seen = new Set) {
   return files;
 }
 async function scanUserPlans() {
-  if (!existsSync4(USER_PLANS_DIR))
+  const userPlansDir = getUserPlansDir();
+  if (!existsSync4(userPlansDir))
     return;
-  const files = await walkDir(USER_PLANS_DIR);
+  const files = await walkDir(userPlansDir);
   for (const file of files) {
     if (!file.endsWith(".md"))
       continue;
@@ -2654,22 +2672,26 @@ import { hostname as osHostname } from "node:os";
 
 // src/pid.ts
 import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync4, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { homedir as homedir9, hostname } from "node:os";
+import { hostname } from "node:os";
 import { dirname, join as join10 } from "node:path";
-var pidPath = join10(homedir9(), ".agendex", "daemon.pid");
+function getPidPath() {
+  return join10(getConfigDir(), "daemon.pid");
+}
 function writePid() {
-  mkdirSync2(dirname(pidPath), { recursive: true });
+  const path = getPidPath();
+  mkdirSync2(dirname(path), { recursive: true });
   const info = {
     pid: process.pid,
     startedAtMs: Date.now(),
     hostname: hostname()
   };
-  writeFileSync2(pidPath, JSON.stringify(info));
+  writeFileSync2(path, JSON.stringify(info));
 }
 function readPidInfo() {
-  if (!existsSync6(pidPath))
+  const path = getPidPath();
+  if (!existsSync6(path))
     return null;
-  const raw = readFileSync4(pidPath, "utf-8").trim();
+  const raw = readFileSync4(path, "utf-8").trim();
   const asNumber = Number(raw);
   if (Number.isFinite(asNumber) && asNumber > 0 && !raw.startsWith("{")) {
     return { pid: asNumber };
@@ -2686,7 +2708,7 @@ function readPid() {
 }
 function removePid() {
   try {
-    unlinkSync(pidPath);
+    unlinkSync(getPidPath());
   } catch {}
 }
 function isRunning(pid) {
@@ -2706,7 +2728,10 @@ function getCloudConfig() {
     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 };
+  return {
+    token: config.cloudToken,
+    convexUrl: config.convexUrl
+  };
 }
 async function syncPlan(plan) {
   const { token, convexUrl } = getCloudConfig();
@@ -2792,6 +2817,13 @@ async function sendHeartbeat() {
     }
   } catch {}
 }
+async function sendShutdown() {
+  try {
+    const { token, convexUrl } = getCloudConfig();
+    cachedDeviceId ??= loadOrCreateDeviceId();
+    await deleteDaemons([cachedDeviceId]);
+  } catch {}
+}
 async function refreshToken(currentToken, convexUrl) {
   const res = await requestText(`${convexUrl}/api/cli/refresh`, {
     method: "POST",
@@ -2914,7 +2946,7 @@ 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;
+  return isDevMode() ? DEV_SITE_URL : PROD_SITE_URL;
 }
 async function login(siteUrlOverride) {
   const { port, result } = await startCallbackServer();
@@ -3108,14 +3140,16 @@ import { fileURLToPath } from "node:url";
 // src/sync-cache.ts
 import { createHash as createHash2 } from "node:crypto";
 import { existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "node:fs";
-import { homedir as homedir10 } from "node:os";
 import { join as join11 } from "node:path";
-var CACHE_PATH = join11(homedir10(), ".agendex", "sync-cache.json");
+function getCachePath() {
+  return join11(getConfigDir(), "sync-cache.json");
+}
 function loadSyncCache() {
-  if (!existsSync7(CACHE_PATH))
+  const cachePath = getCachePath();
+  if (!existsSync7(cachePath))
     return {};
   try {
-    const raw = JSON.parse(readFileSync5(CACHE_PATH, "utf-8"));
+    const raw = JSON.parse(readFileSync5(cachePath, "utf-8"));
     if (!raw || typeof raw !== "object" || Array.isArray(raw))
       return {};
     return raw;
@@ -3124,15 +3158,16 @@ function loadSyncCache() {
   }
 }
 function saveSyncCache(cache, options) {
-  const dir = join11(homedir10(), ".agendex");
+  const dir = getConfigDir();
   if (!existsSync7(dir))
     mkdirSync3(dir, { recursive: true });
+  const cachePath = getCachePath();
   if (options?.replace) {
-    writeFileSync3(CACHE_PATH, JSON.stringify(cache));
+    writeFileSync3(cachePath, JSON.stringify(cache));
     return;
   }
   const existing = loadSyncCache();
-  writeFileSync3(CACHE_PATH, JSON.stringify({ ...existing, ...cache }));
+  writeFileSync3(cachePath, JSON.stringify({ ...existing, ...cache }));
 }
 function computePayloadHash(payload) {
   const canonical = JSON.stringify([
@@ -3173,7 +3208,7 @@ async function runWorker() {
   const adapters = resolveAdapters(config.enabledAdapters);
   setActiveAdapters(adapters);
   console.log(`[agendex] daemon starting with ${config.enabledAdapters.length} adapters`);
-  sendHeartbeat();
+  await sendHeartbeat();
   const syncCache = loadSyncCache();
   const syncQueue = [];
   let syncing = false;
@@ -3261,6 +3296,12 @@ async function runWorker() {
     processSyncQueue();
   });
   console.log(`[agendex] daemon running. Watching for file changes...`);
+  async function gracefulShutdown() {
+    await sendShutdown();
+    process.exit(0);
+  }
+  process.on("SIGTERM", () => void gracefulShutdown());
+  process.on("SIGINT", () => void gracefulShutdown());
   await new Promise(() => {});
 }
 async function startSupervisor() {
@@ -3368,7 +3409,7 @@ import { join as join12 } from "node:path";
 // package.json
 var package_default = {
   name: "agendex-cli",
-  version: "0.8.5",
+  version: "0.9.1",
   description: "Agendex CLI for login, sync, and daemon workflows",
   homepage: "https://github.com/Tyru5/Agendex#readme",
   repository: {
@@ -3480,7 +3521,18 @@ function isNewer(latest, current) {
 
 // src/cli.ts
 var args = process.argv.slice(2);
-var command = args[0] ?? "start";
+var devFlag = args.includes("--dev");
+if (devFlag)
+  setDevMode(true);
+function firstCommandToken(argv) {
+  for (const a of argv) {
+    if (a === "--dev")
+      continue;
+    return a;
+  }
+  return;
+}
+var command = firstCommandToken(args) ?? "start";
 var cliEntry = resolve5(process.argv[1] ?? fileURLToPath2(import.meta.url));
 async function main() {
   const isInternal = args.includes("--daemon") || args.includes("--worker");
@@ -3523,9 +3575,13 @@ async function main() {
       }
       if (existingPid)
         removePid();
-      const child = spawn3(process.execPath, [cliEntry, "start", "--daemon"], {
+      const daemonArgs = [cliEntry, "start", "--daemon"];
+      if (devFlag)
+        daemonArgs.push("--dev");
+      const child = spawn3(process.execPath, daemonArgs, {
         detached: true,
-        stdio: "ignore"
+        stdio: "ignore",
+        env: { ...process.env, ...devFlag ? { AGENDEX_DEV: "1" } : {} }
       });
       child.unref();
       await new Promise((r) => setTimeout(r, 500));
@@ -3549,6 +3605,7 @@ async function main() {
         writeStderr("[agendex] daemon did not stop in time");
       } else {
         removePid();
+        await sendShutdown();
         writeStdout(`[agendex] daemon stopped (PID ${pid})`);
       }
       return isRunning(pid) ? 1 : 0;
@@ -3670,6 +3727,7 @@ async function main() {
           const allDevices = await fetchDevices();
           if (allDevices.length > 0) {
             const now = Date.now();
+            const localDeviceId = config.deviceId;
             writeStdout(`[agendex] All daemons:`);
             for (const device of allDevices) {
               const age = device.lastSeenAt ? now - device.lastSeenAt : Number.POSITIVE_INFINITY;
@@ -3677,7 +3735,8 @@ async function main() {
               const uptimeStr = device.startedAtMs != null ? formatDuration(now - device.startedAtMs) : "~";
               const pidStr = device.pid != null ? String(device.pid) : "~";
               const hostnameStr = device.hostname ?? "~";
-              writeStdout(`- hostname: ${hostnameStr}
+              const isLocal = localDeviceId && device.deviceId === localDeviceId;
+              writeStdout(`- hostname: ${hostnameStr}${isLocal ? " (this machine)" : ""}
   pid: ${pidStr}
   uptime: ${uptimeStr}
   status: ${status}`);
@@ -3711,6 +3770,9 @@ Usage:
   agendex help         Show this help message
   agendex --version    Print CLI version
   agendex -v           Print CLI version
+
+Flags:
+  --dev                Use dev environment (~/.agendex-dev/ config dir)
 `.trim());
       return 0;
     }

package/package.json

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