@skaile/workspaces 5.6.0 → 5.7.0

package/dist/{chunk-MX3UQXLU.js → chunk-DFFD4BFG.js}

@@ -1,12 +1,12 @@
-import { readManifestSourceConfig, discoverAssetsInTree, barePublisher, createDefaultKindRegistry, sharesItsFolder } from './chunk-XOGG7VDZ.js';
-import { installFromManifest, assertSafeManifestPath } from './chunk-BTISGSK4.js';
+import { readManifestSourceConfig, discoverAssetsInTree, barePublisher, createDefaultKindRegistry, sharesItsFolder, SEMVER_RE, parseManifestFile } from './chunk-6VRJH4MR.js';
+import { installFromManifest, assertSafeManifestPath } from './chunk-FAP63KV7.js';
 import { PresetManifestSchema } from './chunk-FRHE7FFB.js';
-import { defaultLibraryDir, resolveLibraryDir, GLOBAL_INSTALL_DIR_NAME, readLock, buildLibraryLockEntries, writeLock, mergeLockFile, buildLockFile, ManifestYamlEditor } from './chunk-TZCQ7ZWQ.js';
-import { getGlobalCacheDir, storeManifestSlug, resolveSourcePublisher } from './chunk-2W4LBLIN.js';
-import { userConfigPath, globalSkaileDir, mergeLegacyEntriesInto, migrateLegacyDir, globalCacheRoot } from './chunk-MFHKHXDE.js';
-import { encodeSkaileManifest, loadSkPublishManifest, SKAILE_MANIFEST_FILENAME } from './chunk-7ZHLYXTI.js';
-import { scanDirectory } from './chunk-PA7WLID3.js';
-import { parseAssetRef, assetRefToStr } from './chunk-AO7VJ6G6.js';
+import { defaultLibraryDir, resolveLibraryDir, GLOBAL_INSTALL_DIR_NAME, readLock, buildLibraryLockEntries, writeLock, mergeLockFile, buildLockFile, ManifestYamlEditor } from './chunk-OOLT6HGP.js';
+import { getGlobalCacheDir, storeManifestSlug, resolveSourcePublisher } from './chunk-LCU5U5IW.js';
+import { userConfigPath, globalSkaileDir, mergeLegacyEntriesInto, migrateLegacyDir, globalCacheRoot } from './chunk-L5VSIPQD.js';
+import { encodeSkaileManifest, loadSkPublishManifest, SKAILE_MANIFEST_FILENAME } from './chunk-RVIZQ5XD.js';
+import { scanDirectory } from './chunk-TTPSDC2G.js';
+import { parseAssetRef, assetRefToStr } from './chunk-O7VPNKYN.js';
 import { __export } from './chunk-NSBPE2FW.js';
 import * as fs10 from 'fs';
 import { existsSync, mkdirSync, symlinkSync, copyFileSync, cpSync } from 'fs';
@@ -106,7 +106,7 @@ function defaultIndexPath() {
   return path4.join(globalSkaileDir(), "index.db");
 }
 function resolveIndexPath() {
-  if (process.env.SKAILE_INDEX_PATH) return process.env.SKAILE_INDEX_PATH;
+  if (process.env.SKAILE_INDEX_PATH) return path4.resolve(process.env.SKAILE_INDEX_PATH);
   return defaultIndexPath();
 }
 function getConfigDefaults() {
@@ -1269,6 +1269,18 @@ function ensureGitRepo(libPath, url, branch) {
   }
   setOriginUrl(libPath, url);
 }
