teamix-evo 0.4.0 → 0.5.0

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command28 } from "commander";
-import { createRequire as createRequire8 } from "module";
+import { Command as Command29 } from "commander";
+import { createRequire as createRequire7 } from "module";
 
 // src/commands/tokens/index.ts
 import { Command as Command6 } from "commander";
@@ -67,7 +67,7 @@ function detectIde() {
 }
 
 // src/core/tokens-init.ts
-import * as path8 from "path";
+import * as path9 from "path";
 import * as fs6 from "fs/promises";
 import { createRequire as createRequire2 } from "module";
 import {
@@ -321,7 +321,10 @@ async function loadSkillsData(packageName) {
 // src/core/skills-installer.ts
 import * as path7 from "path";
 import * as fs5 from "fs/promises";
-import { replaceManagedRegion } from "@teamix-evo/registry";
+import {
+  replaceManagedRegion,
+  hasManagedRegion
+} from "@teamix-evo/registry";
 
 // src/utils/template.ts
 import Handlebars from "handlebars";
@@ -440,20 +443,63 @@ async function mirrorSkillToIde(skill, ide, scope, projectRoot) {
     const rel2 = path7.relative(sourceDir, src);
     const targetFile = path7.join(targetDir, rel2);
     const sourceContent = await fs5.readFile(src, "utf-8");
-    const existing = await readFileOrNull(targetFile);
-    if (existing !== null && existing !== sourceContent) {
-      logger.warn(
-        `Mirror drift detected at ${targetFile} \u2014 overwriting from source. Edit ${src} (not the mirror) and re-run \`teamix-evo skills sync\`.`
-      );
-    }
-    await writeFileSafe(targetFile, sourceContent);
+    const writtenContent = await writeMirrorContent(
+      targetFile,
+      sourceContent,
+      skill.managedRegions,
+      src
+    );
     records.push(
-      makeMirrorRecord(skill, targetFile, sourceContent, ide, scope, rel2)
+      makeMirrorRecord(skill, targetFile, writtenContent, ide, scope, rel2)
     );
     logger.debug(`  Mirrored ${ide}:${scope}: ${targetFile}`);
   }
   return records;
 }
+async function writeMirrorContent(targetFile, sourceContent, managedRegions, sourceFile) {
+  const existing = await readFileOrNull(targetFile);
+  if (existing === null) {
+    await writeFileSafe(targetFile, sourceContent);
+    return sourceContent;
+  }
+  const regions = managedRegions ?? [];
+  const matchedRegions = regions.filter((id) => hasManagedRegion(existing, id));
+  if (matchedRegions.length === 0) {
+    if (existing !== sourceContent) {
+      logger.warn(
+        `Mirror drift detected at ${targetFile} \u2014 overwriting from source. Edit ${sourceFile} (not the mirror) and re-run \`teamix-evo skills sync\`.`
+      );
+      await writeFileSafe(targetFile, sourceContent);
+      return sourceContent;
+    }
+    return existing;
+  }
+  let merged = existing;
+  for (const id of matchedRegions) {
+    const newRegion = extractRegionBody(sourceContent, id);
+    if (newRegion === null) continue;
+    try {
+      merged = replaceManagedRegion(merged, id, newRegion);
+    } catch {
+    }
+  }
+  if (merged !== existing) {
+    await writeFileSafe(targetFile, merged);
+  }
+  return merged;
+}
+function extractRegionBody(content, id) {
+  const re = new RegExp(
+    `<!-- teamix-evo:managed:start id="${escapeRegExp(
+      id
+    )}" -->([\\s\\S]*?)<!-- teamix-evo:managed:end id="${escapeRegExp(
+      id
+    )}" -->`
+  );
+  const m = content.match(re);
+  if (!m) return null;
+  return m[1].replace(/^\n/, "").replace(/\n$/, "");
+}
 async function renderSkillContent(sourceAbs, skill, data) {
   if (skill.template ?? sourceAbs.endsWith(".hbs")) {
     const tpl = await loadTemplateFile(sourceAbs);
@@ -613,17 +659,16 @@ async function syncSkillsToIdes(options) {
         const rel2 = path7.relative(sourceDir, src);
         const targetFile = path7.join(targetDir, rel2);
         const sourceContent = await fs5.readFile(src, "utf-8");
-        const existing = await readFileOrNull(targetFile);
-        if (existing !== null && existing !== sourceContent) {
-          logger.warn(
-            `Mirror drift detected at ${targetFile} \u2014 overwriting from source. Edit ${src} (not the mirror) and re-run \`teamix-evo skills sync\`.`
-          );
-        }
-        await writeFileSafe(targetFile, sourceContent);
+        const writtenContent = await writeMirrorContent(
+          targetFile,
+          sourceContent,
+          skill.managedRegions,
+          src
+        );
         out.push({
           id: rel2 === "SKILL.md" ? skill.id : `${skill.id}:${rel2}`,
           target: targetFile,
-          hash: computeHash(sourceContent),
+          hash: computeHash(writtenContent),
           strategy: skill.updateStrategy,
           ide,
           scope
@@ -662,6 +707,29 @@ async function removeSkillFiles(records) {
   return removed;
 }
 
+// src/utils/mcp.ts
+import * as path8 from "path";
+var MCP_JSON_CONTENT = {
+  mcpServers: {
+    "teamix-evo": {
+      command: "npx",
+      args: ["-y", "@teamix-evo/mcp"]
+    }
+  }
+};
+async function ensureMcpJson(projectRoot) {
+  const mcpPath = path8.join(projectRoot, ".mcp.json");
+  if (await fileExists(mcpPath)) return "exists";
+  try {
+    await writeFileSafe(mcpPath, JSON.stringify(MCP_JSON_CONTENT, null, 2) + "\n");
+    logger.debug(`Wrote .mcp.json \u2192 ${mcpPath}`);
+    return "created";
+  } catch (err) {
+    logger.warn(`Failed to write .mcp.json: ${err.message}`);
+    return "failed";
+  }
+}
+
 // src/core/skills-add.ts
 var DEFAULT_SKILLS_PACKAGE = "@teamix-evo/skills";
 var FLAT_VARIANT = "_flat";
@@ -673,9 +741,6 @@ async function runSkillsAdd(options) {
   await ensureTeamixDir(projectRoot);
   const existingConfig = await readProjectConfig(projectRoot);
   const existingSkillsCfg = existingConfig?.packages?.skills;
-  if (!isIncremental && existingSkillsCfg) {
-    return { status: "already-added" };
-  }
   const ides = options.ides && options.ides.length > 0 ? [...options.ides] : existingSkillsCfg?.ides ? [...existingSkillsCfg.ides] : [];
   const scope = options.scope ?? existingSkillsCfg?.scope;
   if (ides.length === 0) {
@@ -713,8 +778,7 @@ async function runSkillsAdd(options) {
     skippedSkillIds = requestedNames.filter((n) => existingSkillIds.has(n));
     onlyIds = requestedNames.filter((n) => !existingSkillIds.has(n));
   } else {
-    skippedSkillIds = [];
-    onlyIds = manifest.skills.filter((s) => {
+    const candidateIds = manifest.skills.filter((s) => {
       if (!s.variant) return true;
       if (!currentTokensVariant) {
         logger.debug(
@@ -730,6 +794,11 @@ async function runSkillsAdd(options) {
       }
       return true;
     }).map((s) => s.id);
+    skippedSkillIds = candidateIds.filter((id) => existingSkillIds.has(id));
+    onlyIds = candidateIds.filter((id) => !existingSkillIds.has(id));
+  }
+  if (!isIncremental && existingSkillsCfg && onlyIds.length === 0) {
+    return { status: "already-added" };
   }
   if (isIncremental && onlyIds.length === 0) {
     return {
@@ -806,6 +875,7 @@ async function runSkillsAdd(options) {
     };
   }
   await writeSkillsLock(projectRoot, lock);
+  await ensureMcpJson(projectRoot);
   return {
     status: "installed",
     packageName,
@@ -843,6 +913,16 @@ async function runTokensInit(options) {
   const { projectRoot, variant, ide } = options;
   const packageName = options.packageName ?? DEFAULT_TOKENS_PACKAGE;
   await ensureTeamixDir(projectRoot);
+  const packageRoot = options.packageRoot ?? resolveTokensPackageRoot(packageName);
+  const catalog = await loadTokensPackageManifest(packageRoot);
+  const variantEntry = getVariantEntry(catalog, variant);
+  if (!variantEntry) {
+    const known = catalog.variants.map((v) => v.name).join(", ");
+    throw new Error(
+      `Unknown variant "${variant}". Available variants: ${known || "(none)"}.
+Run \`teamix-evo tokens list-variants\` to see all options.`
+    );
+  }
   const existingConfig = await readProjectConfig(projectRoot);
   if (existingConfig?.packages?.tokens) {
     const existingVariant = existingConfig.packages.tokens.variant;
@@ -855,21 +935,12 @@ async function runTokensInit(options) {
       requestedVariant: variant
     };
   }
-  const packageRoot = options.packageRoot ?? resolveTokensPackageRoot(packageName);
-  const catalog = await loadTokensPackageManifest(packageRoot);
-  const variantEntry = getVariantEntry(catalog, variant);
-  if (!variantEntry) {
-    const known = catalog.variants.map((v) => v.name).join(", ");
-    throw new Error(
-      `Tokens variant not found: "${variant}". Known variants: ${known || "(none)"}. Hint: run "teamix-evo tokens list-variants" to see all.`
-    );
-  }
   const installed = [];
   for (const fileRel of variantEntry.files) {
     const result = await installVariantFile(fileRel, packageRoot, projectRoot);
     if (result) installed.push(result);
   }
-  const overridesAbs = path8.join(
+  const overridesAbs = path9.join(
     projectRoot,
     CONSUMER_TOKENS_DIR,
     CONSUMER_OVERRIDES_FILE
@@ -880,7 +951,7 @@ async function runTokensInit(options) {
   const overridesContent = await fs6.readFile(overridesAbs, "utf-8");
   installed.push({
     id: `tokens:${CONSUMER_OVERRIDES_FILE}`,
-    target: path8.posix.join(CONSUMER_TOKENS_DIR, CONSUMER_OVERRIDES_FILE),
+    target: path9.posix.join(CONSUMER_TOKENS_DIR, CONSUMER_OVERRIDES_FILE),
     hash: computeHash(overridesContent),
     strategy: "frozen"
   });
@@ -897,7 +968,7 @@ async function runTokensInit(options) {
     installedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   await writeFileSafe(
-    path8.join(projectRoot, ".teamix-evo", "tokens-lock.json"),
+    path9.join(projectRoot, ".teamix-evo", "tokens-lock.json"),
     JSON.stringify(lock, null, 2) + "\n"
   );
   const config = {
@@ -929,6 +1000,7 @@ async function runTokensInit(options) {
   if (tokensIdx >= 0) prior.installed[tokensIdx] = tokensEntry;
   else prior.installed.push(tokensEntry);
   await writeInstalledManifest(projectRoot, prior);
+  await ensureMcpJson(projectRoot);
   const skills = await tryAutoInstallVariantSkills({
     projectRoot,
     variant,
@@ -1015,14 +1087,14 @@ async function tryAutoInstallVariantSkills(args) {
   }
 }
 async function installVariantFile(fileRelToPackage, packageRoot, projectRoot) {
-  const sourceAbs = path8.join(packageRoot, fileRelToPackage);
-  const base = path8.basename(fileRelToPackage);
+  const sourceAbs = path9.join(packageRoot, fileRelToPackage);
+  const base = path9.basename(fileRelToPackage);
   if (base === "theme.css") {
-    const targetRel = path8.posix.join(
+    const targetRel = path9.posix.join(
       CONSUMER_TOKENS_DIR,
       CONSUMER_THEME_FILE
     );
-    const targetAbs = path8.join(projectRoot, targetRel);
+    const targetAbs = path9.join(projectRoot, targetRel);
     const content = await fs6.readFile(sourceAbs, "utf-8");
     await writeFileSafe(targetAbs, content);
     return {
@@ -1033,11 +1105,11 @@ async function installVariantFile(fileRelToPackage, packageRoot, projectRoot) {
     };
   }
   if (base === "overrides.css" || base === "tokens.overrides.css") {
-    const targetRel = path8.posix.join(
+    const targetRel = path9.posix.join(
       CONSUMER_TOKENS_DIR,
       CONSUMER_OVERRIDES_FILE
     );
-    const targetAbs = path8.join(projectRoot, targetRel);
+    const targetAbs = path9.join(projectRoot, targetRel);
     if (await fileExists(targetAbs)) {
       const existing = await fs6.readFile(targetAbs, "utf-8");
       return {
@@ -1060,7 +1132,7 @@ async function installVariantFile(fileRelToPackage, packageRoot, projectRoot) {
 }
 function resolveTokensPackageRoot(packageName) {
   const pkgJson = require3.resolve(`${packageName}/package.json`);
-  return path8.dirname(pkgJson);
+  return path9.dirname(pkgJson);
 }
 async function listTokenVariants(packageName = DEFAULT_TOKENS_PACKAGE, packageRoot) {
   const root = packageRoot ?? resolveTokensPackageRoot(packageName);
@@ -1078,11 +1150,46 @@ async function listTokenVariants(packageName = DEFAULT_TOKENS_PACKAGE, packageRo
   };
 }
 
+// src/utils/global-root.ts
+import { existsSync } from "fs";
+import * as fs7 from "fs/promises";
+import * as os3 from "os";
+import * as path10 from "path";
+var GLOBAL_META_DIR = ".teamix-evo-global";
+var TEAMIX_DIR2 = ".teamix-evo";
+var CONFIG_FILE2 = "config.json";
+function getGlobalMetaRoot() {
+  return path10.join(os3.homedir(), GLOBAL_META_DIR);
+}
+function isTeamixEvoProject(dir) {
+  return existsSync(path10.join(dir, TEAMIX_DIR2, CONFIG_FILE2));
+}
+async function ensureGlobalMetaRoot() {
+  const root = getGlobalMetaRoot();
+  await fs7.mkdir(root, { recursive: true });
+  return root;
+}
+function hasPackageJson(projectRoot) {
+  return existsSync(path10.join(projectRoot, "package.json"));
+}
+function resolveSkillsMaintenanceRoot(cwd) {
+  if (isTeamixEvoProject(cwd)) return cwd;
+  const globalRoot = getGlobalMetaRoot();
+  if (isTeamixEvoProject(globalRoot)) return globalRoot;
+  return cwd;
+}
+
 // src/commands/tokens/init.ts
 var initCommand = new Command("init").description("\u521D\u59CB\u5316\u8BBE\u8BA1\u4F53\u7CFB\u8D44\u6E90\uFF08\u5FC5\u987B\u663E\u5F0F\u6307\u5B9A\u4E1A\u52A1\u53D8\u4F53\uFF09").argument("<variant>", '\u4E1A\u52A1\u53D8\u4F53\u540D\u79F0\uFF08\u5982 "opentrek"\u3001"uni-manager"\uFF09').action(async (variant) => {
   try {
     const ide = detectIde();
     const projectRoot = ide.getProjectRoot();
+    if (!hasPackageJson(projectRoot)) {
+      logger.error(
+        "No package.json found in current directory. Please run this command in a valid project root."
+      );
+      process.exit(1);
+    }
     logger.info(`Initializing design system: variant="${variant}"`);
     logger.debug(`Project root: ${projectRoot}`);
     logger.debug(`IDE: ${ide.name}`);
@@ -1152,8 +1259,8 @@ var initCommand = new Command("init").description("\u521D\u59CB\u5316\u8BBE\u8BA
 import { Command as Command2 } from "commander";
 
 // src/core/tokens-update.ts
-import * as path9 from "path";
-import * as fs7 from "fs/promises";
+import * as path11 from "path";
+import * as fs8 from "fs/promises";
 import { createRequire as createRequire3 } from "module";
 import {
   loadTokensPackageManifest as loadTokensPackageManifest2,
@@ -1195,7 +1302,7 @@ async function runTokensUpdate(options) {
     projectRoot
   );
   const preserved = [];
-  const overridesAbs = path9.join(
+  const overridesAbs = path11.join(
     projectRoot,
     CONSUMER_TOKENS_DIR2,
     "tokens.overrides.css"
@@ -1214,7 +1321,7 @@ async function runTokensUpdate(options) {
     installedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   await writeFileSafe(
-    path9.join(projectRoot, ".teamix-evo", "tokens-lock.json"),
+    path11.join(projectRoot, ".teamix-evo", "tokens-lock.json"),
     JSON.stringify(lock, null, 2) + "\n"
   );
   config.packages.tokens.version = variantEntry.version;
@@ -1229,9 +1336,9 @@ async function runTokensUpdate(options) {
     prior.installed[idx].installedAt = (/* @__PURE__ */ new Date()).toISOString();
     for (const r of prior.installed[idx].resources) {
       if (r.strategy === "regenerable") {
-        const abs = path9.isAbsolute(r.target) ? r.target : path9.join(projectRoot, r.target);
+        const abs = path11.isAbsolute(r.target) ? r.target : path11.join(projectRoot, r.target);
         if (await fileExists(abs)) {
-          r.hash = computeHash(await fs7.readFile(abs, "utf-8"));
+          r.hash = computeHash(await fs8.readFile(abs, "utf-8"));
         }
       }
     }
@@ -1250,15 +1357,15 @@ async function runTokensUpdate(options) {
 async function rewriteRegenerableFiles(files, packageRoot, projectRoot) {
   const written = [];
   for (const fileRel of files) {
-    const base = path9.basename(fileRel);
+    const base = path11.basename(fileRel);
     if (base !== "theme.css") continue;
-    const sourceAbs = path9.join(packageRoot, fileRel);
-    const targetAbs = path9.join(
+    const sourceAbs = path11.join(packageRoot, fileRel);
+    const targetAbs = path11.join(
       projectRoot,
       CONSUMER_TOKENS_DIR2,
       CONSUMER_THEME_FILE2
     );
-    const content = await fs7.readFile(sourceAbs, "utf-8");
+    const content = await fs8.readFile(sourceAbs, "utf-8");
     await writeFileSafe(targetAbs, content);
     written.push(CONSUMER_THEME_FILE2);
   }
@@ -1266,7 +1373,7 @@ async function rewriteRegenerableFiles(files, packageRoot, projectRoot) {
 }
 function resolveTokensPackageRoot2(packageName) {
   const pkgJson = require4.resolve(`${packageName}/package.json`);
-  return path9.dirname(pkgJson);
+  return path11.dirname(pkgJson);
 }
 
 // src/commands/tokens/update.ts
@@ -1382,8 +1489,8 @@ var listVariantsCommand = new Command4("list-variants").description("\u5217\u51F
 
 // src/commands/tokens/uninstall.ts
 import { Command as Command5 } from "commander";
-import * as fs8 from "fs/promises";
-import * as path10 from "path";
+import * as fs9 from "fs/promises";
+import * as path12 from "path";
 import * as prompts from "@clack/prompts";
 var TOKENS_PACKAGE = "@teamix-evo/tokens";
 var uninstallCommand = new Command5("uninstall").description(
@@ -1425,9 +1532,9 @@ var uninstallCommand = new Command5("uninstall").description(
     }
     let removed = 0;
     for (const r of removable) {
-      const target = path10.isAbsolute(r.target) ? r.target : path10.join(projectRoot, r.target);
+      const target = path12.isAbsolute(r.target) ? r.target : path12.join(projectRoot, r.target);
       try {
-        await fs8.unlink(target);
+        await fs9.unlink(target);
         removed++;
       } catch (err) {
         if (err.code !== "ENOENT") {
@@ -1445,13 +1552,13 @@ var uninstallCommand = new Command5("uninstall").description(
     }
     delete config.packages.tokens;
     await writeProjectConfig(projectRoot, config);
-    const lockPath = path10.join(
+    const lockPath = path12.join(
       projectRoot,
       ".teamix-evo",
       "tokens-lock.json"
     );
     try {
-      await fs8.unlink(lockPath);
+      await fs9.unlink(lockPath);
     } catch (err) {
       if (err.code !== "ENOENT") {
         logger.warn(
@@ -1486,34 +1593,6 @@ import { Command as Command13 } from "commander";
 // src/commands/skills/add.ts
 import { Command as Command7 } from "commander";
 import * as prompts2 from "@clack/prompts";
-
-// src/utils/global-root.ts
-import { existsSync } from "fs";
-import * as fs9 from "fs/promises";
-import * as os3 from "os";
-import * as path11 from "path";
-var GLOBAL_META_DIR = ".teamix-evo-global";
-var TEAMIX_DIR2 = ".teamix-evo";
-var CONFIG_FILE2 = "config.json";
-function getGlobalMetaRoot() {
-  return path11.join(os3.homedir(), GLOBAL_META_DIR);
-}
-function isTeamixEvoProject(dir) {
-  return existsSync(path11.join(dir, TEAMIX_DIR2, CONFIG_FILE2));
-}
-async function ensureGlobalMetaRoot() {
-  const root = getGlobalMetaRoot();
-  await fs9.mkdir(root, { recursive: true });
-  return root;
-}
-function resolveSkillsMaintenanceRoot(cwd) {
-  if (isTeamixEvoProject(cwd)) return cwd;
-  const globalRoot = getGlobalMetaRoot();
-  if (isTeamixEvoProject(globalRoot)) return globalRoot;
-  return cwd;
-}
-
-// src/commands/skills/add.ts
 var addCommand = new Command7("add").description(
   "\u5411\u9879\u76EE\uFF08\u6216\u5168\u5C40 IDE \u914D\u7F6E\uFF09\u6DFB\u52A0 teamix-evo skills\uFF1B\u4E0D\u4F20 names \u5219\u6DFB\u52A0 manifest \u5185\u5168\u90E8 skill"
 ).argument(
@@ -1536,6 +1615,11 @@ var addCommand = new Command7("add").description(
     if (scope === "global" && !isTeamixEvoProject(cwd)) {
       projectRoot = await ensureGlobalMetaRoot();
       logger.info(`Global skill install \u2014 meta root: ${projectRoot}`);
+    } else if (scope !== "global" && !hasPackageJson(cwd)) {
+      logger.error(
+        "No package.json found in current directory. Please run this command in a valid project root."
+      );
+      process.exit(1);
     }
     logger.info(
       isIncremental ? `Adding skills [${names.join(",")}]: ides=[${ides.join(
@@ -1843,7 +1927,7 @@ var updateCommand2 = new Command9("update").description("\u66F4\u65B0\u5DF2\u5B8
 // src/commands/skills/uninstall.ts
 import { Command as Command10 } from "commander";
 import * as prompts3 from "@clack/prompts";
-import * as path12 from "path";
+import * as path13 from "path";
 import * as fs10 from "fs/promises";
 var SKILLS_PACKAGE3 = "@teamix-evo/skills";
 var uninstallCommand2 = new Command10("uninstall").description(
@@ -1912,6 +1996,7 @@ async function runFullUninstall(args) {
   const removed = await removeSkillFiles(resources);
   logger.debug(`Removed ${removed.length} files`);
   const skillsRoot = getSkillsSourceDir(projectRoot);
+  const sourceSkillNames = await listSkillSourceNames(skillsRoot);
   try {
     await fs10.rm(skillsRoot, { recursive: true, force: true });
     logger.debug(`Removed source dir ${skillsRoot}`);
@@ -1920,6 +2005,17 @@ async function runFullUninstall(args) {
       `Failed to remove ${skillsRoot}: ${err.message}`
     );
   }
+  const skillNames = collectSkillNames({
+    fromSources: sourceSkillNames,
+    fromConfig: config,
+    fromResources: resources
+  });
+  const cleanedMirrorDirs = await removeMirrorDirs(
+    projectRoot,
+    config?.packages?.skills?.scope,
+    config?.packages?.skills?.ides,
+    skillNames
+  );
   if (installedManifest && pkg) {
     installedManifest.installed = installedManifest.installed.filter(
       (p) => p.package !== SKILLS_PACKAGE3
@@ -1930,7 +2026,12 @@ async function runFullUninstall(args) {
   await writeProjectConfig(projectRoot, config);
   logger.success(`Uninstalled ${SKILLS_PACKAGE3}`);
   logger.info(`  Removed: ${removed.length} files`);
-  logger.info(`  Source:  ${path12.relative(projectRoot, skillsRoot)} (cleaned)`);
+  logger.info(`  Source:  ${path13.relative(projectRoot, skillsRoot)} (cleaned)`);
+  if (cleanedMirrorDirs.length > 0) {
+    logger.info(
+      `  Mirrors: ${cleanedMirrorDirs.map((d) => path13.relative(projectRoot, d)).join(", ")} (cleaned)`
+    );
+  }
 }
 async function runPartialUninstall(args) {
   const { projectRoot, installedManifest, pkg, resources, ids, opts } = args;
@@ -1972,6 +2073,13 @@ async function runPartialUninstall(args) {
       logger.warn(`Failed to remove ${dir}: ${err.message}`);
     }
   }
+  const config = await readProjectConfig(projectRoot);
+  const cleanedMirrorDirs = await removeMirrorDirs(
+    projectRoot,
+    config?.packages?.skills?.scope,
+    config?.packages?.skills?.ides,
+    matched
+  );
   const lock = await readSkillsLock(projectRoot);
   if (lock) {
     for (const id of matched) delete lock.skills[id];
@@ -1985,10 +2093,69 @@ async function runPartialUninstall(args) {
     `Removed ${matched.length} skill(s): ${matched.join(", ")}`
   );
   logger.info(`  Files:   ${removed.length}`);
+  if (cleanedMirrorDirs.length > 0) {
+    logger.info(
+      `  Mirrors: ${cleanedMirrorDirs.map((d) => path13.relative(projectRoot, d)).join(", ")} (cleaned)`
+    );
+  }
   if (missing.length > 0) {
     logger.info(`  Skipped: ${missing.join(", ")} (not installed)`);
   }
 }
+async function listSkillSourceNames(skillsRoot) {
+  try {
+    const entries = await fs10.readdir(skillsRoot, { withFileTypes: true });
+    return entries.filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return [];
+  }
+}
+function collectSkillNames(args) {
+  const set = new Set(args.fromSources);
+  for (const r of args.fromResources) {
+    set.add(r.id.split(":")[0]);
+  }
+  return [...set];
+}
+async function removeMirrorDirs(projectRoot, scope, ides, skillNames) {
+  if (skillNames.length === 0) return [];
+  const targetIdes = ides && ides.length > 0 ? ides.filter((i) => i === "qoder" || i === "claude") : [...ALL_IDE_KINDS];
+  const targetScope = scope === "global" ? "global" : "project";
+  const removed = [];
+  for (const ide of targetIdes) {
+    const adapter = getAdapter(ide);
+    for (const name of skillNames) {
+      const dir = adapter.getSkillTargetDir(name, targetScope, projectRoot);
+      let existed = true;
+      try {
+        await fs10.access(dir);
+      } catch {
+        existed = false;
+      }
+      if (!existed) continue;
+      try {
+        await fs10.rm(dir, { recursive: true, force: true });
+        removed.push(dir);
+        logger.debug(`Removed mirror dir ${dir}`);
+      } catch (err) {
+        logger.warn(`Failed to remove ${dir}: ${err.message}`);
+      }
+    }
+    if (removed.length > 0) {
+      const skillsParent = path13.dirname(
+        adapter.getSkillTargetDir("placeholder", targetScope, projectRoot)
+      );
+      try {
+        const remaining = await fs10.readdir(skillsParent);
+        if (remaining.length === 0) {
+          await fs10.rmdir(skillsParent);
+        }
+      } catch {
+      }
+    }
+  }
+  return removed;
+}
 function skillIdOf(r) {
   return r.id.split(":")[0];
 }
@@ -2010,7 +2177,7 @@ function dedupe(values) {
 import { Command as Command11 } from "commander";
 
 // src/core/skills-sync.ts
-import * as path13 from "path";
+import * as path14 from "path";
 import * as fs11 from "fs/promises";
 import { createRequire as createRequire4 } from "module";
 import { loadSkillsPackageManifest as loadSkillsPackageManifest2 } from "@teamix-evo/registry";
@@ -2018,7 +2185,7 @@ var require5 = createRequire4(import.meta.url);
 async function readSkillMetaFromUpstream(skillId) {
   try {
     const pkgJson = require5.resolve("@teamix-evo/skills/package.json");
-    const packageRoot = path13.dirname(pkgJson);
+    const packageRoot = path14.dirname(pkgJson);
     const manifest = await loadSkillsPackageManifest2(packageRoot);
     const entry = manifest.skills.find((s) => s.id === skillId);
     if (!entry) return null;
@@ -2192,7 +2359,7 @@ function parseScope2(input) {
 import { Command as Command12 } from "commander";
 
 // src/core/skills-doctor.ts
-import * as path14 from "path";
+import * as path15 from "path";
 import * as fs12 from "fs/promises";
 async function runSkillsDoctor(options) {
   const { projectRoot } = options;
@@ -2215,7 +2382,7 @@ async function runSkillsDoctor(options) {
     const sourceFiles = await walkDir(sourceDir);
     const sourceContents = /* @__PURE__ */ new Map();
     for (const f of sourceFiles) {
-      const rel2 = path14.relative(sourceDir, f);
+      const rel2 = path15.relative(sourceDir, f);
       sourceContents.set(rel2, await fs12.readFile(f, "utf-8"));
     }
     for (const ide of entry.mirroredTo) {
@@ -2237,7 +2404,7 @@ async function runSkillsDoctor(options) {
         continue;
       }
       for (const [rel2, sourceContent] of sourceContents.entries()) {
-        const mirrorFile = path14.join(mirrorDir, rel2);
+        const mirrorFile = path15.join(mirrorDir, rel2);
         if (!await fileExists(mirrorFile)) {
           findings.push({
             kind: "missing-mirror",
@@ -2335,35 +2502,6 @@ import { Command as Command14 } from "commander";
 import * as prompts4 from "@clack/prompts";
 
 // src/core/ui-init.ts
-import * as fs13 from "fs/promises";
-import { createRequire as createRequire5 } from "module";
-import * as path15 from "path";
-var require6 = createRequire5(import.meta.url);
-async function deployPreferencesCss(projectRoot) {
-  const targetDir = path15.join(projectRoot, "src");
-  const targetPath = path15.join(targetDir, "preferences.css");
-  try {
-    await fs13.access(targetPath);
-    logger.debug(`preferences.css already exists at ${targetPath}, skipping`);
-    return "skipped";
-  } catch {
-  }
-  let sourcePath;
-  try {
-    const uiPkgJson = require6.resolve("@teamix-evo/ui/package.json");
-    sourcePath = path15.join(path15.dirname(uiPkgJson), "src", "preferences.css");
-    await fs13.access(sourcePath);
-  } catch {
-    logger.debug(
-      "Could not resolve @teamix-evo/ui/src/preferences.css; skipping deploy"
-    );
-    return "source-missing";
-  }
-  await fs13.mkdir(targetDir, { recursive: true });
-  const content = await fs13.readFile(sourcePath, "utf-8");
-  await fs13.writeFile(targetPath, content, "utf-8");
-  return "deployed";
-}
 var DEFAULT_UI_ALIASES = {
   components: "src/components/ui",
   hooks: "src/hooks",
@@ -2407,14 +2545,13 @@ async function runUiInit(options) {
     rsc
   };
   await writeProjectConfig(projectRoot, config);
-  const preferencesCss = await deployPreferencesCss(projectRoot);
+  await ensureMcpJson(projectRoot);
   return {
     status: "installed",
     aliases,
     iconLibrary,
     tsx,
-    rsc,
-    preferencesCss
+    rsc
   };
 }
 
@@ -2429,6 +2566,12 @@ var initCommand2 = new Command14("init").description(
   try {
     const ide = detectIde();
     const projectRoot = ide.getProjectRoot();
+    if (!hasPackageJson(projectRoot)) {
+      logger.error(
+        "No package.json found in current directory. Please run this command in a valid project root."
+      );
+      process.exit(1);
+    }
     const cfg = await resolveConfig(opts);
     const result = await runUiInit({
       projectRoot,
@@ -2451,14 +2594,6 @@ var initCommand2 = new Command14("init").description(
     logger.info(`  lib:        ${result.aliases.lib}`);
     logger.info(`  iconLibrary: ${result.iconLibrary}`);
     logger.info(`  tsx: ${result.tsx}, rsc: ${result.rsc}`);
-    if (result.preferencesCss === "deployed") {
-      logger.info("  preferences.css: deployed \u2192 src/preferences.css");
-      logger.info(
-        "    \u5728 src/index.css \u9876\u90E8\u52A0 `@import './preferences.css';` \u542F\u7528 shadcn \u5168\u5C40\u504F\u597D"
-      );
-    } else if (result.preferencesCss === "skipped") {
-      logger.info("  preferences.css: \u5DF2\u5B58\u5728,\u4FDD\u7559\u7528\u6237\u7248\u672C");
-    }
     logger.info("");
     logger.info("Next: `npx teamix-evo ui add button`");
   } catch (err) {
@@ -2538,12 +2673,12 @@ import { Command as Command15 } from "commander";
 
 // src/core/ui-client.ts
 import * as path16 from "path";
-import * as fs14 from "fs/promises";
-import { createRequire as createRequire6 } from "module";
+import * as fs13 from "fs/promises";
+import { createRequire as createRequire5 } from "module";
 import { loadUiPackageManifest } from "@teamix-evo/registry";
-var require7 = createRequire6(import.meta.url);
+var require6 = createRequire5(import.meta.url);
 function resolvePackageRoot2(packageName) {
-  const pkgJsonPath = require7.resolve(`${packageName}/package.json`);
+  const pkgJsonPath = require6.resolve(`${packageName}/package.json`);
   return path16.dirname(pkgJsonPath);
 }
 async function loadUiData(packageName) {
@@ -2553,7 +2688,7 @@ async function loadUiData(packageName) {
   let data = {};
   const dataPath = path16.join(packageRoot, "_data.json");
   try {
-    const raw = await fs14.readFile(dataPath, "utf-8");
+    const raw = await fs13.readFile(dataPath, "utf-8");
     data = JSON.parse(raw);
   } catch (err) {
     if (err.code !== "ENOENT") {
@@ -2566,7 +2701,7 @@ async function loadUiData(packageName) {
 
 // src/core/ui-installer.ts
 import * as path17 from "path";
-import * as fs15 from "fs/promises";
+import * as fs14 from "fs/promises";
 import { resolveUiEntryOrder } from "@teamix-evo/registry";
 
 // src/utils/transform-imports.ts
@@ -2579,13 +2714,13 @@ var SOURCE_ROOT_TO_ALIAS_KEY = {
 function rewriteImports(source, aliases) {
   return source.replace(
     /(['"])@\/([a-z][a-z0-9-]*)(\/[^'"]*)?\1/g,
-    (full, quote, root, rest) => {
+    (full, quote2, root, rest) => {
       const aliasKey = SOURCE_ROOT_TO_ALIAS_KEY[root];
       if (!aliasKey) return full;
       const alias = aliases[aliasKey];
       const normalized = aliasToImportPath(alias);
       const flatRest = flattenRestPath(rest);
-      return `${quote}${normalized}${flatRest}${quote}`;
+      return `${quote2}${normalized}${flatRest}${quote2}`;
     }
   );
 }
@@ -2640,7 +2775,7 @@ async function installUiEntries(options) {
       }
       const rootForEntry = entryPackageRoot?.get(entry.id) ?? packageRoot;
       const sourceAbs = path17.resolve(rootForEntry, file.source);
-      const raw = await fs15.readFile(sourceAbs, "utf-8");
+      const raw = await fs14.readFile(sourceAbs, "utf-8");
       const transformed = rewriteImports(raw, aliases);
       await writeFileSafe(targetAbs, transformed);
       written++;
@@ -2677,7 +2812,7 @@ function rel(projectRoot, abs) {
 // src/core/ui-add.ts
 var DEFAULT_UI_PACKAGE = "@teamix-evo/ui";
 async function runUiAdd(options) {
-  const { projectRoot, ids, overwrite } = options;
+  const { projectRoot, ids, overwrite, includeDeprecated } = options;
   const packageName = options.packageName ?? DEFAULT_UI_PACKAGE;
   if (ids.length === 0) {
     throw new Error("At least one entry id must be provided.");
@@ -2690,7 +2825,21 @@ async function runUiAdd(options) {
     );
   }
   const { manifest, packageRoot } = await loadUiData(packageName);
-  const knownIds = new Set(manifest.entries.map((e) => e.id));
+  const archived = manifest.deprecatedEntries ?? [];
+  const archivedIds = new Set(archived.map((e) => e.id));
+  const activeIds = new Set(manifest.entries.map((e) => e.id));
+  const requestedDeprecated = ids.filter((id) => archivedIds.has(id));
+  if (requestedDeprecated.length > 0 && !includeDeprecated) {
+    const list = requestedDeprecated.map((s) => `"${s}"`).join(", ");
+    throw new Error(
+      `Refusing to install deprecated entr${requestedDeprecated.length === 1 ? "y" : "ies"} ${list}. These entries are archived and not part of the active distribution (ADR 0028). Pass \`--include-deprecated\` to override (e.g. for migration tooling).`
+    );
+  }
+  const effectiveManifest = includeDeprecated ? { ...manifest, entries: [...manifest.entries, ...archived] } : manifest;
+  const knownIds = /* @__PURE__ */ new Set([
+    ...activeIds,
+    ...includeDeprecated ? archivedIds : []
+  ]);
   const unknown = ids.filter((id) => !knownIds.has(id));
   if (unknown.length > 0) {
     throw new Error(
@@ -2699,7 +2848,7 @@ async function runUiAdd(options) {
   }
   const result = await installUiEntries({
     projectRoot,
-    manifest,
+    manifest: effectiveManifest,
     packageRoot,
     aliases: uiCfg.aliases,
     requested: ids,
@@ -2747,40 +2896,48 @@ function mergeResources(prior, next) {
 // src/commands/ui/add.ts
 var addCommand2 = new Command15("add").description(
   "\u5B89\u88C5\u4E00\u4E2A\u6216\u591A\u4E2A ui entry\uFF08\u6309 id\uFF0C\u81EA\u52A8\u5C55\u5F00 registryDependencies\uFF09"
-).argument("<ids...>", 'entry id \u5217\u8868\uFF0C\u5982 "button" "dialog"').option("--overwrite", "\u5373\u4F7F\u76EE\u6807\u6587\u4EF6\u5DF2\u5B58\u5728\u4E5F\u8986\u76D6\uFF08\u7ED5\u8FC7 frozen \u8DF3\u8FC7\uFF09").action(async (ids, opts) => {
-  try {
-    const ide = detectIde();
-    const projectRoot = ide.getProjectRoot();
-    logger.info(`Installing entries: ${ids.join(", ")}`);
-    const result = await runUiAdd({
-      projectRoot,
-      ids,
-      overwrite: opts.overwrite
-    });
-    logger.success(
-      `UI add complete: ${result.written} written, ${result.skipped} skipped.`
-    );
-    logger.info("");
-    logger.info(`Resolved order: ${result.orderedIds.join(" \u2192 ")}`);
-    const npmDeps = Object.entries(result.npmDependencies);
-    if (npmDeps.length > 0) {
+).argument("<ids...>", 'entry id \u5217\u8868\uFF0C\u5982 "button" "dialog"').option("--overwrite", "\u5373\u4F7F\u76EE\u6807\u6587\u4EF6\u5DF2\u5B58\u5728\u4E5F\u8986\u76D6\uFF08\u7ED5\u8FC7 frozen \u8DF3\u8FC7\uFF09").option(
+  "--include-deprecated",
+  "\u5141\u8BB8\u5B89\u88C5\u5DF2\u5F52\u6863\u7684 deprecated entry\uFF08\u4EC5\u8FC1\u79FB / \u5BA1\u8BA1\u573A\u666F\uFF0CADR 0028\uFF09"
+).action(
+  async (ids, opts) => {
+    try {
+      const ide = detectIde();
+      const projectRoot = ide.getProjectRoot();
+      logger.info(`Installing entries: ${ids.join(", ")}`);
+      const result = await runUiAdd({
+        projectRoot,
+        ids,
+        overwrite: opts.overwrite,
+        includeDeprecated: opts.includeDeprecated
+      });
+      logger.success(
+        `UI add complete: ${result.written} written, ${result.skipped} skipped.`
+      );
       logger.info("");
-      logger.info("Install npm dependencies in your project:");
-      const installCmd = npmDeps.map(([name, range]) => `${name}@${range}`).join(" ");
-      logger.info(`  pnpm add ${installCmd}`);
-      logger.info(`  # or: npm install ${installCmd}`);
-    }
-  } catch (err) {
-    const message = err.message;
-    if (message.startsWith("UI not initialized")) {
-      logger.error("UI not initialized. Run `npx teamix-evo ui init` first.");
-    } else {
-      logger.error(`Failed to add ui entries: ${message}`);
+      logger.info(`Resolved order: ${result.orderedIds.join(" \u2192 ")}`);
+      const npmDeps = Object.entries(result.npmDependencies);
+      if (npmDeps.length > 0) {
+        logger.info("");
+        logger.info("Install npm dependencies in your project:");
+        const installCmd = npmDeps.map(([name, range]) => `${name}@${range}`).join(" ");
+        logger.info(`  pnpm add ${installCmd}`);
+        logger.info(`  # or: npm install ${installCmd}`);
+      }
+    } catch (err) {
+      const message = err.message;
+      if (message.startsWith("UI not initialized")) {
+        logger.error(
+          "UI not initialized. Run `npx teamix-evo ui init` first."
+        );
+      } else {
+        logger.error(`Failed to add ui entries: ${message}`);
+      }
+      logger.debug(err.stack ?? "");
+      process.exitCode = 1;
     }
-    logger.debug(err.stack ?? "");
-    process.exitCode = 1;
   }
-});
+);
 
 // src/commands/ui/list.ts
 import { Command as Command16 } from "commander";
@@ -2788,7 +2945,7 @@ import { Command as Command16 } from "commander";
 // src/core/ui-list.ts
 var DEFAULT_UI_PACKAGE2 = "@teamix-evo/ui";
 async function runUiList(options) {
-  const { projectRoot, installedOnly } = options;
+  const { projectRoot, installedOnly, includeDeprecated } = options;
   const packageName = options.packageName ?? DEFAULT_UI_PACKAGE2;
   const { manifest } = await loadUiData(packageName);
   const installedManifest = await readInstalledManifest(projectRoot);
@@ -2800,65 +2957,77 @@ async function runUiList(options) {
     const colon = r.id.indexOf(":");
     installedIds.add(colon >= 0 ? r.id.slice(0, colon) : r.id);
   }
-  const entries = manifest.entries.filter((e) => !installedOnly || installedIds.has(e.id)).map((e) => ({
-    id: e.id,
-    type: e.type,
-    description: e.description,
-    installed: installedIds.has(e.id)
+  const archived = manifest.deprecatedEntries ?? [];
+  const pool = includeDeprecated ? [
+    ...manifest.entries.map((e) => ({ entry: e, deprecated: false })),
+    ...archived.map((e) => ({ entry: e, deprecated: true }))
+  ] : manifest.entries.map((e) => ({ entry: e, deprecated: false }));
+  const entries = pool.filter(({ entry }) => !installedOnly || installedIds.has(entry.id)).map(({ entry, deprecated }) => ({
+    id: entry.id,
+    type: entry.type,
+    description: entry.description,
+    installed: installedIds.has(entry.id),
+    deprecated
   }));
   return {
     packageName,
-    total: manifest.entries.length,
+    total: manifest.entries.length + (includeDeprecated ? archived.length : 0),
     installedCount: installedIds.size,
     entries
   };
 }
 
 // src/commands/ui/list.ts
-var listCommand3 = new Command16("list").description("\u5217\u51FA @teamix-evo/ui \u7684\u6240\u6709 entry \u53CA\u5DF2\u5B89\u88C5\u72B6\u6001").option("--installed", "\u4EC5\u5C55\u793A\u5DF2\u5B89\u88C5\u7684 entry").action(async (opts) => {
-  try {
-    const ide = detectIde();
-    const projectRoot = ide.getProjectRoot();
-    const { entries, total, installedCount } = await runUiList({
-      projectRoot,
-      installedOnly: opts.installed
-    });
-    if (entries.length === 0) {
+var listCommand3 = new Command16("list").description("\u5217\u51FA @teamix-evo/ui \u7684\u6240\u6709 entry \u53CA\u5DF2\u5B89\u88C5\u72B6\u6001").option("--installed", "\u4EC5\u5C55\u793A\u5DF2\u5B89\u88C5\u7684 entry").option(
+  "--include-deprecated",
+  "\u540C\u65F6\u5217\u51FA\u5DF2\u5F52\u6863\u7684 deprecated entry\uFF08\u9ED8\u8BA4\u9690\u85CF\uFF0CADR 0028\uFF09"
+).action(
+  async (opts) => {
+    try {
+      const ide = detectIde();
+      const projectRoot = ide.getProjectRoot();
+      const { entries, total, installedCount } = await runUiList({
+        projectRoot,
+        installedOnly: opts.installed,
+        includeDeprecated: opts.includeDeprecated
+      });
+      if (entries.length === 0) {
+        logger.info(
+          opts.installed ? "No ui entries installed." : "No ui entries available."
+        );
+        return;
+      }
+      const idWidth = Math.max(...entries.map((e) => e.id.length), 4);
+      const typeWidth = Math.max(...entries.map((e) => e.type.length), 4);
       logger.info(
-        opts.installed ? "No ui entries installed." : "No ui entries available."
+        `${"ID".padEnd(idWidth)}  ${"TYPE".padEnd(
+          typeWidth
+        )}  STATUS      DESCRIPTION`
       );
-      return;
-    }
-    const idWidth = Math.max(...entries.map((e) => e.id.length), 4);
-    const typeWidth = Math.max(...entries.map((e) => e.type.length), 4);
-    logger.info(
-      `${"ID".padEnd(idWidth)}  ${"TYPE".padEnd(
-        typeWidth
-      )}  STATUS   DESCRIPTION`
-    );
-    logger.info(
-      `${"\u2500".repeat(idWidth)}  ${"\u2500".repeat(
-        typeWidth
-      )}  \u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`
-    );
-    for (const e of entries) {
-      const status = e.installed ? "INSTALLED" : "\u2013";
       logger.info(
-        `${e.id.padEnd(idWidth)}  ${e.type.padEnd(
+        `${"\u2500".repeat(idWidth)}  ${"\u2500".repeat(
           typeWidth
-        )}  ${status.padEnd(7)}  ${e.description}`
+        )}  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`
       );
+      for (const e of entries) {
+        const status = e.deprecated ? e.installed ? "INST/DEPR" : "DEPRECATED" : e.installed ? "INSTALLED" : "\u2013";
+        logger.info(
+          `${e.id.padEnd(idWidth)}  ${e.type.padEnd(
+            typeWidth
+          )}  ${status.padEnd(10)}  ${e.description}`
+        );
+      }
+      logger.info("");
+      logger.info(
+        `Total: ${total} entr${total === 1 ? "y" : "ies"}, ${installedCount} installed.`
+      );
+    } catch (err) {
+      logger.error(`Failed to list ui entries: ${err.message}`);
+      logger.debug(err.stack ?? "");
+      process.exitCode = 1;
     }
-    logger.info("");
-    logger.info(
-      `Total: ${total} entr${total === 1 ? "y" : "ies"}, ${installedCount} installed.`
-    );
-  } catch (err) {
-    logger.error(`Failed to list ui entries: ${err.message}`);
-    logger.debug(err.stack ?? "");
-    process.exitCode = 1;
   }
-});
+);
 
 // src/commands/ui/index.ts
 var uiCommand = new Command17("ui").description(
@@ -2876,15 +3045,15 @@ import { Command as Command18 } from "commander";
 
 // src/core/variant-ui-add.ts
 import * as path18 from "path";
-import { createRequire as createRequire7 } from "module";
+import { createRequire as createRequire6 } from "module";
 import {
   loadUiPackageManifest as loadUiPackageManifest2,
   loadVariantUiPackageCatalog,
   loadVariantUiPackageManifest
 } from "@teamix-evo/registry";
-var require8 = createRequire7(import.meta.url);
+var require7 = createRequire6(import.meta.url);
 function resolvePackageRoot3(packageName) {
-  const pkgJsonPath = require8.resolve(`${packageName}/package.json`);
+  const pkgJsonPath = require7.resolve(`${packageName}/package.json`);
   return path18.dirname(pkgJsonPath);
 }
 async function runVariantUiAdd(packageName, options) {
@@ -3055,6 +3224,12 @@ var addCommand3 = new Command18("add").description(
       }
       const ide = detectIde();
       const projectRoot = ide.getProjectRoot();
+      const projectVariant = await readTokensVariant(projectRoot);
+      if (projectVariant && projectVariant !== opts.variant) {
+        throw new Error(
+          `Variant mismatch \u2014 project is locked to "${projectVariant}" but you requested "${opts.variant}". Fix: run \`teamix-evo tokens uninstall -y\` then \`teamix-evo tokens init ${opts.variant}\` to switch, or re-run with \`--variant ${projectVariant}\` to install for the current variant.`
+        );
+      }
       logger.info(
         `Installing biz-ui entries from variant "${opts.variant}": ${ids.join(", ")}`
       );
@@ -3159,6 +3334,12 @@ var addCommand4 = new Command22("add").description(
       }
       const ide = detectIde();
       const projectRoot = ide.getProjectRoot();
+      const projectVariant = await readTokensVariant(projectRoot);
+      if (projectVariant && projectVariant !== opts.variant) {
+        throw new Error(
+          `Variant mismatch \u2014 project is locked to "${projectVariant}" but you requested "${opts.variant}". Fix: run \`teamix-evo tokens uninstall -y\` then \`teamix-evo tokens init ${opts.variant}\` to switch, or re-run with \`--variant ${projectVariant}\` to install for the current variant.`
+        );
+      }
       logger.info(
         `Installing templates from variant "${opts.variant}": ${ids.join(", ")}`
       );
@@ -3247,7 +3428,7 @@ templatesCommand.addCommand(listCommand5);
 templatesCommand.addCommand(listVariantsCommand3);
 
 // src/commands/logs/index.ts
-import { Command as Command27 } from "commander";
+import { Command as Command28 } from "commander";
 
 // src/commands/logs/analyze.ts
 import { Command as Command26 } from "commander";
@@ -3433,16 +3614,227 @@ function parseIntOrUndef(v) {
   return Number.isFinite(n) && n > 0 ? n : void 0;
 }
 
+// src/commands/logs/trace.ts
+import { Command as Command27 } from "commander";
+import { readFileSync as readFileSync2, readdirSync as readdirSync2, existsSync as existsSync3, statSync as statSync2 } from "fs";
+import { resolve as resolve4, join as join18 } from "path";
+var DATE_DIR_RE2 = /^\d{4}-\d{2}-\d{2}$/;
+var logsTraceCommand = new Command27("trace").description(
+  "\u6309\u4F1A\u8BDD\u8FD8\u539F AI \u8C03\u7528\u94FE\u8DEF:\u4ECE\u7528\u6237 prompt \u8D77\u59CB,\u4E32\u8054\u540E\u7EED PreToolUse/PostToolUse \u76F4\u5230\u4E0B\u4E00\u4E2A prompt \u6216 Stop"
+).option("--prompt <keyword>", "\u6309\u7528\u6237\u8F93\u5165\u5173\u952E\u5B57\u8FC7\u6EE4 (\u5B50\u4E32\u5339\u914D,\u4E0D\u533A\u5206\u5927\u5C0F\u5199)").option("--session <id>", "\u6307\u5B9A\u4F1A\u8BDD ID (\u524D\u7F00\u5339\u914D)").option("--days <n>", "\u53EA\u770B\u6700\u8FD1 N \u5929\u7684\u76EE\u5F55 (\u9ED8\u8BA4 7)", "7").option("--dir <path>", "log \u76EE\u5F55 (\u9ED8\u8BA4 <project>/.log/ai)").option("--json", "\u4EE5 JSON \u8F93\u51FA (CI/\u5DE5\u5177\u53CB\u597D)").action((opts) => {
+  const baseDir = resolve4(opts.dir ?? join18(process.cwd(), ".log", "ai"));
+  if (!existsSync3(baseDir)) {
+    logger.warn(`No log directory at ${baseDir}.`);
+    logger.info(
+      "\u8FD0\u884C vibe-logger hook \u89E6\u53D1\u540E\u4F1A\u5728\u6B64\u76EE\u5F55\u751F\u6210 JSONL \u2014 \u89C1 .claude/scripts/vibe-logger.mjs"
+    );
+    return;
+  }
+  const dayLimit = parseIntOrUndef2(opts.days) ?? 7;
+  const records = readRecords(baseDir, dayLimit);
+  const report = buildTrace(records, {
+    prompt: opts.prompt,
+    session: opts.session
+  });
+  if (opts.json) {
+    process.stdout.write(JSON.stringify(report, null, 2) + "\n");
+    return;
+  }
+  printTrace(baseDir, report);
+});
+function readRecords(baseDir, dayLimit) {
+  const dayDirs = readdirSync2(baseDir, { withFileTypes: true }).filter((e) => e.isDirectory() && DATE_DIR_RE2.test(e.name)).map((e) => e.name).sort().reverse();
+  const selected = dayDirs.slice(0, dayLimit);
+  const records = [];
+  for (const day of selected) {
+    const dayPath = join18(baseDir, day);
+    let entries;
+    try {
+      entries = readdirSync2(dayPath);
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.endsWith(".jsonl")) continue;
+      const fp = join18(dayPath, entry);
+      try {
+        if (!statSync2(fp).isFile()) continue;
+      } catch {
+        continue;
+      }
+      const text2 = readFileSync2(fp, "utf8");
+      for (const line of text2.split("\n")) {
+        if (!line.trim()) continue;
+        try {
+          records.push(JSON.parse(line));
+        } catch {
+        }
+      }
+    }
+  }
+  return records;
+}
+function buildTrace(records, filter = {}) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const r of records) {
+    if (!r.session) continue;
+    const arr = groups.get(r.session) ?? [];
+    arr.push(r);
+    groups.set(r.session, arr);
+  }
+  const promptNeedle = filter.prompt?.toLowerCase();
+  const sessionPrefix = filter.session;
+  const sessions = [];
+  for (const [sessionId, items] of groups.entries()) {
+    if (sessionPrefix && !sessionId.startsWith(sessionPrefix)) continue;
+    items.sort((a, b) => a.ts < b.ts ? -1 : a.ts > b.ts ? 1 : 0);
+    const chains = [];
+    let current = null;
+    let pending = /* @__PURE__ */ new Map();
+    const closeCurrent = () => {
+      if (current) chains.push(current);
+      current = null;
+      pending = /* @__PURE__ */ new Map();
+    };
+    for (const r of items) {
+      if (r.event === "UserPromptSubmit") {
+        if (current) closeCurrent();
+        current = { prompt: r.prompt ?? "", promptTs: r.ts, steps: [] };
+        pending = /* @__PURE__ */ new Map();
+        continue;
+      }
+      if (r.event === "Stop") {
+        if (current) closeCurrent();
+        continue;
+      }
+      if (!current) continue;
+      if (r.event === "PreToolUse") {
+        const idx = current.steps.length;
+        current.steps.push({
+          ts: r.ts,
+          event: "PreToolUse",
+          tool: r.tool,
+          file: r.file,
+          tags: r.tags,
+          duration_ms: r.duration_ms,
+          error: r.error ?? false
+        });
+        if (r.tool) {
+          const list = pending.get(r.tool) ?? [];
+          list.push(idx);
+          pending.set(r.tool, list);
+        }
+      } else if (r.event === "PostToolUse") {
+        const list = r.tool ? pending.get(r.tool) : void 0;
+        if (list && list.length > 0) {
+          const idx = list.shift();
+          if (list.length === 0 && r.tool) pending.delete(r.tool);
+          const step = current.steps[idx];
+          if (r.duration_ms !== void 0) step.duration_ms = r.duration_ms;
+          if (r.error !== void 0) step.error = r.error;
+          if (!step.file && r.file) step.file = r.file;
+          if ((!step.tags || step.tags.length === 0) && r.tags)
+            step.tags = r.tags;
+        } else {
+          current.steps.push({
+            ts: r.ts,
+            event: "PostToolUse",
+            tool: r.tool,
+            file: r.file,
+            tags: r.tags,
+            duration_ms: r.duration_ms,
+            error: r.error ?? false
+          });
+        }
+      }
+    }
+    if (current) closeCurrent();
+    const filteredChains = promptNeedle ? chains.filter((c) => c.prompt.toLowerCase().includes(promptNeedle)) : chains;
+    if (filteredChains.length === 0) continue;
+    sessions.push({
+      id: sessionId,
+      agent: items[0]?.agent ?? "unknown",
+      chains: filteredChains
+    });
+  }
+  sessions.sort((a, b) => {
+    const ta = a.chains[0]?.promptTs ?? "";
+    const tb = b.chains[0]?.promptTs ?? "";
+    return tb.localeCompare(ta);
+  });
+  return { sessions };
+}
+function printTrace(baseDir, r) {
+  logger.info(`vibe-logger \u94FE\u8DEF\u8FFD\u8E2A`);
+  logger.info(`  \u76EE\u5F55:  ${baseDir}`);
+  logger.info(`  \u4F1A\u8BDD:  ${r.sessions.length}`);
+  logger.info("");
+  if (r.sessions.length === 0) {
+    logger.info("\u672A\u627E\u5230\u5339\u914D\u7684\u4F1A\u8BDD/\u63D0\u793A\u3002");
+    return;
+  }
+  for (const s of r.sessions) {
+    logger.info(`\u2501\u2501\u2501 Session: ${s.id} (${s.agent}) \u2501\u2501\u2501`);
+    logger.info("");
+    for (const c of s.chains) {
+      logger.info(
+        `[${formatTime(c.promptTs)}] \u{1F4AC} Prompt: ${quote(truncate(c.prompt, 200))}`
+      );
+      for (const step of c.steps) {
+        logger.info(`  ${formatStep(step)}`);
+      }
+      logger.info("");
+    }
+  }
+}
+function formatStep(s) {
+  const ts = `[${formatTime(s.ts)}]`;
+  const isEdit = s.tool === "Edit" || s.tool === "Write" || s.tool === "MultiEdit" || s.tool === "create_file" || s.tool === "search_replace";
+  const icon = isEdit ? "\u{1F4DD}" : "\u{1F527}";
+  const head = isEdit && s.file ? `${s.tool ?? "?"} \u2192 ${s.file}` : s.tool ?? s.event ?? "?";
+  const dur = s.duration_ms !== void 0 ? `${s.duration_ms}ms` : "";
+  const tags = s.tags && s.tags.length ? `[${s.tags.join(",")}]` : "";
+  const err = s.error ? "\u274C" : "";
+  return [ts, icon, padRight(head, 40), padLeft(dur, 6), tags, err].filter((x) => x !== "").join(" ");
+}
+function formatTime(ts) {
+  const d = new Date(ts);
+  if (Number.isNaN(d.getTime())) return ts;
+  const hh = String(d.getUTCHours()).padStart(2, "0");
+  const mm = String(d.getUTCMinutes()).padStart(2, "0");
+  const ss = String(d.getUTCSeconds()).padStart(2, "0");
+  return `${hh}:${mm}:${ss}`;
+}
+function quote(s) {
+  return `"${s.replace(/"/g, '\\"')}"`;
+}
+function truncate(s, n) {
+  if (s.length <= n) return s;
+  return s.slice(0, n) + "\u2026";
+}
+function padRight(s, n) {
+  return s.length >= n ? s : s + " ".repeat(n - s.length);
+}
+function padLeft(s, n) {
+  return s.length >= n ? s : " ".repeat(n - s.length) + s;
+}
+function parseIntOrUndef2(v) {
+  if (v === void 0) return void 0;
+  const n = Number.parseInt(v, 10);
+  return Number.isFinite(n) && n > 0 ? n : void 0;
+}
+
 // src/commands/logs/index.ts
-var logsCommand = new Command27("logs").description(
+var logsCommand = new Command28("logs").description(
   "\u67E5\u8BE2 vibe-logger \u8F93\u51FA (.log/ai/**/*.jsonl) \u2014 AI \u8C03\u7528\u94FE\u5206\u6790"
 );
 logsCommand.addCommand(logsAnalyzeCommand);
+logsCommand.addCommand(logsTraceCommand);
 
 // src/index.ts
-var require9 = createRequire8(import.meta.url);
-var { version } = require9("../package.json");
-var program = new Command28();
+var require8 = createRequire7(import.meta.url);
+var { version } = require8("../package.json");
+var program = new Command29();
 program.name("teamix-evo").description("Where ideas evolve. \u2014 AI Coding \u5957\u4EF6").version(version);
 program.addCommand(tokensCommand);
 program.addCommand(skillsCommand);