triflux 6.0.5 → 6.0.7

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

@@ -38,7 +38,9 @@ function renderTmuxInstallHelp() {
 export { parseTeamArgs };
 
 export async function teamStart(args = []) {
-  const { agents, lead, layout, teammateMode, task } = parseTeamArgs(args);
+  const { agents, lead, layout, teammateMode, task: rawTask, assigns, autoAttach, progressive, timeoutSec } = parseTeamArgs(args);
+  // --assign 사용 시 task를 자동 생성
+  const task = rawTask || (assigns.length > 0 ? assigns.map(a => a.prompt).join(" + ") : "");
   if (!task) return printStartUsage();
 
   console.log(`\n  ${AMBER}${BOLD}⬡ tfx multi${RESET}\n`);
@@ -70,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 })
+      ? await startHeadlessTeam({ sessionId, task, lead, agents, subtasks, layout, assigns, autoAttach, progressive, timeoutSec })
       : 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

@@ -1,32 +1,52 @@
-import { normalizeLayout, normalizeTeammateMode } from "../../services/runtime-mode.mjs";
-
-export function parseTeamArgs(args = []) {
-  let agents = ["codex", "gemini"];
-  let lead = "claude";
-  let layout = "2x2";
-  let teammateMode = "auto";
-  const taskParts = [];
-
-  for (let index = 0; index < args.length; index += 1) {
-    const current = args[index];
-    if (current === "--agents" && args[index + 1]) {
-      agents = args[++index].split(",").map((value) => value.trim().toLowerCase()).filter(Boolean);
-    } else if (current === "--lead" && args[index + 1]) {
-      lead = args[++index].trim().toLowerCase();
-    } else if (current === "--layout" && args[index + 1]) {
-      layout = args[++index];
-    } else if ((current === "--teammate-mode" || current === "--mode") && args[index + 1]) {
-      teammateMode = args[++index];
-    } else if (!current.startsWith("-")) {
-      taskParts.push(current);
-    }
-  }
-
-  return {
-    agents,
-    lead,
-    layout: normalizeLayout(layout),
-    teammateMode: normalizeTeammateMode(teammateMode),
-    task: taskParts.join(" ").trim(),
-  };
-}
+import { normalizeLayout, normalizeTeammateMode } from "../../services/runtime-mode.mjs";
+
+export function parseTeamArgs(args = []) {
+  let agents = ["codex", "gemini"];
+  let lead = "claude";
+  let layout = "2x2";
+  let teammateMode = "auto";
+  const taskParts = [];
+  const assigns = []; // --assign "codex:프롬프트:역할" 형식
+  let autoAttach = false;
+  let progressive = true;
+  let timeoutSec = 300;
+
+  for (let index = 0; index < args.length; index += 1) {
+    const current = args[index];
+    if (current === "--agents" && args[index + 1]) {
+      agents = args[++index].split(",").map((value) => value.trim().toLowerCase()).filter(Boolean);
+    } else if (current === "--lead" && args[index + 1]) {
+      lead = args[++index].trim().toLowerCase();
+    } else if (current === "--layout" && args[index + 1]) {
+      layout = args[++index];
+    } else if ((current === "--teammate-mode" || current === "--mode") && args[index + 1]) {
+      teammateMode = args[++index];
+    } else if (current === "--assign" && args[index + 1]) {
+      // "cli:prompt:role" 형식 파싱
+      const parts = args[++index].split(":");
+      if (parts.length >= 2) {
+        assigns.push({ cli: parts[0].trim(), prompt: parts.slice(1, -1).join(":").trim() || parts[1].trim(), role: parts[parts.length - 1]?.trim() || "" });
+      }
+    } else if (current === "--auto-attach") {
+      autoAttach = true;
+    } else if (current === "--no-progressive") {
+      progressive = false;
+    } else if (current === "--timeout" && args[index + 1]) {
+      timeoutSec = Number(args[++index]) || 300;
+    } else if (!current.startsWith("-")) {
+      taskParts.push(current);
+    }
+  }
+
+  return {
+    agents,
+    lead,
+    layout: normalizeLayout(layout),
+    teammateMode: normalizeTeammateMode(teammateMode),
+    task: taskParts.join(" ").trim(),
+    assigns,
+    autoAttach,
+    progressive,
+    timeoutSec,
+  };
+}

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

@@ -1,33 +1,43 @@
 import { BOLD, DIM, GREEN, RESET, AMBER } from "../../../shared.mjs";
