@triflux/core 10.50.1 → 10.50.2

package/scripts/lib/legacy-mcp-cleanup.mjs

@@ -143,7 +143,14 @@ function envWarning(server, home, env, warnings) {
   }
 }
 
-function patchJson(original, file, home, env, warnings) {
+function patchJson(
+  original,
+  file,
+  home,
+  env,
+  warnings,
+  { withEnv = true } = {},
+) {
   const data = JSON.parse(original);
   if (!data || typeof data !== "object" || Array.isArray(data))
     throw new Error(`${file}: JSON 객체가 아닙니다`);
@@ -190,7 +197,7 @@ function patchJson(original, file, home, env, warnings) {
         ...kept,
         command: server.command,
         args: server.args,
-        ...(server.envVars.length
+        ...(withEnv && server.envVars.length
           ? {
               env: {
                 ...kept.env,
@@ -710,6 +717,8 @@ export function cleanupLegacyMcp({
     [join(repoRoot, ".mcp.json"), "json"],
     [join(home, ".codex/config.toml"), "toml"],
     [join(home, ".gemini/settings.json"), "json"],
+    // agy 는 \${VAR} 참조를 풀지 않으므로 env 없이 바꾸고 셸 환경을 물려받게 한다.
+    [join(home, ".gemini/config/mcp_config.json"), "agy"],
   ];
   const plans = [];
   let blocked = false;
@@ -721,7 +730,9 @@ export function cleanupLegacyMcp({
       const plan =
         kind === "toml"
           ? patchToml(original, file, home, env, result.warnings)
-          : patchJson(original, file, home, env, result.warnings);
+          : patchJson(original, file, home, env, result.warnings, {
+              withEnv: kind !== "agy",
+            });
       if (plan.blocked) blocked = true;
       if (plan.count) plans.push({ file, target, original, ...plan });
     } catch {

package/scripts/lib/psmux-info.mjs

@@ -10,7 +10,7 @@ export const PSMUX_REQUIRED_COMMANDS = [
 
 export const PSMUX_OPTIONAL_COMMANDS = ["detach-client"];
 
-// Windows 패키지 매니저 — winget/scoop/choco 는 Windows 전용
+// Windows 전용 설치 명령
 export const PSMUX_INSTALL_COMMANDS = [
   "winget install psmux",
   "scoop install psmux",
@@ -25,50 +25,18 @@ export const PSMUX_UPDATE_COMMANDS = [
   "cargo install psmux --force",
 ];
 
-// macOS 전용 — brew 가 표준, cargo 는 cross-platform fallback
-export const PSMUX_INSTALL_COMMANDS_DARWIN = [
-  "brew install psmux",
-  "cargo install psmux",
-];
-
-export const PSMUX_UPDATE_COMMANDS_DARWIN = [
-  "brew upgrade psmux",
-  "cargo install psmux --force",
-];
-
-// Linux 전용 — cargo 만 cross-platform 지원, distro 패키지는 미제공
-export const PSMUX_INSTALL_COMMANDS_LINUX = ["cargo install psmux"];
-
-export const PSMUX_UPDATE_COMMANDS_LINUX = ["cargo install psmux --force"];
-
-// PR #258 OS-primary 분기 정책: macOS/Linux 는 tmux 가 POSIX 표준 primary,
-// psmux 는 선택형이다. 따라서 macOS/Linux 에서 "psmux 미설치"는 fallback 사유가
-// 아니며, tmux 까지 없을 때만 native/in-process fallback 을 고려한다.
-export const PSMUX_FALLBACK_NOTE_DARWIN =
-  "macOS 에서는 tmux 가 표준 멀티플렉서이며, " +
-  "psmux 미설치는 fallback 사유가 아닙니다. tmux 도 없을 때만 in-process/native fallback 을 사용합니다.";
-
-export const PSMUX_FALLBACK_NOTE_LINUX =
-  "Linux 에서는 tmux 가 표준 멀티플렉서이며, " +
-  "psmux 미설치는 fallback 사유가 아닙니다. tmux 도 없을 때만 in-process/native fallback 을 사용합니다.";
-
 export function getPsmuxInstallCommandsFor(platform = process.platform) {
-  if (platform === "darwin") return PSMUX_INSTALL_COMMANDS_DARWIN;
-  if (platform === "linux") return PSMUX_INSTALL_COMMANDS_LINUX;
-  // win32 또는 기타 (BSD 등) → Windows 풀 리스트로 폴백 (변경 전 동작 유지)
-  return PSMUX_INSTALL_COMMANDS;
+  if (platform === "win32") return PSMUX_INSTALL_COMMANDS;
+  return [platform === "darwin" ? "brew install tmux" : "apt install tmux"];
 }
 
 export function getPsmuxUpdateCommandsFor(platform = process.platform) {
-  if (platform === "darwin") return PSMUX_UPDATE_COMMANDS_DARWIN;
-  if (platform === "linux") return PSMUX_UPDATE_COMMANDS_LINUX;
-  return PSMUX_UPDATE_COMMANDS;
-}
-
-export function getPsmuxFallbackNoteFor(platform = process.platform) {
-  if (platform === "darwin") return PSMUX_FALLBACK_NOTE_DARWIN;
-  if (platform === "linux") return PSMUX_FALLBACK_NOTE_LINUX;
-  return null;
+  if (platform === "win32") return PSMUX_UPDATE_COMMANDS;
+  return [
+    platform === "darwin"
+      ? "brew upgrade tmux"
+      : "apt install --only-upgrade tmux",
+  ];
 }
 
 export function formatPsmuxCommandList(
@@ -82,10 +50,7 @@ export function formatPsmuxInstallGuidance(
   indent = "",
   platform = process.platform,
 ) {
-  const commands = getPsmuxInstallCommandsFor(platform);
-  const list = formatPsmuxCommandList(commands, indent);
-  const note = getPsmuxFallbackNoteFor(platform);
-  return note ? `${list}\n${indent}(${note})` : list;
+  return formatPsmuxCommandList(getPsmuxInstallCommandsFor(platform), indent);
 }
 
 export function formatPsmuxUpdateGuidance(
@@ -160,8 +125,8 @@ export function probePsmuxSupport(options = {}) {
       missingCommands,
       missingOptionalCommands,
       hasHelp: helpOutput.length > 0,
-      installHint: formatPsmuxInstallGuidance("  "),
-      updateHint: formatPsmuxUpdateGuidance("  "),
+      installHint: formatPsmuxInstallGuidance("  ", "win32"),
+      updateHint: formatPsmuxUpdateGuidance("  ", "win32"),
     };
   } catch {
     return {
@@ -173,8 +138,8 @@ export function probePsmuxSupport(options = {}) {
       missingCommands: [...PSMUX_REQUIRED_COMMANDS],
       missingOptionalCommands: [...PSMUX_OPTIONAL_COMMANDS],
       hasHelp: false,
-      installHint: formatPsmuxInstallGuidance("  "),
-      updateHint: formatPsmuxUpdateGuidance("  "),
+      installHint: formatPsmuxInstallGuidance("  ", "win32"),
+      updateHint: formatPsmuxUpdateGuidance("  ", "win32"),
     };
   }
 }
@@ -207,6 +172,8 @@ export function probePrimaryMultiplexerSupport(options = {}) {
       recommended: true,
       missingCommands: [],
       missingOptionalCommands: [],
+      installHint: formatPsmuxInstallGuidance("  ", platform),
+      updateHint: formatPsmuxUpdateGuidance("  ", platform),
     };
   } catch (error) {
     return {
@@ -218,6 +185,8 @@ export function probePrimaryMultiplexerSupport(options = {}) {
       recommended: false,
       missingCommands: ["tmux"],
       missingOptionalCommands: [],
+      installHint: formatPsmuxInstallGuidance("  ", platform),
+      updateHint: formatPsmuxUpdateGuidance("  ", platform),
       error: error?.message || String(error),
     };
   }

package/scripts/lib/skill-template.mjs

@@ -340,32 +340,6 @@ export function loadTemplatePartials(partialsDir) {
   return partials;
 }
 
-export function loadSkillManifest(skillDir) {
-  const manifestPath = join(skillDir, "skill.json");
-  if (!existsSync(manifestPath)) return null;
-
-  const raw = readFileSync(manifestPath, "utf8");
-  return JSON.parse(raw);
-}
-
-export function parseFrontmatterWithManifest(source, skillDir) {
-  const manifest = skillDir ? loadSkillManifest(skillDir) : null;
-  const { data: yamlData, body } = parseFrontmatter(source);
-
-  if (!manifest) return { data: yamlData, body };
-
-  const merged = { ...yamlData };
-  if (manifest.name) merged.name = manifest.name;
-  if (manifest.description) merged.description = manifest.description;
-  if (manifest.triggers) merged.triggers = manifest.triggers;
-  if (manifest.argument_hint) merged["argument-hint"] = manifest.argument_hint;
-  if (manifest.internal != null) merged.internal = manifest.internal;
-  if (manifest.deprecated != null) merged.deprecated = manifest.deprecated;
-  if (manifest.superseded_by) merged["superseded-by"] = manifest.superseded_by;
-
-  return { data: merged, body };
-}
-
 export function renderSkillTemplate(template, context = {}, options = {}) {
   const { partials = {}, includes = {}, includeBaseDir = "" } = options;
   return renderWithContext(template, context, partials, {

package/hub/codex-compat.mjs

@@ -1,12 +0,0 @@
-// hub/codex-compat.mjs — backward-compatible facade for legacy imports
-
-/** @experimental 런타임 미연결 — 향후 통합 예정 */
-export {
-  buildExecCommand,
-  CODEX_MCP_EXECUTION_EXIT_CODE,
-  CODEX_MCP_TRANSPORT_EXIT_CODE,
-  escapePwshSingleQuoted,
-  FEATURES,
-  getCodexVersion,
-  gte,
-} from "./cli-adapter-base.mjs";

package/hub/fullcycle.mjs

@@ -1,113 +0,0 @@
-// hub/fullcycle.mjs — tfx-fullcycle runtime artifact/state helpers
-
-import {
-  existsSync,
-  mkdirSync,
-  readdirSync,
-  readFileSync,
-  statSync,
-  writeFileSync,
-} from "node:fs";
-import { join, resolve } from "node:path";
-import { ensureTfxDirs, TFX_FULLCYCLE_DIR, TFX_PLANS_DIR } from "./paths.mjs";
-
-function safeResolve(baseDir, relativePath) {
-  const base = resolve(baseDir);
-  const target = resolve(join(baseDir, relativePath));
-  if (!target.startsWith(base)) {
-    throw new Error("Invalid fullcycle path: path traversal detected");
-  }
-  return target;
-}
-
-/** @experimental 런타임 미연결 — 향후 통합 예정 */
-export function createFullcycleRunId(now = new Date()) {
-  return now
-    .toISOString()
-    .replace(/[:.]/g, "-")
-    .replace("T", "_")
-    .replace("Z", "Z");
-}
-
-export function getFullcycleRunDir(runId, baseDir = process.cwd()) {
-  return safeResolve(baseDir, join(TFX_FULLCYCLE_DIR, runId));
-}
-
-export function ensureFullcycleRunDir(runId, baseDir = process.cwd()) {
-  ensureTfxDirs(baseDir);
-  const dir = getFullcycleRunDir(runId, baseDir);
-  mkdirSync(dir, { recursive: true });
-  return dir;
-}
-
-export function saveFullcycleArtifact(
-  runId,
-  filename,
-  content,
-  baseDir = process.cwd(),
-) {
-  if (!filename || typeof filename !== "string") {
-    throw new Error("Artifact filename is required");
-  }
-
-  const dir = ensureFullcycleRunDir(runId, baseDir);
-  const path = safeResolve(dir, filename);
-  writeFileSync(path, content, "utf8");
-  return path;
-}
-
-export function readFullcycleArtifact(
-  runId,
-  filename,
-  baseDir = process.cwd(),
-) {
-  const dir = getFullcycleRunDir(runId, baseDir);
-  const path = safeResolve(dir, filename);
-  if (!existsSync(path)) return null;
-  return readFileSync(path, "utf8");
-}
-
-export function writeFullcycleState(runId, state, baseDir = process.cwd()) {
-  const payload = typeof state === "object" && state !== null ? state : {};
-  const serialized = JSON.stringify(payload, null, 2);
-  return saveFullcycleArtifact(runId, "state.json", serialized, baseDir);
-}
-
-export function readFullcycleState(runId, baseDir = process.cwd()) {
-  const content = readFullcycleArtifact(runId, "state.json", baseDir);
-  if (!content) return null;
-  try {
-    return JSON.parse(content);
-  } catch {
-    return null;
-  }
-}
-
-export function findLatestInterviewPlan(baseDir = process.cwd()) {
-  const plansDir = safeResolve(baseDir, TFX_PLANS_DIR);
-  if (!existsSync(plansDir)) return null;
-
-  const candidates = readdirSync(plansDir)
-    .filter((name) => /^interview-.*\.md$/i.test(name))
-    .map((name) => {
-      const path = join(plansDir, name);
-      const stats = statSync(path);
-      return { name, path, mtimeMs: stats.mtimeMs };
-    })
-    .sort((a, b) => b.mtimeMs - a.mtimeMs);
-
-  return candidates[0]?.path || null;
-}
-
-export function shouldStopQaLoop(failureHistory = [], maxRepeats = 3) {
-  if (!Array.isArray(failureHistory) || maxRepeats <= 1) return false;
-
-  const normalized = failureHistory
-    .map((entry) => String(entry ?? "").trim())
-    .filter(Boolean);
-
-  if (normalized.length < maxRepeats) return false;
-  const target = normalized.at(-1);
-  const tail = normalized.slice(-maxRepeats);
-  return tail.every((entry) => entry === target);
-}

package/hub/gemini-adapter.mjs

@@ -1,174 +0,0 @@
-// hub/gemini-adapter.mjs — legacy Gemini adapter compatibility layer
-// The "gemini" route is retained as an alias, but execution is Antigravity/agy.
-
-import { mkdirSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import {
-  resolveGeminiModel,
-  resolveGeminiProfileForPurpose,
-} from "../scripts/lib/gemini-profiles.mjs";
-import {
-  executeWithCircuitBroker,
-  normalizePathForShell,
-  runProcess,
-} from "./cli-adapter-base.mjs";
-import { isActivityLifecycleEnabled } from "./lib/worker-lifecycle.mjs";
-import { whichCommandAsync } from "./platform.mjs";
-
-function shellSingleQuote(value) {
-  return `'${String(value).replace(/'/g, "'\\''")}'`;
-}
-
-// ── Antigravity stall inference ─────────────────────────────────
-
-function inferStallMode(stdout, stderr) {
-  const text = `${stdout}\n${stderr}`.toLowerCase();
-  if (/(rate.?limit|quota|resource.?exhaust|429)/u.test(text))
-    return "rate_limited";
-  if (
-    /(unauthorized|forbidden|auth|login|token|credential|api.?key)/u.test(text)
-  )
-    return "auth_stall";
-  if (/\bmcp\b|playwright|tavily|brave|sequential|server/u.test(text))
-    return "mcp_stall";
-  return "timeout";
-}
-
-// ── Preflight ───────────────────────────────────────────────────
-
-async function runPreflight(opts = {}) {
-  const agyPath = await whichCommandAsync("agy");
-  if (!agyPath) {
-    return {
-      agyPath: null,
-      warnings: [
-        "Antigravity CLI not found. Install Antigravity and ensure `agy` is available on PATH.",
-      ],
-      excludeMcpServers: [],
-      ok: false,
-    };
-  }
-
-  const warnings = [];
-  const excludeMcpServers = [];
-
-  for (const name of Array.isArray(opts.mcpServers) ? opts.mcpServers : []) {
-    const server = String(name ?? "").trim();
-    if (!server) continue;
-    // Antigravity MCP health는 best-effort: 실행 시점 probe는 수행하지 않음.
-  }
-
-  return { agyPath, warnings, excludeMcpServers, ok: true };
-}
-
-// ── Command building ────────────────────────────────────────────
-
-function buildGeminiCommand(prompt, resultFile, opts = {}) {
-  // agy 의 --print 는 값(프롬프트)을 받는 플래그다. 1.1.27 부터 stdin 프롬프트는
-  // "empty prompt" 로 거부되므로 프롬프트를 --print 의 값으로, 맨 끝에 넘긴다.
-  const parts = ["agy", "--dangerously-skip-permissions"];
-  if (typeof opts.model === "string" && opts.model.trim()) {
-    parts.push("--model", shellSingleQuote(opts.model.trim()));
-  }
-  parts.push("--print", shellSingleQuote(prompt));
-
-  if (resultFile) {
-    return `${parts.join(" ")} > ${shellSingleQuote(normalizePathForShell(resultFile))} 2>${shellSingleQuote(normalizePathForShell(resultFile + ".err"))}`;
-  }
-
-  return parts.join(" ");
-}
-
-function resolveAntigravityModel(opts = {}) {
-  // effort 는 역할별 SSOT(scripts/lib/gemini-profiles.mjs). 명시 model 이 우선한다.
-  const explicit = typeof opts.model === "string" ? opts.model.trim() : "";
-  if (explicit)
-    return resolveGeminiModel(explicit, {
-      profilesPath: opts.geminiProfilesPath,
-    });
-  if (!opts.role && !opts.agent) return "";
-  return resolveGeminiModel(
-    resolveGeminiProfileForPurpose(opts.role || opts.agent),
-    {
-      profilesPath: opts.geminiProfilesPath,
-    },
-  );
-}
-
-function buildAttempts(opts, preflight) {
-  const timeout = Number.isFinite(opts.timeout) ? opts.timeout : 900_000;
-  const base = {
-    timeout,
-    model: resolveAntigravityModel(opts),
-    allowedMcpServers: Array.isArray(opts.mcpServers)
-      ? [...opts.mcpServers]
-      : [],
-    excludeMcpServers: [...(preflight.excludeMcpServers || [])],
-  };
-  if (opts.retryOnFail === false) return [base];
-  const retryTimeout = isActivityLifecycleEnabled() ? timeout : timeout * 2;
-  return [base, { ...base, timeout: retryTimeout, allowedMcpServers: [] }];
-}
-
-// ── Public: buildExecArgs ───────────────────────────────────────
-
-export function buildExecArgs(opts = {}) {
-  const prompt = typeof opts.prompt === "string" ? opts.prompt : "";
-  return buildGeminiCommand(prompt, opts.resultFile || null, {
-    model: resolveAntigravityModel(opts),
-    allowedMcpServers: opts.mcpServers,
-  });
-}
-
-// ── Execution ───────────────────────────────────────────────────
-
-async function runGemini(prompt, workdir, preflight, attempt, lease) {
-  const dir = join(tmpdir(), "triflux-antigravity-exec");
-  mkdirSync(dir, { recursive: true });
-  const resultFile = join(
-    dir,
-    `agy-${Date.now()}-${Math.random().toString(36).slice(2)}.txt`,
-  );
-  const command = buildGeminiCommand(prompt, resultFile, {
-    model: attempt.model,
-    allowedMcpServers: attempt.allowedMcpServers,
-    excludeMcpServers: attempt.excludeMcpServers,
-  });
-  // PRD A1: lease.env 가 있으면 spawn env 에 적용 (예: GOOGLE_API_KEY 등 account-specific
-  // 환경변수). lease 가 null 이면 default 동작 유지 (부모 env inherit).
-  const spawnEnv =
-    lease?.env && typeof lease.env === "object"
-      ? { ...process.env, ...lease.env }
-      : undefined;
-  return runProcess(command, workdir, attempt.timeout, {
-    resultFile,
-    inferStallMode,
-    spawnEnv,
-  });
-}
-
-// ── Public API ──────────────────────────────────────────────────
-
-export async function getCircuitState() {
-  const brokerMod = await import("./account-broker.mjs");
-  if (!brokerMod.broker) return { state: "closed", failures: [] };
-  const snap = brokerMod.broker
-    .snapshot()
-    .filter((a) => a.provider === "gemini");
-  return snap.length
-    ? { state: snap[0].circuitState, accounts: snap }
-    : { state: "closed", failures: [] };
-}
-
-export function execute(opts = {}) {
-  return executeWithCircuitBroker({
-    // Account-broker still stores this compatibility bucket as "gemini";
-    // execution itself is routed to agy above.
-    provider: "gemini",
-    runFn: runGemini,
-    preflightFn: (o) => runPreflight({ mcpServers: o.mcpServers }),
-    buildAttemptsFn: buildAttempts,
-    opts,
-  });
-}