@skaile/workspaces 6.3.0 → 6.5.0

package/dist/{chunk-J5JRGBKK.js → chunk-UMLCKKIA.js}

@@ -1,15 +1,15 @@
-import { factoryAssetRoots, resolveWorkspacesPackageRoot } from './chunk-6WH2WE4B.js';
+import { factoryAssetRoots, resolveWorkspacesPackageRoot } from './chunk-G4NCSYWR.js';
 import { deployedBase } from './chunk-5KRMNUL4.js';
 import { DEFAULT_HARNESS_ID } from './chunk-C5HFK34M.js';
-import { valueShapeError, parseSourceEntries, resolveSkWorkspaceConfig } from './chunk-XBQTXGY4.js';
+import { ConfigParseError, valueShapeError, parseSourceEntries, resolveSkWorkspaceConfig } from './chunk-IWKKTCXY.js';
 import { globalSkaileDir } from './chunk-L5VSIPQD.js';
 import { harnessNameForHarnessId, SUPPORTED_HARNESSES } from './chunk-VTETQCR6.js';
-import { sha256Hex, compositeSha256, orderedAsset, ASSET_KEY_ORDER } from './chunk-KPKGWXUJ.js';
-import { yamlQuotingHint } from './chunk-JMIKGAUA.js';
-import { parseAssetRefLoose } from './chunk-IZQOO6MN.js';
+import { sha256Hex, compositeSha256, orderedAsset, ASSET_KEY_ORDER } from './chunk-23SG4JRV.js';
+import { yamlQuotingHint } from './chunk-AVFRFGM2.js';
+import { parseAssetRefLoose } from './chunk-V5KG6CCV.js';
 import { validateRegistry, mergeRegistries, validateMergedRegistry } from './chunk-RXGPFAMN.js';
-import fs, { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, readdirSync, realpathSync } from 'fs';
-import path, { join, resolve, dirname, basename } from 'path';
+import fs, { existsSync, readFileSync, writeFileSync, realpathSync, renameSync, rmSync, mkdirSync, cpSync, readdirSync } from 'fs';
+import path, { join, resolve, basename, dirname } from 'path';
 import { parseDocument, Document, isMap, isSeq, parse, stringify, isScalar, visit } from 'yaml';
 import { isDeepStrictEqual } from 'util';
 import { spawnSync } from 'child_process';
