@tokscale/cli 1.0.17 → 1.0.18

package/src/tui/components/Footer.tsx

@@ -131,6 +131,12 @@ export function Footer(props: FooterProps) {
             enabled={props.enabledSources.has("gemini")}
             onToggle={props.onSourceToggle}
           />
+          <SourceBadge
+            name={isVeryNarrowTerminal() ? "6" : "6:AM"}
+            source="amp"
+            enabled={props.enabledSources.has("amp")}
+            onToggle={props.onSourceToggle}
+          />
           <Show when={!isVeryNarrowTerminal()}>
             <text dim>|</text>
             <SortButton
@@ -279,9 +285,8 @@ const SPINNER_INTERVAL = 40;
 
 const PHASE_MESSAGES: Record<LoadingPhase, string> = {
   idle: "Initializing...",
+  "parsing-sources": "Scanning session data...",
   "loading-pricing": "Loading pricing data...",
-  "syncing-cursor": "Syncing Cursor data...",
-  "parsing-sources": "Parsing session files...",
   "finalizing-report": "Finalizing report...",
   complete: "Complete",
 };

package/src/tui/components/LoadingSpinner.tsx

@@ -31,9 +31,8 @@ function getScannerState(frame: number): SpinnerState {
 
 const PHASE_MESSAGES: Record<LoadingPhase, string> = {
   "idle": "Initializing...",
+  "parsing-sources": "Scanning session data...",
   "loading-pricing": "Loading pricing data...",
-  "syncing-cursor": "Syncing Cursor data...",
-  "parsing-sources": "Parsing session files...",
   "finalizing-report": "Finalizing report...",
   "complete": "Complete",
 };

package/src/tui/components/ModelView.tsx

@@ -1,6 +1,6 @@
 import { For, createMemo, type Accessor } from "solid-js";
 import type { TUIData, SortType } from "../hooks/useData.js";
-import { getModelColor } from "../utils/colors.js";
+import { getModelColor, getSourceDisplayName } from "../utils/colors.js";
 import { formatTokensCompact, formatCostFull } from "../utils/format.js";
 import { isNarrow, isVeryNarrow } from "../utils/responsive.js";
 
@@ -65,7 +65,7 @@ export function ModelView(props: ModelViewProps) {
   const formattedRows = createMemo(() => {
     const nameWidth = nameColumnWidths().text;
     return visibleEntries().map((entry) => {
-      const sourceLabel = entry.source.charAt(0).toUpperCase() + entry.source.slice(1);
+      const sourceLabel = getSourceDisplayName(entry.source);
       const fullName = `${sourceLabel} ${entry.model}`;
       let displayName = fullName;
       if (fullName.length > nameWidth) {

package/src/tui/config/settings.ts

@@ -5,7 +5,8 @@ import type { TUIData, DailyModelBreakdown } from "../types/index.js";
 
 const CONFIG_DIR = join(homedir(), ".config", "tokscale");
 const CACHE_DIR = join(homedir(), ".cache", "tokscale");
-const CONFIG_FILE = join(CONFIG_DIR, "tui-settings.json");
+const CONFIG_FILE = join(CONFIG_DIR, "settings.json");
+const LEGACY_CONFIG_FILE = join(CONFIG_DIR, "tui-settings.json");
 const CACHE_FILE = join(CACHE_DIR, "tui-data-cache.json");
 
 const CACHE_STALE_THRESHOLD_MS = 60 * 1000;
@@ -13,17 +14,19 @@ const MIN_AUTO_REFRESH_MS = 30000;
 const MAX_AUTO_REFRESH_MS = 3600000;
 const DEFAULT_AUTO_REFRESH_MS = 60000;
 
-interface TUISettings {
+export interface TokscaleSettings {
   colorPalette: string;
   autoRefreshEnabled?: boolean;
   autoRefreshMs?: number;
+  includeUnusedModels?: boolean;
 }
 
-function validateSettings(raw: unknown): TUISettings {
-  const defaults: TUISettings = { 
+function validateSettings(raw: unknown): TokscaleSettings {
+  const defaults: TokscaleSettings = { 
     colorPalette: "blue", 
     autoRefreshEnabled: false, 
-    autoRefreshMs: DEFAULT_AUTO_REFRESH_MS 
+    autoRefreshMs: DEFAULT_AUTO_REFRESH_MS,
+    includeUnusedModels: false,
   };
   
   if (!raw || typeof raw !== "object") return defaults;
@@ -38,7 +41,9 @@ function validateSettings(raw: unknown): TUISettings {
     autoRefreshMs = Math.min(MAX_AUTO_REFRESH_MS, Math.max(MIN_AUTO_REFRESH_MS, obj.autoRefreshMs));
   }
   
-  return { colorPalette, autoRefreshEnabled, autoRefreshMs };
+  const includeUnusedModels = typeof obj.includeUnusedModels === "boolean" ? obj.includeUnusedModels : defaults.includeUnusedModels;
+  
+  return { colorPalette, autoRefreshEnabled, autoRefreshMs, includeUnusedModels };
 }
 
 interface CachedTUIData {
@@ -49,18 +54,22 @@ interface CachedTUIData {
   };
 }
 
-export function loadSettings(): TUISettings {
+export function loadSettings(): TokscaleSettings {
   try {
     if (existsSync(CONFIG_FILE)) {
       const raw = JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
       return validateSettings(raw);
     }
+    if (existsSync(LEGACY_CONFIG_FILE)) {
+      const raw = JSON.parse(readFileSync(LEGACY_CONFIG_FILE, "utf-8"));
+      return validateSettings(raw);
+    }
   } catch {
   }
-  return { colorPalette: "blue", autoRefreshEnabled: false, autoRefreshMs: DEFAULT_AUTO_REFRESH_MS };
+  return { colorPalette: "blue", autoRefreshEnabled: false, autoRefreshMs: DEFAULT_AUTO_REFRESH_MS, includeUnusedModels: false };
 }
 
-export function saveSettings(updates: Partial<TUISettings>): void {
+export function saveSettings(updates: Partial<TokscaleSettings>): void {
   try {
     if (!existsSync(CONFIG_DIR)) {
       mkdirSync(CONFIG_DIR, { recursive: true });

package/src/tui/hooks/useData.ts

@@ -16,14 +16,13 @@ import type {
 } from "../types/index.js";
 import {
   parseLocalSourcesAsync,
-  finalizeReportAsync,
-  finalizeGraphAsync,
+  finalizeReportAndGraphAsync,
   type ParsedMessages,
 } from "../../native.js";
-import { PricingFetcher } from "../../pricing.js";
+
 import { syncCursorCache, loadCursorCredentials } from "../../cursor.js";
 import { getModelColor } from "../utils/colors.js";
-import { loadCachedData, saveCachedData, isCacheStale } from "../config/settings.js";
+import { loadCachedData, saveCachedData, isCacheStale, loadSettings } from "../config/settings.js";
 
 export type {
   SortType,
@@ -144,27 +143,30 @@ function calculateLongestSession(messages: Array<{ sessionId: string; timestamp:
   return `${totalSeconds}s`;
 }
 
-async function loadData(enabledSources: Set<SourceType>, dateFilters?: DateFilters): Promise<TUIData> {
+async function loadData(
+  enabledSources: Set<SourceType>, 
+  dateFilters?: DateFilters,
+  setPhase?: (phase: LoadingPhase) => void
+): Promise<TUIData> {
   const sources = Array.from(enabledSources);
   const localSources = sources.filter(s => s !== "cursor");
   const includeCursor = sources.includes("cursor");
   const { since, until, year } = dateFilters ?? {};
 
-  const pricingFetcher = new PricingFetcher();
+  setPhase?.("parsing-sources");
   
   const phase1Results = await Promise.allSettled([
-    pricingFetcher.fetchPricing(),
     includeCursor && loadCursorCredentials() ? syncCursorCache() : Promise.resolve({ synced: false, rows: 0 }),
     localSources.length > 0
-      ? parseLocalSourcesAsync({ sources: localSources as ("opencode" | "claude" | "codex" | "gemini")[], since, until, year })
-      : Promise.resolve({ messages: [], opencodeCount: 0, claudeCount: 0, codexCount: 0, geminiCount: 0, processingTimeMs: 0 } as ParsedMessages),
+      ? parseLocalSourcesAsync({ sources: localSources as ("opencode" | "claude" | "codex" | "gemini" | "amp" | "droid")[], since, until, year })
+      : Promise.resolve({ messages: [], opencodeCount: 0, claudeCount: 0, codexCount: 0, geminiCount: 0, ampCount: 0, droidCount: 0, processingTimeMs: 0 } as ParsedMessages),
   ]);
 
-  const cursorSync = phase1Results[1].status === "fulfilled" 
-    ? phase1Results[1].value 
+  const cursorSync = phase1Results[0].status === "fulfilled" 
+    ? phase1Results[0].value 
     : { synced: false, rows: 0 };
-  const localMessages = phase1Results[2].status === "fulfilled" 
-    ? phase1Results[2].value 
+  const localMessages = phase1Results[1].status === "fulfilled" 
+    ? phase1Results[1].value 
     : null;
 
   const emptyMessages: ParsedMessages = {
@@ -173,39 +175,23 @@ async function loadData(enabledSources: Set<SourceType>, dateFilters?: DateFilte
     claudeCount: 0,
     codexCount: 0,
     geminiCount: 0,
+    ampCount: 0,
+    droidCount: 0,
     processingTimeMs: 0,
   };
 
-  const phase2Results = await Promise.allSettled([
-    finalizeReportAsync({
-      localMessages: localMessages || emptyMessages,
-      pricing: pricingFetcher.toPricingEntries(),
-      includeCursor: includeCursor && cursorSync.synced,
-      since,
-      until,
-      year,
-    }),
-    finalizeGraphAsync({
-      localMessages: localMessages || emptyMessages,
-      pricing: pricingFetcher.toPricingEntries(),
-      includeCursor: includeCursor && cursorSync.synced,
-      since,
-      until,
-      year,
-    }),
-  ]);
-
-  if (phase2Results[0].status === "rejected") {
-    throw new Error(`Failed to finalize report: ${phase2Results[0].reason}`);
-  }
-  if (phase2Results[1].status === "rejected") {
-    throw new Error(`Failed to finalize graph: ${phase2Results[1].reason}`);
-  }
-
-  const report = phase2Results[0].value;
-  const graph = phase2Results[1].value;
-
-  const modelEntries: ModelEntry[] = report.entries.map(e => ({
+  setPhase?.("finalizing-report");
+  // Single call ensures consistent pricing between report and graph
+  const { report, graph } = await finalizeReportAndGraphAsync({
+    localMessages: localMessages || emptyMessages,
+    includeCursor: includeCursor && cursorSync.synced,
+    since,
+    until,
+    year,
+  });
+
+  const settings = loadSettings();
+  const allModelEntries: ModelEntry[] = report.entries.map(e => ({
     source: e.source,
     model: e.model,
     input: e.input,
@@ -216,6 +202,9 @@ async function loadData(enabledSources: Set<SourceType>, dateFilters?: DateFilte
     total: e.input + e.output + e.cacheWrite + e.cacheRead + e.reasoning,
     cost: e.cost,
   }));
+  const modelEntries = settings.includeUnusedModels
+    ? allModelEntries
+    : allModelEntries.filter(e => e.total > 0);
 
   const dailyMap = new Map<string, DailyEntry>();
   for (const contrib of graph.contributions) {
@@ -490,20 +479,20 @@ export function useData(enabledSources: Accessor<Set<SourceType>>, dateFilters?:
         setData(cachedData);
         setLoading(false);
         setIsRefreshing(true);
-        setLoadingPhase("loading-pricing");
+        setLoadingPhase("idle");
       } else {
         setLoading(true);
-        setLoadingPhase("loading-pricing");
+        setLoadingPhase("idle");
       }
     } else {
       setIsRefreshing(true);
-      setLoadingPhase("loading-pricing");
+      setLoadingPhase("idle");
       setForceRefresh(false);
     }
     
     const requestId = currentRequestId;
     setError(null);
-    loadData(sources, dateFilters)
+    loadData(sources, dateFilters, setLoadingPhase)
       .then((freshData) => {
         if (requestId !== currentRequestId) return;
         setData(freshData);

package/src/tui/types/index.ts

@@ -2,7 +2,7 @@ import type { ColorPaletteName } from "../config/themes.js";
 
 export type TabType = "overview" | "model" | "daily" | "stats";
 export type SortType = "cost" | "tokens";
-export type SourceType = "opencode" | "claude" | "codex" | "cursor" | "gemini";
+export type SourceType = "opencode" | "claude" | "codex" | "cursor" | "gemini" | "amp" | "droid";
 
 export type { ColorPaletteName };
 
@@ -105,9 +105,8 @@ export interface TUISettings {
 
 export type LoadingPhase = 
   | "idle"
-  | "loading-pricing"
-  | "syncing-cursor"
   | "parsing-sources"
+  | "loading-pricing"
   | "finalizing-report"
   | "complete";
 
@@ -161,7 +160,9 @@ export const SOURCE_LABELS: Record<SourceType, string> = {
   codex: "CX",
   cursor: "CR",
   gemini: "GM",
+  amp: "AM",
+  droid: "DR",
 } as const;
 
 export const TABS: readonly TabType[] = ["overview", "model", "daily", "stats"] as const;
-export const ALL_SOURCES: readonly SourceType[] = ["opencode", "claude", "codex", "cursor", "gemini"] as const;
+export const ALL_SOURCES: readonly SourceType[] = ["opencode", "claude", "codex", "cursor", "gemini", "amp", "droid"] as const;

package/src/tui/utils/colors.ts

@@ -58,8 +58,15 @@ export const SOURCE_COLORS: Record<SourceType, string> = {
   codex: "#3b82f6",
   cursor: "#a855f7",
   gemini: "#06b6d4",
+  amp: "#EC4899",
+  droid: "#10b981",
 };
 
 export function getSourceColor(source: SourceType | string): string {
   return SOURCE_COLORS[source as SourceType] || "#888888";
 }
+
+export function getSourceDisplayName(source: string): string {
+  if (source === "droid") return "Droid";
+  return source.charAt(0).toUpperCase() + source.slice(1);
+}

package/src/wrapped.ts

@@ -6,11 +6,9 @@ import * as os from "node:os";
 import pc from "picocolors";
 import {
   parseLocalSourcesAsync,
-  finalizeReportAsync,
-  finalizeGraphAsync,
+  finalizeReportAndGraphAsync,
   type ParsedMessages,
 } from "./native.js";
-import { PricingFetcher } from "./pricing.js";
 import { syncCursorCache, loadCursorCredentials } from "./cursor.js";
 import { loadCredentials } from "./credentials.js";
 import type { SourceType } from "./graph-types.js";
@@ -64,6 +62,7 @@ const SOURCE_DISPLAY_NAMES: Record<string, string> = {
   codex: "Codex CLI",
   gemini: "Gemini CLI",
   cursor: "Cursor IDE",
+  amp: "Amp",
 };
 
 const ASSETS_BASE_URL = "https://tokscale.ai/assets/logos";
@@ -93,6 +92,7 @@ const CLIENT_LOGO_URLS: Record<string, string> = {
   "Codex CLI": `${ASSETS_BASE_URL}/openai.jpg`,
   "Gemini CLI": `${ASSETS_BASE_URL}/gemini.png`,
   "Cursor IDE": `${ASSETS_BASE_URL}/cursor.jpg`,
+  "Amp": `${ASSETS_BASE_URL}/amp.png`,
 };
 
 const PROVIDER_LOGO_URLS: Record<string, string> = {
@@ -210,28 +210,25 @@ async function ensureFontsLoaded(): Promise<void> {
 
 async function loadWrappedData(options: WrappedOptions): Promise<WrappedData> {
   const year = options.year || new Date().getFullYear().toString();
-  const sources = options.sources || ["opencode", "claude", "codex", "gemini", "cursor"];
-  const localSources = sources.filter(s => s !== "cursor") as ("opencode" | "claude" | "codex" | "gemini")[];
+  const sources = options.sources || ["opencode", "claude", "codex", "gemini", "cursor", "amp", "droid"];
+  const localSources = sources.filter(s => s !== "cursor") as ("opencode" | "claude" | "codex" | "gemini" | "amp" | "droid")[];
   const includeCursor = sources.includes("cursor");
 
   const since = `${year}-01-01`;
   const until = `${year}-12-31`;
 
-  const pricingFetcher = new PricingFetcher();
-  
   const phase1Results = await Promise.allSettled([
-    pricingFetcher.fetchPricing(),
     includeCursor && loadCursorCredentials() ? syncCursorCache() : Promise.resolve({ synced: false, rows: 0 }),
     localSources.length > 0
-      ? parseLocalSourcesAsync({ sources: localSources, since, until, year, forceTypescript: options.includeAgents !== false })
-      : Promise.resolve({ messages: [], opencodeCount: 0, claudeCount: 0, codexCount: 0, geminiCount: 0, processingTimeMs: 0 } as ParsedMessages),
+      ? parseLocalSourcesAsync({ sources: localSources, since, until, year })
+      : Promise.resolve({ messages: [], opencodeCount: 0, claudeCount: 0, codexCount: 0, geminiCount: 0, ampCount: 0, droidCount: 0, processingTimeMs: 0 } as ParsedMessages),
   ]);
 
-  const cursorSync = phase1Results[1].status === "fulfilled" 
-    ? phase1Results[1].value 
+  const cursorSync = phase1Results[0].status === "fulfilled" 
+    ? phase1Results[0].value 
     : { synced: false, rows: 0 };
-  const localMessages = phase1Results[2].status === "fulfilled" 
-    ? phase1Results[2].value 
+  const localMessages = phase1Results[1].status === "fulfilled" 
+    ? phase1Results[1].value 
     : null;
 
   const emptyMessages: ParsedMessages = {
@@ -240,37 +237,18 @@ async function loadWrappedData(options: WrappedOptions): Promise<WrappedData> {
     claudeCount: 0,
     codexCount: 0,
     geminiCount: 0,
+    ampCount: 0,
+    droidCount: 0,
     processingTimeMs: 0,
   };
 
-  const [reportResult, graphResult] = await Promise.allSettled([
-    finalizeReportAsync({
-      localMessages: localMessages || emptyMessages,
-      pricing: pricingFetcher.toPricingEntries(),
-      includeCursor: includeCursor && cursorSync.synced,
-      since,
-      until,
-      year,
-    }),
-    finalizeGraphAsync({
-      localMessages: localMessages || emptyMessages,
-      pricing: pricingFetcher.toPricingEntries(),
-      includeCursor: includeCursor && cursorSync.synced,
-      since,
-      until,
-      year,
-    }),
-  ]);
-
-  if (reportResult.status === "rejected") {
-    throw new Error(`Failed to generate report: ${reportResult.reason}`);
-  }
-  if (graphResult.status === "rejected") {
-    throw new Error(`Failed to generate graph: ${graphResult.reason}`);
-  }
-
-  const report = reportResult.value;
-  const graph = graphResult.value;
+  const { report, graph } = await finalizeReportAndGraphAsync({
+    localMessages: localMessages || emptyMessages,
+    includeCursor: includeCursor && cursorSync.synced,
+    since,
+    until,
+    year,
+  });
 
   const modelMap = new Map<string, { cost: number; tokens: number }>();
   for (const entry of report.entries) {
@@ -301,9 +279,6 @@ async function loadWrappedData(options: WrappedOptions): Promise<WrappedData> {
 
   let topAgents: Array<{ name: string; cost: number; tokens: number; messages: number }> | undefined;
   if (options.includeAgents !== false && localMessages) {
-    const pricingEntries = pricingFetcher.toPricingEntries();
-    const pricingMap = new Map(pricingEntries.map(p => [p.modelId, p.pricing]));
-
     const agentMap = new Map<string, { cost: number; tokens: number; messages: number }>();
     for (const msg of localMessages.messages) {
       if (msg.source === "opencode" && msg.agent) {
@@ -311,17 +286,9 @@ async function loadWrappedData(options: WrappedOptions): Promise<WrappedData> {
         const existing = agentMap.get(normalizedAgent) || { cost: 0, tokens: 0, messages: 0 };
 
         const msgTokens = msg.input + msg.output + msg.cacheRead + msg.cacheWrite + msg.reasoning;
-        const pricing = pricingMap.get(msg.modelId);
-        let msgCost = 0;
-        if (pricing) {
-          msgCost = (msg.input * pricing.inputCostPerToken) +
-                    (msg.output * pricing.outputCostPerToken) +
-                    (msg.cacheRead * (pricing.cacheReadInputTokenCost || 0)) +
-                    (msg.cacheWrite * (pricing.cacheCreationInputTokenCost || 0));
-        }
 
         agentMap.set(normalizedAgent, {
-          cost: existing.cost + msgCost,
+          cost: existing.cost,
           tokens: existing.tokens + msgTokens,
           messages: existing.messages + 1,
         });

package/dist/graph.d.ts

@@ -1,29 +0,0 @@
-/**
- * Graph data generation module
- * Aggregates token usage data by date for contribution graph visualization
- *
- * Key design: intensity is calculated based on COST ($), not tokens
- *
- * This module supports two implementations:
- * - Native Rust (fast, ~10x faster) - used when available
- * - Pure TypeScript (fallback) - always available
- */
-import type { TokenContributionData, GraphOptions } from "./graph-types.js";
-/**
- * Check if native implementation is available
- */
-export declare function isNativeAvailable(): boolean;
-/**
- * Generate contribution graph data from all sources
- *
- * Uses native Rust implementation if available, falls back to TypeScript.
- * Set `options.forceTypescript = true` to skip native module.
- */
-export declare function generateGraphData(options?: GraphOptions & {
-    forceTypescript?: boolean;
-}): Promise<TokenContributionData>;
-/**
- * Pure TypeScript implementation of graph data generation
- */
-export declare function generateGraphDataTS(options?: GraphOptions): Promise<TokenContributionData>;
-//# sourceMappingURL=graph.d.ts.map

package/dist/graph.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../src/graph.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAUH,OAAO,KAAK,EACV,qBAAqB,EAIrB,YAAY,EAGb,MAAM,kBAAkB,CAAC;AAY1B;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,GAAE,YAAY,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GACzD,OAAO,CAAC,qBAAqB,CAAC,CAahC;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,qBAAqB,CAAC,CAwChC"}