triflux 3.3.0-dev.1 → 3.3.0-dev.5

package/hub/team/cli-team-status.mjs

@@ -54,6 +54,21 @@ function renderTasks(tasks = []) {
   console.log("");
 }
 
+function formatCompletionSuffix(member) {
+  if (!member?.completionStatus) return "";
+  if (member.completionStatus === "abnormal") {
+    const reason = member.completionReason || "unknown";
+    return ` ${RED}[abnormal:${reason}]${RESET}`;
+  }
+  if (member.completionStatus === "normal") {
+    return ` ${GREEN}[route-ok]${RESET}`;
+  }
+  if (member.completionStatus === "unchecked") {
+    return ` ${GRAY}[route-unchecked]${RESET}`;
+  }
+  return "";
+}
+
 export async function teamStatus() {
   const state = loadTeamState();
   if (!state) {
@@ -91,7 +106,7 @@ export async function teamStatus() {
     if (nativeMembers.length) {
       console.log("");
       for (const m of nativeMembers) {
-        console.log(`    • ${m.name}: ${m.status}${m.lastPreview ? ` ${DIM}${m.lastPreview}${RESET}` : ""}`);
+        console.log(`    • ${m.name}: ${m.status}${formatCompletionSuffix(m)}${m.lastPreview ? ` ${DIM}${m.lastPreview}${RESET}` : ""}`);
       }
     }
   }
@@ -216,7 +231,7 @@ export async function teamDebug() {
       console.log(`    ${DIM}(no data)${RESET}`);
     } else {
       for (const m of members) {
-        console.log(`    - ${m.name}: ${m.status}${m.lastPreview ? ` ${DIM}${m.lastPreview}${RESET}` : ""}`);
+        console.log(`    - ${m.name}: ${m.status}${formatCompletionSuffix(m)}${m.lastPreview ? ` ${DIM}${m.lastPreview}${RESET}` : ""}`);
       }
     }
     console.log("");
@@ -266,4 +281,3 @@ export function teamList() {
   }
   console.log("");
 }
-

package/hub/team/native-supervisor.mjs

@@ -1,8 +1,11 @@
 // 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 { 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;
 
 function parseArgs(argv) {
   const out = {};
@@ -19,10 +22,43 @@ async function readJson(path) {
   return JSON.parse(readFileSync(path, "utf8"));
 }
 
-function safeText(v, fallback = "") {
-  if (v == null) return fallback;
-  return String(v);
-}
+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();
@@ -60,13 +96,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 || "",
-      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;
 }
 
@@ -128,13 +167,14 @@ function spawnMember(member) {
     }
   });
 
-  child.on("exit", (code) => {
-    state.status = "exited";
-    state.exitCode = code;
-    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);
 }

package/hub/team/native.mjs

@@ -7,6 +7,10 @@
 // 팀 설정을 프로그래밍적으로 생성할 때 사용한다.
 
 const ROUTE_SCRIPT = "~/.claude/scripts/tfx-route.sh";
