@triflux/remote 10.50.1 → 10.51.0

package/hub/team/remote-session.mjs

@@ -1,5 +1,4 @@
-// hub/team/remote-session.mjs — Remote session primitives for swarm integration
-// Extracted from scripts/remote-spawn.mjs for reuse by swarm-hypervisor.
+// Remote session primitives.
 // Pure functions + SSH operations. No psmux, no WT, no CLI arg parsing.
 
 import { execFileSync } from "node:child_process";

package/hub/team/session.mjs

@@ -1,5 +1,4 @@
-// hub/team/session.mjs — tmux/psmux/wt 세션 생명주기 관리
-// 의존성: child_process (Node.js 내장)만 사용
+// tmux/psmux 세션 생명주기 관리
 import { execSync, spawnSync } from "node:child_process";
 import { resolveGitBashExecutable } from "@triflux/core/hub/lib/bash-path.mjs";
 import { getEnvironment } from "@triflux/core/hub/lib/env-detect.mjs";
@@ -16,7 +15,6 @@ import {
   psmuxExec,
   psmuxSessionExists,
 } from "./psmux.mjs";
-import { createWtManager } from "./wt-manager.mjs";
 
 /** Windows Terminal 실행 파일 존재 여부 */
 export function hasWindowsTerminal() {
@@ -55,25 +53,6 @@ function hasGitBashTmux() {
   }
 }
 
