triflux 10.46.0 → 10.48.0

package/hud/providers/codex.mjs

@@ -38,6 +38,8 @@ export function classifyBucket(bucket) {
 
 // primary/secondary를 window_minutes 기준으로 정규화
 // HUD 규약: primary=5h, secondary=1w
+// window_minutes 가 비어 있으면 길이를 모르므로 보고된 칸에 둔다(app-server 스키마에서
+// windowDurationMins 는 선택 필드). 길이를 알지만 5h/1w 가 아닌 버킷은 버린다.
 export function normalizeBuckets(rl) {
   let primary = null;
   let secondary = null;
@@ -46,6 +48,12 @@ export function normalizeBuckets(rl) {
     if (kind === "five_hour") primary = bucket;
     else if (kind === "weekly") secondary = bucket;
   }
+  if (!primary && rl.primary && rl.primary.window_minutes == null) {
+    primary = rl.primary;
+  }
+  if (!secondary && rl.secondary && rl.secondary.window_minutes == null) {
+    secondary = rl.secondary;
+  }
   return { primary, secondary };
 }
 
@@ -104,7 +112,35 @@ function isNewerSnapshot(candidate, current) {
   );
 }
 
-function selectCodexWindowSnapshot(snapshots, nowSec, windowKey) {
+function positiveWindowMinutes(bucket) {
+  const minutes = Number(bucket?.window_minutes);
+  return minutes > 0 ? minutes : null;
+}
+
+// 계정 하나에는 같은 종류의 창이 한 번에 하나만 열린다. 브로커 계정이 없으면
+// ~/.codex/sessions 와 HUD 라벨이 모두 ~/.codex/auth.json 계정 하나의 것이다. 그래서
+// 세션 로그에 더 늦게 리셋되는 창이 나타났고 옛 창이 그 창이 열리기 전에만 관측됐다면,
+// 옛 창은 조기 리셋(2026-09-23 실측)이나 계정 전환으로 끝난 창이다. 프로브로만 본 창은
+// 다른 계정일 수 있어 근거로 쓰지 않는다. 새 창이 열린 뒤에도 관측된 창은 함께 도는
+// 계정이므로 max-used 후보로 남긴다.
+function isReplacedWindowGroup(group, other) {
+  if (other === group || !other.seenInSessions) return false;
+  if (other.minResetAt <= group.maxResetAt || !other.windowMinutes) {
+    return false;
+  }
+  const lastSeenMs = Date.parse(group.latest.timestamp);
+  if (!Number.isFinite(lastSeenMs)) return false;
+  // resets_at 은 실측으로 아래로 약 30초, 위로 1초 흔들리므로 가장 늦은 값으로 개시 시각을 잡는다.
+  const otherOpenedAtMs = (other.maxResetAt - other.windowMinutes * 60) * 1000;
+  return lastSeenMs <= otherOpenedAtMs;
+}
+
+function selectCodexWindowSnapshot(
+  snapshots,
+  nowSec,
+  windowKey,
+  replaceEndedWindows,
+) {
   const groups = [];
   const ungrouped = [];
 
@@ -126,19 +162,29 @@ function selectCodexWindowSnapshot(snapshots, nowSec, windowKey) {
         minResetAt: resetAt,
         maxResetAt: resetAt,
         latest: snapshot,
+        seenInSessions: !snapshot.probe,
+        windowMinutes: positiveWindowMinutes(snapshot[windowKey]),
       };
       groups.push(group);
       continue;
     }
 
+    if (!snapshot.probe) group.seenInSessions = true;
+    group.windowMinutes ??= positiveWindowMinutes(snapshot[windowKey]);
     group.minResetAt = Math.min(group.minResetAt, resetAt);
     group.maxResetAt = Math.max(group.maxResetAt, resetAt);
     if (isNewerSnapshot(snapshot, group.latest)) group.latest = snapshot;
   }
 
