@triflux/remote 10.0.1 → 10.25.1

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

@@ -1,10 +1,20 @@
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
 import { spawn } from "node:child_process";
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
+import { join } from "node:path";
 
 import { publishLeadControl as publishLeadControlBridge } from "../../lead-control.mjs";
-import { getTeamStatus as fetchTeamStatus, subscribeToLeadCommands as pullLeadCommands } from "../../session-sync.mjs";
+import {
+  getTeamStatus as fetchTeamStatus,
+  subscribeToLeadCommands as pullLeadCommands,
+} from "../../session-sync.mjs";
 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");
@@ -56,18 +66,20 @@ export async function getHubInfo() {
       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 port = Number(raw?.port) || probePort;
       const status = await probeHubStatus(host, port, 1200);
+      if (!status) throw new Error("pid file process is not a healthy hub");
       return {
         ...raw,
         pid,
         host,
         port,
         url: `${buildHubBaseUrl(host, port)}/mcp`,
-        ...(status ? {} : { degraded: true }),
       };
     } catch {
-      try { unlinkSync(HUB_PID_FILE); } catch {}
+      try {
+        unlinkSync(HUB_PID_FILE);
+      } catch {}
     }
   }
 
@@ -86,7 +98,10 @@ export async function getHubInfo() {
     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() }));
+        writeFileSync(
+          HUB_PID_FILE,
+          JSON.stringify({ ...recovered, started: Date.now() }),
+        );
       } catch {}
     }
     return recovered;
@@ -154,12 +169,14 @@ export async function ensureHubAlive(maxRetries = 3) {
     }
     // 다음 재시도 전 대기: 1초, 2초, 4초 (마지막 시도 후에는 대기 없음)
     if (i < maxRetries - 1) {
-      const backoffMs = Math.pow(2, i) * 1000; // i=0: 1초, i=1: 2초, i=2: 4초
+      const backoffMs = 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}` : ""}`);
+  const error = new Error(
+    `Hub 재시작 ${maxRetries}회 모두 실패${lastError ? `: ${lastError.message}` : ""}`,
+  );
   error.code = "HUB_RESTART_FAILED";
   error.cause = lastError;
   throw error;
@@ -178,16 +195,24 @@ export async function fetchHubTaskList(state) {
       signal: AbortSignal.timeout(2000),
     });
     const data = await res.json();
-    return data?.ok ? (data.data?.tasks || []) : [];
+    return data?.ok ? data.data?.tasks || [] : [];
   } catch {
     return [];
   }
 }
 
