fleetlens 0.2.7 → 0.2.9

package/dist/daemon-worker.js

@@ -8,7 +8,7 @@ import { execFileSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { homedir, platform } from "node:os";
 import { join } from "node:path";
-function readOAuthToken() {
+function readOAuthCredentials() {
   if (platform() === "darwin") {
     return readFromMacKeychain() ?? readFromCredentialsFile();
   }
@@ -21,7 +21,7 @@ function readFromMacKeychain() {
       ["find-generic-password", "-s", "Claude Code-credentials", "-w"],
       { stdio: ["ignore", "pipe", "ignore"], encoding: "utf8" }
     );
-    return extractToken(blob);
+    return extractCredentials(blob);
   } catch {
     return null;
   }
@@ -34,23 +34,32 @@ function readFromCredentialsFile() {
   for (const path of candidates) {
     try {
       const blob = readFileSync(path, "utf8");
-      const token = extractToken(blob);
-      if (token) return token;
+      const creds = extractCredentials(blob);
+      if (creds) return creds;
     } catch {
     }
   }
   return null;
 }
-function extractToken(blob) {
+function isUsable(creds, now, skewMs = 6e4) {
+  return creds.expiresAt - skewMs > now;
+}
+function extractCredentials(blob) {
   try {
     const parsed = JSON.parse(blob);
-    return parsed.claudeAiOauth?.accessToken ?? null;
+    const oauth = parsed.claudeAiOauth;
+    if (!oauth) return null;
+    const accessToken = typeof oauth.accessToken === "string" ? oauth.accessToken : null;
+    const expiresAt = typeof oauth.expiresAt === "number" ? oauth.expiresAt : null;
+    if (!accessToken || expiresAt === null) return null;
+    return { accessToken, expiresAt };
   } catch {
     return null;
   }
 }
 
 // src/usage/api.ts
+var EXPIRY_SKEW_MS = 60 * 1e3;
 var USAGE_ENDPOINT = "https://api.anthropic.com/api/oauth/usage";
 var BETA_HEADER = "oauth-2025-04-20";
 var UsageApiError = class extends Error {
@@ -60,18 +69,24 @@ var UsageApiError = class extends Error {
   }
 };
 async function fetchUsage() {
-  const token = readOAuthToken();
-  if (!token) {
+  const creds = readOAuthCredentials();
+  if (!creds) {
     throw new UsageApiError(
       "No Claude Code OAuth token found. Run `claude` to log in first.",
       "no_token"
     );
   }
+  if (creds.expiresAt - EXPIRY_SKEW_MS <= Date.now()) {
+    throw new UsageApiError(
+      "Claude Code OAuth token expired. Open Claude Code to refresh it.",
+      "expired"
+    );
+  }
   let res;
   try {
     res = await fetch(USAGE_ENDPOINT, {
       headers: {
-        Authorization: `Bearer ${token}`,
+        Authorization: `Bearer ${creds.accessToken}`,
         "anthropic-beta": BETA_HEADER
       }
     });
@@ -132,12 +147,20 @@ function appendSnapshot(filePath, snapshot) {
   appendFileSync(filePath, JSON.stringify(snapshot) + "\n", "utf8");
 }
 
+// src/usage/backoff.ts
+var BASE_INTERVAL_MS = 5 * 60 * 1e3;
+var MAX_INTERVAL_MS = 60 * 60 * 1e3;
+function nextIntervalMs(current, outcome) {
+  if (outcome === "success") return BASE_INTERVAL_MS;
+  if (outcome === "network") return current;
+  return Math.min(Math.max(current, BASE_INTERVAL_MS) * 2, MAX_INTERVAL_MS);
+}
+
 // src/daemon-worker.ts
 var STATE_DIR = join2(homedir2(), ".cclens");
 var USAGE_LOG = join2(STATE_DIR, "usage.jsonl");
 var DAEMON_LOG = join2(STATE_DIR, "daemon.log");
-var POLL_INTERVAL_MS = 5 * 60 * 1e3;
-var WATCHDOG_INTERVAL_MS = 30 * 1e3;
+var WATCHDOG_INTERVAL_MS = 5 * 1e3;
 mkdirSync2(dirname2(USAGE_LOG), { recursive: true });
 function log(level, message) {
   const line = `${(/* @__PURE__ */ new Date()).toISOString()} ${level.toUpperCase()} ${message}
@@ -147,9 +170,10 @@ function log(level, message) {
   } catch {
   }
 }
-var lastPollAtMs = 0;
+var nextPollAtMs = 0;
+var currentIntervalMs = BASE_INTERVAL_MS;
+var waitingForRefresh = false;
 async function tick() {
-  lastPollAtMs = Date.now();
   try {
     const snapshot = await fetchUsage();
     appendSnapshot(USAGE_LOG, snapshot);
@@ -157,36 +181,65 @@ async function tick() {
       "info",
       `snapshot 5h=${snapshot.five_hour.utilization}% 7d=${snapshot.seven_day.utilization}%`
     );
+    return "success";
   } catch (err) {
     if (err instanceof UsageApiError) {
       log("warn", `poll failed (${err.code}): ${err.message}`);
-    } else {
-      log("error", `unexpected error: ${err.stack ?? err}`);
+      return err.code === "network" ? "network" : "auth";
     }
+    log("error", `unexpected error: ${err.stack ?? err}`);
+    return "auth";
   }
 }
+function scheduleAfter(now, outcome) {
+  const prev = currentIntervalMs;
+  currentIntervalMs = nextIntervalMs(currentIntervalMs, outcome);
+  if (currentIntervalMs !== prev) {
+    log(
+      "info",
+      `poll interval ${outcome === "success" ? "reset" : "backoff"} to ${currentIntervalMs / 1e3}s`
+    );
+  }
+  nextPollAtMs = now + currentIntervalMs;
+}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function runLoop() {
   while (true) {
     const now = Date.now();
-    const elapsed = now - lastPollAtMs;
-    if (elapsed >= POLL_INTERVAL_MS) {
-      if (lastPollAtMs > 0 && elapsed > POLL_INTERVAL_MS * 1.5) {
+    if (now >= nextPollAtMs) {
+      if (nextPollAtMs > 0 && now - nextPollAtMs > currentIntervalMs) {
         log(
           "info",
-          `wake-from-sleep catch-up: ${Math.round(elapsed / 1e3)}s since last poll (expected ${POLL_INTERVAL_MS / 1e3}s)`
+          `wake-from-sleep catch-up: ${Math.round((now - nextPollAtMs + currentIntervalMs) / 1e3)}s since last poll`
         );
       }
-      await tick();
+      const creds = readOAuthCredentials();
+      if (!creds) {
+        log("warn", "no Claude Code OAuth token found; waiting");
+        waitingForRefresh = true;
+        nextPollAtMs = now + BASE_INTERVAL_MS;
+      } else if (!isUsable(creds, now)) {
+        if (!waitingForRefresh) {
+          log("info", "token expired; waiting for Claude Code to refresh it");
+          waitingForRefresh = true;
+        }
+      } else {
+        if (waitingForRefresh) {
+          log("info", "token refreshed; resuming polls");
+          waitingForRefresh = false;
+        }
+        const outcome = await tick();
+        scheduleAfter(Date.now(), outcome);
+      }
     }
     await sleep(WATCHDOG_INTERVAL_MS);
   }
 }
 log(
   "info",
-  `daemon started (pid=${process.pid}, interval=${POLL_INTERVAL_MS / 1e3}s, watchdog=${WATCHDOG_INTERVAL_MS / 1e3}s)`
+  `daemon started (pid=${process.pid}, interval=${BASE_INTERVAL_MS / 1e3}s, watchdog=${WATCHDOG_INTERVAL_MS / 1e3}s)`
 );
 void runLoop();
 process.on("SIGTERM", () => {

package/dist/index.js

@@ -454,9 +454,9 @@ Installed: ${PACKAGE_NAME}@${verify.installedVersion}  at ${verify.installedPath
     console.warn(
       `    \u2022 reinstall in the correct Node env: 'npm install -g ${PACKAGE_NAME}@latest'`
     );
-  } else if (verify.installedVersion !== "0.2.7") {
+  } else if (verify.installedVersion !== "0.2.9") {
     console.log(
-      `  \u2192 This process is still running ${"0.2.7"}. Next invocation will use ${verify.installedVersion}.`
+      `  \u2192 This process is still running ${"0.2.9"}. Next invocation will use ${verify.installedVersion}.`
     );
   }
 }
@@ -492,7 +492,7 @@ async function checkForUpdate() {
   if (process.env.__FLEETLENS_UPDATED === "1" || process.env.__CCLENS_UPDATED === "1") return;
   const latest = await fetchLatestVersion();
   if (latest === null) return;
-  const current = "0.2.7";
+  const current = "0.2.9";
   if (!shouldUpdate(current, latest)) return;
   console.log(`Updating ${PACKAGE_NAME} ${current} \u2192 ${latest}...`);
   await stopRunningServices();
@@ -510,10 +510,17 @@ async function checkForUpdate() {
   }
 }
 async function stopRunningServices() {
+  const state = {
+    serverWasRunning: false,
+    serverPort: null,
+    daemonWasRunning: false
+  };
   try {
     const { getServerStatus: getServerStatus2, stopServer: stopServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
     const status2 = getServerStatus2();
     if (status2.running) {
+      state.serverWasRunning = true;
+      state.serverPort = status2.port;
       stopServer2();
       console.log(`  \u2713 Stopped old server (PID ${status2.pid})`);
     }
@@ -523,33 +530,77 @@ async function stopRunningServices() {
     const { stopDaemonSilent: stopDaemonSilent2 } = await Promise.resolve().then(() => (init_daemon(), daemon_exports));
     const result = stopDaemonSilent2();
     if (result.stopped) {
+      state.daemonWasRunning = true;
       console.log(`  \u2713 Stopped old daemon (PID ${result.pid})`);
     }
   } catch {
   }
+  return state;
+}
+async function restartServices(state) {
+  if (!state.serverWasRunning && !state.daemonWasRunning) return;
+  if (state.serverWasRunning) {
+    try {
+      const { startServer: startServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
+      const result = await startServer2({ port: state.serverPort ?? void 0 });
+      console.log(
+        `  \u2713 Restarted server on http://localhost:${result.port} (PID ${result.pid})`
+      );
+    } catch (err) {
+      console.warn(
+        `  ! Could not restart server: ${err.message}
+    Run 'fleetlens start' manually.`
+      );
+    }
+  }
+  if (state.daemonWasRunning) {
+    try {
+      const { startDaemonSilent: startDaemonSilent2 } = await Promise.resolve().then(() => (init_daemon(), daemon_exports));
+      const result = startDaemonSilent2();
+      if (result.started) {
+        console.log(`  \u2713 Restarted daemon (PID ${result.pid})`);
+      } else if (result.alreadyRunning) {
+        console.log(`  \u2713 Daemon already running (PID ${result.pid})`);
+      } else {
+        console.warn(`  ! Could not restart daemon: ${result.error}`);
+      }
+    } catch (err) {
+      console.warn(
+        `  ! Could not restart daemon: ${err.message}
+    Run 'fleetlens daemon start' manually.`
+      );
+    }
+  }
 }
 async function forceUpdate() {
   const latest = await fetchLatestVersion();
-  const current = "0.2.7";
+  const current = "0.2.9";
   if (latest === null) {
     console.error("Could not reach npm registry. Check your network.");
     process.exit(1);
   }
-  if (shouldUpdate(current, latest)) {
+  const isRealUpgrade = shouldUpdate(current, latest);
+  let priorState = null;
+  if (isRealUpgrade) {
     console.log(`Updating ${PACKAGE_NAME} ${current} \u2192 ${latest}...`);
-    await stopRunningServices();
+    priorState = await stopRunningServices();
   } else {
     console.log(`Already on latest (${current}). Reinstalling...`);
   }
   const ok = runNpmInstall();
-  if (ok) {
-    reportInstallOutcome(latest);
-  } else {
+  if (!ok) {
     console.error("Update failed.");
     console.error(`  \u2192 Try manually: npm install -g ${PACKAGE_NAME}@latest`);
     console.error(`  \u2192 Or with sudo if your global npm prefix needs it.`);
     process.exit(1);
   }
+  reportInstallOutcome(latest);
+  if (isRealUpgrade && priorState) {
+    if (priorState.serverWasRunning || priorState.daemonWasRunning) {
+      console.log("");
+      await restartServices(priorState);
+    }
+  }
 }
 var PACKAGE_NAME, CHECK_TIMEOUT_MS;
 var init_updater = __esm({
@@ -1462,7 +1513,7 @@ import { execFileSync } from "node:child_process";
 import { readFileSync as readFileSync5 } from "node:fs";
 import { homedir as homedir3, platform } from "node:os";
 import { join as join4 } from "node:path";
-function readOAuthToken() {
+function readOAuthCredentials() {
   if (platform() === "darwin") {
     return readFromMacKeychain() ?? readFromCredentialsFile();
   }
@@ -1475,7 +1526,7 @@ function readFromMacKeychain() {
       ["find-generic-password", "-s", "Claude Code-credentials", "-w"],
       { stdio: ["ignore", "pipe", "ignore"], encoding: "utf8" }
     );
-    return extractToken(blob);
+    return extractCredentials(blob);
   } catch {
     return null;
   }
@@ -1488,17 +1539,22 @@ function readFromCredentialsFile() {
   for (const path2 of candidates) {
     try {
       const blob = readFileSync5(path2, "utf8");
-      const token = extractToken(blob);
-      if (token) return token;
+      const creds = extractCredentials(blob);
+      if (creds) return creds;
     } catch {
     }
   }
   return null;
 }
-function extractToken(blob) {
+function extractCredentials(blob) {
   try {
     const parsed = JSON.parse(blob);
-    return parsed.claudeAiOauth?.accessToken ?? null;
+    const oauth = parsed.claudeAiOauth;
+    if (!oauth) return null;
+    const accessToken = typeof oauth.accessToken === "string" ? oauth.accessToken : null;
+    const expiresAt = typeof oauth.expiresAt === "number" ? oauth.expiresAt : null;
+    if (!accessToken || expiresAt === null) return null;
+    return { accessToken, expiresAt };
   } catch {
     return null;
   }
@@ -1511,18 +1567,24 @@ var init_token = __esm({
 
 // src/usage/api.ts
 async function fetchUsage() {
-  const token = readOAuthToken();
-  if (!token) {
+  const creds = readOAuthCredentials();
+  if (!creds) {
     throw new UsageApiError(
       "No Claude Code OAuth token found. Run `claude` to log in first.",
       "no_token"
     );
   }
+  if (creds.expiresAt - EXPIRY_SKEW_MS <= Date.now()) {
+    throw new UsageApiError(
+      "Claude Code OAuth token expired. Open Claude Code to refresh it.",
+      "expired"
+    );
+  }
   let res;
   try {
     res = await fetch(USAGE_ENDPOINT, {
       headers: {
-        Authorization: `Bearer ${token}`,
+        Authorization: `Bearer ${creds.accessToken}`,
         "anthropic-beta": BETA_HEADER
       }
     });
@@ -1574,11 +1636,12 @@ function normalizeExtra(raw) {
     utilization: typeof r.utilization === "number" ? r.utilization : null
   };
 }
-var USAGE_ENDPOINT, BETA_HEADER, UsageApiError;
+var EXPIRY_SKEW_MS, USAGE_ENDPOINT, BETA_HEADER, UsageApiError;
 var init_api = __esm({
   "src/usage/api.ts"() {
     "use strict";
     init_token();
+    EXPIRY_SKEW_MS = 60 * 1e3;
     USAGE_ENDPOINT = "https://api.anthropic.com/api/oauth/usage";
     BETA_HEADER = "oauth-2025-04-20";
     UsageApiError = class extends Error {
@@ -1761,7 +1824,7 @@ async function main() {
     case "version":
     case "--version":
     case "-v":
-      console.log(`fleetlens ${"0.2.7"}`);
+      console.log(`fleetlens ${"0.2.9"}`);
       break;
     case "help":
     case "--help":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetlens",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "fleetlens — local-only dashboard and usage tracker for Claude Code sessions and agent fleets",
   "license": "MIT",
   "type": "module",