awarts 0.2.6 → 0.2.8

package/dist/index.js

@@ -6181,11 +6181,20 @@ var CONFIG_DIRS = [
 var CODEX_PRICING = {
   "gpt-5.4": { input: 2.5, output: 15 },
   "gpt-5.4-pro": { input: 30, output: 180 },
-  "gpt-5.2": { input: 1.75, output: 14 },
+  "gpt-5.3": { input: 1.75, output: 14 },
+  "gpt-5.3-codex": { input: 1.75, output: 14 },
+  "gpt-5.2": { input: 0.875, output: 7 },
+  "gpt-5.2-codex": { input: 1.75, output: 14 },
+  "gpt-5.2-pro": { input: 10.5, output: 84 },
   "gpt-5.1": { input: 1.25, output: 10 },
+  "gpt-5.1-codex": { input: 1.25, output: 10 },
+  "gpt-5.1-codex-mini": { input: 0.25, output: 2 },
+  "gpt-5.1-codex-max": { input: 1.25, output: 10 },
   "gpt-5": { input: 1.25, output: 10 },
+  "gpt-5-codex": { input: 1.25, output: 10 },
   "gpt-5-mini": { input: 0.25, output: 2 },
   "gpt-5-nano": { input: 0.05, output: 0.4 },
+  "gpt-5-pro": { input: 15, output: 120 },
   "gpt-4.1": { input: 2, output: 8 },
   "gpt-4.1-mini": { input: 0.4, output: 1.6 },
   "gpt-4.1-nano": { input: 0.1, output: 0.4 },
@@ -6193,13 +6202,14 @@ var CODEX_PRICING = {
   "gpt-4o-mini": { input: 0.15, output: 0.6 },
   o3: { input: 2, output: 8 },
   "o3-pro": { input: 20, output: 80 },
+  "o3-mini": { input: 0.55, output: 2.2 },
   "o4-mini": { input: 1.1, output: 4.4 },
   o1: { input: 15, output: 60 },
+  "o1-mini": { input: 0.55, output: 2.2 },
   "o1-pro": { input: 150, output: 600 },
-  "codex-mini": { input: 1.5, output: 6 },
-  "openai-codex": { input: 2, output: 8 }
+  "codex-mini": { input: 0.75, output: 3 }
 };
-var DEFAULT_PRICING2 = { input: 2, output: 8 };
+var DEFAULT_PRICING2 = { input: 1.1, output: 4.4 };
 async function fetchOpenAICosts(apiKey) {
   const entries = [];
   const now = Math.floor(Date.now() / 1000);
@@ -6328,12 +6338,22 @@ async function findSqliteDb() {
   }
   return null;
 }
+async function readConfigModel() {
+  const configPath = path7.join(HOME, ".codex", "config.toml");
+  try {
+    const content = await fs11.readFile(configPath, "utf-8");
+    const match = content.match(/^\s*model\s*=\s*"([^"]+)"/m);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
 async function readSqliteThreads() {
   const dbPath = await findSqliteDb();
   if (!dbPath)
     return [];
   try {
-    const query = `SELECT date(created_at/1000000000, 'unixepoch') as day, tokens_used, model_provider FROM threads WHERE tokens_used > 0 ORDER BY created_at;`;
+    const query = `SELECT date(created_at, 'unixepoch') as day, tokens_used, model_provider FROM threads WHERE tokens_used > 0 ORDER BY created_at;`;
     const result = execFileSync2("sqlite3", [dbPath, query], {
       timeout: 5000,
       encoding: "utf-8",
@@ -6341,11 +6361,12 @@ async function readSqliteThreads() {
     }).trim();
     if (!result)
       return [];
+    const configModel = await readConfigModel();
     const dayMap = new Map;
     for (const line of result.split(`
 `)) {
       const [day, tokensStr, model] = line.split("|");
-      if (!day)
+      if (!day || day === "")
         continue;
       const tokens2 = Number(tokensStr) || 0;
       if (!dayMap.has(day))
@@ -6359,8 +6380,8 @@ async function readSqliteThreads() {
     for (const [date, { tokens: tokens2, models }] of dayMap) {
       const inputTokens = Math.round(tokens2 * 0.4);
       const outputTokens = Math.round(tokens2 * 0.6);
-      const modelName = [...models][0] ?? "openai-codex";
-      const pricing = CODEX_PRICING[modelName] || DEFAULT_PRICING2;
+      const resolvedModel = configModel ?? [...models][0] ?? null;
+      const pricing = resolvedModel && CODEX_PRICING[resolvedModel] || DEFAULT_PRICING2;
       const cost = (inputTokens * pricing.input + outputTokens * pricing.output) / 1e6;
       entries.push({
         date,
@@ -6368,7 +6389,7 @@ async function readSqliteThreads() {
         cost_usd: cost,
         input_tokens: inputTokens,
         output_tokens: outputTokens,
-        models: [...models].length > 0 ? [...models] : ["openai-codex"],
+        models: resolvedModel ? [resolvedModel] : ["codex"],
         cost_source: "estimated"
       });
     }
@@ -6439,6 +6460,7 @@ var GEMINI_PRICING = {
   "gemini-3.1-pro": { input: 2, output: 12 },
   "gemini-3.1-flash-lite": { input: 0.25, output: 1.5 },
   "gemini-3-flash": { input: 0.5, output: 3 },
+  "gemini-3-flash-preview": { input: 0.5, output: 3 },
   "gemini-2.0-flash": { input: 0.1, output: 0.4 },
   "gemini-2.0-flash-lite": { input: 0.075, output: 0.3 },
   "gemini-1.5-pro": { input: 1.25, output: 5 },
@@ -6522,6 +6544,73 @@ async function readLocalFiles2() {
   }
   return entries;
 }
+async function readSessionFiles() {
+  const geminiDir = path8.join(HOME2, ".gemini", "tmp");
+  if (!await dirExists3(geminiDir))
+    return [];
+  const entries = [];
+  try {
+    const userDirs = await fs12.readdir(geminiDir);
+    for (const userDir of userDirs) {
+      const chatsDir = path8.join(geminiDir, userDir, "chats");
+      if (!await dirExists3(chatsDir))
+        continue;
+      let files;
+      try {
+        files = await fs12.readdir(chatsDir);
+      } catch {
+        continue;
+      }
+      const sessionFiles = files.filter((f) => f.startsWith("session-") && f.endsWith(".json"));
+      const dayMap = new Map;
+      for (const file of sessionFiles) {
+        try {
+          const raw = await fs12.readFile(path8.join(chatsDir, file), "utf-8");
+          const session = JSON.parse(raw);
+          let date = null;
+          if (session.startTime) {
+            date = session.startTime.split("T")[0];
+          } else {
+            const match = file.match(/session-(\d{4}-\d{2}-\d{2})/);
+            if (match)
+              date = match[1];
+          }
+          if (!date)
+            continue;
+          if (!dayMap.has(date))
+            dayMap.set(date, { input: 0, output: 0, cached: 0, models: new Set });
+          const day = dayMap.get(date);
+          for (const msg of session.messages ?? []) {
+            if (msg.type !== "gemini" || !msg.tokens)
+              continue;
+            day.input += msg.tokens.input ?? 0;
+            day.output += msg.tokens.output ?? 0;
+            day.cached += msg.tokens.cached ?? 0;
+            if (msg.model)
+              day.models.add(msg.model);
+          }
+        } catch {}
+      }
+      for (const [date, { input, output, cached, models }] of dayMap) {
+        if (input === 0 && output === 0)
+          continue;
+        const modelName = [...models][0];
+        const cost = calculateCost(input, output, modelName);
+        entries.push({
+          date,
+          provider: "gemini",
+          cost_usd: cost,
+          input_tokens: input,
+          output_tokens: output,
+          cache_read_tokens: cached,
+          models: [...models].length > 0 ? [...models] : ["gemini"],
+          cost_source: "estimated"
+        });
+      }
+    }
+  } catch {}
+  return entries;
+}
 var geminiAdapter = {
   name: "gemini",
   displayName: "Gemini",
@@ -6538,7 +6627,10 @@ var geminiAdapter = {
     return false;
   },
   async read() {
-    return readLocalFiles2();
+    const localEntries = await readLocalFiles2();
+    if (localEntries.length > 0)
+      return localEntries;
+    return readSessionFiles();
   }
 };
 
@@ -7118,6 +7210,48 @@ async function seedCommand(opts) {
   console.log();
 }
 
+// src/commands/cleanup.ts
+async function cleanupCommand(opts) {
+  banner();
+  const auth = await loadAuth();
+  if (!auth) {
+    error("Not logged in. Run  awarts login  first.");
+    return;
+  }
+  const spin = spinner("Cleaning up invalid usage data...");
+  spin.start();
+  try {
+    const body = {};
+    if (opts.beforeDate)
+      body.before_date = opts.beforeDate;
+    if (opts.dates)
+      body.dates = opts.dates;
+    const res = await post("/api/usage/cleanup", body);
+    if (!res.ok) {
+      spin.fail("Cleanup failed.");
+      if (res.status === 401) {
+        error("Authentication expired. Run  awarts login  to re-authenticate.");
+      } else {
+        error(`Server returned status ${res.status}`);
+      }
+      return;
+    }
+    const { deleted, posts_deleted } = res.data;
+    if (deleted === 0 && posts_deleted === 0) {
+      spin.info("No invalid data found — nothing to clean up.");
+    } else {
+      spin.succeed(source_default.green("Cleanup complete!"));
+      console.log();
+      kv("Usage entries deleted", deleted);
+      kv("Posts deleted", posts_deleted);
+    }
+    console.log();
+  } catch (err) {
+    spin.fail("Could not reach the AWARTS server.");
+    error(err instanceof Error ? err.message : String(err));
+  }
+}
+
 // src/commands/daemon.ts
 async function daemonStartCommand(intervalMs) {
   banner();
@@ -7258,7 +7392,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.5").hook("preAction", () => checkForUpdates());
+program2.name("awarts").description("Track your AI coding spend across Claude, Codex, Gemini & Antigravity").version("0.2.8").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) {
@@ -7299,6 +7433,17 @@ program2.command("seed").description("Generate sample usage data for providers w
     process.exit(1);
   }
 });
+program2.command("cleanup").description("Remove invalid/old usage data from AWARTS (e.g. entries with wrong dates)").option("--before <date>", "Delete entries before this date (default: 2020-01-01)", "2020-01-01").option("--date <dates...>", "Delete entries for specific dates (YYYY-MM-DD)").action(async (opts) => {
+  try {
+    await cleanupCommand({
+      beforeDate: opts.before,
+      dates: opts.date
+    });
+  } catch (err) {
+    error(err instanceof Error ? err.message : String(err));
+    process.exit(1);
+  }
+});
 program2.command("status").description("Show auth status, configuration, and detected providers").action(async () => {
   try {
     await statusCommand();

package/package.json

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