triflux 10.3.4 → 10.7.0

package/scripts/run.cjs

@@ -7,9 +7,11 @@ const { dirname, isAbsolute, join, resolve } = require("path");
 const { homedir } = require("os");
 
 function isValidPluginRoot(candidate) {
-  return typeof candidate === "string"
-    && candidate.trim().length > 0
-    && existsSync(join(candidate.trim(), "hooks", "hook-orchestrator.mjs"));
+  return (
+    typeof candidate === "string" &&
+    candidate.trim().length > 0 &&
+    existsSync(join(candidate.trim(), "hooks", "hook-orchestrator.mjs"))
+  );
 }
 
 function resolvePluginRoot() {
@@ -23,7 +25,8 @@ function resolvePluginRoot() {
     }
   }
 
-  if (isValidPluginRoot(process.env.CLAUDE_PLUGIN_ROOT)) return process.env.CLAUDE_PLUGIN_ROOT;
+  if (isValidPluginRoot(process.env.CLAUDE_PLUGIN_ROOT))
+    return process.env.CLAUDE_PLUGIN_ROOT;
   return dirname(__dirname);
 }
 
@@ -68,7 +71,7 @@ try {
     env: process.env,
     stdio: ["pipe", "inherit", "inherit"],
     input: stdinBuffer,
-    windowsHide: true
+    windowsHide: true,
   });
   process.exit(0);
 } catch (error) {

package/scripts/session-spawn-helper.mjs

@@ -1,14 +1,37 @@
 #!/usr/bin/env node
-import { spawn, execFileSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
+import { spawn } from "../hub/lib/spawn-trace.mjs";
 
 const SESSION_PREFIX = "tfx-isolated";
 const DEFAULT_ATTACH_PROFILE = "triflux";
 const SESSION_EXPIRE_MS = 30 * 60 * 1000;
 
 const STOP_WORDS = new Set([
-  "a", "an", "and", "as", "at", "be", "by", "for", "from", "in",
-  "is", "it", "of", "on", "or", "that", "the", "to", "with",
-  "작업", "요청", "합니다", "그리고", "에서", "으로",
+  "a",
+  "an",
+  "and",
+  "as",
+  "at",
+  "be",
+  "by",
+  "for",
+  "from",
+  "in",
+  "is",
+  "it",
+  "of",
+  "on",
+  "or",
+  "that",
+  "the",
+  "to",
+  "with",
+  "작업",
+  "요청",
+  "합니다",
+  "그리고",
+  "에서",
+  "으로",
 ]);
 
 // ── psmux helpers ──
@@ -17,7 +40,9 @@ function hasPsmux() {
   try {
     execFileSync("psmux", ["-V"], { timeout: 2000, stdio: "ignore" });
     return true;
-  } catch { return false; }
+  } catch {
+    return false;
+  }
 }
 
 function psmux(...args) {
@@ -27,16 +52,24 @@ function psmux(...args) {
 function psmuxCapture(sessionName) {
   try {
     return execFileSync("psmux", ["capture-pane", "-t", sessionName, "-p"], {
-      timeout: 5000, encoding: "utf8",
+      timeout: 5000,
+      encoding: "utf8",
     }).trim();
-  } catch { return ""; }
+  } catch {
+    return "";
+  }
 }
 
 function psmuxHasSession(sessionName) {
   try {
-    execFileSync("psmux", ["has-session", "-t", sessionName], { timeout: 2000, stdio: "ignore" });
+    execFileSync("psmux", ["has-session", "-t", sessionName], {
+      timeout: 2000,
+      stdio: "ignore",
+    });
     return true;
-  } catch { return false; }
+  } catch {
+    return false;
+  }
 }
 
 // ── core functions ──
@@ -58,7 +91,13 @@ export function createIsolatedSession(options = {}) {
   // send prompt as claude command
   if (options.prompt) {
     const safePrompt = options.prompt.replace(/'/g, "'\\''");
-    psmux("send-keys", "-t", sessionName, `claude --prompt '${safePrompt}'`, "Enter");
+    psmux(
+      "send-keys",
+      "-t",
+      sessionName,
+      `claude --prompt '${safePrompt}'`,
+      "Enter",
+    );
   }
 
   return { sessionName };
@@ -70,8 +109,23 @@ export function attachWithWindowsTerminal(sessionName, options = {}) {
   const spawnFn = options.spawnFn || spawn;
 
   // sp (split-pane), not new-tab
-  const wtArgs = ["sp", "-p", profile, "--title", title, "--", "psmux", "attach-session", "-t", sessionName];
-  const child = spawnFn("wt.exe", wtArgs, { detached: true, stdio: "ignore", windowsHide: false });
+  const wtArgs = [
+    "sp",
+    "-p",
+    profile,
+    "--title",
+    title,
+    "--",
+    "psmux",
+    "attach-session",
+    "-t",
+    sessionName,
+  ];
+  const child = spawnFn("wt.exe", wtArgs, {
+    detached: true,
+    stdio: "ignore",
+    windowsHide: false,
+  });
   child.unref();
   return wtArgs;
 }
@@ -86,7 +140,9 @@ export function waitForCompletion(sessionName, opts = {}) {
       if (!psmuxHasSession(sessionName) || Date.now() - start > maxMs) {
         const output = psmuxCapture(sessionName);
         // cleanup expired session
-        try { psmux("kill-session", "-t", sessionName); } catch {}
+        try {
+          psmux("kill-session", "-t", sessionName);
+        } catch {}
         res({ sessionName, output, expired: Date.now() - start > maxMs });
         return;
       }
@@ -99,34 +155,60 @@ export function waitForCompletion(sessionName, opts = {}) {
 // ── context drift (kept from codex) ──
 
 function tokenize(text) {
-  return String(text || "").toLowerCase()
+  return String(text || "")
+    .toLowerCase()
     .split(/[^\p{L}\p{N}_-]+/u)
     .filter((t) => t.length >= 2 && !STOP_WORDS.has(t));
 }
 
 export function evaluateContextDrift(input = {}) {
   const taskTokens = Array.from(new Set(tokenize(input.taskPrompt)));
-  if (!taskTokens.length) return { drift: false, overlapRatio: 1, reason: "task-token-empty" };
+  if (!taskTokens.length)
+    return { drift: false, overlapRatio: 1, reason: "task-token-empty" };
 
   const outputTokens = new Set(tokenize(input.latestOutput));
   const matched = taskTokens.filter((t) => outputTokens.has(t));
   const ratio = matched.length / taskTokens.length;
   const threshold = input.minOverlapRatio ?? 0.2;
 
-  return { drift: ratio < threshold, overlapRatio: ratio, reason: ratio < threshold ? "token-overlap-low" : "token-overlap-ok" };
+  return {
+    drift: ratio < threshold,
+    overlapRatio: ratio,
+    reason: ratio < threshold ? "token-overlap-low" : "token-overlap-ok",
+  };
 }
 
 // ── CLI ──
 
 function parseArgs(argv) {
-  const a = { spawn: false, prompt: "", attach: false, background: false, name: "" };
+  const a = {
+    spawn: false,
+    prompt: "",
+    attach: false,
+    background: false,
+    name: "",
+  };
   for (let i = 2; i < argv.length; i++) {
     const arg = argv[i];
-    if (arg === "--spawn") { a.spawn = true; continue; }
-    if (arg === "--attach") { a.attach = true; continue; }
-    if (arg === "--background") { a.background = true; continue; }
-    if ((arg === "--prompt" || arg === "-p") && argv[i + 1]) { a.prompt = argv[++i]; continue; }
-    if ((arg === "--name" || arg === "-n") && argv[i + 1]) { a.name = argv[++i]; }
+    if (arg === "--spawn") {
+      a.spawn = true;
+      continue;
+    }
+    if (arg === "--attach") {
+      a.attach = true;
+      continue;
+    }
+    if (arg === "--background") {
+      a.background = true;
+      continue;
+    }
+    if ((arg === "--prompt" || arg === "-p") && argv[i + 1]) {
+      a.prompt = argv[++i];
+      continue;
+    }
+    if ((arg === "--name" || arg === "-n") && argv[i + 1]) {
+      a.name = argv[++i];
+    }
   }
   return a;
 }
@@ -135,25 +217,29 @@ async function main() {
   const args = parseArgs(process.argv);
 
   if (!args.spawn) {
-    process.stdout.write([
-      "session-spawn-helper: psmux 격리 세션 생성 도구",
-      "",
-      "사용법:",
-      "  node scripts/session-spawn-helper.mjs --spawn --prompt '작업 내용' [--attach] [--background] [--name 세션명]",
-      "",
-      "옵션:",
-      "  --spawn        세션 생성 (필수)",
-      "  --prompt TEXT   Claude에 전달할 프롬프트",
-      "  --attach        WT split-pane으로 attach",
-      "  --background    attach 없이 실행, 완료 시 결과 출력",
-      "  --name NAME     세션 이름 (기본: tfx-isolated-{ts})",
-      "",
-    ].join("\n"));
+    process.stdout.write(
+      [
+        "session-spawn-helper: psmux 격리 세션 생성 도구",
+        "",
+        "사용법:",
+        "  node scripts/session-spawn-helper.mjs --spawn --prompt '작업 내용' [--attach] [--background] [--name 세션명]",
+        "",
+        "옵션:",
+        "  --spawn        세션 생성 (필수)",
+        "  --prompt TEXT   Claude에 전달할 프롬프트",
+        "  --attach        WT split-pane으로 attach",
+        "  --background    attach 없이 실행, 완료 시 결과 출력",
+        "  --name NAME     세션 이름 (기본: tfx-isolated-{ts})",
+        "",
+      ].join("\n"),
+    );
     process.exit(0);
   }
 
   if (!hasPsmux()) {
-    process.stderr.write("ERROR: psmux 미설치. 설치: winget install marlocarlo.psmux (또는 npm i -g psmux)\n");
+    process.stderr.write(
+      "ERROR: psmux 미설치. 설치: winget install marlocarlo.psmux (또는 npm i -g psmux)\n",
+    );
     process.exit(1);
   }
 
@@ -174,10 +260,15 @@ async function main() {
     process.stdout.write(`[session-spawn] 백그라운드 대기 중...\n`);
     const result = await waitForCompletion(sessionName);
     const preview = (result.output || "(no output)").slice(0, 200);
-    process.stdout.write(`[session-spawn] 완료: ${sessionName} | expired=${result.expired} | preview=${preview}\n`);
+    process.stdout.write(
+      `[session-spawn] 완료: ${sessionName} | expired=${result.expired} | preview=${preview}\n`,
+    );
   }
 }
 
 if (process.argv[1]?.endsWith("session-spawn-helper.mjs")) {
-  main().catch((e) => { process.stderr.write(`${e.message}\n`); process.exit(1); });
+  main().catch((e) => {
+    process.stderr.write(`${e.message}\n`);
+    process.exit(1);
+  });
 }

package/scripts/session-stale-cleanup.mjs

@@ -0,0 +1,123 @@
+#!/usr/bin/env node
+/**
+ * session-stale-cleanup.mjs — SessionStart 훅
+ *
+ * 새 세션 시작 시 이전 세션의 stale 상태를 정리한다:
+ * 1. tfx-multi-state.json — 세션 간 상태 누수 방지 (#62)
+ * 2. tfx-route-*-pids — 고아 워커 프로세스 정리 (#62 후속)
+ *
+ * @see scripts/headless-guard.mjs — 상태 소비자
+ * @see scripts/tfx-gate-activate.mjs — 상태 생산자 (ownerPid 기록)
+ * @see scripts/tfx-route.sh — PID tracking 파일 생산자
+ */
+
+import { execSync } from "node:child_process";
+import {
+  existsSync,
+  readFileSync,
+  readdirSync,
+  unlinkSync,
+} from "node:fs";
+import { platform, tmpdir } from "node:os";
+import { join } from "node:path";
+
+const MULTI_STATE_FILE = join(tmpdir(), "tfx-multi-state.json");
+const EXPIRE_MS = 30 * 60 * 1000; // 30분
+const PID_FILE_RE = /^tfx-route-(\d+)-pids$/;
+
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function treeKill(pid) {
+  try {
+    if (platform() === "win32") {
+      execSync(`taskkill /T /F /PID ${pid}`, {
+        stdio: "ignore",
+        timeout: 5000,
+        windowsHide: true,
+      });
+    } else {
+      process.kill(pid, "SIGTERM");
+    }
+  } catch {
+    /* already dead */
+  }
+}
+
+// ── 1. tfx-multi-state.json 정리 ──
+function cleanupMultiState() {
+  if (!existsSync(MULTI_STATE_FILE)) return;
+
+  let state;
+  try {
+    state = JSON.parse(readFileSync(MULTI_STATE_FILE, "utf8"));
+  } catch {
+    try { unlinkSync(MULTI_STATE_FILE); } catch { /* ignore */ }
+    return;
+  }
+
+  if (state.ownerPid && isProcessAlive(state.ownerPid)) return;
+
+  if (!state.ownerPid && state.activatedAt) {
+    if (Date.now() - state.activatedAt < EXPIRE_MS) return;
+  }
+
+  if (state.active) {
+    console.error(
+      `[session-stale-cleanup] stale tfx-multi state 정리 (pid=${state.ownerPid || "unknown"}, dispatched=${state.dispatched}, calls=${state.nativeWorkCalls || 0})`,
+    );
+  }
+
+  try { unlinkSync(MULTI_STATE_FILE); } catch { /* ignore */ }
+}
+
+// ── 2. orphan PID tracking 파일 정리 ──
+function cleanupOrphanPidFiles() {
+  let files;
+  try {
+    files = readdirSync(tmpdir());
+  } catch {
+    return;
+  }
+
+  for (const f of files) {
+    const m = PID_FILE_RE.exec(f);
+    if (!m) continue;
+
+    const ownerPid = Number(m[1]);
+    if (isProcessAlive(ownerPid)) continue; // 세션 살아있음, 건드리지 않음
+
+    const filePath = join(tmpdir(), f);
+    try {
+      const pids = readFileSync(filePath, "utf8")
+        .split("\n")
+        .map((l) => l.trim())
+        .filter(Boolean)
+        .map(Number);
+
+      for (const pid of pids) {
+        if (pid > 0 && isProcessAlive(pid)) {
+          console.error(`[session-stale-cleanup] orphan worker kill: pid=${pid} (from ${f})`);
+          treeKill(pid);
+        }
+      }
+    } catch {
+      /* 읽기 실패 무시 */
+    }
+
+    try { unlinkSync(filePath); } catch { /* ignore */ }
+  }
+}
+
+function main() {
+  cleanupMultiState();
+  cleanupOrphanPidFiles();
+}
+
+main();