triflux 7.3.2 → 7.5.0

package/hub/team/cli/services/hub-client.mjs

@@ -1,208 +1,208 @@
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { spawn } from "node:child_process";
-
-import { HUB_PID_DIR, PKG_ROOT } from "./state-store.mjs";
-export { nativeGetStatus } from "./native-control.mjs";
-
-const HUB_PID_FILE = join(HUB_PID_DIR, "hub.pid");
-const LOOPBACK_HOSTS = new Set(["127.0.0.1", "localhost", "::1"]);
-
-export function formatHostForUrl(host) {
-  return host.includes(":") ? `[${host}]` : host;
-}
-
-export function buildHubBaseUrl(host, port) {
-  return `http://${formatHostForUrl(host)}:${port}`;
-}
-
-export function getDefaultHubPort() {
-  const envPortRaw = Number(process.env.TFX_HUB_PORT || "27888");
-  return Number.isFinite(envPortRaw) && envPortRaw > 0 ? envPortRaw : 27888;
-}
-
-export function getDefaultHubUrl() {
-  return `${buildHubBaseUrl("127.0.0.1", getDefaultHubPort())}/mcp`;
-}
-
-function normalizeLoopbackHost(host) {
-  if (typeof host !== "string") return "127.0.0.1";
-  const candidate = host.trim();
-  return LOOPBACK_HOSTS.has(candidate) ? candidate : "127.0.0.1";
-}
-
-async function probeHubStatus(host, port, timeoutMs = 1500) {
-  try {
-    const res = await fetch(`${buildHubBaseUrl(host, port)}/status`, {
-      signal: AbortSignal.timeout(timeoutMs),
-    });
-    if (!res.ok) return null;
-    const data = await res.json();
-    return data?.hub ? data : null;
-  } catch {
-    return null;
-  }
-}
-
-export async function getHubInfo() {
-  const probePort = getDefaultHubPort();
-
-  if (existsSync(HUB_PID_FILE)) {
-    try {
-      const raw = JSON.parse(readFileSync(HUB_PID_FILE, "utf8"));
-      const pid = Number(raw?.pid);
-      if (!Number.isFinite(pid) || pid <= 0) throw new Error("invalid pid");
-      process.kill(pid, 0);
-      const host = normalizeLoopbackHost(raw?.host);
-      const port = Number(raw?.port) || 27888;
-      const status = await probeHubStatus(host, port, 1200);
-      return {
-        ...raw,
-        pid,
-        host,
-        port,
-        url: `${buildHubBaseUrl(host, port)}/mcp`,
-        ...(status ? {} : { degraded: true }),
-      };
-    } catch {
-      try { unlinkSync(HUB_PID_FILE); } catch {}
-    }
-  }
-
-  for (const portCandidate of Array.from(new Set([probePort, 27888]))) {
-    const data = await probeHubStatus("127.0.0.1", portCandidate, 1200);
-    if (!data) continue;
-    const port = Number(data.port) || portCandidate;
-    const pid = Number(data.pid);
-    const recovered = {
-      pid: Number.isFinite(pid) ? pid : null,
-      host: "127.0.0.1",
-      port,
-      url: `${buildHubBaseUrl("127.0.0.1", port)}/mcp`,
-      discovered: true,
-    };
-    if (Number.isFinite(recovered.pid) && recovered.pid > 0) {
-      try {
-        mkdirSync(HUB_PID_DIR, { recursive: true });
-        writeFileSync(HUB_PID_FILE, JSON.stringify({ ...recovered, started: Date.now() }));
-      } catch {}
-    }
-    return recovered;
-  }
-  return null;
-}
-
-export async function startHubDaemon() {
-  const serverPath = join(PKG_ROOT, "hub", "server.mjs");
-  if (!existsSync(serverPath)) {
-    const error = new Error("hub/server.mjs 없음");
-    error.code = "HUB_SERVER_MISSING";
-    throw error;
-  }
-
-  const child = spawn(process.execPath, [serverPath], {
-    env: { ...process.env },
-    stdio: "ignore",
-    detached: true,
-    windowsHide: true,
-  });
-  child.unref();
-
-  const expectedPort = getDefaultHubPort();
-  const deadline = Date.now() + 3000;
-  while (Date.now() < deadline) {
-    const status = await probeHubStatus("127.0.0.1", expectedPort, 500);
-    if (status?.hub) {
-      return {
-        pid: Number(status.pid) || child.pid,
-        host: "127.0.0.1",
-        port: expectedPort,
-        url: `${buildHubBaseUrl("127.0.0.1", expectedPort)}/mcp`,
-      };
-    }
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  }
-
-  return null;
-}
-
-/**
- * Hub가 살아있는지 확인하고, 죽어있으면 재시작을 시도한다.
- * exponential backoff: 1초, 2초, 4초
- * 모든 재시작 실패 시 에러를 throw한다 (silent fail 아님).
- * @param {number} [maxRetries=3]
- * @returns {Promise<object>} Hub 정보
- * @throws {Error} 모든 재시작 시도 실패 시
- */
-export async function ensureHubAlive(maxRetries = 3) {
-  const hub = await getHubInfo();
-  if (hub && !hub.degraded) return hub;
-
-  let lastError = null;
-  for (let i = 0; i < maxRetries; i++) {
-    try {
-      const restarted = await startHubDaemon();
-      if (restarted) {
-        // 재시작 후 연결 복구 확인
-        const recovered = await getHubInfo();
-        if (recovered) return recovered;
-      }
-    } catch (err) {
-      lastError = err;
-    }
-    // 다음 재시도 전 대기: 1초, 2초, 4초 (마지막 시도 후에는 대기 없음)
-    if (i < maxRetries - 1) {
-      const backoffMs = Math.pow(2, i) * 1000; // i=0: 1초, i=1: 2초, i=2: 4초
-      await new Promise((resolve) => setTimeout(resolve, backoffMs));
-    }
-  }
-
-  const error = new Error(`Hub 재시작 ${maxRetries}회 모두 실패${lastError ? `: ${lastError.message}` : ""}`);
-  error.code = "HUB_RESTART_FAILED";
-  error.cause = lastError;
-  throw error;
-}
-
-export async function fetchHubTaskList(state) {
-  const hubBase = (state?.hubUrl || getDefaultHubUrl()).replace(/\/mcp$/, "");
-  const teamName = state?.native?.teamName || state?.sessionName || null;
-  if (!teamName) return [];
-
-  try {
-    const res = await fetch(`${hubBase}/bridge/team/task-list`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ team_name: teamName }),
-      signal: AbortSignal.timeout(2000),
-    });
-    const data = await res.json();
-    return data?.ok ? (data.data?.tasks || []) : [];
-  } catch {
-    return [];
-  }
-}
-
-export async function publishLeadControl(state, targetMember, command, reason = "") {
-  const hubBase = (state?.hubUrl || getDefaultHubUrl()).replace(/\/mcp$/, "");
-  const leadAgent = (state?.members || []).find((member) => member.role === "lead")?.agentId || "lead";
-
-  try {
-    const res = await fetch(`${hubBase}/bridge/control`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        from_agent: leadAgent,
-        to_agent: targetMember.agentId,
-        command,
-        reason,
-        payload: {
-          issued_by: leadAgent,
-          issued_at: Date.now(),
-        },
-      }),
-    });
-    return !!res.ok;
-  } catch {
-    return false;
-  }
-}
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { spawn } from "node:child_process";
+
+import { HUB_PID_DIR, PKG_ROOT } from "./state-store.mjs";
+export { nativeGetStatus } from "./native-control.mjs";
+
+const HUB_PID_FILE = join(HUB_PID_DIR, "hub.pid");
+const LOOPBACK_HOSTS = new Set(["127.0.0.1", "localhost", "::1"]);
+
+export function formatHostForUrl(host) {
+  return host.includes(":") ? `[${host}]` : host;
+}
+
+export function buildHubBaseUrl(host, port) {
+  return `http://${formatHostForUrl(host)}:${port}`;
+}
+
+export function getDefaultHubPort() {
+  const envPortRaw = Number(process.env.TFX_HUB_PORT || "27888");
+  return Number.isFinite(envPortRaw) && envPortRaw > 0 ? envPortRaw : 27888;
+}
+
+export function getDefaultHubUrl() {
+  return `${buildHubBaseUrl("127.0.0.1", getDefaultHubPort())}/mcp`;
+}
+
+function normalizeLoopbackHost(host) {
+  if (typeof host !== "string") return "127.0.0.1";
+  const candidate = host.trim();
+  return LOOPBACK_HOSTS.has(candidate) ? candidate : "127.0.0.1";
+}
+
+async function probeHubStatus(host, port, timeoutMs = 1500) {
+  try {
+    const res = await fetch(`${buildHubBaseUrl(host, port)}/status`, {
+      signal: AbortSignal.timeout(timeoutMs),
+    });
+    if (!res.ok) return null;
+    const data = await res.json();
+    return data?.hub ? data : null;
+  } catch {
+    return null;
+  }
+}
+
+export async function getHubInfo() {
+  const probePort = getDefaultHubPort();
+
+  if (existsSync(HUB_PID_FILE)) {
+    try {
+      const raw = JSON.parse(readFileSync(HUB_PID_FILE, "utf8"));
+      const pid = Number(raw?.pid);
+      if (!Number.isFinite(pid) || pid <= 0) throw new Error("invalid pid");
+      process.kill(pid, 0);
+      const host = normalizeLoopbackHost(raw?.host);
+      const port = Number(raw?.port) || 27888;
+      const status = await probeHubStatus(host, port, 1200);
+      return {
+        ...raw,
+        pid,
+        host,
+        port,
+        url: `${buildHubBaseUrl(host, port)}/mcp`,
+        ...(status ? {} : { degraded: true }),
+      };
+    } catch {
+      try { unlinkSync(HUB_PID_FILE); } catch {}
+    }
+  }
+
+  for (const portCandidate of Array.from(new Set([probePort, 27888]))) {
+    const data = await probeHubStatus("127.0.0.1", portCandidate, 1200);
+    if (!data) continue;
+    const port = Number(data.port) || portCandidate;
+    const pid = Number(data.pid);
+    const recovered = {
+      pid: Number.isFinite(pid) ? pid : null,
+      host: "127.0.0.1",
+      port,
+      url: `${buildHubBaseUrl("127.0.0.1", port)}/mcp`,
+      discovered: true,
+    };
+    if (Number.isFinite(recovered.pid) && recovered.pid > 0) {
+      try {
+        mkdirSync(HUB_PID_DIR, { recursive: true });
+        writeFileSync(HUB_PID_FILE, JSON.stringify({ ...recovered, started: Date.now() }));
+      } catch {}
+    }
+    return recovered;
+  }
+  return null;
+}
+
+export async function startHubDaemon() {
+  const serverPath = join(PKG_ROOT, "hub", "server.mjs");
+  if (!existsSync(serverPath)) {
+    const error = new Error("hub/server.mjs 없음");
+    error.code = "HUB_SERVER_MISSING";
+    throw error;
+  }
+
+  const child = spawn(process.execPath, [serverPath], {
+    env: { ...process.env },
+    stdio: "ignore",
+    detached: true,
+    windowsHide: true,
+  });
+  child.unref();
+
+  const expectedPort = getDefaultHubPort();
+  const deadline = Date.now() + 3000;
+  while (Date.now() < deadline) {
+    const status = await probeHubStatus("127.0.0.1", expectedPort, 500);
+    if (status?.hub) {
+      return {
+        pid: Number(status.pid) || child.pid,
+        host: "127.0.0.1",
+        port: expectedPort,
+        url: `${buildHubBaseUrl("127.0.0.1", expectedPort)}/mcp`,
+      };
+    }
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+
+  return null;
+}
+
+/**
+ * Hub가 살아있는지 확인하고, 죽어있으면 재시작을 시도한다.
+ * exponential backoff: 1초, 2초, 4초
+ * 모든 재시작 실패 시 에러를 throw한다 (silent fail 아님).
+ * @param {number} [maxRetries=3]
+ * @returns {Promise<object>} Hub 정보
+ * @throws {Error} 모든 재시작 시도 실패 시
+ */
+export async function ensureHubAlive(maxRetries = 3) {
+  const hub = await getHubInfo();
+  if (hub && !hub.degraded) return hub;
+
+  let lastError = null;
+  for (let i = 0; i < maxRetries; i++) {
+    try {
+      const restarted = await startHubDaemon();
+      if (restarted) {
+        // 재시작 후 연결 복구 확인
+        const recovered = await getHubInfo();
+        if (recovered) return recovered;
+      }
+    } catch (err) {
+      lastError = err;
+    }
+    // 다음 재시도 전 대기: 1초, 2초, 4초 (마지막 시도 후에는 대기 없음)
+    if (i < maxRetries - 1) {
+      const backoffMs = Math.pow(2, i) * 1000; // i=0: 1초, i=1: 2초, i=2: 4초
+      await new Promise((resolve) => setTimeout(resolve, backoffMs));
+    }
+  }
+
+  const error = new Error(`Hub 재시작 ${maxRetries}회 모두 실패${lastError ? `: ${lastError.message}` : ""}`);
+  error.code = "HUB_RESTART_FAILED";
+  error.cause = lastError;
+  throw error;
+}
+
+export async function fetchHubTaskList(state) {
+  const hubBase = (state?.hubUrl || getDefaultHubUrl()).replace(/\/mcp$/, "");
+  const teamName = state?.native?.teamName || state?.sessionName || null;
+  if (!teamName) return [];
+
+  try {
+    const res = await fetch(`${hubBase}/bridge/team/task-list`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ team_name: teamName }),
+      signal: AbortSignal.timeout(2000),
+    });
+    const data = await res.json();
+    return data?.ok ? (data.data?.tasks || []) : [];
+  } catch {
+    return [];
+  }
+}
+
+export async function publishLeadControl(state, targetMember, command, reason = "") {
+  const hubBase = (state?.hubUrl || getDefaultHubUrl()).replace(/\/mcp$/, "");
+  const leadAgent = (state?.members || []).find((member) => member.role === "lead")?.agentId || "lead";
+
+  try {
+    const res = await fetch(`${hubBase}/bridge/control`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        from_agent: leadAgent,
+        to_agent: targetMember.agentId,
+        command,
+        reason,
+        payload: {
+          issued_by: leadAgent,
+          issued_at: Date.now(),
+        },
+      }),
+    });
+    return !!res.ok;
+  } catch {
+    return false;
+  }
+}

