@triflux/core 10.44.0 → 10.46.0

package/hud/renderers.mjs

@@ -22,11 +22,9 @@ import {
 import {
   ACCOUNT_LABEL_WIDTH,
   FIVE_HOUR_MS,
-  LEGACY_SV_ACCUMULATOR,
   ONE_DAY_MS,
   PROVIDER_PREFIX_WIDTH,
   SEVEN_DAY_MS,
-  SV_ACCUMULATOR_PATH,
   TEAM_STATE_PATH,
 } from "./constants.mjs";
 import { buildContextUsageView } from "./context-monitor.mjs";
@@ -40,13 +38,11 @@ import {
   formatResetRemaining,
   formatResetRemainingDayHour,
   formatSavings,
-  formatSvPct,
   formatTimeCell,
   formatTimeCellDH,
   formatTokenCount,
   padAnsiRight,
   readJson,
-  readJsonMigrate,
   stripAnsi,
   truncateAnsi,
 } from "./utils.mjs";
@@ -88,25 +84,6 @@ export function readLatestBenchmarkDiff() {
   }
 }
 
-// 토큰 절약액 누적치 읽기 (tfx-auto token tracker)
-export function readTokenSavings() {
-  const savingsPath = join(
-    homedir(),
-    ".omc",
-    "state",
-    "tfx-auto-tokens",
-    "savings-total.json",
-  );
-  const data = readJson(savingsPath, null);
-  if (!data || data.totalSaved === 0) return null;
-  return data;
-}
-
-// sv-accumulator.json에서 누적 토큰/비용 읽기
-export function readSvAccumulator() {
-  return readJsonMigrate(SV_ACCUMULATOR_PATH, LEGACY_SV_ACCUMULATOR, null);
-}
-
 /**
  * 파이프라인 벤치마크 diff 결과를 HUD 요약 문자열로 포맷
  */
@@ -279,9 +256,12 @@ export function getMicroLine(
   codexBuckets,
   geminiSession,
   geminiBucket,
-  combinedSvPct,
   geminiMarker = "g",
+  options = {},
 ) {
+  // showCodex / showGemini 는 machine profile 의 TFX_DISABLE_* 게이트다. 기본값이
+  // true 라 8번째 인자를 주지 않는 기존 호출은 그대로 동작한다.
+  const { showCodex = true, showGemini = true } = options;
   const ctxView = contextView || buildContextUsageView({}, null);
   // Claude 5h/1w
   const cF =
@@ -325,34 +305,27 @@ export function getMicroLine(
     gVal = dim("--");
   }
 
-  // sv
-  const sv = formatSvPct(combinedSvPct).trim();
-
   const cols = getTerminalColumns() || 120;
-  const line =
-    `${bold(claudeOrange("c"))}${dim(":")}${cVal} ` +
-    `${bold(codexWhite("x"))}${dim(":")}${xVal} ` +
-    `${bold(geminiBlue(geminiMarker))}${dim(":")}${gVal} ` +
-    `${dim("sv:")}${sv} ` +
-    `${dim("CTX:")}${colorByPercent(ctxView.percent, ctxView.display)}`;
-  return truncateAnsi(line, cols);
+  // 세그먼트를 모아 join 한다. 차단된 프로바이더를 뺄 때 공백이 겹치지 않는다.
+  const segments = [`${bold(claudeOrange("c"))}${dim(":")}${cVal}`];
+  if (showCodex) {
+    segments.push(`${bold(codexWhite("x"))}${dim(":")}${xVal}`);
+  }
+  if (showGemini) {
+    segments.push(`${bold(geminiBlue(geminiMarker))}${dim(":")}${gVal}`);
+  }
+  segments.push(
+    `${dim("CTX:")}${colorByPercent(ctxView.percent, ctxView.display)}`,
+  );
+  return truncateAnsi(segments.join(" "), cols);
 }
 
 // ============================================================================
 // Claude 행 렌더러
 // ============================================================================
