@triflux/remote 10.50.1 → 10.51.0

package/scripts/lib/gemini-profiles.mjs

@@ -30,36 +30,10 @@ const DEFAULT_GEMINI_PROFILES = {
   },
 };
 
-// 1회 마이그레이션 테이블: 옛 ID 형식 모델값 → agy display name.
-// null = 카탈로그에서 빠진 모델(2.5 계열, 3 Flash) → 해당 프로필 제거 대상.
-const LEGACY_MODEL_MIGRATION = {
-  "gemini-3.1-pro-preview": "Gemini 3.1 Pro (High)",
-  "gemini-3-flash-preview": null,
-  "Gemini 3 Flash": null,
-  "gemini-2.5-pro": null,
-  "gemini-2.5-flash": null,
-  "gemini-2.5-flash-lite": null,
-};
-// 과거 setup 이 자동 생성했던 프로필 이름. 정책상 더 쓰지 않으므로 제거한다.
-// 사용자가 직접 이름 붙인 프로필은 건드리지 않는다.
-const LEGACY_PROFILE_NAMES = [
-  "pro25",
-  "flash25",
-  "lite25",
-  "flash3",
-  "pro31",
-  "pro31_low",
-  "flash35",
-  "flash35_high",
-  "flash35_low",
-];
-// 과거 setup 이 자동 생성한 기본 model 값. 사용자가 고른 값이 아니므로 새 기본으로 올린다.
-const LEGACY_DEFAULT_MODELS = new Set(["Gemini 3.5 Flash (Medium)"]);
-
 // ── 용도별 effort (SSOT) ──
 // 한 세대(3.8 Flash)만 쓰고 역할에 따라 effort 를 나눈다. 키는 tfx 에이전트/역할 이름
 // (agent-map.json 의 에이전트, tfx multi --assign 의 role). bash(tfx-route.sh)와
-// node(execution-mode, gemini-adapter, cli-agy)가 모두 이 표를 읽는다.
+// 실행 모드(execution-mode)가 이 표를 읽는다.
 //   High   : 판단이 결과를 좌우하는 역할 (검토, 설계, 디버깅, 분석)
 //   Medium : 생성/작성/실행 (기본값)
 //   Low    : 분류, 요약, 추출, 번역처럼 짧고 기계적인 작업
