@triflux/remote 10.51.0 → 10.53.0

package/hub/team/psmux.mjs

@@ -931,22 +931,8 @@ function killOrphanPipeHelpers(sessionName) {
  */
 function killOrphanMcpProcesses(sessionName) {
   if (!IS_WINDOWS) {
-    // macOS/Linux: 세션별 스코핑 + Hub PID 보호
+    // macOS/Linux: 세션별 스코핑
     const safeSessionUnix = sanitizePathPart(sessionName);
-    let hubPidUnix = 0;
-    try {
-      const hubPidFile = join(
-        homedir(),
-        ".claude",
-        "cache",
-        "tfx-hub",
-        "hub.pid",
-      );
-      if (existsSync(hubPidFile)) {
-        const info = JSON.parse(readFileSync(hubPidFile, "utf8"));
-        hubPidUnix = Number(info.pid) || 0;
-      }
-    } catch {}
     try {
       // MCP/result files live under `tfx-headless/<session>-<pane>.txt`, so
       // match `tfx-headless/<session>` with a trailing boundary to avoid
@@ -963,7 +949,7 @@ function killOrphanMcpProcesses(sessionName) {
       if (pids) {
         for (const p of pids.split("\n").filter(Boolean)) {
           const numPid = Number(p);
-          if (numPid === hubPidUnix || numPid <= 0) continue;
+          if (numPid <= 0) continue;
           try {
             process.kill(numPid, "SIGTERM");
           } catch {}
@@ -975,22 +961,6 @@ function killOrphanMcpProcesses(sessionName) {
   // Windows: escape + trailing boundary (mirror of the macOS branch).
   const safeSession = escapeRegex(sanitizePathPart(sessionName));
 
-  // Hub PID 보호 — Hub 프로세스를 고아로 잘못 식별하지 않도록
-  let hubPid = null;
-  try {
-    const hubPidPath = join(
-      homedir(),
-      ".claude",
-      "cache",
-      "tfx-hub",
-      "hub.pid",
-    );
-    if (existsSync(hubPidPath)) {
-      const hubInfo = JSON.parse(readFileSync(hubPidPath, "utf8"));
-      hubPid = Number(hubInfo?.pid);
-    }
-  } catch {}
-
   try {
     // 세션 결과 디렉토리 패턴으로 MCP 서버 프로세스 식별
     const output = childProcess.execSync(
@@ -1005,7 +975,7 @@ function killOrphanMcpProcesses(sessionName) {
     const pids = output
       .split(/\r?\n/)
       .map((l) => Number.parseInt(l.trim(), 10))
-      .filter((p) => Number.isFinite(p) && p > 0 && p !== hubPid);
+      .filter((p) => Number.isFinite(p) && p > 0);
     for (const pid of pids) {
       killProcessTree(pid);
     }

package/hub/team/results-index.mjs

@@ -0,0 +1,92 @@
+// headless 세션 결과 색인. 화면의 HEADLESS_COMPLETE 문자열 대신 읽도록 세션당 JSON 하나를 둔다 (ADR-0034).
+import { renameSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+
+export const RESULTS_INDEX_VERSION = 1;
+
+export function resultsIndexPath(dir, sessionName) {
+  return join(dir, `${sessionName}.results.json`);
+}
+
+/**
+ * @param {string} path
+ * @param {string} sessionName
+ * @param {Array<{paneName: string, displayName?: string, cli: string, role?: string, resultFile: string}>} workers
+ * @param {() => boolean} canWrite
+ */
+export function createResultsIndex(path, sessionName, workers, canWrite) {
+  const now = () => new Date().toISOString();
+  const index = {
+    version: RESULTS_INDEX_VERSION,
+    sessionName,
+    startedAt: now(),
+    finishedAt: null,
+    completed: false,
+    workers: workers.map((w) => ({
+      paneName: w.paneName,
+      displayName: w.displayName || w.paneName,
+      cli: w.cli,
+      role: w.role || "",
+      status: "pending",
+      matched: null,
+      exitCode: null,
+      sessionDead: false,
+      startedAt: null,
+      finishedAt: null,
+      resultFile: w.resultFile,
+    })),
+  };
+  const byPane = new Map(index.workers.map((w) => [w.paneName, w]));
+
+  // 임시 파일에 쓰고 rename 해 읽는 쪽이 반쯤 쓴 JSON 을 보지 않게 한다.
+  // 색인은 보조 산출물이라 쓰기 실패가 실행을 멈추면 안 된다.
+  const flush = () => {
+    if (!canWrite()) return;
+    const tmp = `${path}.${process.pid}.tmp`;
+    try {
+      writeFileSync(tmp, `${JSON.stringify(index, null, 2)}\n`, "utf8");
+      renameSync(tmp, path);
+    } catch {
+      try {
+        rmSync(tmp, { force: true });
+      } catch {
+        /* best-effort */
+      }
+    }
+  };
+
+  return {
+    path,
+    // 같은 이름의 이전 실행 색인이 남아 있으면 세션을 잡자마자 덮어 오판을 막는다.
+    begin: flush,
+    workerStarted(paneName) {
+      const w = byPane.get(paneName);
+      if (!w || w.status !== "pending") return;
+      w.status = "running";
+      w.startedAt = now();
+      flush();
+    },
+    workerFinished(paneName, { matched, exitCode, sessionDead } = {}) {
+      const w = byPane.get(paneName);
+      if (!w) return;
+      w.status = matched && exitCode === 0 ? "completed" : "failed";
+      w.matched = Boolean(matched);
+      w.exitCode = exitCode ?? null;
+      w.sessionDead = Boolean(sessionDead);
+      w.finishedAt = now();
+      flush();
+    },
+    finish(completed) {
+      // 예외로 끝나면 끝나지 못한 워커를 failed 로 확정해 "아직 도는 중"과 구분한다.
+      for (const w of index.workers) {
+        if (w.status === "pending" || w.status === "running") {
+          w.status = "failed";
+          w.finishedAt = now();
+        }
+      }
+      index.finishedAt = now();
+      index.completed = Boolean(completed);
+      flush();
+    },
+  };
+}

package/hub/team/session-context.mjs

@@ -96,7 +96,7 @@ export function contextGuard(
     : {};
 }
 
-async function findCodexRollout(threadId) {
+export async function findCodexRollout(threadId) {
   if (!/^[a-zA-Z0-9-]+$/u.test(threadId || "")) return null;
   const root = path.join(
     process.env.CODEX_HOME || path.join(homedir(), ".codex"),

package/hub/team/tui-viewer.mjs

@@ -25,12 +25,7 @@ function argVal(flag) {
 const SESSION = argVal("--session");
 const RESULT_DIR = argVal("--result-dir") ?? join(tmpdir(), "tfx-headless");
 const LAYOUT = argVal("--layout") ?? "single";
-const SOURCE = argVal("--source") === "files" ? "files" : "mux";
 const LEAD_PANE = argVal("--lead-pane");
-const parsedWorkerCount = Number.parseInt(argVal("--workers") || "0", 10);
-const WORKER_COUNT = Number.isFinite(parsedWorkerCount)
-  ? Math.min(64, Math.max(0, parsedWorkerCount))
-  : 0;
 const MUX_BIN = getMultiplexerType();
 
 if (!SESSION || !/^[a-zA-Z0-9_-]+$/u.test(SESSION)) {
@@ -39,22 +34,15 @@ if (!SESSION || !/^[a-zA-Z0-9_-]+$/u.test(SESSION)) {
   );
   process.exit(1);
 }
-if (SOURCE === "files" && WORKER_COUNT === 0) {
-  process.stderr.write("ERROR: --source files requires --workers <count>\n");
+try {
+  execFileSync(MUX_BIN, ["-V"], { encoding: "utf8", timeout: 2000 });
+} catch {
+  process.stderr.write(
+    `ERROR: primary multiplexer 미설치. 설치 방법:\n${formatPsmuxInstallGuidance("  ")}\n`,
+  );
   process.exit(1);
 }
 
-if (SOURCE === "mux") {
-  try {
-    execFileSync(MUX_BIN, ["-V"], { encoding: "utf8", timeout: 2000 });
-  } catch {
-    process.stderr.write(
-      `ERROR: primary multiplexer 미설치. 설치 방법:\n${formatPsmuxInstallGuidance("  ")}\n`,
-    );
-    process.exit(1);
-  }
-}
-
 // ── 메모리 보호 상수 ──
 const MAX_BODY_BYTES = 10240;
 
@@ -182,13 +170,6 @@ function estimateProgress(lines, context = {}) {
 
 // ── psmux 래퍼 ──
 function listPanes() {
-  if (SOURCE === "files") {
-    return Array.from({ length: WORKER_COUNT }, (_, index) => ({
-      index: index + 1,
-      title: `worker-${index + 1} (daemon)`,
-      pid: "",
-    }));
-  }
   try {
     const out = execFileSync(
       MUX_BIN,
@@ -215,32 +196,6 @@ function listPanes() {
 }
 
 function capturePane(paneIdx, lines = 20) {
-  if (SOURCE === "files") {
-    const base = join(RESULT_DIR, `${SESSION}-worker-${paneIdx}.txt`);
-    const artifacts = [
-      { path: base, label: "output" },
-      { path: `${base}.partial`, label: "daemon" },
-      { path: `${base}.err`, label: "stderr" },
-    ];
-    const snapshots = [];
-    for (const artifact of artifacts) {
-      try {
-        const content = readFileSync(artifact.path, "utf8").trim();
-        if (!content) continue;
-        snapshots.push(
-          `[${artifact.label}]\n${content.split("\n").slice(-lines).join("\n")}`,
-        );
-      } catch {
-        /* artifact is optional while the daemon job is starting */
-      }
-    }
-    return (
-      snapshots.join("\n") ||
-      `worker-${paneIdx} daemon active · waiting for output · ${Math.round(
-        (Date.now() - startTime) / 1000,
-      )}s`
-    );
-  }
   try {
     return execFileSync(
       MUX_BIN,
@@ -417,7 +372,7 @@ function ingest() {
     const tokens = extractTokenLabel(snapshot);
     const elapsed = Math.round((Date.now() - startTime) / 1000);
 
-    if (SOURCE !== "files" && (resultSize > 10 || shellReturned)) {
+    if (resultSize > 10 || shellReturned) {
       const resultContent = existsSync(resultFile)
         ? readFileSync(resultFile, "utf8")
         : snapshot;
@@ -459,10 +414,8 @@ function ingest() {
     // 진행 중
     const progress = estimateProgress(lines, {
       tokens,
-      // daemon output files grow while the job is still running; file size is
-      // activity evidence, not a completion signal in read-only file mode.
-      resultSize: SOURCE === "files" ? 0 : resultSize,
-      shellReturned: SOURCE === "files" ? false : shellReturned,
+      resultSize,
+      shellReturned,
       done: false,
     });
     const verdict = lastLine;

package/hub/team/tui.mjs

@@ -44,11 +44,6 @@ import {
   wrapLine,
   wrapText as wrapTextAll,
 } from "./tui-core.mjs";
-import {
-  createMetricsCollector,
-  createSynapseEventStream,
-  renderMetricsTier1,
-} from "./tui-synapse.mjs";
 import {
   createPanelResizer,
   createSearchState,
@@ -934,19 +929,6 @@ export function createLogDashboard(opts = {}) {
     initialRatio: focus === "detail" ? 0.2 : 0.3,
   });
 
-  // Synapse 실시간 관제 (Phase 3)
-  const synapseMetrics = deps.synapseMetrics || createMetricsCollector();
-  const synapseStream =
-    deps.synapseStream ||
-    createSynapseEventStream({
-      onEvent(event) {
-        synapseMetrics.ingest(event);
-      },
-      fetchImpl: deps.synapseFetch,
-    });
-  // Synapse 자동 시작 (옵트인: deps.enableSynapse)
-  if (deps.enableSynapse) synapseStream.start();
-
   // virtual row buffer (altScreen 전용)
   const rowBuf = new RowBuffer();
 
@@ -1017,7 +999,6 @@ export function createLogDashboard(opts = {}) {
   function doClose() {
     if (closed) return;
     if (timer) clearInterval(timer);
-    synapseStream.stop();
     if (inputAttached && typeof input?.off === "function")
       input.off("data", handleInput);
     if (rawModeEnabled && typeof input?.setRawMode === "function")
@@ -1369,13 +1350,6 @@ export function createLogDashboard(opts = {}) {
         truncate(` ${color("▸", MOCHA.green)} ${flashMessage}`, totalCols),
       );
     }
-    // Synapse 실시간 메트릭 (활성 시)
-    if (synapseStream.isRunning) {
-      const metricsSnap = synapseMetrics.snapshot();
-      tier1.push(
-        truncate(renderMetricsTier1(metricsSnap, totalCols), totalCols),
-      );
-    }
     // 검색 프롬프트 (/ 모드)
     const searchPrompt = searchState.renderPrompt(totalCols);
     if (searchPrompt) {
@@ -1659,17 +1633,6 @@ export function createLogDashboard(opts = {}) {
       return attachToSession(w);
     },
 
-    // Synapse 관제 API
-    startSynapse() {
-      synapseStream.start();
-    },
-    stopSynapse() {
-      synapseStream.stop();
-    },
-    getSynapseMetrics() {
-      return synapseMetrics.snapshot();
-    },
-
     close() {
       doClose();
     },