triflux 10.50.2 → 10.52.0

package/hub/cli-adapter-base.mjs

@@ -1,7 +1,7 @@
 // hub/cli-adapter-base.mjs — codex/gemini 공통 CLI adapter 인터페이스
 // Phase 2: codex-adapter.mjs에서 추출한 재사용 가능 유틸리티
 
-import { execSync, spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 import { existsSync, readFileSync, statSync } from "node:fs";
 
 import { codexProfileConfigOverrides } from "../scripts/lib/codex-profile-config.mjs";
@@ -70,71 +70,6 @@ export function parseRetryAfterMs(text, provider) {
   return FALLBACK_COOLDOWN_MS[provider] || 5 * 3600_000;
 }
 
-// ── Codex CLI compatibility ─────────────────────────────────────
-
-let _cachedVersion = null;
-
-/**
- * `codex --version` 실행 결과를 파싱하여 마이너 버전 숫자 반환.
- * 파싱 실패 시 0 반환 (구버전으로 간주).
- * @returns {number} 마이너 버전 (예: 0.117.0 → 117)
- */
-export function getCodexVersion() {
-  if (_cachedVersion !== null) return _cachedVersion;
-  const override = Number(process.env.TFX_CODEX_VERSION_MINOR);
-  if (Number.isFinite(override) && override > 0) {
-    _cachedVersion = override;
-    return _cachedVersion;
-  }
-  try {
-    const out = execSync("codex --version", {
-      encoding: "utf8",
-      timeout: 5000,
-    }).trim();
-    const match = out.match(/(\d+)\.(\d+)\.(\d+)/);
-    _cachedVersion = match ? Number.parseInt(match[2], 10) : 0;
-  } catch {
-    // Command builders should remain stable in CI even when the real Codex
-    // CLI is absent. Runtime preflight still reports/install-gates Codex
-    // separately; this fallback only selects the modern argv shape.
-    _cachedVersion = 117;
-  }
-  return _cachedVersion;
-}
-
-/**
- * 최소 마이너 버전 이상인지 확인.
- * @param {number} minMinor
- * @returns {boolean}
- */
-export function gte(minMinor) {
-  return getCodexVersion() >= minMinor;
-}
-
-/**
- * Codex CLI 기능별 분기 객체.
- * 실측 기반 임계값: 0.114.0에서 exec/skip-git-repo-check/color 확인됨.
- * --output-last-message는 0.114.0에 없음 (0.117+ 추정).
- */
-export const FEATURES = {
-  /** exec 서브커맨드 사용 가능 여부 (0.110+ 이전부터 존재) */
-  get execSubcommand() {
-    return gte(110);
-  },
-  /** --output-last-message 플래그 지원 여부 (0.117+) */
-  get outputLastMessage() {
-    return gte(117);
-  },
-  /** --color <COLOR> 플래그 지원 여부 (exec와 동시 도입) */
-  get colorNever() {
-    return gte(110);
-  },
-  /** 플러그인 시스템 지원 여부 (향후 확장용) */
-  get pluginSystem() {
-    return gte(120);
-  },
-};
-
 // ── Shell utilities ─────────────────────────────────────────────
 
 export function normalizePathForShell(value) {
@@ -182,7 +117,7 @@ export function buildExecCommand(prompt, resultFile = null, opts = {}) {
     enforceCanonicalProfile,
   } = opts;
 
-  const parts = ["codex"];
+  const parts = ["codex", "exec"];
   // Select the effort profile via `-c` config overrides instead of
   // `--profile <name>`. codex 0.134+ rejects `--profile X` whenever config.toml
   // still contains an inline [profiles.X] table (and codex re-injects such
@@ -196,30 +131,17 @@ export function buildExecCommand(prompt, resultFile = null, opts = {}) {
       })
     : [];
 
-  if (FEATURES.execSubcommand) {
-    parts.push("exec");
-    if (sandboxBypass) parts.push("--dangerously-bypass-approvals-and-sandbox");
-    if (skipGitRepoCheck) parts.push("--skip-git-repo-check");
-    if (resultFile && FEATURES.outputLastMessage) {
-      parts.push("--output-last-message", resultFile);
-    }
-    if (FEATURES.colorNever) parts.push("--color", "never");
-    for (const override of profileOverrides)
-      parts.push("-c", shellQuote(override));
-    // NOTE: `codex exec`는 --cwd 플래그를 지원하지 않는다. Node spawn의 cwd
-    // 옵션으로 child process의 working directory를 제어한다 (conductor.mjs 참조).
-    // opts.cwd는 기록용으로만 받아두고 CLI command에는 반영하지 않는다.
-    // (이전 커밋에서 잘못 추가되어 shard 전체가 exit 2로 크래시한 회귀 #94 후속 이슈)
-    if (Array.isArray(mcpServers)) {
-      for (const server of mcpServers) {
-        parts.push("-c", `mcp_servers.${server}.enabled=true`);
-      }
+  if (sandboxBypass) parts.push("--dangerously-bypass-approvals-and-sandbox");
+  if (skipGitRepoCheck) parts.push("--skip-git-repo-check");
+  if (resultFile) parts.push("--output-last-message", resultFile);
+  parts.push("--color", "never");
+  for (const override of profileOverrides)
+    parts.push("-c", shellQuote(override));
+  // `codex exec`는 --cwd를 받지 않아 child process의 cwd로 제어한다.
+  if (Array.isArray(mcpServers)) {
+    for (const server of mcpServers) {
+      parts.push("-c", `mcp_servers.${server}.enabled=true`);
     }
-  } else {
-    parts.push("--dangerously-bypass-approvals-and-sandbox");
-    if (skipGitRepoCheck) parts.push("--skip-git-repo-check");
-    for (const override of profileOverrides)
-      parts.push("-c", shellQuote(override));
   }
 
   const useStdin = resolveStdinPromptMode(stdinPrompt);

package/hub/codex-adapter.mjs

@@ -126,7 +126,6 @@ export function buildExecArgs(opts = {}) {
     cwd: opts.cwd,
     // stdinPrompt 가 명시되면 buildExecCommand 로 forward.
     // headless 워커 spawn (backend.mjs) 은 default (stdin on, macOS hook fix).
-    // launcher path (launcher-template.mjs) 는 결정론 위해 false 전달.
     stdinPrompt: opts.stdinPrompt,
   });
 

package/hub/codex-preflight.mjs

@@ -5,7 +5,6 @@ import { join } from "node:path";
 
 import { whichCommandAsync } from "./platform.mjs";
 
-const MIN_RECOMMENDED_MINOR = 118;
 let _cachedVersion = null;
 
 function escapeRegExp(value) {
@@ -74,25 +73,11 @@ async function checkCodexInstalled() {
   };
 }
 
-function checkCodexVersion() {
-  const version = getCodexVersion();
-  const warnings =
-    version >= MIN_RECOMMENDED_MINOR
-      ? []
-      : [
-          `Codex CLI 0.${version}.x detected; 0.${MIN_RECOMMENDED_MINOR}.x or newer is recommended.`,
-        ];
-  return { version, warnings };
-}
-
 function checkApprovalMode(configText, opts = {}) {
-  const approvalMode = readTomlString(configText, "approval_mode");
-  const sandbox = readTomlString(configText, "sandbox");
+  const approvalPolicy = readTomlString(configText, "approval_policy");
   const subcommand = opts.subcommand || "exec";
   return {
-    needsBypass: subcommand === "exec" || approvalMode !== "full-auto",
-    approvalMode,
-    sandbox,
+    needsBypass: subcommand === "exec" || approvalPolicy !== "never",
   };
 }
 
@@ -154,7 +139,7 @@ async function checkMcpHealth(mcpServers, configText) {
 /**
  * Detects codex config drift between global (~/.codex/config.toml) and the
  * target workdir. Covers:
- *   1. workdir-local `.codex/config.toml` overriding global approval_mode/sandbox
+ *   1. workdir-local `.codex/config.toml` overriding global approval_policy/sandbox_mode
  *   2. instruction-file asymmetry (AGENTS.md vs CLAUDE.md)
  *
  * @param {string} [workdir] absolute path to the invocation workdir
@@ -173,7 +158,7 @@ export function detectWorkdirDrift(workdir, globalConfigText = "") {
     } catch {
       localText = "";
     }
-    const keys = ["approval_mode", "sandbox", "model"];
+    const keys = ["approval_policy", "sandbox_mode", "model"];
     for (const key of keys) {
       const local = readTomlString(localText, key);
       const global = readTomlString(globalConfigText, key);
@@ -212,18 +197,10 @@ export async function runPreflight(opts = {}) {
   }
 
   const warnings = [...install.warnings];
-  const { version, warnings: versionWarnings } = checkCodexVersion();
-  warnings.push(...versionWarnings);
+  const version = getCodexVersion();
 
   const configText = readConfigText(opts.configPath);
   const approval = checkApprovalMode(configText, opts);
-  if (approval.approvalMode !== "full-auto") {
-    warnings.push(
-      `approval_mode is '${approval.approvalMode || "unset"}'; bypass flag will be used.`,
-    );
-  }
-  if (approval.sandbox)
-    warnings.push(`sandbox mode from config.toml: ${approval.sandbox}`);
 
   const mcp = await checkMcpHealth(opts.mcpServers, configText);
   warnings.push(...mcp.warnings);

package/hub/lib/process-utils.mjs

@@ -9,7 +9,7 @@ import {
   unlinkSync,
   writeFileSync,
 } from "node:fs";
-import { homedir, tmpdir } from "node:os";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { IS_WINDOWS, killProcess } from "../platform.mjs";
 
@@ -387,23 +387,6 @@ function getProcessSnapshot({
   }
 }
 
-function addHubPid(protectedPids) {
-  try {
-    const hubPidPath = join(
-      homedir(),
-      ".claude",
-      "cache",
-      "tfx-hub",
-      "hub.pid",
-    );
-    if (existsSync(hubPidPath)) {
-      const hubInfo = JSON.parse(readFileSync(hubPidPath, "utf8"));
-      const hubPid = normalizePid(hubInfo?.pid);
-      if (hubPid) protectedPids.add(hubPid);
-    }
-  } catch {}
-}
-
 function getProtectedPids({
   protectedPids,
   isWindows = IS_WINDOWS,
@@ -415,7 +398,6 @@ function getProtectedPids({
   if (Number.isInteger(process.ppid) && process.ppid > 0) {
     result.add(process.ppid);
   }
-  addHubPid(result);
   if (!includeAncestorScan) return result;
 
   const snapshot = getProcessSnapshot({ isWindows, spawnSyncFn });
@@ -488,68 +470,6 @@ function hasExactGbrainServe(commandLine) {
   );
 }
 
-function hasGbrainServeCommand(commandLine) {
-  return /(^|\s)gbrain\s+serve(\s|$)/i.test(commandLine.trim());
-}
-
-function hasFsmonitorDaemonCommand(commandLine) {
-  return FSMONITOR_DAEMON_PATTERN.test(commandLine);
-}
-
-function categoryForShardProcess(proc, context) {
-  const name = normalizeName(proc.name);
-  const commandLine = normalizeCommandLine(proc.commandLine);
-  const worktreePath = normalizeCommandLine(context.worktreePath || "");
-  const shardMarker = context.shardName
-    ? `.codex-swarm\\wt-${context.shardName}`
-    : "";
-  const hasWorktree = worktreePath && commandLine.includes(worktreePath);
-  const hasShardMarker = shardMarker && commandLine.includes(shardMarker);
-
-  if (name === "node.exe" || name === "node") {
-    if (hasWorktree || hasShardMarker) return "node";
-  }
-
-  if (name === "bash.exe" || name === "bash" || name === "sh") {
-    if (hasWorktree) return "bash";
-  }
-
-  if (name === "conhost.exe" || name === "conhost") {
-    if (
-      context.sessionIds?.length > 0 &&
-      context.sessionIds.some((id) => id && commandLine.includes(id))
-    ) {
-      return "conhost";
-    }
-  }
-
-  if (name === "bun.exe" || name === "bun") {
-    if ((hasWorktree || hasShardMarker) && hasGbrainServeCommand(commandLine)) {
-      return "bun";
-    }
-  }
-
-  if (name === "git.exe" || name === "git") {
-    if (
-      (hasWorktree || hasShardMarker) &&
-      hasFsmonitorDaemonCommand(commandLine)
-    ) {
-      return "git";
-    }
-  }
-
-  return null;
-}
-
-function killPid(
-  pid,
-  { killFn = process.kill, protectedPids = new Set() } = {},
-) {
-  if (protectedPids.has(pid)) return false;
-  killFn(pid, "SIGKILL");
-  return true;
-}
-
 /**
  * Return a process tree rooted at `rootPid`.
  *
@@ -730,67 +650,6 @@ export function findProcessesByCommandLine(
     });
 }
 
-/**
- * Cleanup processes associated with a swarm shard.
- *
- * Sequence: kill known top PID snapshots, scan scoped command lines, skip
- * protected PIDs, and kill only narrowly gated runtime categories.
- *
- * @param {{worktreePath?: string, sessionIds?: string[], topPids?: Array<number | {pid: number}>, runId?: string, shardName?: string, dryRun?: boolean, isWindows?: boolean, spawnSyncFn?: typeof spawnSync, killFn?: typeof process.kill, protectedPids?: Set<number>}} opts
- * @returns {{killed: number, scanned: number, skipped: number, byCategory: {node: number, bash: number, conhost: number, bun: number, git: number}}}
- */
-export function cleanupShardProcesses({
-  worktreePath,
-  sessionIds = [],
-  topPids = [],
-  runId,
-  shardName,
-  dryRun = false,
-  isWindows = IS_WINDOWS,
-  spawnSyncFn = spawnSync,
-  killFn = process.kill,
-  protectedPids,
-} = {}) {
-  const protectedSet = getProtectedPids({
-    protectedPids,
-    isWindows,
-    spawnSyncFn,
-    includeAncestorScan: true,
-  });
-  const byCategory = { node: 0, bash: 0, conhost: 0, bun: 0, git: 0 };
-  let killed = 0;
-  let skipped = 0;
-
-  if (!dryRun && topPids.length > 0) {
-    killed += killProcessTreeSnapshot(topPids, {
-      killFn,
-      protectedPids: protectedSet,
-    }).killed;
-  }
-
-  const scanned = getProcessSnapshot({ isWindows, spawnSyncFn });
-
-  for (const proc of scanned) {
-    const category = categoryForShardProcess(proc, {
-      worktreePath,
-      sessionIds,
-      shardName,
-    });
-    if (!category) continue;
-    byCategory[category]++;
-    if (protectedSet.has(proc.pid)) {
-      skipped++;
-      continue;
-    }
-    if (dryRun) continue;
-    try {
-      if (killPid(proc.pid, { killFn, protectedPids: protectedSet })) killed++;
-    } catch {}
-  }
-
-  return { killed, scanned: scanned.length, skipped, byCategory };
-}
-
 /**
  * Cleanup narrowly gated orphan runtime processes.
  *
@@ -968,22 +827,8 @@ export function cleanupStaleFsmonitorDaemons({
 function cleanupOrphansUnix() {
   const myPid = process.pid;
 
-  // Hub PID 보호
   const protectedPids = new Set();
   protectedPids.add(myPid);
-  try {
-    const hubPidPath = join(
-      homedir(),
-      ".claude",
-      "cache",
-      "tfx-hub",
-      "hub.pid",
-    );
-    if (existsSync(hubPidPath)) {
-      const hubPid = Number(JSON.parse(readFileSync(hubPidPath, "utf8"))?.pid);
-      if (Number.isFinite(hubPid) && hubPid > 0) protectedPids.add(hubPid);
-    }
-  } catch {}
 
   // 현재 프로세스의 조상 트리 보호
   try {

package/hub/lib/spawn-trace.mjs

@@ -7,13 +7,14 @@ import { join } from "node:path";
 const LOG_DIR = join(homedir(), ".triflux", "logs");
 const DEDUPE_WINDOW_MS = 5_000;
 const RATE_WINDOW_MS = 1_000;
+const DEFAULT_MAX_SPAWN_PER_SEC = 100;
 // multi-worker headless dispatch 가 1 초 안에 ~25-30+ psmux/tmux 명령을 호출한다.
 // 2-worker dispatchBatch 가 default 30 limit 을 초과해 `rate_limit` throw 로 mac
 // 호환성 회귀 (smoke test 발견, 2026-05-15). 100 으로 상향 — 폭주 안전망은
 // 여전히 (default 100/sec) 유지, env override 로 보수 설정 가능.
 export let MAX_SPAWN_PER_SEC = resolvePositiveInteger(
   process.env.TRIFLUX_MAX_SPAWN_RATE,
-  100,
+  DEFAULT_MAX_SPAWN_PER_SEC,
 );
 export const MAX_TOTAL_DESCENDANTS = resolvePositiveInteger(
   process.env.TRIFLUX_MAX_DESCENDANTS,
@@ -160,7 +161,7 @@ export function getMaxSpawnPerSec() {
 export function reload() {
   MAX_SPAWN_PER_SEC = resolvePositiveInteger(
     process.env.TRIFLUX_MAX_SPAWN_RATE,
-    30,
+    DEFAULT_MAX_SPAWN_PER_SEC,
   );
   return getMaxSpawnPerSec();
 }

package/hub/lib/timeout-defaults.mjs

@@ -5,7 +5,6 @@ export const MAX_DURATION_MS = 86_400_000;
 export const DEFAULT_ASSIGN_TIMEOUT_MS = 600_000;
 export const DEFAULT_ASSIGN_TTL_MS = 600_000;
 export const DEFAULT_HANDOFF_TTL_MS = 600_000;
-export const DEFAULT_SWARM_LOCK_TTL_MS = 600_000;
 export const DEFAULT_REGISTER_TIMEOUT_SEC = 600;
 export const REGISTER_HEARTBEAT_GRACE_MS = 120_000;
 export const DEFAULT_STALL_INTERVENTION_SEC = 1_200;

package/hub/team/agent-map.json

@@ -23,7 +23,6 @@
   "test-engineer": "codex",
   "qa-tester": "codex",
   "codex": "codex",
-  "gemini": "antigravity",
   "antigravity": "antigravity",
   "agy": "antigravity",
   "claude": "claude"

package/hub/team/agents-row-attach.py

@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+# claude agents 행의 백킹 PTY 안에서 워커 tmux pane 에 붙는다.
+# bg-pty-host 가 출력 이력을 다시 재생하면 바깥 터미널이 tmux 의 오래된 질의에 또 답한다.
+# tmux 는 늦게 온 응답을 키 입력으로 넘기므로 여기서 응답 시퀀스를 걸러 낸다.
+import fcntl
+import os
+import pty
+import re
+import select
+import signal
+import sys
+import termios
+import time
+import tty
+
+# DA1/DA2/DA3, 창 크기 보고(CSI ... t), DECRQM, kitty 키보드 플래그 응답, DCS, OSC
+REPLY = re.compile(
+    rb"\x1b\[[?>=][0-9;]*c"
+    rb"|\x1b\[[0-9]+(?:;[0-9]+)*t"
+    rb"|\x1b\[\?[0-9;]*\$y"
+    rb"|\x1b\[\?[0-9]*u"
+    rb"|\x1bP[^\x1b]*\x1b\\"
+    rb"|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)"
+)
+# 응답이 read 경계에서 잘렸을 때 잠깐 붙잡아 둘 접두
+PARTIAL = re.compile(
+    rb"(?:\x1b\[[?>=]?[0-9;$]*|\x1bP[^\x1b]*\x1b?|\x1b\][^\x07\x1b]*\x1b?)\Z"
+)
+HOLD_SEC = 0.05
+
+
+def strip_replies(buf):
+    """걸러 낸 바이트와, 다음 read 까지 보류할 꼬리를 돌려준다."""
+    cleaned = REPLY.sub(b"", buf)
+    m = PARTIAL.search(cleaned)
+    if m and cleaned[m.start():] != b"\x1b":
+        return cleaned[: m.start()], cleaned[m.start():]
+    return cleaned, b""
+
+
+def copy_winsize(src, dst):
+    try:
+        size = fcntl.ioctl(src, termios.TIOCGWINSZ, b"\0" * 8)
+        fcntl.ioctl(dst, termios.TIOCSWINSZ, size)
+    except OSError:
+        pass
+
+
+def relay(argv, env):
+    pid, fd = pty.fork()
+    if pid == 0:
+        os.execvpe(argv[0], argv, env)
+    stdin = sys.stdin.fileno()
+    stdout = sys.stdout.fileno()
+    copy_winsize(stdin, fd)
+    signal.signal(signal.SIGWINCH, lambda *_: copy_winsize(stdin, fd))
+    saved = termios.tcgetattr(stdin) if os.isatty(stdin) else None
+    if saved:
+        tty.setraw(stdin)
+    pending = b""
+    deadline = 0.0
+    try:
+        while True:
+            # 자식 출력이 계속 바빠도 보류한 바이트가 HOLD_SEC 를 넘겨 묶이지 않게 마감을 둔다.
+            timeout = max(0.0, deadline - time.monotonic()) if pending else None
+            try:
+                ready, _, _ = select.select([stdin, fd], [], [], timeout)
+            except InterruptedError:
+                continue
+            if pending and time.monotonic() >= deadline:
+                os.write(fd, pending)
+                pending = b""
+            if fd in ready:
+                try:
+                    data = os.read(fd, 65536)
+                except OSError:
+                    break
+                if not data:
+                    break
+                os.write(stdout, data)
+            if stdin in ready:
+                # 행 PTY 가 닫히면 slave 읽기는 EIO 를 던진다.
+                try:
+                    data = os.read(stdin, 65536)
+                except OSError:
+                    break
+                if not data:
+                    break
+                out, held = strip_replies(pending + data)
+                if held and not pending:
+                    deadline = time.monotonic() + HOLD_SEC
+                pending = held
+                if out:
+                    os.write(fd, out)
+    finally:
+        if saved:
+            try:
+                termios.tcsetattr(stdin, termios.TCSADRAIN, saved)
+            except termios.error:
+                pass
+    # 행 PTY 가 닫히면 attach client 도 끝낸다. 워커 방은 그대로 남는다.
+    os.close(fd)
+    _, status = os.waitpid(pid, 0)
+    return os.waitstatus_to_exitcode(status)
+
+
+def main():
+    # 사용법: agents-row-attach.py -- <tmux attach 명령>
+    argv = sys.argv[1:]
+    if argv[:1] == ["--"]:
+        argv = argv[1:]
+    if not argv:
+        print("usage: agents-row-attach.py -- <command>", file=sys.stderr)
+        return 2
+    env = {k: v for k, v in os.environ.items() if k not in ("TMUX", "TMUX_PANE")}
+    return relay(argv, env)
+
+
+if __name__ == "__main__":
+    sys.exit(main())