@skaile/workspaces 5.14.0 → 5.15.1

package/dist/{chunk-ODQGLELI.js → chunk-OOQ5Q75W.js}

@@ -1,12 +1,12 @@
-import { readManifestSourceConfig, discoverAssetsInTree, barePublisher, createDefaultKindRegistry, sharesItsFolder, SEMVER_RE, parseManifestFile } from './chunk-NVO6WECE.js';
-import { installFromManifest, assertSafeManifestPath } from './chunk-PXDWTJ3P.js';
-import { PresetManifestSchema } from './chunk-57SF6W6E.js';
-import { defaultLibraryDir, resolveLibraryDir, GLOBAL_INSTALL_DIR_NAME, readLock, buildLibraryLockEntries, writeLock, mergeLockFile, buildLockFile, ManifestYamlEditor } from './chunk-OX2W5YF3.js';
-import { getGlobalCacheDir, storeManifestSlug, resolveSourcePublisher } from './chunk-CAPKENNF.js';
+import { readManifestSourceConfig, discoverAssetsInTree, barePublisher, createDefaultKindRegistry, sharesItsFolder, SEMVER_RE, parseManifestFile } from './chunk-NKDSU4Q7.js';
+import { installFromManifest, assertSafeManifestPath } from './chunk-KRRHADE7.js';
+import { PresetManifestSchema } from './chunk-MGM5EJQQ.js';
+import { defaultLibraryDir, resolveLibraryDir, GLOBAL_INSTALL_DIR_NAME, readLock, buildLibraryLockEntries, writeLock, mergeLockFile, buildLockFile, ManifestYamlEditor } from './chunk-4QINFQ27.js';
+import { getGlobalCacheDir, storeManifestSlug, resolveSourcePublisher } from './chunk-J76LDUDS.js';
 import { userConfigPath, globalSkaileDir, mergeLegacyEntriesInto, migrateLegacyDir, globalCacheRoot } from './chunk-L5VSIPQD.js';
-import { encodeSkaileManifest, SKAILE_MANIFEST_FILENAME, loadSkPublishManifest } from './chunk-IY5E7Y5W.js';
-import { scanDirectory } from './chunk-M3P4BYRK.js';
-import { parseAssetRef, assetRefToStr, isValidAssetName } from './chunk-J4OYIYFQ.js';
+import { encodeSkaileManifest, SKAILE_MANIFEST_FILENAME, librarySymlinkMessage, loadSkPublishManifest } from './chunk-ANSZULXH.js';
+import { scanDirectory } from './chunk-SP5NGNBV.js';
+import { parseAssetRef, assetRefToStr, isValidAssetName } from './chunk-VY6NTFE7.js';
 import { __export } from './chunk-NSBPE2FW.js';
 import * as fs11 from 'fs';
 import { existsSync, mkdirSync, symlinkSync, copyFileSync, cpSync } from 'fs';
