@tokscale/cli 1.0.24 → 1.1.1

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";
 
@@ -221,16 +221,21 @@ 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 }),
     ]);
 
+    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
     const { report, graph } = await finalizeReportAndGraphAsync({
       localMessages,
-      includeCursor: includeCursor && cursorSync.synced,
+      includeCursor: includeCursor && (cursorSync.synced || hasCursorUsageCache()),
       since: options.since,
       until: options.until,
       year: options.year,

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,