triflux 2.4.7 → 3.0.0

package/hud/hud-qos-status.mjs

@@ -121,6 +121,9 @@ function getClaudeUsageStaleMs() {
 const CLAUDE_USAGE_429_BACKOFF_MS = 10 * 60 * 1000; // 429 에러 시 10분 backoff
 const CLAUDE_USAGE_ERROR_BACKOFF_MS = 3 * 60 * 1000; // 기타 에러 시 3분 backoff
 const CLAUDE_API_TIMEOUT_MS = 10_000;
+const FIVE_HOUR_MS = 5 * 60 * 60 * 1000;
+const SEVEN_DAY_MS = 7 * 24 * 60 * 60 * 1000;
+const ONE_DAY_MS = 24 * 60 * 60 * 1000;
 const DEFAULT_OAUTH_CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
 const CODEX_AUTH_PATH = join(homedir(), ".codex", "auth.json");
 const CODEX_QUOTA_CACHE_PATH = join(homedir(), ".claude", "cache", "codex-rate-limits-cache.json");
@@ -152,6 +155,14 @@ function getGeminiModelLabel(model) {
   if (model.includes("flash")) return "[Flash3]";
   return "";
 }
+// rows 임계값 상수 (selectTier 에서 tier 결정에 사용)
+const ROWS_BUDGET_FULL = 40;
+const ROWS_BUDGET_LARGE = 35;
+const ROWS_BUDGET_MEDIUM = 28;
+const ROWS_BUDGET_SMALL = 22;
+// Codex rate_limits에서 최소 수집할 버킷 수
+const CODEX_MIN_BUCKETS = 2;
+
 const GEMINI_RPM_WINDOW_MS = 60 * 1000; // 60초 슬라이딩 윈도우
 const GEMINI_QUOTA_STALE_MS = 5 * 60 * 1000; // 5분
 const GEMINI_SESSION_STALE_MS = 15 * 1000; // 15초
@@ -291,10 +302,10 @@ function selectTier(stdin, claudeUsage = null) {
   const cols = getTerminalColumns() || 120;
 
   let budget;
-  if (rows >= 40) budget = 6;
-  else if (rows >= 35) budget = 5;
-  else if (rows >= 28) budget = 4;
-  else if (rows >= 22) budget = 3;
+  if (rows >= ROWS_BUDGET_FULL) budget = 6;
+  else if (rows >= ROWS_BUDGET_LARGE) budget = 5;
+  else if (rows >= ROWS_BUDGET_MEDIUM) budget = 4;
+  else if (rows >= ROWS_BUDGET_SMALL) budget = 3;
   else if (rows > 0) budget = 2;
   else budget = 5; // rows 감지 불가 → 넉넉하게
 
@@ -437,25 +448,21 @@ function renderAlignedRows(rows) {
 function getMicroLine(stdin, claudeUsage, codexBuckets, geminiSession, geminiBucket, combinedSvPct) {
   const ctx = getContextPercent(stdin);
 
-  // Claude 5h/1w (reset 과거면 0으로 표시)
-  const cF = claudeUsage
-    ? (isResetPast(claudeUsage.fiveHourResetsAt) ? 0 : clampPercent(claudeUsage.fiveHourPercent ?? 0))
-    : null;
-  const cW = claudeUsage
-    ? (isResetPast(claudeUsage.weeklyResetsAt) ? 0 : clampPercent(claudeUsage.weeklyPercent ?? 0))
-    : null;
-  const cVal = cF != null
-    ? `${colorByProvider(cF, `${cF}`, claudeOrange)}${dim("/")}${colorByProvider(cW, `${cW}`, claudeOrange)}`
+  // Claude 5h/1w (캐시된 값 그대로 표시, 시간은 advanceToNextCycle이 처리)
+  const cF = claudeUsage?.fiveHourPercent != null ? clampPercent(claudeUsage.fiveHourPercent) : null;
+  const cW = claudeUsage?.weeklyPercent != null ? clampPercent(claudeUsage.weeklyPercent) : null;
+  const cVal = claudeUsage != null
+    ? `${cF != null ? colorByProvider(cF, `${cF}`, claudeOrange) : dim("--")}${dim("/")}${cW != null ? colorByProvider(cW, `${cW}`, claudeOrange) : dim("--")}`
     : dim("--/--");
 
-  // Codex 5h/1w
+  // Codex 5h/1w (캐시된 값 그대로 표시)
   let xVal = dim("--/--");
   if (codexBuckets) {
     const mb = codexBuckets.codex || codexBuckets[Object.keys(codexBuckets)[0]];
     if (mb) {
-      const xF = isResetPast(mb.primary?.resets_at) ? 0 : clampPercent(mb.primary?.used_percent ?? 0);
-      const xW = isResetPast(mb.secondary?.resets_at) ? 0 : clampPercent(mb.secondary?.used_percent ?? 0);
-      xVal = `${colorByProvider(xF, `${xF}`, codexWhite)}${dim("/")}${colorByProvider(xW, `${xW}`, codexWhite)}`;
+      const xF = mb.primary?.used_percent != null ? clampPercent(mb.primary.used_percent) : null;
+      const xW = mb.secondary?.used_percent != null ? clampPercent(mb.secondary.used_percent) : null;
+      xVal = `${xF != null ? colorByProvider(xF, `${xF}`, codexWhite) : dim("--")}${dim("/")}${xW != null ? colorByProvider(xW, `${xW}`, codexWhite) : dim("--")}`;
     }
   }
 
@@ -502,7 +509,7 @@ function normalizeTimeToken(value) {
   }
   const dayHour = text.match(/^(\d+)d(\d+)h$/);
   if (dayHour) {
-    return `${Number(dayHour[1])}d${Number(dayHour[2])}h`;
+    return `${Number(dayHour[1])}d${String(Number(dayHour[2])).padStart(2, "0")}h`;
   }
   return text;
 }
@@ -667,31 +674,15 @@ function parseClaudeUsageResponse(response) {
 // stale 캐시의 과거 resetsAt → 다음 주기로 순환 추정 (null 대신 다음 reset 시간 계산)
 function stripStaleResets(data) {
   if (!data) return data;
-  const now = Date.now();
   const copy = { ...data };
-
-  // 5시간 주기: 과거 reset → 5시간씩 전진하여 미래 시점 추정
   if (copy.fiveHourResetsAt) {
-    let t = new Date(copy.fiveHourResetsAt).getTime();
-    if (t < now) {
-      const cycle = 5 * 60 * 60 * 1000;
-      const elapsed = now - t;
-      t += Math.ceil(elapsed / cycle) * cycle;
-      copy.fiveHourResetsAt = new Date(t).toISOString();
-    }
+    const t = new Date(copy.fiveHourResetsAt).getTime();
+    if (!isNaN(t)) copy.fiveHourResetsAt = new Date(advanceToNextCycle(t, FIVE_HOUR_MS)).toISOString();
   }
-
-  // 7일 주기: 과거 reset → 7일씩 전진하여 미래 시점 추정
   if (copy.weeklyResetsAt) {
-    let t = new Date(copy.weeklyResetsAt).getTime();
-    if (t < now) {
-      const cycle = 7 * 24 * 60 * 60 * 1000;
-      const elapsed = now - t;
-      t += Math.ceil(elapsed / cycle) * cycle;
-      copy.weeklyResetsAt = new Date(t).toISOString();
-    }
+    const t = new Date(copy.weeklyResetsAt).getTime();
+    if (!isNaN(t)) copy.weeklyResetsAt = new Date(advanceToNextCycle(t, SEVEN_DAY_MS)).toISOString();
   }
-
   return copy;
 }
 
@@ -817,12 +808,15 @@ function scheduleClaudeUsageRefresh() {
 
   try {
     const child = spawn(process.execPath, [scriptPath, CLAUDE_REFRESH_FLAG], {
-      detached: process.platform !== "win32",
+      detached: true,
       stdio: "ignore",
       windowsHide: true,
     });
     child.unref();
-  } catch { /* 백그라운드 실행 실패 무시 */ }
+  } catch (spawnErr) {
+    // spawn 실패 시 에러 유형을 캐시에 기록 (HUD에서 원인 힌트 표시 가능)
+    writeClaudeUsageCache(null, { type: "network", status: 0, hint: String(spawnErr?.message || spawnErr) });
+  }
 }
 
 function getContextPercent(stdin) {
@@ -837,11 +831,20 @@ function getContextPercent(stdin) {
   return clampPercent((totalTokens / capacity) * 100);
 }
 
-function formatResetRemaining(isoOrUnix) {
+// 과거 리셋 시간 → 다음 주기로 순환하여 미래 시점 반환
+function advanceToNextCycle(epochMs, cycleMs) {
+  const now = Date.now();
+  if (epochMs >= now || !cycleMs) return epochMs;
+  const elapsed = now - epochMs;
+  return epochMs + Math.ceil(elapsed / cycleMs) * cycleMs;
+}
+
+function formatResetRemaining(isoOrUnix, cycleMs = 0) {
   if (!isoOrUnix) return "";
   const d = typeof isoOrUnix === "string" ? new Date(isoOrUnix) : new Date(isoOrUnix * 1000);
   if (isNaN(d.getTime())) return "";
-  const diffMs = d.getTime() - Date.now();
+  const targetMs = advanceToNextCycle(d.getTime(), cycleMs);
+  const diffMs = targetMs - Date.now();
   if (diffMs <= 0) return "";
   const totalMinutes = Math.floor(diffMs / 60000);
   const totalHours = Math.floor(totalMinutes / 60);
@@ -855,11 +858,12 @@ function isResetPast(isoOrUnix) {
   return !isNaN(d.getTime()) && d.getTime() <= Date.now();
 }
 
-function formatResetRemainingDayHour(isoOrUnix) {
+function formatResetRemainingDayHour(isoOrUnix, cycleMs = 0) {
   if (!isoOrUnix) return "";
   const d = typeof isoOrUnix === "string" ? new Date(isoOrUnix) : new Date(isoOrUnix * 1000);
   if (isNaN(d.getTime())) return "";
-  const diffMs = d.getTime() - Date.now();
+  const targetMs = advanceToNextCycle(d.getTime(), cycleMs);
+  const diffMs = targetMs - Date.now();
   if (diffMs <= 0) return "";
   const totalMinutes = Math.floor(diffMs / 60000);
   const days = Math.floor(totalMinutes / (60 * 24));
@@ -906,20 +910,33 @@ function httpsPost(url, body, accessToken) {
   });
 }
 
+// ============================================================================
+// JWT base64 디코딩 공통 헬퍼
+// ============================================================================
+/**
+ * JWT 파일에서 이메일을 추출하는 공통 헬퍼.
+ * @param {string|null} idToken - JWT 문자열
+ * @returns {string|null} 이메일 또는 null
+ */
+function decodeJwtEmail(idToken) {
+  if (!idToken) return null;
+  const parts = idToken.split(".");
+  if (parts.length < 2) return null;
+  let payload = parts[1].replace(/-/g, "+").replace(/_/g, "/");
+  while (payload.length % 4) payload += "=";
+  try {
+    const decoded = JSON.parse(Buffer.from(payload, "base64").toString("utf-8"));
+    return decoded.email || null;
+  } catch { return null; }
+}
+
 // ============================================================================
 // Codex JWT에서 이메일 추출
 // ============================================================================
 function getCodexEmail() {
   try {
     const auth = JSON.parse(readFileSync(CODEX_AUTH_PATH, "utf-8"));
-    const idToken = auth?.tokens?.id_token;
-    if (!idToken) return null;
-    const parts = idToken.split(".");
-    if (parts.length < 2) return null;
-    let payload = parts[1].replace(/-/g, "+").replace(/_/g, "/");
-    while (payload.length % 4) payload += "=";
-    const decoded = JSON.parse(Buffer.from(payload, "base64").toString("utf-8"));
-    return decoded.email || null;
+    return decodeJwtEmail(auth?.tokens?.id_token);
   } catch { return null; }
 }
 
@@ -929,23 +946,21 @@ function getCodexEmail() {
 function getGeminiEmail() {
   try {
     const oauth = readJson(GEMINI_OAUTH_PATH, null);
-    const idToken = oauth?.id_token;
-    if (!idToken) return null;
-    const parts = idToken.split(".");
-    if (parts.length < 2) return null;
-    let payload = parts[1].replace(/-/g, "+").replace(/_/g, "/");
-    while (payload.length % 4) payload += "=";
-    const decoded = JSON.parse(Buffer.from(payload, "base64").toString("utf-8"));
-    return decoded.email || null;
+    return decodeJwtEmail(oauth?.id_token);
   } catch { return null; }
 }
 
 // ============================================================================
 // Codex 세션 JSONL에서 실제 rate limits 추출
+// 한계: rate_limits는 세션별 스냅샷이므로 여러 세션 간 토큰 합산은 불가.
+// 오늘 날짜의 모든 세션 파일을 스캔해 가장 최신 rate_limits 버킷을 수집한다.
+// (단일 파일 즉시 return 방식에서 → 당일 전체 스캔 후 최신 데이터 우선 병합으로 변경)
 // ============================================================================
 function getCodexRateLimits() {
   const now = new Date();
-  let todayHasFiles = false;
+  let syntheticBucket = null; // 오늘 token_count에서 합성 (행 활성화 + 토큰 데이터용)
+
+  // 2일간 스캔: 실제 rate_limits 우선, 합성 버킷은 폴백
   for (let dayOffset = 0; dayOffset <= 1; dayOffset++) {
     const d = new Date(now.getTime() - dayOffset * 86_400_000);
     const sessDir = join(
@@ -958,18 +973,19 @@ function getCodexRateLimits() {
     let files;
     try { files = readdirSync(sessDir).filter((f) => f.endsWith(".jsonl")).sort().reverse(); }
     catch { continue; }
-    if (dayOffset === 0 && files.length > 0) todayHasFiles = true;
+
+    const mergedBuckets = {};
     for (const file of files) {
       try {
         const content = readFileSync(join(sessDir, file), "utf-8");
         const lines = content.trim().split("\n").reverse();
-        const buckets = {};
         for (const line of lines) {
           try {
             const evt = JSON.parse(line);
             const rl = evt?.payload?.rate_limits;
-            if (rl?.limit_id && !buckets[rl.limit_id]) {
-              buckets[rl.limit_id] = {
+            if (rl?.limit_id && !mergedBuckets[rl.limit_id]) {
+              // 실제 rate_limits: limit_id별 최신 이벤트만 기록
+              mergedBuckets[rl.limit_id] = {
                 limitId: rl.limit_id, limitName: rl.limit_name,
                 primary: rl.primary, secondary: rl.secondary,
                 credits: rl.credits,
@@ -977,17 +993,33 @@ function getCodexRateLimits() {
                 contextWindow: evt.payload?.info?.model_context_window,
                 timestamp: evt.timestamp,
               };
+            } else if (dayOffset === 0 && !rl && evt?.payload?.info?.total_token_usage && !syntheticBucket) {
+              // 오늘 token_count: 합성 버킷 (rate_limits가 null일 때 행 활성화용)
+              syntheticBucket = {
+                limitId: "codex", limitName: "codex-session",
+                primary: null, secondary: null,
+                credits: null,
+                tokens: evt.payload.info.total_token_usage,
+                contextWindow: evt.payload.info.model_context_window,
+                timestamp: evt.timestamp,
+              };
             }
           } catch { /* 라인 파싱 실패 무시 */ }
-          if (Object.keys(buckets).length >= 2) break;
+          if (Object.keys(mergedBuckets).length >= CODEX_MIN_BUCKETS) break;
         }
-        if (Object.keys(buckets).length > 0) return buckets;
       } catch { /* 파일 읽기 실패 무시 */ }
     }
-    // 오늘 세션 파일이 존재하지만 rate_limits가 없으면 어제 stale 데이터로 폴백하지 않음
-    if (todayHasFiles && dayOffset === 0) return null;
+    // 실제 rate_limits 발견 → 오늘 토큰 데이터 병합 후 즉시 반환
+    if (Object.keys(mergedBuckets).length > 0) {
+      if (syntheticBucket) {
+        const main = mergedBuckets.codex || mergedBuckets[Object.keys(mergedBuckets)[0]];
+        if (main && !main.tokens) main.tokens = syntheticBucket.tokens;
+      }
+      return mergedBuckets;
+    }
   }
-  return null;
+  // 실제 rate_limits 없음 → 합성 버킷이라도 반환 (행 활성화)
+  return syntheticBucket ? { codex: syntheticBucket } : null;
 }
 
 // ============================================================================
@@ -1007,8 +1039,28 @@ async function fetchGeminiQuota(accountId, options = {}) {
     return cache;
   }
 
-  if (!oauth?.access_token) return cache;
-  if (oauth.expiry_date && oauth.expiry_date < Date.now()) return cache; // 만료 시 stale 캐시
+  if (!oauth?.access_token) {
+    // access_token 없음: 에러 힌트를 캐시에 기록하고 stale 캐시 반환
+    writeJsonSafe(GEMINI_QUOTA_CACHE_PATH, {
+      ...(cache || {}),
+      timestamp: cache?.timestamp || Date.now(),
+      error: true,
+      errorType: "auth",
+      errorHint: "no access_token in oauth_creds.json",
+    });
+    return cache;
+  }
+  if (oauth.expiry_date && oauth.expiry_date < Date.now()) {
+    // OAuth 토큰 만료: 에러 힌트를 캐시에 기록 (refresh_token 갱신은 Gemini CLI 담당)
+    writeJsonSafe(GEMINI_QUOTA_CACHE_PATH, {
+      ...(cache || {}),
+      timestamp: cache?.timestamp || Date.now(),
+      error: true,
+      errorType: "auth",
+      errorHint: `token expired at ${new Date(oauth.expiry_date).toISOString()}`,
+    });
+    return cache;
+  }
 
   // 3. projectId (캐시 or API)
   const fetchProjectId = async () => {
@@ -1045,7 +1097,18 @@ async function fetchGeminiQuota(accountId, options = {}) {
     );
   }
 
-  if (!quotaRes?.buckets) return cache;
+  if (!quotaRes?.buckets) {
+    // API 응답에 buckets 없음: 에러 코드 또는 응답 내용을 캐시에 기록
+    const apiError = quotaRes?.error?.message || quotaRes?.error?.code || quotaRes?.error || "no buckets in response";
+    writeJsonSafe(GEMINI_QUOTA_CACHE_PATH, {
+      ...(cache || {}),
+      timestamp: cache?.timestamp || Date.now(),
+      error: true,
+      errorType: "api",
+      errorHint: String(apiError),
+    });
+    return cache;
+  }
 
   // 5. 캐시 저장
   const result = {
@@ -1120,13 +1183,20 @@ function scheduleGeminiQuotaRefresh(accountId) {
       process.execPath,
       [scriptPath, GEMINI_REFRESH_FLAG, "--account", accountId || "gemini-main"],
       {
-        detached: process.platform !== "win32",
+        detached: true,
         stdio: "ignore",
         windowsHide: true,
       },
     );
     child.unref();
-  } catch { /* 백그라운드 실행 실패 무시 */ }
+  } catch (spawnErr) {
+    // spawn 실패 시 캐시에 에러 힌트 기록 (다음 HUD 렌더에서 원인 확인 가능)
+    writeJsonSafe(GEMINI_QUOTA_CACHE_PATH, {
+      timestamp: Date.now(),
+      error: true,
+      errorHint: String(spawnErr?.message || spawnErr),
+    });
+  }
 }
 
 function readCodexRateLimitSnapshot() {
@@ -1152,12 +1222,20 @@ function scheduleCodexRateLimitRefresh() {
   if (!scriptPath) return;
   try {
     const child = spawn(process.execPath, [scriptPath, CODEX_REFRESH_FLAG], {
-      detached: process.platform !== "win32",
+      detached: true,
       stdio: "ignore",
       windowsHide: true,
     });
     child.unref();
-  } catch { /* 백그라운드 실행 실패 무시 */ }
+  } catch (spawnErr) {
+    // spawn 실패 시 캐시에 에러 힌트 기록
+    writeJsonSafe(CODEX_QUOTA_CACHE_PATH, {
+      timestamp: Date.now(),
+      buckets: null,
+      error: true,
+      errorHint: String(spawnErr?.message || spawnErr),
+    });
+  }
 }
 
 function readGeminiSessionSnapshot() {
@@ -1183,7 +1261,7 @@ function scheduleGeminiSessionRefresh() {
   if (!scriptPath) return;
   try {
     const child = spawn(process.execPath, [scriptPath, GEMINI_SESSION_REFRESH_FLAG], {
-      detached: process.platform !== "win32",
+      detached: true,
       stdio: "ignore",
       windowsHide: true,
     });
@@ -1265,13 +1343,14 @@ function getClaudeRows(stdin, claudeUsage, combinedSvPct) {
   const svSuffix = `${dim("sv:")}${svStr}`;
 
   // API 실측 데이터 사용 (없으면 플레이스홀더)
-  const fiveHourPercent = isResetPast(claudeUsage?.fiveHourResetsAt) ? 0 : (claudeUsage?.fiveHourPercent ?? 0);
-  const weeklyPercent = isResetPast(claudeUsage?.weeklyResetsAt) ? 0 : (claudeUsage?.weeklyPercent ?? 0);
+  // 캐시된 percent 그대로 사용 (시간 표시는 advanceToNextCycle이 처리)
+  const fiveHourPercent = claudeUsage?.fiveHourPercent ?? null;
+  const weeklyPercent = claudeUsage?.weeklyPercent ?? null;
   const fiveHourReset = claudeUsage?.fiveHourResetsAt
-    ? formatResetRemaining(claudeUsage.fiveHourResetsAt)
+    ? formatResetRemaining(claudeUsage.fiveHourResetsAt, FIVE_HOUR_MS)
     : "n/a";
   const weeklyReset = claudeUsage?.weeklyResetsAt
-    ? formatResetRemainingDayHour(claudeUsage.weeklyResetsAt)
+    ? formatResetRemainingDayHour(claudeUsage.weeklyResetsAt, SEVEN_DAY_MS)
     : "n/a";
 
   const hasData = claudeUsage != null;
@@ -1285,14 +1364,23 @@ function getClaudeRows(stdin, claudeUsage, combinedSvPct) {
       return [{ prefix, left: quotaSection, right: "" }];
     }
     if (cols < 40) {
-      const quotaSection = `${colorByProvider(fiveHourPercent, `${fiveHourPercent}%`, claudeOrange)}${dim("/")}` +
-        `${colorByProvider(weeklyPercent, `${weeklyPercent}%`, claudeOrange)} ` +
+      // null이면 '--' 플레이스홀더, 아니면 실제 값
+      const fStr = fiveHourPercent != null ? `${colorByProvider(fiveHourPercent, `${fiveHourPercent}%`, claudeOrange)}` : dim("--");
+      const wStr = weeklyPercent != null ? `${colorByProvider(weeklyPercent, `${weeklyPercent}%`, claudeOrange)}` : dim("--");
+      const quotaSection = `${fStr}${dim("/")}${wStr} ` +
         `${dim("ctx:")}${colorByPercent(contextPercent, `${contextPercent}%`)}`;
       return [{ prefix, left: quotaSection, right: "" }];
     }
     // nano: c: 5h  12% 1w  95% sv:  191% ctx:90%
-    const quotaSection = `${dim("5h")} ${colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)} ` +
-      `${dim("1w")} ${colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)} ` +
+    // null이면 '--%' 플레이스홀더 표시
+    const fCellNano = fiveHourPercent != null
+      ? colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)
+      : dim(formatPlaceholderPercentCell());
+    const wCellNano = weeklyPercent != null
+      ? colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)
+      : dim(formatPlaceholderPercentCell());
+    const quotaSection = `${dim("5h")} ${fCellNano} ` +
+      `${dim("1w")} ${wCellNano} ` +
       `${dim("sv:")}${svStr} ${dim("ctx:")}${colorByPercent(contextPercent, `${contextPercent}%`)}`;
     return [{ prefix, left: quotaSection, right: "" }];
   }
@@ -1305,8 +1393,15 @@ function getClaudeRows(stdin, claudeUsage, combinedSvPct) {
       return [{ prefix, left: quotaSection, right: "" }];
     }
     // compact: c: 5h: 14% 1w: 96% | sv:  191% ctx:43%
-    const quotaSection = `${dim("5h:")}${colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)} ` +
-      `${dim("1w:")}${colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)} ` +
+    // null이면 '--%' 플레이스홀더 표시
+    const fCellCmp = fiveHourPercent != null
+      ? colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)
+      : dim(formatPlaceholderPercentCell());
+    const wCellCmp = weeklyPercent != null
+      ? colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)
+      : dim(formatPlaceholderPercentCell());
+    const quotaSection = `${dim("5h:")}${fCellCmp} ` +
+      `${dim("1w:")}${wCellCmp} ` +
       `${dim("|")} ${svSuffix} ${dim("ctx:")}${colorByPercent(contextPercent, `${contextPercent}%`)}`;
     return [{ prefix, left: quotaSection, right: "" }];
   }
@@ -1321,13 +1416,20 @@ function getClaudeRows(stdin, claudeUsage, combinedSvPct) {
     return [{ prefix, left: quotaSection, right: contextSection }];
   }
 
-  const fiveHourPercentCell = formatPercentCell(fiveHourPercent);
-  const weeklyPercentCell = formatPercentCell(weeklyPercent);
+  // null이면 dim 바 + '--%' 플레이스홀더, 아니면 실제 값 표시
+  const fiveHourPercentCell = fiveHourPercent != null
+    ? colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)
+    : dim(formatPlaceholderPercentCell());
+  const weeklyPercentCell = weeklyPercent != null
+    ? colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)
+    : dim(formatPlaceholderPercentCell());
+  const fiveHourBar = fiveHourPercent != null ? tierBar(fiveHourPercent, CLAUDE_ORANGE) : tierDimBar();
+  const weeklyBar = weeklyPercent != null ? tierBar(weeklyPercent, CLAUDE_ORANGE) : tierDimBar();
   const fiveHourTimeCell = formatTimeCell(fiveHourReset);
   const weeklyTimeCell = formatTimeCellDH(weeklyReset);
-  const quotaSection = `${dim("5h:")}${tierBar(fiveHourPercent, CLAUDE_ORANGE)}${colorByProvider(fiveHourPercent, fiveHourPercentCell, claudeOrange)} ` +
+  const quotaSection = `${dim("5h:")}${fiveHourBar}${fiveHourPercentCell} ` +
     `${dim(fiveHourTimeCell)} ` +
-    `${dim("1w:")}${tierBar(weeklyPercent, CLAUDE_ORANGE)}${colorByProvider(weeklyPercent, weeklyPercentCell, claudeOrange)} ` +
+    `${dim("1w:")}${weeklyBar}${weeklyPercentCell} ` +
     `${dim(weeklyTimeCell)}`;
   const contextSection = `${svSuffix} ${dim("|")} ${dim("ctx:")}${colorByPercent(contextPercent, `${contextPercent}%`)}`;
   return [{ prefix, left: quotaSection, right: contextSection }];
@@ -1368,12 +1470,15 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
     if (realQuota?.type === "codex") {
       const main = realQuota.buckets.codex || realQuota.buckets[Object.keys(realQuota.buckets)[0]];
       if (main) {
-        const fiveP = isResetPast(main.primary?.resets_at) ? 0 : clampPercent(main.primary?.used_percent ?? 0);
-        const weekP = isResetPast(main.secondary?.resets_at) ? 0 : clampPercent(main.secondary?.used_percent ?? 0);
+        // 캐시된 값 그대로 표시 (시간은 advanceToNextCycle이 처리)
+        const fiveP = main.primary?.used_percent != null ? clampPercent(main.primary.used_percent) : null;
+        const weekP = main.secondary?.used_percent != null ? clampPercent(main.secondary.used_percent) : null;
+        const fCellN = fiveP != null ? colorByProvider(fiveP, formatPercentCell(fiveP), provFn) : dim(formatPlaceholderPercentCell());
+        const wCellN = weekP != null ? colorByProvider(weekP, formatPercentCell(weekP), provFn) : dim(formatPlaceholderPercentCell());
         if (cols < 40) {
-          return { prefix: minPrefix, left: `${colorByProvider(fiveP, formatPercentCell(fiveP), provFn)}${dim("/")}${colorByProvider(weekP, formatPercentCell(weekP), provFn)}${svCompact}`, right: "" };
+          return { prefix: minPrefix, left: `${fCellN}${dim("/")}${wCellN}${svCompact}`, right: "" };
         }
-        return { prefix: minPrefix, left: `${dim("5h")} ${colorByProvider(fiveP, formatPercentCell(fiveP), provFn)} ${dim("1w")} ${colorByProvider(weekP, formatPercentCell(weekP), provFn)}${svCompact}`, right: "" };
+        return { prefix: minPrefix, left: `${dim("5h")} ${fCellN} ${dim("1w")} ${wCellN}${svCompact}`, right: "" };
       }
     }
     if (realQuota?.type === "gemini") {
@@ -1393,10 +1498,13 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
     if (realQuota?.type === "codex") {
       const main = realQuota.buckets.codex || realQuota.buckets[Object.keys(realQuota.buckets)[0]];
       if (main) {
-        const fiveP = isResetPast(main.primary?.resets_at) ? 0 : clampPercent(main.primary?.used_percent ?? 0);
-        const weekP = isResetPast(main.secondary?.resets_at) ? 0 : clampPercent(main.secondary?.used_percent ?? 0);
-        quotaSection = `${dim("5h:")}${colorByProvider(fiveP, formatPercentCell(fiveP), provFn)} ` +
-          `${dim("1w:")}${colorByProvider(weekP, formatPercentCell(weekP), provFn)}`;
+        // 캐시된 값 그대로 표시 (시간은 advanceToNextCycle이 처리)
+        const fiveP = main.primary?.used_percent != null ? clampPercent(main.primary.used_percent) : null;
+        const weekP = main.secondary?.used_percent != null ? clampPercent(main.secondary.used_percent) : null;
+        const fCell = fiveP != null ? colorByProvider(fiveP, formatPercentCell(fiveP), provFn) : dim(formatPlaceholderPercentCell());
+        const wCell = weekP != null ? colorByProvider(weekP, formatPercentCell(weekP), provFn) : dim(formatPlaceholderPercentCell());
+        quotaSection = `${dim("5h:")}${fCell} ` +
+          `${dim("1w:")}${wCell}`;
       }
     }
     if (realQuota?.type === "gemini") {
@@ -1409,7 +1517,7 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
       }
     }
     if (!quotaSection) {
-      quotaSection = `${dim("5h:")}${provFn("0%".padStart(PERCENT_CELL_WIDTH))} ${dim("1w:")}${provFn("0%".padStart(PERCENT_CELL_WIDTH))}`;
+      quotaSection = `${dim("5h:")}${dim(formatPlaceholderPercentCell())} ${dim("1w:")}${dim(formatPlaceholderPercentCell())}`;
     }
     const prefix = `${bold(markerColor(`${marker}`))}:`;
     // compact: sv + 계정 (모델 라벨 제거)
@@ -1420,13 +1528,18 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
   if (realQuota?.type === "codex") {
     const main = realQuota.buckets.codex || realQuota.buckets[Object.keys(realQuota.buckets)[0]];
     if (main) {
-      const fiveP = isResetPast(main.primary?.resets_at) ? 0 : clampPercent(main.primary?.used_percent ?? 0);
-      const weekP = isResetPast(main.secondary?.resets_at) ? 0 : clampPercent(main.secondary?.used_percent ?? 0);
-      const fiveReset = formatResetRemaining(main.primary?.resets_at) || "n/a";
-      const weekReset = formatResetRemainingDayHour(main.secondary?.resets_at) || "n/a";
-      quotaSection = `${dim("5h:")}${tierBar(fiveP, provAnsi)}${colorByProvider(fiveP, formatPercentCell(fiveP), provFn)} ` +
+      // 캐시된 값 그대로 표시 (시간은 advanceToNextCycle이 처리)
+      const fiveP = main.primary?.used_percent != null ? clampPercent(main.primary.used_percent) : null;
+      const weekP = main.secondary?.used_percent != null ? clampPercent(main.secondary.used_percent) : null;
+      const fiveReset = formatResetRemaining(main.primary?.resets_at, FIVE_HOUR_MS) || "n/a";
+      const weekReset = formatResetRemainingDayHour(main.secondary?.resets_at, SEVEN_DAY_MS) || "n/a";
+      const fCell = fiveP != null ? colorByProvider(fiveP, formatPercentCell(fiveP), provFn) : dim(formatPlaceholderPercentCell());
+      const wCell = weekP != null ? colorByProvider(weekP, formatPercentCell(weekP), provFn) : dim(formatPlaceholderPercentCell());
+      const fBar = fiveP != null ? tierBar(fiveP, provAnsi) : tierDimBar();
+      const wBar = weekP != null ? tierBar(weekP, provAnsi) : tierDimBar();
+      quotaSection = `${dim("5h:")}${fBar}${fCell} ` +
         `${dim(formatTimeCell(fiveReset))} ` +
-        `${dim("1w:")}${tierBar(weekP, provAnsi)}${colorByProvider(weekP, formatPercentCell(weekP), provFn)} ` +
+        `${dim("1w:")}${wBar}${wCell} ` +
         `${dim(formatTimeCellDH(weekReset))}`;
     }
   }
@@ -1435,7 +1548,7 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
     const bucket = realQuota.quotaBucket;
     if (bucket) {
       const usedP = clampPercent((1 - (bucket.remainingFraction ?? 1)) * 100);
-      const rstRemaining = formatResetRemaining(bucket.resetTime) || "n/a";
+      const rstRemaining = formatResetRemaining(bucket.resetTime, ONE_DAY_MS) || "n/a";
       quotaSection = `${dim("1d:")}${tierBar(usedP, provAnsi)}${colorByProvider(usedP, formatPercentCell(usedP), provFn)} ${dim(formatTimeCell(rstRemaining))} ` +
         `${dim("1w:")}${tierInfBar()}${dim("\u221E%".padStart(PERCENT_CELL_WIDTH))} ${dim(formatTimeCellDH("-d--h"))}`;
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "2.4.7",
+  "version": "3.0.0",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "type": "module",
   "bin": {