triflux 10.3.4 → 10.7.0

package/hub/team/remote-probe.mjs

@@ -7,8 +7,8 @@
 // L1.5: INPUT_WAIT 패턴 감지 (detectInputWait 재사용)
 // L3: 완료 토큰 감지 (__TRIFLUX_DONE__ 또는 프롬프트 idle)
 
-import { execFileSync } from 'node:child_process';
-import { detectInputWait, PROBE_DEFAULTS } from './health-probe.mjs';
+import { execFileSync } from "node:child_process";
+import { detectInputWait, PROBE_DEFAULTS } from "./health-probe.mjs";
 
 /** 완료 토큰 패턴 */
 const COMPLETION_TOKEN_RE = /__TRIFLUX_DONE__/;
@@ -27,19 +27,25 @@ const _PROMPT_IDLE_RE = /(\u276f|\u2795|>\s*$)/;
 export function sshCapturePane(host, paneTarget, lines = 20, deps = {}) {
   const execFn = deps.execFileSync || execFileSync;
   try {
-    const output = execFn('ssh', [
-      '-o', 'ConnectTimeout=5',
-      '-o', 'BatchMode=yes',
-      host,
-      `psmux capture-pane -t ${paneTarget} -p -S -`,
-    ], {
-      encoding: 'utf8',
-      timeout: 10_000,
-      windowsHide: true,
-      stdio: ['ignore', 'pipe', 'ignore'],
-    });
-    const nonEmpty = output.split('\n').filter((line) => line.trim() !== '');
-    return nonEmpty.slice(-lines).join('\n');
+    const output = execFn(
+      "ssh",
+      [
+        "-o",
+        "ConnectTimeout=5",
+        "-o",
+        "BatchMode=yes",
+        host,
+        `psmux capture-pane -t ${paneTarget} -p -S -`,
+      ],
+      {
+        encoding: "utf8",
+        timeout: 10_000,
+        windowsHide: true,
+        stdio: ["ignore", "pipe", "ignore"],
+      },
+    );
+    const nonEmpty = output.split("\n").filter((line) => line.trim() !== "");
+    return nonEmpty.slice(-lines).join("\n");
   } catch {
     return null;
   }
@@ -55,16 +61,22 @@ export function sshCapturePane(host, paneTarget, lines = 20, deps = {}) {
 export function sshSessionExists(host, sessionName, deps = {}) {
   const execFn = deps.execFileSync || execFileSync;
   try {
-    execFn('ssh', [
-      '-o', 'ConnectTimeout=5',
-      '-o', 'BatchMode=yes',
-      host,
-      `psmux has-session -t ${sessionName}`,
-    ], {
-      timeout: 10_000,
-      windowsHide: true,
-      stdio: ['ignore', 'ignore', 'ignore'],
-    });
+    execFn(
+      "ssh",
+      [
+        "-o",
+        "ConnectTimeout=5",
+        "-o",
+        "BatchMode=yes",
+        host,
+        `psmux has-session -t ${sessionName}`,
+      ],
+      {
+        timeout: 10_000,
+        windowsHide: true,
+        stdio: ["ignore", "ignore", "ignore"],
+      },
+    );
     return true;
   } catch {
     return false;
@@ -92,7 +104,7 @@ export function createRemoteProbe(session, opts = {}) {
   let started = false;
 
   // L1 tracking — 출력 변화 감지
-  let lastCaptureHash = '';
+  let lastCaptureHash = "";
   let lastOutputChangeAt = Date.now();
 
   // L3 tracking — 완료 토큰 / prompt idle
@@ -102,7 +114,7 @@ export function createRemoteProbe(session, opts = {}) {
   const status = {
     l0: null,
     l1: null,
-    l2: 'skip',  // 원격은 MCP L2 미지원
+    l2: "skip", // 원격은 MCP L2 미지원
     l3: null,
     lastProbeAt: null,
     inputWaitPattern: null,
@@ -113,7 +125,7 @@ export function createRemoteProbe(session, opts = {}) {
    */
   function probeL0() {
     const exists = sshSessionExists(session.host, session.sessionName, deps);
-    status.l0 = exists ? 'ok' : 'fail';
+    status.l0 = exists ? "ok" : "fail";
     return status.l0;
   }
 
@@ -135,9 +147,9 @@ export function createRemoteProbe(session, opts = {}) {
     if (hash !== lastCaptureHash) {
       lastCaptureHash = hash;
       lastOutputChangeAt = now;
-      status.l1 = 'ok';
+      status.l1 = "ok";
       status.inputWaitPattern = null;
-      return 'ok';
+      return "ok";
     }
 
     const silenceMs = now - lastOutputChangeAt;
@@ -147,18 +159,18 @@ export function createRemoteProbe(session, opts = {}) {
       const inputWait = detectInputWait(captured);
 
       if (inputWait.detected) {
-        status.l1 = 'input_wait';
+        status.l1 = "input_wait";
         status.inputWaitPattern = inputWait.pattern;
-        return 'input_wait';
+        return "input_wait";
       }
 
-      status.l1 = 'stall';
+      status.l1 = "stall";
       status.inputWaitPattern = null;
-      return 'stall';
+      return "stall";
     }
 
-    status.l1 = 'ok';
-    return 'ok';
+    status.l1 = "ok";
+    return "ok";
   }
 
   /**
@@ -167,28 +179,28 @@ export function createRemoteProbe(session, opts = {}) {
    */
   function probeL3(captured) {
     if (promptAcked) {
-      status.l3 = 'ok';
-      return 'ok';
+      status.l3 = "ok";
+      return "ok";
     }
 
     if (captured != null && captured.length > 0) {
       // 완료 토큰 감지 → 즉시 ok
       if (COMPLETION_TOKEN_RE.test(captured)) {
         promptAcked = true;
-        status.l3 = 'completed';
-        return 'completed';
+        status.l3 = "completed";
+        return "completed";
       }
 
       // 출력이 있으면 prompt acknowledged
       promptAcked = true;
-      status.l3 = 'ok';
-      return 'ok';
+      status.l3 = "ok";
+      return "ok";
     }
 
     const elapsed = Date.now() - spawnedAt;
     if (elapsed >= config.l3ThresholdMs) {
-      status.l3 = 'timeout';
-      return 'timeout';
+      status.l3 = "timeout";
+      return "timeout";
     }
 
     status.l3 = null;
@@ -204,7 +216,7 @@ export function createRemoteProbe(session, opts = {}) {
 
     // L0 실패 시 나머지 probe 스킵
     let captured = null;
-    if (l0 === 'ok') {
+    if (l0 === "ok") {
       captured = sshCapturePane(session.host, session.paneTarget, 20, deps);
     }
 
@@ -214,14 +226,14 @@ export function createRemoteProbe(session, opts = {}) {
     const result = {
       l0,
       l1,
-      l2: 'skip',
+      l2: "skip",
       l3,
       inputWaitPattern: status.inputWaitPattern,
       ts: Date.now(),
     };
     status.lastProbeAt = result.ts;
 
-    if (typeof config.onProbe === 'function') {
+    if (typeof config.onProbe === "function") {
       config.onProbe(result);
     }
 
@@ -233,10 +245,12 @@ export function createRemoteProbe(session, opts = {}) {
     started = true;
     spawnedAt = Date.now();
     lastOutputChangeAt = Date.now();
-    lastCaptureHash = '';
+    lastCaptureHash = "";
     promptAcked = false;
 
-    timer = setInterval(() => { void probe(); }, config.intervalMs);
+    timer = setInterval(() => {
+      void probe();
+    }, config.intervalMs);
     timer.unref?.();
 
     // 즉시 첫 probe 실행
@@ -254,13 +268,13 @@ export function createRemoteProbe(session, opts = {}) {
 
   /** tracking 리셋 (restart 후 호출) */
   function resetTracking() {
-    lastCaptureHash = '';
+    lastCaptureHash = "";
     lastOutputChangeAt = Date.now();
     promptAcked = false;
     spawnedAt = Date.now();
     status.l0 = null;
     status.l1 = null;
-    status.l2 = 'skip';
+    status.l2 = "skip";
     status.l3 = null;
     status.inputWaitPattern = null;
   }
@@ -271,6 +285,8 @@ export function createRemoteProbe(session, opts = {}) {
     probe,
     resetTracking,
     getStatus: () => ({ ...status }),
-    get started() { return started; },
+    get started() {
+      return started;
+    },
   });
 }

package/hub/team/remote-session.mjs

@@ -2,13 +2,18 @@
 // Extracted from scripts/remote-spawn.mjs for reuse by swarm-hypervisor.
 // Pure functions + SSH operations. No psmux, no WT, no CLI arg parsing.
 
-import { execFileSync } from 'node:child_process';
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { basename, join, posix as posixPath, win32 as win32Path } from 'node:path';
-import { execSshWithRetry } from '../lib/ssh-retry.mjs';
+import { execFileSync } from "node:child_process";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import {
+  basename,
+  join,
+  posix as posixPath,
+  win32 as win32Path,
+} from "node:path";
+import { execSshWithRetry } from "../lib/ssh-retry.mjs";
 
 const REMOTE_ENV_TTL_MS = 86_400_000; // 24h
-const REMOTE_STAGE_ROOT = 'tfx-remote';
+const REMOTE_STAGE_ROOT = "tfx-remote";
 const SAFE_HOST_RE = /^[a-zA-Z0-9._-]+$/;
 
 // ── Shell quoting utilities ─────────────────────────────────────
@@ -22,11 +27,11 @@ export function escapePwshSingleQuoted(value) {
 }
 
 export function escapePwshDoubleQuoted(value) {
-  return String(value).replace(/`/g, '``').replace(/"/g, '`"');
+  return String(value).replace(/`/g, "``").replace(/"/g, '`"');
 }
 
 function normalizeCommandPath(value) {
-  return String(value).replace(/\\/g, '/');
+  return String(value).replace(/\\/g, "/");
 }
 
 // ── Validation ──────────────────────────────────────────────────
@@ -47,7 +52,7 @@ function parseProbeLines(text) {
       .map((line) => line.trim())
       .filter(Boolean)
       .map((line) => {
-        const idx = line.indexOf('=');
+        const idx = line.indexOf("=");
         return idx === -1 ? null : [line.slice(0, idx), line.slice(idx + 1)];
       })
       .filter(Boolean),
@@ -55,24 +60,27 @@ function parseProbeLines(text) {
 }
 
 function normalizePwshProbeEnv(parsed) {
-  if (parsed.shell !== 'pwsh' || parsed.os !== 'win32') return null;
+  if (parsed.shell !== "pwsh" || parsed.os !== "win32") return null;
   if (!parsed.home) return null;
   return Object.freeze({
-    claudePath: (!parsed.claude || parsed.claude === 'notfound') ? null : parsed.claude,
+    claudePath:
+      !parsed.claude || parsed.claude === "notfound" ? null : parsed.claude,
     home: parsed.home,
-    os: 'win32',
-    shell: 'pwsh',
+    os: "win32",
+    shell: "pwsh",
   });
 }
 
 function normalizePosixProbeEnv(parsed) {
-  const os = parsed.os === 'darwin' ? 'darwin' : parsed.os === 'linux' ? 'linux' : null;
+  const os =
+    parsed.os === "darwin" ? "darwin" : parsed.os === "linux" ? "linux" : null;
   if (!os || !parsed.home) return null;
   return Object.freeze({
-    claudePath: (!parsed.claude || parsed.claude === 'notfound') ? null : parsed.claude,
+    claudePath:
+      !parsed.claude || parsed.claude === "notfound" ? null : parsed.claude,
     home: parsed.home,
     os,
-    shell: parsed.shell === 'zsh' ? 'zsh' : 'bash',
+    shell: parsed.shell === "zsh" ? "zsh" : "bash",
   });
 }
 
@@ -81,14 +89,20 @@ function probeRemoteEnvViaPwsh(host) {
     "Write-Output 'shell=pwsh'",
     'Write-Output "home=$env:USERPROFILE"',
     'if (Test-Path "$env:USERPROFILE\\.local\\bin\\claude.exe") { Write-Output "claude=$env:USERPROFILE\\.local\\bin\\claude.exe" } elseif (Get-Command claude -ErrorAction SilentlyContinue) { Write-Output "claude=$((Get-Command claude).Source)" } else { Write-Output \'claude=notfound\' }',
-    'Write-Output "os=$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform([System.Runtime.InteropServices.OSPlatform]::Windows) ? \'win32\' : \'other\')"',
-  ].join('; ');
+    "Write-Output \"os=$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform([System.Runtime.InteropServices.OSPlatform]::Windows) ? 'win32' : 'other')\"",
+  ].join("; ");
 
   try {
-    const output = execSshWithRetry([host, 'pwsh', '-NoProfile', '-Command', command], {
-      encoding: 'utf8', timeout: 15000, stdio: ['pipe', 'pipe', 'pipe'],
-      maxRetries: 2, baseDelayMs: 1000,
-    });
+    const output = execSshWithRetry(
+      [host, "pwsh", "-NoProfile", "-Command", command],
+      {
+        encoding: "utf8",
+        timeout: 15000,
+        stdio: ["pipe", "pipe", "pipe"],
+        maxRetries: 2,
+        baseDelayMs: 1000,
+      },
+    );
     return normalizePwshProbeEnv(parseProbeLines(output));
   } catch {
     return null;
@@ -97,16 +111,19 @@ function probeRemoteEnvViaPwsh(host) {
 
 function probeRemoteEnvViaPosix(host) {
   const script = [
-    'echo shell=$(basename $SHELL)',
-    'echo home=$HOME',
-    'command -v claude >/dev/null 2>&1 && echo claude=$(command -v claude) || echo claude=notfound',
-    'echo os=$(uname -s | tr A-Z a-z)',
-  ].join('\n');
+    "echo shell=$(basename $SHELL)",
+    "echo home=$HOME",
+    "command -v claude >/dev/null 2>&1 && echo claude=$(command -v claude) || echo claude=notfound",
+    "echo os=$(uname -s | tr A-Z a-z)",
+  ].join("\n");
 
   try {
-    const output = execSshWithRetry([host, 'sh'], {
-      encoding: 'utf8', timeout: 15000, input: script,
-      maxRetries: 2, baseDelayMs: 1000,
+    const output = execSshWithRetry([host, "sh"], {
+      encoding: "utf8",
+      timeout: 15000,
+      input: script,
+      maxRetries: 2,
+      baseDelayMs: 1000,
     });
     return normalizePosixProbeEnv(parseProbeLines(output));
   } catch {
@@ -124,8 +141,8 @@ function readEnvCache(host, cacheDir) {
   const cachePath = getEnvCachePath(host, cacheDir);
   if (!existsSync(cachePath)) return null;
   try {
-    const parsed = JSON.parse(readFileSync(cachePath, 'utf8'));
-    return parsed && typeof parsed === 'object' ? parsed : null;
+    const parsed = JSON.parse(readFileSync(cachePath, "utf8"));
+    return parsed && typeof parsed === "object" ? parsed : null;
   } catch {
     return null;
   }
@@ -133,16 +150,20 @@ function readEnvCache(host, cacheDir) {
 
 function isEnvCacheFresh(entry) {
   return Boolean(
-    entry
-    && typeof entry.cachedAt === 'number'
-    && entry.env
-    && (Date.now() - entry.cachedAt) < REMOTE_ENV_TTL_MS,
+    entry &&
+      typeof entry.cachedAt === "number" &&
+      entry.env &&
+      Date.now() - entry.cachedAt < REMOTE_ENV_TTL_MS,
   );
 }
 
 function writeEnvCache(host, env, cacheDir) {
   mkdirSync(cacheDir, { recursive: true });
-  writeFileSync(getEnvCachePath(host, cacheDir), JSON.stringify({ cachedAt: Date.now(), env }, null, 2), 'utf8');
+  writeFileSync(
+    getEnvCachePath(host, cacheDir),
+    JSON.stringify({ cachedAt: Date.now(), env }, null, 2),
+    "utf8",
+  );
 }
 
 /**
@@ -158,7 +179,7 @@ function writeEnvCache(host, env, cacheDir) {
 export function probeRemoteEnv(host, opts = {}) {
   validateHost(host);
   const force = opts.force === true;
-  const cacheDir = opts.cacheDir || join('.omc', 'state', 'remote-env');
+  const cacheDir = opts.cacheDir || join(".omc", "state", "remote-env");
 
   if (!force) {
     const cached = readEnvCache(host, cacheDir);
@@ -166,10 +187,16 @@ export function probeRemoteEnv(host, opts = {}) {
   }
 
   const pwshEnv = probeRemoteEnvViaPwsh(host);
-  if (pwshEnv) { writeEnvCache(host, pwshEnv, cacheDir); return pwshEnv; }
+  if (pwshEnv) {
+    writeEnvCache(host, pwshEnv, cacheDir);
+    return pwshEnv;
+  }
 
   const posixEnv = probeRemoteEnvViaPosix(host);
-  if (posixEnv) { writeEnvCache(host, posixEnv, cacheDir); return posixEnv; }
+  if (posixEnv) {
+    writeEnvCache(host, posixEnv, cacheDir);
+    return posixEnv;
+  }
 
   throw new Error(`remote probe failed for ${host}`);
 }
@@ -177,7 +204,7 @@ export function probeRemoteEnv(host, opts = {}) {
 // ── Remote directory resolution ─────────────────────────────────
 
 function isWindowsAbsolutePath(value) {
-  return /^[a-zA-Z]:[\\/]/u.test(value) || value.startsWith('\\\\');
+  return /^[a-zA-Z]:[\\/]/u.test(value) || value.startsWith("\\\\");
 }
 
 /**
@@ -191,17 +218,19 @@ function isWindowsAbsolutePath(value) {
 export function resolveRemoteDir(dir, env) {
   const requestedDir = dir || env.home;
 
-  if (env.os === 'win32') {
-    const winDir = requestedDir.replace(/\//g, '\\');
-    if (winDir === '~') return env.home;
-    if (/^~[\\/]/u.test(winDir)) return win32Path.join(env.home, winDir.slice(2));
+  if (env.os === "win32") {
+    const winDir = requestedDir.replace(/\//g, "\\");
+    if (winDir === "~") return env.home;
+    if (/^~[\\/]/u.test(winDir))
+      return win32Path.join(env.home, winDir.slice(2));
     if (isWindowsAbsolutePath(winDir)) return winDir;
     return win32Path.join(env.home, winDir);
   }
 
-  if (requestedDir === '~') return env.home;
-  if (requestedDir.startsWith('~/')) return posixPath.join(env.home, requestedDir.slice(2));
-  if (requestedDir.startsWith('/')) return requestedDir;
+  if (requestedDir === "~") return env.home;
+  if (requestedDir.startsWith("~/"))
+    return posixPath.join(env.home, requestedDir.slice(2));
+  if (requestedDir.startsWith("/")) return requestedDir;
   return posixPath.join(env.home, requestedDir);
 }
 
@@ -224,12 +253,26 @@ export function resolveRemoteStageDir(env, stageId) {
  * @param {string} remoteStageDir
  */
 export function ensureRemoteStageDir(host, env, remoteStageDir) {
-  if (env.os === 'win32') {
+  if (env.os === "win32") {
     const safePath = escapePwshSingleQuoted(remoteStageDir);
-    execFileSync('ssh', [host, 'pwsh', '-NoProfile', '-Command', `New-Item -ItemType Directory -Path '${safePath}' -Force | Out-Null`], { timeout: 10000, stdio: 'pipe' });
+    execFileSync(
+      "ssh",
+      [
+        host,
+        "pwsh",
+        "-NoProfile",
+        "-Command",
+        `New-Item -ItemType Directory -Path '${safePath}' -Force | Out-Null`,
+      ],
+      { timeout: 10000, stdio: "pipe" },
+    );
     return;
   }
-  execFileSync('ssh', [host, 'sh', '-lc', `mkdir -p ${shellQuote(remoteStageDir)}`], { timeout: 10000, stdio: 'pipe' });
+  execFileSync(
+    "ssh",
+    [host, "sh", "-lc", `mkdir -p ${shellQuote(remoteStageDir)}`],
+    { timeout: 10000, stdio: "pipe" },
+  );
 }
 
 /**
@@ -239,7 +282,10 @@ export function ensureRemoteStageDir(host, env, remoteStageDir) {
  * @param {string} remotePath
  */
 export function uploadFileToRemote(host, localPath, remotePath) {
-  execFileSync('scp', [localPath, `${host}:${remotePath}`], { timeout: 15000, stdio: 'pipe' });
+  execFileSync("scp", [localPath, `${host}:${remotePath}`], {
+    timeout: 15000,
+    stdio: "pipe",
+  });
 }
 
 /**
@@ -283,17 +329,29 @@ export function stageRemotePromptFiles(host, env, transferCandidates, stageId) {
  * @returns {string} stdout
  */
 export function remoteGit(host, env, gitArgs, cwd) {
-  const gitCmd = ['git', ...gitArgs].map((a) => shellQuote(a)).join(' ');
+  const gitCmd = ["git", ...gitArgs].map((a) => shellQuote(a)).join(" ");
 
-  if (env.os === 'win32') {
+  if (env.os === "win32") {
     const cdPath = escapePwshSingleQuoted(cwd);
     const command = `Set-Location '${cdPath}'; ${gitCmd}`;
-    return execFileSync('ssh', [host, 'pwsh', '-NoProfile', '-Command', command], {
-      encoding: 'utf8', timeout: 30_000, stdio: ['pipe', 'pipe', 'pipe'],
-    }).trim();
+    return execFileSync(
+      "ssh",
+      [host, "pwsh", "-NoProfile", "-Command", command],
+      {
+        encoding: "utf8",
+        timeout: 30_000,
+        stdio: ["pipe", "pipe", "pipe"],
+      },
+    ).trim();
   }
 
-  return execFileSync('ssh', [host, 'sh', '-lc', `cd ${shellQuote(cwd)} && ${gitCmd}`], {
-    encoding: 'utf8', timeout: 30_000, stdio: ['pipe', 'pipe', 'pipe'],
-  }).trim();
+  return execFileSync(
+    "ssh",
+    [host, "sh", "-lc", `cd ${shellQuote(cwd)} && ${gitCmd}`],
+    {
+      encoding: "utf8",
+      timeout: 30_000,
+      stdio: ["pipe", "pipe", "pipe"],
+    },
+  ).trim();
 }