@triflux/remote 10.0.1 → 10.25.1

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 '@triflux/core/hub/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 "@triflux/core/hub/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,34 @@ 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,
+    codexPath:
+      !parsed.codex || parsed.codex === "notfound" ? null : parsed.codex,
+    geminiPath:
+      !parsed.gemini || parsed.gemini === "notfound" ? null : parsed.gemini,
     home: parsed.home,
     os,
-    shell: parsed.shell === 'zsh' ? 'zsh' : 'bash',
+    shell: parsed.shell === "zsh" ? "zsh" : "bash",
+    node: parsed.node || null,
+    cores: parsed.cores ? Number(parsed.cores) : null,
+    ramGb: parsed.ram_gb ? Number(parsed.ram_gb) : null,
   });
 }
 
@@ -81,14 +96,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 +118,26 @@ 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');
+    '[ -f "$HOME/.zshenv" ] && . "$HOME/.zshenv" 2>/dev/null || true',
+    "export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$HOME/.local/bin:$HOME/.nvm/versions/node/$(ls $HOME/.nvm/versions/node 2>/dev/null | sort -V | tail -1)/bin:$PATH 2>/dev/null",
+    "echo shell=$(basename $SHELL)",
+    "echo home=$HOME",
+    "command -v claude >/dev/null 2>&1 && echo claude=$(command -v claude) || echo claude=notfound",
+    "command -v codex >/dev/null 2>&1 && echo codex=$(command -v codex) || echo codex=notfound",
+    "command -v gemini >/dev/null 2>&1 && echo gemini=$(command -v gemini) || echo gemini=notfound",
+    "echo os=$(uname -s | tr A-Z a-z)",
+    "node --version 2>/dev/null && echo node=$(node --version) || echo node=notfound",
+    // darwin: sysctl, linux: nproc + /proc/meminfo
+    "if [ $(uname -s) = Darwin ]; then echo cores=$(sysctl -n hw.ncpu); echo ram_gb=$(($(sysctl -n hw.memsize) / 1073741824)); else echo cores=$(nproc 2>/dev/null || echo 0); echo ram_gb=$(($(grep MemTotal /proc/meminfo 2>/dev/null | awk '{print $2}') / 1048576)); fi",
+  ].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 +155,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 +164,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 +193,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 +201,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 +218,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 +232,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 +267,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 +296,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 +343,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();
 }

package/hub/team/remote-watcher.mjs

@@ -9,9 +9,8 @@
 
 import { execFileSync } from "node:child_process";
 import { EventEmitter } from "node:events";
-
+import { detectHostOs, shellQuoteForHost } from "@triflux/core/hub/lib/ssh-command.mjs";
 import { detectInputWait, PROBE_LEVELS } from "./health-probe.mjs";
