@diogonzafe/tokenwatch 0.2.0 → 0.2.1

package/dist/index.js

@@ -74,29 +74,40 @@ var SqliteStorage = class {
   migrate() {
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS usage (
-        id            INTEGER PRIMARY KEY AUTOINCREMENT,
-        model         TEXT    NOT NULL,
-        input_tokens  INTEGER NOT NULL,
-        output_tokens INTEGER NOT NULL,
-        cost_usd      REAL    NOT NULL,
-        session_id    TEXT,
-        user_id       TEXT,
-        timestamp     TEXT    NOT NULL
+        id               INTEGER PRIMARY KEY AUTOINCREMENT,
+        model            TEXT    NOT NULL,
+        input_tokens     INTEGER NOT NULL,
+        output_tokens    INTEGER NOT NULL,
+        reasoning_tokens INTEGER NOT NULL DEFAULT 0,
+        cost_usd         REAL    NOT NULL,
+        session_id       TEXT,
+        user_id          TEXT,
+        feature          TEXT,
+        timestamp        TEXT    NOT NULL
       )
     `);
+    const cols = this.db.prepare(`PRAGMA table_info(usage)`).all().map((c) => c.name);
+    if (!cols.includes("reasoning_tokens")) {
+      this.db.exec(`ALTER TABLE usage ADD COLUMN reasoning_tokens INTEGER NOT NULL DEFAULT 0`);
+    }
+    if (!cols.includes("feature")) {
+      this.db.exec(`ALTER TABLE usage ADD COLUMN feature TEXT`);
+    }
   }
   record(entry) {
     this.db.prepare(
       `INSERT INTO usage
-         (model, input_tokens, output_tokens, cost_usd, session_id, user_id, timestamp)
-         VALUES (?, ?, ?, ?, ?, ?, ?)`
+         (model, input_tokens, output_tokens, reasoning_tokens, cost_usd, session_id, user_id, feature, timestamp)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
     ).run(
       entry.model,
       entry.inputTokens,
       entry.outputTokens,
+      entry.reasoningTokens ?? 0,
       entry.costUSD,
       entry.sessionId ?? null,
       entry.userId ?? null,
+      entry.feature ?? null,
       entry.timestamp
     );
   }
@@ -106,9 +117,11 @@ var SqliteStorage = class {
       model: r.model,
       inputTokens: r.input_tokens,
       outputTokens: r.output_tokens,
+      ...r.reasoning_tokens > 0 && { reasoningTokens: r.reasoning_tokens },
       costUSD: r.cost_usd,
       ...r.session_id != null && { sessionId: r.session_id },
       ...r.user_id != null && { userId: r.user_id },
+      ...r.feature != null && { feature: r.feature },
       timestamp: r.timestamp
     }));
   }
@@ -1379,11 +1392,7 @@ ${issues}`);
   }
   function track(entry) {
     const price = resolveModelPrice(entry.model);
-    const costUSD = calculateCost(
-      entry.inputTokens,
-      entry.outputTokens + (entry.reasoningTokens ?? 0),
-      price
-    );
+    const costUSD = calculateCost(entry.inputTokens, entry.outputTokens, price);
     const full = {
       ...entry,
       costUSD,
@@ -1530,7 +1539,7 @@ function trackWithMeta(tracker, model, inputTokens, outputTokens, reasoningToken
   tracker.track({
     model,
     inputTokens,
-    outputTokens,
+    outputTokens: outputTokens + reasoningTokens,
     ...reasoningTokens > 0 && { reasoningTokens },
     ...sessionId !== void 0 && { sessionId },
     ...userId !== void 0 && { userId },
@@ -1643,14 +1652,10 @@ function trackWithMeta2(tracker, model, inputTokens, outputTokens, reasoningToke
     model,
     inputTokens,
     outputTokens,
-    // For Anthropic, reasoningTokens is informational (thinking already in outputTokens).
-    // Pass 0 so tracker does not add it to cost (tracker only adds when > 0 AND separate).
-    // We store it as a field but the tracker cost formula adds reasoningTokens to outputTokens,
-    // so we must NOT pass it here to avoid double-counting.
+    ...reasoningTokens > 0 && { reasoningTokens },
     ...sessionId !== void 0 && { sessionId },
     ...userId !== void 0 && { userId },
-    ...feature !== void 0 && { feature },
-    ...reasoningTokens > 0 && { reasoningTokens }
+    ...feature !== void 0 && { feature }
   });
 }
 async function* wrapStream2(stream, model, sessionId, userId, feature, tracker) {