teamix-evo 0.8.0 → 0.10.1

package/dist/core/index.js

@@ -113,7 +113,8 @@ var TEAMIX_DIR = ".teamix-evo";
 var CONFIG_FILE = "config.json";
 var MANIFEST_FILE = "manifest.json";
 var TOKENS_LOCK_FILE = "tokens-lock.json";
-var SKILLS_DIR = "skills";
+var SKILLS_DIR = "skills-source";
+var LEGACY_SKILLS_DIR = "skills";
 var SKILLS_LOCK_FILE = "manifest.lock.json";
 function getTeamixDir(projectRoot) {
   return path2.join(projectRoot, TEAMIX_DIR);
@@ -197,6 +198,9 @@ function getSkillsSourceDir(projectRoot, skillName) {
   const base = path2.join(projectRoot, TEAMIX_DIR, SKILLS_DIR);
   return skillName ? path2.join(base, skillName) : base;
 }
+function getLegacySkillsSourceDir(projectRoot) {
+  return path2.join(projectRoot, TEAMIX_DIR, LEGACY_SKILLS_DIR);
+}
 async function readSkillsLock(projectRoot) {
   const lockPath = path2.join(
     projectRoot,
@@ -365,13 +369,20 @@ function resolveSourcePath(source, variantDir, packageRoot) {
   }
   return path6.join(variantDir, source);
 }
-async function walkDir(dir) {
+var DEFAULT_SKIP_DIRS = /* @__PURE__ */ new Set([
+  "node_modules",
+  "dist",
+  "build",
+  ".teamix-evo"
+]);
+async function walkDir(dir, skipDirs) {
   const files = [];
   const entries = await fs4.readdir(dir, { withFileTypes: true });
   for (const entry of entries) {
     const fullPath = path6.join(dir, entry.name);
     if (entry.isDirectory()) {
-      files.push(...await walkDir(fullPath));
+      if (skipDirs && skipDirs.has(entry.name)) continue;
+      files.push(...await walkDir(fullPath, skipDirs));
     } else if (entry.isFile()) {
       files.push(fullPath);
     }
@@ -385,6 +396,7 @@ function resolveTokensPackageRoot(packageName) {
 
 // src/core/skills-installer.ts
 async function installSkills(options) {
+  await migrateLegacySkillsSourceDir(options.projectRoot);
   const { manifest, ides, scope, onlyIds } = options;
   const installed = [];
   const targets = manifest.skills.filter(
@@ -677,6 +689,7 @@ function escapeRegExp(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 async function syncSkillsToIdes(options) {
+  await migrateLegacySkillsSourceDir(options.projectRoot);
   const { projectRoot, skills, ides, scope, onlyIds } = options;
   const out = [];
   const targets = skills.filter((s) => !onlyIds || onlyIds.includes(s.id));
@@ -720,6 +733,118 @@ async function syncSkillsToIdes(options) {
   }
   return { resources: out, count: out.length };
 }
+async function migrateLegacySkillsSourceDir(projectRoot) {
+  const legacyDir = getLegacySkillsSourceDir(projectRoot);
+  const newDir = getSkillsSourceDir(projectRoot);
+  let legacyExists = false;
+  let newExists = false;
+  try {
+    legacyExists = (await fs5.stat(legacyDir)).isDirectory();
+  } catch {
+    legacyExists = false;
+  }
+  try {
+    newExists = (await fs5.stat(newDir)).isDirectory();
+  } catch {
+    newExists = false;
+  }
+  if (!legacyExists) return;
+  if (newExists) {
+    logger.warn(
+      `Detected stale legacy skills source dir at ${legacyDir} alongside ${newDir}; the new layout takes precedence \u2014 you can safely delete the legacy dir.`
+    );
+    return;
+  }
+  try {
+    await fs5.rename(legacyDir, newDir);
+    logger.info(
+      `Migrated skills source dir: \`.teamix-evo/${LEGACY_SKILLS_DIR}/\` \u2192 \`.teamix-evo/skills-source/\``
+    );
+  } catch (err) {
+    logger.warn(
+      `Failed to rename legacy skills source dir (${getErrorMessage(
+        err
+      )}); leaving as-is. New skills will install under the new layout.`
+    );
+    return;
+  }
+  try {
+    const manifest = await readInstalledManifest(projectRoot);
+    if (!manifest) return;
+    const legacyFragmentPosix = `/.teamix-evo/${LEGACY_SKILLS_DIR}/`;
+    const newFragmentPosix = `/.teamix-evo/skills-source/`;
+    const legacyFragmentNative = `${path7.sep}.teamix-evo${path7.sep}${LEGACY_SKILLS_DIR}${path7.sep}`;
+    const newFragmentNative = `${path7.sep}.teamix-evo${path7.sep}skills-source${path7.sep}`;
+    let touched = 0;
+    for (const pkg of manifest.installed) {
+      for (const r of pkg.resources) {
+        if (typeof r.target !== "string") continue;
+        const before = r.target;
+        let after = before.replace(legacyFragmentPosix, newFragmentPosix);
+        after = after.replace(legacyFragmentNative, newFragmentNative);
+        if (after !== before) {
+          r.target = after;
+          touched += 1;
+        }
+      }
+    }
+    if (touched > 0) {
+      await writeInstalledManifest(projectRoot, manifest);
+      logger.debug(
+        `Rewrote ${touched} manifest target(s) to the new skills-source path.`
+      );
+    }
+  } catch (err) {
+    logger.warn(
+      `Migrated skills source dir but failed to update manifest paths (${getErrorMessage(
+        err
+      )}); manifest may still reference legacy paths.`
+    );
+  }
+}
+async function pruneEmptyIdeSkillDirs(args) {
+  const removed = [];
+  for (const ide of args.ides) {
+    const adapter = getAdapter(ide);
+    const placeholderDir = adapter.getSkillTargetDir(
+      "__placeholder__",
+      args.scope,
+      args.projectRoot
+    );
+    const skillsRoot = path7.dirname(placeholderDir);
+    let entries;
+    try {
+      entries = await fs5.readdir(skillsRoot);
+    } catch {
+      continue;
+    }
+    for (const name of entries) {
+      const dir = path7.join(skillsRoot, name);
+      let stat5;
+      try {
+        stat5 = await fs5.stat(dir);
+      } catch {
+        continue;
+      }
+      if (!stat5.isDirectory()) continue;
+      let children;
+      try {
+        children = await fs5.readdir(dir);
+      } catch {
+        continue;
+      }
+      if (children.some((c) => c === "SKILL.md")) continue;
+      if (children.length !== 0) continue;
+      try {
+        await fs5.rmdir(dir);
+        removed.push(dir);
+        logger.debug(`Pruned empty IDE skill dir: ${dir}`);
+      } catch {
+      }
+    }
+  }
+  return removed;
+}
 async function removeSkillFiles(records) {
   const removed = [];
   for (const r of records) {
@@ -815,13 +940,29 @@ async function runSkillsInit(options) {
     }
     return true;
   }).map((s) => s.id);
-  const skippedSkillIds = candidateIds.filter(
-    (id) => existing.skillIds.has(id)
+  const { onlyIds, skippedSkillIds, outdatedSkills } = partitionByVersion(
+    candidateIds,
+    manifest,
+    existing
   );
-  const onlyIds = candidateIds.filter((id) => !existing.skillIds.has(id));
-  if (existingSkillsCfg && onlyIds.length === 0) {
+  if (existingSkillsCfg && onlyIds.length === 0 && outdatedSkills.length === 0) {
     return { status: "already-initialized" };
   }
+  if (onlyIds.length === 0) {
+    return {
+      status: "installed",
+      packageName,
+      version: existingSkillsCfg?.version ?? manifest.version,
+      ides,
+      scope,
+      skillCount: 0,
+      fileCount: 0,
+      resources: [],
+      addedSkillIds: [],
+      skippedSkillIds,
+      outdatedSkills
+    };
+  }
   return finalizeSkillsInstall({
     projectRoot,
     packageName,
@@ -833,6 +974,7 @@ async function runSkillsInit(options) {
     scope,
     onlyIds,
     skippedSkillIds,
+    outdatedSkills,
     existing,
     existingConfig
   });
@@ -873,10 +1015,11 @@ async function runSkillsAdd(options) {
     }
   }
   const existing = await readExistingState(projectRoot, packageName);
-  const skippedSkillIds = requestedNames.filter(
-    (n) => existing.skillIds.has(n)
+  const { onlyIds, skippedSkillIds, outdatedSkills } = partitionByVersion(
+    requestedNames,
+    manifest,
+    existing
   );
-  const onlyIds = requestedNames.filter((n) => !existing.skillIds.has(n));
   if (onlyIds.length === 0) {
     return {
       status: "installed",
@@ -888,7 +1031,8 @@ async function runSkillsAdd(options) {
       fileCount: 0,
       resources: [],
       addedSkillIds: [],
-      skippedSkillIds
+      skippedSkillIds,
+      outdatedSkills
     };
   }
   return finalizeSkillsInstall({
@@ -902,10 +1046,52 @@ async function runSkillsAdd(options) {
     scope,
     onlyIds,
     skippedSkillIds,
+    outdatedSkills,
     existing,
     existingConfig
   });
 }
+function partitionByVersion(ids, manifest, existing) {
+  const manifestById = new Map(manifest.skills.map((s) => [s.id, s]));
+  const onlyIds = [];
+  const skippedSkillIds = [];
+  const outdatedSkills = [];
+  for (const name of ids) {
+    if (!existing.skillIds.has(name)) {
+      onlyIds.push(name);
+      continue;
+    }
+    const installedVer = existing.lock?.skills?.[name]?.version;
+    const latestVer = manifestById.get(name)?.version;
+    if (installedVer && latestVer && compareSemver(installedVer, latestVer) < 0) {
+      outdatedSkills.push({
+        id: name,
+        installed: installedVer,
+        latest: latestVer
+      });
+    } else {
+      skippedSkillIds.push(name);
+    }
+  }
+  return { onlyIds, skippedSkillIds, outdatedSkills };
+}
+function parseSemverTriple(v) {
+  const m = /^(\d+)\.(\d+)\.(\d+)/.exec(v);
+  if (!m) return null;
+  return [Number(m[1]), Number(m[2]), Number(m[3])];
+}
+function compareSemver(a, b) {
+  const pa = parseSemverTriple(a);
+  const pb = parseSemverTriple(b);
+  if (!pa || !pb) {
+    if (a === b) return 0;
+    return a < b ? -1 : 1;
+  }
+  for (let i = 0; i < 3; i++) {
+    if (pa[i] !== pb[i]) return pa[i] < pb[i] ? -1 : 1;
+  }
+  return 0;
+}
 async function readExistingState(projectRoot, packageName) {
   const installed = await readInstalledManifest(projectRoot);
   const pkg = installed?.installed.find((p) => p.package === packageName);
@@ -930,6 +1116,7 @@ async function finalizeSkillsInstall(args) {
     scope,
     onlyIds,
     skippedSkillIds,
+    outdatedSkills,
     existing,
     existingConfig
   } = args;
@@ -995,6 +1182,10 @@ async function finalizeSkillsInstall(args) {
   }
   await writeSkillsLock(projectRoot, lock);
   await ensureMcpJson(projectRoot);
+  try {
+    await pruneEmptyIdeSkillDirs({ projectRoot, ides, scope });
+  } catch {
+  }
   return {
     status: "installed",
     packageName,
@@ -1005,7 +1196,8 @@ async function finalizeSkillsInstall(args) {
     fileCount: result.count,
     resources: result.resources,
     addedSkillIds: onlyIds,
-    skippedSkillIds
+    skippedSkillIds,
+    outdatedSkills: outdatedSkills ?? []
   };
 }
 function mergeInstalledResources(existing, next) {
@@ -1066,13 +1258,16 @@ Run \`npx teamix-evo@latest tokens list-variants\` to see all options.`
   if (!await fileExists(overridesAbs)) {
     await writeFileSafe(overridesAbs, EMPTY_OVERRIDES_TEMPLATE);
   }
-  const overridesContent = await fs6.readFile(overridesAbs, "utf-8");
-  installed.push({
-    id: `tokens:${CONSUMER_OVERRIDES_FILE}`,
-    target: path9.posix.join(CONSUMER_TOKENS_DIR, CONSUMER_OVERRIDES_FILE),
-    hash: computeHash(overridesContent),
-    strategy: "frozen"
-  });
+  const overridesId = `tokens:${CONSUMER_OVERRIDES_FILE}`;
+  if (!installed.some((r) => r.id === overridesId)) {
+    const overridesContent = await fs6.readFile(overridesAbs, "utf-8");
+    installed.push({
+      id: overridesId,
+      target: path9.posix.join(CONSUMER_TOKENS_DIR, CONSUMER_OVERRIDES_FILE),
+      hash: computeHash(overridesContent),
+      strategy: "frozen"
+    });
+  }
   const lock = {
     schemaVersion: 1,
     variant: {
@@ -1213,6 +1408,9 @@ async function installVariantFile(fileRelToPackage, packageRoot, projectRoot) {
     const targetRel = path9.posix.join(CONSUMER_TOKENS_DIR, CONSUMER_THEME_FILE);
     const targetAbs = path9.join(projectRoot, targetRel);
     const content = await fs6.readFile(sourceAbs, "utf-8");
+    if (await fileExists(targetAbs)) {
+      await backupFile(targetAbs, projectRoot);
+    }
     await writeFileSafe(targetAbs, content);
     return {
       id: `tokens:${CONSUMER_THEME_FILE}`,
@@ -1593,6 +1791,9 @@ async function installUiEntries(options) {
       const sourceAbs = path11.resolve(rootForEntry, file.source);
       const raw = await fs8.readFile(sourceAbs, "utf-8");
       const transformed = rewriteImports(raw, aliases);
+      if (exists) {
+        await backupFile(targetAbs, projectRoot);
+      }
       await writeFileSafe(targetAbs, transformed);
       written++;
       logger.info(`  write: ${rel(projectRoot, targetAbs)}`);
@@ -1963,18 +2164,29 @@ var ESLINT_DEPS = [
 ];
 var STYLELINT_DEPS = ["@teamix-evo/stylelint-config", "stylelint"];
 async function runLintInit(options) {
-  const { projectRoot, skipInstall } = options;
+  const {
+    projectRoot,
+    skipInstall,
+    eslintStrategy = "overwrite",
+    stylelintStrategy = "overwrite",
+    eslintExistingPaths = [],
+    stylelintExistingPaths = []
+  } = options;
   const eslintConfigPath = path13.join(projectRoot, "eslint.config.js");
   const stylelintConfigPath = path13.join(projectRoot, "stylelint.config.cjs");
-  const eslintExists = await fileExists(eslintConfigPath);
-  const stylelintExists = await fileExists(stylelintConfigPath);
-  if (eslintExists && stylelintExists) {
+  const eslintTemplateExists = await fileExists(eslintConfigPath);
+  const stylelintTemplateExists = await fileExists(stylelintConfigPath);
+  const eslintSkipRequested = eslintStrategy === "skip" && eslintExistingPaths.length > 0;
+  const stylelintSkipRequested = stylelintStrategy === "skip" && stylelintExistingPaths.length > 0;
+  const eslintNeedsWrite = !eslintTemplateExists && !eslintSkipRequested;
+  const stylelintNeedsWrite = !stylelintTemplateExists && !stylelintSkipRequested;
+  if (!eslintNeedsWrite && !stylelintNeedsWrite) {
     return { status: "already-initialized" };
   }
   if (!skipInstall) {
     const depsToInstall = [
-      ...eslintExists ? [] : ESLINT_DEPS,
-      ...stylelintExists ? [] : STYLELINT_DEPS
+      ...eslintNeedsWrite ? ESLINT_DEPS : [],
+      ...stylelintNeedsWrite ? STYLELINT_DEPS : []
     ];
     if (depsToInstall.length > 0) {
       const pm = detectPm(projectRoot);
@@ -1983,23 +2195,66 @@ async function runLintInit(options) {
       await execa(pm, args, { cwd: projectRoot, stdio: "inherit" });
     }
   }
+  if (eslintNeedsWrite && eslintExistingPaths.length > 0) {
+    for (const rel2 of eslintExistingPaths) {
+      await backupFile(path13.join(projectRoot, rel2), projectRoot);
+    }
+  }
+  if (stylelintNeedsWrite && stylelintExistingPaths.length > 0) {
+    for (const rel2 of stylelintExistingPaths) {
+      await backupFile(path13.join(projectRoot, rel2), projectRoot);
+    }
+  }
   let wroteEslint = false;
   let wroteStylelint = false;
-  if (!eslintExists) {
+  if (eslintNeedsWrite) {
     await writeFileSafe(eslintConfigPath, ESLINT_CONFIG_CONTENT);
     logger.debug(`Wrote eslint.config.js \u2192 ${eslintConfigPath}`);
     wroteEslint = true;
   }
-  if (!stylelintExists) {
+  if (stylelintNeedsWrite) {
     await writeFileSafe(stylelintConfigPath, STYLELINT_CONFIG_CONTENT);
     logger.debug(`Wrote stylelint.config.cjs \u2192 ${stylelintConfigPath}`);
     wroteStylelint = true;
   }
-  await patchPackageJsonScripts(projectRoot);
+  const packageJsonPatched = await patchPackageJsonScripts(projectRoot);
+  let stylelintIgnoreFilesWarning = false;
+  if (!stylelintNeedsWrite && stylelintTemplateExists) {
+    try {
+      const existingContent = fs9.readFileSync(stylelintConfigPath, "utf-8");
+      const usesTeamixPreset = existingContent.includes("@teamix-evo/stylelint-config/presets/") || existingContent.includes("@teamix-evo/stylelint-config/preset/");
+      const hasTokenIgnore = existingContent.includes("tokens.theme.css") && existingContent.includes("tokens.overrides.css");
+      if (!usesTeamixPreset && !hasTokenIgnore) {
+        stylelintIgnoreFilesWarning = true;
+        logger.warn(
+          [
+            "\u68C0\u6D4B\u5230\u73B0\u6709 stylelint \u914D\u7F6E\u672A\u6392\u9664 token \u5B9A\u4E49\u6587\u4EF6\u3002",
+            "\u5EFA\u8BAE\u5728 stylelint.config.cjs \u4E2D\u6DFB\u52A0 ignoreFiles:",
+            "",
+            "  ignoreFiles: [",
+            "    '**/tokens.theme.css',",
+            "    '**/tokens.overrides.css',",
+            "  ]",
+            "",
+            "\u6216\u5207\u6362\u5230 teamix-evo \u9884\u8BBE\u4EE5\u81EA\u52A8\u83B7\u5F97\u6392\u9664\u89C4\u5219:",
+            "",
+            "  extends: ['@teamix-evo/stylelint-config/presets/consumer']"
+          ].join("\n")
+        );
+      }
+    } catch {
+    }
+  }
   return {
     status: "installed",
     eslint: wroteEslint,
-    stylelint: wroteStylelint
+    stylelint: wroteStylelint,
+    eslintMergeRequested: wroteEslint && eslintStrategy === "merge" && eslintExistingPaths.length > 0,
+    stylelintMergeRequested: wroteStylelint && stylelintStrategy === "merge" && stylelintExistingPaths.length > 0,
+    eslintSkipped: eslintSkipRequested,
+    stylelintSkipped: stylelintSkipRequested,
+    packageJsonPatched,
+    stylelintIgnoreFilesWarning
   };
 }
 function detectPm(projectRoot) {
@@ -2010,12 +2265,12 @@ function detectPm(projectRoot) {
 async function patchPackageJsonScripts(projectRoot) {
   const pkgPath = path13.join(projectRoot, "package.json");
   const raw = await readFileOrNull(pkgPath);
-  if (!raw) return;
+  if (!raw) return false;
   let pkg;
   try {
     pkg = JSON.parse(raw);
   } catch {
-    return;
+    return false;
   }
   const scripts = pkg.scripts ?? {};
   let changed = false;
@@ -2028,17 +2283,22 @@ async function patchPackageJsonScripts(projectRoot) {
     changed = true;
   }
   if (changed) {
+    await backupFile(pkgPath, projectRoot);
     pkg.scripts = scripts;
     await writeFileSafe(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
     logger.debug("Patched package.json scripts with lint / lint:css");
   }
+  return changed;
 }
 
 // src/core/agents-md.ts
 import * as fs10 from "fs/promises";
 import * as path14 from "path";
+import { hasManagedRegion as hasManagedRegion2, replaceManagedRegion as replaceManagedRegion2 } from "@teamix-evo/registry";
+var AGENTS_MD_MANAGED_ID = "teamix-evo-skills";
 async function runGenerateAgentsMd(options) {
   const { projectRoot, variant, skillIds } = options;
+  const mode = options.mode ?? "overwrite";
   const ordered = [...skillIds].sort(
     (a, b) => bucketRank(a) - bucketRank(b) || a.localeCompare(b)
   );
@@ -2049,13 +2309,47 @@ async function runGenerateAgentsMd(options) {
     sections.push(section);
     if (missing) missingSkillIds.push(id);
   }
-  const body = renderAgentsMd({ variant, sections });
   const target = path14.join(projectRoot, "AGENTS.md");
-  await fs10.writeFile(target, body, "utf8");
+  const targetExists = await fileExists(target);
+  const fullTemplate = renderAgentsMd({ variant, sections });
+  const managedBody = renderManagedBlockBody({ variant, sections });
+  let outputContent;
+  let merge;
+  if (!targetExists) {
+    outputContent = fullTemplate;
+    merge = "created";
+  } else {
+    await backupFile(target, projectRoot);
+    if (mode === "merge-managed") {
+      const existing = await readFileOrNull(target) ?? "";
+      if (hasManagedRegion2(existing, AGENTS_MD_MANAGED_ID)) {
+        outputContent = replaceManagedRegion2(
+          existing,
+          AGENTS_MD_MANAGED_ID,
+          managedBody
+        );
+        merge = "managed-replaced";
+      } else {
+        const wrapped = wrapManagedBlock(managedBody);
+        outputContent = `${wrapped}
+
+${PRECEDENCE_NOTICE}
+
+${existing.trimStart()}`;
+        merge = "managed-prepended";
+      }
+    } else {
+      outputContent = fullTemplate;
+      merge = "overwritten";
+    }
+  }
+  await fs10.writeFile(target, outputContent, "utf8");
   return {
     path: target,
     skillCount: ordered.length,
-    missingSkillIds
+    missingSkillIds,
+    backedUp: targetExists,
+    merge
   };
 }
 function bucketRank(id) {
@@ -2065,10 +2359,7 @@ function bucketRank(id) {
 }
 async function renderSkillSection(projectRoot, skillId) {
   const skillPath = path14.join(
-    projectRoot,
-    ".teamix-evo",
-    "skills",
-    skillId,
+    getSkillsSourceDir(projectRoot, skillId),
     "SKILL.md"
   );
   const lines = [];
@@ -2093,16 +2384,25 @@ async function renderSkillSection(projectRoot, skillId) {
   if (parts?.coordinates) {
     lines.push(`- **Coordinates with**: ${parts.coordinates}`);
   }
-  lines.push(`- **\u4F4D\u7F6E**: \`.teamix-evo/skills/${skillId}/SKILL.md\``);
+  lines.push(`- **\u4F4D\u7F6E**: \`.teamix-evo/skills-source/${skillId}/SKILL.md\``);
   return { section: lines.join("\n"), missing };
 }
 function renderAgentsMd(args) {
+  const { variant, sections } = args;
+  const managedBody = renderManagedBlockBody({ variant, sections });
+  const wrapped = wrapManagedBlock(managedBody);
+  return `${wrapped}
+
+${PRECEDENCE_NOTICE}
+`;
+}
+function renderManagedBlockBody(args) {
   const { variant, sections } = args;
   const skillBlock = sections.length > 0 ? sections.join("\n\n") : "_\uFF08\u672C\u5DE5\u7A0B\u672A\u88C5\u914D\u5DE5\u7A0B\u7EA7 skill\u3002\uFF09_";
   return `# AGENTS.md
 
 > \u672C\u5DE5\u7A0B\u5DF2\u88C5\u914D Teamix Evo AI skills\u3002AI \u52A9\u624B\u5728\u4EE5\u4E0B\u573A\u666F\u4E0B**\u5FC5\u987B\u5148\u8BFB\u5BF9\u5E94 skill** \u518D\u52A8\u624B\u3002
-> \u672C\u6587\u4EF6\u7531 \`teamix-evo init\` / \`create-teamix-evo\` \u81EA\u52A8\u751F\u6210\uFF08regenerable\uFF0C[ADR 0038](https://github.com/teamix-evo/teamix-evo/blob/main/docs/adr/0038-create-agents-md-skill-trigger-fallback.md)\uFF09\uFF0C\u5237\u65B0\u65B9\u5F0F\u89C1\u5E95\u90E8\u3002
+> \u672C\u6587\u4EF6\u7531 \`teamix-evo init\` / \`create-teamix-evo\` \u81EA\u52A8\u751F\u6210\uFF08regenerable\uFF0C\u9075\u5FAA ADR 0038\uFF09\uFF0C\u5237\u65B0\u65B9\u5F0F\u89C1\u5E95\u90E8\u3002
 
 ## \u5DF2\u88C5 Skills\uFF08variant: ${variant}\uFF09
 
@@ -2115,9 +2415,22 @@ ${skillBlock}
 - \u6A21\u7CCA\u573A\u666F\uFF1A\u5148\u6309 SKIP \u53CD\u5411\u6392\u9664\uFF0C\u5269\u4F59\u552F\u4E00 skill \u5373\u4E3A\u5165\u53E3
 - \u751F\u547D\u5468\u671F\u547D\u4EE4\uFF08\`init\` / \`update\` / \`add\`\uFF09\u8D70 \`teamix-evo-manage\`\uFF08\u5168\u5C40 skill\uFF0C\u672C\u6587\u4EF6\u4E0D\u5217\uFF09
 
-> \u5237\u65B0\u672C\u6587\u4EF6\uFF1A\`npx teamix-evo skills add\` \u6216\u91CD\u8DD1 \`npm create teamix-evo\` / \`teamix-evo init\`\u3002
-`;
+## UI \u7EC4\u4EF6\u9886\u5730\uFF08init \u540E\u7EA6\u675F\uFF09
+
+- \`src/components/ui/\` \u7531 teamix-evo \u63A5\u7BA1\uFF0C\u7981\u6B62\u624B\u5DE5\u6216\u901A\u8FC7 shadcn CLI \u6DFB\u52A0\u65B0\u7EC4\u4EF6
+- \u5982\u9700\u65B0\u589E UI \u7EC4\u4EF6\uFF0C\u4F7F\u7528 \`npx teamix-evo ui add <id>\`
+- \`src/components/shadcn-ui/\` \u662F init \u524D legacy \u7EC4\u4EF6\u5F52\u6863\uFF0C\u53EA\u8BFB\uFF1B\u65B0\u4EE3\u7801\u4E0D\u5E94\u518D import
+- \u5347\u7EA7 legacy \u7EC4\u4EF6\uFF1A\u89E6\u53D1 teamix-evo-upgrade skill
+
+> \u5237\u65B0\u672C\u6587\u4EF6\uFF1A\`npx teamix-evo skills add\` \u6216\u91CD\u8DD1 \`npm create teamix-evo\` / \`teamix-evo init\`\u3002`;
+}
+function wrapManagedBlock(body) {
+  return `<!-- teamix-evo:managed:start id="${AGENTS_MD_MANAGED_ID}" -->
+${body}
+<!-- teamix-evo:managed:end id="${AGENTS_MD_MANAGED_ID}" -->`;
 }
+var PRECEDENCE_NOTICE = `<!-- teamix-evo:precedence -->
+> \u51B2\u7A81\u4EE5\u4E0A\u65B9\u7684 **Skills** \u7D22\u5F15\u4E3A\u51C6\uFF08\u4E0A\u6E38\u8DEF\u5F84\u4E0E TRIGGER/SKIP \u5951\u7EA6\uFF09\uFF1B\u9879\u76EE\u7279\u6709\u7684\u4EBA\u5DE5\u7EC6\u5219\u8BF7\u5199\u5728\u672C\u5904\u4EE5\u4E0B\u3001\u4E0D\u8981\u8986\u76D6\u4E0A\u65B9 managed \u533A\u57DF\u3002`;
 function extractDescriptionParts(fileContent) {
   const description = extractDescriptionBlock(fileContent);
   if (description == null) return null;
@@ -2311,6 +2624,26 @@ var INDEX_CSS_CANDIDATES = [
 ];
 var SHADCN_FILE_CANDIDATES = ["src/lib/utils.ts"];
 var SHADCN_DIR_CANDIDATES = ["src/components/ui"];
+var ESLINT_CONFIG_CANDIDATES = [
+  ".eslintrc.cjs",
+  ".eslintrc.js",
+  ".eslintrc.json",
+  ".eslintrc.yml",
+  "eslint.config.js",
+  "eslint.config.cjs",
+  "eslint.config.mjs",
+  "eslint.config.ts"
+];
+var STYLELINT_CONFIG_CANDIDATES = [
+  ".stylelintrc.cjs",
+  ".stylelintrc.js",
+  ".stylelintrc.json",
+  ".stylelintrc.yml",
+  "stylelint.config.cjs",
+  "stylelint.config.js",
+  "stylelint.config.mjs",
+  "stylelint.config.ts"
+];
 async function isDir(target) {
   try {
     const stat5 = await fs12.stat(target);
@@ -2487,7 +2820,9 @@ async function detectConflicts(cwd) {
     detectTailwindConfig(absCwd),
     detectTokens(absCwd),
     detectIndexCss(absCwd),
-    detectShadcnSource(absCwd)
+    detectShadcnSource(absCwd),
+    detectEslintConfig(absCwd),
+    detectStylelintConfig(absCwd)
   ]);
   return {
     cwd: absCwd,
@@ -2495,6 +2830,46 @@ async function detectConflicts(cwd) {
     hasAnyConflict: items.some((i) => i.exists)
   };
 }
+async function detectEslintConfig(cwd) {
+  const matched = [];
+  const contents = [];
+  for (const rel2 of ESLINT_CONFIG_CANDIDATES) {
+    const c = await readFileOrNull(path16.join(cwd, rel2));
+    if (c !== null) {
+      matched.push(rel2);
+      contents.push(c);
+    }
+  }
+  const exists = matched.length > 0;
+  return {
+    key: "eslint-config",
+    exists,
+    paths: matched,
+    fingerprint: exists ? fingerprint(contents) : void 0,
+    recommendedStrategy: exists ? "merge" : "overwrite",
+    availableStrategies: ["merge", "backup-overwrite", "overwrite", "skip"]
+  };
+}
+async function detectStylelintConfig(cwd) {
+  const matched = [];
+  const contents = [];
+  for (const rel2 of STYLELINT_CONFIG_CANDIDATES) {
+    const c = await readFileOrNull(path16.join(cwd, rel2));
+    if (c !== null) {
+      matched.push(rel2);
+      contents.push(c);
+    }
+  }
+  const exists = matched.length > 0;
+  return {
+    key: "stylelint-config",
+    exists,
+    paths: matched,
+    fingerprint: exists ? fingerprint(contents) : void 0,
+    recommendedStrategy: exists ? "merge" : "overwrite",
+    availableStrategies: ["merge", "backup-overwrite", "overwrite", "skip"]
+  };
+}
 
 // src/core/legacy-tokens-migrate.ts
 import * as path17 from "path";
@@ -2603,92 +2978,1301 @@ async function migrateLegacyTokens(options) {
   };
 }
 
-// src/core/snapshot.ts
+// src/core/ui-conflict-detector.ts
 import * as fs14 from "fs/promises";
 import * as path18 from "path";
-var TEAMIX_DIR2 = ".teamix-evo";
-var SNAPSHOTS_DIR = ".snapshots";
-var LOGS_DIR = "logs";
-var META_FILE = "_meta.json";
-var DEFAULT_KEEP = 5;
-function isoToFsSafe(iso) {
-  return iso.replace(/[:.]/g, "-");
-}
-function fsSafeToIso(safe) {
-  return safe.replace(
-    /^(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2})-(\d{3})(Z)$/,
-    "$1T$2:$3:$4.$5$6"
-  );
-}
-async function createSnapshot(projectRoot, opts = {}) {
-  const teamixDir = path18.join(projectRoot, TEAMIX_DIR2);
-  try {
-    const stat5 = await fs14.stat(teamixDir);
-    if (!stat5.isDirectory()) return null;
-  } catch (err) {
-    if (err.code === "ENOENT") return null;
-    throw err;
-  }
-  const isoTs = (/* @__PURE__ */ new Date()).toISOString();
-  const ts = isoToFsSafe(isoTs);
-  const snapshotRoot = path18.join(teamixDir, SNAPSHOTS_DIR);
-  const target = path18.join(snapshotRoot, ts);
-  await fs14.mkdir(target, { recursive: true });
-  const entries = await fs14.readdir(teamixDir, { withFileTypes: true });
-  for (const entry of entries) {
-    if (entry.name === SNAPSHOTS_DIR) continue;
-    if (entry.name === LOGS_DIR) continue;
-    const src = path18.join(teamixDir, entry.name);
-    const dst = path18.join(target, entry.name);
-    await fs14.cp(src, dst, { recursive: true });
+function looksLikeShadcnOriginal(content) {
+  if (content.includes("data-slot=")) return false;
+  if (content.includes("@teamix-evo")) return false;
+  if (content.includes("teamix-evo:managed")) return false;
+  return true;
+}
+async function detectUiConflicts(options) {
+  const { projectRoot, aliases, manifest } = options;
+  const conflicts = [];
+  const conflictDirSet = /* @__PURE__ */ new Set();
+  let totalChecked = 0;
+  for (const entry of manifest.entries) {
+    for (const file of entry.files) {
+      totalChecked++;
+      const aliasDir = aliases[file.targetAlias];
+      if (!aliasDir) continue;
+      const targetAbs = path18.join(projectRoot, aliasDir, file.targetName);
+      const exists = await fileExists(targetAbs);
+      if (!exists) continue;
+      let isShadcnOriginal = true;
+      try {
+        const content = await fs14.readFile(targetAbs, "utf-8");
+        isShadcnOriginal = looksLikeShadcnOriginal(content);
+      } catch {
+      }
+      const relativePath = path18.relative(projectRoot, targetAbs).replace(/\\/g, "/");
+      conflicts.push({
+        id: entry.id,
+        targetPath: targetAbs,
+        relativePath,
+        isShadcnOriginal
+      });
+      conflictDirSet.add(aliasDir);
+    }
   }
-  const meta = {
-    ts: isoTs,
-    reason: opts.reason ?? "manual"
+  return {
+    conflictEntries: conflicts,
+    unconflictedTargets: totalChecked - conflicts.length,
+    totalEntries: totalChecked,
+    shouldBlock: conflicts.length > 0,
+    conflictDirs: [...conflictDirSet]
   };
-  await fs14.writeFile(
-    path18.join(target, META_FILE),
-    JSON.stringify(meta, null, 2) + "\n",
-    "utf-8"
-  );
-  logger.debug(
-    `Snapshot created \u2192 ${path18.relative(projectRoot, target)} (${meta.reason})`
-  );
-  const keep = opts.keep ?? DEFAULT_KEEP;
-  await pruneSnapshots(projectRoot, keep, { protectedTs: opts.protectedTs });
-  return { ts, path: target };
 }
-async function listSnapshots(projectRoot) {
-  const snapshotRoot = path18.join(projectRoot, TEAMIX_DIR2, SNAPSHOTS_DIR);
-  let entries;
-  try {
-    entries = await fs14.readdir(snapshotRoot, { withFileTypes: true });
-  } catch (err) {
-    if (err.code === "ENOENT") return [];
-    throw err;
+
+// src/core/ui-isolate.ts
+import * as fs15 from "fs/promises";
+import * as path19 from "path";
+var IGNORE_DIR_NAMES = DEFAULT_SKIP_DIRS;
+async function runUiIsolate(options) {
+  const { projectRoot, aliases } = options;
+  const componentsDir = path19.join(projectRoot, aliases.components);
+  const legacyDir = path19.join(
+    projectRoot,
+    aliases.components.replace(/\/ui\/?$/, "/shadcn-ui")
+  );
+  const movedFiles = [];
+  const backedUpFiles = [];
+  let componentsJsonRemoved = false;
+  if (await fileExists(componentsDir)) {
+    await ensureDir(legacyDir);
+    const UI_EXTENSIONS = /* @__PURE__ */ new Set([
+      ".ts",
+      ".tsx",
+      ".js",
+      ".jsx",
+      ".css",
+      ".json",
+      ".md",
+      ".mdx"
+    ]);
+    const allUiFiles = await walkDir(componentsDir);
+    const uiFiles = allUiFiles.filter(
+      (f) => UI_EXTENSIONS.has(path19.extname(f))
+    );
+    for (const srcFile of uiFiles) {
+      const relFromUi = path19.relative(componentsDir, srcFile);
+      const destFile = path19.join(legacyDir, relFromUi);
+      await ensureDir(path19.dirname(destFile));
+      const content = await fs15.readFile(srcFile, "utf-8");
+      await fs15.writeFile(destFile, content, "utf-8");
+      try {
+        await fs15.unlink(srcFile);
+      } catch {
+        logger.warn(`Could not remove: ${srcFile}`);
+      }
+      const fromRel = path19.relative(projectRoot, srcFile).replace(/\\/g, "/");
+      const toRel = path19.relative(projectRoot, destFile).replace(/\\/g, "/");
+      movedFiles.push({ from: fromRel, to: toRel });
+    }
+    await pruneEmptyDirs(componentsDir);
+    logger.info(
+      `  moved ${movedFiles.length} files \u2192 ${path19.relative(
+        projectRoot,
+        legacyDir
+      )}/`
+    );
   }
-  const result = [];
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    const dir = path18.join(snapshotRoot, entry.name);
-    let isoTs = null;
-    let reason = null;
-    try {
-      const raw = await fs14.readFile(path18.join(dir, META_FILE), "utf-8");
-      const parsed = JSON.parse(raw);
-      if (typeof parsed.ts === "string") isoTs = parsed.ts;
-      if (typeof parsed.reason === "string" && ["init", "update", "switch", "restore", "manual"].includes(
-        parsed.reason
-      )) {
-        reason = parsed.reason;
+  const importRewrites = /* @__PURE__ */ new Map();
+  const srcDir = path19.join(projectRoot, "src");
+  if (await fileExists(srcDir)) {
+    const SCAN_EXTENSIONS = /* @__PURE__ */ new Set([".ts", ".tsx", ".js", ".jsx", ".mdx"]);
+    const allScanFiles = await walkDir(srcDir, DEFAULT_SKIP_DIRS);
+    const scanFiles = allScanFiles.filter((f) => {
+      const rel2 = path19.relative(projectRoot, f);
+      const segments = rel2.split(path19.sep);
+      if (segments.some((s) => IGNORE_DIR_NAMES.has(s))) return false;
+      return SCAN_EXTENSIONS.has(path19.extname(f));
+    });
+    const oldAlias = aliases.components;
+    const newAlias = oldAlias.replace(/\/ui\/?$/, "/shadcn-ui");
+    const oldWithoutSrc = oldAlias.replace(/^src\//, "");
+    const newWithoutSrc = newAlias.replace(/^src\//, "");
+    const dirName = path19.basename(oldAlias);
+    const newDirName = path19.basename(newAlias);
+    for (const file of scanFiles) {
+      const content = await fs15.readFile(file, "utf-8");
+      let modified = content;
+      let count = 0;
+      modified = modified.replace(
+        new RegExp(`(['"'\`])@/${escapeRegExp2(oldWithoutSrc)}/`, "g"),
+        (match, quote) => {
+          count++;
+          return `${quote}@/${newWithoutSrc}/`;
+        }
+      );
+      modified = modified.replace(
+        new RegExp(`(['"'\`])~/${escapeRegExp2(oldWithoutSrc)}/`, "g"),
+        (match, quote) => {
+          count++;
+          return `${quote}~/${newWithoutSrc}/`;
+        }
+      );
+      modified = modified.replace(
+        new RegExp(
+          `(from\\s+['"'\`](?:\\.\\.?\\/)+(?:[\\w.-]+\\/)*)${escapeRegExp2(
+            dirName
+          )}/`,
+          "g"
+        ),
+        (match) => {
+          count++;
+          return match.slice(0, -dirName.length - 1) + `${newDirName}/`;
+        }
+      );
+      if (count > 0) {
+        await fs15.writeFile(file, modified, "utf-8");
+        const relPath = path19.relative(projectRoot, file).replace(/\\/g, "/");
+        importRewrites.set(relPath, count);
       }
+    }
+    logger.info(`  rewrote imports in ${importRewrites.size} files`);
+  }
+  const componentsJsonPath = path19.join(projectRoot, "components.json");
+  if (await fileExists(componentsJsonPath)) {
+    await backupFile(componentsJsonPath, projectRoot);
+    backedUpFiles.push("components.json");
+    try {
+      await fs15.unlink(componentsJsonPath);
+      componentsJsonRemoved = true;
+      logger.info("  backed up and removed components.json");
     } catch {
-      isoTs = fsSafeToIso(entry.name);
+      logger.warn("  could not remove components.json");
     }
-    result.push({ ts: entry.name, isoTs, reason, path: dir });
   }
-  result.sort((a, b) => a.ts < b.ts ? 1 : a.ts > b.ts ? -1 : 0);
-  return result;
+  const libBackupTargets = [
+    path19.join(projectRoot, aliases.utils + ".ts"),
+    path19.join(projectRoot, aliases.lib, "color.ts")
+  ];
+  const hooksDir = path19.join(projectRoot, aliases.hooks);
+  if (await fileExists(hooksDir)) {
+    const allHookFiles = await walkDir(hooksDir, DEFAULT_SKIP_DIRS);
+    const hookFiles = allHookFiles.filter(
+      (f) => path19.extname(f) === ".ts" || path19.extname(f) === ".tsx"
+    );
+    libBackupTargets.push(...hookFiles);
+  }
+  for (const target of libBackupTargets) {
+    if (await fileExists(target)) {
+      await backupFile(target, projectRoot);
+      backedUpFiles.push(
+        path19.relative(projectRoot, target).replace(/\\/g, "/")
+      );
+    }
+  }
+  return {
+    movedFiles,
+    importRewrites,
+    componentsJsonRemoved,
+    backedUpFiles
+  };
+}
+function escapeRegExp2(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+async function pruneEmptyDirs(dir) {
+  try {
+    const entries = await fs15.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        await pruneEmptyDirs(path19.join(dir, entry.name));
+      }
+    }
+    const remaining = await fs15.readdir(dir);
+    if (remaining.length === 0) {
+      await fs15.rmdir(dir);
+    }
+  } catch {
+  }
+}
+
+// src/core/ui-upgrade.ts
+import * as path22 from "path";
+import { createRequire as createRequire5 } from "module";
+import {
+  loadUiPackageManifest as loadUiPackageManifest3,
+  loadVariantUiPackageManifest as loadVariantUiPackageManifest2
+} from "@teamix-evo/registry";
+
+// src/core/ui-upgrade-detector.ts
+import * as fs16 from "fs/promises";
+import * as path20 from "path";
+var PACKAGE_NAME = {
+  ui: "@teamix-evo/ui",
+  "biz-ui": "@teamix-evo/biz-ui"
+};
+var ALIAS_KEY = {
+  ui: "components",
+  "biz-ui": "business"
+};
+var COMPONENT_FILE_RE = /\.(tsx|ts)$/;
+var SKIP_FILENAMES = /* @__PURE__ */ new Set(["index.ts", "index.tsx"]);
+async function detectComponentLineage(options) {
+  const { projectRoot, category } = options;
+  const config = options.config ?? await readProjectConfig(projectRoot);
+  const installed = options.installed ?? await readInstalledManifest(projectRoot);
+  const installDir = resolveInstallDir(category, config);
+  const installDirAbs = path20.join(projectRoot, installDir);
+  const installDirExists = await directoryExists(installDirAbs);
+  const hasComponentsJson = await fileExists(
+    path20.join(projectRoot, "components.json")
+  );
+  const installedPkg = findInstalledPackage(installed, PACKAGE_NAME[category]);
+  const registeredIds = installedPkg ? extractIds(installedPkg).sort() : [];
+  const onDiskIds = installDirExists ? await listComponentIds(installDirAbs) : [];
+  const registeredSet = new Set(registeredIds);
+  const unregisteredIds = onDiskIds.filter((id) => !registeredSet.has(id)).sort();
+  const lineage = classifyLineage({
+    hasInstalled: installedPkg !== null,
+    hasComponentsJson,
+    onDiskIds,
+    unregisteredIds
+  });
+  return {
+    category,
+    lineage,
+    installDir,
+    installDirExists,
+    hasComponentsJson,
+    registeredIds,
+    unregisteredIds,
+    installedVersion: installedPkg?.version ?? null,
+    installedVariant: installedPkg?.variant ?? null
+  };
+}
+function resolveInstallDir(category, config) {
+  const aliasMap = config?.packages?.ui?.aliases ?? config?.packages?.["biz-ui"]?.aliases ?? DEFAULT_UI_ALIASES;
+  const key = ALIAS_KEY[category];
+  return aliasMap[key] ?? DEFAULT_UI_ALIASES[key];
+}
+function extractIds(pkg) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const r of pkg.resources) {
+    const colon = r.id.indexOf(":");
+    ids.add(colon >= 0 ? r.id.slice(0, colon) : r.id);
+  }
+  return [...ids];
+}
+async function directoryExists(p) {
+  try {
+    const stat5 = await fs16.stat(p);
+    return stat5.isDirectory();
+  } catch {
+    return false;
+  }
+}
+async function listComponentIds(installDirAbs) {
+  const entries = await fs16.readdir(installDirAbs, { withFileTypes: true });
+  const ids = [];
+  for (const e of entries) {
+    if (!e.isFile()) continue;
+    if (SKIP_FILENAMES.has(e.name)) continue;
+    if (!COMPONENT_FILE_RE.test(e.name)) continue;
+    ids.push(e.name.replace(COMPONENT_FILE_RE, ""));
+  }
+  return ids.sort();
+}
+function classifyLineage(args) {
+  const { hasInstalled, hasComponentsJson, onDiskIds, unregisteredIds } = args;
+  if (hasInstalled) {
+    return unregisteredIds.length === 0 ? "teamix-evo" : "mixed";
+  }
+  if (onDiskIds.length === 0) return "absent";
+  return hasComponentsJson ? "shadcn-native" : "custom-only";
+}
+
+// src/core/ui-upgrade-staging.ts
+import * as path21 from "path";
+var TEAMIX_DIR2 = ".teamix-evo";
+var STAGING_DIR = ".upgrade-staging";
+var PACKAGE_NAME2 = {
+  ui: "@teamix-evo/ui",
+  "biz-ui": "@teamix-evo/biz-ui"
+};
+function isoToFsSafe(iso) {
+  return iso.replace(/[:.]/g, "-");
+}
+async function buildUiUpgradeStaging(options) {
+  const { lineageReport, category } = options;
+  if (lineageReport.lineage !== "teamix-evo" && lineageReport.lineage !== "mixed") {
+    return null;
+  }
+  const installed = options.installed ?? await readInstalledManifest(options.projectRoot);
+  const installedPkg = findInstalledPackage(installed, PACKAGE_NAME2[category]);
+  if (!installedPkg) return null;
+  const isoTs = options.isoTs ?? (/* @__PURE__ */ new Date()).toISOString();
+  const fsTs = isoToFsSafe(isoTs);
+  const stagingDir = path21.join(
+    options.projectRoot,
+    TEAMIX_DIR2,
+    STAGING_DIR,
+    `${category}-${fsTs}`
+  );
+  const entryMap = new Map(
+    options.manifest.entries.map((e) => [e.id, e])
+  );
+  const resByEntryId = collectResourcesByEntry(installedPkg.resources);
+  const onlyIds = options.onlyIds && options.onlyIds.length > 0 ? new Set(options.onlyIds) : null;
+  const entries = [];
+  for (const id of lineageReport.registeredIds) {
+    if (onlyIds && !onlyIds.has(id)) continue;
+    const built = await processRegistered({
+      id,
+      entry: entryMap.get(id),
+      resource: resByEntryId.get(id),
+      packageRoot: options.packageRoot,
+      entryPackageRoot: options.entryPackageRoot,
+      aliases: options.aliases,
+      stagingDir,
+      projectRoot: options.projectRoot,
+      category,
+      sourceVersion: options.manifest.version
+    });
+    if (built) entries.push(built);
+  }
+  for (const id of lineageReport.unregisteredIds) {
+    if (onlyIds && !onlyIds.has(id)) continue;
+    const built = await processForeign({
+      id,
+      installDirAbs: path21.join(options.projectRoot, lineageReport.installDir),
+      stagingDir,
+      projectRoot: options.projectRoot,
+      category
+    });
+    if (built) entries.push(built);
+  }
+  if (entries.length === 0) return null;
+  const byRisk = aggregateByRisk(entries);
+  const manifestOut = {
+    schemaVersion: 1,
+    ts: isoTs,
+    package: category,
+    trigger: options.trigger,
+    variant: lineageReport.installedVariant ?? "_flat",
+    fromVersion: lineageReport.installedVersion ?? "",
+    toVersion: options.manifest.version,
+    lineage: lineageReport.lineage,
+    summary: { total: entries.length, byRisk },
+    entries
+  };
+  await ensureDir(stagingDir);
+  await writeFileSafe(
+    path21.join(stagingDir, "meta.json"),
+    JSON.stringify(manifestOut, null, 2) + "\n"
+  );
+  return { stagingDir, manifest: manifestOut };
+}
+async function processRegistered(args) {
+  const { id, entry, resource, stagingDir, projectRoot, category } = args;
+  if (!resource) return null;
+  const currentSource = await readFileOrNull(resource.target);
+  if (currentSource === null) {
+    return buildBreakingEntry({
+      id,
+      category,
+      resource,
+      projectRoot,
+      stagingDir,
+      currentSource: "",
+      hint: "installed file missing on disk"
+    });
+  }
+  if (!entry) {
+    return buildBreakingEntry({
+      id,
+      category,
+      resource,
+      projectRoot,
+      stagingDir,
+      currentSource,
+      hint: "entry removed in upstream package"
+    });
+  }
+  const file = entry.files[0];
+  if (!file) return null;
+  const rootForEntry = args.entryPackageRoot?.get(id) ?? args.packageRoot;
+  const sourceAbs = path21.resolve(rootForEntry, file.source);
+  const raw = await readFileOrNull(sourceAbs);
+  if (raw === null) {
+    return null;
+  }
+  const incomingTransformed = rewriteImports(raw, args.aliases);
+  const incomingHash = computeHash(incomingTransformed);
+  const currentExt = path21.extname(resource.target) || ".tsx";
+  const incomingExt = path21.extname(file.targetName) || currentExt;
+  const currentRel = `${id}/current${currentExt}`;
+  const incomingRel = `${id}/incoming${incomingExt}`;
+  await writeFileSafe(path21.join(stagingDir, currentRel), currentSource);
+  await writeFileSafe(path21.join(stagingDir, incomingRel), incomingTransformed);
+  const diff = classifyRisk({
+    currentHash: resource.hash,
+    incomingHash,
+    currentSource,
+    incomingSource: incomingTransformed,
+    multiFile: entry.files.length > 1
+  });
+  const promotion = derivePromotion({
+    currentSource,
+    incomingSource: incomingTransformed,
+    targetName: entry.files[0]?.targetName ?? `${id}.tsx`
+  });
+  return {
+    id,
+    category,
+    current: {
+      target: path21.relative(projectRoot, resource.target),
+      hash: resource.hash,
+      sourceLineage: "teamix-evo"
+    },
+    incoming: {
+      sourceVersion: args.sourceVersion,
+      hash: incomingHash,
+      relPath: incomingRel
+    },
+    diff,
+    promotion
+  };
+}
+async function processForeign(args) {
+  const { id, installDirAbs, stagingDir, projectRoot, category } = args;
+  const tsx = path21.join(installDirAbs, `${id}.tsx`);
+  const ts = path21.join(installDirAbs, `${id}.ts`);
+  const target = await fileExists(tsx) ? tsx : await fileExists(ts) ? ts : null;
+  if (!target) return null;
+  const raw = await readFileOrNull(target);
+  if (raw === null) return null;
+  const ext = path21.extname(target);
+  const currentRel = `${id}/current${ext}`;
+  await writeFileSafe(path21.join(stagingDir, currentRel), raw);
+  return {
+    id,
+    category,
+    current: {
+      target: path21.relative(projectRoot, target),
+      hash: computeHash(raw),
+      sourceLineage: "custom"
+    },
+    diff: {
+      riskLevel: "foreign",
+      hints: [
+        "component is on disk but not registered in .teamix-evo/manifest.json",
+        "AI should propose: (a) ignore, (b) re-register via teamix-evo ui add, or (c) remove"
+      ],
+      filesChangedCount: 0
+    }
+  };
+}
+async function buildBreakingEntry(args) {
+  const ext = path21.extname(args.resource.target) || ".tsx";
+  const currentRel = `${args.id}/current${ext}`;
+  await writeFileSafe(
+    path21.join(args.stagingDir, currentRel),
+    args.currentSource
+  );
+  return {
+    id: args.id,
+    category: args.category,
+    current: {
+      target: path21.relative(args.projectRoot, args.resource.target),
+      hash: args.resource.hash,
+      sourceLineage: "teamix-evo"
+    },
+    diff: {
+      riskLevel: "breaking",
+      hints: [args.hint],
+      filesChangedCount: 0
+    }
+  };
+}
+function classifyRisk(args) {
+  if (args.currentHash === args.incomingHash) {
+    return { riskLevel: "unchanged", hints: [], filesChangedCount: 0 };
+  }
+  const curExports = extractExportNames(args.currentSource);
+  const newExports = extractExportNames(args.incomingSource);
+  const removedExports = setDiff(curExports, newExports);
+  const addedExports = setDiff(newExports, curExports);
+  const curVariants = extractCvaVariantValues(args.currentSource);
+  const newVariants = extractCvaVariantValues(args.incomingSource);
+  const removedVariants = setDiff(curVariants, newVariants);
+  const addedVariants = setDiff(newVariants, curVariants);
+  const hints = [];
+  for (const e of removedExports) hints.push(`removed export: ${e}`);
+  for (const e of addedExports) hints.push(`new export: ${e}`);
+  for (const v of removedVariants) hints.push(`removed cva variant: ${v}`);
+  for (const v of addedVariants) hints.push(`new cva variant: ${v}`);
+  if (args.multiFile) hints.push("multi-file entry; only first file staged");
+  let riskLevel;
+  if (removedExports.length > 0 || removedVariants.length > 0) {
+    riskLevel = "risky";
+  } else if (addedExports.length > 0 || addedVariants.length > 0 || args.multiFile) {
+    riskLevel = "upgradable-medium";
+  } else {
+    riskLevel = "upgradable-low";
+  }
+  return { riskLevel, hints, filesChangedCount: 1 };
+}
+function extractExportNames(src) {
+  const names = /* @__PURE__ */ new Set();
+  const re = /^\s*export\s+(?:default\s+)?(?:async\s+)?(?:const|let|var|function|class|interface|type|enum)\s+(\w+)/gm;
+  let m;
+  while ((m = re.exec(src)) !== null) {
+    if (m[1]) names.add(m[1]);
+  }
+  for (const dm of src.matchAll(/^\s*export\s+default\s+(\w+)\s*;/gm)) {
+    if (dm[1]) names.add(dm[1]);
+  }
+  return [...names];
+}
+function extractCvaVariantValues(src) {
+  const block = extractVariantsBlock(src);
+  if (block === null) return [];
+  const names = /* @__PURE__ */ new Set();
+  for (const groupBody of extractGroupBodies(block)) {
+    for (const km of groupBody.matchAll(/^\s*(?:['"]?)(\w+)(?:['"]?)\s*:/gm)) {
+      if (km[1]) names.add(km[1]);
+    }
+  }
+  return [...names];
+}
+function extractVariantsBlock(src) {
+  const idx = src.search(/\bvariants\s*:\s*\{/);
+  if (idx < 0) return null;
+  const open = src.indexOf("{", idx);
+  if (open < 0) return null;
+  let depth = 0;
+  for (let i = open; i < src.length; i++) {
+    const c = src[i];
+    if (c === "{") depth++;
+    else if (c === "}") {
+      depth--;
+      if (depth === 0) return src.slice(open + 1, i);
+    }
+  }
+  return null;
+}
+function* extractGroupBodies(block) {
+  const re = /(\w+)\s*:\s*\{/g;
+  let m;
+  while ((m = re.exec(block)) !== null) {
+    const open = block.indexOf("{", m.index);
+    if (open < 0) continue;
+    let depth = 0;
+    for (let i = open; i < block.length; i++) {
+      const c = block[i];
+      if (c === "{") depth++;
+      else if (c === "}") {
+        depth--;
+        if (depth === 0) {
+          yield block.slice(open + 1, i);
+          re.lastIndex = i + 1;
+          break;
+        }
+      }
+    }
+  }
+}
+function setDiff(a, b) {
+  const bset = new Set(b);
+  return a.filter((x) => !bset.has(x)).sort();
+}
+function collectResourcesByEntry(resources) {
+  const out = /* @__PURE__ */ new Map();
+  for (const r of resources) {
+    const colon = r.id.indexOf(":");
+    const eid = colon >= 0 ? r.id.slice(0, colon) : r.id;
+    if (!out.has(eid)) out.set(eid, r);
+  }
+  return out;
+}
+function aggregateByRisk(entries) {
+  const out = {};
+  for (const e of entries) {
+    const k = e.diff.riskLevel;
+    out[k] = (out[k] ?? 0) + 1;
+  }
+  return out;
+}
+function derivePromotion(args) {
+  const fileType = classifyPromoteFileType(args.targetName, args.currentSource);
+  const featureVector = buildFeatureVector(
+    args.currentSource,
+    args.incomingSource
+  );
+  const { recommendedModes, confidence, reasons } = scorePromotionModes(
+    fileType,
+    featureVector
+  );
+  return { fileType, featureVector, recommendedModes, confidence, reasons };
+}
+function classifyPromoteFileType(targetName, src) {
+  if (targetName.endsWith(".d.ts")) return "type";
+  if (/^use-[a-z0-9-]+\.tsx?$/i.test(targetName)) return "hook";
+  const hasJsx = /<[A-Za-z][^>]*?>/.test(src);
+  const hasReactImport = /from ['"]react['"]/.test(src);
+  const hasProvider = /\.Provider\b/.test(src) || /createContext\s*[<(]/.test(src);
+  if (hasProvider && (hasJsx || hasReactImport)) return "provider";
+  if (hasJsx || /forwardRef\s*[<(]/.test(src)) return "component";
+  if (!hasJsx && !hasReactImport) return "util";
+  return "component";
+}
+function buildFeatureVector(current, incoming) {
+  const curExports = extractExportNames(current);
+  const newExports = extractExportNames(incoming);
+  const apiAdded = setDiff(curExports, newExports);
+  const apiRemoved = setDiff(newExports, curExports);
+  const curVariants = extractCvaVariantValues(current);
+  const newVariants = extractCvaVariantValues(incoming);
+  const cvaAdded = setDiff(curVariants, newVariants);
+  const cvaModified = [];
+  const sharedVariants = curVariants.filter((v) => newVariants.includes(v));
+  for (const v of sharedVariants) {
+    if (extractVariantBody(current, v) !== extractVariantBody(incoming, v)) {
+      cvaModified.push(v);
+    }
+  }
+  const curClass = extractClassNameLiterals(current);
+  const newClass = extractClassNameLiterals(incoming);
+  const classNameDiff = curClass !== newClass;
+  const curTokens = extractTokenRefs(current);
+  const newTokens = extractTokenRefs(incoming);
+  const tokenUsageDiff = curTokens.size !== newTokens.size || [...curTokens].some((t) => !newTokens.has(t));
+  const hasState = /\buseState\s*[<(]/.test(current);
+  const hasEffect = /\b(useEffect|useLayoutEffect|useMemo|useCallback)\s*[<(]/.test(current);
+  const curImports = extractImportSources(current);
+  const newImports = extractImportSources(incoming);
+  const hasExtraImports = [...curImports].some((src) => !newImports.has(src));
+  const tagSet = /* @__PURE__ */ new Set();
+  for (const m of current.matchAll(/<([A-Z]\w+)[\s/>]/g)) {
+    if (m[1]) tagSet.add(m[1]);
+  }
+  const atomicChildren = [...tagSet];
+  const isComposition = atomicChildren.length > 2;
+  const signatureChanged = extractDefaultParamList(current) !== extractDefaultParamList(incoming);
+  return {
+    apiDelta: { added: apiAdded, removed: apiRemoved, signatureChanged },
+    styleDelta: { classNameDiff, tokenUsageDiff },
+    logicDelta: { hasState, hasEffect, hasExtraImports },
+    cvaDelta: { addedVariants: cvaAdded, modifiedVariants: cvaModified },
+    structureDelta: { isComposition, atomicChildren }
+  };
+}
+function scorePromotionModes(fileType, fv) {
+  const reasons = [];
+  if (fileType === "hook" || fileType === "util" || fileType === "type") {
+    reasons.push(
+      `fileType=${fileType} \u2014 not a component, deferred to ManualReview`
+    );
+    return { recommendedModes: ["ManualReview"], confidence: 0.5, reasons };
+  }
+  const apiNoChange = fv.apiDelta.added.length === 0 && fv.apiDelta.removed.length === 0 && !fv.apiDelta.signatureChanged;
+  const logicMinimal = !fv.logicDelta.hasState && !fv.logicDelta.hasEffect && !fv.logicDelta.hasExtraImports;
+  if (fv.apiDelta.removed.length > 0 || fv.apiDelta.signatureChanged) {
+    reasons.push(
+      "signature changed or props removed \u2014 Coexist preserves user version"
+    );
+    return { recommendedModes: ["Coexist"], confidence: 0.85, reasons };
+  }
+  if (apiNoChange && logicMinimal && (fv.styleDelta.classNameDiff || fv.styleDelta.tokenUsageDiff) && fv.cvaDelta.addedVariants.length === 0 && fv.cvaDelta.modifiedVariants.length === 0) {
+    reasons.push(
+      "only style / token differences \u2014 push to tokens.overrides.css"
+    );
+    return { recommendedModes: ["TokenOnly"], confidence: 0.8, reasons };
+  }
+  const modes = [];
+  let score = 0;
+  if (fv.cvaDelta.addedVariants.length > 0 || fv.cvaDelta.modifiedVariants.length > 0) {
+    modes.push("Variant");
+    reasons.push(
+      `cva variants delta: +${fv.cvaDelta.addedVariants.length} ~${fv.cvaDelta.modifiedVariants.length}`
+    );
+    score = Math.max(score, 0.7);
+  }
+  if (fv.logicDelta.hasState || fv.logicDelta.hasEffect || fv.logicDelta.hasExtraImports || fv.apiDelta.added.length > 0) {
+    modes.push("Wrapper");
+    reasons.push("user added state / effect / imports / props");
+    score = Math.max(score, 0.75);
+  }
+  if (apiNoChange && logicMinimal && !fv.styleDelta.classNameDiff && !fv.styleDelta.tokenUsageDiff && fv.cvaDelta.addedVariants.length === 0 && fv.cvaDelta.modifiedVariants.length === 0) {
+    modes.push("Preset");
+    reasons.push("no API/logic delta \u2014 Preset captures default-prop tweaks");
+    score = Math.max(score, 0.6);
+  }
+  if (fv.structureDelta.isComposition) {
+    modes.push("Compose");
+    reasons.push(
+      `composition of ${fv.structureDelta.atomicChildren.length} atomic children`
+    );
+    score = Math.max(score, 0.65);
+  }
+  if (modes.length === 0) {
+    reasons.push("no axis crossed the 0.6 threshold");
+    return { recommendedModes: ["ManualReview"], confidence: 0.4, reasons };
+  }
+  return { recommendedModes: modes, confidence: score, reasons };
+}
+function extractVariantBody(src, key) {
+  const block = extractVariantsBlock(src);
+  if (block === null) return "";
+  const re = new RegExp(`(?:["']?${key}["']?)\\s*:\\s*\\{`);
+  const idx = block.search(re);
+  if (idx < 0) return "";
+  const open = block.indexOf("{", idx);
+  if (open < 0) return "";
+  let depth = 0;
+  for (let i = open; i < block.length; i++) {
+    const c = block[i];
+    if (c === "{") depth++;
+    else if (c === "}") {
+      depth--;
+      if (depth === 0) return block.slice(open + 1, i);
+    }
+  }
+  return "";
+}
+function extractClassNameLiterals(src) {
+  const out = [];
+  for (const m of src.matchAll(/className\s*=\s*["'`]([^"'`]*)["'`]/g)) {
+    if (m[1]) out.push(m[1]);
+  }
+  for (const m of src.matchAll(/\b(?:cn|clsx|cva)\s*\(/g)) {
+    const open = (m.index ?? 0) + m[0].length - 1;
+    let depth = 1;
+    let i = open + 1;
+    for (; i < src.length && depth > 0; i++) {
+      const c = src[i];
+      if (c === "(") depth++;
+      else if (c === ")") depth--;
+    }
+    const body = src.slice(open + 1, i - 1);
+    for (const lit of body.matchAll(/["'`]([^"'`]*)["'`]/g)) {
+      if (lit[1]) out.push(lit[1]);
+    }
+  }
+  return out.sort().join("|");
+}
+function extractTokenRefs(src) {
+  const out = /* @__PURE__ */ new Set();
+  for (const m of src.matchAll(/var\(--([a-z0-9-]+)\)/g)) {
+    if (m[1]) out.add(m[1]);
+  }
+  for (const m of src.matchAll(/--([a-z][a-z0-9-]*)\s*:/g)) {
+    if (m[1]) out.add(m[1]);
+  }
+  return out;
+}
+function extractImportSources(src) {
+  const out = /* @__PURE__ */ new Set();
+  for (const m of src.matchAll(/^\s*import\b[^'"]*['"]([^'"]+)['"]/gm)) {
+    if (m[1]) out.add(m[1]);
+  }
+  return out;
+}
+function extractDefaultParamList(src) {
+  const m = /export\s+default\s+(?:async\s+)?function\s+\w*\s*\(([^)]*)\)/.exec(src) ?? /export\s+default\s+(?:\([^)]*\)|\w+)\s*=>/.exec(src) ?? /(?:const|function)\s+\w+\s*=?\s*(?:\(([^)]*)\)|\w+)\s*(?:=>|\{)/.exec(src);
+  return m?.[1]?.replace(/\s+/g, " ").trim() ?? "";
+}
+
+// src/core/ui-upgrade.ts
+var nodeRequire = createRequire5(import.meta.url);
+function resolvePackageRoot4(packageName) {
+  const pkgJsonPath = nodeRequire.resolve(`${packageName}/package.json`);
+  return path22.dirname(pkgJsonPath);
+}
+async function runUiUpgrade(options) {
+  const { projectRoot, category, ids = [], trigger } = options;
+  const config = await readProjectConfig(projectRoot);
+  if (!config) return { status: "not-initialized" };
+  const cfgKey = category === "ui" ? "ui" : "biz-ui";
+  if (!config.packages?.[cfgKey]) {
+    return { status: "not-installed", detail: `${category} not installed` };
+  }
+  const aliases = config.packages.ui?.aliases ?? config.packages["biz-ui"]?.aliases;
+  if (!aliases) {
+    return {
+      status: "not-installed",
+      detail: `${category} aliases not configured (run \`teamix-evo ui init\` first)`
+    };
+  }
+  const installed = await readInstalledManifest(projectRoot);
+  const lineageReport = await detectComponentLineage({
+    projectRoot,
+    category,
+    config,
+    installed
+  });
+  if (lineageReport.lineage !== "teamix-evo" && lineageReport.lineage !== "mixed") {
+    return {
+      status: "skipped",
+      detail: `lineage=${lineageReport.lineage}; nothing to stage`,
+      lineage: lineageReport.lineage
+    };
+  }
+  if (ids.length > 0) {
+    const knownIds = /* @__PURE__ */ new Set([
+      ...lineageReport.registeredIds,
+      ...lineageReport.unregisteredIds
+    ]);
+    const unknown = ids.filter((id) => !knownIds.has(id));
+    if (unknown.length > 0) {
+      throw new Error(
+        `Unknown ${category} component id(s): ${unknown.map((s) => `"${s}"`).join(
+          ", "
+        )}. Hint: \`teamix-evo ${category} list\` shows available ids.`
+      );
+    }
+  }
+  const built = await buildStaging({
+    category,
+    projectRoot,
+    aliases,
+    lineageReport,
+    trigger,
+    onlyIds: ids,
+    uiPackageRoot: options.uiPackageRoot,
+    bizUiPackageRoot: options.bizUiPackageRoot
+  });
+  if (built === null) {
+    return {
+      status: "skipped",
+      detail: "no entries to stage",
+      lineage: lineageReport.lineage
+    };
+  }
+  return {
+    status: "staged",
+    stagingDir: built.stagingDir,
+    manifest: built.manifest
+  };
+}
+async function buildStaging(args) {
+  const { category, projectRoot, aliases, lineageReport, trigger, onlyIds } = args;
+  if (category === "ui") {
+    const root = args.uiPackageRoot ?? resolvePackageRoot4("@teamix-evo/ui");
+    const manifest = await loadUiPackageManifest3(root);
+    return buildUiUpgradeStaging({
+      projectRoot,
+      category,
+      manifest,
+      packageRoot: root,
+      aliases,
+      lineageReport,
+      trigger,
+      onlyIds
+    });
+  }
+  const bizRoot = args.bizUiPackageRoot ?? resolvePackageRoot4("@teamix-evo/biz-ui");
+  const variant = lineageReport.installedVariant ?? "_flat";
+  const variantDir = path22.join(bizRoot, "variants", variant);
+  const variantManifest = await loadVariantUiPackageManifest2(variantDir);
+  const uiRoot = args.uiPackageRoot ?? resolvePackageRoot4("@teamix-evo/ui");
+  const uiManifest = await loadUiPackageManifest3(uiRoot);
+  const entryPackageRoot = /* @__PURE__ */ new Map();
+  const merged = [];
+  for (const e of variantManifest.entries) {
+    entryPackageRoot.set(e.id, variantDir);
+    merged.push(e);
+  }
+  for (const e of uiManifest.entries) {
+    if (entryPackageRoot.has(e.id)) continue;
+    entryPackageRoot.set(e.id, uiRoot);
+    merged.push(e);
+  }
+  const synthetic = {
+    schemaVersion: 1,
+    package: "ui",
+    version: variantManifest.version,
+    engines: variantManifest.engines,
+    entries: merged
+  };
+  return buildUiUpgradeStaging({
+    projectRoot,
+    category,
+    manifest: synthetic,
+    packageRoot: variantDir,
+    entryPackageRoot,
+    aliases,
+    lineageReport,
+    trigger,
+    onlyIds
+  });
+}
+
+// src/core/deps-install.ts
+import * as fs17 from "fs/promises";
+import * as path23 from "path";
+import { exec } from "child_process";
+import { promisify } from "util";
+var execAsync = promisify(exec);
+async function detectPackageManager(projectRoot) {
+  if (await fileExists(path23.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
+  if (await fileExists(path23.join(projectRoot, "pnpm-workspace.yaml")))
+    return "pnpm";
+  if (await fileExists(path23.join(projectRoot, "bun.lockb"))) return "bun";
+  if (await fileExists(path23.join(projectRoot, "bun.lock"))) return "bun";
+  if (await fileExists(path23.join(projectRoot, "yarn.lock"))) return "yarn";
+  return "npm";
+}
+function getInstallCommand(pm) {
+  switch (pm) {
+    case "pnpm":
+      return "pnpm install";
+    case "yarn":
+      return "yarn install";
+    case "bun":
+      return "bun install";
+    case "npm":
+      return "npm install";
+  }
+}
+async function installProjectDeps(options) {
+  const { projectRoot, npmDependencies, skipInstall = false } = options;
+  const pkgPath = path23.join(projectRoot, "package.json");
+  const raw = await readFileOrNull(pkgPath);
+  if (!raw) {
+    throw new Error(
+      `package.json not found at ${projectRoot}. Cannot install dependencies.`
+    );
+  }
+  const pkg = JSON.parse(raw);
+  const existingDeps = {
+    ...pkg.dependencies,
+    ...pkg.devDependencies
+  };
+  const added = {};
+  const existed = {};
+  for (const [name, range] of Object.entries(npmDependencies)) {
+    if (existingDeps[name]) {
+      existed[name] = existingDeps[name];
+    } else {
+      added[name] = range;
+    }
+  }
+  if (Object.keys(added).length > 0) {
+    if (!pkg.dependencies) pkg.dependencies = {};
+    for (const [name, range] of Object.entries(added)) {
+      pkg.dependencies[name] = range;
+    }
+    pkg.dependencies = Object.fromEntries(
+      Object.entries(pkg.dependencies).sort(([a], [b]) => a.localeCompare(b))
+    );
+    await fs17.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
+    logger.info(
+      `  patched package.json: +${Object.keys(added).length} dependencies`
+    );
+  }
+  const packageManager = await detectPackageManager(projectRoot);
+  let installed = false;
+  if (!skipInstall && Object.keys(added).length > 0) {
+    const cmd = getInstallCommand(packageManager);
+    logger.info(`  running ${cmd}...`);
+    try {
+      await execAsync(cmd, { cwd: projectRoot, timeout: 12e4 });
+      installed = true;
+      logger.info("  install complete");
+    } catch (err) {
+      logger.warn(
+        `  install failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+      logger.warn("  please run install manually");
+    }
+  }
+  return { added, existed, installed, packageManager };
+}
+
+// src/core/ui-migration-plan-template.ts
+import * as fs18 from "fs/promises";
+import * as path24 from "path";
+async function generateMigrationPlan(options) {
+  const { projectRoot, strategy, isolateResult, addResult, residualImports } = options;
+  const now = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+  const planDir = path24.join(projectRoot, ".qoder", "plans");
+  await ensureDir(planDir);
+  const planPath = path24.join(planDir, "teamix-evo-ui-migration.md");
+  const movedSection = isolateResult.movedFiles.length > 0 ? isolateResult.movedFiles.map((f) => `| \`${f.from}\` | \`${f.to}\` |`).join("\n") : "| _(\u65E0\u642C\u8FC1)_ | |";
+  const installedSection = addResult.orderedIds.map((id) => `- \`${id}\``).join("\n");
+  const rewriteCount = isolateResult.importRewrites.size;
+  const rewriteSection = rewriteCount > 0 ? [...isolateResult.importRewrites.entries()].map(([file, count]) => `- \`${file}\`: ${count} \u5904`).join("\n") : "_(\u65E0 import \u91CD\u5199)_";
+  const strategyLabel = strategy === "isolate-progressive" ? "\u9694\u79BB + \u6E10\u8FDB\u8FC1\u79FB\uFF08Path A\uFF09" : strategy === "isolate-aggressive" ? "\u9694\u79BB + \u4E3B\u52A8\u5347\u7EA7\uFF08Path C\uFF09" : "\u8DF3\u8FC7\u5DF2\u6709\u6587\u4EF6";
+  const residualSection = residualImports != null && residualImports > 0 ? `
+## \u6B8B\u7559 import \u6E05\u5355
+
+\u53D1\u73B0 ${residualImports} \u5904\u6B8B\u7559\u5F15\u7528\uFF0C\u9700\u4EBA\u5DE5\u4FEE\u590D\u3002\u8BE6\u89C1 lint \u8F93\u51FA\u4E2D\u7684 \`no-legacy-shadcn-import\` \u8B66\u544A\u3002
+` : "";
+  const nextSteps = strategy === "isolate-aggressive" ? `1. \u67E5\u770B \`.teamix-evo/.upgrade-staging/\` \u4E2D\u7684\u5347\u7EA7 staging
+2. \u89E6\u53D1 \`teamix-evo-upgrade\` skill \u8FDB\u884C\u5206\u6279\u66FF\u6362
+3. \u9010\u6B65\u5C06 \`shadcn-ui/\` \u4E2D\u7684\u7EC4\u4EF6\u66FF\u6362\u4E3A \`ui/\` \u7248\u672C
+4. \u66FF\u6362\u5B8C\u6210\u540E\u5220\u9664 \`shadcn-ui/\` \u76EE\u5F55
+5. \u8FD0\u884C \`npx teamix-evo tokens treat\` \u8FDB\u884C token \u6CBB\u7406` : `1. \u9010\u6B65\u5C06\u4E1A\u52A1\u4EE3\u7801\u4E2D\u7684 \`@/components/shadcn-ui/...\` \u66FF\u6362\u4E3A \`@/components/ui/...\`
+2. ESLint \`no-legacy-shadcn-import\` \u89C4\u5219\u4F1A\u63D0\u793A\u54EA\u4E9B\u6587\u4EF6\u8FD8\u5728\u5F15\u7528\u65E7\u7EC4\u4EF6
+3. \u5168\u90E8\u66FF\u6362\u5B8C\u6210\u540E\u5220\u9664 \`src/components/shadcn-ui/\` \u76EE\u5F55
+4. \u8FD0\u884C \`npx teamix-evo tokens treat\` \u8FDB\u884C token \u6CBB\u7406`;
+  const content = `# teamix-evo UI \u8FC1\u79FB\u8BA1\u5212
+
+> \u751F\u6210\u65F6\u95F4: ${now}
+> \u8FC1\u79FB\u7B56\u7565: ${strategyLabel}
+
+## \u642C\u8FC1\u8BB0\u5F55
+
+| \u539F\u8DEF\u5F84 | \u65B0\u8DEF\u5F84 |
+| ------ | ------ |
+${movedSection}
+
+## \u5DF2\u5B89\u88C5 teamix-evo \u7EC4\u4EF6\uFF08${addResult.orderedIds.length} \u4E2A\uFF09
+
+${installedSection}
+
+## Import \u91CD\u5199\u8BB0\u5F55\uFF08${rewriteCount} \u4E2A\u6587\u4EF6\uFF09
+
+${rewriteSection}
+
+## components.json
+
+${isolateResult.componentsJsonRemoved ? "\u5DF2\u5907\u4EFD\u81F3 `.teamix-evo/.backups/` \u5E76\u5220\u9664\u539F\u6587\u4EF6\u3002" : "\u672A\u53D1\u73B0 components.json\u3002"}
+
+## \u5907\u4EFD\u6587\u4EF6
+
+${isolateResult.backedUpFiles.length > 0 ? isolateResult.backedUpFiles.map((f) => `- \`${f}\``).join("\n") : "_(\u65E0\u5907\u4EFD)_"}
+${residualSection}
+## \u540E\u7EED\u6B65\u9AA4
+
+${nextSteps}
+
+## npm \u4F9D\u8D56
+
+\u5DF2\u81EA\u52A8\u5B89\u88C5\u7684\u4F9D\u8D56:
+${Object.entries(addResult.npmDependencies).length > 0 ? Object.entries(addResult.npmDependencies).map(([name, version]) => `- \`${name}@${version}\``).join("\n") : "_(\u65E0\u989D\u5916\u4F9D\u8D56)_"}
+`;
+  await fs18.writeFile(planPath, content, "utf-8");
+  return planPath;
+}
+
+// src/core/residual-import-detector.ts
+import * as fs19 from "fs/promises";
+import * as path25 from "path";
+var LEGACY_PATTERNS = [
+  /['"`]@\/components\/shadcn-ui\//,
+  /['"`]~\/components\/shadcn-ui\//,
+  /['"`]\.\.?\/.*shadcn-ui\//,
+  /from\s+['"].*shadcn-ui\//
+];
+async function detectResidualImports(projectRoot) {
+  const srcDir = path25.join(projectRoot, "src");
+  const SCAN_EXTENSIONS = /* @__PURE__ */ new Set([
+    ".ts",
+    ".tsx",
+    ".js",
+    ".jsx",
+    ".mdx",
+    ".css",
+    ".scss"
+  ]);
+  let filesScanned = 0;
+  const entries = [];
+  const affectedFileSet = /* @__PURE__ */ new Set();
+  if (await fileExists(srcDir)) {
+    const allFiles = await walkDir(srcDir, DEFAULT_SKIP_DIRS);
+    const scanFiles = allFiles.filter(
+      (f) => SCAN_EXTENSIONS.has(path25.extname(f))
+    );
+    for (const file of scanFiles) {
+      filesScanned++;
+      const content = await fs19.readFile(file, "utf-8");
+      const lines = content.split("\n");
+      const relPath = path25.relative(projectRoot, file).replace(/\\/g, "/");
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        for (const pattern of LEGACY_PATTERNS) {
+          if (pattern.test(line)) {
+            entries.push({
+              file: relPath,
+              line: i + 1,
+              content: line.trim()
+            });
+            affectedFileSet.add(relPath);
+            break;
+          }
+        }
+      }
+    }
+  }
+  const rootConfigFiles = [
+    "vite.config.ts",
+    "vite.config.js",
+    "next.config.ts",
+    "next.config.js",
+    "tsconfig.json",
+    ".storybook/main.ts",
+    ".storybook/main.js"
+  ];
+  for (const configFile of rootConfigFiles) {
+    const configPath = path25.join(projectRoot, configFile);
+    if (await fileExists(configPath)) {
+      filesScanned++;
+      const content = await fs19.readFile(configPath, "utf-8");
+      const lines = content.split("\n");
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        for (const pattern of LEGACY_PATTERNS) {
+          if (pattern.test(line)) {
+            entries.push({
+              file: configFile,
+              line: i + 1,
+              content: line.trim()
+            });
+            affectedFileSet.add(configFile);
+            break;
+          }
+        }
+      }
+    }
+  }
+  return {
+    filesScanned,
+    entries,
+    affectedFiles: affectedFileSet.size
+  };
+}
+
+// src/core/init-checklist-template.ts
+var STEP_LABELS = {
+  tokens: "tokens \u2014 design tokens \u5B89\u88C5",
+  skills: "skills \u2014 AI skills \u5B89\u88C5",
+  "agents-md": "agents-md \u2014 AGENTS.md \u751F\u6210",
+  "ui-init": "ui-init \u2014 UI \u914D\u7F6E\u521D\u59CB\u5316",
+  "ui-add": "ui-add \u2014 UI \u7EC4\u4EF6\u5B89\u88C5",
+  lint: "lint \u2014 ESLint + Stylelint \u914D\u7F6E",
+  gitignore: "gitignore \u2014 .gitignore \u8FFD\u52A0"
+};
+function renderInitChecklist(args) {
+  const { variant, status, steps } = args;
+  const ts = args.timestamp ?? (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").slice(0, 19);
+  const phaseA = steps.map((s) => {
+    const label = STEP_LABELS[s.name] ?? s.name;
+    const checked = s.status === "ok" ? "x" : " ";
+    const suffix = s.status === "ok" ? "" : s.status === "skip" ? "\uFF08\u8DF3\u8FC7\uFF09" : s.status === "fail" ? `\uFF08\u5931\u8D25\uFF1A${s.detail ?? "unknown"}\uFF09` : "\uFF08\u8BA1\u5212\u4E2D\uFF09";
+    return `- [${checked}] ${label}${suffix}`;
+  }).join("\n");
+  return `# teamix-evo init \u68C0\u67E5\u6E05\u5355
+
+> \u7531 \`teamix-evo init\` \u81EA\u52A8\u751F\u6210 \xB7 ${ts}
+> variant: ${variant} \xB7 status: ${status}
+
+## Phase A \xB7 CLI \u843D\u5730\uFF08\u81EA\u52A8\u5B8C\u6210\uFF09
+
+${phaseA}
+
+## Phase B \xB7 AI \u4E32\u573A\uFF086 \u6B65\u95ED\u73AF\uFF09
+
+> \u4EE5\u4E0B\u6B65\u9AA4\u7531\u5BA2\u6237\u4FA7 AI \u5728 IDE \u4E2D\u9010\u6B65\u6267\u884C\u3002\u26A0\uFE0F \u6807\u8BB0\u7684\u6B65\u9AA4\u4E3A HARD GATE\uFF0C
+> \u5FC5\u987B\u6267\u884C\u5B8C\u6BD5\u5E76\u5F81\u5F97\u7528\u6237\u786E\u8BA4\u540E\u624D\u80FD\u7EE7\u7EED\uFF08\u53C2\u89C1 manage SKILL.md\u300CHARD GATE \u534F\u8BAE\u300D\uFF09\u3002
+
+- [ ] \u26A0\uFE0F HARD GATE\uFF1Aadopt \u2014 \`npx teamix-evo ui add --adopt\`
+- [ ] \u26A0\uFE0F HARD GATE\uFF1Aupgrade staging \u2014 \`npx teamix-evo ui upgrade\`\uFF08+ \`biz-ui upgrade\`\uFF09
+- [ ] \u26A0\uFE0F HARD GATE\uFF1Atokens audit \u2014 \`npx teamix-evo tokens audit\`
+- [ ] AGENTS.md \u56DE\u586B \u2014 \u5F52\u7C7B\u9879\u76EE\u7279\u6709\u89C4\u5219\uFF0C\u585E\u56DE managed \u533A\u57DF\u4E4B\u524D
+- [ ] lint \u2014 \`npx teamix-evo lint init -y\` + \`pnpm lint\`
+- [ ] \u26A0\uFE0F HARD GATE\uFF1Atoken \u6CBB\u7406 \u2014 \u89E6\u53D1 \`teamix-evo-upgrade\` skill Part C\uFF08Token treatment pipeline\uFF09
+
+## \u5907\u6CE8
+
+- Phase A \u4E2D\u5931\u8D25\u6216\u8DF3\u8FC7\u7684\u6B65\u9AA4\u4E0D\u5F71\u54CD Phase B \u542F\u52A8\uFF0C\u4F46\u5EFA\u8BAE\u5148\u4FEE\u590D\u518D\u7EE7\u7EED
+- \u4FEE\u590D\u540E\u91CD\u8DD1 \`teamix-evo init\`\uFF08\u6BCF\u6B65\u5E42\u7B49\uFF0C\u81EA\u52A8\u8DF3\u8FC7\u5DF2\u5B8C\u6210\u9879\uFF09
+- \u6062\u590D\u5230\u6267\u884C\u524D\u72B6\u6001\uFF1A\`teamix-evo restore --list\` \u2192 \`teamix-evo restore <ts>\`
+`;
+}
+
+// src/core/snapshot.ts
+import * as fs20 from "fs/promises";
+import * as path26 from "path";
+var TEAMIX_DIR3 = ".teamix-evo";
+var SNAPSHOTS_DIR = ".snapshots";
+var LOGS_DIR = "logs";
+var META_FILE = "_meta.json";
+var DEFAULT_KEEP = 5;
+function isoToFsSafe2(iso) {
+  return iso.replace(/[:.]/g, "-");
+}
+function fsSafeToIso(safe) {
+  return safe.replace(
+    /^(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2})-(\d{3})(Z)$/,
+    "$1T$2:$3:$4.$5$6"
+  );
+}
+async function createSnapshot(projectRoot, opts = {}) {
+  const teamixDir = path26.join(projectRoot, TEAMIX_DIR3);
+  try {
+    const stat5 = await fs20.stat(teamixDir);
+    if (!stat5.isDirectory()) return null;
+  } catch (err) {
+    if (err.code === "ENOENT") return null;
+    throw err;
+  }
+  const isoTs = (/* @__PURE__ */ new Date()).toISOString();
+  const ts = isoToFsSafe2(isoTs);
+  const snapshotRoot = path26.join(teamixDir, SNAPSHOTS_DIR);
+  const target = path26.join(snapshotRoot, ts);
+  await fs20.mkdir(target, { recursive: true });
+  const entries = await fs20.readdir(teamixDir, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.name === SNAPSHOTS_DIR) continue;
+    if (entry.name === LOGS_DIR) continue;
+    const src = path26.join(teamixDir, entry.name);
+    const dst = path26.join(target, entry.name);
+    await fs20.cp(src, dst, { recursive: true });
+  }
+  const meta = {
+    ts: isoTs,
+    reason: opts.reason ?? "manual"
+  };
+  await fs20.writeFile(
+    path26.join(target, META_FILE),
+    JSON.stringify(meta, null, 2) + "\n",
+    "utf-8"
+  );
+  logger.debug(
+    `Snapshot created \u2192 ${path26.relative(projectRoot, target)} (${meta.reason})`
+  );
+  const keep = opts.keep ?? DEFAULT_KEEP;
+  await pruneSnapshots(projectRoot, keep, { protectedTs: opts.protectedTs });
+  return { ts, path: target };
+}
+async function listSnapshots(projectRoot) {
+  const snapshotRoot = path26.join(projectRoot, TEAMIX_DIR3, SNAPSHOTS_DIR);
+  let entries;
+  try {
+    entries = await fs20.readdir(snapshotRoot, { withFileTypes: true });
+  } catch (err) {
+    if (err.code === "ENOENT") return [];
+    throw err;
+  }
+  const result = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const dir = path26.join(snapshotRoot, entry.name);
+    let isoTs = null;
+    let reason = null;
+    try {
+      const raw = await fs20.readFile(path26.join(dir, META_FILE), "utf-8");
+      const parsed = JSON.parse(raw);
+      if (typeof parsed.ts === "string") isoTs = parsed.ts;
+      if (typeof parsed.reason === "string" && ["init", "update", "switch", "restore", "manual"].includes(
+        parsed.reason
+      )) {
+        reason = parsed.reason;
+      }
+    } catch {
+      isoTs = fsSafeToIso(entry.name);
+    }
+    result.push({ ts: entry.name, isoTs, reason, path: dir });
+  }
+  result.sort((a, b) => a.ts < b.ts ? 1 : a.ts > b.ts ? -1 : 0);
+  return result;
 }
 async function pruneSnapshots(projectRoot, keep = DEFAULT_KEEP, opts = {}) {
   if (keep < 0)
@@ -2699,14 +4283,66 @@ async function pruneSnapshots(projectRoot, keep = DEFAULT_KEEP, opts = {}) {
   const toRemove = opts.protectedTs ? tail.filter((s) => s.ts !== opts.protectedTs) : tail;
   const removed = [];
   for (const snap of toRemove) {
-    await fs14.rm(snap.path, { recursive: true, force: true });
+    await fs20.rm(snap.path, { recursive: true, force: true });
     removed.push(snap.ts);
     logger.debug(`Pruned snapshot ${snap.ts}`);
   }
   return removed.reverse();
 }
 
+// src/core/file-changes.ts
+import * as fs21 from "fs/promises";
+import * as path27 from "path";
+function toRelativePosix(p, projectRoot) {
+  let rel2 = p;
+  if (path27.isAbsolute(p)) {
+    rel2 = path27.relative(projectRoot, p);
+  }
+  return rel2.split(path27.sep).join("/");
+}
+async function listBackupOriginals(projectRoot) {
+  const backupsDir = path27.join(projectRoot, ".teamix-evo", ".backups");
+  const out = /* @__PURE__ */ new Set();
+  const stack = [backupsDir];
+  while (stack.length > 0) {
+    const dir = stack.pop();
+    let entries;
+    try {
+      entries = await fs21.readdir(dir, { withFileTypes: true });
+    } catch (err) {
+      if (err.code === "ENOENT") continue;
+      throw err;
+    }
+    for (const e of entries) {
+      const full = path27.join(dir, e.name);
+      if (e.isDirectory()) {
+        stack.push(full);
+      } else if (e.isFile() && e.name.endsWith(".bak")) {
+        const rel2 = path27.relative(backupsDir, full);
+        const original = stripBackupSuffix(rel2);
+        if (original) out.add(original.split(path27.sep).join("/"));
+      }
+    }
+  }
+  return out;
+}
+function stripBackupSuffix(rel2) {
+  const m = rel2.match(
+    /^(.+)\.\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}Z\.bak$/
+  );
+  return m?.[1] ?? null;
+}
+function diffBackupSet(before, after) {
+  const out = /* @__PURE__ */ new Set();
+  for (const p of after) {
+    if (!before.has(p)) out.add(p);
+  }
+  return out;
+}
+
 // src/core/project-init.ts
+import * as fsNode from "fs/promises";
+import * as path28 from "path";
 var BASELINE_UI_ENTRIES = [
   "button",
   "button-group",
@@ -2728,12 +4364,19 @@ var CRITICAL_STEPS = /* @__PURE__ */ new Set([
   "ui-init"
 ]);
 var IMPLEMENTED_STRATEGIES = {
+  // 'agents-md': both 'merge-managed' (Phase 2.B — splice the
+  // teamix-evo-skills managed region) and 'overwrite' (full rewrite) write
+  // through `runGenerateAgentsMd`.
   "agents-md": ["merge-managed", "overwrite", "skip"],
   tokens: ["migrate", "overwrite", "skip"],
   "components-json": ["overwrite", "skip"],
   "shadcn-source": ["overwrite", "skip-existing", "skip"],
   "tailwind-config": ["skip"],
-  "index-css": ["skip"]
+  "index-css": ["skip"],
+  // Phase 3.E: lint conflict strategies are honored end-to-end by
+  // `runLintInit` (backup user file + write template, optional AI-assist hint).
+  "eslint-config": ["merge", "backup-overwrite", "skip", "overwrite"],
+  "stylelint-config": ["merge", "backup-overwrite", "skip", "overwrite"]
 };
 function pickIde(ides) {
   return ides[0] ?? "qoder";
@@ -2751,11 +4394,75 @@ async function resolveUiEntries(options) {
   }
   return [...BASELINE_UI_ENTRIES];
 }
+function deriveTokensChanges(result, projectRoot) {
+  if (result.status !== "installed") return [];
+  return result.resources.map((r) => ({
+    kind: "created",
+    path: toRelativePosix(r.target, projectRoot),
+    step: "tokens",
+    detail: r.strategy
+  }));
+}
+function deriveSkillsChanges(result, projectRoot) {
+  if (result.status !== "installed") return [];
+  return result.addedSkillIds.map((id) => ({
+    kind: "created",
+    path: `.teamix-evo/skills/${id}/SKILL.md`,
+    step: "skills",
+    detail: "skill installed (source mirror + IDE mirrors)"
+  }));
+}
+function deriveUiAddChanges(result, projectRoot) {
+  const out = [];
+  let remaining = result.written;
+  for (let i = result.resources.length - 1; i >= 0 && remaining > 0; i--) {
+    const r = result.resources[i];
+    out.unshift({
+      kind: "created",
+      path: toRelativePosix(r.target, projectRoot),
+      step: "ui-add",
+      detail: r.strategy
+    });
+    remaining--;
+  }
+  return out;
+}
+function deriveLintChanges(result) {
+  if (result.status !== "installed") return [];
+  const out = [];
+  if (result.eslint) {
+    out.push({
+      kind: "created",
+      path: "eslint.config.js",
+      step: "lint",
+      detail: "@teamix-evo/eslint-config consumer preset"
+    });
+  }
+  if (result.stylelint) {
+    out.push({
+      kind: "created",
+      path: "stylelint.config.cjs",
+      step: "lint",
+      detail: "@teamix-evo/stylelint-config consumer preset"
+    });
+  }
+  if (result.packageJsonPatched) {
+    out.push({
+      kind: "created",
+      path: "package.json",
+      step: "lint",
+      detail: 'scripts.lint / scripts["lint:css"]'
+    });
+  }
+  return out;
+}
 async function runProjectInit(options) {
   const { projectRoot, answers, dryRun = false, onStep } = options;
   const ide = pickIde(answers.ides);
   const steps = [];
   const pending = [];
+  const allChanges = [];
+  const backupsBefore = dryRun ? /* @__PURE__ */ new Set() : await listBackupOriginals(projectRoot).catch(() => /* @__PURE__ */ new Set());
   let snapshot = null;
   let snapshotError;
   if (!dryRun) {
@@ -2772,6 +4479,9 @@ async function runProjectInit(options) {
   function record(step) {
     steps.push(step);
     onStep?.(step);
+    if (step.changes && step.changes.length > 0) {
+      allChanges.push(...step.changes);
+    }
   }
   function recordPending(key) {
     const strategy = answers.conflictDecisions[key];
@@ -2831,7 +4541,8 @@ async function runProjectInit(options) {
       record({
         name: "tokens",
         status: "ok",
-        detail
+        detail,
+        changes: deriveTokensChanges(result, projectRoot)
       });
     } catch (err) {
       recordFailure("tokens", err);
@@ -2863,7 +4574,8 @@ async function runProjectInit(options) {
       record({
         name: "skills",
         status: "ok",
-        detail: result.status === "installed" ? `added: ${result.addedSkillIds.join(", ") || "none"}; existing: ${result.skippedSkillIds.join(", ") || "none"}` : result.status
+        detail: result.status === "installed" ? `added: ${result.addedSkillIds.join(", ") || "none"}; existing: ${result.skippedSkillIds.join(", ") || "none"}` : result.status,
+        changes: deriveSkillsChanges(result, projectRoot)
       });
     } catch (err) {
       recordFailure("skills", err);
@@ -2891,12 +4603,25 @@ async function runProjectInit(options) {
       const result = await runGenerateAgentsMd({
         projectRoot,
         variant: answers.variant,
-        skillIds: agentsMdSkillIds
+        skillIds: agentsMdSkillIds,
+        // Phase 2.B: when the user picked `merge-managed` on conflict, only
+        // rewrite the `teamix-evo-skills` managed region so hand-written
+        // sections survive the regenerate step. `overwrite` keeps the
+        // historical full-rewrite default.
+        mode: agentsMdDecision === "merge-managed" ? "merge-managed" : "overwrite"
       });
       record({
         name: "agents-md",
         status: "ok",
-        detail: `${result.skillCount} skill index${result.missingSkillIds.length > 0 ? ` (missing SKILL.md: ${result.missingSkillIds.join(", ")})` : ""}`
+        detail: `${result.skillCount} skill index${result.missingSkillIds.length > 0 ? ` (missing SKILL.md: ${result.missingSkillIds.join(", ")})` : ""}`,
+        changes: [
+          {
+            kind: result.backedUp ? "modified" : "created",
+            path: toRelativePosix(result.path, projectRoot),
+            step: "agents-md",
+            detail: "skill-trigger fallback (ADR 0038)"
+          }
+        ]
       });
     } catch (err) {
       recordFailure("agents-md", err);
@@ -2906,6 +4631,7 @@ async function runProjectInit(options) {
   const componentsJsonDecision = answers.conflictDecisions["components-json"];
   const shadcnDecision = answers.conflictDecisions["shadcn-source"];
   const skipUiInit = !answers.withUi || componentsJsonDecision === "skip";
+  let uiDecisionRequired;
   if (skipUiInit) {
     record({
       name: "ui-init",
@@ -2971,18 +4697,177 @@ async function runProjectInit(options) {
       } else {
         try {
           const entries = await resolveUiEntries(options);
-          const addResult = await runUiAdd({
+          const { manifest } = await loadUiData("@teamix-evo/ui");
+          const existingConfig = await readProjectConfig(projectRoot).catch(
+            () => null
+          );
+          const aliases = existingConfig?.packages?.ui?.aliases ?? DEFAULT_UI_ALIASES;
+          const conflictReport = await detectUiConflicts({
             projectRoot,
-            ids: entries,
-            // 'overwrite' strategy → overwrite=true; everything else (incl.
-            // 'skip-existing' which is the default) → overwrite=false.
-            overwrite: shadcnDecision === "overwrite"
-          });
-          record({
-            name: "ui-add",
-            status: "ok",
-            detail: `${addResult.orderedIds.length} entries (${addResult.written} written, ${addResult.skipped} skipped)`
+            aliases,
+            manifest
           });
+          if (conflictReport.shouldBlock) {
+            let effectiveStrategy = options.uiConflictStrategy;
+            if (!effectiveStrategy) {
+              if (options.nonInteractive) {
+                effectiveStrategy = "isolate-progressive";
+              } else {
+                uiDecisionRequired = {
+                  report: conflictReport,
+                  options: [
+                    {
+                      strategy: "isolate-progressive",
+                      label: "\u9694\u79BB + \u6E10\u8FDB\u8FC1\u79FB\uFF08\u63A8\u8350\uFF09",
+                      description: "\u5C06\u73B0\u6709 UI \u7EC4\u4EF6\u642C\u8FC1\u5230 shadcn-ui/ \u76EE\u5F55\uFF0C\u81EA\u52A8\u91CD\u5199 import \u8DEF\u5F84\uFF0C\u843D\u5730\u5168\u65B0 teamix-evo \u7EC4\u4EF6\u5230 ui/\uFF0C\u6309\u81EA\u5DF1\u8282\u594F\u9010\u6B65\u8FC1\u79FB\u3002"
+                    },
+                    {
+                      strategy: "isolate-aggressive",
+                      label: "\u9694\u79BB + \u4E3B\u52A8\u5347\u7EA7",
+                      description: "\u5728\u6E10\u8FDB\u8FC1\u79FB\u57FA\u7840\u4E0A\uFF0C\u7ACB\u5373\u751F\u6210\u5347\u7EA7 staging\uFF0C\u7531 teamix-evo-upgrade skill \u5F15\u5BFC\u5206\u6279\u66FF\u6362\u3002"
+                    },
+                    {
+                      strategy: "frozen-skip",
+                      label: "\u8DF3\u8FC7\u5DF2\u6709\u6587\u4EF6\uFF08\u65E7\u6A21\u5F0F\uFF09",
+                      description: "\u4FDD\u6301\u73B0\u6709\u884C\u4E3A\uFF1A\u5DF2\u6709\u7EC4\u4EF6\u6587\u4EF6\u4E0D\u8986\u76D6\uFF0C\u65B0\u7EC4\u4EF6\u6B63\u5E38\u5B89\u88C5\u3002\u4E0D\u63A8\u8350 \u2014\u2014 \u53EF\u80FD\u5BFC\u81F4\u98CE\u683C\u6DF7\u7528\u3002"
+                    }
+                  ]
+                };
+                record({
+                  name: "ui-add",
+                  status: "skip",
+                  detail: `UI conflict detected (${conflictReport.conflictEntries.length} files), awaiting user decision`
+                });
+                effectiveStrategy = void 0;
+              }
+            }
+            if (effectiveStrategy) {
+              if (effectiveStrategy === "frozen-skip") {
+                const addResult = await runUiAdd({
+                  projectRoot,
+                  ids: entries,
+                  overwrite: shadcnDecision === "overwrite"
+                });
+                record({
+                  name: "ui-add",
+                  status: "ok",
+                  detail: `${addResult.orderedIds.length} entries [frozen-skip] (${addResult.written} written, ${addResult.skipped} skipped)`,
+                  changes: deriveUiAddChanges(addResult, projectRoot)
+                });
+              } else {
+                const isolateResult = await runUiIsolate({
+                  projectRoot,
+                  aliases,
+                  conflictReport
+                });
+                logger.info(
+                  `  isolated ${isolateResult.movedFiles.length} files, rewrote imports in ${isolateResult.importRewrites.size} files`
+                );
+                const addResult = await runUiAdd({
+                  projectRoot,
+                  ids: entries,
+                  overwrite: true
+                  // after isolation, ui/ is empty → safe to write
+                });
+                let stagingDetail = "";
+                if (effectiveStrategy === "isolate-aggressive") {
+                  try {
+                    const upgradeResult = await runUiUpgrade({
+                      projectRoot,
+                      category: "ui",
+                      trigger: "ui-upgrade"
+                    });
+                    if (upgradeResult.status === "staged") {
+                      stagingDetail = `; upgrade staging generated (${upgradeResult.manifest.entries.length} entries)`;
+                    }
+                  } catch (upgradeErr) {
+                    stagingDetail = `; upgrade staging failed: ${getErrorMessage(
+                      upgradeErr
+                    )}`;
+                  }
+                }
+                record({
+                  name: "ui-add",
+                  status: "ok",
+                  detail: `${addResult.orderedIds.length} entries [${effectiveStrategy}] (${addResult.written} written, ${addResult.skipped} skipped; isolated ${isolateResult.movedFiles.length} files${stagingDetail})`,
+                  changes: deriveUiAddChanges(addResult, projectRoot)
+                });
+                try {
+                  const deps = addResult.npmDependencies;
+                  if (deps && Object.keys(deps).length > 0) {
+                    await installProjectDeps({
+                      projectRoot,
+                      npmDependencies: deps,
+                      skipInstall: options.skipInstall
+                    });
+                  }
+                } catch (depsErr) {
+                  logger.warn(
+                    `  deps install failed (non-fatal): ${getErrorMessage(
+                      depsErr
+                    )}`
+                  );
+                }
+                let residualCount = 0;
+                try {
+                  const residualReport = await detectResidualImports(
+                    projectRoot
+                  );
+                  residualCount = residualReport.entries.length;
+                  if (residualCount > 0) {
+                    logger.warn(
+                      `  \u26A0\uFE0F ${residualCount} residual import(s) to shadcn-ui/ detected \u2014 see lint warnings`
+                    );
+                  }
+                } catch {
+                }
+                try {
+                  const planPath = await generateMigrationPlan({
+                    projectRoot,
+                    strategy: effectiveStrategy,
+                    isolateResult,
+                    addResult,
+                    residualImports: residualCount
+                  });
+                  logger.info(
+                    `  wrote migration plan: ${path28.relative(
+                      projectRoot,
+                      planPath
+                    )}`
+                  );
+                } catch {
+                }
+              }
+            }
+          } else {
+            const addResult = await runUiAdd({
+              projectRoot,
+              ids: entries,
+              overwrite: shadcnDecision === "overwrite"
+            });
+            record({
+              name: "ui-add",
+              status: "ok",
+              detail: `${addResult.orderedIds.length} entries (${addResult.written} written, ${addResult.skipped} skipped)`,
+              changes: deriveUiAddChanges(addResult, projectRoot)
+            });
+            try {
+              const deps = addResult.npmDependencies;
+              if (deps && Object.keys(deps).length > 0) {
+                await installProjectDeps({
+                  projectRoot,
+                  npmDependencies: deps,
+                  skipInstall: options.skipInstall
+                });
+              }
+            } catch (depsErr) {
+              logger.warn(
+                `  deps install failed (non-fatal): ${getErrorMessage(
+                  depsErr
+                )}`
+              );
+            }
+          }
         } catch (err) {
           recordFailure("ui-add", err);
         }
@@ -3005,771 +4890,449 @@ async function runProjectInit(options) {
     });
   } else {
     try {
+      const eslintStrategy = answers.conflictDecisions["eslint-config"];
+      const stylelintStrategy = answers.conflictDecisions["stylelint-config"];
+      const eslintExistingPaths = options.legacyEslintPaths ?? [];
+      const stylelintExistingPaths = options.legacyStylelintPaths ?? [];
       const result = await runLintInit({
         projectRoot,
-        skipInstall: options.skipInstall ?? false
-      });
-      record({
-        name: "lint",
-        status: "ok",
-        detail: result.status === "installed" ? `eslint=${result.eslint}, stylelint=${result.stylelint}` : result.status
-      });
-    } catch (err) {
-      recordFailure("lint", err);
-    }
-  }
-  recordPending("tailwind-config");
-  recordPending("index-css");
-  const status = dryRun ? "dry-run" : steps.some((s) => s.status === "fail") ? "partial" : "installed";
-  const out = {
-    status,
-    steps,
-    pendingConflictWork: pending,
-    snapshot
-  };
-  if (snapshotError) out.snapshotError = snapshotError;
-  if (firstFailure.value) {
-    out.resumeHint = {
-      failedAt: firstFailure.value.step,
-      completed: steps.filter((s) => s.status === "ok").map((s) => s.name),
-      failed: steps.filter((s) => s.status === "fail").map((s) => s.name),
-      error: firstFailure.value.error,
-      // Every sub-step is idempotent (returns `already-initialized` when its
-      // state file already exists), so a plain re-run resumes from the
-      // failed step. A richer --resume model lands with batch 3 (lock
-      // snapshot + restore).
-      resumeCommand: "teamix-evo init"
-    };
-  }
-  return out;
-}
-
-// src/core/project-update.ts
-import * as path24 from "path";
-import {
-  loadTokensPackageManifest as loadTokensPackageManifest3,
-  getVariantEntry as getVariantEntry3
-} from "@teamix-evo/registry";
-
-// src/core/tokens-update.ts
-import * as path20 from "path";
-import * as fs15 from "fs/promises";
-import {
-  loadTokensPackageManifest as loadTokensPackageManifest2,
-  getVariantEntry as getVariantEntry2
-} from "@teamix-evo/registry";
-
-// src/core/upgrade-hints.ts
-import * as path19 from "path";
-var TEAMIX_DIR3 = ".teamix-evo";
-var HINTS_DIR = ".upgrade-hints";
-function isoToFsSafe2(iso) {
-  return iso.replace(/[:.]/g, "-");
-}
-async function writeTokensUpgradeHint(options) {
-  if (options.renames.length === 0) return null;
-  const isoTs = options.isoTs ?? (/* @__PURE__ */ new Date()).toISOString();
-  const fsTs = isoToFsSafe2(isoTs);
-  const filename = `tokens-${fsTs}.json`;
-  const target = path19.join(
-    options.projectRoot,
-    TEAMIX_DIR3,
-    HINTS_DIR,
-    filename
-  );
-  const payload = {
-    schemaVersion: 1,
-    ts: isoTs,
-    package: "tokens",
-    trigger: options.trigger,
-    fromVariant: options.fromVariant,
-    toVariant: options.toVariant,
-    fromVersion: options.fromVersion,
-    toVersion: options.toVersion,
-    renames: options.renames
-  };
-  await writeFileSafe(target, JSON.stringify(payload, null, 2) + "\n");
-  return {
-    path: target,
-    ts: fsTs,
-    renameCount: options.renames.length
-  };
-}
-function selectApplicableRenames(renames, fromVersion, toVersion) {
-  return renames.filter(
-    (r) => compareSemver(r.sinceVersion, fromVersion) > 0 && compareSemver(r.sinceVersion, toVersion) <= 0
-  ).sort((a, b) => compareSemver(a.sinceVersion, b.sinceVersion));
-}
-function compareSemver(a, b) {
-  const [aMain = "", aRest = ""] = a.split("-", 2);
-  const [bMain = "", bRest = ""] = b.split("-", 2);
-  const aParts = aMain.split(".").map((n) => Number.parseInt(n, 10));
-  const bParts = bMain.split(".").map((n) => Number.parseInt(n, 10));
-  for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
-    const ai = aParts[i] ?? 0;
-    const bi = bParts[i] ?? 0;
-    if (ai !== bi) return ai - bi;
-  }
-  if (aRest === "" && bRest !== "") return 1;
-  if (aRest !== "" && bRest === "") return -1;
-  return aRest.localeCompare(bRest, void 0, { numeric: true });
-}
-
-// src/core/managed-merge.ts
-import { hasManagedRegion as hasManagedRegion2, replaceManagedRegion as replaceManagedRegion2 } from "@teamix-evo/registry";
-function mergeManagedRegions(upstreamContent, consumerContent) {
-  let updated = consumerContent;
-  const re = /<!-- teamix-evo:managed:start id="([^"]+)" -->([\s\S]*?)<!-- teamix-evo:managed:end(?: id="\1")? -->/g;
-  let match;
-  while ((match = re.exec(upstreamContent)) !== null) {
-    const id = match[1];
-    const body = match[2].replace(/^\n/, "").replace(/\n$/, "");
-    if (!hasManagedRegion2(updated, id)) {
-      throw new Error(
-        `Managed region "${id}" missing from consumer file \u2014 refusing to silently rewrite (ADR 0003).`
-      );
-    }
-    updated = replaceManagedRegion2(updated, id, body);
-  }
-  return updated;
-}
-
-// src/core/tokens-update.ts
-var DEFAULT_TOKENS_PACKAGE2 = "@teamix-evo/tokens";
-var CONSUMER_BASENAME_BY_UPSTREAM = {
-  "theme.css": "tokens.theme.css",
-  "overrides.css": "tokens.overrides.css"
-};
-async function runTokensUpdate(options) {
-  const { projectRoot } = options;
-  const packageName = options.packageName ?? DEFAULT_TOKENS_PACKAGE2;
-  const config = await readProjectConfig(projectRoot);
-  if (!config?.packages?.tokens) {
-    return { status: "not-initialized" };
-  }
-  const currentVariant = config.packages.tokens.variant;
-  const currentVersion = config.packages.tokens.version;
-  const packageRoot = options.packageRoot ?? resolveTokensPackageRoot(packageName);
-  const catalog = await loadTokensPackageManifest2(packageRoot);
-  const variantEntry = getVariantEntry2(catalog, currentVariant);
-  if (!variantEntry) {
-    throw new Error(
-      `Currently installed variant "${currentVariant}" no longer exists in ${packageName}@${catalog.version}. Available: ${catalog.variants.map((v) => v.name).join(", ")}. Run \`npx teamix-evo@latest tokens uninstall\` then \`npx teamix-evo@latest tokens init <variant>\` to switch.`
-    );
-  }
-  const upstreamByBasename = /* @__PURE__ */ new Map();
-  for (const fileRel of variantEntry.files) {
-    upstreamByBasename.set(
-      path20.basename(fileRel),
-      path20.join(packageRoot, fileRel)
-    );
-  }
-  const prior = await readInstalledManifest(projectRoot) ?? {
-    schemaVersion: 1,
-    installed: []
-  };
-  const installedIdx = prior.installed.findIndex(
-    (p) => p.package === packageName
-  );
-  const priorResources = installedIdx >= 0 ? prior.installed[installedIdx].resources : [];
-  const rewritten = [];
-  const managedReplaced = [];
-  const preserved = [];
-  const frozenDrift = [];
-  const refreshedResources = [];
-  for (const resource of priorResources) {
-    const consumerAbs = path20.isAbsolute(resource.target) ? resource.target : path20.join(projectRoot, resource.target);
-    const consumerBasename = path20.basename(resource.target);
-    const upstreamBasename = lookupUpstreamBasename(consumerBasename);
-    const upstreamAbs = upstreamBasename ? upstreamByBasename.get(upstreamBasename) : void 0;
-    if (resource.strategy === "regenerable") {
-      if (!upstreamAbs) {
-        refreshedResources.push(resource);
-        continue;
-      }
-      const content = await fs15.readFile(upstreamAbs, "utf-8");
-      await writeFileSafe(consumerAbs, content);
-      rewritten.push(resource.target);
-      refreshedResources.push({
-        ...resource,
-        hash: computeHash(content)
+        skipInstall: options.skipInstall ?? false,
+        eslintStrategy: eslintStrategy === "merge" || eslintStrategy === "backup-overwrite" || eslintStrategy === "skip" || eslintStrategy === "overwrite" ? eslintStrategy : "overwrite",
+        stylelintStrategy: stylelintStrategy === "merge" || stylelintStrategy === "backup-overwrite" || stylelintStrategy === "skip" || stylelintStrategy === "overwrite" ? stylelintStrategy : "overwrite",
+        eslintExistingPaths,
+        stylelintExistingPaths
       });
-      continue;
-    }
-    if (resource.strategy === "managed") {
-      if (!upstreamAbs || !await fileExists(consumerAbs)) {
-        refreshedResources.push(resource);
-        continue;
-      }
-      const upstreamContent = await fs15.readFile(upstreamAbs, "utf-8");
-      const consumerContent = await fs15.readFile(consumerAbs, "utf-8");
-      const merged = mergeManagedRegions(upstreamContent, consumerContent);
-      if (merged !== consumerContent) {
-        await writeFileSafe(consumerAbs, merged);
-        managedReplaced.push(resource.target);
+      const detailParts = [];
+      if (result.status === "installed") {
+        detailParts.push(
+          `eslint=${result.eslint}, stylelint=${result.stylelint}`
+        );
+        if (result.eslintMergeRequested) {
+          detailParts.push("eslint:AI-merge-pending");
+        }
+        if (result.stylelintMergeRequested) {
+          detailParts.push("stylelint:AI-merge-pending");
+        }
+        if (result.eslintSkipped) detailParts.push("eslint:skipped");
+        if (result.stylelintSkipped) detailParts.push("stylelint:skipped");
+        if (result.stylelintIgnoreFilesWarning) {
+          detailParts.push("stylelint:ignoreFiles-warning");
+        }
+      } else {
+        detailParts.push(result.status);
       }
-      refreshedResources.push({
-        ...resource,
-        hash: computeHash(merged)
+      record({
+        name: "lint",
+        status: "ok",
+        detail: detailParts.join(" / "),
+        changes: deriveLintChanges(result)
       });
-      continue;
+    } catch (err) {
+      recordFailure("lint", err);
     }
-    if (await fileExists(consumerAbs)) preserved.push(resource.target);
-    if (upstreamAbs) {
-      const upstreamContent = await fs15.readFile(upstreamAbs, "utf-8");
-      const upstreamHash = computeHash(upstreamContent);
-      if (resource.hash && upstreamHash !== resource.hash) {
-        frozenDrift.push({
-          target: resource.target,
-          reason: "upstream-changed"
+  }
+  recordPending("tailwind-config");
+  recordPending("index-css");
+  const GITIGNORE_MARKER_START = "# >>> teamix-evo:managed >>>";
+  const GITIGNORE_MARKER_END = "# <<< teamix-evo:managed <<<";
+  const GITIGNORE_RULES = [
+    ".teamix-evo/.backups/",
+    ".teamix-evo/.upgrade-staging/",
+    ".teamix-evo/.upgrade-hints/"
+  ];
+  if (dryRun) {
+    record({
+      name: "gitignore",
+      status: "planned",
+      detail: "append teamix-evo runtime artifact rules"
+    });
+  } else {
+    try {
+      try {
+        await fsNode.access(projectRoot);
+      } catch {
+        record({
+          name: "gitignore",
+          status: "skip",
+          detail: "projectRoot does not exist"
+        });
+        throw { __skip: true };
+      }
+      const giPath = path28.join(projectRoot, ".gitignore");
+      let giContent = "";
+      try {
+        giContent = await fsNode.readFile(giPath, "utf-8");
+      } catch {
+      }
+      if (giContent.includes(GITIGNORE_MARKER_START)) {
+        record({
+          name: "gitignore",
+          status: "skip",
+          detail: "teamix-evo markers already present"
+        });
+      } else {
+        const block = [
+          "",
+          GITIGNORE_MARKER_START,
+          ...GITIGNORE_RULES,
+          GITIGNORE_MARKER_END,
+          ""
+        ].join("\n");
+        const separator = giContent.length > 0 && !giContent.endsWith("\n") ? "\n" : "";
+        await fsNode.writeFile(giPath, giContent + separator + block, "utf-8");
+        record({
+          name: "gitignore",
+          status: "ok",
+          detail: GITIGNORE_RULES.length + " rules appended",
+          changes: [
+            {
+              kind: "modified",
+              path: ".gitignore",
+              step: "gitignore",
+              detail: "teamix-evo runtime artifact rules"
+            }
+          ]
         });
       }
+    } catch (err) {
+      if (err && typeof err === "object" && "__skip" in err) {
+      } else {
+        recordFailure("gitignore", err);
+      }
     }
-    refreshedResources.push(resource);
   }
-  if (variantEntry.version === currentVersion) {
-    if (installedIdx >= 0) {
-      prior.installed[installedIdx] = {
-        ...prior.installed[installedIdx],
-        resources: refreshedResources
-      };
-      await writeInstalledManifest(projectRoot, prior);
+  if (!dryRun) {
+    try {
+      const backupsAfter = await listBackupOriginals(projectRoot);
+      const newlyBackedUp = diffBackupSet(backupsBefore, backupsAfter);
+      if (newlyBackedUp.size > 0) {
+        for (const change of allChanges) {
+          if (change.kind === "created" && newlyBackedUp.has(change.path)) {
+            change.kind = "modified";
+          }
+        }
+        for (const rel2 of newlyBackedUp) {
+          allChanges.push({
+            kind: "backed-up",
+            path: rel2,
+            step: "backup",
+            detail: ".teamix-evo/.backups/<\u540C\u8DEF\u5F84>.<isoTs>.bak"
+          });
+        }
+      }
+    } catch {
     }
-    return {
-      status: "up-to-date",
-      packageName,
-      variant: currentVariant,
-      version: currentVersion,
-      frozenDrift
-    };
   }
-  const lock = {
-    schemaVersion: 1,
-    variant: {
-      name: variantEntry.name,
-      displayName: variantEntry.displayName,
-      version: variantEntry.version,
-      from: packageName
-    },
-    packageVersion: catalog.version,
-    linked: variantEntry.linked,
-    installedAt: (/* @__PURE__ */ new Date()).toISOString()
+  const status = dryRun ? "dry-run" : steps.some((s) => s.status === "fail") ? "partial" : "installed";
+  const out = {
+    status,
+    steps,
+    pendingConflictWork: pending,
+    changes: allChanges,
+    snapshot
   };
-  await writeFileSafe(
-    path20.join(projectRoot, ".teamix-evo", "tokens-lock.json"),
-    JSON.stringify(lock, null, 2) + "\n"
-  );
-  config.packages.tokens.version = variantEntry.version;
-  await writeProjectConfig(projectRoot, config);
-  if (installedIdx >= 0) {
-    prior.installed[installedIdx] = {
-      ...prior.installed[installedIdx],
-      version: variantEntry.version,
-      installedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      resources: refreshedResources
+  if (snapshotError) out.snapshotError = snapshotError;
+  if (uiDecisionRequired) out.uiDecisionRequired = uiDecisionRequired;
+  if (firstFailure.value) {
+    out.resumeHint = {
+      failedAt: firstFailure.value.step,
+      completed: steps.filter((s) => s.status === "ok").map((s) => s.name),
+      failed: steps.filter((s) => s.status === "fail").map((s) => s.name),
+      error: firstFailure.value.error,
+      // Every sub-step is idempotent (returns `already-initialized` when its
+      // state file already exists), so a plain re-run resumes from the
+      // failed step. A richer --resume model lands with batch 3 (lock
+      // snapshot + restore).
+      resumeCommand: "teamix-evo init"
     };
-    await writeInstalledManifest(projectRoot, prior);
-  }
-  const renames = selectApplicableRenames(
-    variantEntry.renames ?? [],
-    currentVersion,
-    variantEntry.version
-  );
-  let hintPath;
-  if (renames.length > 0) {
-    const hint = await writeTokensUpgradeHint({
-      projectRoot,
-      trigger: "update",
-      fromVariant: currentVariant,
-      toVariant: currentVariant,
-      fromVersion: currentVersion,
-      toVersion: variantEntry.version,
-      renames
-    });
-    if (hint) hintPath = hint.path;
   }
-  return {
-    status: "updated",
-    packageName,
-    variant: currentVariant,
-    from: currentVersion,
-    to: variantEntry.version,
-    rewritten,
-    managedReplaced,
-    preserved,
-    frozenDrift,
-    renames,
-    ...hintPath ? { hintPath } : {}
-  };
-}
-function lookupUpstreamBasename(consumerBasename) {
-  for (const [upstream, consumer] of Object.entries(
-    CONSUMER_BASENAME_BY_UPSTREAM
-  )) {
-    if (consumer === consumerBasename) return upstream;
+  if (!dryRun) {
+    try {
+      const checklistContent = renderInitChecklist({
+        variant: answers.variant,
+        status,
+        steps
+      });
+      const checklistPath = path28.join(
+        projectRoot,
+        ".teamix-evo",
+        "init-checklist.md"
+      );
+      await fsNode.mkdir(path28.dirname(checklistPath), { recursive: true });
+      await fsNode.writeFile(checklistPath, checklistContent, "utf-8");
+      logger.info("  wrote .teamix-evo/init-checklist.md");
+    } catch {
+      logger.warn("  failed to write init-checklist.md (non-fatal)");
+    }
   }
-  return consumerBasename;
+  return out;
 }
 
-// src/core/ui-upgrade-detector.ts
-import * as fs16 from "fs/promises";
-import * as path21 from "path";
-var PACKAGE_NAME = {
-  ui: "@teamix-evo/ui",
-  "biz-ui": "@teamix-evo/biz-ui"
-};
-var ALIAS_KEY = {
-  ui: "components",
-  "biz-ui": "business"
-};
-var COMPONENT_FILE_RE = /\.(tsx|ts)$/;
-var SKIP_FILENAMES = /* @__PURE__ */ new Set(["index.ts", "index.tsx"]);
-async function detectComponentLineage(options) {
-  const { projectRoot, category } = options;
-  const config = options.config ?? await readProjectConfig(projectRoot);
-  const installed = options.installed ?? await readInstalledManifest(projectRoot);
-  const installDir = resolveInstallDir(category, config);
-  const installDirAbs = path21.join(projectRoot, installDir);
-  const installDirExists = await directoryExists(installDirAbs);
-  const hasComponentsJson = await fileExists(
-    path21.join(projectRoot, "components.json")
-  );
-  const installedPkg = findInstalledPackage(installed, PACKAGE_NAME[category]);
-  const registeredIds = installedPkg ? extractIds(installedPkg).sort() : [];
-  const onDiskIds = installDirExists ? await listComponentIds(installDirAbs) : [];
-  const registeredSet = new Set(registeredIds);
-  const unregisteredIds = onDiskIds.filter((id) => !registeredSet.has(id)).sort();
-  const lineage = classifyLineage({
-    hasInstalled: installedPkg !== null,
-    hasComponentsJson,
-    onDiskIds,
-    unregisteredIds
-  });
-  return {
-    category,
-    lineage,
-    installDir,
-    installDirExists,
-    hasComponentsJson,
-    registeredIds,
-    unregisteredIds,
-    installedVersion: installedPkg?.version ?? null,
-    installedVariant: installedPkg?.variant ?? null
-  };
-}
-function resolveInstallDir(category, config) {
-  const aliasMap = config?.packages?.ui?.aliases ?? config?.packages?.["biz-ui"]?.aliases ?? DEFAULT_UI_ALIASES;
-  const key = ALIAS_KEY[category];
-  return aliasMap[key] ?? DEFAULT_UI_ALIASES[key];
-}
-function extractIds(pkg) {
-  const ids = /* @__PURE__ */ new Set();
-  for (const r of pkg.resources) {
-    const colon = r.id.indexOf(":");
-    ids.add(colon >= 0 ? r.id.slice(0, colon) : r.id);
-  }
-  return [...ids];
-}
-async function directoryExists(p) {
-  try {
-    const stat5 = await fs16.stat(p);
-    return stat5.isDirectory();
-  } catch {
-    return false;
-  }
-}
-async function listComponentIds(installDirAbs) {
-  const entries = await fs16.readdir(installDirAbs, { withFileTypes: true });
-  const ids = [];
-  for (const e of entries) {
-    if (!e.isFile()) continue;
-    if (SKIP_FILENAMES.has(e.name)) continue;
-    if (!COMPONENT_FILE_RE.test(e.name)) continue;
-    ids.push(e.name.replace(COMPONENT_FILE_RE, ""));
-  }
-  return ids.sort();
-}
-function classifyLineage(args) {
-  const { hasInstalled, hasComponentsJson, onDiskIds, unregisteredIds } = args;
-  if (hasInstalled) {
-    return unregisteredIds.length === 0 ? "teamix-evo" : "mixed";
-  }
-  if (onDiskIds.length === 0) return "absent";
-  return hasComponentsJson ? "shadcn-native" : "custom-only";
-}
+// src/core/project-update.ts
+import * as path31 from "path";
+import {
+  loadTokensPackageManifest as loadTokensPackageManifest3,
+  getVariantEntry as getVariantEntry3
+} from "@teamix-evo/registry";
 
-// src/core/ui-upgrade.ts
-import * as path23 from "path";
-import { createRequire as createRequire5 } from "module";
+// src/core/tokens-update.ts
+import * as path30 from "path";
+import * as fs22 from "fs/promises";
 import {
-  loadUiPackageManifest as loadUiPackageManifest3,
-  loadVariantUiPackageManifest as loadVariantUiPackageManifest2
+  loadTokensPackageManifest as loadTokensPackageManifest2,
+  getVariantEntry as getVariantEntry2
 } from "@teamix-evo/registry";
 
-// src/core/ui-upgrade-staging.ts
-import * as path22 from "path";
+// src/core/upgrade-hints.ts
+import * as path29 from "path";
 var TEAMIX_DIR4 = ".teamix-evo";
-var STAGING_DIR = ".upgrade-staging";
-var PACKAGE_NAME2 = {
-  ui: "@teamix-evo/ui",
-  "biz-ui": "@teamix-evo/biz-ui"
-};
+var HINTS_DIR = ".upgrade-hints";
 function isoToFsSafe3(iso) {
   return iso.replace(/[:.]/g, "-");
 }
-async function buildUiUpgradeStaging(options) {
-  const { lineageReport, category } = options;
-  if (lineageReport.lineage !== "teamix-evo" && lineageReport.lineage !== "mixed") {
-    return null;
-  }
-  const installed = options.installed ?? await readInstalledManifest(options.projectRoot);
-  const installedPkg = findInstalledPackage(installed, PACKAGE_NAME2[category]);
-  if (!installedPkg) return null;
+async function writeTokensUpgradeHint(options) {
+  if (options.renames.length === 0) return null;
   const isoTs = options.isoTs ?? (/* @__PURE__ */ new Date()).toISOString();
   const fsTs = isoToFsSafe3(isoTs);
-  const stagingDir = path22.join(
+  const filename = `tokens-${fsTs}.json`;
+  const target = path29.join(
     options.projectRoot,
     TEAMIX_DIR4,
-    STAGING_DIR,
-    `${category}-${fsTs}`
-  );
-  const entryMap = new Map(
-    options.manifest.entries.map((e) => [e.id, e])
+    HINTS_DIR,
+    filename
   );
-  const resByEntryId = collectResourcesByEntry(installedPkg.resources);
-  const onlyIds = options.onlyIds && options.onlyIds.length > 0 ? new Set(options.onlyIds) : null;
-  const entries = [];
-  for (const id of lineageReport.registeredIds) {
-    if (onlyIds && !onlyIds.has(id)) continue;
-    const built = await processRegistered({
-      id,
-      entry: entryMap.get(id),
-      resource: resByEntryId.get(id),
-      packageRoot: options.packageRoot,
-      entryPackageRoot: options.entryPackageRoot,
-      aliases: options.aliases,
-      stagingDir,
-      projectRoot: options.projectRoot,
-      category,
-      sourceVersion: options.manifest.version
-    });
-    if (built) entries.push(built);
-  }
-  for (const id of lineageReport.unregisteredIds) {
-    if (onlyIds && !onlyIds.has(id)) continue;
-    const built = await processForeign({
-      id,
-      installDirAbs: path22.join(options.projectRoot, lineageReport.installDir),
-      stagingDir,
-      projectRoot: options.projectRoot,
-      category
-    });
-    if (built) entries.push(built);
-  }
-  if (entries.length === 0) return null;
-  const byRisk = aggregateByRisk(entries);
-  const manifestOut = {
+  const payload = {
     schemaVersion: 1,
     ts: isoTs,
-    package: category,
+    package: "tokens",
     trigger: options.trigger,
-    variant: lineageReport.installedVariant ?? "_flat",
-    fromVersion: lineageReport.installedVersion ?? "",
-    toVersion: options.manifest.version,
-    lineage: lineageReport.lineage,
-    summary: { total: entries.length, byRisk },
-    entries
-  };
-  await ensureDir(stagingDir);
-  await writeFileSafe(
-    path22.join(stagingDir, "meta.json"),
-    JSON.stringify(manifestOut, null, 2) + "\n"
-  );
-  return { stagingDir, manifest: manifestOut };
-}
-async function processRegistered(args) {
-  const { id, entry, resource, stagingDir, projectRoot, category } = args;
-  if (!resource) return null;
-  const currentSource = await readFileOrNull(resource.target);
-  if (currentSource === null) {
-    return buildBreakingEntry({
-      id,
-      category,
-      resource,
-      projectRoot,
-      stagingDir,
-      currentSource: "",
-      hint: "installed file missing on disk"
-    });
-  }
-  if (!entry) {
-    return buildBreakingEntry({
-      id,
-      category,
-      resource,
-      projectRoot,
-      stagingDir,
-      currentSource,
-      hint: "entry removed in upstream package"
-    });
-  }
-  const file = entry.files[0];
-  if (!file) return null;
-  const rootForEntry = args.entryPackageRoot?.get(id) ?? args.packageRoot;
-  const sourceAbs = path22.resolve(rootForEntry, file.source);
-  const raw = await readFileOrNull(sourceAbs);
-  if (raw === null) {
-    return null;
-  }
-  const incomingTransformed = rewriteImports(raw, args.aliases);
-  const incomingHash = computeHash(incomingTransformed);
-  const currentExt = path22.extname(resource.target) || ".tsx";
-  const incomingExt = path22.extname(file.targetName) || currentExt;
-  const currentRel = `${id}/current${currentExt}`;
-  const incomingRel = `${id}/incoming${incomingExt}`;
-  await writeFileSafe(path22.join(stagingDir, currentRel), currentSource);
-  await writeFileSafe(path22.join(stagingDir, incomingRel), incomingTransformed);
-  const diff = classifyRisk({
-    currentHash: resource.hash,
-    incomingHash,
-    currentSource,
-    incomingSource: incomingTransformed,
-    multiFile: entry.files.length > 1
-  });
-  return {
-    id,
-    category,
-    current: {
-      target: path22.relative(projectRoot, resource.target),
-      hash: resource.hash,
-      sourceLineage: "teamix-evo"
-    },
-    incoming: {
-      sourceVersion: args.sourceVersion,
-      hash: incomingHash,
-      relPath: incomingRel
-    },
-    diff
+    fromVariant: options.fromVariant,
+    toVariant: options.toVariant,
+    fromVersion: options.fromVersion,
+    toVersion: options.toVersion,
+    renames: options.renames
   };
-}
-async function processForeign(args) {
-  const { id, installDirAbs, stagingDir, projectRoot, category } = args;
-  const tsx = path22.join(installDirAbs, `${id}.tsx`);
-  const ts = path22.join(installDirAbs, `${id}.ts`);
-  const target = await fileExists(tsx) ? tsx : await fileExists(ts) ? ts : null;
-  if (!target) return null;
-  const raw = await readFileOrNull(target);
-  if (raw === null) return null;
-  const ext = path22.extname(target);
-  const currentRel = `${id}/current${ext}`;
-  await writeFileSafe(path22.join(stagingDir, currentRel), raw);
+  await writeFileSafe(target, JSON.stringify(payload, null, 2) + "\n");
   return {
-    id,
-    category,
-    current: {
-      target: path22.relative(projectRoot, target),
-      hash: computeHash(raw),
-      sourceLineage: "custom"
-    },
-    diff: {
-      riskLevel: "foreign",
-      hints: [
-        "component is on disk but not registered in .teamix-evo/manifest.json",
-        "AI should propose: (a) ignore, (b) re-register via teamix-evo ui add, or (c) remove"
-      ],
-      filesChangedCount: 0
-    }
+    path: target,
+    ts: fsTs,
+    renameCount: options.renames.length
   };
 }
-async function buildBreakingEntry(args) {
-  const ext = path22.extname(args.resource.target) || ".tsx";
-  const currentRel = `${args.id}/current${ext}`;
-  await writeFileSafe(
-    path22.join(args.stagingDir, currentRel),
-    args.currentSource
-  );
-  return {
-    id: args.id,
-    category: args.category,
-    current: {
-      target: path22.relative(args.projectRoot, args.resource.target),
-      hash: args.resource.hash,
-      sourceLineage: "teamix-evo"
-    },
-    diff: {
-      riskLevel: "breaking",
-      hints: [args.hint],
-      filesChangedCount: 0
-    }
-  };
+function selectApplicableRenames(renames, fromVersion, toVersion) {
+  return renames.filter(
+    (r) => compareSemver2(r.sinceVersion, fromVersion) > 0 && compareSemver2(r.sinceVersion, toVersion) <= 0
+  ).sort((a, b) => compareSemver2(a.sinceVersion, b.sinceVersion));
 }
-function classifyRisk(args) {
-  if (args.currentHash === args.incomingHash) {
-    return { riskLevel: "unchanged", hints: [], filesChangedCount: 0 };
+function compareSemver2(a, b) {
+  const [aMain = "", aRest = ""] = a.split("-", 2);
+  const [bMain = "", bRest = ""] = b.split("-", 2);
+  const aParts = aMain.split(".").map((n) => Number.parseInt(n, 10));
+  const bParts = bMain.split(".").map((n) => Number.parseInt(n, 10));
+  for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
+    const ai = aParts[i] ?? 0;
+    const bi = bParts[i] ?? 0;
+    if (ai !== bi) return ai - bi;
   }
-  const curExports = extractExportNames(args.currentSource);
-  const newExports = extractExportNames(args.incomingSource);
-  const removedExports = setDiff(curExports, newExports);
-  const addedExports = setDiff(newExports, curExports);
-  const curVariants = extractCvaVariantValues(args.currentSource);
-  const newVariants = extractCvaVariantValues(args.incomingSource);
-  const removedVariants = setDiff(curVariants, newVariants);
-  const addedVariants = setDiff(newVariants, curVariants);
-  const hints = [];
-  for (const e of removedExports) hints.push(`removed export: ${e}`);
-  for (const e of addedExports) hints.push(`new export: ${e}`);
-  for (const v of removedVariants) hints.push(`removed cva variant: ${v}`);
-  for (const v of addedVariants) hints.push(`new cva variant: ${v}`);
-  if (args.multiFile) hints.push("multi-file entry; only first file staged");
-  let riskLevel;
-  if (removedExports.length > 0 || removedVariants.length > 0) {
-    riskLevel = "risky";
-  } else if (addedExports.length > 0 || addedVariants.length > 0 || args.multiFile) {
-    riskLevel = "upgradable-medium";
-  } else {
-    riskLevel = "upgradable-low";
+  if (aRest === "" && bRest !== "") return 1;
+  if (aRest !== "" && bRest === "") return -1;
+  return aRest.localeCompare(bRest, void 0, { numeric: true });
+}
+
+// src/core/managed-merge.ts
+import { hasManagedRegion as hasManagedRegion3, replaceManagedRegion as replaceManagedRegion3 } from "@teamix-evo/registry";
+function mergeManagedRegions(upstreamContent, consumerContent) {
+  let updated = consumerContent;
+  const re = /<!-- teamix-evo:managed:start id="([^"]+)" -->([\s\S]*?)<!-- teamix-evo:managed:end(?: id="\1")? -->/g;
+  let match;
+  while ((match = re.exec(upstreamContent)) !== null) {
+    const id = match[1];
+    const body = match[2].replace(/^\n/, "").replace(/\n$/, "");
+    if (!hasManagedRegion3(updated, id)) {
+      throw new Error(
+        `Managed region "${id}" missing from consumer file \u2014 refusing to silently rewrite (ADR 0003).`
+      );
+    }
+    updated = replaceManagedRegion3(updated, id, body);
   }
-  return { riskLevel, hints, filesChangedCount: 1 };
+  return updated;
 }
-function extractExportNames(src) {
-  const names = /* @__PURE__ */ new Set();
-  const re = /^\s*export\s+(?:default\s+)?(?:async\s+)?(?:const|let|var|function|class|interface|type|enum)\s+(\w+)/gm;
-  let m;
-  while ((m = re.exec(src)) !== null) {
-    if (m[1]) names.add(m[1]);
+
+// src/core/tokens-update.ts
+var DEFAULT_TOKENS_PACKAGE2 = "@teamix-evo/tokens";
+var CONSUMER_BASENAME_BY_UPSTREAM = {
+  "theme.css": "tokens.theme.css",
+  "overrides.css": "tokens.overrides.css"
+};
+async function runTokensUpdate(options) {
+  const { projectRoot } = options;
+  const packageName = options.packageName ?? DEFAULT_TOKENS_PACKAGE2;
+  const config = await readProjectConfig(projectRoot);
+  if (!config?.packages?.tokens) {
+    return { status: "not-initialized" };
+  }
+  const currentVariant = config.packages.tokens.variant;
+  const currentVersion = config.packages.tokens.version;
+  const packageRoot = options.packageRoot ?? resolveTokensPackageRoot(packageName);
+  const catalog = await loadTokensPackageManifest2(packageRoot);
+  const variantEntry = getVariantEntry2(catalog, currentVariant);
+  if (!variantEntry) {
+    throw new Error(
+      `Currently installed variant "${currentVariant}" no longer exists in ${packageName}@${catalog.version}. Available: ${catalog.variants.map((v) => v.name).join(", ")}. Run \`npx teamix-evo@latest tokens uninstall\` then \`npx teamix-evo@latest tokens init <variant>\` to switch.`
+    );
   }
-  for (const dm of src.matchAll(/^\s*export\s+default\s+(\w+)\s*;/gm)) {
-    if (dm[1]) names.add(dm[1]);
+  const upstreamByBasename = /* @__PURE__ */ new Map();
+  for (const fileRel of variantEntry.files) {
+    upstreamByBasename.set(
+      path30.basename(fileRel),
+      path30.join(packageRoot, fileRel)
+    );
   }
-  return [...names];
-}
-function extractCvaVariantValues(src) {
-  const block = extractVariantsBlock(src);
-  if (block === null) return [];
-  const names = /* @__PURE__ */ new Set();
-  for (const groupBody of extractGroupBodies(block)) {
-    for (const km of groupBody.matchAll(/^\s*(?:['"]?)(\w+)(?:['"]?)\s*:/gm)) {
-      if (km[1]) names.add(km[1]);
+  const prior = await readInstalledManifest(projectRoot) ?? {
+    schemaVersion: 1,
+    installed: []
+  };
+  const installedIdx = prior.installed.findIndex(
+    (p) => p.package === packageName
+  );
+  const priorResources = installedIdx >= 0 ? prior.installed[installedIdx].resources : [];
+  const rewritten = [];
+  const managedReplaced = [];
+  const preserved = [];
+  const frozenDrift = [];
+  const refreshedResources = [];
+  for (const resource of priorResources) {
+    const consumerAbs = path30.isAbsolute(resource.target) ? resource.target : path30.join(projectRoot, resource.target);
+    const consumerBasename = path30.basename(resource.target);
+    const upstreamBasename = lookupUpstreamBasename(consumerBasename);
+    const upstreamAbs = upstreamBasename ? upstreamByBasename.get(upstreamBasename) : void 0;
+    if (resource.strategy === "regenerable") {
+      if (!upstreamAbs) {
+        refreshedResources.push(resource);
+        continue;
+      }
+      const content = await fs22.readFile(upstreamAbs, "utf-8");
+      await writeFileSafe(consumerAbs, content);
+      rewritten.push(resource.target);
+      refreshedResources.push({
+        ...resource,
+        hash: computeHash(content)
+      });
+      continue;
     }
-  }
-  return [...names];
-}
-function extractVariantsBlock(src) {
-  const idx = src.search(/\bvariants\s*:\s*\{/);
-  if (idx < 0) return null;
-  const open = src.indexOf("{", idx);
-  if (open < 0) return null;
-  let depth = 0;
-  for (let i = open; i < src.length; i++) {
-    const c = src[i];
-    if (c === "{") depth++;
-    else if (c === "}") {
-      depth--;
-      if (depth === 0) return src.slice(open + 1, i);
+    if (resource.strategy === "managed") {
+      if (!upstreamAbs || !await fileExists(consumerAbs)) {
+        refreshedResources.push(resource);
+        continue;
+      }
+      const upstreamContent = await fs22.readFile(upstreamAbs, "utf-8");
+      const consumerContent = await fs22.readFile(consumerAbs, "utf-8");
+      const merged = mergeManagedRegions(upstreamContent, consumerContent);
+      if (merged !== consumerContent) {
+        await writeFileSafe(consumerAbs, merged);
+        managedReplaced.push(resource.target);
+      }
+      refreshedResources.push({
+        ...resource,
+        hash: computeHash(merged)
+      });
+      continue;
     }
-  }
-  return null;
-}
-function* extractGroupBodies(block) {
-  const re = /(\w+)\s*:\s*\{/g;
-  let m;
-  while ((m = re.exec(block)) !== null) {
-    const open = block.indexOf("{", m.index);
-    if (open < 0) continue;
-    let depth = 0;
-    for (let i = open; i < block.length; i++) {
-      const c = block[i];
-      if (c === "{") depth++;
-      else if (c === "}") {
-        depth--;
-        if (depth === 0) {
-          yield block.slice(open + 1, i);
-          re.lastIndex = i + 1;
-          break;
-        }
+    if (await fileExists(consumerAbs)) preserved.push(resource.target);
+    if (upstreamAbs) {
+      const upstreamContent = await fs22.readFile(upstreamAbs, "utf-8");
+      const upstreamHash = computeHash(upstreamContent);
+      if (resource.hash && upstreamHash !== resource.hash) {
+        frozenDrift.push({
+          target: resource.target,
+          reason: "upstream-changed"
+        });
       }
     }
+    refreshedResources.push(resource);
   }
-}
-function setDiff(a, b) {
-  const bset = new Set(b);
-  return a.filter((x) => !bset.has(x)).sort();
-}
-function collectResourcesByEntry(resources) {
-  const out = /* @__PURE__ */ new Map();
-  for (const r of resources) {
-    const colon = r.id.indexOf(":");
-    const eid = colon >= 0 ? r.id.slice(0, colon) : r.id;
-    if (!out.has(eid)) out.set(eid, r);
+  if (variantEntry.version === currentVersion) {
+    if (installedIdx >= 0) {
+      prior.installed[installedIdx] = {
+        ...prior.installed[installedIdx],
+        resources: refreshedResources
+      };
+      await writeInstalledManifest(projectRoot, prior);
+    }
+    return {
+      status: "up-to-date",
+      packageName,
+      variant: currentVariant,
+      version: currentVersion,
+      frozenDrift
+    };
   }
-  return out;
-}
-function aggregateByRisk(entries) {
-  const out = {};
-  for (const e of entries) {
-    const k = e.diff.riskLevel;
-    out[k] = (out[k] ?? 0) + 1;
+  const lock = {
+    schemaVersion: 1,
+    variant: {
+      name: variantEntry.name,
+      displayName: variantEntry.displayName,
+      version: variantEntry.version,
+      from: packageName
+    },
+    packageVersion: catalog.version,
+    linked: variantEntry.linked,
+    installedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  await writeFileSafe(
+    path30.join(projectRoot, ".teamix-evo", "tokens-lock.json"),
+    JSON.stringify(lock, null, 2) + "\n"
+  );
+  config.packages.tokens.version = variantEntry.version;
+  await writeProjectConfig(projectRoot, config);
+  if (installedIdx >= 0) {
+    prior.installed[installedIdx] = {
+      ...prior.installed[installedIdx],
+      version: variantEntry.version,
+      installedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      resources: refreshedResources
+    };
+    await writeInstalledManifest(projectRoot, prior);
   }
-  return out;
-}
-
-// src/core/ui-upgrade.ts
-var nodeRequire = createRequire5(import.meta.url);
-function resolvePackageRoot4(packageName) {
-  const pkgJsonPath = nodeRequire.resolve(`${packageName}/package.json`);
-  return path23.dirname(pkgJsonPath);
-}
-async function buildStaging(args) {
-  const { category, projectRoot, aliases, lineageReport, trigger, onlyIds } = args;
-  if (category === "ui") {
-    const root = args.uiPackageRoot ?? resolvePackageRoot4("@teamix-evo/ui");
-    const manifest = await loadUiPackageManifest3(root);
-    return buildUiUpgradeStaging({
+  const renames = selectApplicableRenames(
+    variantEntry.renames ?? [],
+    currentVersion,
+    variantEntry.version
+  );
+  let hintPath;
+  if (renames.length > 0) {
+    const hint = await writeTokensUpgradeHint({
       projectRoot,
-      category,
-      manifest,
-      packageRoot: root,
-      aliases,
-      lineageReport,
-      trigger,
-      onlyIds
+      trigger: "update",
+      fromVariant: currentVariant,
+      toVariant: currentVariant,
+      fromVersion: currentVersion,
+      toVersion: variantEntry.version,
+      renames
     });
+    if (hint) hintPath = hint.path;
   }
-  const bizRoot = args.bizUiPackageRoot ?? resolvePackageRoot4("@teamix-evo/biz-ui");
-  const variant = lineageReport.installedVariant ?? "_flat";
-  const variantDir = path23.join(bizRoot, "variants", variant);
-  const variantManifest = await loadVariantUiPackageManifest2(variantDir);
-  const uiRoot = args.uiPackageRoot ?? resolvePackageRoot4("@teamix-evo/ui");
-  const uiManifest = await loadUiPackageManifest3(uiRoot);
-  const entryPackageRoot = /* @__PURE__ */ new Map();
-  const merged = [];
-  for (const e of variantManifest.entries) {
-    entryPackageRoot.set(e.id, variantDir);
-    merged.push(e);
-  }
-  for (const e of uiManifest.entries) {
-    if (entryPackageRoot.has(e.id)) continue;
-    entryPackageRoot.set(e.id, uiRoot);
-    merged.push(e);
-  }
-  const synthetic = {
-    schemaVersion: 1,
-    package: "ui",
-    version: variantManifest.version,
-    engines: variantManifest.engines,
-    entries: merged
+  return {
+    status: "updated",
+    packageName,
+    variant: currentVariant,
+    from: currentVersion,
+    to: variantEntry.version,
+    rewritten,
+    managedReplaced,
+    preserved,
+    frozenDrift,
+    renames,
+    ...hintPath ? { hintPath } : {}
   };
-  return buildUiUpgradeStaging({
-    projectRoot,
-    category,
-    manifest: synthetic,
-    packageRoot: variantDir,
-    entryPackageRoot,
-    aliases,
-    lineageReport,
-    trigger,
-    onlyIds
-  });
+}
+function lookupUpstreamBasename(consumerBasename) {
+  for (const [upstream, consumer] of Object.entries(
+    CONSUMER_BASENAME_BY_UPSTREAM
+  )) {
+    if (consumer === consumerBasename) return upstream;
+  }
+  return consumerBasename;
 }
 
 // src/core/project-update.ts
@@ -4019,7 +5582,7 @@ async function runComponentSourceStep(category, args) {
       });
       return;
     }
-    const stagingRel = path24.relative(projectRoot, built.stagingDir);
+    const stagingRel = path31.relative(projectRoot, built.stagingDir);
     const summary = summarizeStagingRisk(built.manifest.summary.byRisk);
     record({
       name: category,
@@ -4062,8 +5625,8 @@ async function planTokensUpdate(tokensPackage, config) {
 }
 
 // src/core/installer.ts
-import * as path25 from "path";
-import * as fs17 from "fs/promises";
+import * as path32 from "path";
+import * as fs23 from "fs/promises";
 async function installResources(options) {
   const { projectRoot, manifest, data, variantDir, packageRoot } = options;
   const installedResources = [];
@@ -4100,13 +5663,13 @@ async function installSingleResource(resource, projectRoot, data, variantDir, pa
     variantDir,
     packageRoot
   );
-  const targetPath = path25.join(projectRoot, resource.target);
+  const targetPath = path32.join(projectRoot, resource.target);
   let content;
   if (resource.template) {
     const templateContent = await loadTemplateFile(sourcePath);
     content = renderTemplate(templateContent, data);
   } else {
-    content = await fs17.readFile(sourcePath, "utf-8");
+    content = await fs23.readFile(sourcePath, "utf-8");
   }
   await writeFileSafe(targetPath, content);
   const hash = computeHash(content);
@@ -4124,13 +5687,13 @@ async function installRecursiveResource(resource, projectRoot, data, variantDir,
     variantDir,
     packageRoot
   );
-  const targetDir = path25.join(projectRoot, resource.target);
+  const targetDir = path32.join(projectRoot, resource.target);
   const results = [];
   await ensureDir(targetDir);
   const entries = await walkDir(sourcePath);
   for (const entry of entries) {
-    const relPath = path25.relative(sourcePath, entry);
-    let targetFile = path25.join(targetDir, relPath);
+    const relPath = path32.relative(sourcePath, entry);
+    let targetFile = path32.join(targetDir, relPath);
     if (resource.template && targetFile.endsWith(".hbs")) {
       targetFile = targetFile.slice(0, -4);
     }
@@ -4139,11 +5702,11 @@ async function installRecursiveResource(resource, projectRoot, data, variantDir,
       const templateContent = await loadTemplateFile(entry);
       content = renderTemplate(templateContent, data);
     } else {
-      content = await fs17.readFile(entry, "utf-8");
+      content = await fs23.readFile(entry, "utf-8");
     }
     await writeFileSafe(targetFile, content);
     const hash = computeHash(content);
-    const targetRel = path25.relative(projectRoot, targetFile);
+    const targetRel = path32.relative(projectRoot, targetFile);
     results.push({
       id: `${resource.id}:${relPath}`,
       target: targetRel,
@@ -4156,25 +5719,25 @@ async function installRecursiveResource(resource, projectRoot, data, variantDir,
 }
 
 // src/core/registry-client.ts
-import * as path26 from "path";
-import * as fs18 from "fs/promises";
+import * as path33 from "path";
+import * as fs24 from "fs/promises";
 import { createRequire as createRequire6 } from "module";
 import { loadVariantManifest } from "@teamix-evo/registry";
 var require6 = createRequire6(import.meta.url);
 function resolvePackageRoot5(packageName) {
   const pkgJsonPath = require6.resolve(`${packageName}/package.json`);
-  return path26.dirname(pkgJsonPath);
+  return path33.dirname(pkgJsonPath);
 }
 async function loadVariantData(packageName, variant) {
   const packageRoot = resolvePackageRoot5(packageName);
-  const variantDir = path26.join(packageRoot, "library", variant);
+  const variantDir = path33.join(packageRoot, "library", variant);
   logger.debug(`Resolved variant dir: ${variantDir}`);
   logger.debug(`Package root: ${packageRoot}`);
   const manifest = await loadVariantManifest(variantDir);
   let data = {};
-  const dataPath = path26.join(variantDir, "_data.json");
+  const dataPath = path33.join(variantDir, "_data.json");
   try {
-    const raw = await fs18.readFile(dataPath, "utf-8");
+    const raw = await fs24.readFile(dataPath, "utf-8");
     data = JSON.parse(raw);
   } catch (err) {
     if (err.code !== "ENOENT") {