@triflux/core 10.50.2 → 10.52.0

package/hub/team/session-context.mjs

@@ -96,7 +96,7 @@ export function contextGuard(
     : {};
 }
 
-async function findCodexRollout(threadId) {
+export async function findCodexRollout(threadId) {
   if (!/^[a-zA-Z0-9-]+$/u.test(threadId || "")) return null;
   const root = path.join(
     process.env.CODEX_HOME || path.join(homedir(), ".codex"),

package/hud/cli-policy.mjs

@@ -41,25 +41,3 @@ export function resolveHudCliVisibility(env = process.env, opts = {}) {
     return { showCodex: true, antigravityAllowed: true, policy: null };
   }
 }
-
-/**
- * antigravity / gemini 슬롯 행을 그릴지 판정한다.
- *
- * antigravity 가 허용이면 기존 동작 그대로 항상 그린다. 정책으로 꺼졌을 때만
- * gemini 폴백 정보가 하나라도 있는지 보고, 전부 비어 있으면 행을 생략한다.
- *
- * @param {{
- *   antigravityAllowed?: boolean,
- *   antigravityReady?: boolean,
- *   geminiEmail?: unknown,
- * }} [args]
- * @returns {boolean}
- */
-export function shouldRenderGeminiFallbackRow({
-  antigravityAllowed = true,
-  antigravityReady = false,
-  geminiEmail = null,
-} = {}) {
-  if (antigravityAllowed || antigravityReady) return true;
-  return Boolean(geminiEmail);
-}

package/hud/constants.mjs

@@ -31,9 +31,6 @@ export const CLAUDE_BAND_MARKER_DIR = join(
 );
 export const CLAUDE_BAND_MARKER_TTL_MS = 12 * 60 * 60 * 1000;
 
-// tfx-multi 세션 상태 디렉터리
-export const TEAM_STATE_DIR =
-  process.env.TFX_HUB_PID_DIR || join(homedir(), ".claude", "cache", "tfx-hub");
 export const CONTEXT_MONITOR_CACHE_PATH = join(
   homedir(),
   ".claude",
@@ -149,11 +146,9 @@ export const CODEX_REFRESH_LOCK_PATH = join(
 );
 export const SPAWN_LOCK_TTL_MS = 30 * 1000; // 30초 spawn dedup
 
-export const GEMINI_OAUTH_PATH = join(homedir(), ".gemini", "oauth_creds.json");
 export const ANTIGRAVITY_OAUTH_PATHS = [
   join(homedir(), ".gemini", "antigravity-cli", "oauth_creds.json"),
   join(homedir(), ".gemini", "antigravity-cli", "credentials.json"),
-  GEMINI_OAUTH_PATH,
 ];
 export const ANTIGRAVITY_KEYCHAIN_SERVICE = "gemini";
 export const ANTIGRAVITY_KEYCHAIN_ACCOUNT = "antigravity";
@@ -163,33 +158,25 @@ export const ANTIGRAVITY_SETTINGS_PATH = join(
   "antigravity-cli",
   "settings.json",
 );
-// Antigravity CLI 현재 장착 모델 라벨 → HUD 2자 약어 매핑
-export const ANTIGRAVITY_MODEL_ABBREV = {
-  // Flash 세대와 등급을 구분한다.
-  "Gemini 3.8 Flash (High)": "8h",
-  "Gemini 3.8 Flash (Medium)": "8m",
-  "Gemini 3.8 Flash (Low)": "8l",
-  "Gemini 3.7 Flash (High)": "7h",
-  "Gemini 3.7 Flash (Medium)": "7m",
-  "Gemini 3.7 Flash (Low)": "7l",
-  "Gemini 3.6 Flash (High)": "6h",
-  "Gemini 3.6 Flash (Medium)": "6m",
-  "Gemini 3.6 Flash (Low)": "6l",
-  "Gemini 3.5 Flash (High)": "Fh",
-  "Gemini 3.5 Flash (Medium)": "Fm",
-  "Gemini 3.5 Flash (Low)": "Fl",
-};
-export const TFX_PREFLIGHT_CACHE_PATH = join(
+export const ANTIGRAVITY_QUOTA_CACHE_PATH = join(
   homedir(),
   ".claude",
   "cache",
-  "tfx-preflight.json",
+  "antigravity-quota-cache.json",
 );
-export const TFX_PREFLIGHT_CACHE_STALE_MS = 60 * 60 * 1000;
-
+export const ANTIGRAVITY_REFRESH_LOCK_PATH = join(
+  homedir(),
+  ".claude",
+  "cache",
+  ".antigravity-refresh-lock",
+);
+export const ANTIGRAVITY_QUOTA_STALE_MS = 5 * 60 * 1000;
+// 조회가 잠시 실패해도 이 시간 안에 성공한 적이 있으면 로그인 상태로 본다.
+export const ANTIGRAVITY_SIGNED_IN_GRACE_MS = 60 * 60 * 1000;
+export const ANTIGRAVITY_REFRESH_FLAG = "--refresh-antigravity-quota";
 export const ACCOUNT_LABEL_WIDTH = 10;
 export const PROVIDER_PREFIX_WIDTH = 2;
-export const PERCENT_CELL_WIDTH = 3;
+export const PERCENT_CELL_WIDTH = 4;
 export const TIME_CELL_INNER_WIDTH = 6;
 
 export const CLAUDE_REFRESH_FLAG = "--refresh-claude-usage";

package/hud/hud-qos-status.mjs

@@ -3,10 +3,7 @@
 import { existsSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import {
-  resolveHudCliVisibility,
-  shouldRenderGeminiFallbackRow,
-} from "./cli-policy.mjs";
+import { resolveHudCliVisibility } from "./cli-policy.mjs";
 import {
   bold,
   claudeOrange,
@@ -19,12 +16,12 @@ import {
 import {
   ACCOUNTS_CONFIG_PATH,
   ACCOUNTS_STATE_PATH,
+  ANTIGRAVITY_REFRESH_FLAG,
   CLAUDE_BAND_MARKER_DIR,
   CLAUDE_BAND_MARKER_TTL_MS,
   CLAUDE_REFRESH_FLAG,
+  CODEX_AUTH_PATH,
   CODEX_REFRESH_FLAG,
-  TFX_PREFLIGHT_CACHE_PATH,
-  TFX_PREFLIGHT_CACHE_STALE_MS,
 } from "./constants.mjs";
 import { buildContextUsageView } from "./context-monitor.mjs";
 import {
@@ -41,19 +38,24 @@ import {
 } from "./providers/codex.mjs";
 import {
   getAntigravityAccountLabel,
-  getAntigravityCurrentModel,
-  getAntigravityModelAbbrev,
-  getGeminiEmail,
+  getAntigravityAuthKind,
+  readAntigravityQuotaSnapshot,
+  refreshAntigravityQuotaCache,
+  scheduleAntigravityQuotaRefresh,
 } from "./providers/gemini.mjs";
 import {
   getClaudeRows,
   getMicroLine,
   getProviderRow,
-  getTeamRow,
   renderAlignedRows,
 } from "./renderers.mjs";
 import { selectTier } from "./terminal.mjs";
-import { readJson, readStdinJson } from "./utils.mjs";
+import {
+  formatTimeCell,
+  formatTimeCellDH,
+  readJson,
+  readStdinJson,
+} from "./utils.mjs";
 
 async function main() {
   if (process.argv.includes(CLAUDE_REFRESH_FLAG)) {
@@ -64,22 +66,21 @@ async function main() {
     await refreshCodexRateLimitsCache();
     return;
   }
+  if (process.argv.includes(ANTIGRAVITY_REFRESH_FLAG)) {
+    refreshAntigravityQuotaCache();
+    return;
+  }
 
   const stdinPromise = readStdinJson();
-  const preflightCache = readJson(TFX_PREFLIGHT_CACHE_PATH, null);
-  const preflightTimestamp = Number(preflightCache?.timestamp);
-  const preflightFresh =
-    Number.isFinite(preflightTimestamp) &&
-    Date.now() - preflightTimestamp <= TFX_PREFLIGHT_CACHE_STALE_MS;
   const { showCodex, antigravityAllowed } = resolveHudCliVisibility();
-  const antigravityReady =
-    antigravityAllowed &&
-    preflightFresh &&
-    preflightCache?.antigravity?.ok === true;
   const accountsConfig = readJson(ACCOUNTS_CONFIG_PATH, { providers: {} });
   const accountsState = readJson(ACCOUNTS_STATE_PATH, { providers: {} });
   const claudeUsageSnapshot = readClaudeUsageSnapshot();
   const codexSnapshot = readCodexRateLimitSnapshot();
+  const antigravitySnapshot = antigravityAllowed
+    ? readAntigravityQuotaSnapshot()
+    : null;
+  if (antigravitySnapshot?.shouldRefresh) scheduleAntigravityQuotaRefresh();
   // 설정이 없는 홈에서는 갱신 프로세스를 시작하지 않는다.
   if (
     claudeUsageSnapshot.shouldRefresh &&
@@ -101,22 +102,16 @@ async function main() {
     ? { ...claudeUsageSnapshot.data, stale: claudeUsageSnapshot.isStale }
     : null;
   const codexBuckets = codexSnapshot.buckets;
+  const antigravityQuota = antigravityAllowed
+    ? { ...antigravitySnapshot?.data, auth: getAntigravityAuthKind() }
+    : null;
   const currentTier = selectTier();
-  const geminiEmail = getGeminiEmail();
-  const showGeminiRow = shouldRenderGeminiFallbackRow({
-    antigravityAllowed,
-    antigravityReady,
-    geminiEmail,
-  });
-
   if (currentTier === "nano") {
-    const microLine = getMicroLine(
-      contextView,
-      claudeUsage,
-      codexBuckets,
-      antigravityReady,
-      { showCodex, showGemini: showGeminiRow },
-    );
+    const microLine = getMicroLine(contextView, claudeUsage, codexBuckets, {
+      showCodex,
+      showAntigravity: antigravityAllowed,
+      antigravityQuota,
+    });
     process.stdout.write(`\x1b[0m${microLine}\n`);
     return;
   }
@@ -140,38 +135,31 @@ async function main() {
       ),
     );
   }
-  let geminiRowIndex = -1;
-  if (showGeminiRow) {
-    geminiRowIndex = rows.length;
+  if (antigravityAllowed) {
     rows.push(
       getProviderRow(
         currentTier,
-        antigravityReady ? "antigravity" : "gemini",
-        antigravityReady ? "a" : "g",
+        "antigravity",
+        "a",
         geminiBlue,
         accountsConfig,
         accountsState,
-        antigravityReady
-          ? {
-              currentAbbrev: getAntigravityModelAbbrev(
-                getAntigravityCurrentModel(),
-              ),
-            }
-          : null,
-        antigravityReady ? getAntigravityAccountLabel() : geminiEmail,
+        antigravityQuota,
+        getAntigravityAccountLabel(),
       ),
     );
   }
-  const teamRow = getTeamRow(currentTier);
-  if (teamRow) rows.push(teamRow);
 
   const outputLines = renderAlignedRows(rows);
-  if (!codexBuckets && outputLines[codexRowIndex] != null) {
+  // 회색은 로그인 안 된 경우에만 쓴다. 로그인 상태의 조회 공백은 --% 로만 보인다.
+  if (
+    outputLines[codexRowIndex] != null &&
+    !codexBuckets &&
+    !existsSync(CODEX_AUTH_PATH) &&
+    !hasBrokerCodexAccounts()
+  ) {
     outputLines[codexRowIndex] = `${DIM}${outputLines[codexRowIndex]}${RESET}`;
   }
-  if (!antigravityReady && outputLines[geminiRowIndex] != null) {
-    outputLines[geminiRowIndex] = dim(outputLines[geminiRowIndex]);
-  }
   // 알림 배너와 TUI 스타일이 HUD 내용에 겹치지 않도록 한다.
   const leadingBreaks = contextView.percent >= 85 ? "\n\n" : "\n";
   const resetLines = outputLines.map((line) => `\x1b[0m${line}`);
@@ -180,7 +168,7 @@ async function main() {
 
 main().catch(() => {
   process.stdout.write(
-    `\x1b[0m${bold(claudeOrange("c"))}: ${dim("5h:--% (n/a) 1w:--% (n/a) | ctx:--%")}\n`,
+    `\x1b[0m${bold(claudeOrange("c"))}: ${dim(`5h:--% ${formatTimeCell("")} 1w:--% ${formatTimeCellDH("")} | CTX:--%`)}\n`,
   );
 });
 

package/hud/providers/gemini.mjs

@@ -1,10 +1,16 @@
+import { execFileSync, spawn } from "node:child_process";
+import { existsSync } from "node:fs";
 import {
-  ANTIGRAVITY_MODEL_ABBREV,
   ANTIGRAVITY_OAUTH_PATHS,
+  ANTIGRAVITY_QUOTA_CACHE_PATH,
+  ANTIGRAVITY_QUOTA_STALE_MS,
+  ANTIGRAVITY_REFRESH_FLAG,
+  ANTIGRAVITY_REFRESH_LOCK_PATH,
   ANTIGRAVITY_SETTINGS_PATH,
-  GEMINI_OAUTH_PATH,
+  ANTIGRAVITY_SIGNED_IN_GRACE_MS,
+  SPAWN_LOCK_TTL_MS,
 } from "../constants.mjs";
-import { decodeJwtEmail, readJson } from "../utils.mjs";
+import { decodeJwtEmail, readJson, writeJsonSafe } from "../utils.mjs";
 
 function getCredentialEmail(credential) {
   return (
@@ -17,10 +23,6 @@ function getCredentialEmail(credential) {
   );
 }
 
-export function getGeminiEmail() {
-  return getCredentialEmail(readJson(GEMINI_OAUTH_PATH, null));
-}
-
 // GCP 프로젝트 인증이면 계정 이메일 대신 프로젝트 ID를 보여 준다.
 export function getAntigravityAccountLabel() {
   const project = readJson(ANTIGRAVITY_SETTINGS_PATH, null)?.gcp?.project;
@@ -36,20 +38,123 @@ export function getAntigravityAccountLabel() {
   return null;
 }
 
-export function getAntigravityCurrentModel() {
-  const settings = readJson(ANTIGRAVITY_SETTINGS_PATH, null);
-  return settings?.model || null;
+function isGcpProjectAuth() {
+  return Boolean(readJson(ANTIGRAVITY_SETTINGS_PATH, null)?.gcp?.project);
+}
+
+// Keychain 인증은 파일을 남기지 않으므로 최근 쿼터 조회 성공도 로그인 근거로 본다.
+export function getAntigravityAuthKind() {
+  if (isGcpProjectAuth()) return "project";
+  if (getAntigravityAccountLabel()) return "account";
+  const cache = readJson(ANTIGRAVITY_QUOTA_CACHE_PATH, null);
+  const signedInAge = Date.now() - Number(cache?.signedInAt);
+  return cache?.accountLabel == null &&
+    signedInAge < ANTIGRAVITY_SIGNED_IN_GRACE_MS
+    ? "account"
+    : null;
+}
+
+export function readAntigravityQuotaSnapshot() {
+  // 프로젝트 과금의 기본 응답을 개인 플랜의 0% 사용률로 표시하지 않는다.
+  if (isGcpProjectAuth()) return { data: null, shouldRefresh: false };
+  const cache = readJson(ANTIGRAVITY_QUOTA_CACHE_PATH, null);
+  const matched = cache?.accountLabel === getAntigravityAccountLabel();
+  const stale =
+    !cache?.timestamp ||
+    Date.now() - cache.timestamp >= ANTIGRAVITY_QUOTA_STALE_MS;
+  const model = readJson(ANTIGRAVITY_SETTINGS_PATH, null)?.model;
+  const buckets = matched && Array.isArray(cache?.buckets) ? cache.buckets : [];
+  const bucket = buckets
+    .filter(
+      (item) =>
+        model &&
+        item &&
+        (item?.name === model || item?.id === model) &&
+        Number.isFinite(item.remaining_fraction) &&
+        item.remaining_fraction >= 0 &&
+        item.remaining_fraction <= 1 &&
+        Date.parse(item.reset_time) > Date.now(),
+    )
+    .sort((a, b) => a.remaining_fraction - b.remaining_fraction)[0];
+  return {
+    data: bucket
+      ? {
+          usedPercent: Math.round((1 - bucket.remaining_fraction) * 100),
+          resetTime: bucket.reset_time,
+          stale,
+        }
+      : null,
+    shouldRefresh: !matched || stale,
+  };
+}
+
+// /usage는 모델 턴을 시작하지 않는 공식 print-mode 조회다.
+export function refreshAntigravityQuotaCache(execFileSyncFn = execFileSync) {
+  if (isGcpProjectAuth()) return null;
+  const accountLabel = getAntigravityAccountLabel();
+  let buckets = null;
+  try {
+    const result = JSON.parse(
+      execFileSyncFn("agy", ["-p", "/usage", "--output-format", "json"], {
+        encoding: "utf8",
+        timeout: 15_000,
+        maxBuffer: 1024 * 1024,
+        stdio: ["ignore", "pipe", "ignore"],
+        windowsHide: true,
+      }),
+    );
+    if (
+      result.status === "SUCCESS" &&
+      result.command?.name === "usage" &&
+      Array.isArray(result.command.data?.groups)
+    ) {
+      buckets = result.command.data.groups.flatMap((group) =>
+        Array.isArray(group?.buckets) ? group.buckets : [],
+      );
+    }
+  } catch {
+    // 실패도 캐시해 인증 오류나 CLI 부재 시 매 렌더마다 실행하지 않는다.
+  }
+  if (accountLabel === getAntigravityAccountLabel()) {
+    const previous = readJson(ANTIGRAVITY_QUOTA_CACHE_PATH, null);
+    const signedInAt = buckets
+      ? Date.now()
+      : previous?.accountLabel === accountLabel
+        ? previous?.signedInAt
+        : undefined;
+    writeJsonSafe(ANTIGRAVITY_QUOTA_CACHE_PATH, {
+      timestamp: Date.now(),
+      accountLabel,
+      buckets,
+      signedInAt,
+    });
+  }
+  return buckets;
 }
 
-export function getAntigravityModelAbbrev(label) {
-  if (!label) return "??";
-  const known = ANTIGRAVITY_MODEL_ABBREV[label];
-  if (known) return known;
-  const parens = label.match(/\(([^)]+)\)/);
-  const head = label.match(/^(\w+)/);
-  if (head && parens) {
-    return `${head[1][0].toUpperCase()}${parens[1][0].toLowerCase()}`;
+export function scheduleAntigravityQuotaRefresh() {
+  const scriptPath = process.argv[1];
+  if (
+    !scriptPath ||
+    !existsSync(ANTIGRAVITY_SETTINGS_PATH) ||
+    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() });
+  try {
+    const child = spawn(
+      process.execPath,
+      [scriptPath, ANTIGRAVITY_REFRESH_FLAG],
+      {
+        detached: true,
+        stdio: "ignore",
+        windowsHide: true,
+      },
+    );
+    child.unref();
+  } catch {
+    // 다음 렌더에서 다시 시도한다.
   }
-  if (head) return head[1].slice(0, 2);
-  return "??";
 }