triflux 3.2.0-dev.1 → 3.2.0-dev.2

package/hub/team/session.mjs

@@ -1,6 +1,39 @@
-// hub/team/session.mjs — tmux 세션 생명주기 관리
-// 의존성: child_process (Node.js 내장)만 사용
-import { execSync } from "node:child_process";
+// hub/team/session.mjs — tmux/wt 세션 생명주기 관리
+// 의존성: child_process (Node.js 내장)만 사용
+import { execSync, spawnSync } from "node:child_process";
+
+const GIT_BASH_CANDIDATES = [
+  "C:/Program Files/Git/bin/bash.exe",
+  "C:/Program Files/Git/usr/bin/bash.exe",
+];
+
+function findGitBashExe() {
+  for (const p of GIT_BASH_CANDIDATES) {
+    try {
+      execSync(`"${p}" --version`, { stdio: "ignore", timeout: 3000 });
+      return p;
+    } catch {
+      // 다음 후보
+    }
+  }
+  return null;
+}
+
+/** Windows Terminal 실행 파일 존재 여부 */
+export function hasWindowsTerminal() {
+  if (process.platform !== "win32") return false;
+  try {
+    execSync("where wt.exe", { stdio: "ignore", timeout: 3000 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/** 현재 프로세스가 Windows Terminal 내에서 실행 중인지 여부 */
+export function hasWindowsTerminalSession() {
+  return process.platform === "win32" && !!process.env.WT_SESSION;
+}
 
 /** tmux 실행 가능 여부 확인 */
 function hasTmux() {
@@ -22,12 +55,29 @@ function hasWslTmux() {
   }
 }
 
+/** Git Bash 내 tmux 사용 가능 여부 (Windows 전용) */
+function hasGitBashTmux() {
+  const bash = findGitBashExe();
+  if (!bash) return false;
+  try {
+    const r = spawnSync(bash, ["-lc", "tmux -V"], {
+      encoding: "utf8",
+      timeout: 5000,
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    return (r.status ?? 1) === 0;
+  } catch {
+    return false;
+  }
+}
+
 /**
  * 터미널 멀티플렉서 감지
- * @returns {'tmux'|'wsl-tmux'|null}
+ * @returns {'tmux'|'git-bash-tmux'|'wsl-tmux'|null}
  */
 export function detectMultiplexer() {
   if (hasTmux()) return "tmux";
+  if (process.platform === "win32" && hasGitBashTmux()) return "git-bash-tmux";
   if (process.platform === "win32" && hasWslTmux()) return "wsl-tmux";
   return null;
 }
@@ -53,6 +103,23 @@ function tmux(args, opts = {}) {
       "  3. tfx team \"작업\"  (자동으로 WSL tmux 사용)"
     );
   }
+  if (mux === "git-bash-tmux") {
+    const bash = findGitBashExe();
+    if (!bash) throw new Error("git-bash-tmux 감지 실패");
+    const r = spawnSync(bash, ["-lc", `tmux ${args}`], {
+      encoding: "utf8",
+      timeout: 10000,
+      stdio: ["pipe", "pipe", "pipe"],
+      ...opts,
+    });
+    if ((r.status ?? 1) !== 0) {
+      const e = new Error(r.stderr || "tmux command failed");
+      e.status = r.status;
+      throw e;
+    }
+    return (r.stdout || "").trim();
+  }
+
   const prefix = mux === "wsl-tmux" ? "wsl tmux" : "tmux";
   const result = execSync(`${prefix} ${args}`, {
     encoding: "utf8",
@@ -60,15 +127,204 @@ function tmux(args, opts = {}) {
     stdio: ["pipe", "pipe", "pipe"],
     ...opts,
   });
-  // stdio: "ignore" 시 execSync가 null 반환 — 안전 처리
   return result != null ? result.trim() : "";
 }
 
+/**
+ * tmux 명령 직접 실행 (고수준 모듈에서 재사용)
+ * @param {string} args
+ * @param {object} opts
+ * @returns {string}
+ */
+export function tmuxExec(args, opts = {}) {
+  return tmux(args, opts);
+}
+
+/**
+ * 현재 멀티플렉서 환경에 맞는 attach 실행 스펙 반환
+ * @param {string} sessionName
+ * @returns {{ command: string, args: string[] }}
+ */
+export function resolveAttachCommand(sessionName) {
+  const mux = detectMultiplexer();
+  if (!mux) {
+    throw new Error("tmux 미발견");
+  }
+
+  if (mux === "git-bash-tmux") {
+    const bash = findGitBashExe();
+    if (!bash) throw new Error("git-bash-tmux 감지 실패");
+    return {
+      command: bash,
+      args: ["-lc", `tmux attach-session -t ${sessionName}`],
+    };
+  }
+
+  if (mux === "wsl-tmux") {
+    return {
+      command: "wsl",
+      args: ["tmux", "attach-session", "-t", sessionName],
+    };
+  }
+
+  return {
+    command: "tmux",
+    args: ["attach-session", "-t", sessionName],
+  };
+}
+
+/**
+ * wt.exe 커맨드 실행
+ * @param {string[]} args
+ * @param {object} opts
+ * @returns {string}
+ */
+function wt(args, opts = {}) {
+  if (!hasWindowsTerminal()) {
+    throw new Error("wt.exe 미발견");
+  }
+
+  const r = spawnSync("wt.exe", args, {
+    encoding: "utf8",
+    timeout: 10000,
+    stdio: ["ignore", "pipe", "pipe"],
+    windowsHide: true,
+    ...opts,
+  });
+  if ((r.status ?? 1) !== 0) {
+    const e = new Error((r.stderr || r.stdout || "wt command failed").trim());
+    e.status = r.status;
+    throw e;
+  }
+  return (r.stdout || "").trim();
+}
+
+/**
+ * Windows Terminal pane 분할용 cmd.exe 인자 구성
+ * @param {string} command
+ * @returns {string[]}
+ */
+function buildWtCmdArgs(command) {
+  return ["cmd.exe", "/c", command];
+}
+
+/**
+ * Windows Terminal 독립 모드 세션 생성
+ * - 현재 pane를 앵커로 사용하고, 우측(1xN) 또는 하단(Nx1)으로만 분할
+ * - 생성한 pane에 즉시 CLI 커맨드를 실행
+ * @param {string} sessionName
+ * @param {object} opts
+ * @param {'1xN'|'Nx1'} opts.layout
+ * @param {Array<{title:string,command:string,cwd?:string}>} opts.paneCommands
+ * @returns {{ sessionName: string, panes: string[], titles: string[], layout: '1xN'|'Nx1', paneCount: number, anchorPane: string }}
+ */
+export function createWtSession(sessionName, opts = {}) {
+  const { layout = "1xN", paneCommands = [] } = opts;
+
+  if (!hasWindowsTerminalSession()) {
+    throw new Error("WT_SESSION 미감지");
+  }
+  if (!hasWindowsTerminal()) {
+    throw new Error("wt.exe 미발견");
+  }
+  if (!Array.isArray(paneCommands) || paneCommands.length === 0) {
+    throw new Error("paneCommands가 비어 있음");
+  }
+
+  const splitFlag = layout === "Nx1" ? "-H" : "-V";
+  const panes = [];
+  const titles = [];
+
+  for (let i = 0; i < paneCommands.length; i++) {
+    const pane = paneCommands[i] || {};
+    const title = pane.title || `${sessionName}-${i + 1}`;
+    const command = String(pane.command || "").trim();
+    const cwd = pane.cwd || process.cwd();
+    if (!command) continue;
+
+    wt(["-w", "0", "sp", splitFlag, "--title", title, "-d", cwd, ...buildWtCmdArgs(command)]);
+    panes.push(`wt:${i}`);
+    titles.push(title);
+  }
+
+  return {
+    sessionName,
+    panes,
+    titles,
+    layout: layout === "Nx1" ? "Nx1" : "1xN",
+    paneCount: panes.length,
+    anchorPane: "wt:anchor",
+  };
+}
+
+/**
+ * Windows Terminal pane 포커스 이동
+ * @param {number} paneIndex - createWtSession()에서 생성한 pane 인덱스(0 기반)
+ * @param {object} opts
+ * @param {'1xN'|'Nx1'} opts.layout
+ * @returns {boolean}
+ */
+export function focusWtPane(paneIndex, opts = {}) {
+  if (!hasWindowsTerminalSession() || !hasWindowsTerminal()) return false;
+  const idx = Number(paneIndex);
+  if (!Number.isInteger(idx) || idx < 0) return false;
+
+  const layout = opts.layout === "Nx1" ? "Nx1" : "1xN";
+  const backDir = layout === "Nx1" ? "up" : "left";
+  const stepDir = layout === "Nx1" ? "down" : "right";
+
+  // 앵커로 최대한 복귀
+  for (let i = 0; i < 10; i++) {
+    try { wt(["-w", "0", "move-focus", backDir]); } catch { break; }
+  }
+
+  for (let i = 0; i <= idx; i++) {
+    wt(["-w", "0", "move-focus", stepDir]);
+  }
+  return true;
+}
+
+/**
+ * Windows Terminal에서 생성한 팀 pane 정리
+ * @param {object} opts
+ * @param {'1xN'|'Nx1'} opts.layout
+ * @param {number} opts.paneCount
+ * @returns {number} 닫힌 pane 수 (best-effort)
+ */
+export function closeWtSession(opts = {}) {
+  if (!hasWindowsTerminalSession() || !hasWindowsTerminal()) return 0;
+
+  const paneCount = Math.max(0, Number(opts.paneCount || 0));
+  if (paneCount === 0) return 0;
+
+  const layout = opts.layout === "Nx1" ? "Nx1" : "1xN";
+  const backDir = layout === "Nx1" ? "up" : "left";
+  const stepDir = layout === "Nx1" ? "down" : "right";
+  let closed = 0;
+
+  // 앵커(원래 tfx 실행 pane)로 최대한 복귀
+  for (let i = 0; i < 10; i++) {
+    try { wt(["-w", "0", "move-focus", backDir]); } catch { break; }
+  }
+
+  for (let i = 0; i < paneCount; i++) {
+    try {
+      wt(["-w", "0", "move-focus", stepDir]);
+      wt(["-w", "0", "close-pane"]);
+      closed++;
+    } catch {
+      break;
+    }
+  }
+
+  return closed;
+}
+
 /**
  * tmux 세션 생성 + 레이아웃 분할
  * @param {string} sessionName — 세션 이름
  * @param {object} opts
- * @param {'2x2'|'1xN'} opts.layout — 레이아웃 (기본 2x2)
+ * @param {'2x2'|'1xN'|'Nx1'} opts.layout — 레이아웃 (기본 2x2)
  * @param {number} opts.paneCount — pane 수 (기본 4)
  * @returns {{ sessionName: string, panes: string[] }}
  */
@@ -86,23 +342,33 @@ export function createSession(sessionName, opts = {}) {
   const panes = [`${sessionName}:0.0`];
 
   if (layout === "2x2" && paneCount >= 3) {
-    // 2x2 그리드: 좌|우 → 좌상/좌하 → 우상/우하
-    tmux(`split-window -h -t ${sessionName}:0`);
-    tmux(`split-window -v -t ${sessionName}:0.0`);
+    // 3-pane 기본: lead 왼쪽, workers 오른쪽 상/하
+    // 4-pane: 좌/우 각각 상/하(균등 2x2)
+    tmux(`split-window -h -t ${sessionName}:0.0`);
+    tmux(`split-window -v -t ${sessionName}:0.1`);
     if (paneCount >= 4) {
-      tmux(`split-window -v -t ${sessionName}:0.2`);
+      tmux(`split-window -v -t ${sessionName}:0.0`);
     }
     // pane ID 재수집
     panes.length = 0;
     for (let i = 0; i < Math.min(paneCount, 4); i++) {
       panes.push(`${sessionName}:0.${i}`);
     }
+  } else if (layout === "1xN") {
+    // 세로 분할(좌/우 컬럼 확장)
+    for (let i = 1; i < paneCount; i++) {
+      tmux(`split-window -h -t ${sessionName}:0`);
+    }
+    tmux(`select-layout -t ${sessionName}:0 even-horizontal`);
+    panes.length = 0;
+    for (let i = 0; i < paneCount; i++) {
+      panes.push(`${sessionName}:0.${i}`);
+    }
   } else {
-    // 1xN 수직 분할
+    // Nx1 가로 분할(상/하 스택)
     for (let i = 1; i < paneCount; i++) {
       tmux(`split-window -v -t ${sessionName}:0`);
     }
-    // even-vertical 레이아웃 적용
     tmux(`select-layout -t ${sessionName}:0 even-vertical`);
     panes.length = 0;
     for (let i = 0; i < paneCount; i++) {
@@ -113,18 +379,76 @@ export function createSession(sessionName, opts = {}) {
   return { sessionName, panes };
 }
 
+/**
+ * pane 포커스 이동
+ * @param {string} target
+ * @param {object} opts
+ * @param {boolean} opts.zoom
+ */
+export function focusPane(target, opts = {}) {
+  const { zoom = false } = opts;
+  tmux(`select-pane -t ${target}`);
+  if (zoom) {
+    try { tmux(`resize-pane -t ${target} -Z`); } catch {}
+  }
+}
+
+/**
+ * 팀메이트 조작 키 바인딩 설정
+ * - Shift+Down: 다음 팀메이트
+ * - Shift+Up: 이전 팀메이트
+ * - Escape: 현재 팀메이트 인터럽트(C-c)
+ * - Ctrl+T: 태스크 목록 표시
+ * @param {string} sessionName
+ * @param {object} opts
+ * @param {boolean} opts.inProcess
+ * @param {string} opts.taskListCommand
+ */
+export function configureTeammateKeybindings(sessionName, opts = {}) {
+  const { inProcess = false, taskListCommand = "" } = opts;
+  const cond = `#{==:#{session_name},${sessionName}}`;
+
+  if (inProcess) {
+    // 단일 뷰(zoom) 상태에서 팀메이트 순환
+    tmux(`bind-key -T root -n S-Down if-shell -F '${cond}' 'select-pane -t :.+ \\; resize-pane -Z' 'send-keys S-Down'`);
+    tmux(`bind-key -T root -n S-Up if-shell -F '${cond}' 'select-pane -t :.- \\; resize-pane -Z' 'send-keys S-Up'`);
+  } else {
+    // 분할 뷰에서 팀메이트 순환
+    tmux(`bind-key -T root -n S-Down if-shell -F '${cond}' 'select-pane -t :.+' 'send-keys S-Down'`);
+    tmux(`bind-key -T root -n S-Up if-shell -F '${cond}' 'select-pane -t :.-' 'send-keys S-Up'`);
+  }
+
+  // 현재 활성 pane 인터럽트
+  tmux(`bind-key -T root -n Escape if-shell -F '${cond}' 'send-keys C-c' 'send-keys Escape'`);
+
+  // 태스크 목록 토글 (tmux 3.2+ popup 우선, 실패 시 안내 메시지)
+  if (taskListCommand) {
+    const escaped = taskListCommand.replace(/'/g, "'\\''");
+    try {
+      tmux(`bind-key -T root -n C-t if-shell -F '${cond}' \"display-popup -E '${escaped}'\" \"send-keys C-t\"`);
+    } catch {
+      tmux(`bind-key -T root -n C-t if-shell -F '${cond}' 'display-message "tfx team tasks 명령으로 태스크 확인"' 'send-keys C-t'`);
+    }
+  }
+}
+
 /**
  * tmux 세션 연결 (포그라운드 전환)
  * @param {string} sessionName
  */
 export function attachSession(sessionName) {
-  const mux = detectMultiplexer();
-  const prefix = mux === "wsl-tmux" ? "wsl tmux" : "tmux";
-  // stdio: inherit로 사용자에게 제어권 반환
-  execSync(`${prefix} attach-session -t ${sessionName}`, {
+  if (!process.stdout.isTTY || !process.stdin.isTTY) {
+    throw new Error("현재 터미널은 tmux attach를 지원하지 않음 (non-TTY)");
+  }
+
+  const { command, args } = resolveAttachCommand(sessionName);
+  const r = spawnSync(command, args, {
     stdio: "inherit",
     timeout: 0, // 타임아웃 없음 (사용자가 detach할 때까지)
   });
+  if ((r.status ?? 1) !== 0) {
+    throw new Error(`tmux attach 실패 (exit=${r.status})`);
+  }
 }
 
 /**
@@ -168,6 +492,25 @@ export function listSessions() {
   }
 }
 
+/**
+ * 세션 attach client 수 조회
+ * @param {string} sessionName
+ * @returns {number|null}
+ */
+export function getSessionAttachedCount(sessionName) {
+  try {
+    const output = tmux('list-sessions -F "#{session_name} #{session_attached}"');
+    const line = output
+      .split("\n")
+      .find((l) => l.startsWith(`${sessionName} `));
+    if (!line) return null;
+    const n = parseInt(line.split(" ")[1], 10);
+    return Number.isFinite(n) ? n : null;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * pane 마지막 N줄 캡처
  * @param {string} target — 예: tfx-team-abc:0.1

package/hub/tools.mjs

@@ -1,7 +1,14 @@
-// hub/tools.mjs — MCP 도구 8개 정의
-// register, status, publish, ask, poll_messages, handoff, request_human_input, submit_human_input
+// hub/tools.mjs — MCP 도구 정의
+// register/status/publish/ask/poll/handoff/HITL + team proxy
 // 모든 도구 응답: { ok: boolean, error?: { code, message }, data?: ... }
 
+import {
+  teamInfo,
+  teamTaskList,
+  teamTaskUpdate,
+  teamSendMessage,
+} from './team/nativeProxy.mjs';
+
 /**
  * MCP 도구 목록 생성
  * @param {object} store  — createStore() 반환
@@ -145,19 +152,19 @@ export function createTools(store, router, hitl) {
           auto_ack: args.auto_ack,
         });
 
-        // wait_ms > 0 이고 메시지 없으면 짧은 간격으로 반복 재시도
-        if (!messages.length && args.wait_ms > 0) {
-          const interval = Math.min(args.wait_ms, 500);
-          const deadline = Date.now() + Math.min(args.wait_ms, 30000);
-          while (!messages.length && Date.now() < deadline) {
-            await new Promise(r => setTimeout(r, interval));
-            messages = store.pollForAgent(args.agent_id, {
-              max_messages: args.max_messages,
-              include_topics: args.include_topics,
-              auto_ack: args.auto_ack,
-            });
-          }
-        }
+        // wait_ms > 0 이고 메시지 없으면 짧은 간격으로 반복 재시도
+        if (!messages.length && args.wait_ms > 0) {
+          const interval = Math.min(args.wait_ms, 500);
+          const deadline = Date.now() + Math.min(args.wait_ms, 30000);
+          while (!messages.length && Date.now() < deadline) {
+            await new Promise(r => setTimeout(r, interval));
+            messages = store.pollForAgent(args.agent_id, {
+              max_messages: args.max_messages,
+              include_topics: args.include_topics,
+              auto_ack: args.auto_ack,
+            });
+          }
+        }
 
         return {
           ok: true,
@@ -238,5 +245,96 @@ export function createTools(store, router, hitl) {
         return hitl.submitHumanInput(args);
       }),
     },
+
+    // ── 9. team_info ──
+    {
+      name: 'team_info',
+      description: 'Claude Native Teams 메타/멤버/경로 정보를 조회합니다',
+      inputSchema: {
+        type: 'object',
+        required: ['team_name'],
+        properties: {
+          team_name: { type: 'string', minLength: 1, maxLength: 128, pattern: '^[a-z0-9][a-z0-9-]*$' },
+          include_members: { type: 'boolean', default: true },
+          include_paths: { type: 'boolean', default: true },
+        },
+      },
+      handler: wrap('TEAM_INFO_FAILED', (args) => {
+        return teamInfo(args);
+      }),
+    },
+
+    // ── 10. team_task_list ──
+    {
+      name: 'team_task_list',
+      description: 'Claude Native Teams task 목록을 owner/status 조건으로 조회합니다',
+      inputSchema: {
+        type: 'object',
+        required: ['team_name'],
+        properties: {
+          team_name: { type: 'string', pattern: '^[a-z0-9][a-z0-9-]*$' },
+          owner: { type: 'string' },
+          statuses: {
+            type: 'array',
+            items: { type: 'string', enum: ['pending', 'in_progress', 'completed', 'failed', 'deleted'] },
+            maxItems: 8,
+          },
+          include_internal: { type: 'boolean', default: false },
+          limit: { type: 'integer', minimum: 1, maximum: 1000, default: 200 },
+        },
+      },
+      handler: wrap('TEAM_TASK_LIST_FAILED', (args) => {
+        return teamTaskList(args);
+      }),
+    },
+
+    // ── 11. team_task_update ──
+    {
+      name: 'team_task_update',
+      description: 'Claude Native Teams task를 claim/update 합니다',
+      inputSchema: {
+        type: 'object',
+        required: ['team_name', 'task_id'],
+        properties: {
+          team_name: { type: 'string', pattern: '^[a-z0-9][a-z0-9-]*$' },
+          task_id: { type: 'string', minLength: 1, maxLength: 64 },
+          claim: { type: 'boolean', default: false },
+          owner: { type: 'string' },
+          status: { type: 'string', enum: ['pending', 'in_progress', 'completed', 'failed', 'deleted'] },
+          subject: { type: 'string' },
+          description: { type: 'string' },
+          activeForm: { type: 'string' },
+          add_blocks: { type: 'array', items: { type: 'string' } },
+          add_blocked_by: { type: 'array', items: { type: 'string' } },
+          metadata_patch: { type: 'object' },
+          if_match_mtime_ms: { type: 'number' },
+          actor: { type: 'string' },
+        },
+      },
+      handler: wrap('TEAM_TASK_UPDATE_FAILED', (args) => {
+        return teamTaskUpdate(args);
+      }),
+    },
+
+    // ── 12. team_send_message ──
+    {
+      name: 'team_send_message',
+      description: 'Claude Native Teams inbox에 메시지를 append 합니다',
+      inputSchema: {
+        type: 'object',
+        required: ['team_name', 'from', 'text'],
+        properties: {
+          team_name: { type: 'string', pattern: '^[a-z0-9][a-z0-9-]*$' },
+          from: { type: 'string', minLength: 1, maxLength: 128 },
+          to: { type: 'string', default: 'team-lead' },
+          text: { type: 'string', minLength: 1, maxLength: 200000 },
+          summary: { type: 'string', maxLength: 1000 },
+          color: { type: 'string', default: 'blue' },
+        },
+      },
+      handler: wrap('TEAM_SEND_MESSAGE_FAILED', (args) => {
+        return teamSendMessage(args);
+      }),
+    },
   ];
 }

package/package.json

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