triflux 8.0.0 → 8.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "8.0.0",
+  "version": "8.2.2",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "type": "module",
   "bin": {

package/scripts/remote-spawn.mjs

@@ -10,8 +10,8 @@
 //   node remote-spawn.mjs --probe <ssh-host>
 
 import { randomUUID } from "crypto";
-import { execFileSync, spawn } from "child_process";
-import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "fs";
+import { execFileSync, execSync, spawn } from "child_process";
+import { existsSync, mkdirSync, readFileSync, statSync, unlinkSync, writeFileSync } from "fs";
 import { homedir, platform as getPlatform, tmpdir } from "os";
 import { join, posix as posixPath, resolve, win32 as win32Path } from "path";
 import {
@@ -184,24 +184,76 @@ function parseArgs(argv) {
   };
 }
 
+function parseVersion(versionStr) {
+  const match = /(\d+)\.(\d+)\.(\d+)/.exec(versionStr);
+  if (!match) return null;
+  return [parseInt(match[1], 10), parseInt(match[2], 10), parseInt(match[3], 10)];
+}
+
+function compareVersions(a, b) {
+  for (let i = 0; i < 3; i++) {
+    if (a[i] !== b[i]) return a[i] - b[i];
+  }
+  return 0;
+}
+
+function probeVersion(binPath) {
+  try {
+    if (/\.(cmd|bat)$/iu.test(binPath)) {
+      // .cmd/.bat → execSync로 shell 경유 (execFileSync EINVAL 회피)
+      const out = execSync(`"${binPath}" --version`, {
+        encoding: "utf8", timeout: 3000, stdio: ["ignore", "pipe", "ignore"],
+      });
+      return parseVersion(out);
+    }
+    const out = execFileSync(binPath, ["--version"], {
+      encoding: "utf8", timeout: 3000, stdio: ["ignore", "pipe", "ignore"],
+    });
+    return parseVersion(out);
+  } catch {
+    return null;
+  }
+}
+
 function detectClaudePath() {
   if (process.env.CLAUDE_BIN_PATH) return process.env.CLAUDE_BIN_PATH;
 
+  const candidates = [];
+
   const wingetPath = join(homedir(), "AppData", "Local", "Microsoft", "WinGet", "Links", "claude.exe");
-  if (existsSync(wingetPath)) return wingetPath;
+  if (existsSync(wingetPath)) candidates.push(wingetPath);
 
   const npmPath = join(process.env.APPDATA || "", "npm", "claude.cmd");
-  if (existsSync(npmPath)) return npmPath;
+  if (existsSync(npmPath)) candidates.push(npmPath);
 
   try {
     const command = IS_WINDOWS_LOCAL ? "where" : "which";
     const result = execFileSync(command, ["claude"], { encoding: "utf8", timeout: 5000 }).trim();
-    if (result) return result.split(/\r?\n/u)[0].trim();
+    if (result) {
+      for (const line of result.split(/\r?\n/u)) {
+        const p = line.trim();
+        if (p && !candidates.includes(p)) candidates.push(p);
+      }
+    }
   } catch {
     // not found
   }
 
-  return "claude";
+  if (candidates.length === 0) return "claude";
+
+  let bestPath = candidates[0];
+  let bestVersion = probeVersion(candidates[0]);
+
+  for (const candidate of candidates.slice(1)) {
+    const ver = probeVersion(candidate);
+    if (ver === null) continue;
+    if (bestVersion === null || compareVersions(ver, bestVersion) > 0) {
+      bestVersion = ver;
+      bestPath = candidate;
+    }
+  }
+
+  return bestPath;
 }
 
 function getPermissionFlag() {
@@ -598,16 +650,44 @@ function spawnLocal(args, claudePath, prompt) {
   const sessionName = `tfx-spawn-${randomUUID().slice(0, 8)}`;
   const paneId = `${sessionName}:0.0`;
   const permissionFlags = getPermissionFlag().join(" ");
-  const command = `& '${escapePwshSingleQuoted(normalizeCommandPath(claudePath))}'${permissionFlags ? ` ${permissionFlags}` : ""}`;
+  const claudePathNorm = normalizeCommandPath(claudePath);
+
+  // 임시파일 생성 (프롬프트가 있을 때만)
+  // 정리는 pwsh 스크립트 내부에서 수행 (Node exit 시 삭제하면 pane 실행 전 사라짐)
+  let tmpFile = null;
+  if (prompt) {
+    tmpFile = join(tmpdir(), `tfx-prompt-${randomUUID().slice(0, 8)}.md`);
+    writeFileSync(tmpFile, prompt, { encoding: "utf8" });
+  }
 
   createPsmuxSession(sessionName, { layout: "1xN", paneCount: 1 });
   sendKeysToPane(paneId, `cd '${escapePwshSingleQuoted(dir)}'`);
-  sleepMs(500);
-  sendKeysToPane(paneId, command);
-  if (prompt) {
-    sleepMs(2000);
-    sendKeysToPane(paneId, prompt);
+  sleepMs(300);
+
+  if (prompt && tmpFile) {
+    // pwsh -File 패턴: 인라인 쿼팅 문제 회피 (피드백: -Command 금지)
+    // 1단계: 프롬프트를 Get-Content -Raw → claude -p (one-shot), 세션 ID 추출
+    // 2단계: --resume으로 인터랙티브 세션 이어붙이기
+    const tmpFileNorm = normalizeCommandPath(tmpFile);
+    const flags = getPermissionFlag().map((f) => `'${escapePwshSingleQuoted(f)}'`).join(", ");
+    const scriptContent = [
+      `$ErrorActionPreference = 'SilentlyContinue'`,
+      `$t = '${escapePwshSingleQuoted(tmpFileNorm)}'`,
+      `$c = '${escapePwshSingleQuoted(claudePathNorm)}'`,
+      `$f = @(${flags})`,
+      `$raw = Get-Content -Raw $t`,
+      `Remove-Item -ErrorAction SilentlyContinue $t`,
+      `Remove-Item -ErrorAction SilentlyContinue $MyInvocation.MyCommand.Definition`,
+      `& $c @f $raw`,
+    ].join("\n");
+    const scriptFile = join(tmpdir(), `tfx-spawn-${randomUUID().slice(0, 8)}.ps1`);
+    writeFileSync(scriptFile, scriptContent, { encoding: "utf8" });
+    sendKeysToPane(paneId, `pwsh -NoProfile -NoExit -File '${escapePwshSingleQuoted(normalizeCommandPath(scriptFile))}'`);
+  } else {
+    const command = `& '${escapePwshSingleQuoted(claudePathNorm)}'${permissionFlags ? ` ${permissionFlags}` : ""}`;
+    sendKeysToPane(paneId, command);
   }
+
   openAttachTab(sessionName, "Claude@local");
   console.log(sessionName);
 }

package/scripts/tfx-route.sh

@@ -29,6 +29,15 @@ VERSION="2.5"
 
 set -euo pipefail
 
+# ── timeout 명령 호환성 — Windows에서 TIMEOUT.exe 대신 Git Bash coreutils timeout 사용 ──
+if command -v /usr/bin/timeout >/dev/null 2>&1; then
+  TIMEOUT_BIN="/usr/bin/timeout"
+elif command -v gtimeout >/dev/null 2>&1; then
+  TIMEOUT_BIN="gtimeout"  # macOS homebrew
+else
+  TIMEOUT_BIN="timeout"   # Linux 기본
+fi
+
 # ── Async Job 디렉토리 ──
 TFX_JOBS_DIR="${TMPDIR:-/tmp}/tfx-jobs"
 
@@ -1120,9 +1129,9 @@ run_stream_worker() {
   )
 
   if [[ "$use_tee_flag" == "true" ]]; then
-    printf '%s' "$prompt" | timeout "$TIMEOUT_SEC" "${worker_cmd[@]}" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
+    printf '%s' "$prompt" | "$TIMEOUT_BIN" "$TIMEOUT_SEC" "${worker_cmd[@]}" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
   else
-    printf '%s' "$prompt" | timeout "$TIMEOUT_SEC" "${worker_cmd[@]}" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
+    printf '%s' "$prompt" | "$TIMEOUT_BIN" "$TIMEOUT_SEC" "${worker_cmd[@]}" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
   fi
   worker_pid=$!
 
@@ -1144,9 +1153,9 @@ _gemini_run_once() {
   local -a g_args=("$@")
 
   if [[ "$use_tee_flag" == "true" ]]; then
-    timeout "$TIMEOUT_SEC" "$CLI_CMD" "${g_args[@]}" "$prompt" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
+    "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$CLI_CMD" "${g_args[@]}" "$prompt" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
   else
-    timeout "$TIMEOUT_SEC" "$CLI_CMD" "${g_args[@]}" "$prompt" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
+    "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$CLI_CMD" "${g_args[@]}" "$prompt" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
   fi
   echo "$!"
 }
@@ -1285,9 +1294,9 @@ run_codex_exec() {
   fi
 
   if [[ "$use_tee_flag" == "true" ]]; then
-    timeout "$TIMEOUT_SEC" "$CLI_CMD" "${codex_args[@]}" "$prompt" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
+    "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$CLI_CMD" "${codex_args[@]}" "$prompt" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
   else
-    timeout "$TIMEOUT_SEC" "$CLI_CMD" "${codex_args[@]}" "$prompt" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
+    "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$CLI_CMD" "${codex_args[@]}" "$prompt" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
   fi
   worker_pid=$!
 
@@ -1379,9 +1388,9 @@ run_codex_mcp() {
   esac
 
   if [[ "$use_tee_flag" == "true" ]]; then
-    timeout "$TIMEOUT_SEC" "$node_bin" "${mcp_args[@]}" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
+    "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$node_bin" "${mcp_args[@]}" 2>"$STDERR_LOG" | tee "$STDOUT_LOG" &
   else
-    timeout "$TIMEOUT_SEC" "$node_bin" "${mcp_args[@]}" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
+    "$TIMEOUT_BIN" "$TIMEOUT_SEC" "$node_bin" "${mcp_args[@]}" >"$STDOUT_LOG" 2>"$STDERR_LOG" &
   fi
   worker_pid=$!