triflux 10.17.3 → 10.17.4

package/.claude-plugin/marketplace.json

@@ -9,7 +9,7 @@
     {
       "name": "triflux",
       "description": "Tri-CLI orchestrator for Claude Code. Routes tasks across Claude + Codex + Gemini with consensus intelligence, natural language routing, 42 skills, and cross-model review.",
-      "version": "10.17.3",
+      "version": "10.17.4",
       "author": {
         "name": "tellang"
       },
@@ -30,5 +30,5 @@
       ]
     }
   ],
-  "version": "10.17.3"
+  "version": "10.17.4"
 }

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "10.17.3",
+  "version": "10.17.4",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "author": {
     "name": "tellang"

package/bin/triflux.mjs

@@ -5158,11 +5158,19 @@ function autoRegisterMcp(mcpUrl, { codexEnabled = false } = {}) {
       if (existsSync(settingsFile))
         settings = JSON.parse(readFileSync(settingsFile, "utf8"));
       if (!settings.mcpServers) settings.mcpServers = {};
-      if (!settings.mcpServers["tfx-hub"]) {
-        settings.mcpServers["tfx-hub"] = { url: mcpUrl };
+      const current = settings.mcpServers["tfx-hub"];
+      if (!current || current.url !== mcpUrl) {
+        settings.mcpServers["tfx-hub"] = {
+          ...(current && typeof current === "object" ? current : {}),
+          url: mcpUrl,
+        };
         if (!existsSync(geminiDir)) mkdirSync(geminiDir, { recursive: true });
         writeFileSync(settingsFile, JSON.stringify(settings, null, 2) + "\n");
-        ok("Gemini: settings.json에 등록 완료");
+        ok(
+          current
+            ? "Gemini: settings.json URL 갱신 완료"
+            : "Gemini: settings.json에 등록 완료",
+        );
       } else {
         ok("Gemini: 이미 등록됨");
       }
@@ -5182,10 +5190,19 @@ function autoRegisterMcp(mcpUrl, { codexEnabled = false } = {}) {
     if (existsSync(mcpJsonPath))
       mcpJson = JSON.parse(readFileSync(mcpJsonPath, "utf8"));
     if (!mcpJson.mcpServers) mcpJson.mcpServers = {};
-    if (!mcpJson.mcpServers["tfx-hub"]) {
-      mcpJson.mcpServers["tfx-hub"] = { type: "url", url: mcpUrl };
+    const current = mcpJson.mcpServers["tfx-hub"];
+    if (!current || current.type !== "http" || current.url !== mcpUrl) {
+      mcpJson.mcpServers["tfx-hub"] = {
+        ...(current && typeof current === "object" ? current : {}),
+        type: "http",
+        url: mcpUrl,
+      };
       writeFileSync(mcpJsonPath, JSON.stringify(mcpJson, null, 2) + "\n");
-      ok("Claude: .claude/mcp.json에 등록 완료");
+      ok(
+        current
+          ? "Claude: .claude/mcp.json URL/type 갱신 완료"
+          : "Claude: .claude/mcp.json에 등록 완료",
+      );
     } else {
       ok("Claude: 이미 등록됨");
     }
@@ -5253,11 +5270,25 @@ async function cmdHub(args = [], options = {}) {
         try {
           const info = JSON.parse(readFileSync(HUB_PID_FILE, "utf8"));
           process.kill(info.pid, 0); // 프로세스 존재 확인
-          autoRegisterMcp(info.url, { codexEnabled: true });
-          console.log(
-            `\n  ${YELLOW}⚠${RESET} hub 이미 실행 중 (PID ${info.pid}, ${info.url})\n`,
+          const host =
+            typeof info.host === "string" && info.host.trim()
+              ? info.host.trim()
+              : "127.0.0.1";
+          const port = Number(info.port) || probePort;
+          const probed = await probeHubStatus(host, port, 1500);
+          if (probed?.hub) {
+            const url = `http://${formatHostForUrl(host)}:${probed.port || port}/mcp`;
+            recoverPidFile(probed, host);
+            autoRegisterMcp(url, { codexEnabled: true });
+            console.log(
+              `\n  ${YELLOW}⚠${RESET} hub 이미 실행 중 (PID ${probed.pid || info.pid}, ${url})\n`,
+            );
+            return;
+          }
+          warn(
+            `stale hub PID 파일 감지: PID ${info.pid}는 살아있지만 hub status 응답이 없음. PID 파일을 정리합니다.`,
           );
-          return;
+          unlinkSync(HUB_PID_FILE);
         } catch {
           // PID 파일 있지만 프로세스 없음 — 정리
           try {
@@ -5267,7 +5298,7 @@ async function cmdHub(args = [], options = {}) {
       }
 
       const portArg = args.indexOf("--port");
-      const port = portArg !== -1 ? args[portArg + 1] : "27888";
+      const port = portArg !== -1 ? args[portArg + 1] : String(probePort);
       const serverPath = join(PKG_ROOT, "hub", "server.mjs");
 
       if (!existsSync(serverPath)) {

package/config/mcp-registry.json

@@ -23,6 +23,7 @@
       "~/.codex/config.toml",
       "~/.claude/settings.json",
       "~/.claude/settings.local.json",
+      ".claude/mcp.json",
       ".mcp.json"
     ]
   }

package/hub/bridge.mjs

@@ -31,6 +31,17 @@ const HUB_PID_FILE = join(homedir(), ".claude", "cache", "tfx-hub", "hub.pid");
 const HUB_TOKEN_FILE = join(homedir(), ".claude", ".tfx-hub-token");
 const PROJECT_ROOT = fileURLToPath(new URL("..", import.meta.url));
 const HUB_DEFAULT_PORT = 27888;
+const LOOPBACK_HOSTS = new Set(["127.0.0.1", "localhost", "::1"]);
+
+function formatHostForUrl(host) {
+  return host.includes(":") ? `[${host}]` : host;
+}
+
+function normalizeLoopbackHost(host) {
+  if (typeof host !== "string") return "127.0.0.1";
+  const candidate = host.trim();
+  return LOOPBACK_HOSTS.has(candidate) ? candidate : "127.0.0.1";
+}
 
 function normalizeToken(raw) {
   if (raw == null) return null;
@@ -53,22 +64,21 @@ export function getHubUrl() {
   if (process.env.TFX_HUB_URL)
     return process.env.TFX_HUB_URL.replace(/\/mcp$/, "");
 
+  const envPort = Number.parseInt(String(process.env.TFX_HUB_PORT ?? ""), 10);
+  const port =
+    Number.isFinite(envPort) && envPort > 0 ? envPort : HUB_DEFAULT_PORT;
+  let host = "127.0.0.1";
+
   if (existsSync(HUB_PID_FILE)) {
     try {
       const info = JSON.parse(readFileSync(HUB_PID_FILE, "utf8"));
-      const pidPort = Number.parseInt(String(info?.port ?? ""), 10);
-      const port =
-        Number.isFinite(pidPort) && pidPort > 0 ? pidPort : HUB_DEFAULT_PORT;
-      return `http://${info.host || "127.0.0.1"}:${port}`;
+      host = normalizeLoopbackHost(info?.host);
     } catch {
       // 무시
     }
   }
 
-  const envPort = Number.parseInt(String(process.env.TFX_HUB_PORT ?? ""), 10);
-  const port =
-    Number.isFinite(envPort) && envPort > 0 ? envPort : HUB_DEFAULT_PORT;
-  return `http://127.0.0.1:${port}`;
+  return `http://${formatHostForUrl(host)}:${port}`;
 }
 
 export function getHubPipePath() {

package/hub/lib/process-utils.mjs

@@ -30,7 +30,11 @@ const LEGACY_ORPHAN_KILLABLE_NAMES = new Set([
   "cmd.exe",
   "uvx.exe",
 ]);
-const LIVE_CLI_SESSION_ROOT_NAMES = new Set(["codex.exe", "claude.exe"]);
+const LIVE_CLI_SESSION_ROOT_NAMES = new Set([
+  "codex.exe",
+  "claude.exe",
+  "gemini.exe",
+]);
 
 /**
  * 주어진 PID의 프로세스가 살아있는지 확인한다.
@@ -179,7 +183,7 @@ function ensureHelperScripts() {
       SCAN_SCRIPT_PATH,
       [
         "$ErrorActionPreference = 'SilentlyContinue'",
-        "Get-CimInstance Win32_Process -Filter \"Name='node.exe' OR Name='bash.exe' OR Name='cmd.exe' OR Name='codex.exe' OR Name='claude.exe' OR Name='pwsh.exe' OR Name='uvx.exe'\" | ForEach-Object {",
+        "Get-CimInstance Win32_Process -Filter \"Name='node.exe' OR Name='bash.exe' OR Name='cmd.exe' OR Name='codex.exe' OR Name='claude.exe' OR Name='gemini.exe' OR Name='pwsh.exe' OR Name='uvx.exe'\" | ForEach-Object {",
         '    Write-Output "$($_.ProcessId),$($_.ParentProcessId),$($_.Name)"',
         "}",
       ].join("\n"),
@@ -1014,7 +1018,7 @@ function cleanupOrphansUnix() {
       if (
         Number.isFinite(pid) &&
         pid > 0 &&
-        /^(node|bash|sh|python|codex|claude|uvx)/.test(name)
+        /^(node|bash|sh|python|codex|claude|gemini|uvx)/.test(name)
       ) {
         procMap.set(pid, { ppid, name });
       }
@@ -1022,7 +1026,7 @@ function cleanupOrphansUnix() {
   } catch {}
 
   // kill 대상: node, python, codex, claude, uvx — bash/sh는 사용자 인터랙티브 쉘 가능성
-  const killableUnix = /^(node|python|codex|claude|uvx)/;
+  const killableUnix = /^(node|python|codex|claude|gemini|uvx)/;
 
   // 고아 판정 + SIGKILL 에스컬레이션
   const orphanPids = [];
@@ -1030,6 +1034,7 @@ function cleanupOrphansUnix() {
     if (protectedPids.has(pid)) continue;
     if (!killableUnix.test(info.name)) continue;
     if (hasLiveAncestorChain(pid, procMap, protectedPids)) continue;
+    if (hasLiveCliDescendant(pid, procMap)) continue;
     orphanPids.push(pid);
   }
 

package/hub/server.mjs

@@ -778,7 +778,6 @@ export async function startHub({
   const port = portSpecified
     ? resolvedPort
     : resolveHubPort(process.env, {
-        preferLivePid: true,
         detectPeer: () => livePeer,
       });
 

package/hub/team/cli/services/hub-client.mjs

@@ -66,15 +66,15 @@ export async function getHubInfo() {
       if (!Number.isFinite(pid) || pid <= 0) throw new Error("invalid pid");
       process.kill(pid, 0);
       const host = normalizeLoopbackHost(raw?.host);
-      const port = Number(raw?.port) || 27888;
+      const port = Number(raw?.port) || probePort;
       const status = await probeHubStatus(host, port, 1200);
+      if (!status) throw new Error("pid file process is not a healthy hub");
       return {
         ...raw,
         pid,
         host,
         port,
         url: `${buildHubBaseUrl(host, port)}/mcp`,
-        ...(status ? {} : { degraded: true }),
       };
     } catch {
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "10.17.3",
+  "version": "10.17.4",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "type": "module",
   "bin": {

package/scripts/__tests__/mcp-guard-engine.test.mjs

@@ -54,10 +54,10 @@ describe("mcp guard engine", () => {
     const registry = loadRegistry();
     assert.equal(registry.version, 1);
     assert.equal(registry.servers["tfx-hub"].url, "http://127.0.0.1:27888/mcp");
-    assert.equal(registry.policies.watched_paths.length, 5);
+    assert.equal(registry.policies.watched_paths.length, 6);
   });
 
-  it("matches watched paths for Gemini and local .mcp.json", () => {
+  it("matches watched paths for Gemini, Claude project MCP, and local .mcp.json", () => {
     const homeDir = createHomeDir();
     withHome(homeDir);
 
@@ -69,6 +69,10 @@ describe("mcp guard engine", () => {
       isWatchedPath(join(PROJECT_ROOT, "nested", ".mcp.json")),
       true,
     );
+    assert.equal(
+      isWatchedPath(join(PROJECT_ROOT, "nested", ".claude", "mcp.json")),
+      true,
+    );
     assert.equal(
       isWatchedPath(join(PROJECT_ROOT, "nested", "settings.yaml")),
       false,
@@ -101,6 +105,42 @@ describe("mcp guard engine", () => {
     );
   });
 
+  it("treats .claude/mcp.json as a Claude project MCP config", () => {
+    const homeDir = createHomeDir();
+    withHome(homeDir);
+
+    const projectMcpPath = join(homeDir, "repo", ".claude", "mcp.json");
+    mkdirSync(dirname(projectMcpPath), { recursive: true });
+    writeFileSync(
+      projectMcpPath,
+      JSON.stringify(
+        {
+          mcpServers: {
+            "unsafe-stdio": { command: "node", args: ["server.js"] },
+          },
+        },
+        null,
+        2,
+      ),
+    );
+
+    const found = scanForStdioServers(projectMcpPath);
+    assert.deepEqual(
+      found.map((server) => server.name),
+      ["unsafe-stdio"],
+    );
+
+    const result = remediate(projectMcpPath, found, {
+      stdio_action: "replace-with-hub",
+    });
+    const updated = JSON.parse(readFileSync(projectMcpPath, "utf8"));
+
+    assert.equal(result.modified, true);
+    assert.equal(updated.mcpServers["tfx-hub"].type, "http");
+    assert.equal(updated.mcpServers["tfx-hub"].url, resolveHubUrl());
+    assert.equal(Object.hasOwn(updated.mcpServers, "unsafe-stdio"), false);
+  });
+
   it("replaces stdio MCP entries with tfx-hub and writes a backup (TFX_HUB_PORT env overrides)", () => {
     const homeDir = createHomeDir();
     withHome(homeDir);

package/scripts/config-audit.mjs

@@ -155,6 +155,7 @@ function auditMcp() {
   const mcpPaths = [
     join(CLAUDE_DIR, "mcp_servers.json"),
     join(CLAUDE_DIR, ".mcp.json"),
+    join(process.cwd(), ".claude", "mcp.json"),
     join(process.cwd(), ".mcp.json"),
   ];
 

package/scripts/hub-watchdog.mjs

@@ -1,15 +1,19 @@
 #!/usr/bin/env node
 // scripts/hub-watchdog.mjs — Hub 상시 감시 + 자동 재시작
 //
-// 10초마다 27888/status 체크. 응답 없으면 `tfx hub start` 실행.
+// 10초마다 Hub /status 체크. 응답 없으면 `tfx hub start` 실행.
 // 실행: node scripts/hub-watchdog.mjs &
 // 중지: kill $(pgrep -f hub-watchdog.mjs)  (또는 별도 pid 파일)
 
 import { spawn } from "node:child_process";
-import { existsSync, unlinkSync, writeFileSync } from "node:fs";
+import { appendFileSync, existsSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
-const HUB_URL = "http://127.0.0.1:27888/status";
+const HUB_DEFAULT_PORT = 27888;
+const envPort = Number.parseInt(String(process.env.TFX_HUB_PORT ?? ""), 10);
+const HUB_PORT =
+  Number.isFinite(envPort) && envPort > 0 ? envPort : HUB_DEFAULT_PORT;
+const HUB_URL = `http://127.0.0.1:${HUB_PORT}/status`;
 const POLL_MS = 10_000;
 const START_GRACE_MS = 5_000;
 const LOG_PREFIX = "[hub-watchdog]";
@@ -24,8 +28,7 @@ function log(msg) {
     process.stdout.write(line);
   } catch {}
   try {
-    const fs = require("node:fs");
-    fs.appendFileSync(LOG_FILE, line);
+    appendFileSync(LOG_FILE, line);
   } catch {}
 }
 
@@ -44,6 +47,7 @@ function startHub() {
   log("Hub 기동: tfx hub start");
   const proc = spawn("tfx", ["hub", "start"], {
     cwd: process.cwd(),
+    env: { ...process.env, TFX_HUB_PORT: String(HUB_PORT) },
     stdio: "ignore",
     detached: true,
     shell: true,
@@ -81,6 +85,6 @@ try {
   writeFileSync(PID_FILE, String(process.pid));
 } catch {}
 
-log(`watchdog 시작 (pid=${process.pid}, poll=${POLL_MS}ms)`);
+log(`watchdog 시작 (pid=${process.pid}, port=${HUB_PORT}, poll=${POLL_MS}ms)`);
 ensure();
 setInterval(ensure, POLL_MS);

package/scripts/lib/env-probe.mjs

@@ -6,6 +6,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { whichCommand, whichCommandAsync } from "../../hub/platform.mjs";
 
+const HUB_DEFAULT_PORT = 27888;
 const DEFAULT_STATUS_URL = "http://127.0.0.1:27888/status";
 const _sab = new Int32Array(new SharedArrayBuffer(4));
 const CLI_PROBE_CACHE = new Map();
@@ -20,7 +21,7 @@ function sleepSync(ms) {
 
 function fetchHubStatus({
   execSyncFn = execSync,
-  statusUrl = DEFAULT_STATUS_URL,
+  statusUrl = resolveDefaultStatusUrl(),
   timeout = 3000,
 } = {}) {
   const response = execSyncFn(`curl -sf ${statusUrl}`, {
@@ -36,6 +37,13 @@ function fetchHubStatus({
   };
 }
 
+export function resolveDefaultStatusUrl(env = process.env) {
+  const envPort = Number.parseInt(String(env?.TFX_HUB_PORT ?? ""), 10);
+  const port =
+    Number.isFinite(envPort) && envPort > 0 ? envPort : HUB_DEFAULT_PORT;
+  return `http://127.0.0.1:${port}/status`;
+}
+
 function normalizeCliName(name) {
   return String(name ?? "").trim() || null;
 }
@@ -205,7 +213,7 @@ export function detectCodexPlan(options = {}) {
 
 export function checkHub({
   pkgRoot = DEFAULT_PKG_ROOT,
-  statusUrl = DEFAULT_STATUS_URL,
+  statusUrl = resolveDefaultStatusUrl(),
   restart = true,
   requestTimeoutMs = 3000,
   pollAttempts = 8,
@@ -231,6 +239,7 @@ export function checkHub({
 
   try {
     const child = spawnFn(process.execPath, [serverPath], {
+      env: { ...process.env, TFX_HUB_PORT: String(new URL(statusUrl).port) },
       detached: true,
       stdio: "ignore",
       windowsHide: true,

package/scripts/lib/mcp-guard-engine.mjs

@@ -38,6 +38,7 @@ const DEFAULT_REGISTRY = Object.freeze({
       "~/.codex/config.toml",
       "~/.claude/settings.json",
       "~/.claude/settings.local.json",
+      ".claude/mcp.json",
       ".mcp.json",
     ],
   },
@@ -69,6 +70,10 @@ function pathBasename(filePath) {
   return basename(filePath.replace(/\\/g, "/")).toLowerCase();
 }
 
+function isClaudeProjectMcpConfig(filePath) {
+  return normalizeForMatch(filePath).endsWith("/.claude/mcp.json");
+}
+
 function readJsonFile(filePath) {
   return JSON.parse(readFileSync(filePath, "utf8"));
 }
@@ -89,7 +94,8 @@ function isJsonMcpConfig(filePath) {
   return (
     name === "settings.json" ||
     name === "settings.local.json" ||
-    name === ".mcp.json"
+    name === ".mcp.json" ||
+    isClaudeProjectMcpConfig(filePath)
   );
 }
 
@@ -116,6 +122,7 @@ function detectClient(filePath) {
   if (
     normalized.endsWith("/.claude/settings.json") ||
     normalized.endsWith("/.claude/settings.local.json") ||
+    normalized.endsWith("/.claude/mcp.json") ||
     normalized.endsWith("/.mcp.json")
   ) {
     return "claude";
@@ -130,6 +137,7 @@ function detectLabel(filePath) {
   if (normalized.endsWith("/.claude/settings.json")) return "Claude User";
   if (normalized.endsWith("/.claude/settings.local.json"))
     return "Claude Local";
+  if (normalized.endsWith("/.claude/mcp.json")) return "Claude Project MCP";
   if (normalized.endsWith("/.mcp.json")) return "Project MCP";
   return basename(filePath);
 }
@@ -139,6 +147,7 @@ function isPrimaryConfigTarget(filePath) {
   return (
     normalized.endsWith("/.gemini/settings.json") ||
     normalized.endsWith("/.codex/config.toml") ||
+    normalized.endsWith("/.claude/mcp.json") ||
     normalized.endsWith("/.mcp.json")
   );
 }
@@ -280,8 +289,8 @@ function buildDesiredServerRecord(name, serverConfig, filePath) {
       : normalizeUrl(serverConfig?.url || "");
   const basenameValue = pathBasename(filePath);
 
-  if (basenameValue === ".mcp.json") {
-    return { name, config: { type: "url", url } };
+  if (basenameValue === ".mcp.json" || isClaudeProjectMcpConfig(filePath)) {
+    return { name, config: { type: "http", url } };
   }
 
   if (isCodexConfig(filePath)) {

package/scripts/mcp-check.mjs

@@ -137,8 +137,12 @@ function walkUpForMcpJson(startDir, maxDepth = 5) {
   const found = [];
   let dir = resolve(startDir);
   for (let i = 0; i < maxDepth; i += 1) {
-    const candidate = join(dir, ".mcp.json");
-    if (existsSync(candidate)) found.push(candidate);
+    for (const candidate of [
+      join(dir, ".claude", "mcp.json"),
+      join(dir, ".mcp.json"),
+    ]) {
+      if (existsSync(candidate)) found.push(candidate);
+    }
     const parent = dirname(dir);
     if (parent === dir) break;
     dir = parent;

package/scripts/session-stale-cleanup.mjs

@@ -26,7 +26,11 @@ import { isProcessAlive } from "./lib/process-utils.mjs";
 const MULTI_STATE_FILE = join(tmpdir(), "tfx-multi-state.json");
 const EXPIRE_MS = 30 * 60 * 1000; // 30분
 const PID_FILE_RE = /^tfx-route-(\d+)-pids$/;
-const PROTECTED_ANCESTOR_NAMES = new Set(["claude.exe", "codex.exe"]);
+const PROTECTED_ANCESTOR_NAMES = new Set([
+  "claude.exe",
+  "codex.exe",
+  "gemini.exe",
+]);
 const PID_REUSE_GRACE_MS = 1000;
 
 function normalizeName(name) {