triflux 3.1.0-dev.2 → 3.1.0-dev.3

package/hub/bridge.mjs

@@ -0,0 +1,224 @@
+#!/usr/bin/env node
+// hub/bridge.mjs — tfx-route.sh ↔ tfx-hub 브릿지 CLI
+//
+// tfx-route.sh에서 CLI 에이전트 실행 전후로 호출하여
+// Hub에 자동 등록/결과 발행/컨텍스트 수신/해제를 수행한다.
+//
+// 사용법:
+//   node bridge.mjs register  --agent <id> --cli <type> --timeout <sec> [--topics t1,t2]
+//   node bridge.mjs result    --agent <id> --file <path> [--topic task.result] [--trace <id>]
+//   node bridge.mjs context   --agent <id> [--topics t1,t2] [--max 10] [--out <path>]
+//   node bridge.mjs deregister --agent <id>
+//   node bridge.mjs ping
+//
+// Hub 미실행 시 모든 커맨드는 조용히 실패 (exit 0).
+// tfx-route.sh 흐름을 절대 차단하지 않는다.
+
+import { readFileSync, writeFileSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
+
+const HUB_PID_FILE = join(homedir(), '.claude', 'cache', 'tfx-hub', 'hub.pid');
+
+// ── Hub URL 해석 ──
+
+function getHubUrl() {
+  // 환경변수 우선
+  if (process.env.TFX_HUB_URL) return process.env.TFX_HUB_URL.replace(/\/mcp$/, '');
+
+  // PID 파일에서 읽기
+  if (existsSync(HUB_PID_FILE)) {
+    try {
+      const info = JSON.parse(readFileSync(HUB_PID_FILE, 'utf8'));
+      return `http://${info.host || '127.0.0.1'}:${info.port || 27888}`;
+    } catch { /* 무시 */ }
+  }
+
+  // 기본값
+  const port = process.env.TFX_HUB_PORT || '27888';
+  return `http://127.0.0.1:${port}`;
+}
+
+// ── HTTP 요청 ──
+
+async function post(path, body, timeoutMs = 5000) {
+  const url = `${getHubUrl()}${path}`;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+
+  try {
+    const res = await fetch(url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+      signal: controller.signal,
+    });
+    clearTimeout(timer);
+    return await res.json();
+  } catch {
+    clearTimeout(timer);
+    return null; // Hub 미실행 — 조용히 실패
+  }
+}
+
+// ── 인자 파싱 ──
+
+function parseArgs(argv) {
+  const args = {};
+  for (let i = 0; i < argv.length; i++) {
+    if (argv[i].startsWith('--')) {
+      const key = argv[i].slice(2);
+      const next = argv[i + 1];
+      if (!next || next.startsWith('--')) {
+        args[key] = true;
+      } else {
+        args[key] = next;
+        i++;
+      }
+    }
+  }
+  return args;
+}
+
+// ── 커맨드 ──
+
+async function cmdRegister(args) {
+  const agentId = args.agent;
+  const cli = args.cli || 'other';
+  const timeoutSec = parseInt(args.timeout || '600', 10);
+  const topics = args.topics ? args.topics.split(',') : [];
+  const capabilities = args.capabilities ? args.capabilities.split(',') : ['code'];
+
+  const result = await post('/bridge/register', {
+    agent_id: agentId,
+    cli,
+    timeout_sec: timeoutSec,
+    topics,
+    capabilities,
+    metadata: {
+      pid: process.ppid, // 부모 프로세스 (tfx-route.sh)
+      registered_at: Date.now(),
+    },
+  });
+
+  if (result?.ok) {
+    // 에이전트 ID를 stdout으로 출력 (tfx-route.sh에서 캡처)
+    console.log(JSON.stringify({ ok: true, agent_id: agentId, lease_expires_ms: result.data?.lease_expires_ms }));
+  } else {
+    // Hub 미실행 — 조용히 패스
+    console.log(JSON.stringify({ ok: false, reason: 'hub_unavailable' }));
+  }
+}
+
+async function cmdResult(args) {
+  const agentId = args.agent;
+  const filePath = args.file;
+  const topic = args.topic || 'task.result';
+  const traceId = args.trace || undefined;
+  const correlationId = args.correlation || undefined;
+  const exitCode = parseInt(args['exit-code'] || '0', 10);
+
+  // 결과 파일 읽기 (최대 48KB — Hub 메시지 크기 제한)
+  let output = '';
+  if (filePath && existsSync(filePath)) {
+    output = readFileSync(filePath, 'utf8').slice(0, 49152);
+  }
+
+  const result = await post('/bridge/result', {
+    agent_id: agentId,
+    topic,
+    payload: {
+      agent_id: agentId,
+      exit_code: exitCode,
+      output_length: output.length,
+      output_preview: output.slice(0, 4096), // 미리보기 4KB
+      output_full: output, // 전체 (최대 48KB)
+      completed_at: Date.now(),
+    },
+    trace_id: traceId,
+    correlation_id: correlationId,
+  });
+
+  if (result?.ok) {
+    console.log(JSON.stringify({ ok: true, message_id: result.data?.message_id }));
+  } else {
+    console.log(JSON.stringify({ ok: false, reason: 'hub_unavailable' }));
+  }
+}
+
+async function cmdContext(args) {
+  const agentId = args.agent;
+  const topics = args.topics ? args.topics.split(',') : undefined;
+  const maxMessages = parseInt(args.max || '10', 10);
+  const outPath = args.out;
+
+  const result = await post('/bridge/context', {
+    agent_id: agentId,
+    topics,
+    max_messages: maxMessages,
+  });
+
+  if (result?.ok && result.data?.messages?.length) {
+    // 컨텍스트 조합
+    const parts = result.data.messages.map((m, i) => {
+      const from = m.from_agent || 'unknown';
+      const topic = m.topic || 'unknown';
+      const payload = typeof m.payload === 'string' ? m.payload : JSON.stringify(m.payload, null, 2);
+      return `=== Context ${i + 1}: ${from} (${topic}) ===\n${payload}`;
+    });
+    const combined = parts.join('\n\n');
+
+    if (outPath) {
+      writeFileSync(outPath, combined, 'utf8');
+      console.log(JSON.stringify({ ok: true, count: result.data.messages.length, file: outPath }));
+    } else {
+      console.log(combined);
+    }
+  } else {
+    if (outPath) {
+      console.log(JSON.stringify({ ok: true, count: 0 }));
+    }
+    // 메시지 없으면 빈 출력
+  }
+}
+
+async function cmdDeregister(args) {
+  const agentId = args.agent;
+  const result = await post('/bridge/deregister', { agent_id: agentId });
+
+  if (result?.ok) {
+    console.log(JSON.stringify({ ok: true, agent_id: agentId, status: 'offline' }));
+  } else {
+    console.log(JSON.stringify({ ok: false, reason: 'hub_unavailable' }));
+  }
+}
+
+async function cmdPing() {
+  try {
+    const url = `${getHubUrl()}/status`;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), 3000);
+    const res = await fetch(url, { signal: controller.signal });
+    clearTimeout(timer);
+    const data = await res.json();
+    console.log(JSON.stringify({ ok: true, hub: data.hub?.state, sessions: data.sessions }));
+  } catch {
+    console.log(JSON.stringify({ ok: false, reason: 'hub_unavailable' }));
+  }
+}
+
+// ── 메인 ──
+
+const cmd = process.argv[2];
+const args = parseArgs(process.argv.slice(3));
+
+switch (cmd) {
+  case 'register':   await cmdRegister(args); break;
+  case 'result':     await cmdResult(args); break;
+  case 'context':    await cmdContext(args); break;
+  case 'deregister': await cmdDeregister(args); break;
+  case 'ping':       await cmdPing(); break;
+  default:
+    console.error('사용법: bridge.mjs <register|result|context|deregister|ping> [--옵션]');
+    process.exit(1);
+}

