@tokscale/cli 1.0.24 → 1.1.0

package/src/submit.ts

@@ -10,7 +10,7 @@ import { exec } from "node:child_process";
 import { promisify } from "node:util";
 import { loadCredentials, getApiBaseUrl, loadStarCache, saveStarCache } from "./credentials.js";
 import { parseLocalSourcesAsync, finalizeReportAndGraphAsync, type ParsedMessages } from "./native.js";
-import { syncCursorCache, loadCursorCredentials } from "./cursor.js";
+import { syncCursorCache, isCursorLoggedIn, hasCursorUsageCache } from "./cursor.js";
 import type { TokenContributionData } from "./graph-types.js";
 import { formatCurrency } from "./table.js";
 
@@ -179,6 +179,9 @@ async function handleStarPrompt(username: string): Promise<void> {
 }
 
 export async function submit(options: SubmitOptions = {}): Promise<void> {
+  const submitStart = performance.now();
+  const timing: Record<string, number> = {};
+
   const credentials = loadCredentials();
   if (!credentials) {
     console.log(pc.yellow("\n  Not logged in."));
@@ -186,7 +189,9 @@ export async function submit(options: SubmitOptions = {}): Promise<void> {
     process.exit(1);
   }
 
+  let t0 = performance.now();
   await handleStarPrompt(credentials.username);
+  timing["star-prompt"] = performance.now() - t0;
 
   console.log(pc.cyan("\n  Tokscale - Submit Usage Data\n"));
 
@@ -214,6 +219,7 @@ export async function submit(options: SubmitOptions = {}): Promise<void> {
   try {
     // Two-phase processing (same as TUI) for consistency:
     // Phase 1: Parse local sources + sync cursor in parallel
+    t0 = performance.now();
     const [localMessages, cursorSync] = await Promise.all([
       parseLocalSourcesAsync({
         sources: localSources,
@@ -221,20 +227,28 @@ export async function submit(options: SubmitOptions = {}): Promise<void> {
         until: options.until,
         year: options.year,
       }),
-      includeCursor && loadCursorCredentials()
+      includeCursor && isCursorLoggedIn()
         ? syncCursorCache()
-        : Promise.resolve({ synced: false, rows: 0 }),
+        : Promise.resolve({ synced: false, rows: 0, error: undefined }),
     ]);
+    timing["parse-local+cursor-sync"] = performance.now() - t0;
+
+    if (includeCursor && cursorSync.error && (cursorSync.synced || hasCursorUsageCache())) {
+      const prefix = cursorSync.synced ? "Cursor sync warning" : "Cursor sync failed; using cached data";
+      console.log(pc.yellow(`  ${prefix}: ${cursorSync.error}`));
+    }
 
     // Phase 2: Finalize with pricing (combines local + cursor)
     // Single subprocess call ensures consistent pricing for both report and graph
+    t0 = performance.now();
     const { report, graph } = await finalizeReportAndGraphAsync({
       localMessages,
-      includeCursor: includeCursor && cursorSync.synced,
+      includeCursor: includeCursor && (cursorSync.synced || hasCursorUsageCache()),
       since: options.since,
       until: options.until,
       year: options.year,
     });
+    timing["finalize-report+graph"] = performance.now() - t0;
 
     // Use graph structure for submission, report's cost for display
     data = graph;
@@ -252,6 +266,8 @@ export async function submit(options: SubmitOptions = {}): Promise<void> {
   console.log(pc.gray(`    Total cost: ${formatCurrency(data.summary.totalCost)}`));
   console.log(pc.gray(`    Sources: ${data.summary.sources.join(", ")}`));
   console.log(pc.gray(`    Models: ${data.summary.models.length} models`));
+  console.log(pc.gray(`    Contributions: ${data.contributions.length} days`));
+  console.log(pc.gray(`    Payload size: ${(JSON.stringify(data).length / 1024).toFixed(1)} KB`));
   console.log();
 
   if (data.summary.totalTokens === 0) {
@@ -271,16 +287,22 @@ export async function submit(options: SubmitOptions = {}): Promise<void> {
   const baseUrl = getApiBaseUrl();
 
   try {
+    t0 = performance.now();
+    const body = JSON.stringify(data);
+    timing["json-serialize"] = performance.now() - t0;
+
+    t0 = performance.now();
     const response = await fetch(`${baseUrl}/api/submit`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
         Authorization: `Bearer ${credentials.token}`,
       },
-      body: JSON.stringify(data),
+      body,
     });
 
     const result: SubmitResponse = await response.json();
+    timing["server-roundtrip"] = performance.now() - t0;
 
     if (!response.ok) {
       console.error(pc.red(`\n  Error: ${result.error || "Submission failed"}`));
@@ -317,4 +339,14 @@ export async function submit(options: SubmitOptions = {}): Promise<void> {
     console.error(pc.gray(`  ${(error as Error).message}\n`));
     process.exit(1);
   }
+
+  // Timing summary
+  timing["total"] = performance.now() - submitStart;
+  console.log(pc.gray("  ⏱ Timing breakdown:"));
+  for (const [label, ms] of Object.entries(timing)) {
+    const formatted = ms < 1000 ? `${ms.toFixed(0)}ms` : `${(ms / 1000).toFixed(2)}s`;
+    const bar = "█".repeat(Math.max(1, Math.round(ms / timing["total"] * 20)));
+    console.log(pc.gray(`    ${label.padEnd(24)} ${formatted.padStart(8)}  ${bar}`));
+  }
+  console.log();
 }

package/src/tui/hooks/useData.ts

@@ -20,7 +20,7 @@ import {
   type ParsedMessages,
 } from "../../native.js";
 
-import { syncCursorCache, loadCursorCredentials } from "../../cursor.js";
+import { syncCursorCache, isCursorLoggedIn, hasCursorUsageCache } from "../../cursor.js";
 import { getModelColor } from "../utils/colors.js";
 import { loadCachedData, saveCachedData, isCacheStale, loadSettings } from "../config/settings.js";
 
@@ -156,7 +156,7 @@ async function loadData(
   setPhase?.("parsing-sources");
   
   const phase1Results = await Promise.allSettled([
-    includeCursor && loadCursorCredentials() ? syncCursorCache() : Promise.resolve({ synced: false, rows: 0 }),
+    includeCursor && isCursorLoggedIn() ? syncCursorCache() : Promise.resolve({ synced: false, rows: 0, error: undefined }),
     localSources.length > 0
       ? 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),
@@ -164,11 +164,17 @@ async function loadData(
 
   const cursorSync = phase1Results[0].status === "fulfilled" 
     ? phase1Results[0].value 
-    : { synced: false, rows: 0 };
+    : { synced: false, rows: 0, error: "Cursor sync failed" };
   const localMessages = phase1Results[1].status === "fulfilled" 
     ? phase1Results[1].value 
     : null;
 
+  if (includeCursor && cursorSync.error && (cursorSync.synced || hasCursorUsageCache())) {
+    // TUI should keep working; just emit a warning.
+    const prefix = cursorSync.synced ? "Cursor sync warning" : "Cursor sync failed; using cached data";
+    console.warn(`${prefix}: ${cursorSync.error}`);
+  }
+
   const emptyMessages: ParsedMessages = {
     messages: [],
     opencodeCount: 0,
@@ -184,7 +190,7 @@ async function loadData(
   // Single call ensures consistent pricing between report and graph
   const { report, graph } = await finalizeReportAndGraphAsync({
     localMessages: localMessages || emptyMessages,
-    includeCursor: includeCursor && cursorSync.synced,
+    includeCursor: includeCursor && (cursorSync.synced || hasCursorUsageCache()),
     since,
     until,
     year,

package/src/wrapped.ts

@@ -9,7 +9,7 @@ import {
   finalizeReportAndGraphAsync,
   type ParsedMessages,
 } from "./native.js";
-import { syncCursorCache, loadCursorCredentials } from "./cursor.js";
+import { syncCursorCache, isCursorLoggedIn, hasCursorUsageCache } from "./cursor.js";
 import { loadCredentials } from "./credentials.js";
 import type { SourceType } from "./graph-types.js";
 
@@ -218,7 +218,7 @@ async function loadWrappedData(options: WrappedOptions): Promise<WrappedData> {
   const until = `${year}-12-31`;
 
   const phase1Results = await Promise.allSettled([
-    includeCursor && loadCursorCredentials() ? syncCursorCache() : Promise.resolve({ synced: false, rows: 0 }),
+    includeCursor && isCursorLoggedIn() ? syncCursorCache() : Promise.resolve({ synced: false, rows: 0, error: undefined }),
     localSources.length > 0
       ? 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),
@@ -226,11 +226,16 @@ async function loadWrappedData(options: WrappedOptions): Promise<WrappedData> {
 
   const cursorSync = phase1Results[0].status === "fulfilled" 
     ? phase1Results[0].value 
-    : { synced: false, rows: 0 };
+    : { synced: false, rows: 0, error: "Cursor sync failed" };
   const localMessages = phase1Results[1].status === "fulfilled" 
     ? phase1Results[1].value 
     : null;
 
+  if (includeCursor && cursorSync.error && (cursorSync.synced || hasCursorUsageCache())) {
+    const prefix = cursorSync.synced ? "Cursor sync warning" : "Cursor sync failed; using cached data";
+    console.log(pc.yellow(`  ${prefix}: ${cursorSync.error}`));
+  }
+
   const emptyMessages: ParsedMessages = {
     messages: [],
     opencodeCount: 0,
@@ -244,7 +249,7 @@ async function loadWrappedData(options: WrappedOptions): Promise<WrappedData> {
 
   const { report, graph } = await finalizeReportAndGraphAsync({
     localMessages: localMessages || emptyMessages,
-    includeCursor: includeCursor && cursorSync.synced,
+    includeCursor: includeCursor && (cursorSync.synced || hasCursorUsageCache()),
     since,
     until,
     year,