triflux 7.0.6 → 7.1.1

package/hub/team/headless.mjs

@@ -522,8 +522,25 @@ export function attachDashboardTab(sessionName, workerCount = 2) {
   try { execSync("where wt.exe", { stdio: "ignore" }); } catch { return false; }
   ensureWtProfile(workerCount);
 
+  // v7.1: 같은 WT 창에서 가로 스플릿 (새 탭 대신)
+  // 포커스 탈취가 최소화되고 Claude Code와 나란히 보임
+  if (process.env.WT_SESSION) {
+    try {
+      const child = spawn("wt.exe", [
+        "-w", "0", "sp", "-H", "-s", "0.35",
+        "--profile", "triflux",
+        "--title", `▲ ${sessionName}`,
+        "--", "psmux", "attach", "-t", sessionName,
+      ], { detached: true, stdio: "ignore" });
+      child.unref();
+      // 스플릿 후 원래 pane으로 포커스 복귀
+      try { spawn("wt.exe", ["-w", "0", "mf", "up"], { detached: true, stdio: "ignore" }).unref(); } catch {}
+      return true;
+    } catch { /* fallthrough to tab */ }
+  }
+
+  // WT 세션 외부 → 새 탭 fallback
   try {
-    // psmux attach로 전체 세션을 WT 탭에 표시
     const child = spawn("wt.exe", [
       "-w", "0", "nt",
       "--profile", "triflux",
@@ -533,7 +550,6 @@ export function attachDashboardTab(sessionName, workerCount = 2) {
     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 {

package/hub/team/tui-viewer.mjs

@@ -1,25 +1,28 @@
 #!/usr/bin/env node
-// hub/team/tui-viewer.mjs — psmux pane용 TUI 대시보드 뷰어 v2
-// 같은 psmux 세션의 워커 pane을 capture-pane으로 실시간 모니터링
+// hub/team/tui-viewer.mjs — psmux pane용 append-only 로그 뷰어 v3
+// 같은 psmux 세션의 워커 pane을 capture-pane으로 모니터링한다.
 
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import { execFileSync } from "node:child_process";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
-import { createTui } from "./tui.mjs";
+import { createLogDashboard } 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 = join(tmpdir(), "tfx-headless");
+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);
 }
 
-const tui = createTui({ refreshMs: 0 });
+const tui = createLogDashboard({ refreshMs: 0 });
 const startTime = Date.now();
 tui.setStartTime(startTime);
 
@@ -34,7 +37,9 @@ function listPanes() {
       const [index, title, pid] = line.split(":");
       return { index: parseInt(index, 10), title: title || "", pid };
     });
-  } catch { return []; }
+  } catch {
+    return [];
+  }
 }
 
 // ── pane 캡처 ──
@@ -43,7 +48,9 @@ function capturePane(paneIdx, lines = 5) {
     return execFileSync("psmux", [
       "capture-pane", "-t", `${SESSION}:0.${paneIdx}`, "-p",
     ], { encoding: "utf8", timeout: 2000 }).trim().split("\n").slice(-lines).join("\n");
-  } catch { return ""; }
+  } catch {
+    return "";
+  }
 }
 
 // ── result 파일에서 handoff 파싱 ──
@@ -54,7 +61,9 @@ function checkResultFile(paneName) {
     const content = readFileSync(resultFile, "utf8");
     if (content.trim().length === 0) return null;
     return processHandoff(content, { exitCode: 0, resultFile });
-  } catch { return null; }
+  } catch {
+    return null;
+  }
 }
 
 // ── 메인 폴링 ──
@@ -110,16 +119,20 @@ function poll() {
     const elapsed = Math.round((Date.now() - startTime) / 1000);
     if (resultSize > 10 || shellReturned) {
       workerState.set(paneName, { paneIdx: pane.index, done: true });
-      const meaningful = lines.filter(l => !(/^(PS\s|>|\$)/.test(l)) && !(/tokens?\s+used/i.test(l)));
+      const meaningful = lines.filter((l) => !(/^(PS\s|>|\$)/.test(l)) && !(/tokens?\s+used/i.test(l)));
       const verdict = meaningful.pop()?.slice(0, 80) || "completed";
-      tui.updateWorker(paneName, { cli, role: pane.title, status: "completed", handoff: { verdict, confidence: tokensLine ? "high" : "low" }, elapsed });
+      tui.updateWorker(paneName, {
+        cli,
+        role: pane.title,
+        status: "completed",
+        handoff: { verdict, confidence: tokensLine ? "high" : "low" },
+        elapsed,
+      });
     } else {
       const meaningful = lines.filter(l => !(/^(PS\s|>|\$)/.test(l)));
       const snap = meaningful.pop()?.slice(0, 60) || lastLine.slice(0, 60);
       tui.updateWorker(paneName, { cli, role: pane.title, status: "running", snapshot: snap, elapsed });
     }
-    // debug: stderr에 상태 출력 (캡처 영향 없음)
-    process.stderr.write(`[dbg] ${paneName} cli=${cli} status=${shellReturned?"done":"run"} lines=${lines.length}\n`);
   }
 
   tui.render();

