triflux 7.0.2 → 7.0.4

package/hub/team/cli/commands/start/start-headless.mjs

@@ -1,6 +1,5 @@
 import { BOLD, DIM, GREEN, RESET, AMBER } from "../../../shared.mjs";
 import { runHeadlessInteractive, resolveCliType } from "../../../headless.mjs";
-import { createTui } from "../../../tui.mjs";
 import { ok, warn } from "../../render.mjs";
 import { buildTasks } from "../../services/task-model.mjs";
 import { clearTeamState } from "../../services/state-store.mjs";
@@ -14,48 +13,28 @@ export async function startHeadlessTeam({ sessionId, task, lead, agents, subtask
   const startedAt = Date.now();
   ok(`headless ${assignments.length}워커 시작`);
 
-  // TUI 대시보드 (--dashboard 플래그)
-  const tui = dashboard ? createTui({ refreshMs: 1000 }) : null;
-
   const handle = await runHeadlessInteractive(sessionId, assignments, {
     timeoutSec: timeoutSec || 300,
     layout,
     autoAttach: !!autoAttach,
+    dashboard: !!dashboard,
     progressive: progressive !== false,
-    progressIntervalSec: (verbose || dashboard) ? 10 : 0,
-    onProgress: function onProgress(event) {
-      // TUI 대시보드 업데이트
-      if (tui) {
-        if (event.type === "dispatched") {
-          tui.updateWorker(event.paneName, { cli: event.cli, status: "running" });
-        } else if (event.type === "progress") {
-          const snap = (event.snapshot || "").split("\n").filter(l => l.trim()).pop() || "";
-          tui.updateWorker(event.paneName, { snapshot: snap });
-        } else if (event.type === "completed") {
-          tui.updateWorker(event.paneName, {
-            status: event.matched && event.exitCode === 0 ? "completed" : "failed",
-            elapsed: Math.round((Date.now() - (tui._start || Date.now())) / 1000),
-          });
-        }
-      }
-
-      // verbose 텍스트 출력 (TUI 비활성 시)
-      if (verbose && !tui) {
-        if (event.type === "session_created") {
-          console.log(`  ${DIM}세션: ${event.sessionName}${RESET}`);
-        } else if (event.type === "worker_added") {
-          console.log(`  ${DIM}[+] ${event.paneTitle}${RESET}`);
-        } else if (event.type === "dispatched") {
-          console.log(`  ${DIM}[${event.paneName}] ${event.cli} dispatch${RESET}`);
-        } else if (event.type === "progress") {
-          const last = (event.snapshot || "").split("\n").filter(l => l.trim()).pop() || "";
-          if (last) console.log(`  ${DIM}[${event.paneName}] ${last.slice(0, 60)}${RESET}`);
-        } else if (event.type === "completed") {
-          const icon = event.matched && event.exitCode === 0 ? `${GREEN}✓${RESET}` : `${AMBER}✗${RESET}`;
-          console.log(`  ${icon} [${event.paneName}] ${event.cli} exit=${event.exitCode}${event.sessionDead ? " (dead)" : ""}`);
-        }
+    progressIntervalSec: verbose ? 10 : 0,
+    onProgress: verbose ? function onProgress(event) {
+      if (event.type === "session_created") {
+        console.log(`  ${DIM}세션: ${event.sessionName}${RESET}`);
+      } else if (event.type === "worker_added") {
+        console.log(`  ${DIM}[+] ${event.paneTitle}${RESET}`);
+      } else if (event.type === "dispatched") {
+        console.log(`  ${DIM}[${event.paneName}] ${event.cli} dispatch${RESET}`);
+      } else if (event.type === "progress") {
+        const last = (event.snapshot || "").split("\n").filter(l => l.trim()).pop() || "";
+        if (last) console.log(`  ${DIM}[${event.paneName}] ${last.slice(0, 60)}${RESET}`);
+      } else if (event.type === "completed") {
+        const icon = event.matched && event.exitCode === 0 ? `${GREEN}✓${RESET}` : `${AMBER}✗${RESET}`;
+        console.log(`  ${icon} [${event.paneName}] ${event.cli} exit=${event.exitCode}${event.sessionDead ? " (dead)" : ""}`);
       }
-    },
+    } : undefined,
   });
 
   // 최소 결과 요약
@@ -94,21 +73,6 @@ export async function startHeadlessTeam({ sessionId, task, lead, agents, subtask
     }
   }
 
-  // TUI에 handoff 최종 반영
-  if (tui) {
-    for (const r of results) {
-      if (r.handoff) {
-        tui.updateWorker(r.paneName, {
-          status: r.matched && r.exitCode === 0 ? "completed" : "failed",
-          handoff: r.handoff,
-          elapsed: Math.round((Date.now() - startedAt) / 1000),
-        });
-      }
-    }
-    tui.render();  // 최종 프레임
-    tui.close();
-  }
-
   // 세션 정리
   handle.kill();
 

package/hub/team/headless.mjs

@@ -72,17 +72,12 @@ const MCP_PROFILE_HINTS = {
  */
 export function buildHeadlessCommand(cli, prompt, resultFile, opts = {}) {
   const { handoff = true, mcp } = opts;
-  // 에이전트 역할명("executor" 등)을 CLI 타입으로 해석
   const resolvedCli = resolveCliType(cli);
-  // MCP 프로필 힌트를 프롬프트에 삽입
-  const mcpHint = mcp && MCP_PROFILE_HINTS[mcp] ? `\n[MCP: ${mcp}] ${MCP_PROFILE_HINTS[mcp]}` : "";
-  // HANDOFF 지시를 프롬프트에 삽입 (opt-out 가능)
-  const fullPrompt = handoff
-    ? `${prompt}${mcpHint}\n\n${HANDOFF_INSTRUCTION}`
-    : `${prompt}${mcpHint}`;
-  // 프롬프트의 단일 인용부호를 이스케이프
+  const mcpHint = mcp && MCP_PROFILE_HINTS[mcp] ? ` [MCP: ${mcp}] ${MCP_PROFILE_HINTS[mcp]}` : "";
+  // HANDOFF 지시는 프롬프트에 삽입하지 않음 — headless 후처리(processHandoff)에서 처리
+  // psmux send-keys 줄바꿈 문제 + codex exec "---" 인자 충돌 방지
+  const fullPrompt = `${prompt}${mcpHint}`;
   const escaped = fullPrompt.replace(/'/g, "''");
-  // Clear-Host: 실행 즉시 이전 PS 프롬프트 + 명령 텍스트를 깨끗이 지움
   const cls = "Clear-Host; ";
 
   switch (resolvedCli) {
@@ -131,6 +126,7 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
     onProgress,
     progressIntervalSec = 0,
     progressive = true,
+    dashboard = false,
   } = opts;
 
   mkdirSync(RESULT_DIR, { recursive: true });
@@ -148,6 +144,17 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
     applyTrifluxTheme(sessionName);
     if (safeProgress) safeProgress({ type: "session_created", sessionName, panes: session.panes });
 
+    // v7.0: dashboard pane — pane 0에 TUI 뷰어를 send-keys로 실행
+    if (dashboard) {
+      const viewerPath = join(import.meta.dirname, "tui-viewer.mjs").replace(/\\/g, "/");
+      const resultDir = RESULT_DIR.replace(/\\/g, "/");
+      const viewerCmd = `node ${viewerPath} --session ${sessionName} --result-dir ${resultDir}`;
+      try {
+        psmuxExec(["send-keys", "-t", `${sessionName}:0.0`, viewerCmd, "Enter"]);
+        psmuxExec(["select-pane", "-t", `${sessionName}:0.0`, "-T", "▲ dashboard"]);
+      } catch { /* 무시 */ }
+    }
+
     dispatches = assignments.map((assignment, i) => {
       const paneName = `worker-${i + 1}`;
       const resolvedCli = resolveCliType(assignment.cli);
@@ -157,8 +164,8 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
         : `${brand.emoji} ${resolvedCli}-${i + 1}`;
 
       let newPaneId;
-      if (i === 0) {
-        // 첫 번째 워커: 빈 lead pane을 직접 사용 (빈 pane 제거)
+      if (i === 0 && !dashboard) {
+        // 대시보드 없으면: 첫 번째 워커가 빈 lead pane 사용
         newPaneId = `${sessionName}:0.0`;
       } else {
         // 2번째+: split-window로 추가
@@ -502,6 +509,40 @@ export function autoAttachTerminal(sessionName, opts = {}, workerCount = 2) {
   return true;
 }
 
+/**
+ * v7.0: psmux 세션을 WT 탭에 attach (대시보드 + 워커 전체 뷰)
+ * @param {string} sessionName
+ * @param {number} workerCount
+ * @returns {boolean}
+ */
+export function attachDashboardTab(sessionName, workerCount = 2) {
+  try { execSync("where wt.exe", { stdio: "ignore" }); } catch { return false; }
+  ensureWtProfile(workerCount);
+
+  try {
+    // psmux attach로 전체 세션을 WT 탭에 표시
+    const child = spawn("wt.exe", [
+      "-w", "0", "nt",
+      "--profile", "triflux",
+      "--title", `▲ ${sessionName}`,
+      "--", "psmux", "attach", "-t", sessionName,
+    ], { detached: true, stdio: "ignore" });
+    child.unref();
+  } catch { return false; }
+
+  // 150ms 후 이전 탭으로 복귀
+  const prevTabScript = "Start-Sleep -Milliseconds 150; Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SendKeys]::SendWait('^+{TAB}')";
+  for (const shell of ["pwsh.exe", "powershell.exe"]) {
+    try {
+      spawn(shell, ["-NoProfile", "-NonInteractive", "-Command", prevTabScript], {
+        detached: true, stdio: "ignore",
+      }).unref();
+      break;
+    } catch { /* 다음 shell */ }
+  }
+  return true;
+}
+
 /**
  * 모든 워커 pane의 현재 스냅샷을 수집한다.
  *
@@ -552,19 +593,27 @@ export function getProgressSnapshots(sessionName, dispatches, lines = 15) {
 export async function runHeadlessInteractive(sessionName, assignments, opts = {}) {
   const {
     autoAttach = false,
+    dashboard = false,
     signal,
     maxIdleSec = 0,
     ...runOpts
   } = opts;
 
+  // dashboard 옵션을 runHeadless에 전달
+  if (dashboard) runOpts.dashboard = true;
+
   // autoAttach를 session_created 시점에 트리거 (CLI 실행 전에 터미널 열림)
   const userOnProgress = runOpts.onProgress;
   let terminalAttached = false;
   runOpts.onProgress = (event) => {
     if (autoAttach && event.type === "session_created" && !terminalAttached) {
       terminalAttached = true;
-      // v6.0.20: 항상 별도 창 (포커스 문제 회피)
-      autoAttachTerminal(sessionName, { mode: "window" }, assignments.length);
+      if (dashboard) {
+        // v7.0: psmux attach로 대시보드+워커 전체 세션을 WT 탭에 표시
+        attachDashboardTab(sessionName, assignments.length);
+      } else {
+        autoAttachTerminal(sessionName, { mode: "window" }, assignments.length);
+      }
     }
     if (userOnProgress) userOnProgress(event);
   };

package/hub/team/tui-viewer.mjs

@@ -0,0 +1,130 @@
+#!/usr/bin/env node
+// hub/team/tui-viewer.mjs — psmux pane용 TUI 대시보드 뷰어
+// 독립 프로세스로 실행되어 headless 워커 상태를 실시간 렌더링한다.
+//
+// 실행: node hub/team/tui-viewer.mjs --session <name> [--result-dir <dir>]
+//
+// 데이터 소스: result 파일 (RESULT_DIR/{session}-worker-N.txt) polling
+// + psmux capture-pane (워커 진행 상황)
+
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { createTui } from "./tui.mjs";
+import { processHandoff } from "./handoff.mjs";
+
+// ── 인자 파싱 ──
+const args = process.argv.slice(2);
+const sessionIdx = args.indexOf("--session");
+const resultDirIdx = args.indexOf("--result-dir");
+const SESSION = sessionIdx >= 0 ? args[sessionIdx + 1] : null;
+const RESULT_DIR = resultDirIdx >= 0 ? args[resultDirIdx + 1] : join(tmpdir(), "tfx-headless");
+
+if (!SESSION) {
+  process.stderr.write("Usage: node tui-viewer.mjs --session <name>\n");
+  process.exit(1);
+}
+
+// ── TUI 초기화 ──
+const tui = createTui({ refreshMs: 0 }); // 수동 렌더 (폴링 주기에 맞춤)
+
+// ── 워커 상태 폴링 ──
+const POLL_MS = 800;
+const knownWorkers = new Map(); // paneName → { resultFile, lastSize, done }
+
+function discoverWorkers() {
+  if (!existsSync(RESULT_DIR)) return;
+  const prefix = `${SESSION}-worker-`;
+  for (const f of readdirSync(RESULT_DIR)) {
+    if (!f.startsWith(prefix) || !f.endsWith(".txt")) continue;
+    const paneName = f.replace(`${SESSION}-`, "").replace(".txt", "");
+    if (!knownWorkers.has(paneName)) {
+      knownWorkers.set(paneName, {
+        resultFile: join(RESULT_DIR, f),
+        lastSize: 0,
+        done: false,
+      });
+      tui.updateWorker(paneName, { cli: "codex", status: "running" });
+    }
+  }
+}
+
+function pollWorkers() {
+  discoverWorkers();
+
+  for (const [paneName, state] of knownWorkers) {
+    if (state.done) continue;
+
+    let size = 0;
+    try { size = statSync(state.resultFile).size; } catch { continue; }
+
+    if (size === state.lastSize) continue;
+    state.lastSize = size;
+
+    // 결과 파일 읽기
+    let content = "";
+    try { content = readFileSync(state.resultFile, "utf8"); } catch { continue; }
+
+    if (content.trim().length === 0) continue;
+
+    // handoff 파싱 시도
+    const result = processHandoff(content, { exitCode: 0, resultFile: state.resultFile });
+
+    if (result.handoff && !result.fallback) {
+      // handoff 블록 발견 → 완료
+      state.done = true;
+      tui.updateWorker(paneName, {
+        status: result.handoff.status === "failed" ? "failed" : "completed",
+        handoff: result.handoff,
+        elapsed: Math.round((Date.now() - startTime) / 1000),
+      });
+    } else {
+      // 아직 진행 중 — 마지막 줄을 스냅샷으로
+      const lastLine = content.trim().split("\n").filter(l => l.trim()).pop() || "";
+      tui.updateWorker(paneName, {
+        status: "running",
+        snapshot: lastLine.slice(0, 60),
+        elapsed: Math.round((Date.now() - startTime) / 1000),
+      });
+    }
+  }
+
+  tui.render();
+}
+
+// ── 메인 루프 ──
+const startTime = Date.now();
+tui.setStartTime(startTime);
+
+// 초기 렌더
+tui.render();
+
+const timer = setInterval(pollWorkers, POLL_MS);
+
+// 모든 워커 완료 감지 → 10초 후 자동 종료
+let doneCheckTimer = setInterval(() => {
+  if (knownWorkers.size > 0 && [...knownWorkers.values()].every(w => w.done)) {
+    tui.render(); // 최종 렌더
+    setTimeout(() => {
+      tui.close();
+      clearInterval(timer);
+      clearInterval(doneCheckTimer);
+      process.exit(0);
+    }, 10000); // 10초 유지 후 종료
+    clearInterval(doneCheckTimer);
+  }
+}, 2000);
+
+// Ctrl+C 정리
+process.on("SIGINT", () => {
+  tui.close();
+  clearInterval(timer);
+  process.exit(0);
+});
+
+// 5분 안전 타임아웃
+setTimeout(() => {
+  tui.close();
+  clearInterval(timer);
+  process.exit(0);
+}, 5 * 60 * 1000);

package/package.json

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