@triflux/core 10.50.2 → 10.52.0

package/hud/renderers.mjs

@@ -1,8 +1,6 @@
 // ============================================================================
 // 라인 렌더러 (tier별 행 생성)
 // ============================================================================
-import { readdirSync, statSync } from "node:fs";
-import { join } from "node:path";
 import {
   bold,
   CLAUDE_ORANGE,
@@ -12,17 +10,19 @@ import {
   colorByPercent,
   colorByProvider,
   dim,
+  GAUGE_WIDTH,
+  GEMINI_BLUE,
   geminiBlue,
-  green,
-  red,
   yellow,
 } from "./colors.mjs";
 import {
   ACCOUNT_LABEL_WIDTH,
   FIVE_HOUR_MS,
+  ONE_DAY_MS,
+  PERCENT_CELL_WIDTH,
   PROVIDER_PREFIX_WIDTH,
   SEVEN_DAY_MS,
-  TEAM_STATE_DIR,
+  TIME_CELL_INNER_WIDTH,
 } from "./constants.mjs";
 import { buildContextUsageView } from "./context-monitor.mjs";
 import { getTerminalColumns, tierBar, tierDimBar } from "./terminal.mjs";
@@ -36,94 +36,10 @@ import {
   formatTimeCell,
   formatTimeCellDH,
   padAnsiRight,
-  readJson,
   stripAnsi,
   truncateAnsi,
 } from "./utils.mjs";
 
-// ============================================================================
-// tfx-multi 상태 행 생성 (v2.2 HUD 통합)
-// ============================================================================
-export function getTeamRow(currentTier, stateDir = TEAM_STATE_DIR) {
-  let latestPath = null;
-  let latestMtime = Date.now() - 24 * 60 * 60 * 1000;
-  try {
-    for (const name of readdirSync(stateDir)) {
-      if (!/^team-state-.+\.json$/.test(name)) continue;
-      const path = join(stateDir, name);
-      try {
-        const stat = statSync(path);
-        if (stat.isFile() && stat.mtimeMs > latestMtime) {
-          latestPath = path;
-          latestMtime = stat.mtimeMs;
-        }
-      } catch {
-        // 세션 종료 중 사라진 파일은 제외한다.
-      }
-    }
-  } catch {
-    return null;
-  }
-  const teamState = latestPath ? readJson(latestPath, null) : null;
-  if (!teamState?.sessionName) return null;
-
-  const workers = (teamState.members || []).filter((m) => m.role === "worker");
-  if (!workers.length) return null;
-
-  const tasks = teamState.tasks || [];
-  const completed = tasks.filter((t) => t.status === "completed").length;
-  const failed = tasks.filter((t) => t.status === "failed").length;
-  const total = tasks.length || workers.length;
-
-  // 경과 시간 (80col 이상에서만 표시)
-  const elapsed =
-    teamState.startedAt && (currentTier === "full" || currentTier === "compact")
-      ? `${Math.round((Date.now() - teamState.startedAt) / 60000)}m`
-      : "";
-
-  // CLI 브랜드: 단일문자 + ANSI 색상 (x=codex, g=gemini, c=claude)
-  const cliTag = (cli) =>
-    cli === "codex"
-      ? bold(codexWhite("x"))
-      : cli === "gemini"
-        ? bold(geminiBlue("g"))
-        : bold(claudeOrange("c"));
-  // 멤버 상태: 태그 + 상태기호 (60col 이상)
-  const memberIcons =
-    currentTier === "full" ||
-    currentTier === "compact" ||
-    currentTier === "minimal"
-      ? workers
-          .map((m) => {
-            const task = tasks.find((t) => t.owner === m.name);
-            const status =
-              task?.status === "completed"
-                ? green("\u2713")
-                : task?.status === "in_progress"
-                  ? yellow("\u22EF")
-                  : task?.status === "failed"
-                    ? red("\u2717")
-                    : dim("\u25CC");
-            return `${cliTag(m.cli)}${status}`;
-          })
-          .join(" ")
-      : "";
-
-  // 진행 텍스트
-  const doneText =
-    failed > 0
-      ? `${completed}/${total} ${red(`${failed}\u2717`)}`
-      : `${completed}/${total}`;
-
-  const leftText = elapsed ? `${doneText} ${dim(elapsed)}` : doneText;
-
-  return {
-    prefix: bold(claudeOrange("\u25B2")),
-    left: leftText,
-    right: memberIcons,
-  };
-}
-
 // ============================================================================
 // 행 정렬 렌더링
 // ============================================================================
@@ -142,9 +58,7 @@ export function renderAlignedRows(rows) {
     if (!hasRight) {
       return truncateAnsi(`${prefix} ${row.left}`, cols);
     }
-    // 자기 left 대비 패딩 상한: 최대 2칸까지만 패딩 (과도한 공백 방지)
-    const ownLen = stripAnsi(row.left).length;
-    const effectiveWidth = Math.min(rawLeftWidth, ownLen + 2);
+    const effectiveWidth = rawLeftWidth;
     const left = padAnsiRight(row.left, effectiveWidth);
     // 우선순위 기반 truncate: right 먼저 축소, 그래도 넘치면 left 축소
     // prefix(PROVIDER_PREFIX_WIDTH) + " "(1) + left(effectiveWidth) + " | "(3) + right
@@ -169,10 +83,9 @@ export function getMicroLine(
   contextView,
   claudeUsage,
   codexBuckets,
-  antigravityReady,
   options = {},
 ) {
-  const { showCodex = true, showGemini = true } = options;
+  const { showCodex = true, showAntigravity = true } = options;
   const ctxView = contextView || buildContextUsageView({});
   // Claude 5h/1w
   const cF =
@@ -211,19 +124,35 @@ export function getMicroLine(
   if (showCodex) {
     segments.push(`${bold(codexWhite("x"))}${dim(":")}${xVal}`);
   }
-  if (showGemini) {
+  if (showAntigravity) {
+    const marker = options.antigravityQuota?.auth
+      ? bold(geminiBlue("a"))
+      : dim("a");
     segments.push(
-      `${bold(geminiBlue(antigravityReady ? "a" : "g"))}${dim(":")}${antigravityReady ? "agy" : dim("--")}`,
+      `${marker}${dim(":")}${antigravityPercentText(options.antigravityQuota)}${options.antigravityQuota?.stale ? dim("*") : ""}`,
     );
   }
   segments.push(`${dim("CTX:")}${contextPercentText(ctxView)}`);
   return truncateAnsi(segments.join(" "), cols);
 }
 
+function antigravityPercentText(quota) {
+  if (quota?.auth === "project") {
+    return geminiBlue("GCP".padStart(PERCENT_CELL_WIDTH));
+  }
+  return quota?.usedPercent != null
+    ? colorByProvider(
+        quota.usedPercent,
+        formatPercentCell(quota.usedPercent),
+        geminiBlue,
+      )
+    : dim(formatPlaceholderPercentCell());
+}
+
 // context 는 토큰 수 대신 사용률만 보여 준다.
 function contextPercentText(ctxView) {
-  const text = ctxView.display === "--" ? "--" : `${ctxView.percent}%`;
-  return colorByPercent(ctxView.percent, text);
+  if (ctxView.display === "--") return dim("--%");
+  return colorByPercent(ctxView.percent, `${ctxView.percent}%`);
 }
 
 // ============================================================================
@@ -237,10 +166,10 @@ export function getClaudeRows(currentTier, contextView, claudeUsage) {
   const weeklyPercent = claudeUsage?.weeklyPercent ?? null;
   const fiveHourReset = claudeUsage?.fiveHourResetsAt
     ? formatResetRemaining(claudeUsage.fiveHourResetsAt, FIVE_HOUR_MS)
-    : "n/a";
+    : "";
   const weeklyReset = claudeUsage?.weeklyResetsAt
     ? formatResetRemainingDayHour(claudeUsage.weeklyResetsAt, SEVEN_DAY_MS)
-    : "n/a";
+    : "";
 
   const hasData = claudeUsage != null;
 
@@ -275,11 +204,11 @@ export function getClaudeRows(currentTier, contextView, claudeUsage) {
     const fShort =
       hasData && fiveHourPercent != null
         ? colorByProvider(fiveHourPercent, `${fiveHourPercent}%`, claudeOrange)
-        : dim("--");
+        : dim("--%");
     const wShort =
       hasData && weeklyPercent != null
         ? colorByProvider(weeklyPercent, `${weeklyPercent}%`, claudeOrange)
-        : dim("--");
+        : dim("--%");
     const quotaSection = `${fShort}${dim("/")}${wShort}`;
     return [{ prefix, left: quotaSection, right: "" }];
   }
@@ -324,7 +253,10 @@ export function getAccountLabel(
   const providerState = accountsState?.providers?.[provider] || {};
   const lastId = providerState.last_selected_id;
   const picked = providerConfig.find((a) => a.id === lastId) ||
-    providerConfig[0] || { id: `${provider}-main`, label: provider };
+    providerConfig[0] || {
+      id: `${provider}-main`,
+      label: provider === "antigravity" ? "agy" : provider,
+    };
   let label = picked.label || picked.id;
   if (codexEmail) label = codexEmail;
   if (label.includes("@")) label = label.split("@")[0];
@@ -347,15 +279,14 @@ export function getProviderRow(
   );
 
   const prefix = `${bold(markerColor(marker))}:`;
-  if (provider === "antigravity" || provider === "gemini") {
-    return {
-      prefix,
-      left:
-        provider === "antigravity"
-          ? markerColor(realQuota?.currentAbbrev || "agy")
-          : dim("--"),
-      right: accountLabel ? markerColor(accountLabel) : "",
-    };
+  if (provider === "antigravity") {
+    return getAntigravityRow(
+      currentTier,
+      marker,
+      markerColor,
+      accountLabel,
+      realQuota,
+    );
   }
   const provAnsi = CODEX_WHITE;
   const provFn = codexWhite;
@@ -391,7 +322,7 @@ export function getProviderRow(
         };
       }
     }
-    return { prefix: minPrefix, left: dim("--/--"), right: "" };
+    return { prefix: minPrefix, left: dim("--%/--%"), right: "" };
   }
 
   if (currentTier === "minimal") {
@@ -451,16 +382,16 @@ export function getProviderRow(
           weekP != null
             ? colorByProvider(weekP, formatPercentCell(weekP), provFn)
             : dim(formatPlaceholderPercentCell());
-        const fiveReset =
-          formatResetRemaining(main.primary?.resets_at) || "n/a";
-        const weekReset =
-          formatResetRemainingDayHour(main.secondary?.resets_at) || "n/a";
+        const fiveReset = formatResetRemaining(main.primary?.resets_at);
+        const weekReset = formatResetRemainingDayHour(
+          main.secondary?.resets_at,
+        );
         quotaSection = `${dim("5h:")}${fCell} ${dim(formatTimeCell(fiveReset))} ${dim("1w:")}${wCell} ${dim(formatTimeCellDH(weekReset))}`;
         if (main.mixedWindows) quotaSection += dim("*");
       }
     }
     if (!quotaSection) {
-      quotaSection = `${dim("5h:")}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCell("n/a"))} ${dim("1w:")}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCellDH("--d--h"))}`;
+      quotaSection = `${dim("5h:")}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCell(""))} ${dim("1w:")}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCellDH(""))}`;
     }
     const compactRight = [accountLabel ? markerColor(accountLabel) : ""]
       .filter(Boolean)
@@ -483,9 +414,8 @@ export function getProviderRow(
         main.secondary?.used_percent != null
           ? clampPercent(main.secondary.used_percent)
           : null;
-      const fiveReset = formatResetRemaining(main.primary?.resets_at) || "n/a";
-      const weekReset =
-        formatResetRemainingDayHour(main.secondary?.resets_at) || "n/a";
+      const fiveReset = formatResetRemaining(main.primary?.resets_at);
+      const weekReset = formatResetRemainingDayHour(main.secondary?.resets_at);
       const fCell =
         fiveP != null
           ? colorByProvider(fiveP, formatPercentCell(fiveP), provFn)
@@ -513,7 +443,7 @@ export function getProviderRow(
 
   // 폴백
   if (!quotaSection) {
-    quotaSection = `${dim("5h:")}${tierDimBar(currentTier)}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCell("n/a"))} ${dim("1w:")}${tierDimBar(currentTier)}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCellDH("--d--h"))}`;
+    quotaSection = `${dim("5h:")}${tierDimBar(currentTier)}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCell(""))} ${dim("1w:")}${tierDimBar(currentTier)}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCellDH(""))}`;
   }
 
   const accountSection = `${markerColor(accountLabel)}`;
@@ -523,3 +453,52 @@ export function getProviderRow(
     right: accountSection,
   };
 }
+
+// 회색은 로그인 안 된 경우에만 쓴다. GCP 프로젝트 과금은 개인 쿼터가 없을 뿐 정상 상태다.
+function getAntigravityRow(
+  currentTier,
+  marker,
+  markerColor,
+  accountLabel,
+  quota,
+) {
+  const usedPercent = quota?.usedPercent;
+  const hasValue = usedPercent != null;
+  const loggedIn = quota?.auth != null;
+  const project = quota?.auth === "project";
+  const tint = loggedIn ? markerColor : dim;
+  const prefix = loggedIn ? `${bold(markerColor(marker))}:` : dim(`${marker}:`);
+  const stale = quota?.stale ? dim(" [stale]") : "";
+  const right = `${tint(accountLabel)}${stale}`;
+  const percent = antigravityPercentText(quota);
+  if (currentTier === "nano" || currentTier === "micro") {
+    return { prefix, left: percent, right };
+  }
+  const isFull = currentTier === "full";
+  const showTime = isFull || currentTier === "compact";
+  const reset =
+    Date.parse(quota?.resetTime) - Date.now() >= ONE_DAY_MS
+      ? formatResetRemainingDayHour(quota.resetTime)
+      : formatResetRemaining(quota?.resetTime);
+  const timeCell = showTime ? ` ${dim(formatTimeCell(reset))}` : "";
+  // /usage의 모델별 값에는 5h/1w 식별자가 없으므로 창을 추측하지 않는다.
+  // 두 창(5h, 1w) 폭에 맞춰 c, x 행과 구분자 열을 맞춘다.
+  const windowWidth =
+    "5h:".length +
+    (isFull ? GAUGE_WIDTH + 1 : 0) +
+    PERCENT_CELL_WIDTH +
+    (showTime ? TIME_CELL_INNER_WIDTH + 3 : 0);
+  let slot;
+  if (project) {
+    // 쿼터 대신 과금 방식을 막대 자리(막대가 없는 표시에서는 퍼센트 자리)에 보인다.
+    const mark = isFull ? `${markerColor("GCP".padEnd(GAUGE_WIDTH))} ` : "";
+    const cell = isFull ? dim(formatPlaceholderPercentCell()) : percent;
+    slot = `${dim("--:")}${mark}${cell}${timeCell}`;
+  } else {
+    const bar = hasValue
+      ? tierBar(currentTier, usedPercent, GEMINI_BLUE)
+      : tierDimBar(currentTier);
+    slot = `${dim("--:")}${bar}${percent}${timeCell}`;
+  }
+  return { prefix, left: padAnsiRight(slot, windowWidth * 2 + 1), right };
+}

package/hud/utils.mjs

@@ -145,7 +145,7 @@ export function formatPlaceholderPercentCell() {
 }
 
 export function normalizeTimeToken(value) {
-  const text = String(value || "n/a");
+  const text = String(value || "");
   const hourMinute = text.match(/^(\d+)h(\d+)m$/);
   if (hourMinute) {
     return `${Number(hourMinute[1])}h${String(Number(hourMinute[2])).padStart(2, "0")}m`;
@@ -157,17 +157,21 @@ export function normalizeTimeToken(value) {
   return text;
 }
 
+// 값이 없는 시간 칸은 단위 모양을 남겨 정상 값과 같은 폭으로 그린다.
+function emptyTimeCell(unit) {
+  return unit === "dh" ? "(--d--h)" : "(--h--m)";
+}
+
 export function formatTimeCell(value) {
   const text = normalizeTimeToken(value);
-  // 시간값(숫자 포함)은 0패딩, 비시간값(n/a 등)은 공백패딩
-  const padChar = /\d/.test(text) ? "0" : " ";
-  return `(${text.padStart(TIME_CELL_INNER_WIDTH, padChar)})`;
+  if (!/\d/.test(text)) return emptyTimeCell("hm");
+  return `(${text.padStart(TIME_CELL_INNER_WIDTH, "0")})`;
 }
 
-// 주간(d/h) 전용 — 최대 7d00h(5자)이므로 공백 불필요
 export function formatTimeCellDH(value) {
   const text = normalizeTimeToken(value);
-  return `(${text})`;
+  if (!/\d/.test(text)) return emptyTimeCell("dh");
+  return `(${text.padStart(TIME_CELL_INNER_WIDTH, " ")})`;
 }
 
 export function getCliArgValue(flag) {

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@triflux/core",
-  "version": "10.50.2",
-  "description": "triflux core — CLI routing, pipeline, adapters. Zero native dependencies.",
+  "version": "10.52.0",
+  "description": "triflux core — CLI routing, adapters, account broker. Zero native dependencies.",
   "type": "module",
   "main": "hub/index.mjs",
   "exports": {
     ".": "./hub/index.mjs",
     "./hub/*": "./hub/*",
-    "./mesh/*": "./mesh/*",
     "./scripts/*": "./scripts/*"
   },
   "engines": {
@@ -15,13 +14,10 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "pino": "^10.3.1",
-    "pino-pretty": "^13.1.3",
     "zod": "^4.0.0"
   },
   "files": [
     "hub",
-    "mesh",
     "scripts/lib",
     "hooks",
     "hud"