triflux 3.2.0-dev.2 → 3.2.0-dev.5

package/hub/team/dashboard.mjs

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
-// hub/team/dashboard.mjs — 실시간 팀 상태 표시
-// 실행: watch -n 1 -c 'node hub/team/dashboard.mjs --session tfx-team-xxx'
-// 또는: node hub/team/dashboard.mjs --session tfx-team-xxx (단일 출력)
+// hub/team/dashboard.mjs — 실시간 팀 상태 표시 (v2.2)
+// tmux 의존 제거 — Hub task-list + native-supervisor 기반
+//
+// 실행:
+//   node hub/team/dashboard.mjs --session <세션이름> [--interval 2]
+//   node hub/team/dashboard.mjs --team <팀이름> [--interval 2]
 import { get } from "node:http";
-import { capturePaneOutput } from "./session.mjs";
 
 // ── 색상 ──
 const AMBER = "\x1b[38;5;214m";
@@ -15,32 +17,44 @@ const BOLD = "\x1b[1m";
 const RESET = "\x1b[0m";
 
 /**
- * Hub /status 엔드포인트 조회
- * @param {string} hubUrl — 예: http://127.0.0.1:27888
+ * HTTP GET JSON
+ * @param {string} url
  * @returns {Promise<object|null>}
  */
