@skaile/workspaces 0.21.0 → 0.22.0-beta.1

package/dist/{chunk-W5DFC35Z.js → chunk-UMOENHVH.js}

@@ -1,7 +1,7 @@
-import { readLinks, getRepoCommit, resolveSkWorkspaceConfig } from './chunk-5QNQLSBW.js';
+import { resolveSkWorkspaceConfig } from './chunk-J3VKAEQP.js';
 import { createHash } from 'crypto';
 import fs, { writeFileSync, existsSync, readFileSync, mkdirSync, cpSync, readdirSync } from 'fs';
-import path, { join, resolve, dirname, basename } from 'path';
+import path, { join, dirname, basename } from 'path';
 import { stringify, parse, parseDocument, Document, isMap, isSeq } from 'yaml';
 import { spawnSync, spawn } from 'child_process';
 import fsp from 'fs/promises';
@@ -13,105 +13,107 @@ function writeLock(lockPath, data) {
 }
 function readLock(lockPath) {
   if (!existsSync(lockPath)) return null;
+  let raw;
   try {
-    return parse(readFileSync(lockPath, "utf8"));
+    raw = parse(readFileSync(lockPath, "utf8"));
   } catch {
     return null;
   }
+  if (!raw || typeof raw !== "object") return null;
+  const r = raw;
+  if (r.schema_version !== 2) {
+    throw new Error(
+      "lockfile schema v1 detected. The lockfile shape changed in @skaile/workspaces 4.x. Regenerate: `rm skaile.lock.yaml && skaile install`."
+    );
+  }
+  return r;
 }
 function computeHash(filePath) {
-  const content = readFileSync(filePath, "utf8");
+  const content = readFileSync(filePath);
   return createHash("sha256").update(content).digest("hex");
 }