@@ -3593,10 +3593,22 @@ var RemoteCatalogSource = class {
    *
    * In air-gapped mode this method **does** make a network call (bypassing
    * the TTL=0 gate); it is the only way to repopulate the cache.
+   *
+   * @param opts.timeoutMs - Give up after this long instead of the default request timeout; the
+   *   error then reads `no answer from <url> within <n> s`.
    */
-  async refresh() {
+  async refresh(opts) {
     this.cache.invalidateAll();
-    const items = await this.fetchListNetwork(void 0);
+    let items;
+    try {
+      items = await this.fetchListNetwork(void 0, opts?.timeoutMs);
+    } catch (err) {
+      const e = err;
+      if (opts?.timeoutMs !== void 0 && (e?.name === "TimeoutError" || e?.name === "AbortError")) {
+        throw new Error(`no answer from ${this.baseUrl} within ${opts.timeoutMs / 1e3} s`);
+      }
+      throw err;
+    }
     this.cache.setList(void 0, items);
     for (const item of items) {
       this.cache.setResolve(item.id, item);
@@ -3754,12 +3766,13 @@ var RemoteCatalogSource = class {
     return normalizeCatalogAsset(data);
   }
   /** Raw network call: GET /trpc/catalog.list?input=<superjson> */
-  async fetchListNetwork(filter) {
+  async fetchListNetwork(filter, timeoutMs) {
     const input = filter ? { filter } : {};
     const url = trpcGetUrl(this.baseUrl, "catalog.list", input);
     const res = await this.httpClient(url, {
       method: "GET",
-      headers: { Accept: "application/json" }
+      headers: { Accept: "application/json" },
+      ...timeoutMs !== void 0 ? { signal: AbortSignal.timeout(timeoutMs) } : {}
     });
     if (!res.ok) {
       throw new CatalogHttpError(
@@ -4086,10 +4099,22 @@ var RestCatalogSource = class {
    *
    * In air-gapped mode this method **does** make a network call (bypassing
    * the TTL=0 gate); it is the only way to repopulate the cache.
+   *
+   * @param opts.timeoutMs - Give up after this long instead of the default request timeout; the
+   *   error then reads `no answer from <url> within <n> s`.
    */
-  async refresh() {
+  async refresh(opts) {
     this.cache.invalidateAll();
-    const items = await this.fetchListNetwork(void 0);
+    let items;
+    try {
+      items = await this.fetchListNetwork(void 0, opts?.timeoutMs);
+    } catch (err) {
+      const e = err;
+      if (opts?.timeoutMs !== void 0 && (e?.name === "TimeoutError" || e?.name === "AbortError")) {
+        throw new Error(`no answer from ${this.baseUrl} within ${opts.timeoutMs / 1e3} s`);
+      }
+      throw err;
+    }
     this.cache.setList(void 0, items);
     for (const item of items) {
       this.cache.setResolve(item.id, item);
@@ -4152,7 +4177,7 @@ var RestCatalogSource = class {
     return normalizeRestAsset(data);
   }
   /** Raw network call: GET /api/catalog/list?publisher=&kind=&category= */
-  async fetchListNetwork(filter) {
+  async fetchListNetwork(filter, timeoutMs) {
     const params = new URLSearchParams();
     if (filter?.publisher) params.set("publisher", filter.publisher);
     if (filter?.kind) params.set("kind", filter.kind);
@@ -4160,7 +4185,8 @@ var RestCatalogSource = class {
     const url = `${this.baseUrl}/api/catalog/list${qs ? `?${qs}` : ""}`;
     const res = await this.httpClient(url, {
       method: "GET",
-      headers: { Accept: "application/json" }
+      headers: { Accept: "application/json" },
+      ...timeoutMs !== void 0 ? { signal: AbortSignal.timeout(timeoutMs) } : {}
     });
     if (!res.ok) {
       throw new CatalogHttpError(
@@ -4306,6 +4332,36 @@ function assertManifestEditable(libraryPath) {
   if (!fs11.existsSync(file)) return;
   openManifest(libraryPath);
 }
+function assetRootProblem(libraryPath, root) {
+  const libDir = path16.resolve(libraryPath);
+  let realLib;
+  try {
+    realLib = fs11.realpathSync(libDir);
+  } catch {
+    return void 0;
+  }
+  const parts = root.split(/[\\/]+/);
+  if (path16.isAbsolute(root) || parts.includes("..")) {
+    return `asset root "${root}" must stay inside the library (${realLib}): it resolves to ${path16.resolve(libDir, root)}.`;
+  }
+  let current = libDir;
+  const walked = [];
+  for (const part of parts) {
+    if (part === "" || part === ".") continue;
+    current = path16.join(current, part);
+    walked.push(part);
+    let stat;
+    try {
+      stat = fs11.lstatSync(current);
+    } catch {
+      return void 0;
+    }
+    if (stat.isSymbolicLink()) {
+      return librarySymlinkMessage({ path: walked.join("/"), target: fs11.readlinkSync(current) });
+    }
+  }
+  return void 0;
+}
 function conflictingAssetRoot(libraryPath, kind, name, root) {
   const existing = loadSkPublishManifest(path16.resolve(libraryPath))?.assets?.find(
     (a) => a.kind === kind && a.name === name
@@ -4390,6 +4446,40 @@ function setManifestPublisher(libraryPath, publisher) {
   editor.save();
   return true;
 }
+function reconcileEntryNames(libraryPath, scanned) {
+  const renamed = [];
+  const superseded = [];
+  const manifest = loadSkPublishManifest(libraryPath);
+  if (!manifest || manifest.source) return { renamed, superseded };
+  const entries = manifest.assets ?? [];
+  const listed = new Set(entries.map((a) => `${a.kind}:${a.name}`));
+  const onDisk = new Set(scanned.map((e) => `${e.kind}:${e.name}`));
+  const parsable = scanned.filter((e) => isParsable(e.source));
+  const edits = [];
+  for (const entry of entries) {
+    if (!entry.root || entry.source || onDisk.has(`${entry.kind}:${entry.name}`)) continue;
+    const dir = path16.resolve(libraryPath, entry.root);
+    const holders = parsable.filter(
+      (s) => s.kind === entry.kind && path16.resolve(path16.dirname(s.source)) === dir
+    );
+    if (holders.length === 0) continue;
+    const free = holders.filter((s) => !listed.has(`${s.kind}:${s.name}`));
+    const target = free.length === 1 ? free[0] : void 0;
+    if (target) {
+      listed.add(`${target.kind}:${target.name}`);
+      renamed.push({ from: entry, to: target.name });
+      edits.push((editor2) => editor2.renameAsset(entry.kind, entry.name, target.name));
+    } else if (free.length === 0) {
+      superseded.push(entry);
+      edits.push((editor2) => editor2.removeAsset(entry.kind, entry.name));
+    }
+  }
+  if (edits.length === 0) return { renamed, superseded };
+  const { editor } = openManifest(libraryPath);
+  for (const edit of edits) edit(editor);
+  editor.save();
+  return { renamed, superseded };
+}
 async function syncManifestWithDisk(libraryPath, defaultPublisher, registry, opts = {}) {
   stampManifestPublisher(libraryPath, defaultPublisher);
   const knownKinds = new Set(registry.getAllKinds());
@@ -4402,6 +4492,7 @@ async function syncManifestWithDisk(libraryPath, defaultPublisher, registry, opt
     knownKinds,
     keepDuplicates: true
   });
+  const { renamed, superseded } = reconcileEntryNames(libraryPath, scanned);
   const rootOf = (e) => path16.relative(libraryPath, path16.dirname(e.source)) || e.name;
   const copiesOf = /* @__PURE__ */ new Map();
   for (const e of scanned) {
@@ -4476,7 +4567,7 @@ async function syncManifestWithDisk(libraryPath, defaultPublisher, registry, opt
       version: e.version || DEFAULT_ASSET_VERSION
     });
   }
-  return { removed, unknownKind, skipped, failed };
+  return { removed, unknownKind, skipped, failed, renamed, superseded };
 }
 async function scanUnlistedAssets(libraryPath, publisher, registry) {
   const manifest = loadSkPublishManifest(libraryPath);
@@ -4632,6 +4723,6 @@ function detectWorkspaceVersion(dir, filename = "skaile.yaml") {
   return raw.version === 2 ? 2 : 1;
 }
 
-export { AssignmentNotFoundError, CatalogCache, CatalogConfigSchema, CatalogHttpError, DuplicateAssignmentError, DuplicateLibraryNameError, GitSyncDriver, InstanceHasConsumersError, InstanceNotFoundError, InterpolationError, KnowledgeManifestSchema, LIBRARY_BACKENDS, LIBRARY_OWNERSHIPS, LOCAL_CATALOG_URL, LibraryConfigSchema, LibraryError, LibraryInstanceRefSchema, LibraryManager, LibrarySectionSchema, LibrarySyncError, LocalCatalogSource, LocalIndex, LocalSyncDriver, LockAssignmentSchema, LockFileSchema, OfflineError, OperationNotPermittedError, PIN_POLICIES, PinPolicySchema, PresetAppliedSchema, PresetExpandedSchema, RemoteCatalogSource, RequiresEdgeSchema, RestCatalogSource, SidecarGit, SkaileConfigSchema, SourceNotFoundError, TarballHashMismatchError, UserLibraryNotFoundError, WorkspaceConfigV2Schema, applyNonStructuralUpgrade, applyPreset, applyPresetFromData, assertManifestEditable, assertValidLibraryName, classifyRef, cloneOrInitGitRepo, commitStoreManifest, conflictingAssetRoot, createEmptyLockFile, curatedManifestOverlay, deriveSlug, describeCatalogError, detectChanges, detectNestedPresetRefs, detectWorkspaceVersion, ensureGitRepo, evaluateUpgrade, extractLibraryInstanceId, extractReferencedKeys, filterKey, getConfigDefaults, getDefaultValue, getSidecarRoot, getStoreManifestsDir, getStoreRoot, hasInterpolationTokens, installLibraryAsset, interpolate, isGitRepo, isLocalCatalogUrl, isSecretPlaceholder, knowledgeKindProvider, libraryDirMissing, listSidecarSlugsOnDisk, loadLockFile, loadWorkspaceV2, markLibraryUnregistered, migrateSidecarsToStoreIfNeeded, migrateWorkspaceConfig, missingLibraryDirMessage, missingRootAssets, parsePreset, parsePresetYaml, parseWorkspaceV2, projectConfigPath, pruneMissingRootAssets, queryInstancePickerChoices, recordLibraryRename, renamedLibraryName, resolveAllItems, resolveConfig, resolveIndexPath, resolveItem, resolvePin, resolveSidecarPaths, saveConfig, saveLockFile, saveWorkspaceV2, scanAuthoringLibraries, scanLibraryRoot, scanUnlistedAssets, setManifestPublisher, setOriginUrl, sha256Hex, stampManifestPublisher, storeSecrets, syncManifestWithDisk, trackOriginBranch, trpcGetUrl, unregisteredLibraryNames, upsertManifestAsset, validateAllPlaceholders, validateKnowledge, validateNestingDepth, validatePlaceholder, writeCuratedManifest };
-//# sourceMappingURL=chunk-ODQGLELI.js.map
-//# sourceMappingURL=chunk-ODQGLELI.js.map
+export { AssignmentNotFoundError, CatalogCache, CatalogConfigSchema, CatalogHttpError, DuplicateAssignmentError, DuplicateLibraryNameError, GitSyncDriver, InstanceHasConsumersError, InstanceNotFoundError, InterpolationError, KnowledgeManifestSchema, LIBRARY_BACKENDS, LIBRARY_OWNERSHIPS, LOCAL_CATALOG_URL, LibraryConfigSchema, LibraryError, LibraryInstanceRefSchema, LibraryManager, LibrarySectionSchema, LibrarySyncError, LocalCatalogSource, LocalIndex, LocalSyncDriver, LockAssignmentSchema, LockFileSchema, OfflineError, OperationNotPermittedError, PIN_POLICIES, PinPolicySchema, PresetAppliedSchema, PresetExpandedSchema, RemoteCatalogSource, RequiresEdgeSchema, RestCatalogSource, SidecarGit, SkaileConfigSchema, SourceNotFoundError, TarballHashMismatchError, UserLibraryNotFoundError, WorkspaceConfigV2Schema, applyNonStructuralUpgrade, applyPreset, applyPresetFromData, assertManifestEditable, assertValidLibraryName, assetRootProblem, classifyRef, cloneOrInitGitRepo, commitStoreManifest, conflictingAssetRoot, createEmptyLockFile, curatedManifestOverlay, deriveSlug, describeCatalogError, detectChanges, detectNestedPresetRefs, detectWorkspaceVersion, ensureGitRepo, evaluateUpgrade, extractLibraryInstanceId, extractReferencedKeys, filterKey, getConfigDefaults, getDefaultValue, getSidecarRoot, getStoreManifestsDir, getStoreRoot, hasInterpolationTokens, installLibraryAsset, interpolate, isGitRepo, isLocalCatalogUrl, isSecretPlaceholder, knowledgeKindProvider, libraryDirMissing, listSidecarSlugsOnDisk, loadLockFile, loadWorkspaceV2, markLibraryUnregistered, migrateSidecarsToStoreIfNeeded, migrateWorkspaceConfig, missingLibraryDirMessage, missingRootAssets, parsePreset, parsePresetYaml, parseWorkspaceV2, projectConfigPath, pruneMissingRootAssets, queryInstancePickerChoices, recordLibraryRename, renamedLibraryName, resolveAllItems, resolveConfig, resolveIndexPath, resolveItem, resolvePin, resolveSidecarPaths, saveConfig, saveLockFile, saveWorkspaceV2, scanAuthoringLibraries, scanLibraryRoot, scanUnlistedAssets, setManifestPublisher, setOriginUrl, sha256Hex, stampManifestPublisher, storeSecrets, syncManifestWithDisk, trackOriginBranch, trpcGetUrl, unregisteredLibraryNames, upsertManifestAsset, validateAllPlaceholders, validateKnowledge, validateNestingDepth, validatePlaceholder, writeCuratedManifest };
+//# sourceMappingURL=chunk-OOQ5Q75W.js.map
+//# sourceMappingURL=chunk-OOQ5Q75W.js.map