-function getCommandVersion(command) {
-  const r = spawnSync(command, ["-V"], {
-    encoding: "utf8",
-    timeout: 3000,
-    stdio: ["ignore", "pipe", "pipe"],
-    windowsHide: true,
-  });
-  if ((r.status ?? 1) !== 0) return null;
-  return `${r.stdout || ""}${r.stderr || ""}`.trim();
-}
-
-function isPsmuxVersion(command) {
-  try {
-    return /\bpsmux\b/i.test(getCommandVersion(command) || "");
-  } catch {
-    return false;
-  }
-}
-
 function isPsmuxCommandName(command) {
   const name = String(command || "")
     .replace(/\\/g, "/")
@@ -83,10 +62,6 @@ function isPsmuxCommandName(command) {
   return name === "psmux" || name === "psmux.exe" || name === "psmux.cmd";
 }
 
-function hasLiteralPsmuxBinary(command = process.env.PSMUX_BIN || "psmux") {
-  return isPsmuxVersion(command);
-}
-
 /**
  * 터미널 멀티플렉서 감지 (결과 캐싱 — 프로세스 수명 동안 불변)
  * @returns {'tmux'|'git-bash-tmux'|'psmux'|null}
@@ -105,10 +80,6 @@ export function detectMultiplexer() {
       _cachedMux = "tmux";
       return _cachedMux;
     }
-    if (hasLiteralPsmuxBinary()) {
-      _cachedMux = "psmux";
-      return _cachedMux;
-    }
     _cachedMux = null;
     return _cachedMux;
   }
@@ -150,7 +121,7 @@ function tmux(args, opts = {}) {
     return psmuxExec(args, opts);
   }
   if (mux === "git-bash-tmux") {
-    const bash = findGitBashExe();
+    const bash = resolveGitBashExecutable();
     if (!bash) throw new Error("git-bash-tmux 감지 실패");
     const r = spawnSync(bash, ["-lc", `tmux ${args}`], {
       encoding: "utf8",
@@ -220,77 +191,6 @@ export function resolveAttachCommand(sessionName, opts = {}) {
   };
 }
 
-/**
- * Windows Terminal pane 포커스 이동
- * @param {number} paneIndex - createWtSession()에서 생성한 pane 인덱스(0 기반)
- * @param {object} opts
- * @param {'1xN'|'Nx1'} opts.layout
- * @returns {boolean}
- */
-export function focusWtPane(paneIndex, opts = {}) {
-  // wt() 제거로 인해 일시 비활성화 (탭 기반 전환 필요)
-  return false;
-}
-
-/**
- * Windows Terminal에서 생성한 팀 pane 정리
- * @param {object} opts
- * @param {'1xN'|'Nx1'} opts.layout
- * @param {number} opts.paneCount
- * @returns {number} 닫힌 pane 수 (best-effort)
- */
-export function closeWtSession(opts = {}) {
-  // wt() 제거로 인해 일시 비활성화 (탭 기반 전환 필요)
-  return 0;
-}
-
-/**
- * Windows Terminal 독립 모드 세션 생성 (비동기)
- * @param {string} sessionName
- * @param {object} opts
- * @param {'1xN'|'Nx1'} opts.layout
- * @param {Array<{title:string,command:string,cwd?:string}>} opts.paneCommands
- * @returns {Promise<{ sessionName: string, panes: string[], titles: string[], layout: '1xN'|'Nx1', paneCount: number, anchorPane: string }>}
- */
-export async function createWtSession(sessionName, opts = {}) {
-  const { layout = "1xN", paneCommands = [] } = opts;
-
-  if (!hasWindowsTerminalSession()) {
-    throw new Error("WT_SESSION 미감지");
-  }
-  if (!getEnvironment().terminal.hasWt) {
-    throw new Error("wt.exe 미발견");
-  }
-  if (!Array.isArray(paneCommands) || paneCommands.length === 0) {
-    throw new Error("paneCommands가 비어 있음");
-  }
-
-  const wtManager = createWtManager();
-  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;
-
-    await wtManager.createTab({ title, command, cwd });
-    panes.push(`wt:${i}`);
-    titles.push(title);
-  }
-
-  return {
-    sessionName,
-    panes,
-    titles,
-    layout: layout === "Nx1" ? "Nx1" : "1xN",
-    paneCount: panes.length,
-    anchorPane: "wt:anchor",
-  };
-}
-
 /**
  * tmux 세션 생성 + 레이아웃 분할
  * @param {string} sessionName — 세션 이름
@@ -402,23 +302,12 @@ export function configureTeammateKeybindings(sessionName, opts = {}) {
     ? `'select-pane -t :.- \\; resize-pane -Z'`
     : `'select-pane -t :.-'`;
 
-  if (inProcess) {
-    // 단일 뷰(zoom) 상태에서 팀메이트 순환
-    tmux(
-      `bind-key -T root -n S-Down if-shell -F '${cond}' ${bindNext} 'send-keys S-Down'`,
-    );
-    tmux(
-      `bind-key -T root -n S-Up if-shell -F '${cond}' ${bindPrev} 'send-keys S-Up'`,
-    );
-  } else {
-    // 분할 뷰에서 팀메이트 순환
-    tmux(
-      `bind-key -T root -n S-Down if-shell -F '${cond}' ${bindNext} 'send-keys S-Down'`,
-    );
-    tmux(
-      `bind-key -T root -n S-Up if-shell -F '${cond}' ${bindPrev} 'send-keys S-Up'`,
-    );
-  }
+  tmux(
+    `bind-key -T root -n S-Down if-shell -F '${cond}' ${bindNext} 'send-keys S-Down'`,
+  );
+  tmux(
+    `bind-key -T root -n S-Up if-shell -F '${cond}' ${bindPrev} 'send-keys S-Up'`,
+  );
 
   // 대체 키: 일부 환경에서 S-Up이 누락될 때 사용
   tmux(

package/hub/team/swarm-intent.mjs

@@ -1,127 +1,5 @@
-// hub/team/swarm-intent.mjs — X-Intent helper utilities for semantic merge awareness
-
 const INTENT_TRAILER_REGEX = /^X-Intent:\s*(.+)$/m;
 
-function normalizeText(value) {
-  return typeof value === "string" ? value.trim() : "";
-}
-
-function normalizeTouches(touches) {
-  if (!Array.isArray(touches)) return null;
-  return touches
-    .filter((item) => typeof item === "string")
-    .map((item) => item.trim().replace(/\\/g, "/"))
-    .filter(Boolean);
-}
-
-function normalizeIntent(intentObj) {
-  if (!intentObj || typeof intentObj !== "object" || Array.isArray(intentObj)) {
-    return null;
-  }
-
-  const scope = normalizeText(intentObj.scope);
-  const action = normalizeText(intentObj.action);
-  const reason = normalizeText(intentObj.reason);
-  const touches = normalizeTouches(intentObj.touches);
-
-  if (!scope || !action || !reason || !touches) {
-    return null;
-  }
-
-  return {
-    scope,
-    action,
-    reason,
-    touches,
-    invariant: normalizeText(intentObj.invariant),
-    conflictsWith: normalizeText(intentObj.conflictsWith),
-  };
-}
-
-function fallbackIntent(llmResponse) {
-  const responseText = String(llmResponse ?? "");
-  return {
-    scope: "unknown",
-    action: "unknown",
-    reason: responseText.slice(0, 100),
-    touches: [],
-    invariant: "",
-    conflictsWith: "",
-  };
-}
-
-function includesEitherWay(a, b) {
-  if (!a || !b) return false;
-  return a.includes(b) || b.includes(a);
-}
-
-function hasConflict(intentA, intentB) {
-  const conflictsWith = normalizeText(intentA?.conflictsWith).toLowerCase();
-  const scope = normalizeText(intentB?.scope).toLowerCase();
-  const action = normalizeText(intentB?.action).toLowerCase();
-
-  if (!conflictsWith) return false;
-  return (
-    includesEitherWay(conflictsWith, scope) ||
-    includesEitherWay(conflictsWith, action)
-  );
-}
-
-function getTouchesOverlap(intentA, intentB) {
-  const touchesA = new Set(
-    (normalizeTouches(intentA?.touches) ?? []).map((item) =>
-      item.toLowerCase(),
-    ),
-  );
-  const touchesB = (normalizeTouches(intentB?.touches) ?? []).map((item) =>
-    item.toLowerCase(),
-  );
-  return touchesB.filter((item) => touchesA.has(item));
-}
-
-/**
- * Build prompts for an LLM to generate an X-Intent JSON object.
- * @param {string[]} changedFiles
- * @param {string} commitDiff
- * @param {string} taskContext
- * @returns {{ systemPrompt: string, userPrompt: string }}
- */
-export function generateIntentPrompt(changedFiles, commitDiff, taskContext) {
-  const files = Array.isArray(changedFiles)
-    ? changedFiles.filter((filePath) => typeof filePath === "string")
-    : [];
-  const diffSnippet = String(commitDiff ?? "").slice(0, 4000);
-  const context = String(taskContext ?? "").trim();
-
-  return {
-    systemPrompt:
-      "You generate commit intent metadata for semantic merge awareness. Return only valid JSON with keys: scope, action, reason, touches, invariant, conflictsWith.",
-    userPrompt: [
-      "Create an intent object from the following commit context.",
-      "- scope/action/reason must be concise strings.",
-      "- touches must be an array of touched file paths.",
-      "- invariant/conflictsWith should be strings (empty if unknown).",
-      "- Return JSON only (no markdown).",
-      "",
-      `Task context:\n${context || "(none provided)"}`,
-      "",
-      `Changed files (${files.length}):\n${files.join("\n") || "(none)"}`,
-      "",
-      "Commit diff (first 4000 chars):",
-      diffSnippet || "(empty)",
-    ].join("\n"),
-  };
-}
-
-/**
- * Format an intent object into an X-Intent commit trailer.
- * @param {object} intentObj
- * @returns {string}
- */
-export function formatIntentTrailer(intentObj) {
-  return `X-Intent: ${JSON.stringify(intentObj)}`;
-}
-
 /**
  * Parse an X-Intent trailer from a commit message.
  * @param {string} commitMessage
@@ -138,79 +16,3 @@ export function parseIntentTrailer(commitMessage) {
     return null;
   }
 }
-
-/**
- * Classify the relation between two intents.
- * @param {object} intentA
- * @param {object} intentB
- * @returns {{ relation: "complementary" | "complementary-risky" | "contradictory" | "independent", reason: string }}
- */
-export function classifyIntentPair(intentA, intentB) {
-  if (hasConflict(intentA, intentB) || hasConflict(intentB, intentA)) {
-    return {
-      relation: "contradictory",
-      reason:
-        "conflictsWith on one intent matches the other intent scope/action",
-    };
-  }
-
-  const scopeA = normalizeText(intentA?.scope).toLowerCase();
-  const scopeB = normalizeText(intentB?.scope).toLowerCase();
-
-  if (scopeA && scopeB && scopeA === scopeB) {
-    const overlap = getTouchesOverlap(intentA, intentB);
-    if (overlap.length > 0) {
-      return {
-        relation: "complementary-risky",
-        reason: `same scope with overlapping touched files: ${overlap.join(", ")}`,
-      };
-    }
-
-    return {
-      relation: "complementary",
-      reason:
-        "same scope with no conflicting intent and no touched-file overlap",
-    };
-  }
-
-  return {
-    relation: "independent",
-    reason: "different scopes and no conflictsWith match detected",
-  };
-}
-
-/**
- * Build a validated intent object from raw LLM response text.
- * @param {string} llmResponse
- * @returns {{ scope: string, action: string, reason: string, touches: string[], invariant: string, conflictsWith: string }}
- */
-export function buildIntentFromLLMResponse(llmResponse) {
-  const responseText = String(llmResponse ?? "").trim();
-  const candidates = [];
-
-  const codeBlockRegex = /```(?:json)?\s*([\s\S]*?)```/gi;
-  for (const match of responseText.matchAll(codeBlockRegex)) {
-    if (match[1]) candidates.push(match[1].trim());
-  }
-
-  candidates.push(responseText);
-
-  const firstBrace = responseText.indexOf("{");
-  const lastBrace = responseText.lastIndexOf("}");
-  if (firstBrace >= 0 && lastBrace > firstBrace) {
-    candidates.push(responseText.slice(firstBrace, lastBrace + 1));
-  }
-
-  for (const candidate of candidates) {
-    if (!candidate) continue;
-    try {
-      const parsed = JSON.parse(candidate);
-      const normalized = normalizeIntent(parsed);
-      if (normalized) return normalized;
-    } catch {
-      // ignore parse failures and continue trying other candidates
-    }
-  }
-
-  return fallbackIntent(responseText);
-}

