@diogonzafe/tokenwatch 0.9.0 → 0.10.0

package/dist/cli.js

@@ -30,6 +30,7 @@ function rowToEntry(r) {
     ...r["user_id"] != null && { userId: r["user_id"] },
     ...r["feature"] != null && { feature: r["feature"] },
     ...r["app_id"] != null && { appId: r["app_id"] },
+    ...r["metadata"] != null && { metadata: r["metadata"] },
     timestamp: r["timestamp"] instanceof Date ? r["timestamp"].toISOString() : r["timestamp"]
   };
 }
@@ -59,6 +60,7 @@ var init_postgres = __esm({
         user_id               TEXT,
         feature               TEXT,
         app_id                TEXT,
+        metadata              JSONB,
         timestamp             TIMESTAMPTZ NOT NULL
       )
     `);
@@ -67,7 +69,8 @@ var init_postgres = __esm({
           "ALTER TABLE tokenwatch_usage ADD COLUMN IF NOT EXISTS feature TEXT",
           "ALTER TABLE tokenwatch_usage ADD COLUMN IF NOT EXISTS cached_tokens INTEGER NOT NULL DEFAULT 0",
           "ALTER TABLE tokenwatch_usage ADD COLUMN IF NOT EXISTS cache_creation_tokens INTEGER NOT NULL DEFAULT 0",
-          "ALTER TABLE tokenwatch_usage ADD COLUMN IF NOT EXISTS app_id TEXT"
+          "ALTER TABLE tokenwatch_usage ADD COLUMN IF NOT EXISTS app_id TEXT",
+          "ALTER TABLE tokenwatch_usage ADD COLUMN IF NOT EXISTS metadata JSONB"
         ]) {
           await this.client.query(col).catch(() => {
           });
@@ -77,8 +80,8 @@ var init_postgres = __esm({
         this.client.query(
           `INSERT INTO tokenwatch_usage
          (model, input_tokens, output_tokens, reasoning_tokens, cached_tokens, cache_creation_tokens,
-          cost_usd, session_id, user_id, feature, app_id, timestamp)
-         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`,
+          cost_usd, session_id, user_id, feature, app_id, metadata, timestamp)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`,
           [
             entry.model,
             entry.inputTokens,
@@ -91,6 +94,7 @@ var init_postgres = __esm({
             entry.userId ?? null,
             entry.feature ?? null,
             entry.appId ?? null,
+            entry.metadata ?? null,
             entry.timestamp
           ]
         ).catch((err) => {
@@ -137,6 +141,7 @@ function rowToEntry2(r) {
     ...r["user_id"] != null && { userId: r["user_id"] },
     ...r["feature"] != null && { feature: r["feature"] },
     ...r["app_id"] != null && { appId: r["app_id"] },
+    ...r["metadata"] != null && { metadata: typeof r["metadata"] === "string" ? JSON.parse(r["metadata"]) : r["metadata"] },
     timestamp: r["timestamp"] instanceof Date ? r["timestamp"].toISOString() : r["timestamp"]
   };
 }
@@ -166,6 +171,7 @@ var init_mysql = __esm({
         user_id               VARCHAR(255),
         feature               VARCHAR(255),
         app_id                VARCHAR(255),
+        metadata              JSON,
         timestamp             DATETIME(3)   NOT NULL
       )
     `);
@@ -175,7 +181,8 @@ var init_mysql = __esm({
         ADD COLUMN IF NOT EXISTS feature               VARCHAR(255),
         ADD COLUMN IF NOT EXISTS cached_tokens         INT NOT NULL DEFAULT 0,
         ADD COLUMN IF NOT EXISTS cache_creation_tokens INT NOT NULL DEFAULT 0,
-        ADD COLUMN IF NOT EXISTS app_id                VARCHAR(255)
+        ADD COLUMN IF NOT EXISTS app_id                VARCHAR(255),
+        ADD COLUMN IF NOT EXISTS metadata              JSON
     `).catch(() => {
         });
       }
@@ -183,8 +190,8 @@ var init_mysql = __esm({
         this.client.execute(
           `INSERT INTO tokenwatch_usage
          (model, input_tokens, output_tokens, reasoning_tokens, cached_tokens, cache_creation_tokens,
-          cost_usd, session_id, user_id, feature, app_id, timestamp)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          cost_usd, session_id, user_id, feature, app_id, metadata, timestamp)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
           [
             entry.model,
             entry.inputTokens,
@@ -197,6 +204,7 @@ var init_mysql = __esm({
             entry.userId ?? null,
             entry.feature ?? null,
             entry.appId ?? null,
+            entry.metadata != null ? JSON.stringify(entry.metadata) : null,
             entry.timestamp
           ]
         ).catch((err) => {
@@ -240,6 +248,7 @@ function docToEntry(doc) {
     ...doc.userId != null && { userId: doc.userId },
     ...doc.feature != null && { feature: doc.feature },
     ...doc.appId != null && { appId: doc.appId },
+    ...doc.metadata != null && { metadata: doc.metadata },
     timestamp: doc.timestamp
   };
 }
@@ -274,6 +283,7 @@ var init_mongodb = __esm({
           userId: entry.userId ?? null,
           ...entry.feature !== void 0 && { feature: entry.feature },
           ...entry.appId !== void 0 && { appId: entry.appId },
+          ...entry.metadata !== void 0 && { metadata: entry.metadata },
           timestamp: entry.timestamp
         }).catch((err) => {
           console.warn("[tokenwatch] MongoStorage.record failed:", err);
@@ -404,6 +414,7 @@ var SqliteStorage = class {
         user_id               TEXT,
         feature               TEXT,
         app_id                TEXT,
+        metadata              TEXT,
         timestamp             TEXT    NOT NULL
       )
     `);
@@ -423,13 +434,16 @@ var SqliteStorage = class {
     if (!cols.includes("app_id")) {
       this.db.exec(`ALTER TABLE usage ADD COLUMN app_id TEXT`);
     }
+    if (!cols.includes("metadata")) {
+      this.db.exec(`ALTER TABLE usage ADD COLUMN metadata TEXT`);
+    }
   }
   record(entry) {
     this.db.prepare(
       `INSERT INTO usage
          (model, input_tokens, output_tokens, reasoning_tokens, cached_tokens, cache_creation_tokens,
-          cost_usd, session_id, user_id, feature, app_id, timestamp)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+          cost_usd, session_id, user_id, feature, app_id, metadata, timestamp)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     ).run(
       entry.model,
       entry.inputTokens,
@@ -442,6 +456,7 @@ var SqliteStorage = class {
       entry.userId ?? null,
       entry.feature ?? null,
       entry.appId ?? null,
+      entry.metadata != null ? JSON.stringify(entry.metadata) : null,
       entry.timestamp
     );
   }
@@ -459,6 +474,7 @@ var SqliteStorage = class {
       ...r.user_id != null && { userId: r.user_id },
       ...r.feature != null && { feature: r.feature },
       ...r.app_id != null && { appId: r.app_id },
+      ...r.metadata != null && { metadata: JSON.parse(r.metadata) },
       timestamp: r.timestamp
     }));
   }
@@ -536,6 +552,7 @@ var CloudExporter = class {
         sessionId: entry.sessionId,
         userId: entry.userId,
         feature: entry.feature,
+        metadata: entry.metadata,
         timestamp: entry.timestamp
       })
     }).catch(() => {
@@ -2200,6 +2217,7 @@ ${issues}`);
     const byUser = {};
     const byFeature = {};
     const byApp = {};
+    const byMetadata = {};
     let totalInput = 0;
     let totalOutput = 0;
     let totalCost = 0;
@@ -2241,6 +2259,14 @@ ${issues}`);
         a.costUSD += e.costUSD;
         a.calls += 1;
       }
+      if (e.metadata) {
+        for (const [key, val] of Object.entries(e.metadata)) {
+          const group = byMetadata[key] ??= {};
+          const slot = group[val] ??= { costUSD: 0, calls: 0 };
+          slot.costUSD += e.costUSD;
+          slot.calls += 1;
+        }
+      }
     }
     if (options && entries.length > 0) {
       periodFrom = entries[0]?.timestamp ?? periodFrom;
@@ -2253,6 +2279,7 @@ ${issues}`);
       byUser,
       byFeature,
       byApp,
+      byMetadata,
       period: { from: periodFrom, to: lastTimestamp },
       ...pricesUpdatedAt ? { pricesUpdatedAt } : {}
     };
@@ -2357,7 +2384,7 @@ ${issues}`);
   }
   async function exportCSV() {
     const entries = await Promise.resolve(storage.getAll());
-    const header = "timestamp,model,inputTokens,outputTokens,reasoningTokens,cachedTokens,cacheCreationTokens,costUSD,sessionId,userId,feature,appId";
+    const header = "timestamp,model,inputTokens,outputTokens,reasoningTokens,cachedTokens,cacheCreationTokens,costUSD,sessionId,userId,feature,appId,metadata";
     const rows = entries.map(
       (e) => [
         csvEscape(e.timestamp),
@@ -2371,7 +2398,8 @@ ${issues}`);
         csvEscape(e.sessionId ?? ""),
         csvEscape(e.userId ?? ""),
         csvEscape(e.feature ?? ""),
-        csvEscape(e.appId ?? "")
+        csvEscape(e.appId ?? ""),
+        csvEscape(e.metadata ? JSON.stringify(e.metadata) : "")
       ].join(",")
     );
     return [header, ...rows].join("\n");
