awarts 0.2.8 → 0.2.9

package/dist/index.js

@@ -5857,119 +5857,6 @@ async function spawnDaemon(intervalMs) {
   return pid;
 }
 
-// src/commands/login.ts
-var POLL_INTERVAL_MS = 2000;
-var MAX_POLLS = 300;
-async function loginCommand() {
-  banner();
-  const existing = await loadAuth();
-  if (existing) {
-    info("You are already logged in.");
-    kv("User ID", existing.user_id);
-    kv("Saved at", existing.saved_at);
-    console.log();
-    dim("Run  awarts login --force  to re-authenticate.");
-    dim("Run  awarts logout  to clear your credentials.");
-    console.log();
-    return;
-  }
-  await startDeviceAuth();
-}
-async function loginForceCommand() {
-  banner();
-  await clearAuth();
-  await startDeviceAuth();
-}
-async function startDeviceAuth() {
-  const spin = spinner("Starting device authentication...");
-  spin.start();
-  let initData;
-  try {
-    const res = await postUnauthenticated("/api/auth/cli/init");
-    if (!res.ok) {
-      spin.fail("Failed to start authentication.");
-      error(`Server responded with status ${res.status}`);
-      return;
-    }
-    initData = res.data;
-    spin.stop();
-  } catch (err) {
-    spin.fail("Could not reach the AWARTS server.");
-    error(err instanceof Error ? err.message : String(err));
-    dim("Is the backend running? Check AWARTS_API_URL or ~/.awarts/config.json");
-    return;
-  }
-  const FRONTEND_URL = process.env.AWARTS_FRONTEND_URL ?? "https://awarts.vercel.app";
-  const verifyUrl = `${FRONTEND_URL}/cli/verify?code=${initData.code}`;
-  console.log();
-  console.log(`  ${source_default.bold("Your verification code:")}  ${source_default.bgWhite.black.bold(` ${initData.code} `)}`);
-  console.log();
-  info(`Open this URL to verify:  ${source_default.cyan.underline(verifyUrl)}`);
-  console.log();
-  try {
-    await open_default(verifyUrl);
-    dim("Browser opened automatically. Waiting for verification...");
-  } catch {
-    dim("Could not open browser. Please visit the URL above manually.");
-  }
-  console.log();
-  const pollSpin = spinner("Waiting for verification...");
-  pollSpin.start();
-  for (let attempt = 0;attempt < MAX_POLLS; attempt++) {
-    await sleep(POLL_INTERVAL_MS);
-    try {
-      const res = await postUnauthenticated("/api/auth/cli/poll", {
-        device_token: initData.device_token
-      });
-      if (!res.ok) {
-        pollSpin.fail("Poll request failed.");
-        error(`Status ${res.status}`);
-        return;
-      }
-      const { status, token, user_id } = res.data;
-      if (status === "verified" && token && user_id) {
-        await saveAuth({
-          token,
-          user_id,
-          saved_at: new Date().toISOString()
-        });
-        pollSpin.succeed(source_default.green("Authenticated successfully!"));
-        console.log();
-        kv("User ID", user_id);
-        success("Token saved to ~/.awarts/auth.json");
-        console.log();
-        try {
-          const existingPid = await readPid();
-          const isRunning = existingPid ? isProcessRunning(existingPid) : false;
-          if (!isRunning) {
-            const pid = await spawnDaemon(DEFAULT_INTERVAL_MS);
-            success(`Auto-sync daemon started (PID ${pid}, every 5 min)`);
-            dim("Your usage data will sync automatically in the background.");
-            dim("Manage with:  awarts daemon status | stop | logs");
-          } else {
-            dim("Auto-sync daemon is already running.");
-          }
-        } catch {
-          dim("Run  awarts daemon start  to enable auto-sync.");
-        }
-        console.log();
-        return;
-      }
-      if (status === "expired") {
-        pollSpin.fail("Verification code expired.");
-        error("Please run  awarts login  again to get a new code.");
-        return;
-      }
-      pollSpin.text = `Waiting for verification... (${Math.floor((attempt + 1) * POLL_INTERVAL_MS / 1000)}s)`;
-    } catch {}
-  }
-  pollSpin.fail("Timed out waiting for verification.");
-  error("Please try  awarts login  again.");
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // src/adapters/claude.ts
 import fs9 from "node:fs/promises";
 import path5 from "node:path";
@@ -6781,6 +6668,260 @@ function hashEntries(entries) {
   return createHash("sha256").update(canonical).digest("hex");
 }
 
+// src/commands/sync.ts
+async function syncCommand() {
+  banner();
+  const auth = await loadAuth();
+  if (!auth) {
+    error("Not logged in. Run  awarts login  first.");
+    return;
+  }
+  const detectSpin = spinner("Detecting installed providers...");
+  detectSpin.start();
+  const results = await detectAll();
+  const detected = results.filter((r) => r.detected);
+  if (detected.length === 0) {
+    detectSpin.warn("No AI coding tools detected.");
+    console.log();
+    dim("Looked for: Claude, Codex, Gemini, Antigravity");
+    dim("Make sure you have used one of these tools on this machine.");
+    console.log();
+    return;
+  }
+  const names = detected.map((r) => providerLabel(r.adapter.name)).join(", ");
+  detectSpin.succeed(`Detected: ${names}`);
+  console.log();
+  const allEntries = [];
+  for (const { adapter } of detected) {
+    const spin = spinner(`Reading ${adapter.displayName} data...`);
+    spin.start();
+    try {
+      const entries = await adapter.read();
+      if (entries.length === 0) {
+        spin.info(source_default.dim(`${adapter.displayName} -- no usage data found`));
+        if (adapter.name === "codex") {
+          dim(`    Set your OpenAI API key:  ${source_default.cyan("awarts keys set openai <your-key>")}`);
+          dim(`    Or create usage files manually — see ${source_default.cyan("awarts.com/docs")}`);
+        } else if (adapter.name === "gemini") {
+          dim(`    Set your Google API key:  ${source_default.cyan("awarts keys set google <your-key>")}`);
+          dim(`    Or create usage files manually — see ${source_default.cyan("awarts.com/docs")}`);
+        } else if (adapter.name === "antigravity") {
+          dim(`    Set your API key:  ${source_default.cyan("awarts keys set antigravity <your-key>")}`);
+          dim(`    Or create usage files manually — see ${source_default.cyan("awarts.com/docs")}`);
+        }
+      } else {
+        allEntries.push(...entries);
+        const totalCost2 = entries.reduce((s, e) => s + e.cost_usd, 0);
+        spin.succeed(`${providerLabel(adapter.name)}  ` + `${source_default.bold(String(entries.length))} entries  ` + `${source_default.yellow(usd(totalCost2))}`);
+      }
+    } catch (err) {
+      spin.fail(`${adapter.displayName} -- error reading data`);
+      error(err instanceof Error ? err.message : String(err));
+    }
+  }
+  console.log();
+  if (allEntries.length === 0) {
+    warn("No usage data found across any provider.");
+    console.log();
+    info(`Set API keys to fetch real billing data:`);
+    dim(`  ${source_default.cyan("awarts keys set openai <key>")}      — for Codex / OpenAI`);
+    dim(`  ${source_default.cyan("awarts keys set google <key>")}      — for Gemini`);
+    dim(`  ${source_default.cyan("awarts keys set antigravity <key>")} — for Antigravity`);
+    dim(`Or visit ${source_default.cyan("awarts.com/docs")} for manual import instructions.`);
+    console.log();
+    return;
+  }
+  const totalCost = allEntries.reduce((s, e) => s + e.cost_usd, 0);
+  const totalTokens = allEntries.reduce((s, e) => s + e.input_tokens + e.output_tokens, 0);
+  const uniqueDates = new Set(allEntries.map((e) => e.date));
+  divider();
+  kv("Total entries", allEntries.length);
+  kv("Unique days", uniqueDates.size);
+  kv("Total cost", usd(totalCost));
+  kv("Total tokens", tokens(totalTokens));
+  divider();
+  console.log();
+  const hash = hashEntries(allEntries);
+  const submitSpin = spinner("Syncing with AWARTS...");
+  submitSpin.start();
+  const cleanEntries = allEntries.map(({ cost_source, ...rest }) => rest);
+  try {
+    const res = await post("/api/usage/submit", {
+      entries: cleanEntries,
+      source: "cli",
+      hash
+    });
+    if (!res.ok) {
+      submitSpin.fail("Sync failed.");
+      if (res.status === 401) {
+        error("Authentication expired. Run  awarts login  to re-authenticate.");
+      } else {
+        error(`Server returned status ${res.status}`);
+        const errorData = res.data;
+        if (errorData?.error)
+          error(String(errorData.error));
+      }
+      return;
+    }
+    const { processed, posts_created, errors } = res.data;
+    if (errors && errors.length > 0) {
+      submitSpin.warn(source_default.yellow(`Synced with ${errors.length} error(s).`));
+      for (const e of errors) {
+        error(`  ${e.date} / ${e.provider}: ${e.error}`);
+      }
+    } else {
+      submitSpin.succeed(source_default.green("Sync complete!"));
+    }
+    console.log();
+    kv("Entries processed", processed);
+    kv("Posts created", posts_created);
+    console.log();
+    success("Your usage data is now live on AWARTS.");
+    console.log();
+    try {
+      const existingPid = await readPid();
+      const isRunning = existingPid ? isProcessRunning(existingPid) : false;
+      if (!isRunning) {
+        const pid = await spawnDaemon(DEFAULT_INTERVAL_MS);
+        dim(`Auto-sync daemon started (PID ${pid}, every 5 min)`);
+        dim("Manage with:  awarts daemon status | stop | logs");
+        console.log();
+      }
+    } catch {}
+  } catch (err) {
+    submitSpin.fail("Could not reach the AWARTS server.");
+    error(err instanceof Error ? err.message : String(err));
+    dim("Is the backend running? Check AWARTS_API_URL or ~/.awarts/config.json");
+  }
+}
+
+// src/commands/login.ts
+var POLL_INTERVAL_MS = 2000;
+var MAX_POLLS = 300;
+async function stopExistingDaemon() {
+  const pid = await readPid();
+  if (pid && isProcessRunning(pid)) {
+    killProcess(pid);
+    await removePid();
+  } else if (pid) {
+    await removePid();
+  }
+}
+async function loginCommand() {
+  banner();
+  const existing = await loadAuth();
+  if (existing) {
+    info("You are already logged in.");
+    kv("User ID", existing.user_id);
+    kv("Saved at", existing.saved_at);
+    console.log();
+    dim("To switch accounts:  awarts login --force");
+    dim("To log out:          awarts logout");
+    console.log();
+    return;
+  }
+  await startDeviceAuth();
+}
+async function loginForceCommand() {
+  banner();
+  const pid = await readPid();
+  if (pid && isProcessRunning(pid)) {
+    dim("Stopping existing daemon...");
+    await stopExistingDaemon();
+  }
+  await clearAuth();
+  await startDeviceAuth();
+}
+async function startDeviceAuth() {
+  const spin = spinner("Starting device authentication...");
+  spin.start();
+  let initData;
+  try {
+    const res = await postUnauthenticated("/api/auth/cli/init");
+    if (!res.ok) {
+      spin.fail("Failed to start authentication.");
+      error(`Server responded with status ${res.status}`);
+      return;
+    }
+    initData = res.data;
+    spin.stop();
+  } catch (err) {
+    spin.fail("Could not reach the AWARTS server.");
+    error(err instanceof Error ? err.message : String(err));
+    dim("Is the backend running? Check AWARTS_API_URL or ~/.awarts/config.json");
+    return;
+  }
+  const FRONTEND_URL = process.env.AWARTS_FRONTEND_URL ?? "https://awarts.vercel.app";
+  const verifyUrl = `${FRONTEND_URL}/cli/verify?code=${initData.code}`;
+  console.log();
+  console.log(`  ${source_default.bold("Your verification code:")}  ${source_default.bgWhite.black.bold(` ${initData.code} `)}`);
+  console.log();
+  info(`Open this URL to verify:  ${source_default.cyan.underline(verifyUrl)}`);
+  console.log();
+  try {
+    await open_default(verifyUrl);
+    dim("Browser opened automatically. Waiting for verification...");
+  } catch {
+    dim("Could not open browser. Please visit the URL above manually.");
+  }
+  console.log();
+  const pollSpin = spinner("Waiting for verification...");
+  pollSpin.start();
+  for (let attempt = 0;attempt < MAX_POLLS; attempt++) {
+    await sleep(POLL_INTERVAL_MS);
+    try {
+      const res = await postUnauthenticated("/api/auth/cli/poll", {
+        device_token: initData.device_token
+      });
+      if (!res.ok) {
+        pollSpin.fail("Poll request failed.");
+        error(`Status ${res.status}`);
+        return;
+      }
+      const { status, token, user_id } = res.data;
+      if (status === "verified" && token && user_id) {
+        await stopExistingDaemon();
+        await saveAuth({
+          token,
+          user_id,
+          saved_at: new Date().toISOString()
+        });
+        pollSpin.succeed(source_default.green("Authenticated successfully!"));
+        console.log();
+        kv("User ID", user_id);
+        success("Token saved to ~/.awarts/auth.json");
+        console.log();
+        try {
+          await syncCommand();
+        } catch {
+          dim("Initial sync skipped — you can run  awarts sync  manually.");
+        }
+        try {
+          const pid = await spawnDaemon(DEFAULT_INTERVAL_MS);
+          success(`Auto-sync daemon started (PID ${pid}, every 5 min)`);
+          dim("Your usage data will sync automatically in the background.");
+          dim("Manage with:  awarts daemon status | stop | logs");
+        } catch {
+          dim("Run  awarts daemon start  to enable auto-sync.");
+        }
+        console.log();
+        return;
+      }
+      if (status === "expired") {
+        pollSpin.fail("Verification code expired.");
+        error("Please run  awarts login  again to get a new code.");
+        return;
+      }
+      pollSpin.text = `Waiting for verification... (${Math.floor((attempt + 1) * POLL_INTERVAL_MS / 1000)}s)`;
+    } catch {}
+  }
+  pollSpin.fail("Timed out waiting for verification.");
+  error("Please try  awarts login  again.");
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 // src/commands/push.ts
 var VALID_PROVIDERS = new Set(["claude", "codex", "gemini", "antigravity"]);
 async function pushCommand(opts) {
@@ -6968,133 +7109,6 @@ async function statusCommand() {
   }
 }
 
-// src/commands/sync.ts
-async function syncCommand() {
-  banner();
-  const auth = await loadAuth();
-  if (!auth) {
-    error("Not logged in. Run  awarts login  first.");
-    return;
-  }
-  const detectSpin = spinner("Detecting installed providers...");
-  detectSpin.start();
-  const results = await detectAll();
-  const detected = results.filter((r) => r.detected);
-  if (detected.length === 0) {
-    detectSpin.warn("No AI coding tools detected.");
-    console.log();
-    dim("Looked for: Claude, Codex, Gemini, Antigravity");
-    dim("Make sure you have used one of these tools on this machine.");
-    console.log();
-    return;
-  }
-  const names = detected.map((r) => providerLabel(r.adapter.name)).join(", ");
-  detectSpin.succeed(`Detected: ${names}`);
-  console.log();
-  const allEntries = [];
-  for (const { adapter } of detected) {
-    const spin = spinner(`Reading ${adapter.displayName} data...`);
-    spin.start();
-    try {
-      const entries = await adapter.read();
-      if (entries.length === 0) {
-        spin.info(source_default.dim(`${adapter.displayName} -- no usage data found`));
-        if (adapter.name === "codex") {
-          dim(`    Set your OpenAI API key:  ${source_default.cyan("awarts keys set openai <your-key>")}`);
-          dim(`    Or create usage files manually — see ${source_default.cyan("awarts.com/docs")}`);
-        } else if (adapter.name === "gemini") {
-          dim(`    Set your Google API key:  ${source_default.cyan("awarts keys set google <your-key>")}`);
-          dim(`    Or create usage files manually — see ${source_default.cyan("awarts.com/docs")}`);
-        } else if (adapter.name === "antigravity") {
-          dim(`    Set your API key:  ${source_default.cyan("awarts keys set antigravity <your-key>")}`);
-          dim(`    Or create usage files manually — see ${source_default.cyan("awarts.com/docs")}`);
-        }
-      } else {
-        allEntries.push(...entries);
-        const totalCost2 = entries.reduce((s, e) => s + e.cost_usd, 0);
-        spin.succeed(`${providerLabel(adapter.name)}  ` + `${source_default.bold(String(entries.length))} entries  ` + `${source_default.yellow(usd(totalCost2))}`);
-      }
-    } catch (err) {
-      spin.fail(`${adapter.displayName} -- error reading data`);
-      error(err instanceof Error ? err.message : String(err));
-    }
-  }
-  console.log();
-  if (allEntries.length === 0) {
-    warn("No usage data found across any provider.");
-    console.log();
-    info(`Set API keys to fetch real billing data:`);
-    dim(`  ${source_default.cyan("awarts keys set openai <key>")}      — for Codex / OpenAI`);
-    dim(`  ${source_default.cyan("awarts keys set google <key>")}      — for Gemini`);
-    dim(`  ${source_default.cyan("awarts keys set antigravity <key>")} — for Antigravity`);
-    dim(`Or visit ${source_default.cyan("awarts.com/docs")} for manual import instructions.`);
-    console.log();
-    return;
-  }
-  const totalCost = allEntries.reduce((s, e) => s + e.cost_usd, 0);
-  const totalTokens = allEntries.reduce((s, e) => s + e.input_tokens + e.output_tokens, 0);
-  const uniqueDates = new Set(allEntries.map((e) => e.date));
-  divider();
-  kv("Total entries", allEntries.length);
-  kv("Unique days", uniqueDates.size);
-  kv("Total cost", usd(totalCost));
-  kv("Total tokens", tokens(totalTokens));
-  divider();
-  console.log();
-  const hash = hashEntries(allEntries);
-  const submitSpin = spinner("Syncing with AWARTS...");
-  submitSpin.start();
-  const cleanEntries = allEntries.map(({ cost_source, ...rest }) => rest);
-  try {
-    const res = await post("/api/usage/submit", {
-      entries: cleanEntries,
-      source: "cli",
-      hash
-    });
-    if (!res.ok) {
-      submitSpin.fail("Sync failed.");
-      if (res.status === 401) {
-        error("Authentication expired. Run  awarts login  to re-authenticate.");
-      } else {
-        error(`Server returned status ${res.status}`);
-        const errorData = res.data;
-        if (errorData?.error)
-          error(String(errorData.error));
-      }
-      return;
-    }
-    const { processed, posts_created, errors } = res.data;
-    if (errors && errors.length > 0) {
-      submitSpin.warn(source_default.yellow(`Synced with ${errors.length} error(s).`));
-      for (const e of errors) {
-        error(`  ${e.date} / ${e.provider}: ${e.error}`);
-      }
-    } else {
-      submitSpin.succeed(source_default.green("Sync complete!"));
-    }
-    console.log();
-    kv("Entries processed", processed);
-    kv("Posts created", posts_created);
-    console.log();
-    success("Your usage data is now live on AWARTS.");
-    console.log();
-    try {
-      const existingPid = await readPid();
-      const isRunning = existingPid ? isProcessRunning(existingPid) : false;
-      if (!isRunning) {
-        const pid = await spawnDaemon(DEFAULT_INTERVAL_MS);
-        dim(`Auto-sync daemon started (PID ${pid}, every 5 min)`);
-        dim("Manage with:  awarts daemon status | stop | logs");
-        console.log();
-      }
-    } catch {}
-  } catch (err) {
-    submitSpin.fail("Could not reach the AWARTS server.");
-    error(err instanceof Error ? err.message : String(err));
-    dim("Is the backend running? Check AWARTS_API_URL or ~/.awarts/config.json");
-  }
-}
-
 // src/commands/seed.ts
 import fs14 from "node:fs/promises";
 import path10 from "node:path";
@@ -7392,7 +7406,7 @@ async function checkForUpdates() {
 
 // src/index.ts
 var program2 = new Command;
-program2.name("awarts").description("Track your AI coding spend across Claude, Codex, Gemini & Antigravity").version("0.2.8").hook("preAction", () => checkForUpdates());
+program2.name("awarts").description("Track your AI coding spend across Claude, Codex, Gemini & Antigravity").version("0.2.9").hook("preAction", () => checkForUpdates());
 program2.command("login").description("Authenticate with your AWARTS account via device auth").option("--force", "Re-authenticate even if already logged in").action(async (opts) => {
   try {
     if (opts.force) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awarts",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Track your AI coding across Claude, Codex, Gemini & Antigravity",
   "type": "module",
   "license": "MIT",