@skaile/workspaces 0.24.0 → 0.26.0

package/dist/{chunk-2XY6732A.js → chunk-YRU4WB6Y.js}

@@ -7,7 +7,7 @@ async function flowList(projectDir) {
   try {
     const assetsRoot = findAiAssetsRoot(projectDir);
     if (!assetsRoot) return okJson([]);
-    const { loadAllFlows } = await import('./base-assets/connectors/flow/engine.js');
+    const { loadAllFlows } = await import('./factory-assets/connectors/flow/engine.js');
     const flows = loadAllFlows(assetsRoot);
     const summary = flows.map((f) => ({
       id: f.id,
@@ -23,7 +23,7 @@ async function flowShow(projectDir, flowId) {
   try {
     const assetsRoot = findAiAssetsRoot(projectDir);
     if (!assetsRoot) return err(`Flow not found: ${flowId}`);
-    const { loadAllFlows } = await import('./base-assets/connectors/flow/engine.js');
+    const { loadAllFlows } = await import('./factory-assets/connectors/flow/engine.js');
     const flows = loadAllFlows(assetsRoot);
     const flow = flows.find((f) => f.id === flowId);
     if (!flow) return err(`Flow not found: ${flowId}`);
@@ -57,7 +57,7 @@ async function flowFindFlowForSession(projectDir, runId) {
     if (!session) return err(`Session not found: ${runId}`);
     const assetsRoot = findAiAssetsRoot(projectDir);
     if (!assetsRoot) return err(`Flow not found for session: ${runId} (no ai-assets root)`);
-    const { loadAllFlows } = await import('./base-assets/connectors/flow/engine.js');
+    const { loadAllFlows } = await import('./factory-assets/connectors/flow/engine.js');
     const flows = loadAllFlows(assetsRoot);
     const flow = flows.find((f) => f.id === session.flowId);
     if (!flow) return err(`Flow not found: ${session.flowId}`);
@@ -68,5 +68,5 @@ async function flowFindFlowForSession(projectDir, runId) {
 }
 
 export { flowFindFlowForSession, flowGetSession, flowList, flowListSessions, flowShow };
-//# sourceMappingURL=chunk-2XY6732A.js.map
-//# sourceMappingURL=chunk-2XY6732A.js.map
+//# sourceMappingURL=chunk-YRU4WB6Y.js.map
+//# sourceMappingURL=chunk-YRU4WB6Y.js.map

package/dist/chunk-YRU4WB6Y.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../workspace-plugin/src/tools/flows.ts"],"names":[],"mappings":"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","file":"chunk-YRU4WB6Y.js","sourcesContent":["// src/tools/flows.ts\nimport { err, okJson } from \"../types.js\";\nimport type { ToolResult } from \"../types.js\";\nimport { findAiAssetsRoot } from \"../utils/ai-assets.js\";\nimport { readAllSessions } from \"./sessions.js\";\n\n// ── Flow tools ────────────────────────────────────────────────────────────────\n\n/**\n * List all flow definitions available in the project's `ai-assets` directory.\n *\n * Returns a JSON array of summary objects `{ id, name, nodeCount }`.\n * Returns an empty array when no `ai-assets` root is found.\n *\n * @param projectDir - Absolute path to the skaile project root.\n *\n * @docLink packages/workspace-plugin/concepts#tool-delivery\n */\nexport async function flowList(projectDir: string): Promise<ToolResult> {\n  try {\n    const assetsRoot = findAiAssetsRoot(projectDir);\n    if (!assetsRoot) return okJson([]);\n    const { loadAllFlows } = await import(\n      \"@skaile/workspaces/factory-assets/connectors/flow/engine\"\n    );\n    const flows = loadAllFlows(assetsRoot);\n    const summary = flows.map((f: any) => ({\n      id: f.id,\n      name: f.name ?? f.id,\n      nodeCount: f.nodes?.length ?? 0,\n    }));\n    return okJson(summary);\n  } catch (e: unknown) {\n    return err(e instanceof Error ? e.message : String(e));\n  }\n}\n\n/**\n * Show the full flow definition (nodes, edges, metadata) for a specific flow.\n *\n * @param projectDir - Absolute path to the skaile project root.\n * @param flowId     - Flow ID as returned by {@link flowList}.\n *\n * @docLink packages/workspace-plugin/concepts#tool-delivery\n */\nexport async function flowShow(projectDir: string, flowId: string): Promise<ToolResult> {\n  try {\n    const assetsRoot = findAiAssetsRoot(projectDir);\n    if (!assetsRoot) return err(`Flow not found: ${flowId}`);\n    const { loadAllFlows } = await import(\n      \"@skaile/workspaces/factory-assets/connectors/flow/engine\"\n    );\n    const flows = loadAllFlows(assetsRoot);\n    const flow = flows.find((f: any) => f.id === flowId);\n    if (!flow) return err(`Flow not found: ${flowId}`);\n    return okJson(flow);\n  } catch (e: unknown) {\n    return err(e instanceof Error ? e.message : String(e));\n  }\n}\n\n/**\n * List all past and active flow run sessions for the workspace.\n *\n * Delegates to {@link readAllSessions} (reads `.skaile/sessions/*.json`),\n * sorted newest-first by `updatedAt`.\n *\n * @param projectDir - Absolute path to the skaile project root.\n *\n * @docLink packages/workspace-plugin/concepts#tool-delivery\n */\nexport async function flowListSessions(projectDir: string): Promise<ToolResult> {\n  try {\n    const sessions = await readAllSessions(projectDir);\n    return okJson(sessions);\n  } catch (e: unknown) {\n    return err(e instanceof Error ? e.message : String(e));\n  }\n}\n\n/**\n * Get driver metadata for a specific flow run session.\n *\n * @param projectDir - Absolute path to the skaile project root.\n * @param runId      - Run ID from {@link flowListSessions}.\n *\n * @docLink packages/workspace-plugin/concepts#tool-delivery\n */\nexport async function flowGetSession(projectDir: string, runId: string): Promise<ToolResult> {\n  try {\n    const sessions = await readAllSessions(projectDir);\n    const session = sessions.find((s) => s.runId === runId);\n    if (!session) return err(`Session not found: ${runId}`);\n    return okJson(session);\n  } catch (e: unknown) {\n    return err(e instanceof Error ? e.message : String(e));\n  }\n}\n\n/**\n * Resolve and return the flow definition that was used in a past session.\n *\n * Looks up the session by `runId`, reads its `flowId`, then returns the full\n * flow definition from `ai-assets`.\n *\n * @param projectDir - Absolute path to the skaile project root.\n * @param runId      - Run ID from {@link flowListSessions}.\n *\n * @docLink packages/workspace-plugin/concepts#tool-delivery\n */\nexport async function flowFindFlowForSession(\n  projectDir: string,\n  runId: string,\n): Promise<ToolResult> {\n  try {\n    const sessions = await readAllSessions(projectDir);\n    const session = sessions.find((s) => s.runId === runId);\n    if (!session) return err(`Session not found: ${runId}`);\n\n    const assetsRoot = findAiAssetsRoot(projectDir);\n    if (!assetsRoot) return err(`Flow not found for session: ${runId} (no ai-assets root)`);\n\n    const { loadAllFlows } = await import(\n      \"@skaile/workspaces/factory-assets/connectors/flow/engine\"\n    );\n    const flows = loadAllFlows(assetsRoot);\n    const flow = flows.find((f: any) => f.id === session.flowId);\n    if (!flow) return err(`Flow not found: ${session.flowId}`);\n    return okJson(flow);\n  } catch (e: unknown) {\n    return err(e instanceof Error ? e.message : String(e));\n  }\n}\n"]}

package/dist/{chunk-542K7SR6.js → chunk-Z5DI7PDG.js}

@@ -1,8 +1,9 @@
-import { scanDirectory, parseFrontmatter, bundleDepRefs, fromMcpServerMd } from './chunk-DH4N5AW4.js';
-import { parseAssetRef, assetRefToStr } from './chunk-YX3UWPJ5.js';
-import { mkdirSync, existsSync, readFileSync, writeFileSync, lstatSync, symlinkSync, rmSync, readdirSync } from 'fs';
+import { decodeSkaileManifest, SKAILE_MANIFEST_FILENAME } from './chunk-IERB3UXJ.js';
+import { scanDirectory, parseFrontmatter, bundleDepRefs, fromMcpServerMd } from './chunk-2FS4FPZ7.js';
+import { parseAssetRef, assetRefToStr } from './chunk-IEJ5IOC3.js';
+import { mkdirSync, existsSync, readFileSync, writeFileSync, lstatSync, symlinkSync, rmSync, readdirSync, cpSync } from 'fs';
 import { homedir } from 'os';
-import { join, resolve, relative, dirname, parse as parse$1 } from 'path';
+import { join, resolve, relative, dirname, parse as parse$1, basename } from 'path';
 import { parse, stringify } from 'yaml';
 import { spawnSync } from 'child_process';
 import semver from 'semver';
@@ -176,10 +177,10 @@ function repoSlugFromGitRemote(rootDir) {
   return m ? `${m[1]}/${m[2]}` : void 0;
 }
 function declaredPublisher(repoDir) {
-  const yamlPath = join(repoDir, "skaile.yaml");
-  if (existsSync(yamlPath)) {
+  const manifestPath = join(repoDir, SKAILE_MANIFEST_FILENAME);
+  if (existsSync(manifestPath)) {
     try {
-      const raw = parse(readFileSync(yamlPath, "utf8"));
+      const raw = parse(readFileSync(manifestPath, "utf8"));
       if (raw && typeof raw.publisher === "string" && raw.publisher.length > 0)
         return raw.publisher;
     } catch {
@@ -292,17 +293,20 @@ async function resolveAll(deps, opts) {
     const sourceCandidates = opts.provenanceIndex.get(key) ?? [];
     const storeCandidates = [];
     if (opts.stores.length > 0 && opts.storeFetcher) {
-      const candidateVersions = enumerateVersionsForPin(
-        ref.pin,
-        sourceCandidates.map((c) => c.version)
-      );
+      const sourceVersions = sourceCandidates.map((c) => c.version);
+      const fetcher = opts.storeFetcher;
       for (const store of opts.stores) {
-        for (const v of candidateVersions) {
-          if (!v) continue;
-          const m = await opts.storeFetcher.getInstallManifest(
+        let versionsHint = sourceVersions;
+        if (versionsHint.length === 0 && needsStoreVersionDiscovery(ref.pin) && fetcher.listVersions) {
+          versionsHint = await fetcher.listVersions(
             store.url,
-            assetRefToStr({ ...ref, pin: v })
+            assetRefToStr({ ...ref, pin: void 0 })
           );
+        }
+        const candidateVersions = enumerateVersionsForPin(ref.pin, versionsHint);
+        for (const v of candidateVersions) {
+          if (!v) continue;
+          const m = await fetcher.getInstallManifest(store.url, assetRefToStr({ ...ref, pin: v }));
           if (m) {
             storeCandidates.push({
               publisher: ref.publisher,
@@ -387,6 +391,11 @@ function matchPin(pin, version) {
   if (!semver.valid(version)) return version === pin;
   return semver.satisfies(version, pin, { includePrerelease: false });
 }
+function needsStoreVersionDiscovery(pin) {
+  if (!pin) return true;
+  if (SHA_PIN_RE.test(pin)) return false;
+  return !semver.valid(pin);
+}
 function enumerateVersionsForPin(pin, sourceVersionsHint) {
   if (!pin) return sourceVersionsHint.length > 0 ? sourceVersionsHint : [];
   if (semver.valid(pin)) return [pin];
@@ -484,55 +493,112 @@ function buildProvenanceIndex(clones, _opts) {
   return index;
 }
 function walkOne(clone, index) {
-  const yamlPath = join(clone.localPath, "skaile.yaml");
-  if (existsSync(yamlPath)) {
-    walkWithManifest(clone, yamlPath, index);
-  } else {
+  const manifestPaths = findManifestFiles(clone.localPath);
+  if (manifestPaths.length === 0) {
     walkFilenameConvention(clone, index);
-  }
-}
-function walkWithManifest(clone, yamlPath, index) {
-  const raw = parse(readFileSync(yamlPath, "utf8")) ?? {};
-  const publisher = typeof raw.publisher === "string" && raw.publisher.length > 0 ? raw.publisher : publisherFromGithubUrl(clone.sourceUrl);
-  if (!publisher) {
-    throw new Error(
-      `${clone.sourceUrl}: publisher must be declared in skaile.yaml (non-GitHub source URL \u2014 auto-derivation not available).`
-    );
-  }
-  const sourceVersion = (typeof raw.version === "string" ? raw.version : void 0) ?? (clone.tag ? clone.tag.replace(/^v/, "") : void 0) ?? syntheticVersion(clone.commit);
-  const assets = Array.isArray(raw.assets) ? raw.assets : [];
-  if (assets.length === 0) {
-    walkFilenameConvention(clone, index, publisher, sourceVersion);
     return;
   }
+  let produced = false;
+  for (const p of manifestPaths) {
+    if (walkWithManifest(clone, p, index)) produced = true;
+  }
+  if (!produced) walkFilenameConvention(clone, index);
+}
+function findManifestFiles(root) {
+  const found = [];
+  const walk = (dir) => {
+    if (!existsSync(dir)) return;
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      if (entry.name === ".git" || entry.name === "node_modules") continue;
+      const abs = join(dir, entry.name);
+      if (entry.isDirectory()) walk(abs);
+      else if (entry.isFile() && entry.name === SKAILE_MANIFEST_FILENAME) found.push(abs);
+    }
+  };
+  walk(root);
+  return found;
+}
+function walkWithManifest(clone, manifestPath, index) {
+  const { manifest } = decodeSkaileManifest(readFileSync(manifestPath, "utf8"));
+  const repoRoot = clone.localPath;
+  const manifestPublisher = manifest.publisher ?? publisherFromGithubUrl(clone.sourceUrl);
+  const manifestVersion = manifest.version ?? (clone.tag ? clone.tag.replace(/^v/, "") : void 0) ?? syntheticVersion(clone.commit);
+  const assets = manifest.assets ?? [];
+  if (assets.length === 0) return false;
   for (const a of assets) {
-    const assetPublisher = a.publisher ?? publisher;
-    const version = a.version ?? sourceVersion;
-    const files = expandAssetFiles(clone.localPath, a);
-    verifyNameMatch(clone.localPath, files, a.name, a.kind);
-    const metadata = readMetadata(clone.localPath, files, a.kind);
+    const assetPublisher = a.publisher ?? manifestPublisher;
+    if (!assetPublisher) {
+      throw new Error(
+        `${clone.sourceUrl}: publisher must be declared in skaile.manifest.yaml (non-GitHub source URL \u2014 auto-derivation not available).`
+      );
+    }
+    const curatedSource = a.source ?? manifest.source;
+    const version = a.version ?? manifestVersion;
+    let files;
+    let sourceUrl;
+    let commit;
+    let metadata;
+    let frontmatter;
+    if (curatedSource) {
+      files = granularFiles(a) ?? [];
+      sourceUrl = curatedSource.url;
+      commit = curatedSource.commit ?? clone.commit;
+    } else {
+      files = expandAssetFiles(repoRoot, a);
+      verifyNameMatch(repoRoot, files, a.name, a.kind);
+      metadata = readMetadata(repoRoot, files, a.kind);
+      frontmatter = readContentFrontmatter(repoRoot, files, a.kind);
+      sourceUrl = clone.sourceUrl;
+      commit = clone.commit;
+    }
     const candidate = {
       publisher: assetPublisher,
       kind: a.kind,
       name: a.name,
       version,
-      sourceUrl: clone.sourceUrl,
-      commit: clone.commit,
+      sourceUrl,
+      commit,
       files,
-      sha256: compositeSha256(files),
+      sha256: a.sha256 ?? compositeSha256(files),
       metadata,
-      deps: bundleDeps(clone.localPath, files, a.kind)
+      deps: a.dependencies ?? bundleDeps(repoRoot, files, a.kind)
     };
+    const fmStr = (k) => typeof frontmatter?.[k] === "string" ? frontmatter[k] : void 0;
+    const fmArr = (k) => Array.isArray(frontmatter?.[k]) ? frontmatter[k].filter((x) => typeof x === "string") : void 0;
+    const description = a.description ?? fmStr("description");
+    const keywords = a.keywords ?? fmArr("keywords");
+    const category = a.category ?? fmStr("category");
+    const license = a.license ?? manifest.license;
+    const homepage = a.homepage ?? manifest.homepage;
+    if (description) candidate.description = description;
+    if (keywords && keywords.length > 0) candidate.keywords = keywords;
+    if (category) candidate.category = category;
+    if (license) candidate.license = license;
+    if (homepage) candidate.homepage = homepage;
     push(index, `${assetPublisher}/${a.kind}:${a.name}`, candidate);
   }
+  return true;
+}
+function globFiles(a) {
+  if (!Array.isArray(a.files)) return void 0;
+  const strings = a.files.filter((f) => typeof f === "string");
+  return strings.length > 0 ? strings : void 0;
+}
+function granularFiles(a) {
+  if (!Array.isArray(a.files)) return void 0;
+  const granular = a.files.filter(
+    (f) => !!f && typeof f === "object" && "path" in f && "sha256" in f
+  );
+  return granular.length > 0 ? granular : void 0;
 }
 function expandAssetFiles(repoRoot, a) {
   const out = [];
   if (a.root) {
     walkDirRecursive(join(repoRoot, a.root), repoRoot, out);
   }
-  if (a.files) {
-    const matches = fg.sync(a.files, { cwd: repoRoot, onlyFiles: true, dot: false });
+  const globs = globFiles(a);
+  if (globs) {
+    const matches = fg.sync(globs, { cwd: repoRoot, onlyFiles: true, dot: false });
     for (const rel of matches) {
       out.push({ path: rel, sha256: fileSha256(join(repoRoot, rel)) });
     }
@@ -560,14 +626,14 @@ var DIR_SCOPED_KINDS = /* @__PURE__ */ new Set([
   "connector",
   "knowledge"
 ]);
-function walkFilenameConvention(clone, index, publisherOverride, versionOverride) {
-  const publisher = publisherOverride ?? publisherFromGithubUrl(clone.sourceUrl);
+function walkFilenameConvention(clone, index) {
+  const publisher = publisherFromGithubUrl(clone.sourceUrl);
   if (!publisher) {
     throw new Error(
-      `${clone.sourceUrl}: publisher must be declared in skaile.yaml (non-GitHub source URL).`
+      `${clone.sourceUrl}: publisher must be declared in skaile.manifest.yaml (non-GitHub source URL).`
     );
   }
-  const version = versionOverride ?? (clone.tag ? clone.tag.replace(/^v/, "") : void 0) ?? syntheticVersion(clone.commit);
+  const version = (clone.tag ? clone.tag.replace(/^v/, "") : void 0) ?? syntheticVersion(clone.commit);
   for (const e of scanDirectory(clone.localPath, publisher)) {
     const manifestAbs = e.source;
     const files = [];
@@ -600,7 +666,7 @@ function verifyNameMatch(repoRoot, files, expectedName, kind) {
   const declared = typeof data.name === "string" ? data.name : void 0;
   if (declared && declared !== expectedName) {
     throw new Error(
-      `name mismatch: ${mdName} says "${declared}", skaile.yaml says "${expectedName}" \u2014 index-time hard error.`
+      `name mismatch: ${mdName} says "${declared}", skaile.manifest.yaml says "${expectedName}" \u2014 index-time hard error.`
     );
   }
 }
@@ -611,6 +677,17 @@ function readMetadata(repoRoot, files, kind) {
   const { data } = parseFrontmatter(readFileSync(join(repoRoot, mcpMd.path), "utf8"));
   return data;
 }
+function readContentFrontmatter(repoRoot, files, kind) {
+  const mdName = MD_FILE_BY_KIND[kind];
+  if (!mdName) return void 0;
+  const md = files.find((f) => f.path.endsWith(mdName));
+  if (!md) return void 0;
+  try {
+    return parseFrontmatter(readFileSync(join(repoRoot, md.path), "utf8")).data;
+  } catch {
+    return void 0;
+  }
+}
 function bundleDeps(repoRoot, files, kind) {
   if (kind !== "bundle") return void 0;
   const bf = files.find((f) => f.path.endsWith(".bundle.yaml") || f.path.endsWith("BUNDLE.md"));
@@ -771,13 +848,6 @@ function mergeSkWorkspaceConfigs(base, overlay) {
     },
     // startup: overlay wins (project-level only)
     startup: overlay.startup ?? base.startup,
-    // publication half — scalars: overlay wins when defined; assets: by kind+name
-    publisher: overlay.publisher ?? base.publisher,
-    version: overlay.version ?? base.version,
-    assets: dedupeByKey(
-      [...base.assets ?? [], ...overlay.assets ?? []],
-      (a) => `${a.kind}:${a.name}`
-    ),
     // mounts: by id — overlay wins
     mounts: mergeById(base.mounts ?? [], overlay.mounts ?? []),
     // connectors: by id — overlay wins
@@ -932,38 +1002,20 @@ function normalizeConfigInternal(raw) {
   }
   if (raw.repositories !== void 0) {
     throw new Error(
-      "skaile.yaml: unknown top-level key `repositories:`. The schema changed in @skaile/workspaces 4.x \u2014 see docs/concepts/manifest-schema.md, or ask your AI assistant to apply the `migrate-skaile-manifest` skill."
+      "skaile.yaml: unknown top-level key `repositories:`. The schema changed \u2014 see docs/concepts/manifest-schema.md, or ask your AI assistant to apply the `migrate-skaile-manifest` skill."
     );
   }
   if (raw.ai_resources !== void 0 || raw.aiResources !== void 0) {
     throw new Error(
-      "skaile.yaml: unknown top-level key `ai_resources:`. The schema changed in @skaile/workspaces 4.x \u2014 see docs/concepts/manifest-schema.md, or ask your AI assistant to apply the `migrate-skaile-manifest` skill."
+      "skaile.yaml: unknown top-level key `ai_resources:`. The schema changed \u2014 see docs/concepts/manifest-schema.md, or ask your AI assistant to apply the `migrate-skaile-manifest` skill."
     );
   }
-  if (typeof raw.publisher === "string" && raw.publisher.length > 0) {
-    config.publisher = raw.publisher;
-  }
-  if (typeof raw.version === "string" && raw.version.length > 0) {
-    config.version = raw.version;
-  }
-  if (Array.isArray(raw.assets)) {
-    const entries = [];
-    for (const item of raw.assets) {
-      if (!item || typeof item !== "object" || Array.isArray(item)) continue;
-      const a = item;
-      const kind = typeof a.kind === "string" ? a.kind : "";
-      const name = typeof a.name === "string" ? a.name : "";
-      if (!kind || !name) continue;
-      const entry = { kind, name };
-      if (typeof a.root === "string") entry.root = a.root;
-      if (Array.isArray(a.files)) {
-        entry.files = a.files.filter((f) => typeof f === "string");
-      }
-      if (typeof a.version === "string") entry.version = a.version;
-      if (typeof a.publisher === "string") entry.publisher = a.publisher;
-      entries.push(entry);
+  for (const key of ["publisher", "version", "assets"]) {
+    if (raw[key] !== void 0) {
+      throw new Error(
+        `skaile.yaml: \`${key}:\` is no longer valid here \u2014 publication keys (publisher, version, assets) describe what a repo publishes and now live in skaile.manifest.yaml. See docs/concepts/manifest-schema.md, or run the \`migrate-skaile-manifest\` skill.`
+      );
     }
-    if (entries.length > 0) config.assets = entries;
   }
   if (Array.isArray(raw.stores)) {
     const entries = [];
@@ -1151,9 +1203,6 @@ function validateConfigValues(config, diagnostics) {
 var CANONICAL_KEY_ORDER = [
   "name",
   "description",
-  "publisher",
-  "version",
-  "assets",
   "agent_config",
   "dependencies",
   "plugins",
@@ -1332,6 +1381,35 @@ function loadMaterializedMcpDeclarations(projectDir) {
   }
   return result;
 }
+function stageMaterializedSkills(projectDir, skillsDir) {
+  const dir = join(projectDir, ".skaile/assets/skill");
+  if (!existsSync(dir)) return [];
+  const staged = [];
+  let subdirs;
+  try {
+    subdirs = readdirSync(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return [];
+  }
+  for (const name of subdirs) {
+    const src = join(dir, name);
+    if (!existsSync(join(src, "SKILL.md"))) continue;
+    const dest = join(projectDir, skillsDir, name);
+    try {
+      cpSync(src, dest, {
+        recursive: true,
+        force: true,
+        filter: (source) => basename(source) !== ".instance.json"
+      });
+      staged.push(name);
+    } catch (err) {
+      console.warn(
+        `[workspace-config] stageMaterializedSkills: failed to stage "${src}": ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  return staged;
+}
 function sourceSlug(url) {
   return url.replace(/\.git$/, "").split(/[/:]/).pop() ?? "source";
 }
@@ -1349,17 +1427,22 @@ function buildSourceClones(sources) {
 }
 function catalogEntryFromCandidate(c) {
   const md = c.metadata ?? {};
-  return {
+  const entry = {
     name: c.name,
     kind: c.kind,
-    description: typeof md.description === "string" ? md.description : "",
+    description: c.description ?? (typeof md.description === "string" ? md.description : ""),
     source: c.files[0]?.path ?? "",
     publisher: c.publisher,
     version: c.version,
     requires: [],
-    dependencies: [],
+    dependencies: c.deps ?? [],
     metadata: c.metadata
   };
+  if (c.category != null) entry.category = c.category;
+  if (c.keywords && c.keywords.length > 0) entry.keywords = c.keywords;
+  if (c.license != null) entry.license = c.license;
+  if (c.homepage != null) entry.homepage = c.homepage;
+  return entry;
 }
 function loadMcpServerDeclarations(projectDir) {
   const config = resolveSkWorkspaceConfig(projectDir);
@@ -1449,6 +1532,6 @@ function resolveAgentDir(projectDir) {
   return resolve(projectDir, definition);
 }
 
-export { COMPACTION_DEFAULTS, CanonicalRefConflictError, DEFAULT_RECIPE_ATTR, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, decodeSkaileYaml, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, mergeSkWorkspaceConfigs, normalizeConfig, pullRepo, readLinks, resolveAgentDir, resolveAll, resolveAsset, resolveSkWorkspaceConfig, saveSkWorkspaceConfig, scanRepo, unlinkRepo, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
-//# sourceMappingURL=chunk-542K7SR6.js.map
-//# sourceMappingURL=chunk-542K7SR6.js.map
+export { COMPACTION_DEFAULTS, CanonicalRefConflictError, DEFAULT_RECIPE_ATTR, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, decodeSkaileYaml, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, mergeSkWorkspaceConfigs, normalizeConfig, pullRepo, readLinks, resolveAgentDir, resolveAll, resolveAsset, resolveSkWorkspaceConfig, saveSkWorkspaceConfig, scanRepo, stageMaterializedSkills, unlinkRepo, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-Z5DI7PDG.js.map
+//# sourceMappingURL=chunk-Z5DI7PDG.js.map