+export const SLIM_WRAPPER_SUBAGENT_TYPE = "slim-wrapper";
+const ROUTE_LOG_RE = /\[tfx-route\]/i;
+const ROUTE_COMMAND_RE = /(?:^|[\s"'`])(?:bash\s+)?(?:[^"'`\s]*\/)?tfx-route\.sh\b/i;
+const ROUTE_PROMPT_RE = /tfx-route\.sh/i;
 
 function inferWorkerIndex(agentName = "") {
   const match = /(\d+)(?!.*\d)/.exec(agentName);
@@ -26,6 +30,63 @@ function buildRouteEnvPrefix(agentName, workerIndex, searchTool) {
   return envPrefix;
 }
 
+/**
+ * slim-wrapper 커스텀 subagent 사양.
+ * Claude Code custom subagent(`.claude/agents/slim-wrapper.md`)와 짝을 이룬다.
+ *
+ * @param {'codex'|'gemini'} cli
+ * @param {object} opts
+ * @returns {{name:string, cli:string, subagent_type:string, prompt:string}}
+ */
+export function buildSlimWrapperAgent(cli, opts = {}) {
+  return {
+    name: opts.agentName || `${cli}-wrapper`,
+    cli,
+    subagent_type: SLIM_WRAPPER_SUBAGENT_TYPE,
+    prompt: buildSlimWrapperPrompt(cli, opts),
+  };
+}
+
+/**
+ * slim-wrapper 로그에서 tfx-route.sh 경유 흔적을 판정한다.
+ * route stderr prefix(`[tfx-route]`) 또는 Bash command trace를 근거로 본다.
+ *
+ * @param {object} input
+ * @param {string} [input.promptText]
+ * @param {string} [input.stdoutText]
+ * @param {string} [input.stderrText]
+ * @returns {{
+ *   expectedRouteInvocation: boolean,
+ *   promptMentionsRoute: boolean,
+ *   sawRouteCommand: boolean,
+ *   sawRouteLog: boolean,
+ *   usedRoute: boolean,
+ *   abnormal: boolean,
+ *   reason: string|null,
+ * }}
+ */
+export function verifySlimWrapperRouteExecution(input = {}) {
+  const promptText = String(input.promptText || "");
+  const stdoutText = String(input.stdoutText || "");
+  const stderrText = String(input.stderrText || "");
+  const combinedLogs = `${stdoutText}\n${stderrText}`;
+  const promptMentionsRoute = ROUTE_PROMPT_RE.test(promptText);
+  const sawRouteCommand = ROUTE_COMMAND_RE.test(combinedLogs);
+  const sawRouteLog = ROUTE_LOG_RE.test(combinedLogs);
+  const usedRoute = sawRouteCommand || sawRouteLog;
+  const expectedRouteInvocation = promptMentionsRoute;
+
+  return {
+    expectedRouteInvocation,
+    promptMentionsRoute,
+    sawRouteCommand,
+    sawRouteLog,
+    usedRoute,
+    abnormal: expectedRouteInvocation && !usedRoute,
+    reason: expectedRouteInvocation && !usedRoute ? "missing_tfx_route_evidence" : null,
+  };
+}
+
 /**
  * role/mcp_profile별 tfx-route.sh 기본 timeout (초)
  * analyze/review 프로필이나 설계·분석 역할은 더 긴 timeout을 부여한다.
@@ -83,24 +144,34 @@ export function buildSlimWrapperPrompt(cli, opts = {}) {
     : '';
   const routeEnvPrefix = buildRouteEnvPrefix(agentName, workerIndex, searchTool);
 
-  const taskIdRef = taskId ? `taskId: "${taskId}"` : "";
+  return `실행 프로토콜 (subagent_type="${SLIM_WRAPPER_SUBAGENT_TYPE}"):
+1. Bash(command, timeout: ${bashTimeoutMs}) — 아래 명령 1회만 실행
+2. Bash 종료 후 TaskUpdate + SendMessage로 Claude Code 태스크 동기화
+3. 종료${pipelineHint}
 
-  return `인터럽트 프로토콜:
-1. TaskUpdate(${taskIdRef ? `${taskIdRef}, ` : ""}status: in_progress) — task claim
-2. SendMessage(to: ${leadName}, "작업 시작: ${agentName}") — 시작 보고 (턴 경계 생성)
-3. Bash(command, timeout: ${bashTimeoutMs}) — 아래 명령 1회 실행
-4. 결과 보고 후 반드시 종료${pipelineHint}
+[HARD CONSTRAINT] 허용 도구: Bash, TaskUpdate, SendMessage만 사용한다.
+Read, Edit, Write, Grep, Glob, Agent, WebSearch, WebFetch 등 다른 모든 도구 사용을 금지한다.
+코드를 직접 읽거나 수정하면 안 된다. 반드시 아래 Bash 명령(tfx-route.sh)을 통해 Codex/Gemini에 위임하라.
+이 규칙을 위반하면 작업 실패로 간주한다.
 
 gemini/codex를 직접 호출하지 마라. 반드시 tfx-route.sh를 거쳐야 한다.
 프롬프트를 파일로 저장하지 마라. tfx-route.sh가 인자로 받는다.
 
+Step 1 — Bash 실행:
 Bash(command: 'TFX_TEAM_NAME="${teamName}" TFX_TEAM_TASK_ID="${taskId}" TFX_TEAM_AGENT_NAME="${agentName}" TFX_TEAM_LEAD_NAME="${leadName}"${routeEnvPrefix} bash ${ROUTE_SCRIPT} "${role}" '"'"'${escaped}'"'"' ${mcp_profile}', timeout: ${bashTimeoutMs})
 
-성공 → TaskUpdate(${taskIdRef ? `${taskIdRef}, ` : ""}status: completed, metadata: {result: "success"}) + SendMessage(to: ${leadName}).
-실패 → TaskUpdate(${taskIdRef ? `${taskIdRef}, ` : ""}status: completed, metadata: {result: "failed", error: "에러 요약"}) + SendMessage(to: ${leadName}).
+Step 2 — Claude Code 태스크 동기화 (Bash 완료 후 반드시 실행):
+exit_code=0이면:
+  TaskUpdate(taskId: "${taskId}", status: "completed", metadata: {result: "success"})
+  SendMessage(type: "message", recipient: "${leadName}", content: "완료: ${agentName}", summary: "task ${taskId} success")
+exit_code≠0이면:
+  TaskUpdate(taskId: "${taskId}", status: "completed", metadata: {result: "failed", error: "exit_code=N"})
+  SendMessage(type: "message", recipient: "${leadName}", content: "실패: ${agentName} (exit=N)", summary: "task ${taskId} failed")
+TFX_NEEDS_FALLBACK 출력 감지 시:
+  TaskUpdate(taskId: "${taskId}", status: "completed", metadata: {result: "fallback", reason: "claude-native"})
+  SendMessage(type: "message", recipient: "${leadName}", content: "fallback 필요: ${agentName} — claude-native 역할은 Claude Agent로 위임 필요", summary: "task ${taskId} fallback")
 
-중요: TaskUpdate의 status는 "completed"만 사용. "failed"는 API 미지원.
-실패 여부는 metadata.result로 구분. Bash 실패 시에도 반드시 TaskUpdate + SendMessage 후 종료.`;
+Step 3 — TaskUpdate + SendMessage 후 즉시 종료. 추가 도구 호출 금지.`;
 }
 
 /**
@@ -169,6 +240,11 @@ export function buildHybridWrapperPrompt(cli, opts = {}) {
    Bash: node ${psmuxPath} output --session "${sessionName}" --name "${agentName}" --lines 100
    → 결과를 TaskUpdate + SendMessage로 보고
 ${pipelineHint}
+[HARD CONSTRAINT] 너는 Bash, TaskUpdate, TaskGet, TaskList, SendMessage만 사용할 수 있다.
+Read, Edit, Write, Grep, Glob, Agent, WebSearch, WebFetch 등 다른 모든 도구 사용을 금지한다.
+코드를 직접 읽거나 수정하면 안 된다. 반드시 아래 Bash 명령(tfx-route.sh)을 통해 Codex/Gemini에 위임하라.
+이 규칙을 위반하면 작업 실패로 간주한다.
+
 gemini/codex를 직접 호출하지 마라. psmux spawn이 tfx-route.sh를 통해 실행한다.
 프롬프트를 파일로 저장하지 마라. psmux spawn --cmd 인자로 전달된다.