-function fetchStatus(hubUrl) {
+function fetchJson(url) {
   return new Promise((resolve) => {
-    const url = `${hubUrl}/status`;
     const req = get(url, { timeout: 2000 }, (res) => {
       let data = "";
       res.on("data", (chunk) => (data += chunk));
       res.on("end", () => {
-        try {
-          resolve(JSON.parse(data));
-        } catch {
-          resolve(null);
-        }
+        try { resolve(JSON.parse(data)); } catch { resolve(null); }
       });
     });
     req.on("error", () => resolve(null));
-    req.on("timeout", () => {
-      req.destroy();
-      resolve(null);
-    });
+    req.on("timeout", () => { req.destroy(); resolve(null); });
   });
 }
 
+/**
+ * HTTP POST JSON (Hub bridge 용)
+ * @param {string} url
+ * @param {object} body
+ * @returns {Promise<object|null>}
+ */
+async function fetchPost(url, body = {}) {
+  try {
+    const res = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body),
+      signal: AbortSignal.timeout(2000),
+    });
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+
 /**
  * 진행률 바 생성
  * @param {number} pct — 0~100
@@ -65,56 +79,141 @@ function formatUptime(ms) {
 }
 
 /**
- * 대시보드 렌더링
- * @param {string} sessionName — tmux 세션 이름
+ * task 상태 아이콘
+ * @param {string} status
+ * @returns {string}
+ */
+function statusIcon(status) {
+  switch (status) {
+    case "completed": return `${GREEN}✓${RESET}`;
+    case "in_progress": return `${AMBER}●${RESET}`;
+    case "failed": return `${RED}✗${RESET}`;
+    default: return `${GRAY}○${RESET}`;
+  }
+}
+
+/**
+ * 멤버 목록 구성: Hub tasks + supervisor + teamState 통합
+ * @param {Array} hubTasks — Hub bridge task-list 결과
+ * @param {Array} supervisorMembers — native-supervisor 멤버 상태
+ * @param {object} teamState — team-state.json 내용
+ * @returns {Array<{name: string, cli: string, status: string, subject: string, preview: string}>}
+ */
+function buildMemberList(hubTasks, supervisorMembers, teamState) {
+  const members = [];
+  const supervisorByName = new Map(supervisorMembers.map((m) => [m.name, m]));
+
+  // Hub tasks가 있으면 주 데이터 소스
+  if (hubTasks.length > 0) {
+    for (const task of hubTasks) {
+      const owner = task.owner || task.subject || "";
+      const sup = supervisorByName.get(owner);
+      members.push({
+        name: owner,
+        cli: task.metadata?.cli || sup?.cli || "",
+        status: task.status || "pending",
+        subject: task.subject || "",
+        preview: sup?.lastPreview || task.description?.slice(0, 80) || "",
+      });
+    }
+    return members;
+  }
+
+  // Supervisor 데이터 폴백
+  if (supervisorMembers.length > 0) {
+    for (const m of supervisorMembers) {
+      if (m.role === "lead") continue;
+      members.push({
+        name: m.name,
+        cli: m.cli || "",
+        status: m.status === "running" ? "in_progress" : m.status === "exited" ? "completed" : m.status,
+        subject: "",
+        preview: m.lastPreview || "",
+      });
+    }
+    return members;
+  }
+
+  // teamState 폴백 (하위 호환)
+  const panes = teamState?.panes || {};
+  for (const [, paneInfo] of Object.entries(panes).filter(([, v]) => v.role !== "dashboard" && v.role !== "lead")) {
+    members.push({
+      name: paneInfo.agentId || paneInfo.name || "?",
+      cli: paneInfo.cli || "",
+      status: "unknown",
+      subject: paneInfo.subtask || "",
+      preview: "",
+    });
+  }
+  return members;
+}
+
+/**
+ * 대시보드 렌더링 (v2.2: Hub/supervisor 기반)
+ * @param {string} sessionName — 세션 또는 팀 이름
  * @param {object} opts
  * @param {string} opts.hubUrl — Hub URL (기본 http://127.0.0.1:27888)
- * @param {object} opts.teamState — team-state.json 내용
+ * @param {string} [opts.teamName] — Hub task-list 조회용 팀 이름
+ * @param {string} [opts.supervisorUrl] — native-supervisor 제어 URL
+ * @param {object} [opts.teamState] — team-state.json 내용 (하위 호환)
  */
 export async function renderDashboard(sessionName, opts = {}) {
-  const { hubUrl = "http://127.0.0.1:27888", teamState = {} } = opts;
+  const {
+    hubUrl = "http://127.0.0.1:27888",
+    teamName,
+    supervisorUrl,
+    teamState = {},
+  } = opts;
   const W = 50;
   const border = "─".repeat(W);
 
-  // Hub 상태 조회
-  const status = await fetchStatus(hubUrl);
-  const hubOnline = !!status;
+  // 데이터 수집 (병렬)
+  const [hubStatus, taskListRes, supervisorRes] = await Promise.all([
+    fetchJson(`${hubUrl}/status`),
+    teamName ? fetchPost(`${hubUrl}/bridge/team/task-list`, { team_name: teamName }) : null,
+    supervisorUrl ? fetchJson(`${supervisorUrl}/status`) : null,
+  ]);
+
+  const hubOnline = !!hubStatus;
   const hubState = hubOnline ? `${GREEN}● online${RESET}` : `${RED}● offline${RESET}`;
-  const uptime = status?.hub?.uptime ? formatUptime(status.hub.uptime) : "-";
-  const queueSize = status?.hub?.queue_depth ?? 0;
+  const uptime = hubStatus?.hub?.uptime ? formatUptime(hubStatus.hub.uptime) : "-";
+  const queueSize = hubStatus?.hub?.queue_depth ?? 0;
+
+  // Hub task 데이터
+  const hubTasks = taskListRes?.ok ? (taskListRes.data?.tasks || []) : [];
+  const completedCount = hubTasks.filter((t) => t.status === "completed").length;
+  const totalCount = hubTasks.length;
+
+  // Supervisor 멤버 데이터
+  const supervisorMembers = supervisorRes?.ok ? (supervisorRes.data?.members || []) : [];
 
   // 헤더
-  console.log(`${AMBER}┌─ ${sessionName} ${GRAY}${"─".repeat(Math.max(0, W - sessionName.length - 3))}${AMBER}┐${RESET}`);
+  const progress = totalCount > 0 ? ` ${completedCount}/${totalCount}` : "";
+  console.log(`${AMBER}┌─ ${sessionName}${progress} ${GRAY}${"─".repeat(Math.max(0, W - sessionName.length - progress.length - 3))}${AMBER}┐${RESET}`);
   console.log(`${AMBER}│${RESET} Hub: ${hubState}  Uptime: ${DIM}${uptime}${RESET}  Queue: ${DIM}${queueSize}${RESET}`);
   console.log(`${AMBER}│${RESET}`);
 
-  // 에이전트 상태
-  const panes = teamState?.panes || {};
-  const paneEntries = Object.entries(panes).filter(([, v]) => v.role !== "dashboard");
+  // 멤버/워커 렌더링
+  const members = buildMemberList(hubTasks, supervisorMembers, teamState);
 
-  if (paneEntries.length === 0) {
+  if (members.length === 0) {
     console.log(`${AMBER}│${RESET}  ${DIM}에이전트 정보 없음${RESET}`);
   } else {
-    for (const [paneTarget, paneInfo] of paneEntries) {
-      const { cli = "?", agentId = "?", subtask = "" } = paneInfo;
-      const label = `[${agentId}]`;
-      const cliTag = cli.charAt(0).toUpperCase() + cli.slice(1);
-
-      // Hub에서 에이전트 상태 확인
-      const agentStatus = status?.agents?.find?.((a) => a.agent_id === agentId);
-      const online = agentStatus ? `${GREEN}● online${RESET}` : `${GRAY}○ -${RESET}`;
-
-      // 진행률 추정 (메시지 기반, 단순 휴리스틱)
-      const msgCount = agentStatus?.message_count ?? 0;
-      const pct = msgCount === 0 ? 0 : Math.min(100, msgCount * 25);
-
-      console.log(`${AMBER}│${RESET}  ${BOLD}${label}${RESET} ${cliTag}  ${online}  ${progressBar(pct)} ${DIM}${pct}%${RESET}`);
-
-      // pane 미리보기 (마지막 2줄)
-      const preview = capturePaneOutput(paneTarget, 2)
-        .split("\n")
-        .filter(Boolean)
-        .slice(-1)[0] || "";
+    for (const m of members) {
+      const icon = statusIcon(m.status);
+      const label = `[${m.name}]`;
+      const cliTag = m.cli ? m.cli.charAt(0).toUpperCase() + m.cli.slice(1) : "";
+
+      // 진행률 추정
+      const pct = m.status === "completed" ? 100
+        : m.status === "in_progress" ? 50
+        : m.status === "failed" ? 100
+        : 0;
+
+      console.log(`${AMBER}│${RESET}  ${BOLD}${label}${RESET} ${cliTag}  ${icon} ${m.status || "pending"}  ${progressBar(pct)}`);
+
+      // 미리보기: supervisor lastPreview > task subject
+      const preview = m.preview || m.subject || "";
       if (preview) {
         const truncated = preview.length > W - 8 ? preview.slice(0, W - 11) + "..." : preview;
         console.log(`${AMBER}│${RESET}    ${DIM}> ${truncated}${RESET}`);
@@ -140,14 +239,17 @@ async function loadTeamState() {
   }
 }
 
-// ── CLI 실행 (자체 갱신 루프 — watch 불필요) ──
+// ── CLI 실행 ──
 if (process.argv[1]?.includes("dashboard.mjs")) {
   const sessionIdx = process.argv.indexOf("--session");
+  const teamIdx = process.argv.indexOf("--team");
   const sessionName = sessionIdx !== -1 ? process.argv[sessionIdx + 1] : null;
+  const teamName = teamIdx !== -1 ? process.argv[teamIdx + 1] : null;
   const intervalSec = parseInt(process.argv[process.argv.indexOf("--interval") + 1] || "2", 10);
 
-  if (!sessionName) {
-    console.error("사용법: node dashboard.mjs --session <세션이름> [--interval 2]");
+  const displayName = sessionName || teamName;
+  if (!displayName) {
+    console.error("사용법: node dashboard.mjs --session <세션이름> [--team <팀이름>] [--interval 2]");
     process.exit(1);
   }
 
@@ -157,9 +259,16 @@ if (process.argv[1]?.includes("dashboard.mjs")) {
   // 갱신 루프
   while (true) {
     const teamState = await loadTeamState();
+    const effectiveTeamName = teamName || null;
+    const supervisorUrl = teamState?.native?.controlUrl || null;
+
     // 화면 클리어 (ANSI)
     process.stdout.write("\x1b[2J\x1b[H");
-    await renderDashboard(sessionName, { teamState });
+    await renderDashboard(displayName, {
+      teamName: effectiveTeamName,
+      supervisorUrl,
+      teamState,
+    });
     console.log(`${DIM}  ${intervalSec}초 간격 갱신 | Ctrl+C로 종료${RESET}`);
     await new Promise((r) => setTimeout(r, intervalSec * 1000));
   }

package/hub/team/native.mjs

@@ -83,6 +83,44 @@ export function buildTeamConfig(teamName, assignments) {
   };
 }
 
+/**
+ * v2.2 슬림 래퍼 프롬프트 생성
+ * Agent spawn으로 네비게이션에 등록하되, 실제 작업은 tfx-route.sh가 수행.
+ * 프롬프트 ~100 토큰 목표 (v2의 ~500 대비 80% 감소).
+ *
+ * @param {'codex'|'gemini'} cli — CLI 타입
+ * @param {object} opts
+ * @param {string} opts.subtask — 서브태스크 설명
+ * @param {string} [opts.role] — 역할 (executor, designer, reviewer 등)
+ * @param {string} [opts.teamName] — 팀 이름
+ * @param {string} [opts.taskId] — Hub task ID
+ * @param {string} [opts.agentName] — 워커 표시 이름
+ * @param {string} [opts.leadName] — 리드 수신자 이름
+ * @param {string} [opts.mcp_profile] — MCP 프로필
+ * @returns {string} 슬림 래퍼 프롬프트
+ */
+export function buildSlimWrapperPrompt(cli, opts = {}) {
+  const {
+    subtask,
+    role = "executor",
+    teamName = "tfx-team",
+    taskId = "",
+    agentName = "",
+    leadName = "team-lead",
+    mcp_profile = "auto",
+  } = opts;
+
+  // 셸 이스케이프
+  const escaped = subtask.replace(/'/g, "'\\''");
+
+  return `Bash 1회 실행 후 종료.
+
+TFX_TEAM_NAME=${teamName} TFX_TEAM_TASK_ID=${taskId} TFX_TEAM_AGENT_NAME=${agentName} TFX_TEAM_LEAD_NAME=${leadName} bash ${ROUTE_SCRIPT} ${role} '${escaped}' ${mcp_profile}
+
+완료 → TaskUpdate(status: completed) + SendMessage(to: ${leadName}).
+실패 → TaskUpdate(status: failed) + SendMessage(to: ${leadName}).`;
+}
+
 /**
  * 팀 이름 생성 (타임스탬프 기반)
  * @returns {string}

package/hub/team/nativeProxy.mjs

@@ -47,10 +47,10 @@ function atomicWriteJson(path, value) {
   renameSync(tmp, path);
 }
 
-function sleepMs(ms) {
-  const end = Date.now() + ms;
-  while (Date.now() < end) {}
-}
+function sleepMs(ms) {
+  // busy-wait를 피하고 Atomics.wait로 동기 대기 (CPU 점유 최소화)
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
 
 function withFileLock(lockPath, fn, retries = 20, delayMs = 25) {
   let fd = null;
@@ -419,37 +419,42 @@ export function teamSendMessage(args = {}) {
     return err('TEAM_NOT_FOUND', `팀 디렉토리가 없습니다: ${paths.team_dir}`);
   }
 
-  const recipient = sanitizeRecipientName(to);
-  const inboxFile = join(paths.inboxes_dir, `${recipient}.json`);
-  const queue = readJsonSafe(inboxFile);
-  const list = Array.isArray(queue) ? queue : [];
-
-  const message = {
-    id: randomUUID(),
-    from: String(from),
-    text: String(text),
-    ...(summary ? { summary: String(summary) } : {}),
-    timestamp: new Date().toISOString(),
-    color: String(color || 'blue'),
-    read: false,
-  };
-  list.push(message);
-
-  try {
-    atomicWriteJson(inboxFile, list);
-  } catch (e) {
-    return err('SEND_MESSAGE_FAILED', e.message);
-  }
-
-  const unreadCount = list.filter((m) => m?.read !== true).length;
-  return {
-    ok: true,
-    data: {
-      message_id: message.id,
-      recipient,
-      inbox_file: inboxFile,
-      queued_at: message.timestamp,
-      unread_count: unreadCount,
-    },
-  };
-}
+  const recipient = sanitizeRecipientName(to);
+  const inboxFile = join(paths.inboxes_dir, `${recipient}.json`);
+  const lockFile = `${inboxFile}.lock`;
+  let message;
+
+  try {
+    const unreadCount = withFileLock(lockFile, () => {
+      const queue = readJsonSafe(inboxFile);
+      const list = Array.isArray(queue) ? queue : [];
+
+      message = {
+        id: randomUUID(),
+        from: String(from),
+        text: String(text),
+        ...(summary ? { summary: String(summary) } : {}),
+        timestamp: new Date().toISOString(),
+        color: String(color || 'blue'),
+        read: false,
+      };
+      list.push(message);
+      atomicWriteJson(inboxFile, list);
+
+      return list.filter((m) => m?.read !== true).length;
+    });
+
+    return {
+      ok: true,
+      data: {
+        message_id: message.id,
+        recipient,
+        inbox_file: inboxFile,
+        queued_at: message.timestamp,
+        unread_count: unreadCount,
+      },
+    };
+  } catch (e) {
+    return err('SEND_MESSAGE_FAILED', e.message);
+  }
+}

package/hub/team/pane.mjs

@@ -39,13 +39,18 @@ function tmux(args, opts = {}) {
 /**
  * CLI 에이전트 시작 커맨드 생성
  * @param {'codex'|'gemini'|'claude'} cli
- * @returns {string} 실행할 셸 커맨드
- */
-export function buildCliCommand(cli) {
-  switch (cli) {
-    case "codex":
-      // interactive REPL 진입 — MCP는 ~/.codex/config.json에 사전 등록
-      return "codex";
+ * @param {{ trustMode?: boolean }} [options]
+ * @returns {string} 실행할 셸 커맨드
+ */
+export function buildCliCommand(cli, options = {}) {
+  const { trustMode = false } = options;
+
+  switch (cli) {
+    case "codex":
+      // trust 모드에서는 승인/샌드박스 우회 + alt-screen 비활성화
+      return trustMode
+        ? "codex --dangerously-bypass-approvals-and-sandbox --no-alt-screen"
+        : "codex";
     case "gemini":
       // interactive 모드 — MCP는 ~/.gemini/settings.json에 사전 등록
       return "gemini";

package/hud/hud-qos-status.mjs

@@ -105,6 +105,9 @@ const QOS_PATH = join(homedir(), ".omc", "state", "cli_qos_profile.json");
 const ACCOUNTS_CONFIG_PATH = join(homedir(), ".omc", "router", "accounts.json");
 const ACCOUNTS_STATE_PATH = join(homedir(), ".omc", "state", "cli_accounts_state.json");
 
+// tfx-team 상태 (v2.2 HUD 통합)
+const TEAM_STATE_PATH = join(homedir(), ".claude", "cache", "tfx-hub", "team-state.json");
+
 // Claude OAuth Usage API (api.anthropic.com/api/oauth/usage)
 const CLAUDE_CREDENTIALS_PATH = join(homedir(), ".claude", ".credentials.json");
 const CLAUDE_USAGE_CACHE_PATH = join(homedir(), ".claude", "cache", "claude-usage-cache.json");
@@ -426,6 +429,54 @@ function getProviderAccountId(provider, accountsConfig, accountsState) {
   return providerConfig[0]?.id || `${provider}-main`;
 }
 
+/**
+ * tfx-team 상태 행 생성 (v2.2 HUD 통합)
+ * 활성 팀이 있을 때만 행 반환, 없으면 null
+ * @returns {{ prefix: string, left: string, right: string } | null}
+ */
+function getTeamRow() {
+  const teamState = readJson(TEAM_STATE_PATH, null);
+  if (!teamState || !teamState.sessionName) return null;
+
+  // 팀 생존 확인: startedAt 기준 24시간 초과면 stale로 간주
+  if (teamState.startedAt && (Date.now() - teamState.startedAt) > 24 * 60 * 60 * 1000) return null;
+
+  const workers = (teamState.members || []).filter((m) => m.role === "worker");
+  if (!workers.length) return null;
+
+  const tasks = teamState.tasks || [];
+  const completed = tasks.filter((t) => t.status === "completed").length;
+  const failed = tasks.filter((t) => t.status === "failed").length;
+  const total = tasks.length || workers.length;
+
+  // 경과 시간
+  const elapsed = teamState.startedAt
+    ? `${Math.round((Date.now() - teamState.startedAt) / 60000)}m`
+    : "";
+
+  // 멤버 상태 아이콘 요약
+  const memberIcons = workers.map((m) => {
+    const task = tasks.find((t) => t.owner === m.name);
+    const icon = task?.status === "completed" ? green("✓")
+      : task?.status === "in_progress" ? yellow("●")
+      : task?.status === "failed" ? red("✗")
+      : dim("○");
+    const tag = m.cli ? m.cli.charAt(0) : "?";
+    return `${tag}${icon}`;
+  }).join(" ");
+
+  // done / failed 상태 텍스트
+  const doneText = failed > 0
+    ? `${completed}/${total} ${red(`${failed}✗`)}`
+    : `${completed}/${total} done`;
+
+  return {
+    prefix: bold(claudeOrange("⬡")),
+    left: `team ${doneText} ${dim(elapsed)}`,
+    right: memberIcons,
+  };
+}
+
 function renderAlignedRows(rows) {
   const rightRows = rows.filter((row) => stripAnsi(String(row.right || "")).trim().length > 0);
   const rawLeftWidth = rightRows.reduce((max, row) => Math.max(max, stripAnsi(row.left).length), 0);
@@ -791,7 +842,7 @@ async function fetchClaudeUsage(forceRefresh = false) {
       : result.status === 401 || result.status === 403 ? "auth"
       : result.error === "timeout" || result.error === "network" ? "network"
       : "unknown";
-    writeClaudeUsageCache(existingSnapshot.data, { type: errorType, status: result.status });
+    writeClaudeUsageCache(existingSnapshot.data, { type: errorType, status: result.status });
     return existingSnapshot.data || null;
   }
   const usage = parseClaudeUsageResponse(result.data);
@@ -1707,6 +1758,10 @@ async function main() {
       geminiQuotaData, geminiEmail, geminiSv, null),
   ];
 
+  // tfx-team 활성 시 팀 상태 행 추가 (v2.2)
+  const teamRow = getTeamRow();
+  if (teamRow) rows.push(teamRow);
+
   // 비활성 프로바이더 dim 처리: 데이터 없으면 전체 줄 dim
   const codexActive = codexBuckets != null;
   const geminiActive = (geminiSession?.total || 0) > 0 || geminiBucket != null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "3.2.0-dev.2",
+  "version": "3.2.0-dev.5",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "type": "module",
   "bin": {
@@ -26,7 +26,8 @@
   ],
   "scripts": {
     "setup": "node scripts/setup.mjs",
-    "postinstall": "node scripts/setup.mjs"
+    "postinstall": "node scripts/setup.mjs",
+    "test:route-smoke": "node --test scripts/test-tfx-route-no-claude-native.mjs"
   },
   "engines": {
     "node": ">=18.0.0"