@skaile/workspaces 5.6.1 → 5.8.0

package/dist/{chunk-MX3UQXLU.js → chunk-4MQS7CAF.js}

@@ -1,16 +1,16 @@
-import { readManifestSourceConfig, discoverAssetsInTree, barePublisher, createDefaultKindRegistry, sharesItsFolder } from './chunk-XOGG7VDZ.js';
-import { installFromManifest, assertSafeManifestPath } from './chunk-BTISGSK4.js';
-import { PresetManifestSchema } from './chunk-FRHE7FFB.js';
-import { defaultLibraryDir, resolveLibraryDir, GLOBAL_INSTALL_DIR_NAME, readLock, buildLibraryLockEntries, writeLock, mergeLockFile, buildLockFile, ManifestYamlEditor } from './chunk-TZCQ7ZWQ.js';
-import { getGlobalCacheDir, storeManifestSlug, resolveSourcePublisher } from './chunk-2W4LBLIN.js';
-import { userConfigPath, globalSkaileDir, mergeLegacyEntriesInto, migrateLegacyDir, globalCacheRoot } from './chunk-MFHKHXDE.js';
-import { encodeSkaileManifest, loadSkPublishManifest, SKAILE_MANIFEST_FILENAME } from './chunk-7ZHLYXTI.js';
-import { scanDirectory } from './chunk-PA7WLID3.js';
-import { parseAssetRef, assetRefToStr } from './chunk-AO7VJ6G6.js';
+import { readManifestSourceConfig, discoverAssetsInTree, barePublisher, createDefaultKindRegistry, sharesItsFolder, SEMVER_RE, parseManifestFile } from './chunk-Y7QA2OLD.js';
+import { installFromManifest, assertSafeManifestPath } from './chunk-CKQEIY43.js';
+import { PresetManifestSchema } from './chunk-B6GIW55K.js';
+import { defaultLibraryDir, resolveLibraryDir, GLOBAL_INSTALL_DIR_NAME, readLock, buildLibraryLockEntries, writeLock, mergeLockFile, buildLockFile, ManifestYamlEditor } from './chunk-36AFURKZ.js';
+import { getGlobalCacheDir, storeManifestSlug, resolveSourcePublisher } from './chunk-JAKOMFC6.js';
+import { userConfigPath, globalSkaileDir, mergeLegacyEntriesInto, migrateLegacyDir, globalCacheRoot } from './chunk-L5VSIPQD.js';
+import { encodeSkaileManifest, loadSkPublishManifest, SKAILE_MANIFEST_FILENAME } from './chunk-BTE2V4IW.js';
+import { scanDirectory } from './chunk-GTILM2CI.js';
+import { parseAssetRef, assetRefToStr } from './chunk-QVNRCDTV.js';
 import { __export } from './chunk-NSBPE2FW.js';
 import * as fs10 from 'fs';
 import { existsSync, mkdirSync, symlinkSync, copyFileSync, cpSync } from 'fs';
-import * as path4 from 'path';
+import * as path15 from 'path';
 import { resolve, relative, sep, join, dirname } from 'path';
 import { stringify, parse, parseDocument } from 'yaml';
 import * as z3 from 'zod';
