triflux 10.3.0 → 10.3.2

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

@@ -1,117 +1,117 @@
-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 { 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;
+  }
 }

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

@@ -1,30 +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
-    )),
-  };
-}
+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/conductor.mjs

@@ -22,7 +22,7 @@ import { createRegistry } from "../../mesh/mesh-registry.mjs";
 import { broker } from "../account-broker.mjs";
 import { killProcess } from "../platform.mjs";
 import { createConductorMeshBridge } from "./conductor-mesh-bridge.mjs";
-import { getConductorRegistry } from "./conductor-registry.mjs";
+import { ensureConductorRegistry, getConductorRegistry } from "./conductor-registry.mjs";
 import { createEventLog } from "./event-log.mjs";
 import { createHealthProbe } from "./health-probe.mjs";
 import { buildLauncher } from "./launcher-template.mjs";
@@ -797,6 +797,6 @@ export function createConductor(opts = {}) {
   }
 
   const frozenApi = Object.freeze(conductor);
-  getConductorRegistry().register(frozenApi);
+  ensureConductorRegistry();
   return frozenApi;
 }

package/hub/team/notify.mjs

@@ -290,4 +290,4 @@ export function createNotifier(opts = {}) {
   });
 
   return createNotifierInstance(normalizeChannels(opts.channels, env), deps);
-}
+}

package/hub/team/orchestrator.mjs

