triflux 10.9.21 → 10.9.23

package/scripts/tfx-route.sh

@@ -1193,12 +1193,14 @@ resolve_mcp_policy() {
   fi
 
   available_servers=$(get_cached_servers "$CLI_TYPE")
-  if [[ "$CLI_TYPE" == "codex" && "${TFX_CODEX_TRANSPORT:-auto}" != "mcp" ]]; then
-    available_servers=""
+  # Codex exec 모드에서도 config.toml의 MCP 서버를 전부 시작하므로,
+  # transport 모드와 관계없이 registered servers를 전달하여 불필요한 서버를
+  # enabled=false로 비활성화해야 한다.
+  # 캐시가 비어있으면 config.toml에서 직접 서버 목록을 추출한다.
+  if [[ -z "$available_servers" && "$CLI_TYPE" == "codex" && -f "$_CODEX_CONFIG" ]]; then
+    available_servers=$(sed -n 's/^\[mcp_servers\.\([^].]*\)\]$/\1/p' "$_CODEX_CONFIG" 2>/dev/null \
+      | sort -u | tr '\n' ',' | sed 's/,$//')
   fi
-  # Codex 0.115+: 미등록 서버에 config override(enabled=true/false 모두)를 보내면
-  # "invalid transport" 에러 발생. 캐시 비어있으면 빈 문자열이 유지되어
-  # mcp-filter가 override를 생성하지 않는다.
 
   local -a cmd=(
     "$NODE_BIN" "$filter_script" shell
@@ -1398,6 +1400,53 @@ resolve_codex_mcp_script() {
     "$sd/hub/workers/codex-mcp.mjs" "$sd/../hub/workers/codex-mcp.mjs"
 }
 
+## ── Config Swap: 프로필별 MCP 서버 필터링 ──
+# codex exec는 -c flag로 MCP enabled/disabled를 제어할 수 없다.
+# config.toml을 원자적으로 교체하여 불필요한 서버 시작을 방지한다.
+_codex_config_swap() {
+  local action="$1"  # "filter" or "restore"
+  local config="$_CODEX_CONFIG"
+  local backup="${config}.pre-exec"
+
+  if [[ "$action" == "filter" && -f "$config" ]]; then
+    # MCP 프로필에서 허용된 서버 목록 추출
+    local allowed_pat=""
+    for flag in "${CODEX_CONFIG_FLAGS[@]}"; do
+      if [[ "$flag" =~ mcp_servers\.([^.]+)\.enabled=true ]]; then
+        [[ -n "$allowed_pat" ]] && allowed_pat="${allowed_pat}|"
+        allowed_pat="${allowed_pat}${BASH_REMATCH[1]}"
+      fi
+    done
+
+    # 백업 생성 (이미 있으면 다른 워커가 swap 중 — 건드리지 않음)
+    if [[ -f "$backup" ]]; then
+      echo "[tfx-route] config.toml swap 스킵: 다른 워커가 사용 중" >&2
+      return 0
+    fi
+    cp "$config" "$backup"
+
+    # awk로 필터링: 비허용 MCP 서버 섹션 제거, 나머지 그대로 유지
+    awk -v keep="$allowed_pat" '
+      BEGIN { skip=0 }
+      /^\[mcp_servers\./ {
+        name=$0; gsub(/^\[mcp_servers\./, "", name); gsub(/[\].].*/, "", name)
+        if (keep == "" || name !~ "^(" keep ")$") { skip=1; next }
+        else { skip=0 }
+      }
+      /^\[/ && !/^\[mcp_servers\./ { skip=0 }
+      !skip { print }
+    ' "$backup" > "$config"
+
+    local kept=0
+    [[ -n "$allowed_pat" ]] && kept=$(echo "$allowed_pat" | tr '|' '\n' | wc -l | tr -d ' ')
+    echo "[tfx-route] config.toml swap: ${kept}개 MCP 서버만 활성" >&2
+
+  elif [[ "$action" == "restore" && -f "$backup" ]]; then
+    mv "$backup" "$config" 2>/dev/null
+    echo "[tfx-route] config.toml 복원 완료" >&2
+  fi
+}
+
 run_codex_exec() {
   local prompt="$1"
   local use_tee_flag="$2"
@@ -1405,9 +1454,8 @@ run_codex_exec() {
   local worker_pid
   local -a codex_args=()
   read -r -a codex_args <<< "$CLI_ARGS"
-  if [[ ${#CODEX_CONFIG_FLAGS[@]} -gt 0 ]]; then
-    codex_args+=("${CODEX_CONFIG_FLAGS[@]}")
-  fi
+  # -c flags는 codex exec에서 MCP enabled 제어 불가 — config swap으로 대체
+  # config swap은 codex 블록 최상단(_codex_config_swap "filter")에서 실행됨
 
   if [[ "$use_tee_flag" == "true" ]]; then
     "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$CLI_CMD" "${codex_args[@]}" "$prompt" < /dev/null 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
@@ -1656,6 +1704,12 @@ FALLBACK_EOF
   fi
 
   if [[ "$CLI_TYPE" == "codex" ]]; then
+    # Config swap: 프로필에 맞는 MCP 서버만 남긴 임시 config 적용
+    # run_codex_mcp / run_codex_exec 어느 경로든 적용되도록 최상단에서 실행
+    _codex_config_swap "filter"
+    # swap 후 config override 플래그 클리어 — 제거된 서버에 override 보내면 "invalid transport" 에러
+    CODEX_CONFIG_FLAGS=()
+    CODEX_CONFIG_JSON="{}"
     codex_transport_effective="exec"
     if [[ "$TFX_CODEX_TRANSPORT" != "exec" ]]; then
       run_codex_mcp "$FULL_PROMPT" "$use_tee" || exit_code=$?
@@ -1676,6 +1730,8 @@ FALLBACK_EOF
       codex_transport_effective="exec"
     fi
     echo "[tfx-route] codex_transport_effective=$codex_transport_effective" >&2
+    # Config swap 복원 (성공/실패 관계없이)
+    _codex_config_swap "restore"
 
   elif [[ "$CLI_TYPE" == "gemini" ]]; then
     local gemini_model

package/tui/codex-profile.mjs

@@ -0,0 +1,457 @@
+#!/usr/bin/env node
+// tui/codex-profile.mjs — Interactive Codex Profile Manager
+import {
+  copyFileSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  writeFileSync,
+} from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import {
+  BOLD,
+  box,
+  CYAN,
+  clear,
+  confirm,
+  DIM,
+  divider,
+  fail,
+  GREEN,
+  info,
+  input,
+  label,
+  ok,
+  onExit,
+  RED,
+  RESET,
+  select,
+  showCursor,
+  table,
+  WHITE,
+  warn,
+  YELLOW,
+} from "./core.mjs";
+
+const CODEX_DIR = join(homedir(), ".codex");
+const CONFIG_PATH = join(CODEX_DIR, "config.toml");
+
+const KNOWN_MODELS = [
+  { label: "gpt-5.4", hint: "최신 플래그십" },
+  { label: "gpt-5.3-codex", hint: "코딩 특화" },
+  { label: "gpt-5.1-codex-mini", hint: "경량 Spark" },
+  { label: "o3", hint: "추론 특화" },
+  { label: "o4-mini", hint: "추론 경량" },
+  { label: "직접 입력", hint: "" },
+];
+
+const EFFORT_LEVELS = [
+  { label: "low", hint: "빠른 응답, 최소 추론" },
+  { label: "medium", hint: "균형 잡힌 추론" },
+  { label: "high", hint: "깊은 추론" },
+  { label: "xhigh", hint: "최대 추론 (느림)" },
+];
+
+// ── TOML Parsing ──
+
+function readConfig() {
+  if (!existsSync(CONFIG_PATH)) return { raw: "", defaults: {}, profiles: [] };
+  const raw = readFileSync(CONFIG_PATH, "utf8");
+  return { raw, ...parseConfig(raw) };
+}
+
+function parseConfig(raw) {
+  const lines = raw.split("\n");
+  const defaults = {};
+  const profiles = [];
+  let currentSection = null;
+  let currentProfile = null;
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+
+    const sectionMatch = trimmed.match(/^\[(.+)\]$/);
+    if (sectionMatch) {
+      const name = sectionMatch[1];
+      const profileMatch = name.match(/^profiles\.(\w+)$/);
+      if (profileMatch) {
+        currentSection = "profile";
+        currentProfile = { name: profileMatch[1] };
+        profiles.push(currentProfile);
+      } else {
+        currentSection = name;
+        currentProfile = null;
+      }
+      continue;
+    }
+
+    const kvMatch = trimmed.match(/^(\w+)\s*=\s*(.+)$/);
+    if (kvMatch) {
+      const [, key, rawVal] = kvMatch;
+      const value = rawVal.replace(/^["']|["']$/g, "").trim();
+      if (currentSection === "profile" && currentProfile) {
+        currentProfile[key] = value;
+      } else if (!currentSection) {
+        defaults[key] = value;
+      }
+    }
+  }
+
+  return { defaults, profiles };
+}
+
+function writeProfile(raw, profileName, props) {
+  const lines = raw.split("\n");
+  const sectionRe = new RegExp(`^\\[profiles\\.${escRe(profileName)}\\]\\s*$`);
+  let inSection = false;
+  let sectionStart = -1;
+  let sectionEnd = lines.length;
+
+  for (let i = 0; i < lines.length; i++) {
+    if (sectionRe.test(lines[i].trim())) {
+      inSection = true;
+      sectionStart = i;
+      continue;
+    }
+    if (inSection && lines[i].trim().startsWith("[")) {
+      sectionEnd = i;
+      break;
+    }
+  }
+
+  if (sectionStart === -1) {
+    // Append new profile section
+    const newLines = [`[profiles.${profileName}]`];
+    for (const [k, v] of Object.entries(props)) {
+      newLines.push(`${k} = "${v}"`);
+    }
+    return raw.trimEnd() + "\n" + newLines.join("\n") + "\n";
+  }
+
+  // Replace existing section body
+  const newBody = [];
+  for (const [k, v] of Object.entries(props)) {
+    newBody.push(`${k} = "${v}"`);
+  }
+  lines.splice(sectionStart + 1, sectionEnd - sectionStart - 1, ...newBody);
+  return lines.join("\n");
+}
+
+function deleteProfile(raw, profileName) {
+  const lines = raw.split("\n");
+  const sectionRe = new RegExp(`^\\[profiles\\.${escRe(profileName)}\\]\\s*$`);
+  let inSection = false;
+  let start = -1;
+  let end = lines.length;
+
+  for (let i = 0; i < lines.length; i++) {
+    if (sectionRe.test(lines[i].trim())) {
+      inSection = true;
+      start = i;
+      continue;
+    }
+    if (inSection && lines[i].trim().startsWith("[")) {
+      end = i;
+      break;
+    }
+  }
+
+  if (start === -1) return raw;
+  // Remove trailing blank lines too
+  while (end < lines.length && lines[end].trim() === "") end++;
+  lines.splice(start, end - start);
+  return lines.join("\n");
+}
+
+function setDefault(raw, key, value) {
+  const lines = raw.split("\n");
+  const keyRe = new RegExp(`^${escRe(key)}\\s*=`);
+
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].trim().startsWith("[")) break; // hit first section
+    if (keyRe.test(lines[i].trim())) {
+      lines[i] = `${key} = "${value}"`;
+      return lines.join("\n");
+    }
+  }
+
+  // Key not found — insert before first section
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].trim().startsWith("[")) {
+      lines.splice(i, 0, `${key} = "${value}"`);
+      return lines.join("\n");
+    }
+  }
+
+  return raw + `\n${key} = "${value}"\n`;
+}
+
+function escRe(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+// ── UI Flows ──
+
+function showStatus(config) {
+  const { defaults, profiles } = config;
+
+  console.log();
+  label("기본 모델", `${WHITE}${defaults.model || "미설정"}${RESET}`);
+  label(
+    "기본 Effort",
+    `${WHITE}${defaults.model_reasoning_effort || "미설정"}${RESET}`,
+  );
+  console.log();
+
+  if (profiles.length === 0) {
+    warn("등록된 프로파일이 없습니다.");
+    return;
+  }
+
+  const headers = ["프로파일", "모델", "Effort", "기타"];
+  const rows = profiles.map((p) => {
+    const extras = Object.entries(p)
+      .filter(([k]) => !["name", "model", "model_reasoning_effort"].includes(k))
+      .map(([k, v]) => `${k}=${v}`)
+      .join(", ");
+    return [
+      `${CYAN}${p.name}${RESET}`,
+      p.model || DIM + "inherit" + RESET,
+      effortColor(p.model_reasoning_effort),
+      extras ? `${DIM}${extras}${RESET}` : "",
+    ];
+  });
+
+  table(headers, rows);
+}
+
+function effortColor(effort) {
+  if (!effort) return `${DIM}inherit${RESET}`;
+  const colors = { low: GREEN, medium: CYAN, high: YELLOW, xhigh: RED };
+  return `${colors[effort] || ""}${effort}${RESET}`;
+}
+
+async function pickModel(current) {
+  const idx = KNOWN_MODELS.findIndex((m) => m.label === current);
+  const choice = await select("모델 선택", KNOWN_MODELS, {
+    initial: Math.max(0, idx),
+  });
+  if (!choice) return null;
+  if (choice.value.label === "직접 입력") {
+    return await input("모델 ID", current || "");
+  }
+  return choice.value.label;
+}
+
+async function pickEffort(current) {
+  const idx = EFFORT_LEVELS.findIndex((e) => e.label === current);
+  const choice = await select("Reasoning Effort 선택", EFFORT_LEVELS, {
+    initial: Math.max(0, idx),
+  });
+  if (!choice) return null;
+  return choice.value.label;
+}
+
+async function editProfile(config) {
+  const { profiles } = config;
+  if (profiles.length === 0) {
+    warn("편집할 프로파일이 없습니다.");
+    return config;
+  }
+
+  const options = profiles.map((p) => ({
+    label: p.name,
+    hint: `${DIM}${p.model || "inherit"} / ${p.model_reasoning_effort || "inherit"}${RESET}`,
+  }));
+
+  const picked = await select("편집할 프로파일", options);
+  if (!picked) return config;
+
+  const profile = profiles[picked.index];
+  console.log();
+  info(
+    `현재: ${BOLD}${profile.name}${RESET} → ${profile.model} / ${profile.model_reasoning_effort}`,
+  );
+
+  const newModel = await pickModel(profile.model);
+  if (newModel === null) return config;
+
+  const newEffort = await pickEffort(profile.model_reasoning_effort);
+  if (newEffort === null) return config;
+
+  console.log();
+  info(
+    `변경: ${profile.model} → ${BOLD}${newModel}${RESET}, ${profile.model_reasoning_effort} → ${BOLD}${newEffort}${RESET}`,
+  );
+
+  if (!(await confirm("저장하시겠습니까?"))) return config;
+
+  const props = { model: newModel, model_reasoning_effort: newEffort };
+  // Preserve extra props (like model_temperature)
+  for (const [k, v] of Object.entries(profile)) {
+    if (!["name", "model", "model_reasoning_effort"].includes(k)) props[k] = v;
+  }
+
+  const raw = writeProfile(config.raw, profile.name, props);
+  save(raw);
+  ok(`${profile.name} 프로파일 저장 완료`);
+  return readConfig();
+}
+
+async function editDefault(config) {
+  const { defaults } = config;
+  info(`현재 기본 모델: ${BOLD}${defaults.model || "미설정"}${RESET}`);
+  info(
+    `현재 기본 Effort: ${BOLD}${defaults.model_reasoning_effort || "미설정"}${RESET}`,
+  );
+
+  const newModel = await pickModel(defaults.model);
+  if (newModel === null) return config;
+
+  const newEffort = await pickEffort(defaults.model_reasoning_effort);
+  if (newEffort === null) return config;
+
+  console.log();
+  info(
+    `변경: ${defaults.model} → ${BOLD}${newModel}${RESET}, ${defaults.model_reasoning_effort} → ${BOLD}${newEffort}${RESET}`,
+  );
+
+  if (!(await confirm("저장하시겠습니까?"))) return config;
+
+  let raw = setDefault(config.raw, "model", newModel);
+  raw = setDefault(raw, "model_reasoning_effort", newEffort);
+  save(raw);
+  ok("기본 설정 저장 완료");
+  return readConfig();
+}
+
+async function addProfile(config) {
+  const name = await input("새 프로파일 이름");
+  if (!name) return config;
+
+  if (config.profiles.some((p) => p.name === name)) {
+    fail(`'${name}' 프로파일이 이미 존재합니다.`);
+    return config;
+  }
+
+  const model = await pickModel("");
+  if (!model) return config;
+
+  const effort = await pickEffort("");
+  if (!effort) return config;
+
+  console.log();
+  info(`추가: ${BOLD}${name}${RESET} → ${model} / ${effort}`);
+  if (!(await confirm("저장하시겠습니까?"))) return config;
+
+  const raw = writeProfile(config.raw, name, {
+    model,
+    model_reasoning_effort: effort,
+  });
+  save(raw);
+  ok(`${name} 프로파일 추가 완료`);
+  return readConfig();
+}
+
+async function removeProfile(config) {
+  const { profiles } = config;
+  if (profiles.length === 0) {
+    warn("삭제할 프로파일이 없습니다.");
+    return config;
+  }
+
+  const options = profiles.map((p) => ({ label: p.name, hint: `${p.model}` }));
+  const picked = await select("삭제할 프로파일", options);
+  if (!picked) return config;
+
+  const name = profiles[picked.index].name;
+  if (
+    !(await confirm(
+      `${RED}${name}${RESET} 프로파일을 삭제하시겠습니까?`,
+      false,
+    ))
+  ) {
+    return config;
+  }
+
+  const raw = deleteProfile(config.raw, name);
+  save(raw);
+  ok(`${name} 프로파일 삭제 완료`);
+  return readConfig();
+}
+
+function save(content) {
+  if (!existsSync(CODEX_DIR)) mkdirSync(CODEX_DIR, { recursive: true });
+
+  // Backup before write
+  if (existsSync(CONFIG_PATH)) {
+    const backupPath = CONFIG_PATH + ".bak";
+    copyFileSync(CONFIG_PATH, backupPath);
+  }
+
+  writeFileSync(CONFIG_PATH, content, "utf8");
+}
+
+// ── Main Loop ──
+
+const MENU = [
+  { label: "프로파일 모델 변경", hint: "모델/effort 수정" },
+  { label: "기본 모델 변경", hint: "top-level default" },
+  { label: "프로파일 추가", hint: "새 프로파일 생성" },
+  { label: "프로파일 삭제", hint: "기존 프로파일 제거" },
+  { label: "종료", hint: "Ctrl+C" },
+];
+
+async function main() {
+  onExit(() => {});
+  clear();
+
+  let config = readConfig();
+
+  if (!existsSync(CONFIG_PATH)) {
+    fail(`config.toml 미존재: ${CONFIG_PATH}`);
+    info("codex를 먼저 설치하거나 /tfx-setup을 실행하세요.");
+    process.exit(1);
+  }
+
+  while (true) {
+    box("Codex Profile Manager", 46);
+    showStatus(config);
+    console.log();
+
+    const choice = await select("작업 선택", MENU);
+    if (!choice || choice.index === 4) {
+      console.log();
+      info("종료합니다.");
+      showCursor();
+      break;
+    }
+
+    console.log();
+    switch (choice.index) {
+      case 0:
+        config = await editProfile(config);
+        break;
+      case 1:
+        config = await editDefault(config);
+        break;
+      case 2:
+        config = await addProfile(config);
+        break;
+      case 3:
+        config = await removeProfile(config);
+        break;
+    }
+
+    console.log();
+    divider(46);
+  }
+}
+
+main().catch((e) => {
+  showCursor();
+  console.error(e);
+  process.exit(1);
+});