triflux 3.3.0-dev.7 → 4.0.0

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

@@ -0,0 +1,115 @@
+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";
+
+export function buildNativeCliCommand(cli) {
+  switch (cli) {
+    case "codex":
+      return "codex --dangerously-bypass-approvals-and-sandbox --no-alt-screen";
+    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;
+  }
+}

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

@@ -0,0 +1,60 @@
+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 === "in-process" || raw === "tmux" || raw === "wt" || raw === "psmux") return raw;
+  if (raw === "windows-terminal" || raw === "windows_terminal") return "wt";
+  if (raw === "auto") {
+    if (process.env.TMUX) return "tmux";
+    return detectMultiplexer() === "psmux" ? "psmux" : "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

@@ -0,0 +1,34 @@
+import { 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";
+})();
+
+const TEAM_STATE_FILE = join(
+  HUB_PID_DIR,
+  TEAM_PROFILE === "codex-team" ? "team-state-codex-team.json" : "team-state.json",
+);
+
+export function loadTeamState() {
+  try {
+    return JSON.parse(readFileSync(TEAM_STATE_FILE, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+export function saveTeamState(state) {
+  mkdirSync(dirname(TEAM_STATE_FILE), { recursive: true });
+  writeFileSync(TEAM_STATE_FILE, JSON.stringify({ ...state, profile: TEAM_PROFILE }, null, 2) + "\n");
+}
+
+export function clearTeamState() {
+  try { unlinkSync(TEAM_STATE_FILE); } catch {}
+}

package/hub/team/cli/services/task-model.mjs

@@ -0,0 +1,30 @@
+export function buildTasks(subtasks, workers) {
+  return subtasks.map((subtask, index) => ({
+    id: `T${index + 1}`,
+    title: subtask,
+    owner: workers[index]?.name || null,
+    status: "pending",
+    depends_on: index === 0 ? [] : [`T${index}`],
+  }));
+}
+
+export function normalizeTaskStatus(action) {
+  const value = String(action || "").toLowerCase();
+  if (value === "done" || value === "complete" || value === "completed") return "completed";
+  if (value === "progress" || value === "in-progress" || value === "in_progress") return "in_progress";
+  if (value === "pending") return "pending";
+  return null;
+}
+
+export function updateTaskStatus(tasks = [], taskId, nextStatus) {
+  const normalizedId = String(taskId || "").toUpperCase();
+  const target = tasks.find((task) => String(task.id).toUpperCase() === normalizedId);
+  if (!target) return { tasks, target: null };
+
+  return {
+    target: { ...target, status: nextStatus },
+    tasks: tasks.map((task) => (
+      String(task.id).toUpperCase() === normalizedId ? { ...task, status: nextStatus } : task
+    )),
+  };
+}

package/hub/team/native-supervisor.mjs

@@ -1,11 +1,12 @@
 // hub/team/native-supervisor.mjs — tmux 없이 멀티 CLI를 직접 띄우는 네이티브 팀 런타임
-import { createServer } from "node:http";
-import { spawn } from "node:child_process";
-import { mkdirSync, readFileSync, writeFileSync, createWriteStream } from "node:fs";
-import { dirname, join } from "node:path";
-import { verifySlimWrapperRouteExecution } from "./native.mjs";
-
-const ROUTE_LOG_TAIL_BYTES = 65536;
+import { createServer } from "node:http";
+import { spawn } from "node:child_process";
+import { mkdirSync, readFileSync, writeFileSync, createWriteStream } from "node:fs";
+import { dirname, join } from "node:path";
+import { verifySlimWrapperRouteExecution } from "./native.mjs";
+import { forceCleanupTeam } from "./nativeProxy.mjs";
+
+const ROUTE_LOG_TAIL_BYTES = 65536;
 
 function parseArgs(argv) {
   const out = {};
@@ -22,43 +23,43 @@ async function readJson(path) {
   return JSON.parse(readFileSync(path, "utf8"));
 }
 
-function safeText(v, fallback = "") {
-  if (v == null) return fallback;
-  return String(v);
-}
-
-function readTailText(path, maxBytes = ROUTE_LOG_TAIL_BYTES) {
-  try {
-    const raw = readFileSync(path, "utf8");
-    if (raw.length <= maxBytes) return raw;
-    return raw.slice(-maxBytes);
-  } catch {
-    return "";
-  }
-}
-
-function finalizeRouteVerification(state) {
-  if (state?.member?.role !== "worker") return;
-
-  const verification = verifySlimWrapperRouteExecution({
-    promptText: safeText(state.member?.prompt),
-    stdoutText: readTailText(state.logFile),
-    stderrText: readTailText(state.errFile),
-  });
-
-  state.routeVerification = verification;
-  if (!verification.expectedRouteInvocation) {
-    state.completionStatus = "unchecked";
-    state.completionReason = null;
-    return;
-  }
-
-  state.completionStatus = verification.abnormal ? "abnormal" : "normal";
-  state.completionReason = verification.reason;
-  if (verification.abnormal) {
-    state.lastPreview = "[abnormal] tfx-route.sh evidence missing";
-  }
-}
+function safeText(v, fallback = "") {
+  if (v == null) return fallback;
+  return String(v);
+}
+
+function readTailText(path, maxBytes = ROUTE_LOG_TAIL_BYTES) {
+  try {
+    const raw = readFileSync(path, "utf8");
+    if (raw.length <= maxBytes) return raw;
+    return raw.slice(-maxBytes);
+  } catch {
+    return "";
+  }
+}
+
+function finalizeRouteVerification(state) {
+  if (state?.member?.role !== "worker") return;
+
+  const verification = verifySlimWrapperRouteExecution({
+    promptText: safeText(state.member?.prompt),
+    stdoutText: readTailText(state.logFile),
+    stderrText: readTailText(state.errFile),
+  });
+
+  state.routeVerification = verification;
+  if (!verification.expectedRouteInvocation) {
+    state.completionStatus = "unchecked";
+    state.completionReason = null;
+    return;
+  }
+
+  state.completionStatus = verification.abnormal ? "abnormal" : "normal";
+  state.completionReason = verification.reason;
+  if (verification.abnormal) {
+    state.lastPreview = "[abnormal] tfx-route.sh evidence missing";
+  }
+}
 
 function nowMs() {
   return Date.now();
@@ -73,6 +74,7 @@ if (!args.config) {
 const config = await readJson(args.config);
 const {
   sessionName,
+  teamName = sessionName,
   runtimeFile,
   logsDir,
   startupDelayMs = 3000,
@@ -96,16 +98,16 @@ function memberStateSnapshot() {
       agentId: m.agentId,
       command: m.command,
       pid: state?.child?.pid || null,
-      status: state?.status || "unknown",
-      exitCode: state?.exitCode ?? null,
-      lastPreview: state?.lastPreview || "",
-      completionStatus: state?.completionStatus || null,
-      completionReason: state?.completionReason || null,
-      routeVerification: state?.routeVerification || null,
-      logFile: state?.logFile || null,
-      errFile: state?.errFile || null,
-    });
-  }
+      status: state?.status || "unknown",
+      exitCode: state?.exitCode ?? null,
+      lastPreview: state?.lastPreview || "",
+      completionStatus: state?.completionStatus || null,
+      completionReason: state?.completionReason || null,
+      routeVerification: state?.routeVerification || null,
+      logFile: state?.logFile || null,
+      errFile: state?.errFile || null,
+    });
+  }
   return states;
 }
 
@@ -167,14 +169,14 @@ function spawnMember(member) {
     }
   });
 
-  child.on("exit", (code) => {
-    state.status = "exited";
-    state.exitCode = code;
-    finalizeRouteVerification(state);
-    try { outWs.end(); } catch {}
-    try { errWs.end(); } catch {}
-    maybeAutoShutdown();
-  });
+  child.on("exit", (code) => {
+    state.status = "exited";
+    state.exitCode = code;
+    finalizeRouteVerification(state);
+    try { outWs.end(); } catch {}
+    try { errWs.end(); } catch {}
+    maybeAutoShutdown();
+  });
 
   processMap.set(member.name, state);
 }
@@ -224,7 +226,7 @@ function maybeAutoShutdown() {
   shutdown();
 }
 
-function shutdown() {
+async function shutdown() {
   if (isShuttingDown) return;
   isShuttingDown = true;
 
@@ -237,6 +239,10 @@ function shutdown() {
     try { state.errWs.end(); } catch {}
   }
 
+  try {
+    await forceCleanupTeam(teamName);
+  } catch {}
+
   setTimeout(() => {
     for (const state of processMap.values()) {
       if (state.status === "running") {