package/hub/team/cli/services/native-control.mjs

@@ -4,11 +4,14 @@ import { spawn } from "node:child_process";
 
 import { buildLeadPrompt, buildPrompt } from "../../orchestrator.mjs";
 import { HUB_PID_DIR, PKG_ROOT } from "./state-store.mjs";
+import { FEATURES } from "../../codex-compat.mjs";
 
 export function buildNativeCliCommand(cli) {
   switch (cli) {
     case "codex":
-      return "codex --dangerously-bypass-approvals-and-sandbox --no-alt-screen";
+      return FEATURES.execSubcommand
+        ? "codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check"
+        : "codex --dangerously-bypass-approvals-and-sandbox";
     case "gemini":
       return "gemini";
     case "claude":

package/hub/team/cli/services/runtime-mode.mjs

@@ -1,62 +1,62 @@
-import {
-  detectMultiplexer,
-  hasWindowsTerminal,
-  hasWindowsTerminalSession,
-  sessionExists,
-} from "../../session.mjs";
-
-export function normalizeTeammateMode(mode = "auto") {
-  const raw = String(mode).toLowerCase();
-  if (raw === "inline" || raw === "native") return "in-process";
-  if (raw === "headless" || raw === "hl") return "headless";
-  if (raw === "psmux") return "headless";
-  if (raw === "in-process" || raw === "tmux" || raw === "wt") return raw;
-  if (raw === "windows-terminal" || raw === "windows_terminal") return "wt";
-  if (raw === "auto") {
-    if (process.env.TMUX) return "tmux";
-    return detectMultiplexer() === "psmux" ? "headless" : "in-process";
-  }
-  return "in-process";
-}
-
-export function normalizeLayout(layout = "2x2") {
-  const raw = String(layout).toLowerCase();
-  if (raw === "2x2" || raw === "grid") return "2x2";
-  if (raw === "1xn" || raw === "1x3" || raw === "vertical" || raw === "columns") return "1xN";
-  if (raw === "nx1" || raw === "horizontal" || raw === "rows") return "Nx1";
-  return "2x2";
-}
-
-export function isNativeMode(state) {
-  return state?.teammateMode === "in-process" && !!state?.native?.controlUrl;
-}
-
-export function isWtMode(state) {
-  return state?.teammateMode === "wt";
-}
-
-export function isTeamAlive(state) {
-  if (!state) return false;
-  if (isNativeMode(state)) {
-    try {
-      process.kill(state.native.supervisorPid, 0);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-  if (isWtMode(state)) {
-    if (!hasWindowsTerminal()) return false;
-    if (hasWindowsTerminalSession()) return true;
-    return Array.isArray(state.members) && state.members.length > 0;
-  }
-  return sessionExists(state.sessionName);
-}
-
-export function ensureTmuxOrExit() {
-  const mux = detectMultiplexer();
-  if (mux) return mux;
-  const error = new Error("tmux 미발견");
-  error.code = "TMUX_REQUIRED";
-  throw error;
-}
+import {
+  detectMultiplexer,
+  hasWindowsTerminal,
+  hasWindowsTerminalSession,
+  sessionExists,
+} from "../../session.mjs";
+
+export function normalizeTeammateMode(mode = "auto") {
+  const raw = String(mode).toLowerCase();
+  if (raw === "inline" || raw === "native") return "in-process";
+  if (raw === "headless" || raw === "hl") return "headless";
+  if (raw === "psmux") return "headless";
+  if (raw === "in-process" || raw === "tmux" || raw === "wt") return raw;
+  if (raw === "windows-terminal" || raw === "windows_terminal") return "wt";
+  if (raw === "auto") {
+    if (process.env.TMUX) return "tmux";
+    return detectMultiplexer() === "psmux" ? "headless" : "in-process";
+  }
+  return "in-process";
+}
+
+export function normalizeLayout(layout = "2x2") {
+  const raw = String(layout).toLowerCase();
+  if (raw === "2x2" || raw === "grid") return "2x2";
+  if (raw === "1xn" || raw === "1x3" || raw === "vertical" || raw === "columns") return "1xN";
+  if (raw === "nx1" || raw === "horizontal" || raw === "rows") return "Nx1";
+  return "2x2";
+}
+
+export function isNativeMode(state) {
+  return state?.teammateMode === "in-process" && !!state?.native?.controlUrl;
+}
+
+export function isWtMode(state) {
+  return state?.teammateMode === "wt";
+}
+
+export function isTeamAlive(state) {
+  if (!state) return false;
+  if (isNativeMode(state)) {
+    try {
+      process.kill(state.native.supervisorPid, 0);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  if (isWtMode(state)) {
+    if (!hasWindowsTerminal()) return false;
+    if (hasWindowsTerminalSession()) return true;
+    return Array.isArray(state.members) && state.members.length > 0;
+  }
+  return sessionExists(state.sessionName);
+}
+
+export function ensureTmuxOrExit() {
+  const mux = detectMultiplexer();
+  if (mux) return mux;
+  const error = new Error("tmux 미발견");
+  error.code = "TMUX_REQUIRED";
+  throw error;
+}

package/hub/team/cli/services/state-store.mjs

@@ -1,48 +1,48 @@
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { mkdirSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { homedir } from "node:os";
-import { fileURLToPath } from "node:url";
-
-export const PKG_ROOT = fileURLToPath(new URL("../../../../", import.meta.url));
-export const HUB_PID_DIR = join(homedir(), ".claude", "cache", "tfx-hub");
-export const TEAM_PROFILE = (() => {
-  const raw = String(process.env.TFX_TEAM_PROFILE || "team").trim().toLowerCase();
-  return raw === "codex-team" ? "codex-team" : "team";
-})();
-
-export const SESSION_ID = process.env.CLAUDE_SESSION_ID || `s${Date.now()}`;
-
-function getStatePath(sessionId) {
-  if (sessionId) return join(HUB_PID_DIR, `team-state-${sessionId}.json`);
-  return join(HUB_PID_DIR, TEAM_PROFILE === "codex-team" ? "team-state-codex-team.json" : "team-state.json");
-}
-
-export function loadTeamState(sessionId) {
-  const resolvedId = sessionId || SESSION_ID;
-  const sessionPath = getStatePath(resolvedId);
-  try {
-    if (existsSync(sessionPath)) return JSON.parse(readFileSync(sessionPath, "utf8"));
-  } catch {
-    return null;
-  }
-  // 세션별 파일 없으면 기존 team-state.json fallback
-  const legacyPath = getStatePath(null);
-  try {
-    if (existsSync(legacyPath)) return JSON.parse(readFileSync(legacyPath, "utf8"));
-  } catch {
-    return null;
-  }
-  return null;
-}
-
-export function saveTeamState(state, sessionId) {
-  const path = getStatePath(sessionId || state.sessionId || SESSION_ID);
-  mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(path, JSON.stringify({ ...state, profile: TEAM_PROFILE }, null, 2) + "\n");
-}
-
-export function clearTeamState(sessionId) {
-  const path = getStatePath(sessionId || SESSION_ID);
-  if (existsSync(path)) unlinkSync(path);
-}
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { mkdirSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { homedir } from "node:os";
+import { fileURLToPath } from "node:url";
+
+export const PKG_ROOT = fileURLToPath(new URL("../../../../", import.meta.url));
+export const HUB_PID_DIR = join(homedir(), ".claude", "cache", "tfx-hub");
+export const TEAM_PROFILE = (() => {
+  const raw = String(process.env.TFX_TEAM_PROFILE || "team").trim().toLowerCase();
+  return raw === "codex-team" ? "codex-team" : "team";
+})();
+
+export const SESSION_ID = process.env.CLAUDE_SESSION_ID || `s${Date.now()}`;
+
+function getStatePath(sessionId) {
+  if (sessionId) return join(HUB_PID_DIR, `team-state-${sessionId}.json`);
+  return join(HUB_PID_DIR, TEAM_PROFILE === "codex-team" ? "team-state-codex-team.json" : "team-state.json");
+}
+
+export function loadTeamState(sessionId) {
+  const resolvedId = sessionId || SESSION_ID;
+  const sessionPath = getStatePath(resolvedId);
+  try {
+    if (existsSync(sessionPath)) return JSON.parse(readFileSync(sessionPath, "utf8"));
+  } catch {
+    return null;
+  }
+  // 세션별 파일 없으면 기존 team-state.json fallback
+  const legacyPath = getStatePath(null);
+  try {
+    if (existsSync(legacyPath)) return JSON.parse(readFileSync(legacyPath, "utf8"));
+  } catch {
+    return null;
+  }
+  return null;
+}
+
+export function saveTeamState(state, sessionId) {
+  const path = getStatePath(sessionId || state.sessionId || SESSION_ID);
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, JSON.stringify({ ...state, profile: TEAM_PROFILE }, null, 2) + "\n");
+}
+
+export function clearTeamState(sessionId) {
+  const path = getStatePath(sessionId || SESSION_ID);
+  if (existsSync(path)) unlinkSync(path);
+}