triflux 4.2.0 → 4.2.2

package/hud/hud-qos-status.mjs

@@ -355,7 +355,7 @@ function readJson(filePath, fallback) {
 function writeJsonSafe(filePath, data) {
   try {
     mkdirSync(dirname(filePath), { recursive: true });
-    writeFileSync(filePath, JSON.stringify(data));
+    writeFileSync(filePath, JSON.stringify(data), { mode: 0o600 });
   } catch { /* 쓰기 실패 무시 */ }
 }
 
@@ -731,7 +731,16 @@ function readClaudeUsageSnapshot() {
       return { data: stripStaleResets(cache.data), shouldRefresh: ageMs >= backoffMs };
     }
     const isFresh = ageMs < getClaudeUsageStaleMs();
-    return { data: cache.data, shouldRefresh: !isFresh };
+    // resets_at이 지난 윈도우의 percent를 0으로 보정 (stale 캐시 방지)
+    const data = { ...cache.data };
+    const now = Date.now();
+    if (data.fiveHourResetsAt && new Date(data.fiveHourResetsAt).getTime() <= now) {
+      data.fiveHourPercent = 0;
+    }
+    if (data.weeklyResetsAt && new Date(data.weeklyResetsAt).getTime() <= now) {
+      data.weeklyPercent = 0;
+    }
+    return { data, shouldRefresh: !isFresh };
   }
 
   // 2차: 에러 backoff — 최근 에러 시 재시도 억제 (무한 spawn 방지)
@@ -996,6 +1005,22 @@ function getGeminiEmail() {
   } catch { return null; }
 }
 
+// resets_at이 지난 윈도우의 used_percent를 0으로 보정
+function expireStaleCodexBuckets(buckets) {
+  if (!buckets) return buckets;
+  const nowSec = Math.floor(Date.now() / 1000);
+  for (const bucket of Object.values(buckets)) {
+    if (!bucket) continue;
+    if (bucket.primary?.resets_at && bucket.primary.resets_at <= nowSec) {
+      bucket.primary.used_percent = 0;
+    }
+    if (bucket.secondary?.resets_at && bucket.secondary.resets_at <= nowSec) {
+      bucket.secondary.used_percent = 0;
+    }
+  }
+  return buckets;
+}
+
 // ============================================================================
 // Codex 세션 JSONL에서 실제 rate limits 추출
 // 한계: rate_limits는 세션별 스냅샷이므로 여러 세션 간 토큰 합산은 불가.
@@ -1061,6 +1086,7 @@ function getCodexRateLimits() {
         const main = mergedBuckets.codex || mergedBuckets[Object.keys(mergedBuckets)[0]];
         if (main && !main.tokens) main.tokens = syntheticBucket.tokens;
       }
+      expireStaleCodexBuckets(mergedBuckets);
       return mergedBuckets;
     }
   }
@@ -1213,6 +1239,15 @@ function readGeminiQuotaSnapshot(accountId, authContext) {
   const isFresh = ageMs < GEMINI_QUOTA_STALE_MS;
 
   if (keyMatched) {
+    // resetTime이 지난 버킷의 remainingFraction을 1로 보정 (stale 캐시 방지)
+    if (Array.isArray(cache.buckets)) {
+      const now = Date.now();
+      for (const b of cache.buckets) {
+        if (b?.resetTime && new Date(b.resetTime).getTime() <= now) {
+          b.remainingFraction = 1;
+        }
+      }
+    }
     return { quota: cache, shouldRefresh: !isFresh };
   }
   if (isLegacyCache) {
@@ -1250,6 +1285,7 @@ function readCodexRateLimitSnapshot() {
   if (!cache?.buckets) {
     return { buckets: null, shouldRefresh: true };
   }
+  expireStaleCodexBuckets(cache.buckets);
   const ts = Number(cache.timestamp);
   const ageMs = Number.isFinite(ts) ? Date.now() - ts : Number.MAX_SAFE_INTEGER;
   const isFresh = ageMs < CODEX_QUOTA_STALE_MS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "type": "module",
   "bin": {

package/scripts/preflight-cache.mjs

@@ -2,22 +2,58 @@
 // scripts/preflight-cache.mjs — 세션 시작 시 preflight 점검 캐싱
 
 import { writeFileSync, mkdirSync, existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { join, dirname } from "node:path";
 import { homedir } from "node:os";
-import { execSync } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
+import { fileURLToPath } from "node:url";
+
+const __filename = fileURLToPath(import.meta.url);
+const PKG_ROOT = join(dirname(__filename), "..");
+
+// 동기 대기 (Atomics.wait — Node.js main thread에서 사용 가능)
+const _sab = new Int32Array(new SharedArrayBuffer(4));
+function sleepSync(ms) { Atomics.wait(_sab, 0, 0, ms); }
 
 const CACHE_DIR = join(homedir(), ".claude", "cache");
 const CACHE_FILE = join(CACHE_DIR, "tfx-preflight.json");
 const CACHE_TTL_MS = 30_000; // 30초
 
 function checkHub() {
+  // 1차 시도
   try {
     const res = execSync("curl -sf http://127.0.0.1:27888/status", { timeout: 3000, encoding: "utf8", windowsHide: true });
     const data = JSON.parse(res);
     return { ok: true, state: data?.hub?.state || "unknown", pid: data?.pid };
+  } catch {}
+
+  // Hub 미응답 → 자동 재시작 시도 (bridge.mjs tryRestartHub 동기 버전)
+  const serverPath = join(PKG_ROOT, "hub", "server.mjs");
+  if (!existsSync(serverPath)) return { ok: false, state: "unreachable", restart: "no_server" };
+
+  try {
+    const child = spawn(process.execPath, [serverPath], {
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true,
+    });
+    child.unref();
   } catch {
-    return { ok: false, state: "unreachable" };
+    return { ok: false, state: "unreachable", restart: "spawn_failed" };
   }
+
+  // 최대 4초 폴링 (500ms × 8)
+  for (let i = 0; i < 8; i++) {
+    sleepSync(500);
+    try {
+      const res = execSync("curl -sf http://127.0.0.1:27888/status", { timeout: 1000, encoding: "utf8", windowsHide: true });
+      const data = JSON.parse(res);
+      if (data?.hub?.state === "healthy") {
+        return { ok: true, state: "healthy", pid: data?.pid, restarted: true };
+      }
+    } catch {}
+  }
+
+  return { ok: false, state: "unreachable", restart: "timeout" };
 }
 
 function checkRoute() {
@@ -63,6 +99,14 @@ function runPreflight() {
     ok: false,
   };
   result.ok = result.hub.ok && result.route.ok;
+
+  // CLI 가용성 → available_agents (triage에서 참조)
+  const agents = [];
+  if (result.codex.ok) agents.push("codex");
+  if (result.gemini.ok) agents.push("gemini");
+  agents.push("claude"); // claude는 항상 가용
+  result.available_agents = agents;
+
   return result;
 }
 
@@ -84,7 +128,9 @@ if (process.argv[1]?.endsWith("preflight-cache.mjs")) {
   const summary = result.ok ? "preflight: ok" : "preflight: FAIL";
   const details = [];
   if (!result.hub.ok) details.push("hub:" + result.hub.state);
+  else if (result.hub.restarted) details.push("hub:restarted");
   if (!result.route.ok) details.push("route:missing");
+  if (result.available_agents.length === 1) details.push("agents:claude-only");
   console.log(details.length ? `${summary} (${details.join(", ")})` : summary);
 }