triflux 10.4.0 → 10.7.0

package/hub/team/cli/render.mjs

@@ -1,30 +1,52 @@
-import { AMBER, BOLD, DIM, GRAY, GREEN, RED, RESET, WHITE, YELLOW } from "../shared.mjs";
-
-export function ok(msg) { console.log(`  ${GREEN}✓${RESET} ${msg}`); }
-export function warn(msg) { console.log(`  ${YELLOW}⚠${RESET} ${msg}`); }
-export function fail(msg) { console.log(`  ${RED}✗${RESET} ${msg}`); }
-
-export function renderTasks(tasks = []) {
-  if (!tasks.length) {
-    console.log(`\n  ${DIM}태스크 없음${RESET}\n`);
-    return;
-  }
-
-  console.log(`\n  ${AMBER}${BOLD}⬡ Team Tasks${RESET}\n`);
-  for (const task of tasks) {
-    const dep = task.depends_on?.length ? ` ${DIM}(deps: ${task.depends_on.join(",")})${RESET}` : "";
-    const owner = task.owner ? ` ${GRAY}[${task.owner}]${RESET}` : "";
-    console.log(`    ${WHITE}${task.id}${RESET} ${String(task.status || "").padEnd(11)} ${task.title}${owner}${dep}`);
-  }
-  console.log("");
-}
-
-export function formatCompletionSuffix(member) {
-  if (!member?.completionStatus) return "";
-  if (member.completionStatus === "abnormal") {
-    return ` ${RED}[abnormal:${member.completionReason || "unknown"}]${RESET}`;
-  }
-  if (member.completionStatus === "normal") return ` ${GREEN}[route-ok]${RESET}`;
-  if (member.completionStatus === "unchecked") return ` ${GRAY}[route-unchecked]${RESET}`;
-  return "";
-}
+import {
+  AMBER,
+  BOLD,
+  DIM,
+  GRAY,
+  GREEN,
+  RED,
+  RESET,
+  WHITE,
+  YELLOW,
+} from "../shared.mjs";
+
+export function ok(msg) {
+  console.log(`  ${GREEN}✓${RESET} ${msg}`);
+}
+export function warn(msg) {
+  console.log(`  ${YELLOW}⚠${RESET} ${msg}`);
+}
+export function fail(msg) {
+  console.log(`  ${RED}✗${RESET} ${msg}`);
+}
+
+export function renderTasks(tasks = []) {
+  if (!tasks.length) {
+    console.log(`\n  ${DIM}태스크 없음${RESET}\n`);
+    return;
+  }
+
+  console.log(`\n  ${AMBER}${BOLD}⬡ Team Tasks${RESET}\n`);
+  for (const task of tasks) {
+    const dep = task.depends_on?.length
+      ? ` ${DIM}(deps: ${task.depends_on.join(",")})${RESET}`
+      : "";
+    const owner = task.owner ? ` ${GRAY}[${task.owner}]${RESET}` : "";
+    console.log(
+      `    ${WHITE}${task.id}${RESET} ${String(task.status || "").padEnd(11)} ${task.title}${owner}${dep}`,
+    );
+  }
+  console.log("");
+}
+
+export function formatCompletionSuffix(member) {
+  if (!member?.completionStatus) return "";
+  if (member.completionStatus === "abnormal") {
+    return ` ${RED}[abnormal:${member.completionReason || "unknown"}]${RESET}`;
+  }
+  if (member.completionStatus === "normal")
+    return ` ${GREEN}[route-ok]${RESET}`;
+  if (member.completionStatus === "unchecked")
+    return ` ${GRAY}[route-unchecked]${RESET}`;
+  return "";
+}

package/hub/team/cli/services/attach-fallback.mjs

