@triflux/core 10.45.0 → 10.47.0

package/hooks/session-start-fast.mjs

@@ -13,6 +13,7 @@
 import { execFile, execFileSync } from "node:child_process";
 import { dirname, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { resolveRoleControlSnapshot } from "../hub/lib/cto-env.mjs";
 import {
   buildSynapseTaskSummary,
   drainPendingSynapse,
@@ -95,6 +96,11 @@ async function defaultResolveParticipantLakeRoot(cwd) {
  */
 export async function emitParticipantSessionStarted(stdinData, seams = {}) {
   try {
+    if (
+      !resolveRoleControlSnapshot(seams.env || process.env).auto_collect_enabled
+    ) {
+      return null;
+    }
     const payload = parseStartPayload(stdinData);
     const sessionId = String(payload?.session_id || "").trim();
     if (!sessionId) return null;

package/hub/dynamic-routing-engine.mjs

@@ -45,7 +45,7 @@ function makeFallback(policy, trigger, inputsHash, now) {
       {
         cli: fb.default_cli ?? "codex",
         accountId: null,
-        model: fb.default_model ?? "gpt-5.6-terra",
+        model: fb.default_model ?? "gpt-6-sol",
         riskTier: "safe",
         reason: trigger,
       },

package/hub/lib/cto-env.mjs

@@ -38,10 +38,9 @@ export function resolveRoleControlSnapshot(env = process.env, options = {}) {
   const ctoManagerEnabled = masterEnabled && isEnvOn(env, "TFX_CTO_MANAGER");
   const leadManagerEnabled =
     ctoManagerEnabled && isEnvOn(env, "TFX_LEAD_MANAGER");
-  const northStarEnabled =
-    masterEnabled && !isEnvOff(env, "TFX_CTO_NORTH_STAR");
+  const northStarEnabled = masterEnabled && isEnvOn(env, "TFX_CTO_NORTH_STAR");
   const autoCollectEnabled =
-    masterEnabled && !isEnvOff(env, "TFX_CTO_AUTO_COLLECT");
+    masterEnabled && isEnvOn(env, "TFX_CTO_AUTO_COLLECT");
   const values = {
     master_enabled: masterEnabled,
     cto_manager_enabled: ctoManagerEnabled,

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

@@ -23,7 +23,10 @@ import {
 } from "node:fs";
 import { dirname, join } from "node:path";
 
-import { normalizeCodexProfileName } from "../../scripts/lib/codex-profile-config.mjs";
+import {
+  canonicalCodexProfileModel,
+  normalizeCodexProfileName,
+} from "../../scripts/lib/codex-profile-config.mjs";
 
 export const STATES = Object.freeze({
   PLANNING: "PLANNING",
@@ -318,6 +321,11 @@ function normalizeEscalationChainEntry(entry, index, source) {
     const profile = entry.profile.trim();
     normalized.profile =
       entry.cli === "codex" ? normalizeEscalationProfile(profile) : profile;
+    // A remapped legacy profile must not keep reporting its old model.
+    if (normalized.profile !== profile) {
+      normalized.model =
+        canonicalCodexProfileModel(normalized.profile) ?? normalized.model;
+    }
   }
   return normalized;
 }

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/core",
-  "version": "10.45.0",
+  "version": "10.47.0",
   "description": "triflux core — CLI routing, pipeline, adapters. Zero native dependencies.",
   "type": "module",
   "main": "hub/index.mjs",

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

@@ -7,7 +7,7 @@ import {
 
 const policy = {
   executor: {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1080,
     runMode: "fg",
     opusOversight: false,
@@ -15,7 +15,7 @@ const policy = {
     subcommand: "exec",
   },
   codex: {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1080,
     runMode: "fg",
     opusOversight: false,
@@ -23,7 +23,7 @@ const policy = {
     subcommand: "exec",
   },
   "build-fixer": {
-    profile: "gpt56_luna_low",
+    profile: "gpt6_luna_high",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -31,7 +31,7 @@ const policy = {
     subcommand: "exec",
   },
   cleanup: {
-    profile: "gpt56_terra_med",
+    profile: "gpt6_sol_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -39,7 +39,7 @@ const policy = {
     subcommand: "exec",
   },
   deslop: {
-    profile: "gpt56_terra_med",
+    profile: "gpt6_sol_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -95,7 +95,7 @@ const policy = {
     subcommand: "exec",
   },
   "code-reviewer": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1800,
     runMode: "bg",
     opusOversight: false,
@@ -103,7 +103,7 @@ const policy = {
     subcommand: "review",
   },
   "quality-reviewer": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1800,
     runMode: "bg",
     opusOversight: false,
@@ -119,7 +119,7 @@ const policy = {
     subcommand: "review",
   },
   scientist: {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1440,
     runMode: "bg",
     opusOversight: false,
@@ -127,7 +127,7 @@ const policy = {
     subcommand: "exec",
   },
   "document-specialist": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1440,
     runMode: "bg",
     opusOversight: false,
@@ -143,7 +143,7 @@ const policy = {
     subcommand: "exec",
   },
   verifier: {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1200,
     runMode: "fg",
     opusOversight: false,
@@ -151,7 +151,7 @@ const policy = {
     subcommand: "review",
   },
   "test-engineer": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1200,
     runMode: "bg",
     opusOversight: false,
@@ -159,7 +159,7 @@ const policy = {
     subcommand: "exec",
   },
   "qa-tester": {
-    profile: "gpt56_terra_high",
+    profile: "gpt6_sol_high",
     timeoutSec: 1200,
     runMode: "bg",
     opusOversight: false,
@@ -167,7 +167,7 @@ const policy = {
     subcommand: "review",
   },
   spark: {
-    profile: "gpt56_luna_low",
+    profile: "gpt6_luna_low",
     timeoutSec: 180,
     runMode: "fg",
     opusOversight: false,
@@ -185,7 +185,7 @@ const policy = {
     subcommand: "exec",
   },
   writer: {
-    profile: "gpt56_luna_low",
+    profile: "gpt6_luna_high",
     timeoutSec: 900,
     runMode: "bg",
     opusOversight: false,
@@ -210,9 +210,10 @@ 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",
+    "gpt6_luna_low",
+    "gpt6_luna_high",
+    "gpt6_sol_med",
+    "gpt6_sol_high",
     "gpt6_astra_xhigh",
     "gpt6_astra_max",
     "gpt6_astra_ultra",

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

@@ -19,18 +19,24 @@ 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" },
+  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) {
@@ -38,6 +44,14 @@ export function normalizeCodexProfileName(profileName) {
   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(
@@ -51,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]`
@@ -69,7 +83,7 @@ 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) {