triflux 8.11.2 → 8.12.2

package/hub/team/headless.mjs

@@ -22,6 +22,7 @@ import {
 import { HANDOFF_INSTRUCTION_SHORT, processHandoff } from "./handoff.mjs";
 import { getBackend } from "./backend.mjs";
 import { resolveDashboardLayout } from "./dashboard-layout.mjs";
+import { normalizeDashboardAnchor } from "./dashboard-anchor.mjs";
 import { createLogDashboard } from "./tui.mjs";
 
 const RESULT_DIR = join(tmpdir(), "tfx-headless");
@@ -49,6 +50,11 @@ export function resolveCliType(agentOrCli) {
   return AGENT_TO_CLI[agentOrCli] || agentOrCli;
 }
 
+// remote-spawn.mjs의 escapePwshSingleQuoted와 동일 — 순환 의존 방지를 위해 인라인
+function escapePwshSingleQuoted(value) {
+  return String(value).replace(/'/g, "''");
+}
+
 /** MCP 프로필별 프롬프트 힌트 (tfx-route.sh resolve_mcp_policy의 경량 미러) */
 const MCP_PROFILE_HINTS = {
   implement: "You have full filesystem read/write access. Implement changes directly.",
@@ -66,10 +72,11 @@ const MCP_PROFILE_HINTS = {
  * @param {boolean} [opts.handoff=true]
  * @param {string} [opts.mcp] — MCP 프로필 ("implement"|"analyze"|"review"|"docs")
  * @param {string} [opts.contextFile] — 컨텍스트 파일 경로 (최대 32KB, UTF-8 안전 절단)
+ * @param {string} [opts.cwd] — 워커 실행 작업 디렉터리
  * @returns {string} PowerShell 명령
  */
 export function buildHeadlessCommand(cli, prompt, resultFile, opts = {}) {
-  const { handoff = true, mcp, contextFile, model } = opts;
+  const { handoff = true, mcp, contextFile, model, cwd } = opts;
   const resolvedCli = resolveCliType(cli);
 
   // contextFile 처리: 32KB(32768 bytes) 초과 시 UTF-8 안전 절단
@@ -96,7 +103,14 @@ export function buildHeadlessCommand(cli, prompt, resultFile, opts = {}) {
 
   const backend = getBackend(resolvedCli);
   const promptExpr = `(Get-Content -Raw '${promptFile}')`;
-  return backend.buildArgs(promptExpr, resultFile, { ...opts, model });
+  const backendCommand = backend.buildArgs(promptExpr, resultFile, { ...opts, model });
+  const safeCwd = typeof cwd === "string" ? cwd.trim().replace(/[\r\n\x00-\x1f]/g, "") : "";
+  if (safeCwd && (safeCwd.startsWith("\\\\") || safeCwd.startsWith("//"))) {
+    throw new Error("[headless] UNC 경로는 cwd로 사용할 수 없습니다: " + safeCwd);
+  }
+  if (!safeCwd) return backendCommand;
+
+  return `Set-Location -LiteralPath '${escapePwshSingleQuoted(safeCwd)}'; ${backendCommand}`;
 }
 
 /**
@@ -160,7 +174,7 @@ async function dispatchProgressive(sessionName, assignments, opts = {}) {
 
     // 캡처 시작 + 컬러 배너 + 명령 dispatch
     const resultFile = join(RESULT_DIR, `${sessionName}-${paneName}.txt`).replace(/\\/g, "/");
-    const cmd = buildHeadlessCommand(assignment.cli, assignment.prompt, resultFile, { mcp: assignment.mcp, model: assignment.model });
+    const cmd = buildHeadlessCommand(assignment.cli, assignment.prompt, resultFile, { mcp: assignment.mcp, model: assignment.model, cwd: assignment.cwd });
     startCapture(sessionName, newPaneId);
     // pane 간 pipe-pane EBUSY 방지 — 이벤트 루프 해방하며 순차 대기
     if (i > 0) await new Promise(r => setTimeout(r, 300));
@@ -204,7 +218,7 @@ function dispatchBatch(sessionName, assignments, opts = {}) {
   return assignments.map((assignment, i) => {
     const paneName = `worker-${i + 1}`;
     const resultFile = join(RESULT_DIR, `${sessionName}-${paneName}.txt`).replace(/\\/g, "/");
-    const cmd = buildHeadlessCommand(assignment.cli, assignment.prompt, resultFile, { mcp: assignment.mcp, model: assignment.model });
+    const cmd = buildHeadlessCommand(assignment.cli, assignment.prompt, resultFile, { mcp: assignment.mcp, model: assignment.model, cwd: assignment.cwd });
     const scriptDir = join(RESULT_DIR, sessionName);
     const dispatch = dispatchCommand(sessionName, paneName, cmd, { scriptDir, scriptName: paneName });
 
@@ -595,37 +609,45 @@ export function autoAttachTerminal(sessionName, opts = {}, workerCount = 2) {
       "--", "psmux", "attach", "-t", sessionName,
     ], { detached: true, stdio: "ignore" });
     child.unref();
-    try { spawn("wt.exe", ["-w", "0", "mf", "up"], { detached: true, stdio: "ignore" }).unref(); } catch { /* 무시 */ }
+    // v7.2: mf up 제거 — 새 WT window/process로 attach하므로 포커스 이동 불필요
     return true;
   } catch { return false; }
 }
 
+export function buildDashboardAttachArgs(sessionName, dashboardLayout = "single", workerCount = 2, dashboardAnchor = "window") {
+  const safeName = String(sessionName).replace(/[^a-zA-Z0-9_\-]/g, "") || "tfx-session";
+  const resolvedDashboardLayout = resolveDashboardLayout(dashboardLayout, workerCount);
+  const resolvedDashboardAnchor = normalizeDashboardAnchor(dashboardAnchor);
+  const viewerPath = join(import.meta.dirname, "tui-viewer.mjs").replace(/\\/g, "/");
+  const viewerArgs = [
+    "--profile", "triflux",
+    "--title", `▲ ${safeName}`,
+    "--", "node", viewerPath, "--session", safeName, "--result-dir", RESULT_DIR, "--layout", resolvedDashboardLayout,
+  ];
+
+  if (resolvedDashboardAnchor === "tab") {
+    return ["-w", "0", "nt", ...viewerArgs];
+  }
+  return ["-w", "new", ...viewerArgs];
+}
+
 /**
  * v7.0: psmux 세션을 WT 탭에 attach (대시보드 + 워커 전체 뷰)
  * @param {string} sessionName
  * @param {number} workerCount
  * @param {string} [dashboardLayout='single']
  * @param {number} [dashboardSize=0.50] — 대시보드 분할 비율 (0.2~0.8)
+ * @deprecated dashboardSize — anchor=window|tab 모드에서는 무시됨
+ * @param {string} [dashboardAnchor='window'] — dashboard anchor 정책(window|tab)
  * @returns {boolean}
  */
-export function attachDashboardTab(sessionName, workerCount = 2, dashboardLayout = "single", dashboardSize = 0.40) {
+export function attachDashboardTab(sessionName, workerCount = 2, dashboardLayout = "single", dashboardSize = 0.40, dashboardAnchor = "window") {
   try { execSync("where wt.exe", { stdio: "ignore" }); } catch { return false; }
   ensureWtProfile(workerCount);
-  const resolvedDashboardLayout = resolveDashboardLayout(dashboardLayout, workerCount);
-
-  // v7.1.3: 대시보드만 스플릿 (psmux attach 대신 tui-viewer 직접 실행)
-  // raw CLI 출력은 사용자에게 불필요 — 대시보드 로그만 표시
-  const viewerPath = join(import.meta.dirname, "tui-viewer.mjs").replace(/\\/g, "/");
-  const sizeStr = String(Math.round(dashboardSize * 100) / 100);
   try {
-    const child = spawn("wt.exe", [
-      "-w", "0", "sp", "-H", "-s", sizeStr,
-      "--profile", "triflux",
-      "--title", `▲ ${sessionName}`,
-      "--", "node", viewerPath, "--session", sessionName, "--result-dir", RESULT_DIR, "--layout", resolvedDashboardLayout,
-    ], { detached: true, stdio: "ignore" });
+    const args = buildDashboardAttachArgs(sessionName, dashboardLayout, workerCount, dashboardAnchor);
+    const child = spawn("wt.exe", args, { detached: true, stdio: "ignore" });
     child.unref();
-    try { spawn("wt.exe", ["-w", "0", "mf", "up"], { detached: true, stdio: "ignore" }).unref(); } catch {}
     return true;
   } catch { return false; }
 }
@@ -664,6 +686,7 @@ export function getProgressSnapshots(sessionName, dispatches, lines = 15) {
  * @param {number} [opts.progressIntervalSec=0]
  * @param {boolean} [opts.autoAttach=false] — Windows Terminal 자동 attach
  * @param {string} [opts.dashboardLayout='single'] — dashboard viewer 레이아웃
+ * @param {string} [opts.dashboardAnchor='window'] — dashboard anchor 정책(window|tab)
  * @param {AbortSignal} [opts.signal] — abort 시 자동 세션 정리
  * @param {number} [opts.maxIdleSec=0] — 유휴 시 자동 정리 (0=비활성)
  * @returns {Promise<{
@@ -683,6 +706,7 @@ export async function runHeadlessInteractive(sessionName, assignments, opts = {}
     autoAttach = false,
     dashboard = false,
     dashboardSize = 0.40,
+    dashboardAnchor = "window",
     signal,
     maxIdleSec = 0,
     ...runOpts
@@ -704,6 +728,7 @@ export async function runHeadlessInteractive(sessionName, assignments, opts = {}
           assignments.length,
           event.dashboardLayout || resolveDashboardLayout(headlessOpts.dashboardLayout, assignments.length),
           dashboardSize,
+          dashboardAnchor,
         );
       } else {
         autoAttachTerminal(sessionName, {}, assignments.length);