@@ -2490,6 +2518,7 @@ async function getDashboardData(storage, filter) {
   const byUser = {};
   const byFeature = {};
   const byApp = {};
+  const byMetadata = {};
   let totalInput = 0;
   let totalOutput = 0;
   let totalCost = 0;
@@ -2528,6 +2557,14 @@ async function getDashboardData(storage, filter) {
       a.costUSD += e.costUSD;
       a.calls += 1;
     }
+    if (e.metadata) {
+      for (const [key, val] of Object.entries(e.metadata)) {
+        const group = byMetadata[key] ??= {};
+        const slot = group[val] ??= { costUSD: 0, calls: 0 };
+        slot.costUSD += e.costUSD;
+        slot.calls += 1;
+      }
+    }
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const periodFrom = entries[0]?.timestamp ?? now;
@@ -2540,6 +2577,7 @@ async function getDashboardData(storage, filter) {
     byUser,
     byFeature,
     byApp,
+    byMetadata,
     period: { from: periodFrom, to: periodTo }
   };
   const forecastWindowMs = 24 * 60 * 60 * 1e3;
@@ -3515,7 +3553,65 @@ function ModelTable({ models, total, t, onRowClick, exampleHover }) {
     </section>
   );
 }
-Object.assign(window, { ModelTable });
+function MetaGroup({ label, rows, t }) {
+  const [open, setOpen] = useStateT(true);
+  const { fmtUSD, fmtInt } = window.TW;
+  const total = rows.reduce(function(s, r) { return s + r[1].costUSD; }, 0);
+  return (
+    <section className="tw-section">
+      <div className="tw-sec-head" style={{ cursor: 'pointer' }} onClick={() => setOpen(function(v) { return !v; })}>
+        <h3 style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+          <button className="tw-collapse" style={{ transform: open ? 'none' : 'rotate(-90deg)' }}><Ico.chevron /></button>
+          {label}
+        </h3>
+        <span className="tw-sec-sub">{rows.length + ' values \xB7 ' + fmtUSD(total, 4)}</span>
+      </div>
+      {open && (
+        <div className="tw-table-wrap">
+          <table className={'tw-table' + (t.density === 'compact' ? ' compact' : '')}>
+            <thead>
+              <tr>
+                <th style={{ textAlign: 'left' }}>Value</th>
+                <th style={{ textAlign: 'right' }}>Cost</th>
+                <th style={{ textAlign: 'right' }}>Calls</th>
+                <th style={{ textAlign: 'right' }}>Avg / call</th>
+              </tr>
+            </thead>
+            <tbody>
+              {rows.map(function(r) {
+                var val = r[0], stats = r[1];
+                return (
+                  <tr key={val} className="tw-row">
+                    <td>{val}</td>
+                    <td style={{ textAlign: 'right' }}>{fmtUSD(stats.costUSD, 4)}</td>
+                    <td style={{ textAlign: 'right' }}>{fmtInt(stats.calls)}</td>
+                    <td style={{ textAlign: 'right' }}>{fmtUSD(stats.costUSD / Math.max(stats.calls, 1), 4)}</td>
+                  </tr>
+                );
+              })}
+            </tbody>
+          </table>
+        </div>
+      )}
+    </section>
+  );
+}
+
+function MetadataSection({ byMetadata, t }) {
+  var keys = Object.keys(byMetadata || {});
+  if (keys.length === 0) return null;
+  return (
+    <div>
+      {keys.map(function(key) {
+        var group = byMetadata[key];
+        var rows = Object.entries(group).sort(function(a, b) { return b[1].costUSD - a[1].costUSD; });
+        return <MetaGroup key={key} label={key} rows={rows} t={t} />;
+      })}
+    </div>
+  );
+}
+
+Object.assign(window, { ModelTable, MetaGroup, MetadataSection });
 </script>
 
 <script type="text/babel">
