@axis-ds/mcp 1.4.7 → 1.4.8

package/README.md

@@ -42,6 +42,7 @@ Claude Desktop 또는 기타 MCP 호환 클라이언트에서 설정:
 - `targetDir` 는 이미 있는 프로젝트 루트입니다(상대 경로는 서버의 현재 디렉터리 기준). `axis.config.json` 이 있으면 그 `componentsDir` · `agenticDir` 에, 없으면 `components/ui` · `components/agentic` 에 설치하고 그 사실을 알립니다. 프로젝트 밖으로 나가는 경로는 아무것도 쓰지 않고 실패합니다.
 - 내용이 다른 기존 파일은 덮어쓰지 않고 건너뛰며 응답 첫머리에 건너뛴 수를 적습니다. `overwrite: true` 일 때만 덮어씁니다.
 - 의존성은 설치하지 않고 lockfile 에 맞는 명령(`pnpm add` · `npm install` · `yarn add`)만 안내합니다. lockfile 이 없으면 `package.json` 의 `packageManager` 를 봅니다(1.4.2 부터). `axis.apply_template` 의 「필요한 의존성」 · `axis.list_brands` · `axis.get_brand` 의 설치 안내도 1.4.2 부터 같은 방식으로 `targetDir` 의 매니저를 따릅니다(1.4.1 까지는 `pnpm` 고정).
+- `axis.apply_template` 은 `targetDir` 에 이미 있는 `package.json` · `axis.config.json`(템플릿 루트의 것)을 덮어쓰지 않고 CLI `axis template apply` 와 같은 규칙으로 합칩니다(WI-0088). `packageManager` 등 사용자 필드가 남고, 결과의 파일 목록에 「합치기」로 표시합니다. 파일을 쓰는 도중 실패하면 건드린 파일을 되돌리고 오류로 응답합니다. 템플릿 경로가 `targetDir` 밖(절대 경로 · `..` · 밖을 가리키는 심볼릭 링크 경유)이면 `axis.apply_template` · `axis.diff_template` 은 아무 파일도 쓰거나 읽지 않고 오류로 응답합니다.
 
 ## 토큰 도구
 

package/dist/index.js

@@ -58,8 +58,8 @@ function listTokens(category) {
   }
   return tokens;
 }