@@ -1,54 +1,74 @@
-import { spawn } from "node:child_process";
-
-import {
-  getSessionAttachedCount,
-  hasWindowsTerminal,
-  resolveAttachCommand,
-} from "../../session.mjs";
-import { PKG_ROOT } from "./state-store.mjs";
-
-export async function launchAttachInWindowsTerminal(sessionName) {
-  if (!hasWindowsTerminal()) return false;
-
-  let attachSpec;
-  try {
-    attachSpec = resolveAttachCommand(sessionName);
-  } catch {
-    return false;
-  }
-
-  const beforeAttached = getSessionAttachedCount(sessionName);
-  try {
-    const child = spawn("wt", ["-w", "0", "split-pane", "-V", "-d", PKG_ROOT, attachSpec.command, ...attachSpec.args], {
-      detached: true,
-      stdio: "ignore",
-      windowsHide: false,
-    });
-    child.unref();
-
-    if (beforeAttached == null) return true;
-    const deadline = Date.now() + 3500;
-    while (Date.now() < deadline) {
-      await new Promise((resolve) => setTimeout(resolve, 120));
-      const nowAttached = getSessionAttachedCount(sessionName);
-      if (typeof nowAttached === "number" && nowAttached > beforeAttached) return true;
-    }
-  } catch {}
-  return false;
-}
-
-export function buildManualAttachCommand(sessionName) {
-  try {
-    const spec = resolveAttachCommand(sessionName);
-    return [spec.command, ...spec.args].map((value) => {
-      const text = String(value);
-      return /\s/.test(text) ? `"${text.replace(/"/g, '\\"')}"` : text;
-    }).join(" ");
-  } catch {
-    return `tmux attach-session -t ${sessionName}`;
-  }
-}
-
-export function wantsWtAttachFallback(args = [], env = process.env) {
-  return args.includes("--wt") || args.includes("--spawn-wt") || env.TFX_ATTACH_WT_AUTO === "1";
-}
+import { spawn } from "node:child_process";
+
+import {
+  getSessionAttachedCount,
+  hasWindowsTerminal,
+  resolveAttachCommand,
+} from "../../session.mjs";
+import { PKG_ROOT } from "./state-store.mjs";
+
+export async function launchAttachInWindowsTerminal(sessionName) {
+  if (!hasWindowsTerminal()) return false;
+
+  let attachSpec;
+  try {
+    attachSpec = resolveAttachCommand(sessionName);
+  } catch {
+    return false;
+  }
+
+  const beforeAttached = getSessionAttachedCount(sessionName);
+  try {
+    const child = spawn(
+      "wt",
+      [
+        "-w",
+        "0",
+        "split-pane",
+        "-V",
+        "-d",
+        PKG_ROOT,
+        attachSpec.command,
+        ...attachSpec.args,
+      ],
+      {
+        detached: true,
+        stdio: "ignore",
+        windowsHide: false,
+      },
+    );
+    child.unref();
+
+    if (beforeAttached == null) return true;
+    const deadline = Date.now() + 3500;
+    while (Date.now() < deadline) {
+      await new Promise((resolve) => setTimeout(resolve, 120));
+      const nowAttached = getSessionAttachedCount(sessionName);
+      if (typeof nowAttached === "number" && nowAttached > beforeAttached)
+        return true;
+    }
+  } catch {}
+  return false;
+}
+
+export function buildManualAttachCommand(sessionName) {
+  try {
+    const spec = resolveAttachCommand(sessionName);
+    return [spec.command, ...spec.args]
+      .map((value) => {
+        const text = String(value);
+        return /\s/.test(text) ? `"${text.replace(/"/g, '\\"')}"` : text;
+      })
+      .join(" ");
+  } catch {
+    return `tmux attach-session -t ${sessionName}`;
+  }
+}
+
+export function wantsWtAttachFallback(args = [], env = process.env) {
+  return (
+    args.includes("--wt") ||
+    args.includes("--spawn-wt") ||
+    env.TFX_ATTACH_WT_AUTO === "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");
@@ -67,7 +77,9 @@ export async function getHubInfo() {
         ...(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;
@@ -159,7 +174,9 @@ export async function ensureHubAlive(maxRetries = 3) {
     }
   }
 
-  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,144 @@
-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 "../../../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 "../../../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,
+        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";
 }