-function buildLockFile(repositories, resolved, resolvedBy, reposDir, projectDir) {
-  const lockRepos = {};
-  const links = projectDir ? readLinks(projectDir) : {};
-  for (const [name, decl] of Object.entries(repositories)) {
-    const entry = { branch: decl.branch ?? "main" };
-    if (decl.url) {
-      entry.url = decl.url;
-      const repoDir = links[name] ?? join(reposDir, name);
-      if (existsSync(join(repoDir, ".git"))) {
-        entry.commit = getRepoCommit(repoDir) ?? void 0;
-      }
-    }
-    if (decl.path) entry.path = decl.path;
-    lockRepos[name] = entry;
-  }
+function compositeHash(files) {
+  const lines = files.slice().sort((a, b) => a.path.localeCompare(b.path)).map((f) => `${f.path}:${f.sha256}
+`).join("");
+  return createHash("sha256").update(lines).digest("hex");
+}
+function buildLockFile(resolved, overridesApplied) {
   const assets = {};
-  for (const e of resolved) {
-    const key = `${e.kind}:${e.name}`;
-    let source = e.source;
-    if (e.repository) {
-      const decl = repositories[e.repository];
-      if (decl) {
-        let repoDir;
-        if (links[e.repository]) {
-          repoDir = links[e.repository];
-        } else if (decl.path) {
-          repoDir = resolve(join(reposDir, ".."), decl.path);
-        } else {
-          repoDir = join(reposDir, e.repository);
-        }
-        if (source.startsWith(repoDir)) {
-          source = source.slice(repoDir.length).replace(/^\//, "");
-        }
-      }
-    }
-    assets[key] = {
-      version: e.version,
-      repository: e.repository ?? "unknown",
-      source,
-      domain: e.domain,
-      integrity: existsSync(e.source) ? `sha256-${computeHash(e.source)}` : "",
-      resolved_by: resolvedBy.get(key) ?? "direct"
+  const sourceMap = /* @__PURE__ */ new Map();
+  for (const c of resolved) {
+    const canonicalRef = `${c.publisher}/${c.kind}:${c.name}@${c.version}`;
+    assets[canonicalRef] = {
+      sha256: c.sha256,
+      source: { url: c.sourceUrl, commit: c.commit },
+      files: c.files,
+      override_applied: overridesApplied.has(canonicalRef)
     };
+    if (!sourceMap.has(c.sourceUrl)) {
+      sourceMap.set(c.sourceUrl, { url: c.sourceUrl, commit: c.commit });
+    }
   }
   return {
-    lockfile_version: 1,
+    schema_version: 2,
+    locked_at: (/* @__PURE__ */ new Date()).toISOString(),
+    assets,
+    sources: Array.from(sourceMap.values()).sort((a, b) => a.url.localeCompare(b.url))
+  };
+}
+function lockPathFor(projectDir) {
+  return join(projectDir, "skaile.lock.yaml");
+}
+function readPluginsLockSlice(projectDir) {
+  try {
+    return readLock(lockPathFor(projectDir))?.plugins;
+  } catch {
+    return void 0;
+  }
+}
+function writePluginsLockSlice(projectDir, slice) {
+  const lockPath = lockPathFor(projectDir);
+  let existing = null;
+  try {
+    existing = readLock(lockPath);
+  } catch {
+    existing = null;
+  }
+  const next = existing ?? {
+    schema_version: 2,
     locked_at: (/* @__PURE__ */ new Date()).toISOString(),
-    repositories: lockRepos,
-    assets
+    assets: {},
+    sources: []
   };
+  next.plugins = slice;
+  writeLock(lockPath, next);
 }
-function verifyLock(lock, reposDir) {
+function verifyLock(lock, resolveCloneDir) {
   const drifted = [];
   const missing = [];
-  for (const [name, lockRepo] of Object.entries(lock.repositories)) {
-    if (!lockRepo.commit || lockRepo.path) continue;
-    const repoDir = join(reposDir, name);
-    const currentCommit = existsSync(join(repoDir, ".git")) ? getRepoCommit(repoDir) : null;
-    if (currentCommit && currentCommit !== lockRepo.commit) ;
-  }
   for (const [ref, entry] of Object.entries(lock.assets)) {
-    const repoDecl = lock.repositories[entry.repository];
-    if (!repoDecl) {
+    const cloneDir = resolveCloneDir(entry.source.url);
+    if (!cloneDir) {
       missing.push(ref);
       continue;
     }
-    let repoDir;
-    if (repoDecl.path) {
-      repoDir = resolve(join(reposDir, ".."), repoDecl.path);
-    } else {
-      repoDir = join(reposDir, entry.repository);
+    let allPresent = true;
+    const recomputed = [];
+    for (const f of entry.files) {
+      const abs = join(cloneDir, f.path);
+      if (!existsSync(abs)) {
+        allPresent = false;
+        break;
+      }
+      recomputed.push({ path: f.path, sha256: computeHash(abs) });
     }
-    const fullPath = entry.source.startsWith("/") ? entry.source : join(repoDir, entry.source);
-    if (!existsSync(fullPath)) {
+    if (!allPresent) {
       missing.push(ref);
       continue;
     }
-    if (entry.integrity) {
-      const currentHash = `sha256-${computeHash(fullPath)}`;
-      if (currentHash !== entry.integrity) {
-        drifted.push(ref);
-      }
+    if (compositeHash(recomputed) !== entry.sha256) {
+      drifted.push(ref);
     }
   }
-  return {
-    ok: drifted.length === 0 && missing.length === 0,
-    drifted,
-    missing
-  };
+  return { ok: drifted.length === 0 && missing.length === 0, drifted, missing };
 }
 function extractForPatch(entry, patchDir) {
   const ref = `${entry.kind}-${entry.name}`;
@@ -362,9 +364,9 @@ function portableSpawn(cmd, opts = {}) {
     stdio: ["ignore", "pipe", "pipe"],
     detached: opts.detached
   });
-  const exited = new Promise((resolve2) => {
-    child.on("close", (code) => resolve2(code ?? 0));
-    child.on("error", () => resolve2(-1));
+  const exited = new Promise((resolve) => {
+    child.on("close", (code) => resolve(code ?? 0));
+    child.on("error", () => resolve(-1));
   });
   return {
     pid: child.pid ?? -1,
@@ -482,51 +484,24 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
     const node = this.doc.get("agent-config", true) ?? this.doc.get("agent_config", true);
     return isMap(node) ? node : void 0;
   }
-  // ── AI Resources ──────────────────────────────────────────────────────────
-  /** Get all ai_resources entries. */
-  getAiResources() {
-    const val = this.doc.get("ai_resources");
-    if (!Array.isArray(val)) return [];
-    return val;
+  // ── Publisher / version (publication half) ──────────────────────────────────
+  /** Get the publication-half `publisher:` field. */
+  getPublisher() {
+    const v = this.doc.get("publisher");
+    return v != null ? String(v) : void 0;
   }
-  /**
-   * Add or update an AI resource entry by name.
-   * If an entry with the same name exists, it is replaced.
-   */
-  setAiResource(entry) {
-    const node = this.doc.get("ai_resources", true);
-    if (!node || !isSeq(node)) {
-      this.doc.set("ai_resources", this.doc.createNode([entry]));
-      return;
-    }
-    let found = false;
-    for (let i = 0; i < node.items.length; i++) {
-      const item = node.items[i];
-      if (isMap(item)) {
-        const nameVal = item.get("name");
-        if (nameVal === entry.name) {
-          node.set(i, this.doc.createNode(entry));
-          found = true;
-          break;
-        }
-      }
-    }
-    if (!found) {
-      node.add(this.doc.createNode(entry));
-    }
+  /** Set the publication-half `publisher:` field. */
+  setPublisher(p) {
+    this.doc.set("publisher", p);
   }
-  /** Remove an AI resource entry by name. */
-  removeAiResource(name) {
-    const node = this.doc.get("ai_resources", true);
-    if (!node || !isSeq(node)) return false;
-    for (let i = 0; i < node.items.length; i++) {
-      const item = node.items[i];
-      if (isMap(item) && item.get("name") === name) {
-        node.delete(i);
-        return true;
-      }
-    }
-    return false;
+  /** Get the publication-half `version:` field. */
+  getVersion() {
+    const v = this.doc.get("version");
+    return v != null ? String(v) : void 0;
+  }
+  /** Set the publication-half `version:` field. */
+  setVersion(v) {
+    this.doc.set("version", v);
   }
   // ── Connectors ─────────────────────────────────────────────────────────────
   /** Get all connectors. */
@@ -570,16 +545,75 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
     }
     return false;
   }
+  // ── Plugins ────────────────────────────────────────────────────────────────
+  /** Get all `plugins:` specifiers. */
+  getPlugins() {
+    const node = this.doc.get("plugins", true);
+    if (!isSeq(node)) return [];
+    const out = [];
+    for (const item of node.items) {
+      const cur = item != null && typeof item === "object" && "value" in item ? item.value : item;
+      if (typeof cur === "string") out.push(cur);
+    }
+    return out;
+  }
+  /**
+   * Add a plugin specifier to `plugins:`, deduped by package name.
+   * If an entry with the same package name exists it is replaced (so a version
+   * bump re-pins in place); otherwise the spec is appended.
+   *
+   * @param spec - npm specifier, e.g. `"@skaile/provider-fly@^0.1.0"`.
+   * @param nameOf - Extracts the package name from a spec (caller passes `parseSpec`-derived names).
+   * @returns `true` when an existing entry was replaced, `false` when appended.
+   */
+  addPlugin(spec, nameOf) {
+    const node = this.doc.get("plugins", true);
+    if (!node || !isSeq(node)) {
+      this.doc.set("plugins", this.doc.createNode([spec]));
+      return false;
+    }
+    const wantName = nameOf(spec);
+    for (let i = 0; i < node.items.length; i++) {
+      const item = node.items[i];
+      const cur = item != null && typeof item === "object" && "value" in item ? item.value : item;
+      if (typeof cur === "string" && nameOf(cur) === wantName) {
+        node.set(i, this.doc.createNode(spec));
+        return true;
+      }
+    }
+    node.add(this.doc.createNode(spec));
+    return false;
+  }
+  /**
+   * Remove the `plugins:` entry whose package name matches `name`.
+   *
+   * @param name - Package name to remove (e.g. `"@skaile/provider-fly"`).
+   * @param nameOf - Extracts the package name from a spec.
+   * @returns `true` when an entry was removed.
+   */
+  removePlugin(name, nameOf) {
+    const node = this.doc.get("plugins", true);
+    if (!node || !isSeq(node)) return false;
+    for (let i = 0; i < node.items.length; i++) {
+      const item = node.items[i];
+      const cur = item != null && typeof item === "object" && "value" in item ? item.value : item;
+      if (typeof cur === "string" && nameOf(cur) === name) {
+        node.delete(i);
+        return true;
+      }
+    }
+    return false;
+  }
   // ── Sources ────────────────────────────────────────────────────────────────
-  /** Get all source entries. */
+  /** Get all source entries (`{url, pin?}`). */
   getSources() {
     const val = this.doc.get("sources");
     if (!Array.isArray(val)) return [];
     return val;
   }
   /**
-   * Add or update a source entry by name.
-   * If an entry with the same name exists, it is replaced.
+   * Add or update a source entry, matched by `url`.
+   * If an entry with the same url exists, it is replaced.
    */
   setSource(entry) {
     const node = this.doc.get("sources", true);
@@ -590,23 +624,135 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
     let found = false;
     for (let i = 0; i < node.items.length; i++) {
       const item = node.items[i];
-      if (isMap(item) && item.get("name") === entry.name) {
+      if (isMap(item) && item.get("url") === entry.url) {
         node.set(i, this.doc.createNode(entry));
         found = true;
         break;
       }
     }
-    if (!found) {
-      node.add(this.doc.createNode(entry));
-    }
+    if (!found) node.add(this.doc.createNode(entry));
   }
-  /** Remove a source entry by name. Returns true when an entry was removed. */
-  removeSource(name) {
+  /** Remove a source entry by url. Returns true when an entry was removed. */
+  removeSource(url) {
     const node = this.doc.get("sources", true);
     if (!node || !isSeq(node)) return false;
     for (let i = 0; i < node.items.length; i++) {
       const item = node.items[i];
-      if (isMap(item) && item.get("name") === name) {
+      if (isMap(item) && item.get("url") === url) {
+        node.delete(i);
+        return true;
+      }
+    }
+    return false;
+  }
+  // ── Stores ─────────────────────────────────────────────────────────────────
+  /** Get all store entries (`{url}`). */
+  getStores() {
+    const val = this.doc.get("stores");
+    if (!Array.isArray(val)) return [];
+    return val;
+  }
+  /** Add or update a store entry, matched by `url`. */
+  setStore(entry) {
+    const node = this.doc.get("stores", true);
+    if (!node || !isSeq(node)) {
+      this.doc.set("stores", this.doc.createNode([entry]));
+      return;
+    }
+    let found = false;
+    for (let i = 0; i < node.items.length; i++) {
+      const item = node.items[i];
+      if (isMap(item) && item.get("url") === entry.url) {
+        node.set(i, this.doc.createNode(entry));
+        found = true;
+        break;
+      }
+    }
+    if (!found) node.add(this.doc.createNode(entry));
+  }
+  /** Remove a store entry by url. Returns true when an entry was removed. */
+  removeStore(url) {
+    const node = this.doc.get("stores", true);
+    if (!node || !isSeq(node)) return false;
+    for (let i = 0; i < node.items.length; i++) {
+      const item = node.items[i];
+      if (isMap(item) && item.get("url") === url) {
+        node.delete(i);
+        return true;
+      }
+    }
+    return false;
+  }
+  // ── Overrides ────────────────────────────────────────────────────────────────
+  /** Get all override entries (`{ref, source, reason}`). */
+  getOverrides() {
+    const val = this.doc.get("overrides");
+    if (!Array.isArray(val)) return [];
+    return val;
+  }
+  /** Add or update an override entry, matched by `ref`. */
+  setOverride(entry) {
+    const node = this.doc.get("overrides", true);
+    if (!node || !isSeq(node)) {
+      this.doc.set("overrides", this.doc.createNode([entry]));
+      return;
+    }
+    let found = false;
+    for (let i = 0; i < node.items.length; i++) {
+      const item = node.items[i];
+      if (isMap(item) && item.get("ref") === entry.ref) {
+        node.set(i, this.doc.createNode(entry));
+        found = true;
+        break;
+      }
+    }
+    if (!found) node.add(this.doc.createNode(entry));
+  }
+  /** Remove an override entry by ref. Returns true when an entry was removed. */
+  removeOverride(ref) {
+    const node = this.doc.get("overrides", true);
+    if (!node || !isSeq(node)) return false;
+    for (let i = 0; i < node.items.length; i++) {
+      const item = node.items[i];
+      if (isMap(item) && item.get("ref") === ref) {
+        node.delete(i);
+        return true;
+      }
+    }
+    return false;
+  }
+  // ── Publication assets ───────────────────────────────────────────────────────
+  /** Get all publication-half `assets:` entries. */
+  getPublicationAssets() {
+    const val = this.doc.get("assets");
+    if (!Array.isArray(val)) return [];
+    return val;
+  }
+  /** Add or update a publication asset entry, matched by `kind` + `name`. */
+  setPublicationAsset(entry) {
+    const node = this.doc.get("assets", true);
+    if (!node || !isSeq(node)) {
+      this.doc.set("assets", this.doc.createNode([entry]));
+      return;
+    }
+    let found = false;
+    for (let i = 0; i < node.items.length; i++) {
+      const item = node.items[i];
+      if (isMap(item) && item.get("kind") === entry.kind && item.get("name") === entry.name) {
+        node.set(i, this.doc.createNode(entry));
+        found = true;
+        break;
+      }
+    }
+    if (!found) node.add(this.doc.createNode(entry));
+  }
+  /** Remove a publication asset entry by kind + name. Returns true when removed. */
+  removePublicationAsset(kind, name) {
+    const node = this.doc.get("assets", true);
+    if (!node || !isSeq(node)) return false;
+    for (let i = 0; i < node.items.length; i++) {
+      const item = node.items[i];
+      if (isMap(item) && item.get("kind") === kind && item.get("name") === name) {
         node.delete(i);
         return true;
       }
@@ -620,6 +766,6 @@ var WorkspaceYamlEditor = class _WorkspaceYamlEditor {
   }
 };
 
-export { ALL_PROVIDERS, SETTINGS_DEFAULTS, WorkspaceYamlEditor, applyPatch, buildLockFile, computeHash, detectEnvApiKeys, extractForPatch, generatePatch, globalSettingsPath, listPatches, loadSettings, mapLegacyFields, maskApiKey, migrateSettings, portableSpawn, portableSpawnSync, projectSettingsPath, providerEnvKey, readLock, readPatch, resolveAllKeys, resolveApiKey, resolveSettings, savePatch, saveSettings, verifyLock, walkForSettings, writeLock };
-//# sourceMappingURL=chunk-W5DFC35Z.js.map
-//# sourceMappingURL=chunk-W5DFC35Z.js.map
+export { ALL_PROVIDERS, SETTINGS_DEFAULTS, WorkspaceYamlEditor, applyPatch, buildLockFile, computeHash, detectEnvApiKeys, extractForPatch, generatePatch, globalSettingsPath, listPatches, loadSettings, mapLegacyFields, maskApiKey, migrateSettings, portableSpawn, portableSpawnSync, projectSettingsPath, providerEnvKey, readLock, readPatch, readPluginsLockSlice, resolveAllKeys, resolveApiKey, resolveSettings, savePatch, saveSettings, verifyLock, walkForSettings, writeLock, writePluginsLockSlice };
+//# sourceMappingURL=chunk-UMOENHVH.js.map
+//# sourceMappingURL=chunk-UMOENHVH.js.map