triflux 2.4.7 → 2.5.1

package/README.ko.md

@@ -187,7 +187,8 @@ tfx doctor
 - **Codex CLI** (선택): `npm install -g @openai/codex`
 - **Gemini CLI** (선택): `npm install -g @google/gemini-cli`
 
-> Codex/Gemini 없이도 동작합니다. 자동으로 Claude 네이티브 에이전트로 fallback됩니다.
+> [!TIP]
+> **triflux는 100% 독립적으로 동작합니다.** 기능을 수행하기 위해 [oh-my-claudecode (OMC)](https://github.com/nicepkg/oh-my-claudecode)가 필요하지 않습니다. OMC가 설치된 경우에만 이를 감지하여 선택적인 통합 기능을 제공합니다. Codex/Gemini 없이도 자동으로 Claude 네이티브 에이전트로 fallback되어 동작합니다.
 
 ### 설치 후
 
@@ -224,14 +225,15 @@ Claude Code 상태줄에서 실시간 모니터링:
 </details>
 
 <details>
-<summary><strong>oh-my-claudecode 통합</strong></summary>
+<summary><strong>선택 사항: oh-my-claudecode (OMC) 통합</strong></summary>
 
-triflux는 단독으로 동작하거나 [oh-my-claudecode](https://github.com/nicepkg/oh-my-claudecode)와 함께 사용할 수 있습니다:
+triflux는 **100% 독립적으로 동작**하며 기능을 수행하기 위해 외부 도구에 의존하지 않습니다. 다만, [oh-my-claudecode](https://github.com/nicepkg/oh-my-claudecode) 생태계를 사용하는 사용자를 위해 선택적 호환성을 제공합니다:
 
-- OMC 플러그인 시스템을 통한 스킬 자동 등록
-- `cli-route.sh`가 OMC 에이전트 카탈로그와 통합
-- HUD가 OMC 상태줄을 확장
-- OMC autopilot, ralph, team, ultrawork 모드와 호환
+- **완전한 독립성**: OMC나 다른 래퍼 없이 단독으로 100% 동작합니다.
+- **캐시 호환성**: OMC 캐시 경로(예: `~/.omc/state/`)가 존재할 경우 이를 감지하고 배려하지만, 기본적으로 자체 격리된 상태를 유지합니다.
+- **심리스한 플러그인**: OMC가 설치된 경우 OMC 플러그인 시스템을 통해 스킬이 자동 등록됩니다.
+- **확장된 HUD**: OMC가 감지되면 HUD가 자동으로 OMC 상태줄을 확장하여 표시합니다.
+- **모드 지원**: OMC autopilot, ralph, team, ultrawork 모드와 완벽히 호환됩니다.
 
 </details>
 

package/README.md

@@ -187,7 +187,8 @@ User: "/tfx-auto refactor auth + improve UI + add tests"
 - **Codex CLI** (optional): `npm install -g @openai/codex`
 - **Gemini CLI** (optional): `npm install -g @google/gemini-cli`
 
-> Without Codex or Gemini, triflux automatically falls back to Claude native agents.
+> [!TIP]
+> **triflux is 100% standalone.** It does not require [oh-my-claudecode (OMC)](https://github.com/nicepkg/oh-my-claudecode) to function. It will automatically detect and provide optional integration only if OMC is present. Without Codex or Gemini, triflux falls back to Claude native agents.
 
 ### Post-install
 
@@ -224,14 +225,15 @@ Configured automatically via `tfx setup`.
 </details>
 
 <details>
-<summary><strong>oh-my-claudecode Integration</strong></summary>
+<summary><strong>Optional: oh-my-claudecode (OMC) Integration</strong></summary>
 
-triflux works standalone or as part of [oh-my-claudecode](https://github.com/nicepkg/oh-my-claudecode):
+triflux is **100% independent** and does not require any external tools to function. However, it provides optional compatibility with [oh-my-claudecode](https://github.com/nicepkg/oh-my-claudecode) for users who prefer that ecosystem:
 
-- Skills auto-registered via OMC's plugin system
-- `cli-route.sh` integrates with OMC's agent catalog
-- HUD extends OMC's status line
-- Compatible with OMC autopilot, ralph, team, and ultrawork modes
+- **Full Independence**: Works standalone without OMC or any other wrappers.
+- **Cache Compatibility**: Detects and respects OMC cache paths (e.g., `~/.omc/state/`) if present, but maintains its own isolated state by default.
+- **Seamless Plugin**: Skills auto-registered via OMC's plugin system if OMC is installed.
+- **Extended HUD**: HUD automatically extends OMC's status line when detected.
+- **Mode Support**: Compatible with OMC autopilot, ralph, team, and ultrawork modes.
 
 </details>
 

package/bin/tfx-doctor.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 // tfx-doctor — triflux doctor 바로가기
 import { dirname } from "path";
 import { fileURLToPath } from "url";

package/bin/tfx-setup.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 // tfx-setup — triflux setup 바로가기
 import { dirname } from "path";
 import { fileURLToPath } from "url";

package/bin/triflux.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 // triflux CLI — setup, doctor, version
 import { copyFileSync, existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync, readdirSync, unlinkSync } from "fs";
 import { join, dirname } from "path";

package/hud/hud-qos-status.mjs

@@ -121,6 +121,9 @@ function getClaudeUsageStaleMs() {
 const CLAUDE_USAGE_429_BACKOFF_MS = 10 * 60 * 1000; // 429 에러 시 10분 backoff
 const CLAUDE_USAGE_ERROR_BACKOFF_MS = 3 * 60 * 1000; // 기타 에러 시 3분 backoff
 const CLAUDE_API_TIMEOUT_MS = 10_000;
+const FIVE_HOUR_MS = 5 * 60 * 60 * 1000;
+const SEVEN_DAY_MS = 7 * 24 * 60 * 60 * 1000;
+const ONE_DAY_MS = 24 * 60 * 60 * 1000;
 const DEFAULT_OAUTH_CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
 const CODEX_AUTH_PATH = join(homedir(), ".codex", "auth.json");
 const CODEX_QUOTA_CACHE_PATH = join(homedir(), ".claude", "cache", "codex-rate-limits-cache.json");
@@ -152,6 +155,14 @@ function getGeminiModelLabel(model) {
   if (model.includes("flash")) return "[Flash3]";
   return "";
 }
+// rows 임계값 상수 (selectTier 에서 tier 결정에 사용)
+const ROWS_BUDGET_FULL = 40;
+const ROWS_BUDGET_LARGE = 35;
+const ROWS_BUDGET_MEDIUM = 28;
+const ROWS_BUDGET_SMALL = 22;
+// Codex rate_limits에서 최소 수집할 버킷 수
+const CODEX_MIN_BUCKETS = 2;
+
 const GEMINI_RPM_WINDOW_MS = 60 * 1000; // 60초 슬라이딩 윈도우
 const GEMINI_QUOTA_STALE_MS = 5 * 60 * 1000; // 5분
 const GEMINI_SESSION_STALE_MS = 15 * 1000; // 15초
@@ -291,10 +302,10 @@ function selectTier(stdin, claudeUsage = null) {
   const cols = getTerminalColumns() || 120;
 
   let budget;
-  if (rows >= 40) budget = 6;
-  else if (rows >= 35) budget = 5;
-  else if (rows >= 28) budget = 4;
-  else if (rows >= 22) budget = 3;
+  if (rows >= ROWS_BUDGET_FULL) budget = 6;
+  else if (rows >= ROWS_BUDGET_LARGE) budget = 5;
+  else if (rows >= ROWS_BUDGET_MEDIUM) budget = 4;
+  else if (rows >= ROWS_BUDGET_SMALL) budget = 3;
   else if (rows > 0) budget = 2;
   else budget = 5; // rows 감지 불가 → 넉넉하게
 
@@ -437,25 +448,21 @@ function renderAlignedRows(rows) {
 function getMicroLine(stdin, claudeUsage, codexBuckets, geminiSession, geminiBucket, combinedSvPct) {
   const ctx = getContextPercent(stdin);
 
-  // Claude 5h/1w (reset 과거면 0으로 표시)
-  const cF = claudeUsage
-    ? (isResetPast(claudeUsage.fiveHourResetsAt) ? 0 : clampPercent(claudeUsage.fiveHourPercent ?? 0))
-    : null;
-  const cW = claudeUsage
-    ? (isResetPast(claudeUsage.weeklyResetsAt) ? 0 : clampPercent(claudeUsage.weeklyPercent ?? 0))
-    : null;
-  const cVal = cF != null
-    ? `${colorByProvider(cF, `${cF}`, claudeOrange)}${dim("/")}${colorByProvider(cW, `${cW}`, claudeOrange)}`
+  // Claude 5h/1w (캐시된 값 그대로 표시, 시간은 advanceToNextCycle이 처리)
+  const cF = claudeUsage?.fiveHourPercent != null ? clampPercent(claudeUsage.fiveHourPercent) : null;
+  const cW = claudeUsage?.weeklyPercent != null ? clampPercent(claudeUsage.weeklyPercent) : null;
+  const cVal = claudeUsage != null
+    ? `${cF != null ? colorByProvider(cF, `${cF}`, claudeOrange) : dim("--")}${dim("/")}${cW != null ? colorByProvider(cW, `${cW}`, claudeOrange) : dim("--")}`
     : dim("--/--");
 
-  // Codex 5h/1w
+  // Codex 5h/1w (캐시된 값 그대로 표시)
   let xVal = dim("--/--");
   if (codexBuckets) {
     const mb = codexBuckets.codex || codexBuckets[Object.keys(codexBuckets)[0]];
     if (mb) {
-      const xF = isResetPast(mb.primary?.resets_at) ? 0 : clampPercent(mb.primary?.used_percent ?? 0);
-      const xW = isResetPast(mb.secondary?.resets_at) ? 0 : clampPercent(mb.secondary?.used_percent ?? 0);
-      xVal = `${colorByProvider(xF, `${xF}`, codexWhite)}${dim("/")}${colorByProvider(xW, `${xW}`, codexWhite)}`;
+      const xF = mb.primary?.used_percent != null ? clampPercent(mb.primary.used_percent) : null;
+      const xW = 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("--")}`;
     }
   }
 
@@ -667,31 +674,15 @@ function parseClaudeUsageResponse(response) {
 // stale 캐시의 과거 resetsAt → 다음 주기로 순환 추정 (null 대신 다음 reset 시간 계산)
 function stripStaleResets(data) {
   if (!data) return data;
-  const now = Date.now();
   const copy = { ...data };
-
-  // 5시간 주기: 과거 reset → 5시간씩 전진하여 미래 시점 추정
   if (copy.fiveHourResetsAt) {
-    let t = new Date(copy.fiveHourResetsAt).getTime();
-    if (t < now) {
-      const cycle = 5 * 60 * 60 * 1000;
-      const elapsed = now - t;
-      t += Math.ceil(elapsed / cycle) * cycle;
-      copy.fiveHourResetsAt = new Date(t).toISOString();
-    }
+    const t = new Date(copy.fiveHourResetsAt).getTime();
+    if (!isNaN(t)) copy.fiveHourResetsAt = new Date(advanceToNextCycle(t, FIVE_HOUR_MS)).toISOString();
   }
-
-  // 7일 주기: 과거 reset → 7일씩 전진하여 미래 시점 추정
   if (copy.weeklyResetsAt) {
-    let t = new Date(copy.weeklyResetsAt).getTime();
-    if (t < now) {
-      const cycle = 7 * 24 * 60 * 60 * 1000;
-      const elapsed = now - t;
-      t += Math.ceil(elapsed / cycle) * cycle;
-      copy.weeklyResetsAt = new Date(t).toISOString();
-    }
+    const t = new Date(copy.weeklyResetsAt).getTime();
+    if (!isNaN(t)) copy.weeklyResetsAt = new Date(advanceToNextCycle(t, SEVEN_DAY_MS)).toISOString();
   }
-
   return copy;
 }
 
@@ -817,12 +808,15 @@ function scheduleClaudeUsageRefresh() {
 
   try {
     const child = spawn(process.execPath, [scriptPath, CLAUDE_REFRESH_FLAG], {
-      detached: process.platform !== "win32",
+      detached: true,
       stdio: "ignore",
       windowsHide: true,
     });
     child.unref();
-  } catch { /* 백그라운드 실행 실패 무시 */ }
+  } catch (spawnErr) {
+    // spawn 실패 시 에러 유형을 캐시에 기록 (HUD에서 원인 힌트 표시 가능)
+    writeClaudeUsageCache(null, { type: "network", status: 0, hint: String(spawnErr?.message || spawnErr) });
+  }
 }
 
 function getContextPercent(stdin) {
@@ -837,11 +831,20 @@ function getContextPercent(stdin) {
   return clampPercent((totalTokens / capacity) * 100);
 }
 
-function formatResetRemaining(isoOrUnix) {
+// 과거 리셋 시간 → 다음 주기로 순환하여 미래 시점 반환
+function advanceToNextCycle(epochMs, cycleMs) {
+  const now = Date.now();
+  if (epochMs >= now || !cycleMs) return epochMs;
+  const elapsed = now - epochMs;
+  return epochMs + Math.ceil(elapsed / cycleMs) * cycleMs;
+}
+
+function formatResetRemaining(isoOrUnix, cycleMs = 0) {
   if (!isoOrUnix) return "";
   const d = typeof isoOrUnix === "string" ? new Date(isoOrUnix) : new Date(isoOrUnix * 1000);
   if (isNaN(d.getTime())) return "";
-  const diffMs = d.getTime() - Date.now();
+  const targetMs = advanceToNextCycle(d.getTime(), cycleMs);
+  const diffMs = targetMs - Date.now();
   if (diffMs <= 0) return "";
   const totalMinutes = Math.floor(diffMs / 60000);
   const totalHours = Math.floor(totalMinutes / 60);
@@ -855,11 +858,12 @@ function isResetPast(isoOrUnix) {
   return !isNaN(d.getTime()) && d.getTime() <= Date.now();
 }
 
-function formatResetRemainingDayHour(isoOrUnix) {
+function formatResetRemainingDayHour(isoOrUnix, cycleMs = 0) {
   if (!isoOrUnix) return "";
   const d = typeof isoOrUnix === "string" ? new Date(isoOrUnix) : new Date(isoOrUnix * 1000);
   if (isNaN(d.getTime())) return "";
-  const diffMs = d.getTime() - Date.now();
+  const targetMs = advanceToNextCycle(d.getTime(), cycleMs);
+  const diffMs = targetMs - Date.now();
   if (diffMs <= 0) return "";
   const totalMinutes = Math.floor(diffMs / 60000);
   const days = Math.floor(totalMinutes / (60 * 24));
@@ -906,20 +910,33 @@ function httpsPost(url, body, accessToken) {
   });
 }
 
+// ============================================================================
+// JWT base64 디코딩 공통 헬퍼
+// ============================================================================
+/**
+ * JWT 파일에서 이메일을 추출하는 공통 헬퍼.
+ * @param {string|null} idToken - JWT 문자열
+ * @returns {string|null} 이메일 또는 null
+ */
+function decodeJwtEmail(idToken) {
+  if (!idToken) return null;
+  const parts = idToken.split(".");
+  if (parts.length < 2) return null;
+  let payload = parts[1].replace(/-/g, "+").replace(/_/g, "/");
+  while (payload.length % 4) payload += "=";
+  try {
+    const decoded = JSON.parse(Buffer.from(payload, "base64").toString("utf-8"));
+    return decoded.email || null;
+  } catch { return null; }
+}
+
 // ============================================================================
 // Codex JWT에서 이메일 추출
 // ============================================================================
 function getCodexEmail() {
   try {
     const auth = JSON.parse(readFileSync(CODEX_AUTH_PATH, "utf-8"));
-    const idToken = auth?.tokens?.id_token;
-    if (!idToken) return null;
-    const parts = idToken.split(".");
-    if (parts.length < 2) return null;
-    let payload = parts[1].replace(/-/g, "+").replace(/_/g, "/");
-    while (payload.length % 4) payload += "=";
-    const decoded = JSON.parse(Buffer.from(payload, "base64").toString("utf-8"));
-    return decoded.email || null;
+    return decodeJwtEmail(auth?.tokens?.id_token);
   } catch { return null; }
 }
 
@@ -929,19 +946,15 @@ function getCodexEmail() {
 function getGeminiEmail() {
   try {
     const oauth = readJson(GEMINI_OAUTH_PATH, null);
-    const idToken = oauth?.id_token;
-    if (!idToken) return null;
-    const parts = idToken.split(".");
-    if (parts.length < 2) return null;
-    let payload = parts[1].replace(/-/g, "+").replace(/_/g, "/");
-    while (payload.length % 4) payload += "=";
-    const decoded = JSON.parse(Buffer.from(payload, "base64").toString("utf-8"));
-    return decoded.email || null;
+    return decodeJwtEmail(oauth?.id_token);
   } catch { return null; }
 }
 
 // ============================================================================
 // Codex 세션 JSONL에서 실제 rate limits 추출
+// 한계: rate_limits는 세션별 스냅샷이므로 여러 세션 간 토큰 합산은 불가.
+// 오늘 날짜의 모든 세션 파일을 스캔해 가장 최신 rate_limits 버킷을 수집한다.
+// (단일 파일 즉시 return 방식에서 → 당일 전체 스캔 후 최신 데이터 우선 병합으로 변경)
 // ============================================================================
 function getCodexRateLimits() {
   const now = new Date();
@@ -959,17 +972,21 @@ function getCodexRateLimits() {
     try { files = readdirSync(sessDir).filter((f) => f.endsWith(".jsonl")).sort().reverse(); }
     catch { continue; }
     if (dayOffset === 0 && files.length > 0) todayHasFiles = true;
+
+    // 당일 모든 세션 파일을 스캔해 limit_id별 가장 최신 버킷을 병합
+    // (파일 목록은 이름 역순 정렬 → 최신 세션 우선)
+    const mergedBuckets = {};
     for (const file of files) {
       try {
         const content = readFileSync(join(sessDir, file), "utf-8");
         const lines = content.trim().split("\n").reverse();
-        const buckets = {};
         for (const line of lines) {
           try {
             const evt = JSON.parse(line);
             const rl = evt?.payload?.rate_limits;
-            if (rl?.limit_id && !buckets[rl.limit_id]) {
-              buckets[rl.limit_id] = {
+            if (rl?.limit_id && !mergedBuckets[rl.limit_id]) {
+              // limit_id별로 첫 발견(=해당 세션의 가장 최신 이벤트)만 기록
+              mergedBuckets[rl.limit_id] = {
                 limitId: rl.limit_id, limitName: rl.limit_name,
                 primary: rl.primary, secondary: rl.secondary,
                 credits: rl.credits,
@@ -979,11 +996,12 @@ function getCodexRateLimits() {
               };
             }
           } catch { /* 라인 파싱 실패 무시 */ }
-          if (Object.keys(buckets).length >= 2) break;
+          if (Object.keys(mergedBuckets).length >= CODEX_MIN_BUCKETS) break;
         }
-        if (Object.keys(buckets).length > 0) return buckets;
       } catch { /* 파일 읽기 실패 무시 */ }
     }
+    if (Object.keys(mergedBuckets).length > 0) return mergedBuckets;
+
     // 오늘 세션 파일이 존재하지만 rate_limits가 없으면 어제 stale 데이터로 폴백하지 않음
     if (todayHasFiles && dayOffset === 0) return null;
   }
@@ -1007,8 +1025,28 @@ async function fetchGeminiQuota(accountId, options = {}) {
     return cache;
   }
 
-  if (!oauth?.access_token) return cache;
-  if (oauth.expiry_date && oauth.expiry_date < Date.now()) return cache; // 만료 시 stale 캐시
+  if (!oauth?.access_token) {
+    // access_token 없음: 에러 힌트를 캐시에 기록하고 stale 캐시 반환
+    writeJsonSafe(GEMINI_QUOTA_CACHE_PATH, {
+      ...(cache || {}),
+      timestamp: cache?.timestamp || Date.now(),
+      error: true,
+      errorType: "auth",
+      errorHint: "no access_token in oauth_creds.json",
+    });
+    return cache;
+  }
+  if (oauth.expiry_date && oauth.expiry_date < Date.now()) {
+    // OAuth 토큰 만료: 에러 힌트를 캐시에 기록 (refresh_token 갱신은 Gemini CLI 담당)
+    writeJsonSafe(GEMINI_QUOTA_CACHE_PATH, {
+      ...(cache || {}),
+      timestamp: cache?.timestamp || Date.now(),
+      error: true,
+      errorType: "auth",
+      errorHint: `token expired at ${new Date(oauth.expiry_date).toISOString()}`,
+    });
+    return cache;
+  }
 
   // 3. projectId (캐시 or API)
   const fetchProjectId = async () => {
@@ -1045,7 +1083,18 @@ async function fetchGeminiQuota(accountId, options = {}) {
     );
   }
 
-  if (!quotaRes?.buckets) return cache;
+  if (!quotaRes?.buckets) {
+    // API 응답에 buckets 없음: 에러 코드 또는 응답 내용을 캐시에 기록
+    const apiError = quotaRes?.error?.message || quotaRes?.error?.code || quotaRes?.error || "no buckets in response";
+    writeJsonSafe(GEMINI_QUOTA_CACHE_PATH, {
+      ...(cache || {}),
+      timestamp: cache?.timestamp || Date.now(),
+      error: true,
+      errorType: "api",
+      errorHint: String(apiError),
+    });
+    return cache;
+  }
 
   // 5. 캐시 저장
   const result = {
@@ -1120,13 +1169,20 @@ function scheduleGeminiQuotaRefresh(accountId) {
       process.execPath,
       [scriptPath, GEMINI_REFRESH_FLAG, "--account", accountId || "gemini-main"],
       {
-        detached: process.platform !== "win32",
+        detached: true,
         stdio: "ignore",
         windowsHide: true,
       },
     );
     child.unref();
-  } catch { /* 백그라운드 실행 실패 무시 */ }
+  } catch (spawnErr) {
+    // spawn 실패 시 캐시에 에러 힌트 기록 (다음 HUD 렌더에서 원인 확인 가능)
+    writeJsonSafe(GEMINI_QUOTA_CACHE_PATH, {
+      timestamp: Date.now(),
+      error: true,
+      errorHint: String(spawnErr?.message || spawnErr),
+    });
+  }
 }
 
 function readCodexRateLimitSnapshot() {
@@ -1152,12 +1208,20 @@ function scheduleCodexRateLimitRefresh() {
   if (!scriptPath) return;
   try {
     const child = spawn(process.execPath, [scriptPath, CODEX_REFRESH_FLAG], {
-      detached: process.platform !== "win32",
+      detached: true,
       stdio: "ignore",
       windowsHide: true,
     });
     child.unref();
-  } catch { /* 백그라운드 실행 실패 무시 */ }
+  } catch (spawnErr) {
+    // spawn 실패 시 캐시에 에러 힌트 기록
+    writeJsonSafe(CODEX_QUOTA_CACHE_PATH, {
+      timestamp: Date.now(),
+      buckets: null,
+      error: true,
+      errorHint: String(spawnErr?.message || spawnErr),
+    });
+  }
 }
 
 function readGeminiSessionSnapshot() {
@@ -1183,7 +1247,7 @@ function scheduleGeminiSessionRefresh() {
   if (!scriptPath) return;
   try {
     const child = spawn(process.execPath, [scriptPath, GEMINI_SESSION_REFRESH_FLAG], {
-      detached: process.platform !== "win32",
+      detached: true,
       stdio: "ignore",
       windowsHide: true,
     });
@@ -1265,13 +1329,14 @@ function getClaudeRows(stdin, claudeUsage, combinedSvPct) {
   const svSuffix = `${dim("sv:")}${svStr}`;
 
   // API 실측 데이터 사용 (없으면 플레이스홀더)
-  const fiveHourPercent = isResetPast(claudeUsage?.fiveHourResetsAt) ? 0 : (claudeUsage?.fiveHourPercent ?? 0);
-  const weeklyPercent = isResetPast(claudeUsage?.weeklyResetsAt) ? 0 : (claudeUsage?.weeklyPercent ?? 0);
+  // 캐시된 percent 그대로 사용 (시간 표시는 advanceToNextCycle이 처리)
+  const fiveHourPercent = claudeUsage?.fiveHourPercent ?? null;
+  const weeklyPercent = claudeUsage?.weeklyPercent ?? null;
   const fiveHourReset = claudeUsage?.fiveHourResetsAt
-    ? formatResetRemaining(claudeUsage.fiveHourResetsAt)
+    ? formatResetRemaining(claudeUsage.fiveHourResetsAt, FIVE_HOUR_MS)
     : "n/a";
   const weeklyReset = claudeUsage?.weeklyResetsAt
-    ? formatResetRemainingDayHour(claudeUsage.weeklyResetsAt)
+    ? formatResetRemainingDayHour(claudeUsage.weeklyResetsAt, SEVEN_DAY_MS)
     : "n/a";
 
   const hasData = claudeUsage != null;
@@ -1285,14 +1350,23 @@ function getClaudeRows(stdin, claudeUsage, combinedSvPct) {
       return [{ prefix, left: quotaSection, right: "" }];
     }
     if (cols < 40) {
-      const quotaSection = `${colorByProvider(fiveHourPercent, `${fiveHourPercent}%`, claudeOrange)}${dim("/")}` +
-        `${colorByProvider(weeklyPercent, `${weeklyPercent}%`, claudeOrange)} ` +
+      // null이면 '--' 플레이스홀더, 아니면 실제 값
+      const fStr = fiveHourPercent != null ? `${colorByProvider(fiveHourPercent, `${fiveHourPercent}%`, claudeOrange)}` : dim("--");
+      const wStr = weeklyPercent != null ? `${colorByProvider(weeklyPercent, `${weeklyPercent}%`, claudeOrange)}` : dim("--");
+      const quotaSection = `${fStr}${dim("/")}${wStr} ` +
         `${dim("ctx:")}${colorByPercent(contextPercent, `${contextPercent}%`)}`;
       return [{ prefix, left: quotaSection, right: "" }];
     }
     // nano: c: 5h  12% 1w  95% sv:  191% ctx:90%
-    const quotaSection = `${dim("5h")} ${colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)} ` +
-      `${dim("1w")} ${colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)} ` +
+    // null이면 '--%' 플레이스홀더 표시
+    const fCellNano = fiveHourPercent != null
+      ? colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)
+      : dim(formatPlaceholderPercentCell());
+    const wCellNano = weeklyPercent != null
+      ? colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)
+      : dim(formatPlaceholderPercentCell());
+    const quotaSection = `${dim("5h")} ${fCellNano} ` +
+      `${dim("1w")} ${wCellNano} ` +
       `${dim("sv:")}${svStr} ${dim("ctx:")}${colorByPercent(contextPercent, `${contextPercent}%`)}`;
     return [{ prefix, left: quotaSection, right: "" }];
   }
@@ -1305,8 +1379,15 @@ function getClaudeRows(stdin, claudeUsage, combinedSvPct) {
       return [{ prefix, left: quotaSection, right: "" }];
     }
     // compact: c: 5h: 14% 1w: 96% | sv:  191% ctx:43%
-    const quotaSection = `${dim("5h:")}${colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)} ` +
-      `${dim("1w:")}${colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)} ` +
+    // null이면 '--%' 플레이스홀더 표시
+    const fCellCmp = fiveHourPercent != null
+      ? colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)
+      : dim(formatPlaceholderPercentCell());
+    const wCellCmp = weeklyPercent != null
+      ? colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)
+      : dim(formatPlaceholderPercentCell());
+    const quotaSection = `${dim("5h:")}${fCellCmp} ` +
+      `${dim("1w:")}${wCellCmp} ` +
       `${dim("|")} ${svSuffix} ${dim("ctx:")}${colorByPercent(contextPercent, `${contextPercent}%`)}`;
     return [{ prefix, left: quotaSection, right: "" }];
   }
@@ -1321,13 +1402,20 @@ function getClaudeRows(stdin, claudeUsage, combinedSvPct) {
     return [{ prefix, left: quotaSection, right: contextSection }];
   }
 
-  const fiveHourPercentCell = formatPercentCell(fiveHourPercent);
-  const weeklyPercentCell = formatPercentCell(weeklyPercent);
+  // null이면 dim 바 + '--%' 플레이스홀더, 아니면 실제 값 표시
+  const fiveHourPercentCell = fiveHourPercent != null
+    ? colorByProvider(fiveHourPercent, formatPercentCell(fiveHourPercent), claudeOrange)
+    : dim(formatPlaceholderPercentCell());
+  const weeklyPercentCell = weeklyPercent != null
+    ? colorByProvider(weeklyPercent, formatPercentCell(weeklyPercent), claudeOrange)
+    : dim(formatPlaceholderPercentCell());
+  const fiveHourBar = fiveHourPercent != null ? tierBar(fiveHourPercent, CLAUDE_ORANGE) : tierDimBar();
+  const weeklyBar = weeklyPercent != null ? tierBar(weeklyPercent, CLAUDE_ORANGE) : tierDimBar();
   const fiveHourTimeCell = formatTimeCell(fiveHourReset);
   const weeklyTimeCell = formatTimeCellDH(weeklyReset);
-  const quotaSection = `${dim("5h:")}${tierBar(fiveHourPercent, CLAUDE_ORANGE)}${colorByProvider(fiveHourPercent, fiveHourPercentCell, claudeOrange)} ` +
+  const quotaSection = `${dim("5h:")}${fiveHourBar}${fiveHourPercentCell} ` +
     `${dim(fiveHourTimeCell)} ` +
-    `${dim("1w:")}${tierBar(weeklyPercent, CLAUDE_ORANGE)}${colorByProvider(weeklyPercent, weeklyPercentCell, claudeOrange)} ` +
+    `${dim("1w:")}${weeklyBar}${weeklyPercentCell} ` +
     `${dim(weeklyTimeCell)}`;
   const contextSection = `${svSuffix} ${dim("|")} ${dim("ctx:")}${colorByPercent(contextPercent, `${contextPercent}%`)}`;
   return [{ prefix, left: quotaSection, right: contextSection }];
@@ -1368,12 +1456,15 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
     if (realQuota?.type === "codex") {
       const main = realQuota.buckets.codex || realQuota.buckets[Object.keys(realQuota.buckets)[0]];
       if (main) {
-        const fiveP = isResetPast(main.primary?.resets_at) ? 0 : clampPercent(main.primary?.used_percent ?? 0);
-        const weekP = isResetPast(main.secondary?.resets_at) ? 0 : clampPercent(main.secondary?.used_percent ?? 0);
+        // 캐시된 값 그대로 표시 (시간은 advanceToNextCycle이 처리)
+        const fiveP = main.primary?.used_percent != null ? clampPercent(main.primary.used_percent) : null;
+        const weekP = main.secondary?.used_percent != null ? clampPercent(main.secondary.used_percent) : null;
+        const fCellN = fiveP != null ? colorByProvider(fiveP, formatPercentCell(fiveP), provFn) : dim(formatPlaceholderPercentCell());
+        const wCellN = weekP != null ? colorByProvider(weekP, formatPercentCell(weekP), provFn) : dim(formatPlaceholderPercentCell());
         if (cols < 40) {
-          return { prefix: minPrefix, left: `${colorByProvider(fiveP, formatPercentCell(fiveP), provFn)}${dim("/")}${colorByProvider(weekP, formatPercentCell(weekP), provFn)}${svCompact}`, right: "" };
+          return { prefix: minPrefix, left: `${fCellN}${dim("/")}${wCellN}${svCompact}`, right: "" };
         }
-        return { prefix: minPrefix, left: `${dim("5h")} ${colorByProvider(fiveP, formatPercentCell(fiveP), provFn)} ${dim("1w")} ${colorByProvider(weekP, formatPercentCell(weekP), provFn)}${svCompact}`, right: "" };
+        return { prefix: minPrefix, left: `${dim("5h")} ${fCellN} ${dim("1w")} ${wCellN}${svCompact}`, right: "" };
       }
     }
     if (realQuota?.type === "gemini") {
@@ -1393,10 +1484,13 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
     if (realQuota?.type === "codex") {
       const main = realQuota.buckets.codex || realQuota.buckets[Object.keys(realQuota.buckets)[0]];
       if (main) {
-        const fiveP = isResetPast(main.primary?.resets_at) ? 0 : clampPercent(main.primary?.used_percent ?? 0);
-        const weekP = isResetPast(main.secondary?.resets_at) ? 0 : clampPercent(main.secondary?.used_percent ?? 0);
-        quotaSection = `${dim("5h:")}${colorByProvider(fiveP, formatPercentCell(fiveP), provFn)} ` +
-          `${dim("1w:")}${colorByProvider(weekP, formatPercentCell(weekP), provFn)}`;
+        // 캐시된 값 그대로 표시 (시간은 advanceToNextCycle이 처리)
+        const fiveP = main.primary?.used_percent != null ? clampPercent(main.primary.used_percent) : null;
+        const weekP = main.secondary?.used_percent != null ? clampPercent(main.secondary.used_percent) : null;
+        const fCell = fiveP != null ? colorByProvider(fiveP, formatPercentCell(fiveP), provFn) : dim(formatPlaceholderPercentCell());
+        const wCell = weekP != null ? colorByProvider(weekP, formatPercentCell(weekP), provFn) : dim(formatPlaceholderPercentCell());
+        quotaSection = `${dim("5h:")}${fCell} ` +
+          `${dim("1w:")}${wCell}`;
       }
     }
     if (realQuota?.type === "gemini") {
@@ -1409,7 +1503,7 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
       }
     }
     if (!quotaSection) {
-      quotaSection = `${dim("5h:")}${provFn("0%".padStart(PERCENT_CELL_WIDTH))} ${dim("1w:")}${provFn("0%".padStart(PERCENT_CELL_WIDTH))}`;
+      quotaSection = `${dim("5h:")}${dim(formatPlaceholderPercentCell())} ${dim("1w:")}${dim(formatPlaceholderPercentCell())}`;
     }
     const prefix = `${bold(markerColor(`${marker}`))}:`;
     // compact: sv + 계정 (모델 라벨 제거)
@@ -1420,13 +1514,18 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
   if (realQuota?.type === "codex") {
     const main = realQuota.buckets.codex || realQuota.buckets[Object.keys(realQuota.buckets)[0]];
     if (main) {
-      const fiveP = isResetPast(main.primary?.resets_at) ? 0 : clampPercent(main.primary?.used_percent ?? 0);
-      const weekP = isResetPast(main.secondary?.resets_at) ? 0 : clampPercent(main.secondary?.used_percent ?? 0);
-      const fiveReset = formatResetRemaining(main.primary?.resets_at) || "n/a";
-      const weekReset = formatResetRemainingDayHour(main.secondary?.resets_at) || "n/a";
-      quotaSection = `${dim("5h:")}${tierBar(fiveP, provAnsi)}${colorByProvider(fiveP, formatPercentCell(fiveP), provFn)} ` +
+      // 캐시된 값 그대로 표시 (시간은 advanceToNextCycle이 처리)
+      const fiveP = main.primary?.used_percent != null ? clampPercent(main.primary.used_percent) : null;
+      const weekP = main.secondary?.used_percent != null ? clampPercent(main.secondary.used_percent) : null;
+      const fiveReset = formatResetRemaining(main.primary?.resets_at, FIVE_HOUR_MS) || "n/a";
+      const weekReset = formatResetRemainingDayHour(main.secondary?.resets_at, SEVEN_DAY_MS) || "n/a";
+      const fCell = fiveP != null ? colorByProvider(fiveP, formatPercentCell(fiveP), provFn) : dim(formatPlaceholderPercentCell());
+      const wCell = weekP != null ? colorByProvider(weekP, formatPercentCell(weekP), provFn) : dim(formatPlaceholderPercentCell());
+      const fBar = fiveP != null ? tierBar(fiveP, provAnsi) : tierDimBar();
+      const wBar = weekP != null ? tierBar(weekP, provAnsi) : tierDimBar();
+      quotaSection = `${dim("5h:")}${fBar}${fCell} ` +
         `${dim(formatTimeCell(fiveReset))} ` +
-        `${dim("1w:")}${tierBar(weekP, provAnsi)}${colorByProvider(weekP, formatPercentCell(weekP), provFn)} ` +
+        `${dim("1w:")}${wBar}${wCell} ` +
         `${dim(formatTimeCellDH(weekReset))}`;
     }
   }
@@ -1435,7 +1534,7 @@ function getProviderRow(provider, marker, markerColor, qosProfile, accountsConfi
     const bucket = realQuota.quotaBucket;
     if (bucket) {
       const usedP = clampPercent((1 - (bucket.remainingFraction ?? 1)) * 100);
-      const rstRemaining = formatResetRemaining(bucket.resetTime) || "n/a";
+      const rstRemaining = formatResetRemaining(bucket.resetTime, ONE_DAY_MS) || "n/a";
       quotaSection = `${dim("1d:")}${tierBar(usedP, provAnsi)}${colorByProvider(usedP, formatPercentCell(usedP), provFn)} ${dim(formatTimeCell(rstRemaining))} ` +
         `${dim("1w:")}${tierInfBar()}${dim("\u221E%".padStart(PERCENT_CELL_WIDTH))} ${dim(formatTimeCellDH("-d--h"))}`;
     } else {

package/package.json

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

package/scripts/cli-route.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# cli-route.sh v1.6 — CLI 라우팅 래퍼 (ai-scaffold 템플릿)
+# cli-route.sh v1.7 — CLI 라우팅 래퍼 (ai-scaffold 템플릿)
 # v1.0: 기본 라우팅 (Codex/Gemini/Claude 분기)
 # v1.1: stderr 분리, 출력 필터링, 타임아웃, MCP 프로필 지원
 # v1.2: effort 동적 라우팅, bg/fg 모드, Opus 직접 수행, Gemini 모델 분기, 실행 로그
@@ -7,7 +7,8 @@
 # v1.4: TFX_CLI_MODE 지원 (codex-only/gemini-only), CLI 미설치 자동 fallback
 # v1.5: MCP 인벤토리 캐싱 — 실제 서버 가용성 기반 동적 힌트 생성
 # v1.6: 토큰 사용량 추출 + sv-accumulator.json 누적
-VERSION="1.6"
+# v1.7: 배치 AIMD 전략 — 성공 시 +1, 실패/타임아웃 시 ×0.5, 수렴 감지
+VERSION="1.7"
 #
 # 설치: cp scripts/cli-route.sh ~/.claude/scripts/cli-route.sh
 #
@@ -35,8 +36,207 @@ GEMINI_BIN="${GEMINI_BIN:-$(command -v gemini 2>/dev/null || echo gemini)}"
 # ── 상수 ──
 MAX_STDOUT_BYTES=51200  # 50KB — Claude 컨텍스트 절약
 TIMESTAMP=$(date +%s)
-STDERR_LOG="/tmp/omc-route-${AGENT_TYPE}-${TIMESTAMP}-stderr.log"
-STDOUT_LOG="/tmp/omc-route-${AGENT_TYPE}-${TIMESTAMP}-stdout.log"
+STDERR_LOG="/tmp/tfx-route-${AGENT_TYPE}-${TIMESTAMP}-stderr.log"
+STDOUT_LOG="/tmp/tfx-route-${AGENT_TYPE}-${TIMESTAMP}-stdout.log"
+
+# fallback 시 원래 에이전트/CLI 인자 보존용 (수정 3: review fallback 프로필 유실 방지)
+ORIGINAL_AGENT=""
+ORIGINAL_CLI_ARGS=""
+
+# ── 크로스 세션 활성 에이전트 추적 ──
+# 활성 에이전트 레지스트리 경로
+ACTIVE_AGENTS_FILE="${HOME}/.claude/cache/active-agents.json"
+
+# 죽은 PID 및 좀비 정리
+cleanup_stale_agents() {
+  [[ ! -f "$ACTIVE_AGENTS_FILE" ]] && return
+  local now
+  now=$(date +%s)
+  local tmp="${ACTIVE_AGENTS_FILE}.tmp"
+  # jq가 있으면 사용, 없으면 건너뜀
+  if command -v jq &>/dev/null; then
+    jq --argjson now "$now" '
+      .agents |= map(select(
+        # PID 생존 확인은 셸에서 하므로 여기선 타임아웃만 체크
+        (.started + 1200) > $now
+      ))
+    ' "$ACTIVE_AGENTS_FILE" > "$tmp" 2>/dev/null && mv "$tmp" "$ACTIVE_AGENTS_FILE"
+    # 추가로 kill -0으로 죽은 PID 제거
+    local pids
+    pids=$(jq -r '.agents[].pid' "$ACTIVE_AGENTS_FILE" 2>/dev/null)
+    local pid
+    for pid in $pids; do
+      if ! kill -0 "$pid" 2>/dev/null; then
+        jq --argjson pid "$pid" '.agents |= map(select(.pid != $pid))' "$ACTIVE_AGENTS_FILE" > "$tmp" 2>/dev/null && mv "$tmp" "$ACTIVE_AGENTS_FILE"
+      fi
+    done
+  fi
+}
+
+# 에이전트 등록
+register_agent() {
+  local pid="$1" cli="$2" agent="$3"
+  local now
+  now=$(date +%s)
+  cleanup_stale_agents
+  if command -v jq &>/dev/null; then
+    # 캐시 디렉토리가 없으면 생성
+    mkdir -p "$(dirname "$ACTIVE_AGENTS_FILE")"
+    if [[ -f "$ACTIVE_AGENTS_FILE" ]]; then
+      jq --argjson pid "$pid" --arg cli "$cli" --arg agent "$agent" --argjson started "$now" \
+        '.agents += [{"pid": $pid, "cli": $cli, "agent": $agent, "started": $started}]' \
+        "$ACTIVE_AGENTS_FILE" > "${ACTIVE_AGENTS_FILE}.tmp" && mv "${ACTIVE_AGENTS_FILE}.tmp" "$ACTIVE_AGENTS_FILE"
+    else
+      echo "{\"agents\":[{\"pid\":$pid,\"cli\":\"$cli\",\"agent\":\"$agent\",\"started\":$now}]}" > "$ACTIVE_AGENTS_FILE"
+    fi
+  fi
+}
+
+# 에이전트 등록 해제
+deregister_agent() {
+  local pid="$1"
+  if command -v jq &>/dev/null && [[ -f "$ACTIVE_AGENTS_FILE" ]]; then
+    jq --argjson pid "$pid" '.agents |= map(select(.pid != $pid))' \
+      "$ACTIVE_AGENTS_FILE" > "${ACTIVE_AGENTS_FILE}.tmp" && mv "${ACTIVE_AGENTS_FILE}.tmp" "$ACTIVE_AGENTS_FILE"
+  fi
+}
+
+# ── 배치 AIMD 전략 ──
+# 배치 설정 파일: ~/.claude/cache/batch-config.json
+# 초기 batch_size=2, 성공→+1 (AI), 실패/타임아웃→×0.5 (MD), 상한=8, 수렴=3연속 동일
+BATCH_CONFIG_FILE="${HOME}/.claude/cache/batch-config.json"
+
+# 현재 batch_size 반환 (파일 없으면 기본값 2)
+get_batch_size() {
+  if ! command -v jq &>/dev/null; then
+    echo "2"
+    return
+  fi
+  if [[ -f "$BATCH_CONFIG_FILE" ]]; then
+    local size
+    size=$(jq -r '.batch_size // 2' "$BATCH_CONFIG_FILE" 2>/dev/null)
+    # 숫자가 아니거나 비어 있으면 기본값
+    if [[ "$size" =~ ^[0-9]+$ ]]; then
+      echo "$size"
+    else
+      echo "2"
+    fi
+  else
+    echo "2"
+  fi
+}
+
+# 현재 활성 에이전트 수 반환 (active-agents.json 기반)
+get_active_agent_count() {
+  if ! command -v jq &>/dev/null; then
+    echo "0"
+    return
+  fi
+  if [[ -f "$ACTIVE_AGENTS_FILE" ]]; then
+    local count
+    count=$(jq '.agents | length' "$ACTIVE_AGENTS_FILE" 2>/dev/null)
+    echo "${count:-0}"
+  else
+    echo "0"
+  fi
+}
+
+# AIMD 결과 기록 및 batch_size 업데이트
+# 인자: result (success/failed/timeout), agent
+update_batch_result() {
+  local result="$1"
+  local agent="${2:-unknown}"
+
+  if ! command -v jq &>/dev/null; then
+    return
+  fi
+
+  mkdir -p "$(dirname "$BATCH_CONFIG_FILE")"
+
+  # 현재 설정 읽기 (없으면 초기값)
+  local current_size consecutive_same converged
+  if [[ -f "$BATCH_CONFIG_FILE" ]]; then
+    current_size=$(jq -r '.batch_size // 2' "$BATCH_CONFIG_FILE" 2>/dev/null)
+    consecutive_same=$(jq -r '.consecutive_same // 0' "$BATCH_CONFIG_FILE" 2>/dev/null)
+    converged=$(jq -r '.converged // false' "$BATCH_CONFIG_FILE" 2>/dev/null)
+  else
+    current_size=2
+    consecutive_same=0
+    converged="false"
+  fi
+
+  # 숫자 검증
+  [[ "$current_size" =~ ^[0-9]+$ ]] || current_size=2
+  [[ "$consecutive_same" =~ ^[0-9]+$ ]] || consecutive_same=0
+
+  # 수렴 상태면 batch_size 고정 (업데이트만 기록)
+  local new_size="$current_size"
+  if [[ "$converged" != "true" ]]; then
+    case "$result" in
+      success)
+        # Additive Increase: +1, 상한 8
+        new_size=$((current_size + 1))
+        if [[ $new_size -gt 8 ]]; then new_size=8; fi
+        ;;
+      failed|timeout)
+        # Multiplicative Decrease: ×0.5, 하한 1
+        new_size=$((current_size / 2))
+        if [[ $new_size -lt 1 ]]; then new_size=1; fi
+        ;;
+    esac
+  fi
+
+  # 수렴 판단: 3연속 동일하면 converged=true
+  if [[ $new_size -eq $current_size ]]; then
+    consecutive_same=$((consecutive_same + 1))
+  else
+    consecutive_same=0
+  fi
+
+  local new_converged="false"
+  if [[ $consecutive_same -ge 3 ]]; then
+    new_converged="true"
+  fi
+
+  local now
+  now=$(date +%s)
+
+  # history에 추가 (최대 50건 유지) 후 batch_size 업데이트
+  local tmp="${BATCH_CONFIG_FILE}.tmp"
+  if [[ -f "$BATCH_CONFIG_FILE" ]]; then
+    jq --argjson now "$now" \
+       --arg agent "$agent" \
+       --arg result "$result" \
+       --argjson batch_at_time "$current_size" \
+       --argjson new_size "$new_size" \
+       --argjson consecutive_same "$consecutive_same" \
+       --argjson converged "$new_converged" \
+       '
+      .history += [{"timestamp": $now, "agent": $agent, "result": $result, "batch_at_time": $batch_at_time}] |
+      .history = (.history | if length > 50 then .[-50:] else . end) |
+      .batch_size = $new_size |
+      .consecutive_same = $consecutive_same |
+      .converged = $converged
+    ' "$BATCH_CONFIG_FILE" > "$tmp" 2>/dev/null && mv "$tmp" "$BATCH_CONFIG_FILE"
+  else
+    # 파일 신규 생성
+    jq -n \
+      --argjson now "$now" \
+      --arg agent "$agent" \
+      --arg result "$result" \
+      --argjson new_size "$new_size" \
+      --argjson consecutive_same "$consecutive_same" \
+      --argjson converged "$new_converged" \
+      '{
+        batch_size: $new_size,
+        history: [{"timestamp": $now, "agent": $agent, "result": $result, "batch_at_time": 2}],
+        consecutive_same: $consecutive_same,
+        converged: $converged
+      }' > "$BATCH_CONFIG_FILE" 2>/dev/null || true
+  fi
+
+  echo "[cli-route] AIMD: $result → batch_size $current_size→$new_size (consecutive_same=$consecutive_same, converged=$new_converged)" >&2
+}
 
 # ── 라우팅 테이블 ──
 # 반환: CLI_CMD, CLI_ARGS, CLI_TYPE, CLI_EFFORT, DEFAULT_TIMEOUT, RUN_MODE, OPUS_OVERSIGHT
@@ -373,10 +573,13 @@ apply_cli_mode() {
           apply_cli_mode
           return
         else
+          # 원래 에이전트 및 MCP 프로필 정보 보존
+          ORIGINAL_AGENT="${AGENT_TYPE}"
+          ORIGINAL_CLI_ARGS="$CLI_ARGS"
           CLI_TYPE="claude-native"
           CLI_CMD=""
           CLI_ARGS=""
-          echo "[cli-route] codex/gemini 모두 미설치: $AGENT_TYPE → claude-native fallback" >&2
+          echo "[cli-route] codex/gemini 모두 미설치: $AGENT_TYPE → claude-native fallback (원래 프로필: $MCP_PROFILE)" >&2
         fi
       elif [[ "$CLI_TYPE" == "gemini" ]] && ! command -v "$GEMINI_BIN" &>/dev/null; then
         if command -v "$CODEX_BIN" &>/dev/null; then
@@ -384,10 +587,13 @@ apply_cli_mode() {
           apply_cli_mode
           return
         else
+          # 원래 에이전트 및 MCP 프로필 정보 보존
+          ORIGINAL_AGENT="${AGENT_TYPE}"
+          ORIGINAL_CLI_ARGS="$CLI_ARGS"
           CLI_TYPE="claude-native"
           CLI_CMD=""
           CLI_ARGS=""
-          echo "[cli-route] codex/gemini 모두 미설치: $AGENT_TYPE → claude-native fallback" >&2
+          echo "[cli-route] codex/gemini 모두 미설치: $AGENT_TYPE → claude-native fallback (원래 프로필: $MCP_PROFILE)" >&2
         fi
       fi
       ;;
@@ -764,6 +970,9 @@ truncate_output() {
 
 # ── 메인 실행 ──
 main() {
+  # 종료 시 활성 에이전트 레지스트리에서 자동 제거
+  trap 'deregister_agent $$' EXIT
+
   route_agent "$AGENT_TYPE"
 
   # CLI 모드 오버라이드 적용 (tfx-codex/tfx-gemini 또는 auto-fallback)
@@ -782,12 +991,12 @@ main() {
     TIMEOUT_SEC="$DEFAULT_TIMEOUT"
   fi
 
-  # kteam 안정화: Gemini 에이전트 기본 타임아웃 축소 (사용자 미지정 시만)
+  # kteam 안정화: Gemini 에이전트 기본 타임아웃 하한 적용 (사용자 미지정 시만)
   if [[ -z "$USER_TIMEOUT" ]]; then
     case "$AGENT_TYPE" in
       designer|writer)
-        if [[ "$DEFAULT_TIMEOUT" -gt 60 ]]; then
-          TIMEOUT_SEC=60
+        if [[ "$DEFAULT_TIMEOUT" -gt 300 ]]; then
+          TIMEOUT_SEC=300
         fi
         ;;
     esac
@@ -808,6 +1017,12 @@ main() {
     echo "RUN_MODE=$RUN_MODE"
     echo "OPUS_OVERSIGHT=$OPUS_OVERSIGHT"
     echo "TIMEOUT=$TIMEOUT_SEC"
+    echo "MCP_PROFILE=$MCP_PROFILE"
+    # fallback 시 원래 에이전트/MCP 프로필 정보를 함께 출력 (수정 3)
+    if [[ -n "$ORIGINAL_AGENT" ]]; then
+      echo "ORIGINAL_AGENT=$ORIGINAL_AGENT"
+      echo "ORIGINAL_CLI_ARGS=$ORIGINAL_CLI_ARGS"
+    fi
     echo "PROMPT=$PROMPT"
     echo "--- Claude Task($model) 에이전트로 위임하세요 ---"
     exit 0
@@ -825,6 +1040,9 @@ main() {
   echo "[cli-route] type=$CLI_TYPE agent=$AGENT_TYPE effort=$CLI_EFFORT mode=$RUN_MODE timeout=${TIMEOUT_SEC}s" >&2
   echo "[cli-route] opus_oversight=$OPUS_OVERSIGHT mcp_profile=$MCP_PROFILE stderr_log=$STDERR_LOG" >&2
 
+  # 크로스 세션 활성 에이전트 레지스트리에 등록 (수정 4)
+  register_agent $$ "$CLI_TYPE" "$AGENT_TYPE"
+
   # CLI 실행 (stderr 분리 + 타임아웃 + 소요시간 측정)
   local exit_code=0
   local raw_output=""
@@ -906,6 +1124,15 @@ main() {
     accumulate_tokens "$CLI_TYPE" "$input_tokens" "$output_tokens" || true
   fi
 
+  # AIMD 배치 크기 업데이트 (exit code 기반)
+  if [[ $exit_code -eq 0 ]]; then
+    update_batch_result "success" "$AGENT_TYPE" || true
+  elif [[ $exit_code -eq 124 ]]; then
+    update_batch_result "timeout" "$AGENT_TYPE" || true
+  else
+    update_batch_result "failed" "$AGENT_TYPE" || true
+  fi
+
   # CLI 이슈 자동 수집
   local _stderr_for_track=""
   [[ -f "$STDERR_LOG" ]] && _stderr_for_track=$(cat "$STDERR_LOG" 2>/dev/null || echo "")

package/scripts/notion-read.mjs

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
-// notion-read.mjs v1.1 — Notion 대형 페이지 리더 (Codex/Gemini/Claude MCP 위임)
+// notion-read.mjs v1.2 — Notion 대형 페이지 리더 (Codex/Gemini/Claude MCP 위임)
 //
 // Codex/Gemini/Claude CLI에 설치된 Notion MCP를 활용하여 대형 페이지를 마크다운으로 추출.
 // 폴백 체인: Codex(무료) → Gemini(무료) → Claude(최후) → 에러
+// 이관 모드(--delegate): Claude(notion-guest 우선) 단독 실행 + 결과 파일 저장
 //
 // 사용법:
 //   node notion-read.mjs <notion-url-or-page-id> [옵션]
@@ -14,27 +15,28 @@
 //   --cli, -c <codex|gemini> CLI 강제 지정 (기본: 자동 + 폴백)
 //   --depth, -d <n>          중첩 블록 최대 깊이 (기본: 3)
 //   --guest                  notion-guest 통합 사용 (기본: notion)
+//   --delegate               Claude 이관 모드 (notion-guest 우선, 파일 저장)
 
-import { execSync } from "child_process";
-import { readFileSync, writeFileSync, existsSync, mkdirSync, appendFileSync, unlinkSync } from "fs";
-import { join, dirname } from "path";
-import { homedir, tmpdir } from "os";
+import { execSync } from 'child_process';
+import { readFileSync, writeFileSync, existsSync, mkdirSync, appendFileSync, unlinkSync } from 'fs';
+import { join, dirname, resolve } from 'path';
+import { homedir, tmpdir } from 'os';
 
-const VERSION = "1.1";
-const CLAUDE_DIR = join(homedir(), ".claude");
-const MCP_CACHE = join(CLAUDE_DIR, "cache", "mcp-inventory.json");
-const LOG_FILE = join(CLAUDE_DIR, "logs", "cli-route-stats.jsonl");
-const ACC_FILE = join(CLAUDE_DIR, "cache", "sv-accumulator.json");
+const VERSION = '1.2';
+const CLAUDE_DIR = join(homedir(), '.claude');
+const MCP_CACHE = join(CLAUDE_DIR, 'cache', 'mcp-inventory.json');
+const LOG_FILE = join(CLAUDE_DIR, 'logs', 'cli-route-stats.jsonl');
+const ACC_FILE = join(CLAUDE_DIR, 'cache', 'sv-accumulator.json');
 
 // ── ANSI 색상 ──
-const AMBER = "\x1b[38;5;214m";
-const GREEN = "\x1b[38;5;82m";
-const RED = "\x1b[38;5;196m";
-const YELLOW = "\x1b[33m";
-const DIM = "\x1b[2m";
-const BOLD = "\x1b[1m";
-const RESET = "\x1b[0m";
-const GRAY = "\x1b[38;5;245m";
+const AMBER = '\x1b[38;5;214m';
+const GREEN = '\x1b[38;5;82m';
+const RED = '\x1b[38;5;196m';
+const YELLOW = '\x1b[33m';
+const DIM = '\x1b[2m';
+const BOLD = '\x1b[1m';
+const RESET = '\x1b[0m';
+const GRAY = '\x1b[38;5;245m';
 
 // ── URL 파싱 ──
 function parseNotionUrl(input) {
@@ -165,24 +167,24 @@ ${mcpServer} MCP 서버의 도구를 사용하라.
 }
 
 // ── CLI 실행 (임시 파일 + execSync — Windows .cmd 호환) ──
-function runWithCli(cliType, prompt, timeout) {
-  const cliName = cliType === "claude" ? "claude" : cliType === "codex" ? "codex" : "gemini";
+function runWithCli(cliType, prompt, timeout, runMode = 'fg') {
+  const cliName = cliType === 'claude' ? 'claude' : cliType === 'codex' ? 'codex' : 'gemini';
   if (!cliExists(cliName)) {
-    return { success: false, output: "", error: `${cliType} CLI 미설치`, cli: cliType };
+    return { success: false, output: '', error: `${cliType} CLI 미설치`, cli: cliType };
   }
 
   // 프롬프트를 임시 파일에 저장 (shell escaping 회피)
   const promptFile = join(tmpdir(), `notion-prompt-${Date.now()}.md`);
-  writeFileSync(promptFile, prompt, "utf8");
-  const promptPath = promptFile.replace(/\\/g, "/");
+  writeFileSync(promptFile, prompt, 'utf8');
+  const promptPath = promptFile.replace(/\\/g, '/');
 
   // CLI에 전달할 짧은 메타 프롬프트
   const metaPrompt = `Read the file at ${promptPath} and execute all instructions in it exactly as described. Output only the final markdown result.`;
 
   let cmd;
-  if (cliType === "codex") {
+  if (cliType === 'codex') {
     cmd = `codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check "${metaPrompt}"`;
-  } else if (cliType === "gemini") {
+  } else if (cliType === 'gemini') {
     cmd = `gemini -m gemini-3-flash-preview -y --allowed-mcp-server-names notion,notion-guest --prompt "${metaPrompt}"`;
   } else {
     // Claude CLI — print 모드 (MCP 도구 자동 접근)
@@ -192,16 +194,16 @@ function runWithCli(cliType, prompt, timeout) {
   console.error(`${AMBER}▸${RESET} ${cliType}로 실행 중... (timeout: ${timeout}s)`);
   const startTime = Date.now();
 
-  let stdout = "";
-  let stderr = "";
+  let stdout = '';
+  let stderr = '';
   let exitCode = 0;
 
   try {
     stdout = execSync(cmd, {
-      encoding: "utf8",
+      encoding: 'utf8',
       timeout: (timeout + 30) * 1000,
       maxBuffer: 10 * 1024 * 1024,
-      stdio: ["pipe", "pipe", "pipe"],
+      stdio: ['pipe', 'pipe', 'pipe'],
       cwd: process.cwd(),
     });
   } catch (e) {
@@ -216,7 +218,7 @@ function runWithCli(cliType, prompt, timeout) {
   try { unlinkSync(promptFile); } catch {}
 
   // 실행 로그 기록
-  logExecution(cliType, exitCode, elapsed, timeout, stderr);
+  logExecution(cliType, exitCode, elapsed, timeout, stderr, runMode);
 
   if (exitCode === 0 && stdout) {
     return { success: true, output: stdout, cli: cliType, elapsed };
@@ -263,30 +265,30 @@ function cleanCodexOutput(raw) {
 }
 
 // ── 실행 로그 (cli-route.sh 호환) ──
-function logExecution(cliType, exitCode, elapsed, timeout, stderr) {
+function logExecution(cliType, exitCode, elapsed, timeout, stderr, runMode = 'fg') {
   try {
     const logDir = dirname(LOG_FILE);
     if (!existsSync(logDir)) mkdirSync(logDir, { recursive: true });
 
     const ts = new Date().toISOString();
-    const status = exitCode === 0 ? "success" : exitCode === 124 ? "timeout" : "failed";
+    const status = exitCode === 0 ? 'success' : exitCode === 124 ? 'timeout' : 'failed';
     const entry = JSON.stringify({
       ts,
-      agent: "notion-read",
+      agent: 'notion-read',
       cli: cliType,
-      effort: cliType === "codex" ? "high" : cliType === "claude" ? "sonnet" : "flash",
-      run_mode: "fg",
-      opus_oversight: "false",
+      effort: cliType === 'codex' ? 'high' : cliType === 'claude' ? 'sonnet' : 'flash',
+      run_mode: runMode,
+      opus_oversight: 'false',
       status,
       exit_code: exitCode,
       elapsed_sec: elapsed,
       timeout_sec: timeout,
-      mcp_profile: "notion",
+      mcp_profile: runMode === 'delegate' ? 'notion-guest' : 'notion',
       input_tokens: 0,
       output_tokens: 0,
       total_tokens: 0,
     });
-    appendFileSync(LOG_FILE, entry + "\n");
+    appendFileSync(LOG_FILE, entry + '\n');
   } catch {}
 }
 
@@ -309,6 +311,7 @@ function main() {
     --depth, -d <n>           중첩 블록 최대 깊이 (기본: 3)
     --comments                블록/페이지 댓글 포함
     --guest                   notion-guest 통합 사용
+    --delegate                Claude 이관 모드 (notion-guest 우선, 파일 저장)
 
   ${BOLD}폴백 체인${RESET}
     Codex(무료) → Gemini(무료) → Claude(최후) → 에러
@@ -318,6 +321,8 @@ function main() {
     tfx notion-read abc123def456... --output page.md --comments
     tfx notion-read abc123def456... --cli gemini --timeout 900
     tfx notion-read abc123def456... --guest --comments
+    tfx notion-read abc123def456... --delegate
+    tfx notion-read abc123def456... --delegate --output .notion-cache/page.md
 `);
     return;
   }
@@ -330,6 +335,7 @@ function main() {
   let depth = 3;
   let useGuest = false;
   let includeComments = false;
+  let delegateMode = false;
 
   for (let i = 1; i < args.length; i++) {
     switch (args[i]) {
@@ -355,6 +361,9 @@ function main() {
       case "--comments":
         includeComments = true;
         break;
+      case '--delegate':
+        delegateMode = true;
+        break;
     }
   }
 
@@ -368,7 +377,62 @@ function main() {
   console.error(
     `${AMBER}▸${RESET} 페이지: ${parsed.pageId}${parsed.blockId ? ` (블록: ${parsed.blockId})` : ""}`,
   );
-  console.error(`${GRAY}  통합: ${useGuest ? "notion-guest" : "notion"} | 깊이: ${depth} | 댓글: ${includeComments ? "O" : "X"} | 타임아웃: ${timeout}s${RESET}`);
+  console.error(`${GRAY}  통합: ${delegateMode ? 'notion-guest(우선)' : useGuest ? 'notion-guest' : 'notion'} | 깊이: ${depth} | 댓글: ${includeComments ? 'O' : 'X'} | 타임아웃: ${timeout}s${RESET}`);
+
+  // 프롬프트 생성
+  const prompt = buildPrompt(parsed.pageId, parsed.blockId, depth, useGuest, includeComments);
+  // Claude 폴백용: notion/notion-guest 양쪽 시도 프롬프트
+  const claudePrompt = buildPrompt(parsed.pageId, parsed.blockId, depth, false, includeComments)
+    .replace(
+      'notion MCP 서버의 도구를 사용하라.',
+      '가능하면 notion-guest MCP 서버를 먼저 사용하라. 실패하면 notion MCP 서버를 사용하라.',
+    );
+
+  // delegate 모드: Claude 단독 + notion-guest 우선 + 파일 저장
+  if (delegateMode) {
+    console.error(`${AMBER}▸${RESET} delegate 모드 활성화: Claude로 notion-guest 우선 접근`);
+
+    const delegatePrompt = `${claudePrompt}
+
+### delegate 모드 추가 지시
+- notion-guest MCP 서버를 최우선으로 먼저 시도하라.
+- notion-guest가 실패하거나 미구성일 때만 notion 서버로 폴백하라.
+- 도구 호출 결과를 바탕으로 최종 마크다운만 출력하라.`;
+
+    const delegateResult = runWithCli('claude', delegatePrompt, timeout, 'delegate');
+    if (!delegateResult.success) {
+      console.error(`${RED}✗${RESET} delegate 모드 실패: ${delegateResult.error}`);
+      if (delegateResult.stderr) {
+        console.error(`${GRAY}  stderr: ${delegateResult.stderr.slice(0, 250)}${RESET}`);
+      }
+      console.error(`${GRAY}  대안: --delegate 없이 실행해 기존 폴백 체인을 사용하세요.${RESET}`);
+      console.error(`${GRAY}  예: tfx notion-read ${parsed.pageId} --comments${RESET}`);
+      process.exit(1);
+    }
+
+    const delegateOutput = delegateResult.output.trim();
+    const isDelegateFailureOutput =
+      (delegateOutput.includes('조회 실패') || delegateOutput.includes('읽기 실패') || delegateOutput.includes('not_found')) &&
+      delegateOutput.length < 500;
+
+    if (delegateOutput.length <= 100 || isDelegateFailureOutput) {
+      console.error(`${RED}✗${RESET} delegate 모드 실패: Claude 결과가 비정상적입니다.`);
+      console.error(`${GRAY}  대안: --delegate 없이 실행해 Codex/Gemini/Claude 폴백 체인을 사용하세요.${RESET}`);
+      process.exit(1);
+    }
+
+    const delegateTarget = outputFile || join('.notion-cache', `${parsed.pageId}.md`);
+    const delegateDir = dirname(delegateTarget);
+    if (delegateDir && delegateDir !== '.' && !existsSync(delegateDir)) {
+      mkdirSync(delegateDir, { recursive: true });
+    }
+    writeFileSync(delegateTarget, delegateOutput, 'utf8');
+
+    const savedPath = resolve(delegateTarget);
+    console.error(`${GREEN}✓${RESET} delegate 결과 저장: ${savedPath}`);
+    console.error(`${GRAY}  후속 작업 참조 경로: ${savedPath}${RESET}`);
+    return;
+  }
 
   // MCP 가용성 확인
   const mcpAvail = getNotionMcpClis(useGuest);
@@ -400,15 +464,6 @@ function main() {
     cliOrder.push("claude");
   }
 
-  // 프롬프트 생성
-  const prompt = buildPrompt(parsed.pageId, parsed.blockId, depth, useGuest, includeComments);
-  // Claude 폴백용: notion/notion-guest 양쪽 시도 프롬프트
-  const claudePrompt = buildPrompt(parsed.pageId, parsed.blockId, depth, false, includeComments)
-    .replace(
-      "404 에러가 나면 notion-guest 서버로 재시도하라.",
-      "404 에러가 나면 반드시 notion-guest 서버로 재시도하라. notion, notion-guest, claude_ai_Notion 등 사용 가능한 모든 Notion MCP 서버를 시도하라.",
-    );
-
   // 실행 + 폴백
   let lastResult = null;
   let notionAccessFailed = false;