-function getToken(path11) {
-  const q = path11.trim().toLowerCase();
+function getToken(path12) {
+  const q = path12.trim().toLowerCase();
   return loadTokens().tokens.find(
     (t) => t.path.toLowerCase() === q || (t.aliases ?? []).some((a) => a.toLowerCase() === q) || t.cssVariable.toLowerCase() === q
   );
@@ -1020,6 +1020,9 @@ function dependencyInstallGuide(baseDirInput, name, range) {
     ...base
   };
 }
+function installCommandPhrase(installCommand, rootDeclared) {
+  return rootDeclared && packageManagerOf(installCommand) === "npm" ? `\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uB8E8\uD2B8\uC5D0\uC11C ${installCommand}` : installCommand;
+}
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1195,20 +1198,20 @@ function splitPackageSpec(spec) {
   if (parts.length < n || parts.slice(0, n).some((p) => p === "" || p === "." || p === "..")) return void 0;
   return { name: parts.slice(0, n).join("/"), rest: parts.slice(n).join("/") };
 }
-function resolveExportTarget(value) {
+function resolveExportTarget(value, conditions = CSS_EXPORT_CONDITIONS) {
   if (typeof value === "string") return value;
   if (Array.isArray(value)) {
     for (const v of value) {
-      const r = resolveExportTarget(v);
+      const r = resolveExportTarget(v, conditions);
       if (r !== void 0) return r;
     }
     return void 0;
   }
   if (isPlainObject(value)) {
     for (const [key, v] of Object.entries(value)) {
-      if (!CSS_EXPORT_CONDITIONS.has(key)) continue;
+      if (!conditions.has(key)) continue;
       if (v === null) return void 0;
-      const r = resolveExportTarget(v);
+      const r = resolveExportTarget(v, conditions);
       if (r !== void 0) return r;
     }
   }
@@ -1217,10 +1220,10 @@ function resolveExportTarget(value) {
 function cssFileCandidates(p) {
   return [p, `${p}.css`, path3.join(p, "index.css")];
 }
-function exportsTarget(exportsField, subpath) {
+function exportsTarget(exportsField, subpath, conditions = CSS_EXPORT_CONDITIONS) {
   const map = isPlainObject(exportsField) && Object.keys(exportsField).some((k) => k.startsWith(".")) ? exportsField : { ".": exportsField };
   if (Object.prototype.hasOwnProperty.call(map, subpath)) {
-    const t = resolveExportTarget(map[subpath]);
+    const t = resolveExportTarget(map[subpath], conditions);
     if (t === void 0) return void 0;
     return t.includes("*") || !t.startsWith("./") ? "?" : t;
   }
@@ -1228,6 +1231,9 @@ function exportsTarget(exportsField, subpath) {
   return void 0;
 }
 function resolveCssPackageImport(fromDir, spec) {
+  return resolvePackageSubpath(fromDir, spec, CSS_EXPORT_CONDITIONS, cssFileCandidates);
+}
+function resolvePackageSubpath(fromDir, spec, conditions, candidates) {
   const parsed = splitPackageSpec(spec);
   if (parsed === void 0 || parsed.rest === "") return { kind: "unknown" };
   const subpath = `./${parsed.rest}`;
@@ -1244,16 +1250,16 @@ function resolveCssPackageImport(fromDir, spec) {
       }
       if (manifest !== void 0 && manifest.exports) {
         const version = exactVersionOf(manifest.version);
-        const target = exportsTarget(manifest.exports, subpath);
+        const target = exportsTarget(manifest.exports, subpath, conditions);
         if (target === "?") return { kind: "unknown" };
         if (target === void 0) {
           return version !== void 0 ? { kind: "not-exported", pkgDir, subpath, version } : { kind: "not-exported", pkgDir, subpath };
         }
-        const file = cssFileCandidates(path3.join(pkgDir, target)).find(isFile);
+        const file = candidates(path3.join(pkgDir, target)).find(isFile);
         if (file !== void 0) return { kind: "resolved", pkgDir, file };
         return version !== void 0 ? { kind: "target-missing", pkgDir, subpath, target, version } : { kind: "target-missing", pkgDir, subpath, target };
       }
-      const bare = cssFileCandidates(path3.join(pkgDir, parsed.rest)).find(isFile);
+      const bare = candidates(path3.join(pkgDir, parsed.rest)).find(isFile);
       if (bare !== void 0) return { kind: "resolved", pkgDir, file: bare };
     }
     const parent = path3.dirname(dir);
@@ -1304,6 +1310,25 @@ function cssPackageLineResolution(baseDir, lineDir, spec, otherDirs = []) {
   }
   return { kind: "ok" };
 }
+var JS_REQUIRE_CONDITIONS = /* @__PURE__ */ new Set(["require", "node", "module-sync", "default"]);
+var JS_IMPORT_CONDITIONS = /* @__PURE__ */ new Set(["import", "node", "module-sync", "default"]);
+function jsFileCandidates(p) {
+  return [p, `${p}.js`, `${p}.json`, `${p}.node`, path3.join(p, "index.js"), path3.join(p, "index.json"), path3.join(p, "index.node")];
+}
+function tailwindConfigImportResolution(baseDir, spec, refs) {
+  if (isPnpProject(baseDir)) return { kind: "ok" };
+  const blocked = (conditions) => {
+    const r = resolvePackageSubpath(baseDir, spec, conditions, jsFileCandidates);
+    return r.kind === "not-exported" ? r : void 0;
+  };
+  const viaRequire = refs.require || refs.import ? blocked(JS_REQUIRE_CONDITIONS) : void 0;
+  if (refs.require && viaRequire !== void 0) return viaRequire;
+  if (refs.import && viaRequire !== void 0) {
+    const viaImport = blocked(JS_IMPORT_CONDITIONS);
+    if (viaImport !== void 0) return viaImport;
+  }
+  return { kind: "ok" };
+}
 function findPnpUnpluggedPackages(baseDirInput, name, range) {
   const root = pnpProjectRoot(baseDirInput);
   if (root === void 0) return [];
@@ -1328,6 +1353,17 @@ function findPnpUnpluggedPackages(baseDirInput, name, range) {
   }
   return found;
 }
+var PNP_REAL_DIR_RANGE = /^(?:workspace|portal|link):/;
+function pnpComponentSourceHidden(baseDirInput, name, range) {
+  if (!isPnpProject(baseDirInput)) return false;
+  const r = range.trim();
+  if (PNP_REAL_DIR_RANGE.test(r)) return false;
+  const probe = versionSatisfiesRange("0.0.0", r) === void 0 ? "*" : r;
+  return findPnpUnpluggedPackages(baseDirInput, name, probe).length === 0;
+}
+function pnpUnplugSetupPhrase(name) {
+  return `Plug'n'Play \uB8E8\uD2B8(.pnp.cjs \uAC00 \uC788\uB294 \uACF3) package.json \uC758 dependenciesMeta \uC5D0 "${name}": { "unplugged": true } \uB97C \uB450\uACE0 yarn install`;
+}
 function parsePartialVersion(token) {
   const m = /^v?(\d+|[xX*])(?:\.(\d+|[xX*]))?(?:\.(\d+|[xX*]))?(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(token.trim());
   if (!m) return void 0;
@@ -1765,18 +1801,19 @@ function packageNameOfSpec(spec) {
 function displayRel(baseDir, p) {
   return relative(baseDir, p).split(sep).join("/");
 }
-function packageLineShadowIssue(baseDir, expanded, origin, spec) {
+function packageLineShadowIssue(baseDir, expanded, origin, spec, opts = {}) {
   const name = packageNameOfSpec(spec);
   const lineDir = dirname2(origin.path);
   const others = () => [...new Set(expanded.files.map((f) => dirname2(f.path)))].filter((d) => d !== lineDir);
   const r = cssPackageLineResolution(baseDir, lineDir, spec, others);
   const head = `${spec} import \uAC00 \uC788\uC9C0\uB9CC \uADF8 \uC904\uC774 \uC788\uB294 \uD30C\uC77C \uC704\uCE58\uC5D0\uC11C`;
   const label = (pkgDir, version) => `${displayRel(baseDir, pkgDir)}(${version ?? "\uBC84\uC804 \uBAA8\uB984"})`;
+  if (opts.tailwind3 === true && r.kind !== "shadow-not-exported") return void 0;
   switch (r.kind) {
     case "ok":
       return void 0;
     case "shadow-not-exported": {
-      const current = r.version !== void 0 && (compareExactVersions(r.version, TAILWIND4_MIN_AXIS_VERSION) ?? -1) >= 0;
+      const current = opts.tailwind3 === true || r.version !== void 0 && (compareExactVersions(r.version, TAILWIND4_MIN_AXIS_VERSION) ?? -1) >= 0;
       const todo = current ? "\uB2E4\uC2DC \uC124\uCE58\uD558\uC138\uC694" : `${TAILWIND4_MIN_AXIS_VERSION} \uC774\uC0C1\uC73C\uB85C \uB9DE\uCD94\uC138\uC694`;
       return `${head} \uBA3C\uC800 \uC7A1\uD788\uB294 ${label(r.pkgDir, r.version)}\uAC00 ${r.subpath} \uB97C \uB0B4\uBCF4\uB0B4\uC9C0 \uC54A\uC544 \uD574\uC11D\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4 \u2192 \uADF8 \uC911\uCCA9 node_modules \uC758 ${name} \uB97C \uC9C0\uC6B0\uAC70\uB098 ${todo}`;
     }
@@ -1819,13 +1856,20 @@ function judgeGlobalsCss(baseDir, selection, candidate, expanded) {
     const origin = evidenceOrigin(expanded, (f) => findTokensCssImport(f) === imported);
     via = cssImportViaNote(viaFiles([origin]));
     const tailwind4 = (detectTailwind(baseDir, pkg).major ?? 0) >= 4;
-    const issue = tailwind4 && origin !== void 0 && !isOutsideEntry(origin) ? tokensCssUnresolvedIssue(
+    const inside = origin !== void 0 && !isOutsideEntry(origin);
+    const issue = tailwind4 && inside ? tokensCssUnresolvedIssue(
       baseDir,
       pkg,
       imported,
       void 0,
       () => packageLineShadowIssue(baseDir, expanded, origin, imported)
-    ) : tokensCssUnresolvedIssue(baseDir, pkg, imported, origin !== void 0 ? origin.cssDir : outsideCssDir(selection));
+    ) : tokensCssUnresolvedIssue(
+      baseDir,
+      pkg,
+      imported,
+      origin !== void 0 ? origin.cssDir : outsideCssDir(selection),
+      inside ? () => packageLineShadowIssue(baseDir, expanded, origin, imported, { tailwind3: true }) : void 0
+    );
     if (issue !== void 0) unresolved = `${candidate}\uC5D0 ${issue}`;
     else pass = `${candidate}\uC5D0 AXIS CSS \uBCC0\uC218\uAC00 \uC788\uC2B5\uB2C8\uB2E4 (${imported} import)`;
   } else if (AXIS_VARIABLE_DEFINITION.test(stripCssComments(expanded.evidence))) {
@@ -2029,6 +2073,8 @@ function stripJsComments(src) {
 }
 var TOKENS_TAILWIND3_PRESET = "@axis-ds/tokens/tailwind";
 var PRESET_REFERENCE = /(?:\brequire\s*\(\s*|\bimport\s*\(\s*|\bfrom\s*|\bimport\s+)(["'])@axis-ds\/tokens\/tailwind\1/;
+var PRESET_REQUIRE_REFERENCE = /\brequire\s*\(\s*(["'])@axis-ds\/tokens\/tailwind\1/;
+var PRESET_IMPORT_REFERENCE = /(?:\bimport\s*\(\s*|\bfrom\s*|\bimport\s+)(["'])@axis-ds\/tokens\/tailwind\1/;
 function hasTokensPresetReference(source) {
   return PRESET_REFERENCE.test(stripJsComments(source));
 }
@@ -2056,7 +2102,7 @@ function hasBareCjsPresetRequire(code) {
 function isCommonJsConfig(file, source) {
   return extname(file) === ".cjs" || /\bmodule\.exports\b/.test(source);
 }
-function presetTokensUnresolvedMessage(baseDir, pkg, file, bareCjs) {
+function presetTokensUnresolvedMessage(baseDir, pkg, file, bareCjs, code) {
   const r = tokensCssResolution(baseDir, pkg, TOKENS_PACKAGE_NAME);
   const head = `${file}\uC5D0 AXIS preset \uCC38\uC870\uAC00 \uC788\uC9C0\uB9CC ${TOKENS_PACKAGE_NAME} \uAC00`;
   if (r.kind === "not-installed") {
@@ -2065,6 +2111,14 @@ function presetTokensUnresolvedMessage(baseDir, pkg, file, bareCjs) {
   if (r.kind === "pnp-root-only" && !bareCjs) {
     return `${head} ${PNP_ROOT_ONLY_NOTE}(\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uB8E8\uD2B8 \uC120\uC5B8 ${r.range}) \u2192 \uC571 package.json \uC5D0 ${TOKENS_PACKAGE_NAME} \uB97C \uC120\uC5B8\uD558\uC138\uC694`;
   }
+  const e = tailwindConfigImportResolution(baseDir, TOKENS_TAILWIND3_PRESET, {
+    require: PRESET_REQUIRE_REFERENCE.test(code),
+    import: PRESET_IMPORT_REFERENCE.test(code)
+  });
+  if (e.kind === "not-exported") {
+    const label = `${displayRel(baseDir, e.pkgDir)}(${e.version ?? "\uBC84\uC804 \uBAA8\uB984"})`;
+    return `${file}\uC5D0 AXIS preset \uCC38\uC870\uAC00 \uC788\uC9C0\uB9CC \uBA3C\uC800 \uC7A1\uD788\uB294 ${label}\uAC00 ${e.subpath} \uB97C \uB0B4\uBCF4\uB0B4\uC9C0 \uC54A\uC544 \uD574\uC11D\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4 \u2192 \uADF8 node_modules \uC758 ${TOKENS_PACKAGE_NAME} \uB97C \uC9C0\uC6B0\uAC70\uB098 \uB2E4\uC2DC \uC124\uCE58\uD558\uC138\uC694`;
+  }
   return void 0;
 }
 function packageVersionGate(baseDirInput, pkg, name, min, options = {}) {
@@ -2119,7 +2173,8 @@ function tailwind4Issues(input, pkg, versions, baseDir) {
     const r = resolutions.get(name);
     if (r.kind === "undeclared" || r.kind === "app-lockfile") continue;
     if (hasComponentTailwindImport(evidence, name) || hasComponentSource(evidence, name)) continue;
-    if (componentCssResolvable(r)) missing.push(name);
+    if (r.kind === "app" && pnpComponentSourceHidden(baseDir, name, r.range)) unresolvedMissing.push(componentCssPnpMissingIssue(name));
+    else if (componentCssResolvable(r)) missing.push(name);
     else unresolvedMissing.push(componentCssMissingIssue(baseDir, name, r));
   }
   if (missing.length > 0) {
@@ -2135,12 +2190,17 @@ function tailwind4Issues(input, pkg, versions, baseDir) {
   }
   for (const name of TAILWIND4_COMPONENT_PACKAGES) {
     if (!hasComponentTailwindImport(evidence, name)) continue;
-    const unresolved = componentCssPresentIssue(baseDir, name, resolutions.get(name));
+    const r = resolutions.get(name);
+    const unresolved = componentCssPresentIssue(baseDir, name, r);
     const spec = `${name}/tailwind.css`;
     if (unresolved !== void 0) {
       issues.push(unresolved);
       continue;
     }
+    if (r.kind === "app" && pnpComponentSourceHidden(baseDir, name, r.range)) {
+      issues.push(componentCssPnpPresentIssue(name));
+      continue;
+    }
     const shadow = input.lineIssue === void 0 ? false : input.lineIssue(spec);
     let lineProblem;
     if (shadow !== false) lineProblem = shadow;
@@ -2159,6 +2219,13 @@ function componentInstallPhrase(baseDir, name, range) {
   const g = dependencyInstallGuide(baseDir, name, range);
   return g.kind === "install-at-root" ? `\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uB8E8\uD2B8\uC5D0\uC11C ${g.installCommand}` : g.installCommand;
 }
+var PNP_ZIP_SOURCE_NOTE = `Plug'n'Play \uC5D0\uC11C @source "./dist" \uAC00 .yarn/cache zip \uC548\uC744 \uAC00\uB9AC\uCF1C \uCEF4\uD3EC\uB10C\uD2B8 \uD074\uB798\uC2A4\uAC00 \uC0DD\uC131\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4`;
+function componentCssPnpMissingIssue(name) {
+  return `${name} \uC758 tailwind.css \uB294 ${PNP_ZIP_SOURCE_NOTE} \u2192 ${pnpUnplugSetupPhrase(name)} \uB4A4 ${componentTailwindImportLine(name)}`;
+}
+function componentCssPnpPresentIssue(name) {
+  return `${name}/tailwind.css import \uAC00 \uC788\uC9C0\uB9CC ${PNP_ZIP_SOURCE_NOTE} \u2192 ${pnpUnplugSetupPhrase(name)} \uD558\uC138\uC694`;
+}
 function componentCssMissingIssue(baseDir, name, r) {
   const line = componentTailwindImportLine(name);
   switch (r.kind) {
@@ -2254,13 +2321,13 @@ function checkTailwindSetup(baseDirInput) {
     };
   }
   for (const file of TAILWIND_CONFIG_FILES) {
-    const path11 = join2(baseDir, file);
-    if (!existsSync3(path11)) continue;
-    const content = readFileSync4(path11, "utf8");
+    const path12 = join2(baseDir, file);
+    if (!existsSync3(path12)) continue;
+    const content = readFileSync4(path12, "utf8");
     if (hasTokensPresetReference(content)) {
       const code = stripJsComments(content);
       const bareCjs = isCommonJsConfig(file, code) && hasBareCjsPresetRequire(code);
-      const unresolved = presetTokensUnresolvedMessage(baseDir, pkg, file, bareCjs);
+      const unresolved = presetTokensUnresolvedMessage(baseDir, pkg, file, bareCjs, code);
       if (unresolved !== void 0) return { name: "tailwind.config", severity: "warn", message: unresolved };
       if (bareCjs) {
         const gate = packageVersionGate(baseDir, pkg, "@axis-ds/tokens", TOKENS_CJS_PRESET_FIXED_VERSION, { appOnlyInPnp: true });
@@ -3690,11 +3757,11 @@ async function handleGetComponent(params, deps = {}) {
   return { component, source: describeOrigin(client, latest.version), notices };
 }
 function handleGetToken(params) {
-  const { path: path11 } = params;
-  if (!path11 || path11.trim() === "") {
+  const { path: path12 } = params;
+  if (!path12 || path12.trim() === "") {
     throw new Error("\uD1A0\uD070 \uACBD\uB85C(path)\uB294 \uD544\uC218\uC785\uB2C8\uB2E4.");
   }
-  const token = getToken(path11);
+  const token = getToken(path12);
   if (!token) {
     return null;
   }
@@ -3775,9 +3842,9 @@ function cssUsage(token) {
   const shadcnColor = !token.cssVariable.startsWith("--axis-") && token.value.startsWith("hsl(");
   return shadcnColor ? `hsl(var(${token.cssVariable}))` : `var(${token.cssVariable})`;
 }
-function formatTokenNotFound(path11) {
+function formatTokenNotFound(path12) {
   return [
-    `\uD1A0\uD070\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4: \`${path11}\``,
+    `\uD1A0\uD070\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4: \`${path12}\``,
     "",
     "- \uACBD\uB85C\uB294 `axis.list_tokens` \uB85C \uD655\uC778\uD558\uC138\uC694. \uACBD\uB85C \xB7 tokens \uC774\uB984 \uAE30\uBC18 \uACBD\uB85C(\uC608: `control.h.md`) \xB7 CSS \uBCC0\uC218 \uC774\uB984(\uC608: `--axis-control-h-md`)\uC744 \uBC1B\uC2B5\uB2C8\uB2E4.",
     "- \uBE0C\uB79C\uB4DC \uAC12\uC740 `axis.list_brands` \xB7 `axis.get_brand` \uB85C \uC870\uD68C\uD558\uC138\uC694."
@@ -5475,7 +5542,7 @@ function formatSaveResult(result) {
 // src/tools/template.ts
 import fetch from "node-fetch";
 import fs6 from "fs-extra";
-import path9 from "path";
+import path10 from "path";
 
 // src/tools/brand-core.ts
 import { createHash as createHash2 } from "crypto";
@@ -6035,11 +6102,15 @@ function checkDependencies(baseDirInput) {
   if (missingRecommended.length > 0) problems.push(`\uAD8C\uC7A5 \uC758\uC874\uC131 \uB204\uB77D: ${missingRecommended.join(", ")}`);
   if (pnpRootRecommended.length > 0) problems.push(`\uAD8C\uC7A5 \uC758\uC874\uC131 ${pnpRootRecommended.join(", ")} \uAC00 ${PNP_ROOT_ONLY_NOTE} \u2192 \uC571 package.json \uC5D0 \uC120\uC5B8\uD558\uC138\uC694`);
   if (pnpRootAxis.length > 0) problems.push(`${pnpRootAxis.join(", ")} \uAC00 ${PNP_ROOT_ONLY_NOTE} \u2192 \uC571 package.json \uC5D0 \uC120\uC5B8\uD558\uC138\uC694`);
+  const installCommand = detectInstallCommand(baseDir);
   if (notInstalledOther.length > 0) {
-    problems.push(`\uC120\uC5B8\uB410\uC9C0\uB9CC \uC124\uCE58\uB418\uC9C0 \uC54A\uC740 \uC758\uC874\uC131: ${notInstalledOther.join(", ")} \u2192 ${detectInstallCommand(baseDir)}`);
+    const phrase = installCommandPhrase(installCommand, notInstalledOther.some((d) => fromRoot(d)));
+    problems.push(`\uC120\uC5B8\uB410\uC9C0\uB9CC \uC124\uCE58\uB418\uC9C0 \uC54A\uC740 \uC758\uC874\uC131: ${notInstalledOther.join(", ")} \u2192 ${phrase}`);
   }
   if (notInstalledRoot.length > 0) {
-    problems.push(`\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uB8E8\uD2B8\uC5D0 \uC120\uC5B8\uB3FC \uC788\uC9C0\uB9CC \uC124\uCE58\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4: ${notInstalledRoot.join(", ")} \u2192 ${detectInstallCommand(baseDir)}`);
+    problems.push(
+      `\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uB8E8\uD2B8\uC5D0 \uC120\uC5B8\uB3FC \uC788\uC9C0\uB9CC \uC124\uCE58\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4: ${notInstalledRoot.join(", ")} \u2192 ${installCommandPhrase(installCommand, true)}`
+    );
   }
   if (problems.length > 0) {
     return { name: "dependencies", severity: "warn", message: problems.join(" / ") + (rootNote ? ` (${rootNote})` : "") };
@@ -6052,6 +6123,192 @@ function checkDependencies(baseDirInput) {
   };
 }
 
+// ../axis-registry-core/src/template/apply-files.ts
+import { existsSync as existsSync9, lstatSync as lstatSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync10, readdirSync as readdirSync3, realpathSync as realpathSync4, rmdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import path9 from "path";
+var TemplatePathError = class extends Error {
+  constructor(relPath, reason) {
+    super(`\uD15C\uD50C\uB9BF \uACBD\uB85C '${relPath}' \uAC00 \uB300\uC0C1 \uB514\uB809\uD130\uB9AC \uBC16\uC744 \uAC00\uB9AC\uCF1C(${reason}) \uC911\uB2E8\uD588\uC2B5\uB2C8\uB2E4. \uC544\uBB34 \uD30C\uC77C\uB3C4 \uBC14\uAFB8\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4`);
+    this.relPath = relPath;
+    this.reason = reason;
+    this.name = "TemplatePathError";
+  }
+};
+function realpathOfExisting(p) {
+  const rest = [];
+  let cur = p;
+  for (; ; ) {
+    try {
+      lstatSync3(cur);
+      break;
+    } catch {
+      const parent = path9.dirname(cur);
+      if (parent === cur) break;
+      rest.unshift(path9.basename(cur));
+      cur = parent;
+    }
+  }
+  try {
+    return path9.join(realpathSync4(cur), ...rest);
+  } catch {
+    return void 0;
+  }
+}
+function isInside(root, target) {
+  const rel2 = path9.relative(root, target);
+  return rel2 !== "" && !rel2.startsWith("..") && !path9.isAbsolute(rel2);
+}
+function resolveTemplatePath(baseDir, relPath) {
+  if (typeof relPath !== "string" || relPath === "" || relPath.includes("\0")) {
+    throw new TemplatePathError(String(relPath), "\uBE48 \uACBD\uB85C \uB610\uB294 \uC798\uBABB\uB41C \uBB38\uC790");
+  }
+  if (path9.isAbsolute(relPath) || path9.win32.isAbsolute(relPath)) throw new TemplatePathError(relPath, "\uC808\uB300 \uACBD\uB85C");
+  const base = path9.resolve(baseDir);
+  const dest = path9.resolve(base, relPath);
+  if (!isInside(base, dest)) throw new TemplatePathError(relPath, "\uC0C1\uC704 \uB514\uB809\uD130\uB9AC\uB85C \uB098\uAC10");
+  const baseReal = realpathOfExisting(base);
+  const destReal = realpathOfExisting(dest);
+  if (!baseReal || !destReal || !isInside(baseReal, destReal)) {
+    throw new TemplatePathError(relPath, "\uC2EC\uBCFC\uB9AD \uB9C1\uD06C\uAC00 \uB300\uC0C1 \uB514\uB809\uD130\uB9AC \uBC16\uC744 \uAC00\uB9AC\uD0B4");
+  }
+  return dest;
+}
+function assertTemplatePaths(baseDir, relPaths) {
+  for (const p of relPaths) resolveTemplatePath(baseDir, p);
+}
+var PACKAGE_JSON_MERGED_MAPS = [
+  "scripts",
+  "dependencies",
+  "devDependencies",
+  "peerDependencies",
+  "optionalDependencies"
+];
+function isPlainObject3(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function parseObject(text) {
+  try {
+    const v = JSON.parse(text);
+    return isPlainObject3(v) ? v : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function mergePackageJson(user, template) {
+  const maps = new Set(PACKAGE_JSON_MERGED_MAPS);
+  const out = {};
+  for (const [key, value] of Object.entries(user)) {
+    const tpl = template[key];
+    if (maps.has(key) && isPlainObject3(tpl)) {
+      out[key] = isPlainObject3(value) ? { ...value, ...tpl } : tpl;
+    } else {
+      out[key] = value;
+    }
+  }
+  for (const [key, value] of Object.entries(template)) {
+    if (!(key in out)) out[key] = value;
+  }
+  return out;
+}
+function mergeAxisConfigJson(user, template) {
+  return { ...user, ...template };
+}
+function detectJsonIndent(text) {
+  const m = /^([ \t]+)\S/m.exec(text);
+  if (!m) return 2;
+  return m[1].startsWith("	") ? "	" : m[1].length;
+}
+function serializeLike(before, value) {
+  const crlf = before.includes("\r\n");
+  const trailing = /\r?\n$/.test(before);
+  let text = JSON.stringify(value, null, detectJsonIndent(before));
+  if (trailing) text += "\n";
+  return crlf ? text.replace(/\n/g, "\r\n") : text;
+}
+var MERGERS = {
+  "package.json": mergePackageJson,
+  "axis.config.json": mergeAxisConfigJson
+};
+function planTemplateFileContent(relPath, templateContent, before) {
+  if (before === void 0) return { action: "created", content: templateContent };
+  const merger = MERGERS[relPath.replace(/^\.\//, "")];
+  if (!merger) return { action: "overwritten", content: templateContent };
+  const user = parseObject(before);
+  const template = parseObject(templateContent);
+  if (!user || !template) {
+    return {
+      action: "overwritten",
+      content: templateContent,
+      note: `\uAE30\uC874 ${relPath} \uC744 JSON \uAC1D\uCCB4\uB85C \uC77D\uC744 \uC218 \uC5C6\uC5B4 \uD15C\uD50C\uB9BF \uB0B4\uC6A9\uC73C\uB85C \uB36E\uC5B4\uC501\uB2C8\uB2E4`
+    };
+  }
+  return { action: "merged", content: serializeLike(before, merger(user, template)) };
+}
+function planTemplateFiles(baseDir, files, extraPaths = []) {
+  const dests = files.map((file) => resolveTemplatePath(baseDir, file.path));
+  assertTemplatePaths(baseDir, extraPaths);
+  return files.map((file, i) => {
+    const dest = dests[i];
+    const before = existsSync9(dest) ? readFileSync10(dest, "utf8") : void 0;
+    return { path: file.path, dest, before, ...planTemplateFileContent(file.path, file.content, before) };
+  });
+}
+var TemplateApplyError = class extends Error {
+  constructor(message, restored, unrestored) {
+    super(message);
+    this.restored = restored;
+    this.unrestored = unrestored;
+    this.name = "TemplateApplyError";
+  }
+};
+function writeTemplateFiles(plan) {
+  const done = [];
+  const madeDirs = [];
+  try {
+    for (const item of plan) {
+      const dir = path9.dirname(item.dest);
+      if (!existsSync9(dir)) {
+        const fresh = [];
+        for (let d = dir; !existsSync9(d); d = path9.dirname(d)) fresh.unshift(d);
+        mkdirSync2(dir, { recursive: true });
+        madeDirs.push(...fresh);
+      }
+      writeFileSync2(item.dest, item.content);
+      done.push(item);
+    }
+  } catch (err) {
+    const restored = [];
+    const unrestored = [];
+    const failed = plan[done.length];
+    const targets = failed ? [...done, failed] : done;
+    for (const item of targets.reverse()) {
+      try {
+        if (item.before === void 0) {
+          if (existsSync9(item.dest)) unlinkSync(item.dest);
+        } else {
+          writeFileSync2(item.dest, item.before);
+        }
+        restored.push(item.path);
+      } catch {
+        unrestored.push(item.path);
+      }
+    }
+    for (const d of madeDirs.reverse()) {
+      try {
+        if (existsSync9(d) && readdirSync3(d).length === 0) rmdirSync(d);
+      } catch {
+      }
+    }
+    const reason = err instanceof Error ? err.message : String(err);
+    const tail = unrestored.length > 0 ? ` \uB418\uB3CC\uB9AC\uC9C0 \uBABB\uD55C \uD30C\uC77C: ${unrestored.join(", ")}` : "";
+    throw new TemplateApplyError(
+      `\uD15C\uD50C\uB9BF \uD30C\uC77C\uC744 \uC4F0\uB294 \uB3C4\uC911 \uC2E4\uD328\uD574 \uAC74\uB4DC\uB9B0 \uD30C\uC77C ${restored.length}\uAC1C\uB97C \uC6D0\uB798\uB300\uB85C \uB418\uB3CC\uB838\uC2B5\uB2C8\uB2E4(${reason}).${tail}`,
+      restored.reverse(),
+      unrestored
+    );
+  }
+}
+
 // src/site.ts
 var AXIS_SITE_URL2 = "https://axis-design-system.pages.dev";
 
@@ -6105,24 +6362,18 @@ async function handleGetTemplate(params) {
 }
 async function handleApplyTemplate(params) {
   const detail = await fetchTemplateDetail(params.name);
-  const baseDir = path9.resolve(params.targetDir);
+  const baseDir = path10.resolve(params.targetDir);
   const installCommand = detectInstallCommand(baseDir);
-  const files = [];
-  for (const file of detail.files) {
-    const dest = path9.join(baseDir, file.path);
-    const exists = await fs6.pathExists(dest);
-    if (!params.dryRun) {
-      await fs6.ensureDir(path9.dirname(dest));
-      await fs6.writeFile(dest, file.content);
-    }
-    files.push({
-      path: file.path,
-      action: exists ? "overwritten" : "created"
-    });
-  }
+  const plan = planTemplateFiles(baseDir, detail.files, (detail.postInstall ?? []).map((p) => p.file));
+  if (!params.dryRun) writeTemplateFiles(plan);
+  const files = plan.map((item) => ({
+    path: item.path,
+    action: item.action,
+    ...item.note ? { note: item.note } : {}
+  }));
   if (!params.dryRun && detail.postInstall?.length) {
     for (const patch of detail.postInstall) {
-      const target = path9.join(baseDir, patch.file);
+      const target = resolveTemplatePath(baseDir, patch.file);
       if (!await fs6.pathExists(target)) continue;
       if (patch.type === "replace" && patch.search && patch.value) {
         const content = await fs6.readFile(target, "utf-8");
@@ -6150,10 +6401,11 @@ async function handleApplyTemplate(params) {
 }
 async function handleDiffTemplate(params) {
   const detail = await fetchTemplateDetail(params.name);
-  const baseDir = path9.resolve(params.targetDir || ".");
+  const baseDir = path10.resolve(params.targetDir || ".");
   const entries = [];
-  for (const file of detail.files) {
-    const localPath = path9.join(baseDir, file.path);
+  const localPaths = detail.files.map((file) => resolveTemplatePath(baseDir, file.path));
+  for (const [i, file] of detail.files.entries()) {
+    const localPath = localPaths[i];
     if (!await fs6.pathExists(localPath)) {
       entries.push({ path: file.path, status: "added" });
       continue;
@@ -6241,9 +6493,9 @@ function brandActivationResult(check) {
   };
 }
 async function handleCheckProject(params) {
-  const baseDir = path9.resolve(params.targetDir || ".");
+  const baseDir = path10.resolve(params.targetDir || ".");
   const results = [];
-  const configExists = await fs6.pathExists(path9.join(baseDir, "axis.config.json"));
+  const configExists = await fs6.pathExists(path10.join(baseDir, "axis.config.json"));
   results.push({
     name: "axis.config.json",
     severity: configExists ? "pass" : "fail",
@@ -6260,7 +6512,7 @@ async function handleCheckProject(params) {
   ];
   let utilsFound = false;
   for (const candidate of utilsCandidates) {
-    const fullPath = path9.join(baseDir, candidate);
+    const fullPath = path10.join(baseDir, candidate);
     if (await fs6.pathExists(fullPath)) {
       const content2 = await fs6.readFile(fullPath, "utf-8");
       const hasCn = content2.includes("function cn");
@@ -6351,9 +6603,15 @@ function formatApplyTemplateResult(result) {
 `);
   if (result.files.length > 0) {
     lines.push("### \uD30C\uC77C", "");
+    const label = {
+      created: "\uC0DD\uC131",
+      overwritten: "\uB36E\uC5B4\uC4F0\uAE30",
+      merged: "\uD569\uCE58\uAE30: \uAE30\uC874 \uD544\uB4DC\uB97C \uB450\uACE0 \uD15C\uD50C\uB9BF \uD0A4\uB97C \uD569\uCE68"
+    };
     for (const f of result.files) {
       const icon = f.action === "created" ? "+" : "~";
-      lines.push(`- ${icon} ${f.path} (${f.action === "created" ? "\uC0DD\uC131" : "\uB36E\uC5B4\uC4F0\uAE30"})`);
+      lines.push(`- ${icon} ${f.path} (${label[f.action]})`);
+      if (f.note) lines.push(`  - ! ${f.note}`);
     }
   }
   const deps = Object.entries(result.dependencies);
@@ -6405,10 +6663,10 @@ function formatCheckProjectResult(result) {
 }
 
 // src/tools/brand.ts
-import path10 from "path";
+import path11 from "path";
 var TOKENS_INSTALL_COMMAND = addCommandFor("pnpm install", { [TOKENS_PACKAGE]: `^${TOKENS_DEPENDENCY_MIN_VERSION}` });
 function baseDirOf(targetDir) {
-  return path10.resolve(targetDir || process.cwd());
+  return path11.resolve(targetDir || process.cwd());
 }
 function tokensInstallGuideFor(targetDir) {
   return dependencyInstallGuide(baseDirOf(targetDir), TOKENS_PACKAGE, `^${TOKENS_DEPENDENCY_MIN_VERSION}`);
@@ -6696,10 +6954,10 @@ server.tool(
   {
     path: z.string().describe("\uD1A0\uD070 \uACBD\uB85C (\uC608: colors.primary, spacing.4, control.h.md) \uB610\uB294 CSS \uBCC0\uC218 \uC774\uB984 (\uC608: --axis-control-h-md)")
   },
-  async ({ path: path11 }) => {
+  async ({ path: path12 }) => {
     try {
-      const token = handleGetToken({ path: path11 });
-      const formatted = formatTokenDetail(token, path11);
+      const token = handleGetToken({ path: path12 });
+      const formatted = formatTokenDetail(token, path12);
       return {
         content: [
           {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axis-ds/mcp",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "type": "module",
   "description": "AXIS Design System - MCP Server for AI-assisted component discovery",
   "bin": {