ccstatusline 2.2.16 → 2.2.17

package/dist/ccstatusline.js

@@ -56039,16 +56039,26 @@ function getTTYForProcess(pid) {
   }
 }
 function getWidthForTTY(tty2) {
-  try {
-    const width = execSync(`stty size < /dev/${tty2} | awk '{print $2}'`, {
-      encoding: "utf8",
-      stdio: ["pipe", "pipe", "ignore"],
-      shell: "/bin/sh"
-    }).trim();
-    return parsePositiveInteger(width);
-  } catch {
-    return null;
+  const devicePath = `/dev/${tty2}`;
+  const attempts = [
+    `stty -F ${devicePath} size`,
+    `stty -f ${devicePath} size`,
+    `stty size < ${devicePath}`
+  ];
+  for (const cmd of attempts) {
+    try {
+      const width = execSync(`${cmd} 2>/dev/null | awk '{print $2}'`, {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "ignore"],
+        shell: "/bin/sh"
+      }).trim();
+      const parsed = parsePositiveInteger(width);
+      if (parsed !== null) {
+        return parsed;
+      }
+    } catch {}
   }
+  return null;
 }
 function getTerminalWidth() {
   return probeTerminalWidth();
@@ -56056,7 +56066,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/home/runner/work/ccstatusline/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.16";
+var __dirname = "/home/runner/work/ccstatusline/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.17";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -59430,6 +59440,9 @@ import * as fs3 from "fs";
 import * as https from "https";
 import * as os4 from "os";
 import * as path3 from "path";
+function getUsageApiBucketUtilization(bucket) {
+  return bucket === null ? 0 : bucket?.utilization ?? undefined;
+}
 function parseJsonWithSchema(rawJson, schema) {
   try {
     const parsed = schema.safeParse(JSON.parse(rawJson));
@@ -59470,13 +59483,13 @@ function parseUsageApiResponse(rawJson) {
     return null;
   }
   return {
-    sessionUsage: parsed.five_hour?.utilization ?? undefined,
+    sessionUsage: getUsageApiBucketUtilization(parsed.five_hour),
     sessionResetAt: parsed.five_hour?.resets_at ?? undefined,
-    weeklyUsage: parsed.seven_day?.utilization ?? undefined,
+    weeklyUsage: getUsageApiBucketUtilization(parsed.seven_day),
     weeklyResetAt: parsed.seven_day?.resets_at ?? undefined,
-    weeklySonnetUsage: parsed.seven_day_sonnet === null ? 0 : parsed.seven_day_sonnet?.utilization ?? undefined,
+    weeklySonnetUsage: getUsageApiBucketUtilization(parsed.seven_day_sonnet),
     weeklySonnetResetAt: parsed.seven_day_sonnet?.resets_at ?? undefined,
-    weeklyOpusUsage: parsed.seven_day_opus === null ? 0 : parsed.seven_day_opus?.utilization ?? undefined,
+    weeklyOpusUsage: getUsageApiBucketUtilization(parsed.seven_day_opus),
     weeklyOpusResetAt: parsed.seven_day_opus?.resets_at ?? undefined,
     extraUsageEnabled: parsed.extra_usage?.is_enabled ?? undefined,
     extraUsageLimit: parsed.extra_usage?.monthly_limit ?? undefined,
@@ -59801,9 +59814,11 @@ async function fetchUsageData(options = {}) {
     }
     const usageData = parseUsageApiResponse(response.body);
     if (!usageData) {
+      writeUsageLock(now2 + LOCK_MAX_AGE, "parse-error");
       return getStaleUsageOrError("parse-error", now2, LOCK_MAX_AGE, requiredFields);
     }
     if (usageData.sessionUsage === undefined && usageData.weeklyUsage === undefined) {
+      writeUsageLock(now2 + LOCK_MAX_AGE, "parse-error");
       return getStaleUsageOrError("parse-error", now2, LOCK_MAX_AGE, requiredFields);
     }
     try {
@@ -59812,10 +59827,11 @@ async function fetchUsageData(options = {}) {
     } catch {}
     return cacheUsageData(usageData, now2);
   } catch {
+    writeUsageLock(now2 + LOCK_MAX_AGE, "parse-error");
     return getStaleUsageOrError("parse-error", now2, LOCK_MAX_AGE, requiredFields);
   }
 }
-var CACHE_DIR, CACHE_FILE, LOCK_FILE, CACHE_MAX_AGE = 180, LOCK_MAX_AGE = 30, DEFAULT_RATE_LIMIT_BACKOFF = 300, MACOS_USAGE_CREDENTIALS_SERVICE = "Claude Code-credentials", MACOS_SECURITY_DUMP_MAX_BUFFER, UsageCredentialsSchema, UsageLockErrorSchema, UsageLockSchema, CachedUsageDataSchema, PerModelWeeklyBucketSchema, UsageApiResponseSchema, cachedUsageData = null, usageCacheTime = 0, usageErrorCacheMaxAge, USAGE_API_HOST = "api.anthropic.com", USAGE_API_PATH = "/api/oauth/usage", USAGE_API_TIMEOUT_MS = 5000;
+var CACHE_DIR, CACHE_FILE, LOCK_FILE, CACHE_MAX_AGE = 180, LOCK_MAX_AGE = 30, DEFAULT_RATE_LIMIT_BACKOFF = 300, MACOS_USAGE_CREDENTIALS_SERVICE = "Claude Code-credentials", MACOS_SECURITY_DUMP_MAX_BUFFER, UsageCredentialsSchema, UsageLockErrorSchema, UsageLockSchema, CachedUsageDataSchema, UsageApiBucketSchema, UsageApiResponseSchema, cachedUsageData = null, usageCacheTime = 0, usageErrorCacheMaxAge, USAGE_API_HOST = "api.anthropic.com", USAGE_API_PATH = "/api/oauth/usage", USAGE_API_TIMEOUT_MS = 5000;
 var init_usage_fetch = __esm(async () => {
   init_dist5();
   init_zod();
@@ -59826,7 +59842,7 @@ var init_usage_fetch = __esm(async () => {
   LOCK_FILE = path3.join(CACHE_DIR, "usage.lock");
   MACOS_SECURITY_DUMP_MAX_BUFFER = 8 * 1024 * 1024;
   UsageCredentialsSchema = exports_external.object({ claudeAiOauth: exports_external.object({ accessToken: exports_external.string().nullable().optional() }).optional() });
-  UsageLockErrorSchema = exports_external.enum(["timeout", "rate-limited"]);
+  UsageLockErrorSchema = exports_external.enum(["timeout", "rate-limited", "parse-error"]);
   UsageLockSchema = exports_external.object({
     blockedUntil: exports_external.number(),
     error: UsageLockErrorSchema.optional()
@@ -59846,27 +59862,21 @@ var init_usage_fetch = __esm(async () => {
     extraUsageUtilization: exports_external.number().nullable().optional(),
     error: exports_external.string().nullable().optional()
   });
-  PerModelWeeklyBucketSchema = exports_external.object({
+  UsageApiBucketSchema = exports_external.looseObject({
     utilization: exports_external.number().nullable().optional(),
     resets_at: exports_external.string().nullable().optional()
   }).nullable().optional();
-  UsageApiResponseSchema = exports_external.object({
-    five_hour: exports_external.object({
-      utilization: exports_external.number().nullable().optional(),
-      resets_at: exports_external.string().nullable().optional()
-    }).optional(),
-    seven_day: exports_external.object({
-      utilization: exports_external.number().nullable().optional(),
-      resets_at: exports_external.string().nullable().optional()
-    }).optional(),
-    seven_day_sonnet: PerModelWeeklyBucketSchema,
-    seven_day_opus: PerModelWeeklyBucketSchema,
-    extra_usage: exports_external.object({
+  UsageApiResponseSchema = exports_external.looseObject({
+    five_hour: UsageApiBucketSchema,
+    seven_day: UsageApiBucketSchema,
+    seven_day_sonnet: UsageApiBucketSchema,
+    seven_day_opus: UsageApiBucketSchema,
+    extra_usage: exports_external.looseObject({
       is_enabled: exports_external.boolean().nullable().optional(),
       monthly_limit: exports_external.number().nullable().optional(),
       used_credits: exports_external.number().nullable().optional(),
       utilization: exports_external.number().nullable().optional()
-    }).optional()
+    }).nullable().optional()
   });
   usageErrorCacheMaxAge = LOCK_MAX_AGE;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",