-export async function publishLeadControl(state, targetMember, command, reason = "") {
+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";
-  const targetAgent = typeof targetMember === "string" ? targetMember : targetMember?.agentId;
+  const leadAgent =
+    (state?.members || []).find((member) => member.role === "lead")?.agentId ||
+    "lead";
+  const targetAgent =
+    typeof targetMember === "string" ? targetMember : targetMember?.agentId;
 
   const result = await publishLeadControlBridge({
     hubUrl: hubBase,
@@ -206,10 +231,13 @@ export async function publishLeadControl(state, targetMember, command, reason =
 
 export async function subscribeToLeadCommands(state, member, options = {}) {
   const hubBase = (state?.hubUrl || getDefaultHubUrl()).replace(/\/mcp$/, "");
-  const fallbackAgentId = (state?.members || []).find((candidate) => candidate.role === "lead")?.agentId || null;
-  const agentId = typeof member === "string"
-    ? member
-    : member?.agentId || options?.agentId || fallbackAgentId;
+  const fallbackAgentId =
+    (state?.members || []).find((candidate) => candidate.role === "lead")
+      ?.agentId || null;
+  const agentId =
+    typeof member === "string"
+      ? member
+      : member?.agentId || options?.agentId || fallbackAgentId;
 
   return await pullLeadCommands({
     hubUrl: hubBase,

package/hub/team/cli/services/member-selector.mjs

@@ -1,30 +1,37 @@
-export function resolveMember(state, selector) {
-  const members = state?.members || [];
-  if (!selector) return null;
-
-  const direct = members.find((member) => (
-    member.name === selector || member.role === selector || member.agentId === selector
-  ));
-  if (direct) return direct;
-
-  const workerAlias = /^worker-(\d+)$/i.exec(selector);
-  if (workerAlias) {
-    const index = parseInt(workerAlias[1], 10) - 1;
-    const workers = members.filter((member) => member.role === "worker");
-    if (index >= 0 && index < workers.length) return workers[index];
-  }
-
-  const numeric = parseInt(selector, 10);
-  if (!Number.isNaN(numeric)) {
-    const byPane = members.find((member) => member.pane?.endsWith(`.${numeric}`) || member.pane?.endsWith(`:${numeric}`));
-    if (byPane) return byPane;
-    if (numeric >= 1 && numeric <= members.length) return members[numeric - 1];
-  }
-
-  return null;
-}
-
-export function toAgentId(cli, target) {
-  const suffix = String(target).split(/[:.]/).pop();
-  return `${cli}-${suffix}`;
-}
+export function resolveMember(state, selector) {
+  const members = state?.members || [];
+  if (!selector) return null;
+
+  const direct = members.find(
+    (member) =>
+      member.name === selector ||
+      member.role === selector ||
+      member.agentId === selector,
+  );
+  if (direct) return direct;
+
+  const workerAlias = /^worker-(\d+)$/i.exec(selector);
+  if (workerAlias) {
+    const index = parseInt(workerAlias[1], 10) - 1;
+    const workers = members.filter((member) => member.role === "worker");
+    if (index >= 0 && index < workers.length) return workers[index];
+  }
+
+  const numeric = parseInt(selector, 10);
+  if (!Number.isNaN(numeric)) {
+    const byPane = members.find(
+      (member) =>
+        member.pane?.endsWith(`.${numeric}`) ||
+        member.pane?.endsWith(`:${numeric}`),
+    );
+    if (byPane) return byPane;
+    if (numeric >= 1 && numeric <= members.length) return members[numeric - 1];
+  }
+
+  return null;
+}
+
+export function toAgentId(cli, target) {
+  const suffix = String(target).split(/[:.]/).pop();
+  return `${cli}-${suffix}`;
+}

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

@@ -1,117 +1,145 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { spawn } from "node:child_process";
-
-import { buildLeadPrompt, buildPrompt } from "../../orchestrator.mjs";
-import { HUB_PID_DIR, PKG_ROOT } from "./state-store.mjs";
-
-import { buildExecArgs } from "@triflux/core/hub/codex-adapter.mjs";
-
-export function buildNativeCliCommand(cli) {
-  switch (cli) {
-    case "codex":
-      return buildExecArgs({});
-    case "gemini":
-      return "gemini";
-    case "claude":
-      return "claude";
-    default:
-      return cli;
-  }
-}
-
-export async function startNativeSupervisor({ sessionId, task, lead, agents, subtasks, hubUrl }) {
-  const configPath = join(HUB_PID_DIR, `team-native-${sessionId}.config.json`);
-  const runtimePath = join(HUB_PID_DIR, `team-native-${sessionId}.runtime.json`);
-  const logsDir = join(HUB_PID_DIR, "team-logs", sessionId);
-  mkdirSync(logsDir, { recursive: true });
-
-  const leadMember = {
-    role: "lead",
-    name: "lead",
-    cli: lead,
-    agentId: `${lead}-lead`,
-    command: buildNativeCliCommand(lead),
-  };
-  const workers = agents.map((cli, index) => ({
-    role: "worker",
-    name: `${cli}-${index + 1}`,
-    cli,
-    agentId: `${cli}-w${index + 1}`,
-    command: buildNativeCliCommand(cli),
-    subtask: subtasks[index],
-  }));
-  const members = [
-    {
-      ...leadMember,
-      prompt: buildLeadPrompt(task, {
-        agentId: leadMember.agentId,
-        hubUrl,
-        teammateMode: "in-process",
-        workers: workers.map((worker) => ({
-          agentId: worker.agentId,
-          cli: worker.cli,
-          subtask: worker.subtask,
-        })),
-      }),
-    },
-    ...workers.map((worker) => ({
-      ...worker,
-      prompt: buildPrompt(worker.subtask, { cli: worker.cli, agentId: worker.agentId, hubUrl }),
-    })),
-  ];
-
-  writeFileSync(configPath, JSON.stringify({
-    sessionName: sessionId,
-    hubUrl,
-    startupDelayMs: 3000,
-    logsDir,
-    runtimeFile: runtimePath,
-    members,
-  }, null, 2) + "\n");
-
-  const child = spawn(process.execPath, [join(PKG_ROOT, "hub", "team", "native-supervisor.mjs"), "--config", configPath], {
-    detached: true,
-    stdio: "ignore",
-    env: { ...process.env },
-    windowsHide: true,
-  });
-  child.unref();
-
-  const deadline = Date.now() + 5000;
-  while (Date.now() < deadline) {
-    if (existsSync(runtimePath)) {
-      try {
-        const runtime = JSON.parse(readFileSync(runtimePath, "utf8"));
-        return { runtime, members };
-      } catch {}
-    }
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  }
-
-  return { runtime: null, members };
-}
-
-export async function nativeRequest(state, path, body = {}) {
-  if (!state?.native?.controlUrl) return null;
-  try {
-    const res = await fetch(`${state.native.controlUrl}${path}`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body),
-    });
-    return await res.json();
-  } catch {
-    return null;
-  }
-}
-
-export async function nativeGetStatus(state) {
-  if (!state?.native?.controlUrl) return null;
-  try {
-    const res = await fetch(`${state.native.controlUrl}/status`);
-    return await res.json();
-  } catch {
-    return null;
-  }
+import { spawn } from "node:child_process";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { buildExecArgs } from "@triflux/core/hub/codex-adapter.mjs";
+import { buildLeadPrompt, buildPrompt } from "../../orchestrator.mjs";
+import { HUB_PID_DIR, PKG_ROOT } from "./state-store.mjs";
+
+export function buildNativeCliCommand(cli) {
+  switch (cli) {
+    case "codex":
+      return buildExecArgs({});
+    case "gemini":
+      return "gemini";
+    case "claude":
+      return "claude";
+    default:
+      return cli;
+  }
+}
+
+export async function startNativeSupervisor({
+  sessionId,
+  task,
+  lead,
+  agents,
+  subtasks,
+  hubUrl,
+}) {
+  const configPath = join(HUB_PID_DIR, `team-native-${sessionId}.config.json`);
+  const runtimePath = join(
+    HUB_PID_DIR,
+    `team-native-${sessionId}.runtime.json`,
+  );
+  const logsDir = join(HUB_PID_DIR, "team-logs", sessionId);
+  mkdirSync(logsDir, { recursive: true });
+
+  const leadMember = {
+    role: "lead",
+    name: "lead",
+    cli: lead,
+    agentId: `${lead}-lead`,
+    command: buildNativeCliCommand(lead),
+  };
+  const workers = agents.map((cli, index) => ({
+    role: "worker",
+    name: `${cli}-${index + 1}`,
+    cli,
+    agentId: `${cli}-w${index + 1}`,
+    command: buildNativeCliCommand(cli),
+    subtask: subtasks[index],
+  }));
+  const members = [
+    {
+      ...leadMember,
+      prompt: buildLeadPrompt(task, {
+        agentId: leadMember.agentId,
+        hubUrl,
+        teammateMode: "in-process",
+        workers: workers.map((worker) => ({
+          agentId: worker.agentId,
+          cli: worker.cli,
+          subtask: worker.subtask,
+        })),
+      }),
+    },
+    ...workers.map((worker) => ({
+      ...worker,
+      prompt: buildPrompt(worker.subtask, {
+        cli: worker.cli,
+        agentId: worker.agentId,
+        hubUrl,
+      }),
+    })),
+  ];
+
+  writeFileSync(
+    configPath,
+    JSON.stringify(
+      {
+        sessionName: sessionId,
+        hubUrl,
+        workdir: process.cwd(),
+        startupDelayMs: 3000,
+        logsDir,
+        runtimeFile: runtimePath,
+        members,
+      },
+      null,
+      2,
+    ) + "\n",
+  );
+
+  const child = spawn(
+    process.execPath,
+    [
+      join(PKG_ROOT, "hub", "team", "native-supervisor.mjs"),
+      "--config",
+      configPath,
+    ],
+    {
+      detached: true,
+      stdio: "ignore",
+      env: { ...process.env },
+      windowsHide: true,
+    },
+  );
+  child.unref();
+
+  const deadline = Date.now() + 5000;
+  while (Date.now() < deadline) {
+    if (existsSync(runtimePath)) {
+      try {
+        const runtime = JSON.parse(readFileSync(runtimePath, "utf8"));
+        return { runtime, members };
+      } catch {}
+    }
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+
+  return { runtime: null, members };
+}
+
+export async function nativeRequest(state, path, body = {}) {
+  if (!state?.native?.controlUrl) return null;
+  try {
+    const res = await fetch(`${state.native.controlUrl}${path}`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body),
+    });
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+
+export async function nativeGetStatus(state) {
+  if (!state?.native?.controlUrl) return null;
+  try {
+    const res = await fetch(`${state.native.controlUrl}/status`);
+    return await res.json();
+  } catch {
+    return null;
+  }
 }

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

@@ -22,7 +22,8 @@ export function normalizeTeammateMode(mode = "auto") {
 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 === "1xn" || raw === "1x3" || raw === "vertical" || raw === "columns")
+    return "1xN";
   if (raw === "nx1" || raw === "horizontal" || raw === "rows") return "Nx1";
   return "2x2";
 }
@@ -60,3 +61,56 @@ export function ensureTmuxOrExit() {
   error.code = "TMUX_REQUIRED";
   throw error;
 }
+
+/**
+ * teammateMode + 환경 기반 effective mode 결정 (pure function).
+ *
+ * - wt → wt.exe 없으면 in-process
+ * - wt → WT_SESSION 없으면 in-process
+ * - in-process → non-TTY 감지 시 headless (#114: run_in_background 부모 종료 시 자식 SIGTERM 방지)
+ * - override: TFX_FORCE_IN_PROCESS=1 로 in-process 유지
+ *
+ * @param {string} teammateMode
+ * @param {{
+ *   hasWt?: () => boolean,
+ *   hasWtSession?: () => boolean,
+ *   isTTY?: boolean,
+ *   env?: Record<string,string|undefined>,
+ * }} [deps]
+ * @returns {{ mode: string, warnings: string[] }}
+ */
+export function resolveEffectiveMode(teammateMode, deps = {}) {
+  const hasWt = deps.hasWt || hasWindowsTerminal;
+  const hasWtSession = deps.hasWtSession || hasWindowsTerminalSession;
+  const isTTY =
+    typeof deps.isTTY === "boolean"
+      ? deps.isTTY
+      : Boolean(process.stdout.isTTY);
+  const env = deps.env || process.env;
+
+  const warnings = [];
+  let effective = teammateMode;
+
+  if (effective === "wt" && !hasWt()) {
+    warnings.push("wt.exe 미발견 — in-process 모드로 자동 fallback");
+    effective = "in-process";
+  }
+  if (effective === "wt" && !hasWtSession()) {
+    warnings.push(
+      "WT_SESSION 미감지(Windows Terminal 외부) — in-process 모드로 자동 fallback",
+    );
+    effective = "in-process";
+  }
+  if (
+    effective === "in-process" &&
+    !isTTY &&
+    env.TFX_FORCE_IN_PROCESS !== "1"
+  ) {
+    warnings.push(
+      "non-TTY 환경 감지 (run_in_background 등) — headless 모드로 자동 fallback (#114). 강제 유지: TFX_FORCE_IN_PROCESS=1",
+    );
+    effective = "headless";
+  }
+
+  return { mode: effective, warnings };
+}

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

@@ -1,13 +1,23 @@
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { mkdirSync } from "node:fs";
-import { dirname, join } from "node:path";
+import {
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  readFileSync,
+  statSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
 import { homedir } from "node:os";
+import { dirname, join } from "node:path";
 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 HUB_PID_DIR =
+  process.env.TFX_HUB_PID_DIR || join(homedir(), ".claude", "cache", "tfx-hub");
 export const TEAM_PROFILE = (() => {
-  const raw = String(process.env.TFX_TEAM_PROFILE || "team").trim().toLowerCase();
+  const raw = String(process.env.TFX_TEAM_PROFILE || "team")
+    .trim()
+    .toLowerCase();
   return raw === "codex-team" ? "codex-team" : "team";
 })();
 
@@ -15,31 +25,78 @@ 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");
+  return join(
+    HUB_PID_DIR,
+    TEAM_PROFILE === "codex-team"
+      ? "team-state-codex-team.json"
+      : "team-state.json",
+  );
+}
+
+function findLatestMatchingTeamState() {
+  try {
+    if (!existsSync(HUB_PID_DIR)) return null;
+    const entries = readdirSync(HUB_PID_DIR)
+      .filter((name) => /^team-state-.+\.json$/.test(name))
+      .map((name) => {
+        const path = join(HUB_PID_DIR, name);
+        try {
+          return { path, mtime: statSync(path).mtimeMs };
+        } catch {
+          return null;
+        }
+      })
+      .filter(Boolean)
+      .sort((a, b) => b.mtime - a.mtime);
+    for (const { path } of entries) {
+      try {
+        const parsed = JSON.parse(readFileSync(path, "utf8"));
+        if ((parsed.profile || "team") === TEAM_PROFILE) return parsed;
+      } catch {
+        // corrupt entry — skip
+      }
+    }
+  } catch {
+    // directory walk failure
+  }
+  return null;
 }
 
 export function loadTeamState(sessionId) {
+  const explicit = Boolean(sessionId);
   const resolvedId = sessionId || SESSION_ID;
   const sessionPath = getStatePath(resolvedId);
   try {
-    if (existsSync(sessionPath)) return JSON.parse(readFileSync(sessionPath, "utf8"));
+    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"));
+    if (existsSync(legacyPath))
+      return JSON.parse(readFileSync(legacyPath, "utf8"));
   } catch {
     return null;
   }
+  // Issue #116-B: CLAUDE_SESSION_ID 미설정이거나 bg shell 의 다른 세션이 저장한
+  // team-state-*.json 을 tfx multi status 가 못 찾던 false-negative 우회.
+  // 명시 sessionId lookup 은 의도적 조회이므로 auto-discover 하지 않는다.
+  if (!explicit) {
+    const latest = findLatestMatchingTeamState();
+    if (latest) return latest;
+  }
   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");
+  writeFileSync(
+    path,
+    JSON.stringify({ ...state, profile: TEAM_PROFILE }, null, 2) + "\n",
+  );
 }
 
 export function clearTeamState(sessionId) {