tokelytics 0.3.3 → 0.3.5

package/README.md

@@ -9,7 +9,7 @@ prompts or responses.
 
 ```
 npx tokelytics@latest login    # opens your browser to approve — no setup, no keys
-npx tokelytics@latest watch     # local live updates; cloud backup every 20m
+npx tokelytics@latest watch     # one machine-wide watcher; cloud backup every 30m
 ```
 
 Keep `@latest` in install and onboarding commands. Agents older than 0.3.1

package/bin/tokelytics.mjs

@@ -1014,13 +1014,34 @@ async function loadUpdateState() {
 async function saveUpdateState(state) {
   await writeJson(updatePath(), state);
 }
-async function acquireWatchLock() {
+var AgentAlreadyRunningError = class extends Error {
+  lock;
+  constructor(lock, cause) {
+    super(`Tokelytics is already running (PID ${lock.pid}).`, { cause });
+    this.name = "AgentAlreadyRunningError";
+    this.lock = lock;
+  }
+};
+async function activeAgentLock() {
+  const lock = await readJson(watchLockPath());
+  if (!lock?.pid || !processIsAlive(lock.pid)) return null;
+  return lock;
+}
+async function acquireWatchLock(owner = "watch") {
   await ensureDir();
   const file = watchLockPath();
   for (let attempt = 0; attempt < 2; attempt++) {
     try {
       const handle = await fs3.open(file, "wx");
-      await handle.writeFile(JSON.stringify({ pid: process.pid, startedAt: (/* @__PURE__ */ new Date()).toISOString() }), "utf-8");
+      await handle.writeFile(
+        JSON.stringify({
+          pid: process.pid,
+          startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+          owner,
+          scope: "machine"
+        }),
+        "utf-8"
+      );
       await handle.close();
       let released = false;
       return {
@@ -1036,7 +1057,7 @@ async function acquireWatchLock() {
       if (code !== "EEXIST") throw error;
       const lock = await readJson(file);
       if (lock?.pid && processIsAlive(lock.pid)) {
-        throw new Error(`Tokelytics is already running (PID ${lock.pid}).`, { cause: error });
+        throw new AgentAlreadyRunningError(lock, error);
       }
       await fs3.rm(file, { force: true });
     }
@@ -1781,7 +1802,7 @@ var FirestoreSink = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.3.3";
+var AGENT_VERSION = "0.3.5";
 
 // src/sync.ts
 async function runSync(connectors, sink, state, device, limitCollectors = [], options = {}) {
@@ -3781,8 +3802,8 @@ var DEBOUNCE_MS = 1200;
 var LIMIT_REFRESH_MS = 6e4;
 var FALLBACK_SCAN_MS = 5e3;
 var DEVICE_HEARTBEAT_MS = 60 * 6e4;
-var CLOUD_SYNC_INTERVAL_MS = 20 * 6e4;
-var MAX_CLOUD_WRITES_PER_DAY = 24;
+var CLOUD_SYNC_INTERVAL_MS = 30 * 6e4;
+var MAX_CLOUD_WRITES_PER_DAY = 16;
 var QUOTA_RETRY_MS = 15 * 6e4;
 var QUOTA_RETRY_JITTER_MS = 5 * 6e4;
 async function watch2(runner) {
@@ -3979,7 +4000,7 @@ var USAGE = `Tokelytics agent
 Usage:
   tokelytics login              Sign in by approving in your browser
   tokelytics sync               Run one incremental sync to your dashboard
-  tokelytics watch              Watch usage and refresh the cloud snapshot
+  tokelytics watch              Watch Claude Code and Codex usage across this machine
   tokelytics status             Show current sign-in and device
   tokelytics logout             Forget stored credentials
 `;
@@ -4001,7 +4022,7 @@ async function main(argv) {
     case "sync": {
       const update = await agentUpdateMessage();
       if (update) console.warn(update);
-      const lock = await acquireWatchLock();
+      const lock = await acquireWatchLock("sync");
       try {
         const runner = await createRunner();
         const { processedTurns, processedLimits, byProvider, publicationError } = await runner.syncOnce();
@@ -4014,7 +4035,17 @@ async function main(argv) {
       return 0;
     }
     case "watch": {
-      const lock = await acquireWatchLock();
+      let lock;
+      try {
+        lock = await acquireWatchLock("watch");
+      } catch (err) {
+        if (err instanceof AgentAlreadyRunningError && err.lock.owner !== "sync") {
+          console.log(`Tokelytics is already watching this machine (PID ${err.lock.pid}).`);
+          console.log("Claude Code and Codex usage from every folder and repository is already covered.");
+          return 0;
+        }
+        throw err;
+      }
       try {
         const update = await agentUpdateMessage();
         if (update) console.warn(update);
@@ -4028,7 +4059,15 @@ async function main(argv) {
     case "status": {
       const creds = await loadCredentials();
       const state = await loadState();
+      const lock = await activeAgentLock();
       console.log(`Agent version: ${AGENT_VERSION}`);
+      if (lock && lock.owner !== "sync") {
+        console.log(`Watcher: active machine-wide (PID ${lock.pid}); all folders and repositories are covered.`);
+      } else if (lock?.owner === "sync") {
+        console.log(`Watcher: sync currently in progress (PID ${lock.pid}).`);
+      } else {
+        console.log('Watcher: not running. Run "tokelytics watch" once on this machine.');
+      }
       if (!creds) {
         console.log('Not signed in. Run "tokelytics login".');
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokelytics",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Tokelytics sync agent — streams local AI CLI usage logs (Claude Code, Codex) to your Tokelytics dashboard.",
   "license": "MIT",
   "type": "module",