@@ -182,40 +156,6 @@ function ensureGeminiProfiles({
     )
       cfg.profiles = {};
 
-    // ── 1회 마이그레이션: deprecated 2.5 프로필 prune + 옛 ID 형식 → display name ──
-    // merge-only 로직만으로는 기존 사용자 파일에 남은 stale 프로필/옛 모델 ID 가
-    // 정리되지 않으므로, 신규 default 를 채우기 전에 마이그레이션을 먼저 적용한다.
-    let migrated = false;
-    for (const legacy of LEGACY_PROFILE_NAMES) {
-      if (cfg.profiles[legacy]) {
-        delete cfg.profiles[legacy];
-        migrated = true;
-      }
-    }
-    for (const [pname, pval] of Object.entries(cfg.profiles)) {
-      const mid = typeof pval === "string" ? pval : pval?.model;
-      if (mid && Object.hasOwn(LEGACY_MODEL_MIGRATION, mid)) {
-        const repl = LEGACY_MODEL_MIGRATION[mid];
-        if (repl === null) {
-          delete cfg.profiles[pname];
-        } else if (typeof pval === "string") {
-          cfg.profiles[pname] = repl;
-        } else {
-          cfg.profiles[pname].model = repl;
-        }
-        migrated = true;
-      }
-    }
-    if (
-      typeof cfg.model === "string" &&
-      (Object.hasOwn(LEGACY_MODEL_MIGRATION, cfg.model) ||
-        LEGACY_DEFAULT_MODELS.has(cfg.model))
-    ) {
-      // 옛 ID 형식/이전 세대 자동 생성 기본값은 새 기본(DEFAULT)으로 정규화한다.
-      cfg.model = DEFAULT_GEMINI_PROFILES.model;
-      migrated = true;
-    }
-
     let added = 0;
     for (const [name, value] of Object.entries(
       DEFAULT_GEMINI_PROFILES.profiles,
@@ -227,12 +167,7 @@ function ensureGeminiProfiles({
     }
     if (!cfg.model) cfg.model = DEFAULT_GEMINI_PROFILES.model;
 
-    if (added > 0 || migrated) {
-      if (migrated) {
-        try {
-          copyFileSync(profilesPath, profilesPath + `.bak.${Date.now()}`);
-        } catch {}
-      }
+    if (added > 0) {
       writeFileSync(profilesPath, JSON.stringify(cfg, null, 2) + "\n", {
         encoding: "utf8",
         mode: 0o600,
@@ -260,8 +195,6 @@ function ensureGeminiProfiles({
 export {
   DEFAULT_GEMINI_PROFILES,
   ensureGeminiProfiles,
-  GEMINI_DEFAULT_PURPOSE_PROFILE,
-  GEMINI_PROFILE_BY_PURPOSE,
   resolveGeminiModel,
   resolveGeminiProfileForPurpose,
 };

package/scripts/lib/legacy-mcp-cleanup.mjs

@@ -143,7 +143,14 @@ function envWarning(server, home, env, warnings) {
   }
 }
 
-function patchJson(original, file, home, env, warnings) {
+function patchJson(
+  original,
+  file,
+  home,
+  env,
+  warnings,
+  { withEnv = true } = {},
+) {
   const data = JSON.parse(original);
   if (!data || typeof data !== "object" || Array.isArray(data))
     throw new Error(`${file}: JSON 객체가 아닙니다`);
@@ -190,7 +197,7 @@ function patchJson(original, file, home, env, warnings) {
         ...kept,
         command: server.command,
         args: server.args,
-        ...(server.envVars.length
+        ...(withEnv && server.envVars.length
           ? {
               env: {
                 ...kept.env,
@@ -710,6 +717,8 @@ export function cleanupLegacyMcp({
     [join(repoRoot, ".mcp.json"), "json"],
     [join(home, ".codex/config.toml"), "toml"],
     [join(home, ".gemini/settings.json"), "json"],
+    // agy 는 \${VAR} 참조를 풀지 않으므로 env 없이 바꾸고 셸 환경을 물려받게 한다.
+    [join(home, ".gemini/config/mcp_config.json"), "agy"],
   ];
   const plans = [];
   let blocked = false;
@@ -721,7 +730,9 @@ export function cleanupLegacyMcp({
       const plan =
         kind === "toml"
           ? patchToml(original, file, home, env, result.warnings)
-          : patchJson(original, file, home, env, result.warnings);
+          : patchJson(original, file, home, env, result.warnings, {
+              withEnv: kind !== "agy",
+            });
       if (plan.blocked) blocked = true;
       if (plan.count) plans.push({ file, target, original, ...plan });
     } catch {

package/scripts/lib/machine-profile.mjs

@@ -14,7 +14,7 @@ import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 
-export const MACHINE_PROFILE_FILENAME = "machine-profile.env";
+const MACHINE_PROFILE_FILENAME = "machine-profile.env";
 
 export const MACHINE_PROFILE_KEYS = Object.freeze([
   "TFX_MACHINE_PROFILE_VERSION",
@@ -28,9 +28,9 @@ export const MACHINE_PROFILE_KEYS = Object.freeze([
   "TFX_STALL_KILL",
 ]);
 
-export const MACHINE_PROFILE_KEY_SET = new Set(MACHINE_PROFILE_KEYS);
+const MACHINE_PROFILE_KEY_SET = new Set(MACHINE_PROFILE_KEYS);
 
-export const MACHINE_PROFILE_VALUE_RE = /^[A-Za-z0-9_.-]+$/u;
+const MACHINE_PROFILE_VALUE_RE = /^[A-Za-z0-9_.-]+$/u;
 
 // CLI 이름과 disable 키의 대응. 이 두 개가 TFX_DISABLE_* SSOT 의 전부다.
 const CLI_DISABLE_KEYS = Object.freeze({
@@ -248,20 +248,6 @@ export function normalizeCliName(cli) {
   return CLI_ALIASES[key] || null;
 }
 
-/**
- * 세션 문맥 주입용 한 줄. 형식은 고정이며 소비자가 파싱하지 않고 그대로 보여준다.
- *
- * @param {ReturnType<typeof resolveCliPolicy>} policy
- * @returns {string}
- */
-export function formatCliPolicyLine(policy) {
-  const codex = policy?.codexDisabled ? "off" : "on";
-  const antigravity = policy?.antigravityDisabled ? "off" : "on";
-  const codexSource = policy?.source?.codex || "default";
-  const antigravitySource = policy?.source?.antigravity || "default";
-  return `cli-policy: codex=${codex} antigravity=${antigravity} (SSOT: TFX_DISABLE_*; codex<-${codexSource}, antigravity<-${antigravitySource})`;
-}
-
 /**
  * 차단된 CLI 실행 요청에 쓸 오류를 만든다. throw 는 호출자가 한다. 정책상 허용된
  * CLI 이거나 모르는 이름이면 null 을 준다.

package/scripts/lib/mcp-filter.mjs

@@ -15,10 +15,6 @@ import {
   uniqueStrings,
 } from "./mcp-server-catalog.mjs";
 
-export const KNOWN_MCP_SERVERS = Object.freeze(
-  Object.keys(MCP_SERVER_TOOL_CATALOG),
-);
-
 const SEARCH_INTENT_PATTERNS = Object.freeze([
   /\b(search|web|browse|look ?up|find|latest|recent|news|current|today|release(?: note)?s?|changelog|announcement|pricing|status|verify|fact[- ]?check)\b/i,
   /(검색|웹|브라우즈|찾아|조회|최신|최근|뉴스|현재|오늘|릴리즈|배포|변경사항|공지|가격|상태|검증)/u,
@@ -145,7 +141,7 @@ const PROFILE_DEFINITIONS = Object.freeze({
  * 파이프라인 단계별 MCP 서버/도구 제한 (post-filter).
  * role-based 프로필 위에 추가 적용. 빈 배열 = 전체 차단, 미정의 = 제한 없음.
  */
-export const PHASE_OVERRIDES = Object.freeze({
+const PHASE_OVERRIDES = Object.freeze({
   plan: Object.freeze({
     description: "계획 단계: 읽기 전용 탐색만 허용",
     allowedServers: Object.freeze(["context7"]),
@@ -166,7 +162,7 @@ export const PHASE_OVERRIDES = Object.freeze({
   }),
 });
 
-export const LEGACY_PROFILE_ALIASES = Object.freeze({
+const LEGACY_PROFILE_ALIASES = Object.freeze({
   implement: "executor",
   analyze: "analyze",
   review: "reviewer",
@@ -257,30 +253,51 @@ function loadInventory(inventoryFile = "") {
   }
 }
 
+function availableServersFromInventory(inventory, cliType) {
+  const servers = inventory?.[cliType]?.servers || [];
+  return uniqueStrings(
+    servers
+      .filter((server) => ["enabled", "configured"].includes(server.status))
+      .map((server) => server.name),
+  );
+}
+
+function codexServersFromConfig(configFile) {
+  if (!configFile) return [];
+  try {
+    return uniqueStrings(
+      readFileSync(configFile, "utf8")
+        .split(/\r?\n/)
+        .map((line) => /^\[mcp_servers\.([^\].]+)\]$/.exec(line)?.[1])
+        .filter(Boolean),
+    ).sort();
+  } catch {
+    return [];
+  }
+}
+
 function buildInventoryIndex(inventory = null) {
   const index = new Map();
   if (!inventory || typeof inventory !== "object") return index;
 
-  for (const client of ["codex", "gemini"]) {
-    const servers = Array.isArray(inventory[client]?.servers)
-      ? inventory[client].servers
-      : [];
-    for (const server of servers) {
-      if (!server || typeof server.name !== "string" || !server.name.trim())
-        continue;
-      const name = server.name.trim();
-      const previous = index.get(name) || {};
-      index.set(name, {
-        ...previous,
-        tool_count: Number.isFinite(server.tool_count)
-          ? Math.max(previous.tool_count ?? 0, Math.trunc(server.tool_count))
-          : previous.tool_count,
-        domain_tags: uniqueStrings([
-          ...(Array.isArray(previous.domain_tags) ? previous.domain_tags : []),
-          ...(Array.isArray(server.domain_tags) ? server.domain_tags : []),
-        ]),
-      });
-    }
+  const servers = Array.isArray(inventory.codex?.servers)
+    ? inventory.codex.servers
+    : [];
+  for (const server of servers) {
+    if (!server || typeof server.name !== "string" || !server.name.trim())
+      continue;
+    const name = server.name.trim();
+    const previous = index.get(name) || {};
+    index.set(name, {
+      ...previous,
+      tool_count: Number.isFinite(server.tool_count)
+        ? Math.max(previous.tool_count ?? 0, Math.trunc(server.tool_count))
+        : previous.tool_count,
+      domain_tags: uniqueStrings([
+        ...(Array.isArray(previous.domain_tags) ? previous.domain_tags : []),
+        ...(Array.isArray(server.domain_tags) ? server.domain_tags : []),
+      ]),
+    });
   }
 
   return index;
@@ -498,7 +515,7 @@ export function resolveMcpProfile(agentType = "", requestedProfile = "auto") {
   return normalized === "auto" ? resolveAutoProfile(agentType) : normalized;
 }
 
-export function parseAvailableServers(rawAvailableServers = "") {
+function parseAvailableServers(rawAvailableServers = "") {
   if (Array.isArray(rawAvailableServers))
     return uniqueStrings(rawAvailableServers);
   if (typeof rawAvailableServers !== "string" || !rawAvailableServers.trim())
@@ -554,15 +571,21 @@ function applyManifestFilter(servers) {
   return servers.filter((s) => enabled.has(s));
 }
 
-export function resolveAllowedServers(options = {}) {
+function resolveAllowedServers(options = {}) {
   const resolvedProfile = resolveMcpProfile(
     options.agentType,
     options.requestedProfile,
   );
   const profile = getProfileDefinition(resolvedProfile);
   const availableServers = parseAvailableServers(options.availableServers);
-  const inventory = options.inventory || loadInventory(options.inventoryFile);
-  const inventoryIndex = buildInventoryIndex(inventory);
+  const inventory =
+    options.inventory !== undefined
+      ? options.inventory
+      : loadInventory(options.inventoryFile);
+  const inventoryIndex =
+    options.inventoryIndex instanceof Map
+      ? options.inventoryIndex
+      : buildInventoryIndex(inventory);
   const baseServers = availableServers.length
     ? profile.allowedServers.filter((server) =>
         availableServers.includes(server),
@@ -585,8 +608,14 @@ export function buildPromptHint(options = {}) {
   );
   if (resolvedProfile === "none") return "";
 
-  const inventory = options.inventory || loadInventory(options.inventoryFile);
-  const inventoryIndex = buildInventoryIndex(inventory);
+  const inventory =
+    options.inventory !== undefined
+      ? options.inventory
+      : loadInventory(options.inventoryFile);
+  const inventoryIndex =
+    options.inventoryIndex instanceof Map
+      ? options.inventoryIndex
+      : buildInventoryIndex(inventory);
   const allowedServers = resolveAllowedServers({
     ...options,
     inventory,
@@ -636,16 +665,7 @@ export function buildPromptHint(options = {}) {
     .join(" ");
 }
 
-export function getGeminiAllowedServers(options = {}) {
-  return resolveAllowedServers(options);
-}
-
 export function getCodexMcpConfig(options = {}) {
-  const allowedServers = new Set(resolveAllowedServers(options));
-  const resolvedProfile = resolveMcpProfile(
-    options.agentType,
-    options.requestedProfile,
-  );
   // Codex에 실제 등록된 서버만 대상으로 config override 생성.
   // 미등록 서버에 enabled=false를 보내면 "invalid transport" 에러 발생.
   const registeredServers = parseAvailableServers(options.availableServers);
@@ -654,6 +674,11 @@ export function getCodexMcpConfig(options = {}) {
   if (registeredServers.length === 0) {
     return { mcp_servers: {} };
   }
+  const allowedServers = new Set(resolveAllowedServers(options));
+  const resolvedProfile = resolveMcpProfile(
+    options.agentType,
+    options.requestedProfile,
+  );
   const targetServers = registeredServers;
 
   if (resolvedProfile === "none") {
@@ -712,9 +737,27 @@ export function getCodexConfigOverrides(options = {}) {
 }
 
 export function buildMcpPolicy(options = {}) {
-  const inventory = options.inventory || loadInventory(options.inventoryFile);
+  const inventory =
+    options.inventory !== undefined
+      ? options.inventory
+      : loadInventory(options.inventoryFile);
   const inventoryIndex = buildInventoryIndex(inventory);
-  const resolvedOptions = { ...options, inventory, inventoryIndex };
+  let availableServers = options.availableServers;
+  if (availableServers === undefined) {
+    availableServers = availableServersFromInventory(
+      inventory,
+      options.cliType,
+    );
+    if (availableServers.length === 0 && options.cliType === "codex") {
+      availableServers = codexServersFromConfig(options.codexConfig);
+    }
+  }
+  const resolvedOptions = {
+    ...options,
+    availableServers,
+    inventory,
+    inventoryIndex,
+  };
   const resolvedProfile = resolveMcpProfile(
     options.agentType,
     options.requestedProfile,
@@ -730,6 +773,12 @@ export function buildMcpPolicy(options = {}) {
     allowedServers = allowedServers.filter((s) => !blocked.has(s));
   }
 
+  // 플러그인 서버는 transport 설정이 없어 CLI override를 받으면 부팅이 실패한다.
+  const codexOptions = {
+    ...resolvedOptions,
+    availableServers: codexServersFromConfig(options.codexConfig),
+  };
+
   return {
     requestedProfile:
       typeof options.requestedProfile === "string" && options.requestedProfile
@@ -739,9 +788,8 @@ export function buildMcpPolicy(options = {}) {
     resolvedPhase: phase || null,
     allowedServers,
     hint,
-    geminiAllowedServers: getGeminiAllowedServers(resolvedOptions),
-    codexConfig: getCodexMcpConfig(resolvedOptions),
-    codexConfigOverrides: getCodexConfigOverrides(resolvedOptions),
+    codexConfig: getCodexMcpConfig(codexOptions),
+    codexConfigOverrides: getCodexConfigOverrides(codexOptions),
   };
 }
 
@@ -753,25 +801,25 @@ function shellArray(name, values) {
   return `${name}=(${values.map((value) => shellEscape(value)).join(" ")})`;
 }
 
-export function toDelimited(policy) {
+function toDelimited(policy) {
   const RS = "\x1e";
   return [
     policy.requestedProfile,
     policy.resolvedProfile,
     policy.hint,
-    policy.geminiAllowedServers.join(","),
-    policy.codexConfigOverrides.flatMap((o) => ["-c", o]).join(","),
+    policy.allowedServers.join(","),
+    policy.codexConfigOverrides.flatMap((o) => ["-c", o]).join("\x1f"),
     JSON.stringify(policy.codexConfig),
     policy.resolvedPhase || "",
   ].join(RS);
 }
 
-export function toShellExports(policy) {
+function toShellExports(policy) {
   const lines = [
     `MCP_PROFILE_REQUESTED=${shellEscape(policy.requestedProfile)}`,
     `MCP_RESOLVED_PROFILE=${shellEscape(policy.resolvedProfile)}`,
     `MCP_HINT=${shellEscape(policy.hint)}`,
-    shellArray("GEMINI_ALLOWED_SERVERS", policy.geminiAllowedServers),
+    shellArray("ALLOWED_MCP_SERVERS", policy.allowedServers),
     shellArray(
       "CODEX_CONFIG_FLAGS",
       policy.codexConfigOverrides.flatMap((override) => ["-c", override]),
@@ -789,8 +837,10 @@ function parseCliArgs(argv) {
     command: "json",
     agentType: "",
     requestedProfile: "auto",
-    availableServers: [],
+    availableServers: undefined,
     inventoryFile: "",
+    cliType: "",
+    codexConfig: "",
     searchTool: "",
     taskText: "",
     workerIndex: undefined,
@@ -821,6 +871,12 @@ function parseCliArgs(argv) {
       case "--available":
         args.availableServers = parseAvailableServers(next());
         break;
+      case "--cli-type":
+        args.cliType = next();
+        break;
+      case "--codex-config":
+        args.codexConfig = next();
+        break;
       case "--inventory-file":
         args.inventoryFile = next();
         break;
@@ -844,7 +900,7 @@ function parseCliArgs(argv) {
   return args;
 }
 
-export async function runCli(argv = process.argv.slice(2)) {
+async function runCli(argv = process.argv.slice(2)) {
   let args;
   try {
     args = parseCliArgs(argv);

package/scripts/lib/mcp-health.mjs

@@ -224,7 +224,7 @@ export function parseMcpServersFromToml(content = "") {
   return servers;
 }
 
-export function readMcpServers(configPath = DEFAULT_CONFIG_PATH) {
+function readMcpServers(configPath = DEFAULT_CONFIG_PATH) {
   if (!existsSync(configPath)) return {};
   try {
     const content = readFileSync(configPath, "utf8");
@@ -754,7 +754,7 @@ function renderOutput(results, source, format) {
   return JSON.stringify({ source, healthy, dead, results }, null, 2);
 }
 
-export async function runCli(argv = process.argv.slice(2)) {
+async function runCli(argv = process.argv.slice(2)) {
   let args;
   try {
     args = parseCliArgs(argv);

package/scripts/lib/mcp-server-catalog.mjs

@@ -296,7 +296,7 @@ export function uniqueStrings(values = []) {
   ];
 }
 
-export function inferDomainTagsFromText(text = "") {
+function inferDomainTagsFromText(text = "") {
   if (typeof text !== "string" || !text.trim()) return [];
   const normalized = text.toLocaleLowerCase();
   const matched = [];
@@ -314,7 +314,7 @@ export function inferDomainTagsFromText(text = "") {
   return uniqueStrings(matched);
 }
 
-export function getDefaultServerMetadata(serverName = "") {
+function getDefaultServerMetadata(serverName = "") {
   const toolCount = MCP_SERVER_TOOL_CATALOG[serverName]?.length || 0;
   const domainTags = uniqueStrings([
     ...(MCP_SERVER_DOMAIN_TAGS[serverName] || []),