teamix-evo 0.14.0 → 0.14.1

package/dist/core/index.d.ts

@@ -314,8 +314,14 @@ interface RunUiAddResult {
     packageName: string;
     /** Registered ids in install order (deps + requested). */
     orderedIds: string[];
-    /** Number of files written. */
+    /** Number of files written (= created + overwritten). */
     written: number;
+    /** Number of files newly created. */
+    created: number;
+    /** Number of existing files overwritten. */
+    overwritten: number;
+    /** Number of overwritten files that had local modifications. */
+    userModified: number;
     /** Number of files skipped due to frozen + exists. */
     skipped: number;
     /** Aggregate npm dependencies of the installed entries. */
@@ -390,6 +396,9 @@ interface RunVariantUiAddResult {
     variant: string;
     orderedIds: string[];
     written: number;
+    created: number;
+    overwritten: number;
+    userModified: number;
     skipped: number;
     npmDependencies: Record<string, string>;
     resources: InstalledResource[];
@@ -883,6 +892,8 @@ interface UiInstallOptions {
     skipExisting?: boolean;
     /** When false, preserve directory structure in import paths (skip flattenRestPath). Defaults to true. */
     flatten?: boolean;
+    /** Prior manifest resources for the same package — used to detect user-modified files before overwrite. */
+    priorResources?: InstalledResource[];
 }
 interface UiInstallResult {
     /** Ordered list of entry ids that were processed (deps + requested) */
@@ -891,8 +902,14 @@ interface UiInstallResult {
     resources: InstalledResource[];
     /** Aggregate npm dependencies across the installed entries */
     npmDependencies: Record<string, string>;
-    /** Number of files written */
+    /** Number of files written (= created + overwritten, kept for backwards compat) */
     written: number;
+    /** Number of files newly created (target did not exist) */
+    created: number;
+    /** Number of existing files overwritten */
+    overwritten: number;
+    /** Number of overwritten files that had local modifications vs manifest hash */
+    userModified: number;
     /** Number of files skipped because they already exist (frozen) */
     skipped: number;
 }

package/dist/core/index.js

@@ -165,12 +165,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 = path2.join(projectRoot, TEAMIX_DIR, MANIFEST_FILE);
@@ -948,9 +976,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,
@@ -1669,13 +1703,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(
+      (p) => p.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(
@@ -1712,7 +1767,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;
   });
@@ -1726,7 +1781,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 {
@@ -1798,7 +1853,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);
@@ -1984,8 +2039,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;
@@ -2019,11 +2080,25 @@ async function installUiEntries(options) {
           });
           continue;
         }
+        const relPath = path11.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: path11.relative(projectRoot, targetAbs),
@@ -2036,7 +2111,10 @@ async function installUiEntries(options) {
     orderedIds,
     resources,
     npmDependencies: npmDeps,
-    written,
+    written: created + overwritten,
+    created,
+    overwritten,
+    userModified,
     skipped
   };
 }
@@ -2115,17 +2193,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(
+    (p) => p.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((p) => p.package === packageName);
   const prior = idx >= 0 ? installed.installed[idx] : null;
   const mergedResources = mergeResources(
@@ -2150,6 +2233,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
@@ -2260,24 +2346,23 @@ async function runVariantUiAdd(packageName, options) {
     engines: variantManifest.engines,
     entries: mergedEntries
   };
+  const installed = await readInstalledManifest(
+    projectRoot
+  ) ?? { schemaVersion: 1, installed: [] };
+  const idx = installed.installed.findIndex(
+    (p) => p.package === fullPackageName && p.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(
-    (p) => p.package === fullPackageName && p.variant === variant
-  );
-  const prior = idx >= 0 ? installed.installed[idx] : null;
   const mergedResources = mergeResources2(
     prior?.resources ?? [],
     result.resources
@@ -2297,6 +2382,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