triflux 3.3.0-dev.3 → 3.3.0-dev.5

package/hub/pipe.mjs

@@ -5,6 +5,19 @@ import net from 'node:net';
 import { existsSync, unlinkSync } from 'node:fs';
 import { join } from 'node:path';
 import { randomUUID } from 'node:crypto';
+import {
+  teamInfo,
+  teamTaskList,
+  teamTaskUpdate,
+  teamSendMessage,
+} from './team/nativeProxy.mjs';
+import { createPipeline } from './pipeline/index.mjs';
+import {
+  ensurePipelineTable,
+  initPipelineState,
+  listPipelineStates,
+  readPipelineState,
+} from './pipeline/state.mjs';
 
 const DEFAULT_HEARTBEAT_TTL_MS = 60000;
 
@@ -236,6 +249,41 @@ export function createPipeServer({
         };
       }
 
+      case 'team_task_update': {
+        const result = await teamTaskUpdate(payload);
+        if (client) touchClient(client);
+        return result;
+      }
+
+      case 'team_send_message': {
+        const result = await teamSendMessage(payload);
+        if (client) touchClient(client);
+        return result;
+      }
+
+      case 'pipeline_advance': {
+        if (client) touchClient(client);
+        if (!store?.db) {
+          return { ok: false, error: 'hub_db_not_found' };
+        }
+        ensurePipelineTable(store.db);
+        const pipeline = createPipeline(store.db, payload.team_name);
+        return pipeline.advance(payload.phase);
+      }
+
+      case 'pipeline_init': {
+        if (client) touchClient(client);
+        if (!store?.db) {
+          return { ok: false, error: 'hub_db_not_found' };
+        }
+        ensurePipelineTable(store.db);
+        const state = initPipelineState(store.db, payload.team_name, {
+          fix_max: payload.fix_max,
+          ralph_max: payload.ralph_max,
+        });
+        return { ok: true, data: state };
+      }
+
       default:
         return {
           ok: false,
@@ -305,6 +353,39 @@ export function createPipeServer({
         return router.getAssignStatus(payload);
       }
 
+      case 'team_info': {
+        const result = await teamInfo(payload);
+        if (client) touchClient(client);
+        return result;
+      }
+
+      case 'team_task_list': {
+        const result = await teamTaskList(payload);
+        if (client) touchClient(client);
+        return result;
+      }
+
+      case 'pipeline_state': {
+        if (client) touchClient(client);
+        if (!store?.db) {
+          return { ok: false, error: 'hub_db_not_found' };
+        }
+        ensurePipelineTable(store.db);
+        const state = readPipelineState(store.db, payload.team_name);
+        return state
+          ? { ok: true, data: state }
+          : { ok: false, error: 'pipeline_not_found' };
+      }
+
+      case 'pipeline_list': {
+        if (client) touchClient(client);
+        if (!store?.db) {
+          return { ok: false, error: 'hub_db_not_found' };
+        }
+        ensurePipelineTable(store.db);
+        return { ok: true, data: listPipelineStates(store.db) };
+      }
+
       default:
         return {
           ok: false,

package/hub/server.mjs

@@ -13,22 +13,8 @@ import { createStore } from './store.mjs';
 import { createRouter } from './router.mjs';
 import { createHitlManager } from './hitl.mjs';
 import { createPipeServer } from './pipe.mjs';
+import { createAssignCallbackServer } from './assign-callbacks.mjs';
 import { createTools } from './tools.mjs';
-import {
-  ensurePipelineTable,
-  createPipeline,
-} from './pipeline/index.mjs';
-import {
-  readPipelineState,
-  initPipelineState,
-  listPipelineStates,
-} from './pipeline/state.mjs';
-import {
-  teamInfo,
-  teamTaskList,
-  teamTaskUpdate,
-  teamSendMessage,
-} from './team/nativeProxy.mjs';
 
 function isInitializeRequest(body) {
   if (body?.method === 'initialize') return true;
@@ -61,6 +47,22 @@ function isAllowedOrigin(origin) {
   return origin && ALLOWED_ORIGIN_RE.test(origin);
 }
 
+function resolveTeamStatusCode(result) {
+  if (result?.ok) return 200;
+  const code = result?.error?.code;
+  if (code === 'TEAM_NOT_FOUND' || code === 'TASK_NOT_FOUND' || code === 'TASKS_DIR_NOT_FOUND') return 404;
+  if (code === 'CLAIM_CONFLICT' || code === 'MTIME_CONFLICT') return 409;
+  if (code === 'INVALID_TEAM_NAME' || code === 'INVALID_TASK_ID' || code === 'INVALID_TEXT' || code === 'INVALID_FROM' || code === 'INVALID_STATUS') return 400;
+  return 500;
+}
+
+function resolvePipelineStatusCode(result) {
+  if (result?.ok) return 200;
+  if (result?.error === 'pipeline_not_found') return 404;
+  if (result?.error === 'hub_db_not_found') return 503;
+  return 400;
+}
+
 /**
  * tfx-hub 시작
  * @param {object} opts
@@ -82,6 +84,7 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1', sessi
   const store = createStore(dbPath);
   const router = createRouter(store);
   const pipe = createPipeServer({ router, store, sessionId });
+  const assignCallbacks = createAssignCallbackServer({ store, sessionId });
   const hitl = createHitlManager(store, router);
   const tools = createTools(store, router, hitl, pipe);
   const transports = new Map();
@@ -145,6 +148,8 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1', sessi
         port,
         pipe_path: pipe.path,
         pipe: pipe.getStatus(),
+        assign_callback_pipe_path: assignCallbacks.path,
+        assign_callback_pipe: assignCallbacks.getStatus(),
       }));
     }
 
@@ -343,25 +348,17 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1', sessi
         if (req.method === 'POST') {
           let teamResult = null;
           if (path === '/bridge/team/info' || path === '/bridge/team-info') {
-            teamResult = await teamInfo(body);
+            teamResult = await pipe.executeQuery('team_info', body);
           } else if (path === '/bridge/team/task-list' || path === '/bridge/team-task-list') {
-            teamResult = await teamTaskList(body);
+            teamResult = await pipe.executeQuery('team_task_list', body);
           } else if (path === '/bridge/team/task-update' || path === '/bridge/team-task-update') {
-            teamResult = await teamTaskUpdate(body);
+            teamResult = await pipe.executeCommand('team_task_update', body);
           } else if (path === '/bridge/team/send-message' || path === '/bridge/team-send-message') {
-            teamResult = await teamSendMessage(body);
+            teamResult = await pipe.executeCommand('team_send_message', body);
           }
 
           if (teamResult) {
-            let status = 200;
-            const code = teamResult?.error?.code;
-            if (!teamResult.ok) {
-              if (code === 'TEAM_NOT_FOUND' || code === 'TASK_NOT_FOUND' || code === 'TASKS_DIR_NOT_FOUND') status = 404;
-              else if (code === 'CLAIM_CONFLICT' || code === 'MTIME_CONFLICT') status = 409;
-              else if (code === 'INVALID_TEAM_NAME' || code === 'INVALID_TASK_ID' || code === 'INVALID_TEXT' || code === 'INVALID_FROM' || code === 'INVALID_STATUS') status = 400;
-              else status = 500;
-            }
-            res.writeHead(status);
+            res.writeHead(resolveTeamStatusCode(teamResult));
             return res.end(JSON.stringify(teamResult));
           }
 
@@ -372,51 +369,42 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1', sessi
 
           // ── 파이프라인 엔드포인트 ──
           if (path === '/bridge/pipeline/state' && req.method === 'POST') {
-            ensurePipelineTable(store.db);
-            const { team_name } = body;
-            const state = readPipelineState(store.db, team_name);
-            res.writeHead(state ? 200 : 404);
-            return res.end(JSON.stringify(state
-              ? { ok: true, data: state }
-              : { ok: false, error: 'pipeline_not_found' }));
+            const result = await pipe.executeQuery('pipeline_state', body);
+            res.writeHead(resolvePipelineStatusCode(result));
+            return res.end(JSON.stringify(result));
           }
 
           if (path === '/bridge/pipeline/advance' && req.method === 'POST') {
-            ensurePipelineTable(store.db);
-            const { team_name, phase } = body;
-            const pipeline = createPipeline(store.db, team_name);
-            const result = pipeline.advance(phase);
-            res.writeHead(result.ok ? 200 : 400);
+            const result = await pipe.executeCommand('pipeline_advance', body);
+            res.writeHead(resolvePipelineStatusCode(result));
             return res.end(JSON.stringify(result));
           }
 
           if (path === '/bridge/pipeline/init' && req.method === 'POST') {
-            ensurePipelineTable(store.db);
-            const { team_name, fix_max, ralph_max } = body;
-            const state = initPipelineState(store.db, team_name, { fix_max, ralph_max });
-            res.writeHead(200);
-            return res.end(JSON.stringify({ ok: true, data: state }));
+            const result = await pipe.executeCommand('pipeline_init', body);
+            res.writeHead(resolvePipelineStatusCode(result));
+            return res.end(JSON.stringify(result));
           }
 
           if (path === '/bridge/pipeline/list' && req.method === 'POST') {
-            ensurePipelineTable(store.db);
-            const states = listPipelineStates(store.db);
-            res.writeHead(200);
-            return res.end(JSON.stringify({ ok: true, data: states }));
+            const result = await pipe.executeQuery('pipeline_list', body);
+            res.writeHead(resolvePipelineStatusCode(result));
+            return res.end(JSON.stringify(result));
           }
         }
 
         if (path === '/bridge/context' && req.method === 'POST') {
-          const { agent_id, topics, max_messages = 10 } = body;
+          const { agent_id, topics, max_messages = 10, auto_ack = true } = body;
           if (!agent_id) {
             res.writeHead(400);
             return res.end(JSON.stringify({ ok: false, error: 'agent_id 필수' }));
           }
 
-          const result = await pipe.executeQuery('context', {
+          const result = await pipe.executeQuery('drain', {
             agent_id,
             topics,
             max_messages,
+            auto_ack,
           });
           res.writeHead(200);
           return res.end(JSON.stringify(result));
@@ -536,6 +524,7 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1', sessi
 
   mkdirSync(PID_DIR, { recursive: true });
   await pipe.start();
+  await assignCallbacks.start();
 
   return new Promise((resolve, reject) => {
     httpServer.listen(port, host, () => {
@@ -544,9 +533,12 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1', sessi
         host,
         dbPath,
         pid: process.pid,
+        hubToken: HUB_TOKEN,
         url: `http://${host}:${port}/mcp`,
         pipe_path: pipe.path,
         pipePath: pipe.path,
+        assign_callback_pipe_path: assignCallbacks.path,
+        assignCallbackPipePath: assignCallbacks.path,
       };
 
       writeFileSync(PID_FILE, JSON.stringify({
@@ -556,10 +548,11 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1', sessi
         url: info.url,
         pipe_path: pipe.path,
         pipePath: pipe.path,
+        assign_callback_pipe_path: assignCallbacks.path,
         started: Date.now(),
       }));
 
-      console.log(`[tfx-hub] MCP 서버 시작: ${info.url} / pipe ${pipe.path} (PID ${process.pid})`);
+      console.log(`[tfx-hub] MCP 서버 시작: ${info.url} / pipe ${pipe.path} / assign-callback ${assignCallbacks.path} (PID ${process.pid})`);
 
       const stopFn = async () => {
         router.stopSweeper();
@@ -570,13 +563,23 @@ export async function startHub({ port = 27888, dbPath, host = '127.0.0.1', sessi
         }
         transports.clear();
         await pipe.stop();
+        await assignCallbacks.stop();
         store.close();
         try { unlinkSync(PID_FILE); } catch {}
         try { unlinkSync(TOKEN_FILE); } catch {}
         await new Promise((resolveClose) => httpServer.close(resolveClose));
       };
 
-      resolve({ ...info, httpServer, store, router, hitl, pipe, stop: stopFn });
+      resolve({
+        ...info,
+        httpServer,
+        store,
+        router,
+        hitl,
+        pipe,
+        assignCallbacks,
+        stop: stopFn,
+      });
     });
     httpServer.on('error', reject);
   });

package/hub/store.mjs

@@ -223,6 +223,24 @@ export function createStore(dbPath) {
     activeAssignCount: db.prepare("SELECT COUNT(*) as cnt FROM assign_jobs WHERE status IN ('queued','running')"),
   };
 
+  const assignStatusListeners = new Set();
+
+  function buildAssignCallbackEvent(row) {
+    return {
+      job_id: row.job_id,
+      status: row.status,
+      result: row.result ?? row.error ?? null,
+      timestamp: new Date(row.updated_at_ms || Date.now()).toISOString(),
+    };
+  }
+
+  function notifyAssignStatusListeners(row) {
+    const event = buildAssignCallbackEvent(row);
+    for (const listener of Array.from(assignStatusListeners)) {
+      try { listener(event, row); } catch {}
+    }
+  }
+
   function clampMaxMessages(value, fallback = 20) {
     const num = Number(value);
     if (!Number.isFinite(num)) return fallback;
@@ -481,7 +499,9 @@ export function createStore(dbPath) {
         last_retry_at_ms: retry_count > 0 ? now : null,
       };
       S.insertAssign.run(row);
-      return store.getAssign(row.job_id);
+      const inserted = store.getAssign(row.job_id);
+      notifyAssignStatusListeners(inserted);
+      return inserted;
     },
 
     getAssign(jobId) {
@@ -541,7 +561,11 @@ export function createStore(dbPath) {
           : current.last_retry_at_ms,
       };
       S.updateAssign.run(nextRow);
-      return store.getAssign(jobId);
+      const updated = store.getAssign(jobId);
+      if (updated && current.status !== updated.status) {
+        notifyAssignStatusListeners(updated);
+      }
+      return updated;
     },
 
     listAssigns({
@@ -639,6 +663,16 @@ export function createStore(dbPath) {
       };
     },
 
+    onAssignStatusChange(listener) {
+      if (typeof listener !== 'function') {
+        return () => {};
+      }
+      assignStatusListeners.add(listener);
+      return () => {
+        assignStatusListeners.delete(listener);
+      };
+    },
+
     getDeliveryStats() {
       return {
         total_deliveries: S.ackedRecent.get(Date.now()).cnt,

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);
 }