-export function getClaudeRows(
-  currentTier,
-  contextView,
-  claudeUsage,
-  combinedSvPct,
-) {
+export function getClaudeRows(currentTier, contextView, claudeUsage) {
   const ctxView = contextView || buildContextUsageView({}, null);
   const prefix = `${bold(claudeOrange("c"))}:`;
-  // 절약 퍼센트
-  const svStr = formatSvPct(combinedSvPct);
-  const svSuffix = `${dim("sv:")}${svStr}`;
-
   // API 실측 데이터
   const fiveHourPercent = claudeUsage?.fiveHourPercent ?? null;
   const weeklyPercent = claudeUsage?.weeklyPercent ?? null;
@@ -418,7 +391,7 @@ export function getClaudeRows(
     const warning = ctxView.warningTag
       ? ` ${dim("|")} ${yellow(ctxView.warningTag)}`
       : "";
-    const contextSection = `${svSuffix} ${dim("|")} ${dim("CTX:")}${colorByPercent(ctxView.percent, ctxView.display)}${warning}`;
+    const contextSection = `${dim("CTX:")}${colorByPercent(ctxView.percent, ctxView.display)}${warning}`;
     return [{ prefix, left: quotaSection, right: contextSection }];
   }
 
@@ -428,7 +401,7 @@ export function getClaudeRows(
   const warning = ctxView.warningTag
     ? ` ${dim("|")} ${yellow(ctxView.warningTag)}`
     : "";
-  const contextSection = `${svSuffix} ${dim("|")} ${dim("CTX:")}${colorByPercent(ctxView.percent, ctxView.display)}${warning}`;
+  const contextSection = `${dim("CTX:")}${colorByPercent(ctxView.percent, ctxView.display)}${warning}`;
   return [{ prefix, left: quotaSection, right: contextSection }];
 }
 
@@ -513,7 +486,6 @@ export function getProviderRow(
   accountsState,
   realQuota,
   codexEmail,
-  savingsMultiplier,
   modelLabel,
 ) {
   const accountLabel = fitText(
@@ -521,10 +493,6 @@ export function getProviderRow(
     ACCOUNT_LABEL_WIDTH,
   );
 
-  // 절약 퍼센트 섹션
-  const svPct =
-    savingsMultiplier != null ? Math.round(savingsMultiplier * 100) : null;
-  const svStr = formatSvPct(svPct);
   const _modelLabelStr = modelLabel ? ` ${markerColor(modelLabel)}` : "";
 
   // 프로바이더별 색상 프로필
@@ -708,10 +676,7 @@ export function getProviderRow(
       quotaSection = `${dim("5h:")}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCell("n/a"))} ${dim("1w:")}${dim(formatPlaceholderPercentCell())} ${dim(formatTimeCellDH("--d--h"))}`;
     }
     const prefix = `${bold(markerColor(`${marker}`))}:`;
-    const compactRight = [
-      svStr ? `${dim("sv:")}${svStr}` : "",
-      accountLabel ? markerColor(accountLabel) : "",
-    ]
+    const compactRight = [accountLabel ? markerColor(accountLabel) : ""]
       .filter(Boolean)
       .join(" ");
     return { prefix, left: quotaSection, right: compactRight };
@@ -800,11 +765,8 @@ export function getProviderRow(
 
   const prefix = `${bold(markerColor(`${marker}`))}:`;
   const accountSection = `${markerColor(accountLabel)}`;
-  const svSection = svStr ? `${dim("sv:")}${svStr}` : "";
   const modelLabelSection = modelLabel ? markerColor(modelLabel) : "";
-  const rightParts = [svSection, accountSection, modelLabelSection].filter(
-    Boolean,
-  );
+  const rightParts = [accountSection, modelLabelSection].filter(Boolean);
   return {
     prefix,
     left: quotaSection,

package/hud/utils.mjs

@@ -5,11 +5,7 @@
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
-import {
-  PERCENT_CELL_WIDTH,
-  SV_CELL_WIDTH,
-  TIME_CELL_INNER_WIDTH,
-} from "./constants.mjs";
+import { PERCENT_CELL_WIDTH, TIME_CELL_INNER_WIDTH } from "./constants.mjs";
 
 export async function readStdinJson() {
   if (process.stdin.isTTY) return {};
@@ -338,16 +334,6 @@ export function createHttpsPost(https, timeoutMs) {
   };
 }
 
-// sv 퍼센트 포맷 (1000+ → k 표기, 5자 고정폭)
-export function formatSvPct(value) {
-  if (value == null) return "--%".padStart(SV_CELL_WIDTH);
-  if (value >= 10000)
-    return `${Math.round(value / 1000)}k%`.padStart(SV_CELL_WIDTH);
-  if (value >= 1000)
-    return `${(value / 1000).toFixed(1)}k%`.padStart(SV_CELL_WIDTH);
-  return `${value}%`.padStart(SV_CELL_WIDTH);
-}
-
 export function formatSavings(dollars) {
   if (dollars >= 100) return `$${Math.round(dollars)}`;
   if (dollars >= 10) return `$${dollars.toFixed(1)}`;

package/package.json

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

package/scripts/lib/agent-route-policy.mjs

@@ -1,10 +1,13 @@
 // Canonical Codex role policy. Concrete model IDs stay in profile config files.
 
-import { resolveCodexProfileConfigValues } from "./codex-profile-config.mjs";
+import {
+  normalizeCodexProfileName,
+  resolveCodexProfileConfigValues,
+} from "./codex-profile-config.mjs";
 
 const policy = {
   executor: {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1080,
     runMode: "fg",
     opusOversight: false,
@@ -12,7 +15,7 @@ const policy = {
     subcommand: "exec",
   },
   codex: {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1080,
     runMode: "fg",
     opusOversight: false,
@@ -20,7 +23,7 @@ const policy = {
     subcommand: "exec",
   },
   "build-fixer": {
-    profile: "gpt56_luna_low",
+    profile: "gpt6_luna_high",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -28,7 +31,7 @@ const policy = {
     subcommand: "exec",
   },
   cleanup: {
-    profile: "gpt56_terra_med",
+    profile: "gpt6_sol_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -36,7 +39,7 @@ const policy = {
     subcommand: "exec",
   },
   deslop: {
-    profile: "gpt56_terra_med",
+    profile: "gpt6_sol_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -44,7 +47,7 @@ const policy = {
     subcommand: "exec",
   },
   debugger: {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 900,
     runMode: "bg",
     opusOversight: false,
@@ -52,7 +55,7 @@ const policy = {
     subcommand: "exec",
   },
   "deep-executor": {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 3600,
     runMode: "bg",
     opusOversight: true,
@@ -60,7 +63,7 @@ const policy = {
     subcommand: "exec",
   },
   architect: {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 3600,
     runMode: "bg",
     opusOversight: true,
@@ -68,7 +71,7 @@ const policy = {
     subcommand: "exec",
   },
   critic: {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 3600,
     runMode: "bg",
     opusOversight: true,
@@ -76,7 +79,7 @@ const policy = {
     subcommand: "exec",
   },
   planner: {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 3600,
     runMode: "fg",
     opusOversight: true,
@@ -84,7 +87,7 @@ const policy = {
     subcommand: "exec",
   },
   analyst: {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 3600,
     runMode: "fg",
     opusOversight: true,
@@ -92,7 +95,7 @@ const policy = {
     subcommand: "exec",
   },
   "code-reviewer": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1800,
     runMode: "bg",
     opusOversight: false,
@@ -100,7 +103,7 @@ const policy = {
     subcommand: "review",
   },
   "quality-reviewer": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1800,
     runMode: "bg",
     opusOversight: false,
@@ -108,7 +111,7 @@ const policy = {
     subcommand: "review",
   },
   "security-reviewer": {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 1800,
     runMode: "bg",
     opusOversight: true,
@@ -116,7 +119,7 @@ const policy = {
     subcommand: "review",
   },
   scientist: {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1440,
     runMode: "bg",
     opusOversight: false,
@@ -124,7 +127,7 @@ const policy = {
     subcommand: "exec",
   },
   "document-specialist": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1440,
     runMode: "bg",
     opusOversight: false,
@@ -132,7 +135,7 @@ const policy = {
     subcommand: "exec",
   },
   "scientist-deep": {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 3600,
     runMode: "bg",
     opusOversight: false,
@@ -140,7 +143,7 @@ const policy = {
     subcommand: "exec",
   },
   verifier: {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1200,
     runMode: "fg",
     opusOversight: false,
@@ -148,7 +151,7 @@ const policy = {
     subcommand: "review",
   },
   "test-engineer": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1200,
     runMode: "bg",
     opusOversight: false,
@@ -156,7 +159,7 @@ const policy = {
     subcommand: "exec",
   },
   "qa-tester": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1200,
     runMode: "bg",
     opusOversight: false,
@@ -164,7 +167,7 @@ const policy = {
     subcommand: "review",
   },
   spark: {
-    profile: "gpt56_luna_low",
+    profile: "gpt6_luna_low",
     timeoutSec: 180,
     runMode: "fg",
     opusOversight: false,
@@ -174,7 +177,7 @@ const policy = {
   // These entries are only for explicit direct-Codex overrides. agent-map.json
   // remains the provider-selection authority for their normal execution.
   designer: {
-    profile: "gpt56_sol_xhigh",
+    profile: "gpt6_astra_xhigh",
     timeoutSec: 900,
     runMode: "bg",
     opusOversight: false,
@@ -182,7 +185,7 @@ const policy = {
     subcommand: "exec",
   },
   writer: {
-    profile: "gpt56_luna_low",
+    profile: "gpt6_luna_high",
     timeoutSec: 900,
     runMode: "bg",
     opusOversight: false,
@@ -207,12 +210,13 @@ export const DEFAULT_CODEX_AGENT = "executor";
 
 export const CANONICAL_CODEX_PROFILE_OVERRIDES = Object.freeze(
   new Set([
-    "gpt56_luna_low",
-    "gpt56_terra_med",
-    "gpt56_terra_high",
-    "gpt56_sol_xhigh",
-    "gpt56_sol_max",
-    "gpt56_sol_ultra",
+    "gpt6_luna_low",
+    "gpt6_luna_high",
+    "gpt6_sol_med",
+    "gpt6_sol_high",
+    "gpt6_astra_xhigh",
+    "gpt6_astra_max",
+    "gpt6_astra_ultra",
   ]),
 );
 export const ULTRA_ELIGIBLE_CODEX_AGENTS = Object.freeze(
@@ -222,8 +226,8 @@ export const ULTRA_ELIGIBLE_CODEX_AGENTS = Object.freeze(
 const NESTED_GLOBAL_PROFILE_OVERRIDES = new Set([
   "max",
   "ultra",
-  "gpt56_sol_max",
-  "gpt56_sol_ultra",
+  "gpt6_astra_max",
+  "gpt6_astra_ultra",
 ]);
 
 export function resolveCodexAgentPolicy(agent) {
@@ -251,14 +255,16 @@ export function resolveCodexAgentProfile(
 ) {
   const defaultProfile = resolveCodexAgentPolicy(agent).profile;
   const retryRequested = String(retryProfile ?? "").trim();
-  const requested = retryRequested || String(profileOverride || "auto").trim();
+  const requested = normalizeCodexProfileName(
+    retryRequested || String(profileOverride || "auto").trim(),
+  );
   if (!requested || requested === "auto") return defaultProfile;
 
   const canonical =
     requested === "max"
-      ? "gpt56_sol_max"
+      ? "gpt6_astra_max"
       : requested === "ultra"
-        ? "gpt56_sol_ultra"
+        ? "gpt6_astra_ultra"
         : requested;
   if (!CANONICAL_CODEX_PROFILE_OVERRIDES.has(canonical)) {
     if (allowCustom) return requested;
@@ -266,9 +272,9 @@ export function resolveCodexAgentProfile(
       `[agent-route-policy] unsupported profile override: ${requested}`,
     );
   }
-  if (canonical !== "gpt56_sol_ultra") return canonical;
+  if (canonical !== "gpt6_astra_ultra") return canonical;
   return nested || !ULTRA_ELIGIBLE_CODEX_AGENTS.has(agent)
-    ? "gpt56_sol_max"
+    ? "gpt6_astra_max"
     : canonical;
 }
 
@@ -287,7 +293,9 @@ export function resolveNestedCodexAgentProfile(
   } = {},
 ) {
   const explicitProfile = String(profileOverride || "auto").trim();
-  const globalOverride = String(globalProfile || "auto").trim();
+  const globalOverride = normalizeCodexProfileName(
+    String(globalProfile || "auto").trim(),
+  );
   // Headless lanes must select their role policy explicitly. Only the max and
   // ultra exception lanes may cross the process environment boundary.
   const effectiveOverride =
@@ -305,7 +313,7 @@ export function resolveNestedCodexAgentProfile(
   });
   const { effort } = resolveCodexProfileConfigValues(candidate, { codexHome });
   if (!effort) return fallback;
-  return effort.toLowerCase() === "ultra" ? "gpt56_sol_max" : candidate;
+  return effort.toLowerCase() === "ultra" ? "gpt6_astra_max" : candidate;
 }
 
 export function describeCodexAgentPolicy() {

package/scripts/lib/cli-agy.mjs

@@ -1,12 +1,18 @@
 // cli-agy.mjs — Antigravity (agy) CLI adapter (Phase 0 PoC).
 //
-// 책임: agy --print 는 stdin-only 이므로 plan() 에서 stdinMode="pipe" 시그널을 반환한다.
-// positional prompt 패턴은 환영 메시지 폴백을 유발하므로 사용 금지.
+// 책임: agy 1.1.27 부터 --print 는 값(프롬프트)이 필수이고 stdin 프롬프트는 거부되므로
+// plan() 은 프롬프트를 args 의 --print 값으로 넣고 stdinMode="argv" 를 돌려준다.
+// --print 뒤에 다른 플래그가 오면 그 플래그를 프롬프트로 삼키므로 항상 마지막에 둔다.
 //
 // 출처: scripts/tfx-route.sh route_agent() L1052-L1059, run_codex_exec() L2036-L2046.
 //        .claude/rules/tfx-update-logic.md Antigravity CLI 1.0.0 정밀 sanity matrix.
 // timeoutSec은 lane 예상 소요 시간(advisory)이다. hard ceiling 집행은 Bash route가 소유한다.
 
+import {
+  resolveGeminiModel,
+  resolveGeminiProfileForPurpose,
+} from "./gemini-profiles.mjs";
+
 export const id = "agy";
 export const cliType = "antigravity";
 export const command = "agy";
@@ -38,6 +44,7 @@ export function plan({
   mcpProfile = "auto",
   timeoutSec,
   contextFile,
+  geminiProfilesPath,
 } = {}) {
   if (!agent) {
     throw new Error("[cli-agy] agent required");
@@ -49,8 +56,21 @@ export function plan({
     command,
     profile: cfg.profile,
     effort: cfg.profile,
-    args: ["--print", "--dangerously-skip-permissions"],
-    stdinMode: "pipe",
+    // effort 는 역할별 SSOT(gemini-profiles.mjs): designer → High, writer → Medium ...
+    geminiProfile: resolveGeminiProfileForPurpose(agent),
+    model: resolveGeminiModel(resolveGeminiProfileForPurpose(agent), {
+      profilesPath: geminiProfilesPath,
+    }),
+    args: [
+      "--dangerously-skip-permissions",
+      "--model",
+      resolveGeminiModel(resolveGeminiProfileForPurpose(agent), {
+        profilesPath: geminiProfilesPath,
+      }),
+      "--print",
+      prompt,
+    ],
+    stdinMode: "argv",
     timeoutMs: effectiveTimeoutSec * 1000,
     runMode: cfg.runMode,
     opusOversight: cfg.opusOversight,

package/scripts/lib/codex-profile-config.mjs

@@ -19,14 +19,39 @@ const EFFORT_BY_SUFFIX = {
 };
 
 const CANONICAL_PROFILE_VALUES = Object.freeze({
-  gpt56_luna_low: { model: "gpt-5.6-luna", effort: "low" },
-  gpt56_terra_med: { model: "gpt-5.6-terra", effort: "medium" },
-  gpt56_terra_high: { model: "gpt-5.6-terra", effort: "high" },
-  gpt56_sol_xhigh: { model: "gpt-5.6-sol", effort: "xhigh" },
-  gpt56_sol_max: { model: "gpt-5.6-sol", effort: "max" },
-  gpt56_sol_ultra: { model: "gpt-5.6-sol", effort: "ultra" },
+  gpt6_luna_low: { model: "gpt-6-luna", effort: "low" },
+  gpt6_luna_high: { model: "gpt-6-luna", effort: "high" },
+  gpt6_sol_med: { model: "gpt-6-sol", effort: "medium" },
+  gpt6_sol_high: { model: "gpt-6-sol", effort: "high" },
+  gpt6_astra_xhigh: { model: "gpt-6-astra", effort: "xhigh" },
+  gpt6_astra_max: { model: "gpt-6-astra", effort: "max" },
+  gpt6_astra_ultra: { model: "gpt-6-astra", effort: "ultra" },
 });
 
+// GPT-5.6 lane names map to the GPT-6 lane with the same effort. GPT-6 has no
+// Terra tier, so Terra lanes move to Sol.
+const LEGACY_CANONICAL_PROFILE_ALIASES = Object.freeze({
+  gpt56_sol_xhigh: "gpt6_astra_xhigh",
+  gpt56_sol_max: "gpt6_astra_max",
+  gpt56_sol_ultra: "gpt6_astra_ultra",
+  gpt56_terra_high: "gpt6_sol_high",
+  gpt56_terra_med: "gpt6_sol_med",
+  gpt56_luna_low: "gpt6_luna_low",
+});
+
+export function normalizeCodexProfileName(profileName) {
+  const normalized = String(profileName ?? "").trim();
+  return LEGACY_CANONICAL_PROFILE_ALIASES[normalized] || normalized;
+}
+
+/** Model ID of a canonical profile (after legacy normalization), or null. */
+export function canonicalCodexProfileModel(profileName) {
+  return (
+    CANONICAL_PROFILE_VALUES[normalizeCodexProfileName(profileName)]?.model ??
+    null
+  );
+}
+
 function readProfileScalar(raw, key) {
   const match = String(raw).match(
     new RegExp(
@@ -40,7 +65,7 @@ function readProfileScalar(raw, key) {
 }
 
 /**
- * Resolve a Codex effort profile name (e.g. "gpt56_terra_high") to the `-c key=value`
+ * Resolve a Codex effort profile name (e.g. "gpt6_sol_high") to the `-c key=value`
  * config overrides that `codex exec` accepts, so the headless CLI lanes can
  * select a profile WITHOUT `codex exec --profile <name>`. codex 0.134+ rejects
  * `--profile X` whenever config.toml still contains an inline `[profiles.X]`
@@ -58,38 +83,45 @@ function readProfileScalar(raw, key) {
  *
  * @param {string} profileName
  * @param {{ codexHome?: string }} [opts]
- * @returns {string[]} e.g. ['model="gpt-5.6-terra"', 'model_reasoning_effort="high"']
+ * @returns {string[]} e.g. ['model="gpt-6-sol"', 'model_reasoning_effort="high"']
  */
 export function resolveCodexProfileConfigValues(profileName, opts = {}) {
   if (typeof profileName !== "string" || !profileName) {
     return { model: null, effort: null };
   }
+  const normalizedProfileName = normalizeCodexProfileName(profileName);
   const codexHome =
     opts.codexHome || process.env.CODEX_HOME || join(homedir(), ".codex");
   let model = null;
   let effort = null;
   try {
     const raw = readFileSync(
-      join(codexHome, `${profileName}.config.toml`),
+      join(codexHome, `${normalizedProfileName}.config.toml`),
       "utf8",
     );
     model = readProfileScalar(raw, "model");
     effort = readProfileScalar(raw, "model_reasoning_effort");
   } catch {
-    const suffix = /_(ultra|max|xhigh|high|med|medium|low)$/.exec(profileName);
+    const suffix = /_(ultra|max|xhigh|high|med|medium|low)$/.exec(
+      normalizedProfileName,
+    );
     if (suffix) effort = EFFORT_BY_SUFFIX[suffix[1]] || null;
   }
   return { model, effort };
 }
 
 export function codexProfileConfigOverrides(profileName, opts = {}) {
-  let { model, effort } = resolveCodexProfileConfigValues(profileName, opts);
+  const normalizedProfileName = normalizeCodexProfileName(profileName);
+  let { model, effort } = resolveCodexProfileConfigValues(
+    normalizedProfileName,
+    opts,
+  );
   if (opts.enforceCanonicalProfile === true) {
-    const canonical = CANONICAL_PROFILE_VALUES[profileName];
+    const canonical = CANONICAL_PROFILE_VALUES[normalizedProfileName];
     if (canonical) ({ model, effort } = canonical);
   }
   if (opts.disallowUltra === true && effort?.toLowerCase() === "ultra") {
-    model = "gpt-5.6-sol";
+    model = "gpt-6-astra";
     effort = "max";
   }
   const overrides = [];