+function trackOriginBranch(libPath, branch, opts) {
+  spawnGit(libPath, ["config", `branch.${branch}.remote`, "origin"], "config");
+  spawnGit(libPath, ["config", `branch.${branch}.merge`, `refs/heads/${branch}`], "config");
+  if (opts?.fetch) {
+    spawnSync("git", ["fetch", "--quiet", "origin", branch], {
+      cwd: libPath,
+      encoding: "utf-8",
+      timeout: 2e4,
+      env: { ...process.env, GIT_TERMINAL_PROMPT: "0" }
+    });
+  }
+}
 function cloneOrInitGitRepo(libPath, url, branch) {
   mkdirSync(libPath, { recursive: true });
   const clone = spawnSync("git", ["clone", "--", url, libPath], {
@@ -1364,8 +1376,27 @@ var GitSyncDriver = class {
     const r = git(lib.path, args);
     if (r.status !== 0) {
       if (/couldn't find remote ref/i.test(r.stderr)) return { applied: 0, conflicts: [] };
-      if (/non-fast-forward|diverged|conflict/i.test(r.stderr)) {
-        return { applied: 0, conflicts: [{ path: "(branch)", reason: r.stderr.trim() }] };
+      if (/not possible to fast-forward|non-fast-forward|diverg/i.test(r.stderr)) {
+        return {
+          applied: 0,
+          conflicts: [
+            {
+              path: "(branch)",
+              reason: `local and remote both changed; run skaile library git ${lib.name} pull --rebase origin ${cfg.branch}`
+            }
+          ]
+        };
+      }
+      if (opts?.rebase && /conflict/i.test(r.stderr)) {
+        return {
+          applied: 0,
+          conflicts: [
+            {
+              path: "(branch)",
+              reason: `rebase stopped on conflicts; resolve them, then run skaile library git ${lib.name} rebase --continue (or --abort)`
+            }
+          ]
+        };
       }
       throw new LibrarySyncError(`git pull failed: ${r.stderr.trim()}`, "remote_error");
     }
@@ -1489,6 +1520,14 @@ function rowToLibrary2(row) {
     updatedAt: new Date(row.updatedAt)
   };
 }
+var LIBRARY_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
+function assertValidLibraryName(name) {
+  if (!LIBRARY_NAME_PATTERN.test(name)) {
+    throw new Error(
+      `Invalid library name "${name}": use letters, digits, "_" or "-", starting with a letter or digit.`
+    );
+  }
+}
 var LibraryManager = class {
   constructor(lib) {
     this.lib = lib;
@@ -1506,6 +1545,7 @@ var LibraryManager = class {
     }
   }
   async addLibrary(input) {
+    assertValidLibraryName(input.name);
     const db = await this.lib.dbHandle();
     const existing = await db.select().from(libraries).where(eq(libraries.name, input.name)).get();
     if (existing) throw new DuplicateLibraryNameError(input.name);
@@ -1548,6 +1588,7 @@ var LibraryManager = class {
   }
   async updateLibrary(nameOrId, patch) {
     const lib = await this.requireLibrary(nameOrId);
+    if (patch.name !== void 0 && patch.name !== lib.name) assertValidLibraryName(patch.name);
     const db = await this.lib.dbHandle();
     const updates = {
       updatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -1726,12 +1767,16 @@ var LocalCatalogSource = class {
    *
    * @param syncOpts - When `includeDev` is set, assets under the source
    *   config's `dev_paths` (e.g. `ai-assets-dev/`) are discovered and cached
-   *   too. Defaults to excluding them (a normal run).
+   *   too. Defaults to excluding them (a normal run). `exclude` drops every
+   *   asset it returns `true` for — never upserted, and any row an earlier sync
+   *   left behind is pruned (`library index` leaves out a non-semver version).
    * @returns Discovery statistics, fatal `errors`, and non-fatal `advisories`
    *   (missing sha256, unknown kind) — the latter never signal a failed index.
    */
   async sync(syncOpts) {
     const result = this.scan(syncOpts);
+    const exclude = syncOpts?.exclude;
+    const assets = exclude ? result.assets.filter((a) => !exclude(a)) : result.assets;
     let assetsUpdated = 0;
     const errors = [];
     const softDepsByRef = /* @__PURE__ */ new Map();
@@ -1741,7 +1786,7 @@ var LocalCatalogSource = class {
       if (list) list.push(e.to);
       else softDepsByRef.set(e.from, [e.to]);
     }
-    for (const asset of result.assets) {
+    for (const asset of assets) {
       const softDeps = softDepsByRef.get(asset.ref) ?? [];
       try {
         await this.library.upsertAssetDef({
@@ -1782,9 +1827,9 @@ var LocalCatalogSource = class {
         `${missingSha256Count} asset(s): sha256 not pinned \u2014 auto-computed locally (pin only for store publish)`
       );
     }
-    const keepRefs = result.assets.map((a) => a.ref);
-    if (keepRefs.length > 0) await this.library.pruneAssetDefs(this.sourceId, keepRefs);
-    return { assetsFound: result.assets.length, assetsUpdated, errors, advisories };
+    const keepRefs = assets.map((a) => a.ref);
+    if (result.assets.length > 0) await this.library.pruneAssetDefs(this.sourceId, keepRefs);
+    return { assetsFound: assets.length, assetsUpdated, errors, advisories };
   }
 };
 function defToCatalogAsset(def) {
@@ -3866,6 +3911,9 @@ function assertManifestEditable(libraryPath) {
   openManifest(libraryPath);
 }
 function upsertManifestAsset(libraryPath, input) {
+  if (input.root.split(/[\\/]+/).includes("..")) {
+    throw new Error(`Asset root "${input.root}" must stay inside the library (no "..").`);
+  }
   const { editor } = openManifest(libraryPath);
   const declared = editor.getPublisher();
   const topLevel = declared === void 0 ? void 0 : barePublisher(declared);
@@ -3920,10 +3968,31 @@ function setManifestPublisher(libraryPath, publisher) {
 async function syncManifestWithDisk(libraryPath, defaultPublisher, registry) {
   stampManifestPublisher(libraryPath, defaultPublisher);
   const removed = pruneMissingRootAssets(libraryPath);
+  const skipped = [];
   const publisher = loadSkPublishManifest(libraryPath)?.publisher ?? defaultPublisher;
   for (const e of await scanDirectory(libraryPath, publisher, {
     knownKinds: new Set(registry.getAllKinds())
   })) {
+    if (!isParsable(e.source)) {
+      skipped.push({
+        kind: e.kind,
+        name: e.name,
+        reason: "unparsable",
+        detail: "manifest file could not be parsed",
+        file: path4.relative(libraryPath, e.source)
+      });
+      continue;
+    }
+    if (e.version && !SEMVER_RE.test(e.version)) {
+      skipped.push({
+        kind: e.kind,
+        name: e.name,
+        reason: "invalid-version",
+        detail: `version "${e.version}" is not valid semver`,
+        file: path4.relative(libraryPath, e.source)
+      });
+      continue;
+    }
     upsertManifestAsset(libraryPath, {
       kind: e.kind,
       name: e.name,
@@ -3931,7 +4000,14 @@ async function syncManifestWithDisk(libraryPath, defaultPublisher, registry) {
       version: e.version
     });
   }
-  return removed;
+  return { removed, skipped };
+}
+function isParsable(file) {
+  try {
+    return parseManifestFile(file, fs10.readFileSync(file, "utf-8")).ok;
+  } catch {
+    return false;
+  }
 }
 var PinPolicySchema = z3.enum(PIN_POLICIES);
 var LibraryInstanceRefSchema = z3.object({
@@ -4056,6 +4132,6 @@ function detectWorkspaceVersion(dir, filename = "skaile.yaml") {
   return raw.version === 2 ? 2 : 1;
 }
 
-export { AssignmentNotFoundError, CatalogCache, CatalogConfigSchema, CatalogHttpError, DuplicateAssignmentError, DuplicateLibraryNameError, GitSyncDriver, InstanceHasConsumersError, InstanceNotFoundError, InterpolationError, KnowledgeManifestSchema, LIBRARY_BACKENDS, LIBRARY_OWNERSHIPS, LOCAL_CATALOG_URL, LibraryConfigSchema, LibraryError, LibraryInstanceRefSchema, LibraryManager, LibrarySectionSchema, LibrarySyncError, LocalCatalogSource, LocalIndex, LocalSyncDriver, LockAssignmentSchema, LockFileSchema, OfflineError, OperationNotPermittedError, PIN_POLICIES, PinPolicySchema, PresetAppliedSchema, PresetExpandedSchema, RemoteCatalogSource, RequiresEdgeSchema, RestCatalogSource, SidecarGit, SkaileConfigSchema, SourceNotFoundError, TarballHashMismatchError, UserLibraryNotFoundError, WorkspaceConfigV2Schema, applyNonStructuralUpgrade, applyPreset, applyPresetFromData, assertManifestEditable, classifyRef, cloneOrInitGitRepo, createEmptyLockFile, curatedManifestOverlay, deriveSlug, detectChanges, detectNestedPresetRefs, detectWorkspaceVersion, ensureGitRepo, evaluateUpgrade, extractLibraryInstanceId, extractReferencedKeys, filterKey, getConfigDefaults, getDefaultValue, getSidecarRoot, getStoreManifestsDir, getStoreRoot, hasInterpolationTokens, installLibraryAsset, interpolate, isGitRepo, isLocalCatalogUrl, isSecretPlaceholder, knowledgeKindProvider, listSidecarSlugsOnDisk, loadLockFile, loadWorkspaceV2, migrateSidecarsToStoreIfNeeded, migrateWorkspaceConfig, missingRootAssets, parsePreset, parsePresetYaml, parseWorkspaceV2, projectConfigPath, pruneMissingRootAssets, queryInstancePickerChoices, resolveAllItems, resolveConfig, resolveIndexPath, resolveItem, resolvePin, resolveSidecarPaths, saveConfig, saveLockFile, saveWorkspaceV2, scanLibraryRoot, setManifestPublisher, setOriginUrl, sha256Hex, stampManifestPublisher, storeSecrets, syncManifestWithDisk, trpcGetUrl, upsertManifestAsset, validateAllPlaceholders, validateKnowledge, validateNestingDepth, validatePlaceholder, writeCuratedManifest };
-//# sourceMappingURL=chunk-MX3UQXLU.js.map
-//# sourceMappingURL=chunk-MX3UQXLU.js.map
+export { AssignmentNotFoundError, CatalogCache, CatalogConfigSchema, CatalogHttpError, DuplicateAssignmentError, DuplicateLibraryNameError, GitSyncDriver, InstanceHasConsumersError, InstanceNotFoundError, InterpolationError, KnowledgeManifestSchema, LIBRARY_BACKENDS, LIBRARY_OWNERSHIPS, LOCAL_CATALOG_URL, LibraryConfigSchema, LibraryError, LibraryInstanceRefSchema, LibraryManager, LibrarySectionSchema, LibrarySyncError, LocalCatalogSource, LocalIndex, LocalSyncDriver, LockAssignmentSchema, LockFileSchema, OfflineError, OperationNotPermittedError, PIN_POLICIES, PinPolicySchema, PresetAppliedSchema, PresetExpandedSchema, RemoteCatalogSource, RequiresEdgeSchema, RestCatalogSource, SidecarGit, SkaileConfigSchema, SourceNotFoundError, TarballHashMismatchError, UserLibraryNotFoundError, WorkspaceConfigV2Schema, applyNonStructuralUpgrade, applyPreset, applyPresetFromData, assertManifestEditable, assertValidLibraryName, classifyRef, cloneOrInitGitRepo, createEmptyLockFile, curatedManifestOverlay, deriveSlug, detectChanges, detectNestedPresetRefs, detectWorkspaceVersion, ensureGitRepo, evaluateUpgrade, extractLibraryInstanceId, extractReferencedKeys, filterKey, getConfigDefaults, getDefaultValue, getSidecarRoot, getStoreManifestsDir, getStoreRoot, hasInterpolationTokens, installLibraryAsset, interpolate, isGitRepo, isLocalCatalogUrl, isSecretPlaceholder, knowledgeKindProvider, listSidecarSlugsOnDisk, loadLockFile, loadWorkspaceV2, migrateSidecarsToStoreIfNeeded, migrateWorkspaceConfig, missingRootAssets, parsePreset, parsePresetYaml, parseWorkspaceV2, projectConfigPath, pruneMissingRootAssets, queryInstancePickerChoices, resolveAllItems, resolveConfig, resolveIndexPath, resolveItem, resolvePin, resolveSidecarPaths, saveConfig, saveLockFile, saveWorkspaceV2, scanLibraryRoot, setManifestPublisher, setOriginUrl, sha256Hex, stampManifestPublisher, storeSecrets, syncManifestWithDisk, trackOriginBranch, trpcGetUrl, upsertManifestAsset, validateAllPlaceholders, validateKnowledge, validateNestingDepth, validatePlaceholder, writeCuratedManifest };
+//# sourceMappingURL=chunk-DFFD4BFG.js.map
+//# sourceMappingURL=chunk-DFFD4BFG.js.map