triflux 10.3.4 → 10.7.0

package/scripts/tfx-route-worker.mjs

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 // tfx-route-worker.mjs — tfx-route.sh용 subprocess worker 러너
 
-import { readFileSync, existsSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 
 const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
 const FACTORY_CANDIDATES = [
-  resolve(SCRIPT_DIR, '../hub/workers/factory.mjs'),
-  resolve(SCRIPT_DIR, './hub/workers/factory.mjs'),
+  resolve(SCRIPT_DIR, "../hub/workers/factory.mjs"),
+  resolve(SCRIPT_DIR, "./hub/workers/factory.mjs"),
 ];
 
 // MCP transport 실패 시 tfx-route.sh가 exec fallback을 수행할 수 있도록
@@ -16,10 +16,10 @@ const FACTORY_CANDIDATES = [
 const MCP_TRANSPORT_EXIT_CODE = 70;
 const GEMINI_RETRY_DELAY_MS = 5000;
 const GEMINI_RETRY_PATTERN_SNIPPETS = [
-  '429',
-  'quota',
-  'rate limit',
-  'resource_exhausted',
+  "429",
+  "quota",
+  "rate limit",
+  "resource_exhausted",
 ];
 
 let createWorker = null;
@@ -30,8 +30,10 @@ for (const candidate of FACTORY_CANDIDATES) {
     ({ createWorker } = await import(pathToFileURL(candidate).href));
   } catch (err) {
     // 의존성 누락 (예: @modelcontextprotocol/sdk) → fallback 가능하도록 exit 70
-    if (err.code === 'ERR_MODULE_NOT_FOUND') {
-      process.stderr.write(`[tfx-route-worker] 모듈 로드 실패: ${err.message}\n`);
+    if (err.code === "ERR_MODULE_NOT_FOUND") {
+      process.stderr.write(
+        `[tfx-route-worker] 모듈 로드 실패: ${err.message}\n`,
+      );
       process.exit(MCP_TRANSPORT_EXIT_CODE);
     }
     throw err;
@@ -40,7 +42,9 @@ for (const candidate of FACTORY_CANDIDATES) {
 }
 
 if (!createWorker) {
-  process.stderr.write('[tfx-route-worker] worker factory를 찾지 못했습니다.\n');
+  process.stderr.write(
+    "[tfx-route-worker] worker factory를 찾지 못했습니다.\n",
+  );
   process.exit(MCP_TRANSPORT_EXIT_CODE);
 }
 
@@ -55,46 +59,46 @@ function parseArgs(argv) {
     const next = argv[index + 1];
 
     switch (token) {
-      case '--type':
+      case "--type":
         args.type = next;
         index += 1;
         break;
-      case '--command':
+      case "--command":
         args.command = next;
         index += 1;
         break;
-      case '--command-args-json':
+      case "--command-args-json":
         args.commandArgsJson = next;
         index += 1;
         break;
-      case '--model':
+      case "--model":
         args.model = next;
         index += 1;
         break;
-      case '--timeout-ms':
+      case "--timeout-ms":
         args.timeoutMs = Number(next);
         index += 1;
         break;
-      case '--approval-mode':
+      case "--approval-mode":
         args.approvalMode = next;
         index += 1;
         break;
-      case '--permission-mode':
+      case "--permission-mode":
         args.permissionMode = next;
         index += 1;
         break;
-      case '--allow-dangerously-skip-permissions':
+      case "--allow-dangerously-skip-permissions":
         args.allowDangerouslySkipPermissions = true;
         break;
-      case '--allowed-mcp-server-name':
+      case "--allowed-mcp-server-name":
         args.allowedMcpServerNames.push(next);
         index += 1;
         break;
-      case '--mcp-config':
+      case "--mcp-config":
         args.mcpConfig.push(next);
         index += 1;
         break;
-      case '--cwd':
+      case "--cwd":
         args.cwd = next;
         index += 1;
         break;
@@ -104,7 +108,7 @@ function parseArgs(argv) {
   }
 
   if (!args.type) {
-    throw new Error('--type is required');
+    throw new Error("--type is required");
   }
 
   return args;
@@ -124,15 +128,17 @@ function parseJsonArray(raw, label) {
 }
 
 function readPromptFromStdin() {
-  return readFileSync(0, 'utf8');
+  return readFileSync(0, "utf8");
 }
 
 function resolveDefaultMcpConfig(cwd) {
-  const primary = resolve(cwd, '.claude', 'mcp.json');
+  const primary = resolve(cwd, ".claude", "mcp.json");
   if (existsSync(primary)) return [primary];
-  const legacy = resolve(cwd, '.mcp.json');
+  const legacy = resolve(cwd, ".mcp.json");
   if (existsSync(legacy)) return [legacy];
-  process.stderr.write('[tfx-route-worker] warning: no MCP config found, hub unavailable\n');
+  process.stderr.write(
+    "[tfx-route-worker] warning: no MCP config found, hub unavailable\n",
+  );
   return [];
 }
 
@@ -145,21 +151,19 @@ function isGeminiQuotaRetrySignal(error) {
     return true;
   }
 
-  const fragments = [
-    error?.message,
-    error?.stderr,
-    error?.result?.stderr,
-  ]
-    .filter((value) => typeof value === 'string' && value.trim().length > 0)
+  const fragments = [error?.message, error?.stderr, error?.result?.stderr]
+    .filter((value) => typeof value === "string" && value.trim().length > 0)
     .map((value) => value.toLowerCase());
 
   if (fragments.length === 0) return false;
-  const merged = fragments.join('\n');
-  return GEMINI_RETRY_PATTERN_SNIPPETS.some((pattern) => merged.includes(pattern));
+  const merged = fragments.join("\n");
+  return GEMINI_RETRY_PATTERN_SNIPPETS.some((pattern) =>
+    merged.includes(pattern),
+  );
 }
 
 async function runWorker(worker, type, prompt) {
-  const maxAttempts = type === 'gemini' ? 2 : 1;
+  const maxAttempts = type === "gemini" ? 2 : 1;
   let lastError = null;
 
   for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
@@ -167,18 +171,17 @@ async function runWorker(worker, type, prompt) {
       return await worker.run(prompt);
     } catch (error) {
       lastError = error;
-      const shouldRetry = (
-        type === 'gemini'
-        && attempt < maxAttempts
-        && isGeminiQuotaRetrySignal(error)
-      );
+      const shouldRetry =
+        type === "gemini" &&
+        attempt < maxAttempts &&
+        isGeminiQuotaRetrySignal(error);
 
       if (!shouldRetry) {
         throw error;
       }
 
       process.stderr.write(
-        '[tfx-route-worker] Gemini 429/quota 감지 — 5초 후 1회 재시도합니다.\n',
+        "[tfx-route-worker] Gemini 429/quota 감지 — 5초 후 1회 재시도합니다.\n",
       );
       await sleep(GEMINI_RETRY_DELAY_MS);
     }
@@ -192,16 +195,17 @@ const prompt = readPromptFromStdin();
 
 const worker = createWorker(args.type, {
   command: args.command,
-  commandArgs: parseJsonArray(args.commandArgsJson, '--command-args-json'),
+  commandArgs: parseJsonArray(args.commandArgsJson, "--command-args-json"),
   model: args.model,
   timeoutMs: args.timeoutMs,
   approvalMode: args.approvalMode,
   permissionMode: args.permissionMode,
   allowDangerouslySkipPermissions: args.allowDangerouslySkipPermissions,
   allowedMcpServerNames: args.allowedMcpServerNames,
-  mcpConfig: args.type === 'claude' && args.mcpConfig.length === 0
-    ? resolveDefaultMcpConfig(args.cwd || process.cwd())
-    : args.mcpConfig,
+  mcpConfig:
+    args.type === "claude" && args.mcpConfig.length === 0
+      ? resolveDefaultMcpConfig(args.cwd || process.cwd())
+      : args.mcpConfig,
   cwd: args.cwd || process.cwd(),
 });
 
@@ -209,15 +213,17 @@ try {
   const result = await runWorker(worker, args.type, prompt);
   if (result.response) {
     process.stdout.write(result.response);
-    if (!result.response.endsWith('\n')) process.stdout.write('\n');
+    if (!result.response.endsWith("\n")) process.stdout.write("\n");
   }
 } catch (error) {
   if (error.stderr) {
     process.stderr.write(String(error.stderr));
-    if (!String(error.stderr).endsWith('\n')) process.stderr.write('\n');
+    if (!String(error.stderr).endsWith("\n")) process.stderr.write("\n");
   }
   process.stderr.write(`${error.message}\n`);
-  process.exitCode = error.code === 'ETIMEDOUT' ? 124 : 1;
+  process.exitCode = error.code === "ETIMEDOUT" ? 124 : 1;
 } finally {
-  try { await worker.stop(); } catch {}
+  try {
+    await worker.stop();
+  } catch {}
 }

package/scripts/tfx-route.sh

@@ -56,6 +56,37 @@ resolve_tmp_dir() {
 
 TFX_TMP="$(resolve_tmp_dir)"
 
+# ── Worker PID 추적 (EXIT trap에서 정리) ──
+_PID_TRACK="${TFX_TMP}/tfx-route-$$-pids"
+
+track_worker_pid() {
+  echo "$1" >> "$_PID_TRACK"
+}
+
+cleanup_workers() {
+  deregister_agent 2>/dev/null || true
+  [[ ! -f "$_PID_TRACK" ]] && return
+  while IFS= read -r pid; do
+    [[ -z "$pid" ]] && continue
+    kill -0 "$pid" 2>/dev/null || continue
+    case "$(uname -s)" in
+      MINGW*|MSYS*)
+        # Windows: taskkill /T /F로 프로세스 트리 전체 종료
+        MSYS_NO_PATHCONV=1 cmd.exe //c "taskkill /T /F /PID $pid" 2>/dev/null || true ;;
+      *)
+        # Unix: 프로세스 그룹 kill
+        local pgid
+        pgid=$(ps -o pgid= -p "$pid" 2>/dev/null | tr -d ' ')
+        if [[ -n "$pgid" && "$pgid" != "0" ]]; then
+          kill -- "-$pgid" 2>/dev/null || true
+        else
+          kill "$pid" 2>/dev/null || true
+        fi ;;
+    esac
+  done < "$_PID_TRACK"
+  rm -f "$_PID_TRACK"
+}
+
 # ── config.toml sandbox/approval_mode 감지 ──
 # config.toml에 이미 설정되어 있으면 CLI 플래그 중복 시 Codex가 에러를 던짐
 _CODEX_CONFIG="${HOME}/.codex/config.toml"
@@ -1375,6 +1406,7 @@ run_stream_worker() {
     printf '%s' "$prompt" | "$TIMEOUT_BIN" "$TIMEOUT_SEC" "${worker_cmd[@]}" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
   fi
   worker_pid=$!
+  track_worker_pid "$worker_pid"
 
   heartbeat_monitor "$worker_pid" &
   hb_pid=$!
@@ -1384,125 +1416,6 @@ run_stream_worker() {
   return "$exit_code_local"
 }
 
-# Gemini 429 지수 백오프 재시도 래퍼
-# 사용: gemini_with_retry <use_tee_flag> <gemini_args_array_name> <prompt>
-# 429/rate limit 감지 시 최대 3회 재시도 (2→4→8초 백오프)
-_gemini_run_once() {
-  local use_tee_flag="$1"
-  local prompt="$2"
-  shift 2
-  local -a g_args=("$@")
-
-  if [[ "$use_tee_flag" == "true" ]]; then
-    "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$CLI_CMD" "${g_args[@]}" "$prompt" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
-  else
-    "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$CLI_CMD" "${g_args[@]}" "$prompt" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
-  fi
-  GEMINI_RUN_PID=$!
-}
-
-gemini_with_retry() {
-  local use_tee_flag="$1"
-  local prompt="$2"
-  shift 2
-  local -a g_args=("$@")
-
-  local max_retries=3
-  local attempt=0
-  local delay=2
-  local exit_code_local=0
-
-  while (( attempt < max_retries )); do
-    exit_code_local=0
-    local pid
-    _gemini_run_once "$use_tee_flag" "$prompt" "${g_args[@]}"
-    pid="${GEMINI_RUN_PID:-}"
-    if [[ -z "$pid" ]]; then
-      echo "[tfx-route] Gemini: worker pid 획득 실패" >&2
-      return 1
-    fi
-
-    local health_ok=true
-    local intervals=(1 2 3 5 8)
-    for wait_sec in "${intervals[@]}"; do
-      sleep "$wait_sec"
-      if [[ -s "$STDOUT_LOG" ]] || [[ -s "$STDERR_LOG" ]]; then
-        break
-      fi
-      if ! kill -0 "$pid" 2>/dev/null; then
-        health_ok=false
-        echo "[tfx-route] Gemini: 출력 없이 프로세스 종료 (${wait_sec}초 체크)" >&2
-        break
-      fi
-    done
-
-    local hb_pid
-    if [[ "$health_ok" == "false" ]]; then
-      wait "$pid" 2>/dev/null
-    else
-      heartbeat_monitor "$pid" &
-      hb_pid=$!
-      wait "$pid" || exit_code_local=$?
-      kill "$hb_pid" 2>/dev/null; wait "$hb_pid" 2>/dev/null
-    fi
-
-    # 성공 시 즉시 반환
-    if [[ $exit_code_local -eq 0 ]]; then
-      return 0
-    fi
-
-    # 429 / rate limit 감지
-    if grep -qiE '429|rate.limit|too many requests' "$STDERR_LOG" 2>/dev/null; then
-      attempt=$(( attempt + 1 ))
-      if (( attempt < max_retries )); then
-        echo "[tfx-route] Gemini 429 감지. ${delay}초 후 재시도 ($attempt/$max_retries)..." >&2
-        kill "$pid" 2>/dev/null
-        wait "$pid" 2>/dev/null
-        sleep "$delay"
-        delay=$(( delay * 2 ))
-        : > "$STDOUT_LOG"
-        : > "$STDERR_LOG"
-        continue
-      else
-        echo "[tfx-route] Gemini 429: ${max_retries}회 재시도 실패" >&2
-      fi
-    fi
-
-    # 비-429 에러 또는 최대 재시도 초과 시 즉시 반환
-    return "$exit_code_local"
-  done
-
-  return "$exit_code_local"
-}
-
-run_legacy_gemini() {
-  local prompt="$1"
-  local use_tee_flag="$2"
-  local -a gemini_args=()
-  read -r -a gemini_args <<< "$CLI_ARGS"
-
-  if [[ ${#GEMINI_ALLOWED_SERVERS[@]} -gt 0 ]]; then
-    local gemini_mcp_filter prompt_index=-1
-    gemini_mcp_filter=$(IFS=,; echo "${GEMINI_ALLOWED_SERVERS[*]}")
-    for i in "${!gemini_args[@]}"; do
-      if [[ "${gemini_args[$i]}" == "--prompt" ]]; then
-        prompt_index="$i"
-        break
-      fi
-    done
-    if [[ "$prompt_index" -ge 0 ]]; then
-      gemini_args=(
-        "${gemini_args[@]:0:$prompt_index}"
-        "--allowed-mcp-server-names" "$gemini_mcp_filter"
-        "${gemini_args[@]:$prompt_index}"
-      )
-      echo "[tfx-route] Gemini MCP 필터: $gemini_mcp_filter" >&2
-    fi
-  fi
-
-  gemini_with_retry "$use_tee_flag" "$prompt" "${gemini_args[@]}"
-}
-
 resolve_codex_mcp_script() {
   if [[ -n "${TFX_CODEX_MCP_SCRIPT:-}" && -f "$TFX_CODEX_MCP_SCRIPT" ]]; then
     printf '%s\n' "$TFX_CODEX_MCP_SCRIPT"
@@ -1547,6 +1460,7 @@ run_codex_exec() {
     "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$CLI_CMD" "${codex_args[@]}" "$prompt" < /dev/null >"$STDOUT_LOG" 2>"$STDERR_LOG" &
   fi
   worker_pid=$!
+  track_worker_pid "$worker_pid"
 
   heartbeat_monitor "$worker_pid" &
   hb_pid=$!
@@ -1641,6 +1555,7 @@ run_codex_mcp() {
     "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$node_bin" "${mcp_args[@]}" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
   fi
   worker_pid=$!
+  track_worker_pid "$worker_pid"
 
   heartbeat_monitor "$worker_pid" &
   hb_pid=$!
@@ -1665,8 +1580,8 @@ run_codex_mcp() {
 
 # ── 메인 실행 ──
 main() {
-  # 종료 시 per-process 에이전트 파일 자동 삭제
-  trap 'deregister_agent' EXIT
+  # 종료 시 per-process 에이전트 파일 + 워커 프로세스 정리
+  trap 'cleanup_workers' EXIT
 
   route_agent "$AGENT_TYPE"
   apply_cli_mode
@@ -1847,11 +1762,13 @@ FALLBACK_EOF
 
     run_stream_worker "gemini" "$FULL_PROMPT" "$use_tee" "${gemini_worker_args[@]}" || exit_code=$?
     if [[ "$exit_code" -ne 0 && "$exit_code" -ne 124 ]]; then
-      echo "[tfx-route] Gemini stream wrapper 실패(exit=${exit_code}). legacy CLI 경로로 fallback합니다." >&2
-      : > "$STDOUT_LOG"
+      echo "[tfx-route] Gemini stream wrapper 실패(exit=${exit_code}). claude-native fallback." >&2
+      cat > "$STDOUT_LOG" <<EOF
+$(emit_claude_native_metadata)
+EOF
       : > "$STDERR_LOG"
       exit_code=0
-      run_legacy_gemini "$FULL_PROMPT" "$use_tee" || exit_code=$?
+      CLI_TYPE="claude-native"
     fi
 
   elif [[ "$CLI_TYPE" == "claude" ]]; then

package/scripts/tmp-cleanup.mjs

@@ -4,9 +4,9 @@
  * 7일 이상 된 파일을 삭제한다.
  * SessionStart 훅 또는 독립 실행으로 사용.
  */
-import { existsSync, readdirSync, statSync, rmSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { existsSync, readdirSync, rmSync, statSync } from "node:fs";
 import { tmpdir } from "node:os";
+import { join, resolve } from "node:path";
 
 const MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000; // 7일
 const TRIFLUX_CLI_MAX_AGE_MS = 24 * 60 * 60 * 1000; // 1일
@@ -50,7 +50,11 @@ export async function cleanupTmpFiles({ protectPaths = [] } = {}) {
 
   // 1) tmpdir() 직하위의 관리 대상 항목 정리
   let topEntries;
-  try { topEntries = readdirSync(tmp); } catch { topEntries = []; }
+  try {
+    topEntries = readdirSync(tmp);
+  } catch {
+    topEntries = [];
+  }
 
   for (const entry of topEntries) {
     const rule = TOP_LEVEL_RULES.find(({ prefix }) => entry.startsWith(prefix));
@@ -66,14 +70,20 @@ export async function cleanupTmpFiles({ protectPaths = [] } = {}) {
         rmSync(full, { recursive: true, force: true });
         cleaned++;
       }
-    } catch { /* 권한 에러 등 무시 */ }
+    } catch {
+      /* 권한 에러 등 무시 */
+    }
   }
 
   // 2) tfx-headless/ 내 오래된 결과 파일 정리 (디렉터리 자체는 유지)
   const headlessDir = join(tmp, "tfx-headless");
   if (existsSync(headlessDir)) {
     let entries;
-    try { entries = readdirSync(headlessDir); } catch { entries = []; }
+    try {
+      entries = readdirSync(headlessDir);
+    } catch {
+      entries = [];
+    }
 
     for (const entry of entries) {
       if (SKIP_FILES.has(entry)) continue;
@@ -84,7 +94,9 @@ export async function cleanupTmpFiles({ protectPaths = [] } = {}) {
           rmSync(full, { recursive: true, force: true });
           cleaned++;
         }
-      } catch { /* 권한 에러 등 무시 */ }
+      } catch {
+        /* 권한 에러 등 무시 */
+      }
     }
   }
 
@@ -97,7 +109,9 @@ if (process.argv[1]) {
   if (fileURLToPath(import.meta.url) === process.argv[1]) {
     const cleaned = await cleanupTmpFiles();
     if (cleaned > 0) {
-      process.stdout.write(JSON.stringify({ message: `tfx-cleanup: ${cleaned} files removed` }));
+      process.stdout.write(
+        JSON.stringify({ message: `tfx-cleanup: ${cleaned} files removed` }),
+      );
     }
   }
 }