@triflux/core 10.57.0 → 10.57.2

package/hud/constants.mjs

@@ -17,6 +17,8 @@ export const CLAUDE_BAND_MARKER_DIR = join(
 export const BAND_FLAG = "--band";
 export const BAND_HEADER = "tfx-band 1";
 export const BAND_ALL_TTL_MS = 3 * 60 * 1000;
+// 양옆 여백 4칸과 첫 행 오른쪽 알림 자리 30칸.
+export const STATUSLINE_RESERVE_COLS = 34;
 export const CLAUDE_BAND_MARKER_TTL_MS = 12 * 60 * 60 * 1000;
 
 export const CONTEXT_MONITOR_CACHE_PATH = join(

package/hud/hud-qos-status.mjs

@@ -24,6 +24,7 @@ import {
   CODEX_REFRESH_FLAG,
   getCodexAuthPath,
   getCodexHome,
+  STATUSLINE_RESERVE_COLS,
 } from "./constants.mjs";
 import { buildContextUsageView } from "./context-monitor.mjs";
 import {
@@ -69,11 +70,15 @@ async function main() {
 
   // --band: triflux mods 가 입력창 위에 그릴 줄을 만든다. statusLine 은 band 가 다 그리는 세션에서 비운다.
   const bandMode = process.argv.includes(BAND_FLAG);
+  // statusLine 은 엔진이 양옆에 2칸씩 여백을 두고, 첫 행 오른쪽에 알림을 띄운다(공식 문서). 그만큼 좁게 그린다.
+  // 알림 자리를 빼고 40칸이 안 남는 좁은 화면은 그대로 두어 원래 축소 단계를 따른다.
+  const reserved = Number(process.env.COLUMNS) - STATUSLINE_RESERVE_COLS;
+  if (!bandMode && reserved >= 40) process.env.COLUMNS = String(reserved);
   const stdin = await readStdinJson();
   const bandState = bandMode ? "none" : readBandState(stdin?.session_id);
   if (bandState === "all") return;
-  // mods 가 넘긴 세션 사용량이 있으면 Claude API 를 따로 조회하지 않는다.
-  const bandClaudeUsage = claudeUsageFromRateLimits(stdin?.claude_rate_limits);
+  // Claude Code 가 넘긴 세션 사용량이 있으면 Claude API 를 따로 조회하지 않는다.
+  const stdinClaudeUsage = claudeUsageFromStdin(stdin);
 
   const { showCodex, antigravityAllowed } = resolveHudCliVisibility();
   const claudeUsageSnapshot = readClaudeUsageSnapshot();
@@ -84,7 +89,7 @@ async function main() {
   if (antigravitySnapshot?.shouldRefresh) scheduleAntigravityQuotaRefresh();
   // 설정이 없는 홈에서는 갱신 프로세스를 시작하지 않는다.
   if (
-    !bandClaudeUsage &&
+    !stdinClaudeUsage &&
     claudeUsageSnapshot.shouldRefresh &&
     existsSync(join(homedir(), ".claude"))
   ) {
@@ -96,7 +101,7 @@ async function main() {
 
   const contextView = buildContextUsageView(stdin);
   const claudeUsage =
-    bandClaudeUsage ??
+    stdinClaudeUsage ??
     (claudeUsageSnapshot.data
       ? { ...claudeUsageSnapshot.data, stale: claudeUsageSnapshot.isStale }
       : null);
@@ -123,7 +128,12 @@ async function main() {
   const rows =
     bandState === "claude"
       ? []
-      : getClaudeRows(currentTier, contextView, claudeUsage);
+      : getClaudeRows(
+          currentTier,
+          contextView,
+          claudeUsage,
+          Number(stdin?.cost?.total_cost_usd ?? Number.NaN),
+        );
   let codexRowIndex = -1;
   if (showCodex) {
     codexRowIndex = rows.length;
@@ -191,16 +201,30 @@ function readBandState(sessionId) {
   }
 }
 
-// mods 의 $.session.usage() rateLimits 를 HUD 의 Claude 사용량 형식으로 바꾼다.
-function claudeUsageFromRateLimits(rateLimits) {
-  if (!Array.isArray(rateLimits)) return null;
-  const find = (kind) => rateLimits.find((w) => w?.kind === kind);
-  const fiveHour = find("five_hour");
-  const weekly = find("seven_day");
-  const spendLimit = find("spend_limit");
+// statusLine 입력의 rate_limits(Claude Code 2.1.251+, Pro/Max 와 gateway)를 HUD 의 Claude 사용량 형식으로 바꾼다.
+// 10.57.0 mods 가 넘기던 claude_rate_limits 배열도 받는다.
+function claudeUsageFromStdin(stdin) {
+  const windows = {};
+  const limits = stdin?.rate_limits;
+  if (limits && typeof limits === "object" && !Array.isArray(limits)) {
+    for (const kind of ["five_hour", "seven_day", "spend_limit"]) {
+      const w = limits[kind];
+      if (w)
+        windows[kind] = { percent: w.used_percentage, resetsAt: w.resets_at };
+    }
+  } else if (Array.isArray(stdin?.claude_rate_limits)) {
+    for (const w of stdin.claude_rate_limits)
+      if (w?.kind)
+        windows[w.kind] = { percent: w.percentUsed, resetsAt: w.resetsAt };
+  }
+  const {
+    five_hour: fiveHour,
+    seven_day: weekly,
+    spend_limit: spendLimit,
+  } = windows;
   if (!fiveHour && !weekly && !spendLimit) return null;
   const percent = (w) =>
-    Number.isFinite(w?.percentUsed) ? Math.round(w.percentUsed) : null;
+    Number.isFinite(w?.percent) ? Math.round(w.percent) : null;
   return {
     fiveHourPercent: percent(fiveHour),
     weeklyPercent: percent(weekly),

package/hud/hud-statusline.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+# statusLine 진입점. triflux mods band 가 HUD 를 입력창 위에 그리는 세션이면 node 를 띄우지 않고 끝낸다.
+# band 는 1분마다 표식에 "all:<시각>" 을 다시 쓰므로, 3분 넘게 멈췄거나 표식이 없으면 HUD 를 그대로 돌린다.
+# 인자 1: node 실행 파일(없으면 PATH 의 node).
+# Claude Code 는 입력을 닫아 주지만, 닫히지 않아도 1초 뒤에는 읽기를 끝낸다.
+# 백그라운드 명령은 stdin 이 /dev/null 로 바뀌므로 fd 3 으로 넘긴다.
+exec 3<&0
+input=$({ cat <&3 & cat_pid=$!; (sleep 1; kill "$cat_pid" 2>/dev/null) >/dev/null 2>&1 & wait "$cat_pid"; })
+exec 3<&-
+sid=$(printf '%s' "$input" | sed -n 's/.*"session_id"[[:space:]]*:[[:space:]]*"\([A-Za-z0-9_-]*\)".*/\1/p' | head -n 1)
+marker="$HOME/.claude/cache/triflux/claude-band/$sid"
+if [ -n "$sid" ] && [ -f "$marker" ] && [ -n "$(find "$marker" -mmin -3 2>/dev/null)" ]; then
+  case "$(head -c 4 "$marker")" in all:) exit 0 ;; esac
+fi
+printf '%s' "$input" | "${1:-node}" "$(dirname "$0")/hud-qos-status.mjs"

package/hud/providers/claude.mjs

@@ -26,8 +26,10 @@ import {
   SPAWN_LOCK_TTL_MS,
 } from "../constants.mjs";
 import {
+  acquireSpawnLock,
   advanceToNextCycle,
   clampPercent,
+  parseRetryAfterMs,
   readJson,
   writeJsonSafe,
 } from "../utils.mjs";
@@ -77,10 +79,27 @@ export function computeClaudeUsagePollState({
   };
 }
 
+// 서버가 Retry-After 로 더 기다리라고 하면 따르되, 잘못된 큰 값에 오래 묶이지 않게 1시간에서 자른다.
+const MAX_RETRY_AFTER_MS = 60 * 60 * 1000;
+function withRetryAfter(pollState, retryAfterMs) {
+  if (!retryAfterMs) return pollState;
+  return {
+    ...pollState,
+    delayMs: Math.max(
+      pollState.delayMs,
+      Math.min(retryAfterMs, MAX_RETRY_AFTER_MS),
+    ),
+  };
+}
+
 function getSnapshotSchedule(cache) {
   const timestamp = Number(cache?.timestamp);
   const nextRefreshAt = Number(cache?.nextRefreshAt);
-  if (Number.isFinite(nextRefreshAt)) {
+  // 다음 갱신이 상한보다 멀면 시계가 뒤로 간 것이다. 그대로 두면 갱신이 오래 멈춘다.
+  if (
+    Number.isFinite(nextRefreshAt) &&
+    nextRefreshAt - Date.now() <= MAX_RETRY_AFTER_MS
+  ) {
     return {
       nextRefreshAt,
       shouldRefresh: Date.now() >= nextRefreshAt,
@@ -448,7 +467,11 @@ export function fetchClaudeUsageFromApi(accessToken) {
               resolve({ ok: false, status: 0 });
             }
           } else {
-            resolve({ ok: false, status: res.statusCode });
+            resolve({
+              ok: false,
+              status: res.statusCode,
+              retryAfterMs: parseRetryAfterMs(res.headers?.["retry-after"]),
+            });
           }
         });
       },
@@ -674,10 +697,13 @@ export async function fetchClaudeUsage(forceRefresh = false) {
             : "unknown";
     const pollState =
       errorType === "rate_limit"
-        ? computeClaudeUsagePollState({
-            consecutive429s,
-            outcome: "rate_limit",
-          })
+        ? withRetryAfter(
+            computeClaudeUsagePollState({
+              consecutive429s,
+              outcome: "rate_limit",
+            }),
+            result.retryAfterMs,
+          )
         : null;
     writeClaudeUsageCache(
       existingSnapshot.data,
@@ -720,11 +746,7 @@ export function scheduleClaudeUsageRefresh() {
 
   // 스폰 락: 30초 내 이미 스폰했으면 중복 방지 (첫 설치 시 429 방지)
   try {
-    if (existsSync(CLAUDE_REFRESH_LOCK_PATH)) {
-      const lockAge = Date.now() - readJson(CLAUDE_REFRESH_LOCK_PATH, {}).t;
-      if (lockAge < SPAWN_LOCK_TTL_MS) return;
-    }
-    writeJsonSafe(CLAUDE_REFRESH_LOCK_PATH, { t: Date.now() });
+    if (!acquireSpawnLock(CLAUDE_REFRESH_LOCK_PATH, SPAWN_LOCK_TTL_MS)) return;
   } catch {
     /* 락 실패 무시 — 스폰 진행 */
   }

package/hud/providers/codex.mjs

@@ -26,7 +26,12 @@ import {
   getCodexHome,
   SPAWN_LOCK_TTL_MS,
 } from "../constants.mjs";
-import { decodeJwtEmail, readJson, writeJsonSafe } from "../utils.mjs";
+import {
+  acquireSpawnLock,
+  decodeJwtEmail,
+  readJson,
+  writeJsonSafe,
+} from "../utils.mjs";
 import {
   listProbeTargets,
   probeRateLimitsViaAppServer,
@@ -552,11 +557,7 @@ export function scheduleCodexRateLimitRefresh() {
 
   // 스폰 락: 30초 내 이미 스폰했으면 중복 방지
   try {
-    if (existsSync(CODEX_REFRESH_LOCK_PATH)) {
-      const lockAge = Date.now() - readJson(CODEX_REFRESH_LOCK_PATH, {}).t;
-      if (lockAge < SPAWN_LOCK_TTL_MS) return;
-    }
-    writeJsonSafe(CODEX_REFRESH_LOCK_PATH, { t: Date.now() });
+    if (!acquireSpawnLock(CODEX_REFRESH_LOCK_PATH, SPAWN_LOCK_TTL_MS)) return;
   } catch {
     /* 락 실패 무시 — 스폰 진행 */
   }

package/hud/providers/gemini.mjs

@@ -10,7 +10,12 @@ import {
   ANTIGRAVITY_SIGNED_IN_GRACE_MS,
   SPAWN_LOCK_TTL_MS,
 } from "../constants.mjs";
-import { decodeJwtEmail, readJson, writeJsonSafe } from "../utils.mjs";
+import {
+  acquireSpawnLock,
+  decodeJwtEmail,
+  readJson,
+  writeJsonSafe,
+} from "../utils.mjs";
 
 function getCredentialEmail(credential) {
   return (
@@ -140,9 +145,8 @@ export function scheduleAntigravityQuotaRefresh() {
     isGcpProjectAuth()
   )
     return;
-  const lock = readJson(ANTIGRAVITY_REFRESH_LOCK_PATH, null);
-  if (Date.now() - Number(lock?.t || 0) < SPAWN_LOCK_TTL_MS) return;
-  writeJsonSafe(ANTIGRAVITY_REFRESH_LOCK_PATH, { t: Date.now() });
+  if (!acquireSpawnLock(ANTIGRAVITY_REFRESH_LOCK_PATH, SPAWN_LOCK_TTL_MS))
+    return;
   try {
     const child = spawn(
       process.execPath,

package/hud/renderers.mjs

@@ -177,9 +177,20 @@ function spendOnlyPercent(claudeUsage) {
 // ============================================================================
 // Claude 행 렌더러
 // ============================================================================
-export function getClaudeRows(currentTier, contextView, claudeUsage) {
+export function getClaudeRows(
+  currentTier,
+  contextView,
+  claudeUsage,
+  costUsd = null,
+) {
   const ctxView = contextView || buildContextUsageView({});
   const prefix = `${bold(claudeOrange("c"))}:`;
+  // 이번 세션 비용. 폭이 넉넉한 full, compact 에서만 CTX 뒤에 붙인다.
+  const costText =
+    Number.isFinite(costUsd) &&
+    (currentTier === "full" || currentTier === "compact")
+      ? ` ${dim(`$${costUsd.toFixed(2)}`)}`
+      : "";
   const spend = spendOnlyPercent(claudeUsage);
   if (spend != null) {
     if (currentTier === "nano" || currentTier === "micro") {
@@ -188,7 +199,7 @@ export function getClaudeRows(currentTier, contextView, claudeUsage) {
     }
     const pct = colorByProvider(spend, formatPercentCell(spend), claudeOrange);
     const left = `${dim("$:")}${tierBar(currentTier, spend, CLAUDE_ORANGE)}${pct}`;
-    const right = `${dim("CTX:")}${contextPercentText(ctxView)}`;
+    const right = `${dim("CTX:")}${contextPercentText(ctxView)}${costText}`;
     return [{ prefix, left, right }];
   }
   // API 실측 데이터
@@ -256,7 +267,7 @@ export function getClaudeRows(currentTier, contextView, claudeUsage) {
     const warning = ctxView.warningTag
       ? ` ${dim("|")} ${yellow(ctxView.warningTag)}`
       : "";
-    const contextSection = `${dim("CTX:")}${contextPercentText(ctxView)}${warning}`;
+    const contextSection = `${dim("CTX:")}${contextPercentText(ctxView)}${costText}${warning}`;
     return [{ prefix, left: quotaSection, right: contextSection }];
   }
 
@@ -266,7 +277,7 @@ export function getClaudeRows(currentTier, contextView, claudeUsage) {
   const warning = ctxView.warningTag
     ? ` ${dim("|")} ${yellow(ctxView.warningTag)}`
     : "";
-  const contextSection = `${dim("CTX:")}${contextPercentText(ctxView)}${warning}`;
+  const contextSection = `${dim("CTX:")}${contextPercentText(ctxView)}${costText}${warning}`;
   return [{ prefix, left: quotaSection, right: contextSection }];
 }
 

package/hud/utils.mjs

@@ -7,32 +7,40 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { PERCENT_CELL_WIDTH, TIME_CELL_INNER_WIDTH } from "./constants.mjs";
 
+const STDIN_MAX_BYTES = 1024 * 1024;
+
+// 입력이 JSON 으로 읽히는 순간 끝낸다. Claude Code 가 stdin 을 늦게 닫아도 기다리지 않는다.
 export async function readStdinJson() {
   if (process.stdin.isTTY) return {};
   return new Promise((resolve) => {
-    const timeout = setTimeout(() => {
-      process.stdin.destroy();
-      resolve({});
-    }, 200);
-    const chunks = [];
-    process.stdin.on("data", (chunk) => chunks.push(chunk));
-    process.stdin.on("end", () => {
+    let raw = "";
+    let done = false;
+    const finish = (value) => {
+      if (done) return;
+      done = true;
       clearTimeout(timeout);
-      const raw = chunks.join("").trim();
-      if (!raw) {
-        resolve({});
-        return;
-      }
+      process.stdin.removeAllListeners("data");
+      process.stdin.destroy();
+      resolve(value);
+    };
+    const tryParse = () => {
       try {
-        resolve(JSON.parse(raw));
+        return JSON.parse(raw);
       } catch {
-        resolve({});
+        return null;
       }
+    };
+    // 200ms 안에 다 못 받으면 받은 만큼으로 판정한다.
+    const timeout = setTimeout(() => finish(tryParse() ?? {}), 200);
+    process.stdin.setEncoding("utf8");
+    process.stdin.on("data", (chunk) => {
+      raw += chunk;
+      if (raw.length > STDIN_MAX_BYTES) return finish({});
+      const parsed = tryParse();
+      if (parsed) finish(parsed);
     });
-    process.stdin.on("error", () => {
-      clearTimeout(timeout);
-      resolve({});
-    });
+    process.stdin.on("end", () => finish(tryParse() ?? {}));
+    process.stdin.on("error", () => finish({}));
     process.stdin.resume();
   });
 }
@@ -56,6 +64,28 @@ export function writeJsonSafe(filePath, data) {
 }
 
 // .omc/ → .claude/cache/ 마이그레이션: 새 경로 우선, 없으면 레거시 읽고 복사
+// 갱신 프로세스를 겹쳐 띄우지 않는 락. 만료 시각을 적고, 남은 시간이 ttl 보다 길면(시계가 뒤로 감) 깨진 락으로 본다.
+// 예전 { t } 락도 읽는다.
+export function acquireSpawnLock(lockPath, ttlMs, now = Date.now()) {
+  const lock = readJson(lockPath, null);
+  const until = Number(lock?.until ?? Number(lock?.t) + ttlMs);
+  const remaining = until - now;
+  if (Number.isFinite(remaining) && remaining > 0 && remaining <= ttlMs)
+    return false;
+  writeJsonSafe(lockPath, { until: now + ttlMs });
+  return true;
+}
+
+// Retry-After 헤더(초 또는 HTTP 날짜)를 ms 로 바꾼다. 없거나 지난 값이면 null.
+export function parseRetryAfterMs(value, now = Date.now()) {
+  if (value == null || value === "") return null;
+  const seconds = Number(value);
+  const ms = Number.isFinite(seconds)
+    ? seconds * 1000
+    : Date.parse(value) - now;
+  return Number.isFinite(ms) && ms > 0 ? ms : null;
+}
+
 export function readJsonMigrate(newPath, legacyPath, fallback) {
   const data = readJson(newPath, null);
   if (data != null) return data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triflux/core",
-  "version": "10.57.0",
+  "version": "10.57.2",
   "description": "triflux core — CLI routing, adapters. Zero native dependencies.",
   "type": "module",
   "main": "hub/index.mjs",