-  const activeGroups = groups.filter(
+  const openGroups = groups.filter(
     (group) => Number(group.latest[windowKey]?.resets_at) > nowSec,
   );
+  const activeGroups = replaceEndedWindows
+    ? openGroups.filter(
+        (group) =>
+          !openGroups.some((other) => isReplacedWindowGroup(group, other)),
+      )
+    : openGroups;
   let selected = null;
   if (activeGroups.length > 0) {
     selected = activeGroups
@@ -168,16 +214,18 @@ function selectCodexWindowSnapshot(snapshots, nowSec, windowKey) {
   return { snapshot: selected, activeGroupCount: activeGroups.length };
 }
 
-function selectCodexSnapshot(snapshots, nowSec) {
+function selectCodexSnapshot(snapshots, nowSec, replaceEndedWindows) {
   const primarySelection = selectCodexWindowSnapshot(
     snapshots,
     nowSec,
     "primary",
+    replaceEndedWindows,
   );
   const secondarySelection = selectCodexWindowSnapshot(
     snapshots,
     nowSec,
     "secondary",
+    replaceEndedWindows,
   );
   const primarySnapshot = primarySelection.snapshot;
   if (!primarySnapshot) return null;
@@ -198,7 +246,7 @@ function selectCodexSnapshot(snapshots, nowSec) {
   return selected;
 }
 
-function mergeRateLimitSnapshots(snapshots, nowSec) {
+function mergeRateLimitSnapshots(snapshots, nowSec, replaceEndedWindows) {
   const merged = {};
   const codexSnapshots = [];
   for (const snapshot of snapshots) {
@@ -211,7 +259,11 @@ function mergeRateLimitSnapshots(snapshots, nowSec) {
     }
   }
 
-  const codex = selectCodexSnapshot(codexSnapshots, nowSec);
+  const codex = selectCodexSnapshot(
+    codexSnapshots,
+    nowSec,
+    replaceEndedWindows,
+  );
   if (codex) merged.codex = codex;
   return merged;
 }
@@ -227,9 +279,16 @@ export function getCodexRateLimits({
   now = new Date(),
   maxLinesPerFile = 800,
   extraSnapshots = [],
+  // 교체된 창 판정(isReplacedWindowGroup). 브로커 Codex 계정이 있으면 끈다.
+  replaceEndedWindows = true,
 } = {}) {
   let syntheticBucket = null; // 최근 token_count에서 합성 (행 활성화 + 토큰 데이터용)
-  const recentSnapshots = [...extraSnapshots];
+  // 프로브도 세션 로그와 같은 window_minutes 기준으로 5h/1w 슬롯을 정한다.
+  // app-server 는 5h 창이 없으면 주간 창을 primary 로 보낸다(2026-09-23 실측).
+  const recentSnapshots = extraSnapshots.map((snapshot) => ({
+    ...snapshot,
+    ...normalizeBuckets(snapshot),
+  }));
   const nowSec = Math.floor(now.getTime() / 1000);
 
   // 7일간 스캔: 실제 rate_limits 우선, 합성 버킷은 폴백
@@ -313,7 +372,11 @@ export function getCodexRateLimits({
     }
 
     const snapshots = dayOffset <= 1 ? recentSnapshots : daySnapshots;
-    const mergedBuckets = mergeRateLimitSnapshots(snapshots, nowSec);
+    const mergedBuckets = mergeRateLimitSnapshots(
+      snapshots,
+      nowSec,
+      replaceEndedWindows,
+    );
     if (Object.keys(mergedBuckets).length > 0) {
       if (syntheticBucket) {
         const main =
@@ -369,10 +432,30 @@ export async function collectProbeSnapshots(now = new Date()) {
   );
 }
 
+// 브로커 계정은 자기 CODEX_HOME 에서 돌기 때문에, 옛 창이 전환 전 계정의 창이어도 그
+// 계정이 아직 쓰이고 있을 수 있다. accounts.json 의 codex 항목과 프로브용 인증 캐시로 판정한다.
+export function hasBrokerCodexAccounts({
+  brokerDir = CODEX_BROKER_AUTH_CACHE_DIR,
+} = {}) {
+  const accounts = readJson(join(brokerDir, "accounts.json"), null);
+  if (Array.isArray(accounts?.codex) && accounts.codex.length > 0) return true;
+  try {
+    return readdirSync(brokerDir).some((file) =>
+      /^codex-auth-.+\.json$/.test(file),
+    );
+  } catch {
+    return false;
+  }
+}
+
 export async function refreshCodexRateLimitsCache() {
   const now = new Date();
   const extraSnapshots = await collectProbeSnapshots(now);
-  const buckets = getCodexRateLimits({ now, extraSnapshots });
+  const buckets = getCodexRateLimits({
+    now,
+    extraSnapshots,
+    replaceEndedWindows: !hasBrokerCodexAccounts(),
+  });
   // buckets가 null이어도 캐시 갱신 (stale 데이터 제거)
   writeJsonSafe(CODEX_QUOTA_CACHE_PATH, { timestamp: Date.now(), buckets });
   return buckets;

package/hud/providers/cto.mjs

@@ -1,5 +1,6 @@
 import { readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
+import { resolveRoleControlSnapshot } from "../../hub/lib/cto-env.mjs";
 import {
   CTO_LAKE_CURRENT_RELATIVE_PATH,
   CTO_STATUS_LINE_MAX_CHARS,
@@ -53,6 +54,8 @@ function extractStatusLine(lines) {
 }
 
 export function readCtoStatus(options = {}) {
+  if (!resolveRoleControlSnapshot(options.env).auto_collect_enabled)
+    return null;
   try {
     const currentPath = resolveCurrentPath(options);
     const stat = statSync(currentPath);

package/package.json

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

package/scripts/__tests__/tfx-route-bash-node-parity.test.mjs

@@ -87,7 +87,7 @@ describe("tfx-route bash/node parity — Phase 0 회귀가드", () => {
     assert.equal(plan.agent, "executor");
     assert.equal(plan.cliType, "codex");
     assert.equal(plan.adapter, "codex");
-    assert.equal(plan.effort, "gpt6_sol_high");
+    assert.equal(plan.effort, "gpt61_sol_high");
     assert.equal(plan.runMode, "fg");
   });
 

package/scripts/__tests__/tfx-route-node-entry.test.mjs

@@ -234,14 +234,14 @@ describe("tfx-route.mjs — buildRoutePlan (agent-map.json 전수)", () => {
 });
 
 describe("cli-codex.mjs — 핵심 매핑", () => {
-  test("executor → gpt6_sol_high / 1080s / fg / mcp=implement", () => {
+  test("executor → gpt61_sol_high / 1080s / fg / mcp=implement", () => {
     const p = codexAdapter.plan({
       agent: "executor",
       prompt: "x",
       mcpProfile: "auto",
     });
-    assert.equal(p.effort, "gpt6_sol_high");
-    assert.equal(p.profile, "gpt6_sol_high");
+    assert.equal(p.effort, "gpt61_sol_high");
+    assert.equal(p.profile, "gpt61_sol_high");
     assert.equal(p.timeoutMs, 1_080_000);
     assert.equal(p.runMode, "fg");
     assert.equal(p.opusOversight, false);
@@ -334,7 +334,7 @@ describe("cli-codex.mjs — 핵심 매핑", () => {
       prompt: "x",
       mcpProfile: "auto",
     });
-    assert.equal(p.effort, "gpt6_sol_high");
+    assert.equal(p.effort, "gpt61_sol_high");
     assert.equal(p.timeoutMs, 1_080_000);
   });
 

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

@@ -7,7 +7,7 @@ import {
 
 const policy = {
   executor: {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1080,
     runMode: "fg",
     opusOversight: false,
@@ -15,7 +15,7 @@ const policy = {
     subcommand: "exec",
   },
   codex: {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1080,
     runMode: "fg",
     opusOversight: false,
@@ -31,7 +31,7 @@ const policy = {
     subcommand: "exec",
   },
   cleanup: {
-    profile: "gpt6_sol_med",
+    profile: "gpt61_sol_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -39,7 +39,7 @@ const policy = {
     subcommand: "exec",
   },
   deslop: {
-    profile: "gpt6_sol_med",
+    profile: "gpt61_sol_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -95,7 +95,7 @@ const policy = {
     subcommand: "exec",
   },
   "code-reviewer": {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1800,
     runMode: "bg",
     opusOversight: false,
@@ -103,7 +103,7 @@ const policy = {
     subcommand: "review",
   },
   "quality-reviewer": {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1800,
     runMode: "bg",
     opusOversight: false,
@@ -119,7 +119,7 @@ const policy = {
     subcommand: "review",
   },
   scientist: {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1440,
     runMode: "bg",
     opusOversight: false,
@@ -127,7 +127,7 @@ const policy = {
     subcommand: "exec",
   },
   "document-specialist": {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1440,
     runMode: "bg",
     opusOversight: false,
@@ -143,7 +143,7 @@ const policy = {
     subcommand: "exec",
   },
   verifier: {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1200,
     runMode: "fg",
     opusOversight: false,
@@ -151,7 +151,7 @@ const policy = {
     subcommand: "review",
   },
   "test-engineer": {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1200,
     runMode: "bg",
     opusOversight: false,
@@ -159,7 +159,7 @@ const policy = {
     subcommand: "exec",
   },
   "qa-tester": {
-    profile: "gpt6_sol_high",
+    profile: "gpt61_sol_high",
     timeoutSec: 1200,
     runMode: "bg",
     opusOversight: false,
@@ -212,8 +212,8 @@ export const CANONICAL_CODEX_PROFILE_OVERRIDES = Object.freeze(
   new Set([
     "gpt6_luna_low",
     "gpt6_luna_high",
-    "gpt6_sol_med",
-    "gpt6_sol_high",
+    "gpt61_sol_med",
+    "gpt61_sol_high",
     "gpt6_astra_xhigh",
     "gpt6_astra_max",
     "gpt6_astra_ultra",

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

@@ -21,22 +21,25 @@ const EFFORT_BY_SUFFIX = {
 const CANONICAL_PROFILE_VALUES = Object.freeze({
   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" },
+  gpt61_sol_med: { model: "gpt-6.1-sol", effort: "medium" },
+  gpt61_sol_high: { model: "gpt-6.1-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.
+// Terra tier, so Terra lanes move to Sol. GPT-6 Sol lane names map to GPT-6.1
+// Sol with the same effort.
 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_terra_high: "gpt61_sol_high",
+  gpt56_terra_med: "gpt61_sol_med",
   gpt56_luna_low: "gpt6_luna_low",
+  gpt6_sol_high: "gpt61_sol_high",
+  gpt6_sol_med: "gpt61_sol_med",
 });
 
 export function normalizeCodexProfileName(profileName) {
@@ -65,7 +68,7 @@ function readProfileScalar(raw, key) {
 }
 
 /**
- * Resolve a Codex effort profile name (e.g. "gpt6_sol_high") to the `-c key=value`
+ * Resolve a Codex effort profile name (e.g. "gpt61_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]`
@@ -83,7 +86,7 @@ function readProfileScalar(raw, key) {
  *
  * @param {string} profileName
  * @param {{ codexHome?: string }} [opts]
- * @returns {string[]} e.g. ['model="gpt-6-sol"', 'model_reasoning_effort="high"']
+ * @returns {string[]} e.g. ['model="gpt-6.1-sol"', 'model_reasoning_effort="high"']
  */
 export function resolveCodexProfileConfigValues(profileName, opts = {}) {
   if (typeof profileName !== "string" || !profileName) {

package/scripts/setup.mjs

@@ -437,14 +437,14 @@ const REQUIRED_CODEX_PROFILES = [
     name: "gpt6_astra_xhigh",
     lines: ['model = "gpt-6-astra"', 'model_reasoning_effort = "xhigh"'],
   },
-  // GPT-6 Sol: implementation, review, and verification role defaults.
+  // GPT-6.1 Sol: implementation, review, and verification role defaults.
   {
-    name: "gpt6_sol_high",
-    lines: ['model = "gpt-6-sol"', 'model_reasoning_effort = "high"'],
+    name: "gpt61_sol_high",
+    lines: ['model = "gpt-6.1-sol"', 'model_reasoning_effort = "high"'],
   },
   {
-    name: "gpt6_sol_med",
-    lines: ['model = "gpt-6-sol"', 'model_reasoning_effort = "medium"'],
+    name: "gpt61_sol_med",
+    lines: ['model = "gpt-6.1-sol"', 'model_reasoning_effort = "medium"'],
   },
   // GPT-6 Luna: high for focused lanes, low for latency-first lanes.
   {
@@ -636,6 +636,13 @@ const SYNC_MAP = [
   // 설치본이 남지 않게 한다. hooks/ 는 플러그인 루트에서 직접 import 되는 경로라
   // 이 복사 목록의 대상이 아니다.
   ...scanLibFiles(PLUGIN_ROOT, CLAUDE_DIR),
+  // hud/providers/cto.mjs 가 ../../hub/lib/cto-env.mjs 를 정적 import 한다(ADR-0018).
+  // 의존성 없는 env 판독 모듈이라 이 파일 하나만 hud 보다 먼저 복사한다.
+  {
+    src: join(PLUGIN_ROOT, "hub", "lib", "cto-env.mjs"),
+    dst: join(CLAUDE_DIR, "hub", "lib", "cto-env.mjs"),
+    label: "hub/lib/cto-env.mjs",
+  },
   ...scanHudFiles(PLUGIN_ROOT, CLAUDE_DIR),
   {
     src: join(PLUGIN_ROOT, "scripts", "notion-read.mjs"),

package/scripts/tfx-route.sh

@@ -1424,7 +1424,7 @@ route_agent() {
       exit 1
     }
     IFS=$'\t' read -r policy_profile policy_timeout policy_mode policy_oversight policy_mcp policy_subcommand <<< "$policy_row"
-    case "$policy_profile" in gpt6_astra_xhigh|gpt6_sol_high|gpt6_sol_med|gpt6_luna_high|gpt6_luna_low) ;; *) echo "ERROR: invalid Codex profile policy" >&2; exit 1 ;; esac
+    case "$policy_profile" in gpt6_astra_xhigh|gpt61_sol_high|gpt61_sol_med|gpt6_luna_high|gpt6_luna_low) ;; *) echo "ERROR: invalid Codex profile policy" >&2; exit 1 ;; esac
     [[ "$policy_timeout" =~ ^[1-9][0-9]*$ ]] || { echo "ERROR: invalid Codex timeout policy" >&2; exit 1; }
     case "$policy_mode" in fg|bg) ;; *) echo "ERROR: invalid Codex run mode policy" >&2; exit 1 ;; esac
     case "$policy_oversight" in true|false) ;; *) echo "ERROR: invalid Codex oversight policy" >&2; exit 1 ;; esac
@@ -1495,9 +1495,11 @@ normalize_codex_profile_name() {
     gpt56_sol_xhigh) echo "gpt6_astra_xhigh" ;;
     gpt56_sol_max) echo "gpt6_astra_max" ;;
     gpt56_sol_ultra) echo "gpt6_astra_ultra" ;;
-    gpt56_terra_high) echo "gpt6_sol_high" ;;
-    gpt56_terra_med) echo "gpt6_sol_med" ;;
+    gpt56_terra_high) echo "gpt61_sol_high" ;;
+    gpt56_terra_med) echo "gpt61_sol_med" ;;
     gpt56_luna_low) echo "gpt6_luna_low" ;;
+    gpt6_sol_high) echo "gpt61_sol_high" ;;
+    gpt6_sol_med) echo "gpt61_sol_med" ;;
     *) echo "$1" ;;
   esac
 }
@@ -1588,9 +1590,9 @@ case "$TFX_CODEX_TRANSPORT" in
     ;;
 esac
 case "$TFX_CODEX_PROFILE" in
-  auto|max|ultra|gpt6_luna_low|gpt6_luna_high|gpt6_sol_med|gpt6_sol_high|gpt6_astra_xhigh|gpt6_astra_max|gpt6_astra_ultra) ;;
+  auto|max|ultra|gpt6_luna_low|gpt6_luna_high|gpt61_sol_med|gpt61_sol_high|gpt6_astra_xhigh|gpt6_astra_max|gpt6_astra_ultra) ;;
   *)
-    echo "ERROR: TFX_CODEX_PROFILE 값은 auto, max, ultra 또는 canonical gpt6_* profile이어야 합니다. (현재: $TFX_CODEX_PROFILE)" >&2
+    echo "ERROR: TFX_CODEX_PROFILE 값은 auto, max, ultra 또는 canonical gpt6_*/gpt61_* profile이어야 합니다. (현재: $TFX_CODEX_PROFILE)" >&2
     exit 1
     ;;
 esac
@@ -1645,7 +1647,7 @@ apply_cli_mode() {
           writer)
             CLI_ARGS="exec --profile gpt6_luna_high ${codex_base}"; CLI_EFFORT="gpt6_luna_high"; DEFAULT_TIMEOUT=900 ;;
           *)
-            CLI_ARGS="exec --profile gpt6_sol_high ${codex_base}"; CLI_EFFORT="gpt6_sol_high"; DEFAULT_TIMEOUT=1080 ;;
+            CLI_ARGS="exec --profile gpt61_sol_high ${codex_base}"; CLI_EFFORT="gpt61_sol_high"; DEFAULT_TIMEOUT=1080 ;;
         esac
         echo "[tfx-route] TFX_CLI_MODE=codex: $AGENT_TYPE → codex($CLI_EFFORT)로 리매핑" >&2
       fi ;;
@@ -1792,9 +1794,9 @@ apply_plan_guard() {
     replacement=""
     case "$CLI_EFFORT" in
       gpt55_low|spark53_low|codex53_low|gpt54_low|mini54_low) replacement="gpt6_luna_low" ;;
-      gpt55_med|spark53_med|codex53_med|mini54_med) replacement="gpt6_sol_med" ;;
+      gpt55_med|spark53_med|codex53_med|mini54_med) replacement="gpt61_sol_med" ;;
       gpt55_xhigh|codex53_xhigh|gpt54_xhigh) replacement="gpt6_astra_xhigh" ;;
-      gpt55_high|spark53_*|codex53_*|gpt54_*|mini54_*) replacement="gpt6_sol_high" ;;
+      gpt55_high|spark53_*|codex53_*|gpt54_*|mini54_*) replacement="gpt61_sol_high" ;;
     esac
   fi
   [[ -z "$replacement" ]] && return
@@ -1832,22 +1834,22 @@ apply_no_claude_native_mode() {
       OPUS_OVERSIGHT="false"
       ;;
     verifier)
-      CLI_ARGS="exec --profile gpt6_sol_high ${codex_base} review"
-      CLI_EFFORT="gpt6_sol_high"
+      CLI_ARGS="exec --profile gpt61_sol_high ${codex_base} review"
+      CLI_EFFORT="gpt61_sol_high"
       DEFAULT_TIMEOUT=1200
       RUN_MODE="fg"
       OPUS_OVERSIGHT="false"
       ;;
     test-engineer)
-      CLI_ARGS="exec --profile gpt6_sol_high ${codex_base}"
-      CLI_EFFORT="gpt6_sol_high"
+      CLI_ARGS="exec --profile gpt61_sol_high ${codex_base}"
+      CLI_EFFORT="gpt61_sol_high"
       DEFAULT_TIMEOUT=1200
       RUN_MODE="bg"
       OPUS_OVERSIGHT="false"
       ;;
     qa-tester)
-      CLI_ARGS="exec --profile gpt6_sol_high ${codex_base} review"
-      CLI_EFFORT="gpt6_sol_high"
+      CLI_ARGS="exec --profile gpt61_sol_high ${codex_base} review"
+      CLI_EFFORT="gpt61_sol_high"
       DEFAULT_TIMEOUT=1200
       RUN_MODE="bg"
       OPUS_OVERSIGHT="false"
@@ -1879,7 +1881,7 @@ resolve_safe_retry_codex_profile() {
       echo "gpt6_astra_max"
       return
       ;;
-    gpt6_luna_low|gpt6_luna_high|gpt6_sol_med|gpt6_sol_high|gpt6_astra_xhigh|gpt6_astra_max)
+    gpt6_luna_low|gpt6_luna_high|gpt61_sol_med|gpt61_sol_high|gpt6_astra_xhigh|gpt6_astra_max)
       echo "$profile"
       return
       ;;
@@ -1889,7 +1891,7 @@ resolve_safe_retry_codex_profile() {
   codex_home="${CODEX_HOME:-${TFX_CODEX_HOME:-${HOME:-}/.codex}}"
   profile_file="${codex_home}/${profile}.config.toml"
   if [[ ! -f "$profile_file" ]]; then
-    echo "gpt6_sol_high"
+    echo "gpt61_sol_high"
     return
   fi
   effort=$(awk -F= '
@@ -1903,7 +1905,7 @@ resolve_safe_retry_codex_profile() {
   ' "$profile_file" 2>/dev/null || true)
   case "$effort" in
     ultra) echo "gpt6_astra_max" ;;
-    "") echo "gpt6_sol_high" ;;
+    "") echo "gpt61_sol_high" ;;
     *) echo "$profile" ;;
   esac
 }
@@ -2116,8 +2118,8 @@ apply_dynamic_routing_override() {
       local codex_base
       codex_base="$(build_codex_base)"
       CLI_CMD="codex"
-      CLI_ARGS="exec --profile gpt6_sol_high ${codex_base}"
-      CLI_EFFORT="gpt6_sol_high"; DEFAULT_TIMEOUT=1080; RUN_MODE="fg"; OPUS_OVERSIGHT="false"
+      CLI_ARGS="exec --profile gpt61_sol_high ${codex_base}"
+      CLI_EFFORT="gpt61_sol_high"; DEFAULT_TIMEOUT=1080; RUN_MODE="fg"; OPUS_OVERSIGHT="false"
       ;;
     antigravity)
       CLI_CMD="agy"
@@ -3079,7 +3081,7 @@ run_codex_exec() {
   if [[ "$exit_code_local" -ne 0 ]] && grep -qE "is not supported when using Codex with a ChatGPT account" "$STDERR_LOG" 2>/dev/null; then
     local fallback_profile=""
     case "$CLI_EFFORT" in
-      gpt6_astra_ultra|gpt6_astra_max|gpt6_astra_xhigh|gpt6_sol_high|gpt6_sol_med|gpt6_luna_high) fallback_profile="gpt6_luna_low" ;;
+      gpt6_astra_ultra|gpt6_astra_max|gpt6_astra_xhigh|gpt61_sol_high|gpt61_sol_med|gpt6_luna_high) fallback_profile="gpt6_luna_low" ;;
     esac
     if [[ -n "$fallback_profile" ]]; then
       echo "[tfx-route] tier fallback: $CLI_EFFORT not supported on ChatGPT account → retry with $fallback_profile" >&2
@@ -3539,7 +3541,7 @@ EOF
       FULL_PROMPT="$PROMPT"
     fi
     # CTO north-star: codex lane(line ~2670)과 동일하게 brief 를 prompt 앞에 주입.
-    # prepend_codex_north_star 는 CLI-agnostic (TFX_CTO_NORTH_STAR opt-out +
+    # prepend_codex_north_star 는 CLI-agnostic (TFX_CTO_NORTH_STAR opt-in +
     # .triflux/lake/current.md 만 참조) 하므로 agy 워커에서도 그대로 재사용한다.
     # sentinel 은 command-substitution 이 trailing newline 을 삼키는 것을 막는다.
     local _agy_north_star_file="${WORKDIR:-$PWD}/.triflux/lake/current.md"

package/skills/tfx-auto/SKILL.md

@@ -1009,7 +1009,7 @@ Agent(subagent_type="oh-my-claudecode:{agent}", model="{model}", prompt="{prompt
 
 | 입력 | CLI | MCP |
 |------|-----|-----|
-| codex / executor | Codex (`gpt6_sol_high`; 복잡 구현은 deep-executor/xhigh) | implement |
+| codex / executor | Codex (`gpt61_sol_high`; 복잡 구현은 deep-executor/xhigh) | implement |
 | debugger / deep-executor | Codex (`gpt6_astra_xhigh`) | implement |
 | build-fixer | Codex (`gpt6_luna_high`) | implement |
 | spark | Codex (`gpt6_luna_low`) | implement |

package/skills/tfx-live/SKILL.md

@@ -79,6 +79,34 @@ the npm `node .../codex` shim, `codex.js`, and native `codex` executables.
 on that host; unavailable `ps` produces a peer `preflightWarning` and allows
 attach to continue.
 
+### Claude discovery and Codex registry
+
+`tfx-live list-sessions --cli claude [--cwd DIR]` lists local tmux sessions from
+`~/.claude/sessions/*.json` (`TFX_CLAUDE_SESSIONS_DIR` overrides the directory).
+It returns `session`, `target`, `paneId`, pane `cwd`, `pid`, `sessionId`, `short`,
+`name`, `title`, `nameSource`, and `status` only for live PIDs matching the pane process
+or a descendant within four levels. Claude discovery rejects `--remote` and
+`--transport uds`; `--transport auto` uses local tmux, and `--cwd` matches the
+pane cwd exactly.
+
+`title` equals `name` unless `nameSource` is `derived` or the name is empty.
+In those cases it uses the latest non-empty, trimmed `custom-title` or `ai-title`
+from the last 262144 bytes of `~/.claude/projects/*/<sessionId>.jsonl`
+(`TFX_CLAUDE_PROJECTS_DIR` overrides the projects directory). `customTitle`
+takes precedence over `aiTitle` on the same line; no matching title yields null.
+
+Codex SessionStart and UserPromptSubmit hooks atomically write `<pid>.json` to
+`${XDG_STATE_HOME:-$HOME/.local/state}/triflux/codex-sessions`
+(`TFX_CODEX_SESSION_REGISTRY_DIR` overrides it). Version 1 contains
+`{ version: 1, writer: "triflux", pid, sessionId, cwd, tmux, tmuxPane, source,
+startedAt, updatedAt }`: `tmux` is `<session>:@<window_id>.%<pane_id>` or null,
+`tmuxPane` is `%<pane_id>` or null, `source` defaults to null, and timestamps
+are milliseconds. `startedAt` stays unchanged for the same PID and thread.
+Local Codex discovery adds `threadId` and `name` to matching entries in `panes`;
+names come from `$CODEX_HOME/session_index.jsonl` (default `~/.codex`), and are
+null when absent. Dead PID records are pruned after writes.
+Records are written only when the Codex process is inside the hook's tmux pane, so TUIs attached to a shared app-server daemon (`daemon_auto_start`) are not recorded.
+
 `ask` and tmux `interrupt` accept session names, `name:window`, and
 `name:window.pane`. `start` and `stop` require a session name only; `stop`
 rejects pane targets because it kills the entire session. `--remote HOST`

package/skills/tfx-plan/SKILL.md

@@ -10,7 +10,7 @@ argument-hint: "<구현할 기능> [--quick]"
 > **ARGUMENTS 처리**: `--quick` → Quick 모드. 그 외 → Deep 모드 (기본).
 
 > AI makes completeness near-free. 기본은 Opus 4.6(Planner) + Codex(Architect) + Claude Opus(Critic) 합의.
-> Antigravity는 `agy --print` stdin 경로가 단순 프롬프트에서만 검증됐으므로, schema-driven critic에는 쓰지 않고 `--quick` freeform 보조로만 사용한다.
+> Antigravity는 `agy --print` 경로가 단순 프롬프트에서만 검증됐으므로, schema-driven critic에는 쓰지 않고 `--quick` freeform 보조로만 사용한다.
 
 ---
 
@@ -49,7 +49,7 @@ Tier 3:
 3. Claude → `Agent(run_in_background=true)`
 4. Bash + Agent 동시 호출
 5. deprecated Gemini CLI 또는 legacy Gemini assign 금지. Antigravity는 `antigravity:`/`agy` 이름만 사용한다.
-6. `agy --print`는 stdin prompt만 사용한다. positional prompt 및 strict JSON critic 검증에 실패하면 Claude critic으로 대체한다.
+6. `agy --print`는 프롬프트를 옵션 값으로 받는다(`--print '<prompt>'`). 표준 입력 프롬프트는 agy 1.1.27부터 동작하지 않는다. strict JSON critic 검증에 실패하면 Claude critic으로 대체한다.
 
 ### 모델 역할