@triflux/core 10.25.1 → 10.26.0

package/hub/team/retry-state-machine.mjs

@@ -21,7 +21,7 @@ import {
   readFileSync,
   writeFileSync,
 } from "node:fs";
-import { dirname } from "node:path";
+import { dirname, join } from "node:path";
 
 export const STATES = Object.freeze({
   PLANNING: "PLANNING",
@@ -38,16 +38,12 @@ export const MODES = Object.freeze({
   ESCALATE: "auto-escalate",
 });
 
-// Escalation chain (2026-04-25 정책):
-//   1. gpt-5.4-mini   — 비용 최저, fast tier, 단순 task 대부분 해결
-//   2. gpt-5.3-codex  — 가성비 중간, code specialized (Plus/free 모두 OK, fast 미지원)
-//   3. gpt-5.5         — top reasoning + 코드 강함, fast tier
-//   4. claude opus-4-7 — 최종 수단
-// sonnet-4-6 단계는 제거: gpt-5.5 가 코드/추론/비용 모두 우위 + 5.3-codex 가성비
-// 단계가 더 적합한 중간 격상.
+const ESCALATION_CHAIN_CONFIG_PATH = ".triflux/config/escalation-chain.json";
+
+// Escalation chain (2026-05-27 정책):
+//   1. codex gpt-5.5   — 코드/추론/비용에서 mini/5.3-codex 중간 단계를 대체
+//   2. claude opus-4-7 — 최종 수단
 const DEFAULT_ESCALATION_CHAIN = Object.freeze([
-  Object.freeze({ cli: "codex", model: "gpt-5.4-mini" }),
-  Object.freeze({ cli: "codex", model: "gpt-5.3-codex" }),
   Object.freeze({ cli: "codex", model: "gpt-5.5" }),
   Object.freeze({ cli: "claude", model: "opus-4-7" }),
 ]);
@@ -56,9 +52,7 @@ const STUCK_THRESHOLD = 3;
 
 export function createRetryStateMachine(options = {}) {
   const mode = options.mode || MODES.BOUNDED;
-  const cliChain = Array.isArray(options.cliChain)
-    ? options.cliChain.slice()
-    : DEFAULT_ESCALATION_CHAIN.slice();
+  const cliChain = resolveEscalationChain(options);
   const maxIterationsInput =
     typeof options.maxIterations === "number" ? options.maxIterations : null;
   const maxIterations =
@@ -205,7 +199,10 @@ export function createRetryStateMachine(options = {}) {
     state.lastFailureReason = snapshot.lastFailureReason || null;
     state.cliIndex = Number(snapshot.cliIndex) || 0;
     if (Array.isArray(snapshot.cliChain) && snapshot.cliChain.length > 0) {
-      state.cliChain = snapshot.cliChain.slice();
+      state.cliChain = normalizeEscalationChain(
+        snapshot.cliChain,
+        "snapshot.cliChain",
+      );
     }
     if (snapshot.mode) state.mode = snapshot.mode;
     if (snapshot.sessionId !== undefined) state.sessionId = snapshot.sessionId;
@@ -227,6 +224,78 @@ export function createRetryStateMachine(options = {}) {
   };
 }
 
+function resolveEscalationChain(options) {
+  if (Array.isArray(options.cliChain)) {
+    return normalizeEscalationChain(options.cliChain, "options.cliChain");
+  }
+
+  const projectRoot = options.projectRoot || process.cwd();
+  return (
+    loadEscalationChainOverride(projectRoot) ||
+    normalizeEscalationChain(
+      DEFAULT_ESCALATION_CHAIN,
+      "DEFAULT_ESCALATION_CHAIN",
+    )
+  );
+}
+
+export function loadEscalationChainOverride(projectRoot = process.cwd()) {
+  const configPath = join(projectRoot, ESCALATION_CHAIN_CONFIG_PATH);
+  if (!existsSync(configPath)) return null;
+
+  const raw = readFileSync(configPath, "utf8");
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    throw new Error(
+      `escalation-chain override 파싱 실패: ${configPath} — 원인: ${err.message} — 수정: JSON 문법 확인 또는 파일 삭제로 DEFAULT_ESCALATION_CHAIN 사용`,
+      { cause: err },
+    );
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(`${configPath}: expected object`);
+  }
+  if (parsed.version !== undefined && parsed.version !== 1) {
+    throw new Error(`${configPath}: unsupported version ${parsed.version}`);
+  }
+  return normalizeEscalationChain(parsed.chain, configPath);
+}
+
+function normalizeEscalationChain(chain, source) {
+  if (!Array.isArray(chain) || chain.length === 0) {
+    throw new Error(`${source}: chain must be a non-empty array`);
+  }
+  return chain.map((entry, index) =>
+    normalizeEscalationChainEntry(entry, index, source),
+  );
+}
+
+function normalizeEscalationChainEntry(entry, index, source) {
+  if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
+    throw new Error(`${source}: chain[${index}] must be an object`);
+  }
+  if (typeof entry.cli !== "string" || entry.cli.trim() === "") {
+    throw new Error(
+      `${source}: chain[${index}].cli must be a non-empty string`,
+    );
+  }
+  if (typeof entry.model !== "string" || entry.model.trim() === "") {
+    throw new Error(
+      `${source}: chain[${index}].model must be a non-empty string`,
+    );
+  }
+
+  const normalized = {
+    cli: entry.cli,
+    model: entry.model,
+  };
+  if (typeof entry.profile === "string" && entry.profile.trim() !== "") {
+    normalized.profile = entry.profile;
+  }
+  return normalized;
+}
+
 function persistTransition(stateFile, entry) {
   const dir = dirname(stateFile);
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true });

