@skaile/workspaces 5.3.0 → 5.4.0

package/dist/{chunk-WGNFDLHT.js → chunk-BATL2CWI.js}

@@ -1,10 +1,10 @@
-import { getStoreManifestsDir } from './chunk-3ZVSINEV.js';
+import { getStoreManifestsDir } from './chunk-Y5OCUOXF.js';
 import { readManifestSourceConfig, discoverAssetsInTree } from './chunk-Y7UBRRKG.js';
-import { deployAll, removeAsset, createScaffold } from './chunk-K2JVODQD.js';
-import { resolveConfiguredDriverTarget, resolveLibraryDir, buildLibraryLockEntries, writeLock, buildLockFile, readLock, verifyLock, mergeLockFile, extractForPatch, generatePatch, savePatch, applyPatch } from './chunk-6GBQND2F.js';
-import { resolveRuntimeAssets, factoryAssetRoots } from './chunk-4SSKKFDF.js';
+import { deployAll, removeAsset, canonicalEntryRef, createScaffold } from './chunk-37DN45RR.js';
+import { resolveConfiguredDriverTarget, GLOBAL_INSTALL_DIR_NAME, resolveLibraryDir, buildLibraryLockEntries, writeLock, buildLockFile, readLock, verifyLock, mergeLockFile, extractForPatch, generatePatch, savePatch, applyPatch } from './chunk-QEXEHXX5.js';
+import { resolveRuntimeAssets, factoryAssetRoots } from './chunk-JCATNLY3.js';
 import { deployedBase, deployedDir, isDeployed } from './chunk-XGIS325V.js';
-import { loadMcpServerDeclarations, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, getGlobalCacheDir, sourceCacheKey, getRepoCommit, coerceVersion, matchPin, resolveAll, buildProvenanceIndex, ensureRepo, sourceShortName, scanRepo, SKAILE_YAML_DEFAULT, checkRepoStatus, resolveAsset, readLinks, storeManifestSlug } from './chunk-KBAE7PU7.js';
+import { loadMcpServerDeclarations, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, getGlobalCacheDir, sourceCacheKey, getRepoCommit, matchPin, coerceVersion, resolveAll, buildProvenanceIndex, ensureRepo, sourceShortName, scanRepo, SKAILE_YAML_DEFAULT, checkRepoStatus, resolveAsset, readLinks, storeManifestSlug } from './chunk-6IGFSUTE.js';
 import { globalSkaileDir, globalCacheRoot, migrateLegacyDir } from './chunk-MFHKHXDE.js';
 import { scanDirectory, parseRequires } from './chunk-LFMX2UEF.js';
 import { parseAssetRef, parseAssetRefLoose, assetRefToStr, slugifyAssetName } from './chunk-WX74MVNA.js';