-import { shellQuoteForHost, detectHostOs } from "@triflux/core/hub/lib/ssh-command.mjs";
 
 export const REMOTE_WATCHER_STATES = Object.freeze({
   WATCHING: "watching",
@@ -40,7 +39,7 @@ const PROMPT_IDLE_PATTERNS = Object.freeze([
 ]);
 
 /** @deprecated shellQuoteForHost(value, os) 사용 권장 — OS-aware 쿼팅 */
-function shellQuote(value, os) {
+function _shellQuote(value, os) {
   if (os) return shellQuoteForHost(value, os);
   return `'${String(value).replace(/'/g, "'\\''")}'`;
 }
@@ -62,7 +61,10 @@ function freezeStatus(status) {
     Object.fromEntries(
       Object.entries(status.sessions || {})
         .sort(([left], [right]) => left.localeCompare(right))
-        .map(([sessionName, record]) => [sessionName, freezeSessionRecord(record)]),
+        .map(([sessionName, record]) => [
+          sessionName,
+          freezeSessionRecord(record),
+        ]),
     ),
   );
 
@@ -117,7 +119,9 @@ function hasMeaningfulActivity(captured) {
 }
 
 function detectCompletion(captured) {
-  const matches = Array.from(String(captured || "").matchAll(COMPLETION_TOKEN_RE));
+  const matches = Array.from(
+    String(captured || "").matchAll(COMPLETION_TOKEN_RE),
+  );
   const match = matches.at(-1);
   if (!match) {
     return {
@@ -128,7 +132,8 @@ function detectCompletion(captured) {
     };
   }
 
-  const parsedExitCode = match[2] == null ? null : Number.parseInt(match[2], 10);
+  const parsedExitCode =
+    match[2] == null ? null : Number.parseInt(match[2], 10);
   return {
     detected: true,
     exitCode: Number.isFinite(parsedExitCode) ? parsedExitCode : null,
@@ -143,7 +148,10 @@ function parseSessionNames(rawOutput, sessionPrefix) {
     .map((line) => line.trim())
     .filter(Boolean)
     .map((line) => line.split(":")[0]?.trim())
-    .filter((sessionName) => Boolean(sessionName) && sessionName.startsWith(sessionPrefix));
+    .filter(
+      (sessionName) =>
+        Boolean(sessionName) && sessionName.startsWith(sessionPrefix),
+    );
 }
 
 function buildExecOptions(config) {
@@ -187,7 +195,9 @@ function captureSpawnSession(sessionName, config) {
   );
   return {
     paneTarget,
-    captured: String(output || "").replace(/\r/g, "").trimEnd(),
+    captured: String(output || "")
+      .replace(/\r/g, "")
+      .trimEnd(),
   };
 }
 
@@ -221,7 +231,10 @@ function createSessionRecord(sessionName, config, now) {
 }
 
 function isTerminalState(state) {
-  return state === REMOTE_WATCHER_STATES.COMPLETED || state === REMOTE_WATCHER_STATES.FAILED;
+  return (
+    state === REMOTE_WATCHER_STATES.COMPLETED ||
+    state === REMOTE_WATCHER_STATES.FAILED
+  );
 }
 
 export function createRemoteWatcher(opts = {}) {
@@ -252,26 +265,30 @@ export function createRemoteWatcher(opts = {}) {
   }
 
   function emitSessionEvent(eventName, nextRecord, now) {
-    emitter.emit(eventName, Object.freeze({
-      exitCode: nextRecord.exitCode,
-      host: nextRecord.host,
-      inputWaitPattern: nextRecord.inputWaitPattern,
-      output: nextRecord.lastOutput,
-      paneTarget: nextRecord.paneTarget,
-      probeLevel: nextRecord.lastProbeLevel,
-      promptIdlePattern: nextRecord.promptIdlePattern,
-      reason: nextRecord.reason,
-      sessionName: nextRecord.sessionName,
-      state: nextRecord.state,
-      ts: now,
-    }));
+    emitter.emit(
+      eventName,
+      Object.freeze({
+        exitCode: nextRecord.exitCode,
+        host: nextRecord.host,
+        inputWaitPattern: nextRecord.inputWaitPattern,
+        output: nextRecord.lastOutput,
+        paneTarget: nextRecord.paneTarget,
+        probeLevel: nextRecord.lastProbeLevel,
+        promptIdlePattern: nextRecord.promptIdlePattern,
+        reason: nextRecord.reason,
+        sessionName: nextRecord.sessionName,
+        state: nextRecord.state,
+        ts: now,
+      }),
+    );
   }
 
   function classifySession(previousRecord, captured, now) {
     const completion = detectCompletion(captured);
     const inputWait = detectInputWait(captured);
     const promptIdle = detectPromptIdle(captured);
-    const hasActivity = previousRecord.hasActivity || hasMeaningfulActivity(captured);
+    const hasActivity =
+      previousRecord.hasActivity || hasMeaningfulActivity(captured);
 
     let nextState = REMOTE_WATCHER_STATES.WATCHING;
     let reason = "watching";
@@ -292,9 +309,9 @@ export function createRemoteWatcher(opts = {}) {
         eventName = "sessionCompleted";
       }
     } else if (
-      promptIdle.detected
-      && hasActivity
-      && (!inputWait.detected || inputWait.pattern === BARE_INPUT_WAIT_PATTERN)
+      promptIdle.detected &&
+      hasActivity &&
+      (!inputWait.detected || inputWait.pattern === BARE_INPUT_WAIT_PATTERN)
     ) {
       nextState = REMOTE_WATCHER_STATES.COMPLETED;
       reason = "prompt_idle";
@@ -325,10 +342,10 @@ export function createRemoteWatcher(opts = {}) {
     };
 
     if (
-      eventName
-      && previousRecord.state === nextRecord.state
-      && previousRecord.reason === nextRecord.reason
-      && previousRecord.exitCode === nextRecord.exitCode
+      eventName &&
+      previousRecord.state === nextRecord.state &&
+      previousRecord.reason === nextRecord.reason &&
+      previousRecord.exitCode === nextRecord.exitCode
     ) {
       return { eventName: null, nextRecord };
     }
@@ -375,7 +392,10 @@ export function createRemoteWatcher(opts = {}) {
           : createSessionRecord(sessionName, config, now);
 
         try {
-          const { paneTarget, captured } = captureSpawnSession(sessionName, config);
+          const { paneTarget, captured } = captureSpawnSession(
+            sessionName,
+            config,
+          );
           const { eventName, nextRecord } = classifySession(
             { ...previousRecord, paneTarget },
             captured,
@@ -396,7 +416,10 @@ export function createRemoteWatcher(opts = {}) {
             state: REMOTE_WATCHER_STATES.FAILED,
           };
           nextSessions[sessionName] = failedRecord;
-          queuedEvents.push({ eventName: "sessionFailed", record: failedRecord });
+          queuedEvents.push({
+            eventName: "sessionFailed",
+            record: failedRecord,
+          });
           setStatus({
             ...status,
             lastError: toErrorRecord(error),
@@ -407,9 +430,14 @@ export function createRemoteWatcher(opts = {}) {
         }
       }
 
-      for (const [sessionName, previousRecord] of Object.entries(status.sessions)) {
+      for (const [sessionName, previousRecord] of Object.entries(
+        status.sessions,
+      )) {
         if (activeSet.has(sessionName)) continue;
-        const { eventName, nextRecord } = markMissingSession(previousRecord, now);
+        const { eventName, nextRecord } = markMissingSession(
+          previousRecord,
+          now,
+        );
         nextSessions[sessionName] = nextRecord;
         if (eventName) {
           queuedEvents.push({ eventName, record: nextRecord });