triflux 3.3.0-dev.1 → 3.3.0-dev.3

package/hub/team/psmux.mjs

@@ -1,10 +1,23 @@
-// hub/team/psmux.mjs — Windows psmux 세션/키바인딩/캡처 관리
-// 의존성: child_process (Node.js 내장)만 사용
-import { execSync, spawnSync } from "node:child_process";
+// hub/team/psmux.mjs — Windows psmux 세션/키바인딩/캡처/steering 관리
+// 의존성: child_process, fs, os, path (Node.js 내장)만 사용
+import childProcess from "node:child_process";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 
 const PSMUX_BIN = process.env.PSMUX_BIN || "psmux";
 const GIT_BASH = process.env.GIT_BASH_PATH || "C:\\Program Files\\Git\\bin\\bash.exe";
 const IS_WINDOWS = process.platform === "win32";
+const PSMUX_TIMEOUT_MS = 10000;
+const COMPLETION_PREFIX = "__TRIFLUX_DONE__:";
+const CAPTURE_ROOT = process.env.PSMUX_CAPTURE_ROOT || join(tmpdir(), "psmux-steering");
+const CAPTURE_HELPER_PATH = join(CAPTURE_ROOT, "pipe-pane-capture.ps1");
+const POLL_INTERVAL_MS = (() => {
+  const ms = Number.parseInt(process.env.PSMUX_POLL_INTERVAL_MS || "", 10);
+  if (Number.isFinite(ms) && ms > 0) return ms;
+  const sec = Number.parseFloat(process.env.PSMUX_POLL_INTERVAL_SEC || "1");
+  return Number.isFinite(sec) && sec > 0 ? Math.max(100, Math.trunc(sec * 1000)) : 1000;
+})();
 
 function quoteArg(value) {
   const str = String(value);
@@ -12,10 +25,143 @@ function quoteArg(value) {
   return `"${str.replace(/"/g, '\\"')}"`;
 }
 
+function sanitizePathPart(value) {
+  return String(value).replace(/[<>:"/\\|?*\u0000-\u001f]/gu, "_");
+}
+
 function toPaneTitle(index) {
   return index === 0 ? "lead" : `worker-${index}`;
 }
 
+function sleepMs(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, Math.max(0, ms));
+}
+
+function tokenizeCommand(command) {
+  const source = String(command || "").trim();
+  if (!source) return [];
+
+  const tokens = [];
+  let current = "";
+  let quote = null;
+
+  const pushCurrent = () => {
+    if (current.length > 0) {
+      tokens.push(current);
+      current = "";
+    }
+  };
+
+  for (let index = 0; index < source.length; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+
+    if (quote === "'") {
+      if (char === "'") {
+        quote = null;
+      } else {
+        current += char;
+      }
+      continue;
+    }
+
+    if (quote === '"') {
+      if (char === '"') {
+        quote = null;
+        continue;
+      }
+      if (char === "\\" && (next === '"' || next === "\\")) {
+        current += next;
+        index += 1;
+        continue;
+      }
+      current += char;
+      continue;
+    }
+
+    if (char === "'" || char === '"') {
+      quote = char;
+      continue;
+    }
+
+    if (char === "\\" && next && (/[\s"'\\;]/u.test(next))) {
+      current += next;
+      index += 1;
+      continue;
+    }
+
+    if (/\s/u.test(char)) {
+      pushCurrent();
+      continue;
+    }
+
+    current += char;
+  }
+
+  if (quote) {
+    throw new Error(`psmux 인자 파싱 실패: 닫히지 않은 인용부호 (${command})`);
+  }
+
+  pushCurrent();
+  return tokens;
+}
+
+function normalizePsmuxArgs(args) {
+  if (Array.isArray(args)) {
+    return args.map((arg) => String(arg));
+  }
+  return tokenizeCommand(args);
+}
+
+function randomToken(prefix) {
+  const base = sanitizePathPart(prefix).replace(/_+/g, "-") || "pane";
+  const entropy = Math.random().toString(36).slice(2, 10);
+  return `${base}-${Date.now()}-${entropy}`;
+}
+
+function ensurePsmuxInstalled() {
+  if (!hasPsmux()) {
+    throw new Error("psmux가 설치되어 있지 않습니다.");
+  }
+}
+
+function getCaptureSessionDir(sessionName) {
+  return join(CAPTURE_ROOT, sanitizePathPart(sessionName));
+}
+
+function getCaptureLogPath(sessionName, paneName) {
+  return join(getCaptureSessionDir(sessionName), `${sanitizePathPart(paneName)}.log`);
+}
+
+function ensureCaptureHelper() {
+  mkdirSync(CAPTURE_ROOT, { recursive: true });
+  writeFileSync(
+    CAPTURE_HELPER_PATH,
+    [
+      "param(",
+      "  [Parameter(Mandatory = $true)][string]$Path",
+      ")",
+      "",
+      "$parent = Split-Path -Parent $Path",
+      "if ($parent) {",
+      "  New-Item -ItemType Directory -Force -Path $parent | Out-Null",
+      "}",
+      "",
+      "$reader = [Console]::In",
+      "while (($line = $reader.ReadLine()) -ne $null) {",
+      "  Add-Content -LiteralPath $Path -Value $line -Encoding utf8",
+      "}",
+      "",
+    ].join("\n"),
+    "utf8",
+  );
+  return CAPTURE_HELPER_PATH;
+}
+
+function readCaptureLog(logPath) {
+  return existsSync(logPath) ? readFileSync(logPath, "utf8") : "";
+}
+
 function parsePaneList(output) {
   return output
     .split("\n")
@@ -60,44 +206,123 @@ function parseSessionSummaries(output) {
     .filter(Boolean);
 }
 
+function parsePaneDetails(output) {
+  return output
+    .split("\n")
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .map((line) => {
+      const [title = "", paneId = "", dead = "0", deadStatus = ""] = line.split("\t");
+      const exitCode = dead === "1"
+        ? Number.parseInt(deadStatus, 10)
+        : null;
+      return {
+        title,
+        paneId,
+        isDead: dead === "1",
+        exitCode: Number.isFinite(exitCode) ? exitCode : dead === "1" ? 0 : null,
+      };
+    })
+    .filter((entry) => entry.paneId);
+}
+
 function collectSessionPanes(sessionName) {
-  const output = psmuxExec(
-    `list-panes -t ${quoteArg(`${sessionName}:0`)} -F "#{pane_index}\t#{session_name}:#{window_index}.#{pane_index}"`
-  );
+  const output = psmuxExec([
+    "list-panes",
+    "-t",
+    `${sessionName}:0`,
+    "-F",
+    "#{pane_index}\t#{session_name}:#{window_index}.#{pane_index}",
+  ]);
   return parsePaneList(output);
 }
 
+function listPaneDetails(sessionName) {
+  const output = psmuxExec([
+    "list-panes",
+    "-t",
+    sessionName,
+    "-F",
+    "#{pane_title}\t#{session_name}:#{window_index}.#{pane_index}\t#{pane_dead}\t#{pane_dead_status}",
+  ]);
+  return parsePaneDetails(output);
+}
+
+function resolvePane(sessionName, paneNameOrTarget) {
+  const wanted = String(paneNameOrTarget);
+  const pane = listPaneDetails(sessionName)
+    .find((entry) => entry.title === wanted || entry.paneId === wanted);
+  if (!pane) {
+    throw new Error(`Pane을 찾을 수 없습니다: ${paneNameOrTarget}`);
+  }
+  return pane;
+}
+
+function refreshCaptureSnapshot(sessionName, paneNameOrTarget) {
+  const pane = resolvePane(sessionName, paneNameOrTarget);
+  const paneName = pane.title || paneNameOrTarget;
+  const logPath = getCaptureLogPath(sessionName, paneName);
+  mkdirSync(getCaptureSessionDir(sessionName), { recursive: true });
+  const snapshot = psmuxExec(["capture-pane", "-t", pane.paneId, "-p"]);
+  writeFileSync(logPath, snapshot, "utf8");
+  return { paneId: pane.paneId, paneName, logPath, snapshot };
+}
+
+function disablePipeCapture(paneId) {
+  try {
+    psmuxExec(["pipe-pane", "-t", paneId]);
+  } catch {
+    // 기존 pipe가 없으면 무시
+  }
+}
+
+function sendLiteralToPane(paneId, text, submit = true) {
+  psmuxExec(["send-keys", "-t", paneId, "-l", text]);
+  if (submit) {
+    psmuxExec(["send-keys", "-t", paneId, "Enter"]);
+  }
+}
+
+function toPatternRegExp(pattern) {
+  if (pattern instanceof RegExp) {
+    const flags = pattern.flags.includes("m") ? pattern.flags : `${pattern.flags}m`;
+    return new RegExp(pattern.source, flags);
+  }
+  return new RegExp(String(pattern), "m");
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 function psmux(args, opts = {}) {
-  if (Array.isArray(args)) {
-    const result = spawnSync(PSMUX_BIN, args.map((arg) => String(arg)), {
+  const normalizedArgs = normalizePsmuxArgs(args);
+  try {
+    const result = childProcess.execFileSync(PSMUX_BIN, normalizedArgs, {
       encoding: "utf8",
-      timeout: 10000,
+      timeout: PSMUX_TIMEOUT_MS,
       stdio: ["pipe", "pipe", "pipe"],
       windowsHide: true,
       ...opts,
     });
-    if ((result.status ?? 1) !== 0) {
-      const error = new Error((result.stderr || result.stdout || "psmux command failed").trim());
-      error.status = result.status;
-      throw error;
-    }
-    return (result.stdout || "").trim();
+    return result != null ? String(result).trim() : "";
+  } catch (error) {
+    const stderr = typeof error?.stderr === "string"
+      ? error.stderr
+      : error?.stderr?.toString?.("utf8") || "";
+    const stdout = typeof error?.stdout === "string"
+      ? error.stdout
+      : error?.stdout?.toString?.("utf8") || "";
+    const wrapped = new Error((stderr || stdout || error.message || "psmux command failed").trim());
+    wrapped.status = error.status;
+    throw wrapped;
   }
-
-  const result = execSync(`${quoteArg(PSMUX_BIN)} ${args}`, {
-    encoding: "utf8",
-    timeout: 10000,
-    stdio: ["pipe", "pipe", "pipe"],
-    windowsHide: true,
-    ...opts,
-  });
-  return result != null ? result.trim() : "";
 }
 
 /** psmux 실행 가능 여부 확인 */
 export function hasPsmux() {
   try {
-    execSync(`${quoteArg(PSMUX_BIN)} -V`, {
+    childProcess.execFileSync(PSMUX_BIN, ["-V"], {
       stdio: "ignore",
       timeout: 3000,
       windowsHide: true,
@@ -130,45 +355,73 @@ export function createPsmuxSession(sessionName, opts = {}) {
   const layout = opts.layout === "1xN" || opts.layout === "Nx1" ? opts.layout : "2x2";
   const paneCount = Math.max(
     1,
-    Number.isFinite(opts.paneCount) ? Math.trunc(opts.paneCount) : 4
+    Number.isFinite(opts.paneCount) ? Math.trunc(opts.paneCount) : 4,
   );
   const limitedPaneCount = layout === "2x2" ? Math.min(paneCount, 4) : paneCount;
   const sessionTarget = `${sessionName}:0`;
 
-  const leadPane = psmuxExec(
-    `new-session -d -P -F "#{session_name}:#{window_index}.#{pane_index}" -s ${quoteArg(sessionName)} -x 220 -y 55`
-  );
+  const leadPane = psmuxExec([
+    "new-session",
+    "-d",
+    "-P",
+    "-F",
+    "#{session_name}:#{window_index}.#{pane_index}",
+    "-s",
+    sessionName,
+    "-x",
+    "220",
+    "-y",
+    "55",
+  ]);
 
   if (layout === "2x2" && limitedPaneCount >= 3) {
-    const rightPane = psmuxExec(
-      `split-window -h -P -F "#{session_name}:#{window_index}.#{pane_index}" -t ${quoteArg(leadPane)}`
-    );
-    psmuxExec(
-      `split-window -v -P -F "#{session_name}:#{window_index}.#{pane_index}" -t ${quoteArg(rightPane)}`
-    );
+    const rightPane = psmuxExec([
+      "split-window",
+      "-h",
+      "-P",
+      "-F",
+      "#{session_name}:#{window_index}.#{pane_index}",
+      "-t",
+      leadPane,
+    ]);
+    psmuxExec([
+      "split-window",
+      "-v",
+      "-P",
+      "-F",
+      "#{session_name}:#{window_index}.#{pane_index}",
+      "-t",
+      rightPane,
+    ]);
     if (limitedPaneCount >= 4) {
-      psmuxExec(
-        `split-window -v -P -F "#{session_name}:#{window_index}.#{pane_index}" -t ${quoteArg(leadPane)}`
-      );
+      psmuxExec([
+        "split-window",
+        "-v",
+        "-P",
+        "-F",
+        "#{session_name}:#{window_index}.#{pane_index}",
+        "-t",
+        leadPane,
+      ]);
     }
-    psmuxExec(`select-layout -t ${quoteArg(sessionTarget)} tiled`);
+    psmuxExec(["select-layout", "-t", sessionTarget, "tiled"]);
   } else if (layout === "1xN") {
-    for (let i = 1; i < limitedPaneCount; i++) {
-      psmuxExec(`split-window -h -t ${quoteArg(sessionTarget)}`);
+    for (let index = 1; index < limitedPaneCount; index += 1) {
+      psmuxExec(["split-window", "-h", "-t", sessionTarget]);
     }
-    psmuxExec(`select-layout -t ${quoteArg(sessionTarget)} even-horizontal`);
+    psmuxExec(["select-layout", "-t", sessionTarget, "even-horizontal"]);
   } else {
-    for (let i = 1; i < limitedPaneCount; i++) {
-      psmuxExec(`split-window -v -t ${quoteArg(sessionTarget)}`);
+    for (let index = 1; index < limitedPaneCount; index += 1) {
+      psmuxExec(["split-window", "-v", "-t", sessionTarget]);
     }
-    psmuxExec(`select-layout -t ${quoteArg(sessionTarget)} even-vertical`);
+    psmuxExec(["select-layout", "-t", sessionTarget, "even-vertical"]);
   }
 
-  psmuxExec(`select-pane -t ${quoteArg(leadPane)}`);
+  psmuxExec(["select-pane", "-t", leadPane]);
 
   const panes = collectSessionPanes(sessionName).slice(0, limitedPaneCount);
   panes.forEach((pane, index) => {
-    psmuxExec(`select-pane -t ${quoteArg(pane)} -T ${quoteArg(toPaneTitle(index))}`);
+    psmuxExec(["select-pane", "-t", pane, "-T", toPaneTitle(index)]);
   });
 
   return { sessionName, panes };
@@ -180,7 +433,7 @@ export function createPsmuxSession(sessionName, opts = {}) {
  */
 export function killPsmuxSession(sessionName) {
   try {
-    psmuxExec(`kill-session -t ${quoteArg(sessionName)}`, { stdio: "ignore" });
+    psmuxExec(["kill-session", "-t", sessionName], { stdio: "ignore" });
   } catch {
     // 이미 종료된 세션 — 무시
   }
@@ -193,7 +446,7 @@ export function killPsmuxSession(sessionName) {
  */
 export function psmuxSessionExists(sessionName) {
   try {
-    psmuxExec(`has-session -t ${quoteArg(sessionName)}`, { stdio: "ignore" });
+    psmuxExec(["has-session", "-t", sessionName], { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -206,7 +459,7 @@ export function psmuxSessionExists(sessionName) {
  */
 export function listPsmuxSessions() {
   try {
-    return parseSessionSummaries(psmuxExec("list-sessions"))
+    return parseSessionSummaries(psmuxExec(["list-sessions"]))
       .map((session) => session.sessionName)
       .filter((sessionName) => sessionName.startsWith("tfx-multi-"));
   } catch {
@@ -222,7 +475,7 @@ export function listPsmuxSessions() {
  */
 export function capturePsmuxPane(target, lines = 5) {
   try {
-    const full = psmuxExec(`capture-pane -t ${quoteArg(target)} -p`);
+    const full = psmuxExec(["capture-pane", "-t", target, "-p"]);
     const nonEmpty = full.split("\n").filter((line) => line.trim() !== "");
     return nonEmpty.slice(-lines).join("\n");
   } catch {
@@ -235,7 +488,7 @@ export function capturePsmuxPane(target, lines = 5) {
  * @param {string} sessionName
  */
 export function attachPsmuxSession(sessionName) {
-  const result = spawnSync(PSMUX_BIN, ["attach-session", "-t", sessionName], {
+  const result = childProcess.spawnSync(PSMUX_BIN, ["attach-session", "-t", sessionName], {
     stdio: "inherit",
     timeout: 0,
     windowsHide: false,
@@ -252,7 +505,7 @@ export function attachPsmuxSession(sessionName) {
  */
 export function getPsmuxSessionAttachedCount(sessionName) {
   try {
-    const session = parseSessionSummaries(psmuxExec("list-sessions"))
+    const session = parseSessionSummaries(psmuxExec(["list-sessions"]))
       .find((entry) => entry.sessionName === sessionName);
     return session ? session.attachedCount : null;
   } catch {
@@ -272,30 +525,166 @@ export function configurePsmuxKeybindings(sessionName, opts = {}) {
   const cond = `#{==:#{session_name},${sessionName}}`;
   const target = `${sessionName}:0`;
   const bindNext = inProcess
-    ? `'select-pane -t :.+ \\; resize-pane -Z'`
-    : `'select-pane -t :.+'`;
+    ? "select-pane -t :.+ \\; resize-pane -Z"
+    : "select-pane -t :.+";
   const bindPrev = inProcess
-    ? `'select-pane -t :.- \\; resize-pane -Z'`
-    : `'select-pane -t :.-'`;
+    ? "select-pane -t :.- \\; resize-pane -Z"
+    : "select-pane -t :.-";
 
-  // psmux는 세션별 서버이므로 -t target으로 세션 컨텍스트를 전달해야 한다
-  const bindSafe = (cmd) => {
-    try { psmuxExec(`-t ${quoteArg(target)} ${cmd}`); } catch { /* 미지원 시 무시 */ }
+  // psmux는 세션별 서버이므로 -t target으로 세션 컨텍스트를 전달해야 한다.
+  const bindSafe = (args) => {
+    try {
+      psmuxExec(["-t", target, ...args]);
+    } catch {
+      // 미지원 시 무시
+    }
   };
 
-  bindSafe(`bind-key -T root -n S-Down if-shell -F '${cond}' ${bindNext} 'send-keys S-Down'`);
-  bindSafe(`bind-key -T root -n S-Up if-shell -F '${cond}' ${bindPrev} 'send-keys S-Up'`);
-  bindSafe(`bind-key -T root -n S-Right if-shell -F '${cond}' ${bindNext} 'send-keys S-Right'`);
-  bindSafe(`bind-key -T root -n S-Left if-shell -F '${cond}' ${bindPrev} 'send-keys S-Left'`);
-  bindSafe(`bind-key -T root -n BTab if-shell -F '${cond}' ${bindPrev} 'send-keys BTab'`);
-  bindSafe(`bind-key -T root -n Escape if-shell -F '${cond}' 'send-keys C-c' 'send-keys Escape'`);
+  bindSafe(["bind-key", "-T", "root", "-n", "S-Down", "if-shell", "-F", cond, bindNext, "send-keys S-Down"]);
+  bindSafe(["bind-key", "-T", "root", "-n", "S-Up", "if-shell", "-F", cond, bindPrev, "send-keys S-Up"]);
+  bindSafe(["bind-key", "-T", "root", "-n", "S-Right", "if-shell", "-F", cond, bindNext, "send-keys S-Right"]);
+  bindSafe(["bind-key", "-T", "root", "-n", "S-Left", "if-shell", "-F", cond, bindPrev, "send-keys S-Left"]);
+  bindSafe(["bind-key", "-T", "root", "-n", "BTab", "if-shell", "-F", cond, bindPrev, "send-keys BTab"]);
+  bindSafe(["bind-key", "-T", "root", "-n", "Escape", "if-shell", "-F", cond, "send-keys C-c", "send-keys Escape"]);
 
   if (taskListCommand) {
-    const escaped = taskListCommand.replace(/'/g, "'\\''");
-    bindSafe(
-      `bind-key -T root -n C-t if-shell -F '${cond}' "display-popup -E '${escaped}'" "send-keys C-t"`
-    );
+    bindSafe([
+      "bind-key",
+      "-T",
+      "root",
+      "-n",
+      "C-t",
+      "if-shell",
+      "-F",
+      cond,
+      `display-popup -E ${quoteArg(taskListCommand)}`,
+      "send-keys C-t",
+    ]);
+  }
+}
+
+// ─── steering 기능 ───
+
+/**
+ * pane 출력 pipe-pane 캡처를 시작하고 즉시 snapshot을 기록한다.
+ * @param {string} sessionName
+ * @param {string} paneNameOrTarget
+ * @returns {{ paneId: string, paneName: string, logPath: string }}
+ */
+export function startCapture(sessionName, paneNameOrTarget) {
+  ensurePsmuxInstalled();
+  const pane = resolvePane(sessionName, paneNameOrTarget);
+  const paneName = pane.title || paneNameOrTarget;
+  const logPath = getCaptureLogPath(sessionName, paneName);
+  const helperPath = ensureCaptureHelper();
+  mkdirSync(getCaptureSessionDir(sessionName), { recursive: true });
+  writeFileSync(logPath, "", "utf8");
+
+  disablePipeCapture(pane.paneId);
+  psmuxExec([
+    "pipe-pane",
+    "-t",
+    pane.paneId,
+    `powershell.exe -NoLogo -NoProfile -File ${quoteArg(helperPath)} ${quoteArg(logPath)}`,
+  ]);
+
+  refreshCaptureSnapshot(sessionName, pane.paneId);
+  return { paneId: pane.paneId, paneName, logPath };
+}
+
+/**
+ * PowerShell 명령을 pane에 비동기 전송하고 완료 토큰을 반환한다.
+ * @param {string} sessionName
+ * @param {string} paneNameOrTarget
+ * @param {string} commandText
+ * @returns {{ paneId: string, paneName: string, token: string, logPath: string }}
+ */
+export function dispatchCommand(sessionName, paneNameOrTarget, commandText) {
+  ensurePsmuxInstalled();
+  const pane = resolvePane(sessionName, paneNameOrTarget);
+  const paneName = pane.title || paneNameOrTarget;
+  const logPath = getCaptureLogPath(sessionName, paneName);
+
+  if (!existsSync(logPath)) {
+    startCapture(sessionName, paneName);
+  }
+
+  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 };
+}
+
+/**
+ * pane 캡처 로그에서 정규식 패턴을 polling으로 대기한다.
+ * @param {string} sessionName
+ * @param {string} paneNameOrTarget
+ * @param {string|RegExp} pattern
+ * @param {number} timeoutSec
+ * @returns {{ matched: boolean, paneId: string, paneName: string, logPath: string, match: string|null }}
+ */
+export function waitForPattern(sessionName, paneNameOrTarget, pattern, timeoutSec = 300) {
+  ensurePsmuxInstalled();
+  const pane = resolvePane(sessionName, paneNameOrTarget);
+  const paneName = pane.title || paneNameOrTarget;
+  const logPath = getCaptureLogPath(sessionName, paneName);
+  if (!existsSync(logPath)) {
+    throw new Error(`캡처 로그가 없습니다. 먼저 startCapture(${sessionName}, ${paneName})를 호출하세요.`);
   }
+
+  const deadline = Date.now() + Math.max(0, Math.trunc(timeoutSec * 1000));
+  const regex = toPatternRegExp(pattern);
+
+  while (Date.now() <= deadline) {
+    refreshCaptureSnapshot(sessionName, pane.paneId);
+    const content = readCaptureLog(logPath);
+    const match = regex.exec(content);
+    if (match) {
+      return {
+        matched: true,
+        paneId: pane.paneId,
+        paneName,
+        logPath,
+        match: match[0],
+      };
+    }
+
+    if (Date.now() > deadline) {
+      break;
+    }
+    sleepMs(POLL_INTERVAL_MS);
+  }
+
+  return {
+    matched: false,
+    paneId: pane.paneId,
+    paneName,
+    logPath,
+    match: null,
+  };
+}
+
+/**
+ * 완료 토큰이 찍힐 때까지 대기하고 exit code를 파싱한다.
+ * @param {string} sessionName
+ * @param {string} paneNameOrTarget
+ * @param {string} token
+ * @param {number} timeoutSec
+ * @returns {{ matched: boolean, paneId: string, paneName: string, logPath: string, match: string|null, token: string, exitCode: number|null }}
+ */
+export function waitForCompletion(sessionName, paneNameOrTarget, token, timeoutSec = 300) {
+  const completionRegex = new RegExp(
+    `${escapeRegExp(COMPLETION_PREFIX)}${escapeRegExp(token)}:(\\d+)`,
+    "m",
+  );
+  const result = waitForPattern(sessionName, paneNameOrTarget, completionRegex, timeoutSec);
+  const exitMatch = result.match ? completionRegex.exec(result.match) : null;
+  return {
+    ...result,
+    token,
+    exitCode: exitMatch ? Number.parseInt(exitMatch[1], 10) : null,
+  };
 }
 
 // ─── 하이브리드 모드 워커 관리 함수 ───
@@ -314,23 +703,28 @@ export function spawnWorker(sessionName, workerName, cmd) {
 
   // remain-on-exit: 종료된 pane이 즉시 사라지는 것 방지
   try {
-    psmuxExec(`set-option -t ${quoteArg(sessionName)} remain-on-exit on`);
-  } catch { /* 미지원 시 무시 */ }
+    psmuxExec(["set-option", "-t", sessionName, "remain-on-exit", "on"]);
+  } catch {
+    // 미지원 시 무시
+  }
 
   // Windows: pane 기본셸이 PowerShell → Git Bash로 래핑
-  // psmux가 이스케이프 시퀀스를 처리하므로 포워드 슬래시로 변환
+  // psmux가 이스케이프 시퀀스를 처리하므로 포워드 슬래시 경로를 사용한다.
   const shellCmd = IS_WINDOWS
-    ? `& '${GIT_BASH.replace(/\\/g, '/')}' -l -c '${cmd.replace(/'/g, "'\\''")}'`
+    ? `& '${GIT_BASH.replace(/\\/g, "/")}' -l -c '${cmd.replace(/'/g, "'\\''")}'`
     : cmd;
 
   try {
-    // 배열 형태 spawnSync → 쉘 해석 우회 (백슬래시 경로 보존)
-    const paneTarget = psmux([
-      "split-window", "-t", sessionName,
-      "-P", "-F", "#{session_name}:#{window_index}.#{pane_index}",
+    const paneTarget = psmuxExec([
+      "split-window",
+      "-t",
+      sessionName,
+      "-P",
+      "-F",
+      "#{session_name}:#{window_index}.#{pane_index}",
       shellCmd,
     ]);
-    psmux(["select-pane", "-t", paneTarget, "-T", workerName]);
+    psmuxExec(["select-pane", "-t", paneTarget, "-T", workerName]);
     return { paneId: paneTarget, workerName };
   } catch (err) {
     throw new Error(`워커 생성 실패 (session=${sessionName}, worker=${workerName}): ${err.message}`);
@@ -348,24 +742,16 @@ export function getWorkerStatus(sessionName, workerName) {
     throw new Error("psmux가 설치되어 있지 않습니다.");
   }
   try {
-    const output = psmuxExec(
-      `list-panes -t ${quoteArg(sessionName)} -F "#{pane_title}\t#{session_name}:#{window_index}.#{pane_index}\t#{pane_dead}\t#{pane_dead_status}"`
-    );
-    const lines = output.split("\n").filter(Boolean);
-    for (const line of lines) {
-      const [title, paneId, dead, deadStatus] = line.split("\t");
-      if (title === workerName) {
-        const isDead = dead === "1";
-        return {
-          status: isDead ? "exited" : "running",
-          exitCode: isDead ? parseInt(deadStatus, 10) || 0 : null,
-          paneId,
-        };
-      }
-    }
-    throw new Error(`워커를 찾을 수 없습니다: ${workerName}`);
+    const pane = resolvePane(sessionName, workerName);
+    return {
+      status: pane.isDead ? "exited" : "running",
+      exitCode: pane.isDead ? pane.exitCode : null,
+      paneId: pane.paneId,
+    };
   } catch (err) {
-    if (err.message.includes("워커를 찾을 수 없습니다")) throw err;
+    if (err.message.includes("Pane을 찾을 수 없습니다")) {
+      throw new Error(`워커를 찾을 수 없습니다: ${workerName}`);
+    }
     throw new Error(`워커 상태 조회 실패 (session=${sessionName}, worker=${workerName}): ${err.message}`);
   }
 }
@@ -385,26 +771,30 @@ export function killWorker(sessionName, workerName) {
 
     // 이미 종료된 워커 → pane 정리만 수행
     if (status === "exited") {
-      try { psmuxExec(`kill-pane -t ${quoteArg(paneId)}`); } catch { /* 무시 */ }
+      try {
+        psmuxExec(["kill-pane", "-t", paneId]);
+      } catch {
+        // 무시
+      }
       return { killed: true };
     }
 
     // running → C-c 우아한 종료 시도
     try {
-      psmuxExec(`send-keys -t ${quoteArg(paneId)} C-c`);
+      psmuxExec(["send-keys", "-t", paneId, "C-c"]);
     } catch {
       // send-keys 실패 무시
     }
-    // 1초 대기 후 pane 강제 종료
-    spawnSync("sleep", ["1"], { stdio: "ignore", windowsHide: true });
+
+    sleepMs(1000);
+
     try {
-      psmuxExec(`kill-pane -t ${quoteArg(paneId)}`);
+      psmuxExec(["kill-pane", "-t", paneId]);
     } catch {
       // 이미 종료된 pane — 무시
     }
     return { killed: true };
   } catch (err) {
-    // 워커를 찾을 수 없음 → 이미 종료된 것으로 간주
     if (err.message.includes("워커를 찾을 수 없습니다")) {
       return { killed: true };
     }
@@ -425,7 +815,7 @@ export function captureWorkerOutput(sessionName, workerName, lines = 50) {
   }
   try {
     const { paneId } = getWorkerStatus(sessionName, workerName);
-    return psmuxExec(`capture-pane -t ${quoteArg(paneId)} -p -S -${lines}`);
+    return psmuxExec(["capture-pane", "-t", paneId, "-p", "-S", `-${lines}`]);
   } catch (err) {
     if (err.message.includes("워커를 찾을 수 없습니다")) throw err;
     throw new Error(`출력 캡처 실패 (session=${sessionName}, worker=${workerName}): ${err.message}`);
@@ -435,7 +825,7 @@ export function captureWorkerOutput(sessionName, workerName, lines = 50) {
 // ─── CLI 진입점 ───
 
 if (process.argv[1] && process.argv[1].endsWith("psmux.mjs")) {
-  const [,, cmd, ...args] = process.argv;
+  const [, , cmd, ...args] = process.argv;
 
   // CLI 인자 파싱 헬퍼
   function getArg(name) {
@@ -453,8 +843,7 @@ if (process.argv[1] && process.argv[1].endsWith("psmux.mjs")) {
           console.error("사용법: node psmux.mjs spawn --session <세션> --name <워커명> --cmd <커맨드>");
           process.exit(1);
         }
-        const result = spawnWorker(session, name, workerCmd);
-        console.log(JSON.stringify(result, null, 2));
+        console.log(JSON.stringify(spawnWorker(session, name, workerCmd), null, 2));
         break;
       }
       case "status": {
@@ -464,8 +853,7 @@ if (process.argv[1] && process.argv[1].endsWith("psmux.mjs")) {
           console.error("사용법: node psmux.mjs status --session <세션> --name <워커명>");
           process.exit(1);
         }
-        const result = getWorkerStatus(session, name);
-        console.log(JSON.stringify(result, null, 2));
+        console.log(JSON.stringify(getWorkerStatus(session, name), null, 2));
         break;
       }
       case "kill": {
@@ -475,8 +863,7 @@ if (process.argv[1] && process.argv[1].endsWith("psmux.mjs")) {
           console.error("사용법: node psmux.mjs kill --session <세션> --name <워커명>");
           process.exit(1);
         }
-        const result = killWorker(session, name);
-        console.log(JSON.stringify(result, null, 2));
+        console.log(JSON.stringify(killWorker(session, name), null, 2));
         break;
       }
       case "output": {
@@ -490,13 +877,66 @@ if (process.argv[1] && process.argv[1].endsWith("psmux.mjs")) {
         console.log(captureWorkerOutput(session, name, lines));
         break;
       }
+      case "capture-start": {
+        const session = getArg("session");
+        const name = getArg("name");
+        if (!session || !name) {
+          console.error("사용법: node psmux.mjs capture-start --session <세션> --name <pane>");
+          process.exit(1);
+        }
+        console.log(JSON.stringify(startCapture(session, name), null, 2));
+        break;
+      }
+      case "dispatch": {
+        const session = getArg("session");
+        const name = getArg("name");
+        const commandText = getArg("command");
+        if (!session || !name || !commandText) {
+          console.error("사용법: node psmux.mjs dispatch --session <세션> --name <pane> --command <PowerShell 명령>");
+          process.exit(1);
+        }
+        console.log(JSON.stringify(dispatchCommand(session, name, commandText), null, 2));
+        break;
+      }
+      case "wait-pattern": {
+        const session = getArg("session");
+        const name = getArg("name");
+        const pattern = getArg("pattern");
+        const timeoutSec = parseInt(getArg("timeout") || "300", 10);
+        if (!session || !name || !pattern) {
+          console.error("사용법: node psmux.mjs wait-pattern --session <세션> --name <pane> --pattern <정규식> [--timeout <초>]");
+          process.exit(1);
+        }
+        const result = waitForPattern(session, name, pattern, timeoutSec);
+        console.log(JSON.stringify(result, null, 2));
+        if (!result.matched) process.exit(2);
+        break;
+      }
+      case "wait-completion": {
+        const session = getArg("session");
+        const name = getArg("name");
+        const token = getArg("token");
+        const timeoutSec = parseInt(getArg("timeout") || "300", 10);
+        if (!session || !name || !token) {
+          console.error("사용법: node psmux.mjs wait-completion --session <세션> --name <pane> --token <토큰> [--timeout <초>]");
+          process.exit(1);
+        }
+        const result = waitForCompletion(session, name, token, timeoutSec);
+        console.log(JSON.stringify(result, null, 2));
+        if (!result.matched) process.exit(2);
+        break;
+      }
       default:
-        console.error("사용법: node psmux.mjs spawn|status|kill|output [args]");
+        console.error("사용법: node psmux.mjs spawn|status|kill|output|capture-start|dispatch|wait-pattern|wait-completion [args]");
         console.error("");
-        console.error("  spawn   --session <세션> --name <워커명> --cmd <커맨드>");
-        console.error("  status  --session <세션> --name <워커명>");
-        console.error("  kill    --session <세션> --name <워커명>");
-        console.error("  output  --session <세션> --name <워커명> [--lines <줄수>]");
+        console.error("  spawn            --session <세션> --name <워커명> --cmd <커맨드>");
+        console.error("  status           --session <세션> --name <워커명>");
+        console.error("  kill             --session <세션> --name <워커명>");
+        console.error("  output           --session <세션> --name <워커명> [--lines <줄수>]");
+        console.error("  capture-start    --session <세션> --name <pane>");
+        console.error("  dispatch         --session <세션> --name <pane> --command <PowerShell 명령>");
+        console.error("  wait-pattern     --session <세션> --name <pane> --pattern <정규식> [--timeout <초>]");
+        console.error("  wait-completion  --session <세션> --name <pane> --token <토큰> [--timeout <초>]");
         process.exit(1);
     }
   } catch (err) {