@@ -73,14 +73,17 @@ function factoryBundleVersion() {
 function isFactoryMemorySource(source) {
   return source !== void 0 && repoUrlKey(source.url) === FACTORY_URL_KEY && source.commit === FACTORY_MEMORY_COMMIT;
 }
-function lockToDisk(lock) {
+function lockToDisk(lock, prevAssets) {
   const version = factoryBundleVersion();
+  const prev = prevAssets && typeof prevAssets === "object" ? prevAssets : {};
   let anyFactory = false;
   const assets = {};
   for (const [key, entry] of Object.entries(lock.assets)) {
     if (isFactoryMemorySource(entry.source)) {
       anyFactory = true;
-      assets[key] = { ...entry, source: { url: LOCK_FACTORY_URL, commit: version } };
+      const before = prev[key];
+      const keep = before?.source?.url === LOCK_FACTORY_URL && typeof before.source.commit === "string" && before.source.commit !== "" && before.sha256 === entry.sha256 ? before.source.commit : version;
+      assets[key] = { ...entry, source: { url: LOCK_FACTORY_URL, commit: keep } };
     } else {
       assets[key] = entry;
     }
@@ -148,9 +151,27 @@ function stringifyLock(data) {
     { lineWidth: 120 }
   );
 }
-function parseLockYaml(text) {
+var LockParseError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "LockParseError";
+  }
+};
+var LOCK_PARSE_HINT = "Restore it from git, or delete it and run `skaile install`.";
+function lockParseError(label, reason, line) {
+  const where = line === void 0 ? "" : ` at line ${line}`;
+  return new LockParseError(`${label} \u2014 parse error: ${reason}${where}. ${LOCK_PARSE_HINT}`);
+}
+function parseLockYaml(text, label = "skaile.lock.yaml") {
   const doc = parseDocument(text);
-  if (doc.errors.length > 0) throw doc.errors[0];
+  const first = doc.errors[0];
+  if (first) {
+    const reason = (first.message.split("\n")[0] ?? "").replace(/ at line \d+, column \d+:?$/, "").replace(/:$/, "");
+    throw lockParseError(label, reason, first.linePos?.[0]?.line);
+  }
+  if (text.trim() !== "" && doc.contents !== null && !isMap(doc.contents)) {
+    throw lockParseError(label, "the file must be a mapping at the top level");
+  }
   visit(doc, {
     Pair(_key, pair) {
       if (!isScalar(pair.key) || pair.key.value !== "commit" && pair.key.value !== "sha256")
@@ -163,14 +184,14 @@ function parseLockYaml(text) {
   return doc.toJS();
 }
 function writeLock(lockPath, data) {
-  const next = stringifyLock(lockToDisk(data));
+  let onDisk = null;
   if (existsSync(lockPath)) {
+    onDisk = parseLockYaml(readFileSync(lockPath, "utf8"), basename(lockPath));
+  }
+  const next = stringifyLock(lockToDisk(data, onDisk?.assets));
+  if (onDisk && typeof onDisk === "object" && typeof onDisk.locked_at === "string") {
     try {
-      const prev = parseLockYaml(readFileSync(lockPath, "utf8"));
-      if (prev && typeof prev === "object" && typeof prev.locked_at === "string") {
-        const same = stringifyLock({ ...prev, locked_at: data.locked_at });
-        if (same === next) return false;
-      }
+      if (stringifyLock({ ...onDisk, locked_at: data.locked_at }) === next) return false;
     } catch {
     }
   }
@@ -179,12 +200,7 @@ function writeLock(lockPath, data) {
 }
 function readLock(lockPath) {
   if (!existsSync(lockPath)) return null;
-  let raw;
-  try {
-    raw = parseLockYaml(readFileSync(lockPath, "utf8"));
-  } catch {
-    return null;
-  }
+  const raw = parseLockYaml(readFileSync(lockPath, "utf8"), basename(lockPath));
   if (!raw || typeof raw !== "object") return null;
   const r = raw;
   if (r.schema_version !== 3 && r.schema_version !== 4) {
@@ -243,7 +259,8 @@ function buildLockFile(resolved, overridesApplied, libraryAssets = {}) {
       source: { url: c.sourceUrl, commit: c.commit },
       files: c.files,
       override_applied: overridesApplied.has(canonicalRef),
-      ...lockRequires(c)
+      ...lockRequires(c),
+      ...c.storeUrl ? { origin: "store", store: c.storeUrl } : {}
     };
   }
   return {
@@ -402,9 +419,20 @@ var ManifestYamlEditor = class _ManifestYamlEditor {
     if (contents != null && !isMap(contents)) return "the root must be a mapping";
     return void 0;
   }
-  /** Write the document back to disk, preserving comments and formatting. */
+  /**
+   * Write the document back to disk, preserving comments and formatting. The file is replaced in
+   * one step, so a process that reads it while another saves never sees a half-written manifest.
+   */
   save() {
-    writeFileSync(this.path, this.toString());
+    const target = existsSync(this.path) ? realpathSync(this.path) : this.path;
+    const tmp = `${target}.${process.pid}.tmp`;
+    writeFileSync(tmp, this.toString());
+    try {
+      renameSync(tmp, target);
+    } catch (err) {
+      rmSync(tmp, { force: true });
+      throw err;
+    }
   }
   /** Return the serialized YAML string without writing to disk. */
   toString() {
@@ -1203,14 +1231,18 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
     if (first) {
       const reason = (first.message.split("\n")[0] ?? "").replace(/:$/, "");
       const hint = yamlQuotingHint(reason, raw);
-      throw new Error(`${basename(filePath)} \u2014 parse error: ${reason}${hint ? `.${hint}` : ""}`);
+      throw new ConfigParseError(
+        `${basename(filePath)} \u2014 parse error: ${reason}${hint ? `.${hint}` : ""}`
+      );
     }
     const label = basename(filePath);
     if (doc.contents !== null && !isMap(doc.contents)) {
-      throw new Error(`${label} \u2014 parse error: skaile.yaml must be a mapping at the top level.`);
+      throw new ConfigParseError(
+        `${label} \u2014 parse error: skaile.yaml must be a mapping at the top level.`
+      );
     }
     const wrongShape = valueShapeError(doc.toJS() ?? {});
-    if (wrongShape) throw new Error(`${label} \u2014 parse error: ${wrongShape.message}`);
+    if (wrongShape) throw new ConfigParseError(`${label} \u2014 parse error: ${wrongShape.message}`);
     return new _WorkspaceYamlEditor(filePath, doc);
   }
   /** Create a new empty document (for use when no file exists yet). */
@@ -1568,6 +1600,6 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
   }
 };
 
-export { AGENT_PROMPT_SECTION_ORDER, FACTORY_SOURCE_URL, GLOBAL_INSTALL_DIR_NAME, LOCK_FACTORY_URL, LOCK_SCHEMA_VERSION, ManifestYamlEditor, PROVIDERS_FILENAME, SETTINGS_DEFAULTS, WorkspaceYamlEditor, aiResourceRoots, applyPatch, assertLockHashes, buildAgentPromptSections, buildLibraryLockEntries, buildLockFile, capMemoryContent, checkAgentSkillConformance, computeHash, connectProbe, defaultLibraryDir, detectPackageManager, extractForPatch, findProjectPackageDir, generatePatch, globalInstallDir, globalSettingsPath, harnessSdkMissingError, holdsWildcard, installCommand, installCommandFor, listPatches, listenWithProbe, loadHarnessSdk, loadHarnessSdkSubpath, loadProviderRegistry, loadProviderRegistryFile, loadSettings, mapLegacyFields, maskApiKey, mergeLockFile, migrateSettings, needsWildcardProbe, portIsHeld, probeHosts, projectAssetRoots, projectSettingsPath, readLock, readPatch, readPluginsLockSlice, renderMemorySection, resolveConfiguredHarnessName, resolveLibraryDir, resolveSettings, resolveSettingsWithSources, resyncLockSources, savePatch, saveProviderRegistryFile, saveSettings, sdkLookupPlaces, skaileInstallDir, userProviderRegistryPath, verifyLock, verifyLockEntry, walkForSettings, workspaceProviderRegistryPath, writeLock, writePluginsLockSlice };
-//# sourceMappingURL=chunk-J5JRGBKK.js.map
-//# sourceMappingURL=chunk-J5JRGBKK.js.map
+export { AGENT_PROMPT_SECTION_ORDER, FACTORY_SOURCE_URL, GLOBAL_INSTALL_DIR_NAME, LOCK_FACTORY_URL, LOCK_SCHEMA_VERSION, LockParseError, ManifestYamlEditor, PROVIDERS_FILENAME, SETTINGS_DEFAULTS, WorkspaceYamlEditor, aiResourceRoots, applyPatch, assertLockHashes, buildAgentPromptSections, buildLibraryLockEntries, buildLockFile, capMemoryContent, checkAgentSkillConformance, computeHash, connectProbe, defaultLibraryDir, detectPackageManager, extractForPatch, findProjectPackageDir, generatePatch, globalInstallDir, globalSettingsPath, harnessSdkMissingError, holdsWildcard, installCommand, installCommandFor, isFactoryMemorySource, listPatches, listenWithProbe, loadHarnessSdk, loadHarnessSdkSubpath, loadProviderRegistry, loadProviderRegistryFile, loadSettings, mapLegacyFields, maskApiKey, mergeLockFile, migrateSettings, needsWildcardProbe, portIsHeld, probeHosts, projectAssetRoots, projectSettingsPath, readLock, readPatch, readPluginsLockSlice, renderMemorySection, resolveConfiguredHarnessName, resolveLibraryDir, resolveSettings, resolveSettingsWithSources, resyncLockSources, savePatch, saveProviderRegistryFile, saveSettings, sdkLookupPlaces, skaileInstallDir, userProviderRegistryPath, verifyLock, verifyLockEntry, walkForSettings, workspaceProviderRegistryPath, writeLock, writePluginsLockSlice };
+//# sourceMappingURL=chunk-UMLCKKIA.js.map
+//# sourceMappingURL=chunk-UMLCKKIA.js.map