@triflux/core 10.52.0 → 10.53.0

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/renderers.mjs

@@ -85,7 +85,11 @@ export function getMicroLine(
   codexBuckets,
   options = {},
 ) {
-  const { showCodex = true, showAntigravity = true } = options;
+  const {
+    showCodex = true,
+    showAntigravity = true,
+    codexLoggedOut = false,
+  } = options;
   const ctxView = contextView || buildContextUsageView({});
   // Claude 5h/1w
   const cF =
@@ -98,11 +102,11 @@ export function getMicroLine(
       : null;
   const cVal =
     claudeUsage != null
-      ? `${cF != null ? colorByProvider(cF, `${cF}`, claudeOrange) : dim("--")}${dim("/")}${cW != null ? colorByProvider(cW, `${cW}`, claudeOrange) : dim("--")}`
-      : dim("--/--");
+      ? `${cF != null ? colorByProvider(cF, `${cF}%`, claudeOrange) : dim("--%")}${dim("/")}${cW != null ? colorByProvider(cW, `${cW}%`, claudeOrange) : dim("--%")}`
+      : dim("--%/--%");
 
   // Codex 5h/1w
-  let xVal = dim("--/--");
+  let xVal = dim("--%/--%");
   if (codexBuckets) {
     const mb = codexBuckets.codex || codexBuckets[Object.keys(codexBuckets)[0]];
     if (mb) {
@@ -114,7 +118,7 @@ export function getMicroLine(
         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("--")}`;
+      xVal = `${xF != null ? colorByProvider(xF, `${xF}%`, codexWhite) : dim("--%")}${dim("/")}${xW != null ? colorByProvider(xW, `${xW}%`, codexWhite) : dim("--%")}`;
     }
   }
 
@@ -122,15 +126,19 @@ export function getMicroLine(
   // 세그먼트를 모아 join 한다. 차단된 프로바이더를 뺄 때 공백이 겹치지 않는다.
   const segments = [`${bold(claudeOrange("c"))}${dim(":")}${cVal}`];
   if (showCodex) {
-    segments.push(`${bold(codexWhite("x"))}${dim(":")}${xVal}`);
+    const xMarker = codexLoggedOut ? dim("x") : bold(codexWhite("x"));
+    segments.push(`${xMarker}${dim(":")}${xVal}`);
   }
   if (showAntigravity) {
     const marker = options.antigravityQuota?.auth
       ? bold(geminiBlue("a"))
       : dim("a");
-    segments.push(
-      `${marker}${dim(":")}${antigravityPercentText(options.antigravityQuota)}${options.antigravityQuota?.stale ? dim("*") : ""}`,
-    );
+    // stale 은 값을 dim 으로 보인다. 표식을 덧붙이면 최악 폭이 39칸을 넘는다.
+    const agyText = antigravityPercentText(options.antigravityQuota);
+    const agyValue = options.antigravityQuota?.stale
+      ? dim(stripAnsi(agyText))
+      : agyText;
+    segments.push(`${marker}${dim(":")}${agyValue}`);
   }
   segments.push(`${dim("CTX:")}${contextPercentText(ctxView)}`);
   return truncateAnsi(segments.join(" "), cols);
@@ -243,24 +251,9 @@ export function getClaudeRows(currentTier, contextView, claudeUsage) {
 // ============================================================================
 // 계정 라벨 + 범용 프로바이더 행 렌더러
 // ============================================================================
-export function getAccountLabel(
-  provider,
-  accountsConfig,
-  accountsState,
-  codexEmail,
-) {
-  const providerConfig = accountsConfig?.providers?.[provider] || [];
-  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 === "antigravity" ? "agy" : provider,
-    };
-  let label = picked.label || picked.id;
-  if (codexEmail) label = codexEmail;
-  if (label.includes("@")) label = label.split("@")[0];
-  return label;
+export function getAccountLabel(provider, accountName) {
+  const label = accountName || (provider === "antigravity" ? "agy" : provider);
+  return label.includes("@") ? label.split("@")[0] : label;
 }
 
 export function getProviderRow(
@@ -268,13 +261,11 @@ export function getProviderRow(
   provider,
   marker,
   markerColor,
-  accountsConfig,
-  accountsState,
   realQuota,
-  codexEmail,
+  accountName,
 ) {
   const accountLabel = fitText(
-    getAccountLabel(provider, accountsConfig, accountsState, codexEmail),
+    getAccountLabel(provider, accountName),
     ACCOUNT_LABEL_WIDTH,
   );
 

package/hud/utils.mjs

@@ -254,14 +254,6 @@ export function formatResetRemainingDayHour(isoOrUnix, cycleMs = 0) {
   return `${String(days).padStart(2, "0")}d${String(hours).padStart(2, "0")}h`;
 }
 
-export function getProviderAccountId(provider, accountsConfig, accountsState) {
-  const providerState = accountsState?.providers?.[provider] || {};
-  const selectedId = providerState.last_selected_id;
-  if (selectedId) return selectedId;
-  const providerConfig = accountsConfig?.providers?.[provider] || [];
-  return providerConfig[0]?.id || `${provider}-main`;
-}
-
 // JWT base64 디코딩 공통 헬퍼
 export function decodeJwtEmail(idToken) {
   if (!idToken) return null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@triflux/core",
-  "version": "10.52.0",
-  "description": "triflux core — CLI routing, adapters, account broker. Zero native dependencies.",
+  "version": "10.53.0",
+  "description": "triflux core — CLI routing, adapters. Zero native dependencies.",
   "type": "module",
   "main": "hub/index.mjs",
   "exports": {
@@ -13,8 +13,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@iarna/toml": "^2.2.5",
-    "zod": "^4.0.0"
+    "@iarna/toml": "^2.2.5"
   },
   "files": [
     "hub",

package/scripts/lib/mcp-guard-engine.mjs

@@ -40,7 +40,6 @@ const DEFAULT_REGISTRY = Object.freeze({
     unknown_server_action: "warn",
     sync_denylist: [],
     watched_paths: [
-      "~/.gemini/settings.json",
       "~/.codex/config.toml",
       "~/.claude.json",
       "~/.claude/settings.json",
@@ -709,7 +708,7 @@ function serverTargets(serverConfig) {
       ),
     ];
   }
-  return ["claude", "gemini", "codex", "antigravity"];
+  return ["claude", "codex", "antigravity"];
 }
 
 function serverAppliesToClient(serverConfig, client) {
@@ -1718,7 +1717,7 @@ export function addRegistryServer(name, url, options = {}) {
                 .filter(Boolean),
             ),
           ]
-        : ["claude", "gemini", "codex", "antigravity"],
+        : ["claude", "codex", "antigravity"],
     description: options.description || `${trimmedName} MCP 서버`,
   };