package/hub/workers/worker-utils.mjs

@@ -1,5 +1,5 @@
 // hub/workers/worker-utils.mjs — 워커 공통 유틸리티
-// claude-worker, gemini-worker, pipe 등에서 공유하는 순수 유틸 함수 모음.
+// claude-worker, Antigravity route compatibility worker, pipe 등에서 공유하는 순수 유틸 함수 모음.
 
 export const DEFAULT_TIMEOUT_MS = 15 * 60 * 1000;
 export const DEFAULT_KILL_GRACE_MS = 1000;

package/hud/constants.mjs

@@ -138,6 +138,11 @@ export const SPAWN_LOCK_TTL_MS = 30 * 1000; // 30초 spawn dedup
 
 // Gemini 쿼터 API 관련
 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 GEMINI_QUOTA_CACHE_PATH = join(
   homedir(),
   ".claude",
@@ -162,6 +167,7 @@ export const TFX_PREFLIGHT_CACHE_PATH = join(
   "cache",
   "tfx-preflight.json",
 );
+export const TFX_PREFLIGHT_CACHE_STALE_MS = 60 * 60 * 1000;
 export const GEMINI_RPM_TRACKER_PATH = join(
   homedir(),
   ".claude",

package/hud/hud-qos-status.mjs

@@ -26,6 +26,7 @@ import {
   GEMINI_SESSION_REFRESH_FLAG,
   QOS_PATH,
   TFX_PREFLIGHT_CACHE_PATH,
+  TFX_PREFLIGHT_CACHE_STALE_MS,
 } from "./constants.mjs";
 import {
   buildContextUsageView,
@@ -50,6 +51,7 @@ import {
 import {
   buildGeminiAuthContext,
   fetchGeminiQuota,
+  getAntigravityEmail,
   getGeminiEmail,
   readGeminiQuotaSnapshot,
   readGeminiSessionSnapshot,
@@ -111,10 +113,12 @@ async function main() {
 
   const qosProfile = readJson(QOS_PATH, { providers: {} });
   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 antigravityReady =
-    process.env.TFX_ANTIGRAVITY_OK === "1" ||
-    preflightCache?.antigravity?.ok === true ||
-    preflightCache?.available_agents?.includes("antigravity");
+    preflightFresh && preflightCache?.antigravity?.ok === true;
   const accountsConfig = readJson(ACCOUNTS_CONFIG_PATH, { providers: {} });
   const accountsState = readJson(ACCOUNTS_STATE_PATH, { providers: {} });
   const claudeUsageSnapshot = readClaudeUsageSnapshot();
@@ -150,6 +154,7 @@ async function main() {
   const claudeUsage = claudeUsageSnapshot.data;
   const codexEmail = getCodexEmail();
   const geminiEmail = getGeminiEmail();
+  const antigravityEmail = getAntigravityEmail();
   const codexBuckets = codexSnapshot.buckets;
   const geminiSession = geminiSessionSnapshot.session;
   const geminiQuota = geminiQuotaSnapshot.quota;
@@ -206,9 +211,9 @@ async function main() {
       contextView,
       claudeUsage,
       codexBuckets,
-      geminiSession,
-      geminiBucket,
-      combinedSvPct,
+      antigravityReady ? null : geminiSession,
+      antigravityReady ? null : geminiBucket,
+      antigravityReady ? Math.round((codexSv ?? 0) * 100) : combinedSvPct,
       antigravityReady ? "a" : "g",
     );
     process.stdout.write(`\x1b[0m${microLine}\n`);
@@ -252,9 +257,9 @@ async function main() {
       qosProfile,
       accountsConfig,
       accountsState,
-      geminiQuotaData,
-      antigravityReady ? "anti" : geminiEmail,
-      geminiSv,
+      antigravityReady ? { type: "antigravity" } : geminiQuotaData,
+      antigravityReady ? antigravityEmail : geminiEmail,
+      antigravityReady ? null : geminiSv,
       null,
     ),
   ];
@@ -284,7 +289,6 @@ async function main() {
   // 비활성 프로바이더 dim 처리: 데이터 없으면 전체 줄 dim
   const codexActive = codexBuckets != null;
   const geminiActive =
-    antigravityReady ||
     (geminiSession?.total || 0) > 0 ||
     geminiBucket != null ||
     geminiProBucket != null ||

package/hud/providers/gemini.mjs

@@ -8,6 +8,7 @@ import https from "node:https";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import {
+  ANTIGRAVITY_OAUTH_PATHS,
   GEMINI_API_TIMEOUT_MS,
   GEMINI_OAUTH_PATH,
   GEMINI_PROJECT_CACHE_PATH,
@@ -82,15 +83,39 @@ export function deriveGeminiLimits(bucket) {
   };
 }
 
+function getCredentialEmail(credential) {
+  return (
+    decodeJwtEmail(credential?.id_token) ||
+    credential?.email ||
+    credential?.account?.email ||
+    credential?.user?.email ||
+    credential?.profile?.email ||
+    null
+  );
+}
+
 export function getGeminiEmail() {
   try {
     const oauth = readJson(GEMINI_OAUTH_PATH, null);
-    return decodeJwtEmail(oauth?.id_token);
+    return getCredentialEmail(oauth);
   } catch {
     return null;
   }
 }
 
+export function getAntigravityEmail() {
+  for (const oauthPath of ANTIGRAVITY_OAUTH_PATHS) {
+    try {
+      const oauth = readJson(oauthPath, null);
+      const email = getCredentialEmail(oauth);
+      if (email) return email;
+    } catch {
+      // Try the next known Antigravity credential path.
+    }
+  }
+  return null;
+}
+
 export function buildGeminiAuthContext(accountId) {
   const oauth = readJson(GEMINI_OAUTH_PATH, null);
   const tokenSource =

package/hud/renderers.mjs

@@ -434,6 +434,16 @@ export function getAccountLabel(
   return label;
 }
 
+function formatAntigravityQuotaSection(currentTier) {
+  if (currentTier === "minimal") {
+    return `${dim("q:")}${dim(formatPlaceholderPercentCell())}`;
+  }
+  if (currentTier === "compact") {
+    return `${dim("q:")}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCell("n/a"))}`;
+  }
+  return `${dim("q:")}${tierDimBar(currentTier)}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCell("n/a"))}`;
+}
+
 export function getProviderRow(
   currentTier,
   provider,
@@ -470,6 +480,9 @@ export function getProviderRow(
 
   if (currentTier === "nano" || currentTier === "micro") {
     const minPrefix = `${bold(markerColor(`${marker}`))}:`;
+    if (provider === "antigravity") {
+      return { prefix: minPrefix, left: dim("--"), right: "" };
+    }
     if (realQuota?.type === "codex") {
       const main =
         realQuota.buckets.codex ||
@@ -498,7 +511,7 @@ export function getProviderRow(
         };
       }
     }
-    if (realQuota?.type === "gemini") {
+    if (provider === "gemini" && realQuota?.type === "gemini") {
       const pools = realQuota.pools || {};
       if (pools.pro || pools.flash) {
         const pP = pools.pro
@@ -526,6 +539,9 @@ export function getProviderRow(
   }
 
   if (currentTier === "minimal") {
+    if (provider === "antigravity") {
+      quotaSection = formatAntigravityQuotaSection(currentTier);
+    }
     if (realQuota?.type === "codex") {
       const main =
         realQuota.buckets.codex ||
@@ -550,7 +566,7 @@ export function getProviderRow(
         quotaSection = `${dim("5h:")}${fCell} ${dim("1w:")}${wCell}`;
       }
     }
-    if (realQuota?.type === "gemini") {
+    if (provider === "gemini" && realQuota?.type === "gemini") {
       const pools = realQuota.pools || {};
       if (pools.pro || pools.flash) {
         const slot = (bucket, label) => {
@@ -579,6 +595,9 @@ export function getProviderRow(
   }
 
   if (currentTier === "compact") {
+    if (provider === "antigravity") {
+      quotaSection = formatAntigravityQuotaSection(currentTier);
+    }
     if (realQuota?.type === "codex") {
       const main =
         realQuota.buckets.codex ||
@@ -610,7 +629,7 @@ export function getProviderRow(
         quotaSection = `${dim("5h:")}${fCell} ${dim(formatTimeCell(fiveReset))} ${dim("1w:")}${wCell} ${dim(formatTimeCellDH(weekReset))}`;
       }
     }
-    if (realQuota?.type === "gemini") {
+    if (provider === "gemini" && realQuota?.type === "gemini") {
       const pools = realQuota.pools || {};
       const hasAnyPool = pools.pro || pools.flash;
       if (hasAnyPool) {
@@ -644,6 +663,10 @@ export function getProviderRow(
   }
 
   // full tier
+  if (provider === "antigravity") {
+    quotaSection = formatAntigravityQuotaSection(currentTier);
+  }
+
   if (realQuota?.type === "codex") {
     const main =
       realQuota.buckets.codex ||
@@ -686,7 +709,7 @@ export function getProviderRow(
     }
   }
 
-  if (realQuota?.type === "gemini") {
+  if (provider === "gemini" && realQuota?.type === "gemini") {
     const pools = realQuota.pools || {};
     const hasAnyPool = pools.pro || pools.flash;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triflux/core",
-  "version": "10.25.1",
+  "version": "10.26.0",
   "description": "triflux core — CLI routing, pipeline, adapters. Zero native dependencies.",
   "type": "module",
   "main": "hub/index.mjs",

package/scripts/lib/cli-codex.mjs

@@ -33,14 +33,14 @@ const AGENT_PROFILES = {
     mcpHint: "implement",
   },
   cleanup: {
-    profile: "mini54_med",
+    profile: "gpt55_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
     mcpHint: "implement",
   },
   deslop: {
-    profile: "mini54_med",
+    profile: "gpt55_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -157,7 +157,7 @@ const AGENT_PROFILES = {
     subcommand: "review",
   },
   spark: {
-    profile: "spark53_low",
+    profile: "gpt55_low",
     timeoutSec: 180,
     runMode: "fg",
     opusOversight: false,

package/scripts/lib/cli-gemini.mjs

@@ -1,39 +1,11 @@
-// cli-gemini.mjs — Gemini CLI adapter (Phase 0 PoC).
-//
-// 책임: Gemini 프로파일/모델/timeout 매핑. resolve_gemini_profile() 의 결과는 Phase 1 에서
-// 통합한다 (Phase 0 은 라벨만 전달).
-//
-// 출처: scripts/tfx-route.sh route_agent() L1045-L1050.
+// cli-gemini.mjs — legacy Gemini adapter alias.
+// The public "gemini" label remains accepted, but the executable plan is AGY.
 
-export const id = "gemini";
-export const cliType = "gemini";
-export const command = "gemini";
-
-const AGENT_PROFILES = {
-  designer: {
-    profile: "pro31",
-    timeoutSec: 900,
-    runMode: "bg",
-    opusOversight: false,
-    mcpHint: "docs",
-  },
-  gemini: {
-    profile: "pro31",
-    timeoutSec: 900,
-    runMode: "bg",
-    opusOversight: false,
-    mcpHint: "docs",
-  },
-  writer: {
-    profile: "flash3",
-    timeoutSec: 900,
-    runMode: "bg",
-    opusOversight: false,
-    mcpHint: "docs",
-  },
-};
+import * as agyAdapter from "./cli-agy.mjs";
 
-const DEFAULT_PROFILE = AGENT_PROFILES.gemini;
+export const id = "gemini";
+export const cliType = "antigravity";
+export const command = "agy";
 
 export function plan({
   agent,
@@ -45,23 +17,21 @@ export function plan({
   if (!agent) {
     throw new Error("[cli-gemini] agent required");
   }
-  const cfg = AGENT_PROFILES[agent] ?? DEFAULT_PROFILE;
-  const effectiveTimeoutSec =
-    Number.isFinite(timeoutSec) && timeoutSec > 0 ? timeoutSec : cfg.timeoutSec;
-  return {
-    command,
-    profile: cfg.profile,
-    effort: cfg.profile,
-    args: ["-m", cfg.profile, "-y", "--prompt"],
-    timeoutMs: effectiveTimeoutSec * 1000,
-    runMode: cfg.runMode,
-    opusOversight: cfg.opusOversight,
-    mcpProfile: mcpProfile === "auto" ? cfg.mcpHint : mcpProfile,
-    promptLength: prompt.length,
-    contextFile: contextFile || null,
-  };
+  return agyAdapter.plan({
+    agent: agent === "gemini" ? "antigravity" : agent,
+    prompt,
+    mcpProfile,
+    timeoutSec,
+    contextFile,
+  });
 }
 
 export function describe() {
-  return { id, cliType, command, agents: Object.keys(AGENT_PROFILES) };
+  return {
+    id,
+    cliType,
+    command,
+    aliases: ["gemini"],
+    agents: ["gemini", "designer", "writer", "antigravity", "agy"],
+  };
 }

package/scripts/lib/keyword-rules.mjs

@@ -1,6 +1,6 @@
 import { readFileSync } from "node:fs";
 
-const VALID_MCP_ROUTES = new Set(["codex", "gemini", "claude"]);
+const VALID_MCP_ROUTES = new Set(["codex", "antigravity", "gemini", "claude"]);
 
 function logRuleError(message, error) {
   if (error) {

package/scripts/lib/psmux-info.mjs

@@ -12,14 +12,14 @@ export const PSMUX_OPTIONAL_COMMANDS = ["detach-client"];
 
 // Windows 패키지 매니저 — winget/scoop/choco 는 Windows 전용
 export const PSMUX_INSTALL_COMMANDS = [
-  "winget install marlocarlo.psmux",
+  "winget install psmux",
   "scoop install psmux",
   "choco install psmux",
   "cargo install psmux",
 ];
 
 export const PSMUX_UPDATE_COMMANDS = [
-  "winget upgrade marlocarlo.psmux",
+  "winget upgrade psmux",
   "scoop update psmux",
   "choco upgrade psmux",
   "cargo install psmux --force",
@@ -42,14 +42,15 @@ export const PSMUX_INSTALL_COMMANDS_LINUX = ["cargo install psmux"];
 export const PSMUX_UPDATE_COMMANDS_LINUX = ["cargo install psmux --force"];
 
 // PR #258 OS-primary 분기 정책: macOS/Linux 는 tmux 가 POSIX 표준 primary,
-// psmux 는 선택형. native teams fallback (tmux 또는 child process spawn) 으로 동작 가능.
+// psmux 는 선택형이다. 따라서 macOS/Linux 에서 "psmux 미설치"는 fallback 사유가
+// 아니며, tmux 까지 없을 때만 native/in-process fallback 을 고려한다.
 export const PSMUX_FALLBACK_NOTE_DARWIN =
   "macOS 에서는 tmux 가 표준 멀티플렉서이며, " +
-  "triflux 는 psmux 없이도 native teams fallback 으로 멀티모델 병렬 실행을 지원합니다.";
+  "psmux 미설치는 fallback 사유가 아닙니다. tmux 도 없을 때만 in-process/native fallback 을 사용합니다.";
 
 export const PSMUX_FALLBACK_NOTE_LINUX =
   "Linux 에서는 tmux 가 표준 멀티플렉서이며, " +
-  "triflux 는 psmux 없이도 native teams fallback 으로 멀티모델 병렬 실행을 지원합니다.";
+  "psmux 미설치는 fallback 사유가 아닙니다. tmux 도 없을 때만 in-process/native fallback 을 사용합니다.";
 
 export function getPsmuxInstallCommandsFor(platform = process.platform) {
   if (platform === "darwin") return PSMUX_INSTALL_COMMANDS_DARWIN;
@@ -177,3 +178,47 @@ export function probePsmuxSupport(options = {}) {
     };
   }
 }
+
+export function probePrimaryMultiplexerSupport(options = {}) {
+  const platform = options.platform || process.platform;
+  const execFileSyncFn = options.execFileSyncFn || execFileSync;
+
+  if (platform === "win32") {
+    return {
+      kind: "psmux",
+      ...probePsmuxSupport(options),
+    };
+  }
+
+  const bin = options.bin || "tmux";
+  try {
+    const versionOutput = execFileSyncFn(bin, ["-V"], {
+      encoding: "utf8",
+      timeout: 2000,
+      stdio: ["ignore", "pipe", "pipe"],
+      windowsHide: true,
+    });
+    return {
+      ok: true,
+      installed: true,
+      kind: "tmux",
+      version: String(versionOutput || "").trim() || null,
+      recommendedVersion: null,
+      recommended: true,
+      missingCommands: [],
+      missingOptionalCommands: [],
+    };
+  } catch (error) {
+    return {
+      ok: false,
+      installed: false,
+      kind: "tmux",
+      version: null,
+      recommendedVersion: null,
+      recommended: false,
+      missingCommands: ["tmux"],
+      missingOptionalCommands: [],
+      error: error?.message || String(error),
+    };
+  }
+}