cc-api-statusline 0.1.1 → 0.1.2

package/dist/cc-api-statusline.js

@@ -134,7 +134,7 @@ var DEFAULT_CONFIG = {
     barSize: "medium",
     barStyle: "classic",
     separator: " | ",
-    maxWidth: 80,
+    maxWidth: 100,
     clockFormat: "24h"
   },
   components: {
@@ -557,8 +557,13 @@ class Logger {
       this.enabled = false;
     }
   }
+  formatLocalTimestamp() {
+    const d = new Date;
+    const pad = (n, len = 2) => n.toString().padStart(len, "0");
+    return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}.${pad(d.getMilliseconds(), 3)}`;
+  }
   format(level, message, data) {
-    const timestamp = new Date().toISOString();
+    const timestamp = this.formatLocalTimestamp();
     const dataStr = data ? ` ${JSON.stringify(data)}` : "";
     return `[${timestamp}] [${level.toUpperCase()}] ${message}${dataStr}
 `;
@@ -634,21 +639,21 @@ function detectClaudeVersion() {
 }
 
 // src/providers/sub2api.ts
-function computeNextMidnightUTC() {
+function computeNextMidnightLocal() {
   const now = new Date;
-  const tomorrow = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + 1, 0, 0, 0, 0));
+  const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1, 0, 0, 0, 0);
   return tomorrow.toISOString();
 }
-function computeNextMondayUTC() {
+function computeNextMondayLocal() {
   const now = new Date;
-  const dayOfWeek = now.getUTCDay();
+  const dayOfWeek = now.getDay();
   const daysUntilMonday = dayOfWeek === 0 ? 1 : 8 - dayOfWeek;
-  const nextMonday = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + daysUntilMonday, 0, 0, 0, 0));
+  const nextMonday = new Date(now.getFullYear(), now.getMonth(), now.getDate() + daysUntilMonday, 0, 0, 0, 0);
   return nextMonday.toISOString();
 }
-function computeFirstOfNextMonthUTC() {
+function computeFirstOfNextMonthLocal() {
   const now = new Date;
-  const nextMonth = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth() + 1, 1, 0, 0, 0, 0));
+  const nextMonth = new Date(now.getFullYear(), now.getMonth() + 1, 1, 0, 0, 0, 0);
   return nextMonth.toISOString();
 }
 function mapPeriodTokens(data) {
@@ -730,9 +735,9 @@ async function fetchSub2api(baseUrl, token, config, timeoutMs = 5000) {
       if (!sub) {
         throw new Error("Subscription mode but no subscription object in response");
       }
-      result.daily = createQuotaWindow(sub.daily_usage_usd, sub.daily_limit_usd, computeNextMidnightUTC());
-      result.weekly = createQuotaWindow(sub.weekly_usage_usd, sub.weekly_limit_usd, computeNextMondayUTC());
-      result.monthly = createQuotaWindow(sub.monthly_usage_usd, sub.monthly_limit_usd, computeFirstOfNextMonthUTC());
+      result.daily = createQuotaWindow(sub.daily_usage_usd, sub.daily_limit_usd, computeNextMidnightLocal());
+      result.weekly = createQuotaWindow(sub.weekly_usage_usd, sub.weekly_limit_usd, computeNextMondayLocal());
+      result.monthly = createQuotaWindow(sub.monthly_usage_usd, sub.monthly_limit_usd, computeFirstOfNextMonthLocal());
       result.resetsAt = computeSoonestReset(result);
     }
     if (data.usage) {
@@ -756,12 +761,12 @@ async function fetchSub2api(baseUrl, token, config, timeoutMs = 5000) {
           used: 0,
           limit: 0,
           remaining: 0,
-          resetsAt: computeNextMidnightUTC()
+          resetsAt: computeNextMidnightLocal()
         },
         weekly: null,
         monthly: null,
         balance: null,
-        resetsAt: computeNextMidnightUTC(),
+        resetsAt: computeNextMidnightLocal(),
         tokenStats: null,
         rateLimit: null
       };
@@ -1433,10 +1438,10 @@ function renderCountdown(resetsAt, config, clockFormat) {
   if (format === "auto") {
     if (remainingMs < 60000) {
       timeStr = "now";
-    } else if (remainingMs <= 86400000) {
+    } else if (remainingMs <= 604800000) {
       timeStr = formatDuration(remainingMs);
     } else {
-      timeStr = formatWallClock(resetDate, clockFormat);
+      timeStr = formatDateOnly(resetDate);
     }
   } else if (format === "duration") {
     if (remainingMs < 60000) {
@@ -1459,11 +1464,23 @@ function formatDuration(ms) {
     return `${days}d ${remainingHours}h`;
   } else if (hours >= 1) {
     const remainingMinutes = minutes % 60;
-    return `${hours}h${remainingMinutes}m`;
+    return `${hours}h ${remainingMinutes}m`;
   } else {
     return `${minutes}m`;
   }
 }
+function formatDateOnly(date) {
+  const now = new Date;
+  const dayOfWeek = date.toLocaleDateString("en-US", { weekday: "short" });
+  const month = date.toLocaleDateString("en-US", { month: "short" });
+  const dayOfMonth = date.getDate();
+  const isSameMonth = date.getFullYear() === now.getFullYear() && date.getMonth() === now.getMonth();
+  if (isSameMonth) {
+    return `${dayOfWeek} ${dayOfMonth}`;
+  } else {
+    return `${month} ${dayOfMonth}`;
+  }
+}
 function formatWallClock(date, clockFormat) {
   const now = new Date;
   const dayOfWeek = date.toLocaleDateString("en-US", { weekday: "short" });
@@ -1715,7 +1732,14 @@ function getTerminalWidth() {
   if (process.stdout.columns && process.stdout.columns > 0) {
     return process.stdout.columns;
   }
-  return 80;
+  const colsOverride = process.env["CC_STATUSLINE_COLS"];
+  if (colsOverride) {
+    const parsed = parseInt(colsOverride, 10);
+    if (!isNaN(parsed) && parsed > 0) {
+      return parsed;
+    }
+  }
+  return 200;
 }
 function computeMaxWidth(termWidth, maxWidthPct) {
   const pct = Math.max(20, Math.min(100, maxWidthPct));
@@ -1756,6 +1780,16 @@ function ansiAwareTruncate(text, maxWidth) {
   }
   return output + "…";
 }
+var COMPONENT_DROP_PRIORITY = [
+  "plan",
+  "tokens",
+  "rateLimit",
+  "monthly",
+  "countdown",
+  "weekly",
+  "daily",
+  "balance"
+];
 
 // src/renderer/index.ts
 var DEFAULT_COMPONENT_ORDER2 = [
@@ -1769,7 +1803,7 @@ var DEFAULT_COMPONENT_ORDER2 = [
 ];
 function renderStatusline(data, config, errorState, cacheAge) {
   const componentOrder = getComponentOrder(config);
-  const renderedComponents = [];
+  const componentMap = new Map;
   for (const componentId of componentOrder) {
     const componentConfig = config.components[componentId];
     if (componentConfig === false) {
@@ -1777,10 +1811,38 @@ function renderStatusline(data, config, errorState, cacheAge) {
     }
     const rendered = renderComponent(componentId, data, componentConfig === true || componentConfig === undefined ? {} : componentConfig, config);
     if (rendered !== null) {
-      renderedComponents.push(rendered);
+      componentMap.set(componentId, rendered);
     }
   }
+  const termWidth = getTerminalWidth();
+  const maxWidth = computeMaxWidth(termWidth, config.display.maxWidth ?? 100);
   const separator = config.display.separator ?? " | ";
+  const activeComponents = new Set(componentMap.keys());
+  let currentWidth = calculateStatuslineWidth(componentMap, activeComponents, componentOrder, separator, errorState, data, cacheAge);
+  for (const dropCandidate of COMPONENT_DROP_PRIORITY) {
+    if (dropCandidate === "countdown") {
+      continue;
+    }
+    if (currentWidth <= maxWidth) {
+      break;
+    }
+    if (activeComponents.size <= 1) {
+      break;
+    }
+    if (activeComponents.has(dropCandidate)) {
+      activeComponents.delete(dropCandidate);
+      currentWidth = calculateStatuslineWidth(componentMap, activeComponents, componentOrder, separator, errorState, data, cacheAge);
+    }
+  }
+  const renderedComponents = [];
+  for (const componentId of componentOrder) {
+    if (activeComponents.has(componentId)) {
+      const rendered = componentMap.get(componentId);
+      if (rendered) {
+        renderedComponents.push(rendered);
+      }
+    }
+  }
   let statusline = renderedComponents.join(separator);
   if (errorState) {
     const isTransition = errorState === "switching-provider" || errorState === "new-credentials" || errorState === "new-endpoint" || errorState === "auth-error-waiting";
@@ -1797,11 +1859,37 @@ function renderStatusline(data, config, errorState, cacheAge) {
       }
     }
   }
-  const termWidth = getTerminalWidth();
-  const maxWidth = computeMaxWidth(termWidth, config.display.maxWidth ?? 80);
   statusline = ansiAwareTruncate(statusline, maxWidth);
   return statusline;
 }
+function calculateStatuslineWidth(componentMap, activeComponents, componentOrder, separator, errorState, data, cacheAge) {
+  const components = [];
+  for (const id of componentOrder) {
+    if (activeComponents.has(id)) {
+      const rendered = componentMap.get(id);
+      if (rendered) {
+        components.push(rendered);
+      }
+    }
+  }
+  let statusline = components.join(separator);
+  if (errorState) {
+    const isTransition = errorState === "switching-provider" || errorState === "new-credentials" || errorState === "new-endpoint" || errorState === "auth-error-waiting";
+    if (isTransition) {
+      statusline = renderError(errorState, "with-cache", data.provider, undefined, cacheAge);
+    } else {
+      const hasCache = components.length > 0;
+      const errorMode = hasCache ? "with-cache" : "without-cache";
+      const errorIndicator = renderError(errorState, errorMode, data.provider, undefined, cacheAge);
+      if (hasCache) {
+        statusline = `${statusline} ${errorIndicator}`;
+      } else {
+        statusline = errorIndicator;
+      }
+    }
+  }
+  return visibleLength(statusline);
+}
 function getComponentOrder(config) {
   const explicitOrder = [];
   const explicitSet = new Set;
@@ -1878,7 +1966,7 @@ async function executeCycle(ctx) {
     if (!baseUrl || !authToken) {
       return {
         output: renderError("missing-env", "without-cache"),
-        exitCode: 1,
+        exitCode: 0,
         cacheUpdate: null
       };
     }
@@ -1898,7 +1986,8 @@ async function executeCycle(ctx) {
       ttlSeconds,
       data,
       renderedLine: statusline,
-      configHash
+      configHash,
+      errorState: null
     };
     return {
       output: statusline,
@@ -1921,7 +2010,7 @@ async function executeCycle(ctx) {
       const errorOutput = renderError("network-error", "without-cache", providerId);
       return {
         output: errorOutput,
-        exitCode: 1,
+        exitCode: 0,
         cacheUpdate: null
       };
     }
@@ -1997,7 +2086,7 @@ function uninstallStatusLine() {
 // package.json
 var package_default = {
   name: "cc-api-statusline",
-  version: "0.1.1",
+  version: "0.1.2",
   description: "Claude Code statusline tool that polls API usage from third-party proxy backends",
   type: "module",
   bin: {
@@ -2192,7 +2281,7 @@ async function main() {
   if (envError) {
     const errorOutput = renderError("missing-env", "without-cache");
     process.stdout.write(errorOutput);
-    process.exit(1);
+    process.exit(0);
   }
   const baseUrl = env.baseUrl;
   const authToken = env.authToken;
@@ -2210,7 +2299,7 @@ async function main() {
     logger.error("Provider not found", { providerId });
     const errorOutput = renderError("provider-unknown", "without-cache");
     process.stdout.write(errorOutput);
-    process.exit(1);
+    process.exit(0);
   }
   const cachedEntry = readCache(baseUrl);
   logger.debug("Cache read", {
@@ -2239,12 +2328,17 @@ async function main() {
     outputLength: result.output.length,
     cacheUpdate: !!result.cacheUpdate
   });
+  let output = result.output;
+  if (!output || output.trim().length === 0) {
+    output = "[loading...]";
+    logger.debug("Empty output detected, using fallback");
+  }
   if (isPiped) {
-    const formatted = "\x1B[0m" + result.output.replace(/ /g, " ");
+    const formatted = "\x1B[0m" + output.replace(/ /g, " ");
     process.stdout.write(formatted);
     logger.debug("Output formatted for piped mode (ANSI reset + NBSP)");
   } else {
-    process.stdout.write(result.output);
+    process.stdout.write(output);
     logger.debug("Output written (TTY mode)");
   }
   if (result.cacheUpdate) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-api-statusline",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Claude Code statusline tool that polls API usage from third-party proxy backends",
   "type": "module",
   "bin": {