@uzysjung/agent-harness 26.166.0 → 26.167.0

package/dist/index.js

@@ -17,6 +17,7 @@ import {
   INTERNAL_BUNDLED_SKILL_IDS,
   LEGACY_INSTALL_LOG_DIR,
   POLICY_DIRS,
+  REMOVED_CATALOG_ASSETS,
   RENAMED_SKILL_IDS,
   RETIRED_AGENTS,
   RETIRED_AGENT_IDS,
@@ -102,7 +103,7 @@ import {
   targetsInclude,
   upsertHarnessImport,
   writeInstallLog
-} from "./chunk-AHAAF4HS.js";
+} from "./chunk-KVXCTS6D.js";
 
 // node_modules/sisteransi/src/index.js
 var require_src = __commonJS({
@@ -787,7 +788,7 @@ var cac = (name = "") => new CAC(name);
 // src/commands/install.ts
 init_esm_shims();
 import { rmSync as rmSync4 } from "fs";
-import { join as join31, resolve as resolve2 } from "path";
+import { join as join32, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/adapters/index.ts
@@ -2992,8 +2993,8 @@ function padDisplay(s, width) {
 
 // src/install-writes.ts
 init_esm_shims();
-import { existsSync as existsSync4, mkdirSync, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
-import { dirname, join as join5, relative, sep } from "path";
+import { existsSync as existsSync5, mkdirSync, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { dirname, join as join6, relative, sep } from "path";
 
 // src/env-files.ts
 init_esm_shims();
@@ -3169,6 +3170,200 @@ function advisory(input) {
   return j("create", LINES.scaffoldWrote, "advisory");
 }
 
+// src/mcp-merge.ts
+init_esm_shims();
+import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
+import { join as join5 } from "path";
+
+// src/mcp-prior.ts
+init_esm_shims();
+var PRIOR_MCP_SERVERS = [
+  {
+    name: "github",
+    value: { type: "stdio", command: "npx", args: ["-y", "@modelcontextprotocol/server-github"] },
+    retired: "the old @modelcontextprotocol/server-github is deprecated upstream and ran without a token. The agent uses the gh CLI for GitHub; to use GitHub's official MCP instead: agent-harness install \u2026 --with github-mcp (needs GITHUB_PAT)"
+  },
+  {
+    name: "railway-mcp-server",
+    value: { type: "stdio", command: "npx", args: ["-y", "@railway/mcp-server"] },
+    updated: "now Railway's remote server \u2014 sign in on first use, see NEXT"
+  },
+  {
+    name: "chrome-devtools",
+    value: { type: "stdio", command: "npx", args: ["-y", "chrome-devtools-mcp@latest"] },
+    updated: "usage statistics off"
+  }
+];
+function priorMcpValues(name) {
+  return PRIOR_MCP_SERVERS.filter((p2) => p2.name === name).map((p2) => p2.value);
+}
+function retiredMcpNames() {
+  return PRIOR_MCP_SERVERS.filter((p2) => p2.retired !== void 0).map((p2) => p2.name);
+}
+
+// src/mcp-merge.ts
+var ENV_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
+function parseRemote(raw) {
+  let v2;
+  try {
+    v2 = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (v2 === null || typeof v2 !== "object" || Array.isArray(v2)) return null;
+  const { url, bearerEnv } = v2;
+  if (typeof url !== "string" || !url.startsWith("https://")) return null;
+  if (bearerEnv === void 0) return { type: "http", url };
+  if (typeof bearerEnv !== "string" || !ENV_NAME.test(bearerEnv)) return null;
+  return { type: "http", url, auth: { bearerEnv } };
+}
+function parseTrackMcpMap(raw) {
+  const rows = [];
+  for (const line of raw.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      continue;
+    }
+    const parts = line.split("	");
+    if (parts.length < 4) {
+      continue;
+    }
+    const [name, pattern, command, argsJson] = parts;
+    if (!name || !pattern || !command) {
+      continue;
+    }
+    if (command === "url") {
+      const server = parseRemote(argsJson ?? "");
+      if (server !== null) rows.push({ name, pattern, server });
+      continue;
+    }
+    let args;
+    try {
+      args = JSON.parse(argsJson ?? "[]");
+    } catch {
+      continue;
+    }
+    if (!Array.isArray(args) || !args.every((a) => typeof a === "string")) {
+      continue;
+    }
+    rows.push({ name, pattern, server: { type: "stdio", command, args } });
+  }
+  return rows;
+}
+function toClaudeServer(cfg) {
+  if (cfg.type === "http") {
+    return cfg.auth === void 0 ? { type: "http", url: cfg.url } : {
+      type: "http",
+      url: cfg.url,
+      headers: { Authorization: `Bearer \${${cfg.auth.bearerEnv}}` }
+    };
+  }
+  const out = {
+    type: cfg.type ?? "stdio",
+    command: cfg.command,
+    args: cfg.args
+  };
+  if (cfg.env && Object.keys(cfg.env).length > 0) out.env = { ...cfg.env };
+  return out;
+}
+function mergeMcpServers(base, rows, tracks, chosen = [], dropped = []) {
+  const out = {
+    ...base,
+    mcpServers: { ...base.mcpServers }
+  };
+  for (const row of rows) {
+    if (dropped.includes(row.name)) {
+      continue;
+    }
+    if (!anyTrack(tracks, row.pattern) && !chosen.includes(row.name)) {
+      continue;
+    }
+    if (out.mcpServers[row.name]) {
+      continue;
+    }
+    out.mcpServers[row.name] = row.server;
+  }
+  delete out._comment;
+  return out;
+}
+function composeMcpJson(opts) {
+  const base = JSON.parse(readFileSync3(opts.templateMcpPath, "utf8"));
+  const mapRaw = existsSync4(opts.trackMapPath) ? readFileSync3(opts.trackMapPath, "utf8") : "";
+  const rows = parseTrackMcpMap(mapRaw);
+  return mergeMcpServers(base, rows, opts.tracks, opts.chosen(rows), opts.dropped?.(rows) ?? []);
+}
+function selectableMcpServers(rows) {
+  const names = new Set(rows.map((r) => r.name));
+  const out = /* @__PURE__ */ new Map();
+  for (const a of EXTERNAL_ASSETS) {
+    if (a.method.kind === "internal" && names.has(a.method.key)) out.set(a.method.key, a.id);
+  }
+  return out;
+}
+function selectedMcpServers(rows, choice) {
+  const recorded2 = new Set(
+    (choice.previousLog?.portions ?? []).filter((p2) => p2.path === ".mcp.json").map((p2) => p2.key)
+  );
+  const legacy = new Set(
+    choice.projectDir === void 0 ? [] : legacyMcpServers(choice.projectDir, choice.previousLog, rows)
+  );
+  const dropped = new Set(droppedMcpServers(rows, choice.excluded));
+  const out = [];
+  for (const [name, assetId] of selectableMcpServers(rows)) {
+    if (dropped.has(name)) continue;
+    const key = `mcpServers.${name}`;
+    if (isAssetSelected(assetId, choice.spec) || recorded2.has(key) || legacy.has(name)) {
+      out.push(name);
+    }
+  }
+  return out;
+}
+function legacyMcpServers(projectDir, previousLog, rows) {
+  if (previousLog === null || previousLog.records === "writer") return [];
+  if ((previousLog.portions ?? []).some((p2) => p2.path === ".mcp.json")) return [];
+  const created = (previousLog.rootFiles ?? []).some(
+    (f) => f.path === ".mcp.json" && f.change === "created"
+  );
+  if (!created) return [];
+  const servers = readMcpServers(join5(projectDir, ".mcp.json"));
+  if (servers === null) return [];
+  const out = [];
+  for (const name of selectableMcpServers(rows).keys()) {
+    if (!Object.hasOwn(servers, name)) continue;
+    const disk = jsonSha(servers[name]);
+    const row = rows.find((r) => r.name === name);
+    const known = [...row ? [row.server] : [], ...priorMcpValues(name)];
+    if (known.some((v2) => jsonSha(toClaudeServer(v2)) === disk)) out.push(name);
+  }
+  return out;
+}
+function readMcpServers(path) {
+  if (!existsSync4(path)) return null;
+  try {
+    const parsed = JSON.parse(readFileSync3(path, "utf8"));
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+    const servers = parsed.mcpServers;
+    if (servers === null || typeof servers !== "object" || Array.isArray(servers)) return null;
+    return servers;
+  } catch {
+    return null;
+  }
+}
+function droppedMcpServers(rows, excluded) {
+  return [...selectableMcpServers(rows)].filter(([name, assetId]) => {
+    const id = keyId(".mcp.json", `mcpServers.${name}`);
+    return excluded.has(assetId) || id !== null && excluded.has(id);
+  }).map(([name]) => name);
+}
+function recordedMcpAssetIds(log) {
+  const recorded2 = new Set(
+    (log?.portions ?? []).filter((p2) => p2.path === ".mcp.json").map((p2) => p2.key)
+  );
+  return EXTERNAL_ASSETS.filter(
+    (a) => a.method.kind === "internal" && recorded2.has(`mcpServers.${a.method.key}`)
+  ).map((a) => a.id);
+}
+
 // src/recorded.ts
 init_esm_shims();
 
@@ -3325,10 +3520,10 @@ function createInstallWriter(args) {
     else external.set(path, sha256);
   }
   function harness(path, from, opts = {}) {
-    const abs = join5(projectDir, path);
+    const abs = join6(projectDir, path);
     if (outside.skip(abs)) return null;
-    const next = "source" in from ? readFileSync3(from.source, "utf8") : from.content;
-    const disk = existsSync4(abs) ? readFileSync3(abs, "utf8") : null;
+    const next = "source" in from ? readFileSync4(from.source, "utf8") : from.content;
+    const disk = existsSync5(abs) ? readFileSync4(abs, "utf8") : null;
     const j4 = judge({
       op: "write",
       kind: "harness",
@@ -3390,8 +3585,8 @@ function createInstallWriter(args) {
     const file = SHARED_FILES[path];
     if (file === void 0) throw new Error(`install: ${path} is not a shared file`);
     const adapter = ADAPTERS[file.adapter];
-    const abs = join5(projectDir, path);
-    const disk = existsSync4(abs) ? readFileSync3(abs, "utf8") : null;
+    const abs = join6(projectDir, path);
+    const disk = existsSync5(abs) ? readFileSync4(abs, "utf8") : null;
     const own = new Map(
       (previousLog?.portions ?? []).filter((p2) => p2.path === path).map((p2) => [p2.key, p2.sha256])
     );
@@ -3471,8 +3666,10 @@ function createInstallWriter(args) {
     const wrote = onlyRemoved ? "removed the harness part" : j4.line;
     const line = res.changed ? removedEdited.length > 0 ? wrote.replace(" \u2014 yours stays", "") : wrote : valueKeys2.length > 0 ? "kept \u2014 the harness part is already in place" : "nothing written \u2014 yours already has these";
     const retired = names(res.removed.filter((k2) => !out.has(k2) && !render.has(k2)));
+    const replaced = names(res.replaced);
     return result(j4.verdict, line, {
       ...retired.length > 0 ? { retired } : {},
+      ...replaced.length > 0 ? { replaced } : {},
       changed: res.changed,
       harness: names(valueKeys2),
       added: names(addedKeys),
@@ -3655,7 +3852,7 @@ function legacySettingsSeed(text, render, projectDir) {
   } catch {
     return seed;
   }
-  const claudeDir = join5(projectDir, ".claude");
+  const claudeDir = join6(projectDir, ".claude");
   const candidates = new Set([...render.keys()].filter((k2) => k2.startsWith("hooks.")));
   const hooks = isObject2(root) && isObject2(root.hooks) ? root.hooks : {};
   for (const [event, groups] of Object.entries(hooks)) {
@@ -3685,8 +3882,14 @@ function legacyMcpSeed(text, render, previous) {
     (f) => f.path === ".mcp.json" && f.change === "created"
   );
   if (!created) return seed;
-  const present2 = ADAPTERS["json-keys"].read(text, render.keys()) ?? /* @__PURE__ */ new Map();
-  for (const key of present2.keys()) seed.set(key, jsonSha(render.get(key)));
+  const retired = retiredMcpNames().map((n) => `mcpServers.${n}`);
+  const candidates = [...render.keys(), ...retired.filter((k2) => !render.has(k2))];
+  const present2 = ADAPTERS["json-keys"].read(text, candidates) ?? /* @__PURE__ */ new Map();
+  for (const [key, disk] of present2) {
+    const prior = priorMcpValues(key.slice("mcpServers.".length)).map((v2) => jsonSha(toClaudeServer(v2))).find((sha) => sha === disk);
+    if (render.has(key)) seed.set(key, prior ?? jsonSha(render.get(key)));
+    else if (prior !== void 0) seed.set(key, prior);
+  }
   seed.set("mcpServers{}", "legacy");
   return seed;
 }
@@ -3701,16 +3904,39 @@ function writeSettingsShared(writer, templateText, projectDir, previousLog, hook
     createdNote: "Claude Code \uC124\uC815 \u2014 \uD558\uB124\uC2A4 \uBAAB\uB9CC(\uD6C5 \xB7 statusLine)"
   });
 }
-function writeMcpShared(writer, mcp, previousLog, opts = {}) {
+function writeMcpShared(writer, mcp, previousLog, opts = {}, defaults) {
   const servers = mcp.mcpServers;
   const render = new Map(
-    Object.entries(servers).map(([name, cfg]) => [`mcpServers.${name}`, cfg])
+    Object.entries(servers).map(([name, cfg]) => [`mcpServers.${name}`, toClaudeServer(cfg)])
   );
-  return writer.shared(".mcp.json", render, {
+  const res = writer.shared(".mcp.json", render, {
     ...opts,
     legacySeed: (text) => legacyMcpSeed(text, render, previousLog),
     createdNote: "MCP \uC11C\uBC84 \uC815\uC758 \uC0DD\uC131"
   });
+  const inFile = new Set(res.harness);
+  const replaced = res.replaced ?? [];
+  const notes = {};
+  for (const p2 of PRIOR_MCP_SERVERS) {
+    if (p2.retired !== void 0 && (res.retired ?? []).includes(p2.name)) notes[p2.name] = p2.retired;
+    if (p2.updated !== void 0 && replaced.includes(p2.name)) notes[p2.name] = p2.updated;
+  }
+  if (defaults !== void 0) {
+    for (const name of replaced) {
+      const assetId = EXTERNAL_ASSETS.find(
+        (a) => a.method.kind === "internal" && a.method.key === name
+      )?.id;
+      if (assetId === void 0 || defaults.names.has(name)) continue;
+      const why = `not a default on ${defaults.tracks.join(", ")} \u2014 kept because your install record has it; drop it: agent-harness install \u2026 --without ${assetId}`;
+      notes[name] = notes[name] === void 0 ? why : `${notes[name]}; ${why}`;
+    }
+  }
+  const remote = Object.entries(servers).flatMap(
+    ([name, cfg]) => cfg.type === "http" && inFile.has(name) ? [cfg.auth === void 0 ? { name } : { name, bearerEnv: cfg.auth.bearerEnv }] : []
+  );
+  if (Object.keys(notes).length > 0) res.notes = notes;
+  if (remote.length > 0) res.remote = remote;
+  return res;
 }
 function writeGitignoreShared(writer, previousLog) {
   const render = gitignoreRender();
@@ -3740,12 +3966,12 @@ function legacyGitignoreSeed(text, render, previous) {
 // src/installer.ts
 init_esm_shims();
 import { chmodSync as chmodSync3, existsSync as existsSync21, readdirSync as readdirSync4, readFileSync as readFileSync22, writeFileSync as writeFileSync8 } from "fs";
-import { basename as basename4, join as join28, relative as relative3, resolve, sep as sep4 } from "path";
+import { basename as basename4, join as join29, relative as relative3, resolve, sep as sep4 } from "path";
 
 // src/anchor-seed.ts
 init_esm_shims();
-import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
+import { join as join7 } from "path";
 
 // src/agents-md-render.ts
 init_esm_shims();
@@ -3829,9 +4055,9 @@ ${CODEX_SIZE_NOTE}` : RULES_NOTE : "",
 
 // src/anchor-seed.ts
 function readIfExists(path) {
-  if (!existsSync5(path)) return null;
+  if (!existsSync6(path)) return null;
   try {
-    return readFileSync4(path, "utf8");
+    return readFileSync5(path, "utf8");
   } catch {
     return null;
   }
@@ -3852,7 +4078,7 @@ function compose(body, into) {
 ${trimmed.join("\n")}`;
 }
 function seedAgentsMdProjectContext(projectDir) {
-  const root = readIfExists(join6(projectDir, "CLAUDE.md"));
+  const root = readIfExists(join7(projectDir, "CLAUDE.md"));
   if (root === null) return null;
   const withoutImport = stripHarnessImport(root) ?? root;
   const body = dropHarnessQuoteBlocks(dropTitle(withoutImport.split("\n")));
@@ -3860,9 +4086,9 @@ function seedAgentsMdProjectContext(projectDir) {
   return compose(body, "agents-md");
 }
 function seedRootClaudeProjectContext(projectDir, harnessRoot) {
-  const agents = readIfExists(join6(projectDir, "AGENTS.md"));
+  const agents = readIfExists(join7(projectDir, "AGENTS.md"));
   if (agents === null) return null;
-  const template = readIfExists(join6(harnessRoot, AGENTS_MD_TEMPLATE));
+  const template = readIfExists(join7(harnessRoot, AGENTS_MD_TEMPLATE));
   if (template === null) return null;
   const installer = projectContextInstallerLines({ existing: agents, template });
   if (installer === null) return null;
@@ -3873,8 +4099,8 @@ function seedRootClaudeProjectContext(projectDir, harnessRoot) {
 
 // src/ci-scaffold.ts
 init_esm_shims();
-import { existsSync as existsSync6 } from "fs";
-import { join as join7 } from "path";
+import { existsSync as existsSync7 } from "fs";
+import { join as join8 } from "path";
 var PYTHON_TRACKS = "data|csr-fastapi|full";
 var VARIANTS = [
   {
@@ -3898,12 +4124,12 @@ function installCiScaffold(ctx) {
   for (const v2 of VARIANTS) {
     if (!v2.applies(ctx.tracks)) continue;
     const relTarget = `.github/workflows/${v2.target}`;
-    const target = join7(ctx.projectDir, relTarget);
-    if (existsSync6(target)) {
+    const target = join8(ctx.projectDir, relTarget);
+    if (existsSync7(target)) {
       report.skippedExisting.push(relTarget);
       continue;
     }
-    copyFile(join7(ctx.harnessRoot, "templates/github-workflows", v2.source), target);
+    copyFile(join8(ctx.harnessRoot, "templates/github-workflows", v2.source), target);
     report.written.push(relTarget);
   }
   return report;
@@ -3912,16 +4138,16 @@ function installCiScaffold(ctx) {
 // src/cli-transforms.ts
 init_esm_shims();
 import { existsSync as existsSync16, readFileSync as readFileSync16 } from "fs";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 
 // src/agents-md-transform.ts
 init_esm_shims();
-import { existsSync as existsSync10, readFileSync as readFileSync8 } from "fs";
-import { basename, join as join12 } from "path";
+import { existsSync as existsSync11, readFileSync as readFileSync9 } from "fs";
+import { basename, join as join13 } from "path";
 
 // src/agents-skill-targets.ts
 init_esm_shims();
-import { join as join8, sep as sep2 } from "path";
+import { join as join9, sep as sep2 } from "path";
 function bundledSkillTargets(projectDir) {
   const log = readInstallLog(projectDir);
   if (log === null) return [];
@@ -3936,7 +4162,7 @@ function bundledSkillTargets(projectDir) {
 }
 function allowSkillCreation(writer, projectDir, ids) {
   if (ids.length === 0) return writer;
-  const roots = ids.map((id) => `${join8(projectDir, ".agents", "skills", id)}${sep2}`);
+  const roots = ids.map((id) => `${join9(projectDir, ".agents", "skills", id)}${sep2}`);
   return {
     write(absPath, content, opts) {
       const inTarget = roots.some((root) => absPath.startsWith(root));
@@ -3957,24 +4183,24 @@ function agentsSkillSlot(params) {
 
 // src/owned-write.ts
 init_esm_shims();
-import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync2, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
 import { dirname as dirname2, relative as relative2, sep as sep3 } from "path";
 
 // src/foreign-slot.ts
 init_esm_shims();
 import { lstatSync, realpathSync, statSync } from "fs";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 var SKILL_SLOT = /^((?:\.claude|\.agents)\/skills\/[^/]+)(?:\/|$)/;
 function occupiedByNonDirectory(path) {
   const stat = lstatSync(path, { throwIfNoEntry: false });
   return stat !== void 0 && !stat.isDirectory();
 }
 function linksToProjectSharedSkill(projectDir, id) {
-  const slot = join9(projectDir, ".claude/skills", id);
+  const slot = join10(projectDir, ".claude/skills", id);
   if (lstatSync(slot, { throwIfNoEntry: false })?.isSymbolicLink() !== true) return false;
   try {
     const real = realpathSync(slot);
-    return real === join9(realpathSync(projectDir), ".agents/skills", id) && statSync(real).isDirectory();
+    return real === join10(realpathSync(projectDir), ".agents/skills", id) && statSync(real).isDirectory();
   } catch {
     return false;
   }
@@ -3982,15 +4208,15 @@ function linksToProjectSharedSkill(projectDir, id) {
 function foreignOwnedTarget(projectDir, rel) {
   const slot = SKILL_SLOT.exec(rel)?.[1];
   if (slot === void 0) return null;
-  if (occupiedByNonDirectory(join9(projectDir, slot))) return slot;
+  if (occupiedByNonDirectory(join10(projectDir, slot))) return slot;
   if (rel !== slot) {
     const parts = rel.slice(slot.length + 1).split("/");
     let cursor = slot;
     for (const part of parts.slice(0, -1)) {
       cursor = `${cursor}/${part}`;
-      if (occupiedByNonDirectory(join9(projectDir, cursor))) return cursor;
+      if (occupiedByNonDirectory(join10(projectDir, cursor))) return cursor;
     }
-    const leaf = lstatSync(join9(projectDir, rel), { throwIfNoEntry: false });
+    const leaf = lstatSync(join10(projectDir, rel), { throwIfNoEntry: false });
     if (leaf !== void 0 && !leaf.isFile()) return rel;
   }
   return null;
@@ -4016,7 +4242,7 @@ function createOwnedWriter(projectDir, baseline, options = {}) {
       }
       if (outside.skip(absPath)) return false;
       const digest = hashContent(content);
-      if (!existsSync7(absPath)) {
+      if (!existsSync8(absPath)) {
         const recordedPath = baseline.has(rel);
         if (refreshOnly && !opts?.createInRefresh && !recordedPath) return false;
         mkdirSync2(dirname2(absPath), { recursive: true });
@@ -4024,7 +4250,7 @@ function createOwnedWriter(projectDir, baseline, options = {}) {
         updated++;
         if (refreshOnly && recordedPath) restored.push(rel);
       } else {
-        const current = readFileSync5(absPath, "utf8");
+        const current = readFileSync6(absPath, "utf8");
         if (current !== content) {
           if (!isHarnessOwned(baseline, rel, current)) {
             const backup = backupFile(absPath, now);
@@ -4058,8 +4284,8 @@ function createOwnedWriter(projectDir, baseline, options = {}) {
 
 // src/rules-port.ts
 init_esm_shims();
-import { existsSync as existsSync8, readdirSync, readFileSync as readFileSync6 } from "fs";
-import { join as join10 } from "path";
+import { existsSync as existsSync9, readdirSync, readFileSync as readFileSync7 } from "fs";
+import { join as join11 } from "path";
 function claudePaths(source) {
   if (!source.startsWith("---\n")) return [];
   const end = source.indexOf("\n---", 4);
@@ -4087,16 +4313,16 @@ function stripClaudeFrontmatter(source) {
 function portRules(harnessRoot, ruleNames) {
   const ported = [];
   for (const name of ruleNames) {
-    const src = join10(harnessRoot, "templates/rules", `${name}.md`);
-    if (!existsSync8(src)) continue;
-    const source = readFileSync6(src, "utf8");
+    const src = join11(harnessRoot, "templates/rules", `${name}.md`);
+    if (!existsSync9(src)) continue;
+    const source = readFileSync7(src, "utf8");
     ported.push({ name, body: stripClaudeFrontmatter(source), paths: claudePaths(source) });
   }
   return ported;
 }
 function ruleHeadings(harnessRoot) {
-  const dir = join10(harnessRoot, "templates/rules");
-  if (!existsSync8(dir)) return /* @__PURE__ */ new Set();
+  const dir = join11(harnessRoot, "templates/rules");
+  if (!existsSync9(dir)) return /* @__PURE__ */ new Set();
   const names = readdirSync(dir).filter((f) => f.endsWith(".md")).map((f) => f.slice(0, -3));
   const block = renderRulesBlock(portRules(harnessRoot, names));
   return new Set(
@@ -4110,8 +4336,8 @@ function renderRulesBlock(rules) {
 
 // src/shared-write.ts
 init_esm_shims();
-import { existsSync as existsSync9, mkdirSync as mkdirSync3, readFileSync as readFileSync7, rmSync, statSync as statSync2, writeFileSync as writeFileSync5 } from "fs";
-import { dirname as dirname3, join as join11 } from "path";
+import { existsSync as existsSync10, mkdirSync as mkdirSync3, readFileSync as readFileSync8, rmSync, statSync as statSync2, writeFileSync as writeFileSync5 } from "fs";
+import { dirname as dirname3, join as join12 } from "path";
 function toPortions(path, portions) {
   const adapter = adapterFor(path);
   if (adapter === null) throw new Error(`shared-write: ${path} is not a shared file`);
@@ -4126,8 +4352,8 @@ function writeShared(params) {
   const { projectDir, path, render, record, baseline, writer, refreshOnly } = params;
   const adapter = adapterFor(path);
   if (adapter === null) throw new Error(`shared-write: ${path} is not a shared file`);
-  const abs = join11(projectDir, path);
-  const onDisk = existsSync9(abs) ? readFileSync7(abs, "utf8") : null;
+  const abs = join12(projectDir, path);
+  const onDisk = existsSync10(abs) ? readFileSync8(abs, "utf8") : null;
   const recorded2 = recordedFor(path, record);
   const excluded = excludedKeys(path, record.excluded ?? []);
   const result = (action2, rest = {}) => ({
@@ -4246,8 +4472,8 @@ function agentsMdModel(disk, recordedByHarness, recordedBlock = false) {
   return "block";
 }
 function writeAgentsMd(params) {
-  const abs = join11(params.projectDir, AGENTS_MD);
-  const disk = existsSync9(abs) ? readFileSync7(abs, "utf8") : null;
+  const abs = join12(params.projectDir, AGENTS_MD);
+  const disk = existsSync10(abs) ? readFileSync8(abs, "utf8") : null;
   const recordedBlock = (params.record.portions ?? []).some((p2) => p2.path === AGENTS_MD);
   if (agentsMdModel(disk, params.baseline.has(AGENTS_MD), recordedBlock) === "sections") {
     params.writer.write(
@@ -4300,9 +4526,9 @@ function stripShared(params) {
     portions: [],
     ...rest
   });
-  const abs = join11(projectDir, path);
-  if (!existsSync9(abs) || !statSync2(abs).isFile()) return out("none");
-  const disk = readFileSync7(abs, "utf8");
+  const abs = join12(projectDir, path);
+  if (!existsSync10(abs) || !statSync2(abs).isFile()) return out("none");
+  const disk = readFileSync8(abs, "utf8");
   const recorded2 = new Map(
     params.portions.filter((p2) => p2.path === path).map((p2) => [p2.key, p2.sha256])
   );
@@ -4355,16 +4581,16 @@ function runAgentsMdTransform(params) {
     refreshOnly,
     ...params.journal === void 0 ? {} : { journal: params.journal }
   });
-  const claudeMd = readRequired(join12(harnessRoot, "templates/CLAUDE.md"));
-  const template = readRequired(join12(harnessRoot, AGENTS_MD_TEMPLATE));
+  const claudeMd = readRequired(join13(harnessRoot, "templates/CLAUDE.md"));
+  const template = readRequired(join13(harnessRoot, AGENTS_MD_TEMPLATE));
   const { skillIds } = agentsSkillSlot({
     projectDir,
     selectedInternalSkills: params.selectedInternalSkills,
     refreshOnly,
     writer
   });
-  const agentsMdPath = join12(projectDir, "AGENTS.md");
-  const exists = existsSync10(agentsMdPath);
+  const agentsMdPath = join13(projectDir, "AGENTS.md");
+  const exists = existsSync11(agentsMdPath);
   const creates = !exists && (!refreshOnly || params.installedByRecord === true);
   const legacy = params.legacyContext ?? null;
   const fromRoot = creates ? seedAgentsMdProjectContext(projectDir) : null;
@@ -4383,7 +4609,7 @@ function runAgentsMdTransform(params) {
     harnessRules: renderRulesBlock(portRules(harnessRoot, params.rules)),
     clis
   });
-  const diskBefore = exists ? readFileSync8(agentsMdPath, "utf8") : null;
+  const diskBefore = exists ? readFileSync9(agentsMdPath, "utf8") : null;
   const agentsMd = writeAgentsMd({
     projectDir,
     rendered,
@@ -4406,22 +4632,22 @@ function runAgentsMdTransform(params) {
   };
 }
 function seededInto(path, before, seed, from) {
-  if (seed === null || !existsSync10(path)) return null;
-  const after = readFileSync8(path, "utf8");
+  if (seed === null || !existsSync11(path)) return null;
+  const after = readFileSync9(path, "utf8");
   const body = renameSlashes(seed.slice(seed.indexOf("\n\n") + 2));
   return after !== before && after.includes(body) ? from : null;
 }
 function readRequired(path) {
-  if (!existsSync10(path)) {
+  if (!existsSync11(path)) {
     throw new Error(`AGENTS.md transform: required source missing: ${path}`);
   }
-  return readFileSync8(path, "utf8");
+  return readFileSync9(path, "utf8");
 }
 
 // src/antigravity/retire-anchor.ts
 init_esm_shims();
-import { lstatSync as lstatSync2, readFileSync as readFileSync9, rmSync as rmSync2 } from "fs";
-import { join as join13 } from "path";
+import { lstatSync as lstatSync2, readFileSync as readFileSync10, rmSync as rmSync2 } from "fs";
+import { join as join14 } from "path";
 var LEGACY_ANTIGRAVITY_ANCHOR_SECTIONS = ["Project Context", "Project Rules", "Protected Files"];
 function anchorRecord(previous) {
   return previous.find((f) => f.path === LEGACY_ANTIGRAVITY_ANCHOR) ?? null;
@@ -4430,7 +4656,7 @@ function readRegular(abs) {
   const stat = lstatSync2(abs, { throwIfNoEntry: false });
   if (stat === void 0 || !stat.isFile()) return null;
   try {
-    return readFileSync9(abs, "utf8");
+    return readFileSync10(abs, "utf8");
   } catch {
     return null;
   }
@@ -4449,7 +4675,7 @@ function legacyContextLines(text) {
 }
 function readLegacyAntigravityContext(projectDir, previous) {
   if (anchorRecord(previous) === null) return null;
-  const text = readRegular(join13(projectDir, LEGACY_ANTIGRAVITY_ANCHOR));
+  const text = readRegular(join14(projectDir, LEGACY_ANTIGRAVITY_ANCHOR));
   if (text === null) return null;
   const lines2 = legacyContextLines(text);
   if (lines2 === null) return null;
@@ -4473,7 +4699,7 @@ function retireAntigravityAnchor(args) {
   const rec = anchorRecord(args.previous);
   if (rec === null) return null;
   const path = LEGACY_ANTIGRAVITY_ANCHOR;
-  const abs = join13(args.projectDir, path);
+  const abs = join14(args.projectDir, path);
   const left = (why) => ({
     path,
     action: "left",
@@ -4484,7 +4710,7 @@ function retireAntigravityAnchor(args) {
   if (args.outside.skip(abs)) return left("it points outside this project");
   const stat = lstatSync2(abs, { throwIfNoEntry: false });
   if (stat !== void 0 && !stat.isFile()) return left("it is a link or folder, so it is yours");
-  const disk = stat === void 0 ? null : readFileSync9(abs, "utf8");
+  const disk = stat === void 0 ? null : readFileSync10(abs, "utf8");
   const verdict = judge({
     op: "remove",
     kind: "harness",
@@ -4511,12 +4737,12 @@ function relativeBackup(projectDir, backup) {
 
 // src/antigravity/transform.ts
 init_esm_shims();
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 
 // src/codex/skills.ts
 init_esm_shims();
-import { chmodSync, existsSync as existsSync11, readFileSync as readFileSync10 } from "fs";
-import { join as join14 } from "path";
+import { chmodSync, existsSync as existsSync12, readFileSync as readFileSync11 } from "fs";
+import { join as join15 } from "path";
 function renderBundledSkill(source) {
   const trimmed = source.trimEnd();
   const lines2 = trimmed.split(/\r?\n/);
@@ -4548,14 +4774,14 @@ function writeBundledSkillDirs(params) {
   const { harnessRoot, projectDir, skillIds, writer } = params;
   const written = [];
   for (const id of skillIds) {
-    const srcDir = join14(harnessRoot, "templates/skills", id);
-    const srcSkill = join14(srcDir, "SKILL.md");
-    if (!existsSync11(srcSkill)) {
+    const srcDir = join15(harnessRoot, "templates/skills", id);
+    const srcSkill = join15(srcDir, "SKILL.md");
+    if (!existsSync12(srcSkill)) {
       continue;
     }
-    const targetDir = join14(projectDir, ".agents", "skills", id);
-    const targetSkill = join14(targetDir, "SKILL.md");
-    if (!writer.write(targetSkill, renderBundledSkill(readFileSync10(srcSkill, "utf8")))) {
+    const targetDir = join15(projectDir, ".agents", "skills", id);
+    const targetSkill = join15(targetDir, "SKILL.md");
+    if (!writer.write(targetSkill, renderBundledSkill(readFileSync11(srcSkill, "utf8")))) {
       continue;
     }
     written.push(targetSkill);
@@ -4563,10 +4789,10 @@ function writeBundledSkillDirs(params) {
       if (rel === "SKILL.md") continue;
       if (rel.split("/").some((segment2) => segment2.startsWith("."))) continue;
       const segments = rel.split("/");
-      const raw = readFileSync10(join14(srcDir, ...segments), "utf8");
+      const raw = readFileSync11(join15(srcDir, ...segments), "utf8");
       const ported = rel.endsWith(".md") || rel.endsWith(".sh") ? `${portBody(raw)}
 ` : raw;
-      const target = join14(targetDir, ...segments);
+      const target = join15(targetDir, ...segments);
       if (!writer.write(target, ported, { createInRefresh: true })) continue;
       if (rel.endsWith(".sh")) chmodSync(target, 493);
       written.push(target);
@@ -4607,7 +4833,7 @@ function runAntigravityTransform(params) {
   const antigravityInstalled = params.installedByRecord === true;
   const harnessRuleFiles = [];
   for (const rule of portRules(harnessRoot, rules)) {
-    const target = join15(projectDir, ".agents", "rules", `${rule.name}.md`);
+    const target = join16(projectDir, ".agents", "rules", `${rule.name}.md`);
     const content = `${antigravityFrontmatter(rule)}${rule.body}
 `;
     if (!writer.write(target, content, { createInRefresh: antigravityInstalled })) {
@@ -4631,11 +4857,11 @@ function runAntigravityTransform(params) {
 // src/codex/opt-in.ts
 init_esm_shims();
 import { homedir } from "os";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 // src/codex/trust-entry.ts
 init_esm_shims();
-import { existsSync as existsSync12, mkdirSync as mkdirSync4, readFileSync as readFileSync11, realpathSync as realpathSync2, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync4, readFileSync as readFileSync12, realpathSync as realpathSync2, writeFileSync as writeFileSync6 } from "fs";
 import { dirname as dirname4 } from "path";
 var UNSAFE_APPEND = "adding the entry would make this file unreadable TOML \u2014 left untouched";
 function trustKeysFor(projectDir) {
@@ -4678,7 +4904,7 @@ function registerTrustEntry(opts) {
   const keys = trustKeysFor(projectDir);
   const key = keys[0] ?? projectDir;
   try {
-    const existing = existsSync12(configPath) ? readFileSync11(configPath, "utf8") : "";
+    const existing = existsSync13(configPath) ? readFileSync12(configPath, "utf8") : "";
     let parsed;
     try {
       parsed = parse(existing);
@@ -4729,8 +4955,8 @@ function firstLine(e2) {
 
 // src/codex/opt-in.ts
 function runCodexOptIn(ctx) {
-  const codexHome = ctx.codexHome ?? join16(homedir(), ".codex");
-  const configPath = join16(codexHome, "config.toml");
+  const codexHome = ctx.codexHome ?? join17(homedir(), ".codex");
+  const configPath = join17(codexHome, "config.toml");
   const result = registerTrustEntry({ configPath, projectDir: ctx.projectDir });
   return {
     trustEntry: {
@@ -4745,13 +4971,13 @@ function runCodexOptIn(ctx) {
 
 // src/codex/transform.ts
 init_esm_shims();
-import { chmodSync as chmodSync2, existsSync as existsSync13, readFileSync as readFileSync13 } from "fs";
-import { basename as basename2, join as join18 } from "path";
+import { chmodSync as chmodSync2, existsSync as existsSync14, readFileSync as readFileSync14 } from "fs";
+import { basename as basename2, join as join19 } from "path";
 
 // src/codex/config-toml.ts
 init_esm_shims();
-import { readFileSync as readFileSync12 } from "fs";
-import { join as join17 } from "path";
+import { readFileSync as readFileSync13 } from "fs";
+import { join as join18 } from "path";
 var TABLES_REGION = "tables";
 function configRegions(rendered) {
   const lines2 = rendered.split(/\r?\n/);
@@ -4796,7 +5022,7 @@ function retiredFeatureKeys(disk) {
 function retiredFeaturesLeftBehind(projectDir, r) {
   if (r.action !== "left" && !r.leftAsIs.includes(TABLES_REGION)) return [];
   try {
-    return retiredFeatureKeys(readFileSync12(join17(projectDir, ".codex/config.toml"), "utf8"));
+    return retiredFeatureKeys(readFileSync13(join18(projectDir, ".codex/config.toml"), "utf8"));
   } catch {
     return [];
   }
@@ -4814,7 +5040,7 @@ function isChangedLegacyConfig(disk, baselineSha) {
   return parsed !== null && callsHarnessHook(parsed);
 }
 function renderConfigToml(params) {
-  const substituted = params.template.replaceAll("{PROJECT_NAME}", params.projectName).replaceAll("{PROJECT_DIR}", tomlBasicString(params.projectDir).slice(1, -1)).replaceAll("{GITHUB_TOKEN}", "${GITHUB_TOKEN}");
+  const substituted = params.template.replaceAll("{PROJECT_NAME}", params.projectName).replaceAll("{PROJECT_DIR}", tomlBasicString(params.projectDir).slice(1, -1));
   if (!params.mcp) {
     return substituted;
   }
@@ -4826,6 +5052,12 @@ ${renderMcpServers(params.mcp)}
 function renderMcpServers(mcp) {
   const blocks = Object.entries(mcp.mcpServers).map(([name, cfg]) => {
     const lines2 = [`[mcp_servers.${quoteIfNeeded(name)}]`];
+    if (cfg.type === "http") {
+      lines2.push(`url = ${jsonString(cfg.url)}`);
+      if (cfg.auth !== void 0)
+        lines2.push(`bearer_token_env_var = ${jsonString(cfg.auth.bearerEnv)}`);
+      return lines2.join("\n");
+    }
     lines2.push(`command = ${jsonString(cfg.command)}`);
     lines2.push(`args = ${JSON.stringify(cfg.args)}`);
     if (cfg.env && Object.keys(cfg.env).length > 0) {
@@ -4860,7 +5092,7 @@ function runCodexTransform(params) {
     refreshOnly: refreshOnly ?? false,
     ...params.journal === void 0 ? {} : { journal: params.journal }
   });
-  const configTemplate = readRequired2(join18(harnessRoot, "templates/codex/config.toml.template"));
+  const configTemplate = readRequired2(join19(harnessRoot, "templates/codex/config.toml.template"));
   const projectName = basename2(projectDir);
   const { skillIds, skillWriter } = agentsSkillSlot({
     projectDir,
@@ -4868,7 +5100,7 @@ function runCodexTransform(params) {
     refreshOnly: refreshOnly ?? false,
     writer
   });
-  const configTomlPath = join18(projectDir, CONFIG_TOML);
+  const configTomlPath = join19(projectDir, CONFIG_TOML);
   const configToml = writeConfigToml({
     projectDir,
     regions: configRegions(
@@ -4879,15 +5111,15 @@ function runCodexTransform(params) {
     record: shared2,
     refreshOnly: refreshOnly ?? false
   });
-  const hookDir = join18(projectDir, ".codex/hooks");
+  const hookDir = join19(projectDir, ".codex/hooks");
   const hookFiles = [];
   for (const hook of HOOK_NAMES) {
-    const src = join18(harnessRoot, "templates/hooks", `${hook}.sh`);
-    if (!existsSync13(src)) {
+    const src = join19(harnessRoot, "templates/hooks", `${hook}.sh`);
+    if (!existsSync14(src)) {
       continue;
     }
-    const ported = readFileSync13(src, "utf8").replace(ENV_VAR_RENAME, "CODEX_PROJECT_DIR");
-    const target = join18(hookDir, `${hook}.sh`);
+    const ported = readFileSync14(src, "utf8").replace(ENV_VAR_RENAME, "CODEX_PROJECT_DIR");
+    const target = join19(hookDir, `${hook}.sh`);
     if (!writer.write(target, ported)) continue;
     chmodSync2(target, 493);
     hookFiles.push(target);
@@ -4909,8 +5141,8 @@ function runCodexTransform(params) {
 var CONFIG_TOML = ".codex/config.toml";
 var LEGACY_CHANGED = "written by an earlier harness version and changed since \u2014 left as is; harness part not added";
 function writeConfigToml(args) {
-  const abs = join18(args.projectDir, CONFIG_TOML);
-  const disk = existsSync13(abs) ? readFileSync13(abs, "utf8") : null;
+  const abs = join19(args.projectDir, CONFIG_TOML);
+  const disk = existsSync14(abs) ? readFileSync14(abs, "utf8") : null;
   const regions = disk === null ? null : ADAPTERS["toml-region"].read(disk);
   if (disk !== null && regions?.size === 0 && isChangedLegacyConfig(disk, args.baseline.get(CONFIG_TOML))) {
     return {
@@ -4940,131 +5172,42 @@ function writeConfigToml(args) {
   });
 }
 function readRequired2(path) {
-  if (!existsSync13(path)) {
+  if (!existsSync14(path)) {
     throw new Error(`Codex transform: required source missing: ${path}`);
   }
-  return readFileSync13(path, "utf8");
-}
-
-// src/mcp-merge.ts
-init_esm_shims();
-import { existsSync as existsSync14, readFileSync as readFileSync14 } from "fs";
-function parseTrackMcpMap(raw) {
-  const rows = [];
-  for (const line of raw.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) {
-      continue;
-    }
-    const parts = line.split("	");
-    if (parts.length < 4) {
-      continue;
-    }
-    const [name, pattern, command, argsJson] = parts;
-    if (!name || !pattern || !command) {
-      continue;
-    }
-    let args;
-    try {
-      args = JSON.parse(argsJson ?? "[]");
-    } catch {
-      continue;
-    }
-    if (!Array.isArray(args) || !args.every((a) => typeof a === "string")) {
-      continue;
-    }
-    rows.push({ name, pattern, command, args });
-  }
-  return rows;
-}
-function mergeMcpServers(base, rows, tracks, chosen = [], dropped = []) {
-  const out = {
-    ...base,
-    mcpServers: { ...base.mcpServers }
-  };
-  for (const row of rows) {
-    if (dropped.includes(row.name)) {
-      continue;
-    }
-    if (!anyTrack(tracks, row.pattern) && !chosen.includes(row.name)) {
-      continue;
-    }
-    if (out.mcpServers[row.name]) {
-      continue;
-    }
-    out.mcpServers[row.name] = {
-      type: "stdio",
-      command: row.command,
-      args: row.args
-    };
-  }
-  delete out._comment;
-  return out;
-}
-function composeMcpJson(opts) {
-  const base = JSON.parse(readFileSync14(opts.templateMcpPath, "utf8"));
-  const mapRaw = existsSync14(opts.trackMapPath) ? readFileSync14(opts.trackMapPath, "utf8") : "";
-  const rows = parseTrackMcpMap(mapRaw);
-  return mergeMcpServers(base, rows, opts.tracks, opts.chosen(rows), opts.dropped?.(rows) ?? []);
-}
-function selectableMcpServers(rows) {
-  const names = new Set(rows.map((r) => r.name));
-  const out = /* @__PURE__ */ new Map();
-  for (const a of EXTERNAL_ASSETS) {
-    if (a.method.kind === "internal" && names.has(a.method.key)) out.set(a.method.key, a.id);
-  }
-  return out;
-}
-function selectedMcpServers(rows, choice) {
-  const recorded2 = new Set(
-    (choice.previousLog?.portions ?? []).filter((p2) => p2.path === ".mcp.json").map((p2) => p2.key)
-  );
-  const dropped = new Set(droppedMcpServers(rows, choice.excluded));
-  const out = [];
-  for (const [name, assetId] of selectableMcpServers(rows)) {
-    if (dropped.has(name)) continue;
-    const key = `mcpServers.${name}`;
-    if (isAssetSelected(assetId, choice.spec) || recorded2.has(key)) out.push(name);
-  }
-  return out;
-}
-function droppedMcpServers(rows, excluded) {
-  return [...selectableMcpServers(rows)].filter(([name, assetId]) => {
-    const id = keyId(".mcp.json", `mcpServers.${name}`);
-    return excluded.has(assetId) || id !== null && excluded.has(id);
-  }).map(([name]) => name);
-}
-function recordedMcpAssetIds(log) {
-  const recorded2 = new Set(
-    (log?.portions ?? []).filter((p2) => p2.path === ".mcp.json").map((p2) => p2.key)
-  );
-  return EXTERNAL_ASSETS.filter(
-    (a) => a.method.kind === "internal" && recorded2.has(`mcpServers.${a.method.key}`)
-  ).map((a) => a.id);
+  return readFileSync14(path, "utf8");
 }
 
 // src/opencode/transform.ts
 init_esm_shims();
 import { existsSync as existsSync15, readdirSync as readdirSync2, readFileSync as readFileSync15, unlinkSync } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 
 // src/opencode/opencode-json.ts
 init_esm_shims();
-function toLocal(cfg) {
+function toOpencode(cfg) {
+  if (cfg.type === "http") {
+    return cfg.auth === void 0 ? { type: "remote", url: cfg.url } : {
+      type: "remote",
+      url: cfg.url,
+      oauth: false,
+      headers: { Authorization: `Bearer {env:${cfg.auth.bearerEnv}}` }
+    };
+  }
   const local = { type: "local", command: [cfg.command, ...cfg.args] };
   if (cfg.env && Object.keys(cfg.env).length > 0) local.environment = { ...cfg.env };
   return local;
 }
 function renderOpencodeMcp(mcp) {
   return new Map(
-    Object.entries(mcp.mcpServers).map(([name, cfg]) => [`mcp.${name}`, toLocal(cfg)])
+    Object.entries(mcp.mcpServers).map(([name, cfg]) => [`mcp.${name}`, toOpencode(cfg)])
   );
 }
 function renderOpencodeJson(params) {
   const config = parseTemplate(params.template);
   if (params.mcp) {
     config.mcp = Object.fromEntries(
-      Object.entries(params.mcp.mcpServers).map(([name, cfg]) => [name, toLocal(cfg)])
+      Object.entries(params.mcp.mcpServers).map(([name, cfg]) => [name, toOpencode(cfg)])
     );
   }
   return `${JSON.stringify(config, null, 2)}
@@ -5095,7 +5238,7 @@ function runOpencodeTransform(params) {
     ...params.journal === void 0 ? {} : { journal: params.journal }
   });
   const opencodeTemplate = readRequired3(
-    join19(harnessRoot, "templates/opencode/opencode.json.template")
+    join20(harnessRoot, "templates/opencode/opencode.json.template")
   );
   const { skillIds, skillWriter } = agentsSkillSlot({
     projectDir,
@@ -5104,7 +5247,7 @@ function runOpencodeTransform(params) {
     writer
   });
   ensureDir(projectDir);
-  const opencodeJsonPath = join19(projectDir, OPENCODE_JSON);
+  const opencodeJsonPath = join20(projectDir, OPENCODE_JSON);
   const render = renderOpencodeMcp(mcp);
   const opencodeJson = writeShared({
     projectDir,
@@ -5123,13 +5266,13 @@ function runOpencodeTransform(params) {
     writer: skillWriter
   });
   const retiredCommands = [];
-  const cmdDir = join19(projectDir, ".opencode/commands");
+  const cmdDir = join20(projectDir, ".opencode/commands");
   if (existsSync15(cmdDir)) {
     for (const entry of readdirSync2(cmdDir)) {
       if (!entry.endsWith(".md")) continue;
       const id = entry.slice(0, -3);
-      if (!existsSync15(join19(harnessRoot, "templates/skills", id, "SKILL.md"))) continue;
-      const victim = join19(cmdDir, entry);
+      if (!existsSync15(join20(harnessRoot, "templates/skills", id, "SKILL.md"))) continue;
+      const victim = join20(cmdDir, entry);
       if (writer.skipOutside(victim)) continue;
       try {
         backupFile(victim);
@@ -5172,6 +5315,14 @@ function trackDefaultMcpAssetIds(harnessRoot, tracks) {
     return id !== void 0 && anyTrack(tracks, r.pattern) ? [id] : [];
   });
 }
+function trackDefaultMcpNames(harnessRoot, tracks) {
+  const { templateMcpPath } = mcpSources(harnessRoot);
+  const base = existsSync16(templateMcpPath) ? Object.keys(JSON.parse(readFileSync16(templateMcpPath, "utf8")).mcpServers) : [];
+  return /* @__PURE__ */ new Set([
+    ...base,
+    ...trackRows(harnessRoot).filter((r) => anyTrack(tracks, r.pattern)).map((r) => r.name)
+  ]);
+}
 function trackRows(harnessRoot) {
   const { trackMapPath } = mcpSources(harnessRoot);
   return existsSync16(trackMapPath) ? parseTrackMcpMap(readFileSync16(trackMapPath, "utf8")) : [];
@@ -5194,8 +5345,8 @@ function adapterExcluded(harnessRoot, excluded) {
 }
 function mcpSources(harnessRoot) {
   return {
-    templateMcpPath: join20(harnessRoot, "templates/mcp.json"),
-    trackMapPath: join20(harnessRoot, "templates/track-mcp-map.tsv")
+    templateMcpPath: join21(harnessRoot, "templates/mcp.json"),
+    trackMapPath: join21(harnessRoot, "templates/track-mcp-map.tsv")
   };
 }
 var ALL_CLI_TARGETS = CLI_BASES;
@@ -5358,7 +5509,7 @@ function runCliTransforms(params) {
 // src/excluded-still-there.ts
 init_esm_shims();
 import { existsSync as existsSync17 } from "fs";
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 function excludedStillThere(projectDir, excluded, baselineOnDisk, previousLog) {
   const out = [];
   const add = (id, catalog) => {
@@ -5371,10 +5522,11 @@ function excludedStillThere(projectDir, excluded, baselineOnDisk, previousLog) {
   for (const id of excluded) {
     if (INTERNAL_BUNDLED_SKILL_IDS.includes(id)) {
       const there = [".claude/skills", ".agents/skills"].some(
-        (d2) => existsSync17(join21(projectDir, d2, id))
+        (d2) => existsSync17(join22(projectDir, d2, id))
       );
       if (there) add(id, false);
     } else {
+      if (Object.hasOwn(REMOVED_CATALOG_ASSETS, id)) continue;
       const asset = previousLog?.assets.find((a) => a.id === id);
       if (asset !== void 0 && assetStillThere(projectDir, asset)) add(id, true);
     }
@@ -5384,9 +5536,9 @@ function excludedStillThere(projectDir, excluded, baselineOnDisk, previousLog) {
 function assetStillThere(projectDir, asset) {
   if (asset.method !== "skill" || asset.scope === "global") return true;
   if (asset.files !== void 0)
-    return asset.files.some((f) => existsSync17(join21(projectDir, f.path)));
+    return asset.files.some((f) => existsSync17(join22(projectDir, f.path)));
   const dir = asset.detail.skill ?? asset.id;
-  return [".claude/skills", ".agents/skills"].some((d2) => existsSync17(join21(projectDir, d2, dir)));
+  return [".claude/skills", ".agents/skills"].some((d2) => existsSync17(join22(projectDir, d2, dir)));
 }
 
 // src/external-installer.ts
@@ -5394,7 +5546,7 @@ init_esm_shims();
 import { spawnSync } from "child_process";
 import { existsSync as existsSync18, readFileSync as readFileSync17 } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 var SKILL_ROOTS = [".claude/skills", ".agents/skills"];
 function skillRootOf(cli) {
   return cli === "claude" ? ".claude/skills" : ".agents/skills";
@@ -5402,11 +5554,11 @@ function skillRootOf(cli) {
 function snapshotSkillRoots(projectDir) {
   const out = /* @__PURE__ */ new Map();
   for (const root of SKILL_ROOTS) {
-    if (outsideProjectTarget(projectDir, join22(projectDir, root)) !== null) continue;
-    for (const rel of listFilesRecursive(join22(projectDir, root))) {
+    if (outsideProjectTarget(projectDir, join23(projectDir, root)) !== null) continue;
+    for (const rel of listFilesRecursive(join23(projectDir, root))) {
       const path = `${root}/${rel}`;
       try {
-        out.set(path, hashContent(readFileSync17(join22(projectDir, path), "utf8")));
+        out.set(path, hashContent(readFileSync17(join23(projectDir, path), "utf8")));
       } catch {
       }
     }
@@ -5483,7 +5635,7 @@ function installOne(asset, ctx) {
         return runSpawn(asset, ctx.spawn, "npx", buildSkillArgs(method, ctx.cli, ctx.scope), cwd);
       }
       const outside = SKILL_ROOTS.flatMap((root) => {
-        const hit = outsideProjectTarget(cwd, join22(cwd, root));
+        const hit = outsideProjectTarget(cwd, join23(cwd, root));
         return hit === null ? [] : [{ root, target: hit.target }];
       });
       const outRoots = new Set(outside.map((o) => o.root));
@@ -5664,7 +5816,7 @@ function detectVersion(method, spawn, scope, projectDir) {
       case "plugin":
         return detectPluginVersion(method.pluginId, scope, projectDir);
       case "npm": {
-        const pkgJson = scope === "global" ? detectGlobalNpmPackageJsonPath(method.pkg, spawn) : join22(projectDir, "node_modules", method.pkg, "package.json");
+        const pkgJson = scope === "global" ? detectGlobalNpmPackageJsonPath(method.pkg, spawn) : join23(projectDir, "node_modules", method.pkg, "package.json");
         if (!pkgJson || !existsSync18(pkgJson)) return void 0;
         const parsed = JSON.parse(readFileSync17(pkgJson, "utf8"));
         return parsed.version;
@@ -5678,7 +5830,7 @@ function detectVersion(method, spawn, scope, projectDir) {
 }
 function detectPluginVersion(pluginId, scope, projectDir) {
   const claudeScope = scope === "global" ? "user" : "project";
-  const path = join22(homedir2(), ".claude/plugins/installed_plugins.json");
+  const path = join23(homedir2(), ".claude/plugins/installed_plugins.json");
   if (!existsSync18(path)) return void 0;
   const data = JSON.parse(readFileSync17(path, "utf8"));
   const entries = data.plugins?.[pluginId] ?? [];
@@ -5693,7 +5845,7 @@ function detectPluginVersion(pluginId, scope, projectDir) {
 }
 function detectGlobalNpmPackageJsonPath(pkg, spawn) {
   const npmRoot = getNpmGlobalRoot(spawn);
-  return npmRoot ? join22(npmRoot, pkg, "package.json") : void 0;
+  return npmRoot ? join23(npmRoot, pkg, "package.json") : void 0;
 }
 var npmGlobalRootCache;
 function getNpmGlobalRoot(spawn) {
@@ -5713,7 +5865,7 @@ function getNpmGlobalRoot(spawn) {
 // src/key-ids.ts
 init_esm_shims();
 import { readFileSync as readFileSync18 } from "fs";
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 function renderedKeyIds(harnessRoot, input, clis) {
   const out = /* @__PURE__ */ new Set();
   const add = (path, key) => {
@@ -5736,7 +5888,7 @@ function renderedKeyIds(harnessRoot, input, clis) {
   for (const name of Object.keys(mcp.mcpServers)) add(".mcp.json", `mcpServers.${name}`);
   for (const key of gitignoreRender().keys()) add(".gitignore", key);
   if (clis.includes("claude")) {
-    const template = readFileSync18(join23(harnessRoot, "templates/settings.json"), "utf8");
+    const template = readFileSync18(join24(harnessRoot, "templates/settings.json"), "utf8");
     for (const key of renderSettingsPortion(template, () => true).keys()) {
       add(".claude/settings.json", key);
     }
@@ -5777,7 +5929,7 @@ function withoutAccepts(harnessRoot, spec, previous) {
 
 // src/linked-skill-bodies.ts
 init_esm_shims();
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 function refreshLinkedSkillBodies(params) {
   const { harnessRoot, projectDir, ids, baseline, journal } = params;
   const bodyKey = (id) => `.agents/skills/${id}/SKILL.md`;
@@ -5788,7 +5940,7 @@ function refreshLinkedSkillBodies(params) {
   );
   const result = writer.result();
   return {
-    updated: ours.filter((id) => written.has(join24(projectDir, bodyKey(id)))),
+    updated: ours.filter((id) => written.has(join25(projectDir, bodyKey(id)))),
     notOurs: ids.filter((id) => !baseline.has(bodyKey(id))),
     files: result.files,
     backupPaths: result.backupPaths,
@@ -5800,7 +5952,7 @@ function refreshLinkedSkillBodies(params) {
 // src/out-of-track.ts
 init_esm_shims();
 import { lstatSync as lstatSync3, readFileSync as readFileSync19, rmSync as rmSync3 } from "fs";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 var AGENTS_RULE = /^\.agents\/rules\/([^/]+)\.md$/;
 var ANCHOR_RULE = "uzys-harness";
 function reclaimOutOfTrack(args) {
@@ -5820,7 +5972,7 @@ function reclaimOutOfTrack(args) {
     const name = AGENTS_RULE.exec(f.path)?.[1];
     if (name === void 0 || name === ANCHOR_RULE || rendered.has(name)) continue;
     if (isBaselineExcluded(`.claude/rules/${name}.md`, args.excluded)) continue;
-    const abs = join25(projectDir, f.path);
+    const abs = join26(projectDir, f.path);
     if (args.outside.skip(abs)) continue;
     const stat = lstatSync3(abs, { throwIfNoEntry: false });
     if (stat !== void 0 && !stat.isFile()) continue;
@@ -5862,14 +6014,14 @@ function tracksBringing(rule) {
 // src/state.ts
 init_esm_shims();
 import { existsSync as existsSync19, readFileSync as readFileSync20 } from "fs";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 var META_FILE = ".claude/.installed-tracks";
 var LEGACY_ANCHOR_FILE = ".claude/CLAUDE.md";
 var TRACE_RULES = ["htmx", "nextjs", "data-analysis", "pyside6", "cli-development"].map(
   (r) => `.claude/rules/${r}.md`
 );
 function detectInstallState(projectDir) {
-  const hasClaudeDir = existsSync19(join26(projectDir, ".claude"));
+  const hasClaudeDir = existsSync19(join27(projectDir, ".claude"));
   const read = readInstallLogStatus(projectDir);
   if (read.status === "ok") {
     return {
@@ -5889,7 +6041,7 @@ function tracksFromLog(tracks) {
   return [...new Set(tracks.filter(isTrack))].sort();
 }
 function collectTraces(projectDir) {
-  const at5 = (rel) => join26(projectDir, rel);
+  const at5 = (rel) => join27(projectDir, rel);
   const contains = (rel, needle) => existsSync19(at5(rel)) && readFileSync20(at5(rel), "utf8").includes(needle);
   const traces = [];
   if (existsSync19(at5(META_FILE)))
@@ -5958,7 +6110,7 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync7
 } from "fs";
-import { basename as basename3, dirname as dirname5, join as join27 } from "path";
+import { basename as basename3, dirname as dirname5, join as join28 } from "path";
 var LEGACY_ANCHOR_FILE2 = ".claude/CLAUDE.md";
 function buildUpdateSpec(projectDir, tracks, only) {
   const log = readInstallLog(projectDir);
@@ -5980,7 +6132,7 @@ function parseUpdateOnly(raw) {
   return { ok: true, groups: [...new Set(raw)] };
 }
 function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
-  const claudeDir = join27(projectDir, ".claude");
+  const claudeDir = join28(projectDir, ".claude");
   const startedAt = Date.now();
   const backupsAtStart = new Set(
     collectRunBackups(projectDir, Number.NEGATIVE_INFINITY).map((b2) => b2.backup)
@@ -6026,8 +6178,8 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   const policyBase = policyBaseline(projectDir);
   for (const { dir, ext } of POLICY_DIRS) {
     if (!claudeManaged || !wants(dir === "hooks" ? "hooks" : "rules")) continue;
-    const target = join27(claudeDir, dir);
-    const source = join27(templatesDir, dir);
+    const target = join28(claudeDir, dir);
+    const source = join28(templatesDir, dir);
     const label = `.claude/${dir}`;
     const ctx = { prefix: dir, baseline: policyBase, outside, excluded: excludedIds(logAtStart) };
     const synced = updateDir(target, source, ext, ctx);
@@ -6041,8 +6193,8 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   if (claudeManaged && syncedDirs.length > 0)
     refreshPolicyBaseline(projectDir, templatesDir, syncedDirs, outsidePaths(outside, ".claude/"));
   const skillSync = claudeManaged && wants("skills") ? syncSkills(
-    join27(claudeDir, "skills"),
-    join27(templatesDir, "skills"),
+    join28(claudeDir, "skills"),
+    join28(templatesDir, "skills"),
     skillBaseline(projectDir),
     /* @__PURE__ */ new Date(),
     (relInSkills) => foreignOwnedTarget(projectDir, `.claude/skills/${relInSkills}`),
@@ -6067,7 +6219,9 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   const harnessMcp = renderHarnessMcp(harnessRoot, {
     spec: { tracks: installedTracks(projectDir), options: DEFAULT_OPTIONS },
     excluded: excludedIds(logAtStart),
-    previousLog: logAtStart
+    previousLog: logAtStart,
+    // #722 (ADR-106) — 옛 로그면 하네스가 만든 `.mcp.json` 에서 하네스 값 그대로인 고를 수 있는 서버를 선택으로 본다
+    projectDir
   });
   const sharedWrites = writeUpdateSharedFiles({
     projectDir,
@@ -6078,7 +6232,7 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
     droppedKeys: legacyDroppedKeys(logAtStart),
     harnessMcp
   });
-  const settingsPath = join27(claudeDir, "settings.json");
+  const settingsPath = join28(claudeDir, "settings.json");
   if (claudeManaged && wants("hooks") && existsSync20(settingsPath) && !outside.skip(settingsPath)) {
     report.staleHookRefs = cleanStaleHookRefs(
       settingsPath,
@@ -6123,6 +6277,13 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   report.restoredFiles = external.restoredFiles;
   report.excludedKeys = external.excludedKeys;
   report.sharedWrites = sharedWrites.writes;
+  const remoteMcp = changedRemoteMcp(sharedWrites.writes);
+  if (remoteMcp.length > 0) {
+    report.remoteMcp = {
+      servers: remoteMcp,
+      clis: logAtStart === null ? [] : installedClis(logAtStart)
+    };
+  }
   report.legacyReleasedCatalog = [...legacyReleasedCatalog(logAtStart)];
   report.excludedStillThere = excludedStillThere(
     projectDir,
@@ -6165,6 +6326,9 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
   const skillRefresh = wants("external") ? (deps.refreshSkills ?? refreshExternalSkills)(projectDir) : { attempted: 0, refreshed: 0, failed: [], notInCatalog: [], unknown: false };
   report.externalSkillsRefreshed = skillRefresh.refreshed;
   report.externalSkillsFailed = skillRefresh.failed;
+  const removedOnRecord = wants("external") ? catalogRemovedOnRecord(logAtStart) : [];
+  if (removedOnRecord.length > 0) report.catalogRemoved = removedOnRecord;
+  const saidAsRemoved = new Set(removedOnRecord.map((e2) => e2.id));
   report.externalSkillsNotInCatalog = [
     ...skillRefresh.notInCatalog,
     ...staleSkillDirs(
@@ -6172,7 +6336,7 @@ function runUpdateMode(projectDir, templatesDir, harnessRoot, deps = {}, only) {
       claudeDir,
       logAtStart === null ? [] : installedClis(logAtStart)
     ).filter((id) => !skillRefresh.notInCatalog.includes(id))
-  ];
+  ].filter((id) => !saidAsRemoved.has(id));
   report.externalSkillsUnknown = skillRefresh.unknown;
   const outsideLinks = mergeOutside(outside.list(), sharedWrites.outside, external.externalOutside);
   if (outsideLinks.length > 0) report.outsideLinks = outsideLinks;
@@ -6271,7 +6435,7 @@ function retiredFeaturesPart(projectDir, f) {
 }
 function legacyHookOnDisk(projectDir, rel) {
   try {
-    return hasLegacyHarnessHook(readFileSync21(join27(projectDir, rel), "utf8"));
+    return hasLegacyHarnessHook(readFileSync21(join28(projectDir, rel), "utf8"));
   } catch {
     return false;
   }
@@ -6297,7 +6461,7 @@ function writeUpdateSharedFiles(args) {
     excluded: adapterExcluded(harnessRoot, excluded)
   });
   const tracks = installedTracks(projectDir);
-  const settingsSource = join27(templatesDir, "settings.json");
+  const settingsSource = join28(templatesDir, "settings.json");
   if (args.claudeManaged && wants("hooks") && existsSync20(settingsSource)) {
     const spec = buildAssetSpec({ tracks, options: DEFAULT_OPTIONS });
     const manifest = buildManifest(spec);
@@ -6308,12 +6472,20 @@ function writeUpdateSharedFiles(args) {
       log,
       (script) => {
         const target = `.claude/hooks/${script}`;
-        return manifest.some((e2) => e2.target === target && e2.applies(spec)) && !isBaselineExcluded(target, excluded) && existsSync20(join27(projectDir, target));
+        return manifest.some((e2) => e2.target === target && e2.applies(spec)) && !isBaselineExcluded(target, excluded) && existsSync20(join28(projectDir, target));
       }
       // 기록이 claude 를 깔린 CLI 로 말한다 = install 이 이 파일을 썼다 — 없으면 만든다(훅 배선이 여기 산다)
     );
   }
-  if (wants("external")) writeMcpShared(writer, args.harnessMcp, log, { onlyIfRecorded: true });
+  if (wants("external")) {
+    writeMcpShared(
+      writer,
+      args.harnessMcp,
+      log,
+      { onlyIfRecorded: true },
+      { tracks, names: trackDefaultMcpNames(harnessRoot, tracks) }
+    );
+  }
   if (wants("rules")) writeGitignoreShared(writer, log);
   const ledger = writer.ledger();
   if (ledger.portionPaths.length > 0 || ledger.rootFiles.length > 0) {
@@ -6344,10 +6516,28 @@ function writeUpdateSharedFiles(args) {
     outside: ledger.outside
   };
 }
+function catalogRemovedOnRecord(log) {
+  if (log === null) return [];
+  const clis = installedClis(log);
+  const out = [];
+  for (const a of log.assets) {
+    if (!Object.hasOwn(REMOVED_CATALOG_ASSETS, a.id)) continue;
+    if (out.some((e2) => e2.id === a.id)) continue;
+    const replacedBy = REMOVED_CATALOG_ASSETS[a.id]?.replacedBy;
+    const entry = { id: a.id, method: a.method };
+    if (replacedBy !== void 0) {
+      entry.replacedBy = replacedBy;
+      const next = EXTERNAL_ASSETS.find((e2) => e2.id === replacedBy);
+      if (next !== void 0) entry.replacementReaches = assetReachesCli(next, clis);
+    }
+    out.push(entry);
+  }
+  return out;
+}
 function staleSkillDirs(projectDir, claudeDir, clis) {
   const stale = (id) => RENAMED_SKILL_IDS[id] !== void 0 || RETIRED_SKILL_IDS.includes(id);
-  const dirs = [join27(claudeDir, "skills")];
-  if (clis.some((cli) => cli !== "claude")) dirs.push(join27(projectDir, ".agents", "skills"));
+  const dirs = [join28(claudeDir, "skills")];
+  if (clis.some((cli) => cli !== "claude")) dirs.push(join28(projectDir, ".agents", "skills"));
   const ids = /* @__PURE__ */ new Set();
   for (const dir of dirs) {
     if (!existsSync20(dir)) continue;
@@ -6358,13 +6548,13 @@ function staleSkillDirs(projectDir, claudeDir, clis) {
   return [...ids];
 }
 function staleAgentFiles(claudeDir) {
-  const dir = join27(claudeDir, "agents");
+  const dir = join28(claudeDir, "agents");
   if (!existsSync20(dir)) return [];
   return readdirSync3(dir, { withFileTypes: true }).filter((e2) => e2.isFile() && e2.name.endsWith(".md")).map((e2) => basename3(e2.name, ".md")).filter((id) => RETIRED_AGENT_IDS.includes(id));
 }
 function demotedAgentFiles(claudeDir, tracks) {
   if (tracks.length === 0) return [];
-  const dir = join27(claudeDir, "agents");
+  const dir = join28(claudeDir, "agents");
   if (!existsSync20(dir)) return [];
   const demoted = TRACK_AGENTS.filter(([, pattern]) => !anyTrack(tracks, pattern)).map(
     ([id]) => id
@@ -6387,14 +6577,14 @@ function installNewAssets(projectDir, templatesDir, wants, outside) {
     if (!wants(group)) continue;
     if (entry.target === HARNESS_ANCHOR_FILE) continue;
     if (isBaselineExcluded(entry.target, baselineExcluded)) continue;
-    const target = join27(projectDir, entry.target);
+    const target = join28(projectDir, entry.target);
     const foreign = foreignOwnedTarget(projectDir, entry.target);
     if (foreign !== null) {
       if (!foreignOwned.includes(foreign)) foreignOwned.push(foreign);
       continue;
     }
     if (existsSync20(target)) continue;
-    const source = join27(templatesDir, entry.source);
+    const source = join28(templatesDir, entry.source);
     if (!existsSync20(source)) continue;
     if (outside.skip(target)) continue;
     if (entry.target.startsWith(".claude/")) {
@@ -6421,20 +6611,20 @@ function collectRunBackups(projectDir, startedAt, exclude) {
   const consider = (rel) => {
     if (!BACKUP_SUFFIX.test(rel)) return;
     if (exclude?.has(rel)) return;
-    const abs = join27(projectDir, rel);
+    const abs = join28(projectDir, rel);
     if (statSync3(abs).mtimeMs < startedAt - 1e3) return;
     out.push({ path: rel.replace(BACKUP_SUFFIX, ""), backup: rel });
   };
   for (const e2 of readdirSync3(projectDir, { withFileTypes: true }))
     if (e2.isFile()) consider(e2.name);
   for (const dir of BACKUP_SCAN_DIRS) {
-    for (const rel of listFilesRecursive(join27(projectDir, dir))) consider(`${dir}/${rel}`);
+    for (const rel of listFilesRecursive(join28(projectDir, dir))) consider(`${dir}/${rel}`);
   }
   return out.sort((a, b2) => a.path.localeCompare(b2.path));
 }
 function writeBackupList(projectDir, backups, noChecksum = /* @__PURE__ */ new Set()) {
-  const dir = join27(projectDir, ".uzys-agent-harness");
-  const file = join27(dir, "update-backups.json");
+  const dir = join28(projectDir, ".uzys-agent-harness");
+  const file = join28(dir, "update-backups.json");
   try {
     if (backups.length === 0) {
       if (existsSync20(file)) unlinkSync2(file);
@@ -6472,14 +6662,14 @@ function installNewSkillDirs(projectDir, templatesDir, tracks, outside) {
     if (entry.type !== "dir" || !entry.target.startsWith(".claude/skills/")) continue;
     if (!entry.applies(spec) || isBaselineExcluded(entry.target, excluded)) continue;
     if (skillExcluded.has(entry.target.slice(".claude/skills/".length))) continue;
-    const target = join27(projectDir, entry.target);
+    const target = join28(projectDir, entry.target);
     const foreign = foreignOwnedTarget(projectDir, entry.target);
     if (foreign !== null) {
       if (!foreignOwned.includes(foreign)) foreignOwned.push(foreign);
       continue;
     }
     if (existsSync20(target)) continue;
-    const source = join27(templatesDir, entry.source);
+    const source = join28(templatesDir, entry.source);
     if (!existsSync20(source)) continue;
     if (outside.skip(target)) continue;
     copyDir(source, target, (rel) => foreignOwnedTarget(projectDir, `${entry.target}/${rel}`));
@@ -6510,12 +6700,12 @@ function trackOnlyFileAssets(tracks) {
   );
 }
 function syncHarnessAnchor(projectDir, templatesDir, report, outside, now = /* @__PURE__ */ new Date()) {
-  if (existsSync20(join27(projectDir, LEGACY_ANCHOR_FILE2))) {
+  if (existsSync20(join28(projectDir, LEGACY_ANCHOR_FILE2))) {
     report.legacyAnchor = LEGACY_ANCHOR_FILE2;
   }
-  const templateMd = join27(templatesDir, "CLAUDE.md");
+  const templateMd = join28(templatesDir, "CLAUDE.md");
   if (!existsSync20(templateMd)) return;
-  const anchor = join27(projectDir, HARNESS_ANCHOR_FILE);
+  const anchor = join28(projectDir, HARNESS_ANCHOR_FILE);
   if (outside.skip(anchor)) return;
   const existed = existsSync20(anchor);
   if (existed) {
@@ -6541,7 +6731,7 @@ function syncHarnessAnchor(projectDir, templatesDir, report, outside, now = /* @
   recordAnchorBaseline(projectDir, anchor);
 }
 function upsertRootImport(projectDir, outside) {
-  const target = join27(projectDir, "CLAUDE.md");
+  const target = join28(projectDir, "CLAUDE.md");
   if (outside.skip(target)) return false;
   const existing = existsSync20(target) ? readFileSync21(target, "utf8") : null;
   const next = upsertHarnessImport(existing, {
@@ -6550,7 +6740,7 @@ function upsertRootImport(projectDir, outside) {
     // ADR-085 — update 는 선택 목록을 인자로 받지 않는다. `syncSkills` 와 같은 판정을 쓴다:
     // `.claude/skills/<id>` 가 있으면 그 스킬은 이 설치가 고른 것이다.
     continuousSkills: CONTINUOUS_SKILLS.map((s) => s.id).filter(
-      (id) => existsSync20(join27(projectDir, ".claude/skills", id))
+      (id) => existsSync20(join28(projectDir, ".claude/skills", id))
     )
   });
   if (next === existing) return false;
@@ -6585,7 +6775,7 @@ function excludedBaselineOnDisk(projectDir, log) {
   if (excluded.size === 0) return [];
   const spec = buildAssetSpec({ tracks: installedTracks(projectDir), options: DEFAULT_OPTIONS });
   return buildManifest(spec).filter(
-    (e2) => e2.applies(spec) && isBaselineExcluded(e2.target, excluded) && existsSync20(join27(projectDir, e2.target))
+    (e2) => e2.applies(spec) && isBaselineExcluded(e2.target, excluded) && existsSync20(join28(projectDir, e2.target))
   ).map((e2) => e2.target);
 }
 function excludedSkillOf(log) {
@@ -6612,7 +6802,7 @@ function recordedRenderInputs(projectDir, log) {
 }
 function installedBundledSkills(projectDir) {
   return INTERNAL_BUNDLED_SKILL_IDS.filter(
-    (id) => existsSync20(join27(projectDir, ".claude/skills", id)) || existsSync20(join27(projectDir, ".agents/skills", id))
+    (id) => existsSync20(join28(projectDir, ".claude/skills", id)) || existsSync20(join28(projectDir, ".agents/skills", id))
   );
 }
 function installedCliTargets(log) {
@@ -6642,9 +6832,9 @@ var SHARED_SKILLS_DIR = ".agents/skills";
 var SHARED_SKILL_FILE = /^\.agents\/skills\/([^/]+)\//;
 var SHARED_SKILL_MD = /^\.agents\/skills\/([^/]+)\/SKILL\.md$/;
 function sharedSkillIdsOnDisk(projectDir) {
-  const root = join27(projectDir, SHARED_SKILLS_DIR);
+  const root = join28(projectDir, SHARED_SKILLS_DIR);
   if (!existsSync20(root)) return /* @__PURE__ */ new Set();
-  return new Set(readdirSync3(root).filter((id) => existsSync20(join27(root, id, "SKILL.md"))));
+  return new Set(readdirSync3(root).filter((id) => existsSync20(join28(root, id, "SKILL.md"))));
 }
 var CREATED_SHARED_HOW = {
   "opencode.json": "created from template (harness part + template defaults)",
@@ -6661,18 +6851,24 @@ function agentsMdNews(report, existedBefore, priorPaths) {
   if (!created && report.agentsMdSeededFrom === null) return null;
   return { created, clis: [...report.clis], seededFrom: report.agentsMdSeededFrom };
 }
+function changedRemoteMcp(writes) {
+  const mcp = writes.find((w3) => w3.path === ".mcp.json");
+  if (mcp === void 0) return [];
+  const changed = /* @__PURE__ */ new Set([...mcp.added, ...mcp.replaced ?? []]);
+  return (mcp.remote ?? []).filter((r) => changed.has(r.name));
+}
 function refreshExternalCli(projectDir, harnessRoot, droppedKeys, harnessMcp) {
   const log = readInstallLog(projectDir);
   const presentBefore = sharedSkillIdsOnDisk(projectDir);
   const rulesBefore = /* @__PURE__ */ new Set();
-  const rulesDir = join27(projectDir, ".agents", "rules");
+  const rulesDir = join28(projectDir, ".agents", "rules");
   if (existsSync20(rulesDir)) {
     try {
       for (const f of readdirSync3(rulesDir)) rulesBefore.add(f);
     } catch {
     }
   }
-  const agentsMdBefore = existsSync20(join27(projectDir, "AGENTS.md"));
+  const agentsMdBefore = existsSync20(join28(projectDir, "AGENTS.md"));
   const result = runCliTransforms({
     harnessRoot,
     projectDir,
@@ -6814,8 +7010,8 @@ function updateDir(target, source, ext, ctx, now = /* @__PURE__ */ new Date()) {
   const backedUp = [];
   for (const file of readdirSync3(target)) {
     if (!file.endsWith(ext)) continue;
-    const targetFile = join27(target, file);
-    const sourceFile = join27(source, file);
+    const targetFile = join28(target, file);
+    const sourceFile = join28(source, file);
     if (!existsSync20(sourceFile)) continue;
     if (ctx.outside?.skip(targetFile)) continue;
     if (ctx.excluded && isBaselineExcluded(`.claude/${ctx.prefix}/${file}`, ctx.excluded)) continue;
@@ -6841,22 +7037,22 @@ function syncSkills(targetDir, sourceDir, baseline, now = /* @__PURE__ */ new Da
   const pruned = [];
   for (const skill of readdirSync3(sourceDir, { withFileTypes: true })) {
     if (!skill.isDirectory()) continue;
-    const targetSkill = join27(targetDir, skill.name);
+    const targetSkill = join28(targetDir, skill.name);
     if (occupiedByNonDirectory(targetSkill)) {
       skippedLinks.push(skill.name);
       continue;
     }
     if (!existsSync20(targetSkill)) continue;
     if (excludedSkill?.(skill.name)) continue;
-    for (const rel of listFilesRecursive(join27(sourceDir, skill.name))) {
-      const targetFile = join27(targetSkill, rel);
+    for (const rel of listFilesRecursive(join28(sourceDir, skill.name))) {
+      const targetFile = join28(targetSkill, rel);
       const foreign = foreignOf(`${skill.name}/${rel}`);
       if (foreign !== null) {
         if (!foreignOwned.includes(foreign)) foreignOwned.push(foreign);
         continue;
       }
       if (outside?.skip(targetFile)) continue;
-      const next = readFileSync21(join27(sourceDir, skill.name, rel), "utf8");
+      const next = readFileSync21(join28(sourceDir, skill.name, rel), "utf8");
       if (!existsSync20(targetFile)) {
         mkdirSync5(dirname5(targetFile), { recursive: true });
         writeFileSync7(targetFile, next);
@@ -6873,11 +7069,11 @@ function syncSkills(targetDir, sourceDir, baseline, now = /* @__PURE__ */ new Da
       writeFileSync7(targetFile, next);
       updated++;
     }
-    const bundled = new Set(listFilesRecursive(join27(sourceDir, skill.name)));
+    const bundled = new Set(listFilesRecursive(join28(sourceDir, skill.name)));
     for (const rel of listFilesRecursive(targetSkill)) {
       if (bundled.has(rel) || basename3(rel).includes(".backup-")) continue;
       if (foreignOf(`${skill.name}/${rel}`) !== null) continue;
-      const targetFile = join27(targetSkill, rel);
+      const targetFile = join28(targetSkill, rel);
       if (outside?.skip(targetFile)) continue;
       const recorded2 = baseline.get(`${skill.name}/${rel}`);
       if (recorded2 === void 0 || hashContent(readFileSync21(targetFile, "utf8")) !== recorded2) {
@@ -6944,9 +7140,9 @@ function pruneOrphans(target, source, ext, ctx, now = /* @__PURE__ */ new Date()
   const removed = [];
   for (const file of readdirSync3(target)) {
     if (!file.endsWith(ext)) continue;
-    const sourceFile = join27(source, file);
+    const sourceFile = join28(source, file);
     if (!existsSync20(sourceFile)) {
-      const targetFile = join27(target, file);
+      const targetFile = join28(target, file);
       if (!ctx.baseline.has(`${ctx.prefix}/${file}`)) continue;
       if (ctx.outside?.skip(targetFile)) continue;
       try {
@@ -6961,7 +7157,7 @@ function pruneOrphans(target, source, ext, ctx, now = /* @__PURE__ */ new Date()
   return removed;
 }
 function retireMcpAllowlist(projectDir, now = /* @__PURE__ */ new Date()) {
-  const target = join27(projectDir, ".mcp-allowlist");
+  const target = join28(projectDir, ".mcp-allowlist");
   if (!existsSync20(target)) return null;
   try {
     const backup = backupFile(target, now);
@@ -6977,8 +7173,8 @@ function refreshNeutralHelpers(projectDir, templatesDir, report) {
   for (const entry of buildManifest(spec)) {
     if (entry.type !== "file" || !isCliNeutralTarget(entry.target)) continue;
     if (!entry.applies(spec)) continue;
-    const abs = join27(projectDir, entry.target);
-    const source = join27(templatesDir, entry.source);
+    const abs = join28(projectDir, entry.target);
+    const source = join28(templatesDir, entry.source);
     if (!existsSync20(source)) continue;
     let st2;
     try {
@@ -7034,7 +7230,7 @@ function dropHealedHookPortions(projectDir, healedFiles) {
   const log = readInstallLog(projectDir);
   if (log === null) return;
   const portions = (log.portions ?? []).filter(
-    (p2) => !(p2.path === join27(".claude", "settings.json") && isHealedKey(p2.key))
+    (p2) => !(p2.path === join28(".claude", "settings.json") && isHealedKey(p2.key))
   );
   if (portions.length > 0) log.portions = portions;
   else delete log.portions;
@@ -7048,11 +7244,11 @@ function dropHealedHookPortions(projectDir, healedFiles) {
 function runInstall(ctx) {
   const { harnessRoot, projectDir } = ctx;
   const mode = ctx.mode ?? "fresh";
-  const templatesDir = join28(harnessRoot, "templates");
+  const templatesDir = join29(harnessRoot, "templates");
   if (!existsSync21(templatesDir)) {
     throw new Error(`Templates dir not found: ${templatesDir}`);
   }
-  const claudeDir = join28(projectDir, ".claude");
+  const claudeDir = join29(projectDir, ".claude");
   const previousLog = readInstallLog(projectDir);
   const legacyAnchor = mode === "update" ? null : legacyAnchorTrace(projectDir, ctx.spec);
   if (mode === "update" && previousLog === null) {
@@ -7081,7 +7277,7 @@ function runInstall(ctx) {
   const manifestSpec = buildManifestSpec(spec);
   const baselineExcluded = new Set(spec.baselineExclude ?? []);
   if (spec.cli.includes("claude")) {
-    const settingsPath = join28(projectDir, ".claude", "settings.json");
+    const settingsPath = join29(projectDir, ".claude", "settings.json");
     if (existsSync21(settingsPath)) {
       try {
         JSON.parse(readFileSync22(settingsPath, "utf8"));
@@ -7140,8 +7336,11 @@ function runInstallStages(ctx, args) {
     installCliNeutralAssets(manifestSpec, templatesDir, baselineExcluded, writer)
   );
   stage.rootImportWritten = base.rootImportWritten;
-  const harnessMcp = renderHarnessMcp(harnessRoot, { spec, excluded, previousLog });
-  const mcp = writeMcpPortion(writer, harnessMcp, previousLog);
+  const harnessMcp = renderHarnessMcp(harnessRoot, { spec, excluded, previousLog, projectDir });
+  const mcp = writeMcpPortion(writer, harnessMcp, previousLog, {
+    tracks: spec.tracks,
+    names: trackDefaultMcpNames(harnessRoot, spec.tracks)
+  });
   const ciScaffold = isAssetSelected("ci-scaffold", {
     tracks: spec.tracks,
     options: spec.options,
@@ -7358,7 +7557,7 @@ function releasedThisRun(args) {
     }
     if (id.startsWith(BASELINE_PREFIX)) {
       const again2 = manifest.some(
-        (e2) => e2.applies(manifestSpec) && classifyBaselineTarget(e2.target)?.id === id && existsSync21(join28(projectDir, e2.target))
+        (e2) => e2.applies(manifestSpec) && classifyBaselineTarget(e2.target)?.id === id && existsSync21(join29(projectDir, e2.target))
       );
       return { id, again: again2, tail: "the harness manages it again" };
     }
@@ -7367,7 +7566,7 @@ function releasedThisRun(args) {
       options: spec.options,
       ...spec.userOverride ? { userOverride: spec.userOverride } : {}
     });
-    const recorded2 = (previousLog?.assets.some((a) => a.id === id) ?? false) || [".claude/skills", ".agents/skills"].some((d2) => existsSync21(join28(projectDir, d2, id)));
+    const recorded2 = (previousLog?.assets.some((a) => a.id === id) ?? false) || [".claude/skills", ".agents/skills"].some((d2) => existsSync21(join29(projectDir, d2, id)));
     return {
       id,
       again,
@@ -7379,10 +7578,10 @@ function pendingKeyExcludes(projectDir, keyExclude, touched) {
   const done = new Set(touched);
   return keyExclude.flatMap((id) => {
     const path = sharedPathOfKeyId(id);
-    if (path === null || done.has(path) || !existsSync21(join28(projectDir, path))) return [];
+    if (path === null || done.has(path) || !existsSync21(join29(projectDir, path))) return [];
     const name = adapterFor(path);
     const keys = [...excludedKeys(path, [id])];
-    const present2 = name === null ? null : ADAPTERS[name].read(readFileSync22(join28(projectDir, path), "utf8"), keys, projectDir);
+    const present2 = name === null ? null : ADAPTERS[name].read(readFileSync22(join29(projectDir, path), "utf8"), keys, projectDir);
     return present2 !== null && present2.size === 0 ? [] : [{ id, path }];
   });
 }
@@ -7426,7 +7625,7 @@ function installCliNeutralAssets(manifestSpec, templatesDir, baselineExcluded, w
       continue;
     }
     if (!isCliNeutralTarget(entry.target)) continue;
-    const source = join28(templatesDir, entry.source);
+    const source = join29(templatesDir, entry.source);
     if (!existsSync21(source)) {
       result.skipped += 1;
       continue;
@@ -7447,13 +7646,13 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
     if (!entry.applies(manifestSpec)) {
       continue;
     }
-    const target = join28(projectDir, entry.target);
+    const target = join29(projectDir, entry.target);
     if (isBaselineExcluded(entry.target, baselineExcluded)) {
       result.excluded.push(entry.target);
       if (existsSync21(target)) result.excludedOnDisk.push(entry.target);
       continue;
     }
-    const source = join28(templatesDir, entry.source);
+    const source = join29(templatesDir, entry.source);
     if (!existsSync21(source)) {
       result.skipped += 1;
       continue;
@@ -7484,18 +7683,18 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
           if (!result.foreignOwned.includes(slot)) result.foreignOwned.push(slot);
           continue;
         }
-        if (writer.skipOutside(join28(projectDir, entry.target, rel))) {
+        if (writer.skipOutside(join29(projectDir, entry.target, rel))) {
           leftOutside += 1;
           continue;
         }
-        writer.harness(`${entry.target}/${rel}`, { source: join28(source, rel) });
+        writer.harness(`${entry.target}/${rel}`, { source: join29(source, rel) });
       }
       if (leftOutside > 0) continue;
       result.dirsCopied += 1;
     }
     accumulateCategory(result.categories, entry);
   }
-  const hookDir = join28(projectDir, ".claude/hooks");
+  const hookDir = join29(projectDir, ".claude/hooks");
   if (existsSync21(hookDir)) {
     chmodHooksSync(hookDir, projectDir);
   }
@@ -7512,12 +7711,12 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
   if (settingsSource !== null) {
     writeSettingsPortion(writer, settingsSource, projectDir, previousLog, (script) => {
       const target = `${HOOKS_PREFIX}${script}`;
-      return manifest.some((e2) => e2.target === target && e2.applies(manifestSpec)) && !isBaselineExcluded(target, baselineExcluded) && existsSync21(join28(projectDir, target));
+      return manifest.some((e2) => e2.target === target && e2.applies(manifestSpec)) && !isBaselineExcluded(target, baselineExcluded) && existsSync21(join29(projectDir, target));
     });
     result.keptHookRefs.push(
       ...findStaleHookRefs(
-        join28(projectDir, ".claude", "settings.json"),
-        join28(projectDir, ".claude")
+        join29(projectDir, ".claude", "settings.json"),
+        join29(projectDir, ".claude")
       )
     );
   }
@@ -7527,7 +7726,7 @@ function installClaudeBaseline(manifestSpec, projectDir, templatesDir, baselineE
     // ADR-085 · update(`upsertRootImport`)와 같은 판정 — 실제로 깔린 스킬만 안내한다. 밖 링크라 쓰지 않은
     // 스킬(ADR-098)을 "installed" 라 적으면 다음 update 가 그 절을 걷어 내 두 동작이 서로 반대로 쓴다.
     (manifestSpec.selectedInternalSkills ?? []).filter(
-      (id) => existsSync21(join28(projectDir, ".claude", "skills", id))
+      (id) => existsSync21(join29(projectDir, ".claude", "skills", id))
     ),
     harnessRoot,
     writer
@@ -7549,8 +7748,8 @@ function writeSettingsPortion(writer, source, projectDir, previousLog, hookInsta
     hookInstalled
   );
 }
-function writeMcpPortion(writer, harnessMcp, previousLog) {
-  return [...writeMcpShared(writer, harnessMcp, previousLog).harness].sort();
+function writeMcpPortion(writer, harnessMcp, previousLog, defaults) {
+  return [...writeMcpShared(writer, harnessMcp, previousLog, {}, defaults).harness].sort();
 }
 function installedTracksText(tracks) {
   return `${[...new Set(tracks)].sort().join("\n")}
@@ -7799,7 +7998,7 @@ function accumulateCategory(cats, entry) {
   }
 }
 function writeRootClaudeMd(projectDir, tracks, continuousSkills, harnessRoot, writer) {
-  const target = join28(projectDir, "CLAUDE.md");
+  const target = join29(projectDir, "CLAUDE.md");
   if (writer.skipOutside(target)) return null;
   const existing = existsSync21(target) ? readFileSync22(target, "utf-8") : null;
   const seeded = existing === null ? seedRootClaudeProjectContext(projectDir, harnessRoot) : null;
@@ -7836,7 +8035,7 @@ function listHookFiles(hookDir) {
 init_esm_shims();
 import { homedir as homedir3 } from "os";
 import { existsSync as existsSync23, readdirSync as readdirSync5, readFileSync as readFileSync24 } from "fs";
-import { join as join30, relative as relative4 } from "path";
+import { join as join31, relative as relative4 } from "path";
 
 // src/preset-recommend.ts
 init_esm_shims();
@@ -7873,9 +8072,9 @@ function groupAssetsByCategory(assetIds) {
 // src/resident-entries.ts
 init_esm_shims();
 import { existsSync as existsSync22, readFileSync as readFileSync23 } from "fs";
-import { basename as basename5, join as join29 } from "path";
+import { basename as basename5, join as join30 } from "path";
 function residentEntries(spec) {
-  const skillThere = (id) => INTERNAL_BUNDLED_SKILL_IDS.includes(id) && [".claude/skills", ".agents/skills"].some((d2) => existsSync22(join29(spec.projectDir, d2, id)));
+  const skillThere = (id) => INTERNAL_BUNDLED_SKILL_IDS.includes(id) && [".claude/skills", ".agents/skills"].some((d2) => existsSync22(join30(spec.projectDir, d2, id)));
   const forceExclude = (spec.userOverride?.forceExclude ?? []).filter((id) => !skillThere(id));
   const assetSpec = buildManifestSpec(
     spec.userOverride ? { ...spec, userOverride: { ...spec.userOverride, forceExclude } } : spec
@@ -7901,7 +8100,7 @@ function residentEntries(spec) {
 function residentCostFor(spec, entries = residentEntries(spec), contextFiles) {
   if (contextFiles !== void 0) return residentCost(entries, void 0, spec.cli, contextFiles);
   const cost = residentCost(entries, void 0, spec.cli, plannedClaudeContext(spec));
-  if (anchorSurface(spec.cli).scaffold === "agents-md" && existsSync22(join29(spec.projectDir, "AGENTS.md"))) {
+  if (anchorSurface(spec.cli).scaffold === "agents-md" && existsSync22(join30(spec.projectDir, "AGENTS.md"))) {
     return makeResidentCost({
       ...cost,
       contextNote: "planned, not counting text already in AGENTS.md"
@@ -7912,7 +8111,7 @@ function residentCostFor(spec, entries = residentEntries(spec), contextFiles) {
 function plannedClaudeContext(spec) {
   if (!spec.cli.includes("claude")) return void 0;
   const root = resolveBundleRoot();
-  const rootClaude = join29(spec.projectDir, "CLAUDE.md");
+  const rootClaude = join30(spec.projectDir, "CLAUDE.md");
   const existing = existsSync22(rootClaude) ? readFileSync23(rootClaude, "utf-8") : null;
   const seeded = existing === null ? seedRootClaudeProjectContext(spec.projectDir, root) : null;
   if (existing === null && seeded === null) return void 0;
@@ -7923,14 +8122,14 @@ function plannedClaudeContext(spec) {
     continuousSkills: manifestSpec.selectedInternalSkills ?? [],
     ...seeded === null ? {} : { projectContext: seeded }
   });
-  return [join29(root, "templates", "CLAUDE.md"), { text }];
+  return [join30(root, "templates", "CLAUDE.md"), { text }];
 }
 function onDiskTargets(spec, assetSpec) {
   const out = /* @__PURE__ */ new Set();
   for (const e2 of buildManifest(assetSpec)) {
     if (!e2.applies(assetSpec)) continue;
     const t = classifyBaselineTarget(e2.target);
-    if (t !== null && existsSync22(join29(spec.projectDir, e2.target))) out.add(t.id);
+    if (t !== null && existsSync22(join30(spec.projectDir, e2.target))) out.add(t.id);
   }
   return out;
 }
@@ -8052,6 +8251,11 @@ function renderUpdateSummary(log, spec, report) {
     summarizeContextCost(finalSelectedAssets(spec.tracks, spec.userOverride)).unmeasuredCount
   );
   if (cost) log(infoRow("CONTEXT", cost));
+  const remote = report.updateMode?.remoteMcp;
+  const remoteLines = remote === void 0 ? [] : remoteMcpNextLines(remote.servers, remote.clis);
+  remoteLines.forEach((line, i) => {
+    log(i === 0 ? infoRow("NEXT", line) : `${" ".repeat(16)} ${line}`);
+  });
   const backups = report.updateMode?.backups ?? [];
   if (backups.length > 0) {
     const unmeasured = report.updateMode?.noChecksum?.length ?? 0;
@@ -8079,23 +8283,23 @@ function residentEntriesOnDisk(spec) {
   const hasClaude = spec.cli.includes("claude");
   const surface = anchorSurface(spec.cli).scaffold;
   const mdFiles = (dir, kind, skip) => {
-    const abs = join30(spec.projectDir, dir);
+    const abs = join31(spec.projectDir, dir);
     return existsSync23(abs) ? readdirSync5(abs, { withFileTypes: true }).filter((e2) => e2.isFile() && e2.name.endsWith(".md") && e2.name !== skip).map((e2) => ({
       source: `${kind}/${e2.name}`,
       // `target` 은 `residentCost` 의 분류 키다 — 실제 자리는 `file` 이 말한다.
       target: `.claude/${kind}/${e2.name}`,
       // 배포판이 아니라 **이 프로젝트의 파일**을 잰다 — 사용자가 고친 본문도,
       // 배포판에 더는 없는 파일도 실제로 상주하는 것은 이쪽이다.
-      file: join30(abs, e2.name)
+      file: join31(abs, e2.name)
     })) : [];
   };
-  const rules = surface === "claude" ? mdFiles(join30(".claude", "rules"), "rules") : rulesInline(spec.cli) ? planned.filter((e2) => e2.target.startsWith(".claude/rules/")) : mdFiles(join30(".agents", "rules"), "rules", "uzys-harness.md");
-  const slot = hasClaude ? join30(".claude", "skills") : join30(".agents", "skills");
+  const rules = surface === "claude" ? mdFiles(join31(".claude", "rules"), "rules") : rulesInline(spec.cli) ? planned.filter((e2) => e2.target.startsWith(".claude/rules/")) : mdFiles(join31(".agents", "rules"), "rules", "uzys-harness.md");
+  const slot = hasClaude ? join31(".claude", "skills") : join31(".agents", "skills");
   const skills = planned.filter((e2) => e2.target.startsWith(".claude/skills/")).map((e2) => ({
     ...e2,
-    file: join30(spec.projectDir, slot, e2.target.slice(".claude/skills/".length))
+    file: join31(spec.projectDir, slot, e2.target.slice(".claude/skills/".length))
   })).filter((e2) => existsSync23(e2.file));
-  const agents = hasClaude ? mdFiles(join30(".claude", "agents"), "agents") : [];
+  const agents = hasClaude ? mdFiles(join31(".claude", "agents"), "agents") : [];
   return [
     ...planned.filter(
       (e2) => !e2.target.startsWith(".claude/rules/") && !e2.target.startsWith(".claude/agents/") && !e2.target.startsWith(".claude/skills/")
@@ -8107,8 +8311,8 @@ function residentEntriesOnDisk(spec) {
 }
 function contextFilesOnDisk(spec) {
   const surface = anchorSurface(spec.cli).scaffold;
-  const files = surface === "claude" ? [HARNESS_ANCHOR_FILE, "CLAUDE.md", join30(".claude", "CLAUDE.md")] : ["AGENTS.md"];
-  return files.map((f) => join30(spec.projectDir, f));
+  const files = surface === "claude" ? [HARNESS_ANCHOR_FILE, "CLAUDE.md", join31(".claude", "CLAUDE.md")] : ["AGENTS.md"];
+  return files.map((f) => join31(spec.projectDir, f));
 }
 function rulesInsideAgentsMd(spec, cost) {
   if (anchorSurface(spec.cli).scaffold !== "agents-md" || !rulesInline(spec.cli)) return cost;
@@ -8362,8 +8566,8 @@ function renderFinalSummary(log, spec, report, fromWizard) {
   const codexTrusted = report.codexOptIn?.trustEntry.status === "registered" || report.codexOptIn?.trustEntry.status === "already-present";
   const alreadyTrustedGlobally = (() => {
     try {
-      const home = process.env.CODEX_HOME ?? join30(homedir3(), ".codex");
-      const configPath = join30(home, "config.toml");
+      const home = process.env.CODEX_HOME ?? join31(homedir3(), ".codex");
+      const configPath = join31(home, "config.toml");
       if (!existsSync23(configPath)) return false;
       return hasTrustEntry(readFileSync24(configPath, "utf8"), spec.projectDir);
     } catch {
@@ -8387,8 +8591,10 @@ function renderFinalSummary(log, spec, report, fromWizard) {
       `${" ".repeat(16)} ${c.bold("Codex")} also runs the harness session-start hook only after you review it: at first launch it warns that hooks need review \u2014 open ${c.bold("/hooks")} and trust it. The harness does not approve it for you.`
     );
   }
+  const remote = (report.shared ?? []).find((f) => f.path === ".mcp.json")?.remote ?? [];
+  for (const line of remoteMcpNextLines(remote, spec.cli)) log(`${" ".repeat(16)} ${line}`);
   const scaffoldFiles = scaffoldFilesForCli(spec.cli).filter(
-    (f) => f === "CLAUDE.md" && report.rootClaudeMd?.created === true || hasFillPrompt(join30(spec.projectDir, f))
+    (f) => f === "CLAUDE.md" && report.rootClaudeMd?.created === true || hasFillPrompt(join31(spec.projectDir, f))
   );
   if (scaffoldFiles.length > 0) {
     const auditInstalled = buildManifestSpec(spec).selectedInternalSkills?.includes("audit-harness-fit");
@@ -8734,6 +8940,7 @@ function renderPhase1Rows(log, baseline, verbose = false) {
       const meta = failed.length === 1 ? `${head.id}: ${head.message}` : `${failed.map((f) => f.id).join(", ")} (${failed.length}\uAC74) \xB7 \uC608: ${head.message}`;
       log(assetRow("skip", "external skills", `${meta} \xB7 \uB2E4\uC74C update \uC5D0\uC11C \uB2E4\uC2DC \uC2DC\uB3C4\uD55C\uB2E4`));
     }
+    for (const row of catalogRemovedRows(baseline.updateMode.catalogRemoved ?? [])) log(row);
     if (baseline.updateMode.externalSkillsNotInCatalog.length > 0) {
       const ids = baseline.updateMode.externalSkillsNotInCatalog;
       for (const id of ids) {
@@ -8979,6 +9186,7 @@ function sharedFileRow(f) {
   if (f.verdict === "leave+advise") return `  ${c.yellow(symbol.skip)} left  ${f.path} \u2014 ${f.line}`;
   const parts = [f.line];
   if (f.added.length > 0) parts.push(`added: ${f.added.join(", ")}`);
+  if (f.path === ".mcp.json") parts.push(...mcpChangeParts(f));
   if (f.kept.length > 0) parts.push(`kept yours: ${f.kept.join(", ")}`);
   if (f.restored.length > 0) parts.push(restoredKeysPart(f.restored));
   parts.push(...excludedKeyParts(f));
@@ -8989,6 +9197,47 @@ ${assetRow("success", f.path, GITIGNORE_RECORD_DIR_NOTE, 28)}`;
   }
   return row;
 }
+function mcpChangeParts(f) {
+  const why = (name) => f.notes?.[name];
+  const parts = [];
+  const replaced = f.replaced ?? [];
+  if (replaced.length > 0) {
+    parts.push(
+      `updated: ${replaced.map((n) => why(n) === void 0 ? n : `${n} (${why(n)})`).join(", ")}`
+    );
+  }
+  for (const n of f.retired ?? []) {
+    parts.push(why(n) === void 0 ? `retired: ${n}` : `retired: ${n} \u2014 ${why(n)}`);
+  }
+  return parts;
+}
+function remoteMcpNextLines(servers, clis) {
+  const reads = clis.filter((c3) => c3 === "claude" || c3 === "codex" || c3 === "opencode");
+  if (servers.length === 0 || reads.length === 0) return [];
+  const oauth = servers.filter((s) => s.bearerEnv === void 0).map((s) => s.name);
+  const lines2 = [];
+  const one = oauth[0];
+  if (one !== void 0) {
+    lines2.push(`Remote MCP servers sign in on first use \u2014 ${oauth.join(" \xB7 ")}`);
+    if (reads.includes("claude"))
+      lines2.push(
+        `  Claude Code: approve the project's .mcp.json servers when asked, then /mcp \u2192 Authenticate (or: claude mcp login ${one})`
+      );
+    if (reads.includes("codex"))
+      lines2.push(
+        `  Codex: ${oauth.map((n) => `codex mcp login ${n}`).join(" \xB7 ")} (after trusting this folder)`
+      );
+    if (reads.includes("opencode"))
+      lines2.push(`  OpenCode: opens the browser by itself (or: opencode mcp auth ${one})`);
+  }
+  for (const s of servers) {
+    if (s.bearerEnv === void 0) continue;
+    lines2.push(
+      `${s.name} needs ${s.bearerEnv} in the shell you start the CLI from \u2014 a GitHub personal access token (fine-grained: https://github.com/settings/personal-access-tokens/new). The harness writes only the variable name, never the token`
+    );
+  }
+  return lines2;
+}
 var GITIGNORE_RECORD_DIR_LINE = ".uzys-agent-harness/";
 var GITIGNORE_RECORD_DIR_NOTE = "now ignores only the harness's runtime files \u2014 commit .uzys-agent-harness/ so teammates get the install record";
 function excludedKeyParts(f) {
@@ -9009,6 +9258,27 @@ function excludedKeyParts(f) {
   }
   return parts;
 }
+function catalogRemovedRows(items) {
+  return items.map((e2) => {
+    const parts = [
+      e2.replacedBy === void 0 ? "\uCE74\uD0C8\uB85C\uADF8\uC5D0\uC11C \uBE60\uC84C\uB2E4" : `${e2.replacedBy} \uB85C \uBC14\uB00C\uC5C8\uB2E4`,
+      e2.method === "skill" ? "\uAE50 \uAC83\uC740 \uADF8\uB300\uB85C \uB0A8\uACE0 update \uAC00 \uB354\uB294 \uAC31\uC2E0\uD558\uC9C0 \uC54A\uB294\uB2E4" : "\uAE50 \uAC83\uC740 \uADF8\uB300\uB85C \uB0A8\uB294\uB2E4"
+    ];
+    if (e2.replacedBy !== void 0) {
+      if (e2.replacementReaches === false) {
+        const next = EXTERNAL_ASSETS.find((a) => a.id === e2.replacedBy);
+        const only = next ? assetCliSupport(next).map((cli) => CLI_DISPLAY_NAMES[cli]).join(" \xB7 ") : "\uB2E4\uB978 CLI";
+        parts.push(`${e2.replacedBy} \uB294 ${only} \uC804\uC6A9\uC774\uB77C \uC774 \uC124\uCE58\uBCF8\uC758 CLI \uC5D0\uB294 \uAE54\uB9AC\uC9C0 \uC54A\uB294\uB2E4`);
+      } else {
+        parts.push(`\uC0C8 \uAC83\uC740 agent-harness install --with ${e2.replacedBy}`);
+      }
+      parts.push(`\uC61B \uAC83\uC744 \uCE58\uC6B0\uB824\uBA74 agent-harness uninstall --only ${e2.id}`);
+    } else {
+      parts.push(`\uCE58\uC6B0\uB824\uBA74 agent-harness uninstall --only ${e2.id}`);
+    }
+    return assetRow("skip", e2.id, parts.join(" \xB7 "));
+  });
+}
 function excludedStillThereRows(items) {
   return items.map(
     (e2) => e2.catalog ? `  ${c.yellow(symbol.skip)} ${e2.id} \u2014 excluded, so the harness no longer updates it (still installed). To manage it again: run install (without --without ${e2.id}; add --with ${e2.id} if it is opt-in) \xB7 remove it: agent-harness uninstall --only ${e2.id}` : `  ${c.yellow(symbol.skip)} ${e2.id} \u2014 excluded (still on disk \u2014 an earlier install put it there; the harness does not delete it. Remove the file yourself, or run uninstall) \xB7 to manage it again: run install without --without ${e2.id}`
@@ -9347,7 +9617,7 @@ function executeSpec(requested, deps = {}) {
     return;
   }
   if (deps.mode === "update" && report.backup !== null) {
-    const liveClaude = join31(spec.projectDir, ".claude");
+    const liveClaude = join32(spec.projectDir, ".claude");
     if (dirTreesIdentical(liveClaude, report.backup)) {
       try {
         rmSync4(report.backup, { recursive: true, force: true });
@@ -9435,7 +9705,7 @@ function registerInstallCommand(cli) {
 // src/commands/list.ts
 init_esm_shims();
 import { existsSync as existsSync24, readFileSync as readFileSync25 } from "fs";
-import { join as join32, resolve as resolve3 } from "path";
+import { join as join33, resolve as resolve3 } from "path";
 function listAction(options = {}, deps = {}) {
   const log = deps.log ?? console.log;
   const err = deps.err ?? console.error;
@@ -9538,7 +9808,7 @@ function formatHarnessFileRows(log, projectDir) {
   const rows = [`    ${c.dim(tops.length > 0 ? tops.join("  ") : "(none recorded)")}`];
   const rootMd = log.templates.rootClaudeMd;
   if (rootMd) {
-    const path = join32(projectDir, rootMd.path);
+    const path = join33(projectDir, rootMd.path);
     const modified = existsSync24(path) && hashContent(readFileSync25(path, "utf8")) !== rootMd.sha256;
     rows.push(
       modified ? `    ${c.dim(rootMd.path)}  ${c.yellow("(\uC218\uC815\uB428 \u2014 uninstall \uC2DC \uBCF4\uC874)")}` : `    ${c.dim(rootMd.path)}`
@@ -9553,7 +9823,7 @@ var ROOT_FILE_CHANGE = {
   displaced: "\uBE44\uCF1C \uB460"
 };
 function formatRootFileRows(rootFiles, projectDir) {
-  const present2 = rootFiles.filter((f) => existsSync24(join32(projectDir, f.path)));
+  const present2 = rootFiles.filter((f) => existsSync24(join33(projectDir, f.path)));
   const width = Math.max(0, ...present2.map((f) => f.path.length));
   return present2.map(
     (f) => `    ${c.dim(padDisplay(f.path, width))}  ${c.dim(ROOT_FILE_CHANGE[f.change])}  ${c.dim(f.notes.join(" / "))}`
@@ -9583,7 +9853,7 @@ import {
   statSync as statSync4,
   writeFileSync as writeFileSync9
 } from "fs";
-import { dirname as dirname6, join as join33, relative as relative5, resolve as resolve4, sep as sep5 } from "path";
+import { dirname as dirname6, join as join34, relative as relative5, resolve as resolve4, sep as sep5 } from "path";
 
 // src/uninstall-interactive.ts
 init_esm_shims();
@@ -10746,7 +11016,11 @@ function buildPageGroups(cats, initialSet, installedSet = /* @__PURE__ */ new Se
     );
     for (const a of catAssets) {
       const tier = assetTrustTier(a.id);
-      const badge = tier === "official" ? "  \u2605 official" : tier === "experimental" ? "  \u26A0 experimental (opt-in)" : "";
+      const badge = tier === "official" ? "  \u2605 official" : tier === "experimental" ? (
+        // #713 — 트랙 기본으로 체크된 experimental(트랙 표의 railway 행)을 "opt-in" 이라 부르면 화면이 체크 상태와 어긋난다.
+        //   이미 깔린 것은 `● installed` 가 말하므로 여기서는 이번 트랙의 기본만 가른다.
+        initialSet.has(`asset:${a.id}`) && !installedSet.has(`asset:${a.id}`) ? "  \u26A0 experimental (default on your tracks)" : "  \u26A0 experimental (opt-in)"
+      ) : "";
       items.push({
         value: `asset:${a.id}`,
         label: `    ${a.id}  [${a.source}]${badge}${installedMark(`asset:${a.id}`)}`,
@@ -11199,7 +11473,7 @@ Proceed?`, initialValue: false });
 
 // src/commands/uninstall.ts
 function templateDirPath(projectDir, rel) {
-  return join33(projectDir, rel.replace(/\/+$/, ""));
+  return join34(projectDir, rel.replace(/\/+$/, ""));
 }
 function outsideTemplateLink(projectDir, rel) {
   return outsideLinkAt(projectDir, rel.replace(/\/+$/, ""));
@@ -11422,7 +11696,7 @@ function unwritablePaths(ctx) {
   const project = ctx.targetAssets.filter((a) => a.scope === "project");
   if (project.some((a) => a.method === "npm")) need.add(".");
   const parentOf = (path) => {
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     if (!safeExists(abs)) return;
     const real = safeRealpath(abs);
     if (real !== null && isOutsideProject(projectDir, real)) return;
@@ -11433,7 +11707,7 @@ function unwritablePaths(ctx) {
   if (!ctx.keepTemplates) {
     const recordedShared = new Set((installLog.portions ?? []).map((p2) => p2.path));
     for (const p2 of ctx.sharedPaths) {
-      if (recordedShared.has(p2) && existsSync25(join33(projectDir, p2))) need.add(p2);
+      if (recordedShared.has(p2) && existsSync25(join34(projectDir, p2))) need.add(p2);
     }
     for (const f of installLog.externalFiles ?? []) {
       if (!underAny(f.path, ctx.movedDirs)) parentOf(f.path);
@@ -11442,7 +11716,7 @@ function unwritablePaths(ctx) {
   }
   return [...need].filter((p2) => {
     try {
-      accessSync(join33(projectDir, p2), fsConstants.W_OK);
+      accessSync(join34(projectDir, p2), fsConstants.W_OK);
       return false;
     } catch (e2) {
       return e2.code !== "ENOENT";
@@ -11526,7 +11800,7 @@ function settleLog(ctx, io) {
       return true;
     }
   } else {
-    io.rm(join33(projectDir, INSTALL_LOG_DIR));
+    io.rm(join34(projectDir, INSTALL_LOG_DIR));
     if (outsideTemplateLink(projectDir, LEGACY_INSTALL_LOG_DIR) === null) {
       io.rm(legacyInstallLogPath(projectDir));
     }
@@ -11552,7 +11826,7 @@ function dryRunLines(plan, installLog, projectDir, keepTemplates, rootFiles, har
     for (const rel of dirs) {
       const kept = outsideTemplateLink(projectDir, rel);
       if (kept) lines2.push(keptOutsideLinkLine(kept, installLog));
-      else if (existsSync25(join33(projectDir, rel))) lines2.push(MOVE_ASIDE_PREVIEW(rel));
+      else if (existsSync25(join34(projectDir, rel))) lines2.push(MOVE_ASIDE_PREVIEW(rel));
     }
     if (dirs.length === 0) lines2.push("  \u25CB remove templates: (none)");
     const rootMd = installLog.templates.rootClaudeMd;
@@ -11610,7 +11884,7 @@ function backupArtifactAdvisoryLines(projectDir) {
       found.push(e2.name);
     }
   }
-  const agents = join33(projectDir, ".agents");
+  const agents = join34(projectDir, ".agents");
   if (existsSync25(agents)) {
     for (const rel of listFilesRecursive(agents)) {
       if (stampRe.test(rel)) found.push(`.agents/${rel}`);
@@ -11626,11 +11900,11 @@ function backupArtifactAdvisoryLines(projectDir) {
 }
 function rootFileAdvisoryLines(rootFiles, projectDir, keepTemplates = false) {
   const header = keepTemplates ? "[LEFT] uninstall \uD6C4 \uB0A8\uB294 \uAC83 \u2014 templates \uBCF4\uC874(.claude/ \uB4F1) + \uB8E8\uD2B8 \uD30C\uC77C (\uC790\uB3D9\uC73C\uB85C \uC9C0\uC6B0\uC9C0 \uC54A\uB294\uB2E4):" : "[ROOT] `.claude/` \uBC16\uC5D0 \uB0A8\uB294 \uAC83 (\uC790\uB3D9\uC73C\uB85C \uC9C0\uC6B0\uC9C0 \uC54A\uB294\uB2E4):";
-  const present2 = rootFiles.filter((f) => existsSync25(join33(projectDir, f.path)));
+  const present2 = rootFiles.filter((f) => existsSync25(join34(projectDir, f.path)));
   if (present2.length === 0) return [];
   const outside = /* @__PURE__ */ new Map();
   const inside = present2.filter((f) => {
-    const o = outsideProjectTarget(projectDir, join33(projectDir, f.path));
+    const o = outsideProjectTarget(projectDir, join34(projectDir, f.path));
     if (o === null) return true;
     const group = outside.get(o.link) ?? { link: o, files: [] };
     group.files.push(f.path);
@@ -11669,7 +11943,7 @@ function rootFileMeaning(f, projectDir) {
     case "displaced": {
       const backup = f.notes[0];
       if (backup === void 0) return "\uD558\uB124\uC2A4 \uD310\uACFC \uAC19\uC740 \uC124\uCE58\uC790 \uD30C\uC77C\uC774 \uC788\uB358 \uC790\uB9AC (\uADF8\uB300\uB85C \uB450\uC5C8\uB2E4)";
-      return existsSync25(join33(projectDir, backup)) ? `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC740 ${backup} \uC5D0 \uC788\uB2E4` : `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC758 \uBC31\uC5C5(${backup})\uC774 \uB354\uB294 \uC5C6\uB2E4`;
+      return existsSync25(join34(projectDir, backup)) ? `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC740 ${backup} \uC5D0 \uC788\uB2E4` : `\uD558\uB124\uC2A4\uAC00 \uC4F4 \uC790\uB9AC \u2014 \uC6D0\uB798 \uC788\uB358 \uC124\uCE58\uC790 \uD30C\uC77C\uC758 \uBC31\uC5C5(${backup})\uC774 \uB354\uB294 \uC5C6\uB2E4`;
     }
   }
 }
@@ -11748,7 +12022,7 @@ function removeCliDryRunLines(plan, ctx, remaining) {
   for (const dir of plan.dirs) {
     const kept = outsideTemplateLink(projectDir, dir);
     if (kept) lines2.push(keptOutsideLinkLine(kept, installLog));
-    else if (existsSync25(join33(projectDir, dir))) lines2.push(MOVE_ASIDE_PREVIEW(dir));
+    else if (existsSync25(join34(projectDir, dir))) lines2.push(MOVE_ASIDE_PREVIEW(dir));
   }
   lines2.push(...previewExternalLines(plan.scoped, projectDir, harnessRoot));
   lines2.push(
@@ -11758,7 +12032,7 @@ function removeCliDryRunLines(plan, ctx, remaining) {
     )
   );
   const rootMd = plan.anchor ? installLog.templates.rootClaudeMd : void 0;
-  if (rootMd && existsSync25(join33(projectDir, rootMd.path))) {
+  if (rootMd && existsSync25(join34(projectDir, rootMd.path))) {
     lines2.push(
       rootClaudeMdModified(installLog, projectDir) ? `  \u25CB keep ${rootMd.path} (modified since install \u2014 preserved)` : `  \u25CB remove ${rootMd.path}`
     );
@@ -11781,7 +12055,7 @@ function agentsMdRerenderSet(target, remaining, log, projectDir) {
   const set = agentsMdClis(remaining);
   if (set.length === 0) return null;
   const recorded2 = (log.externalFiles ?? []).some((f) => f.path === AGENTS_MD2) || (log.portions ?? []).some((p2) => p2.path === AGENTS_MD2);
-  if (!recorded2 || !existsSync25(join33(projectDir, AGENTS_MD2))) return null;
+  if (!recorded2 || !existsSync25(join34(projectDir, AGENTS_MD2))) return null;
   return set;
 }
 function rerenderAgentsMd(ctx, set) {
@@ -11825,14 +12099,14 @@ function rerenderLines(r) {
 function removeHarnessAnchor(ctx, io) {
   const { installLog, projectDir } = ctx;
   const rootMd = installLog.templates.rootClaudeMd;
-  if (!rootMd || !existsSync25(join33(projectDir, rootMd.path))) return false;
+  if (!rootMd || !existsSync25(join34(projectDir, rootMd.path))) return false;
   if (rootClaudeMdModified(installLog, projectDir)) {
     io.log(
       `  ${c.yellow("\u2298")} ${rootMd.path} kept \u2014 modified since install. Remove manually if intended.`
     );
     return false;
   }
-  io.rm(join33(projectDir, rootMd.path));
+  io.rm(join34(projectDir, rootMd.path));
   io.log(`  ${status.success(`${rootMd.path} removed`)}`);
   return true;
 }
@@ -11890,7 +12164,7 @@ function removeCliAction(ctx, io) {
       io.log(keptOutsideLinkLine(kept, installLog));
       continue;
     }
-    if (!existsSync25(join33(projectDir, dir))) continue;
+    if (!existsSync25(join34(projectDir, dir))) continue;
     const backup = io.moveAside(templateDirPath(projectDir, dir));
     if (backup) io.log(movedAsideLine(projectDir, dir, backup));
   }
@@ -11931,7 +12205,7 @@ var SKILLS_LOCK = "skills-lock.json";
 function withSkillsLock(rootFiles, assets, projectDir) {
   const out = [...rootFiles];
   const skills = assets.some((a) => a.method === "skill" && a.scope === "project");
-  if (skills && !out.some((f) => f.path === SKILLS_LOCK) && existsSync25(join33(projectDir, SKILLS_LOCK))) {
+  if (skills && !out.some((f) => f.path === SKILLS_LOCK) && existsSync25(join34(projectDir, SKILLS_LOCK))) {
     out.push({ path: SKILLS_LOCK, change: "advisory", notes: [] });
   }
   return out;
@@ -11949,9 +12223,9 @@ function remnantFor(path, log, harnessRoot) {
       } catch {
         return [];
       }
-      const render = new Map(Object.entries(servers).map(([n, v2]) => [`mcpServers.${n}`, v2]));
-      const present2 = ADAPTERS["json-keys"].read(disk, render.keys()) ?? /* @__PURE__ */ new Map();
-      return [...present2].filter(([k2, sha]) => sha === jsonSha(render.get(k2))).map(([k2]) => k2.slice("mcpServers.".length));
+      const known = knownServerValues(servers, (v2) => toClaudeServer(v2));
+      const present2 = ADAPTERS["json-keys"].read(disk, known.keys()) ?? /* @__PURE__ */ new Map();
+      return [...present2].filter(([k2, sha]) => known.get(k2)?.has(sha) === true).map(([k2]) => k2.slice("mcpServers.".length));
     };
   }
   if (path === AGENTS_MD2) {
@@ -11960,18 +12234,32 @@ function remnantFor(path, log, harnessRoot) {
   }
   if (!clis.includes("opencode")) return () => [];
   return (disk) => {
-    let render;
+    let known;
     try {
-      render = renderOpencodeMcp(
-        renderEverySelectableMcp(harnessRoot, log.spec.tracks.filter(isTrack))
+      known = knownServerValues(
+        renderEverySelectableMcp(harnessRoot, log.spec.tracks.filter(isTrack)).mcpServers,
+        (v2) => [...renderOpencodeMcp({ mcpServers: { x: v2 } }).values()][0],
+        "mcp."
       );
     } catch {
       return [];
     }
-    const present2 = ADAPTERS["json-keys"].read(disk, render.keys()) ?? /* @__PURE__ */ new Map();
-    return [...present2].filter(([k2, sha]) => sha === jsonSha(render.get(k2))).map(([k2]) => k2);
+    const present2 = ADAPTERS["json-keys"].read(disk, known.keys()) ?? /* @__PURE__ */ new Map();
+    return [...present2].filter(([k2, sha]) => known.get(k2)?.has(sha) === true).map(([k2]) => k2);
   };
 }
+function knownServerValues(servers, form, prefix = "mcpServers.") {
+  const out = /* @__PURE__ */ new Map();
+  const add = (name, v2) => {
+    const key = `${prefix}${name}`;
+    const set = out.get(key) ?? /* @__PURE__ */ new Set();
+    set.add(jsonSha(form(v2)));
+    out.set(key, set);
+  };
+  for (const [name, v2] of Object.entries(servers)) add(name, v2);
+  for (const p2 of PRIOR_MCP_SERVERS) add(p2.name, p2.value);
+  return out;
+}
 function remnantLine(path) {
   if (path === ".mcp.json") {
     return (names) => `may still hold the harness's MCP servers (not on record): ${names.join(" \xB7 ")} \u2014 delete them by hand if they are not yours`;
@@ -12055,7 +12343,7 @@ function noReverseHints(asset, ctx) {
   }
   if (asset.method !== "skill") return [];
   const name = asset.detail.skill;
-  const left = name === void 0 ? [] : [".claude/skills", ".agents/skills"].map((root) => `${root}/${name}/`).filter((p2) => !underAny(p2, ctx.movedDirs) && existsSync25(join33(ctx.projectDir, p2)));
+  const left = name === void 0 ? [] : [".claude/skills", ".agents/skills"].map((root) => `${root}/${name}/`).filter((p2) => !underAny(p2, ctx.movedDirs) && existsSync25(join34(ctx.projectDir, p2)));
   return [
     left.length > 0 ? `files it put down are not on record (installed by an older version) \u2014 left: ${left.join(" \xB7 ")} (delete by hand if the harness installed it)` : "files it put down are not on record (installed by an older version) \u2014 nothing removed"
   ];
@@ -12162,14 +12450,14 @@ function removeTemplates(log, projectDir, io, harnessRoot) {
   if (rootMd) {
     if (rootClaudeMdModified(log, projectDir))
       return { rootClaudeMdKept: true, importStripped, external, moved, keptLinks };
-    rm(join33(projectDir, rootMd.path));
+    rm(join34(projectDir, rootMd.path));
   }
   return { rootClaudeMdKept: false, importStripped, external, moved, keptLinks };
 }
 var AGENTS_MD2 = "AGENTS.md";
 function readAgentsMdTemplate(harnessRoot) {
   try {
-    return readFileSync26(join33(harnessRoot, AGENTS_MD_TEMPLATE), "utf8");
+    return readFileSync26(join34(harnessRoot, AGENTS_MD_TEMPLATE), "utf8");
   } catch {
     return null;
   }
@@ -12180,7 +12468,7 @@ function recoverMovedSymlinkPortions(log, projectDir, dirs) {
   for (const path of paths) {
     if (path.startsWith(".agents/skills/")) continue;
     if (!dirs.some((d2) => path.startsWith(d2))) continue;
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     if (!safeIsSymlink(abs)) continue;
     const target = safeRealpath(abs);
     if (target !== null && isOutsideProject(projectDir, target)) {
@@ -12209,7 +12497,7 @@ function recoverMovedSymlinkTargets(log, projectDir, dirs, rm) {
   for (const { path, sha256 } of log.externalFiles ?? []) {
     if (path.startsWith(".agents/skills/")) continue;
     if (!dirs.some((d2) => path.startsWith(d2))) continue;
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     if (!safeIsSymlink(abs)) continue;
     let target;
     try {
@@ -12271,7 +12559,7 @@ function removeExternalFiles(log, projectDir, rm, harnessRoot) {
   const unjudged = [];
   const outside = [];
   for (const { path, sha256 } of log.externalFiles ?? []) {
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     if (!existsSync25(abs)) continue;
     let current;
     let effective = abs;
@@ -12320,8 +12608,8 @@ function removeExternalFiles(log, projectDir, rm, harnessRoot) {
     }
     removed.push(path);
   }
-  for (const path of removed) pruneEmptyDirsUpward(projectDir, dirname6(join33(projectDir, path)));
-  const decisions = join33(projectDir, "docs", "decisions");
+  for (const path of removed) pruneEmptyDirsUpward(projectDir, dirname6(join34(projectDir, path)));
+  const decisions = join34(projectDir, "docs", "decisions");
   try {
     if (existsSync25(decisions) && readdirSync6(decisions).length === 0)
       rmSync5(decisions, { recursive: true });
@@ -12334,7 +12622,7 @@ function removeToolFiles(files, projectDir, rm) {
   const removed = [];
   let failed = 0;
   for (const { path, sha256 } of files) {
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     let isLink;
     try {
       isLink = lstatSync5(abs).isSymbolicLink();
@@ -12362,7 +12650,7 @@ function removeToolFiles(files, projectDir, rm) {
       notes.push(`left ${path} \u2014 ${e2 instanceof Error ? e2.message : String(e2)}`);
     }
   }
-  for (const path of removed) pruneEmptyDirsUpward(projectDir, dirname6(join33(projectDir, path)));
+  for (const path of removed) pruneEmptyDirsUpward(projectDir, dirname6(join34(projectDir, path)));
   return failed > 0 ? { ok: false, message: `${failed} file(s) could not be removed`, notes } : { ok: true, notes };
 }
 function pruneEmptyDirsUpward(projectDir, startDir) {
@@ -12384,8 +12672,8 @@ function stripRootImport(projectDir) {
   const stripped = current === null ? null : stripHarnessImport(current);
   if (stripped === null) return false;
   try {
-    backupIfLossyUtf8(join33(projectDir, "CLAUDE.md"));
-    writeFileSync9(join33(projectDir, "CLAUDE.md"), stripped, "utf8");
+    backupIfLossyUtf8(join34(projectDir, "CLAUDE.md"));
+    writeFileSync9(join34(projectDir, "CLAUDE.md"), stripped, "utf8");
     return true;
   } catch {
     return false;
@@ -12395,7 +12683,7 @@ function previewExternalLines(installLog, projectDir, harnessRoot, movedDirs = [
   const lines2 = [];
   let removable = 0;
   for (const { path, sha256 } of installLog.externalFiles ?? []) {
-    const abs = join33(projectDir, path);
+    const abs = join34(projectDir, path);
     const underMoved = underAny(path, movedDirs);
     const isLink = !underMoved || existsSync25(abs) ? safeIsSymlink(abs) : false;
     if (underMoved && !isLink) continue;
@@ -12479,7 +12767,7 @@ function hasRootImport(projectDir) {
   return current !== null && stripHarnessImport(current) !== null;
 }
 function readRootClaudeMd(projectDir) {
-  const path = join33(projectDir, "CLAUDE.md");
+  const path = join34(projectDir, "CLAUDE.md");
   if (!existsSync25(path)) return null;
   try {
     return readFileSync26(path, "utf8");
@@ -12490,7 +12778,7 @@ function readRootClaudeMd(projectDir) {
 function rootClaudeMdModified(log, projectDir) {
   const rootMd = log.templates.rootClaudeMd;
   if (!rootMd) return false;
-  const path = join33(projectDir, rootMd.path);
+  const path = join34(projectDir, rootMd.path);
   if (!existsSync25(path)) return false;
   return hashContent(readFileSync26(path, "utf8")) !== rootMd.sha256;
 }
@@ -13032,7 +13320,7 @@ function computeUserOverride(tracks, assetIds) {
   const recommended = new Set(wizardRecommended(tracks));
   const selected = new Set(assetIds);
   const forceExclude = [...recommended].filter((id) => !selected.has(id)).sort();
-  const forceInclude = [...selected].filter((id) => !recommended.has(id)).sort();
+  const forceInclude = [...selected].filter((id) => !recommended.has(id) && EXTERNAL_ASSETS.some((a) => a.id === id)).sort();
   if (forceInclude.length === 0 && forceExclude.length === 0) return void 0;
   return { forceInclude, forceExclude };
 }