@triflux/remote 10.44.0 → 10.46.0

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,15 +210,24 @@ 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(
   new Set(["deep-executor", "scientist-deep"]),
 );
+
 const NESTED_GLOBAL_PROFILE_OVERRIDES = new Set([
-  "max", "ultra", "gpt56_sol_max", "gpt56_sol_ultra",
+  "max",
+  "ultra",
+  "gpt6_astra_max",
+  "gpt6_astra_ultra",
 ]);
 
 export function resolveCodexAgentPolicy(agent) {
@@ -224,35 +236,84 @@ export function resolveCodexAgentPolicy(agent) {
   );
 }
 
+/**
+ * Resolves a requested Codex profile against the canonical role policy.
+ *
+ * `retryProfile` intentionally wins over `profileOverride`: retry snapshots
+ * represent an already-selected escalation step and must not be replaced by a
+ * later process-level `TFX_CODEX_PROFILE`. Ultra is reserved for an eligible
+ * top-level role; every nested/sandboxed or ineligible request is max.
+ */
 export function resolveCodexAgentProfile(
   agent,
-  { profileOverride = "auto", retryProfile = null, nested = false, allowCustom = false } = {},
+  {
+    profileOverride = "auto",
+    retryProfile = null,
+    nested = false,
+    allowCustom = false,
+  } = {},
 ) {
   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" : requested === "ultra" ? "gpt56_sol_ultra" : requested;
+
+  const canonical =
+    requested === "max"
+      ? "gpt6_astra_max"
+      : requested === "ultra"
+        ? "gpt6_astra_ultra"
+        : requested;
   if (!CANONICAL_CODEX_PROFILE_OVERRIDES.has(canonical)) {
     if (allowCustom) return requested;
-    throw new Error(`[agent-route-policy] unsupported profile override: ${requested}`);
+    throw new Error(
+      `[agent-route-policy] unsupported profile override: ${requested}`,
+    );
   }
-  if (canonical !== "gpt56_sol_ultra") return canonical;
-  return nested || !ULTRA_ELIGIBLE_CODEX_AGENTS.has(agent) ? "gpt56_sol_max" : canonical;
+  if (canonical !== "gpt6_astra_ultra") return canonical;
+  return nested || !ULTRA_ELIGIBLE_CODEX_AGENTS.has(agent)
+    ? "gpt6_astra_max"
+    : canonical;
 }
 
+/**
+ * Nested headless, team, worker, and delegator launches always select an
+ * explicit role profile rather than inheriting the global Codex config. A
+ * custom profile that resolves to ultra is also downgraded to max.
+ */
 export function resolveNestedCodexAgentProfile(
   agent,
-  { profileOverride = "auto", globalProfile = "auto", retryProfile = null, codexHome } = {},
+  {
+    profileOverride = "auto",
+    globalProfile = "auto",
+    retryProfile = null,
+    codexHome,
+  } = {},
 ) {
   const explicitProfile = String(profileOverride || "auto").trim();
-  const globalOverride = String(globalProfile || "auto").trim();
-  const effectiveOverride = explicitProfile !== "auto" ? explicitProfile : NESTED_GLOBAL_PROFILE_OVERRIDES.has(globalOverride) ? globalOverride : "auto";
+  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 =
+    explicitProfile !== "auto"
+      ? explicitProfile
+      : NESTED_GLOBAL_PROFILE_OVERRIDES.has(globalOverride)
+        ? globalOverride
+        : "auto";
   const fallback = resolveCodexAgentProfile(agent);
-  const candidate = resolveCodexAgentProfile(agent, { profileOverride: effectiveOverride, retryProfile, nested: true, allowCustom: true });
+  const candidate = resolveCodexAgentProfile(agent, {
+    profileOverride: effectiveOverride,
+    retryProfile,
+    nested: true,
+    allowCustom: true,
+  });
   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/cli-codex.mjs

@@ -18,6 +18,8 @@ import {
   resolveNestedCodexAgentProfile,
 } from "./agent-route-policy.mjs";
 
+// Compatibility re-exports for launchers which historically imported these
+// helpers from this adapter. The policy module owns the semantics.
 export { resolveCodexAgentProfile, resolveNestedCodexAgentProfile };
 
 export function plan({

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 = [];

package/scripts/lib/codex-recovery.sh

@@ -8,9 +8,16 @@
 # 4차 FALLBACK_FAILED → 모두 실패 시 marker + stderr_log 경로 출력
 
 recover_codex_stdout() {
+  # 복구 진입 여부 플래그(전역, local 아님) — 아우터 no-op 가드가 읽는다.
+  # 0 = 진짜 stdout 존재(복구 미진입), 1 = stdout 이 애초에 비어 복구 진입함.
+  CODEX_STDOUT_WAS_RECOVERED=0
   if [[ -s "$STDOUT_LOG" || ! -s "$STDERR_LOG" ]]; then
     return 0
   fi
+  # 여기 도달 = stdout 이 애초에 비어있었다. 아래에서 STDOUT_LOG 에 채워지는 내용은
+  # 전부 stderr 에서 복구된 것이지 워커의 진짜 산출물이 아니다. 이 플래그로 아우터
+  # 가드가 "복구된 stderr 노이즈"를 성공 출력으로 오인하지 않게 한다(#result-verification).
+  CODEX_STDOUT_WAS_RECOVERED=1
 
   # 1차: codex marker
   sed 's/\r$//' "$STDERR_LOG" \
@@ -48,3 +55,15 @@ recover_codex_stdout() {
     echo "[tfx-route] 경고: codex stdout 비어있음, stderr 복구도 실패. 위 stderr_log 경로에서 raw codex 출력 확인 가능." >&2
   fi
 }
+
+# ── MCP transport 채널 사망 판정 ──
+# Codex MCP transport 채널이 실행 중 죽으면 codex exec 가 exit 0 + 빈 stdout 으로
+# 끝나는 변형이 있다(래퍼 부재로 인한 pre-flight CODEX_MCP_TRANSPORT_EXIT_CODE=70
+# 과 구분됨 — 이건 런타임 채널 사망). stderr 의 하드 크래시 서명으로 이 사망을
+# 검출한다. 아우터 가드가 exit 0 이어도 결과를 실패로 승격하는 근거로 쓴다.
+# 인자: [stderr_log] (미지정 시 $STDERR_LOG). 반환: 0=크래시 서명 있음, 1=없음.
+codex_stdout_transport_crashed() {
+  local stderr_log="${1:-${STDERR_LOG:-}}"
+  [[ -n "$stderr_log" && -f "$stderr_log" ]] || return 1
+  grep -qE 'Transport channel closed|rmcp::transport worker quit with fatal' "$stderr_log" 2>/dev/null
+}