package/hub/team/terminal-opener.mjs

@@ -56,16 +56,8 @@ function execOpenTerminal(execFn) {
   });
 }
 
-// psmux는 Windows에서 wt-manager 경유 (createTab/splitPane 등) — tmux 호환 unix 명령군과 다른 표면.
-// 비-Windows(macOS/Linux) 환경에서는 psmux가 tmux-compatible new-window/select-pane 명령을 받아주므로
-// tmux 어댑터와 동일하게 취급한다.
-function isTmuxLikeMux(mux, platform) {
-  return TMUX_LIKE_MUXES.has(mux) || (platform !== "win32" && mux === "psmux");
-}
-
-function shellCommandName(value) {
-  const command = String(value);
-  return /^[A-Za-z0-9_./:-]+$/u.test(command) ? command : shellQuote(command);
+function isTmuxLikeMux(mux) {
+  return TMUX_LIKE_MUXES.has(mux);
 }
 
 function powershellCommandName(value) {
@@ -94,17 +86,6 @@ function defaultPsmuxBinaryExists(command) {
   }
 }
 
-function buildAttachCommand(mux, sessionName, deps = {}) {
-  if (mux === "psmux") {
-    const command = process.env.PSMUX_BIN || "psmux";
-    const psmuxBinaryExists =
-      deps.psmuxBinaryExists || defaultPsmuxBinaryExists;
-    if (!psmuxBinaryExists(command)) return null;
-    return `${shellCommandName(command)} attach-session -t ${shellQuote(sessionName)}`;
-  }
-  return `tmux attach-session -t ${shellQuote(sessionName)}`;
-}
-
 // wt-manager.createTab은 (a) undefined/void 반환 — legacy success 의미 (b) {success:true|false, ...} 객체 반환의 두 형태가 공존.
 // `result?.success !== false`는 undefined/null/{}을 모두 success로 취급하고 명시적 {success:false}만 실패로 본다.
 function wtResultSucceeded(result) {
@@ -162,7 +143,7 @@ export function createTerminalOpener(deps = {}) {
     }
 
     const mux = resolveMux(deps);
-    if (isTmuxLikeMux(mux, platform)) {
+    if (isTmuxLikeMux(mux)) {
       const targetPane = resolveLeadPane(spec.targetPane);
       if (!targetPane) return false;
       const targetWindow = resolveLeadWindow(tmuxExec, targetPane);
@@ -212,19 +193,14 @@ export function createTerminalOpener(deps = {}) {
     }
 
     const mux = resolveMux(deps);
-    if (isTmuxLikeMux(mux, platform)) {
+    if (isTmuxLikeMux(mux)) {
       const targetPane = resolveLeadPane(opts.targetPane);
       if (!targetPane) return false;
-      const socketPath =
-        mux === "psmux" ? null : resolveLeadSocket(tmuxExec, targetPane);
-      if (mux !== "psmux" && !socketPath) return false;
-      const attachCommand =
-        mux === "psmux"
-          ? buildAttachCommand(mux, sessionName, deps)
-          : `env -u TMUX tmux -S ${shellQuote(
-              socketPath,
-            )} attach-session -t ${shellQuote(sessionName)}`;
-      if (!attachCommand) return false;
+      const socketPath = resolveLeadSocket(tmuxExec, targetPane);
+      if (!socketPath) return false;
+      const attachCommand = `env -u TMUX tmux -S ${shellQuote(
+        socketPath,
+      )} attach-session -t ${shellQuote(sessionName)}`;
       const targetWindow = resolveLeadWindow(tmuxExec, targetPane);
       if (!targetWindow) return false;
       try {
@@ -246,12 +222,12 @@ export function createTerminalOpener(deps = {}) {
     const target = `${sessionName}:0.${workerNumber}`;
     const mux = resolveMux(deps);
 
-    if (mux === "psmux") {
+    if (platform === "win32" && mux === "psmux") {
       psmuxExec(["select-pane", "-t", target]);
       return true;
     }
 
-    if (isTmuxLikeMux(mux, platform)) {
+    if (isTmuxLikeMux(mux)) {
       tmuxExec(`select-pane -t ${shellQuote(target)}`);
       return true;
     }

package/hub/team/tui-core.mjs

@@ -195,7 +195,7 @@ export function normalizeWorkerState(existing = {}, state = {}, opts = {}) {
 
 // ── 색상 헬퍼 ─────────────────────────────────────────────────────────────
 export function cliColor(cli) {
-  if (cli === "gemini") return FG.gemini;
+  if (cli === "antigravity" || cli === "agy") return FG.antigravity;
   if (cli === "claude") return FG.claude;
   if (cli === "codex") return FG.codex;
   return FG.white;

package/hub/team/tui-viewer.mjs

@@ -358,8 +358,8 @@ function ingest() {
 
     // CLI 타입 감지
     let cli = "codex";
-    if (pane.title.includes("gemini") || pane.title.includes("🔵"))
-      cli = "gemini";
+    if (pane.title.includes("antigravity") || pane.title.includes("🔵"))
+      cli = "antigravity";
     else if (pane.title.includes("claude") || pane.title.includes("🟠"))
       cli = "claude";
     ws.title = pane.title;