@@ -1,161 +1,161 @@
-// hub/team/orchestrator.mjs — 작업 분배 + 프롬프트 구성
-// 의존성: pane.mjs만 사용
-import { injectPrompt } from "./pane.mjs";
-
-/**
- * 작업 분해 (LLM 없이 구분자 기반)
- * @param {string} taskDescription — 전체 작업 설명
- * @param {number} agentCount — 에이전트 수
- * @returns {string[]} 각 에이전트의 서브태스크
- */
-export function decomposeTask(taskDescription, agentCount) {
-  if (agentCount <= 0) return [];
-  if (agentCount === 1) return [taskDescription];
-
-  // '+', ',', '\n' 기준으로 분리
-  const parts = taskDescription
-    .split(/[+,\n]+/)
-    .map((s) => s.trim())
-    .filter(Boolean);
-
-  if (parts.length === 0) return [taskDescription];
-
-  // 에이전트보다 서브태스크가 적으면 마지막 에이전트에 전체 태스크 부여
-  if (parts.length < agentCount) {
-    const result = [...parts];
-    while (result.length < agentCount) {
-      result.push(taskDescription);
-    }
-    return result;
-  }
-
-  // 에이전트보다 서브태스크가 많으면 앞에서부터 N개, 나머지는 마지막에 합침
-  if (parts.length > agentCount) {
-    const result = parts.slice(0, agentCount - 1);
-    result.push(parts.slice(agentCount - 1).join(" + "));
-    return result;
-  }
-
-  return parts;
-}
-
-/**
- * 리드(보통 claude) 초기 프롬프트 생성
- * @param {string} taskDescription
- * @param {object} config
- * @param {string} config.agentId
- * @param {string} config.hubUrl
- * @param {string} config.teammateMode
- * @param {Array<{agentId:string, cli:string, subtask:string}>} config.workers
- * @returns {string}
- */
-export function buildLeadPrompt(taskDescription, config) {
-  const { agentId, teammateMode = "tmux", workers = [] } = config;
-
-  const roster = workers
-    .map((w, i) => `${i + 1}. ${w.agentId} (${w.cli}) — ${w.subtask}`)
-    .join("\n") || "- (워커 없음)";
-
-  const workerIds = workers.map((w) => w.agentId).join(", ");
-
-  const bridgePath = "node hub/bridge.mjs";
-
-  return `리드 에이전트: ${agentId}
-
-목표: ${taskDescription}
-모드: ${teammateMode}
-
-워커:
-${roster}
-
-규칙:
-- 가능한 짧고 핵심만 지시/요약(토큰 절약)
-- 워커 제어:
-  ${bridgePath} result --agent ${agentId} --topic lead.control
-- 워커 결과 수집:
-  ${bridgePath} context --agent ${agentId} --max 20
-- 최종 결과는 topic="task.result"를 모아 통합
-
-워커 ID: ${workerIds || "(없음)"}
-지금 즉시 워커를 배정하고 병렬 진행을 관리하라.`;
-}
-
-/**
- * 워커 초기 프롬프트 생성
- * @param {string} subtask — 이 에이전트의 서브태스크
- * @param {object} config
- * @param {string} config.cli — codex/gemini/claude
- * @param {string} config.agentId — 에이전트 식별자
- * @param {string} config.hubUrl — Hub URL
- * @returns {string}
- */
-export function buildPrompt(subtask, config) {
-  const { cli, agentId, hubUrl } = config;
-
-  const _hubBase = hubUrl.replace("/mcp", "");
-
-  const bridgePath = "node hub/bridge.mjs";
-
-  return `워커: ${agentId} (${cli})
-작업: ${subtask}
-
-필수 규칙:
-1) 간결하게 작업(불필요한 장문 설명 금지)
-2) 시작 즉시 등록:
-   ${bridgePath} register --agent ${agentId} --cli ${cli} --topics lead.control,task.result
-3) 주기적으로 수신함 확인:
-   ${bridgePath} context --agent ${agentId} --max 10
-4) lead.control 수신 시 즉시 반응 (interrupt/stop/pause/resume)
-5) 완료 시 결과 발행:
-   ${bridgePath} result --agent ${agentId} --topic task.result --file <출력파일>
-
-지금 작업을 시작하라.`;
-}
-
-/**
- * 팀 오케스트레이션 실행 — 각 pane에 프롬프트 주입
- * @param {string} sessionName — tmux 세션 이름
- * @param {Array<{target: string, cli: string, subtask: string}>} assignments
- * @param {object} opts
- * @param {string} opts.hubUrl — Hub URL
- * @param {{target:string, cli:string, task:string}|null} opts.lead
- * @param {string} opts.teammateMode
- * @returns {Promise<void>}
- */
-export async function orchestrate(sessionName, assignments, opts = {}) {
-  const {
-    hubUrl = "http://127.0.0.1:27888/mcp",
-    lead = null,
-    teammateMode = "tmux",
-  } = opts;
-
-  const workers = assignments.map(({ target, cli, subtask }) => ({
-    target,
-    cli,
-    subtask,
-    agentId: `${cli}-${target.split(".").pop()}`,
-  }));
-
-  if (lead?.target) {
-    const leadAgentId = `${lead.cli || "claude"}-${lead.target.split(".").pop()}`;
-    const leadPrompt = buildLeadPrompt(lead.task || "팀 작업 조율", {
-      agentId: leadAgentId,
-      hubUrl,
-      teammateMode,
-      workers: workers.map((w) => ({ agentId: w.agentId, cli: w.cli, subtask: w.subtask })),
-    });
-    injectPrompt(lead.target, leadPrompt, { useFileRef: true });
-    await new Promise((r) => setTimeout(r, 100));
-  }
-
-  for (const worker of workers) {
-    const prompt = buildPrompt(worker.subtask, {
-      cli: worker.cli,
-      agentId: worker.agentId,
-      hubUrl,
-      sessionName,
-    });
-    injectPrompt(worker.target, prompt, { useFileRef: true });
-    await new Promise((r) => setTimeout(r, 100));
-  }
-}
+// hub/team/orchestrator.mjs — 작업 분배 + 프롬프트 구성
+// 의존성: pane.mjs만 사용
+import { injectPrompt } from "./pane.mjs";
+
+/**
+ * 작업 분해 (LLM 없이 구분자 기반)
+ * @param {string} taskDescription — 전체 작업 설명
+ * @param {number} agentCount — 에이전트 수
+ * @returns {string[]} 각 에이전트의 서브태스크
+ */
+export function decomposeTask(taskDescription, agentCount) {
+  if (agentCount <= 0) return [];
+  if (agentCount === 1) return [taskDescription];
+
+  // '+', ',', '\n' 기준으로 분리
+  const parts = taskDescription
+    .split(/[+,\n]+/)
+    .map((s) => s.trim())
+    .filter(Boolean);
+
+  if (parts.length === 0) return [taskDescription];
+
+  // 에이전트보다 서브태스크가 적으면 마지막 에이전트에 전체 태스크 부여
+  if (parts.length < agentCount) {
+    const result = [...parts];
+    while (result.length < agentCount) {
+      result.push(taskDescription);
+    }
+    return result;
+  }
+
+  // 에이전트보다 서브태스크가 많으면 앞에서부터 N개, 나머지는 마지막에 합침
+  if (parts.length > agentCount) {
+    const result = parts.slice(0, agentCount - 1);
+    result.push(parts.slice(agentCount - 1).join(" + "));
+    return result;
+  }
+
+  return parts;
+}
+
+/**
+ * 리드(보통 claude) 초기 프롬프트 생성
+ * @param {string} taskDescription
+ * @param {object} config
+ * @param {string} config.agentId
+ * @param {string} config.hubUrl
+ * @param {string} config.teammateMode
+ * @param {Array<{agentId:string, cli:string, subtask:string}>} config.workers
+ * @returns {string}
+ */
+export function buildLeadPrompt(taskDescription, config) {
+  const { agentId, teammateMode = "tmux", workers = [] } = config;
+
+  const roster = workers
+    .map((w, i) => `${i + 1}. ${w.agentId} (${w.cli}) — ${w.subtask}`)
+    .join("\n") || "- (워커 없음)";
+
+  const workerIds = workers.map((w) => w.agentId).join(", ");
+
+  const bridgePath = "node hub/bridge.mjs";
+
+  return `리드 에이전트: ${agentId}
+
+목표: ${taskDescription}
+모드: ${teammateMode}
+
+워커:
+${roster}
+
+규칙:
+- 가능한 짧고 핵심만 지시/요약(토큰 절약)
+- 워커 제어:
+  ${bridgePath} result --agent ${agentId} --topic lead.control
+- 워커 결과 수집:
+  ${bridgePath} context --agent ${agentId} --max 20
+- 최종 결과는 topic="task.result"를 모아 통합
+
+워커 ID: ${workerIds || "(없음)"}
+지금 즉시 워커를 배정하고 병렬 진행을 관리하라.`;
+}
+
+/**
+ * 워커 초기 프롬프트 생성
+ * @param {string} subtask — 이 에이전트의 서브태스크
+ * @param {object} config
+ * @param {string} config.cli — codex/gemini/claude
+ * @param {string} config.agentId — 에이전트 식별자
+ * @param {string} config.hubUrl — Hub URL
+ * @returns {string}
+ */
+export function buildPrompt(subtask, config) {
+  const { cli, agentId, hubUrl } = config;
+
+  const _hubBase = hubUrl.replace("/mcp", "");
+
+  const bridgePath = "node hub/bridge.mjs";
+
+  return `워커: ${agentId} (${cli})
+작업: ${subtask}
+
+필수 규칙:
+1) 간결하게 작업(불필요한 장문 설명 금지)
+2) 시작 즉시 등록:
+   ${bridgePath} register --agent ${agentId} --cli ${cli} --topics lead.control,task.result
+3) 주기적으로 수신함 확인:
+   ${bridgePath} context --agent ${agentId} --max 10
+4) lead.control 수신 시 즉시 반응 (interrupt/stop/pause/resume)
+5) 완료 시 결과 발행:
+   ${bridgePath} result --agent ${agentId} --topic task.result --file <출력파일>
+
+지금 작업을 시작하라.`;
+}
+
+/**
+ * 팀 오케스트레이션 실행 — 각 pane에 프롬프트 주입
+ * @param {string} sessionName — tmux 세션 이름
+ * @param {Array<{target: string, cli: string, subtask: string}>} assignments
+ * @param {object} opts
+ * @param {string} opts.hubUrl — Hub URL
+ * @param {{target:string, cli:string, task:string}|null} opts.lead
+ * @param {string} opts.teammateMode
+ * @returns {Promise<void>}
+ */
+export async function orchestrate(sessionName, assignments, opts = {}) {
+  const {
+    hubUrl = "http://127.0.0.1:27888/mcp",
+    lead = null,
+    teammateMode = "tmux",
+  } = opts;
+
+  const workers = assignments.map(({ target, cli, subtask }) => ({
+    target,
+    cli,
+    subtask,
+    agentId: `${cli}-${target.split(".").pop()}`,
+  }));
+
+  if (lead?.target) {
+    const leadAgentId = `${lead.cli || "claude"}-${lead.target.split(".").pop()}`;
+    const leadPrompt = buildLeadPrompt(lead.task || "팀 작업 조율", {
+      agentId: leadAgentId,
+      hubUrl,
+      teammateMode,
+      workers: workers.map((w) => ({ agentId: w.agentId, cli: w.cli, subtask: w.subtask })),
+    });
+    injectPrompt(lead.target, leadPrompt, { useFileRef: true });
+    await new Promise((r) => setTimeout(r, 100));
+  }
+
+  for (const worker of workers) {
+    const prompt = buildPrompt(worker.subtask, {
+      cli: worker.cli,
+      agentId: worker.agentId,
+      hubUrl,
+      sessionName,
+    });
+    injectPrompt(worker.target, prompt, { useFileRef: true });
+    await new Promise((r) => setTimeout(r, 100));
+  }
+}