triflux 6.0.20 → 6.0.21

package/hub/team/cli/commands/start/index.mjs

@@ -38,7 +38,7 @@ function renderTmuxInstallHelp() {
 export { parseTeamArgs };
 
 export async function teamStart(args = []) {
-  const { agents, lead, layout, teammateMode, task: rawTask, assigns, autoAttach, progressive, timeoutSec } = parseTeamArgs(args);
+  const { agents, lead, layout, teammateMode, task: rawTask, assigns, autoAttach, progressive, timeoutSec, verbose } = parseTeamArgs(args);
   // --assign 사용 시 task를 자동 생성
   const task = rawTask || (assigns.length > 0 ? assigns.map(a => a.prompt).join(" + ") : "");
   if (!task) return printStartUsage();
@@ -72,7 +72,7 @@ export async function teamStart(args = []) {
   const state = effectiveMode === "in-process"
     ? await startInProcessTeam({ sessionId, task, lead, agents, subtasks, hubUrl })
     : effectiveMode === "headless"
-      ? await startHeadlessTeam({ sessionId, task, lead, agents, subtasks, layout, assigns, autoAttach, progressive, timeoutSec })
+      ? await startHeadlessTeam({ sessionId, task, lead, agents, subtasks, layout, assigns, autoAttach, progressive, timeoutSec, verbose })
       : effectiveMode === "wt"
         ? await startWtTeam({ sessionId, task, lead, agents, subtasks, layout, hubUrl })
         : await startMuxTeam({ sessionId, task, lead, agents, subtasks, layout, hubUrl, teammateMode: effectiveMode });

package/hub/team/cli/commands/start/parse-args.mjs

@@ -7,9 +7,10 @@ export function parseTeamArgs(args = []) {
   let teammateMode = "auto";
   const taskParts = [];
   const assigns = []; // --assign "codex:프롬프트:역할" 형식
-  let autoAttach = true;
+  let autoAttach = false;
   let progressive = true;
   let timeoutSec = 300;
+  let verbose = false;
 
   for (let index = 0; index < args.length; index += 1) {
     const current = args[index];
@@ -29,6 +30,10 @@ export function parseTeamArgs(args = []) {
       }
     } else if (current === "--auto-attach") {
       autoAttach = true;
+    } else if (current === "--no-auto-attach") {
+      autoAttach = false;
+    } else if (current === "--verbose") {
+      verbose = true;
     } else if (current === "--no-progressive") {
       progressive = false;
     } else if (current === "--timeout" && args[index + 1]) {
@@ -48,5 +53,6 @@ export function parseTeamArgs(args = []) {
     autoAttach,
     progressive,
     timeoutSec,
+    verbose,
   };
 }

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

@@ -4,23 +4,21 @@ import { ok, warn } from "../../render.mjs";
 import { buildTasks } from "../../services/task-model.mjs";
 import { clearTeamState } from "../../services/state-store.mjs";
 
-export async function startHeadlessTeam({ sessionId, task, lead, agents, subtasks, layout, assigns, autoAttach, progressive, timeoutSec }) {
-  console.log(`  ${AMBER}모드: headless (Lead-Direct v6.0.0)${RESET}`);
-
+export async function startHeadlessTeam({ sessionId, task, lead, agents, subtasks, layout, assigns, autoAttach, progressive, timeoutSec, verbose }) {
   // --assign이 있으면 그것을 사용, 없으면 agents+subtasks 조합
   const assignments = assigns && assigns.length > 0
     ? assigns.map((a, i) => ({ cli: a.cli, prompt: a.prompt, role: a.role || `worker-${i + 1}` }))
     : subtasks.map((subtask, i) => ({ cli: agents[i] || agents[0], prompt: subtask, role: `worker-${i + 1}` }));
 
-  ok(`헤드리스 실행 시작 (${assignments.length}워커, progressive=${progressive !== false})`);
+  ok(`headless ${assignments.length}워커 시작`);
 
   const handle = await runHeadlessInteractive(sessionId, assignments, {
     timeoutSec: timeoutSec || 300,
     layout,
-    autoAttach: autoAttach !== false, // 기본 true
-    progressive: progressive !== false, // 기본 true
-    progressIntervalSec: 10,
-    onProgress(event) {
+    autoAttach: !!autoAttach,
+    progressive: progressive !== false,
+    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") {
@@ -34,28 +32,36 @@ export async function startHeadlessTeam({ sessionId, task, lead, agents, subtask
         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,
   });
 
-  // 결과 요약
+  // 최소 결과 요약
   const results = handle.results;
   const succeeded = results.filter((r) => r.matched && r.exitCode === 0);
   const failed = results.filter((r) => !r.matched || r.exitCode !== 0);
 
-  console.log(`\n  ${GREEN}${BOLD}헤드리스 실행 완료${RESET}`);
-  console.log(`  ${DIM}성공: ${succeeded.length} / 실패: ${failed.length} / 전체: ${results.length}${RESET}`);
+  ok(`헤드리스 완료: ${succeeded.length}성공 / ${failed.length}실패 / ${results.length}전체`);
 
   if (failed.length > 0) {
-    warn("실패 워커:");
-    for (const r of failed) console.log(`    ${r.paneName} (${r.cli}): exit=${r.exitCode}`);
+    for (const r of failed) console.log(`  ${AMBER}✗${RESET} ${r.paneName} (${r.cli}) exit=${r.exitCode}`);
   }
 
-  // 결과 출력 + JSON stdout
+  // 결과 파일 경로 (Lead가 필요시 Read()로 확인)
   for (const r of results) {
-    if (r.output) {
-      const preview = r.output.length > 200 ? `${r.output.slice(0, 200)}…` : r.output;
-      console.log(`\n  ${DIM}── ${r.paneName} (${r.cli}${r.role ? `, ${r.role}` : ""}) ──${RESET}`);
-      console.log(`  ${preview}`);
+    const icon = r.matched && r.exitCode === 0 ? `${GREEN}✓${RESET}` : `${AMBER}✗${RESET}`;
+    if (r.resultFile) {
+      console.log(`  ${icon} ${r.paneName}: ${r.resultFile}`);
+    }
+  }
+
+  // --verbose: 기존 장황한 출력 (200자 preview)
+  if (verbose) {
+    for (const r of results) {
+      if (r.output) {
+        const preview = r.output.length > 200 ? `${r.output.slice(0, 200)}…` : r.output;
+        console.log(`\n  ${DIM}── ${r.paneName} (${r.cli}${r.role ? `, ${r.role}` : ""}) ──${RESET}`);
+        console.log(`  ${preview}`);
+      }
     }
   }
 

package/hub/team/headless.mjs

@@ -6,7 +6,7 @@
 import { join } from "node:path";
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { execSync, execFileSync } from "node:child_process";
+import { execSync, execFileSync, spawn } from "node:child_process";
 import {
   createPsmuxSession,
   killPsmuxSession,
@@ -39,14 +39,16 @@ const ANSI_DIM = "\x1b[2m";
 export function buildHeadlessCommand(cli, prompt, resultFile) {
   // 프롬프트의 단일 인용부호를 이스케이프
   const escaped = prompt.replace(/'/g, "''");
+  // Clear-Host: 실행 즉시 이전 PS 프롬프트 + 명령 텍스트를 깨끗이 지움
+  const cls = "Clear-Host; ";
 
   switch (cli) {
     case "codex":
-      return `codex exec '${escaped}' -o '${resultFile}' --color never`;
+      return `${cls}codex exec '${escaped}' -o '${resultFile}' --color never`;
     case "gemini":
-      return `gemini -p '${escaped}' -o text > '${resultFile}' 2>'${resultFile}.err'`;
+      return `${cls}gemini -p '${escaped}' -o text > '${resultFile}' 2>'${resultFile}.err'`;
     case "claude":
-      return `claude -p '${escaped}' --output-format text > '${resultFile}' 2>&1`;
+      return `${cls}claude -p '${escaped}' --output-format text > '${resultFile}' 2>&1`;
     default:
       throw new Error(`지원하지 않는 CLI: ${cli}`);
   }
@@ -156,7 +158,8 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
       const paneName = `worker-${i + 1}`;
       const resultFile = join(RESULT_DIR, `${sessionName}-${paneName}.txt`).replace(/\\/g, "/");
       const cmd = buildHeadlessCommand(assignment.cli, assignment.prompt, resultFile);
-      const dispatch = dispatchCommand(sessionName, paneName, cmd);
+      const scriptDir = join(RESULT_DIR, sessionName);
+      const dispatch = dispatchCommand(sessionName, paneName, cmd, { scriptDir, scriptName: paneName });
 
       // P1 fix: 비-progressive에서는 pane 리네임 금지 — 캡처 로그 경로가 타이틀 기반이므로
       // 리네임하면 waitForCompletion이 "codex (role).log"를 찾지만 실제는 "worker-N.log"로 불일치
@@ -216,6 +219,7 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
       matched: completion.matched,
       exitCode: completion.exitCode,
       output,
+      resultFile: d.resultFile,
       sessionDead: completion.sessionDead || false,
     };
   }));
@@ -278,6 +282,7 @@ export function applyTrifluxTheme(sessionName) {
  * 반투명 + 비포커스 시 더 투명 + Catppuccin 테마.
  * @returns {boolean} 성공 여부
  */
+
 /**
  * WT 기본 프로필의 폰트 크기를 읽는다.
  * @returns {number} 기본 폰트 크기 (못 읽으면 12)
@@ -357,52 +362,72 @@ export function ensureWtProfile(workerCount = 2) {
  */
 export function autoAttachTerminal(sessionName, opts = {}, workerCount = 2) {
   try {
-    // Windows Terminal이 설치되어 있는지 확인
     execSync("where wt.exe", { stdio: "ignore" });
   } catch {
-    return false; // wt.exe 미설치 — 사용자에게 수동 attach 안내 필요
+    return false;
   }
 
-  // triflux WT 프로필 확보 (투명도 + 테마 + 폰트 크기)
   ensureWtProfile(workerCount);
 
-  const shells = ["pwsh.exe", "powershell.exe"];
-  const mode = opts.mode || "auto"; // "split" | "window" | "auto"
-
-  // v6.0.20: 기본 popup(별도 창). split은 --split 명시 시에만.
-  // 이유: WT sp는 포커스된 pane을 분할하므로, 사용자가 다른 탭에 있으면
-  // 엉뚱한 곳이 분할됨. 별도 창은 포커스 무관하게 안정적.
-  const preferSplit = mode === "split";
-  const preferWindow = mode !== "split";
+  const mode = opts.mode || "auto";
 
-  if (preferSplit && !preferWindow && process.env.WT_SESSION) {
-    // inner split — 같은 WT 창에서 가로 분할
-    const splitSize = "0.50";
-    for (const shell of shells) {
-      try {
-        execSync(
-          `wt.exe -w 0 sp -H --size ${splitSize} --profile triflux --title triflux -- ${shell} -Command "psmux attach -t ${sessionName}"`,
-          { stdio: "ignore", timeout: 5000 },
-        );
-        try { execSync(`wt.exe -w 0 mf up`, { stdio: "ignore", timeout: 2000 }); } catch { /* 무시 */ }
-        return true;
-      } catch { /* 다음 shell */ }
-    }
+  if (mode === "split" && process.env.WT_SESSION) {
+    // inner split — 같은 WT 창에서 가로 분할. psmux를 직접 실행 (pwsh 불필요).
+    try {
+      const child = spawn("wt.exe", [
+        "-w", "0", "sp", "-H", "-s", "0.50",
+        "--profile", "triflux", "--title", "triflux",
+        "--", "psmux", "attach", "-t", sessionName,
+      ], { detached: true, stdio: "ignore" });
+      child.unref();
+      try { spawn("wt.exe", ["-w", "0", "mf", "up"], { detached: true, stdio: "ignore" }).unref(); } catch { /* 무시 */ }
+      return true;
+    } catch { /* fallthrough to window */ }
   }
-  // 별도 WT 창 — PowerShell 콘솔 크기 지정 후 psmux attach
+
+  // v6.0.22: 읽기전용 뷰어 + 최소화 트릭.
+  // 1. 현재 HWND 캡처 → 2. WT 열기(읽기전용 뷰어) → 3. 새 창 즉시 최소화
+  // → Windows가 자동으로 이전 창에 포커스 복원. 사용자는 작업표시줄에서 확인.
+  const logDir = join(tmpdir(), "psmux-steering", sessionName).replace(/\\/g, "/");
   const cols = Math.max(100, 60 + workerCount * 15);
   const rows = Math.max(25, 15 + workerCount * 4);
-  const resizePs = `$s=$Host.UI.RawUI;$b=$s.BufferSize;$b.Width=${cols};$s.BufferSize=$b;$w=$s.WindowSize;$w.Width=${cols};$w.Height=${rows};$s.WindowSize=$w`;
-  for (const shell of shells) {
+
+  // 읽기전용 뷰어 스크립트 생성
+  const viewerScript = join(tmpdir(), "tfx-viewer-" + sessionName + ".ps1").replace(/\\/g, "/");
+  writeFileSync(viewerScript, [
+    "$Host.UI.RawUI.WindowTitle = '" + sessionName + "'",
+    "Write-Host \"`e[38;5;214m⬡ triflux viewer (read-only)`e[0m — " + sessionName + "\"",
+    "Write-Host 'Log: " + logDir + "'",
+    "Write-Host '---'",
+    "for ($i=0; $i -lt 10; $i++) { if (Test-Path '" + logDir + "') { break }; Start-Sleep 1 }",
+    "Get-Content -Path '" + logDir + "\\*.log' -Wait -Tail 50",
+  ].join("\n"), "utf8");
+
+  // v6.0.23: 같은 WT 창에 탭 추가 (-w 0).
+  // WT에 "이전 탭" CLI 명령이 없으므로, 탭 추가 후 Ctrl+Shift+Tab 시뮬레이션.
+  try {
+    const child = spawn("wt.exe", [
+      "-w", "0", "nt",
+      "--profile", "triflux",
+      "--title", sessionName,
+      "--", "pwsh.exe", "-NoProfile", "-NoLogo", "-File", viewerScript,
+    ], { detached: true, stdio: "ignore" });
+    child.unref();
+  } catch {
+    return false;
+  }
+
+  // 300ms 후 Ctrl+Shift+Tab → "이전 탭"으로 복귀 (탭 인덱스 무관)
+  const prevTabScript = "Start-Sleep -Milliseconds 300; Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.SendKeys]::SendWait('^+{TAB}')";
+  for (const shell of ["pwsh.exe", "powershell.exe"]) {
     try {
-      execSync(
-        `start "" /b wt.exe -w new --profile triflux --title "triflux workers (${workerCount})" -- ${shell} -NoProfile -Command "${resizePs};psmux attach -t ${sessionName}"`,
-        { stdio: "ignore", shell: true, timeout: 5000 },
-      );
-      return true;
+      spawn(shell, ["-NoProfile", "-NonInteractive", "-Command", prevTabScript], {
+        detached: true, stdio: "ignore",
+      }).unref();
+      break;
     } catch { /* 다음 shell */ }
   }
-  return false;
+  return true;
 }
 
 /**

package/hub/team/psmux.mjs

@@ -630,6 +630,7 @@ export function dispatchCommand(sessionName, paneNameOrTarget, commandText) {
 
   const token = randomToken(paneName);
   const wrapped = `${commandText}; $trifluxExit = if ($null -ne $LASTEXITCODE) { [int]$LASTEXITCODE } else { 0 }; Write-Output "${COMPLETION_PREFIX}${token}:$trifluxExit"`;
+
   sendLiteralToPane(pane.paneId, wrapped, true);
 
   return { paneId: pane.paneId, paneName, token, logPath };

package/package.json

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