@@ -103,10 +103,10 @@ var SkaileConfigSchema = z3.object({
   library: LibraryConfigSchema.optional()
 });
 function defaultIndexPath() {
-  return path4.join(globalSkaileDir(), "index.db");
+  return path15.join(globalSkaileDir(), "index.db");
 }
 function resolveIndexPath() {
-  if (process.env.SKAILE_INDEX_PATH) return process.env.SKAILE_INDEX_PATH;
+  if (process.env.SKAILE_INDEX_PATH) return path15.resolve(process.env.SKAILE_INDEX_PATH);
   return defaultIndexPath();
 }
 function getConfigDefaults() {
@@ -117,7 +117,7 @@ function getConfigDefaults() {
 }
 var CONFIG_FILENAME = "config.yaml";
 function projectConfigPath(projectDir) {
-  return path4.join(projectDir, ".skaile", CONFIG_FILENAME);
+  return path15.join(projectDir, ".skaile", CONFIG_FILENAME);
 }
 function loadConfigFile(filePath) {
   if (!fs10.existsSync(filePath)) return null;
@@ -170,7 +170,7 @@ function resolveConfig(opts) {
   return resolved;
 }
 function saveConfig(filePath, config) {
-  const dir = path4.dirname(filePath);
+  const dir = path15.dirname(filePath);
   if (!fs10.existsSync(dir)) {
     fs10.mkdirSync(dir, { recursive: true });
   }
@@ -200,11 +200,11 @@ function validateKnowledge(data) {
 
 // library/src/knowledge/knowledge-kind-provider.ts
 function collectDirRecursive(baseDir, relativeDir) {
-  const full = path4.join(baseDir, relativeDir);
+  const full = path15.join(baseDir, relativeDir);
   if (!fs10.existsSync(full) || !fs10.statSync(full).isDirectory()) return [];
   const results = [];
   for (const entry of fs10.readdirSync(full, { withFileTypes: true })) {
-    const rel = path4.posix.join(relativeDir, entry.name);
+    const rel = path15.posix.join(relativeDir, entry.name);
     if (entry.isDirectory()) {
       results.push(...collectDirRecursive(baseDir, rel));
     } else if (entry.isFile()) {
@@ -231,8 +231,8 @@ var knowledgeKindProvider = {
     return validateKnowledge(data);
   },
   defaultFileFilter(manifestPath) {
-    const dir = path4.dirname(manifestPath);
-    const manifestName = path4.basename(manifestPath);
+    const dir = path15.dirname(manifestPath);
+    const manifestName = path15.basename(manifestPath);
     const files = [manifestName];
     files.push(...collectDirRecursive(dir, "documents"));
     files.sort();
@@ -311,30 +311,30 @@ var assignments = sqliteTable("assignments", {
   assignedAt: text("assigned_at").notNull()
 });
 function isClone(dir) {
-  return fs10.existsSync(path4.join(dir, ".git"));
+  return fs10.existsSync(path15.join(dir, ".git"));
 }
 function getSidecarRoot() {
   const home = globalSkaileDir();
-  const sidecars = path4.join(home, "sidecars");
-  const legacy = path4.join(home, "sources");
+  const sidecars = path15.join(home, "sidecars");
+  const legacy = path15.join(home, "sources");
   mergeLegacyEntriesInto(getGlobalCacheDir(), legacy, isClone);
   mergeLegacyEntriesInto(sidecars, legacy, (p) => !isClone(p));
   return sidecars;
 }
 function resolveSidecarPaths(slug) {
   const rootDir = getSidecarRoot();
-  const sidecarDir = path4.join(rootDir, slug);
+  const sidecarDir = path15.join(rootDir, slug);
   return {
     rootDir,
     sidecarDir,
-    manifestFile: path4.join(sidecarDir, "skaile.manifest.yaml"),
-    readmeFile: path4.join(sidecarDir, "README.md"),
-    lockFile: path4.join(sidecarDir, "skaile.manifest.lock.json")
+    manifestFile: path15.join(sidecarDir, "skaile.manifest.yaml"),
+    readmeFile: path15.join(sidecarDir, "README.md"),
+    lockFile: path15.join(sidecarDir, "skaile.manifest.lock.json")
   };
 }
 function deriveSlug(sourceConfig, sourcePath, existingSlugs) {
   const fromConfig = sourceConfig && typeof sourceConfig.name === "string" ? sourceConfig.name : void 0;
-  const base = fromConfig && fromConfig.length > 0 ? slugify(fromConfig) : slugify(path4.basename(sourcePath || "")) || "unnamed-source";
+  const base = fromConfig && fromConfig.length > 0 ? slugify(fromConfig) : slugify(path15.basename(sourcePath || "")) || "unnamed-source";
   const taken = new Set(existingSlugs);
   if (!taken.has(base)) return base;
   for (let i = 2; i < 1e3; i++) {
@@ -360,17 +360,17 @@ function slugify(input) {
 
 // library/src/local/store-paths.ts
 function getStoreRoot() {
-  return path4.join(globalSkaileDir(), "store");
+  return path15.join(globalSkaileDir(), "store");
 }
 function getStoreManifestsDir() {
-  return path4.join(getStoreRoot(), "manifests");
+  return path15.join(getStoreRoot(), "manifests");
 }
 function curatedManifestOverlay(sourceUrl) {
-  const file = path4.join(getStoreManifestsDir(), `${storeManifestSlug(sourceUrl)}.yaml`);
+  const file = path15.join(getStoreManifestsDir(), `${storeManifestSlug(sourceUrl)}.yaml`);
   return fs10.existsSync(file) ? file : void 0;
 }
 function migratedMarkerPath() {
-  return path4.join(getStoreRoot(), ".migrated");
+  return path15.join(getStoreRoot(), ".migrated");
 }
 function collectSidecarMigrationCandidates(sidecarRoot) {
   const candidates = [];
@@ -378,9 +378,9 @@ function collectSidecarMigrationCandidates(sidecarRoot) {
     for (const entry of fs10.readdirSync(sidecarRoot, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
       if (entry.name.startsWith(".")) continue;
-      const sidecarDir = path4.join(sidecarRoot, entry.name);
-      const current = path4.join(sidecarDir, "skaile.manifest.yaml");
-      const legacy = path4.join(sidecarDir, ".skaile-source.yaml");
+      const sidecarDir = path15.join(sidecarRoot, entry.name);
+      const current = path15.join(sidecarDir, "skaile.manifest.yaml");
+      const legacy = path15.join(sidecarDir, ".skaile-source.yaml");
       const src = fs10.existsSync(current) ? current : fs10.existsSync(legacy) ? legacy : void 0;
       if (src) candidates.push({ src, slug: entry.name });
     }
@@ -390,7 +390,7 @@ function collectSidecarMigrationCandidates(sidecarRoot) {
 function moveSidecarManifests(candidates, manifestsDir) {
   let migrated = 0;
   for (const { src, slug } of candidates) {
-    const dest = path4.join(manifestsDir, `${slug}.yaml`);
+    const dest = path15.join(manifestsDir, `${slug}.yaml`);
     if (fs10.existsSync(dest)) continue;
     try {
       fs10.renameSync(src, dest);
@@ -405,11 +405,11 @@ function moveSidecarManifests(candidates, manifestsDir) {
   return migrated;
 }
 function initStoreGitRepo(storeRoot) {
-  if (fs10.existsSync(path4.join(storeRoot, ".git"))) return;
+  if (fs10.existsSync(path15.join(storeRoot, ".git"))) return;
   try {
     spawnSync("git", ["init", "--quiet"], { cwd: storeRoot, stdio: "ignore" });
     fs10.writeFileSync(
-      path4.join(storeRoot, ".gitignore"),
+      path15.join(storeRoot, ".gitignore"),
       "# Remote-store cache \u2014 local to this machine.\nremote-cache/\n",
       "utf8"
     );
@@ -507,7 +507,7 @@ async function librariesPresent(client) {
   return rs.rows.length > 0;
 }
 function slugify2(p) {
-  const base = path4.basename(p) || "lib";
+  const base = path15.basename(p) || "lib";
   return base.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-|-$/g, "") || "lib";
 }
 async function runLibrariesMigration(client) {
@@ -672,19 +672,19 @@ async function purgeOrphanedAssetDefinitions(client) {
 }
 function assertNoLegacyLibDb(newDbPath) {
   if (fs10.existsSync(newDbPath)) return;
-  const parent = path4.dirname(newDbPath);
+  const parent = path15.dirname(newDbPath);
   const skaileHome = globalSkaileDir();
-  const defaultIndexPath2 = path4.join(skaileHome, "index.db");
+  const defaultIndexPath2 = path15.join(skaileHome, "index.db");
   const candidates = [];
-  if (path4.basename(newDbPath) === "index.db") {
-    candidates.push(path4.join(parent, "lib.db"));
+  if (path15.basename(newDbPath) === "index.db") {
+    candidates.push(path15.join(parent, "lib.db"));
   }
   if (newDbPath === defaultIndexPath2) {
-    candidates.push(path4.join(skaileHome, "libraries", "lib.db"));
-    candidates.push(path4.join(skaileHome, "library", "lib.db"));
+    candidates.push(path15.join(skaileHome, "libraries", "lib.db"));
+    candidates.push(path15.join(skaileHome, "library", "lib.db"));
   }
-  if (path4.basename(parent) === "libraries") {
-    candidates.push(path4.join(path4.dirname(parent), "library", "lib.db"));
+  if (path15.basename(parent) === "libraries") {
+    candidates.push(path15.join(path15.dirname(parent), "library", "lib.db"));
   }
   for (const legacy of candidates) {
     if (!fs10.existsSync(legacy)) continue;
@@ -846,14 +846,14 @@ var LocalIndex = class {
     let dbPath;
     if (typeof optionsOrDir === "string") {
       dir = optionsOrDir;
-      dbPath = path4.join(dir, "index.db");
+      dbPath = path15.join(dir, "index.db");
     } else if (optionsOrDir?.indexPath) {
       dbPath = optionsOrDir.indexPath;
       dir = optionsOrDir.libraryDir ?? resolveLibraryDir();
       this._kindRegistry = optionsOrDir.kindRegistry;
     } else if (optionsOrDir?.libraryDir) {
       dir = optionsOrDir.libraryDir;
-      dbPath = path4.join(dir, "index.db");
+      dbPath = path15.join(dir, "index.db");
       this._kindRegistry = optionsOrDir.kindRegistry;
     } else {
       dir = resolveLibraryDir();
@@ -863,7 +863,7 @@ var LocalIndex = class {
     if (!fs10.existsSync(dir)) {
       fs10.mkdirSync(dir, { recursive: true });
     }
-    const dbParent = path4.dirname(dbPath);
+    const dbParent = path15.dirname(dbPath);
     if (!fs10.existsSync(dbParent)) {
       fs10.mkdirSync(dbParent, { recursive: true });
     }
@@ -1085,7 +1085,7 @@ var LocalIndex = class {
    * @returns The created Instance plus its on-disk install path.
    */
   async install(manifest, opts) {
-    const libraryRoot = opts?.libraryRoot ?? path4.join(this.libraryDir, GLOBAL_INSTALL_DIR_NAME);
+    const libraryRoot = opts?.libraryRoot ?? path15.join(this.libraryDir, GLOBAL_INSTALL_DIR_NAME);
     const { installPath } = await installFromManifest({
       manifest,
       libraryRoot,
@@ -1242,7 +1242,7 @@ function git(cwd, args) {
   return spawnSync("git", args, { cwd, encoding: "utf-8" });
 }
 function isGitRepo(libPath) {
-  return existsSync(path4.join(libPath, ".git"));
+  return existsSync(path15.join(libPath, ".git"));
 }
 function spawnGit(cwd, args, action) {
   const r = git(cwd, args);
@@ -1269,6 +1269,18 @@ function ensureGitRepo(libPath, url, branch) {
   }
   setOriginUrl(libPath, url);
 }
+function trackOriginBranch(libPath, branch, opts) {
+  spawnGit(libPath, ["config", `branch.${branch}.remote`, "origin"], "config");
+  spawnGit(libPath, ["config", `branch.${branch}.merge`, `refs/heads/${branch}`], "config");
+  if (opts?.fetch) {
+    spawnSync("git", ["fetch", "--quiet", "origin", branch], {
+      cwd: libPath,
+      encoding: "utf-8",
+      timeout: 2e4,
+      env: { ...process.env, GIT_TERMINAL_PROMPT: "0" }
+    });
+  }
+}
 function cloneOrInitGitRepo(libPath, url, branch) {
   mkdirSync(libPath, { recursive: true });
   const clone = spawnSync("git", ["clone", "--", url, libPath], {
@@ -1364,8 +1376,27 @@ var GitSyncDriver = class {
     const r = git(lib.path, args);
     if (r.status !== 0) {
       if (/couldn't find remote ref/i.test(r.stderr)) return { applied: 0, conflicts: [] };
-      if (/non-fast-forward|diverged|conflict/i.test(r.stderr)) {
-        return { applied: 0, conflicts: [{ path: "(branch)", reason: r.stderr.trim() }] };
+      if (/not possible to fast-forward|non-fast-forward|diverg/i.test(r.stderr)) {
+        return {
+          applied: 0,
+          conflicts: [
+            {
+              path: "(branch)",
+              reason: `local and remote both changed; run skaile library git ${lib.name} pull --rebase origin ${cfg.branch}`
+            }
+          ]
+        };
+      }
+      if (opts?.rebase && /conflict/i.test(r.stderr)) {
+        return {
+          applied: 0,
+          conflicts: [
+            {
+              path: "(branch)",
+              reason: `rebase stopped on conflicts; resolve them, then run skaile library git ${lib.name} rebase --continue (or --abort)`
+            }
+          ]
+        };
       }
       throw new LibrarySyncError(`git pull failed: ${r.stderr.trim()}`, "remote_error");
     }
@@ -1385,7 +1416,14 @@ var GitSyncDriver = class {
     if (opts?.force) args.push("--force-with-lease");
     const local = `refs/heads/${cfg.branch}`;
     const pushed = countCommits(lib.path, `refs/remotes/origin/${cfg.branch}..${local}`) ?? countCommits(lib.path, local) ?? 0;
-    ok(git(lib.path, args), "push");
+    const pushRes = git(lib.path, args);
+    if (pushRes.status !== 0 && /non-fast-forward|fetch first|updates were rejected/i.test(pushRes.stderr)) {
+      throw new LibrarySyncError(
+        `local and remote both changed; run skaile library git ${lib.name} pull --rebase origin ${cfg.branch}`,
+        "remote_error"
+      );
+    }
+    ok(pushRes, "push");
     return { pushed };
   }
   async propose(lib, opts) {
@@ -1489,6 +1527,14 @@ function rowToLibrary2(row) {
     updatedAt: new Date(row.updatedAt)
   };
 }
+var LIBRARY_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
+function assertValidLibraryName(name) {
+  if (!LIBRARY_NAME_PATTERN.test(name)) {
+    throw new Error(
+      `Invalid library name "${name}": use letters, digits, "_" or "-", starting with a letter or digit.`
+    );
+  }
+}
 var LibraryManager = class {
   constructor(lib) {
     this.lib = lib;
@@ -1506,6 +1552,7 @@ var LibraryManager = class {
     }
   }
   async addLibrary(input) {
+    assertValidLibraryName(input.name);
     const db = await this.lib.dbHandle();
     const existing = await db.select().from(libraries).where(eq(libraries.name, input.name)).get();
     if (existing) throw new DuplicateLibraryNameError(input.name);
@@ -1548,6 +1595,7 @@ var LibraryManager = class {
   }
   async updateLibrary(nameOrId, patch) {
     const lib = await this.requireLibrary(nameOrId);
+    if (patch.name !== void 0 && patch.name !== lib.name) assertValidLibraryName(patch.name);
     const db = await this.lib.dbHandle();
     const updates = {
       updatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -1604,7 +1652,7 @@ var LibraryManager = class {
       (l) => l.isDefault && (l.ownership === "owner" || l.ownership === "contributor")
     );
     if (writableDefault) return { library: writableDefault, created: false };
-    const personalPath = path4.join(librariesDir, "personal");
+    const personalPath = path15.join(librariesDir, "personal");
     fs10.mkdirSync(personalPath, { recursive: true });
     const lib = await this.addLibrary({
       name: "personal",
@@ -1636,7 +1684,7 @@ function describeSyncError(err) {
   return parts.join(": ");
 }
 function scanLibraryRoot(rootPath, registry, scanOpts) {
-  const fallbackPublisher = resolveSourcePublisher(rootPath) ?? (path4.basename(rootPath) || "unknown");
+  const fallbackPublisher = resolveSourcePublisher(rootPath) ?? (path15.basename(rootPath) || "unknown");
   const opts = {
     registry,
     sidecarManifestFile: scanOpts?.sidecarManifestFile,
@@ -1726,12 +1774,16 @@ var LocalCatalogSource = class {
    *
    * @param syncOpts - When `includeDev` is set, assets under the source
    *   config's `dev_paths` (e.g. `ai-assets-dev/`) are discovered and cached
-   *   too. Defaults to excluding them (a normal run).
+   *   too. Defaults to excluding them (a normal run). `exclude` drops every
+   *   asset it returns `true` for — never upserted, and any row an earlier sync
+   *   left behind is pruned (`library index` leaves out a non-semver version).
    * @returns Discovery statistics, fatal `errors`, and non-fatal `advisories`
    *   (missing sha256, unknown kind) — the latter never signal a failed index.
    */
   async sync(syncOpts) {
     const result = this.scan(syncOpts);
+    const exclude = syncOpts?.exclude;
+    const assets = exclude ? result.assets.filter((a) => !exclude(a)) : result.assets;
     let assetsUpdated = 0;
     const errors = [];
     const softDepsByRef = /* @__PURE__ */ new Map();
@@ -1741,7 +1793,7 @@ var LocalCatalogSource = class {
       if (list) list.push(e.to);
       else softDepsByRef.set(e.from, [e.to]);
     }
-    for (const asset of result.assets) {
+    for (const asset of assets) {
       const softDeps = softDepsByRef.get(asset.ref) ?? [];
       try {
         await this.library.upsertAssetDef({
@@ -1782,9 +1834,9 @@ var LocalCatalogSource = class {
         `${missingSha256Count} asset(s): sha256 not pinned \u2014 auto-computed locally (pin only for store publish)`
       );
     }
-    const keepRefs = result.assets.map((a) => a.ref);
-    if (keepRefs.length > 0) await this.library.pruneAssetDefs(this.sourceId, keepRefs);
-    return { assetsFound: result.assets.length, assetsUpdated, errors, advisories };
+    const keepRefs = assets.map((a) => a.ref);
+    if (result.assets.length > 0) await this.library.pruneAssetDefs(this.sourceId, keepRefs);
+    return { assetsFound: assets.length, assetsUpdated, errors, advisories };
   }
 };
 function defToCatalogAsset(def) {
@@ -1859,6 +1911,26 @@ function installLibraryAsset(opts) {
   writeLock(lockPath, mergeLockFile(prevLock, buildLockFile([], /* @__PURE__ */ new Set(), lockEntries)));
   return { installPath, lockKey: Object.keys(lockEntries)[0] ?? ref, sha256: found.sha256 };
 }
+function authoringLibraries(libs) {
+  const newRoot = getGlobalCacheDir();
+  const legacyRoot = path15.join(globalSkaileDir(), "sources");
+  return libs.filter((l) => !l.path.startsWith(newRoot) && !l.path.startsWith(legacyRoot));
+}
+async function scanAuthoringLibraries(index, registry) {
+  const libraries2 = authoringLibraries(await index.listSources()).sort(
+    (a, b) => b.createdAt.getTime() - a.createdAt.getTime()
+  );
+  return libraries2.map((library) => {
+    if (!existsSync(library.path)) {
+      return { library, assets: [], error: `library path does not exist: ${library.path}` };
+    }
+    try {
+      return { library, assets: scanLibraryRoot(library.path, registry).assets };
+    } catch (err) {
+      return { library, assets: [], error: describeSyncError(err) };
+    }
+  });
+}
 var FALLBACK_USER_NAME = "Skaile CLI";
 var FALLBACK_USER_EMAIL = "skaile-cli@local";
 var ROOT_README = `# Skaile Sidecar Manifests
@@ -1906,7 +1978,7 @@ var SidecarGit = class {
     if (!fs10.existsSync(this.rootDir)) {
       fs10.mkdirSync(this.rootDir, { recursive: true });
     }
-    const gitDir = path4.join(this.rootDir, ".git");
+    const gitDir = path15.join(this.rootDir, ".git");
     const freshRepo = !fs10.existsSync(gitDir);
     if (freshRepo) {
       const init = this.spawn(["init", "-b", "main"]);
@@ -1914,9 +1986,9 @@ var SidecarGit = class {
         throw new Error(`git init failed: ${init.stderr || init.stdout}`);
       }
     }
-    const attrsPath = path4.join(this.rootDir, ".gitattributes");
+    const attrsPath = path15.join(this.rootDir, ".gitattributes");
     if (!fs10.existsSync(attrsPath)) fs10.writeFileSync(attrsPath, GITATTRIBUTES, "utf-8");
-    const readmePath = path4.join(this.rootDir, "README.md");
+    const readmePath = path15.join(this.rootDir, "README.md");
     if (!fs10.existsSync(readmePath)) fs10.writeFileSync(readmePath, ROOT_README, "utf-8");
     if (!this.hasGlobalGitConfig("user.name")) {
       this.spawn(["config", "user.name", FALLBACK_USER_NAME]);
@@ -1942,7 +2014,7 @@ var SidecarGit = class {
    */
   async commit(slug, message, opts) {
     if (opts?.skip) return;
-    const slugDir = path4.join(this.rootDir, slug);
+    const slugDir = path15.join(this.rootDir, slug);
     if (fs10.existsSync(slugDir)) {
       this.spawn(["add", "--", slug]);
     } else {
@@ -2003,7 +2075,7 @@ ${result.stderr}`;
 };
 function migrateWorkspaceConfig(dir, opts) {
   const filename = opts?.filename ?? "skaile.yaml";
-  const filePath = path4.join(dir, filename);
+  const filePath = path15.join(dir, filename);
   if (!fs10.existsSync(filePath)) {
     return { migrated: false, version: 1, warnings: ["No skaile.yaml found"] };
   }
@@ -2228,8 +2300,8 @@ function resolveTemplate(template, context) {
   });
   return { value: result, hasSecret: false };
 }
-function setNestedValue(obj, path16, value) {
-  const parts = path16.split(".");
+function setNestedValue(obj, path17, value) {
+  const parts = path17.split(".");
   let current = obj;
   for (let i = 0; i < parts.length - 1; i++) {
     const key = parts[i];
@@ -2834,8 +2906,8 @@ function deepEqual(a, b) {
 function defaultCatalogCacheDir() {
   const home = globalSkaileDir();
   return migrateLegacyDir(
-    path4.join(globalCacheRoot(), "catalog"),
-    path4.join(home, "catalog-cache")
+    path15.join(globalCacheRoot(), "catalog"),
+    path15.join(home, "catalog-cache")
   );
 }
 var INDEX_FILE = "index.json";
@@ -2908,7 +2980,7 @@ var CatalogCache = class {
   // ── public: tarball cache ───────────────────────────────────────────────
   /** Absolute path where a tarball with `sha256` would be cached. */
   tarballPath(sha256) {
-    return path4.join(this.dir, TARBALL_DIR, `${sha256}.tgz`);
+    return path15.join(this.dir, TARBALL_DIR, `${sha256}.tgz`);
   }
   /** Read a cached tarball from disk if present, otherwise `null`. */
   readTarball(sha256) {
@@ -2918,7 +2990,7 @@ var CatalogCache = class {
   }
   /** Persist a tarball blob to disk (atomic write). */
   writeTarball(sha256, bytes) {
-    const dir = path4.join(this.dir, TARBALL_DIR);
+    const dir = path15.join(this.dir, TARBALL_DIR);
     if (!fs10.existsSync(dir)) fs10.mkdirSync(dir, { recursive: true });
     const finalPath = this.tarballPath(sha256);
     const tmpPath = `${finalPath}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
@@ -2942,7 +3014,7 @@ var CatalogCache = class {
    */
   invalidateEverything() {
     this.invalidateAll();
-    const tarballDir = path4.join(this.dir, TARBALL_DIR);
+    const tarballDir = path15.join(this.dir, TARBALL_DIR);
     if (fs10.existsSync(tarballDir)) {
       fs10.rmSync(tarballDir, { recursive: true, force: true });
     }
@@ -2954,11 +3026,11 @@ var CatalogCache = class {
   // ── private ─────────────────────────────────────────────────────────────
   ensureDir() {
     if (!fs10.existsSync(this.dir)) fs10.mkdirSync(this.dir, { recursive: true });
-    const tarballDir = path4.join(this.dir, TARBALL_DIR);
+    const tarballDir = path15.join(this.dir, TARBALL_DIR);
     if (!fs10.existsSync(tarballDir)) fs10.mkdirSync(tarballDir, { recursive: true });
   }
   indexPath() {
-    return path4.join(this.dir, INDEX_FILE);
+    return path15.join(this.dir, INDEX_FILE);
   }
   loadIndex() {
     if (this.index) return this.index;
@@ -3822,7 +3894,7 @@ var defaultFetch2 = async (url, init) => {
   });
 };
 function discoveredToAssetEntry(asset, repoPublisher, inheritPublisher) {
-  const root = path4.posix.dirname(asset.relativePath.replace(/\\/g, "/"));
+  const root = path15.posix.dirname(asset.relativePath.replace(/\\/g, "/"));
   const entry = {
     kind: asset.kind,
     name: asset.name,
@@ -3846,13 +3918,13 @@ function writeCuratedManifest(input) {
   const inheritPublisher = input.inheritPublisher ?? false;
   const assets = input.assets.map((a) => discoveredToAssetEntry(a, publisher, inheritPublisher)).sort((a, b) => `${a.kind}:${a.name}`.localeCompare(`${b.kind}:${b.name}`));
   const manifest = { publisher, assets };
-  fs10.mkdirSync(path4.dirname(manifestPath), { recursive: true });
+  fs10.mkdirSync(path15.dirname(manifestPath), { recursive: true });
   fs10.writeFileSync(manifestPath, encodeSkaileManifest(manifest), "utf-8");
   return { wrote: true, manifestPath, assetCount: assets.length };
 }
 function openManifest(libraryPath) {
-  const dir = path4.resolve(libraryPath);
-  const file = path4.join(dir, SKAILE_MANIFEST_FILENAME);
+  const dir = path15.resolve(libraryPath);
+  const file = path15.join(dir, SKAILE_MANIFEST_FILENAME);
   if (!fs10.existsSync(file)) {
     fs10.mkdirSync(dir, { recursive: true });
     return { editor: ManifestYamlEditor.create(file), created: true };
@@ -3865,7 +3937,23 @@ function openManifest(libraryPath) {
 function assertManifestEditable(libraryPath) {
   openManifest(libraryPath);
 }
+function conflictingAssetRoot(libraryPath, kind, name, root) {
+  const existing = loadSkPublishManifest(path15.resolve(libraryPath))?.assets?.find(
+    (a) => a.kind === kind && a.name === name
+  );
+  return existingRootConflict(libraryPath, existing, root);
+}
+function existingRootConflict(libraryPath, existing, root) {
+  if (!existing?.root || existing.source) return void 0;
+  const existingAbs = path15.resolve(libraryPath, existing.root);
+  if (existingAbs === path15.resolve(libraryPath, root)) return void 0;
+  const stat = fs10.statSync(existingAbs, { throwIfNoEntry: false });
+  return stat?.isDirectory() ? existing.root : void 0;
+}
 function upsertManifestAsset(libraryPath, input) {
+  if (input.root.split(/[\\/]+/).includes("..")) {
+    throw new Error(`Asset root "${input.root}" must stay inside the library (no "..").`);
+  }
   const { editor } = openManifest(libraryPath);
   const declared = editor.getPublisher();
   const topLevel = declared === void 0 ? void 0 : barePublisher(declared);
@@ -3876,6 +3964,12 @@ function upsertManifestAsset(libraryPath, input) {
   if (input.description) entry.description = input.description;
   if (input.keywords && input.keywords.length > 0) entry.keywords = input.keywords;
   const existing = editor.getAssets().find((a) => a.kind === input.kind && a.name === input.name);
+  const conflict = existingRootConflict(libraryPath, existing, input.root);
+  if (conflict) {
+    throw new Error(
+      `${input.kind}:${input.name} is already registered at "${conflict}" \u2014 "${input.root}" would re-point it and orphan the first asset. Remove or rename one of them.`
+    );
+  }
   const next = existing ? { ...existing, ...entry } : entry;
   if (existing && input.publisher && !overridesTopLevel) delete next.publisher;
   if (!existing || !isDeepStrictEqual(existing, next)) {
@@ -3887,7 +3981,7 @@ function upsertManifestAsset(libraryPath, input) {
 function missingRootAssets(libraryPath, manifest) {
   return (manifest.assets ?? []).filter((a) => {
     if (a.source || manifest.source || !a.root) return false;
-    const dir = path4.resolve(libraryPath, a.root);
+    const dir = path15.resolve(libraryPath, a.root);
     return !(fs10.existsSync(dir) && fs10.statSync(dir).isDirectory());
   });
 }
@@ -3901,6 +3995,16 @@ function pruneMissingRootAssets(libraryPath) {
   if (removed.length > 0) editor.save();
   return removed;
 }
+function pruneUnknownKindAssets(libraryPath, knownKinds) {
+  const manifest = loadSkPublishManifest(libraryPath);
+  if (!manifest) return [];
+  const unknown = (manifest.assets ?? []).filter((a) => !knownKinds.has(a.kind));
+  if (unknown.length === 0) return [];
+  const { editor } = openManifest(libraryPath);
+  const removed = unknown.filter((a) => editor.removeAsset(a.kind, a.name));
+  if (removed.length > 0) editor.save();
+  return removed;
+}
 function stampManifestPublisher(libraryPath, publisher) {
   const { editor, created } = openManifest(libraryPath);
   if (editor.getPublisher()) return false;
@@ -3919,19 +4023,79 @@ function setManifestPublisher(libraryPath, publisher) {
 }
 async function syncManifestWithDisk(libraryPath, defaultPublisher, registry) {
   stampManifestPublisher(libraryPath, defaultPublisher);
+  const knownKinds = new Set(registry.getAllKinds());
+  const unknownKind = pruneUnknownKindAssets(libraryPath, knownKinds);
   const removed = pruneMissingRootAssets(libraryPath);
+  const skipped = [];
   const publisher = loadSkPublishManifest(libraryPath)?.publisher ?? defaultPublisher;
-  for (const e of await scanDirectory(libraryPath, publisher, {
-    knownKinds: new Set(registry.getAllKinds())
-  })) {
+  const scanned = await scanDirectory(libraryPath, publisher, {
+    knownKinds,
+    keepDuplicates: true
+  });
+  const rootOf = (e) => path15.relative(libraryPath, path15.dirname(e.source)) || e.name;
+  const copiesOf = /* @__PURE__ */ new Map();
+  for (const e of scanned) {
+    const key = `${e.kind}:${e.name}`;
+    copiesOf.set(key, [...copiesOf.get(key) ?? [], e]);
+  }
+  const unclaimed = /* @__PURE__ */ new Set();
+  for (const [key, copies] of copiesOf) {
+    const claimed = copies.some(
+      (c) => conflictingAssetRoot(libraryPath, c.kind, c.name, rootOf(c))
+    );
+    if (copies.length > 1 && !claimed) unclaimed.add(key);
+  }
+  for (const e of scanned) {
+    if (!isParsable(e.source)) {
+      skipped.push({
+        kind: e.kind,
+        name: e.name,
+        reason: "unparsable",
+        detail: "manifest file could not be parsed",
+        file: path15.relative(libraryPath, e.source)
+      });
+      continue;
+    }
+    if (e.version && !SEMVER_RE.test(e.version)) {
+      skipped.push({
+        kind: e.kind,
+        name: e.name,
+        reason: "invalid-version",
+        detail: `version "${e.version}" is not valid semver`,
+        file: path15.relative(libraryPath, e.source)
+      });
+      continue;
+    }
+    const key = `${e.kind}:${e.name}`;
+    const root = rootOf(e);
+    const registered = conflictingAssetRoot(libraryPath, e.kind, e.name, root);
+    const others = (copiesOf.get(key) ?? []).filter((c) => c !== e);
+    const conflict = unclaimed.has(key) ? `also found in ${others.map((c) => `"${rootOf(c)}"`).join(", ")}` : registered && `already registered at "${registered}"`;
+    if (conflict) {
+      skipped.push({
+        kind: e.kind,
+        name: e.name,
+        reason: "duplicate",
+        detail: conflict,
+        file: path15.relative(libraryPath, e.source)
+      });
+      continue;
+    }
     upsertManifestAsset(libraryPath, {
       kind: e.kind,
       name: e.name,
-      root: path4.relative(libraryPath, path4.dirname(e.source)) || e.name,
+      root,
       version: e.version
     });
   }
-  return removed;
+  return { removed, unknownKind, skipped };
+}
+function isParsable(file) {
+  try {
+    return parseManifestFile(file, fs10.readFileSync(file, "utf-8")).ok;
+  } catch {
+    return false;
+  }
 }
 var PinPolicySchema = z3.enum(PIN_POLICIES);
 var LibraryInstanceRefSchema = z3.object({
@@ -3985,7 +4149,7 @@ function parseWorkspaceV2(raw) {
   return WorkspaceConfigV2Schema.parse(raw);
 }
 function loadWorkspaceV2(dir, filename = "skaile.yaml") {
-  const filePath = path4.join(dir, filename);
+  const filePath = path15.join(dir, filename);
   if (!fs10.existsSync(filePath)) return null;
   const content = fs10.readFileSync(filePath, "utf-8");
   const raw = parse(content);
@@ -3993,7 +4157,7 @@ function loadWorkspaceV2(dir, filename = "skaile.yaml") {
   return parseWorkspaceV2(raw);
 }
 function saveWorkspaceV2(dir, v2, filename = "skaile.yaml") {
-  const filePath = path4.join(dir, filename);
+  const filePath = path15.join(dir, filename);
   let existing = {};
   if (fs10.existsSync(filePath)) {
     const content = fs10.readFileSync(filePath, "utf-8");
@@ -4009,7 +4173,7 @@ function saveWorkspaceV2(dir, v2, filename = "skaile.yaml") {
 }
 var LOCK_FILENAME = "skaile.lock.yaml";
 function loadLockFile(dir) {
-  const filePath = path4.join(dir, LOCK_FILENAME);
+  const filePath = path15.join(dir, LOCK_FILENAME);
   if (!fs10.existsSync(filePath)) return null;
   const content = fs10.readFileSync(filePath, "utf-8");
   const raw = parse(content);
@@ -4027,7 +4191,7 @@ function loadLockFile(dir) {
   return LockFileSchema.parse(raw);
 }
 function saveLockFile(dir, lock) {
-  const filePath = path4.join(dir, LOCK_FILENAME);
+  const filePath = path15.join(dir, LOCK_FILENAME);
   if (!fs10.existsSync(dir)) {
     fs10.mkdirSync(dir, { recursive: true });
   }
@@ -4048,7 +4212,7 @@ function createEmptyLockFile() {
   };
 }
 function detectWorkspaceVersion(dir, filename = "skaile.yaml") {
-  const filePath = path4.join(dir, filename);
+  const filePath = path15.join(dir, filename);
   if (!fs10.existsSync(filePath)) return null;
   const content = fs10.readFileSync(filePath, "utf-8");
   const raw = parse(content);
@@ -4056,6 +4220,6 @@ function detectWorkspaceVersion(dir, filename = "skaile.yaml") {
   return raw.version === 2 ? 2 : 1;
 }
 
-export { AssignmentNotFoundError, CatalogCache, CatalogConfigSchema, CatalogHttpError, DuplicateAssignmentError, DuplicateLibraryNameError, GitSyncDriver, InstanceHasConsumersError, InstanceNotFoundError, InterpolationError, KnowledgeManifestSchema, LIBRARY_BACKENDS, LIBRARY_OWNERSHIPS, LOCAL_CATALOG_URL, LibraryConfigSchema, LibraryError, LibraryInstanceRefSchema, LibraryManager, LibrarySectionSchema, LibrarySyncError, LocalCatalogSource, LocalIndex, LocalSyncDriver, LockAssignmentSchema, LockFileSchema, OfflineError, OperationNotPermittedError, PIN_POLICIES, PinPolicySchema, PresetAppliedSchema, PresetExpandedSchema, RemoteCatalogSource, RequiresEdgeSchema, RestCatalogSource, SidecarGit, SkaileConfigSchema, SourceNotFoundError, TarballHashMismatchError, UserLibraryNotFoundError, WorkspaceConfigV2Schema, applyNonStructuralUpgrade, applyPreset, applyPresetFromData, assertManifestEditable, classifyRef, cloneOrInitGitRepo, createEmptyLockFile, curatedManifestOverlay, deriveSlug, detectChanges, detectNestedPresetRefs, detectWorkspaceVersion, ensureGitRepo, evaluateUpgrade, extractLibraryInstanceId, extractReferencedKeys, filterKey, getConfigDefaults, getDefaultValue, getSidecarRoot, getStoreManifestsDir, getStoreRoot, hasInterpolationTokens, installLibraryAsset, interpolate, isGitRepo, isLocalCatalogUrl, isSecretPlaceholder, knowledgeKindProvider, listSidecarSlugsOnDisk, loadLockFile, loadWorkspaceV2, migrateSidecarsToStoreIfNeeded, migrateWorkspaceConfig, missingRootAssets, parsePreset, parsePresetYaml, parseWorkspaceV2, projectConfigPath, pruneMissingRootAssets, queryInstancePickerChoices, resolveAllItems, resolveConfig, resolveIndexPath, resolveItem, resolvePin, resolveSidecarPaths, saveConfig, saveLockFile, saveWorkspaceV2, scanLibraryRoot, setManifestPublisher, setOriginUrl, sha256Hex, stampManifestPublisher, storeSecrets, syncManifestWithDisk, trpcGetUrl, upsertManifestAsset, validateAllPlaceholders, validateKnowledge, validateNestingDepth, validatePlaceholder, writeCuratedManifest };
-//# sourceMappingURL=chunk-MX3UQXLU.js.map
-//# sourceMappingURL=chunk-MX3UQXLU.js.map
+export { AssignmentNotFoundError, CatalogCache, CatalogConfigSchema, CatalogHttpError, DuplicateAssignmentError, DuplicateLibraryNameError, GitSyncDriver, InstanceHasConsumersError, InstanceNotFoundError, InterpolationError, KnowledgeManifestSchema, LIBRARY_BACKENDS, LIBRARY_OWNERSHIPS, LOCAL_CATALOG_URL, LibraryConfigSchema, LibraryError, LibraryInstanceRefSchema, LibraryManager, LibrarySectionSchema, LibrarySyncError, LocalCatalogSource, LocalIndex, LocalSyncDriver, LockAssignmentSchema, LockFileSchema, OfflineError, OperationNotPermittedError, PIN_POLICIES, PinPolicySchema, PresetAppliedSchema, PresetExpandedSchema, RemoteCatalogSource, RequiresEdgeSchema, RestCatalogSource, SidecarGit, SkaileConfigSchema, SourceNotFoundError, TarballHashMismatchError, UserLibraryNotFoundError, WorkspaceConfigV2Schema, applyNonStructuralUpgrade, applyPreset, applyPresetFromData, assertManifestEditable, assertValidLibraryName, classifyRef, cloneOrInitGitRepo, conflictingAssetRoot, createEmptyLockFile, curatedManifestOverlay, deriveSlug, detectChanges, detectNestedPresetRefs, detectWorkspaceVersion, ensureGitRepo, evaluateUpgrade, extractLibraryInstanceId, extractReferencedKeys, filterKey, getConfigDefaults, getDefaultValue, getSidecarRoot, getStoreManifestsDir, getStoreRoot, hasInterpolationTokens, installLibraryAsset, interpolate, isGitRepo, isLocalCatalogUrl, isSecretPlaceholder, knowledgeKindProvider, listSidecarSlugsOnDisk, loadLockFile, loadWorkspaceV2, migrateSidecarsToStoreIfNeeded, migrateWorkspaceConfig, missingRootAssets, parsePreset, parsePresetYaml, parseWorkspaceV2, projectConfigPath, pruneMissingRootAssets, queryInstancePickerChoices, resolveAllItems, resolveConfig, resolveIndexPath, resolveItem, resolvePin, resolveSidecarPaths, saveConfig, saveLockFile, saveWorkspaceV2, scanAuthoringLibraries, scanLibraryRoot, setManifestPublisher, setOriginUrl, sha256Hex, stampManifestPublisher, storeSecrets, syncManifestWithDisk, trackOriginBranch, trpcGetUrl, upsertManifestAsset, validateAllPlaceholders, validateKnowledge, validateNestingDepth, validatePlaceholder, writeCuratedManifest };
+//# sourceMappingURL=chunk-4MQS7CAF.js.map
+//# sourceMappingURL=chunk-4MQS7CAF.js.map