@skaile/workspaces 5.6.1 → 5.8.0

package/dist/cli/index.js

@@ -1,24 +1,24 @@
 #!/usr/bin/env node
-import { makeProvidersCommand, loadRegistryView, addProviderEntry, ProviderRegistryWriteError } from '../chunk-QD772CGQ.js';
-import { makeSourceCommand, syncProjectSources } from '../chunk-D2V42LUE.js';
-import { AI_RESOURCES } from '../chunk-OGLDAJFL.js';
-import { checkSkillManifest } from '../chunk-2NYXQYHN.js';
-import { getStoreConfig, storeFetch, deviceLogin, loadStoreAuthConfig, logout, hasStoredAuth, isStoreAuthenticated, getStoreToken, getStoreIdentity, assetEntryRef, refFor } from '../chunk-65EYRFZJ.js';
-import { makeInstallCommand, makeCheckCommand, makeCleanCommand, reportInstalledSoftDeps } from '../chunk-WIHQWVWL.js';
+import { makeProvidersCommand, loadRegistryView, addProviderEntry, ProviderRegistryWriteError } from '../chunk-NPLPCRW5.js';
+import { makeSourceCommand, syncProjectSources } from '../chunk-P23M65LB.js';
+import { makeInstallCommand, makeCheckCommand, makeCleanCommand, reportRelocked, REF_HINT, reportInstalledSoftDeps } from '../chunk-GXXFLBUQ.js';
 import { createSpinner } from '../chunk-NESV47MF.js';
-import { openCatalogSource, openLibraryManager, openLibrary } from '../chunk-I4QBZLOR.js';
-import { logErr, S, logOk, logInfo, logWarn, TARGET_DEFAULT_HINT, deferredWarnings, warnLegacyClaudeCopies, kindColorPad, kindColor, colorRef, formatSoftDepSection, bareSoftDepName, formatSoftDepHint, formatRelativeTime, formatSoftDepRemovePreview, formatSoftDepAddPreview, fitWidth, KIND_COL_WIDTH } from '../chunk-VJENKWXF.js';
-import { getKindRegistry, getKnownKinds } from '../chunk-OLLAQLFJ.js';
-import { LocalSecretsProvider } from '../chunk-VSQFGU5D.js';
-import { runAgentChat, isCompositionError, loadSessionById, loadSession, listSessions, setCurrentSession, deleteSession, clearSession, loadAgentManifest, hashAgentFiles, createCompositionContentSource, compileComposition, instanceForSession, resolveAgentInstance, describeComposition, MarkdownStreamer } from '../chunk-RGXVQZOV.js';
-import { buildClaudePluginFiles } from '../chunk-4GNJELPH.js';
-import '../chunk-6NPINANG.js';
-import '../chunk-SX4UIDKT.js';
+import { AI_RESOURCES } from '../chunk-Y4N2NUZD.js';
+import { findAssetManifestFile, declaredVersion, readAssetBody, checkAssetManifest } from '../chunk-ZAOGFXDO.js';
+import { getStoreConfig, storeFetch, deviceLogin, loadStoreAuthConfig, logout, hasStoredAuth, isStoreAuthenticated, getStoreToken, getStoreIdentity, assetEntryRef, manifestVersionMismatchMessage, refFor } from '../chunk-HYDRDNKN.js';
+import { openCatalogSource, LocalCatalogDisabledError, openLibraryManager, openLibrary } from '../chunk-HG34RNTK.js';
+import { logErr, S, logOk, logInfo, logWarn, TARGET_DEFAULT_HINT, deferredWarnings, warnLegacyClaudeCopies, kindColorPad, kindColor, colorRef, formatSoftDepSection, bareSoftDepName, formatSoftDepHint, formatRelativeTime, formatSoftDepRemovePreview, formatSoftDepAddPreview, fitWidth, KIND_COL_WIDTH } from '../chunk-F2EKONM7.js';
+import { getKindRegistry, getKnownKinds } from '../chunk-2FRUUDZY.js';
+import { LocalSecretsProvider } from '../chunk-ILFGVSTJ.js';
+import { runAgentChat, isCompositionError, loadSessionById, loadSession, listSessions, setCurrentSession, deleteSession, clearSession, loadAgentManifest, hashAgentFiles, createCompositionContentSource, compileComposition, instanceForSession, resolveAgentInstance, describeComposition, MarkdownStreamer } from '../chunk-LEMHVDET.js';
+import { buildClaudePluginFiles } from '../chunk-I6NLLJHZ.js';
+import '../chunk-LSXHED6I.js';
+import '../chunk-UAROCOXF.js';
 import '../chunk-R6O6YWU7.js';
-import '../chunk-KYXOGHY6.js';
-import '../chunk-45VFGT7A.js';
+import '../chunk-W5DWWE4Y.js';
+import '../chunk-4PTSR4UU.js';
 import '../chunk-4ZTPYIBE.js';
-import '../chunk-2XFUXGV6.js';
+import '../chunk-IONAUNWB.js';
 import '../chunk-X5YPJV4N.js';
 import '../chunk-O7SG5PC2.js';
 import '../chunk-7QBNJTTQ.js';
@@ -26,68 +26,67 @@ import '../chunk-OBYKJB4U.js';
 import '../chunk-5LKOAX7I.js';
 import '../chunk-32NA4TVC.js';
 import '../chunk-W3UDISS2.js';
-import '../chunk-HCYS7GFP.js';
-import { runFlow, resumeFlow } from '../chunk-7KLC4LZO.js';
+import '../chunk-V2DXZYBB.js';
+import { runFlow, resumeFlow } from '../chunk-ZKSJMZKD.js';
 import '../chunk-4R6DROGN.js';
-import { validateFlowVersions, parseSkillFrontmatter } from '../chunk-ZBBM6O6P.js';
-import '../chunk-SDFROXSA.js';
-import '../chunk-CT6NQSA4.js';
-import '../chunk-UAP2XHRF.js';
-import '../chunk-FK6HPLQA.js';
-import '../chunk-2GRB5ITE.js';
-import '../chunk-VX3INFBA.js';
-import '../chunk-VBBBZDI7.js';
-import '../chunk-EINLFFP6.js';
+import { validateFlowVersions, parseSkillFrontmatter } from '../chunk-CGT45WN7.js';
+import '../chunk-2LWYNQK7.js';
+import '../chunk-ISHJITXJ.js';
+import '../chunk-FTJJO3EM.js';
+import '../chunk-WTQ3TATB.js';
+import '../chunk-FVJK4QWM.js';
+import '../chunk-6GRX5L6A.js';
+import '../chunk-S53LOR7B.js';
 import '../chunk-LOO5CB5M.js';
-import '../chunk-NARITJS2.js';
-import '../chunk-27HS2DHB.js';
-import '../chunk-XBSQ4KMC.js';
+import '../chunk-GCICGXDD.js';
+import '../chunk-PTSGWKHR.js';
+import '../chunk-B4X2N7JQ.js';
 import '../chunk-YROR332M.js';
-import { getProviderPreset, AI_PROVIDER_PRESETS } from '../chunk-5B5IZVEP.js';
+import { getProviderPreset, AI_PROVIDER_PRESETS } from '../chunk-AWQYXZVG.js';
 import '../chunk-6E6PKKAD.js';
 import '../chunk-IFGTRL2I.js';
-import { projectAiAssetsRoots, loadFlow, loadAllFlowEntries, findFlowFileInRoots } from '../chunk-AOAZCSDI.js';
-import '../chunk-37FTLYFP.js';
-import '../chunk-QZLWJETK.js';
-import '../chunk-XUUYAS3Z.js';
-import { nodeLabel, nodeSkillAsset, nodeIsInert, nodeIsOptional, nodeRunKind, flowSkillVersionPins } from '../chunk-NFGRW3L7.js';
-import '../chunk-QCI6D7E4.js';
-import '../chunk-DMLDYFDS.js';
-import { AssetManager, MissingManifestError, parseRefTolerant, normalizeRepoUrl, FACTORY_SOURCE_URL } from '../chunk-PTO2YDDG.js';
-import { cloneOrInitGitRepo, ensureGitRepo, setManifestPublisher, syncManifestWithDisk, isGitRepo, assertManifestEditable, installLibraryAsset, missingRootAssets, stampManifestPublisher, upsertManifestAsset, getStoreManifestsDir, getDefaultValue, isSecretPlaceholder } from '../chunk-MX3UQXLU.js';
-import { parseManifestFile } from '../chunk-XOGG7VDZ.js';
-import '../chunk-BTISGSK4.js';
+import { projectAiAssetsRoots, loadFlow, loadAllFlowEntries, findFlowFileInRoots } from '../chunk-FZNG4V4J.js';
+import '../chunk-LNFKL23K.js';
+import '../chunk-MGGFBZWA.js';
+import '../chunk-M3WPBTGJ.js';
+import { nodeLabel, nodeSkillAsset, nodeIsInert, nodeIsOptional, nodeRunKind, flowSkillVersionPins } from '../chunk-7RGTAEG6.js';
+import '../chunk-NUELZWCF.js';
+import '../chunk-F3RDEH5U.js';
+import { AssetManager, MissingManifestError, parseRefTolerant, normalizeRepoUrl, FACTORY_SOURCE_URL } from '../chunk-H7QUDDKH.js';
+import { cloneOrInitGitRepo, trackOriginBranch, stampManifestPublisher, ensureGitRepo, conflictingAssetRoot, setManifestPublisher, LIBRARY_OWNERSHIPS, isGitRepo, assertManifestEditable, installLibraryAsset, missingRootAssets, assertValidLibraryName, upsertManifestAsset, syncManifestWithDisk, getStoreManifestsDir, getDefaultValue, isSecretPlaceholder } from '../chunk-4MQS7CAF.js';
+import { parseManifestFile, requiresSyntaxErrors, SEMVER_RE } from '../chunk-Y7QA2OLD.js';
+import '../chunk-CKQEIY43.js';
 import '../chunk-R7FOF242.js';
 import '../chunk-3TXEJN4W.js';
-import { installTargetOf } from '../chunk-2KOKBTR4.js';
+import { installTargetOf, SCAFFOLD_KINDS } from '../chunk-YSHVQGUS.js';
 import '../chunk-CGYEHQOX.js';
 import '../chunk-KTBKW2FI.js';
 import '../chunk-UQ6LFBPZ.js';
-import '../chunk-VKSXST23.js';
-import { effectiveComposes, validatePreset, composeSlotDiagnostics, agentDeprecationDiagnostics, validateAgent, SLOT_ID_PATTERN } from '../chunk-FRHE7FFB.js';
-import { resolveSettings, globalSettingsPath, projectSettingsPath, loadSettings, saveSettings, WorkspaceYamlEditor, resolveLibraryDir, checkAgentSkillConformance, globalInstallDir, GLOBAL_INSTALL_DIR_NAME, readLock, aiResourceRoots, workspaceProviderRegistryPath, userProviderRegistryPath, loadProviderRegistryFile } from '../chunk-TZCQ7ZWQ.js';
+import '../chunk-EF7NPDDU.js';
+import { effectiveComposes, validatePreset, composeSlotDiagnostics, agentDeprecationDiagnostics, validateAgent, SLOT_ID_PATTERN } from '../chunk-B6GIW55K.js';
+import { resolveSettings, globalSettingsPath, projectSettingsPath, loadSettings, saveSettings, WorkspaceYamlEditor, resolveLibraryDir, checkAgentSkillConformance, globalInstallDir, GLOBAL_INSTALL_DIR_NAME, readLock, aiResourceRoots, workspaceProviderRegistryPath, userProviderRegistryPath, loadProviderRegistryFile } from '../chunk-36AFURKZ.js';
 import '../chunk-4GY63JU6.js';
-import { factoryAssetRoots } from '../chunk-BF33SCLY.js';
-import '../chunk-46OVMT76.js';
+import { factoryAssetRoots } from '../chunk-GB7WDMH2.js';
+import '../chunk-PMECEZK3.js';
 import { DEFAULT_DRIVER_ID, DRIVER_DEFAULTS } from '../chunk-5BEFNLOR.js';
 import { findKindDirs } from '../chunk-A2ULN3KX.js';
-import { sourceCacheKey, getGlobalCacheDir, resolveAgentDir, AgentRefResolutionError, resolveAgentDefinitionDir, resolveSkWorkspaceConfig, matchPin, coerceVersion, loadSkWorkspaceConfig, normalizeAgentInstances, agentInstanceDiagnostics, storeManifestSlug, isWorkspaceConfigFilename } from '../chunk-2W4LBLIN.js';
-import { globalCacheRoot, globalSkaileDir, userConfigPath } from '../chunk-MFHKHXDE.js';
+import { sourceCacheKey, getGlobalCacheDir, resolveAgentDir, AgentRefResolutionError, resolveAgentDefinitionDir, resolveSkWorkspaceConfig, matchPin, coerceVersion, loadSkWorkspaceConfig, normalizeAgentInstances, agentInstanceDiagnostics, storeManifestSlug, isWorkspaceConfigFilename } from '../chunk-JAKOMFC6.js';
+import { globalCacheRoot, globalSkaileDir, userConfigPath } from '../chunk-L5VSIPQD.js';
 import { SUPPORTED_DRIVER_TARGETS, driverTargetForDriver } from '../chunk-CPSIPIX7.js';
-import { loadSkPublishManifest, SKAILE_MANIFEST_FILENAME, decodeSkaileManifest, encodeSkaileManifest } from '../chunk-7ZHLYXTI.js';
+import { SKAILE_MANIFEST_FILENAME, decodeSkaileManifest, loadSkPublishManifest, encodeSkaileManifest } from '../chunk-BTE2V4IW.js';
 import { pluginTitle } from '../chunk-RVRB27AN.js';
-import { parseFrontmatter, scanDirectory } from '../chunk-PA7WLID3.js';
-import { parseAssetRef, isValidAssetName, slugifyAssetName, ASSET_NAME_HINT, assetRefToStr } from '../chunk-AO7VJ6G6.js';
+import { parseFrontmatter, scanDirectory } from '../chunk-GTILM2CI.js';
+import { parseAssetRef, isValidPublisher, PUBLISHER_HINT, isValidAssetName, ASSET_NAME_HINT, slugifyAssetName, parseAssetRefLoose, assetRefToStr } from '../chunk-QVNRCDTV.js';
 import { portableSpawn, portableSpawnSync } from '../chunk-ICSCSM5D.js';
-import { openSqlite } from '../chunk-JMKB7IB4.js';
+import { openSqlite } from '../chunk-UMVKJM4Q.js';
 import { parseModelRef, resolveEntryBaseUrl } from '../chunk-MJHSLODD.js';
 import '../chunk-C3CAXQMA.js';
 import '../chunk-BOFL7GIF.js';
 import '../chunk-NSBPE2FW.js';
-import * as fs11 from 'fs';
-import fs11__default, { readFileSync, existsSync, mkdirSync, writeFileSync, lstatSync, rmSync, readdirSync, statSync } from 'fs';
-import * as path25 from 'path';
-import path25__default, { resolve, join } from 'path';
+import * as fs9 from 'fs';
+import fs9__default, { readFileSync, existsSync, mkdirSync, writeFileSync, lstatSync, rmSync, readdirSync, statSync } from 'fs';
+import * as path23 from 'path';
+import path23__default, { resolve, join } from 'path';
 import { fileURLToPath } from 'url';
 import { Help, Command, Option } from 'commander';
 import { rcompare } from 'semver';
@@ -99,7 +98,7 @@ import * as readline from 'readline';
 import { createInterface } from 'readline';
 import fs6 from 'fs/promises';
 import { parse as parse$1, stringify as stringify$1 } from 'smol-toml';
-import { execSync, spawnSync } from 'child_process';
+import { execSync, spawnSync, execFileSync } from 'child_process';
 import * as readline2 from 'readline/promises';
 import { createTRPCUntypedClient, httpLink, httpSubscriptionLink } from '@trpc/client';
 
