triflux 8.12.2 → 9.0.0

package/scripts/lib/mcp-manifest.mjs

@@ -0,0 +1,79 @@
+// scripts/lib/mcp-manifest.mjs
+// MCP 서버 활성화 매니페스트 — 단일 진실 소스.
+// tfx-setup 위저드가 저장하고, gateway/filter가 참조한다.
+
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { homedir } from 'node:os';
+
+export const MANIFEST_PATH = join(homedir(), '.claude', 'cache', 'mcp-enabled.json');
+
+/** API 키 불필요 — 항상 활성화 */
+export const CORE_SERVERS = Object.freeze(['context7', 'serena']);
+
+/** 검색 MCP — API 키 필요 */
+export const SEARCH_SERVERS = Object.freeze([
+  { name: 'brave-search', envVars: ['BRAVE_API_KEY'] },
+  { name: 'exa',          envVars: ['EXA_API_KEY'] },
+  { name: 'tavily',       envVars: ['TAVILY_API_KEY'] },
+]);
+
+/** 통합 MCP — API 키 + 추가 설정 필요 */
+export const INTEGRATION_SERVERS = Object.freeze([
+  { name: 'jira',         envVars: ['JIRA_API_TOKEN', 'JIRA_EMAIL', 'JIRA_INSTANCE_URL'] },
+  { name: 'notion',       envVars: ['NOTION_TOKEN'] },
+  { name: 'notion-guest', envVars: ['NOTION_TOKEN'] },
+]);
+
+export function readManifest() {
+  if (!existsSync(MANIFEST_PATH)) return null;
+  try {
+    return JSON.parse(readFileSync(MANIFEST_PATH, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+export function writeManifest(enabledServers) {
+  const dir = dirname(MANIFEST_PATH);
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+  const manifest = {
+    version: 1,
+    updatedAt: new Date().toISOString(),
+    enabled: [...new Set([...CORE_SERVERS, ...enabledServers])],
+  };
+  writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2));
+  return manifest;
+}
+
+/**
+ * 매니페스트 기준으로 활성 서버만 필터링.
+ * @param {Array<string|{name:string}>} allServers — 전체 서버 목록
+ * @returns {Array} 활성 서버 목록. 매니페스트 미존재 시 null (레거시 모드).
+ */
+export function filterByManifest(allServers) {
+  const manifest = readManifest();
+  if (!manifest) return null;
+  const enabled = new Set(manifest.enabled || []);
+  for (const core of CORE_SERVERS) enabled.add(core);
+  return allServers.filter((s) => enabled.has(typeof s === 'string' ? s : s.name));
+}
+
+/**
+ * 단일 서버 활성화 여부 확인.
+ * 매니페스트 미존재 시 true (레거시 호환).
+ */
+export function isServerEnabled(serverName) {
+  const manifest = readManifest();
+  if (!manifest) return true;
+  if (CORE_SERVERS.includes(serverName)) return true;
+  return (manifest.enabled || []).includes(serverName);
+}
+
+/** 특정 서버에 필요한 환경변수 중 누락된 것 반환 */
+export function getMissingEnvVars(serverName) {
+  const all = [...SEARCH_SERVERS, ...INTEGRATION_SERVERS];
+  const entry = all.find((s) => s.name === serverName);
+  if (!entry) return [];
+  return entry.envVars.filter((k) => !process.env[k]);
+}

package/scripts/mcp-gateway-config.mjs

@@ -4,6 +4,12 @@
 //        node mcp-gateway-config.mjs --disable  # SSE → stdio (복원)
 
 import { execSync } from 'node:child_process';
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join, dirname } from 'node:path';
+import { isServerEnabled } from './lib/mcp-manifest.mjs';
+
+const BACKUP_FILE = join(homedir(), '.claude', 'cache', 'mcp-pre-gateway.json');
 
 export const GATEWAY_SERVERS = [
   { name: 'context7',     port: 8100, stdioCmd: 'cmd /c npx -y @upstash/context7-mcp@latest' },
@@ -35,18 +41,70 @@ function run(cmd) {
 }
 
 function removeMcp(name) {
-  // 여러 scope에서 제거 시도 (user → local)
   run(`claude mcp remove "${name}" -s user`);
   run(`claude mcp remove "${name}" -s local`);
 }
 
+// ── 스냅샷: enable 전 기존 MCP 설정 백업 ──
+
+function captureCurrentMcpState() {
+  const servers = {};
+  for (const { name } of GATEWAY_SERVERS) {
+    if (SKIP_SERVERS.has(name)) continue;
+    // claude mcp get으로 현재 등록 상태 확인
+    try {
+      const out = execSync(`claude mcp get "${name}" -s user`, {
+        stdio: 'pipe', encoding: 'utf8', timeout: 5000, env: EXEC_ENV,
+      }).trim();
+      servers[name] = { scope: 'user', raw: out };
+    } catch {
+      // user에 없으면 local 확인
+      try {
+        const out = execSync(`claude mcp get "${name}" -s local`, {
+          stdio: 'pipe', encoding: 'utf8', timeout: 5000, env: EXEC_ENV,
+        }).trim();
+        servers[name] = { scope: 'local', raw: out };
+      } catch {
+        servers[name] = null; // 기존에 없었음
+      }
+    }
+  }
+  return servers;
+}
+
+function saveBackup(servers) {
+  const dir = dirname(BACKUP_FILE);
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+  const backup = { captured_at: new Date().toISOString(), servers };
+  writeFileSync(BACKUP_FILE, JSON.stringify(backup, null, 2));
+  console.log(`  [BACKUP] ${BACKUP_FILE}`);
+}
+
+function loadBackup() {
+  if (!existsSync(BACKUP_FILE)) return null;
+  try {
+    return JSON.parse(readFileSync(BACKUP_FILE, 'utf8'));
+  } catch { return null; }
+}
+
+// ── enable: 스냅샷 → remove → SSE add (실패 시 rollback) ──
+
 function enableSse() {
   console.log('Switching MCP servers to SSE mode...\n');
+
+  // 1) 현재 상태 스냅샷
+  const snapshot = captureCurrentMcpState();
+  saveBackup(snapshot);
+
   let ok = 0;
   let fail = 0;
 
   for (const { name, port } of GATEWAY_SERVERS) {
     if (SKIP_SERVERS.has(name)) continue;
+    if (!isServerEnabled(name)) {
+      console.log(`  [SKIP] ${name} — manifest에서 비활성`);
+      continue;
+    }
 
     removeMcp(name);
     const url = `http://localhost:${port}/sse`;
@@ -56,7 +114,15 @@ function enableSse() {
       console.log(`  [SSE] ${name} → ${url}`);
       ok++;
     } else {
-      console.error(`  [FAIL] ${name}`);
+      // add 실패 → 원본 복원 시도
+      console.error(`  [FAIL] ${name} — rollback 시도`);
+      const orig = snapshot[name];
+      if (orig) {
+        // H1 fix: orig.raw를 shell-escape하여 injection 방지
+      const safeRaw = (orig.raw || '').replace(/[;`$(){}|&<>]/g, '');
+      const restored = safeRaw ? run(`claude mcp add "${name}" -s ${orig.scope} -- ${safeRaw}`) : false;
+        console.error(`  [ROLLBACK] ${name}: ${restored ? 'ok' : 'FAIL'}`);
+      }
       fail++;
     }
   }
@@ -64,27 +130,58 @@ function enableSse() {
   console.log(`\nDone: ${ok} switched, ${fail} failed`);
 }
 
+// ── disable: 백업에서 서버별 원복 ──
+
 function disableSse() {
-  console.log('Restoring MCP servers to stdio mode...\n');
+  console.log('Restoring MCP servers from backup...\n');
+  const backup = loadBackup();
+
+  // C1 fix: 백업 없으면 전체 삭제 방지
+  if (!backup) {
+    console.error('No backup found — cannot restore. Run --enable first to create a backup.');
+    process.exit(1);
+  }
+
   let ok = 0;
   let fail = 0;
 
   for (const { name, stdioCmd } of GATEWAY_SERVERS) {
     if (SKIP_SERVERS.has(name)) continue;
 
+    const orig = backup.servers?.[name];
+
+    if (orig === null || orig === undefined) {
+      // 기존에 없었던 서버 → triflux가 추가한 것 → remove만
+      removeMcp(name);
+      console.log(`  [REMOVE] ${name} — triflux가 추가한 서버, 원본 없음`);
+      ok++;
+      continue;
+    }
+
+    // H2 fix: 백업의 scope/raw를 사용하여 원본 복원, fallback으로 stdioCmd
     removeMcp(name);
-    const success = run(`claude mcp add "${name}" -s user -- ${stdioCmd}`);
+    const restoreScope = orig.scope || 'user';
+    const restoreCmd = orig.raw && orig.raw.trim() ? orig.raw.trim() : stdioCmd;
+    const success = run(`claude mcp add "${name}" -s ${restoreScope} -- ${restoreCmd}`);
 
     if (success) {
-      console.log(`  [stdio] ${name} → ${stdioCmd}`);
+      console.log(`  [RESTORE] ${name} → scope=${restoreScope}`);
       ok++;
     } else {
-      console.error(`  [FAIL] ${name}`);
-      fail++;
+      // fallback: stdioCmd로 재시도
+      const fallback = run(`claude mcp add "${name}" -s user -- ${stdioCmd}`);
+      if (fallback) {
+        console.log(`  [FALLBACK] ${name} → stdio (원본 복원 실패, 기본값 사용)`);
+        ok++;
+      } else {
+        console.error(`  [FAIL] ${name}`);
+        fail++;
+      }
     }
   }
 
   console.log(`\nDone: ${ok} restored, ${fail} failed`);
+  console.log(`Backup preserved at: ${BACKUP_FILE}`);
 }
 
 function printUsage() {

package/scripts/mcp-gateway-start.mjs

@@ -9,6 +9,7 @@ import { existsSync, readFileSync, writeFileSync, unlinkSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 import { createConnection } from 'node:net';
+import { isServerEnabled } from './lib/mcp-manifest.mjs';
 
 const PID_FILE = join(tmpdir(), 'tfx-gateway-pids.json');
 const STARTUP_WAIT_MS = 8000;
@@ -103,6 +104,12 @@ async function startAll() {
       continue;
     }
 
+    // 매니페스트 체크 (위저드에서 비활성화한 서버)
+    if (!isServerEnabled(srv.name)) {
+      console.log(`[SKIP] ${srv.name} — manifest에서 비활성`);
+      continue;
+    }
+
     // 필수 환경변수 체크
     const missing = srv.envVars.filter((k) => !process.env[k]);
     if (missing.length > 0) {

package/scripts/mcp-gateway-verify.mjs

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 // mcp-gateway-verify.mjs — supergateway SSE 엔드포인트 헬스체크
 
-const ENDPOINTS = [
+import { readManifest } from './lib/mcp-manifest.mjs';
+
+const ALL_ENDPOINTS = [
   { name: 'context7',     port: 8100 },
   { name: 'brave-search', port: 8101 },
   { name: 'exa',          port: 8102 },
@@ -12,6 +14,18 @@ const ENDPOINTS = [
   { name: 'notion-guest', port: 8107 },
 ];
 
+const manifest = readManifest();
+if (!manifest) {
+  console.log('gateway: not configured (no manifest)');
+  process.exit(0);
+}
+const enabled = new Set(manifest.enabled || []);
+const ENDPOINTS = ALL_ENDPOINTS.filter((e) => enabled.has(e.name));
+if (ENDPOINTS.length === 0) {
+  console.log('gateway: no enabled servers');
+  process.exit(0);
+}
+
 async function checkHealth(name, port) {
   const start = Date.now();
   try {

package/scripts/preflight-cache.mjs

@@ -1,137 +1,68 @@
-#!/usr/bin/env node
-// scripts/preflight-cache.mjs — 세션 시작 시 preflight 점검 캐싱
-
-import { writeFileSync, mkdirSync, existsSync, readFileSync } from "node:fs";
-import { join, dirname } from "node:path";
-import { homedir } from "node:os";
-import { execSync, spawn } from "node:child_process";
-import { fileURLToPath } from "node:url";
-
-const __filename = fileURLToPath(import.meta.url);
-const PKG_ROOT = join(dirname(__filename), "..");
-
-// 동기 대기 (Atomics.wait — Node.js main thread에서 사용 가능)
-const _sab = new Int32Array(new SharedArrayBuffer(4));
-function sleepSync(ms) { Atomics.wait(_sab, 0, 0, ms); }
-
-const CACHE_DIR = join(homedir(), ".claude", "cache");
-const CACHE_FILE = join(CACHE_DIR, "tfx-preflight.json");
-const CACHE_TTL_MS = 30_000; // 30초
-
-function checkHub() {
-  // 1차 시도
-  try {
-    const res = execSync("curl -sf http://127.0.0.1:27888/status", { timeout: 3000, encoding: "utf8", windowsHide: true });
-    const data = JSON.parse(res);
-    return { ok: true, state: data?.hub?.state || "unknown", pid: data?.pid };
-  } catch {}
-
-  // Hub 미응답 → 자동 재시작 시도 (bridge.mjs tryRestartHub 동기 버전)
-  const serverPath = join(PKG_ROOT, "hub", "server.mjs");
-  if (!existsSync(serverPath)) return { ok: false, state: "unreachable", restart: "no_server" };
-
-  try {
-    const child = spawn(process.execPath, [serverPath], {
-      detached: true,
-      stdio: "ignore",
-      windowsHide: true,
-    });
-    child.unref();
-  } catch {
-    return { ok: false, state: "unreachable", restart: "spawn_failed" };
-  }
-
-  // 최대 4초 폴링 (500ms × 8)
-  for (let i = 0; i < 8; i++) {
-    sleepSync(500);
-    try {
-      const res = execSync("curl -sf http://127.0.0.1:27888/status", { timeout: 1000, encoding: "utf8", windowsHide: true });
-      const data = JSON.parse(res);
-      if (data?.hub?.state === "healthy") {
-        return { ok: true, state: "healthy", pid: data?.pid, restarted: true };
-      }
-    } catch {}
-  }
-
-  return { ok: false, state: "unreachable", restart: "timeout" };
-}
-
-function checkRoute() {
-  const routePath = join(homedir(), ".claude", "scripts", "tfx-route.sh");
-  return { ok: existsSync(routePath), path: routePath };
-}
-
-function checkCli(name) {
-  try {
-    const path = execSync(`which ${name} 2>/dev/null || where ${name} 2>nul`, { encoding: "utf8", timeout: 2000, windowsHide: true }).trim();
-    return { ok: !!path, path };
-  } catch {
-    return { ok: false };
-  }
-}
-
-/** Codex auth.json의 JWT에서 chatgpt_plan_type 추출 (pro/plus/free) */
-function detectCodexPlan() {
-  try {
-    const authPath = join(homedir(), ".codex", "auth.json");
-    if (!existsSync(authPath)) return { plan: "unknown", source: "no_auth" };
-    const auth = JSON.parse(readFileSync(authPath, "utf8"));
-    if (auth.auth_mode !== "chatgpt") return { plan: "api", source: "api_key" };
-    const token = auth.tokens?.id_token || auth.tokens?.access_token;
-    if (!token) return { plan: "unknown", source: "no_token" };
-    // JWT payload = 2번째 파트, base64url 디코딩
-    const payload = JSON.parse(Buffer.from(token.split(".")[1], "base64url").toString());
-    const plan = payload?.["https://api.openai.com/auth"]?.chatgpt_plan_type || "unknown";
-    return { plan, source: "jwt" };
-  } catch {
-    return { plan: "unknown", source: "error" };
-  }
-}
-
-function runPreflight() {
-  const result = {
-    timestamp: Date.now(),
-    hub: checkHub(),
-    route: checkRoute(),
-    codex: checkCli("codex"),
-    gemini: checkCli("gemini"),
-    codex_plan: detectCodexPlan(),
-    ok: false,
-  };
-  result.ok = result.hub.ok && result.route.ok;
-
-  // CLI 가용성 → available_agents (triage에서 참조)
-  const agents = [];
-  if (result.codex.ok) agents.push("codex");
-  if (result.gemini.ok) agents.push("gemini");
-  agents.push("claude"); // claude는 항상 가용
-  result.available_agents = agents;
-
-  return result;
-}
-
-// 캐시 읽기 (TTL 검증 포함)
-export function readPreflightCache() {
-  try {
-    const data = JSON.parse(readFileSync(CACHE_FILE, "utf8"));
-    if (Date.now() - data.timestamp < CACHE_TTL_MS) return data;
-  } catch {}
-  return null;
-}
-
-// 메인 실행
-if (process.argv[1]?.endsWith("preflight-cache.mjs")) {
-  const result = runPreflight();
-  mkdirSync(CACHE_DIR, { recursive: true });
-  writeFileSync(CACHE_FILE, JSON.stringify(result, null, 2));
-  // 간결 출력 (hook stdout)
-  const summary = result.ok ? "preflight: ok" : "preflight: FAIL";
-  const details = [];
-  if (!result.hub.ok) details.push("hub:" + result.hub.state);
-  else if (result.hub.restarted) details.push("hub:restarted");
-  if (!result.route.ok) details.push("route:missing");
-  if (result.available_agents.length === 1) details.push("agents:claude-only");
-  console.log(details.length ? `${summary} (${details.join(", ")})` : summary);
-}
-
-export { runPreflight, CACHE_FILE, CACHE_TTL_MS };
+#!/usr/bin/env node
+// scripts/preflight-cache.mjs — 세션 시작 시 preflight 점검 캐싱
+
+import { writeFileSync, mkdirSync, existsSync, readFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { homedir } from "node:os";
+import { fileURLToPath } from "node:url";
+import { checkCli, checkHub, detectCodexPlan } from "./lib/env-probe.mjs";
+
+const __filename = fileURLToPath(import.meta.url);
+const PKG_ROOT = join(dirname(__filename), "..");
+
+const CACHE_DIR = join(homedir(), ".claude", "cache");
+const CACHE_FILE = join(CACHE_DIR, "tfx-preflight.json");
+const CACHE_TTL_MS = 30_000; // 30초
+
+function checkRoute() {
+  const routePath = join(homedir(), ".claude", "scripts", "tfx-route.sh");
+  return { ok: existsSync(routePath), path: routePath };
+}
+
+function runPreflight() {
+  const result = {
+    timestamp: Date.now(),
+    hub: checkHub({ pkgRoot: PKG_ROOT }),
+    route: checkRoute(),
+    codex: checkCli("codex"),
+    gemini: checkCli("gemini"),
+    codex_plan: detectCodexPlan(),
+    ok: false,
+  };
+  result.ok = result.hub.ok && result.route.ok;
+
+  // CLI 가용성 → available_agents (triage에서 참조)
+  const agents = [];
+  if (result.codex.ok) agents.push("codex");
+  if (result.gemini.ok) agents.push("gemini");
+  agents.push("claude"); // claude는 항상 가용
+  result.available_agents = agents;
+
+  return result;
+}
+
+// 캐시 읽기 (TTL 검증 포함)
+export function readPreflightCache() {
+  try {
+    const data = JSON.parse(readFileSync(CACHE_FILE, "utf8"));
+    if (Date.now() - data.timestamp < CACHE_TTL_MS) return data;
+  } catch {}
+  return null;
+}
+
+// 메인 실행
+if (process.argv[1]?.endsWith("preflight-cache.mjs")) {
+  const result = runPreflight();
+  mkdirSync(CACHE_DIR, { recursive: true });
+  writeFileSync(CACHE_FILE, JSON.stringify(result, null, 2));
+  // 간결 출력 (hook stdout)
+  const summary = result.ok ? "preflight: ok" : "preflight: FAIL";
+  const details = [];
+  if (!result.hub.ok) details.push("hub:" + result.hub.state);
+  else if (result.hub.restarted) details.push("hub:restarted");
+  if (!result.route.ok) details.push("route:missing");
+  if (result.available_agents.length === 1) details.push("agents:claude-only");
+  console.log(details.length ? `${summary} (${details.join(", ")})` : summary);
+}
+
+export { runPreflight, CACHE_FILE, CACHE_TTL_MS };