@@ -3824,6 +3920,7 @@ Object.assign(window, {
     BASE_MODELS, RANGES, modelsForRange, kpisForRange,
     seriesForRange, seedFeed, makeCall, callsForModel,
     FEATURES, FEATURE_COLOR, BUDGET, _buildSeries: buildSeries,
+    byMetadata: {},
   },
 });
 
@@ -3868,6 +3965,7 @@ Object.assign(window, {
       var elapsed = window.TW.BUDGET.cycleDays - window.TW.BUDGET.daysLeft;
       window.TW.BUDGET.used = fc.burnRatePerHour * 24 * Math.max(elapsed, 1);
     }
+    if (r.byMetadata) window.TW.byMetadata = r.byMetadata;
     window.dispatchEvent(new CustomEvent('tw-data-update'));
   }
   var evtSource = null;
@@ -4010,6 +4108,10 @@ function App() {
 
   const models = kpis.models;
 
+  const byMetadata = useMemoApp(() => {
+    return window.TW.byMetadata || {};
+  }, [_sseV]);
+
   useEffectApp(() => {
     const onKey = (e) => {
       if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k') {
@@ -4045,6 +4147,7 @@ function App() {
           <ChartsRow range={range} models={models} kpis={kpis} series={series} t={t} />
           <ModelTable models={models} total={kpis.cost} t={t} exampleHover={t.smartHighlight}
                       onRowClick={(m) => setSelModel({ ...m, share: m.cost / Math.max(kpis.cost, 0.0001) })} />
+          <MetadataSection byMetadata={byMetadata} t={t} />
           <ForecastSection t={t} />
           <LiveActivity t={t} />
         </main>