-import { runHeadless } from "../../../headless.mjs";
-import { killPsmuxSession } from "../../../psmux.mjs";
+import { runHeadlessInteractive } from "../../../headless.mjs";
 import { ok, warn } from "../../render.mjs";
 import { buildTasks } from "../../services/task-model.mjs";
 
-export async function startHeadlessTeam({ sessionId, task, lead, agents, subtasks, layout }) {
-  console.log(`  ${AMBER}모드: headless (psmux 헤드리스 CLI 실행)${RESET}`);
+export async function startHeadlessTeam({ sessionId, task, lead, agents, subtasks, layout, assigns, autoAttach, progressive, timeoutSec }) {
+  console.log(`  ${AMBER}모드: headless (Lead-Direct v6.0.0)${RESET}`);
 
-  const assignments = subtasks.map((subtask, i) => ({
-    cli: agents[i],
-    prompt: subtask,
-    role: `worker-${i + 1}`,
-  }));
+  // --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("헤드리스 실행 시작...");
-  const { sessionName, results } = await runHeadless(sessionId, assignments, {
-    timeoutSec: 300,
+  ok(`헤드리스 실행 시작 (${assignments.length}워커, progressive=${progressive !== false})`);
+
+  const handle = await runHeadlessInteractive(sessionId, assignments, {
+    timeoutSec: timeoutSec || 300,
     layout,
+    autoAttach: autoAttach !== false, // 기본 true
+    progressive: progressive !== false, // 기본 true
+    progressIntervalSec: 10,
     onProgress(event) {
-      if (event.type === "dispatched") {
+      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 ? " (session dead)" : ""}`);
+        console.log(`  ${icon} [${event.paneName}] ${event.cli} exit=${event.exitCode}${event.sessionDead ? " (dead)" : ""}`);
       }
     },
   });
 
   // 결과 요약
+  const results = handle.results;
   const succeeded = results.filter((r) => r.matched && r.exitCode === 0);
   const failed = results.filter((r) => !r.matched || r.exitCode !== 0);
 
@@ -36,41 +46,39 @@ export async function startHeadlessTeam({ sessionId, task, lead, agents, subtask
 
   if (failed.length > 0) {
     warn("실패 워커:");
-    for (const r of failed) {
-      console.log(`    ${r.paneName} (${r.cli}): exit=${r.exitCode}${r.sessionDead ? " session dead" : ""}`);
-    }
+    for (const r of failed) console.log(`    ${r.paneName} (${r.cli}): exit=${r.exitCode}`);
   }
 
-  // 결과 출력 (각 워커의 output 요약)
+  // 결과 출력 + JSON stdout
   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}) ──${RESET}`);
+      console.log(`\n  ${DIM}── ${r.paneName} (${r.cli}${r.role ? `, ${r.role}` : ""}) ──${RESET}`);
       console.log(`  ${preview}`);
     }
   }
 
   // 세션 정리
-  try { killPsmuxSession(sessionName); } catch { /* already cleaned */ }
+  handle.kill();
 
   const members = [
-    { role: "lead", name: "lead", cli: lead, pane: `${sessionName}:0.0` },
-    ...results.map((r, i) => ({ role: "worker", name: r.paneName, cli: r.cli, pane: `${sessionName}:0.${i + 1}`, subtask: subtasks[i] })),
+    { role: "lead", name: "lead", cli: lead, pane: `${handle.sessionName}:0.0` },
+    ...results.map((r, i) => ({ role: "worker", name: r.paneName, cli: r.cli, pane: r.paneId || "", subtask: assignments[i]?.prompt })),
   ];
 
   return {
-    sessionName,
+    sessionName: handle.sessionName,
     task,
     lead,
-    agents,
+    agents: assignments.map(a => a.cli),
     layout,
     teammateMode: "headless",
     startedAt: Date.now(),
     members,
     headlessResults: results,
-    tasks: buildTasks(subtasks, members.filter((m) => m.role === "worker")),
+    tasks: buildTasks(assignments.map(a => a.prompt), members.filter((m) => m.role === "worker")),
     postSave() {
-      console.log(`\n  ${DIM}세션 자동 정리 완료. 결과는 위에 표시됨.${RESET}\n`);
+      console.log(`\n  ${DIM}세션 정리 완료.${RESET}\n`);
     },
   };
 }

package/hub/team/headless.mjs

@@ -20,6 +20,15 @@ import {
 
 const RESULT_DIR = join(tmpdir(), "tfx-headless");
 
+/** CLI별 브랜드 — 이모지 + ANSI 색상 (시각적 구분) */
+const CLI_BRAND = {
+  codex:  { emoji: "\u{1F7E2}", label: "Codex",  ansi: "\x1b[32m" },  // 🟢 green
+  gemini: { emoji: "\u{1F535}", label: "Gemini", ansi: "\x1b[34m" },  // 🔵 blue
+  claude: { emoji: "\u{1F7E0}", label: "Claude", ansi: "\x1b[33m" },  // 🟠 yellow/orange
+};
+const ANSI_RESET = "\x1b[0m";
+const ANSI_DIM = "\x1b[2m";
+
 /**
  * CLI별 헤드리스 명령 빌더
  * @param {'codex'|'gemini'|'claude'} cli
@@ -96,25 +105,34 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
 
     dispatches = assignments.map((assignment, i) => {
       const paneName = `worker-${i + 1}`;
+      const brand = CLI_BRAND[assignment.cli] || { emoji: "\u{25CF}", label: assignment.cli, ansi: "" };
       const paneTitle = assignment.role
-        ? `${assignment.cli} (${assignment.role})`
-        : `${assignment.cli}-${i + 1}`;
-
-      // split-window로 새 pane 추가 — paneId 직접 획득
-      const newPaneId = psmuxExec([
-        "split-window", "-t", sessionName, "-P", "-F",
-        "#{session_name}:#{window_index}.#{pane_index}",
-      ]);
+        ? `${brand.emoji} ${assignment.cli} (${assignment.role})`
+        : `${brand.emoji} ${assignment.cli}-${i + 1}`;
+
+      let newPaneId;
+      if (i === 0) {
+        // 첫 번째 워커: 빈 lead pane을 직접 사용 (빈 pane 제거)
+        newPaneId = `${sessionName}:0.0`;
+      } else {
+        // 2번째+: split-window로 추가
+        newPaneId = psmuxExec([
+          "split-window", "-t", sessionName, "-P", "-F",
+          "#{session_name}:#{window_index}.#{pane_index}",
+        ]);
+      }
 
-      // 타이틀 설정
+      // 타이틀 설정 (이모지 포함)
       try { psmuxExec(["select-pane", "-t", newPaneId, "-T", paneTitle]); } catch { /* 무시 */ }
 
       if (safeProgress) safeProgress({ type: "worker_added", paneName, cli: assignment.cli, paneTitle });
 
-      // 캡처 시작 + 명령 dispatch (paneId 직접 사용 — resolvePane race 회피)
+      // 캡처 시작 + 컬러 배너 + 명령 dispatch
       const resultFile = join(RESULT_DIR, `${sessionName}-${paneName}.txt`).replace(/\\/g, "/");
       const cmd = buildHeadlessCommand(assignment.cli, assignment.prompt, resultFile);
       startCapture(sessionName, newPaneId);
+      // pane 간 pipe-pane EBUSY 방지 — capture 스크립트 파일 잠금 해제 대기
+      if (i > 0) { try { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 300); } catch {} }
       const dispatch = dispatchCommand(sessionName, newPaneId, cmd);
 
       if (safeProgress) safeProgress({ type: "dispatched", paneName, cli: assignment.cli });
@@ -276,15 +294,16 @@ export function autoAttachTerminal(sessionName, opts = {}) {
     return false; // wt.exe 미설치 — 사용자에게 수동 attach 안내 필요
   }
 
-  // PowerShell 래핑 — wt가 psmux를 파일로 인식하는 문제 방지
+  // PowerShell 래핑 + "--" 구분자 + 포커스 비탈취
   // pwsh.exe (PS7) 우선, 없으면 powershell.exe (PS5.1) fallback
   const shells = ["pwsh.exe", "powershell.exe"];
   for (const shell of shells) {
     try {
-      execFileSync("wt.exe", [
-        "nt", shell, "-NoExit", "-Command",
-        `psmux attach -t ${sessionName}`,
-      ], { stdio: "ignore" });
+      // start "" /b — 포커스를 현재 창에 유지 (사용자 타이핑 보호)
+      execSync(
+        `start "" /b wt.exe nt --title triflux -- ${shell} -NoExit -Command "psmux attach -t ${sessionName}"`,
+        { stdio: "ignore", shell: true, timeout: 5000 },
+      );
       return true;
     } catch { /* 다음 shell 시도 */ }
   }

package/package.json

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