@@ -637,15 +637,20 @@ var AssetManager = class {
     if (missing.length === 0) return { entries: [], resolved, libraryOf };
     const roots = [];
     for (const l of (await this.loadLibraryIndex())?.libraries ?? []) {
-      if (existsSync(l.path)) roots.push({ name: l.name, dir: l.path });
+      if (l.name === GLOBAL_INSTALL_DIR_NAME) continue;
+      if (existsSync(l.path)) roots.push({ name: l.name, dir: l.path, isDefault: l.isDefault });
     }
     const registered = new Set(roots.map((r) => r.name));
     try {
       const librariesRoot = resolveLibraryDir();
       if (existsSync(librariesRoot)) {
         for (const dirent of readdirSync(librariesRoot, { withFileTypes: true })) {
-          if (dirent.isDirectory() && !registered.has(dirent.name)) {
-            roots.push({ name: dirent.name, dir: join(librariesRoot, dirent.name) });
+          if (dirent.isDirectory() && dirent.name !== GLOBAL_INSTALL_DIR_NAME && !registered.has(dirent.name)) {
+            roots.push({
+              name: dirent.name,
+              dir: join(librariesRoot, dirent.name),
+              isDefault: false
+            });
           }
         }
       }
@@ -653,14 +658,14 @@ var AssetManager = class {
     }
     if (roots.length === 0) return { entries: [], resolved, libraryOf };
     const byKey = /* @__PURE__ */ new Map();
+    const isDefaultLib = new Map(roots.map((r) => [r.name, r.isDefault]));
     for (const { name, dir } of roots) {
       const publisher = readDeclaredPublisher(dir) ?? slugifyAssetName(name);
       for (const entry of await scanDirectory(dir, publisher)) {
         const key = `${entry.kind}:@${entry.publisher}/${entry.name}`;
-        const prev = byKey.get(key);
-        if (!prev || gt(coerceVersion(entry.version ?? ""), coerceVersion(prev.entry.version ?? ""))) {
-          byKey.set(key, { entry, library: name });
-        }
+        const list = byKey.get(key);
+        if (list) list.push({ entry, library: name });
+        else byKey.set(key, [{ entry, library: name }]);
       }
     }
     if (byKey.size === 0) return { entries: [], resolved, libraryOf };
@@ -673,15 +678,43 @@ var AssetManager = class {
         continue;
       }
       if (!parsed.publisher) continue;
-      const hit = byKey.get(`${parsed.kind}:@${parsed.publisher}/${parsed.name}`);
-      if (!hit) continue;
-      if (parsed.pin && !matchPin(parsed.pin, hit.entry.version ?? "")) continue;
+      const key = `${parsed.kind}:@${parsed.publisher}/${parsed.name}`;
+      const candidates = (byKey.get(key) ?? []).filter(
+        (c) => !parsed.pin || matchPin(parsed.pin, c.entry.version ?? "")
+      );
+      if (candidates.length === 0) continue;
+      candidates.sort((a, b) => {
+        const va = coerceVersion(a.entry.version ?? "");
+        const vb = coerceVersion(b.entry.version ?? "");
+        if (gt(va, vb)) return -1;
+        if (gt(vb, va)) return 1;
+        const da = isDefaultLib.get(a.library) ? 0 : 1;
+        const db = isDefaultLib.get(b.library) ? 0 : 1;
+        return da - db || a.library.localeCompare(b.library);
+      });
+      const hit = candidates[0];
+      this.warnLibraryCollision(key, candidates, hit);
       entries.push(hit.entry);
       libraryOf.set(hit.entry, hit.library);
       resolved.add(ref);
     }
     return { entries, resolved, libraryOf };
   }
+  /** Collision messages already printed by this instance (one warning per ref + library set). */
+  warnedLibraryCollisions = /* @__PURE__ */ new Set();
+  /**
+   * Warn once when `key` is held by more than one library: names every library
+   * with its version and the one chosen, so a silent pick can't surprise.
+   */
+  warnLibraryCollision(key, candidates, chosen) {
+    const libraries = new Set(candidates.map((c) => c.library));
+    if (libraries.size < 2) return;
+    const held = candidates.map((c) => `${c.library} (${c.entry.version || "unversioned"})`);
+    const msg = `skaile: ${key} exists in ${libraries.size} libraries: ${held.join(", ")} \u2014 using ${chosen.library} (${chosen.entry.version || "unversioned"}). Highest version wins; an equal version goes to the default library, then by name. Pin a version (${key}#<version>) to choose another.`;
+    if (this.warnedLibraryCollisions.has(msg)) return;
+    this.warnedLibraryCollisions.add(msg);
+    console.warn(msg);
+  }
   /**
    * Open the local index and snapshot its libraries + asset definitions.
    * Best-effort: no index file (never indexed), or any open/guard failure,
@@ -791,6 +824,7 @@ var AssetManager = class {
    * when it exists, else `<libraries dir>/<name>`; `null` when neither is a directory.
    */
   libraryPath(name, snap) {
+    if (name === GLOBAL_INSTALL_DIR_NAME) return null;
     const registered = snap?.libraries.find((l) => l.name === name)?.path;
     if (registered && existsSync(registered)) return registered;
     try {
@@ -1280,6 +1314,8 @@ var AssetManager = class {
    * @param opts.link - When `true`, symlink local-path assets instead of copying them
    *   (the author dev-loop). Machine-local / not for committing; a no-op for
    *   store/factory sources. Defaults to copy.
+   * @param opts.onLibraryOrigin - Called once per deployed library-origin asset with its
+   *   canonical ref and the name of the library it was resolved from.
    * @returns Array of asset refs that were deployed in this call.
    * @throws When the asset cannot be found in any configured repository.
    */
@@ -1309,6 +1345,13 @@ var AssetManager = class {
         )
       )
     ];
+    if (opts?.onLibraryOrigin) {
+      for (const e of lib.entries) {
+        const origin = lib.libraryOf.get(e);
+        const deployedRef = canonicalEntryRef(e);
+        if (origin && deployed.includes(deployedRef)) opts.onLibraryOrigin(deployedRef, origin);
+      }
+    }
     this.addDependencyToConfig(ref);
     await this.renderDriverMcpConfig();
     if (resolved.length > 0 || lib.entries.length > 0) {
@@ -1987,10 +2030,11 @@ var AssetManager = class {
     const lock = this.tryReadLock();
     if (!lock) return [];
     const result = [];
+    const reported = /* @__PURE__ */ new Set();
     for (const src of lock.sources) {
       const slug = sourceCacheKey(src.url);
       const decl = repositories[slug];
-      if (!decl || decl.path) continue;
+      if (!decl) continue;
       const status = checkRepoStatus(decl, slug, this.reposDir);
       if (status.behind <= 0) continue;
       for (const [ref, entry] of Object.entries(lock.assets)) {
@@ -2004,12 +2048,12 @@ var AssetManager = class {
           currentVersion: version ?? "",
           behind: status.behind
         });
+        reported.add(ref);
       }
     }
     const libraryAssets = Object.entries(lock.assets).filter(
       ([, e]) => e.library && !e.library.installed
     );
-    const reported = /* @__PURE__ */ new Set();
     if (libraryAssets.length > 0) {
       const snap = await this.loadLibraryIndex();
       for (const [ref, entry] of libraryAssets) {
@@ -2430,5 +2474,5 @@ var AssetManager = class {
 };
 
 export { AssetManager, FACTORY_SOURCE_URL, MissingManifestError, NON_DEPLOYABLE_KINDS, normalizeRepoUrl, parseCanonicalLockKey, parseRefTolerant, renderMcpServerConfig, softDepName };
-//# sourceMappingURL=chunk-WGNFDLHT.js.map
-//# sourceMappingURL=chunk-WGNFDLHT.js.map
+//# sourceMappingURL=chunk-BATL2CWI.js.map
+//# sourceMappingURL=chunk-BATL2CWI.js.map