triflux 6.0.4 → 6.0.6

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

@@ -171,7 +171,9 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
       };
     }
 
-    const completion = await waitForCompletion(sessionName, d.paneName, d.token, timeoutSec, pollOpts);
+    // dispatch 시 확정된 logPath를 전달 — 셸이 pane 타이틀 변경해도 캡처 로그 매칭 유지
+    if (d.logPath) pollOpts.logPath = d.logPath;
+    const completion = await waitForCompletion(sessionName, d.paneId || d.paneName, d.token, timeoutSec, pollOpts);
 
     const output = completion.matched
       ? readResult(d.resultFile, d.paneId)
@@ -247,6 +249,8 @@ export function applyTrifluxTheme(sessionName) {
     ["pane-border-style", "fg=#45475a"],
     // Status bar 위치
     ["status-position", "bottom"],
+    // 셸이 pane 타이틀을 변경하는 것 방지 (캡처 로그 경로 안정성)
+    ["allow-rename", "off"],
   ];
   for (const [key, value] of opts) {
     try { psmuxExec(["set-option", "-t", sessionName, key, value]); } catch { /* 무시 */ }
@@ -272,18 +276,21 @@ export function autoAttachTerminal(sessionName, opts = {}) {
     return false; // wt.exe 미설치 — 사용자에게 수동 attach 안내 필요
   }
 
-  try {
-    // Fix P2: argv 스타일 — shell injection 방지
-    execFileSync("wt.exe", ["-w", "0", "nt", "psmux", "attach", "-t", sessionName], { stdio: "ignore" });
-    return true;
-  } catch {
+  // PowerShell 래핑 — wt가 psmux를 파일로 인식하는 문제 방지
+  // "--" 구분자 필수: -NoExit 등이 wt 옵션으로 해석되는 것 방지
+  // pwsh.exe (PS7) 우선, 없으면 powershell.exe (PS5.1) fallback
+  const shells = ["pwsh.exe", "powershell.exe"];
+  for (const shell of shells) {
     try {
-      execFileSync("wt.exe", ["psmux", "attach", "-t", sessionName], { stdio: "ignore" });
+      execFileSync("wt.exe", [
+        "nt", "--title", "triflux", "--",
+        shell, "-NoExit", "-Command",
+        `psmux attach -t ${sessionName}`,
+      ], { stdio: "ignore" });
       return true;
-    } catch {
-      return false;
-    }
+    } catch { /* 다음 shell 시도 */ }
   }
+  return false;
 }
 
 /**

package/hub/team/psmux.mjs

@@ -667,7 +667,10 @@ export async function waitForPattern(sessionName, paneNameOrTarget, pattern, tim
   }
 
   const paneName = pane.title || paneNameOrTarget;
-  const logPath = getCaptureLogPath(sessionName, paneName);
+  // opts.logPath: dispatch 시 확정된 캡처 로그 경로 직접 지정 (타이틀 변경 내성)
+  const logPath = (opts.logPath && existsSync(opts.logPath))
+    ? opts.logPath
+    : getCaptureLogPath(sessionName, paneName);
   if (!existsSync(logPath)) {
     throw new Error(`캡처 로그가 없습니다. 먼저 startCapture(${sessionName}, ${paneName})를 호출하세요.`);
   }
@@ -679,7 +682,13 @@ export async function waitForPattern(sessionName, paneNameOrTarget, pattern, tim
   while (Date.now() <= deadline) {
     // E4 크래시 복구: capture 실패 시 세션 생존 체크
     try {
-      refreshCaptureSnapshot(sessionName, pane.paneId);
+      if (opts.logPath) {
+        // logPath 직접 지정 시 — 셸 타이틀 변경과 무관하게 올바른 파일에 기록
+        const snapshot = psmuxExec(["capture-pane", "-t", pane.paneId, "-p"]);
+        writeFileSync(logPath, snapshot, "utf8");
+      } else {
+        refreshCaptureSnapshot(sessionName, pane.paneId);
+      }
     } catch {
       if (!psmuxSessionExists(sessionName)) {
         return {

package/package.json

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