@@ -176,7 +175,7 @@ async function runSearch(kind, query, opts) {
   const showLocal = !opts.store;
   const showStore = !opts.local;
   const { resolveConfig } = await import('../library/index.js');
-  const airGapped = resolveConfig({ projectDir: path25__default.resolve(opts.projectDir) }).catalog.cache_ttl === 0;
+  const airGapped = resolveConfig({ projectDir: path23__default.resolve(opts.projectDir) }).catalog.cache_ttl === 0;
   if (showLocal) {
     await searchLocal(query, kind, opts, showStore, airGapped);
   }
@@ -185,10 +184,11 @@ async function runSearch(kind, query, opts) {
   }
 }
 async function searchIndex(query, kind) {
-  const { openLibrary: openLibrary2 } = await import('../open-library-4WUMQHES.js');
+  const { openLibrary: openLibrary2 } = await import('../open-library-OG457THY.js');
   const library = await openLibrary2();
   try {
     const defs = await library.listAssetDefs(kind ? { kind } : {});
+    const libraryNames = new Map((await library.listSources()).map((l) => [l.id, l.name]));
     let entries = defs.map(
       (d) => ({
         name: d.name,
@@ -202,7 +202,8 @@ async function searchIndex(query, kind) {
         requires: [],
         dependencies: [],
         license: d.license,
-        category: d.category
+        category: d.category,
+        library: d.libraryId ? libraryNames.get(d.libraryId) : void 0
       })
     );
     if (query) {
@@ -217,7 +218,7 @@ async function searchIndex(query, kind) {
   }
 }
 async function searchFactory(projectDir, query, kind) {
-  const prefixes = factoryAssetRoots().map((r) => r.endsWith(path25__default.sep) ? r : r + path25__default.sep);
+  const prefixes = factoryAssetRoots().map((r) => r.endsWith(path23__default.sep) ? r : r + path23__default.sep);
   const isFactoryPath = (p6) => prefixes.some((fp) => p6 === fp.slice(0, -1) || p6.startsWith(fp));
   try {
     const entries = await new AssetManager({ registry: getKindRegistry(), projectDir }).search(
@@ -236,12 +237,44 @@ function unionEntries(indexed, factory) {
   const seen = new Set(indexed.map(entryDedupKey));
   return [...indexed, ...factory.filter((e) => !seen.has(entryDedupKey(e)))];
 }
+async function expandLibraryCopies(entries, projectDir) {
+  if (entries.length === 0) return entries;
+  let holders;
+  try {
+    holders = await new AssetManager({ registry: getKindRegistry(), projectDir }).libraryHolders();
+  } catch {
+    return entries;
+  }
+  if (holders.size === 0) return entries;
+  const out = [];
+  const expanded = /* @__PURE__ */ new Set();
+  for (const e of entries) {
+    const key = e.publisher ? `${e.kind}:@${e.publisher}/${e.name}` : void 0;
+    const group = key ? holders.get(key) : void 0;
+    if (!key || !group) {
+      out.push(e);
+      continue;
+    }
+    if (expanded.has(key)) continue;
+    expanded.add(key);
+    for (const h of group) {
+      out.push({
+        ...e,
+        version: h.version,
+        description: h.description || e.description,
+        library: h.library,
+        usedByAdd: h.picked
+      });
+    }
+  }
+  return out;
+}
 async function searchLocal(query, kind, opts, showStore, airGapped) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const factory = await searchFactory(projectDir, query, kind);
   let entries = unionEntries(await searchIndex(query, kind), factory);
   if (entries.length === 0 && !query && !kind && !airGapped) {
-    const { autoSyncForSearch } = await import('../source-JCF6KSQN.js');
+    const { autoSyncForSearch } = await import('../source-LKOFTOEK.js');
     if (await autoSyncForSearch(projectDir)) {
       entries = unionEntries(await searchIndex(query, kind), factory);
     }
@@ -258,46 +291,54 @@ async function searchLocal(query, kind, opts, showStore, airGapped) {
     console.log(`
   ${S.heading("Local:")}`);
   }
-  printLocalEntries(entries);
+  printLocalEntries(await expandLibraryCopies(entries, projectDir));
 }
 var MIN_LOCAL_DESCRIPTION_WIDTH = 10;
 function layoutLocalTable(rows, width, style = {}) {
   const styleRef = style.ref ?? ((s) => s);
   const styleVer = style.version ?? ((s) => s);
+  const styleLib = style.library ?? ((s) => s);
   const gap = COLUMN_GAP.length;
   const indent = 2;
   const pad = " ".repeat(indent);
   const nameW = Math.max(4, ...rows.map((r) => r.ref.length));
   const verW = Math.max(0, ...rows.map((r) => r.version.length));
-  const verSpan = verW > 0 ? gap + verW : 0;
+  const libW = Math.max(0, ...rows.map((r) => (r.library ?? "").length));
+  const tailSpan = (verW > 0 ? gap + verW : 0) + (libW > 0 ? gap + libW : 0);
   const refCell = (ref) => styleRef(ref) + " ".repeat(nameW - ref.length);
+  const tail = (r) => {
+    if (libW === 0) return r.version ? `${COLUMN_GAP}${styleVer(r.version)}` : "";
+    const verCell = `${COLUMN_GAP}${styleVer(r.version)}${" ".repeat(verW - r.version.length)}`;
+    const ver = verW > 0 ? verCell : "";
+    return `${ver}${COLUMN_GAP}${r.library ? styleLib(r.library) : ""}`;
+  };
   const lines = [];
-  const descW = width - (indent + nameW + gap + verSpan);
+  const descW = width - (indent + nameW + gap + tailSpan);
   if (descW >= MIN_LOCAL_DESCRIPTION_WIDTH) {
     for (const r of rows) {
       const desc = truncateText(r.description, descW);
-      const descCell = verW > 0 ? desc.padEnd(descW) : desc;
-      lines.push(
-        `${pad}${refCell(r.ref)}${COLUMN_GAP}${descCell}${r.version ? `${COLUMN_GAP}${styleVer(r.version)}` : ""}`
-      );
+      const descCell = tailSpan > 0 ? desc.padEnd(descW) : desc;
+      lines.push(`${pad}${refCell(r.ref)}${COLUMN_GAP}${descCell}${tail(r)}`);
     }
-    return { ruleWidth: nameW + gap + descW + verSpan, lines };
+    return { ruleWidth: nameW + gap + descW + tailSpan, lines };
   }
-  if (indent + nameW + verSpan <= width) {
+  if (indent + nameW + tailSpan <= width) {
     for (const r of rows) {
-      lines.push(
-        verW > 0 ? `${pad}${refCell(r.ref)}${r.version ? `${COLUMN_GAP}${styleVer(r.version)}` : ""}` : `${pad}${styleRef(r.ref)}`
-      );
+      lines.push(tailSpan > 0 ? `${pad}${refCell(r.ref)}${tail(r)}` : `${pad}${styleRef(r.ref)}`);
     }
-    return { ruleWidth: nameW + verSpan, lines };
+    return { ruleWidth: nameW + tailSpan, lines };
   }
   const subPad = " ".repeat(indent + 2);
-  const subDescW = width - (indent + 2) - verSpan;
+  const subDescW = width - (indent + 2) - tailSpan;
   for (const r of rows) {
     lines.push(`${pad}${styleRef(r.ref)}`);
     const desc = subDescW >= MIN_LOCAL_DESCRIPTION_WIDTH ? truncateText(r.description, subDescW) : "";
-    const descCell = r.version && desc ? desc.padEnd(subDescW) : desc;
-    const parts = [descCell, r.version ? styleVer(r.version) : ""].filter((s) => s !== "");
+    const descCell = (r.version || r.library) && desc ? desc.padEnd(subDescW) : desc;
+    const parts = [
+      descCell,
+      r.version ? styleVer(r.version) : "",
+      r.library ? styleLib(r.library) : ""
+    ].filter((s) => s !== "");
     if (parts.length > 0) lines.push(`${subPad}${parts.join(COLUMN_GAP)}`);
   }
   return { ruleWidth: Math.max(1, Math.min(nameW, width - indent)), lines };
@@ -313,10 +354,11 @@ function printLocalEntries(entries, width = terminalWidth()) {
       items.map((e) => ({
         ref: localEntryRef(e),
         description: e.description,
-        version: e.version ? `v${e.version}` : ""
+        version: e.version ? `v${e.version}` : "",
+        library: e.usedByAdd ? `${e.library} (used by add)` : e.library
       })),
       width,
-      { ref: S.cmd, version: S.dim }
+      { ref: S.cmd, version: S.dim, library: S.dim }
     );
     console.log();
     console.log(
@@ -350,9 +392,9 @@ async function searchStore(query, kind, opts, airGapped) {
     logInfo("air-gapped (cache_ttl: 0) \u2014 local sources only");
     return;
   }
-  const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError } = await import('../open-library-4WUMQHES.js');
+  const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-OG457THY.js');
   try {
-    const remote = await openCatalogSource2({ projectDir: path25__default.resolve(opts.projectDir) });
+    const remote = await openCatalogSource2({ projectDir: path23__default.resolve(opts.projectDir) });
     const assets = await remote.listAssets(kind ? { kind } : {});
     const results = filterCatalogAssets(assets, query);
     if (results.length > 0) {
@@ -363,7 +405,7 @@ async function searchStore(query, kind, opts, airGapped) {
       logInfo("No results in store");
     }
   } catch (e) {
-    const local = e instanceof LocalCatalogDisabledError;
+    const local = e instanceof LocalCatalogDisabledError2;
     if (opts.store) {
       logErr(
         local ? "remote catalog disabled (catalog.url: local) \u2014 set catalog.url: https://skaile.store to search the store" : `Store search failed: ${e.message}`
@@ -424,6 +466,12 @@ async function promptSoftDepAdds(am2, ref, io) {
     if (yes === true) await addEdge(edge.toRef);
   }
 }
+function presetAddNote(ref, presets) {
+  const own = presets.find((p6) => p6.ref.split("#")[0] === ref.split("#")[0]);
+  if (!own) return void 0;
+  const origin = own.library ? `library ${own.library}` : "a source or store";
+  return `Recorded in skaile.yaml (preset from ${origin}). ${own.assets} assets, ${own.skipped} instance items skipped (apply with skaile preset apply).`;
+}
 async function reportPresetMembership(am2, ref, onHint) {
   for (const preset of await am2.presetsContaining(ref)) {
     onHint(
@@ -470,7 +518,7 @@ function makeAddCommand() {
     const warnings = deferredWarnings();
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir),
+      projectDir: path23__default.resolve(opts.projectDir),
       global: opts.global || harnesses !== void 0,
       harnesses,
       driverTarget: opts.target,
@@ -480,9 +528,13 @@ function makeAddCommand() {
     spinner.start(`Adding ${ref}`);
     try {
       const libraryOf = /* @__PURE__ */ new Map();
+      let presets = [];
       const added = await am2.add(ref, {
         link: opts.link,
-        onLibraryOrigin: (deployedRef, library) => libraryOf.set(deployedRef, library)
+        onLibraryOrigin: (deployedRef, library) => libraryOf.set(deployedRef, library),
+        onPresets: (expanded) => {
+          presets = expanded;
+        }
       });
       spinner.stop("Done");
       warnings.flush();
@@ -499,7 +551,9 @@ function makeAddCommand() {
       });
       if (added.length === 0) {
         const kind = parseAssetRef(ref).kind;
-        if (!installTargetOf(getKindRegistry(), kind))
+        const presetNote = presetAddNote(ref, presets);
+        if (presetNote) logInfo(presetNote);
+        else if (!installTargetOf(getKindRegistry(), kind))
           logInfo(
             `Recorded in skaile.yaml (store bytes are fetched + verified into .skaile/cache/store). ${kind} assets are not deployed into the driver target \u2014 they are composed when skaile runs the agent.`
           );
@@ -520,24 +574,35 @@ function makeAddCommand() {
   });
 }
 function makeRemoveCommand() {
-  return new Command("remove").description("Remove from skaile.yaml + undeploy").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).option("--global", "Remove from ~/.skaile/skaile.yaml + undeploy from every global harness").option(
+  return new Command("remove").description("Remove from skaile.yaml + undeploy").argument("<ref>", "Asset reference (kind:@publisher/name, or kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).option("--global", "Remove from ~/.skaile/skaile.yaml + undeploy from every global harness").option(
     "--harness <ids>",
     "Comma-separated global harnesses to undeploy from (default: all resolved); implies --global"
   ).option("--target <agent>", `Driver target (${TARGET_DEFAULT_HINT})`).option("--no-soft-deps", "skip the orphaned-soft-dep prompt (don't remove, don't report)").action(async (ref, opts) => {
     const harnesses = parseHarnessFilter(opts.harness);
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir),
+      projectDir: path23__default.resolve(opts.projectDir),
       global: opts.global || harnesses !== void 0,
       harnesses,
       driverTarget: opts.target
     });
-    const ok = am2.remove(ref);
-    if (!ok) {
-      logErr(`Not deployed: ${ref}`);
+    let result;
+    try {
+      result = await am2.removeWithDependencies(ref);
+    } catch (err2) {
+      logErr(err2 instanceof Error ? err2.message : String(err2));
+      process.exitCode = 1;
+      return;
+    }
+    if (!result.changed) {
+      logErr(`Not deployed or declared: ${ref}`);
+      process.exitCode = 1;
       return;
     }
     logOk(`Removed ${ref}`);
+    for (const dep of result.pruned) {
+      logOk(`Removed ${dep} (no longer required by anything declared in skaile.yaml)`);
+    }
     await promptSoftDepRemovals(am2, ref, {
       isTTY: !!process.stdin.isTTY,
       noSoftDeps: opts.softDeps === false,
@@ -570,7 +635,7 @@ function makeListCommand() {
     }
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir),
+      projectDir: path23__default.resolve(opts.projectDir),
       driverTarget: opts.target
     });
     let declared;
@@ -618,7 +683,7 @@ function makeListCommand() {
 function runGlobalList(kind, opts, harnesses) {
   const am2 = new AssetManager({
     registry: getKindRegistry(),
-    projectDir: path25__default.resolve(opts.projectDir),
+    projectDir: path23__default.resolve(opts.projectDir),
     global: true,
     harnesses
   });
@@ -691,7 +756,7 @@ async function resolveInfoEntry(am2, ref, opts) {
     return { entry: match ?? deployed };
   }
   const lookup = opts.storeLookup ?? (async (filter) => {
-    const { resolveCatalogSource } = await import('../open-library-4WUMQHES.js');
+    const { resolveCatalogSource } = await import('../open-library-OG457THY.js');
     const { source, close } = await resolveCatalogSource({ projectDir: opts.projectDir });
     try {
       return await source.listAssets(filter);
@@ -707,9 +772,9 @@ async function resolveInfoEntry(am2, ref, opts) {
     );
     return { entry: hit ? catalogAssetToEntry(hit) : null };
   } catch (err2) {
-    const { LocalCatalogDisabledError } = await import('../open-library-4WUMQHES.js');
+    const { LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-OG457THY.js');
     const storeNote = err2 instanceof Error ? err2.message : String(err2);
-    const disabled = err2 instanceof LocalCatalogDisabledError || /catalog\.url/i.test(storeNote);
+    const disabled = err2 instanceof LocalCatalogDisabledError2 || /catalog\.url/i.test(storeNote);
     return { entry: null, storeNote, ...disabled ? { storeDisabled: true } : {} };
   }
 }
@@ -723,7 +788,7 @@ function infoNotFoundHint(ref, lookup) {
 }
 function makeInfoCommand() {
   return new Command("info").description("Show asset metadata, deps, deploy status").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const am2 = new AssetManager({ registry: getKindRegistry(), projectDir });
     const lookup = await resolveInfoEntry(am2, ref, { projectDir });
     const entry = lookup.entry;
@@ -742,8 +807,10 @@ function makeInfoCommand() {
     console.log(`  source:      ${S.dim(entry.source)}`);
     if (entry.requires.length) {
       console.log(`  requires:`);
-      for (const d of entry.requires)
-        console.log(`    ${S.dim("\xB7")}  ${kindColor(d.kind)}:${d.name}`);
+      for (const d of entry.requires) {
+        const scope = d.publisher ? `@${d.publisher}/` : "";
+        console.log(`    ${S.dim("\xB7")}  ${kindColor(d.kind)}:${scope}${d.name}`);
+      }
     }
     if (entry.dependencies.length) {
       console.log(`  dependencies:`);
@@ -756,10 +823,10 @@ function makeInfoCommand() {
 }
 function makeCreateCommand() {
   return new Command("create").description("Scaffold a new asset").argument("<name>", "Asset name").addOption(
-    new Option("-k, --kind <kind>", "Asset kind").default("skill").choices(getKindRegistry().getAllKinds())
+    new Option("-k, --kind <kind>", "Asset kind").default("skill").choices([...SCAFFOLD_KINDS])
   ).option("-d, --dir <dir>", "Target directory (default: cwd)").action((name, opts) => {
     const am2 = new AssetManager({ registry: getKindRegistry(), projectDir: process.cwd() });
-    const destDir = opts.dir ? path25__default.resolve(opts.dir) : process.cwd();
+    const destDir = opts.dir ? path23__default.resolve(opts.dir) : process.cwd();
     const result = am2.create(name, opts.kind, destDir);
     if (result.ok) logOk(`Created ${kindColor(opts.kind)}: ${pc5.dim(result.path)}`);
     else {
@@ -772,21 +839,29 @@ function makeDoctorCommand() {
   return new Command("doctor").description("Scan for missing dependency chains").argument("[name]", "Check a specific asset (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (name, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
     const issues = await am2.doctor();
     if (issues.length === 0) {
       logOk("No missing dependencies.");
       return;
     }
-    const assetW = Math.max(5, ...issues.map((i) => `${i.assetKind}:${i.assetName}`.length));
-    const depW = Math.max(11, ...issues.map((i) => `${i.depKind}:${i.depName}`.length));
+    const unresolved = issues.filter((i) => i.unresolved);
+    const missing = issues.filter((i) => !i.unresolved);
+    for (const i of unresolved) {
+      logErr(
+        `${i.assetKind}:${i.assetName}: locked, but no source or library provides it \u2014 ${i.fix ?? "run skaile install"}`
+      );
+    }
+    if (missing.length === 0) return;
+    const assetW = Math.max(5, ...missing.map((i) => `${i.assetKind}:${i.assetName}`.length));
+    const depW = Math.max(11, ...missing.map((i) => `${i.depKind}:${i.depName}`.length));
     console.log();
     console.log(
       `  ${S.dim("ASSET".padEnd(assetW))}  ${S.dim("MISSING DEP".padEnd(depW))}  ${S.dim("IN REPOS")}`
     );
     console.log(`  ${S.rule(assetW + depW + 15)}`);
-    for (const i of issues) {
+    for (const i of missing) {
       const asset = `${i.assetKind}:${i.assetName}`;
       const dep = `${i.depKind}:${i.depName}`;
       const status4 = i.inRepos ? S.warn("fixable") : S.err("not found");
@@ -795,12 +870,37 @@ function makeDoctorCommand() {
     console.log();
   });
 }
-async function indexLibrary(lib, index) {
+function manifestRequiresProblems(dir) {
+  const file = path23.join(dir, "skaile.manifest.yaml");
+  let doc;
+  try {
+    doc = parse(fs9.readFileSync(file, "utf-8"));
+  } catch {
+    return [];
+  }
+  const assets = doc?.assets;
+  if (!Array.isArray(assets)) return [];
+  const problems = [];
+  for (const a of assets) {
+    if (!a || typeof a !== "object") continue;
+    const { kind, name, dependencies } = a;
+    if (!Array.isArray(dependencies)) continue;
+    const entries = dependencies.map((d) => typeof d === "string" ? d : String(d));
+    for (const message of requiresSyntaxErrors(entries)) {
+      problems.push({
+        asset: `${String(kind)}:${String(name)}`,
+        message: `ManifestRequiresError: ${message}`
+      });
+    }
+  }
+  return problems;
+}
+async function indexLibrary(lib, index, opts = {}) {
   const { LocalCatalogSource } = await import('../library/index.js');
   const own = index ?? await openLibrary();
   try {
     const source = new LocalCatalogSource(own, lib.id, lib.path, getKindRegistry());
-    const res = await source.sync();
+    const res = await source.sync({ exclude: opts.exclude });
     return {
       assetsFound: res.assetsFound,
       assetsUpdated: res.assetsUpdated,
@@ -823,31 +923,23 @@ function resolveLibraryPublisherDetailed(lib, opts, storeIdentity) {
     return { publisher: "library", source: "library-name" };
   }
 }
-function resolveLibraryPublisher(lib, opts, storeIdentity) {
-  return resolveLibraryPublisherDetailed(lib, opts, storeIdentity).publisher;
+function warnLibraryNameFallback(libName, resolved) {
+  if (resolved.source !== "library-name") return;
+  logWarn(
+    `No publisher given and not signed in \u2014 using the library name "${resolved.publisher}" as the publisher. Pass --publisher <name> or run \`skaile store login\`; change it later with \`skaile library set ${libName} publisher=<name>\`.`
+  );
 }
-function stampAssetPublisher(assetDir, publisher) {
-  const markers = ["SKILL.md", "AGENT.md", "CONTRACT.md"];
-  let markerFile;
-  for (const m of markers) {
-    if (fs11.existsSync(path25.join(assetDir, m))) {
-      markerFile = path25.join(assetDir, m);
-      break;
-    }
-  }
+function normalizeAssetFrontmatter(assetDir) {
+  let markerFile = ["SKILL.md", "AGENT.md", "CONTRACT.md"].map((m) => path23.join(assetDir, m)).find((f) => fs9.existsSync(f));
   if (!markerFile) {
-    const promptMd = fs11.readdirSync(assetDir).find((f) => f.endsWith(".prompt.md"));
-    if (promptMd) markerFile = path25.join(assetDir, promptMd);
+    const promptMd = fs9.readdirSync(assetDir).find((f) => f.endsWith(".prompt.md"));
+    if (promptMd) markerFile = path23.join(assetDir, promptMd);
   }
   if (!markerFile) return;
   try {
-    const { data, body } = parseFrontmatter(fs11.readFileSync(markerFile, "utf8"));
-    const meta = data.metadata && typeof data.metadata === "object" && !Array.isArray(data.metadata) ? { ...data.metadata } : {};
-    if (meta.publisher != null) return;
-    meta.publisher = publisher;
-    data.metadata = meta;
+    const { data, body } = parseFrontmatter(fs9.readFileSync(markerFile, "utf8"));
     const fm = stringify(data).trimEnd();
-    fs11.writeFileSync(markerFile, `---
+    fs9.writeFileSync(markerFile, `---
 ${fm}
 ---
 
@@ -862,17 +954,13 @@ async function registerLibraryAsset(lib, index, input) {
     { publisher: input.publisher },
     getStoreIdentity()
   );
-  if (source === "library-name") {
-    logWarn(
-      `No publisher given and not signed in \u2014 using the library name "${publisher}" as the publisher. Pass --publisher <name> or run \`skaile store login\`; change it later with \`skaile library set ${lib.name} publisher=<name>\`.`
-    );
-  }
-  stampAssetPublisher(input.assetDir, publisher);
+  warnLibraryNameFallback(lib.name, { publisher, source });
+  normalizeAssetFrontmatter(input.assetDir);
   stampManifestPublisher(lib.path, publisher);
   upsertManifestAsset(lib.path, {
     kind: input.kind,
     name: input.name,
-    root: path25.relative(lib.path, input.assetDir) || input.name,
+    root: path23.relative(lib.path, input.assetDir) || input.name,
     version: input.version,
     publisher
   });
@@ -882,27 +970,38 @@ async function registerLibraryAsset(lib, index, input) {
 }
 var LIBRARY_UPGRADE_DOCS = "https://github.com/skaile-ai/workspaces/blob/main/docs/sections/cli/commands/library.md#upgrading-a-4x-library";
 var DOMAIN_REMOVED_HINT = `Domains were removed in 5.0 \u2014 delete DOMAIN.md files; group assets with .claude-plugin/marketplace.json. See ${LIBRARY_UPGRADE_DOCS}`;
-function countDomainFiles(root) {
-  let count = 0;
+function removedDomainOption() {
+  return new Option("--domain <domain>", "Removed in 5.0").hideHelp();
+}
+function rejectRemovedDomainOption(opts) {
+  if (opts.domain === void 0) return;
+  logErr(DOMAIN_REMOVED_HINT);
+  process.exit(1);
+}
+function findFiles(root, match) {
+  const found = [];
   const walk = (dir) => {
     let entries;
     try {
-      entries = fs11.readdirSync(dir, { withFileTypes: true });
+      entries = fs9.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const entry of entries) {
       if (entry.isDirectory()) {
         if (!entry.name.startsWith(".") && entry.name !== "node_modules") {
-          walk(path25.join(dir, entry.name));
+          walk(path23.join(dir, entry.name));
         }
-      } else if (entry.name === "DOMAIN.md") {
-        count++;
+      } else if (match(entry.name)) {
+        found.push(path23.join(dir, entry.name));
       }
     }
   };
   walk(root);
-  return count;
+  return found;
+}
+function countDomainFiles(root) {
+  return findFiles(root, (name) => name === "DOMAIN.md").length;
 }
 function warnIgnoredDomainFiles(root) {
   const count = countDomainFiles(root);
@@ -913,27 +1012,38 @@ function warnIgnoredDomainFiles(root) {
   }
   return count;
 }
+function warnLegacyBundleFiles(root) {
+  const files = findFiles(root, (name) => name.endsWith(".bundle.yaml"));
+  if (files.length > 0) {
+    const shown = files.slice(0, 5).map((f) => path23.relative(root, f) || f);
+    const more = files.length > shown.length ? `, +${files.length - shown.length} more` : "";
+    logWarn(
+      `${files.length} *.bundle.yaml file(s) are not scanned (the bundle kind became preset): ${shown.join(", ")}${more}. Run \`skaile migrate assets ${root} --write\` to rename them to *.preset.yaml. See ${LIBRARY_UPGRADE_DOCS}`
+    );
+  }
+  return files.length;
+}
 var DEFAULT_IMPORT_VERSION = "0.1.0";
 var DEFAULT_IMPORT_STAGE = "alpha";
 function claudeSkillRoots() {
   const roots = [];
   const override = process.env.SKAILE_CLAUDE_SKILLS_DIR;
   if (override) roots.push(override);
-  roots.push(path25.join(os.homedir(), ".claude", "skills"));
+  roots.push(path23.join(os.homedir(), ".claude", "skills"));
   return roots;
 }
 function resolveImportSource(nameOrPath) {
-  const asPath = path25.resolve(nameOrPath);
-  if (fs11.existsSync(asPath)) {
-    const dir = fs11.statSync(asPath).isDirectory() ? asPath : path25.dirname(asPath);
-    const skillFile = path25.join(dir, "SKILL.md");
-    if (fs11.existsSync(skillFile)) return { dir, skillFile, via: "path" };
+  const asPath = path23.resolve(nameOrPath);
+  if (fs9.existsSync(asPath)) {
+    const dir = fs9.statSync(asPath).isDirectory() ? asPath : path23.dirname(asPath);
+    const skillFile = path23.join(dir, "SKILL.md");
+    if (fs9.existsSync(skillFile)) return { dir, skillFile, via: "path" };
   }
-  if (!nameOrPath.includes(path25.sep) && !nameOrPath.startsWith(".")) {
+  if (!nameOrPath.includes(path23.sep) && !nameOrPath.startsWith(".")) {
     for (const root of claudeSkillRoots()) {
-      const dir = path25.join(root, nameOrPath);
-      const skillFile = path25.join(dir, "SKILL.md");
-      if (fs11.existsSync(skillFile)) return { dir, skillFile, via: "claude-skills" };
+      const dir = path23.join(root, nameOrPath);
+      const skillFile = path23.join(dir, "SKILL.md");
+      if (fs9.existsSync(skillFile)) return { dir, skillFile, via: "claude-skills" };
     }
   }
   return null;
@@ -989,15 +1099,16 @@ ${body}
 
 // cli/src/commands/asset-cmd.ts
 async function resolveDefByRef(library, ref, opts) {
-  const inScope = (d) => !opts?.fromLibraryId || d.libraryId === opts.fromLibraryId;
-  const direct = await library.getAssetDef(ref);
-  if (direct && inScope(direct)) return direct;
   let parsed;
   try {
     parsed = parseAssetRef(ref);
-  } catch {
-    return null;
+  } catch (err2) {
+    logErr(
+      `malformed asset ref '${ref}' \u2014 expected ${REF_HINT}: ${err2 instanceof Error ? err2.message : String(err2)}`
+    );
+    process.exit(1);
   }
+  const inScope = (d) => !opts?.fromLibraryId || d.libraryId === opts.fromLibraryId;
   const wantPublisher = parsed.publisher?.replace(/^@/, "");
   const defs = await library.listAssetDefs({ kind: parsed.kind });
   const matches = defs.filter(
@@ -1008,7 +1119,8 @@ async function resolveDefByRef(library, ref, opts) {
   return matches[0];
 }
 function withCanonicalRef(def) {
-  return { ref: catalogAssetRef(def), ...def };
+  const { id: _storageId, ...rest } = def;
+  return { ref: catalogAssetRef(def), ...rest };
 }
 function resolveLibraryOption(opts) {
   if (opts.library && opts.to && opts.library !== opts.to) {
@@ -1021,11 +1133,19 @@ function resolveLibraryOption(opts) {
 }
 function makeAssetCommand() {
   const cmd = new Command("asset").description("Author and install AI assets");
-  cmd.command("import <name-or-path>").description("Import + skailify an existing coding-agent skill into a library").option("--library <library>", "Target library (default: auto / personal)").addOption(new Option("--to <library>", "Alias for --library").hideHelp()).option("--version <semver>", "Version to stamp when the skill ships none").option("--stage <stage>", "Lifecycle stage to stamp (default: alpha)").option("--no-normalize", "Copy verbatim \u2014 skip frontmatter normalization").option(
+  cmd.command("import <name-or-path>").description("Import + skailify an existing coding-agent skill into a library").option("--library <library>", "Target library (default: auto / personal)").addOption(new Option("--to <library>", "Alias for --library").hideHelp()).addOption(removedDomainOption()).option("--version <semver>", "Version to stamp when the skill ships none").option("--stage <stage>", "Lifecycle stage to stamp (default: alpha)").option("--no-normalize", "Copy verbatim \u2014 skip frontmatter normalization").option(
     "--publisher <name>",
     "Publisher for the imported skill (default: the library's, else your store login)"
   ).option("--commit", "Auto-commit in git-backed libraries", false).action(
     async (nameOrPath, opts) => {
+      rejectRemovedDomainOption(opts);
+      if (opts.publisher !== void 0) {
+        const bare = opts.publisher.trim().replace(/^@/, "");
+        if (!isValidPublisher(bare)) {
+          logErr(`Invalid publisher "${opts.publisher}": ${PUBLISHER_HINT}.`);
+          process.exit(1);
+        }
+      }
       const src = resolveImportSource(nameOrPath);
       if (!src) {
         logErr(
@@ -1055,24 +1175,31 @@ function makeAssetCommand() {
           logErr(err2 instanceof Error ? err2.message : String(err2));
           process.exit(1);
         }
-        const rawSkill = fs11.readFileSync(src.skillFile, "utf8");
+        const rawSkill = fs9.readFileSync(src.skillFile, "utf8");
         const norm = opts.normalize ? normalizeSkillContent(rawSkill, {
-          fallbackName: path25.basename(src.dir),
+          fallbackName: path23.basename(src.dir),
           version: opts.version,
           stage: opts.stage
-        }) : { content: rawSkill, name: path25.basename(src.dir), changed: false, notes: [] };
+        }) : { content: rawSkill, name: path23.basename(src.dir), changed: false, notes: [] };
         if (!opts.normalize && !isValidAssetName(norm.name)) {
           logWarn(
             `Name "${norm.name}" is not canonical (kebab-case); \`skaile validate\` will reject this manifest entry. Drop --no-normalize to slugify it.`
           );
         }
-        const destDir = path25.join(target.path, norm.name);
-        if (fs11.existsSync(destDir)) {
+        const destDir = path23.join(target.path, norm.name);
+        if (fs9.existsSync(destDir)) {
           logErr(`Destination already exists: ${destDir}`);
           process.exit(1);
         }
-        fs11.cpSync(src.dir, destDir, { recursive: true });
-        fs11.writeFileSync(path25.join(destDir, "SKILL.md"), norm.content, "utf8");
+        const taken = conflictingAssetRoot(target.path, "skill", norm.name, norm.name);
+        if (taken) {
+          logErr(
+            `skill:${norm.name} already exists at "${taken}" \u2014 importing it again would re-point the manifest entry. Rename the skill first.`
+          );
+          process.exit(1);
+        }
+        fs9.cpSync(src.dir, destDir, { recursive: true });
+        fs9.writeFileSync(path23.join(destDir, "SKILL.md"), norm.content, "utf8");
         for (const note of norm.notes) logInfo(`  \u2022 ${note}`);
         const fm = parseFrontmatter(norm.content).data;
         for (const f of checkAgentSkillConformance(fm, { dirName: norm.name })) {
@@ -1105,13 +1232,14 @@ function makeAssetCommand() {
       }
     }
   );
-  cmd.command("migrate <path>").description("Move/copy/link a workspace asset into a library").option("--library <library>", "Target library (default: auto)").addOption(new Option("--to <library>", "Alias for --library").hideHelp()).option("--mode <mode>", "copy | move | link", "copy").option("--commit", "Auto-commit in git-backed libraries", false).action(
+  cmd.command("migrate <path>").description("Move/copy/link a workspace asset into a library").option("--library <library>", "Target library (default: auto)").addOption(new Option("--to <library>", "Alias for --library").hideHelp()).addOption(removedDomainOption()).option("--mode <mode>", "copy | move | link", "copy").option("--commit", "Auto-commit in git-backed libraries", false).action(
     async (srcPath, opts) => {
+      rejectRemovedDomainOption(opts);
       if (!["copy", "move", "link"].includes(opts.mode)) {
         logErr(`Invalid --mode "${opts.mode}". Expected: copy | move | link.`);
         process.exit(1);
       }
-      if (!fs11.existsSync(srcPath)) {
+      if (!fs9.existsSync(srcPath)) {
         logErr(`Source path does not exist: ${srcPath}`);
         process.exit(1);
       }
@@ -1137,29 +1265,29 @@ function makeAssetCommand() {
           );
           process.exit(1);
         }
-        const basename2 = path25.basename(srcPath);
+        const basename3 = path23.basename(srcPath);
         const destDir = target.path;
-        fs11.mkdirSync(destDir, { recursive: true });
-        const destPath = path25.join(destDir, basename2);
-        if (fs11.existsSync(destPath)) {
+        fs9.mkdirSync(destDir, { recursive: true });
+        const destPath = path23.join(destDir, basename3);
+        if (fs9.existsSync(destPath)) {
           logErr(`Destination already exists: ${destPath}`);
           process.exit(1);
         }
         switch (opts.mode) {
           case "copy":
-            fs11.cpSync(srcPath, destPath, { recursive: true });
+            fs9.cpSync(srcPath, destPath, { recursive: true });
             break;
           case "move":
-            fs11.renameSync(srcPath, destPath);
+            fs9.renameSync(srcPath, destPath);
             break;
           case "link":
-            fs11.symlinkSync(path25.resolve(srcPath), destPath);
+            fs9.symlinkSync(path23.resolve(srcPath), destPath);
             break;
         }
         if (target.backend === "git" && opts.commit) {
           const { spawnSync: spawnSync2 } = await import('child_process');
           spawnSync2("git", ["add", "--", destPath], { cwd: target.path, stdio: "inherit" });
-          const r = spawnSync2("git", ["commit", "-m", `skaile: migrate ${basename2}`], {
+          const r = spawnSync2("git", ["commit", "-m", `skaile: migrate ${basename3}`], {
             cwd: target.path,
             stdio: "inherit"
           });
@@ -1167,7 +1295,7 @@ function makeAssetCommand() {
             logWarn("Nothing committed (working tree clean or commit aborted).");
           }
         }
-        logOk(`Migrated ${basename2} \u2192 ${target.name} (${opts.mode})`);
+        logOk(`Migrated ${basename3} \u2192 ${target.name} (${opts.mode})`);
         if (opts.mode === "move") {
           logInfo("Source moved into the library \u2014 future edits modify the library copy.");
         } else if (opts.mode === "copy") {
@@ -1283,14 +1411,14 @@ function makeAuthCommand() {
 }
 function collectCacheTargets(scope) {
   const out = [];
-  out.push(path25__default.join(scope.projectDir, ".skaile", "cache"));
-  out.push(path25__default.join(scope.projectDir, ".skaile", "store-cache"));
-  out.push(path25__default.join(scope.projectDir, ".skaile", "repos"));
+  out.push(path23__default.join(scope.projectDir, ".skaile", "cache"));
+  out.push(path23__default.join(scope.projectDir, ".skaile", "store-cache"));
+  out.push(path23__default.join(scope.projectDir, ".skaile", "repos"));
   if (scope.global) {
     out.push(globalCacheRoot());
     const home = globalSkaileDir();
-    out.push(path25__default.join(home, "repos"));
-    out.push(path25__default.join(home, "catalog-cache"));
+    out.push(path23__default.join(home, "repos"));
+    out.push(path23__default.join(home, "catalog-cache"));
   }
   return out;
 }
@@ -1304,7 +1432,7 @@ function dirSize(target) {
 function dirSizeOfDir(dir) {
   let total = 0;
   for (const ent of readdirSync(dir, { withFileTypes: true })) {
-    const child = path25__default.join(dir, ent.name);
+    const child = path23__default.join(dir, ent.name);
     if (ent.isSymbolicLink()) continue;
     if (ent.isDirectory()) total += dirSizeOfDir(child);
     else if (ent.isFile()) total += statSync(child).size;
@@ -1330,7 +1458,7 @@ function makeCacheCommand() {
   const cmd = new Command("cache").description("Inspect and reclaim the re-derivable cache");
   cmd.command("clean").description("Remove the project cache (.skaile/cache); --global also clears ~/.skaile/cache").option("--global", "Also clear the global cache (sources + catalog) and legacy dirs").option("--dry-run", "Show what would be removed without doing it").option("-y, --yes", "Skip confirmation prompt").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
     const targets = collectCacheTargets({
-      projectDir: path25__default.resolve(opts.projectDir),
+      projectDir: path23__default.resolve(opts.projectDir),
       global: opts.global
     }).filter((t) => existsSync(t));
     if (targets.length === 0) {
@@ -1360,12 +1488,12 @@ function makeCacheCommand() {
     for (const r of removed) logOk(`Removed ${r}`);
   });
   cmd.command("dir").description("Print the resolved cache roots").option("--global", "Include the global cache root").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
-    console.log(path25__default.join(path25__default.resolve(opts.projectDir), ".skaile", "cache"));
+    console.log(path23__default.join(path23__default.resolve(opts.projectDir), ".skaile", "cache"));
     if (opts.global) console.log(globalCacheRoot());
   });
   cmd.command("size").description("Show cache disk usage per directory").option("--global", "Include the global cache").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
     const targets = collectCacheTargets({
-      projectDir: path25__default.resolve(opts.projectDir),
+      projectDir: path23__default.resolve(opts.projectDir),
       global: opts.global
     });
     console.log();
@@ -1381,7 +1509,7 @@ function makeCatalogCommand() {
   const catalog = new Command("catalog").description("Catalog source health and configuration");
   catalog.command("test").description("Probe the configured catalog source and report status").option("--project-dir <path>", "Project directory (for project-level config overlay)").option("--url <url>", "Override the catalog URL for this probe").option("--force", "Probe the network even in air-gapped mode (cache_ttl: 0)").action(async (opts) => {
     const { resolveConfig, isLocalCatalogUrl, trpcGetUrl } = await import('../library/index.js');
-    const projectDir = opts.projectDir ? path25__default.resolve(opts.projectDir) : void 0;
+    const projectDir = opts.projectDir ? path23__default.resolve(opts.projectDir) : void 0;
     const cfg = resolveConfig({ projectDir });
     const baseUrl = opts.url ?? cfg.catalog.url;
     if (isLocalCatalogUrl(baseUrl)) {
@@ -1399,7 +1527,7 @@ function makeCatalogCommand() {
   });
   catalog.command("info").description("Print the resolved catalog configuration (url, framing, cacheTtlMs)").option("--project-dir <path>", "Project directory (for project-level config overlay)").action(async (opts) => {
     const { resolveConfig } = await import('../library/index.js');
-    const projectDir = opts.projectDir ? path25__default.resolve(opts.projectDir) : void 0;
+    const projectDir = opts.projectDir ? path23__default.resolve(opts.projectDir) : void 0;
     const cfg = resolveConfig({ projectDir });
     console.log(`url: ${cfg.catalog.url}`);
     console.log(`framing: ${cfg.catalog.framing}`);
@@ -1408,7 +1536,7 @@ function makeCatalogCommand() {
   return catalog;
 }
 async function runLocalCatalogTest(projectDir) {
-  const { resolveCatalogSource } = await import('../open-library-4WUMQHES.js');
+  const { resolveCatalogSource } = await import('../open-library-OG457THY.js');
   let resolved;
   try {
     resolved = await resolveCatalogSource({ projectDir });
@@ -1548,29 +1676,20 @@ function libraryFlowEntries() {
 async function scanLibraryFlowEntries() {
   const entries = [];
   try {
-    const { LocalCatalogSource, LocalIndex, resolveIndexPath } = await import('../library/index.js');
+    const { LocalIndex, resolveIndexPath, scanAuthoringLibraries } = await import('../library/index.js');
     const indexPath = resolveIndexPath();
     if (!existsSync(indexPath)) return entries;
-    const [{ authoringLibraries }, { getKindRegistry: getKindRegistry2 }] = await Promise.all([
-      import('../open-library-4WUMQHES.js'),
-      import('../open-registry-NVPCQPND.js')
-    ]);
+    const { getKindRegistry: getKindRegistry2 } = await import('../open-registry-ZUZJ7MS7.js');
     const index = new LocalIndex({ indexPath });
     try {
-      const registry = getKindRegistry2();
-      for (const lib of authoringLibraries(await index.listSources())) {
-        if (!existsSync(lib.path)) continue;
-        try {
-          const { assets } = new LocalCatalogSource(index, lib.id, lib.path, registry).scan();
-          for (const asset of assets) {
-            if (asset.kind !== "flow") continue;
-            try {
-              const flow = loadFlow(asset.manifestPath);
-              if (flow.id) entries.push({ flow, path: asset.manifestPath });
-            } catch {
-            }
+      for (const { assets } of await scanAuthoringLibraries(index, getKindRegistry2())) {
+        for (const asset of assets) {
+          if (asset.kind !== "flow") continue;
+          try {
+            const flow = loadFlow(asset.manifestPath);
+            if (flow.id) entries.push({ flow, path: asset.manifestPath });
+          } catch {
           }
-        } catch {
         }
       }
     } finally {
@@ -1610,11 +1729,11 @@ function findSkills() {
   return deduped;
 }
 function walkSkills(dir, out) {
-  for (const entry of fs11__default.readdirSync(dir, { withFileTypes: true })) {
-    const full = path25__default.join(dir, entry.name);
+  for (const entry of fs9__default.readdirSync(dir, { withFileTypes: true })) {
+    const full = path23__default.join(dir, entry.name);
     if (entry.isDirectory()) {
-      const skillMd = path25__default.join(full, "SKILL.md");
-      if (fs11__default.existsSync(skillMd)) {
+      const skillMd = path23__default.join(full, "SKILL.md");
+      if (fs9__default.existsSync(skillMd)) {
         out.push({ name: entry.name, path: full, skillPath: skillMd });
       } else {
         walkSkills(full, out);
@@ -1635,10 +1754,10 @@ function resolveFlowIds() {
   }
 }
 function resolveSessionIds(projectDir) {
-  const sessionsDir = path25__default.join(projectDir, ".skaile", "sessions");
-  if (!fs11__default.existsSync(sessionsDir)) return [];
+  const sessionsDir = path23__default.join(projectDir, ".skaile", "sessions");
+  if (!fs9__default.existsSync(sessionsDir)) return [];
   try {
-    return fs11__default.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).map((f) => f.slice(0, -".json".length));
+    return fs9__default.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).map((f) => f.slice(0, -".json".length));
   } catch {
     return [];
   }
@@ -1777,7 +1896,7 @@ function printResolvedPathsSection(config) {
   console.log(`  ${S.label("prompts:".padEnd(16))} ${config.promptsDir ?? paths.promptsDir}`);
 }
 async function showConfig(opts) {
-  const projectDir = opts.projectDir ? path25__default.resolve(opts.projectDir) : process.cwd();
+  const projectDir = opts.projectDir ? path23__default.resolve(opts.projectDir) : process.cwd();
   let config;
   let wsDefaults;
   try {
@@ -1822,13 +1941,13 @@ function makeConfigCommand() {
   const cmd = new Command("config").description("Manage personal config (.skaile/settings.json)");
   cmd.command("show").description("Show effective config with sources").option("--project-dir <path>", "Project directory").action((opts) => showConfig(opts));
   cmd.command("get <key>").description("Get an effective config value").option("--project-dir <path>", "Project directory").action(async (key, opts) => {
-    const projectDir = opts.projectDir ? path25__default.resolve(opts.projectDir) : process.cwd();
+    const projectDir = opts.projectDir ? path23__default.resolve(opts.projectDir) : process.cwd();
     const config = await resolveSettings(projectDir);
     const value = config[key];
     console.log(value ?? S.dim("(not set)"));
   });
   cmd.command("set <key> <value>").description("Set a personal config value (driver, model, apiKey.<provider>)").option("--project-dir <path>", "Project directory").option("--global", "Write to ~/.skaile/settings.json instead of project-local").action(async (key, value, opts) => {
-    const projectDir = opts.projectDir ? path25__default.resolve(opts.projectDir) : process.cwd();
+    const projectDir = opts.projectDir ? path23__default.resolve(opts.projectDir) : process.cwd();
     if (key === "provider" || key === "cloud" || key === "cloudConfig") {
       logErr(
         `'${key}' is no longer a setting \u2014 an endpoint is an AI provider registry entry and a session selects one with a model reference.
@@ -2168,8 +2287,8 @@ function makeConnectorCommand() {
     async (driver, opts) => {
       const { installNpmPackages } = await import('../connectors/index.js');
       const { scanDirectory: scanDirectory2, factoryAssetRoots: factoryAssetRoots2, WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-      const projectDir = path25__default.resolve(opts.projectDir);
-      const yamlPath = path25__default.join(projectDir, "skaile.yaml");
+      const projectDir = path23__default.resolve(opts.projectDir);
+      const yamlPath = path23__default.join(projectDir, "skaile.yaml");
       if (!existsSync(yamlPath)) {
         logErr("No skaile.yaml found in current directory. Run 'skaile init' first.");
         process.exit(1);
@@ -2229,8 +2348,8 @@ ${installResult.output}`);
   );
   cmd.command("remove <id>").option("--project-dir <path>", "Workspace directory", process.cwd()).description("Remove a connector from skaile.yaml by its instance ID").action(async (id, opts) => {
     const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-    const projectDir = path25__default.resolve(opts.projectDir);
-    const yamlPath = path25__default.join(projectDir, "skaile.yaml");
+    const projectDir = path23__default.resolve(opts.projectDir);
+    const yamlPath = path23__default.join(projectDir, "skaile.yaml");
     if (!existsSync(yamlPath)) {
       logErr("No skaile.yaml found in current directory.");
       process.exit(1);
@@ -2247,7 +2366,7 @@ ${installResult.output}`);
   cmd.command("status [id]").option("--project-dir <path>", "Workspace directory", process.cwd()).description("Connect and report health status for one or all connectors").action(async (id, opts) => {
     const res = await import('../connectors/index.js');
     res.registerBuiltinConnectors();
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const declarations = res.loadConnectorDeclarations(projectDir);
     if (declarations.length === 0) {
       console.log("No connectors configured in skaile.yaml.");
@@ -2271,7 +2390,7 @@ ${installResult.output}`);
     await manager.disconnectAll();
   });
   cmd.command("list").description("List all configured connectors").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       console.log(JSON.stringify(manager.listConnectors(), null, 2));
@@ -2280,7 +2399,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("sync [id]").description("Re-sync a filesystem-face connector or all of them (git pull, S3 refresh, etc.)").option("--all", "Sync all connectors").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (opts.all) {
@@ -2304,7 +2423,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("ops <id>").description("List available operations for a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (!manager.has(id)) {
@@ -2319,7 +2438,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("read <id> <resource-path>").description("Read content from a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const content = await manager.read(id, resourcePath);
@@ -2329,7 +2448,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("write <id> <resource-path> <content>").description("Write content to a connector at a path").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, content, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       await manager.write(id, resourcePath, { data: content });
@@ -2339,7 +2458,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("entries <id> [resource-path]").description("List entries in a connector (files, keys, rows, etc)").option("--project-dir <path>", "Workspace directory", process.cwd()).option("--recursive", "Include nested entries").option("--limit <n>", "Maximum entries to return", parsePositiveIntOption).action(async (id, resourcePath, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const entries = await manager.list(id, resourcePath, {
@@ -2352,7 +2471,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("search <id> <query>").description("Search within a connector for matching content").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, query, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const results = await manager.search(id, query);
@@ -2362,7 +2481,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("delete <id> <resource-path>").description("Delete an entry from a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const ok = await manager.delete(id, resourcePath);
@@ -2372,7 +2491,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("run <id> <op> [args...]").description("Run a custom adapter operation (e.g. git log, sqlite query)").option("--project-dir <path>", "Workspace directory", process.cwd()).allowUnknownOption().action(async (id, op, args, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (!manager.has(id)) {
@@ -2481,7 +2600,7 @@ function envRecord() {
 async function buildDeployContext(projectDir) {
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
-  const workspaceId = config.name ?? path25__default.basename(projectDir);
+  const workspaceId = config.name ?? path23__default.basename(projectDir);
   let log;
   try {
     const { createLogger } = await import('../core/logging.js');
@@ -2513,13 +2632,13 @@ async function ensureTargetsRegistered(projectDir) {
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
   if (config.plugins && config.plugins.length > 0) {
-    const { ensurePluginsLoaded } = await import('../plugin-store-66QFBNEO.js');
+    const { ensurePluginsLoaded } = await import('../plugin-store-MPAMD5OT.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     for (const f of result.failed) logWarn(f.error);
   }
 }
 async function runUp(opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   await ensureTargetsRegistered(projectDir);
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const { resolveDeployTarget, pluginRegistry } = await import('../plugin-registry/index.js');
@@ -2587,7 +2706,7 @@ async function restoreFromHandle(projectDir) {
   return { target, handle, ctx };
 }
 async function runDown(opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   await restored.handle.stop();
@@ -2596,7 +2715,7 @@ async function runDown(opts) {
   logOk(`Stopped ${S.cmd(restored.target.id)} and cleared the handle.`);
 }
 async function runStatus(opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   const health = await restored.handle.health();
@@ -2610,7 +2729,7 @@ async function runStatus(opts) {
   console.log();
 }
 async function runLogs(opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   if (!restored.handle.logs) {
@@ -2636,7 +2755,7 @@ function makeDiffCommand() {
   return new Command("diff").description("Show changes between deployed and source versions").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
     const result = await am2.diff(ref);
     switch (result.status) {
@@ -2659,7 +2778,7 @@ function makeDiffCommand() {
 function makeFlowCommand() {
   const cmd = new Command("flow").description("Manage flows");
   cmd.command("list").description("List available flows").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const flows = await discoverFlowsWithLibraries(path25__default.resolve(opts.projectDir));
+    const flows = await discoverFlowsWithLibraries(path23__default.resolve(opts.projectDir));
     if (flows.length === 0) {
       logInfo("No flows found.");
       return;
@@ -2674,7 +2793,7 @@ function makeFlowCommand() {
     console.log();
   });
   cmd.command("show <id>").description("Show flow details and node graph").option("--project-dir <path>", "Project directory", process.cwd()).action(async (id, opts) => {
-    const flows = await discoverFlowsWithLibraries(path25__default.resolve(opts.projectDir));
+    const flows = await discoverFlowsWithLibraries(path23__default.resolve(opts.projectDir));
     const flow = flows.find((f) => f.id === id);
     if (!flow) {
       logErr(`Flow not found: ${id}`);
@@ -2708,7 +2827,7 @@ function makeHistoryCommand() {
   cmd.argument("[limit]", "Number of entries to show", "20").option("--project-dir <path>", "Project directory", process.cwd()).action((limitStr, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
     const limit = parseInt(limitStr, 10) || 20;
     const entries = am2.history(limit);
@@ -2731,7 +2850,7 @@ function makeHistoryCommand() {
   cmd.command("clear").description("Clear action history").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
     am2.clearHistory();
     logOk("History cleared.");
@@ -2745,7 +2864,7 @@ var MCP_SERVER_ENTRY = {
   env: {}
 };
 function pluginDir(projectDir) {
-  return path25__default.join(projectDir, ".claude", "plugins", "skaile");
+  return path23__default.join(projectDir, ".claude", "plugins", "skaile");
 }
 async function readJsonStrict(p6) {
   let raw;
@@ -2763,7 +2882,7 @@ async function readJsonStrict(p6) {
   }
 }
 async function writeJson(p6, value) {
-  await fs6.mkdir(path25__default.dirname(p6), { recursive: true });
+  await fs6.mkdir(path23__default.dirname(p6), { recursive: true });
   await fs6.writeFile(p6, `${JSON.stringify(value, null, 2)}
 `);
 }
@@ -2771,8 +2890,8 @@ async function copyDir(src, dest) {
   await fs6.mkdir(dest, { recursive: true });
   const entries = await fs6.readdir(src, { withFileTypes: true });
   for (const entry of entries) {
-    const srcPath = path25__default.join(src, entry.name);
-    const destPath = path25__default.join(dest, entry.name);
+    const srcPath = path23__default.join(src, entry.name);
+    const destPath = path23__default.join(dest, entry.name);
     if (entry.isDirectory()) await copyDir(srcPath, destPath);
     else await fs6.copyFile(srcPath, destPath);
   }
@@ -2781,14 +2900,14 @@ async function install(projectDir, opts) {
   return opts?.full ? installFullPlugin(projectDir) : installMcp(projectDir);
 }
 async function installMcp(projectDir) {
-  const mcpPath = path25__default.join(projectDir, ".claude", "mcp.json");
+  const mcpPath = path23__default.join(projectDir, ".claude", "mcp.json");
   const existing = await readJsonStrict(mcpPath) ?? {};
   const mcpServers = { ...existing.mcpServers ?? {} };
   const previous = mcpServers[SKAILE_MCP_NAME];
   const matches = previous && JSON.stringify(previous) === JSON.stringify(MCP_SERVER_ENTRY);
   let warning;
   if (previous && !matches) {
-    warning = `overwrote existing ${SKAILE_MCP_NAME} entry in ${path25__default.relative(projectDir, mcpPath)}`;
+    warning = `overwrote existing ${SKAILE_MCP_NAME} entry in ${path23__default.relative(projectDir, mcpPath)}`;
   }
   mcpServers[SKAILE_MCP_NAME] = MCP_SERVER_ENTRY;
   await writeJson(mcpPath, { ...existing, mcpServers });
@@ -2797,15 +2916,15 @@ async function installMcp(projectDir) {
 async function installFullPlugin(projectDir) {
   const dir = pluginDir(projectDir);
   for (const [rel, content] of Object.entries(buildClaudePluginFiles())) {
-    const dest = path25__default.join(dir, rel);
-    await fs6.mkdir(path25__default.dirname(dest), { recursive: true });
+    const dest = path23__default.join(dir, rel);
+    await fs6.mkdir(path23__default.dirname(dest), { recursive: true });
     await fs6.writeFile(dest, content);
   }
-  const projectSkillsDir = path25__default.join(projectDir, ".skaile", "skills");
+  const projectSkillsDir = path23__default.join(projectDir, ".skaile", "skills");
   if (existsSync(projectSkillsDir)) {
-    await copyDir(projectSkillsDir, path25__default.join(dir, "skills"));
+    await copyDir(projectSkillsDir, path23__default.join(dir, "skills"));
   }
-  const settingsPath = path25__default.join(projectDir, ".claude", "settings.json");
+  const settingsPath = path23__default.join(projectDir, ".claude", "settings.json");
   const settings = await readJsonStrict(settingsPath) ?? {};
   const plugins = settings.plugins ?? [];
   if (!plugins.includes(dir)) plugins.push(dir);
@@ -2813,8 +2932,8 @@ async function installFullPlugin(projectDir) {
   return { changed: true, method: "plugin" };
 }
 async function uninstall(projectDir) {
-  const settingsPath = path25__default.join(projectDir, ".claude", "settings.json");
-  const mcpPath = path25__default.join(projectDir, ".claude", "mcp.json");
+  const settingsPath = path23__default.join(projectDir, ".claude", "settings.json");
+  const mcpPath = path23__default.join(projectDir, ".claude", "mcp.json");
   const dir = pluginDir(projectDir);
   let changed = false;
   const settings = await readJsonStrict(settingsPath);
@@ -2848,12 +2967,12 @@ async function uninstall(projectDir) {
 async function detectInstall(projectDir) {
   const dir = pluginDir(projectDir);
   const settings = await readJsonStrict(
-    path25__default.join(projectDir, ".claude", "settings.json")
+    path23__default.join(projectDir, ".claude", "settings.json")
   );
-  if (existsSync(path25__default.join(dir, ".claude-plugin", "plugin.json")) && settings?.plugins?.includes(dir)) {
+  if (existsSync(path23__default.join(dir, ".claude-plugin", "plugin.json")) && settings?.plugins?.includes(dir)) {
     return { method: "plugin", pluginPath: dir };
   }
-  const mcp = await readJsonStrict(path25__default.join(projectDir, ".claude", "mcp.json"));
+  const mcp = await readJsonStrict(path23__default.join(projectDir, ".claude", "mcp.json"));
   if (mcp?.mcpServers && SKAILE_MCP_NAME in mcp.mcpServers) {
     return { method: "mcp" };
   }
@@ -2862,7 +2981,7 @@ async function detectInstall(projectDir) {
 async function enable(projectDir) {
   const detected = await detectInstall(projectDir);
   if (!detected) throw new Error("plugin not installed for claude-code");
-  const settingsPath = path25__default.join(projectDir, ".claude", "settings.json");
+  const settingsPath = path23__default.join(projectDir, ".claude", "settings.json");
   const settings = await readJsonStrict(settingsPath) ?? {};
   if (detected.method === "plugin") {
     const disabled2 = settings.disabledPlugins ?? [];
@@ -2884,7 +3003,7 @@ async function enable(projectDir) {
 async function disable(projectDir) {
   const detected = await detectInstall(projectDir);
   if (!detected) throw new Error("plugin not installed for claude-code");
-  const settingsPath = path25__default.join(projectDir, ".claude", "settings.json");
+  const settingsPath = path23__default.join(projectDir, ".claude", "settings.json");
   const settings = await readJsonStrict(settingsPath) ?? {};
   if (detected.method === "plugin") {
     const list2 = settings.disabledPlugins ?? [];
@@ -2904,12 +3023,12 @@ async function disable(projectDir) {
   return { changed: true };
 }
 async function status(projectDir) {
-  const settingsPath = path25__default.join(projectDir, ".claude", "settings.json");
-  const mcpPath = path25__default.join(projectDir, ".claude", "mcp.json");
+  const settingsPath = path23__default.join(projectDir, ".claude", "settings.json");
+  const mcpPath = path23__default.join(projectDir, ".claude", "mcp.json");
   const dir = pluginDir(projectDir);
   const settings = await readJsonStrict(settingsPath);
   const mcp = await readJsonStrict(mcpPath);
-  const pluginInstalled = !!(existsSync(path25__default.join(dir, ".claude-plugin", "plugin.json")) && settings?.plugins?.includes(dir));
+  const pluginInstalled = !!(existsSync(path23__default.join(dir, ".claude-plugin", "plugin.json")) && settings?.plugins?.includes(dir));
   const mcpInstalled = !!(mcp?.mcpServers && SKAILE_MCP_NAME in mcp.mcpServers);
   if (!pluginInstalled && !mcpInstalled) {
     return {
@@ -2927,7 +3046,7 @@ async function status(projectDir) {
       installed: "yes",
       enabled: disabled2 ? "no" : "yes",
       method: "plugin",
-      location: path25__default.relative(projectDir, dir)
+      location: path23__default.relative(projectDir, dir)
     };
   }
   const disabled = settings?.disabledMcpjsonServers?.includes(SKAILE_MCP_NAME) ?? false;
@@ -2936,7 +3055,7 @@ async function status(projectDir) {
     installed: "yes",
     enabled: disabled ? "no" : "yes",
     method: "mcp",
-    location: path25__default.relative(projectDir, mcpPath)
+    location: path23__default.relative(projectDir, mcpPath)
   };
 }
 var SKAILE_MCP_NAME2 = "skaile-workspace";
@@ -2963,7 +3082,7 @@ async function readConfig(p6) {
   }
 }
 async function writeConfig(p6, value) {
-  await fs6.mkdir(path25__default.dirname(p6), { recursive: true });
+  await fs6.mkdir(path23__default.dirname(p6), { recursive: true });
   const cleaned = {};
   for (const [k, v] of Object.entries(value)) {
     if (v === void 0) continue;
@@ -2972,7 +3091,7 @@ async function writeConfig(p6, value) {
   await fs6.writeFile(p6, stringify$1(cleaned));
 }
 function configPath(projectDir) {
-  return path25__default.join(projectDir, ".codex", "config.toml");
+  return path23__default.join(projectDir, ".codex", "config.toml");
 }
 async function install2(projectDir) {
   const p6 = configPath(projectDir);
@@ -2983,7 +3102,7 @@ async function install2(projectDir) {
   const matches = previous && JSON.stringify(previous) === JSON.stringify(next);
   let warning;
   if (previous && !matches) {
-    warning = `overwrote existing ${SKAILE_MCP_NAME2} entry in ${path25__default.relative(projectDir, p6)}`;
+    warning = `overwrote existing ${SKAILE_MCP_NAME2} entry in ${path23__default.relative(projectDir, p6)}`;
   }
   if (matches) return { changed: false, method: "toml" };
   servers[SKAILE_MCP_NAME2] = next;
@@ -3024,12 +3143,12 @@ async function status2(projectDir) {
     installed: "yes",
     enabled: "n/a",
     method: "mcp",
-    location: path25__default.relative(projectDir, p6)
+    location: path23__default.relative(projectDir, p6)
   };
 }
 async function install3(projectDir) {
-  const extDir = path25__default.join(projectDir, ".omp", "extensions");
-  const extPath = path25__default.join(extDir, "skaile.ts");
+  const extDir = path23__default.join(projectDir, ".omp", "extensions");
+  const extPath = path23__default.join(extDir, "skaile.ts");
   await fs6.mkdir(extDir, { recursive: true });
   const { WorkspacePlugin } = await import('../workspace-plugin/index.js');
   const plugin = new WorkspacePlugin({ projectDir });
@@ -3044,7 +3163,7 @@ async function install3(projectDir) {
   return { changed: true, method: "generated" };
 }
 async function uninstall3(projectDir) {
-  const extPath = path25__default.join(projectDir, ".omp", "extensions", "skaile.ts");
+  const extPath = path23__default.join(projectDir, ".omp", "extensions", "skaile.ts");
   try {
     await fs6.unlink(extPath);
     return { changed: true };
@@ -3053,14 +3172,14 @@ async function uninstall3(projectDir) {
   }
 }
 async function status3(projectDir) {
-  const extPath = path25__default.join(projectDir, ".omp", "extensions", "skaile.ts");
+  const extPath = path23__default.join(projectDir, ".omp", "extensions", "skaile.ts");
   if (existsSync(extPath)) {
     return {
       harness: "omp",
       installed: "yes",
       enabled: "n/a",
       method: "extension",
-      location: path25__default.relative(projectDir, extPath)
+      location: path23__default.relative(projectDir, extPath)
     };
   }
   return {
@@ -3123,7 +3242,7 @@ async function installCodex(projectDir) {
   console.log(`  ${S.dim("\u2192")} Restart Codex CLI to pick up the change.`);
 }
 async function runInstall(opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const targets = resolveDriver(opts.driver);
   let exitCode = 0;
   if (targets.includes("claude-code")) {
@@ -3157,7 +3276,7 @@ async function uninstallCodex(projectDir) {
   else logInfo(`codex: not installed`);
 }
 async function runUninstall(opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const targets = resolveDriver(opts.driver);
   let exitCode = 0;
   if (targets.includes("claude-code")) {
@@ -3200,7 +3319,7 @@ async function toggleTarget(t, projectDir, action3) {
   });
 }
 async function runToggle(opts, action3) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const requestedAll = opts.driver === "all";
   const targets = resolveDriver(opts.driver);
   const usageError = checkToggleSupported(targets, requestedAll, action3);
@@ -3212,7 +3331,7 @@ async function runToggle(opts, action3) {
   return exitCode;
 }
 async function runStatus2(opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const targets = resolveDriver(opts.driver);
   const rows = [];
   let exitCode = 0;
@@ -3283,7 +3402,7 @@ async function runHook(event) {
     await plugin.shutdown();
     return;
   }
-  const store = new PluginStore(path25__default.join(projectDir, ".skaile", "plugin-state.json"));
+  const store = new PluginStore(path23__default.join(projectDir, ".skaile", "plugin-state.json"));
   await store.load();
   const status4 = store.get("connector:status");
   if (status4 && typeof status4 === "object" && Object.keys(status4).length > 0) {
@@ -3347,6 +3466,98 @@ function exitOnSyncError(err2) {
   logErr(err2 instanceof Error ? err2.message : String(err2));
   process.exit(1);
 }
+var UNFINISHED_GIT_ENTRIES = {
+  MERGE_HEAD: "a merge in progress",
+  "rebase-merge": "a rebase in progress",
+  "rebase-apply": "a rebase in progress",
+  CHERRY_PICK_HEAD: "a cherry-pick in progress",
+  REVERT_HEAD: "a revert in progress"
+};
+function unfinishedGitState(dir) {
+  const unmerged = spawnSync("git", ["ls-files", "-u"], { cwd: dir, encoding: "utf-8" });
+  if (unmerged.status !== 0) return "the git index could not be read";
+  if (unmerged.stdout.trim() !== "") return "unmerged files";
+  for (const [entry, state2] of Object.entries(UNFINISHED_GIT_ENTRIES)) {
+    const p6 = spawnSync("git", ["rev-parse", "--git-path", entry], { cwd: dir, encoding: "utf-8" });
+    if (p6.status !== 0) return "the git directory could not be read";
+    if (fs9.existsSync(path23.resolve(dir, p6.stdout.trim()))) return state2;
+  }
+  return null;
+}
+async function reindexLibrary(lib, library, name) {
+  assertManifestEditableOrExit(lib.path);
+  const badRequires = manifestRequiresProblems(lib.path);
+  const resolved = resolveLibraryPublisherDetailed(lib, {}, getStoreIdentity());
+  warnLibraryNameFallback(name, resolved);
+  const { removed, unknownKind, skipped } = await syncManifestWithDisk(
+    lib.path,
+    resolved.publisher,
+    getKindRegistry()
+  );
+  const manifest = loadSkPublishManifest(lib.path);
+  for (const a of unknownKind) {
+    logWarn(
+      `Removed manifest entry ${a.kind}:${a.name}: the kind "${a.kind}" is not registered (removed or renamed in a newer release).`
+    );
+  }
+  for (const a of removed) {
+    const ref = manifest ? assetEntryRef(a, manifest) : `${a.kind}:${a.name}`;
+    logInfo(`Removed manifest entry ${ref} (root ${a.root} is gone)`);
+  }
+  for (const s of skipped.filter((x) => x.reason === "invalid-version")) {
+    logWarn(
+      `${s.kind}:${s.name} skipped: ${s.detail}. Set a valid \`metadata.version\` (e.g. 0.1.0) and re-run \`skaile library index ${name}\`.`
+    );
+  }
+  const duplicates = skipped.filter((x) => x.reason === "duplicate");
+  for (const s of duplicates) {
+    logErr(
+      `${s.kind}:${s.name} found in ${path23.dirname(s.file)} but ${s.detail}. Rename or delete one of the two directories, then re-run \`skaile library index ${name}\`.`
+    );
+  }
+  const duplicateFiles = new Set(duplicates.map((s) => path23.resolve(lib.path, s.file)));
+  const skippedKeys = new Set(
+    skipped.filter((s) => s.reason !== "duplicate").map((s) => `${s.kind}:${s.name}`)
+  );
+  const res = await indexLibrary(lib, library, {
+    exclude: (a) => skippedKeys.has(`${a.kind}:${a.name}`) || duplicateFiles.has(path23.resolve(a.manifestPath))
+  });
+  const unparsable = res.errors.filter((e) => e.includes("ManifestSchemaError:"));
+  for (const e of res.errors) (unparsable.includes(e) ? logErr : logWarn)(e);
+  const syncUnparsable = skipped.filter(
+    (s) => s.reason === "unparsable" && !unparsable.some((e) => e.includes(s.file))
+  );
+  for (const s of syncUnparsable) {
+    logErr(`${s.kind}:${s.name} skipped: manifest file ${s.file} could not be parsed.`);
+  }
+  for (const p6 of badRequires) logErr(`${p6.asset}: ${p6.message}`);
+  logOk(`Indexed ${res.assetsUpdated} asset(s) from ${name}.`);
+  warnIgnoredDomainFiles(lib.path);
+  warnLegacyBundleFiles(lib.path);
+  const skippedUnparsable = unparsable.length + syncUnparsable.length;
+  if (skippedUnparsable > 0) {
+    logErr(`${skippedUnparsable} asset(s) skipped: manifest could not be parsed.`);
+    process.exitCode = 1;
+  }
+  if (badRequires.length > 0) {
+    logErr(
+      `${badRequires.length} invalid requires entr${badRequires.length === 1 ? "y" : "ies"} ignored: use the \`kind:@<publisher>/name[#version]\` form.`
+    );
+    process.exitCode = 1;
+  }
+  if (duplicates.length > 0) {
+    logErr(
+      `${duplicates.length} asset(s) skipped: kind + name already registered in another directory.`
+    );
+    process.exitCode = 1;
+  }
+}
+async function indexPulledLibrary(lib, library, name) {
+  const res = await indexLibrary(lib, library);
+  for (const e of res.errors) logWarn(e);
+  logOk(`Indexed ${res.assetsUpdated} asset(s) from ${name}.`);
+  warnIgnoredDomainFiles(lib.path);
+}
 function assertManifestEditableOrExit(libraryPath) {
   try {
     assertManifestEditable(libraryPath);
@@ -3356,19 +3567,27 @@ function assertManifestEditableOrExit(libraryPath) {
 }
 async function assertLibraryPathFree(manager, dir, exceptId) {
   const clash = (await manager.listLibraries()).find(
-    (l) => l.id !== exceptId && path25.resolve(l.path) === dir
+    (l) => l.id !== exceptId && path23.resolve(l.path) === dir
   );
   if (clash) throw new Error(`${dir} is already registered as library "${clash.name}".`);
 }
 function canonicalDir(dir) {
-  const abs = path25.resolve(dir);
-  return fs11.existsSync(abs) ? fs11.realpathSync(abs) : abs;
+  const abs = path23.resolve(dir);
+  const missing = [];
+  let existing = abs;
+  while (!fs9.existsSync(existing)) {
+    const parent = path23.dirname(existing);
+    if (parent === existing) return abs;
+    missing.unshift(path23.basename(existing));
+    existing = parent;
+  }
+  return path23.join(fs9.realpathSync(existing), ...missing);
 }
 function refuseGlobalInstallFolder(name, dir) {
   const reserved = globalInstallDir();
-  const rel = path25.relative(canonicalDir(reserved), canonicalDir(dir));
-  const inside = rel === "" || !rel.startsWith("..") && !path25.isAbsolute(rel);
-  if (name === GLOBAL_INSTALL_DIR_NAME || inside) {
+  const rel = path23.relative(canonicalDir(reserved).toLowerCase(), canonicalDir(dir).toLowerCase());
+  const inside = rel === "" || !rel.startsWith("..") && !path23.isAbsolute(rel);
+  if (name?.toLowerCase() === GLOBAL_INSTALL_DIR_NAME || inside) {
     logErr(
       `"${GLOBAL_INSTALL_DIR_NAME}" is reserved: ${reserved} holds assets from \`skaile install\`, not a library you author.`
     );
@@ -3388,10 +3607,35 @@ function readOriginTracking(dir) {
 }
 function requireGitBackend(lib, verb) {
   if (lib.backend !== "git") {
-    logErr(`\`library ${verb}\` only applies to git-backed libraries.`);
+    logErr(
+      `\`library ${verb}\` only applies to git-backed libraries. Run \`skaile library link ${lib.name} <url>\` to attach a remote first.`
+    );
     process.exit(1);
   }
 }
+function requireValidLibraryName(name) {
+  try {
+    assertValidLibraryName(name);
+  } catch (err2) {
+    exitOnSyncError(err2);
+  }
+}
+var LOCAL_OWNERSHIP_REASON = "ownership only governs sync with a git remote, and a local library is always owned by you.";
+function pruneEmptyLibraryParents(libPath) {
+  const root = canonicalDir(resolveLibraryDir());
+  let dir = path23.dirname(path23.resolve(libPath));
+  for (; ; ) {
+    const rel = path23.relative(root, canonicalDir(dir));
+    if (rel === "" || rel.startsWith("..") || path23.isAbsolute(rel)) return;
+    if (!fs9.existsSync(dir) || fs9.readdirSync(dir).length > 0) return;
+    fs9.rmdirSync(dir);
+    dir = path23.dirname(dir);
+  }
+}
+async function warnIfNotGithubRemote(name, url) {
+  const { isGithubRemote, notGithubRemoteMessage } = await import('../library-publish-PICMDSB2.js');
+  if (!isGithubRemote(url)) logWarn(notGithubRemoteMessage(name, url));
+}
 function scaffoldLibraryFiles(dir, name) {
   const readme = `# ${name}
 
@@ -3421,9 +3665,9 @@ by the same ref.
   ];
   const written = [];
   for (const [file, content] of files) {
-    const target = path25.join(dir, file);
-    if (fs11.existsSync(target)) continue;
-    fs11.writeFileSync(target, content, "utf8");
+    const target = path23.join(dir, file);
+    if (fs9.existsSync(target)) continue;
+    fs9.writeFileSync(target, content, "utf8");
     written.push(file);
   }
   return written;
@@ -3486,22 +3730,23 @@ function makeLibraryCommand() {
   });
   cmd.command("init <name>").description("Create (or adopt) a library \u2014 default location ~/.skaile/libraries/<name>").option("--git <url>", "Initialize as a git library tracking <url>").option("--path <dir>", "Register the library at <dir> (created if missing) instead").option("--owner", "Mark as owner (the default)").option("--contributor", "Mark as contributor (needs --git or an existing git clone)").option("--reader", "Mark as reader (needs --git or an existing git clone)").action(
     async (name, opts) => {
+      requireValidLibraryName(name);
       const flagged = ["owner", "contributor", "reader"].filter((o) => opts[o]);
       if (flagged.length > 1) {
         logErr("Pick one of --owner, --contributor, --reader.");
         process.exit(1);
       }
       const ownership = flagged[0] ?? "owner";
-      const libPath = opts.path ? path25.resolve(opts.path) : path25.join(resolveLibraryDir(), name);
+      const libPath = opts.path ? path23.resolve(opts.path) : path23.join(resolveLibraryDir(), name);
       refuseGlobalInstallFolder(name, libPath);
-      if (fs11.existsSync(libPath) && !fs11.statSync(libPath).isDirectory()) {
+      if (fs9.existsSync(libPath) && !fs9.statSync(libPath).isDirectory()) {
         logErr(`${libPath} exists and is not a directory.`);
         process.exit(1);
       }
       const adopted = opts.git ? null : readOriginTracking(libPath);
       if (ownership !== "owner" && !opts.git && !adopted) {
         logErr(
-          `--${ownership} needs --git <url> or an existing git clone: ownership only governs sync with a git remote, and a local library is always owned by you.`
+          `--${ownership} needs --git <url> or an existing git clone: ${LOCAL_OWNERSHIP_REASON}`
         );
         process.exit(1);
       }
@@ -3522,15 +3767,17 @@ function makeLibraryCommand() {
               `Could not clone ${opts.git}; initialised an empty repo with that origin instead. git said: ${reason}`
             );
           }
+          await warnIfNotGithubRemote(name, opts.git);
+          trackOriginBranch(libPath, branch);
           backend = "git";
           backendConfig = { url: opts.git, branch, authHint: "ssh" };
         } else if (adopted) {
           backend = "git";
           backendConfig = { url: adopted.url, branch: adopted.branch, authHint: "ssh" };
         } else {
-          fs11.mkdirSync(libPath, { recursive: true });
+          fs9.mkdirSync(libPath, { recursive: true });
         }
-        const blank = fs11.readdirSync(libPath).every((entry) => entry === ".git");
+        const blank = fs9.readdirSync(libPath).every((entry) => entry === ".git");
         const isDefault = !hasDefault && ownership !== "reader";
         await manager.addLibrary({
           name,
@@ -3557,6 +3804,16 @@ function makeLibraryCommand() {
         }
         if (!blank) {
           const lib = await manager.requireLibrary(name);
+          const resolved = resolveLibraryPublisherDetailed(lib, {}, getStoreIdentity());
+          if (resolved.source === "manifest" && !isValidPublisher(resolved.publisher)) {
+            logWarn(
+              `${SKAILE_MANIFEST_FILENAME} declares publisher "${resolved.publisher}": ${PUBLISHER_HINT}. Fix it with \`skaile library set ${name} publisher=<name>\`.`
+            );
+          }
+          warnLibraryNameFallback(name, resolved);
+          if (resolved.source !== "manifest") {
+            stampManifestPublisher(lib.path, resolved.publisher);
+          }
           const res = await indexLibrary(lib, library);
           for (const e of res.errors) logWarn(e);
           logOk(`Indexed ${res.assetsUpdated} asset(s) from ${name}.`);
@@ -3580,29 +3837,42 @@ function makeLibraryCommand() {
         process.exit(1);
       }
       ensureGitRepo(lib.path, url, opts.branch);
+      trackOriginBranch(lib.path, opts.branch, { fetch: true });
       await manager.updateLibrary(name, {
         backend: "git",
         backendConfig: { url, branch: opts.branch, authHint: "ssh" }
       });
       logOk(`Library "${name}" linked to ${url}.`);
+      await warnIfNotGithubRemote(name, url);
     } catch (err2) {
       exitOnSyncError(err2);
     } finally {
       close();
     }
   });
-  cmd.command("create <kind> <name>").description("Scaffold a new asset inside the default (or named) library").addOption(
-    new Option("--kind <kind>", "Asset kind override").choices(getKindRegistry().getAllKinds())
-  ).option("--library <name>", "Target library (default: the default-marked one)").option("--dir <dir>", "Target directory inside the library (default: library root)").option("--publisher <name>", "Publisher for the new asset (default: the library's default)").option(
+  cmd.command("create <kind> <name>").description("Scaffold a new asset inside the default (or named) library").addOption(new Option("--kind <kind>", "Asset kind override").choices([...SCAFFOLD_KINDS])).addOption(removedDomainOption()).option("--library <name>", "Target library (default: the default-marked one)").option("--dir <dir>", "Target directory inside the library (default: library root)").option("--publisher <name>", "Publisher for the new asset (default: the library's default)").option(
     "--description <text>",
     "Description for the asset's frontmatter \u2014 say what it does and when to use it (default: a TODO placeholder `skaile validate` rejects)"
   ).action(
     async (kind, name, opts) => {
-      const registeredKinds = getKindRegistry().getAllKinds();
-      if (!registeredKinds.includes(kind)) {
-        logErr(`Unknown asset kind "${kind}". Expected: ${registeredKinds.join(", ")}.`);
+      rejectRemovedDomainOption(opts);
+      for (const k of [kind, opts.kind]) {
+        if (k !== void 0 && !SCAFFOLD_KINDS.includes(k)) {
+          logErr(`Cannot scaffold kind "${k}". Expected: ${SCAFFOLD_KINDS.join(", ")}.`);
+          process.exit(1);
+        }
+      }
+      if (!isValidAssetName(name)) {
+        logErr(`Invalid asset name "${name}": ${ASSET_NAME_HINT}.`);
         process.exit(1);
       }
+      if (opts.publisher !== void 0) {
+        const bare = opts.publisher.trim().replace(/^@/, "");
+        if (!isValidPublisher(bare)) {
+          logErr(`Invalid publisher "${opts.publisher}": ${PUBLISHER_HINT}.`);
+          process.exit(1);
+        }
+      }
       if (opts.description !== void 0) {
         const len = opts.description.trim().length;
         if (len === 0 || len > 1024) {
@@ -3616,7 +3886,25 @@ function makeLibraryCommand() {
         assertManifestEditableOrExit(target.path);
         const effectiveKind = opts.kind ?? kind;
         const am2 = new AssetManager({ registry: getKindRegistry(), projectDir: process.cwd() });
-        const destDir = opts.dir ? path25.join(target.path, opts.dir) : target.path;
+        const libRoot = path23.resolve(target.path);
+        const destDir = opts.dir ? path23.resolve(libRoot, opts.dir) : libRoot;
+        const relDest = path23.relative(libRoot, destDir);
+        if (relDest === ".." || relDest.startsWith(`..${path23.sep}`) || path23.isAbsolute(relDest)) {
+          logErr(`--dir "${opts.dir}" must stay inside the library (${libRoot}).`);
+          process.exit(1);
+        }
+        const taken = conflictingAssetRoot(
+          libRoot,
+          effectiveKind,
+          name,
+          path23.relative(libRoot, path23.join(destDir, name))
+        );
+        if (taken) {
+          logErr(
+            `${effectiveKind}:${name} already exists at "${taken}" \u2014 creating it again under "${path23.relative(libRoot, destDir) || "."}" would re-point the manifest entry. Pick another name.`
+          );
+          process.exit(1);
+        }
         const res = am2.create(name, effectiveKind, destDir, { description: opts.description });
         if (!res.ok) {
           logErr(res.path);
@@ -3661,38 +3949,48 @@ function makeLibraryCommand() {
       close();
     }
   });
+  async function renameLibrary(manager, lib, newName) {
+    requireValidLibraryName(newName);
+    if (await manager.getLibrary(newName)) {
+      logErr(`A library named "${newName}" is already registered.`);
+      process.exit(1);
+    }
+    const newPath = path23.join(path23.dirname(lib.path), newName);
+    refuseGlobalInstallFolder(newName, newPath);
+    if (fs9.existsSync(newPath)) {
+      logErr(`Target directory already exists: ${newPath}`);
+      process.exit(1);
+    }
+    fs9.renameSync(lib.path, newPath);
+    await manager.updateLibrary(lib.id, { name: newName, path: newPath });
+    logOk(`Renamed ${lib.name} \u2192 ${newName}`);
+  }
   cmd.command("rename <old> <new>").description("Rename a library (also moves the directory)").action(async (oldName, newName) => {
     const { manager, close } = await openLibraryManager();
     try {
-      const lib = await manager.requireLibrary(oldName);
-      const parent = path25.dirname(lib.path);
-      const newPath = path25.join(parent, newName);
-      refuseGlobalInstallFolder(newName, newPath);
-      if (fs11.existsSync(newPath)) {
-        logErr(`Target directory already exists: ${newPath}`);
-        process.exit(1);
-      }
-      fs11.renameSync(lib.path, newPath);
-      await manager.updateLibrary(lib.id, { name: newName, path: newPath });
-      logOk(`Renamed ${oldName} \u2192 ${newName}`);
+      await renameLibrary(manager, await manager.requireLibrary(oldName), newName);
+    } catch (err2) {
+      exitOnSyncError(err2);
     } finally {
       close();
     }
   });
   cmd.command("set <name> <field=value>").description(
-    "Update a single library field (ownership, isDefault, path, publisher, backendConfig.<key>)"
+    "Update a single library field (name, ownership, isDefault, path, publisher, backendConfig.<key>)"
   ).action(async (name, expr) => {
     const [field, ...rest] = expr.split("=");
+    if (field === "structure") {
+      logErr(DOMAIN_REMOVED_HINT);
+      process.exit(1);
+    }
     const value = rest.join("=");
     const { manager, library, close } = await openLibraryManager();
     try {
       const lib = await manager.requireLibrary(name);
       if (field === "publisher") {
         const publisher = value.trim().replace(/^@/, "");
-        if (!/^[^\s/#@]+$/.test(publisher)) {
-          logErr(
-            `Invalid publisher "${value}": expected a bare name like "acme" (no @, /, # or spaces).`
-          );
+        if (!isValidPublisher(publisher)) {
+          logErr(`Invalid publisher "${value}": ${PUBLISHER_HINT}.`);
           process.exit(1);
         }
         if (lib.ownership === "reader") {
@@ -3709,11 +4007,42 @@ function makeLibraryCommand() {
         return;
       }
       const patch = {};
-      if (field === "ownership") patch.ownership = value;
-      else if (field === "isDefault") patch.isDefault = value === "true";
-      else if (field === "path") {
-        const dir = path25.resolve(value);
-        if (!fs11.existsSync(dir) || !fs11.statSync(dir).isDirectory()) {
+      if (field === "name") {
+        await renameLibrary(manager, lib, value);
+        return;
+      }
+      if (field === "ownership") {
+        if (!LIBRARY_OWNERSHIPS.includes(value)) {
+          logErr(
+            `Invalid ownership "${value}": expected one of ${LIBRARY_OWNERSHIPS.join(", ")}.`
+          );
+          process.exit(1);
+        }
+        if (value !== "owner" && lib.backend !== "git") {
+          logErr(`ownership=${value} needs a git-backed library: ${LOCAL_OWNERSHIP_REASON}`);
+          process.exit(1);
+        }
+        patch.ownership = value;
+      } else if (field === "isDefault") {
+        if (value !== "true" && value !== "false") {
+          logErr(`Invalid isDefault "${value}": expected true or false.`);
+          process.exit(1);
+        }
+        if (value === "true") {
+          await manager.setDefault(lib.id);
+          logOk(`Updated ${name}.isDefault`);
+          return;
+        }
+        if (lib.isDefault) {
+          logErr(
+            `Library "${lib.name}" is the default; make another library the default with \`skaile library default <name>\` instead of unsetting it.`
+          );
+          process.exit(1);
+        }
+        patch.isDefault = false;
+      } else if (field === "path") {
+        const dir = path23.resolve(value);
+        if (!fs9.existsSync(dir) || !fs9.statSync(dir).isDirectory()) {
           logErr(`Directory does not exist: ${dir}. \`library set path=\` does not move files.`);
           process.exit(1);
         }
@@ -3722,6 +4051,10 @@ function makeLibraryCommand() {
         patch.path = dir;
       } else if (field.startsWith("backendConfig.")) {
         const key = field.split(".")[1];
+        if (key === "url" && lib.backend !== "git") {
+          logErr("backendConfig.url only applies to git-backed libraries.");
+          process.exit(1);
+        }
         if (key === "url" && lib.backend === "git") {
           const branch = lib.backendConfig.branch ?? "main";
           ensureGitRepo(lib.path, value, branch);
@@ -3743,6 +4076,10 @@ function makeLibraryCommand() {
     }
   });
   cmd.command("remove <name>").description("Unregister a library (use --purge to also delete files)").option("--purge", "Also delete the library directory from disk", false).option("-y, --yes", "Skip confirmation", false).action(async (name, opts) => {
+    if (!opts.yes && !process.stdin.isTTY) {
+      logErr("library remove needs confirmation: pass -y");
+      process.exit(1);
+    }
     const { manager, close } = await openLibraryManager();
     try {
       if (!opts.yes) {
@@ -3755,25 +4092,31 @@ function makeLibraryCommand() {
           return;
         }
       }
+      const lib = await manager.requireLibrary(name);
       await manager.removeLibrary(name, { purge: opts.purge });
+      if (opts.purge) pruneEmptyLibraryParents(lib.path);
       logOk(`Removed ${name}.`);
+    } catch (err2) {
+      exitOnSyncError(err2);
     } finally {
       close();
     }
   });
   cmd.command("sync <name>").description("Pull then push (as backend permits)").action(async (name) => {
-    const { manager, close } = await openLibraryManager();
+    const { manager, library, close } = await openLibraryManager();
     try {
       const lib = await manager.requireLibrary(name);
       requireGitBackend(lib, "sync");
       const drv = manager.driverFor(lib.backend);
       const pull = await drv.pull(lib);
+      if (pull.conflicts.length > 0) exitOnSyncError(new Error(pull.conflicts[0].reason));
       logInfo(`Pulled: applied=${pull.applied}, conflicts=${pull.conflicts.length}`);
       if (lib.ownership === "owner") {
         const push = await drv.push(lib);
         logInfo(`Pushed: ${push.pushed}`);
       }
       await manager.updateLibrary(name, { lastSyncAt: /* @__PURE__ */ new Date() });
+      if (pull.applied > 0) await indexPulledLibrary(lib, library, name);
       logOk(`Synced ${name}.`);
     } catch (err2) {
       exitOnSyncError(err2);
@@ -3785,40 +4128,22 @@ function makeLibraryCommand() {
     const { manager, library, close } = await openLibraryManager();
     try {
       const lib = await manager.requireLibrary(name);
-      assertManifestEditableOrExit(lib.path);
-      const removed = await syncManifestWithDisk(
-        lib.path,
-        resolveLibraryPublisher(lib, {}, getStoreIdentity()),
-        getKindRegistry()
-      );
-      const manifest = loadSkPublishManifest(lib.path);
-      for (const a of removed) {
-        const ref = manifest ? assetEntryRef(a, manifest) : `${a.kind}:${a.name}`;
-        logInfo(`Removed manifest entry ${ref} (root ${a.root} is gone)`);
-      }
-      const res = await indexLibrary(lib, library);
-      const unparsable = res.errors.filter((e) => e.includes("ManifestSchemaError:"));
-      for (const e of res.errors) (unparsable.includes(e) ? logErr : logWarn)(e);
-      logOk(`Indexed ${res.assetsUpdated} asset(s) from ${name}.`);
-      warnIgnoredDomainFiles(lib.path);
-      if (unparsable.length > 0) {
-        logErr(`${unparsable.length} asset(s) skipped: manifest could not be parsed.`);
-        process.exitCode = 1;
-      }
+      await reindexLibrary(lib, library, name);
     } finally {
       close();
     }
   });
   cmd.command("pull <name>").description("Pull from remote").action(async (name) => {
-    const { manager, close } = await openLibraryManager();
+    const { manager, library, close } = await openLibraryManager();
     try {
       const lib = await manager.requireLibrary(name);
       requireGitBackend(lib, "pull");
       const res = await manager.driverFor(lib.backend).pull(lib);
       if (res.conflicts.length > 0) {
-        logWarn(`Conflicts: ${res.conflicts.map((c) => c.path).join(", ")}`);
+        exitOnSyncError(new Error(res.conflicts[0].reason));
       } else {
         logOk(`Pulled ${res.applied} change(s).`);
+        if (res.applied > 0) await indexPulledLibrary(lib, library, name);
       }
     } catch (err2) {
       exitOnSyncError(err2);
@@ -3862,6 +4187,13 @@ function makeLibraryCommand() {
         );
         process.exit(1);
       }
+      const unfinished = unfinishedGitState(lib.path);
+      if (unfinished) {
+        logErr(
+          `library commit refused: ${unfinished} in ${lib.path}. Resolve the conflicts (\`skaile library git ${name} status\`), finish or abort the rebase/merge, then commit again.`
+        );
+        process.exit(1);
+      }
       const add = spawnSync("git", ["add", "-A"], { cwd: lib.path, stdio: "inherit" });
       if (add.status !== 0) {
         logErr(`git add failed in ${lib.path}.`);
@@ -3916,16 +4248,16 @@ function makeLibraryCommand() {
     "With --create-repo: create the repo private (the store only accepts public repos)"
   ).option("--ref <gitref>", "Git ref to ingest (default: the library branch or main)").option("--dry-run", "Print the plan; push nothing and call no store endpoint").action(
     async (lib, opts) => {
-      const { runLibraryPublish } = await import('../library-publish-LFOJJVMK.js');
+      const { runLibraryPublish } = await import('../library-publish-PICMDSB2.js');
       await withStoreErrorHandling(() => runLibraryPublish(lib, opts));
     }
   );
   cmd.command("register <lib>").description("Register the library's manifest without pushing (bytes already on github)").option("--asset <ref>", "Publish only the single asset matching this ref/name").option("--ref <gitref>", "Git ref to ingest (default: the library branch or main)").option("--dry-run", "Print the plan; call no store endpoint").action(async (lib, opts) => {
-    const { runLibraryRegister } = await import('../library-publish-LFOJJVMK.js');
+    const { runLibraryRegister } = await import('../library-publish-PICMDSB2.js');
     await withStoreErrorHandling(() => runLibraryRegister(lib, opts));
   });
   cmd.command("yank <lib>").description("Retract the library's published assets from the store").option("--asset <ref>", "Yank only the single asset matching this ref/name").action(async (lib, opts) => {
-    const { runLibraryYank } = await import('../library-publish-LFOJJVMK.js');
+    const { runLibraryYank } = await import('../library-publish-PICMDSB2.js');
     await withStoreErrorHandling(() => runLibraryYank(lib, opts));
   });
   return cmd;
@@ -3976,9 +4308,9 @@ async function printOverallStatus(projectDir, asJson) {
     } catch {
       secretsStrategy = "unavailable";
     }
-    const resolvedProjectDir = path25.resolve(projectDir);
-    const hasWorkspaceConfig = existsSync(path25.join(resolvedProjectDir, "skaile.yaml"));
-    const hasLockFile = existsSync(path25.join(resolvedProjectDir, "skaile.lock.yaml"));
+    const resolvedProjectDir = path23.resolve(projectDir);
+    const hasWorkspaceConfig = existsSync(path23.join(resolvedProjectDir, "skaile.yaml"));
+    const hasLockFile = existsSync(path23.join(resolvedProjectDir, "skaile.lock.yaml"));
     let assignments = [];
     if (hasWorkspaceConfig) {
       try {
@@ -4585,13 +4917,18 @@ function scheduleSoftDepPreview() {
 }
 async function loadAssets() {
   softDepPreviewCache.clear();
-  const { gatherAssetFeeds } = await import('../asset-feeds-LU7NHOAP.js');
+  const { gatherAssetFeeds } = await import('../asset-feeds-EYRZR4K5.js');
   const { entries, notes } = await gatherAssetFeeds(am, am.projectDir);
   if (notes.length > 0) {
     state.message = notes.map((n) => `[${n.feed}] ${n.message}`).join(" \u2022 ");
   }
   const installed = new Set(am.listDeployed().map((e) => `${e.kind}:${e.name}`));
-  const rows = buildAssetRows(entries, installed);
+  let lock = null;
+  try {
+    lock = readLock(path23__default.join(am.projectDir, "skaile.lock.yaml"));
+  } catch {
+  }
+  const rows = buildAssetRows(entries, installed, lockedLibraryByIdentity(lock));
   state.assetRows = rows;
   reconcileCollapsedSets(rows);
   rebuildVisible();
@@ -4605,7 +4942,7 @@ function rebuildSourceTree() {
   rebuildVisibleSources();
 }
 function sourceOrgRepo(s) {
-  const parts = s.path.split(path25__default.sep).filter(Boolean);
+  const parts = s.path.split(path23__default.sep).filter(Boolean);
   if (parts.length < 2) return null;
   return { org: parts[parts.length - 2], repo: parts[parts.length - 1] };
 }
@@ -4678,7 +5015,22 @@ function rebuildVisibleLibraries() {
   );
   clampCursor();
 }
-function buildAssetRows(entries, installed) {
+function lockedLibraryByIdentity(lock) {
+  const out = /* @__PURE__ */ new Map();
+  for (const [key, locked] of Object.entries(lock?.assets ?? {})) {
+    if (!locked.library) continue;
+    const ref = parseAssetRefLoose(key);
+    if (ref?.publisher) out.set(`${ref.kind}:${ref.publisher}/${ref.name}`, locked.library.name);
+  }
+  return out;
+}
+function isRowInstalled(origin, group, entry, installed, lockedLibrary) {
+  if (!installed.has(`${entry.kind}:${entry.name}`)) return false;
+  const publisher = entry.publisher?.replace(/^@/, "");
+  const locked = publisher ? lockedLibrary.get(`${entry.kind}:${publisher}/${entry.name}`) : void 0;
+  return locked === void 0 || origin === "library" && group === locked;
+}
+function buildAssetRows(entries, installed, lockedLibrary = /* @__PURE__ */ new Map()) {
   const byOrigin = /* @__PURE__ */ new Map();
   for (const { origin, entry, group } of entries) {
     const publisher = group || entry.publisher || "other";
@@ -4706,7 +5058,7 @@ function buildAssetRows(entries, installed) {
             source: group,
             org: entry.repo?.includes("/") ? entry.repo.slice(0, entry.repo.indexOf("/")) : void 0,
             entry,
-            installed: installed.has(`${entry.kind}:${entry.name}`),
+            installed: isRowInstalled(origin, group, entry, installed, lockedLibrary),
             plugin
           });
         }
@@ -4752,13 +5104,13 @@ function reconcileCollapsedSets(rows) {
 async function loadSourcesAndLibraries() {
   try {
     const [{ openLibraryManager: openLibraryManager2 }, { getGlobalCacheDir: getGlobalCacheDir2, globalSkaileDir: globalSkaileDir2 }] = await Promise.all([
-      import('../open-library-4WUMQHES.js'),
+      import('../open-library-OG457THY.js'),
       import('../core/index.js')
     ]);
     const { manager, library, close } = await openLibraryManager2();
     try {
       const newRoot = getGlobalCacheDir2();
-      const legacyRoot = path25__default.join(globalSkaileDir2(), "sources");
+      const legacyRoot = path23__default.join(globalSkaileDir2(), "sources");
       const isSourceRow = (l) => l.path.startsWith(newRoot) || l.path.startsWith(legacyRoot);
       const libs = await manager.listLibraries();
       const defs = await library.listAssetDefs();
@@ -5125,12 +5477,21 @@ async function applyChanges() {
   render();
   let added = 0;
   let removed = 0;
+  let pruned = 0;
   const appliedAdds = [];
   const appliedRemoves = [];
   for (const ref of state.pendingRemoves) {
-    if (am.remove(ref)) {
-      removed++;
-      appliedRemoves.push(ref);
+    try {
+      const result = await am.removeWithDependencies(ref);
+      if (result.changed) {
+        removed++;
+        pruned += result.pruned.length;
+        appliedRemoves.push(ref);
+      }
+    } catch (err2) {
+      state.message = pc5.red(
+        `Failed to remove ${ref}: ${err2 instanceof Error ? err2.message : err2}`
+      );
     }
   }
   for (const ref of state.pendingAdds) {
@@ -5148,6 +5509,7 @@ async function applyChanges() {
   const parts = [];
   if (added > 0) parts.push(pc5.green(`+${added} added`));
   if (removed > 0) parts.push(pc5.red(`-${removed} removed`));
+  if (pruned > 0) parts.push(pc5.red(`-${pruned} no longer required`));
   const softDeps = appliedAdds.length > 0 ? await am.reportSoftDeps(appliedAdds) : [];
   if (softDeps.length > 0) {
     parts.push(pc5.dim(`${softDeps.length} soft dep${softDeps.length === 1 ? "" : "s"} referenced`));
@@ -5187,7 +5549,10 @@ async function showInfo() {
   console.log(`  installed:   ${row.installed ? pc5.green("yes") : pc5.red("no")}`);
   if (e.requires.length) {
     console.log(`  requires:`);
-    for (const d of e.requires) console.log(`    ${kindColor(d.kind)}:${d.name}`);
+    for (const d of e.requires) {
+      const scope = d.publisher ? `@${d.publisher}/` : "";
+      console.log(`    ${kindColor(d.kind)}:${scope}${d.name}`);
+    }
   }
   if (e.dependencies.length) {
     console.log(`  dependencies:`);
@@ -5694,7 +6059,7 @@ async function run(projectDir) {
 }
 function makeManageCommand() {
   return new Command("manage").description("Interactive TUI for managing assets, sources, and libraries").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    await run(path25__default.resolve(opts.projectDir));
+    await run(path23__default.resolve(opts.projectDir));
   });
 }
 function makeMcpServerCommand() {
@@ -5747,10 +6112,10 @@ function walkFiles(root, match) {
       return;
     }
     for (const entry of entries) {
-      const full = path25__default.join(dir, entry.name);
+      const full = path23__default.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (SKIPPED_DIRS.has(entry.name)) continue;
-        if (entry.name === "cache" && path25__default.basename(dir) === ".skaile") continue;
+        if (entry.name === "cache" && path23__default.basename(dir) === ".skaile") continue;
         visit(full);
       } else if (entry.isFile() && match(entry.name)) {
         out.push(full);
@@ -5768,14 +6133,14 @@ function applyChanges2(changes) {
     switch (change.type) {
       case "write":
       case "create":
-        mkdirSync(path25__default.dirname(change.path), { recursive: true });
+        mkdirSync(path23__default.dirname(change.path), { recursive: true });
         writeFileSync(change.path, change.after, "utf-8");
         break;
       case "delete":
         rmSync(change.path, { force: true });
         break;
       case "move":
-        mkdirSync(path25__default.dirname(change.to), { recursive: true });
+        mkdirSync(path23__default.dirname(change.to), { recursive: true });
         writeFileSync(change.to, change.after, "utf-8");
         rmSync(change.from, { force: true });
         break;
@@ -5868,7 +6233,7 @@ function unifiedDiff(before, after, oldLabel, newLabel, context = 3) {
   return `${out.join("\n")}
 `;
 }
-var posix = (p6) => p6.split(path25__default.sep).join("/");
+var posix = (p6) => p6.split(path23__default.sep).join("/");
 function colorizeDiff(diff) {
   return diff.split("\n").map((line) => {
     if (line.startsWith("+++") || line.startsWith("---")) return S.bold(line);
@@ -5879,7 +6244,7 @@ function colorizeDiff(diff) {
   }).join("\n");
 }
 function renderChange(change, base) {
-  const rel = (p6) => posix(path25__default.relative(base, p6) || path25__default.basename(p6));
+  const rel = (p6) => posix(path23__default.relative(base, p6) || path23__default.basename(p6));
   switch (change.type) {
     case "write":
       return unifiedDiff(
@@ -5906,7 +6271,7 @@ ${diff}`;
   }
 }
 function changeLabel(change, base) {
-  const rel = (p6) => posix(path25__default.relative(base, p6) || path25__default.basename(p6));
+  const rel = (p6) => posix(path23__default.relative(base, p6) || path23__default.basename(p6));
   switch (change.type) {
     case "write":
       return `modify ${rel(change.path)}`;
@@ -5966,10 +6331,10 @@ function loadAsset(projectDir, id, ref) {
       )
     };
   }
-  const manifestPath = path25__default.join(dir, AGENT_MANIFEST_FILE);
+  const manifestPath = path23__default.join(dir, AGENT_MANIFEST_FILE);
   let text;
   try {
-    text = fs11__default.readFileSync(manifestPath, "utf-8");
+    text = fs9__default.readFileSync(manifestPath, "utf-8");
   } catch {
     return {
       diagnostic: err(
@@ -6148,12 +6513,12 @@ function findManifestCandidates(rootPath) {
   function walk(dir) {
     let entries;
     try {
-      entries = fs11__default.readdirSync(dir, { withFileTypes: true });
+      entries = fs9__default.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const entry of entries) {
-      const fullPath = path25__default.join(dir, entry.name);
+      const fullPath = path23__default.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!SKIP_DIRS.has(entry.name)) walk(fullPath);
       } else if (entry.isFile()) {
@@ -6189,16 +6554,16 @@ function checkManifestIdentity(kind, parsed) {
   return null;
 }
 function parseManifestCandidate(c, absRoot) {
-  const content = fs11__default.readFileSync(c.filePath, "utf-8");
+  const content = fs9__default.readFileSync(c.filePath, "utf-8");
   const res = parseManifestFile(c.filePath, content);
   if (!res.ok) {
-    logErr(`${path25__default.relative(absRoot, c.filePath)} [${c.kind}] \u2014 parse error: ${res.reason}`);
+    logErr(`${path23__default.relative(absRoot, c.filePath)} [${c.kind}] \u2014 parse error: ${res.reason}`);
     return { kind: "error" };
   }
   return {
     kind: "value",
     parsed: res.data,
-    body: c.filePath.endsWith(".md") ? parseFrontmatter(content).body : void 0
+    body: readAssetBody(c.filePath, content)
   };
 }
 var PSEUDO_COMPOSE_KINDS = /* @__PURE__ */ new Set(["soul"]);
@@ -6222,7 +6587,7 @@ function checkComposeKinds(parsed, registry) {
   return diagnostics;
 }
 function validateManifestCandidate(c, parsed, body, absRoot, registry, strictConformance) {
-  const relPath = path25__default.relative(absRoot, c.filePath);
+  const relPath = path23__default.relative(absRoot, c.filePath);
   let errors = 0;
   let warnings = 0;
   const identityError = checkManifestIdentity(c.kind, parsed);
@@ -6230,9 +6595,15 @@ function validateManifestCandidate(c, parsed, body, absRoot, registry, strictCon
     logErr(`${relPath} [${c.kind}] \u2014 ${identityError}`);
     errors++;
   }
-  if (c.kind === "skill" && parsed && typeof parsed === "object") {
-    const dirName = path25__default.basename(path25__default.dirname(c.filePath));
-    for (const f of checkSkillManifest(parsed, body, dirName)) {
+  if (parsed && typeof parsed === "object") {
+    const manifest = parsed;
+    const version = declaredVersion(manifest);
+    if (version !== void 0 && !isValidSemver(version)) {
+      logErr(`${relPath} [${c.kind}] \u2014 version "${version}" is not valid semver`);
+      errors++;
+    }
+    const dirName = path23__default.basename(path23__default.dirname(c.filePath));
+    for (const f of checkAssetManifest(c.kind, manifest, body, dirName)) {
       const line = `${relPath} [${f.tag}] \u2014 ${f.text}`;
       if (f.conformance && strictConformance) {
         logErr(line);
@@ -6243,7 +6614,7 @@ function validateManifestCandidate(c, parsed, body, absRoot, registry, strictCon
       }
     }
   }
-  if (c.kind === "agent" && path25__default.basename(c.filePath) === "agent.yaml") {
+  if (c.kind === "agent" && path23__default.basename(c.filePath) === "agent.yaml") {
     for (const d of [
       ...checkComposeKinds(parsed, registry),
       ...composeSlotDiagnostics(parsed),
@@ -6274,8 +6645,8 @@ function validateManifestCandidate(c, parsed, body, absRoot, registry, strictCon
   return { errors, warnings };
 }
 function validateManifests(rootPath, strictConformance) {
-  const absRoot = path25__default.resolve(rootPath);
-  if (!fs11__default.existsSync(absRoot)) {
+  const absRoot = path23__default.resolve(rootPath);
+  if (!fs9__default.existsSync(absRoot)) {
     logErr(`Path does not exist: ${absRoot}`);
     return { total: 0, errors: 1, warnings: 0 };
   }
@@ -6283,6 +6654,7 @@ function validateManifests(rootPath, strictConformance) {
   const candidates = findManifestCandidates(absRoot);
   let errors = 0;
   let warnings = 0;
+  const seenIdentity = /* @__PURE__ */ new Map();
   for (const c of candidates) {
     const parseResult = parseManifestCandidate(c, absRoot);
     if (parseResult.kind === "error") {
@@ -6299,6 +6671,21 @@ function validateManifests(rootPath, strictConformance) {
     );
     errors += delta.errors;
     warnings += delta.warnings;
+    const obj = parseResult.parsed;
+    const identity = obj && typeof obj === "object" ? obj[c.kind === "flow" ? "id" : "name"] : null;
+    if (typeof identity === "string" && identity.length > 0) {
+      const dir = path23__default.dirname(c.filePath);
+      const key = `${c.kind}:${identity}`;
+      const first = seenIdentity.get(key);
+      if (first === void 0) {
+        seenIdentity.set(key, dir);
+      } else if (first !== dir) {
+        logErr(
+          `${path23__default.relative(absRoot, c.filePath)} [${c.kind}] \u2014 ${key} is also defined in ${path23__default.relative(absRoot, first) || "."}; two directories cannot share a kind and name (\`skaile library index\` keeps only the first).`
+        );
+        errors++;
+      }
+    }
   }
   return { total: candidates.length, errors, warnings };
 }
@@ -6307,12 +6694,12 @@ function findWorkspaceManifests(rootPath) {
   function walk(dir) {
     let entries;
     try {
-      entries = fs11__default.readdirSync(dir, { withFileTypes: true });
+      entries = fs9__default.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const entry of entries) {
-      const full = path25__default.join(dir, entry.name);
+      const full = path23__default.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!SKIP_DIRS.has(entry.name)) walk(full);
       } else if (entry.isFile() && /(^|\.)skaile\.yaml$/.test(entry.name)) {
@@ -6375,14 +6762,14 @@ function validateWorkspaceAssets(parsed, relPath) {
   return errors;
 }
 function validateWorkspaceManifests(rootPath) {
-  const absRoot = path25__default.resolve(rootPath);
+  const absRoot = path23__default.resolve(rootPath);
   const files = findWorkspaceManifests(absRoot);
   let errors = 0;
   for (const file of files) {
-    const relPath = path25__default.relative(absRoot, file);
+    const relPath = path23__default.relative(absRoot, file);
     let parsed;
     try {
-      parsed = parse(fs11__default.readFileSync(file, "utf-8")) ?? {};
+      parsed = parse(fs9__default.readFileSync(file, "utf-8")) ?? {};
     } catch (e) {
       logErr(`${relPath} \u2014 parse error: ${e instanceof Error ? e.message : String(e)}`);
       errors++;
@@ -6390,7 +6777,7 @@ function validateWorkspaceManifests(rootPath) {
     }
     errors += validateWorkspaceRefs(collectWorkspaceRefFields(parsed), relPath);
     errors += validateWorkspaceAssets(parsed, relPath);
-    for (const d of checkAgentInstances(path25__default.dirname(file), parsed)) {
+    for (const d of checkAgentInstances(path23__default.dirname(file), parsed)) {
       const line = `${relPath} [agents] \u2014 ${d.code}: ${d.path ? `${d.path}: ` : ""}${d.message}`;
       if (d.severity === "error") {
         logErr(line);
@@ -6403,7 +6790,7 @@ function validateWorkspaceManifests(rootPath) {
   return { total: files.length, errors };
 }
 function validatePublishManifestRoots(rootPath) {
-  const absRoot = path25__default.resolve(rootPath);
+  const absRoot = path23__default.resolve(rootPath);
   const manifest = loadSkPublishManifest(absRoot);
   if (!manifest) return 0;
   const missing = missingRootAssets(absRoot, manifest);
@@ -6414,99 +6801,133 @@ function validatePublishManifestRoots(rootPath) {
   }
   return missing.length;
 }
+function validatePublishManifestRequires(rootPath) {
+  const problems = manifestRequiresProblems(path23__default.resolve(rootPath));
+  for (const p6 of problems) {
+    logErr(
+      `${SKAILE_MANIFEST_FILENAME} [assets] \u2014 ${p6.asset}: ${p6.message}. Use the \`kind:@<publisher>/name[#version]\` form.`
+    );
+  }
+  return problems.length;
+}
+function validatePublishManifestVersions(rootPath) {
+  const absRoot = path23__default.resolve(rootPath);
+  const manifest = loadSkPublishManifest(absRoot);
+  if (!manifest || manifest.source) return 0;
+  let warnings = 0;
+  for (const a of manifest.assets ?? []) {
+    if (!a.root || a.source || !a.version) continue;
+    const file = findAssetManifestFile(path23__default.join(absRoot, a.root), a.kind, a.name);
+    if (!file) continue;
+    const res = parseManifestFile(file, fs9__default.readFileSync(file, "utf-8"));
+    if (!res.ok) continue;
+    const fileVersion = declaredVersion(res.data);
+    if (fileVersion === void 0 || fileVersion === a.version) continue;
+    logWarn(
+      manifestVersionMismatchMessage(
+        assetEntryRef(a, manifest),
+        a.version,
+        toPosix(path23__default.relative(absRoot, file)),
+        fileVersion
+      )
+    );
+    warnings++;
+  }
+  return warnings;
+}
+function validatePublishManifestPublishers(rootPath) {
+  const absRoot = path23__default.resolve(rootPath);
+  const manifest = loadSkPublishManifest(absRoot);
+  if (!manifest || manifest.source) return 0;
+  const bare = (p6) => p6.trim().replace(/^@/, "");
+  let warnings = 0;
+  for (const a of manifest.assets ?? []) {
+    const resolved = a.publisher ?? manifest.publisher;
+    if (!a.root || a.source || !resolved) continue;
+    const file = findAssetManifestFile(path23__default.join(absRoot, a.root), a.kind, a.name);
+    if (!file) continue;
+    const res = parseManifestFile(file, fs9__default.readFileSync(file, "utf-8"));
+    if (!res.ok) continue;
+    const meta = res.data.metadata;
+    const declared = meta !== null && typeof meta === "object" ? meta.publisher : null;
+    if (typeof declared !== "string" || bare(declared) === bare(resolved)) continue;
+    logWarn(
+      `${toPosix(path23__default.relative(absRoot, file))} [publisher] \u2014 metadata.publisher "${bare(declared)}" differs from the manifest publisher "${bare(resolved)}" for ${assetEntryRef(a, manifest)}. The manifest wins and the file value is ignored: delete \`metadata.publisher\` from the file, or set the publisher in ${SKAILE_MANIFEST_FILENAME}.`
+    );
+    warnings++;
+  }
+  return warnings;
+}
 var EXCLUDED_PATHS = ["skaileup-shared/", "external/", "docs/"];
 function toPosix(p6) {
-  return p6.split(path25__default.sep).join("/");
+  return p6.split(path23__default.sep).join("/");
 }
 function isExcludedPath(relPath) {
   const rel = toPosix(relPath);
   return EXCLUDED_PATHS.some((prefix) => rel.startsWith(prefix));
 }
-function collectAssetVersions() {
-  const assets = [];
-  if (!fs11__default.existsSync(AI_RESOURCES)) return assets;
-  const kindDirs = (kindDirName) => findKindDirs(AI_RESOURCES, kindDirName).filter(
-    (dir) => !isExcludedPath(path25__default.relative(AI_RESOURCES, dir))
-  );
-  for (const dir of kindDirs("skills")) collectSkillVersions(dir, assets);
-  for (const dir of kindDirs("agents")) collectAgentVersions(dir, assets);
-  for (const dir of kindDirs("flows")) collectFlowVersions(dir, assets);
-  for (const dir of kindDirs("prompts")) collectPromptVersions(dir, assets);
-  const seen = /* @__PURE__ */ new Set();
-  return assets.filter((a) => !seen.has(a.filePath) && seen.add(a.filePath));
-}
-function collectFlowVersions(dir, out) {
-  for (const f of fs11__default.readdirSync(dir)) {
-    if (!f.endsWith(".flow.yaml")) continue;
-    const fp = path25__default.join(dir, f);
-    const content = fs11__default.readFileSync(fp, "utf-8");
-    const parsed = parse(content);
-    out.push({
-      kind: "flow",
-      name: parsed?.id ?? f.replace(".flow.yaml", ""),
-      version: parsed?.version ?? "",
-      filePath: fp
-    });
-  }
-}
-function collectPromptVersions(dir, out) {
-  for (const f of fs11__default.readdirSync(dir)) {
-    if (!f.endsWith(".prompt.md")) continue;
-    const fp = path25__default.join(dir, f);
-    const content = fs11__default.readFileSync(fp, "utf-8");
+var VERSIONED_KINDS = {
+  skill: true,
+  agent: true,
+  flow: true,
+  prompt: true
+};
+function readAssetVersion(c) {
+  const kind = c.kind;
+  const fileName = path23__default.basename(c.filePath);
+  const dirName = path23__default.basename(path23__default.dirname(c.filePath));
+  const content = fs9__default.readFileSync(c.filePath, "utf-8");
+  if (c.filePath.endsWith(".md")) {
     const fm = parseSkillFrontmatter(content);
-    out.push({
-      kind: "prompt",
-      name: fm?.name ?? f.replace(".prompt.md", ""),
+    const stem = fileName.replace(/\.prompt\.md$/, "");
+    return {
+      kind,
+      name: fm?.name ?? (kind === "prompt" ? stem : dirName),
       version: fm?.metadata?.version ?? "",
-      filePath: fp
-    });
+      filePath: c.filePath
+    };
   }
-}
-function collectSkillVersions(dir, out) {
-  for (const entry of fs11__default.readdirSync(dir, { withFileTypes: true })) {
-    if (!entry.isDirectory()) continue;
-    const full = path25__default.join(dir, entry.name);
-    const skillMd = path25__default.join(full, "SKILL.md");
-    if (fs11__default.existsSync(skillMd)) {
-      const content = fs11__default.readFileSync(skillMd, "utf-8");
-      const fm = parseSkillFrontmatter(content);
-      out.push({
-        kind: "skill",
-        name: fm?.name ?? entry.name,
-        version: fm?.metadata?.version ?? "",
-        filePath: skillMd
-      });
-    } else {
-      collectSkillVersions(full, out);
-    }
+  let parsed = null;
+  try {
+    parsed = parse(content);
+  } catch {
+  }
+  if (kind === "flow") {
+    return {
+      kind,
+      name: String(parsed?.id ?? fileName.replace(".flow.yaml", "")),
+      version: String(parsed?.version ?? ""),
+      filePath: c.filePath
+    };
   }
+  return {
+    kind,
+    name: String(parsed?.name ?? dirName),
+    version: String(parsed?.version ?? ""),
+    filePath: c.filePath
+  };
 }
-function collectAgentVersions(dir, out) {
-  for (const entry of fs11__default.readdirSync(dir, { withFileTypes: true })) {
-    if (!entry.isDirectory()) continue;
-    const agentYaml = path25__default.join(dir, entry.name, "agent.yaml");
-    if (!fs11__default.existsSync(agentYaml)) continue;
-    const content = fs11__default.readFileSync(agentYaml, "utf-8");
-    const parsed = parse(content);
-    out.push({
-      kind: "agent",
-      name: parsed?.name ?? entry.name,
-      version: parsed?.version ?? "",
-      filePath: agentYaml
-    });
+function collectAssetVersions(root) {
+  if (!fs9__default.existsSync(root)) return [];
+  const assets = [];
+  for (const c of findManifestCandidates(root)) {
+    if (!VERSIONED_KINDS[c.kind]) continue;
+    if (c.filePath.endsWith(".flow.json")) continue;
+    if (isExcludedPath(path23__default.relative(root, c.filePath))) continue;
+    assets.push(readAssetVersion(c));
   }
+  return assets;
 }
-function assetLocation(a) {
-  return toPosix(path25__default.relative(AI_RESOURCES, a.filePath));
+function assetLocation(a, root) {
+  return toPosix(path23__default.relative(root, a.filePath));
 }
 function findChangelogUnit(assetRelPath, root) {
-  let dir = path25__default.posix.dirname(toPosix(assetRelPath));
+  let dir = path23__default.posix.dirname(toPosix(assetRelPath));
   for (; ; ) {
     const candidate = dir === "." ? "CHANGELOG.md" : `${dir}/CHANGELOG.md`;
-    if (fs11__default.existsSync(path25__default.join(root, candidate))) return candidate;
+    if (fs9__default.existsSync(path23__default.join(root, candidate))) return candidate;
     if (dir === ".") return null;
-    dir = path25__default.posix.dirname(dir);
+    dir = path23__default.posix.dirname(dir);
   }
 }
 function checkChangelogUnits(modifiedFiles, root) {
@@ -6525,7 +6946,7 @@ function checkChangelogUnits(modifiedFiles, root) {
   return { updated, stale, orphans };
 }
 function isValidSemver(v) {
-  return /^\d+\.\d+\.\d+(-[\w.]+)?(\+[\w.]+)?$/.test(v);
+  return SEMVER_RE.test(v);
 }
 function extractVersionFromContent(filePath, content) {
   if (filePath.endsWith(".yaml")) {
@@ -6537,51 +6958,37 @@ function extractVersionFromContent(filePath, content) {
   const parsed = parse(fmMatch[1]);
   return parsed?.metadata?.version ?? parsed?.version ?? null;
 }
-function filterToChangedAssets(assets) {
-  try {
-    const diffOutput = execSync("git diff --name-only HEAD", {
-      cwd: AI_RESOURCES,
-      encoding: "utf-8"
-    });
-    const changedFiles = new Set(
-      diffOutput.trim().split("\n").filter(Boolean).map((f) => path25__default.resolve(AI_RESOURCES, f))
-    );
-    return assets.filter((a) => changedFiles.has(a.filePath));
-  } catch {
-    logErr("Failed to run git diff \u2014 are you in a git repository?");
-    process.exit(1);
-  }
-}
-function checkAssetVersions(assets) {
+function checkAssetVersions(assets, root) {
   let errors = 0;
-  let warnings = 0;
+  const warnings = 0;
   for (const a of assets) {
     if (!a.version) {
-      logErr(`${a.kind}:${a.name} (${assetLocation(a)}) \u2014 missing version`);
+      logErr(`${a.kind}:${a.name} (${assetLocation(a, root)}) \u2014 missing version`);
       errors++;
     } else if (!isValidSemver(a.version)) {
-      logWarn(
-        `${a.kind}:${a.name} (${assetLocation(a)}) \u2014 version "${a.version}" is not valid semver`
+      logErr(
+        `${a.kind}:${a.name} (${assetLocation(a, root)}) \u2014 version "${a.version}" is not valid semver`
       );
-      warnings++;
+      errors++;
     }
   }
   return { errors, warnings };
 }
-function checkVersionBumps(assets) {
+function checkVersionBumps(assets, root) {
   let warnings = 0;
   for (const a of assets) {
     if (!a.version) continue;
-    const relPath = path25__default.relative(AI_RESOURCES, a.filePath);
+    const relPath = toPosix(path23__default.relative(root, a.filePath));
     try {
-      const headContent = execSync(`git show HEAD:${relPath}`, {
-        cwd: AI_RESOURCES,
-        encoding: "utf-8"
+      const headContent = execFileSync("git", ["show", `HEAD:./${relPath}`], {
+        cwd: root,
+        encoding: "utf-8",
+        stdio: ["ignore", "pipe", "pipe"]
       });
       const headVersion = extractVersionFromContent(a.filePath, headContent);
       if (headVersion && headVersion === a.version) {
         logWarn(
-          `${a.kind}:${a.name} (${assetLocation(a)}) \u2014 file changed but version not bumped (${a.version})`
+          `${a.kind}:${a.name} (${assetLocation(a, root)}) \u2014 file changed but version not bumped (${a.version})`
         );
         warnings++;
       }
@@ -6590,7 +6997,7 @@ function checkVersionBumps(assets) {
   }
   return warnings;
 }
-function checkFlowVersionPins(assets) {
+function checkFlowVersionPins(assets, root) {
   const flows = assets.filter((a) => a.kind === "flow");
   const skillVersionMap = /* @__PURE__ */ new Map();
   for (const a of assets.filter((a2) => a2.kind === "skill")) {
@@ -6604,7 +7011,7 @@ function checkFlowVersionPins(assets) {
       pins = flowSkillVersionPins(loadFlow(f.filePath));
     } catch (err2) {
       logWarn(
-        `flow:${f.name} (${path25__default.relative(AI_RESOURCES, f.filePath)}) \u2014 could not be read: ${err2 instanceof Error ? err2.message : err2}`
+        `flow:${f.name} (${path23__default.relative(root, f.filePath)}) \u2014 could not be read: ${err2 instanceof Error ? err2.message : err2}`
       );
       warnings++;
       continue;
@@ -6620,18 +7027,63 @@ function checkFlowVersionPins(assets) {
   }
   return { errors, warnings };
 }
-function runVersionsCheck(opts) {
-  let assets = collectAssetVersions();
+function resolveCheckRoot(pathArg) {
+  if (pathArg) {
+    const abs = path23__default.resolve(pathArg);
+    if (!fs9__default.existsSync(abs)) {
+      logErr(`Path does not exist: ${abs}`);
+      return null;
+    }
+    return abs;
+  }
+  for (let dir = process.cwd(); ; dir = path23__default.dirname(dir)) {
+    if (fs9__default.existsSync(path23__default.join(dir, SKAILE_MANIFEST_FILENAME))) return dir;
+    if (path23__default.dirname(dir) === dir) return AI_RESOURCES;
+  }
+}
+function changedFiles(root, ref) {
+  try {
+    const out = execFileSync(
+      "git",
+      ["diff", "--name-only", "--relative", "--end-of-options", ref],
+      {
+        cwd: root,
+        encoding: "utf-8",
+        stdio: ["ignore", "pipe", "pipe"]
+      }
+    );
+    return out.trim().split("\n").filter(Boolean);
+  } catch (err2) {
+    const stderr = err2 instanceof Error && "stderr" in err2 ? String(err2.stderr).trim() : "";
+    const reason = (stderr || (err2 instanceof Error ? err2.message : String(err2))).split("\n")[0];
+    logErr(`git diff failed in ${root}: ${reason}`);
+    return null;
+  }
+}
+function runVersionsCheck(pathArg, opts) {
+  const root = resolveCheckRoot(pathArg);
+  if (root === null) {
+    process.exit(1);
+    return;
+  }
+  let assets = collectAssetVersions(root);
   if (opts.changedOnly) {
-    assets = filterToChangedAssets(assets);
+    const changed = changedFiles(root, "HEAD");
+    if (changed === null) {
+      process.exit(1);
+      return;
+    }
+    const changedAbs = new Set(changed.map((f) => path23__default.resolve(root, f)));
+    assets = assets.filter((a) => changedAbs.has(a.filePath));
   }
-  const versionCheck = checkAssetVersions(assets);
+  logInfo(`Checking versions in ${root}`);
+  const versionCheck = checkAssetVersions(assets, root);
   let errors = versionCheck.errors;
   let warnings = versionCheck.warnings;
   if (opts.changedOnly) {
-    warnings += checkVersionBumps(assets);
+    warnings += checkVersionBumps(assets, root);
   }
-  const pinCheck = checkFlowVersionPins(assets);
+  const pinCheck = checkFlowVersionPins(assets, root);
   errors += pinCheck.errors;
   warnings += pinCheck.warnings;
   console.log();
@@ -6654,7 +7106,7 @@ function makeValidateCommand() {
     "--strict-conformance",
     "Treat Agent Skills (agentskills.io) standard findings as errors"
   ).action((targetPath, opts) => {
-    const absPath = path25__default.resolve(targetPath);
+    const absPath = path23__default.resolve(targetPath);
     logInfo(`Validating manifests in ${absPath}`);
     const { total, errors, warnings } = validateManifests(
       absPath,
@@ -6662,11 +7114,16 @@ function makeValidateCommand() {
     );
     const ws = validateWorkspaceManifests(absPath);
     const rootErrors = validatePublishManifestRoots(absPath);
-    const totalErrors = errors + ws.errors + rootErrors;
+    const requiresErrors = validatePublishManifestRequires(absPath);
+    const versionWarnings = validatePublishManifestVersions(absPath);
+    const publisherWarnings = validatePublishManifestPublishers(absPath);
+    const totalErrors = errors + ws.errors + rootErrors + requiresErrors;
     console.log();
     warnIgnoredDomainFiles(absPath);
+    warnLegacyBundleFiles(absPath);
     logInfo(`Scanned ${total} asset manifest(s) and ${ws.total} skaile.yaml file(s)`);
-    if (warnings > 0) logWarn(`${warnings} warning(s)`);
+    const totalWarnings = warnings + versionWarnings + publisherWarnings;
+    if (totalWarnings > 0) logWarn(`${totalWarnings} warning(s)`);
     if (totalErrors === 0) {
       logOk("All manifests valid");
     } else {
@@ -6674,23 +7131,24 @@ function makeValidateCommand() {
       process.exit(1);
     }
   });
-  cmd.command("versions").description("Check version fields and flow version pins").option("--changed-only", "Only check assets modified since last commit").option("--strict", "Exit 1 on warnings (for CI)").action((opts) => {
-    runVersionsCheck(opts);
-  });
-  cmd.command("changelog").description("Check that modified assets have an updated nearest CHANGELOG.md").option("--base <ref>", "Git base ref for diff", "HEAD").action((opts) => {
-    let diffOutput;
-    try {
-      diffOutput = execSync(`git diff --name-only --relative ${opts.base}`, {
-        cwd: AI_RESOURCES,
-        encoding: "utf-8"
-      });
-    } catch {
-      logErr("Failed to run git diff \u2014 are you in a git repository?");
+  cmd.command("versions").description("Check version fields and flow version pins").argument("[path]", "Library or asset directory (default: the current library)").option("--changed-only", "Only check assets modified since last commit").option("--strict", "Exit 1 on warnings (for CI)").addOption(removedDomainOption()).action(
+    (pathArg, opts) => {
+      rejectRemovedDomainOption(opts);
+      runVersionsCheck(pathArg, opts);
+    }
+  );
+  cmd.command("changelog").description("Check that modified assets have an updated nearest CHANGELOG.md").argument("[path]", "Library or asset directory (default: the current library)").option("--base <ref>", "Git base ref for diff", "HEAD").action((pathArg, opts) => {
+    const root = resolveCheckRoot(pathArg);
+    if (root === null) {
       process.exit(1);
       return;
     }
-    const modifiedFiles = diffOutput.trim().split("\n").filter(Boolean);
-    const { updated, stale, orphans } = checkChangelogUnits(modifiedFiles, AI_RESOURCES);
+    const modifiedFiles = changedFiles(root, opts.base);
+    if (modifiedFiles === null) {
+      process.exit(1);
+      return;
+    }
+    const { updated, stale, orphans } = checkChangelogUnits(modifiedFiles, root);
     if (updated.length + stale.length + orphans.length === 0) {
       logOk("No modified assets found");
       return;
@@ -6734,7 +7192,7 @@ function itemFromRef(raw, defaultKind, ctx) {
     return { kind: prefixed[1], ref: value };
   }
   if (PATH_LIKE.test(value)) return { kind: defaultKind, ref: value };
-  if (defaultKind === "skill" && !value.includes("/") && existsSync(path25__default.join(ctx.agentDir, "skills", value, "SKILL.md"))) {
+  if (defaultKind === "skill" && !value.includes("/") && existsSync(path23__default.join(ctx.agentDir, "skills", value, "SKILL.md"))) {
     return { kind: "skill", ref: `./skills/${value}` };
   }
   return { kind: defaultKind, ref: `${defaultKind}:${value}` };
@@ -6870,7 +7328,7 @@ function migrateAgentYaml(source, options) {
         manual.push("metadata.soul: not a string; left unchanged");
         continue;
       }
-      if (path25__default.posix.basename(soul.replace(/\\/g, "/")).toLowerCase() === "soul.md") {
+      if (path23__default.posix.basename(soul.replace(/\\/g, "/")).toLowerCase() === "soul.md") {
         notes.push("metadata.soul \u2192 dropped (SOUL.md is a convention file)");
       } else {
         derived.push({ kind: "persona", ref: soul });
@@ -7104,7 +7562,7 @@ function migrateSubagents(skaileYamlPath, source) {
   if (!isMap(agentNode)) return void 0;
   const subNode = agentNode.get("subagents", true);
   if (!isMap(subNode)) return void 0;
-  const dir = path25__default.dirname(skaileYamlPath);
+  const dir = path23__default.dirname(skaileYamlPath);
   const notes = [];
   const manual = [];
   const changes = [];
@@ -7122,10 +7580,10 @@ function migrateSubagents(skaileYamlPath, source) {
       continue;
     }
     const id = instanceId(name);
-    const assetDir = path25__default.join(dir, ".skaile", "agents", id);
+    const assetDir = path23__default.join(dir, ".skaile", "agents", id);
     if (takenIds.has(id) || existsSync(assetDir)) {
       manual.push(
-        `agent.subagents.${name}: ${takenIds.has(id) ? `agents.${id} already exists` : `${path25__default.relative(dir, assetDir)} already exists`}; left in place`
+        `agent.subagents.${name}: ${takenIds.has(id) ? `agents.${id} already exists` : `${path23__default.relative(dir, assetDir)} already exists`}; left in place`
       );
       continue;
     }
@@ -7149,13 +7607,13 @@ function migrateSubagents(skaileYamlPath, source) {
       manifest.tools = { ...allowed ? { allowed } : {}, ...denied ? { denied } : {} };
     }
     const text = stringify(manifest, { lineWidth: 0 });
-    const manifestPath = path25__default.join(assetDir, "agent.yaml");
+    const manifestPath = path23__default.join(assetDir, "agent.yaml");
     changes.push({ type: "create", path: manifestPath, after: text });
     assetManifests.push({ file: manifestPath, text });
     if (typeof spec.prompt === "string" && spec.prompt.trim() !== "") {
       changes.push({
         type: "create",
-        path: path25__default.join(assetDir, "SOUL.md"),
+        path: path23__default.join(assetDir, "SOUL.md"),
         after: `${spec.prompt.replace(/\s+$/, "")}
 `
       });
@@ -7214,7 +7672,7 @@ function validateMigratedAgent(text, registry) {
 function collectAgentFiles(paths) {
   const files = /* @__PURE__ */ new Set();
   for (const input of paths) {
-    const abs = path25__default.resolve(input);
+    const abs = path23__default.resolve(input);
     if (!existsSync(abs)) continue;
     if (statSync(abs).isDirectory()) {
       for (const f of walkFiles(abs, (b) => b === "agent.yaml" || b === "skaile.yaml"))
@@ -7231,7 +7689,7 @@ function planAgentMigration(options) {
   const reports = [];
   for (const file of collectAgentFiles(options.paths)) {
     const source = readText(file);
-    const base = path25__default.basename(file);
+    const base = path23__default.basename(file);
     if (base === "skaile.yaml") {
       const result = migrateSubagents(file, source);
       if (!result) continue;
@@ -7239,7 +7697,7 @@ function planAgentMigration(options) {
       for (const asset of result.assetManifests) {
         const v = validateMigratedAgent(asset.text, options.registry);
         validation2.errors.push(
-          ...v.errors.map((e) => `${path25__default.basename(path25__default.dirname(asset.file))}: ${e}`)
+          ...v.errors.map((e) => `${path23__default.basename(path23__default.dirname(asset.file))}: ${e}`)
         );
         validation2.warnings.push(...v.warnings);
       }
@@ -7267,7 +7725,7 @@ function planAgentMigration(options) {
         });
         continue;
       }
-      migration = migrateAgentYaml(source, { agentDir: path25__default.dirname(file), knownKinds });
+      migration = migrateAgentYaml(source, { agentDir: path23__default.dirname(file), knownKinds });
     } catch (error) {
       reports.push({
         file,
@@ -7296,7 +7754,7 @@ function planAgentMigration(options) {
 }
 var DEFAULT_PUBLISHER = "skaile-ai";
 var FRONTMATTER = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/;
-var posix2 = (p6) => p6.split(path25__default.sep).join("/");
+var posix2 = (p6) => p6.split(path23__default.sep).join("/");
 var MOVED_KINDS = { persona: "PERSONA.md", ruleset: "RULESET.md" };
 var KIND_MANIFEST_FILES = /* @__PURE__ */ new Set(["PERSONA.md", "RULESET.md", "SKILL.md"]);
 function readFrontmatterType(text) {
@@ -7327,14 +7785,14 @@ function planMarkdownMoves(root, knownKinds, manual, unknownTypes) {
     if (!text.startsWith("---")) continue;
     const found = readFrontmatterType(text);
     if (!found) continue;
-    const base = path25__default.basename(file);
-    const inAgentParts = file.split(path25__default.sep).includes("_agent-parts");
+    const base = path23__default.basename(file);
+    const inAgentParts = file.split(path23__default.sep).includes("_agent-parts");
     const targetName = MOVED_KINDS[found.type];
     if (targetName !== void 0 && !KIND_MANIFEST_FILES.has(base)) {
-      const to = path25__default.join(path25__default.dirname(file), base.replace(/\.md$/i, ""), targetName);
+      const to = path23__default.join(path23__default.dirname(file), base.replace(/\.md$/i, ""), targetName);
       if (existsSync(to) || targets.has(to)) {
         manual.push(
-          `${posix2(path25__default.relative(root, file))}: ${posix2(path25__default.relative(root, to))} already exists; not moved`
+          `${posix2(path23__default.relative(root, file))}: ${posix2(path23__default.relative(root, to))} already exists; not moved`
         );
         continue;
       }
@@ -7355,13 +7813,13 @@ function planAgentRefRewrites(root, moves, knownKinds, notes) {
   const changes = [];
   for (const file of walkFiles(root, (b) => b === "agent.yaml")) {
     const source = readText(file);
-    const agentDir = path25__default.dirname(file);
+    const agentDir = path23__default.dirname(file);
     let hits = 0;
     const refRewrite = (_kind, ref) => {
-      const moved = byOldPath.get(path25__default.resolve(agentDir, ref));
+      const moved = byOldPath.get(path23__default.resolve(agentDir, ref));
       if (moved === void 0) return ref;
       hits++;
-      const rel = posix2(path25__default.relative(agentDir, moved));
+      const rel = posix2(path23__default.relative(agentDir, moved));
       return rel.startsWith(".") ? rel : `./${rel}`;
     };
     let output;
@@ -7378,7 +7836,7 @@ function planAgentRefRewrites(root, moves, knownKinds, notes) {
     if (hits === 0 || output === source) continue;
     changes.push({ type: "write", path: file, before: source, after: output });
     notes.push(
-      `${posix2(path25__default.relative(root, file))}: persona/ruleset refs \u2192 composes items at the new paths`
+      `${posix2(path23__default.relative(root, file))}: persona/ruleset refs \u2192 composes items at the new paths`
     );
   }
   return changes;
@@ -7403,14 +7861,14 @@ function presetText(name, description, refs, publisher) {
 }
 function skillDirs(dir) {
   try {
-    return readdirSync(path25__default.join(dir, "skills"), { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync(path25__default.join(dir, "skills", e.name, "SKILL.md"))).map((e) => e.name).sort();
+    return readdirSync(path23__default.join(dir, "skills"), { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync(path23__default.join(dir, "skills", e.name, "SKILL.md"))).map((e) => e.name).sort();
   } catch {
     return [];
   }
 }
 function repoPublisher(root) {
   for (const name of ["skaile.manifest.yaml", "skaile.yaml"]) {
-    const file = path25__default.join(root, name);
+    const file = path23__default.join(root, name);
     if (!existsSync(file)) continue;
     try {
       const parsed = parse(readText(file));
@@ -7426,9 +7884,9 @@ function planBundles(root, skaileYamls, publisher, notes, manual) {
   const changes = [];
   const presets = [];
   const handled = /* @__PURE__ */ new Set();
-  const rel = (p6) => posix2(path25__default.relative(root, p6));
+  const rel = (p6) => posix2(path23__default.relative(root, p6));
   const convert = (name, bundleFile, dir) => {
-    const target = path25__default.join(dir, `${name}.preset.yaml`);
+    const target = path23__default.join(dir, `${name}.preset.yaml`);
     if (existsSync(target)) {
       manual.push(`${rel(target)} already exists; bundle ${name} not converted`);
       return;
@@ -7454,7 +7912,7 @@ function planBundles(root, skaileYamls, publisher, notes, manual) {
     }
     if (refs.length === 0) {
       manual.push(
-        `bundle ${name}: no dependencies found${bundleFile ? ` in ${rel(bundleFile)}` : ` and no skills under ${rel(path25__default.join(dir, "skills"))}`}; no preset generated`
+        `bundle ${name}: no dependencies found${bundleFile ? ` in ${rel(bundleFile)}` : ` and no skills under ${rel(path23__default.join(dir, "skills"))}`}; no preset generated`
       );
       return;
     }
@@ -7476,18 +7934,18 @@ function planBundles(root, skaileYamls, publisher, notes, manual) {
     const assets = Array.isArray(raw.assets) ? raw.assets : [];
     for (const entry of assets) {
       if (!isRecord(entry) || entry.kind !== "bundle" || typeof entry.name !== "string") continue;
-      const baseDir = path25__default.dirname(file);
-      const entryRoot = typeof entry.root === "string" ? path25__default.join(baseDir, entry.root) : baseDir;
+      const baseDir = path23__default.dirname(file);
+      const entryRoot = typeof entry.root === "string" ? path23__default.join(baseDir, entry.root) : baseDir;
       const files = Array.isArray(entry.files) ? entry.files : [];
       const bundleName = files.find(
         (f) => typeof f === "string" && f.endsWith(".bundle.yaml")
       );
-      convert(entry.name, bundleName ? path25__default.join(entryRoot, bundleName) : void 0, entryRoot);
+      convert(entry.name, bundleName ? path23__default.join(entryRoot, bundleName) : void 0, entryRoot);
     }
   }
   for (const bundleFile of walkFiles(root, (b) => b.endsWith(".bundle.yaml"))) {
     if (handled.has(bundleFile)) continue;
-    const base = path25__default.basename(bundleFile);
+    const base = path23__default.basename(bundleFile);
     let name = base.replace(/\.bundle\.yaml$/, "");
     try {
       const parsed = parse(readText(bundleFile));
@@ -7496,7 +7954,7 @@ function planBundles(root, skaileYamls, publisher, notes, manual) {
     } catch {
     }
     if (presets.some((p6) => p6.bundleFile === bundleFile)) continue;
-    convert(name, bundleFile, path25__default.dirname(bundleFile));
+    convert(name, bundleFile, path23__default.dirname(bundleFile));
   }
   return changes;
 }
@@ -7506,8 +7964,8 @@ function planSkaileYaml(root, file, source, notes, manual) {
   if (doc.errors.length > 0 || !isMap(doc.contents)) return [];
   const map = doc.contents;
   const raw = doc.toJS();
-  const dir = path25__default.dirname(file);
-  const rel = (p6) => posix2(path25__default.relative(root, p6));
+  const dir = path23__default.dirname(file);
+  const rel = (p6) => posix2(path23__default.relative(root, p6));
   const changes = [];
   let changed = false;
   const deps = map.get("dependencies", true);
@@ -7524,7 +7982,7 @@ function planSkaileYaml(root, file, source, notes, manual) {
   const hasPublication = PUBLICATION_KEYS.some((k) => raw[k] !== void 0);
   let remove = false;
   if (hasPublication) {
-    const manifestPath = path25__default.join(dir, "skaile.manifest.yaml");
+    const manifestPath = path23__default.join(dir, "skaile.manifest.yaml");
     if (existsSync(manifestPath)) {
       manual.push(
         `${rel(file)}: publisher/version/assets left in place \u2014 ${rel(manifestPath)} already exists; merge by hand`
@@ -7581,7 +8039,7 @@ function planSkaileYaml(root, file, source, notes, manual) {
   return changes;
 }
 function planAssetMigration(options) {
-  const root = path25__default.resolve(options.root);
+  const root = path23__default.resolve(options.root);
   const knownKinds = new Set(options.registry.getAllKinds());
   const notes = [];
   const manual = [];
@@ -7589,7 +8047,7 @@ function planAssetMigration(options) {
   const { moves, changes: moveChanges } = planMarkdownMoves(root, knownKinds, manual, unknownTypes);
   for (const move of moves) {
     notes.push(
-      `${posix2(path25__default.relative(root, move.from))} \u2192 ${posix2(path25__default.relative(root, move.to))} (${move.kind})`
+      `${posix2(path23__default.relative(root, move.from))} \u2192 ${posix2(path23__default.relative(root, move.to))} (${move.kind})`
     );
   }
   const agentChanges = planAgentRefRewrites(root, moves, knownKinds, notes);
@@ -7601,7 +8059,7 @@ function planAssetMigration(options) {
       const raw = parse(source);
       if (isRecord(raw)) skaileYamls.push({ file, source, raw });
     } catch {
-      manual.push(`${posix2(path25__default.relative(root, file))}: invalid YAML; skipped`);
+      manual.push(`${posix2(path23__default.relative(root, file))}: invalid YAML; skipped`);
     }
   }
   const publisher = repoPublisher(root);
@@ -7755,7 +8213,7 @@ function workspaceConfigFiles(dir) {
   } catch {
     return [];
   }
-  return names.filter((name) => isWorkspaceConfigFilename(name)).sort().map((name) => path25__default.join(dir, name));
+  return names.filter((name) => isWorkspaceConfigFilename(name)).sort().map((name) => path23__default.join(dir, name));
 }
 function readAgentConfigBlock(raw) {
   const key = AGENT_CONFIG_KEYS.find((candidate) => raw[candidate] !== void 0);
@@ -7767,7 +8225,7 @@ function readAgentConfigBlock(raw) {
   return flat ? { key, profiles: { default: profiles }, flat } : { key, profiles, flat };
 }
 function planProviderMigration(options) {
-  const projectDir = path25__default.resolve(options.projectDir);
+  const projectDir = path23__default.resolve(options.projectDir);
   const registryPath = options.workspace ? workspaceProviderRegistryPath(projectDir) : userProviderRegistryPath();
   const plan = {
     registryPath,
@@ -7783,7 +8241,7 @@ function planProviderMigration(options) {
       raw = parseDocument(readFileSync(file, "utf-8")).toJS() ?? {};
     } catch (error) {
       plan.warnings.push(
-        `${path25__default.basename(file)}: not valid YAML (${error instanceof Error ? error.message : String(error)}) \u2014 skipped`
+        `${path23__default.basename(file)}: not valid YAML (${error instanceof Error ? error.message : String(error)}) \u2014 skipped`
       );
       continue;
     }
@@ -7832,7 +8290,7 @@ function planProviderMigration(options) {
       });
       if (!model) {
         plan.warnings.push(
-          `${path25__default.basename(file)}: profile '${profile}' had no model: \u2014 it now resolves against registry order. Pin it with 'model: ${providerId}/<modelId>'.`
+          `${path23__default.basename(file)}: profile '${profile}' had no model: \u2014 it now resolves against registry order. Pin it with 'model: ${providerId}/<modelId>'.`
         );
       }
       touched = true;
@@ -7899,7 +8357,7 @@ function printPlan(plan) {
   for (const entry of plan.entries) {
     const base = entry.entry.base_url ?? S.dim("(transport-derived)");
     console.log(
-      `  ${S.label(`${path25__default.basename(entry.file)} ${entry.profile}`)} provider: ${entry.legacy.provider}, cloud: ${entry.legacy.cloud}`
+      `  ${S.label(`${path23__default.basename(entry.file)} ${entry.profile}`)} provider: ${entry.legacy.provider}, cloud: ${entry.legacy.cloud}`
     );
     console.log(`    \u2192 providers.yml ${S.bold(entry.providerId)}  ${base}`);
     console.log(
@@ -7915,7 +8373,7 @@ function printPlan(plan) {
   console.log();
 }
 async function runMigrateProviders(opts) {
-  const projectDir = opts.projectDir ? path25__default.resolve(opts.projectDir) : process.cwd();
+  const projectDir = opts.projectDir ? path23__default.resolve(opts.projectDir) : process.cwd();
   const plan = planProviderMigration({ projectDir, workspace: opts.workspace });
   for (const warning of plan.warnings) logWarn(warning);
   if (plan.entries.length === 0 && Object.keys(plan.providers).length === 0) {
@@ -8046,7 +8504,7 @@ async function runMigrateAgents(paths, opts) {
   let failures = 0;
   let manualCount = 0;
   for (const report of plan.reports) {
-    const rel = path25__default.relative(base, report.file) || report.file;
+    const rel = path23__default.relative(base, report.file) || report.file;
     for (const note of report.notes) console.log(`  ${S.label(rel)} ${note}`);
     for (const note of report.manual) {
       manualCount++;
@@ -8073,14 +8531,14 @@ async function runMigrateAssets(root, opts) {
   const write = resolveMode(opts);
   const base = process.cwd();
   const plan = planAssetMigration({
-    root: path25__default.resolve(root ?? base),
+    root: path23__default.resolve(root ?? base),
     registry: getKindRegistry()
   });
   for (const note of plan.notes) console.log(`  ${note}`);
   for (const note of plan.manual) logWarn(note);
   for (const { file, type } of plan.unknownTypes) {
     logWarn(
-      `${path25__default.relative(base, file) || file}: frontmatter type "${type}" is not a registered asset kind (reported, not rewritten)`
+      `${path23__default.relative(base, file) || file}: frontmatter type "${type}" is not a registered asset kind (reported, not rewritten)`
     );
   }
   printChanges(plan.changes, base);
@@ -8103,8 +8561,8 @@ function makeNpxCommand() {
   skills.command("add <url>").description(
     "Clone a repo, register it in the project's skaile.yaml sources[], and install a skill from it"
   ).requiredOption("--skill <name>", "Skill name to install from the repo").option("--project-dir <path>", "Project directory", process.cwd()).option("--target <agent>", `Agent framework (${TARGET_DEFAULT_HINT})`).option("--global", "Deploy globally").action(async (url, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
-    const projYaml = path25__default.join(projectDir, "skaile.yaml");
+    const projectDir = path23__default.resolve(opts.projectDir);
+    const projYaml = path23__default.join(projectDir, "skaile.yaml");
     if (!existsSync(projYaml)) {
       logErr(`No skaile.yaml in ${projectDir} \u2014 run \`skaile init\` first.`);
       process.exit(1);
@@ -8117,11 +8575,11 @@ function makeNpxCommand() {
     }
     const spinner = createSpinner();
     const key = sourceCacheKey(url);
-    const clonePath = path25__default.join(getGlobalCacheDir(), key);
+    const clonePath = path23__default.join(getGlobalCacheDir(), key);
     spinner.start(`Cloning ${url}`);
     try {
       if (!existsSync(clonePath)) {
-        mkdirSync(path25__default.dirname(clonePath), { recursive: true });
+        mkdirSync(path23__default.dirname(clonePath), { recursive: true });
         execSync(`git clone ${url} ${clonePath}`, { stdio: "ignore" });
       }
       spinner.stop(`Cloned to ${key}`);
@@ -8176,7 +8634,7 @@ function makeNpxCommand() {
   return npx;
 }
 function resolvePublisher(clonePath, url) {
-  const manifestPath = path25__default.join(clonePath, SKAILE_MANIFEST_FILENAME);
+  const manifestPath = path23__default.join(clonePath, SKAILE_MANIFEST_FILENAME);
   if (existsSync(manifestPath)) {
     try {
       const { manifest } = decodeSkaileManifest(readFileSync(manifestPath, "utf8"));
@@ -8189,12 +8647,12 @@ function resolvePublisher(clonePath, url) {
   return url.match(/github\.com[/:]([^/]+)\/[^/]+/)?.[1];
 }
 function resolveSkillName(clonePath, requested) {
-  const skillsDir = path25__default.join(clonePath, "skills");
-  if (existsSync(path25__default.join(skillsDir, requested, "SKILL.md"))) return requested;
+  const skillsDir = path23__default.join(clonePath, "skills");
+  if (existsSync(path23__default.join(skillsDir, requested, "SKILL.md"))) return requested;
   if (!existsSync(skillsDir)) return requested;
   for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const md = path25__default.join(skillsDir, entry.name, "SKILL.md");
+    const md = path23__default.join(skillsDir, entry.name, "SKILL.md");
     if (!existsSync(md)) continue;
     try {
       const { data } = parseFrontmatter(readFileSync(md, "utf8"));
@@ -8205,6 +8663,7 @@ function resolveSkillName(clonePath, requested) {
   return requested;
 }
 function outdatedRef(e) {
+  if (!e.kind) return e.name;
   const publisher = e.publisher?.replace(/^@/, "");
   return publisher ? `${e.kind}:@${publisher}/${e.name}` : `${e.kind}:${e.name}`;
 }
@@ -8225,7 +8684,7 @@ function makeOutdatedCommand() {
   ).action(async (filter, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir),
+      projectDir: path23__default.resolve(opts.projectDir),
       driverTarget: opts.target
     });
     const entries = await am2.outdated();
@@ -8243,16 +8702,16 @@ function makeOutdatedCommand() {
     console.log(S.heading("  Outdated Assets"));
     console.log(`  ${S.rule(refW + 34)}`);
     for (const e of filtered) {
-      const status4 = e.problem !== void 0 ? e.problem : e.library !== void 0 ? `${e.currentVersion} \u2192 ${e.latestVersion} ${S.dim(`(library ${e.library})`)}` : `${e.behind} commit(s) behind`;
+      const status4 = e.problem !== void 0 ? e.problem : e.contentChanged ? `${e.currentVersion} content changed since lock ${S.dim(`(library ${e.library})`)}` : e.library !== void 0 ? `${e.currentVersion} \u2192 ${e.latestVersion} ${S.dim(`(library ${e.library})`)}` : `${e.behind} commit(s) behind`;
       console.log(
         `  ${colorRef(outdatedRef(e))}${" ".repeat(refW - outdatedRef(e).length)}  ${e.problem !== void 0 ? pc5.red(status4) : pc5.yellow(status4)}`
       );
     }
     console.log();
     if (filtered.some((e) => e.problem === void 0)) {
-      logWarn(`Run ${S.cmd("skaile update")} to re-deploy.`);
+      logWarn(`Run ${S.cmd("skaile update")} to re-lock and re-deploy.`);
     }
-    if (filtered.some((e) => e.problem !== void 0)) {
+    if (filtered.some((e) => e.problem !== void 0 && !e.manualFix)) {
       logWarn(`Run ${S.cmd("skaile install")} to restore or re-lock the broken assets.`);
     }
   });
@@ -8262,7 +8721,7 @@ function makePatchCommand() {
   cmd.command("extract <ref>").alias("start").description("Extract asset for local editing").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
     try {
       const dest = await am2.patch(ref);
@@ -8276,7 +8735,7 @@ function makePatchCommand() {
   cmd.command("commit <ref>").description("Generate .patch file from edits").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
     try {
       const patchFile = await am2.patchCommit(ref);
@@ -8290,7 +8749,7 @@ function makePatchCommand() {
   cmd.command("submit <ref>").description("Apply patch to repo clone and prepare for PR").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
     try {
       await am2.patchSubmit(ref);
@@ -8306,7 +8765,7 @@ function makePatchCommand() {
   cmd.command("remove <ref>").description("Remove local patch after upstream merge").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
     am2.patchRemove(ref);
     logOk(`Patch removed for ${ref}`);
@@ -8325,7 +8784,7 @@ function action2(fn) {
   };
 }
 async function reconcileAndReport(projectDir, plugins) {
-  const { reconcilePlugins } = await import('../plugin-store-66QFBNEO.js');
+  const { reconcilePlugins } = await import('../plugin-store-MPAMD5OT.js');
   if (plugins.length === 0) {
     logInfo("No plugins declared \u2014 nothing to reconcile.");
     return;
@@ -8339,10 +8798,10 @@ async function reconcileAndReport(projectDir, plugins) {
   }
 }
 async function runInstall2(spec, opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName } = await import('../plugin-store-66QFBNEO.js');
-  const yamlPath = path25__default.join(projectDir, "skaile.yaml");
+  const { specName } = await import('../plugin-store-MPAMD5OT.js');
+  const yamlPath = path23__default.join(projectDir, "skaile.yaml");
   const editor = WorkspaceYamlEditor2.load(yamlPath);
   const replaced = editor.addPlugin(spec, specName);
   editor.save();
@@ -8351,10 +8810,10 @@ async function runInstall2(spec, opts) {
   await reconcileAndReport(projectDir, editor.getPlugins());
 }
 async function runRemove(name, opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName } = await import('../plugin-store-66QFBNEO.js');
-  const yamlPath = path25__default.join(projectDir, "skaile.yaml");
+  const { specName } = await import('../plugin-store-MPAMD5OT.js');
+  const yamlPath = path23__default.join(projectDir, "skaile.yaml");
   const editor = WorkspaceYamlEditor2.load(yamlPath);
   const removed = editor.removePlugin(name, specName);
   if (!removed) {
@@ -8366,7 +8825,7 @@ async function runRemove(name, opts) {
   await reconcileAndReport(projectDir, editor.getPlugins());
 }
 async function runList(opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
   const declared = config.plugins ?? [];
@@ -8381,7 +8840,7 @@ async function runList(opts) {
   const registry = createPluginRegistry();
   if (declared.length > 0) {
     try {
-      const { loadPlugins } = await import('../plugin-store-66QFBNEO.js');
+      const { loadPlugins } = await import('../plugin-store-MPAMD5OT.js');
       const result = await loadPlugins(projectDir, declared, registry);
       for (const f of result.failed) logWarn(f.error);
     } catch (err2) {
@@ -8556,7 +9015,7 @@ function neededSources(config, lock) {
 }
 function sourcesWithSidecar(sources) {
   const dir = getStoreManifestsDir();
-  return sources.filter((s) => existsSync(path25.join(dir, `${storeManifestSlug(s.url)}.yaml`))).map((s) => s.url);
+  return sources.filter((s) => existsSync(path23.join(dir, `${storeManifestSlug(s.url)}.yaml`))).map((s) => s.url);
 }
 function compact(obj) {
   const out = {};
@@ -8672,7 +9131,7 @@ function makePresetCommand() {
   cmd.command("init [name]").description("Scaffold a new .preset.yaml file").option("--dir <path>", "Output directory", process.cwd()).action(async (name, opts) => {
     const presetName = name ?? "my-preset";
     const filename = `${presetName}.preset.yaml`;
-    const outPath = path25__default.join(path25__default.resolve(opts.dir), filename);
+    const outPath = path23__default.join(path23__default.resolve(opts.dir), filename);
     if (existsSync(outPath)) {
       logErr(`File already exists: ${outPath}`);
       logInfo("Choose a different name or remove the existing file.");
@@ -8705,7 +9164,7 @@ function makePresetCommand() {
   return cmd;
 }
 async function runPresetExport(name, opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const file = loadSkWorkspaceConfig(projectDir);
   if (!file) {
     logErr(`No skaile.yaml found in ${projectDir}`);
@@ -8715,7 +9174,7 @@ async function runPresetExport(name, opts) {
   const presetName = name ?? file.config.name ?? "my-preset";
   let lock = null;
   try {
-    lock = readLock(path25__default.join(projectDir, "skaile.lock.yaml"));
+    lock = readLock(path23__default.join(projectDir, "skaile.lock.yaml"));
   } catch {
     lock = null;
   }
@@ -8756,7 +9215,7 @@ async function runPresetExport(name, opts) {
   const contents = header ? `${header}
 ${body}` : body;
   if (opts.out && opts.dir !== process.cwd()) logWarn("--dir is ignored when --out is set.");
-  const outPath = opts.out ? path25__default.resolve(opts.out) : path25__default.join(path25__default.resolve(opts.dir), `${presetName}.preset.yaml`);
+  const outPath = opts.out ? path23__default.resolve(opts.out) : path23__default.join(path23__default.resolve(opts.dir), `${presetName}.preset.yaml`);
   if (existsSync(outPath) && !opts.force) {
     logErr(`File already exists: ${outPath}`);
     logInfo("Pass --force to overwrite, or choose a different --out/--dir.");
@@ -8768,7 +9227,7 @@ ${body}` : body;
     logErr(`Failed to write ${outPath}: ${e.message}`);
     process.exit(1);
   }
-  logOk(`Exported ${S.brand(path25__default.basename(outPath))}`);
+  logOk(`Exported ${S.brand(path23__default.basename(outPath))}`);
   logInfo(`Path: ${outPath}`);
   if (unresolved.length > 0) {
     console.error(S.err("This file is NOT safe to share."));
@@ -8809,13 +9268,13 @@ function collectInput(value, acc) {
   return acc;
 }
 async function runPresetApply(filePath, opts) {
-  const projectDir = path25__default.resolve(opts.projectDir);
+  const projectDir = path23__default.resolve(opts.projectDir);
   const file = loadSkWorkspaceConfig(projectDir);
   if (!file) {
     logErr("No skaile.yaml \u2014 run `skaile init` first");
     process.exit(1);
   }
-  const resolved = path25__default.resolve(filePath);
+  const resolved = path23__default.resolve(filePath);
   if (!existsSync(resolved)) {
     logErr(`File not found: ${resolved}`);
     process.exit(1);
@@ -8994,7 +9453,7 @@ async function runPresetInstall(projectDir) {
     logInfo("Installing new dependencies\u2026");
     const result = await am2.install({});
     for (const d of result.deployed) logOk(d);
-    for (const m of result.missing) logErr(`Missing: ${m}`);
+    for (const m of result.missing) logErr(`Missing: ${m}${result.missingHints?.[m] ?? ""}`);
     await reportInstalledSoftDeps(am2);
   } catch (err2) {
     logErr(`Install failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
@@ -9031,7 +9490,7 @@ async function reportNestedPresetRefs(preset) {
 }
 async function checkPresetCycles(preset, resolved) {
   const { detectCycles } = await import('../discovery/index.js');
-  const presetRef = path25__default.basename(resolved, ".preset.yaml");
+  const presetRef = path23__default.basename(resolved, ".preset.yaml");
   const edges = [];
   for (const item of preset.items) {
     if (item.ref) {
@@ -9083,7 +9542,7 @@ function printPresetSummary(preset, placeholderCount, hasWarnings) {
   }
 }
 async function runPresetValidate(filePath) {
-  const resolved = path25__default.resolve(filePath);
+  const resolved = path23__default.resolve(filePath);
   const preset = await loadPresetForValidation(resolved);
   await reportNestedPresetRefs(preset);
   await checkPresetCycles(preset, resolved);
@@ -9133,11 +9592,11 @@ items:
 }
 function makeRebuildCommand() {
   return new Command("rebuild").description("Re-snapshot inline-snapshot composition items and bump prompt version").argument("[agent]", "Agent name or path (defaults to current project agent)").option("--project-dir <dir>", "Project directory", process.cwd()).action(async (agentArg, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     let agentDir;
     if (agentArg) {
       if (agentArg.includes("/") || agentArg.includes("\\")) {
-        agentDir = path25__default.resolve(projectDir, agentArg);
+        agentDir = path23__default.resolve(projectDir, agentArg);
       } else {
         let resolved;
         try {
@@ -9146,7 +9605,7 @@ function makeRebuildCommand() {
           if (!(err2 instanceof AgentRefResolutionError)) throw err2;
           logWarn(`${err2.message} \u2014 using "${agentArg}"`);
         }
-        agentDir = resolved ?? path25__default.resolve(projectDir, agentArg);
+        agentDir = resolved ?? path23__default.resolve(projectDir, agentArg);
       }
     } else {
       let resolved;
@@ -9216,9 +9675,9 @@ Try a different harness with \`--driver claude-sdk\`.`;
 // cli/src/commands/run.ts
 function resolveSingleShotAgentDir(projectDir, agentDefinition) {
   if (!agentDefinition) return resolveAgentDir(projectDir);
-  const asPath = agentDefinition.endsWith("agent.yaml") ? path25__default.dirname(path25__default.resolve(projectDir, agentDefinition)) : agentDefinition;
+  const asPath = agentDefinition.endsWith("agent.yaml") ? path23__default.dirname(path23__default.resolve(projectDir, agentDefinition)) : agentDefinition;
   const dir = resolveAgentDefinitionDir(projectDir, asPath);
-  if (!dir || !fs11__default.existsSync(path25__default.join(dir, "agent.yaml"))) {
+  if (!dir || !fs9__default.existsSync(path23__default.join(dir, "agent.yaml"))) {
     throw new Error(
       `--agent-definition "${agentDefinition}" does not resolve to an agent directory with agent.yaml${dir ? ` (looked in ${dir})` : ""}`
     );
@@ -9317,7 +9776,7 @@ function makeRunCommand() {
     "--agent-definition <ref|path>",
     "Agent asset for this one invocation (agent:@pub/name, ai-assets://\u2026, or a directory with agent.yaml); single-shot prompts only"
   ).option("--skill <name>", "Skill name (for single-shot mode)").action(async (positional, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const cliDriver = opts.driver;
     const dryRun = opts.dryRun ?? false;
     const agentDefinition = opts.agentDefinition?.trim() || void 0;
@@ -9436,7 +9895,7 @@ function makeRunCommand() {
 }
 function makeResumeCommand() {
   const cmd = new Command("resume").description("Resume current session").option("--project-dir <path>", "Project directory", process.cwd()).option("--session <run-id>", "Target session by runId").option("--dry-run", "Print plan without executing").action(async (opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const sessionId = opts.session;
     const dryRun = opts.dryRun ?? false;
     const session = sessionId ? await loadSessionById(projectDir, sessionId) : await loadSession(projectDir);
@@ -9463,7 +9922,7 @@ function makeResumeCommand() {
 }
 function makeStatusCommand() {
   return new Command("status").description("Show current session state").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const session = await loadSession(projectDir);
     if (!session) {
       logInfo("No active session.");
@@ -9488,7 +9947,7 @@ function makeStatusCommand() {
 }
 function makeClearCommand() {
   return new Command("clear").description("Unset current session pointer").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     await clearSession(projectDir);
     logOk("Session cleared.");
   });
@@ -9498,7 +9957,7 @@ function makeReplCommand() {
     const { findWorkspaceRoot } = await import('../core/index.js');
     const { startRepl } = await import('../tui/index.js');
     const os2 = await import('os');
-    const userCwd = path25__default.resolve(opts.projectDir ?? process.cwd());
+    const userCwd = path23__default.resolve(opts.projectDir ?? process.cwd());
     const workspaceRoot = findWorkspaceRoot(userCwd);
     let projectDir;
     let agentCwd;
@@ -9520,13 +9979,13 @@ function makeReplCommand() {
         p4.cancel("Cancelled.");
         process.exit(0);
       }
-      const tmpDir = fs11__default.mkdtempSync(path25__default.join(os2.tmpdir(), "skaile-repl-"));
+      const tmpDir = fs9__default.mkdtempSync(path23__default.join(os2.tmpdir(), "skaile-repl-"));
       projectDir = tmpDir;
       agentCwd = userCwd;
       logOk(`Temporary workspace: ${S.cmd(tmpDir)}`);
       if (!driverOverride) {
-        const claudeDir = path25__default.join(os2.homedir(), ".claude");
-        if (fs11__default.existsSync(claudeDir)) {
+        const claudeDir = path23__default.join(os2.homedir(), ".claude");
+        if (fs9__default.existsSync(claudeDir)) {
           driverOverride = "claude-sdk";
           logInfo(`Detected ${S.cmd("~/.claude")} \u2192 using ${S.cmd("claude-sdk")} harness`);
         } else {
@@ -9598,12 +10057,12 @@ function makeServeCommand() {
   );
 }
 async function ensurePluginsLoadedForServe(projectDir) {
-  const { logInfo: logInfo2, logWarn: logWarn2 } = await import('../helpers-R44RUTDY.js');
+  const { logInfo: logInfo2, logWarn: logWarn2 } = await import('../helpers-MWZDRBLD.js');
   try {
     const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
     const config = resolveSkWorkspaceConfig2(projectDir);
     if (!config.plugins || config.plugins.length === 0) return;
-    const { ensurePluginsLoaded } = await import('../plugin-store-66QFBNEO.js');
+    const { ensurePluginsLoaded } = await import('../plugin-store-MPAMD5OT.js');
     const { pluginRegistry } = await import('../plugin-registry/index.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     if (result.loaded.length > 0) {
@@ -9617,14 +10076,14 @@ async function ensurePluginsLoadedForServe(projectDir) {
   }
 }
 async function runCompileTest(opts) {
-  const { logOk: logOk2, logErr: logErr2, logInfo: logInfo2, S: S2 } = await import('../helpers-R44RUTDY.js');
+  const { logOk: logOk2, logErr: logErr2, logInfo: logInfo2, S: S2 } = await import('../helpers-MWZDRBLD.js');
   const { tmpdir } = await import('os');
   const { dirname: dirname3, join: join7, resolve: resolve5 } = await import('path');
   const { fileURLToPath: fileURLToPath2 } = await import('url');
   const { unlinkSync, existsSync: existsSync18 } = await import('fs');
   const { spawn } = await import('child_process');
   const { portableSpawnSync: portableSpawnSync2 } = await import('../core/index.js');
-  const { MONOREPO_ROOT } = await import('../paths-YUCP7K6U.js');
+  const { MONOREPO_ROOT } = await import('../paths-FQ64OLJG.js');
   if (MONOREPO_ROOT === null) {
     logErr2("--compile-test is only available inside the skaile-dev workspace.");
     logInfo2("Run it from a checkout of skaile-ai/skaile-dev (the monorepo shell).");
@@ -10107,7 +10566,7 @@ function resolveMode2(opts) {
   if (opts.forceLocal && opts.forceRemote) {
     throw new Error("Cannot use both --local and --remote");
   }
-  const startDir = path25__default.resolve(opts.projectDir ?? process.cwd());
+  const startDir = path23__default.resolve(opts.projectDir ?? process.cwd());
   const localDb = findLogsDb(startDir);
   if (opts.forceLocal) {
     if (!localDb) {
@@ -10140,14 +10599,14 @@ function resolveMode2(opts) {
 function findLogsDb(startDir) {
   let dir = startDir;
   for (let i = 0; i < MAX_WALK_LEVELS; i++) {
-    const candidate = path25__default.join(dir, ".skaile", "logs.db");
+    const candidate = path23__default.join(dir, ".skaile", "logs.db");
     if (existsSync(candidate)) {
       try {
         if (statSync(candidate).isFile()) return candidate;
       } catch {
       }
     }
-    const parent = path25__default.dirname(dir);
+    const parent = path23__default.dirname(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
@@ -10322,7 +10781,7 @@ function parsePositiveInt(value, flag) {
 function makeSessionCommand() {
   const cmd = new Command("session").description("Manage sessions");
   cmd.command("list").description("List all sessions for a project").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const sessions = await listSessions(projectDir);
     const current = await loadSession(projectDir);
     if (sessions.length === 0) {
@@ -10350,7 +10809,7 @@ function makeSessionCommand() {
     console.log();
   });
   cmd.command("show <run-id>").description("Show a specific session").option("--project-dir <path>", "Project directory", process.cwd()).action(async (runId, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
     const session = await loadSessionById(projectDir, runId);
     if (!session) {
       logErr(`Session not found: ${runId}`);
@@ -10359,12 +10818,20 @@ function makeSessionCommand() {
     console.log(JSON.stringify(session, null, 2));
   });
   cmd.command("switch <run-id>").description("Switch the current session").option("--project-dir <path>", "Project directory", process.cwd()).action(async (runId, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
+    if (!await loadSessionById(projectDir, runId)) {
+      logErr(`Session not found: ${runId}`);
+      process.exit(1);
+    }
     await setCurrentSession(projectDir, runId);
     logOk(`Switched to session: ${S.dim(runId.slice(0, 8))}`);
   });
   cmd.command("delete <run-id>").description("Delete a session").option("--project-dir <path>", "Project directory", process.cwd()).action(async (runId, opts) => {
-    const projectDir = path25__default.resolve(opts.projectDir);
+    const projectDir = path23__default.resolve(opts.projectDir);
+    if (!await loadSessionById(projectDir, runId)) {
+      logErr(`Session not found: ${runId}`);
+      process.exit(1);
+    }
     await deleteSession(projectDir, runId);
     logOk(`Deleted session: ${S.dim(runId.slice(0, 8))}`);
   });
@@ -10418,12 +10885,12 @@ function showOverview(am2) {
 }
 async function showAsset(am2, kind, name) {
   const entry = await am2.info(`${kind}:${name}`);
-  if (entry?.source && fs11__default.existsSync(entry.source)) {
+  if (entry?.source && fs9__default.existsSync(entry.source)) {
     console.log();
     console.log(`  ${kindColor(entry.kind)} ${S.heading(entry.name)}`);
     console.log(`  ${S.rule(40)}`);
     console.log();
-    console.log(fs11__default.readFileSync(entry.source, "utf-8"));
+    console.log(fs9__default.readFileSync(entry.source, "utf-8"));
     return;
   }
   logErr(`Asset not found: ${kind}:${name}`);
@@ -10433,7 +10900,7 @@ function makeShowCommand() {
   return new Command("show").description("Show deployed assets overview, or print asset content").argument("[kind]", "Asset kind (skill, agent, prompt, flow, preset, contract)").argument("[name]", "Asset name").option("--project-dir <path>", "Project directory", process.cwd()).option("--target <agent>", `Agent framework (${TARGET_DEFAULT_HINT})`).action(async (kind, name, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir),
+      projectDir: path23__default.resolve(opts.projectDir),
       driverTarget: opts.target
     });
     if (!kind) {
@@ -10496,14 +10963,14 @@ function makeStoreCommand() {
   });
   store.command("mode <auto|local|remote>").description("Set the catalog resolution mode (not yet wired)").action((_mode) => {
     logErr(
-      `\`skaile store mode\` is scaffolded but not yet wired. Store config lives at ${path25__default.join(globalSkaileDir(), "store", "config.yaml")}.`
+      `\`skaile store mode\` is scaffolded but not yet wired. Store config lives at ${path23__default.join(globalSkaileDir(), "store", "config.yaml")}.`
     );
     process.exit(2);
   });
   store.command("search <query>").description("Search the AI Asset Store catalog by name, description, or publisher").option("--kind <kind>", "Filter by asset kind (skill, agent, prompt, flow, \u2026)").option("-C, --project-dir <dir>", "Project directory (catalog config overlay)", process.cwd()).action(async (query, opts) => {
-    const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError } = await import('../open-library-4WUMQHES.js');
+    const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-OG457THY.js');
     try {
-      const remote = await openCatalogSource2({ projectDir: path25__default.resolve(opts.projectDir) });
+      const remote = await openCatalogSource2({ projectDir: path23__default.resolve(opts.projectDir) });
       const assets = await remote.listAssets(opts.kind ? { kind: opts.kind } : {});
       const results = filterCatalogAssets(assets, query);
       if (results.length === 0) {
@@ -10518,7 +10985,7 @@ function makeStoreCommand() {
 `
       );
     } catch (e) {
-      if (e instanceof LocalCatalogDisabledError) {
+      if (e instanceof LocalCatalogDisabledError2) {
         logErr(
           `Remote catalog disabled (catalog.url: local). Set \`catalog.url: https://skaile.store\` in ${userConfigPath()}.`
         );
@@ -10529,10 +10996,10 @@ function makeStoreCommand() {
     }
   });
   store.command("show <ref>").description("Show a store asset's details + provenance (source, files, integrity)").option("-C, --project-dir <dir>", "Project directory (catalog config overlay)", process.cwd()).action(async (ref, opts) => {
-    const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError } = await import('../open-library-4WUMQHES.js');
-    const { supportsInstallManifest } = await import('../project-VMOHUXBD.js');
+    const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-OG457THY.js');
+    const { supportsInstallManifest } = await import('../project-2GFT5LEZ.js');
     try {
-      const remote = await openCatalogSource2({ projectDir: path25__default.resolve(opts.projectDir) });
+      const remote = await openCatalogSource2({ projectDir: path23__default.resolve(opts.projectDir) });
       const asset = await remote.resolve(ref);
       if (!asset) {
         logErr(`Not found in store: ${ref} (try a full ref, e.g. skill:@publisher/name#version)`);
@@ -10580,7 +11047,7 @@ function makeStoreCommand() {
       console.log(`  ${S.dim(`Install:  skaile add ${canonical}`)}`);
       console.log();
     } catch (e) {
-      if (e instanceof LocalCatalogDisabledError) {
+      if (e instanceof LocalCatalogDisabledError2) {
         logErr(
           `Remote catalog disabled (catalog.url: local). Set \`catalog.url: https://skaile.store\` in ${userConfigPath()}.`
         );
@@ -10643,29 +11110,31 @@ function makeStoreCommand() {
   });
   return store;
 }
-function printTree(node, prefix = "", isLast = true) {
-  const connector = prefix === "" ? "" : isLast ? "\u2514\u2500 " : "\u251C\u2500 ";
-  const line = prefix + connector + colorRef(node.ref);
-  console.log(`  ${line}`);
-  const childPrefix = prefix + (prefix === "" ? "" : isLast ? "   " : "\u2502  ");
-  for (let i = 0; i < node.children.length; i++) {
-    printTree(node.children[i], childPrefix, i === node.children.length - 1);
-  }
+function printChildren(nodes, prefix) {
+  nodes.forEach((node, i) => {
+    const isLast = i === nodes.length - 1;
+    console.log(`  ${prefix}${isLast ? "\u2514\u2500 " : "\u251C\u2500 "}${colorRef(node.ref)}`);
+    printChildren(node.children, prefix + (isLast ? "   " : "\u2502  "));
+  });
+}
+function treeRefs(nodes) {
+  return [...new Set(nodes.flatMap((n) => [n.ref, ...treeRefs(n.children)]))];
 }
 function makeTreeCommand() {
   return new Command("tree").description("Show full dependency tree").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
-    const root = am2.tree();
+    const root = await am2.tree();
     if (root.children.length === 0) {
       logInfo("No dependencies in lock file. Run `skaile install` first.");
       return;
     }
     console.log();
-    printTree(root);
-    const softDeps = await am2.softDepsOf(root.children.map((c) => c.ref));
+    console.log(`  ${colorRef(root.ref)}`);
+    printChildren(root.children, "");
+    const softDeps = await am2.softDepsOf(treeRefs(root.children));
     if (softDeps.length > 0) {
       console.log(`  ${S.label("Soft dependencies (inferred)")}:`);
       for (const e of softDeps)
@@ -10683,20 +11152,24 @@ function makeUpdateCommand() {
         const catalogSpinner = createSpinner();
         catalogSpinner.start("Refreshing catalog cache");
         try {
-          const remote = await openCatalogSource({ projectDir: path25__default.resolve(opts.projectDir) });
+          const remote = await openCatalogSource({ projectDir: path23__default.resolve(opts.projectDir) });
           const result2 = await remote.refresh();
           catalogSpinner.stop(
             `Catalog refreshed: ${S.heading(String(result2.assetsCached))} assets cached`
           );
           logInfo(`Source: ${remote.baseUrl}`);
         } catch (err2) {
-          catalogSpinner.stop("Catalog refresh failed");
-          logErr(`Catalog refresh failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
-          logInfo("Continuing with asset re-deploy. Run `skaile catalog test` to debug.");
+          if (err2 instanceof LocalCatalogDisabledError) {
+            catalogSpinner.stop("Catalog refresh skipped (catalog.url: local)");
+          } else {
+            catalogSpinner.stop("Catalog refresh failed");
+            logErr(`Catalog refresh failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+            logInfo("Continuing with asset re-deploy. Run `skaile catalog test` to debug.");
+          }
         }
       }
       if (opts.catalogOnly) return;
-      const projectDir = path25__default.resolve(opts.projectDir);
+      const projectDir = path23__default.resolve(opts.projectDir);
       if (await shouldSyncSources(opts)) {
         const syncSpinner = createSpinner();
         syncSpinner.start("Syncing sources");
@@ -10704,6 +11177,7 @@ function makeUpdateCommand() {
         syncSpinner.stop(
           total === 0 ? "No sources to sync." : `Synced ${S.heading(`${synced}/${total}`)} source(s)` + (failed ? ` (${failed} failed)` : "")
         );
+        if (failed > 0) process.exitCode = 1;
       }
       const warnings = deferredWarnings();
       const am2 = new AssetManager({
@@ -10726,7 +11200,17 @@ function makeUpdateCommand() {
       warnings.flush();
       if (result.deployed.length > 0) {
         for (const d of result.deployed) logOk(`Updated ${d}`);
-      } else {
+      }
+      for (const r of result.removed) logWarn(`Removed: ${r}`);
+      reportRelocked(result.relocked);
+      const changed = result.deployed.length > 0 || result.removed.length > 0 || !!result.relocked?.length;
+      if (result.lockWritten && changed) {
+        logInfo(`Lock file written: ${S.dim("skaile.lock.yaml")}`);
+      }
+      if (result.missing.length > 0) {
+        for (const m of result.missing) logErr(`Missing: ${m}${result.missingHints?.[m] ?? ""}`);
+        process.exitCode = 1;
+      } else if (!changed) {
         logInfo("Nothing to update.");
       }
     }
@@ -10840,9 +11324,9 @@ function makeWhyCommand() {
   return new Command("why").description("Show why an asset is installed (dependency chain)").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path25__default.resolve(opts.projectDir)
+      projectDir: path23__default.resolve(opts.projectDir)
     });
-    const chain = am2.why(ref);
+    const chain = await am2.why(ref);
     if (chain.length === 0) {
       let declared;
       try {
@@ -10875,10 +11359,19 @@ function makeWhyCommand() {
 var _defaultFormatHelp = Help.prototype.formatHelp;
 var pkg = JSON.parse(
   readFileSync(
-    path25__default.resolve(path25__default.dirname(fileURLToPath(import.meta.url)), "../../package.json"),
+    path23__default.resolve(path23__default.dirname(fileURLToPath(import.meta.url)), "../../package.json"),
     "utf-8"
   )
 );
+for (const key of [
+  "SKAILE_HOME",
+  "SKAILE_INDEX_PATH",
+  "SKAILE_LIBRARIES_DIR",
+  "SKAILE_CACHE_DIR"
+]) {
+  const value = process.env[key];
+  if (value) process.env[key] = path23__default.resolve(value);
+}
 var program = new Command("skaile").description("AI asset manager").version(pkg.version, "-v, --version", "Show the skaile CLI version").enablePositionalOptions().configureHelp({
   formatHelp(cmd, helper) {
     if (cmd.name() !== "skaile") return _defaultFormatHelp.call(helper, cmd, helper);
@@ -10938,7 +11431,7 @@ Execution:
   debug tools|connectors|mcp|config|state  Inspect running container state
   connect <url>                Interactive WebSocket REPL
   logs [--follow] [--filter]   Tail skaile container logs
-  session list|show|switch|del Session management
+  session list|show|switch|delete  Session management
   status                       Current session state
   clear                        Unset current session
 
@@ -11006,31 +11499,31 @@ async function runInit(projectDir, opts) {
     process.exitCode = 1;
     return;
   }
-  const resolved = path25__default.resolve(projectDir ?? ".");
-  const projectName = path25__default.basename(resolved);
+  const resolved = path23__default.resolve(projectDir ?? ".");
+  const projectName = path23__default.basename(resolved);
   const created = [];
   const { existsSync: existsSync18 } = await import('fs');
   if (!existsSync18(resolved)) {
     mkdirSync5(resolved, { recursive: true });
     created.push(".");
   }
-  const skaileDir = path25__default.join(resolved, ".skaile");
+  const skaileDir = path23__default.join(resolved, ".skaile");
   if (!existsSync18(skaileDir)) {
-    mkdirSync5(path25__default.join(skaileDir, "sessions"), { recursive: true });
+    mkdirSync5(path23__default.join(skaileDir, "sessions"), { recursive: true });
     created.push(".skaile/");
   }
-  const settingsPath = path25__default.join(skaileDir, "settings.json");
+  const settingsPath = path23__default.join(skaileDir, "settings.json");
   if (!existsSync18(settingsPath)) {
     writeFileSync7(settingsPath, "{}\n");
     created.push(".skaile/settings.json");
   }
-  const wsConfigPath = path25__default.join(resolved, "skaile.yaml");
+  const wsConfigPath = path23__default.join(resolved, "skaile.yaml");
   if (!existsSync18(wsConfigPath)) {
     writeFileSync7(wsConfigPath, stringify2(buildInitWorkspaceConfig(projectName, harness)));
     created.push("skaile.yaml");
   }
   for (const dir of new Set(Object.values(DRIVER_TARGETS[harness].local))) {
-    const full = path25__default.join(resolved, dir);
+    const full = path23__default.join(resolved, dir);
     if (!existsSync18(full)) {
       mkdirSync5(full, { recursive: true });
       created.push(`${dir}/`);
@@ -11060,9 +11553,9 @@ function buildInitWorkspaceConfig(projectName, harness) {
   };
 }
 async function initGitScaffold(resolved, created) {
-  const { execSync: execSync3 } = await import('child_process');
+  const { execSync: execSync2 } = await import('child_process');
   const { existsSync: existsSync18, readFileSync: readFileSync10, writeFileSync: writeFileSync7 } = await import('fs');
-  const gitignorePath = path25__default.join(resolved, ".gitignore");
+  const gitignorePath = path23__default.join(resolved, ".gitignore");
   const entries = [
     "node_modules/",
     ".skaile/sessions/",
@@ -11088,9 +11581,9 @@ async function initGitScaffold(resolved, created) {
 `);
     if (!existing) created.push(".gitignore");
   }
-  if (!existsSync18(path25__default.join(resolved, ".git"))) {
+  if (!existsSync18(path23__default.join(resolved, ".git"))) {
     try {
-      execSync3("git init", { cwd: resolved, stdio: "pipe" });
+      execSync2("git init", { cwd: resolved, stdio: "pipe" });
       created.push(".git/");
     } catch (err2) {
       const msg = err2 instanceof Error ? err2.message : String(err2);
@@ -11118,7 +11611,7 @@ async function bootstrapUserConfig() {
 }
 async function hydrateInitSources(resolved, created) {
   try {
-    const { ensureSourcesCloned } = await import('../ensure-sources-DSTSXJWK.js');
+    const { ensureSourcesCloned } = await import('../ensure-sources-SKLNM4UZ.js');
     const hydrate = ensureSourcesCloned(resolved, { quiet: true });
     for (const n of hydrate.cloned) created.push(`~/.skaile/cache/sources/${n}/`);
     if (hydrate.failed.length > 0) {
@@ -11134,7 +11627,7 @@ function printInitSummary(resolved, projectDir, created) {
   logOk(`Initialized project at ${S.heading(resolved)}`);
   console.log();
   console.log(S.heading("  Next steps:"));
-  const isCurrentDir = resolved === path25__default.resolve(".");
+  const isCurrentDir = resolved === path23__default.resolve(".");
   let step = 1;
   if (!isCurrentDir) {
     console.log(`  ${S.dim(`${step}.`)} ${S.cmd(`cd ${projectDir}`)}`);
@@ -11158,7 +11651,7 @@ function printInitSummary(resolved, projectDir, created) {
   console.log();
 }
 program.command("setup").description("Interactive provider setup wizard").action(async () => {
-  const { cmdSetup } = await import('../setup-PYY23HGZ.js');
+  const { cmdSetup } = await import('../setup-WHMCSIF2.js');
   await cmdSetup([], { projectDir: process.cwd() });
 });
 program.addCommand(makeInstallCommand());
@@ -11232,6 +11725,10 @@ program.command("path").description("Show resolved paths (honours SKAILE_HOME an
   console.log();
 });
 program.addCommand(makeCompleteCommand(program));
+process.stdout.on("error", (err2) => {
+  if (err2.code === "EPIPE") process.exit(0);
+  throw err2;
+});
 try {
   await program.parseAsync();
 } catch (err2) {