@triflux/core 10.51.0 → 10.53.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/constants.mjs

@@ -6,21 +6,6 @@ import { join } from "node:path";
 
 export const VERSION = "2.0";
 
-export const ACCOUNTS_CONFIG_PATH = join(
-  homedir(),
-  ".claude",
-  "cache",
-  "tfx-hub",
-  "accounts.json",
-);
-export const ACCOUNTS_STATE_PATH = join(
-  homedir(),
-  ".claude",
-  "cache",
-  "tfx-hub",
-  "cli_accounts_state.json",
-);
-
 // triflux-mods 의 Claude band 가 세션마다 갱신하는 표식. 있으면 Claude 행을 뺀다.
 export const CLAUDE_BAND_MARKER_DIR = join(
   homedir(),
@@ -107,19 +92,19 @@ export const SEVEN_DAY_MS = 7 * 24 * 60 * 60 * 1000;
 export const ONE_DAY_MS = 24 * 60 * 60 * 1000;
 export const DEFAULT_OAUTH_CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
 
-export const CODEX_AUTH_PATH = join(homedir(), ".codex", "auth.json");
+// Codex CLI 는 CODEX_HOME 이 있으면 그 디렉터리를 쓴다. 호출 시점에 읽어 환경 변화를 따른다.
+export function getCodexHome() {
+  return process.env.CODEX_HOME || join(homedir(), ".codex");
+}
+export function getCodexAuthPath() {
+  return join(getCodexHome(), "auth.json");
+}
 export const CODEX_PROBE_STATE_PATH = join(
   homedir(),
   ".claude",
   "cache",
   "codex-probe-state.json",
 );
-export const CODEX_BROKER_AUTH_CACHE_DIR = join(
-  homedir(),
-  ".claude",
-  "cache",
-  "tfx-hub",
-);
 export const CODEX_PROBE_TTL_MS = 5 * 60 * 1000;
 export const CODEX_PROBE_TIMEOUT_MS = 10_000;
 export const CODEX_QUOTA_CACHE_PATH = join(
@@ -171,6 +156,8 @@ export const ANTIGRAVITY_REFRESH_LOCK_PATH = join(
   ".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;

package/hud/hud-qos-status.mjs

@@ -14,13 +14,13 @@ import {
   RESET,
 } from "./colors.mjs";
 import {
-  ACCOUNTS_CONFIG_PATH,
-  ACCOUNTS_STATE_PATH,
   ANTIGRAVITY_REFRESH_FLAG,
   CLAUDE_BAND_MARKER_DIR,
   CLAUDE_BAND_MARKER_TTL_MS,
   CLAUDE_REFRESH_FLAG,
   CODEX_REFRESH_FLAG,
+  getCodexAuthPath,
+  getCodexHome,
 } from "./constants.mjs";
 import { buildContextUsageView } from "./context-monitor.mjs";
 import {
@@ -30,13 +30,13 @@ import {
 } from "./providers/claude.mjs";
 import {
   getCodexEmail,
-  hasBrokerCodexAccounts,
   readCodexRateLimitSnapshot,
   refreshCodexRateLimitsCache,
   scheduleCodexRateLimitRefresh,
 } from "./providers/codex.mjs";
 import {
   getAntigravityAccountLabel,
+  getAntigravityAuthKind,
   readAntigravityQuotaSnapshot,
   refreshAntigravityQuotaCache,
   scheduleAntigravityQuotaRefresh,
@@ -48,7 +48,7 @@ import {
   renderAlignedRows,
 } from "./renderers.mjs";
 import { selectTier } from "./terminal.mjs";
-import { readJson, readStdinJson } from "./utils.mjs";
+import { formatTimeCell, formatTimeCellDH, readStdinJson } from "./utils.mjs";
 
 async function main() {
   if (process.argv.includes(CLAUDE_REFRESH_FLAG)) {
@@ -66,8 +66,6 @@ async function main() {
 
   const stdinPromise = readStdinJson();
   const { showCodex, antigravityAllowed } = resolveHudCliVisibility();
-  const accountsConfig = readJson(ACCOUNTS_CONFIG_PATH, { providers: {} });
-  const accountsState = readJson(ACCOUNTS_STATE_PATH, { providers: {} });
   const claudeUsageSnapshot = readClaudeUsageSnapshot();
   const codexSnapshot = readCodexRateLimitSnapshot();
   const antigravitySnapshot = antigravityAllowed
@@ -81,11 +79,7 @@ async function main() {
   ) {
     scheduleClaudeUsageRefresh();
   }
-  if (
-    showCodex &&
-    codexSnapshot.shouldRefresh &&
-    (existsSync(join(homedir(), ".codex")) || hasBrokerCodexAccounts())
-  ) {
+  if (showCodex && codexSnapshot.shouldRefresh && existsSync(getCodexHome())) {
     scheduleCodexRateLimitRefresh();
   }
 
@@ -95,12 +89,19 @@ 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 codexLoggedOut =
+    showCodex && !codexBuckets && !existsSync(getCodexAuthPath());
   if (currentTier === "nano") {
     const microLine = getMicroLine(contextView, claudeUsage, codexBuckets, {
       showCodex,
+      codexLoggedOut,
       showAntigravity: antigravityAllowed,
-      antigravityQuota: antigravitySnapshot?.data,
+      antigravityQuota,
     });
     process.stdout.write(`\x1b[0m${microLine}\n`);
     return;
@@ -118,8 +119,6 @@ async function main() {
         "codex",
         "x",
         codexWhite,
-        accountsConfig,
-        accountsState,
         codexBuckets ? { type: "codex", buckets: codexBuckets } : null,
         getCodexEmail(),
       ),
@@ -132,16 +131,14 @@ async function main() {
         "antigravity",
         "a",
         geminiBlue,
-        accountsConfig,
-        accountsState,
-        antigravitySnapshot?.data,
+        antigravityQuota,
         getAntigravityAccountLabel(),
       ),
     );
   }
 
   const outputLines = renderAlignedRows(rows);
-  if (!codexBuckets && outputLines[codexRowIndex] != null) {
+  if (outputLines[codexRowIndex] != null && codexLoggedOut) {
     outputLines[codexRowIndex] = `${DIM}${outputLines[codexRowIndex]}${RESET}`;
   }
   // 알림 배너와 TUI 스타일이 HUD 내용에 겹치지 않도록 한다.
@@ -152,7 +149,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/codex-probe.mjs

@@ -2,16 +2,8 @@
 // 세션 이벤트(snake_case) 파이프라인에 합류 가능한 스냅샷을 만든다.
 
 import { spawn } from "node:child_process";
-import {
-  existsSync,
-  mkdirSync,
-  mkdtempSync,
-  readdirSync,
-  readFileSync,
-  writeFileSync,
-} from "node:fs";
-import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
 
 function readJwtExpSec(token) {
   try {
@@ -54,7 +46,6 @@ export function recordProbe(stateFilePath, key, nowMs) {
 
 export function listProbeTargets({
   codexAuthPath,
-  brokerCacheDir,
   stateFilePath,
   ttlMs,
   nowMs,
@@ -68,26 +59,6 @@ export function listProbeTargets({
   if (currentAuth && accessTokenUsable(currentAuth, nowMs) && due("current")) {
     targets.push({ key: "current", codexHome: dirname(codexAuthPath) });
   }
-
-  if (brokerCacheDir && existsSync(brokerCacheDir)) {
-    let files = [];
-    try {
-      files = readdirSync(brokerCacheDir).filter((file) =>
-        /^codex-auth-.+\.json$/.test(file),
-      );
-    } catch {
-      files = [];
-    }
-    for (const file of files) {
-      const key = file.replace(/^codex-auth-/, "").replace(/\.json$/, "");
-      if (!due(key)) continue;
-      const auth = readJsonFile(join(brokerCacheDir, file));
-      if (!auth || !accessTokenUsable(auth, nowMs)) continue;
-      const home = mkdtempSync(join(tmpdir(), `tfx-probe-home-${key}-`));
-      writeFileSync(join(home, "auth.json"), JSON.stringify(auth));
-      targets.push({ key, codexHome: home });
-    }
-  }
   return targets;
 }
 

package/hud/providers/codex.mjs

@@ -4,11 +4,8 @@
 
 import { spawn } from "node:child_process";
 import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
 import { join } from "node:path";
 import {
-  CODEX_AUTH_PATH,
-  CODEX_BROKER_AUTH_CACHE_DIR,
   CODEX_MIN_BUCKETS,
   CODEX_PROBE_STATE_PATH,
   CODEX_PROBE_TIMEOUT_MS,
@@ -17,6 +14,8 @@ import {
   CODEX_QUOTA_STALE_MS,
   CODEX_REFRESH_FLAG,
   CODEX_REFRESH_LOCK_PATH,
+  getCodexAuthPath,
+  getCodexHome,
   SPAWN_LOCK_TTL_MS,
 } from "../constants.mjs";
 import { decodeJwtEmail, readJson, writeJsonSafe } from "../utils.mjs";
@@ -59,7 +58,7 @@ export function normalizeBuckets(rl) {
 
 export function getCodexEmail() {
   try {
-    const auth = JSON.parse(readFileSync(CODEX_AUTH_PATH, "utf-8"));
+    const auth = JSON.parse(readFileSync(getCodexAuthPath(), "utf-8"));
     return decodeJwtEmail(auth?.tokens?.id_token);
   } catch {
     return null;
@@ -117,8 +116,8 @@ function positiveWindowMinutes(bucket) {
   return minutes > 0 ? minutes : null;
 }
 
-// 계정 하나에는 같은 종류의 창이 한 번에 하나만 열린다. 브로커 계정이 없으면
-// ~/.codex/sessions 와 HUD 라벨이 모두 ~/.codex/auth.json 계정 하나의 것이다. 그래서
+// 계정 하나에는 같은 종류의 창이 한 번에 하나만 열린다. Codex 홈(CODEX_HOME)의
+// sessions 와 HUD 라벨은 모두 auth.json 계정 하나의 것이다. 그래서
 // 세션 로그에 더 늦게 리셋되는 창이 나타났고 옛 창이 그 창이 열리기 전에만 관측됐다면,
 // 옛 창은 조기 리셋(2026-09-23 실측)이나 계정 전환으로 끝난 창이다. 프로브로만 본 창은
 // 다른 계정일 수 있어 근거로 쓰지 않는다. 새 창이 열린 뒤에도 관측된 창은 함께 도는
@@ -135,12 +134,7 @@ function isReplacedWindowGroup(group, other) {
   return lastSeenMs <= otherOpenedAtMs;
 }
 
-function selectCodexWindowSnapshot(
-  snapshots,
-  nowSec,
-  windowKey,
-  replaceEndedWindows,
-) {
+function selectCodexWindowSnapshot(snapshots, nowSec, windowKey) {
   const groups = [];
   const ungrouped = [];
 
@@ -179,12 +173,9 @@ function selectCodexWindowSnapshot(
   const openGroups = groups.filter(
     (group) => Number(group.latest[windowKey]?.resets_at) > nowSec,
   );
-  const activeGroups = replaceEndedWindows
-    ? openGroups.filter(
-        (group) =>
-          !openGroups.some((other) => isReplacedWindowGroup(group, other)),
-      )
-    : openGroups;
+  const activeGroups = openGroups.filter(
+    (group) => !openGroups.some((other) => isReplacedWindowGroup(group, other)),
+  );
   let selected = null;
   if (activeGroups.length > 0) {
     selected = activeGroups
@@ -214,18 +205,16 @@ function selectCodexWindowSnapshot(
   return { snapshot: selected, activeGroupCount: activeGroups.length };
 }
 
-function selectCodexSnapshot(snapshots, nowSec, replaceEndedWindows) {
+function selectCodexSnapshot(snapshots, nowSec) {
   const primarySelection = selectCodexWindowSnapshot(
     snapshots,
     nowSec,
     "primary",
-    replaceEndedWindows,
   );
   const secondarySelection = selectCodexWindowSnapshot(
     snapshots,
     nowSec,
     "secondary",
-    replaceEndedWindows,
   );
   const primarySnapshot = primarySelection.snapshot;
   if (!primarySnapshot) return null;
@@ -246,7 +235,7 @@ function selectCodexSnapshot(snapshots, nowSec, replaceEndedWindows) {
   return selected;
 }
 
-function mergeRateLimitSnapshots(snapshots, nowSec, replaceEndedWindows) {
+function mergeRateLimitSnapshots(snapshots, nowSec) {
   const merged = {};
   const codexSnapshots = [];
   for (const snapshot of snapshots) {
@@ -259,11 +248,7 @@ function mergeRateLimitSnapshots(snapshots, nowSec, replaceEndedWindows) {
     }
   }
 
-  const codex = selectCodexSnapshot(
-    codexSnapshots,
-    nowSec,
-    replaceEndedWindows,
-  );
+  const codex = selectCodexSnapshot(codexSnapshots, nowSec);
   if (codex) merged.codex = codex;
   return merged;
 }
@@ -275,12 +260,10 @@ function mergeRateLimitSnapshots(snapshots, nowSec, replaceEndedWindows) {
 // 합성 버킷(token_count 기반)은 2일 이내 데이터만 허용하여 stale 방지.
 // ============================================================================
 export function getCodexRateLimits({
-  sessionsRoot = join(homedir(), ".codex", "sessions"),
+  sessionsRoot = join(getCodexHome(), "sessions"),
   now = new Date(),
   maxLinesPerFile = 800,
   extraSnapshots = [],
-  // 교체된 창 판정(isReplacedWindowGroup). 브로커 Codex 계정이 있으면 끈다.
-  replaceEndedWindows = true,
 } = {}) {
   let syntheticBucket = null; // 최근 token_count에서 합성 (행 활성화 + 토큰 데이터용)
   // 프로브도 세션 로그와 같은 window_minutes 기준으로 5h/1w 슬롯을 정한다.
@@ -372,11 +355,7 @@ export function getCodexRateLimits({
     }
 
     const snapshots = dayOffset <= 1 ? recentSnapshots : daySnapshots;
-    const mergedBuckets = mergeRateLimitSnapshots(
-      snapshots,
-      nowSec,
-      replaceEndedWindows,
-    );
+    const mergedBuckets = mergeRateLimitSnapshots(snapshots, nowSec);
     if (Object.keys(mergedBuckets).length > 0) {
       if (syntheticBucket) {
         const main =
@@ -407,8 +386,7 @@ export async function collectProbeSnapshots(now = new Date()) {
   let targets = [];
   try {
     targets = listProbeTargets({
-      codexAuthPath: CODEX_AUTH_PATH,
-      brokerCacheDir: CODEX_BROKER_AUTH_CACHE_DIR,
+      codexAuthPath: getCodexAuthPath(),
       stateFilePath: CODEX_PROBE_STATE_PATH,
       ttlMs: Number(process.env.TFX_CODEX_PROBE_TTL_MS) || CODEX_PROBE_TTL_MS,
       nowMs: now.getTime(),
@@ -432,30 +410,10 @@ export async function collectProbeSnapshots(now = new Date()) {
   );
 }
 
-// 브로커 계정은 자기 CODEX_HOME 에서 돌기 때문에, 옛 창이 전환 전 계정의 창이어도 그
-// 계정이 아직 쓰이고 있을 수 있다. accounts.json 의 codex 항목과 프로브용 인증 캐시로 판정한다.
-export function hasBrokerCodexAccounts({
-  brokerDir = CODEX_BROKER_AUTH_CACHE_DIR,
-} = {}) {
-  const accounts = readJson(join(brokerDir, "accounts.json"), null);
-  if (Array.isArray(accounts?.codex) && accounts.codex.length > 0) return true;
-  try {
-    return readdirSync(brokerDir).some((file) =>
-      /^codex-auth-.+\.json$/.test(file),
-    );
-  } catch {
-    return false;
-  }
-}
-
 export async function refreshCodexRateLimitsCache() {
   const now = new Date();
   const extraSnapshots = await collectProbeSnapshots(now);
-  const buckets = getCodexRateLimits({
-    now,
-    extraSnapshots,
-    replaceEndedWindows: !hasBrokerCodexAccounts(),
-  });
+  const buckets = getCodexRateLimits({ now, extraSnapshots });
   // buckets가 null이어도 캐시 갱신 (stale 데이터 제거)
   writeJsonSafe(CODEX_QUOTA_CACHE_PATH, { timestamp: Date.now(), buckets });
   return buckets;

package/hud/providers/gemini.mjs

@@ -7,6 +7,7 @@ import {
   ANTIGRAVITY_REFRESH_FLAG,
   ANTIGRAVITY_REFRESH_LOCK_PATH,
   ANTIGRAVITY_SETTINGS_PATH,
+  ANTIGRAVITY_SIGNED_IN_GRACE_MS,
   SPAWN_LOCK_TTL_MS,
 } from "../constants.mjs";
 import { decodeJwtEmail, readJson, writeJsonSafe } from "../utils.mjs";
@@ -41,6 +42,18 @@ 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 };
@@ -103,10 +116,17 @@ export function refreshAntigravityQuotaCache(execFileSyncFn = execFileSync) {
     // 실패도 캐시해 인증 오류나 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;