package/hub/router.mjs

@@ -126,7 +126,7 @@ export function createRouter(store) {
       }, 1000);
       staleTimer = setInterval(() => {
         try { store.sweepStaleAgents(); } catch { /* 무시 */ }
-      }, 60000);
+      }, 120000);
       sweepTimer.unref();
       staleTimer.unref();
     },

package/hub/server.mjs

@@ -121,6 +121,87 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1' } = {}
       }));
     }
 
+    // /bridge/* — 경량 REST 엔드포인트 (tfx-route.sh 브릿지용)
+    if (req.url.startsWith('/bridge')) {
+      res.setHeader('Content-Type', 'application/json');
+
+      if (req.method !== 'POST' && req.method !== 'DELETE') {
+        res.writeHead(405);
+        return res.end(JSON.stringify({ ok: false, error: 'Method Not Allowed' }));
+      }
+
+      try {
+        const body = (req.method === 'POST') ? await parseBody(req) : {};
+        const path = req.url.replace(/\?.*/, '');
+
+        // POST /bridge/register — 에이전트 등록 (프로세스 수명 기반)
+        if (path === '/bridge/register' && req.method === 'POST') {
+          const { agent_id, cli, timeout_sec = 600, topics = [], capabilities = [], metadata = {} } = body;
+          if (!agent_id || !cli) {
+            res.writeHead(400);
+            return res.end(JSON.stringify({ ok: false, error: 'agent_id, cli 필수' }));
+          }
+          // heartbeat = 프로세스 타임아웃 + 여유 120초
+          const heartbeat_ttl_ms = (timeout_sec + 120) * 1000;
+          const data = store.registerAgent({ agent_id, cli, capabilities, topics, heartbeat_ttl_ms, metadata });
+          res.writeHead(200);
+          return res.end(JSON.stringify({ ok: true, data }));
+        }
+
+        // POST /bridge/result — 결과 발행
+        if (path === '/bridge/result' && req.method === 'POST') {
+          const { agent_id, topic = 'task.result', payload = {}, trace_id, correlation_id } = body;
+          if (!agent_id) {
+            res.writeHead(400);
+            return res.end(JSON.stringify({ ok: false, error: 'agent_id 필수' }));
+          }
+          const result = router.handlePublish({
+            from: agent_id, to: 'topic:' + topic, topic, payload,
+            priority: 5, ttl_ms: 3600000, trace_id, correlation_id,
+          });
+          res.writeHead(200);
+          return res.end(JSON.stringify(result));
+        }
+
+        // POST /bridge/context — 선행 컨텍스트 폴링
+        if (path === '/bridge/context' && req.method === 'POST') {
+          const { agent_id, topics, max_messages = 10 } = body;
+          if (!agent_id) {
+            res.writeHead(400);
+            return res.end(JSON.stringify({ ok: false, error: 'agent_id 필수' }));
+          }
+          const messages = store.pollForAgent(agent_id, {
+            max_messages,
+            include_topics: topics,
+            auto_ack: true,
+          });
+          res.writeHead(200);
+          return res.end(JSON.stringify({ ok: true, data: { messages, count: messages.length } }));
+        }
+
+        // POST /bridge/deregister — 에이전트 해제
+        if (path === '/bridge/deregister' && req.method === 'POST') {
+          const { agent_id } = body;
+          if (!agent_id) {
+            res.writeHead(400);
+            return res.end(JSON.stringify({ ok: false, error: 'agent_id 필수' }));
+          }
+          store.db.prepare("UPDATE agents SET status='offline' WHERE agent_id=?").run(agent_id);
+          res.writeHead(200);
+          return res.end(JSON.stringify({ ok: true, data: { agent_id, status: 'offline' } }));
+        }
+
+        res.writeHead(404);
+        return res.end(JSON.stringify({ ok: false, error: 'Unknown bridge endpoint' }));
+      } catch (e) {
+        if (!res.headersSent) {
+          res.writeHead(500);
+          res.end(JSON.stringify({ ok: false, error: e.message }));
+        }
+        return;
+      }
+    }
+
     // /mcp — MCP Streamable HTTP 엔드포인트
     if (req.url !== '/mcp') {
       res.writeHead(404);

package/hub/store.mjs

@@ -84,7 +84,7 @@ export function createStore(dbPath) {
     allAgents: db.prepare('SELECT * FROM agents'),
     agentsByTopic: db.prepare("SELECT a.* FROM agents a, json_each(a.topics_json) t WHERE t.value=? AND a.status != 'offline'"),
     markStale: db.prepare("UPDATE agents SET status='stale' WHERE status='online' AND lease_expires_ms < ?"),
-    markOffline: db.prepare("UPDATE agents SET status='offline' WHERE status='stale' AND lease_expires_ms < ? - 60000"),
+    markOffline: db.prepare("UPDATE agents SET status='offline' WHERE status='stale' AND lease_expires_ms < ? - 300000"),
 
     // 메시지
     insertMsg: db.prepare(`

package/hub/tools.mjs

@@ -38,7 +38,7 @@ export function createTools(store, router, hitl) {
           capabilities:     { type: 'array', items: { type: 'string' }, minItems: 1, maxItems: 64 },
           topics:           { type: 'array', items: { type: 'string' }, maxItems: 64 },
           metadata:         { type: 'object' },
-          heartbeat_ttl_ms: { type: 'integer', minimum: 5000, maximum: 300000 },
+          heartbeat_ttl_ms: { type: 'integer', minimum: 10000, maximum: 7200000 },
         },
       },
       handler: wrap('REGISTER_FAILED', (args) => {

package/package.json

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

package/scripts/tfx-route.sh

@@ -38,6 +38,38 @@ STDERR_LOG="/tmp/tfx-route-${AGENT_TYPE}-${TIMESTAMP}-stderr.log"
 STDOUT_LOG="/tmp/tfx-route-${AGENT_TYPE}-${TIMESTAMP}-stdout.log"
 TFX_TMP="${TMPDIR:-/tmp}"
 
+# ── Hub 브릿지 (선택적 — Hub 미실행 시 무시) ──
+# 패키지 내 브릿지 탐색 (npm global / git local 모두 대응)
+find_bridge() {
+  # 1. 환경변수 지정
+  [[ -n "${TFX_BRIDGE:-}" && -f "$TFX_BRIDGE" ]] && echo "$TFX_BRIDGE" && return
+  # 2. 같은 패키지 내
+  local script_dir
+  script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  local pkg_bridge="${script_dir}/../hub/bridge.mjs"
+  [[ -f "$pkg_bridge" ]] && echo "$pkg_bridge" && return
+  # 3. 설치된 triflux 패키지
+  local npm_bridge
+  npm_bridge="$(npm root -g 2>/dev/null)/triflux/hub/bridge.mjs"
+  [[ -f "$npm_bridge" ]] && echo "$npm_bridge" && return
+  echo ""
+}
+BRIDGE_BIN="$(find_bridge)"
+HUB_ENABLED="false"
+if [[ -n "$BRIDGE_BIN" ]]; then
+  # Hub 핑 (3초 타임아웃, 실패 시 무시)
+  HUB_PING=$(node "$BRIDGE_BIN" ping 2>/dev/null || echo '{"ok":false}')
+  if echo "$HUB_PING" | grep -q '"ok":true'; then
+    HUB_ENABLED="true"
+  fi
+fi
+
+# Hub 브릿지 래퍼 (Hub 꺼져있으면 아무것도 안 함)
+hub_bridge() {
+  [[ "$HUB_ENABLED" != "true" ]] && return 0
+  node "$BRIDGE_BIN" "$@" 2>/dev/null || true
+}
+
 # fallback 시 원래 에이전트 정보 보존
 ORIGINAL_AGENT=""
 ORIGINAL_CLI_ARGS=""
@@ -353,11 +385,31 @@ ${ctx_content}
 
   # 메타정보 (stderr)
   echo "[tfx-route] v${VERSION} type=$CLI_TYPE agent=$AGENT_TYPE effort=$CLI_EFFORT mode=$RUN_MODE timeout=${TIMEOUT_SEC}s" >&2
-  echo "[tfx-route] opus_oversight=$OPUS_OVERSIGHT mcp_profile=$MCP_PROFILE" >&2
+  echo "[tfx-route] opus_oversight=$OPUS_OVERSIGHT mcp_profile=$MCP_PROFILE hub=$HUB_ENABLED" >&2
 
   # Per-process 에이전트 등록
   register_agent
 
+  # Hub 브릿지: 에이전트 등록 (프로세스 수명 기반 lease)
+  local hub_agent_id="${AGENT_TYPE}-$$"
+  local hub_topics="${AGENT_TYPE},task.result"
+  hub_bridge register \
+    --agent "$hub_agent_id" \
+    --cli "$CLI_TYPE" \
+    --timeout "$TIMEOUT_SEC" \
+    --topics "$hub_topics" \
+    --capabilities "code,${AGENT_TYPE}"
+
+  # Hub 브릿지: 선행 컨텍스트 폴링 (DAG 의존 태스크용)
+  if [[ "$HUB_ENABLED" == "true" && -z "$CONTEXT_FILE" ]]; then
+    local hub_ctx_file="${TFX_TMP}/tfx-hub-ctx-${hub_agent_id}.md"
+    hub_bridge context --agent "$hub_agent_id" --topics "$hub_topics" --out "$hub_ctx_file"
+    if [[ -s "$hub_ctx_file" ]]; then
+      CONTEXT_FILE="$hub_ctx_file"
+      echo "[tfx-route] hub: 선행 컨텍스트 수신 ($(wc -c < "$hub_ctx_file") bytes)" >&2
+    fi
+  fi
+
   # CLI 실행 (stderr 분리 + 타임아웃 + 소요시간 측정)
   local exit_code=0
   local start_time
@@ -414,6 +466,14 @@ ${ctx_content}
   end_time=$(date +%s)
   local elapsed=$((end_time - start_time))
 
+  # Hub 브릿지: 결과 발행 + 에이전트 해제
+  hub_bridge result \
+    --agent "$hub_agent_id" \
+    --file "$STDOUT_LOG" \
+    --topic "task.result" \
+    --exit-code "$exit_code"
+  hub_bridge deregister --agent "$hub_agent_id"
+
   # ── 후처리: 단일 node 프로세스로 위임 ──
   # 토큰 추출, 출력 필터링, 로그, 토큰 누적, AIMD, 이슈 추적, 결과 출력 전부 처리
   local post_script="${HOME}/.claude/scripts/tfx-route-post.mjs"