teamix-evo 0.14.0 → 0.14.2

package/dist/index.js

@@ -180,12 +180,40 @@ async function readInstalledManifest(projectRoot) {
     );
   }
   const result = validateInstalled(data);
-  if (!result.success) {
-    throw new Error(
-      `Invalid manifest.json schema: ${result.error}. Fix the file manually or remove it to start fresh.`
+  if (result.success) {
+    return result.data;
+  }
+  const migrated = migrateManifest(data);
+  const retryResult = validateInstalled(migrated);
+  if (retryResult.success) {
+    logger.warn(
+      "Migrated legacy manifest.json \u2014 will be overwritten on next install."
     );
+    return retryResult.data;
   }
-  return result.data;
+  throw new Error(
+    `Invalid manifest.json schema: ${result.error}. Fix the file manually or remove it to start fresh.`
+  );
+}
+function migrateManifest(data) {
+  if (typeof data !== "object" || data === null) return data;
+  const obj = data;
+  if (!("schemaVersion" in obj)) obj.schemaVersion = 1;
+  if (!Array.isArray(obj.installed)) obj.installed = [];
+  for (const pkg of obj.installed) {
+    if (typeof pkg !== "object" || pkg === null) continue;
+    if (!pkg.variant) pkg.variant = "_flat";
+    if (!pkg.installedAt) pkg.installedAt = "";
+    if (!pkg.version) pkg.version = "0.0.0";
+    if (Array.isArray(pkg.resources)) {
+      for (const res of pkg.resources) {
+        if (typeof res !== "object" || res === null) continue;
+        if (!res.hash) res.hash = "sha256:legacy-unknown";
+        if (!res.strategy) res.strategy = "frozen";
+      }
+    }
+  }
+  return obj;
 }
 async function writeInstalledManifest(projectRoot, manifest) {
   const manifestPath = path4.join(projectRoot, TEAMIX_DIR, MANIFEST_FILE);
@@ -1296,9 +1324,15 @@ function partitionByVersion(ids, manifest, existing) {
       onlyIds.push(name);
       continue;
     }
-    const installedVer = existing.lock?.skills?.[name]?.version;
+    const installedVer = existing.lock?.skills?.[name]?.version ?? existing.pkg?.version;
     const latestVer = manifestById.get(name)?.version;
-    if (installedVer && latestVer && compareSemver(installedVer, latestVer) < 0) {
+    if (!installedVer || !latestVer) {
+      if (latestVer) {
+        outdatedSkills.push({ id: name, installed: "0.0.0", latest: latestVer });
+      } else {
+        skippedSkillIds.push(name);
+      }
+    } else if (compareSemver(installedVer, latestVer) < 0) {
       outdatedSkills.push({
         id: name,
         installed: installedVer,
@@ -3877,18 +3911,24 @@ init_state();
 var AGENTS_MD_MANAGED_ID = "teamix-evo-skills";
 async function runGenerateAgentsMd(options) {
   const { projectRoot, variant, skillIds } = options;
+  const globalSkillIds = options.globalSkillIds ?? [];
   const mode = options.mode ?? "overwrite";
   const config = await readProjectConfig(projectRoot);
   const lock = await readSkillsLock(projectRoot);
   const ides = config?.packages?.skills?.ides ?? ["qoder", "claude"];
   const scope = config?.packages?.skills?.scope ?? lock?.skills[skillIds[0] ?? ""]?.scope ?? "project";
-  const ordered = [...skillIds].sort(
+  const skillScopeMap = /* @__PURE__ */ new Map();
+  for (const id of skillIds) skillScopeMap.set(id, scope);
+  for (const id of globalSkillIds) skillScopeMap.set(id, "global");
+  const allSkillIds = [...skillIds, ...globalSkillIds];
+  const ordered = allSkillIds.sort(
     (a, b) => bucketRank(a) - bucketRank(b) || a.localeCompare(b)
   );
   const sections = [];
   const missingSkillIds = [];
   for (const id of ordered) {
-    const { section, missing } = await renderSkillSection(projectRoot, id, ides, scope);
+    const skillScope = skillScopeMap.get(id) ?? scope;
+    const { section, missing } = await renderSkillSection(projectRoot, id, ides, skillScope);
     sections.push(section);
     if (missing) missingSkillIds.push(id);
   }
@@ -3972,6 +4012,12 @@ async function renderSkillSection(projectRoot, skillId, ides, scope) {
   if (parts?.coordinates) {
     lines.push(`- **Coordinates with**: ${parts.coordinates}`);
   }
+  if (scope === "global") {
+    lines.push("");
+    lines.push(
+      "> **\u5168\u5C40\u6280\u80FD** \u2014 \u5B89\u88C5\u5728\u5168\u5C40\u800C\u975E\u9879\u76EE\u5185\uFF0C\u4E0D\u968F\u4EE3\u7801\u4ED3\u5E93\u5206\u53D1\u3002AI \u89E6\u53D1\u65F6\u5E94\u5148\u786E\u8BA4\u672C\u6280\u80FD\u53EF\u7528\uFF1B\u82E5\u4E0D\u53EF\u7528\uFF0C\u5F15\u5BFC\u7528\u6237\u6267\u884C\u5168\u5C40\u5B89\u88C5\u3002"
+    );
+  }
   return { section: lines.join("\n"), missing };
 }
 function renderAgentsMd(args) {
@@ -4118,13 +4164,34 @@ async function runSkillsUpdate(options) {
   }
   const ides = skillsCfg.ides ?? ["qoder", "claude"];
   const scope = skillsCfg.scope ?? "project";
-  const existingLock = await readSkillsLock(projectRoot);
+  let existingLock = await readSkillsLock(projectRoot);
   if (!existingLock || Object.keys(existingLock.skills).length === 0) {
-    return { status: "no-skills" };
+    const installedManifest2 = await readInstalledManifest(projectRoot);
+    const pkg = installedManifest2?.installed.find(
+      (p2) => p2.package === packageName
+    );
+    if (!pkg || pkg.resources.length === 0) {
+      return { status: "no-skills" };
+    }
+    const derivedSkills = {};
+    for (const r of pkg.resources) {
+      const skillId = r.id.split(":")[0] ?? r.id;
+      if (!derivedSkills[skillId]) {
+        derivedSkills[skillId] = {
+          version: pkg.version,
+          from: packageName,
+          installedAt: "",
+          scope,
+          mirroredTo: []
+        };
+      }
+    }
+    existingLock = { schemaVersion: 1, skills: derivedSkills };
   }
+  const activeLock = existingLock;
   const { manifest, data, packageRoot } = await loadSkillsData(packageName);
   const manifestById = new Map(manifest.skills.map((s) => [s.id, s]));
-  const lockIds = Object.keys(existingLock.skills);
+  const lockIds = Object.keys(activeLock.skills);
   const requestedSet = requestedNames ? new Set(requestedNames) : null;
   if (requestedSet) {
     const unknown = requestedNames.filter(
@@ -4161,7 +4228,7 @@ async function runSkillsUpdate(options) {
     targetIds.push(id);
   }
   const allSame = targetIds.every((id) => {
-    const lockVer = existingLock.skills[id].version;
+    const lockVer = activeLock.skills[id].version;
     const manVer = manifestById.get(id).version;
     return lockVer === manVer;
   });
@@ -4175,7 +4242,7 @@ async function runSkillsUpdate(options) {
   }
   if (dryRun) {
     const plan = targetIds.map((id) => {
-      const lockVer = existingLock.skills[id].version;
+      const lockVer = activeLock.skills[id].version;
       const entry2 = manifestById.get(id);
       const sameVersion = lockVer === entry2.version;
       return {
@@ -4247,7 +4314,7 @@ async function runSkillsUpdate(options) {
   await writeInstalledManifest(projectRoot, installedManifest);
   const lock = {
     schemaVersion: 1,
-    skills: { ...existingLock.skills }
+    skills: { ...activeLock.skills }
   };
   for (const id of targetIds) {
     const skillDef = manifestById.get(id);
@@ -4267,10 +4334,12 @@ async function runSkillsUpdate(options) {
       const variant = await readTokensVariant(projectRoot);
       if (variant) {
         const projectSkillIds = Object.entries(lock.skills).filter(([, v]) => v.scope === "project").map(([id]) => id);
+        const globalSkillIds = Object.entries(lock.skills).filter(([, v]) => v.scope === "global").map(([id]) => id);
         await runGenerateAgentsMd({
           projectRoot,
           variant,
           skillIds: projectSkillIds,
+          globalSkillIds,
           mode: "merge-managed"
         });
       }
@@ -4431,11 +4500,14 @@ init_logger();
 var SKILLS_PACKAGE3 = "@teamix-evo/skills";
 var uninstallCommand2 = new Command17("uninstall").description(
   "\u5378\u8F7D\u5DF2\u5B89\u88C5\u7684 teamix-evo skills\uFF1B\u4E0D\u4F20 ids \u5219\u5378\u8F7D\u6574\u5305\uFF0C\u4F20 ids \u5219\u6309 skill \u5220\u9664"
-).argument("[ids...]", "\u53EF\u9009\uFF1A\u4EC5\u5378\u8F7D\u6307\u5B9A skill id\uFF1B\u7701\u7565\u5219\u5378\u8F7D\u6574\u4E2A skills \u5305").option("-y, --yes", "\u8DF3\u8FC7\u786E\u8BA4").action(async (ids, opts) => {
+).argument("[ids...]", "\u53EF\u9009\uFF1A\u4EC5\u5378\u8F7D\u6307\u5B9A skill id\uFF1B\u7701\u7565\u5219\u5378\u8F7D\u6574\u4E2A skills \u5305").option("-y, --yes", "\u8DF3\u8FC7\u786E\u8BA4").option(
+  "--scope <scope>",
+  "project | global\uFF08\u9ED8\u8BA4\u6309 cwd \u63A8\u65AD\uFF1Acwd \u662F\u9879\u76EE\u2192project\uFF1B\u5426\u5219 fallback \u5230\u5168\u5C40\uFF09"
+).action(async (ids, opts) => {
   try {
     const ide = detectIde();
     const cwd = ide.getProjectRoot();
-    const projectRoot = resolveSkillsMaintenanceRoot(cwd);
+    const projectRoot = resolveUninstallRoot(cwd, opts.scope);
     if (projectRoot !== cwd) {
       logger.info(`Using global skills meta root: ${projectRoot}`);
     }
@@ -4637,6 +4709,22 @@ function groupBySkillId(records) {
 function dedupe(values) {
   return Array.from(new Set(values));
 }
+function resolveUninstallRoot(cwd, scopeFlag) {
+  if (scopeFlag === void 0) {
+    return resolveSkillsMaintenanceRoot(cwd);
+  }
+  const scope = parseScope(scopeFlag);
+  if (scope === "global") {
+    const globalRoot = getGlobalMetaRoot();
+    if (!isTeamixEvoProject(globalRoot)) {
+      throw new Error(
+        `No global skills installed at ${globalRoot}. Nothing to uninstall.`
+      );
+    }
+    return globalRoot;
+  }
+  return cwd;
+}
 
 // src/commands/skills/sync.ts
 import { Command as Command18 } from "commander";
@@ -5157,6 +5245,10 @@ async function loadUiData(packageName) {
   const packageRoot = resolvePackageRoot2(packageName);
   logger.debug(`Resolved ui package root: ${packageRoot}`);
   const manifest = await loadUiPackageManifest(packageRoot);
+  const pkgJson = JSON.parse(
+    await fs18.readFile(path23.join(packageRoot, "package.json"), "utf-8")
+  );
+  manifest.version = pkgJson.version;
   let data = {};
   const dataPath = path23.join(packageRoot, "_data.json");
   try {
@@ -5233,8 +5325,14 @@ async function installUiEntries(options) {
   const idToEntry = new Map(manifest.entries.map((e) => [e.id, e]));
   const resources = [];
   const npmDeps = {};
-  let written = 0;
+  let created = 0;
+  let overwritten = 0;
+  let userModified = 0;
   let skipped = 0;
+  const { priorResources } = options;
+  const priorByTarget = new Map(
+    (priorResources ?? []).map((r) => [r.target, r])
+  );
   for (const id of orderedIds) {
     const entry = idToEntry.get(id);
     if (!entry) continue;
@@ -5268,11 +5366,25 @@ async function installUiEntries(options) {
           });
           continue;
         }
+        const relPath = path24.relative(projectRoot, targetAbs);
+        const prior = priorByTarget.get(relPath);
+        if (prior && prior.hash !== "sha256:legacy-unknown") {
+          const onDiskHash = computeHash(current);
+          if (onDiskHash !== prior.hash) {
+            logger.warn(
+              `  \u26A0 ${relPath} has local modifications (backed up)`
+            );
+            userModified++;
+          }
+        }
         await backupFile(targetAbs, projectRoot);
+        overwritten++;
+        logger.info(`  overwrite: ${rel(projectRoot, targetAbs)}`);
+      } else {
+        created++;
+        logger.info(`  create: ${rel(projectRoot, targetAbs)}`);
       }
       await writeFileSafe(targetAbs, transformed);
-      written++;
-      logger.info(`  write: ${rel(projectRoot, targetAbs)}`);
       resources.push({
         id: `${entry.id}:${file.targetName}`,
         target: path24.relative(projectRoot, targetAbs),
@@ -5285,7 +5397,10 @@ async function installUiEntries(options) {
     orderedIds,
     resources,
     npmDependencies: npmDeps,
-    written,
+    written: created + overwritten,
+    created,
+    overwritten,
+    userModified,
     skipped
   };
 }
@@ -5340,17 +5455,22 @@ async function runUiAdd(options) {
       `Unknown entry id(s): ${unknown.map((s) => `"${s}"`).join(", ")}. Run \`teamix-evo ui list\` to see options.`
     );
   }
+  const existingManifest = await readInstalledManifest(
+    projectRoot
+  ) ?? { schemaVersion: 1, installed: [] };
+  const priorPkg = existingManifest.installed.find(
+    (p2) => p2.package === packageName
+  );
   const result = await installUiEntries({
     projectRoot,
     manifest: effectiveManifest,
     packageRoot,
     aliases: uiCfg.aliases,
     requested: ids,
-    skipExisting: !overwrite
+    skipExisting: !overwrite,
+    priorResources: priorPkg?.resources
   });
-  const installed = await readInstalledManifest(
-    projectRoot
-  ) ?? { schemaVersion: 1, installed: [] };
+  const installed = existingManifest;
   const idx = installed.installed.findIndex((p2) => p2.package === packageName);
   const prior = idx >= 0 ? installed.installed[idx] : null;
   const mergedResources = mergeResources(
@@ -5375,6 +5495,9 @@ async function runUiAdd(options) {
     packageName,
     orderedIds: result.orderedIds,
     written: result.written,
+    created: result.created,
+    overwritten: result.overwritten,
+    userModified: result.userModified,
     skipped: result.skipped,
     npmDependencies: result.npmDependencies,
     resources: result.resources
@@ -5738,8 +5861,13 @@ var addCommand2 = new Command22("add").description(
         logger.warn("meta sync failed (non-fatal)");
       }
       logger.success(
-        `UI add complete: ${result.written} written, ${result.skipped} skipped.`
+        `UI add complete: ${result.created} created, ${result.overwritten} updated, ${result.skipped} skipped.`
       );
+      if (result.userModified > 0) {
+        logger.warn(
+          `${result.userModified} file(s) had local modifications (backed up to .teamix-evo/.backups/)`
+        );
+      }
       logger.info("");
       logger.info(`Resolved order: ${result.orderedIds.join(" \u2192 ")}`);
       const npmDeps = Object.entries(result.npmDependencies);
@@ -5900,6 +6028,7 @@ import { Command as Command24 } from "commander";
 // src/core/ui-upgrade.ts
 init_state();
 import * as path29 from "path";
+import * as fs23 from "fs/promises";
 import { createRequire as createRequire7 } from "module";
 import {
   loadUiPackageManifest as loadUiPackageManifest3,
@@ -6071,6 +6200,9 @@ async function buildUiUpgradeStaging(options) {
   }
   if (entries.length === 0) return null;
   const byRisk = aggregateByRisk(entries);
+  const localModifiedCount = entries.filter(
+    (e) => e.current.localModified
+  ).length;
   const manifestOut = {
     schemaVersion: 1,
     ts: isoTs,
@@ -6080,7 +6212,11 @@ async function buildUiUpgradeStaging(options) {
     fromVersion: lineageReport.installedVersion ?? "",
     toVersion: options.manifest.version,
     lineage: lineageReport.lineage,
-    summary: { total: entries.length, byRisk },
+    summary: {
+      total: entries.length,
+      byRisk,
+      ...localModifiedCount > 0 ? { localModifiedCount } : {}
+    },
     entries
   };
   await ensureDir(stagingDir);
@@ -6096,6 +6232,8 @@ async function processRegistered(args) {
   const currentSource = await readFileOrNull(
     resolveResourceTarget(projectRoot, resource.target)
   );
+  const onDiskHash = currentSource !== null ? computeHash(currentSource) : null;
+  const localModified = onDiskHash !== null && resource.hash !== "sha256:legacy-unknown" && onDiskHash !== resource.hash;
   if (currentSource === null) {
     return buildBreakingEntry({
       id,
@@ -6141,6 +6279,16 @@ async function processRegistered(args) {
     incomingSource: incomingTransformed,
     multiFile: entry.files.length > 1
   });
+  if (localModified && diff.riskLevel !== "unchanged") {
+    if (diff.riskLevel === "upgradable-low") {
+      diff.riskLevel = "upgradable-medium";
+    } else if (diff.riskLevel === "upgradable-medium") {
+      diff.riskLevel = "risky";
+    }
+    diff.hints.push(
+      "\u26A0 file has local modifications since installation \u2014 manual merge recommended"
+    );
+  }
   const promotion = derivePromotion({
     currentSource,
     incomingSource: incomingTransformed,
@@ -6155,7 +6303,9 @@ async function processRegistered(args) {
         resolveResourceTarget(projectRoot, resource.target)
       ),
       hash: resource.hash,
-      sourceLineage: "teamix-evo"
+      sourceLineage: "teamix-evo",
+      onDiskHash,
+      localModified
     },
     incoming: {
       sourceVersion: args.sourceVersion,
@@ -6586,6 +6736,7 @@ async function buildStaging(args) {
   if (category === "blocks") {
     const root = args.blocksPackageRoot ?? resolvePackageRoot4("@teamix-evo/blocks");
     const manifest = await loadUiPackageManifest3(root);
+    manifest.version = await readPkgVersion(root);
     return buildUiUpgradeStaging({
       projectRoot,
       category,
@@ -6600,6 +6751,7 @@ async function buildStaging(args) {
   if (category === "ui") {
     const root = args.uiPackageRoot ?? resolvePackageRoot4("@teamix-evo/ui");
     const manifest = await loadUiPackageManifest3(root);
+    manifest.version = await readPkgVersion(root);
     return buildUiUpgradeStaging({
       projectRoot,
       category,
@@ -6631,7 +6783,7 @@ async function buildStaging(args) {
   const synthetic = {
     schemaVersion: 1,
     package: "ui",
-    version: variantManifest.version,
+    version: await readPkgVersion(bizRoot),
     engines: variantManifest.engines,
     entries: merged
   };
@@ -6647,6 +6799,13 @@ async function buildStaging(args) {
     onlyIds
   });
 }
+async function readPkgVersion(packageRoot) {
+  const raw = await fs23.readFile(
+    path29.join(packageRoot, "package.json"),
+    "utf-8"
+  );
+  return JSON.parse(raw).version;
+}
 
 // src/commands/_upgrade-command-factory.ts
 init_logger();
@@ -6687,7 +6846,7 @@ function makeUpgradeCommand(category) {
         `CLI \u4E0D\u4F1A\u81EA\u52A8\u5199\u5165 ${meta.installDirHint}\uFF08ADR 0019 frozen \u8FB9\u754C\uFF09\u3002`
       );
       logger.error(
-        `\u8BF7\u8FD0\u884C \`teamix-evo ${category} upgrade\` \u751F\u6210 staging\uFF0C\u518D\u8BA9 AI \u8C03\u7528 teamix-evo-manage skill \u9010\u6587\u4EF6\u5E94\u7528\u3002`
+        `\u8BF7\u8FD0\u884C \`teamix-evo ${category} update\` \u751F\u6210 staging\uFF0C\u518D\u8BA9 AI \u8C03\u7528 teamix-evo-manage skill \u9010\u6587\u4EF6\u5E94\u7528\u3002`
       );
       process.exitCode = 1;
       return;
@@ -6740,6 +6899,11 @@ function makeUpgradeCommand(category) {
           } catch {
             logger.warn("  meta sync failed (non-fatal)");
           }
+          if (manifest.summary.localModifiedCount) {
+            logger.warn(
+              `  \u26A0 ${manifest.summary.localModifiedCount} file(s) have local modifications \u2014 AI will prompt for manual merge`
+            );
+          }
           logger.info("");
           logger.info(
             "Next: \u8BA9 AI \u8C03\u7528 teamix-evo-manage skill\uFF0C\u6309 risk \u5206\u6279 review & apply\u3002"
@@ -6765,7 +6929,7 @@ import { Command as Command25 } from "commander";
 
 // src/core/ui-promote.ts
 init_fs();
-import * as fs24 from "fs/promises";
+import * as fs25 from "fs/promises";
 import * as path31 from "path";
 init_logger();
 init_error();
@@ -6773,7 +6937,7 @@ init_state();
 
 // src/core/ui-promote-imports.ts
 init_fs();
-import * as fs23 from "fs/promises";
+import * as fs24 from "fs/promises";
 import * as path30 from "path";
 var SOURCE_FILE_EXT = /\.(tsx?|jsx?|mts|cts)$/;
 var STATIC_IMPORT_FROM = /^(\s*(?:import|export)\s[\s\S]*?from\s+['"])([^'"\n]+)(['"])/;
@@ -6880,7 +7044,7 @@ async function collectTsFiles(root) {
   async function walk(dir) {
     let entries;
     try {
-      entries = await fs23.readdir(dir, { withFileTypes: true });
+      entries = await fs24.readdir(dir, { withFileTypes: true });
     } catch (err) {
       if (err.code === "ENOENT") return;
       throw err;
@@ -7285,7 +7449,7 @@ async function findLatestUiStagingDir(projectRoot) {
   const base = path31.join(projectRoot, TEAMIX_DIR5, STAGING_DIR2);
   let entries;
   try {
-    entries = await fs24.readdir(base, { withFileTypes: true });
+    entries = await fs25.readdir(base, { withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT") return null;
     throw err;
@@ -7382,7 +7546,7 @@ function posix2(p2) {
 }
 
 // src/core/file-changes.ts
-import * as fs25 from "fs/promises";
+import * as fs26 from "fs/promises";
 import * as path32 from "path";
 function toRelativePosix(p2, projectRoot) {
   let rel2 = p2;
@@ -7574,6 +7738,7 @@ import { Command as Command27 } from "commander";
 
 // src/core/variant-ui-add.ts
 import * as path33 from "path";
+import * as fs27 from "fs/promises";
 import { createRequire as createRequire8 } from "module";
 import {
   loadUiPackageManifest as loadUiPackageManifest4,
@@ -7609,6 +7774,10 @@ async function runVariantUiAdd(packageName, options) {
   }
   const variantDir = path33.join(packageRoot, "variants", variant);
   const variantManifest = await loadVariantUiPackageManifest3(variantDir);
+  const pkgJson = JSON.parse(
+    await fs27.readFile(path33.join(packageRoot, "package.json"), "utf-8")
+  );
+  const packageVersion = pkgJson.version;
   const knownIds = new Set(variantManifest.entries.map((e) => e.id));
   const unknown = ids.filter((id) => !knownIds.has(id));
   if (unknown.length > 0) {
@@ -7632,28 +7801,27 @@ async function runVariantUiAdd(packageName, options) {
   const adaptedManifest = {
     schemaVersion: 1,
     package: "ui",
-    version: variantManifest.version,
+    version: packageVersion,
     engines: variantManifest.engines,
     entries: mergedEntries
   };
+  const installed = await readInstalledManifest(
+    projectRoot
+  ) ?? { schemaVersion: 1, installed: [] };
+  const idx = installed.installed.findIndex(
+    (p2) => p2.package === fullPackageName && p2.variant === variant
+  );
+  const prior = idx >= 0 ? installed.installed[idx] : null;
   const result = await installUiEntries({
     projectRoot,
     manifest: adaptedManifest,
     packageRoot: variantDir,
-    // default for variant entries
     entryPackageRoot,
-    // ui entries resolve from uiPackageRoot
     aliases: uiCfg.aliases,
     requested: ids,
-    skipExisting: !overwrite
+    skipExisting: !overwrite,
+    priorResources: prior?.resources
   });
-  const installed = await readInstalledManifest(
-    projectRoot
-  ) ?? { schemaVersion: 1, installed: [] };
-  const idx = installed.installed.findIndex(
-    (p2) => p2.package === fullPackageName && p2.variant === variant
-  );
-  const prior = idx >= 0 ? installed.installed[idx] : null;
   const mergedResources = mergeResources3(
     prior?.resources ?? [],
     result.resources
@@ -7661,7 +7829,7 @@ async function runVariantUiAdd(packageName, options) {
   const entry = {
     package: fullPackageName,
     variant,
-    version: variantManifest.version,
+    version: packageVersion,
     installedAt: (/* @__PURE__ */ new Date()).toISOString(),
     resources: mergedResources
   };
@@ -7673,6 +7841,9 @@ async function runVariantUiAdd(packageName, options) {
     variant,
     orderedIds: result.orderedIds,
     written: result.written,
+    created: result.created,
+    overwritten: result.overwritten,
+    userModified: result.userModified,
     skipped: result.skipped,
     npmDependencies: result.npmDependencies,
     resources: result.resources
@@ -7772,8 +7943,13 @@ var addCommand3 = new Command27("add").description(
         logger.warn("meta sync failed (non-fatal)");
       }
       logger.success(
-        `biz-ui add complete: ${result.written} written, ${result.skipped} skipped.`
+        `biz-ui add complete: ${result.created} created, ${result.overwritten} updated, ${result.skipped} skipped.`
       );
+      if (result.userModified > 0) {
+        logger.warn(
+          `${result.userModified} file(s) had local modifications (backed up to .teamix-evo/.backups/)`
+        );
+      }
       logger.info("");
       logger.info(`Variant: ${result.variant}`);
       logger.info(`Resolved order: ${result.orderedIds.join(" \u2192 ")}`);
@@ -7889,6 +8065,11 @@ async function runBlocksAdd(options) {
       `Unknown block id(s): ${unknown.map((s) => `"${s}"`).join(", ")}. Run \`teamix-evo blocks list\` to see options.`
     );
   }
+  const installed = await readInstalledManifest(
+    projectRoot
+  ) ?? { schemaVersion: 1, installed: [] };
+  const idx = installed.installed.findIndex((p2) => p2.package === packageName);
+  const prior = idx >= 0 ? installed.installed[idx] : null;
   const result = await installUiEntries({
     projectRoot,
     manifest,
@@ -7896,13 +8077,9 @@ async function runBlocksAdd(options) {
     aliases: uiCfg.aliases,
     requested: ids,
     skipExisting: !overwrite,
-    flatten: false
+    flatten: false,
+    priorResources: prior?.resources
   });
-  const installed = await readInstalledManifest(
-    projectRoot
-  ) ?? { schemaVersion: 1, installed: [] };
-  const idx = installed.installed.findIndex((p2) => p2.package === packageName);
-  const prior = idx >= 0 ? installed.installed[idx] : null;
   const mergedResources = mergeResources4(
     prior?.resources ?? [],
     result.resources
@@ -7921,6 +8098,9 @@ async function runBlocksAdd(options) {
     packageName,
     orderedIds: result.orderedIds,
     written: result.written,
+    created: result.created,
+    overwritten: result.overwritten,
+    userModified: result.userModified,
     skipped: result.skipped,
     npmDependencies: result.npmDependencies,
     resources: result.resources
@@ -7948,8 +8128,13 @@ var addCommand4 = new Command31("add").description("\u5B89\u88C5\u4E00\u4E2A\u62
         overwrite: opts.overwrite
       });
       logger.success(
-        `Blocks add complete: ${result.written} written, ${result.skipped} skipped.`
+        `Blocks add complete: ${result.created} created, ${result.overwritten} updated, ${result.skipped} skipped.`
       );
+      if (result.userModified > 0) {
+        logger.warn(
+          `${result.userModified} file(s) had local modifications (backed up to .teamix-evo/.backups/)`
+        );
+      }
       logger.info("");
       logger.info(`Resolved order: ${result.orderedIds.join(" \u2192 ")}`);
       const npmDeps = Object.entries(result.npmDependencies);
@@ -8047,7 +8232,7 @@ import * as prompts6 from "@clack/prompts";
 init_fs();
 init_logger();
 import * as path34 from "path";
-import * as fs26 from "fs";
+import * as fs28 from "fs";
 import { execa } from "execa";
 var ESLINT_CONFIG_CONTENT = `/**
  * teamix-evo consumer ESLint preset \u2014 9 token-discipline rules.
@@ -8139,7 +8324,7 @@ async function runLintInit(options) {
   let stylelintIgnoreFilesWarning = false;
   if (!stylelintNeedsWrite && stylelintTemplateExists) {
     try {
-      const existingContent = fs26.readFileSync(stylelintConfigPath, "utf-8");
+      const existingContent = fs28.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) {
@@ -8176,8 +8361,8 @@ async function runLintInit(options) {
   };
 }
 function detectPm(projectRoot) {
-  if (fs26.existsSync(path34.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs26.existsSync(path34.join(projectRoot, "yarn.lock"))) return "yarn";
+  if (fs28.existsSync(path34.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs28.existsSync(path34.join(projectRoot, "yarn.lock"))) return "yarn";
   return "npm";
 }
 async function patchPackageJsonScripts(projectRoot) {
@@ -8273,7 +8458,7 @@ import { execa as execa2 } from "execa";
 // src/core/project-state.ts
 init_fs();
 init_state();
-import * as fs27 from "fs/promises";
+import * as fs29 from "fs/promises";
 import * as path35 from "path";
 var IGNORED_TOP_LEVEL = /* @__PURE__ */ new Set([
   ".git",
@@ -8333,7 +8518,7 @@ async function detectProjectState(cwd) {
   }
   let entries;
   try {
-    entries = await fs27.readdir(absCwd);
+    entries = await fs29.readdir(absCwd);
   } catch (err) {
     if (err.code === "ENOENT") {
       return {
@@ -8418,7 +8603,7 @@ function assertCommandPrecondition(command, state) {
 // src/core/deps-install.ts
 init_fs();
 init_logger();
-import * as fs28 from "fs/promises";
+import * as fs30 from "fs/promises";
 import * as path36 from "path";
 import { exec as exec4 } from "child_process";
 import { promisify as promisify4 } from "util";
@@ -8475,7 +8660,7 @@ async function installProjectDeps(options) {
     pkg.dependencies = Object.fromEntries(
       Object.entries(pkg.dependencies).sort(([a], [b]) => a.localeCompare(b))
     );
-    await fs28.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
+    await fs30.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
     logger.info(
       `  patched package.json: +${Object.keys(added).length} dependencies`
     );
@@ -8657,6 +8842,7 @@ async function runProjectInit(options) {
           `teamix-evo-design-${variant}`,
           `teamix-evo-code-${variant}`
         ],
+        globalSkillIds: ["teamix-evo-manage"],
         mode: "merge-managed"
       });
       record({
@@ -9443,7 +9629,7 @@ import * as prompts7 from "@clack/prompts";
 
 // src/core/snapshot.ts
 init_logger();
-import * as fs29 from "fs/promises";
+import * as fs31 from "fs/promises";
 import * as path42 from "path";
 var TEAMIX_DIR6 = ".teamix-evo";
 var SNAPSHOTS_DIR = ".snapshots";
@@ -9461,7 +9647,7 @@ function fsSafeToIso(safe) {
 async function createSnapshot(projectRoot, opts = {}) {
   const teamixDir = path42.join(projectRoot, TEAMIX_DIR6);
   try {
-    const stat5 = await fs29.stat(teamixDir);
+    const stat5 = await fs31.stat(teamixDir);
     if (!stat5.isDirectory()) return null;
   } catch (err) {
     if (err.code === "ENOENT") return null;
@@ -9471,19 +9657,19 @@ async function createSnapshot(projectRoot, opts = {}) {
   const ts = isoToFsSafe3(isoTs);
   const snapshotRoot = path42.join(teamixDir, SNAPSHOTS_DIR);
   const target = path42.join(snapshotRoot, ts);
-  await fs29.mkdir(target, { recursive: true });
-  const entries = await fs29.readdir(teamixDir, { withFileTypes: true });
+  await fs31.mkdir(target, { recursive: true });
+  const entries = await fs31.readdir(teamixDir, { withFileTypes: true });
   for (const entry of entries) {
     if (entry.name === SNAPSHOTS_DIR) continue;
     const src = path42.join(teamixDir, entry.name);
     const dst = path42.join(target, entry.name);
-    await fs29.cp(src, dst, { recursive: true });
+    await fs31.cp(src, dst, { recursive: true });
   }
   const meta = {
     ts: isoTs,
     reason: opts.reason ?? "manual"
   };
-  await fs29.writeFile(
+  await fs31.writeFile(
     path42.join(target, META_FILE),
     JSON.stringify(meta, null, 2) + "\n",
     "utf-8"
@@ -9499,7 +9685,7 @@ async function listSnapshots(projectRoot) {
   const snapshotRoot = path42.join(projectRoot, TEAMIX_DIR6, SNAPSHOTS_DIR);
   let entries;
   try {
-    entries = await fs29.readdir(snapshotRoot, { withFileTypes: true });
+    entries = await fs31.readdir(snapshotRoot, { withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT") return [];
     throw err;
@@ -9511,7 +9697,7 @@ async function listSnapshots(projectRoot) {
     let isoTs = null;
     let reason = null;
     try {
-      const raw = await fs29.readFile(path42.join(dir, META_FILE), "utf-8");
+      const raw = await fs31.readFile(path42.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(
@@ -9536,7 +9722,7 @@ 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 fs29.rm(snap.path, { recursive: true, force: true });
+    await fs31.rm(snap.path, { recursive: true, force: true });
     removed.push(snap.ts);
     logger.debug(`Pruned snapshot ${snap.ts}`);
   }
@@ -9546,7 +9732,7 @@ async function restoreSnapshot(projectRoot, ts) {
   const snapshotRoot = path42.join(projectRoot, TEAMIX_DIR6, SNAPSHOTS_DIR);
   const target = path42.join(snapshotRoot, ts);
   try {
-    const stat5 = await fs29.stat(target);
+    const stat5 = await fs31.stat(target);
     if (!stat5.isDirectory()) {
       throw new Error(`Snapshot path is not a directory: ${target}`);
     }
@@ -9560,20 +9746,20 @@ async function restoreSnapshot(projectRoot, ts) {
   }
   await createSnapshot(projectRoot, { reason: "restore", protectedTs: ts });
   const teamixDir = path42.join(projectRoot, TEAMIX_DIR6);
-  const live = await fs29.readdir(teamixDir, { withFileTypes: true });
+  const live = await fs31.readdir(teamixDir, { withFileTypes: true });
   for (const entry of live) {
     if (entry.name === SNAPSHOTS_DIR) continue;
-    await fs29.rm(path42.join(teamixDir, entry.name), {
+    await fs31.rm(path42.join(teamixDir, entry.name), {
       recursive: true,
       force: true
     });
   }
-  const snapshotEntries = await fs29.readdir(target, { withFileTypes: true });
+  const snapshotEntries = await fs31.readdir(target, { withFileTypes: true });
   for (const entry of snapshotEntries) {
     if (entry.name === META_FILE) continue;
     const src = path42.join(target, entry.name);
     const dst = path42.join(teamixDir, entry.name);
-    await fs29.cp(src, dst, { recursive: true });
+    await fs31.cp(src, dst, { recursive: true });
   }
   logger.debug(`Restored .teamix-evo/ from snapshot ${ts}`);
 }
@@ -9688,7 +9874,7 @@ import * as prompts8 from "@clack/prompts";
 // src/core/variant-switch.ts
 init_fs();
 import * as path44 from "path";
-import * as fs30 from "fs/promises";
+import * as fs32 from "fs/promises";
 import {
   loadTokensPackageManifest as loadTokensPackageManifest3,
   getVariantEntry as getVariantEntry3
@@ -9761,7 +9947,7 @@ async function runVariantSwitch(options) {
       });
       continue;
     }
-    const upstreamContent = await fs30.readFile(upstreamAbs, "utf-8");
+    const upstreamContent = await fs32.readFile(upstreamAbs, "utf-8");
     if (resource.strategy === "regenerable") {
       const newHash = computeHash(upstreamContent);
       if (newHash === resource.hash) {
@@ -9819,7 +10005,7 @@ async function runVariantSwitch(options) {
     const upstreamBasename = lookupUpstreamBasename2(consumerBasename);
     const upstreamAbs = upstreamBasename ? upstreamByBasename.get(upstreamBasename) : void 0;
     if (resource.strategy === "regenerable" && upstreamAbs) {
-      const upstreamContent = await fs30.readFile(upstreamAbs, "utf-8");
+      const upstreamContent = await fs32.readFile(upstreamAbs, "utf-8");
       await writeFileSafe(consumerAbs, upstreamContent);
       logger.debug(`[variant-switch] rewrite regenerable: ${resource.target}`);
       refreshedResources.push({
@@ -9829,8 +10015,8 @@ async function runVariantSwitch(options) {
       continue;
     }
     if (resource.strategy === "managed" && upstreamAbs && await fileExists(consumerAbs)) {
-      const upstreamContent = await fs30.readFile(upstreamAbs, "utf-8");
-      const consumerContent = await fs30.readFile(consumerAbs, "utf-8");
+      const upstreamContent = await fs32.readFile(upstreamAbs, "utf-8");
+      const consumerContent = await fs32.readFile(consumerAbs, "utf-8");
       const merged = mergeManagedRegions(upstreamContent, consumerContent);
       if (merged !== consumerContent) {
         await writeFileSafe(consumerAbs, merged);
@@ -9927,10 +10113,12 @@ async function runVariantSwitch(options) {
     const lock2 = await readSkillsLock(projectRoot);
     if (lock2) {
       const projectSkillIds = Object.entries(lock2.skills).filter(([, v]) => v.scope === "project").map(([id]) => id);
+      const globalSkillIds = Object.entries(lock2.skills).filter(([, v]) => v.scope === "global").map(([id]) => id);
       await runGenerateAgentsMd({
         projectRoot,
         variant: newVariant,
         skillIds: projectSkillIds,
+        globalSkillIds,
         mode: "merge-managed"
       });
     }