package/hub/team/tui.mjs

@@ -31,14 +31,14 @@ export function createLogDashboard(opts = {}) {
   let closed = false;
   let frameCount = 0;
   const lastLineByWorker = new Map();
-  let lastPipelineLine = "";
 
   function out(text) { if (!closed) stream.write(`${text}\n`); }
 
-  function elapsedLabel(st) {
-    const sec = Number.isFinite(st.elapsed)
-      ? Math.max(0, Math.round(st.elapsed))
-      : Math.max(0, Math.round((Date.now() - startedAt) / 1000));
+  function nowElapsedSec() {
+    return Math.max(0, Math.round((Date.now() - startedAt) / 1000));
+  }
+
+  function elapsedLabel(sec) {
     return dim(`[${sec}s]`);
   }
 
@@ -79,13 +79,8 @@ export function createLogDashboard(opts = {}) {
     const workerLabel = color(name, FG.triflux);
     const statusText = statusLabel(status);
     const message = messageLabel(st);
-    return `${elapsedLabel(st)} ${icon} ${workerLabel} (${cliLabel}) ${statusText} ${dim("—")} ${message}`;
-  }
-
-  function pipelineLine() {
-    const phase = pipeline.phase || "exec";
-    const fix = Number.isFinite(pipeline.fix_attempt) ? pipeline.fix_attempt : 0;
-    return `${dim(`[${Math.max(0, Math.round((Date.now() - startedAt) / 1000))}s]`)} ${color("◇", FG.accent)} ${color("pipeline", FG.accent)} ${dim("(system)")} ${dim("state")} ${dim("—")} ${oneLine(`${phase} (fix=${fix})`, phase)}`;
+    const sec = Number.isFinite(st._logSec) ? st._logSec : nowElapsedSec();
+    return `${elapsedLabel(sec)} ${icon} ${workerLabel} (${cliLabel}) ${statusText} ${dim("—")} ${message}`;
   }
 
   // 현재 상태와 마지막으로 출력한 라인을 비교해 변경분만 append
@@ -102,16 +97,8 @@ export function createLogDashboard(opts = {}) {
         out(line);
       }
     }
-
-    const nextPipelineLine = pipelineLine();
-    if (nextPipelineLine !== lastPipelineLine) {
-      lastPipelineLine = nextPipelineLine;
-      out(nextPipelineLine);
-    }
   }
 
-  out(`${dim("[0s]")} ${color("▲ triflux", FG.triflux)} ${dim(`v${VERSION}`)} ${dim("log-dashboard started")}`);
-
   if (refreshMs > 0) {
     timer = setInterval(render, refreshMs);
     if (timer.unref) timer.unref();
@@ -120,18 +107,37 @@ export function createLogDashboard(opts = {}) {
   return {
     updateWorker(paneName, state) {
       const existing = workers.get(paneName) || { cli: "codex", status: "pending" };
-      workers.set(paneName, { ...existing, ...state });
+      const merged = { ...existing, ...state };
+      const nextSig = [
+        merged.cli || "",
+        merged.status || "",
+        merged.snapshot || "",
+        merged.handoff?.verdict || "",
+      ].join("|");
+      const sigChanged = nextSig !== existing._sig;
+      const explicitElapsed = Number.isFinite(state.elapsed) ? Math.max(0, Math.round(state.elapsed)) : null;
+      merged._sig = nextSig;
+      merged._logSec = sigChanged
+        ? (explicitElapsed ?? nowElapsedSec())
+        : (Number.isFinite(existing._logSec) ? existing._logSec : (explicitElapsed ?? nowElapsedSec()));
+      workers.set(paneName, merged);
+    },
+    updatePipeline(state) {
+      pipeline = { ...pipeline, ...state };
+    },
+    setStartTime(ms) {
+      startedAt = ms;
     },
-    updatePipeline(state) { pipeline = { ...pipeline, ...state }; },
-    setStartTime(ms) { startedAt = ms; },
     render,
     getWorkers() { return new Map(workers); },
     getFrameCount() { return frameCount; },
     close() {
       if (closed) return;
-      closed = true;
       if (timer) clearInterval(timer);
-      out(`${dim(`[${Math.max(0, Math.round((Date.now() - startedAt) / 1000))}s]`)} ${dim("log-dashboard stopped")}`);
+      closed = true;
     },
   };
 }
+
+// 하위 호환
+export { createLogDashboard as createTui };

package/package.json

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