@triflux/remote 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/cto/hygiene-actions.mjs

@@ -1,355 +0,0 @@
-import { createHash } from "node:crypto";
-import {
-  copyFileSync,
-  cpSync,
-  existsSync,
-  lstatSync,
-  mkdirSync,
-  renameSync,
-  rmSync,
-  statSync,
-  unlinkSync,
-} from "node:fs";
-import {
-  basename,
-  dirname,
-  isAbsolute,
-  join,
-  relative,
-  resolve,
-} from "node:path";
-
-const ARCHIVABLE_ACTIONS = new Set([
-  "archive_or_resume_session",
-  "prune_superseded_checkpoint",
-]);
-
-function shortHash(value) {
-  const str = String(value ?? "");
-  let h = 5381;
-  for (let i = 0; i < str.length; i += 1) {
-    h = (h * 33) ^ str.charCodeAt(i);
-  }
-  return (h >>> 0).toString(36);
-}
-
-function stewardRootHash(rootDir) {
-  return createHash("sha256")
-    .update(String(rootDir || ""))
-    .digest("hex")
-    .slice(0, 12);
-}
-
-function hygieneKeyForRow(row) {
-  return `${row.kind}:${row.id}`;
-}
-
-function yyyymmdd(value) {
-  const date = value ? new Date(value) : new Date();
-  if (Number.isNaN(date.getTime())) return yyyymmdd(new Date().toISOString());
-  return date.toISOString().slice(0, 10).replace(/-/gu, "");
-}
-
-function safeLabel(value) {
-  return (
-    String(value || "item")
-      .toLowerCase()
-      .replace(/[^a-z0-9._-]+/gu, "-")
-      .replace(/^-+|-+$/gu, "")
-      .slice(0, 80) || "item"
-  );
-}
-
-function isInside(parent, child) {
-  const rel = relative(resolve(parent), resolve(child));
-  return rel === "" || (!rel.startsWith("..") && !isAbsolute(rel));
-}
-
-function normalizeActiveSessions(active) {
-  const sessions = Array.isArray(active)
-    ? active
-    : Array.isArray(active?.sessions)
-      ? active.sessions
-      : Array.isArray(active?.live_sessions)
-        ? active.live_sessions
-        : [];
-  return sessions
-    .map((session) => ({
-      sessionId: String(session?.sessionId || session?.session_id || "").trim(),
-      phase: String(
-        session?.phase || session?.status || "active",
-      ).toLowerCase(),
-    }))
-    .filter((session) => session.sessionId);
-}
-
-function isLiveOwned(row, activeSessions) {
-  const rowSession = String(row?.session_id || row?.id || "").trim();
-  if (!rowSession) return false;
-  return activeSessions.some(
-    (session) => session.sessionId === rowSession && session.phase !== "stale",
-  );
-}
-
-function assertProjectHash(row, rootDir) {
-  if (!row?.project_root_hash) return;
-  const allowed = new Set([shortHash(rootDir), stewardRootHash(rootDir)]);
-  if (!allowed.has(String(row.project_root_hash))) {
-    throw new Error(
-      `project_root_hash mismatch for ${hygieneKeyForRow(row)}: ${row.project_root_hash}`,
-    );
-  }
-}
-
-function assertLakePath(lakeRoot, path, label) {
-  if (!isInside(lakeRoot, path)) {
-    throw new Error(`${label} must be under lakeRoot: ${path}`);
-  }
-}
-
-function sourceBytes(path) {
-  const info = statSync(path);
-  if (info.isFile()) return info.size;
-  if (!info.isDirectory()) return info.size || 0;
-  return 0;
-}
-
-function targetPathFor({ lakeRoot, row, sourcePath, now }) {
-  const archiveDir = join(lakeRoot, "archive", yyyymmdd(now));
-  const label = safeLabel(hygieneKeyForRow(row));
-  return join(archiveDir, `${label}-${basename(sourcePath)}`);
-}
-
-function hasSecondActorApproval(opts = {}) {
-  if (opts.humanAck === true || opts.humanGate === true) return true;
-  const actorSessionId = String(opts.actorSessionId || "").trim();
-  if (!actorSessionId) return false;
-  const hygieneKey = opts.hygieneKey;
-  const approvals = Array.isArray(opts.approvals) ? opts.approvals : [];
-  return approvals.some((entry) => {
-    const ref = entry?.ref && typeof entry.ref === "object" ? entry.ref : {};
-    if (ref.hygiene_key !== hygieneKey) return false;
-    const approverSession = String(ref?.actor?.session_id || "").trim();
-    return Boolean(approverSession && approverSession !== actorSessionId);
-  });
-}
-
-function movePath(sourcePath, targetPath, fsOps = {}) {
-  const ops = {
-    copyFileSync,
-    cpSync,
-    existsSync,
-    lstatSync,
-    mkdirSync,
-    renameSync,
-    rmSync,
-    unlinkSync,
-    ...fsOps,
-  };
-  ops.mkdirSync(dirname(targetPath), { recursive: true });
-  try {
-    ops.renameSync(sourcePath, targetPath);
-    return "rename";
-  } catch (error) {
-    if (error?.code !== "EXDEV") throw error;
-    const info = ops.lstatSync(sourcePath);
-    if (info.isDirectory()) {
-      ops.cpSync(sourcePath, targetPath, { recursive: true, force: false });
-      ops.rmSync(sourcePath, { recursive: true, force: false });
-    } else {
-      ops.copyFileSync(sourcePath, targetPath);
-      ops.unlinkSync(sourcePath);
-    }
-    return "copy_unlink";
-  }
-}
-
-function digestOperations(operations) {
-  const payload = operations.map((operation) => ({
-    hygiene_key: operation.hygiene_key,
-    status: operation.status,
-    source_path: operation.source_path,
-    target_path: operation.target_path,
-    bytes: operation.bytes,
-    reason: operation.reason,
-  }));
-  return createHash("sha256").update(JSON.stringify(payload)).digest("hex");
-}
-
-function rowsFromProjection(projection) {
-  return Array.isArray(projection?.rows) ? projection.rows : [];
-}
-
-export async function applyHygieneArchiveActions({
-  rootDir,
-  lakeRoot,
-  projection,
-  dryRun = true,
-  now = new Date().toISOString(),
-  applyMode = "off",
-  active = {},
-  humanAck = false,
-  humanGate = false,
-  actorSessionId = null,
-  approvals = [],
-  fsOps = {},
-} = {}) {
-  const archiveRoot = join(lakeRoot, "archive", yyyymmdd(now));
-  assertLakePath(lakeRoot, archiveRoot, "archive target");
-
-  const activeSessions = normalizeActiveSessions(active);
-  const operations = [];
-
-  for (const row of rowsFromProjection(projection)) {
-    const hygieneKey = hygieneKeyForRow(row);
-    if (row?.kind === "worktree" && row?.status === "orphaned") {
-      operations.push({
-        hygiene_key: hygieneKey,
-        kind: row.kind,
-        id: row.id,
-        action: row.action,
-        status: "blocked",
-        reason: "orphan_worktree_requires_human",
-        bytes: 0,
-      });
-      continue;
-    }
-
-    if (!ARCHIVABLE_ACTIONS.has(row?.action)) continue;
-
-    assertProjectHash(row, rootDir);
-
-    if (isLiveOwned(row, activeSessions)) {
-      operations.push({
-        hygiene_key: hygieneKey,
-        kind: row.kind,
-        id: row.id,
-        action: row.action,
-        status: "skipped",
-        reason: "live_session_owned",
-        bytes: 0,
-      });
-      continue;
-    }
-
-    const sourcePath = row.artifact_path ? resolve(row.artifact_path) : null;
-    if (!sourcePath) {
-      operations.push({
-        hygiene_key: hygieneKey,
-        kind: row.kind,
-        id: row.id,
-        action: row.action,
-        status: "skipped",
-        reason: "missing_artifact_path",
-        bytes: 0,
-      });
-      continue;
-    }
-    // lake 밖 산출물은 자동 이동 대상이 아니다 — 크래시 대신 skip으로 보고한다.
-    // (checkpoint 등 실제 산출물은 대부분 lake 밖에 있으므로 throw 하면 apply 전체가 죽는다.)
-    if (!isInside(lakeRoot, sourcePath)) {
-      operations.push({
-        hygiene_key: hygieneKey,
-        kind: row.kind,
-        id: row.id,
-        action: row.action,
-        source_path: sourcePath,
-        status: "skipped",
-        reason: "source_outside_lake",
-        bytes: 0,
-      });
-      continue;
-    }
-
-    const targetPath = targetPathFor({ lakeRoot, row, sourcePath, now });
-    assertLakePath(lakeRoot, targetPath, "archive target");
-
-    if (!existsSync(sourcePath)) {
-      operations.push({
-        hygiene_key: hygieneKey,
-        kind: row.kind,
-        id: row.id,
-        action: row.action,
-        source_path: sourcePath,
-        target_path: targetPath,
-        status: existsSync(targetPath) ? "already_archived" : "skipped",
-        reason: existsSync(targetPath) ? undefined : "source_missing",
-        bytes: 0,
-      });
-      continue;
-    }
-
-    operations.push({
-      hygiene_key: hygieneKey,
-      kind: row.kind,
-      id: row.id,
-      action: row.action,
-      source_path: sourcePath,
-      target_path: targetPath,
-      status: "planned",
-      bytes: sourceBytes(sourcePath),
-    });
-  }
-
-  if (!dryRun) {
-    for (const operation of operations) {
-      if (operation.status !== "planned") continue;
-      if (applyMode !== "archive") {
-        operation.status = "blocked";
-        operation.reason = "apply_mode_off";
-        continue;
-      }
-      if (
-        !hasSecondActorApproval({
-          humanAck,
-          humanGate,
-          actorSessionId,
-          approvals,
-          hygieneKey: operation.hygiene_key,
-        })
-      ) {
-        operation.status = "blocked";
-        operation.reason = "second_actor_ack_required";
-        continue;
-      }
-      operation.move_method = movePath(
-        operation.source_path,
-        operation.target_path,
-        fsOps,
-      );
-      operation.status = "archived";
-    }
-  }
-
-  const plannedCount = operations.filter((operation) =>
-    ["planned", "archived", "already_archived"].includes(operation.status),
-  ).length;
-  const appliedCount = operations.filter(
-    (operation) => operation.status === "archived",
-  ).length;
-  const blockedCount = operations.filter(
-    (operation) => operation.status === "blocked",
-  ).length;
-
-  return {
-    schema_version: "cto-hygiene-actions.v1",
-    dry_run: Boolean(dryRun),
-    apply_mode: applyMode,
-    archive_root: archiveRoot,
-    planned_count: plannedCount,
-    applied_count: appliedCount,
-    blocked_count: blockedCount,
-    total_bytes: operations.reduce(
-      (sum, operation) => sum + Number(operation.bytes || 0),
-      0,
-    ),
-    digest: digestOperations(operations),
-    live_safety: {
-      active_session_count: activeSessions.length,
-      skipped_live_count: operations.filter(
-        (operation) => operation.reason === "live_session_owned",
-      ).length,
-    },
-    operations,
-  };
-}