@tokscale/cli 1.0.16 → 1.0.18

package/src/cli.ts

@@ -6,7 +6,7 @@
  * All heavy computation is done in the native Rust module.
  */
 
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json") as { version: string };
@@ -14,7 +14,7 @@ import pc from "picocolors";
 import { login, logout, whoami } from "./auth.js";
 import { submit } from "./submit.js";
 import { generateWrapped } from "./wrapped.js";
-import { PricingFetcher } from "./pricing.js";
+
 import {
   loadCursorCredentials,
   saveCursorCredentials,
@@ -48,6 +48,7 @@ import * as fs from "node:fs";
 import { performance } from "node:perf_hooks";
 import type { SourceType } from "./graph-types.js";
 import type { TUIOptions, TabType } from "./tui/types/index.js";
+import { loadSettings } from "./tui/config/settings.js";
 
 type LaunchTUIFunction = (options?: TUIOptions) => Promise<void>;
 
@@ -106,6 +107,8 @@ interface FilterOptions {
   codex?: boolean;
   gemini?: boolean;
   cursor?: boolean;
+  amp?: boolean;
+  droid?: boolean;
 }
 
 interface DateFilterOptions {
@@ -204,7 +207,7 @@ async function main() {
 
   program
     .name("tokscale")
-    .description("Tokscale - Track AI coding costs across OpenCode, Claude Code, Codex, Gemini, and Cursor")
+    .description("Tokscale - Track AI coding costs across OpenCode, Claude Code, Codex, Gemini, Cursor, and Amp")
     .version(pkg.version);
 
   program
@@ -217,6 +220,8 @@ async function main() {
     .option("--codex", "Show only Codex CLI usage")
     .option("--gemini", "Show only Gemini CLI usage")
     .option("--cursor", "Show only Cursor IDE usage")
+    .option("--amp", "Show only Amp usage")
+    .option("--droid", "Show only Factory Droid usage")
     .option("--today", "Show only today's usage")
     .option("--week", "Show last 7 days")
     .option("--month", "Show current month")
@@ -224,18 +229,19 @@ async function main() {
     .option("--until <date>", "End date (YYYY-MM-DD)")
     .option("--year <year>", "Filter to specific year")
     .option("--benchmark", "Show processing time")
+    .option("--no-spinner", "Disable spinner (for AI agents and scripts - keeps stdout clean)")
     .action(async (options) => {
       if (options.json) {
         await outputJsonReport("monthly", options);
       } else if (options.light) {
-        await showMonthlyReport(options);
+        await showMonthlyReport(options, { spinner: options.spinner });
       } else {
         const launchTUI = await tryLoadTUI();
         if (launchTUI) {
           await launchTUI(buildTUIOptions(options, "daily"));
         } else {
           showTUIUnavailableMessage();
-          await showMonthlyReport(options);
+          await showMonthlyReport(options, { spinner: options.spinner });
         }
       }
     });
@@ -250,6 +256,8 @@ async function main() {
     .option("--codex", "Show only Codex CLI usage")
     .option("--gemini", "Show only Gemini CLI usage")
     .option("--cursor", "Show only Cursor IDE usage")
+    .option("--amp", "Show only Amp usage")
+    .option("--droid", "Show only Factory Droid usage")
     .option("--today", "Show only today's usage")
     .option("--week", "Show last 7 days")
     .option("--month", "Show current month")
@@ -257,18 +265,19 @@ async function main() {
     .option("--until <date>", "End date (YYYY-MM-DD)")
     .option("--year <year>", "Filter to specific year")
     .option("--benchmark", "Show processing time")
+    .option("--no-spinner", "Disable spinner (for AI agents and scripts - keeps stdout clean)")
     .action(async (options) => {
       if (options.json) {
         await outputJsonReport("models", options);
       } else if (options.light) {
-        await showModelReport(options);
+        await showModelReport(options, { spinner: options.spinner });
       } else {
         const launchTUI = await tryLoadTUI();
         if (launchTUI) {
           await launchTUI(buildTUIOptions(options, "model"));
         } else {
           showTUIUnavailableMessage();
-          await showModelReport(options);
+          await showModelReport(options, { spinner: options.spinner });
         }
       }
     });
@@ -282,6 +291,8 @@ async function main() {
     .option("--codex", "Include only Codex CLI data")
     .option("--gemini", "Include only Gemini CLI data")
     .option("--cursor", "Include only Cursor IDE data")
+    .option("--amp", "Include only Amp data")
+    .option("--droid", "Include only Factory Droid data")
     .option("--today", "Show only today's usage")
     .option("--week", "Show last 7 days")
     .option("--month", "Show current month")
@@ -289,6 +300,7 @@ async function main() {
     .option("--until <date>", "End date (YYYY-MM-DD)")
     .option("--year <year>", "Filter to specific year")
     .option("--benchmark", "Show processing time")
+    .option("--no-spinner", "Disable spinner (for AI agents and scripts - keeps stdout clean)")
     .action(async (options) => {
       await handleGraphCommand(options);
     });
@@ -303,10 +315,13 @@ async function main() {
     .option("--codex", "Include only Codex CLI data")
     .option("--gemini", "Include only Gemini CLI data")
     .option("--cursor", "Include only Cursor IDE data")
+    .option("--amp", "Include only Amp data")
+    .option("--droid", "Include only Factory Droid data")
     .option("--no-spinner", "Disable loading spinner (for scripting)")
     .option("--short", "Display total tokens in abbreviated format (e.g., 7.14B)")
-    .option("--agents", "Show Top OpenCode Agents instead of Top Clients")
-    .option("--pin-sisyphus", "Pin Sisyphus and Planner-Sisyphus at top of agents list")
+    .addOption(new Option("--agents", "Show Top OpenCode Agents (default)").conflicts("clients"))
+    .addOption(new Option("--clients", "Show Top Clients instead of Top OpenCode Agents").conflicts("agents"))
+    .option("--disable-pinned", "Disable pinning of Sisyphus agents in rankings")
     .action(async (options) => {
       await handleWrappedCommand(options);
     });
@@ -344,6 +359,8 @@ async function main() {
     .option("--codex", "Include only Codex CLI data")
     .option("--gemini", "Include only Gemini CLI data")
     .option("--cursor", "Include only Cursor IDE data")
+    .option("--amp", "Include only Amp data")
+    .option("--droid", "Include only Factory Droid data")
     .option("--since <date>", "Start date (YYYY-MM-DD)")
     .option("--until <date>", "End date (YYYY-MM-DD)")
     .option("--year <year>", "Filter to specific year")
@@ -355,6 +372,8 @@ async function main() {
         codex: options.codex,
         gemini: options.gemini,
         cursor: options.cursor,
+        amp: options.amp,
+        droid: options.droid,
         since: options.since,
         until: options.until,
         year: options.year,
@@ -374,6 +393,8 @@ async function main() {
     .option("--codex", "Show only Codex CLI usage")
     .option("--gemini", "Show only Gemini CLI usage")
     .option("--cursor", "Show only Cursor IDE usage")
+    .option("--amp", "Show only Amp usage")
+    .option("--droid", "Show only Factory Droid usage")
     .option("--today", "Show only today's usage")
     .option("--week", "Show last 7 days")
     .option("--month", "Show current month")
@@ -390,9 +411,15 @@ async function main() {
       }
     });
 
-  // =========================================================================
-  // Cursor IDE Authentication Commands
-  // =========================================================================
+  program
+    .command("pricing <model-id>")
+    .description("Look up pricing for a model")
+    .option("--json", "Output as JSON")
+    .option("--provider <source>", "Force pricing source: 'litellm' or 'openrouter'")
+    .option("--no-spinner", "Disable spinner (for AI agents and scripts - keeps stdout clean)")
+    .action(async (modelId: string, options: { json?: boolean; provider?: string; spinner?: boolean }) => {
+      await handlePricingCommand(modelId, options);
+    });
 
   const cursorCommand = program
     .command("cursor")
@@ -425,7 +452,7 @@ async function main() {
   // Global flags should go to main program
   const isGlobalFlag = ['--help', '-h', '--version', '-V'].includes(firstArg);
   const hasSubcommand = args.length > 0 && !firstArg.startsWith('-');
-  const knownCommands = ['monthly', 'models', 'graph', 'wrapped', 'login', 'logout', 'whoami', 'submit', 'cursor', 'tui', 'help'];
+  const knownCommands = ['monthly', 'models', 'graph', 'wrapped', 'login', 'logout', 'whoami', 'submit', 'cursor', 'tui', 'pricing', 'help'];
   const isKnownCommand = hasSubcommand && knownCommands.includes(firstArg);
 
   if (isKnownCommand || isGlobalFlag) {
@@ -442,6 +469,7 @@ async function main() {
       .option("--codex", "Show only Codex CLI usage")
       .option("--gemini", "Show only Gemini CLI usage")
       .option("--cursor", "Show only Cursor IDE usage")
+      .option("--amp", "Show only Amp usage")
       .option("--today", "Show only today's usage")
       .option("--week", "Show last 7 days")
       .option("--month", "Show current month")
@@ -449,27 +477,28 @@ async function main() {
       .option("--until <date>", "End date (YYYY-MM-DD)")
       .option("--year <year>", "Filter to specific year")
       .option("--benchmark", "Show processing time")
+      .option("--no-spinner", "Disable spinner (for AI agents and scripts - keeps stdout clean)")
       .parse();
     
     const opts = defaultProgram.opts();
     if (opts.json) {
       await outputJsonReport("models", opts);
     } else if (opts.light) {
-      await showModelReport(opts);
+      await showModelReport(opts, { spinner: opts.spinner });
     } else {
       const launchTUI = await tryLoadTUI();
       if (launchTUI) {
         await launchTUI(buildTUIOptions(opts));
       } else {
         showTUIUnavailableMessage();
-        await showModelReport(opts);
+        await showModelReport(opts, { spinner: opts.spinner });
       }
     }
   }
 }
 
 function getEnabledSources(options: FilterOptions): SourceType[] | undefined {
-  const hasFilter = options.opencode || options.claude || options.codex || options.gemini || options.cursor;
+  const hasFilter = options.opencode || options.claude || options.codex || options.gemini || options.cursor || options.amp || options.droid;
   if (!hasFilter) return undefined; // All sources
 
   const sources: SourceType[] = [];
@@ -478,21 +507,14 @@ function getEnabledSources(options: FilterOptions): SourceType[] | undefined {
   if (options.codex) sources.push("codex");
   if (options.gemini) sources.push("gemini");
   if (options.cursor) sources.push("cursor");
+  if (options.amp) sources.push("amp");
+  if (options.droid) sources.push("droid");
   return sources;
 }
 
-function logNativeStatus(): void {
-  if (!isNativeAvailable()) {
-    console.log(pc.yellow("  Note: Using TypeScript fallback (native module not available)"));
-    console.log(pc.gray("  Run 'bun run build:core' for ~10x faster processing.\n"));
-  }
-}
 
-async function fetchPricingData(): Promise<PricingFetcher> {
-  const fetcher = new PricingFetcher();
-  await fetcher.fetchPricing();
-  return fetcher;
-}
+
+
 
 /**
  * Sync Cursor usage data from API to local cache.
@@ -514,31 +536,19 @@ async function syncCursorData(): Promise<CursorSyncResult> {
 }
 
 interface LoadedDataSources {
-  fetcher: PricingFetcher;
   cursorSync: CursorSyncResult;
   localMessages: ParsedMessages | null;
 }
 
-/**
- * Load all data sources in parallel (two-phase optimization):
- * - Cursor API sync (network)
- * - Pricing fetch (network)
- * - Local file parsing (CPU/IO) - OpenCode, Claude, Codex, Gemini
- * 
- * This overlaps network I/O with local file parsing for better performance.
- */
 async function loadDataSourcesParallel(
   localSources: SourceType[],
-  dateFilters: { since?: string; until?: string; year?: string }
+  dateFilters: { since?: string; until?: string; year?: string },
+  onPhase?: (phase: string) => void
 ): Promise<LoadedDataSources> {
-  // Skip local parsing if no local sources requested (e.g., cursor-only mode)
   const shouldParseLocal = localSources.length > 0;
 
-  // Use Promise.allSettled for graceful degradation
-  const [cursorResult, pricingResult, localResult] = await Promise.allSettled([
+  const [cursorResult, localResult] = await Promise.allSettled([
     syncCursorData(),
-    fetchPricingData(),
-    // Parse local sources in parallel (excludes Cursor) - skip if empty
     shouldParseLocal
       ? parseLocalSourcesAsync({
           sources: localSources.filter(s => s !== 'cursor'),
@@ -549,25 +559,18 @@ async function loadDataSourcesParallel(
       : Promise.resolve(null),
   ]);
 
-  // Handle partial failures gracefully
   const cursorSync: CursorSyncResult = cursorResult.status === 'fulfilled'
     ? cursorResult.value
     : { attempted: true, synced: false, rows: 0, error: 'Cursor sync failed' };
 
-  const fetcher: PricingFetcher = pricingResult.status === 'fulfilled'
-    ? pricingResult.value
-    : new PricingFetcher(); // Empty pricing → costs = 0
-
   const localMessages: ParsedMessages | null = localResult.status === 'fulfilled'
     ? localResult.value
     : null;
 
-  return { fetcher, cursorSync, localMessages };
+  return { cursorSync, localMessages };
 }
 
-async function showModelReport(options: FilterOptions & DateFilterOptions & { benchmark?: boolean }) {
-  logNativeStatus();
-
+async function showModelReport(options: FilterOptions & DateFilterOptions & { benchmark?: boolean }, extraOptions?: { spinner?: boolean }) {
   const dateFilters = getDateFilters(options);
   const enabledSources = getEnabledSources(options);
   const onlyCursor = enabledSources?.length === 1 && enabledSources[0] === 'cursor';
@@ -594,47 +597,53 @@ async function showModelReport(options: FilterOptions & DateFilterOptions & { be
   }
   console.log();
 
-  // Start spinner for loading phase
-  const spinner = createSpinner({ color: "cyan" });
-  spinner.start(pc.gray("Loading data sources..."));
+  const useSpinner = extraOptions?.spinner !== false;
+  const spinner = useSpinner ? createSpinner({ color: "cyan" }) : null;
 
-  // Filter out cursor for local parsing (it's synced separately via network)
-  const localSources: SourceType[] = (enabledSources || ['opencode', 'claude', 'codex', 'gemini', 'cursor'])
+  const localSources: SourceType[] = (enabledSources || ['opencode', 'claude', 'codex', 'gemini', 'cursor', 'amp', 'droid'])
     .filter(s => s !== 'cursor');
 
-  // Two-phase parallel loading: network (Cursor + pricing) overlaps with local file parsing
-  // If cursor-only, skip local parsing entirely
-  const { fetcher, cursorSync, localMessages } = await loadDataSourcesParallel(
+  spinner?.start(pc.gray("Scanning session data..."));
+
+  const { cursorSync, localMessages } = await loadDataSourcesParallel(
     onlyCursor ? [] : localSources,
-    dateFilters
+    dateFilters,
+    (phase) => spinner?.update(phase)
   );
   
   if (!localMessages && !onlyCursor) {
-    spinner.error('Failed to parse local session files');
+    if (spinner) {
+      spinner.error('Failed to parse local session files');
+    } else {
+      console.error('Failed to parse local session files');
+    }
     process.exit(1);
   }
 
-  spinner.update(pc.gray("Finalizing report..."));
+  spinner?.update(pc.gray("Finalizing report..."));
   const startTime = performance.now();
 
   let report: ModelReport;
   try {
-    const emptyMessages: ParsedMessages = { messages: [], opencodeCount: 0, claudeCount: 0, codexCount: 0, geminiCount: 0, processingTimeMs: 0 };
+    const emptyMessages: ParsedMessages = { messages: [], opencodeCount: 0, claudeCount: 0, codexCount: 0, geminiCount: 0, ampCount: 0, droidCount: 0, processingTimeMs: 0 };
     report = await finalizeReportAsync({
       localMessages: localMessages || emptyMessages,
-      pricing: fetcher.toPricingEntries(),
       includeCursor: includeCursor && cursorSync.synced,
       since: dateFilters.since,
       until: dateFilters.until,
       year: dateFilters.year,
     });
   } catch (e) {
-    spinner.error(`Error: ${(e as Error).message}`);
+    if (spinner) {
+      spinner.error(`Error: ${(e as Error).message}`);
+    } else {
+      console.error(`Error: ${(e as Error).message}`);
+    }
     process.exit(1);
   }
 
   const processingTime = performance.now() - startTime;
-  spinner.stop();
+  spinner?.stop();
 
   if (report.entries.length === 0) {
     if (onlyCursor && !cursorSync.synced) {
@@ -648,8 +657,13 @@ async function showModelReport(options: FilterOptions & DateFilterOptions & { be
 
   // Create table
   const table = createUsageTable("Source/Model");
+  
+  const settings = loadSettings();
+  const filteredEntries = settings.includeUnusedModels 
+    ? report.entries 
+    : report.entries.filter(e => e.input + e.output + e.cacheRead + e.cacheWrite > 0);
 
-  for (const entry of report.entries) {
+  for (const entry of filteredEntries) {
     const sourceLabel = getSourceLabel(entry.source);
     const modelDisplay = `${pc.dim(sourceLabel)} ${formatModelName(entry.model)}`;
     table.push(
@@ -701,9 +715,7 @@ async function showModelReport(options: FilterOptions & DateFilterOptions & { be
   console.log();
 }
 
-async function showMonthlyReport(options: FilterOptions & DateFilterOptions & { benchmark?: boolean }) {
-  logNativeStatus();
-
+async function showMonthlyReport(options: FilterOptions & DateFilterOptions & { benchmark?: boolean }, extraOptions?: { spinner?: boolean }) {
   const dateRange = getDateRangeLabel(options);
   const title = dateRange 
     ? `Monthly Token Usage Report (${dateRange})`
@@ -715,45 +727,55 @@ async function showMonthlyReport(options: FilterOptions & DateFilterOptions & {
   }
   console.log();
 
-  // Start spinner for loading phase
-  const spinner = createSpinner({ color: "cyan" });
-  spinner.start(pc.gray("Loading data sources..."));
+  const useSpinner = extraOptions?.spinner !== false;
+  const spinner = useSpinner ? createSpinner({ color: "cyan" }) : null;
 
   const dateFilters = getDateFilters(options);
   const enabledSources = getEnabledSources(options);
-  // Filter out cursor for local parsing (it's synced separately via network)
-  const localSources: SourceType[] = (enabledSources || ['opencode', 'claude', 'codex', 'gemini', 'cursor'])
+  const localSources: SourceType[] = (enabledSources || ['opencode', 'claude', 'codex', 'gemini', 'cursor', 'amp', 'droid'])
     .filter(s => s !== 'cursor');
   const includeCursor = !enabledSources || enabledSources.includes('cursor');
 
-  // Two-phase parallel loading: network (Cursor + pricing) overlaps with local file parsing
-  const { fetcher, cursorSync, localMessages } = await loadDataSourcesParallel(localSources, dateFilters);
+  spinner?.start(pc.gray("Scanning session data..."));
+
+  const { cursorSync, localMessages } = await loadDataSourcesParallel(
+    localSources,
+    dateFilters,
+    (phase) => spinner?.update(phase)
+  );
   
   if (!localMessages) {
-    spinner.error('Failed to parse local session files');
+    if (spinner) {
+      spinner.error('Failed to parse local session files');
+    } else {
+      console.error('Failed to parse local session files');
+    }
     process.exit(1);
   }
 
-  spinner.update(pc.gray("Finalizing report..."));
+  spinner?.update(pc.gray("Finalizing report..."));
   const startTime = performance.now();
 
   let report: MonthlyReport;
   try {
     report = await finalizeMonthlyReportAsync({
       localMessages,
-      pricing: fetcher.toPricingEntries(),
       includeCursor: includeCursor && cursorSync.synced,
       since: dateFilters.since,
       until: dateFilters.until,
       year: dateFilters.year,
     });
   } catch (e) {
-    spinner.error(`Error: ${(e as Error).message}`);
+    if (spinner) {
+      spinner.error(`Error: ${(e as Error).message}`);
+    } else {
+      console.error(`Error: ${(e as Error).message}`);
+    }
     process.exit(1);
   }
 
   const processingTime = performance.now() - startTime;
-  spinner.stop();
+  spinner?.stop();
 
   if (report.entries.length === 0) {
     console.log(pc.yellow("  No usage data found.\n"));
@@ -763,7 +785,12 @@ async function showMonthlyReport(options: FilterOptions & DateFilterOptions & {
   // Create table
   const table = createUsageTable("Month");
 
-  for (const entry of report.entries) {
+  const settings = loadSettings();
+  const filteredEntries = settings.includeUnusedModels
+    ? report.entries
+    : report.entries.filter(e => e.input + e.output + e.cacheRead + e.cacheWrite > 0);
+
+  for (const entry of filteredEntries) {
     table.push(
       formatUsageRow(
         entry.month,
@@ -810,16 +837,14 @@ async function outputJsonReport(
   reportType: JsonReportType,
   options: FilterOptions & DateFilterOptions
 ) {
-  logNativeStatus();
-
   const dateFilters = getDateFilters(options);
   const enabledSources = getEnabledSources(options);
   const onlyCursor = enabledSources?.length === 1 && enabledSources[0] === 'cursor';
   const includeCursor = !enabledSources || enabledSources.includes('cursor');
-  const localSources: SourceType[] = (enabledSources || ['opencode', 'claude', 'codex', 'gemini', 'cursor'])
+  const localSources: SourceType[] = (enabledSources || ['opencode', 'claude', 'codex', 'gemini', 'cursor', 'amp', 'droid'])
     .filter(s => s !== 'cursor');
 
-  const { fetcher, cursorSync, localMessages } = await loadDataSourcesParallel(
+  const { cursorSync, localMessages } = await loadDataSourcesParallel(
     onlyCursor ? [] : localSources,
     dateFilters
   );
@@ -829,12 +854,11 @@ async function outputJsonReport(
     process.exit(1);
   }
 
-  const emptyMessages: ParsedMessages = { messages: [], opencodeCount: 0, claudeCount: 0, codexCount: 0, geminiCount: 0, processingTimeMs: 0 };
+  const emptyMessages: ParsedMessages = { messages: [], opencodeCount: 0, claudeCount: 0, codexCount: 0, geminiCount: 0, ampCount: 0, droidCount: 0, processingTimeMs: 0 };
 
   if (reportType === "models") {
     const report = await finalizeReportAsync({
       localMessages: localMessages || emptyMessages,
-      pricing: fetcher.toPricingEntries(),
       includeCursor: includeCursor && cursorSync.synced,
       since: dateFilters.since,
       until: dateFilters.until,
@@ -844,7 +868,6 @@ async function outputJsonReport(
   } else {
     const report = await finalizeMonthlyReportAsync({
       localMessages: localMessages || emptyMessages,
-      pricing: fetcher.toPricingEntries(),
       includeCursor: includeCursor && cursorSync.synced,
       since: dateFilters.since,
       until: dateFilters.until,
@@ -857,24 +880,26 @@ async function outputJsonReport(
 interface GraphCommandOptions extends FilterOptions, DateFilterOptions {
   output?: string;
   benchmark?: boolean;
+  spinner?: boolean;
 }
 
 async function handleGraphCommand(options: GraphCommandOptions) {
-  logNativeStatus();
-
-  // Start spinner for loading phase (only if outputting to file, not stdout)
-  const spinner = options.output ? createSpinner({ color: "cyan" }) : null;
-  spinner?.start(pc.gray("Loading data sources..."));
+  const useSpinner = options.output && options.spinner !== false;
+  const spinner = useSpinner ? createSpinner({ color: "cyan" }) : null;
 
   const dateFilters = getDateFilters(options);
   const enabledSources = getEnabledSources(options);
-  // Filter out cursor for local parsing (it's synced separately via network)
-  const localSources: SourceType[] = (enabledSources || ['opencode', 'claude', 'codex', 'gemini', 'cursor'])
+  const localSources: SourceType[] = (enabledSources || ['opencode', 'claude', 'codex', 'gemini', 'cursor', 'amp', 'droid'])
     .filter(s => s !== 'cursor');
   const includeCursor = !enabledSources || enabledSources.includes('cursor');
 
-  // Two-phase parallel loading: network (Cursor + pricing) overlaps with local file parsing
-  const { fetcher, cursorSync, localMessages } = await loadDataSourcesParallel(localSources, dateFilters);
+  spinner?.start(pc.gray("Scanning session data..."));
+
+  const { cursorSync, localMessages } = await loadDataSourcesParallel(
+    localSources,
+    dateFilters,
+    (phase) => spinner?.update(phase)
+  );
   
   if (!localMessages) {
     spinner?.error('Failed to parse local session files');
@@ -886,7 +911,6 @@ async function handleGraphCommand(options: GraphCommandOptions) {
 
   const data = await finalizeGraphAsync({
     localMessages,
-    pricing: fetcher.toPricingEntries(),
     includeCursor: includeCursor && cursorSync.synced,
     since: dateFilters.since,
     until: dateFilters.until,
@@ -929,7 +953,8 @@ interface WrappedCommandOptions extends FilterOptions {
   spinner?: boolean;
   short?: boolean;
   agents?: boolean;
-  pinSisyphus?: boolean;
+  clients?: boolean;
+  disablePinned?: boolean;
 }
 
 async function handleWrappedCommand(options: WrappedCommandOptions) {
@@ -946,8 +971,8 @@ async function handleWrappedCommand(options: WrappedCommandOptions) {
       year,
       sources: enabledSources,
       short: options.short,
-      includeAgents: options.agents,
-      pinSisyphus: options.pinSisyphus,
+      includeAgents: !options.clients,
+      pinSisyphus: !options.disablePinned,
     });
 
     spinner?.stop();
@@ -966,6 +991,114 @@ async function handleWrappedCommand(options: WrappedCommandOptions) {
   }
 }
 
+async function handlePricingCommand(modelId: string, options: { json?: boolean; provider?: string; spinner?: boolean }) {
+  const validProviders = ["litellm", "openrouter"];
+  if (options.provider && !validProviders.includes(options.provider.toLowerCase())) {
+    console.log(pc.red(`\n  Invalid provider: ${options.provider}`));
+    console.log(pc.gray(`  Valid providers: ${validProviders.join(", ")}\n`));
+    process.exit(1);
+  }
+
+  const useSpinner = options.spinner !== false;
+  const spinner = useSpinner ? createSpinner({ color: "cyan" }) : null;
+  const providerLabel = options.provider ? ` from ${options.provider}` : "";
+  spinner?.start(pc.gray(`Fetching pricing data${providerLabel}...`));
+
+  let core: typeof import("@tokscale/core");
+  try {
+    const mod = await import("@tokscale/core");
+    core = (mod.default ?? mod) as typeof import("@tokscale/core");
+  } catch (importErr) {
+    spinner?.stop();
+    const errorMsg = (importErr as Error).message || "Unknown error";
+    if (options.json) {
+      console.log(JSON.stringify({ error: "Native module not available", details: errorMsg }, null, 2));
+    } else {
+      console.log(pc.red(`\n  Native module not available: ${errorMsg}`));
+      console.log(pc.gray("  Run 'bun run build:core' to build the native module.\n"));
+    }
+    process.exit(1);
+  }
+
+  try {
+    const provider = options.provider?.toLowerCase() || undefined;
+    const nativeResult = await core.lookupPricing(modelId, provider);
+    spinner?.stop();
+
+    const result = {
+      matchedKey: nativeResult.matchedKey,
+      source: nativeResult.source as "litellm" | "openrouter",
+      pricing: {
+        input_cost_per_token: nativeResult.pricing.inputCostPerToken,
+        output_cost_per_token: nativeResult.pricing.outputCostPerToken,
+        cache_read_input_token_cost: nativeResult.pricing.cacheReadInputTokenCost,
+        cache_creation_input_token_cost: nativeResult.pricing.cacheCreationInputTokenCost,
+      },
+    };
+
+    if (options.json) {
+      console.log(JSON.stringify({
+        modelId,
+        matchedKey: result.matchedKey,
+        source: result.source,
+        pricing: {
+          inputCostPerToken: result.pricing.input_cost_per_token ?? 0,
+          outputCostPerToken: result.pricing.output_cost_per_token ?? 0,
+          cacheReadInputTokenCost: result.pricing.cache_read_input_token_cost,
+          cacheCreationInputTokenCost: result.pricing.cache_creation_input_token_cost,
+        },
+      }, null, 2));
+    } else {
+      const sourceLabel = result.source.toLowerCase() === "litellm" ? pc.blue("LiteLLM") : pc.magenta("OpenRouter");
+      const inputCost = result.pricing.input_cost_per_token ?? 0;
+      const outputCost = result.pricing.output_cost_per_token ?? 0;
+      const cacheReadCost = result.pricing.cache_read_input_token_cost;
+      const cacheWriteCost = result.pricing.cache_creation_input_token_cost;
+
+      console.log(pc.cyan(`\n  Pricing for: ${pc.white(modelId)}`));
+      console.log(pc.gray(`  Matched key: ${result.matchedKey}`));
+      console.log(pc.gray(`  Source: `) + sourceLabel);
+      console.log();
+      console.log(pc.white(`  Input:  `) + formatPricePerMillion(inputCost));
+      console.log(pc.white(`  Output: `) + formatPricePerMillion(outputCost));
+      if (cacheReadCost !== undefined) {
+        console.log(pc.white(`  Cache Read:  `) + formatPricePerMillion(cacheReadCost));
+      }
+      if (cacheWriteCost !== undefined) {
+        console.log(pc.white(`  Cache Write: `) + formatPricePerMillion(cacheWriteCost));
+      }
+      console.log();
+    }
+  } catch (err) {
+    spinner?.stop();
+    const errorMsg = (err as Error).message || "Unknown error";
+    
+    // Check if this is a "model not found" error from Rust or a different error
+    const isModelNotFound = errorMsg.toLowerCase().includes("not found") || 
+                            errorMsg.toLowerCase().includes("no pricing");
+    
+    if (options.json) {
+      if (isModelNotFound) {
+        console.log(JSON.stringify({ error: "Model not found", modelId }, null, 2));
+      } else {
+        console.log(JSON.stringify({ error: errorMsg, modelId }, null, 2));
+      }
+    } else {
+      if (isModelNotFound) {
+        console.log(pc.red(`\n  Model not found: ${modelId}\n`));
+      } else {
+        console.log(pc.red(`\n  Error looking up pricing: ${errorMsg}\n`));
+      }
+    }
+    process.exit(1);
+  }
+}
+
+function formatPricePerMillion(costPerToken: number): string {
+  const perMillion = costPerToken * 1_000_000;
+  return pc.green(`$${perMillion.toFixed(2)}`) + pc.gray(" / 1M tokens");
+}
+
 function getSourceLabel(source: string): string {
   switch (source) {
     case "opencode":
@@ -978,6 +1111,10 @@ function getSourceLabel(source: string): string {
       return "Gemini";
     case "cursor":
       return "Cursor";
+    case "amp":
+      return "Amp";
+    case "droid":
+      return "Droid";
     default:
       return source;
   }