@skaile/workspaces 0.24.0 → 0.26.0

package/dist/cli/index.js

@@ -1,62 +1,63 @@
 #!/usr/bin/env node
-import { openCatalogSource, openLibraryManager, createFullRegistry, openLibrary } from '../chunk-46COM7M5.js';
+import { AI_RESOURCES, aiResourceRoots } from '../chunk-4SQ6Y6U7.js';
+import { openCatalogSource, openLibraryManager, createFullRegistry, openLibrary } from '../chunk-7OBGSR7O.js';
 import { logErr, S, logOk, colorRef, logInfo, logWarn, kindColorPad, kindColor, formatRelativeTime, fitWidth } from '../chunk-WSZAFRQL.js';
-import { getStoreConfig, storeFetch, saveStoreTokens, clearStoreTokens, isStoreAuthenticated } from '../chunk-AFLH7B64.js';
-import { AI_RESOURCES } from '../chunk-2M3XTMOL.js';
-import { LocalSecretsProvider } from '../chunk-JDX54X4Y.js';
-import { resolveLibraryDir, LocalCatalogSource, skaileHomeDir } from '../chunk-2F3RUZXC.js';
+import { getStoreConfig, storeFetch, saveStoreTokens, clearStoreTokens, isStoreAuthenticated } from '../chunk-XGLGS5B4.js';
+import { LocalSecretsProvider } from '../chunk-7GWYRVAX.js';
+import { resolveLibraryDir, LocalCatalogSource, skaileHomeDir } from '../chunk-RTAIGPTF.js';
 import '../chunk-R7FOF242.js';
-import '../chunk-LJ52ZKIU.js';
+import '../chunk-JIQLLZ65.js';
 import '../chunk-OKRUTSG7.js';
-import { runFlow, resumeFlow } from '../chunk-OYRW5RCM.js';
-import '../chunk-GCJXPUHG.js';
-import { validateFlowVersions, parseSkillFrontmatter } from '../chunk-IPUYL6TD.js';
-import { runAgentChat, loadSessionById, loadSession, listSessions, setCurrentSession, deleteSession, clearSession, loadAgentManifest, compileComposition, MarkdownStreamer, resolveMixin } from '../chunk-JQBHCJ6N.js';
-import { buildClaudePluginFiles } from '../chunk-J2TITSXF.js';
+import { runFlow, resumeFlow } from '../chunk-QHXS3YDV.js';
+import '../chunk-ZONCCO5N.js';
+import { validateFlowVersions, parseSkillFrontmatter } from '../chunk-TV72ZJYN.js';
+import { runAgentChat, loadSessionById, loadSession, listSessions, setCurrentSession, deleteSession, clearSession, loadAgentManifest, compileComposition, MarkdownStreamer, resolveMixin } from '../chunk-WD4LP66U.js';
+import { buildClaudePluginFiles } from '../chunk-BQRRBGDE.js';
 import '../chunk-X5YPJV4N.js';
+import '../chunk-TDSRLMDB.js';
 import '../chunk-O7SG5PC2.js';
 import '../chunk-7QBNJTTQ.js';
 import '../chunk-GTS2FODO.js';
 import '../chunk-WQ7DE5UC.js';
 import '../chunk-32NA4TVC.js';
 import '../chunk-W3UDISS2.js';
-import '../chunk-TDSRLMDB.js';
-import '../chunk-M5TE6YI5.js';
-import '../chunk-DQWREFRQ.js';
-import '../chunk-KOVLSBXK.js';
+import '../chunk-23M4XZQW.js';
+import '../chunk-BMQKMOQY.js';
+import '../chunk-PAYAFNXG.js';
 import '../chunk-RRVQAE5D.js';
-import '../chunk-6VTG73UY.js';
+import '../chunk-45H3UO2R.js';
 import '../chunk-LV2HPH3C.js';
-import '../chunk-HIIARTRZ.js';
-import '../chunk-ODPII24X.js';
+import '../chunk-YDTW4GT6.js';
+import '../chunk-ZYDE52WE.js';
 import '../chunk-QMONOHXT.js';
-import '../chunk-QAVZOJCV.js';
+import '../chunk-OVRSNIKJ.js';
 import '../chunk-6E6PKKAD.js';
-import { loadAllFlows } from '../chunk-ICS76R4T.js';
-import '../chunk-GZWJGNNN.js';
-import '../chunk-FVTV7M76.js';
-import { AssetManager } from '../chunk-N6TA6RSH.js';
-import '../chunk-2RFOFHSM.js';
-import { readLock, resolveSettings, globalSettingsPath, projectSettingsPath, loadSettings, saveSettings, portableSpawn, portableSpawnSync, WorkspaceYamlEditor } from '../chunk-Z3M5K67G.js';
+import { loadFlow, loadAllFlows } from '../chunk-W7W66MDZ.js';
+import '../chunk-DEYYRFQU.js';
+import '../chunk-IFGTRL2I.js';
+import { AssetManager } from '../chunk-PY7AQRGH.js';
+import '../chunk-BKF3UFF4.js';
+import { readLock, resolveSettings, globalSettingsPath, projectSettingsPath, loadSettings, saveSettings, portableSpawn, portableSpawnSync, WorkspaceYamlEditor } from '../chunk-KL2MQ6WI.js';
 import { DRIVER_DEFAULTS } from '../chunk-K5GBV4SA.js';
-import '../chunk-KLNL7QHN.js';
-import '../chunk-5ESCS2OS.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, decodeSkaileYaml, findWorkspaceRoot, workspaceConfigFilename } from '../chunk-542K7SR6.js';
-import { parseFrontmatter } from '../chunk-DH4N5AW4.js';
-import { ASSET_KINDS, assetRefToStr } from '../chunk-YX3UWPJ5.js';
+import { assetSearchDirs, detectDomains } from '../chunk-ZAP2BDHG.js';
+import '../chunk-C32BRO2W.js';
+import { resolveAgentDir, resolveSkWorkspaceConfig, findWorkspaceRoot, workspaceConfigFilename } from '../chunk-Z5DI7PDG.js';
+import { SKAILE_MANIFEST_FILENAME, decodeSkaileManifest } from '../chunk-IERB3UXJ.js';
+import { parseFrontmatter } from '../chunk-2FS4FPZ7.js';
+import { ASSET_KINDS, parseAssetRef, isValidAssetName, ASSET_NAME_HINT, assetRefToStr } from '../chunk-IEJ5IOC3.js';
 import '../chunk-JKNWJ64A.js';
 import { SUPPORTED_DRIVER_TARGETS } from '../chunk-O4JH3KUE.js';
 import { openSqlite } from '../chunk-24UIWON4.js';
 import '../chunk-KTBKW2FI.js';
 import '../chunk-UQ6LFBPZ.js';
-import '../chunk-6FNCZYJY.js';
-import '../chunk-NELZIQ2E.js';
+import '../chunk-MBOR7D65.js';
+import '../chunk-QDJKE557.js';
 import '../chunk-CGYEHQOX.js';
 import '../chunk-NSBPE2FW.js';
-import * as fs10 from 'fs';
-import fs10__default, { readFileSync, existsSync, writeFileSync, readdirSync, rmSync, statSync } from 'fs';
-import * as path14 from 'path';
-import path14__default, { resolve, join } from 'path';
+import * as fs11 from 'fs';
+import fs11__default, { readFileSync, existsSync, writeFileSync, readdirSync, rmSync, statSync } from 'fs';
+import * as path15 from 'path';
+import path15__default, { resolve, join } from 'path';
 import { fileURLToPath } from 'url';
 import { Help, Command, Option } from 'commander';
 import * as p5 from '@clack/prompts';
@@ -65,7 +66,7 @@ import * as readline from 'readline';
 import { createInterface } from 'readline';
 import { execSync, spawnSync } from 'child_process';
 import { homedir } from 'os';
-import fs5 from 'fs/promises';
+import fs6 from 'fs/promises';
 import { parse as parse$1, stringify } from 'smol-toml';
 import { createTRPCUntypedClient, httpLink, httpSubscriptionLink } from '@trpc/client';
 import { parse } from 'yaml';
@@ -78,7 +79,7 @@ function makeAssetCommand() {
         logErr(`Invalid --mode "${opts.mode}". Expected: copy | move | link.`);
         process.exit(1);
       }
-      if (!fs10.existsSync(srcPath)) {
+      if (!fs11.existsSync(srcPath)) {
         logErr(`Source path does not exist: ${srcPath}`);
         process.exit(1);
       }
@@ -105,23 +106,23 @@ function makeAssetCommand() {
           );
           process.exit(1);
         }
-        const basename2 = path14.basename(srcPath);
-        const destDir = target.structure === "domain" && opts.domain ? path14.join(target.path, opts.domain) : target.path;
-        fs10.mkdirSync(destDir, { recursive: true });
-        const destPath = path14.join(destDir, basename2);
-        if (fs10.existsSync(destPath)) {
+        const basename2 = path15.basename(srcPath);
+        const destDir = target.structure === "domain" && opts.domain ? path15.join(target.path, opts.domain) : target.path;
+        fs11.mkdirSync(destDir, { recursive: true });
+        const destPath = path15.join(destDir, basename2);
+        if (fs11.existsSync(destPath)) {
           logErr(`Destination already exists: ${destPath}`);
           process.exit(1);
         }
         switch (opts.mode) {
           case "copy":
-            fs10.cpSync(srcPath, destPath, { recursive: true });
+            fs11.cpSync(srcPath, destPath, { recursive: true });
             break;
           case "move":
-            fs10.renameSync(srcPath, destPath);
+            fs11.renameSync(srcPath, destPath);
             break;
           case "link":
-            fs10.symlinkSync(path14.resolve(srcPath), destPath);
+            fs11.symlinkSync(path15.resolve(srcPath), destPath);
             break;
         }
         if (target.backend === "git" && opts.commit) {
@@ -169,17 +170,17 @@ function makeAssetCommand() {
         }
         const manifestPath = def.manifest.path;
         const candidateSubpath = typeof manifestPath === "string" && manifestPath.length > 0 ? manifestPath : def.name;
-        const srcPath = path14.join(lib.path, candidateSubpath);
-        if (!fs10.existsSync(srcPath)) {
+        const srcPath = path15.join(lib.path, candidateSubpath);
+        if (!fs11.existsSync(srcPath)) {
           logErr(`Asset path not found: ${srcPath}`);
           process.exit(1);
         }
-        const destPath = path14.join(target, candidateSubpath);
-        fs10.mkdirSync(path14.dirname(destPath), { recursive: true });
+        const destPath = path15.join(target, candidateSubpath);
+        fs11.mkdirSync(path15.dirname(destPath), { recursive: true });
         if (opts.mode === "copy") {
-          fs10.cpSync(srcPath, destPath, { recursive: true });
+          fs11.cpSync(srcPath, destPath, { recursive: true });
         } else {
-          fs10.symlinkSync(path14.resolve(srcPath), destPath);
+          fs11.symlinkSync(path15.resolve(srcPath), destPath);
         }
         logOk(`Installed ${ref} \u2192 ${destPath} (${opts.mode})`);
       } finally {
@@ -273,7 +274,7 @@ function makeSearchCommand() {
     const showLocal = !opts.store;
     const showStore = !opts.local;
     if (showLocal) {
-      const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+      const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
       const entries = am2.search(query, kind);
       if (entries.length === 0) {
         if (!showStore) {
@@ -310,7 +311,7 @@ function makeSearchCommand() {
     }
     if (showStore) {
       try {
-        const { getStoreConfig: getStoreConfig2, storeFetch: storeFetch2 } = await import('../store-client-AEI6Y3KD.js');
+        const { getStoreConfig: getStoreConfig2, storeFetch: storeFetch2 } = await import('../store-client-CENBEASX.js');
         const config = getStoreConfig2();
         const params = {};
         if (query) params.q = query;
@@ -339,7 +340,7 @@ function makeSearchCommand() {
 function makeAddCommand() {
   return new Command("add").description("Add to skaile.yaml + deploy").argument("<ref>", "Asset reference (kind:name[@repo])").option("--project-dir <path>", "Project directory", process.cwd()).option("--global", "Deploy to global dir (~/.claude)").option("--target <agent>", "Driver target", "claude-code").action(async (ref, opts) => {
     const am2 = new AssetManager({
-      projectDir: path14__default.resolve(opts.projectDir),
+      projectDir: path15__default.resolve(opts.projectDir),
       global: opts.global,
       driverTarget: opts.target
     });
@@ -360,7 +361,7 @@ function makeAddCommand() {
 function makeRemoveCommand() {
   return new Command("remove").description("Remove from skaile.yaml + undeploy").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).option("--global", "Remove from global dir").option("--target <agent>", "Driver target", "claude-code").action((ref, opts) => {
     const am2 = new AssetManager({
-      projectDir: path14__default.resolve(opts.projectDir),
+      projectDir: path15__default.resolve(opts.projectDir),
       global: opts.global,
       driverTarget: opts.target
     });
@@ -374,7 +375,7 @@ function makeListCommand() {
     new Option("--target <agent>", "Driver target").default("claude-code").choices(SUPPORTED_DRIVER_TARGETS)
   ).action((kind, opts) => {
     const am2 = new AssetManager({
-      projectDir: path14__default.resolve(opts.projectDir),
+      projectDir: path15__default.resolve(opts.projectDir),
       global: opts.global,
       driverTarget: opts.target
     });
@@ -398,7 +399,7 @@ function makeListCommand() {
 }
 function makeInfoCommand() {
   return new Command("info").description("Show asset metadata, deps, deploy status").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     const entry = am2.info(ref);
     if (!entry) {
       logErr(
@@ -431,7 +432,7 @@ function makeCreateCommand() {
     new Option("-k, --kind <kind>", "Asset kind").default("skill").choices([...ASSET_KINDS])
   ).option("-d, --dir <dir>", "Target directory (default: cwd)").action((name, opts) => {
     const am2 = new AssetManager({ projectDir: process.cwd() });
-    const destDir = opts.dir ? path14__default.resolve(opts.dir) : process.cwd();
+    const destDir = opts.dir ? path15__default.resolve(opts.dir) : process.cwd();
     const result = am2.create(name, opts.kind, destDir);
     if (result.ok) logOk(`Created ${kindColor(opts.kind)}: ${pc5.dim(result.path)}`);
     else {
@@ -442,7 +443,7 @@ function makeCreateCommand() {
 }
 function makeDoctorCommand() {
   return new Command("doctor").description("Scan for missing dependency chains").argument("[name]", "Check a specific asset (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action((name, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     const issues = am2.doctor();
     if (issues.length === 0) {
       logOk("No missing dependencies.");
@@ -468,11 +469,11 @@ function makeCatalogCommand() {
   const catalog = new Command("catalog").description("Catalog source health and configuration");
   catalog.command("test").description("Probe the configured catalog source and report status").option("--project-dir <path>", "Project directory (for project-level config overlay)").option("--url <url>", "Override the catalog URL for this probe").option("--force", "Probe the network even in air-gapped mode (cache_ttl: 0)").action(async (opts) => {
     const { resolveConfig, isLocalCatalogUrl, trpcGetUrl } = await import('../library/index.js');
-    const projectDir = opts.projectDir ? path14__default.resolve(opts.projectDir) : void 0;
+    const projectDir = opts.projectDir ? path15__default.resolve(opts.projectDir) : void 0;
     const cfg = resolveConfig({ projectDir });
     const baseUrl = opts.url ?? cfg.catalog.url;
     if (isLocalCatalogUrl(baseUrl)) {
-      const { resolveCatalogSource } = await import('../open-library-67FSSQWE.js');
+      const { resolveCatalogSource } = await import('../open-library-WYASW4BH.js');
       let resolved;
       try {
         resolved = await resolveCatalogSource({ projectDir: opts.projectDir });
@@ -561,7 +562,7 @@ function makeCatalogCommand() {
   });
   catalog.command("info").description("Print the resolved catalog configuration (url, framing, cacheTtlMs)").option("--project-dir <path>", "Project directory (for project-level config overlay)").action(async (opts) => {
     const { resolveConfig } = await import('../library/index.js');
-    const projectDir = opts.projectDir ? path14__default.resolve(opts.projectDir) : void 0;
+    const projectDir = opts.projectDir ? path15__default.resolve(opts.projectDir) : void 0;
     const cfg = resolveConfig({ projectDir });
     console.log(`url: ${cfg.catalog.url}`);
     console.log(`framing: ${cfg.catalog.framing}`);
@@ -613,23 +614,48 @@ complete -F _${bin}_completion ${bin}`,
 end
 complete -c ${bin} -f -a '(__${bin}_complete)'`
 };
+function discoverFlows() {
+  const byId = /* @__PURE__ */ new Map();
+  for (const root of aiResourceRoots()) {
+    for (const flow of loadAllFlows(root)) {
+      if (!byId.has(flow.id)) byId.set(flow.id, flow);
+    }
+  }
+  return [...byId.values()];
+}
+function findFlowFile(flowId, priorityRoots = []) {
+  for (const root of [...priorityRoots, ...aiResourceRoots()]) {
+    for (const { dir } of assetSearchDirs(root, "flows")) {
+      for (const ext of [".flow.yaml", ".flow.json", ".json"]) {
+        const candidate = path15__default.join(dir, `${flowId}${ext}`);
+        if (fs11__default.existsSync(candidate)) return candidate;
+      }
+    }
+  }
+  return void 0;
+}
 function findSkills(domain) {
-  const skills = [];
-  if (!fs10__default.existsSync(AI_RESOURCES)) return skills;
-  const domains = fs10__default.readdirSync(AI_RESOURCES, { withFileTypes: true }).filter((d) => d.isDirectory()).filter((d) => true);
-  for (const d of domains) {
-    const skillsDir = path14__default.join(AI_RESOURCES, d.name, "skills");
-    if (!fs10__default.existsSync(skillsDir)) continue;
-    walkSkills(skillsDir, d.name, skills);
+  const found = [];
+  for (const root of aiResourceRoots()) {
+    for (const { dir, domain: dirDomain } of assetSearchDirs(root, "skills")) {
+      if (fs11__default.existsSync(dir)) walkSkills(dir, dirDomain, found);
+    }
   }
-  return skills;
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = [];
+  for (const s of found) {
+    if (seen.has(s.name)) continue;
+    seen.add(s.name);
+    deduped.push(s);
+  }
+  return deduped;
 }
 function walkSkills(dir, domain, out) {
-  for (const entry of fs10__default.readdirSync(dir, { withFileTypes: true })) {
-    const full = path14__default.join(dir, entry.name);
+  for (const entry of fs11__default.readdirSync(dir, { withFileTypes: true })) {
+    const full = path15__default.join(dir, entry.name);
     if (entry.isDirectory()) {
-      const skillMd = path14__default.join(full, "SKILL.md");
-      if (fs10__default.existsSync(skillMd)) {
+      const skillMd = path15__default.join(full, "SKILL.md");
+      if (fs11__default.existsSync(skillMd)) {
         out.push({ name: entry.name, path: full, skillPath: skillMd, domain });
       } else {
         walkSkills(full, domain, out);
@@ -643,21 +669,24 @@ function resolveSkillNames() {
   return findSkills().map((s) => s.name);
 }
 function resolveDomains() {
-  if (!fs10__default.existsSync(AI_RESOURCES)) return [];
-  return fs10__default.readdirSync(AI_RESOURCES, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+  const domains = /* @__PURE__ */ new Set();
+  for (const root of aiResourceRoots()) {
+    for (const d of detectDomains(root)) domains.add(d.id);
+  }
+  return [...domains];
 }
 function resolveFlowIds() {
   try {
-    return loadAllFlows(AI_RESOURCES).map((f) => f.id);
+    return discoverFlows().map((f) => f.id);
   } catch {
     return [];
   }
 }
 function resolveSessionIds(projectDir) {
-  const sessionsDir = path14__default.join(projectDir, ".skaile", "sessions");
-  if (!fs10__default.existsSync(sessionsDir)) return [];
+  const sessionsDir = path15__default.join(projectDir, ".skaile", "sessions");
+  if (!fs11__default.existsSync(sessionsDir)) return [];
   try {
-    return fs10__default.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).map((f) => f.slice(0, -".json".length));
+    return fs11__default.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).map((f) => f.slice(0, -".json".length));
   } catch {
     return [];
   }
@@ -712,73 +741,74 @@ function resolveDynamic(words, cword) {
 }
 var PERSONAL_KEYS = /* @__PURE__ */ new Set(["driver", "model", "provider"]);
 var API_KEY_PREFIX = "apiKey.";
-function makeConfigCommand() {
-  const cmd = new Command("config").description("Manage personal config (.skaile/settings.json)");
-  cmd.command("show").description("Show effective config with sources").option("--project-dir <path>", "Project directory").action(async (opts) => {
-    const projectDir = opts.projectDir ? path14__default.resolve(opts.projectDir) : process.cwd();
-    const config = await resolveSettings(projectDir);
-    const wsDefaults = {};
-    try {
-      const ws = resolveSkWorkspaceConfig(projectDir);
-      const p7 = ws.agent_config?.default ?? {};
-      if (p7.driver) wsDefaults.driver = p7.driver;
-      if (p7.provider) wsDefaults.provider = p7.provider;
-      if (p7.model) wsDefaults.model = p7.model;
-      if (p7.skills_dir) wsDefaults.skills_dir = p7.skills_dir;
-      if (p7.agents_dir) wsDefaults.agents_dir = p7.agents_dir;
-      if (p7.prompts_dir) wsDefaults.prompts_dir = p7.prompts_dir;
-    } catch {
+async function showConfig(opts) {
+  const projectDir = opts.projectDir ? path15__default.resolve(opts.projectDir) : process.cwd();
+  const config = await resolveSettings(projectDir);
+  const wsDefaults = {};
+  try {
+    const ws = resolveSkWorkspaceConfig(projectDir);
+    const p7 = ws.agent_config?.default ?? {};
+    if (p7.driver) wsDefaults.driver = p7.driver;
+    if (p7.provider) wsDefaults.provider = p7.provider;
+    if (p7.model) wsDefaults.model = p7.model;
+    if (p7.skills_dir) wsDefaults.skills_dir = p7.skills_dir;
+    if (p7.agents_dir) wsDefaults.agents_dir = p7.agents_dir;
+    if (p7.prompts_dir) wsDefaults.prompts_dir = p7.prompts_dir;
+  } catch {
+  }
+  console.log();
+  console.log(S.heading("  Effective Config"));
+  console.log(`  ${S.rule(40)}`);
+  for (const key of ["driver", "provider", "model"]) {
+    const value = config[key];
+    if (value !== void 0) {
+      console.log(`  ${S.label(`${key}:`.padEnd(16))} ${value}`);
     }
+  }
+  if (Object.keys(wsDefaults).length > 0) {
     console.log();
-    console.log(S.heading("  Effective Config"));
+    console.log(`  ${S.heading("Workspace Defaults")}  ${S.dim("(skaile.yaml)")}`);
     console.log(`  ${S.rule(40)}`);
-    for (const key of ["driver", "provider", "model"]) {
-      const value = config[key];
-      if (value !== void 0) {
-        console.log(`  ${S.label(`${key}:`.padEnd(16))} ${value}`);
-      }
-    }
-    if (Object.keys(wsDefaults).length > 0) {
-      console.log();
-      console.log(`  ${S.heading("Workspace Defaults")}  ${S.dim("(skaile.yaml)")}`);
-      console.log(`  ${S.rule(40)}`);
-      for (const [key, value] of Object.entries(wsDefaults)) {
-        console.log(`  ${S.label(`${key}:`.padEnd(16))} ${value}`);
-      }
+    for (const [key, value] of Object.entries(wsDefaults)) {
+      console.log(`  ${S.label(`${key}:`.padEnd(16))} ${value}`);
     }
-    if (config.apiKeys && Object.keys(config.apiKeys).length > 0) {
-      console.log();
-      console.log(`  ${S.heading("API Keys")}`);
-      console.log(`  ${S.rule(40)}`);
-      for (const [provider, key] of Object.entries(config.apiKeys)) {
-        const fromEnv = !!process.env[`${provider.toUpperCase()}_API_KEY`];
-        if (key) {
-          console.log(
-            `  ${S.label(`${provider}:`.padEnd(16))} ****${key.slice(-4)}` + (fromEnv ? `  ${S.dim("[env]")}` : "")
-          );
-        }
+  }
+  if (config.apiKeys && Object.keys(config.apiKeys).length > 0) {
+    console.log();
+    console.log(`  ${S.heading("API Keys")}`);
+    console.log(`  ${S.rule(40)}`);
+    for (const [provider, key] of Object.entries(config.apiKeys)) {
+      const fromEnv = !!process.env[`${provider.toUpperCase()}_API_KEY`];
+      if (key) {
+        console.log(
+          `  ${S.label(`${provider}:`.padEnd(16))} ****${key.slice(-4)}` + (fromEnv ? `  ${S.dim("[env]")}` : "")
+        );
       }
     }
-    const fw = config.driver ?? "omp";
-    const paths = DRIVER_DEFAULTS[fw] ?? DRIVER_DEFAULTS.omp;
-    if (paths) {
-      console.log();
-      console.log(`  ${S.heading("Resolved Paths")}  ${S.dim(`(${fw})`)}`);
-      console.log(`  ${S.rule(40)}`);
-      console.log(`  ${S.label("skills:".padEnd(16))} ${config.skillsDir ?? paths.skillsDir}`);
-      console.log(`  ${S.label("agents:".padEnd(16))} ${config.agentsDir ?? paths.agentsDir}`);
-      console.log(`  ${S.label("prompts:".padEnd(16))} ${config.promptsDir ?? paths.promptsDir}`);
-    }
+  }
+  const fw = config.driver ?? "omp";
+  const paths = DRIVER_DEFAULTS[fw] ?? DRIVER_DEFAULTS.omp;
+  if (paths) {
     console.log();
-  });
+    console.log(`  ${S.heading("Resolved Paths")}  ${S.dim(`(${fw})`)}`);
+    console.log(`  ${S.rule(40)}`);
+    console.log(`  ${S.label("skills:".padEnd(16))} ${config.skillsDir ?? paths.skillsDir}`);
+    console.log(`  ${S.label("agents:".padEnd(16))} ${config.agentsDir ?? paths.agentsDir}`);
+    console.log(`  ${S.label("prompts:".padEnd(16))} ${config.promptsDir ?? paths.promptsDir}`);
+  }
+  console.log();
+}
+function makeConfigCommand() {
+  const cmd = new Command("config").description("Manage personal config (.skaile/settings.json)");
+  cmd.command("show").description("Show effective config with sources").option("--project-dir <path>", "Project directory").action((opts) => showConfig(opts));
   cmd.command("get <key>").description("Get an effective config value").option("--project-dir <path>", "Project directory").action(async (key, opts) => {
-    const projectDir = opts.projectDir ? path14__default.resolve(opts.projectDir) : process.cwd();
+    const projectDir = opts.projectDir ? path15__default.resolve(opts.projectDir) : process.cwd();
     const config = await resolveSettings(projectDir);
     const value = config[key];
     console.log(value ?? S.dim("(not set)"));
   });
   cmd.command("set <key> <value>").description("Set a personal config value (driver, model, provider, apiKey.<provider>)").option("--project-dir <path>", "Project directory").option("--global", "Write to ~/.skaile/settings.json instead of project-local").action(async (key, value, opts) => {
-    const projectDir = opts.projectDir ? path14__default.resolve(opts.projectDir) : process.cwd();
+    const projectDir = opts.projectDir ? path15__default.resolve(opts.projectDir) : process.cwd();
     const isApiKey = key.startsWith(API_KEY_PREFIX);
     if (!PERSONAL_KEYS.has(key) && !isApiKey) {
       logErr(
@@ -802,9 +832,7 @@ function makeConfigCommand() {
     }
     console.log(S.dim(`  \u2192 ${filePath}`));
   });
-  cmd.action(() => {
-    cmd.commands.find((c) => c.name() === "show").parse(process.argv);
-  });
+  cmd.action(() => showConfig({}));
   return cmd;
 }
 function parseShorthand(input) {
@@ -954,6 +982,22 @@ function makeConnectCommand() {
     await client.disconnect();
   });
 }
+function parsePositiveIntOption(value) {
+  const n = Number.parseInt(value, 10);
+  if (!Number.isFinite(n) || n <= 0) {
+    throw new Error(`--limit must be a positive integer (got ${value})`);
+  }
+  return n;
+}
+function scanFactoryConnectors(scanDirectory, roots) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const dir of roots) {
+    for (const e of scanDirectory(dir, "factory-assets")) {
+      if (e.kind === "connector" && !byName.has(e.name)) byName.set(e.name, e);
+    }
+  }
+  return [...byName.values()];
+}
 async function connectConnectors(projectDir) {
   const res = await import('../connectors/index.js');
   res.registerBuiltinConnectors();
@@ -1056,11 +1100,8 @@ async function promptField(field) {
 function makeConnectorCommand() {
   const cmd = new Command("connector").description("Operate on connectors in a workspace");
   cmd.command("catalog").description("List all available connector drivers and their dependencies").action(async () => {
-    const { scanDirectory, resolveBaseAssetsRoot } = await import('../core/index.js');
-    const baseAssetsDir = resolveBaseAssetsRoot();
-    const entries = scanDirectory(baseAssetsDir, "base-assets").filter(
-      (e) => e.kind === "connector"
-    );
+    const { scanDirectory, factoryAssetRoots } = await import('../core/index.js');
+    const entries = scanFactoryConnectors(scanDirectory, factoryAssetRoots());
     if (entries.length === 0) {
       console.log("No connector descriptors found.");
       return;
@@ -1084,17 +1125,14 @@ function makeConnectorCommand() {
   cmd.command("add <driver>").option("--id <id>", "Connector instance ID (defaults to driver name)").option("--access <level>", "Access level: read-only | read-write", "read-only").option("--no-install", "Skip npm dependency installation").option("--project-dir <path>", "Workspace directory", process.cwd()).description("Add a connector to skaile.yaml and install its npm deps").action(
     async (driver, opts) => {
       const { installNpmPackages } = await import('../connectors/index.js');
-      const { scanDirectory, resolveBaseAssetsRoot, WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-      const projectDir = path14__default.resolve(opts.projectDir);
-      const yamlPath = path14__default.join(projectDir, "skaile.yaml");
+      const { scanDirectory, factoryAssetRoots, WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
+      const projectDir = path15__default.resolve(opts.projectDir);
+      const yamlPath = path15__default.join(projectDir, "skaile.yaml");
       if (!existsSync(yamlPath)) {
         logErr("No skaile.yaml found in current directory. Run 'skaile init' first.");
         process.exit(1);
       }
-      const baseAssetsDir = resolveBaseAssetsRoot();
-      const entries = scanDirectory(baseAssetsDir, "base-assets").filter(
-        (e) => e.kind === "connector"
-      );
+      const entries = scanFactoryConnectors(scanDirectory, factoryAssetRoots());
       const entry = entries.find((e) => e.name === driver);
       if (!entry) {
         logErr(
@@ -1149,8 +1187,8 @@ ${installResult.output}`);
   );
   cmd.command("remove <id>").option("--project-dir <path>", "Workspace directory", process.cwd()).description("Remove a connector from skaile.yaml by its instance ID").action(async (id, opts) => {
     const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-    const projectDir = path14__default.resolve(opts.projectDir);
-    const yamlPath = path14__default.join(projectDir, "skaile.yaml");
+    const projectDir = path15__default.resolve(opts.projectDir);
+    const yamlPath = path15__default.join(projectDir, "skaile.yaml");
     if (!existsSync(yamlPath)) {
       logErr("No skaile.yaml found in current directory.");
       process.exit(1);
@@ -1167,7 +1205,7 @@ ${installResult.output}`);
   cmd.command("status [id]").option("--project-dir <path>", "Workspace directory", process.cwd()).description("Connect and report health status for one or all connectors").action(async (id, opts) => {
     const res = await import('../connectors/index.js');
     res.registerBuiltinConnectors();
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const declarations = res.loadConnectorDeclarations(projectDir);
     if (declarations.length === 0) {
       console.log("No connectors configured in skaile.yaml.");
@@ -1191,7 +1229,7 @@ ${installResult.output}`);
     await manager.disconnectAll();
   });
   cmd.command("list").description("List all configured connectors").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       console.log(JSON.stringify(manager.listConnectors(), null, 2));
@@ -1200,7 +1238,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("sync [id]").description("Re-sync a filesystem-face connector or all of them (git pull, S3 refresh, etc.)").option("--all", "Sync all connectors").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (opts.all) {
@@ -1224,7 +1262,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("ops <id>").description("List available operations for a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (!manager.has(id)) {
@@ -1239,7 +1277,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("read <id> <resource-path>").description("Read content from a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const content = await manager.read(id, resourcePath);
@@ -1249,7 +1287,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("write <id> <resource-path> <content>").description("Write content to a connector at a path").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, content, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       await manager.write(id, resourcePath, { data: content });
@@ -1258,8 +1296,8 @@ ${installResult.output}`);
       await manager.disconnectAll();
     }
   });
-  cmd.command("entries <id> [resource-path]").description("List entries in a connector (files, keys, rows, etc)").option("--project-dir <path>", "Workspace directory", process.cwd()).option("--recursive", "Include nested entries").option("--limit <n>", "Maximum entries to return", parseInt).action(async (id, resourcePath, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+  cmd.command("entries <id> [resource-path]").description("List entries in a connector (files, keys, rows, etc)").option("--project-dir <path>", "Workspace directory", process.cwd()).option("--recursive", "Include nested entries").option("--limit <n>", "Maximum entries to return", parsePositiveIntOption).action(async (id, resourcePath, opts) => {
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const entries = await manager.list(id, resourcePath, {
@@ -1272,7 +1310,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("search <id> <query>").description("Search within a connector for matching content").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, query, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const results = await manager.search(id, query);
@@ -1282,7 +1320,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("delete <id> <resource-path>").description("Delete an entry from a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const ok = await manager.delete(id, resourcePath);
@@ -1292,7 +1330,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("run <id> <op> [args...]").description("Run a custom adapter operation (e.g. git log, sqlite query)").option("--project-dir <path>", "Workspace directory", process.cwd()).allowUnknownOption().action(async (id, op, args, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (!manager.has(id)) {
@@ -1401,7 +1439,7 @@ function envRecord() {
 async function buildDeployContext(projectDir) {
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
-  const workspaceId = config.name ?? path14__default.basename(projectDir);
+  const workspaceId = config.name ?? path15__default.basename(projectDir);
   let log;
   try {
     const { createLogger } = await import('../core/logging.js');
@@ -1433,13 +1471,13 @@ async function ensureTargetsRegistered(projectDir) {
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
   if (config.plugins && config.plugins.length > 0) {
-    const { ensurePluginsLoaded } = await import('../plugin-store-IZ5SCRAV.js');
+    const { ensurePluginsLoaded } = await import('../plugin-store-O5VR45CA.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     for (const f of result.failed) logWarn(f.error);
   }
 }
 async function runUp(opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   await ensureTargetsRegistered(projectDir);
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const { resolveDeployTarget, pluginRegistry } = await import('../plugin-registry/index.js');
@@ -1507,7 +1545,7 @@ async function restoreFromHandle(projectDir) {
   return { target, handle, ctx };
 }
 async function runDown(opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   await restored.handle.stop();
@@ -1516,7 +1554,7 @@ async function runDown(opts) {
   logOk(`Stopped ${S.cmd(restored.target.id)} and cleared the handle.`);
 }
 async function runStatus(opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   const health = await restored.handle.health();
@@ -1530,7 +1568,7 @@ async function runStatus(opts) {
   console.log();
 }
 async function runLogs(opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   if (!restored.handle.logs) {
@@ -1554,7 +1592,7 @@ function makeDeployCommand() {
 }
 function makeDiffCommand() {
   return new Command("diff").description("Show changes between deployed and source versions").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     const result = am2.diff(ref);
     if (result === null) {
       logInfo("No differences (or asset not found).");
@@ -1566,7 +1604,7 @@ function makeDiffCommand() {
 function makeFlowCommand() {
   const cmd = new Command("flow").description("Manage flows");
   cmd.command("list").description("List available flows").action(async () => {
-    const flows = loadAllFlows(AI_RESOURCES);
+    const flows = discoverFlows();
     if (flows.length === 0) {
       logInfo("No flows found.");
       return;
@@ -1581,7 +1619,7 @@ function makeFlowCommand() {
     console.log();
   });
   cmd.command("show <id>").description("Show flow details and node graph").action(async (id) => {
-    const flows = loadAllFlows(AI_RESOURCES);
+    const flows = discoverFlows();
     const flow = flows.find((f) => f.id === id);
     if (!flow) {
       logErr(`Flow not found: ${id}`);
@@ -1607,7 +1645,7 @@ function makeFlowCommand() {
 function makeHistoryCommand() {
   const cmd = new Command("history").description("Show recent add/remove/update actions");
   cmd.argument("[limit]", "Number of entries to show", "20").option("--project-dir <path>", "Project directory", process.cwd()).action((limitStr, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     const limit = parseInt(limitStr, 10) || 20;
     const entries = am2.history(limit);
     if (entries.length === 0) {
@@ -1627,7 +1665,7 @@ function makeHistoryCommand() {
     console.log();
   });
   cmd.command("clear").description("Clear action history").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     am2.clearHistory();
     logOk("History cleared.");
   });
@@ -1695,12 +1733,12 @@ function makeLibraryCommand() {
   cmd.command("init <name>").description("Create a new local library at ~/.skaile/libraries/<name>").option("--git <url>", "Initialize as a git library tracking <url>").option("--owner", "Mark as owner (default for local)").option("--contributor", "Mark as contributor").option("--reader", "Mark as reader").action(
     async (name, opts) => {
       const libDir = resolveLibraryDir();
-      const libPath = path14.join(libDir, name);
+      const libPath = path15.join(libDir, name);
       const ownership = opts.contributor ? "contributor" : opts.reader ? "reader" : "owner";
       const { manager, close } = await openLibraryManager();
       try {
         if (opts.git) {
-          fs10.mkdirSync(libPath, { recursive: true });
+          fs11.mkdirSync(libPath, { recursive: true });
           await manager.addLibrary({
             name,
             path: libPath,
@@ -1709,7 +1747,7 @@ function makeLibraryCommand() {
             ownership
           });
         } else {
-          fs10.mkdirSync(libPath, { recursive: true });
+          fs11.mkdirSync(libPath, { recursive: true });
           await manager.addLibrary({
             name,
             path: libPath,
@@ -1768,7 +1806,7 @@ function makeLibraryCommand() {
           target = def;
         }
         const am2 = new AssetManager({ projectDir: process.cwd() });
-        const destDir = opts.dir ? path14.join(target.path, opts.dir) : target.path;
+        const destDir = opts.dir ? path15.join(target.path, opts.dir) : target.path;
         const res = am2.create(name, opts.kind ?? kind, destDir);
         if (res.ok) {
           logOk(`Created ${opts.kind ?? kind}: ${pc5.dim(res.path)}`);
@@ -1794,13 +1832,13 @@ function makeLibraryCommand() {
     const { manager, close } = await openLibraryManager();
     try {
       const lib = await manager.requireLibrary(oldName);
-      const parent = path14.dirname(lib.path);
-      const newPath = path14.join(parent, newName);
-      if (fs10.existsSync(newPath)) {
+      const parent = path15.dirname(lib.path);
+      const newPath = path15.join(parent, newName);
+      if (fs11.existsSync(newPath)) {
         logErr(`Target directory already exists: ${newPath}`);
         process.exit(1);
       }
-      fs10.renameSync(lib.path, newPath);
+      fs11.renameSync(lib.path, newPath);
       await manager.updateLibrary(lib.id, { name: newName, path: newPath });
       logOk(`Renamed ${oldName} \u2192 ${newName}`);
     } finally {
@@ -1986,9 +2024,9 @@ async function printOverallStatus(projectDir, asJson) {
     } catch {
       secretsStrategy = "unavailable";
     }
-    const resolvedProjectDir = path14.resolve(projectDir);
-    const hasWorkspaceConfig = existsSync(path14.join(resolvedProjectDir, "skaile.yaml"));
-    const hasLockFile = existsSync(path14.join(resolvedProjectDir, "skaile.lock.yaml"));
+    const resolvedProjectDir = path15.resolve(projectDir);
+    const hasWorkspaceConfig = existsSync(path15.join(resolvedProjectDir, "skaile.yaml"));
+    const hasLockFile = existsSync(path15.join(resolvedProjectDir, "skaile.lock.yaml"));
     let subscriptions = [];
     if (hasWorkspaceConfig) {
       try {
@@ -2292,7 +2330,7 @@ function actOnHeader(row, action3) {
   return false;
 }
 async function loadAssets() {
-  const { gatherAssetFeeds } = await import('../asset-feeds-WKIKSZ6Z.js');
+  const { gatherAssetFeeds } = await import('../asset-feeds-WMVTI7KW.js');
   const { entries, notes } = await gatherAssetFeeds(am, am.projectDir);
   if (notes.length > 0) {
     state.message = notes.map((n) => `[${n.feed}] ${n.message}`).join(" \u2022 ");
@@ -2347,12 +2385,12 @@ async function loadAssets() {
 async function loadSourcesAndLibraries() {
   try {
     const [{ openLibraryManager: openLibraryManager2 }, { skaileHomeDir: skaileHomeDir2 }] = await Promise.all([
-      import('../open-library-67FSSQWE.js'),
+      import('../open-library-WYASW4BH.js'),
       import('../library/index.js')
     ]);
     const { manager, library, close } = await openLibraryManager2();
     try {
-      const sourcesDir2 = path14__default.join(skaileHomeDir2(), "sources");
+      const sourcesDir2 = path15__default.join(skaileHomeDir2(), "sources");
       const isSourceRow = (l) => l.path.startsWith(sourcesDir2);
       const libs = await manager.listLibraries();
       const defs = await library.listAssetDefs();
@@ -2854,13 +2892,13 @@ async function run(projectDir) {
 }
 function makeManageCommand() {
   return new Command("manage").description("Interactive TUI for managing assets, sources, and libraries").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    await run(path14__default.resolve(opts.projectDir));
+    await run(path15__default.resolve(opts.projectDir));
   });
 }
 function makeMcpServerCommand() {
   return new Command("mcp-server").description("Start skaile workspace MCP server (stdio transport)").option("--project-dir <path>", "Project directory (default: cwd)", process.cwd()).action(async (opts) => {
-    const path34 = await import('path');
-    const projectDir = path34.default.resolve(opts.projectDir);
+    const path35 = await import('path');
+    const projectDir = path35.default.resolve(opts.projectDir);
     const { LogStore, StdoutSink, registerLogStore } = await import('../core/logging.js');
     registerLogStore(
       new LogStore({
@@ -2897,8 +2935,8 @@ function makeNpxCommand() {
   skills.command("add <url>").description(
     "Clone a repo, register it in the project's skaile.yaml sources[], and install a skill from it"
   ).requiredOption("--skill <name>", "Skill name to install from the repo").option("--project-dir <path>", "Project directory", process.cwd()).option("--target <agent>", "Agent framework", "claude-code").option("--global", "Deploy globally").action(async (url, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
-    const projYaml = path14__default.join(projectDir, "skaile.yaml");
+    const projectDir = path15__default.resolve(opts.projectDir);
+    const projYaml = path15__default.join(projectDir, "skaile.yaml");
     if (!existsSync(projYaml)) {
       logErr(`No skaile.yaml in ${projectDir} \u2014 run \`skaile init\` first.`);
       process.exit(1);
@@ -2911,7 +2949,7 @@ function makeNpxCommand() {
     }
     const spinner5 = p5.spinner();
     const slug = sourceSlug(url);
-    const clonePath = path14__default.join(homedir(), ".skaile", "sources", slug);
+    const clonePath = path15__default.join(homedir(), ".skaile", "sources", slug);
     spinner5.start(`Cloning ${url}`);
     try {
       if (!existsSync(clonePath)) {
@@ -2960,12 +2998,12 @@ function makeNpxCommand() {
   return npx;
 }
 function resolvePublisher(clonePath, url) {
-  const yamlPath = path14__default.join(clonePath, "skaile.yaml");
-  if (existsSync(yamlPath)) {
+  const manifestPath = path15__default.join(clonePath, SKAILE_MANIFEST_FILENAME);
+  if (existsSync(manifestPath)) {
     try {
-      const { config } = decodeSkaileYaml(readFileSync(yamlPath, "utf8"));
-      if (typeof config.publisher === "string" && config.publisher.length > 0) {
-        return config.publisher;
+      const { manifest } = decodeSkaileManifest(readFileSync(manifestPath, "utf8"));
+      if (typeof manifest.publisher === "string" && manifest.publisher.length > 0) {
+        return manifest.publisher;
       }
     } catch {
     }
@@ -2973,12 +3011,12 @@ function resolvePublisher(clonePath, url) {
   return url.match(/github\.com[/:]([^/]+)\/[^/]+/)?.[1];
 }
 function resolveSkillName(clonePath, requested) {
-  const skillsDir = path14__default.join(clonePath, "skills");
-  if (existsSync(path14__default.join(skillsDir, requested, "SKILL.md"))) return requested;
+  const skillsDir = path15__default.join(clonePath, "skills");
+  if (existsSync(path15__default.join(skillsDir, requested, "SKILL.md"))) return requested;
   if (!existsSync(skillsDir)) return requested;
   for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const md = path14__default.join(skillsDir, entry.name, "SKILL.md");
+    const md = path15__default.join(skillsDir, entry.name, "SKILL.md");
     if (!existsSync(md)) continue;
     try {
       const { data } = parseFrontmatter(readFileSync(md, "utf8"));
@@ -2998,12 +3036,12 @@ var MCP_SERVER_ENTRY = {
   env: {}
 };
 function pluginDir(projectDir) {
-  return path14__default.join(projectDir, ".claude", "plugins", "skaile");
+  return path15__default.join(projectDir, ".claude", "plugins", "skaile");
 }
 async function readJsonStrict(p7) {
   let raw;
   try {
-    raw = await fs5.readFile(p7, "utf-8");
+    raw = await fs6.readFile(p7, "utf-8");
   } catch {
     return null;
   }
@@ -3016,32 +3054,32 @@ async function readJsonStrict(p7) {
   }
 }
 async function writeJson(p7, value) {
-  await fs5.mkdir(path14__default.dirname(p7), { recursive: true });
-  await fs5.writeFile(p7, `${JSON.stringify(value, null, 2)}
+  await fs6.mkdir(path15__default.dirname(p7), { recursive: true });
+  await fs6.writeFile(p7, `${JSON.stringify(value, null, 2)}
 `);
 }
 async function copyDir(src, dest) {
-  await fs5.mkdir(dest, { recursive: true });
-  const entries = await fs5.readdir(src, { withFileTypes: true });
+  await fs6.mkdir(dest, { recursive: true });
+  const entries = await fs6.readdir(src, { withFileTypes: true });
   for (const entry of entries) {
-    const srcPath = path14__default.join(src, entry.name);
-    const destPath = path14__default.join(dest, entry.name);
+    const srcPath = path15__default.join(src, entry.name);
+    const destPath = path15__default.join(dest, entry.name);
     if (entry.isDirectory()) await copyDir(srcPath, destPath);
-    else await fs5.copyFile(srcPath, destPath);
+    else await fs6.copyFile(srcPath, destPath);
   }
 }
 async function install(projectDir, opts) {
   return opts?.full ? installFullPlugin(projectDir) : installMcp(projectDir);
 }
 async function installMcp(projectDir) {
-  const mcpPath = path14__default.join(projectDir, ".claude", "mcp.json");
+  const mcpPath = path15__default.join(projectDir, ".claude", "mcp.json");
   const existing = await readJsonStrict(mcpPath) ?? {};
   const mcpServers = { ...existing.mcpServers ?? {} };
   const previous = mcpServers[SKAILE_MCP_NAME];
   const matches = previous && JSON.stringify(previous) === JSON.stringify(MCP_SERVER_ENTRY);
   let warning;
   if (previous && !matches) {
-    warning = `overwrote existing ${SKAILE_MCP_NAME} entry in ${path14__default.relative(projectDir, mcpPath)}`;
+    warning = `overwrote existing ${SKAILE_MCP_NAME} entry in ${path15__default.relative(projectDir, mcpPath)}`;
   }
   mcpServers[SKAILE_MCP_NAME] = MCP_SERVER_ENTRY;
   await writeJson(mcpPath, { ...existing, mcpServers });
@@ -3050,15 +3088,15 @@ async function installMcp(projectDir) {
 async function installFullPlugin(projectDir) {
   const dir = pluginDir(projectDir);
   for (const [rel, content] of Object.entries(buildClaudePluginFiles())) {
-    const dest = path14__default.join(dir, rel);
-    await fs5.mkdir(path14__default.dirname(dest), { recursive: true });
-    await fs5.writeFile(dest, content);
+    const dest = path15__default.join(dir, rel);
+    await fs6.mkdir(path15__default.dirname(dest), { recursive: true });
+    await fs6.writeFile(dest, content);
   }
-  const projectSkillsDir = path14__default.join(projectDir, ".skaile", "skills");
+  const projectSkillsDir = path15__default.join(projectDir, ".skaile", "skills");
   if (existsSync(projectSkillsDir)) {
-    await copyDir(projectSkillsDir, path14__default.join(dir, "skills"));
+    await copyDir(projectSkillsDir, path15__default.join(dir, "skills"));
   }
-  const settingsPath = path14__default.join(projectDir, ".claude", "settings.json");
+  const settingsPath = path15__default.join(projectDir, ".claude", "settings.json");
   const settings = await readJsonStrict(settingsPath) ?? {};
   const plugins = settings.plugins ?? [];
   if (!plugins.includes(dir)) plugins.push(dir);
@@ -3066,8 +3104,8 @@ async function installFullPlugin(projectDir) {
   return { changed: true, method: "plugin" };
 }
 async function uninstall(projectDir) {
-  const settingsPath = path14__default.join(projectDir, ".claude", "settings.json");
-  const mcpPath = path14__default.join(projectDir, ".claude", "mcp.json");
+  const settingsPath = path15__default.join(projectDir, ".claude", "settings.json");
+  const mcpPath = path15__default.join(projectDir, ".claude", "mcp.json");
   const dir = pluginDir(projectDir);
   let changed = false;
   const settings = await readJsonStrict(settingsPath);
@@ -3081,7 +3119,7 @@ async function uninstall(projectDir) {
     }
   }
   if (existsSync(dir)) {
-    await fs5.rm(dir, { recursive: true, force: true });
+    await fs6.rm(dir, { recursive: true, force: true });
     changed = true;
   }
   const mcp = await readJsonStrict(mcpPath);
@@ -3091,7 +3129,7 @@ async function uninstall(projectDir) {
     const updated = { ...mcp, mcpServers: rest };
     if (Object.keys(rest).length === 0) delete updated.mcpServers;
     if (Object.keys(updated).length === 0) {
-      await fs5.unlink(mcpPath);
+      await fs6.unlink(mcpPath);
     } else {
       await writeJson(mcpPath, updated);
     }
@@ -3101,12 +3139,12 @@ async function uninstall(projectDir) {
 async function detectInstall(projectDir) {
   const dir = pluginDir(projectDir);
   const settings = await readJsonStrict(
-    path14__default.join(projectDir, ".claude", "settings.json")
+    path15__default.join(projectDir, ".claude", "settings.json")
   );
-  if (existsSync(path14__default.join(dir, ".claude-plugin", "plugin.json")) && settings?.plugins?.includes(dir)) {
+  if (existsSync(path15__default.join(dir, ".claude-plugin", "plugin.json")) && settings?.plugins?.includes(dir)) {
     return { method: "plugin", pluginPath: dir };
   }
-  const mcp = await readJsonStrict(path14__default.join(projectDir, ".claude", "mcp.json"));
+  const mcp = await readJsonStrict(path15__default.join(projectDir, ".claude", "mcp.json"));
   if (mcp?.mcpServers && SKAILE_MCP_NAME in mcp.mcpServers) {
     return { method: "mcp" };
   }
@@ -3115,7 +3153,7 @@ async function detectInstall(projectDir) {
 async function enable(projectDir) {
   const detected = await detectInstall(projectDir);
   if (!detected) throw new Error("plugin not installed for claude-code");
-  const settingsPath = path14__default.join(projectDir, ".claude", "settings.json");
+  const settingsPath = path15__default.join(projectDir, ".claude", "settings.json");
   const settings = await readJsonStrict(settingsPath) ?? {};
   if (detected.method === "plugin") {
     const disabled2 = settings.disabledPlugins ?? [];
@@ -3137,7 +3175,7 @@ async function enable(projectDir) {
 async function disable(projectDir) {
   const detected = await detectInstall(projectDir);
   if (!detected) throw new Error("plugin not installed for claude-code");
-  const settingsPath = path14__default.join(projectDir, ".claude", "settings.json");
+  const settingsPath = path15__default.join(projectDir, ".claude", "settings.json");
   const settings = await readJsonStrict(settingsPath) ?? {};
   if (detected.method === "plugin") {
     const list2 = settings.disabledPlugins ?? [];
@@ -3157,12 +3195,12 @@ async function disable(projectDir) {
   return { changed: true };
 }
 async function status(projectDir) {
-  const settingsPath = path14__default.join(projectDir, ".claude", "settings.json");
-  const mcpPath = path14__default.join(projectDir, ".claude", "mcp.json");
+  const settingsPath = path15__default.join(projectDir, ".claude", "settings.json");
+  const mcpPath = path15__default.join(projectDir, ".claude", "mcp.json");
   const dir = pluginDir(projectDir);
   const settings = await readJsonStrict(settingsPath);
   const mcp = await readJsonStrict(mcpPath);
-  const pluginInstalled = !!(existsSync(path14__default.join(dir, ".claude-plugin", "plugin.json")) && settings?.plugins?.includes(dir));
+  const pluginInstalled = !!(existsSync(path15__default.join(dir, ".claude-plugin", "plugin.json")) && settings?.plugins?.includes(dir));
   const mcpInstalled = !!(mcp?.mcpServers && SKAILE_MCP_NAME in mcp.mcpServers);
   if (!pluginInstalled && !mcpInstalled) {
     return {
@@ -3180,7 +3218,7 @@ async function status(projectDir) {
       installed: "yes",
       enabled: disabled2 ? "no" : "yes",
       method: "plugin",
-      location: path14__default.relative(projectDir, dir)
+      location: path15__default.relative(projectDir, dir)
     };
   }
   const disabled = settings?.disabledMcpjsonServers?.includes(SKAILE_MCP_NAME) ?? false;
@@ -3189,7 +3227,7 @@ async function status(projectDir) {
     installed: "yes",
     enabled: disabled ? "no" : "yes",
     method: "mcp",
-    location: path14__default.relative(projectDir, mcpPath)
+    location: path15__default.relative(projectDir, mcpPath)
   };
 }
 var SKAILE_MCP_NAME2 = "skaile-workspace";
@@ -3203,7 +3241,7 @@ function buildEntry(projectDir) {
 async function readConfig(p7) {
   let raw;
   try {
-    raw = await fs5.readFile(p7, "utf-8");
+    raw = await fs6.readFile(p7, "utf-8");
   } catch {
     return null;
   }
@@ -3216,16 +3254,16 @@ async function readConfig(p7) {
   }
 }
 async function writeConfig(p7, value) {
-  await fs5.mkdir(path14__default.dirname(p7), { recursive: true });
+  await fs6.mkdir(path15__default.dirname(p7), { recursive: true });
   const cleaned = {};
   for (const [k, v] of Object.entries(value)) {
     if (v === void 0) continue;
     cleaned[k] = v;
   }
-  await fs5.writeFile(p7, stringify(cleaned));
+  await fs6.writeFile(p7, stringify(cleaned));
 }
 function configPath(projectDir) {
-  return path14__default.join(projectDir, ".codex", "config.toml");
+  return path15__default.join(projectDir, ".codex", "config.toml");
 }
 async function install2(projectDir) {
   const p7 = configPath(projectDir);
@@ -3236,7 +3274,7 @@ async function install2(projectDir) {
   const matches = previous && JSON.stringify(previous) === JSON.stringify(next);
   let warning;
   if (previous && !matches) {
-    warning = `overwrote existing ${SKAILE_MCP_NAME2} entry in ${path14__default.relative(projectDir, p7)}`;
+    warning = `overwrote existing ${SKAILE_MCP_NAME2} entry in ${path15__default.relative(projectDir, p7)}`;
   }
   if (matches) return { changed: false, method: "toml" };
   servers[SKAILE_MCP_NAME2] = next;
@@ -3253,7 +3291,7 @@ async function uninstall2(projectDir) {
   const updated = { ...cfg, mcp_servers: rest };
   if (Object.keys(rest).length === 0) delete updated.mcp_servers;
   if (Object.keys(updated).length === 0) {
-    await fs5.unlink(p7);
+    await fs6.unlink(p7);
   } else {
     await writeConfig(p7, updated);
   }
@@ -3277,43 +3315,43 @@ async function status2(projectDir) {
     installed: "yes",
     enabled: "n/a",
     method: "mcp",
-    location: path14__default.relative(projectDir, p7)
+    location: path15__default.relative(projectDir, p7)
   };
 }
 async function install3(projectDir) {
-  const extDir = path14__default.join(projectDir, ".omp", "extensions");
-  const extPath = path14__default.join(extDir, "skaile.ts");
-  await fs5.mkdir(extDir, { recursive: true });
+  const extDir = path15__default.join(projectDir, ".omp", "extensions");
+  const extPath = path15__default.join(extDir, "skaile.ts");
+  await fs6.mkdir(extDir, { recursive: true });
   const { WorkspacePlugin } = await import('../workspace-plugin/index.js');
   const plugin = new WorkspacePlugin({ projectDir });
   const nextSrc = await plugin.buildOmpExtensionSource();
   let prevSrc = null;
   try {
-    prevSrc = await fs5.readFile(extPath, "utf-8");
+    prevSrc = await fs6.readFile(extPath, "utf-8");
   } catch {
   }
   if (prevSrc === nextSrc) return { changed: false, method: "generated" };
-  await fs5.writeFile(extPath, nextSrc);
+  await fs6.writeFile(extPath, nextSrc);
   return { changed: true, method: "generated" };
 }
 async function uninstall3(projectDir) {
-  const extPath = path14__default.join(projectDir, ".omp", "extensions", "skaile.ts");
+  const extPath = path15__default.join(projectDir, ".omp", "extensions", "skaile.ts");
   try {
-    await fs5.unlink(extPath);
+    await fs6.unlink(extPath);
     return { changed: true };
   } catch {
     return { changed: false };
   }
 }
 async function status3(projectDir) {
-  const extPath = path14__default.join(projectDir, ".omp", "extensions", "skaile.ts");
+  const extPath = path15__default.join(projectDir, ".omp", "extensions", "skaile.ts");
   if (existsSync(extPath)) {
     return {
       backend: "omp",
       installed: "yes",
       enabled: "n/a",
       method: "extension",
-      location: path14__default.relative(projectDir, extPath)
+      location: path15__default.relative(projectDir, extPath)
     };
   }
   return {
@@ -3334,7 +3372,7 @@ function resolveDriver(driver) {
   throw new Error(`unknown driver: ${driver} (expected: claude-code | omp | codex | all)`);
 }
 async function runInstall(opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const targets = resolveDriver(opts.driver);
   let exitCode = 0;
   if (targets.includes("claude-code")) {
@@ -3389,7 +3427,7 @@ async function runInstall(opts) {
   return exitCode;
 }
 async function runUninstall(opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const targets = resolveDriver(opts.driver);
   let exitCode = 0;
   if (targets.includes("claude-code")) {
@@ -3426,7 +3464,7 @@ async function runUninstall(opts) {
   return exitCode;
 }
 async function runToggle(opts, action3) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const requestedAll = opts.driver === "all";
   const targets = resolveDriver(opts.driver);
   if (!requestedAll) {
@@ -3461,7 +3499,7 @@ async function runToggle(opts, action3) {
   return exitCode;
 }
 async function runStatus2(opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const targets = resolveDriver(opts.driver);
   const rows = [];
   let exitCode = 0;
@@ -3532,7 +3570,7 @@ async function runHook(event) {
     await plugin.shutdown();
     return;
   }
-  const store = new PluginStore(path14__default.join(projectDir, ".skaile", "plugin-state.json"));
+  const store = new PluginStore(path15__default.join(projectDir, ".skaile", "plugin-state.json"));
   await store.load();
   const status4 = store.get("connector:status");
   if (status4 && typeof status4 === "object" && Object.keys(status4).length > 0) {
@@ -3597,7 +3635,7 @@ function makeOutdatedCommand() {
     new Option("--target <agent>", "Driver target").default("claude-code").choices(SUPPORTED_DRIVER_TARGETS)
   ).action((name, opts) => {
     const am2 = new AssetManager({
-      projectDir: path14__default.resolve(opts.projectDir),
+      projectDir: path15__default.resolve(opts.projectDir),
       driverTarget: opts.target
     });
     const entries = am2.outdated();
@@ -3626,7 +3664,7 @@ function makeOutdatedCommand() {
 function makePatchCommand() {
   const cmd = new Command("patch").description("Patch workflow for skill improvement");
   cmd.command("extract <ref>").alias("start").description("Extract asset for local editing").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     try {
       const dest = am2.patch(ref);
       logOk(`Extracted to ${S.dim(dest)}`);
@@ -3637,7 +3675,7 @@ function makePatchCommand() {
     }
   });
   cmd.command("commit <ref>").description("Generate .patch file from edits").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     try {
       const patchFile = am2.patchCommit(ref);
       logOk(`Patch saved to ${S.dim(patchFile)}`);
@@ -3648,7 +3686,7 @@ function makePatchCommand() {
     }
   });
   cmd.command("submit <ref>").description("Apply patch to repo clone and prepare for PR").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     try {
       am2.patchSubmit(ref);
       logOk("Patch applied to repo clone and committed.");
@@ -3661,7 +3699,7 @@ function makePatchCommand() {
     }
   });
   cmd.command("remove <ref>").description("Remove local patch after upstream merge").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     am2.patchRemove(ref);
     logOk(`Patch removed for ${ref}`);
   });
@@ -3679,7 +3717,7 @@ function action2(fn) {
   };
 }
 async function reconcileAndReport(projectDir, plugins) {
-  const { reconcilePlugins } = await import('../plugin-store-IZ5SCRAV.js');
+  const { reconcilePlugins } = await import('../plugin-store-O5VR45CA.js');
   if (plugins.length === 0) {
     logInfo("No plugins declared \u2014 nothing to reconcile.");
     return;
@@ -3693,10 +3731,10 @@ async function reconcileAndReport(projectDir, plugins) {
   }
 }
 async function runInstall2(spec, opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName } = await import('../plugin-store-IZ5SCRAV.js');
-  const yamlPath = path14__default.join(projectDir, "skaile.yaml");
+  const { specName } = await import('../plugin-store-O5VR45CA.js');
+  const yamlPath = path15__default.join(projectDir, "skaile.yaml");
   const editor = WorkspaceYamlEditor2.load(yamlPath);
   const replaced = editor.addPlugin(spec, specName);
   editor.save();
@@ -3705,10 +3743,10 @@ async function runInstall2(spec, opts) {
   await reconcileAndReport(projectDir, editor.getPlugins());
 }
 async function runRemove(name, opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName } = await import('../plugin-store-IZ5SCRAV.js');
-  const yamlPath = path14__default.join(projectDir, "skaile.yaml");
+  const { specName } = await import('../plugin-store-O5VR45CA.js');
+  const yamlPath = path15__default.join(projectDir, "skaile.yaml");
   const editor = WorkspaceYamlEditor2.load(yamlPath);
   const removed = editor.removePlugin(name, specName);
   if (!removed) {
@@ -3720,7 +3758,7 @@ async function runRemove(name, opts) {
   await reconcileAndReport(projectDir, editor.getPlugins());
 }
 async function runList(opts) {
-  const projectDir = path14__default.resolve(opts.projectDir);
+  const projectDir = path15__default.resolve(opts.projectDir);
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
   const declared = config.plugins ?? [];
@@ -3735,7 +3773,7 @@ async function runList(opts) {
   const registry = createPluginRegistry();
   if (declared.length > 0) {
     try {
-      const { loadPlugins } = await import('../plugin-store-IZ5SCRAV.js');
+      const { loadPlugins } = await import('../plugin-store-O5VR45CA.js');
       const result = await loadPlugins(projectDir, declared, registry);
       for (const f of result.failed) logWarn(f.error);
     } catch (err) {
@@ -3774,7 +3812,7 @@ function makePresetCommand() {
   cmd.command("init [name]").description("Scaffold a new .preset.yaml file").option("--dir <path>", "Output directory", process.cwd()).action(async (name, opts) => {
     const presetName = name ?? "my-preset";
     const filename = `${presetName}.preset.yaml`;
-    const outPath = path14__default.join(path14__default.resolve(opts.dir), filename);
+    const outPath = path15__default.join(path15__default.resolve(opts.dir), filename);
     if (existsSync(outPath)) {
       logErr(`File already exists: ${outPath}`);
       logInfo("Choose a different name or remove the existing file.");
@@ -3788,7 +3826,7 @@ function makePresetCommand() {
     logInfo(`  skaile preset validate ${filename}`);
   });
   cmd.command("validate <path>").description("Validate a preset YAML file (schema + cycles + nesting depth)").action(async (filePath) => {
-    const resolved = path14__default.resolve(filePath);
+    const resolved = path15__default.resolve(filePath);
     if (!existsSync(resolved)) {
       logErr(`File not found: ${resolved}`);
       process.exit(1);
@@ -3814,7 +3852,7 @@ function makePresetCommand() {
       logInfo(`Nested preset refs: ${nestedRefs.length} (depth validated at apply-time)`);
     }
     const { detectCycles } = await import('../discovery/index.js');
-    const presetRef = path14__default.basename(resolved, ".preset.yaml");
+    const presetRef = path15__default.basename(resolved, ".preset.yaml");
     const edges = [];
     for (const item of preset.items) {
       if (item.ref) {
@@ -3899,20 +3937,30 @@ items:
     # credential_ref: "\${SECRET:EXAMPLE_KEY}"  # for secret placeholders
 `;
 }
-var ASSET_REF_RE = /^@?([^/@\s]+)\/([^/@\s]+)@([^/@\s]+)$/;
+var REF_HINT = "kind:@<publisher>/<name>#<version> (e.g. skill:@skaile/use-exa#1.0.0)";
+function isValidAssetRef(ref) {
+  try {
+    parseAssetRef(ref);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function supportsInstallManifest(source) {
   return typeof source?.getInstallManifest === "function";
 }
 async function runPointerOnlyInstall(ref, deps) {
-  const m = ref.match(ASSET_REF_RE);
-  if (!m) {
+  let requested;
+  try {
+    requested = parseAssetRef(ref);
+  } catch (e) {
     throw new Error(
-      `malformed asset ref '${ref}' \u2014 expected <publisher>/<name>@<version> (e.g. skaile/use-exa@1.0.0)`
+      `malformed asset ref '${ref}' \u2014 expected ${REF_HINT}: ${e instanceof Error ? e.message : String(e)}`
     );
   }
   const manifest = await deps.catalog.getInstallManifest(ref);
-  const normalizeRef = (r) => r.replace(/^@/, "");
-  if (normalizeRef(manifest.ref) !== normalizeRef(ref)) {
+  const got = parseAssetRef(manifest.ref);
+  if (got.kind !== requested.kind || got.publisher !== requested.publisher || got.name !== requested.name || got.pin !== requested.pin) {
     throw new Error(
       `catalog identity mismatch: requested '${ref}' but the catalog returned a manifest for '${manifest.ref}'`
     );
@@ -3926,20 +3974,18 @@ async function runPointerOnlyInstall(ref, deps) {
 }
 function makeInstallCommand() {
   return new Command("install").description(
-    "Install dependencies from skaile.yaml, or a single asset by ref (<publisher>/<name>@<version>)"
-  ).argument("[ref]", "Asset ref to install from the Catalog (<publisher>/<name>@<version>)").option("--locked", "Install from lock file (CI mode \u2014 fails on drift)").option("--project-dir <path>", "Project directory", process.cwd()).option("--target <agent>", "Agent framework", "claude-code").action(async (ref, opts) => {
+    `Install dependencies from skaile.yaml, or a single asset by ref (${REF_HINT})`
+  ).argument("[ref]", `Asset ref to install from the Catalog (${REF_HINT})`).option("--locked", "Install from lock file (CI mode \u2014 fails on drift)").option("--project-dir <path>", "Project directory", process.cwd()).option("--target <agent>", "Agent framework", "claude-code").action(async (ref, opts) => {
     if (ref !== void 0) {
-      if (!ASSET_REF_RE.test(ref)) {
-        logErr(
-          `malformed asset ref '${ref}' \u2014 expected <publisher>/<name>@<version> (e.g. skaile/use-exa@1.0.0)`
-        );
+      if (!isValidAssetRef(ref)) {
+        logErr(`malformed asset ref '${ref}' \u2014 expected ${REF_HINT}`);
         process.exit(1);
       }
       const spinner6 = p5.spinner();
       spinner6.start(`Installing ${ref}`);
       try {
-        const { openCatalogSource: openCatalogSource2, openLibrary: openLibrary2 } = await import('../open-library-67FSSQWE.js');
-        const catalog = await openCatalogSource2({ projectDir: path14__default.resolve(opts.projectDir) });
+        const { openCatalogSource: openCatalogSource2, openLibrary: openLibrary2 } = await import('../open-library-WYASW4BH.js');
+        const catalog = await openCatalogSource2({ projectDir: path15__default.resolve(opts.projectDir) });
         if (!supportsInstallManifest(catalog)) {
           throw new Error(
             "pointer-only install (skaile install <ref>) requires a tRPC-framed Catalog. The configured catalog uses REST framing, which does not serve install manifests. Set catalog.url to https://skaile.store, or catalog.framing: trpc, in ~/.skaile/config.yaml."
@@ -3968,9 +4014,9 @@ function makeInstallCommand() {
       }
       return;
     }
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     try {
-      const { ensureSourcesCloned } = await import('../ensure-sources-OJUBGX6Z.js');
+      const { ensureSourcesCloned } = await import('../ensure-sources-CVULUVH4.js');
       const hydrate = ensureSourcesCloned(projectDir, { quiet: true });
       if (hydrate.cloned.length > 0) {
         logOk(`Cloned source(s): ${hydrate.cloned.join(", ")}`);
@@ -4016,7 +4062,7 @@ function makeInstallCommand() {
 }
 function makeCheckCommand() {
   return new Command("check").description("Check for unmet requirements").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     const issues = am2.doctor();
     if (issues.length === 0) {
       logOk("All dependencies satisfied.");
@@ -4033,10 +4079,10 @@ function makeCheckCommand() {
 function makeCleanCommand() {
   return new Command("clean").description("Remove all skaile-managed assets from the workspace").option("--all", "Full reset: also remove history, patches, repos, and lock file").option("--dry-run", "Show what would be removed without doing it").option("-y, --yes", "Skip confirmation prompt").option("--project-dir <path>", "Project directory", process.cwd()).option("--target <agent>", "Agent framework", "claude-code").action(async (opts) => {
     const am2 = new AssetManager({
-      projectDir: path14__default.resolve(opts.projectDir),
+      projectDir: path15__default.resolve(opts.projectDir),
       driverTarget: opts.target
     });
-    const lock = readLock(path14__default.resolve(opts.projectDir, "skaile.lock.yaml"));
+    const lock = readLock(path15__default.resolve(opts.projectDir, "skaile.lock.yaml"));
     if (!lock || Object.keys(lock.assets).length === 0) {
       logInfo("Nothing to clean (no skaile-managed assets found).");
       return;
@@ -4089,14 +4135,14 @@ function makeCleanCommand() {
 }
 function makeRebuildCommand() {
   return new Command("rebuild").description("Re-snapshot inline-snapshot composition items and bump prompt version").argument("[agent]", "Agent name or path (defaults to current project agent)").option("--project-dir <dir>", "Project directory", process.cwd()).action(async (agentArg, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     let agentDir;
     if (agentArg) {
       if (agentArg.includes("/") || agentArg.includes("\\")) {
-        agentDir = path14__default.resolve(projectDir, agentArg);
+        agentDir = path15__default.resolve(projectDir, agentArg);
       } else {
         const resolved = resolveAgentDir(projectDir);
-        agentDir = resolved ?? path14__default.resolve(projectDir, agentArg);
+        agentDir = resolved ?? path15__default.resolve(projectDir, agentArg);
       }
     } else {
       const resolved = resolveAgentDir(projectDir);
@@ -4174,19 +4220,19 @@ function makeFlowEventHandler() {
 }
 function makeRunCommand() {
   const cmd = new Command("run").description("Start a flow or run a single-shot text prompt").argument("[flow-id-or-text...]", "Flow ID or text prompt").option("--project-dir <path>", "Project directory", process.cwd()).option("--driver <name>", "Driver backend (claude-sdk, codex, omp)").option("--provider <name>", "LLM provider").option("--model <name>", "Model override").option("--label <label>", "Human-readable session label").option("--dry-run", "Print plan without executing").option("--skill <name>", "Skill name (for single-shot mode)").action(async (positional, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const cliDriver = opts.driver;
     const dryRun = opts.dryRun ?? false;
     let flowId = positional[0];
     if (!flowId) {
-      const flows2 = loadAllFlows(AI_RESOURCES);
-      if (flows2.length === 0) {
+      const flows = discoverFlows();
+      if (flows.length === 0) {
         logErr("No flows available.");
         process.exit(1);
       }
       const selected = await p5.select({
         message: "Select a flow to run",
-        options: flows2.map((f) => ({
+        options: flows.map((f) => ({
           value: f.id,
           label: f.name,
           hint: f.description
@@ -4206,13 +4252,25 @@ function makeRunCommand() {
     const driver = config.driver ?? "omp";
     const model = config.model;
     const provider = config.provider;
-    const flows = loadAllFlows(AI_RESOURCES);
-    const flow = flows.find((f) => f.id === flowId);
-    if (!flow) {
+    const priorityRoots = [];
+    let dir = projectDir;
+    for (let i = 0; i < 6; i++) {
+      const candidate = path15__default.join(dir, "ai-assets");
+      if (fs11__default.existsSync(candidate)) {
+        priorityRoots.push(candidate);
+        break;
+      }
+      dir = path15__default.dirname(dir);
+    }
+    const flowPath = findFlowFile(flowId, priorityRoots);
+    if (!flowPath) {
       const textPrompt = positional.join(" ");
       if (!textPrompt.trim()) {
         logErr(`Flow not found: ${flowId}`);
-        console.log(`  ${S.dim("Available:")} ${flows.map((f) => S.cmd(f.id)).join(", ")}`);
+        const available = discoverFlows().map((f) => f.id);
+        if (available.length > 0) {
+          console.log(`  ${S.dim("Available:")} ${available.map((id) => S.cmd(id)).join(", ")}`);
+        }
         process.exit(1);
       }
       await runAgentChat({
@@ -4225,43 +4283,13 @@ function makeRunCommand() {
       });
       return;
     }
-    let flowPath;
-    let dir = projectDir;
-    for (let i = 0; i < 6; i++) {
-      const candidate = path14__default.join(dir, "ai-assets");
-      if (fs10__default.existsSync(candidate)) {
-        for (const domain of fs10__default.readdirSync(candidate)) {
-          const p_ = path14__default.join(candidate, domain, "flows", `${flowId}.flow.yaml`);
-          if (fs10__default.existsSync(p_)) {
-            flowPath = p_;
-            break;
-          }
-          const legacy = path14__default.join(candidate, domain, "flows", `${flowId}.json`);
-          if (fs10__default.existsSync(legacy)) {
-            flowPath = legacy;
-            break;
-          }
-        }
-        break;
-      }
-      dir = path14__default.dirname(dir);
-    }
-    if (!flowPath) {
-      for (const domain of fs10__default.readdirSync(AI_RESOURCES)) {
-        const p_ = path14__default.join(AI_RESOURCES, domain, "flows", `${flowId}.flow.yaml`);
-        if (fs10__default.existsSync(p_)) {
-          flowPath = p_;
-          break;
-        }
-        const legacy = path14__default.join(AI_RESOURCES, domain, "flows", `${flowId}.json`);
-        if (fs10__default.existsSync(legacy)) {
-          flowPath = legacy;
-          break;
-        }
-      }
-    }
-    if (!flowPath) {
-      logErr(`Could not locate flow file for: ${flowId}`);
+    let flow;
+    try {
+      flow = loadFlow(flowPath);
+    } catch (err) {
+      logErr(
+        `Failed to load flow "${flowId}": ${err instanceof Error ? err.message : String(err)}`
+      );
       process.exit(1);
     }
     console.log();
@@ -4287,7 +4315,7 @@ function makeRunCommand() {
 }
 function makeResumeCommand() {
   const cmd = new Command("resume").description("Resume current session").option("--project-dir <path>", "Project directory", process.cwd()).option("--session <run-id>", "Target session by runId").option("--dry-run", "Print plan without executing").action(async (opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const sessionId = opts.session;
     const dryRun = opts.dryRun ?? false;
     const session = sessionId ? await loadSessionById(projectDir, sessionId) : await loadSession(projectDir);
@@ -4314,7 +4342,7 @@ function makeResumeCommand() {
 }
 function makeStatusCommand() {
   return new Command("status").description("Show current session state").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const session = await loadSession(projectDir);
     if (!session) {
       logInfo("No active session.");
@@ -4339,7 +4367,7 @@ function makeStatusCommand() {
 }
 function makeClearCommand() {
   return new Command("clear").description("Unset current session pointer").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     await clearSession(projectDir);
     logOk("Session cleared.");
   });
@@ -4349,7 +4377,7 @@ function makeReplCommand() {
     const { findWorkspaceRoot: findWorkspaceRoot2 } = await import('../core/index.js');
     const { startRepl } = await import('../tui/index.js');
     const os = await import('os');
-    const userCwd = path14__default.resolve(opts.projectDir ?? process.cwd());
+    const userCwd = path15__default.resolve(opts.projectDir ?? process.cwd());
     const workspaceRoot = findWorkspaceRoot2(userCwd);
     let projectDir;
     let agentCwd;
@@ -4371,13 +4399,13 @@ function makeReplCommand() {
         p5.cancel("Cancelled.");
         process.exit(0);
       }
-      const tmpDir = fs10__default.mkdtempSync(path14__default.join(os.tmpdir(), "skaile-repl-"));
+      const tmpDir = fs11__default.mkdtempSync(path15__default.join(os.tmpdir(), "skaile-repl-"));
       projectDir = tmpDir;
       agentCwd = userCwd;
       logOk(`Temporary workspace: ${S.cmd(tmpDir)}`);
       if (!driverOverride) {
-        const claudeDir = path14__default.join(os.homedir(), ".claude");
-        if (fs10__default.existsSync(claudeDir)) {
+        const claudeDir = path15__default.join(os.homedir(), ".claude");
+        if (fs11__default.existsSync(claudeDir)) {
           driverOverride = "claude-sdk";
           logInfo(`Detected ${S.cmd("~/.claude")} \u2192 using ${S.cmd("claude-sdk")} backend`);
         } else {
@@ -4428,7 +4456,7 @@ async function ensurePluginsLoadedForServe(projectDir) {
     const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
     const config = resolveSkWorkspaceConfig2(projectDir);
     if (!config.plugins || config.plugins.length === 0) return;
-    const { ensurePluginsLoaded } = await import('../plugin-store-IZ5SCRAV.js');
+    const { ensurePluginsLoaded } = await import('../plugin-store-O5VR45CA.js');
     const { pluginRegistry } = await import('../plugin-registry/index.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     if (result.loaded.length > 0) {
@@ -4449,7 +4477,7 @@ async function runCompileTest(opts) {
   const { unlinkSync, existsSync: existsSync12 } = await import('fs');
   const { spawn } = await import('child_process');
   const { portableSpawnSync: portableSpawnSync2 } = await import('../core/index.js');
-  const { MONOREPO_ROOT } = await import('../paths-FKKGS6BA.js');
+  const { MONOREPO_ROOT } = await import('../paths-BMW6JYW6.js');
   if (MONOREPO_ROOT === null) {
     logErr2("--compile-test is only available inside the skaile-dev workspace.");
     logInfo2("Run it from a checkout of skaile-ai/skaile-dev (the monorepo shell).");
@@ -4919,7 +4947,7 @@ function resolveMode(opts) {
   if (opts.forceLocal && opts.forceRemote) {
     throw new Error("Cannot use both --local and --remote");
   }
-  const startDir = path14__default.resolve(opts.projectDir ?? process.cwd());
+  const startDir = path15__default.resolve(opts.projectDir ?? process.cwd());
   const localDb = findLogsDb(startDir);
   if (opts.forceLocal) {
     if (!localDb) {
@@ -4952,14 +4980,14 @@ function resolveMode(opts) {
 function findLogsDb(startDir) {
   let dir = startDir;
   for (let i = 0; i < MAX_WALK_LEVELS; i++) {
-    const candidate = path14__default.join(dir, ".skaile", "logs.db");
+    const candidate = path15__default.join(dir, ".skaile", "logs.db");
     if (existsSync(candidate)) {
       try {
         if (statSync(candidate).isFile()) return candidate;
       } catch {
       }
     }
-    const parent = path14__default.dirname(dir);
+    const parent = path15__default.dirname(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
@@ -4985,7 +5013,7 @@ function readApiToken() {
 }
 function readGlobalSettings() {
   try {
-    const settingsPath = path14__default.join(homedir(), ".skaile", "settings.json");
+    const settingsPath = path15__default.join(homedir(), ".skaile", "settings.json");
     if (!existsSync(settingsPath)) return {};
     return JSON.parse(readFileSync(settingsPath, "utf8"));
   } catch {
@@ -5133,7 +5161,7 @@ function parsePositiveInt(value, flag) {
 function makeSessionCommand() {
   const cmd = new Command("session").description("Manage sessions");
   cmd.command("list").description("List all sessions for a project").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const sessions = await listSessions(projectDir);
     const current = await loadSession(projectDir);
     if (sessions.length === 0) {
@@ -5161,7 +5189,7 @@ function makeSessionCommand() {
     console.log();
   });
   cmd.command("show <run-id>").description("Show a specific session").option("--project-dir <path>", "Project directory", process.cwd()).action(async (runId, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     const session = await loadSessionById(projectDir, runId);
     if (!session) {
       logErr(`Session not found: ${runId}`);
@@ -5170,12 +5198,12 @@ function makeSessionCommand() {
     console.log(JSON.stringify(session, null, 2));
   });
   cmd.command("switch <run-id>").description("Switch the current session").option("--project-dir <path>", "Project directory", process.cwd()).action(async (runId, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     await setCurrentSession(projectDir, runId);
     logOk(`Switched to session: ${S.dim(runId.slice(0, 8))}`);
   });
   cmd.command("delete <run-id>").description("Delete a session").option("--project-dir <path>", "Project directory", process.cwd()).action(async (runId, opts) => {
-    const projectDir = path14__default.resolve(opts.projectDir);
+    const projectDir = path15__default.resolve(opts.projectDir);
     await deleteSession(projectDir, runId);
     logOk(`Deleted session: ${S.dim(runId.slice(0, 8))}`);
   });
@@ -5224,12 +5252,12 @@ function showOverview(am2) {
 }
 function showAsset(am2, kind, name) {
   const entry = am2.info(`${kind}:${name}`);
-  if (entry?.source && fs10__default.existsSync(entry.source)) {
+  if (entry?.source && fs11__default.existsSync(entry.source)) {
     console.log();
     console.log(`  ${kindColor(entry.kind)} ${S.heading(entry.name)}`);
     console.log(`  ${S.rule(40)}`);
     console.log();
-    console.log(fs10__default.readFileSync(entry.source, "utf-8"));
+    console.log(fs11__default.readFileSync(entry.source, "utf-8"));
     return;
   }
   logErr(`Asset not found: ${kind}:${name}`);
@@ -5238,7 +5266,7 @@ function showAsset(am2, kind, name) {
 function makeShowCommand() {
   return new Command("show").description("Show deployed assets overview, or print asset content").argument("[kind]", "Asset kind (skill, agent, prompt, flow, bundle, contract)").argument("[name]", "Asset name").option("--project-dir <path>", "Project directory", process.cwd()).option("--target <agent>", "Agent framework", "claude-code").action((kind, name, opts) => {
     const am2 = new AssetManager({
-      projectDir: path14__default.resolve(opts.projectDir),
+      projectDir: path15__default.resolve(opts.projectDir),
       driverTarget: opts.target
     });
     if (!kind) {
@@ -5276,10 +5304,10 @@ function addSourceManifestCommands(src) {
 
 // cli/src/commands/source.ts
 function sourcesDir() {
-  return path14.join(skaileHomeDir(), "sources");
+  return path15.join(skaileHomeDir(), "sources");
 }
 function sourceClonePath(name) {
-  return path14.join(sourcesDir(), name);
+  return path15.join(sourcesDir(), name);
 }
 function deriveSlug(url) {
   return url.replace(/\.git$/, "").split(/[/:]/).pop() ?? "source";
@@ -5300,7 +5328,7 @@ function requireProjectYamlPath() {
     );
     process.exit(1);
   }
-  return path14.join(root, workspaceConfigFilename());
+  return path15.join(root, workspaceConfigFilename());
 }
 function readProjectSources(yamlPath) {
   if (!existsSync(yamlPath)) return [];
@@ -5398,7 +5426,7 @@ function makeSourceCommand() {
       const result = await refreshManifestCache(entry, opts.dev);
       logOk(`Indexed ${result.assetsUpdated} of ${result.assetsFound} asset(s) from "${slug}".`);
       for (const err of result.errors) logWarn(err);
-      logOk(`Source "${slug}" registered in ${path14.relative(process.cwd(), yamlPath)}.`);
+      logOk(`Source "${slug}" registered in ${path15.relative(process.cwd(), yamlPath)}.`);
     }
   );
   cmd.command("list").description("List sources registered in this project's skaile.yaml").option("--json", "Output as JSON").action(async (opts) => {
@@ -5665,7 +5693,7 @@ function printTree(node, prefix = "", isLast = true) {
 }
 function makeTreeCommand() {
   return new Command("tree").description("Show full dependency tree").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     const root = am2.tree();
     if (root.children.length === 0) {
       logInfo("No dependencies in lock file. Run `skaile install` first.");
@@ -5683,7 +5711,7 @@ function makeUpdateCommand() {
         try {
           const catalogSpinner = p5.spinner();
           catalogSpinner.start("Refreshing catalog cache");
-          const remote = await openCatalogSource({ projectDir: path14__default.resolve(opts.projectDir) });
+          const remote = await openCatalogSource({ projectDir: path15__default.resolve(opts.projectDir) });
           const result2 = await remote.refresh();
           catalogSpinner.stop(
             `Catalog refreshed: ${S.heading(String(result2.assetsCached))} assets cached`
@@ -5695,7 +5723,7 @@ function makeUpdateCommand() {
         }
       }
       if (opts.catalogOnly) return;
-      const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+      const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
       const spinner5 = p5.spinner();
       spinner5.start("Re-deploying assets");
       const result = await am2.install();
@@ -5729,12 +5757,12 @@ function findManifestCandidates(rootPath) {
   function walk(dir) {
     let entries;
     try {
-      entries = fs10__default.readdirSync(dir, { withFileTypes: true });
+      entries = fs11__default.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const entry of entries) {
-      const fullPath = path14__default.join(dir, entry.name);
+      const fullPath = path15__default.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!SKIP_DIRS.has(entry.name)) walk(fullPath);
       } else if (entry.isFile()) {
@@ -5755,9 +5783,28 @@ function parseMdFrontmatter(content) {
   if (!fmMatch) return null;
   return parse(fmMatch[1]);
 }
+function checkManifestIdentity(kind, parsed) {
+  if (parsed === null || typeof parsed !== "object") return null;
+  const obj = parsed;
+  const identity = kind === "flow" ? obj.id : obj.name;
+  if (typeof identity !== "string" || identity.length === 0) return null;
+  const publisher = typeof obj.publisher === "string" ? obj.publisher : void 0;
+  if (publisher !== void 0) {
+    try {
+      parseAssetRef(`${kind}:@${publisher}/${identity}`);
+      return null;
+    } catch (e) {
+      return e instanceof Error ? e.message : String(e);
+    }
+  }
+  if (!isValidAssetName(identity)) {
+    return `invalid asset ${kind === "flow" ? "id" : "name"} "${identity}" \u2014 ${ASSET_NAME_HINT}`;
+  }
+  return null;
+}
 function validateManifests(rootPath) {
-  const absRoot = path14__default.resolve(rootPath);
-  if (!fs10__default.existsSync(absRoot)) {
+  const absRoot = path15__default.resolve(rootPath);
+  if (!fs11__default.existsSync(absRoot)) {
     logErr(`Path does not exist: ${absRoot}`);
     return { total: 0, errors: 1, warnings: 0 };
   }
@@ -5766,7 +5813,7 @@ function validateManifests(rootPath) {
   let errors = 0;
   let warnings = 0;
   for (const c of candidates) {
-    const content = fs10__default.readFileSync(c.filePath, "utf-8");
+    const content = fs11__default.readFileSync(c.filePath, "utf-8");
     let parsed;
     if (c.filePath.endsWith(".md")) {
       parsed = parseMdFrontmatter(content);
@@ -5777,14 +5824,19 @@ function validateManifests(rootPath) {
       try {
         parsed = c.filePath.endsWith(".json") ? JSON.parse(content) : parse(content);
       } catch (e) {
-        const relPath2 = path14__default.relative(absRoot, c.filePath);
+        const relPath2 = path15__default.relative(absRoot, c.filePath);
         logErr(`${relPath2} \u2014 parse error: ${e instanceof Error ? e.message : String(e)}`);
         errors++;
         continue;
       }
     }
+    const relPath = path15__default.relative(absRoot, c.filePath);
+    const identityError = checkManifestIdentity(c.kind, parsed);
+    if (identityError) {
+      logErr(`${relPath} [${c.kind}] \u2014 ${identityError}`);
+      errors++;
+    }
     const provider = registry.getProvider(c.kind);
-    const relPath = path14__default.relative(absRoot, c.filePath);
     if (!provider) {
       logWarn(`${relPath} [${c.kind}] \u2014 kind "${c.kind}" is not registered, skipping validation`);
       warnings++;
@@ -5800,27 +5852,106 @@ function validateManifests(rootPath) {
   }
   return { total: candidates.length, errors, warnings };
 }
+function findWorkspaceManifests(rootPath) {
+  const out = [];
+  function walk(dir) {
+    let entries;
+    try {
+      entries = fs11__default.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      const full = path15__default.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        if (!SKIP_DIRS.has(entry.name)) walk(full);
+      } else if (entry.isFile() && /(^|\.)skaile\.yaml$/.test(entry.name)) {
+        out.push(full);
+      }
+    }
+  }
+  walk(rootPath);
+  return out;
+}
+function validateWorkspaceManifests(rootPath) {
+  const absRoot = path15__default.resolve(rootPath);
+  const files = findWorkspaceManifests(absRoot);
+  let errors = 0;
+  for (const file of files) {
+    const relPath = path15__default.relative(absRoot, file);
+    let parsed;
+    try {
+      parsed = parse(fs11__default.readFileSync(file, "utf-8")) ?? {};
+    } catch (e) {
+      logErr(`${relPath} \u2014 parse error: ${e instanceof Error ? e.message : String(e)}`);
+      errors++;
+      continue;
+    }
+    const refFields = [];
+    if (Array.isArray(parsed.dependencies)) {
+      for (const d of parsed.dependencies) {
+        if (typeof d === "string") refFields.push(["dependencies", d]);
+      }
+    }
+    if (Array.isArray(parsed.overrides)) {
+      for (const o of parsed.overrides) {
+        const ref = o?.ref;
+        if (typeof ref === "string") refFields.push(["overrides.ref", ref]);
+      }
+    }
+    for (const [field, ref] of refFields) {
+      try {
+        parseAssetRef(ref);
+      } catch (e) {
+        logErr(`${relPath} [${field}] \u2014 ${e instanceof Error ? e.message : String(e)}`);
+        errors++;
+      }
+    }
+    if (Array.isArray(parsed.assets)) {
+      const topPublisher = typeof parsed.publisher === "string" ? parsed.publisher : void 0;
+      for (const a of parsed.assets) {
+        const asset = a;
+        const name = asset?.name;
+        const kind = typeof asset?.kind === "string" ? asset.kind : "skill";
+        if (typeof name !== "string" || name.length === 0) continue;
+        const publisher = typeof asset?.publisher === "string" ? asset.publisher : topPublisher;
+        if (publisher !== void 0) {
+          try {
+            parseAssetRef(`${kind}:@${publisher}/${name}`);
+          } catch (e) {
+            logErr(`${relPath} [assets] \u2014 ${e instanceof Error ? e.message : String(e)}`);
+            errors++;
+          }
+        } else if (!isValidAssetName(name)) {
+          logErr(`${relPath} [assets] \u2014 invalid asset name "${name}" \u2014 ${ASSET_NAME_HINT}`);
+          errors++;
+        }
+      }
+    }
+  }
+  return { total: files.length, errors };
+}
 var EXCLUDED_DOMAINS = /* @__PURE__ */ new Set(["skaileup-shared", "external", "docs"]);
 function collectAssetVersions() {
   const assets = [];
-  if (!fs10__default.existsSync(AI_RESOURCES)) return assets;
-  const domains = fs10__default.readdirSync(AI_RESOURCES, { withFileTypes: true }).filter((d) => d.isDirectory() && !EXCLUDED_DOMAINS.has(d.name));
+  if (!fs11__default.existsSync(AI_RESOURCES)) return assets;
+  const domains = fs11__default.readdirSync(AI_RESOURCES, { withFileTypes: true }).filter((d) => d.isDirectory() && !EXCLUDED_DOMAINS.has(d.name));
   for (const d of domains) {
-    const domainDir = path14__default.join(AI_RESOURCES, d.name);
-    const skillsDir = path14__default.join(domainDir, "skills");
-    if (fs10__default.existsSync(skillsDir)) {
+    const domainDir = path15__default.join(AI_RESOURCES, d.name);
+    const skillsDir = path15__default.join(domainDir, "skills");
+    if (fs11__default.existsSync(skillsDir)) {
       collectSkillVersions(skillsDir, d.name, assets);
     }
-    const agentsDir = path14__default.join(domainDir, "agents");
-    if (fs10__default.existsSync(agentsDir)) {
+    const agentsDir = path15__default.join(domainDir, "agents");
+    if (fs11__default.existsSync(agentsDir)) {
       collectAgentVersions(agentsDir, d.name, assets);
     }
-    const flowsDir = path14__default.join(domainDir, "flows");
-    if (fs10__default.existsSync(flowsDir)) {
-      for (const f of fs10__default.readdirSync(flowsDir)) {
+    const flowsDir = path15__default.join(domainDir, "flows");
+    if (fs11__default.existsSync(flowsDir)) {
+      for (const f of fs11__default.readdirSync(flowsDir)) {
         if (!f.endsWith(".flow.yaml")) continue;
-        const fp = path14__default.join(flowsDir, f);
-        const content = fs10__default.readFileSync(fp, "utf-8");
+        const fp = path15__default.join(flowsDir, f);
+        const content = fs11__default.readFileSync(fp, "utf-8");
         const parsed = parse(content);
         assets.push({
           kind: "flow",
@@ -5831,12 +5962,12 @@ function collectAssetVersions() {
         });
       }
     }
-    const promptsDir = path14__default.join(domainDir, "prompts");
-    if (fs10__default.existsSync(promptsDir)) {
-      for (const f of fs10__default.readdirSync(promptsDir)) {
+    const promptsDir = path15__default.join(domainDir, "prompts");
+    if (fs11__default.existsSync(promptsDir)) {
+      for (const f of fs11__default.readdirSync(promptsDir)) {
         if (!f.endsWith(".prompt.md")) continue;
-        const fp = path14__default.join(promptsDir, f);
-        const content = fs10__default.readFileSync(fp, "utf-8");
+        const fp = path15__default.join(promptsDir, f);
+        const content = fs11__default.readFileSync(fp, "utf-8");
         const fm = parseSkillFrontmatter(content);
         assets.push({
           kind: "prompt",
@@ -5851,12 +5982,12 @@ function collectAssetVersions() {
   return assets;
 }
 function collectSkillVersions(dir, domain, out) {
-  for (const entry of fs10__default.readdirSync(dir, { withFileTypes: true })) {
+  for (const entry of fs11__default.readdirSync(dir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const full = path14__default.join(dir, entry.name);
-    const skillMd = path14__default.join(full, "SKILL.md");
-    if (fs10__default.existsSync(skillMd)) {
-      const content = fs10__default.readFileSync(skillMd, "utf-8");
+    const full = path15__default.join(dir, entry.name);
+    const skillMd = path15__default.join(full, "SKILL.md");
+    if (fs11__default.existsSync(skillMd)) {
+      const content = fs11__default.readFileSync(skillMd, "utf-8");
       const fm = parseSkillFrontmatter(content);
       out.push({
         kind: "skill",
@@ -5871,11 +6002,11 @@ function collectSkillVersions(dir, domain, out) {
   }
 }
 function collectAgentVersions(dir, domain, out) {
-  for (const entry of fs10__default.readdirSync(dir, { withFileTypes: true })) {
+  for (const entry of fs11__default.readdirSync(dir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const agentYaml = path14__default.join(dir, entry.name, "agent.yaml");
-    if (!fs10__default.existsSync(agentYaml)) continue;
-    const content = fs10__default.readFileSync(agentYaml, "utf-8");
+    const agentYaml = path15__default.join(dir, entry.name, "agent.yaml");
+    if (!fs11__default.existsSync(agentYaml)) continue;
+    const content = fs11__default.readFileSync(agentYaml, "utf-8");
     const parsed = parse(content);
     out.push({
       kind: "agent",
@@ -5904,15 +6035,17 @@ function makeValidateCommand() {
     "Validate asset manifests, versions, and changelogs"
   );
   cmd.argument("[path]", "Path to asset repo or directory to validate", ".").action((targetPath) => {
-    const absPath = path14__default.resolve(targetPath);
+    const absPath = path15__default.resolve(targetPath);
     logInfo(`Validating manifests in ${absPath}`);
     const { total, errors } = validateManifests(absPath);
+    const ws = validateWorkspaceManifests(absPath);
+    const totalErrors = errors + ws.errors;
     console.log();
-    logInfo(`Scanned ${total} manifest files`);
-    if (errors === 0) {
+    logInfo(`Scanned ${total} asset manifest(s) and ${ws.total} skaile.yaml file(s)`);
+    if (totalErrors === 0) {
       logOk("All manifests valid");
     } else {
-      logErr(`${errors} validation error(s)`);
+      logErr(`${totalErrors} validation error(s)`);
       process.exit(1);
     }
   });
@@ -5925,7 +6058,7 @@ function makeValidateCommand() {
           encoding: "utf-8"
         });
         const changedFiles = new Set(
-          diffOutput.trim().split("\n").filter(Boolean).map((f) => path14__default.resolve(AI_RESOURCES, f))
+          diffOutput.trim().split("\n").filter(Boolean).map((f) => path15__default.resolve(AI_RESOURCES, f))
         );
         assets = assets.filter((a) => changedFiles.has(a.filePath));
       } catch {
@@ -5947,7 +6080,7 @@ function makeValidateCommand() {
     if (opts.changedOnly) {
       for (const a of assets) {
         if (!a.version) continue;
-        const relPath = path14__default.relative(AI_RESOURCES, a.filePath);
+        const relPath = path15__default.relative(AI_RESOURCES, a.filePath);
         try {
           const headContent = execSync(`git show HEAD:${relPath}`, {
             cwd: AI_RESOURCES,
@@ -5970,7 +6103,7 @@ function makeValidateCommand() {
       skillVersionMap.set(a.name, a.version);
     }
     for (const f of flows) {
-      const content = fs10__default.readFileSync(f.filePath, "utf-8");
+      const content = fs11__default.readFileSync(f.filePath, "utf-8");
       const parsed = parse(content);
       const nodes = (parsed?.nodes ?? []).filter((n) => n.type === "skill" && n.data?.version).map((n) => ({
         nodeId: n.id,
@@ -6027,7 +6160,7 @@ function makeValidateCommand() {
     let errors = 0;
     for (const domain of modifiedDomains) {
       const changelogModified = modifiedFiles.some(
-        (f) => f === `${domain}/CHANGELOG.md` || f === path14__default.join(domain, "CHANGELOG.md")
+        (f) => f === `${domain}/CHANGELOG.md` || f === path15__default.join(domain, "CHANGELOG.md")
       );
       if (changelogModified) {
         logOk(`${domain}/CHANGELOG.md updated`);
@@ -6109,7 +6242,7 @@ function makeVerifyCommand() {
 }
 function makeWhyCommand() {
   return new Command("why").description("Show why an asset is installed (dependency chain)").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
-    const am2 = new AssetManager({ projectDir: path14__default.resolve(opts.projectDir) });
+    const am2 = new AssetManager({ projectDir: path15__default.resolve(opts.projectDir) });
     const chain = am2.why(ref);
     if (chain.length === 0) {
       logErr(`${ref} not found in lock file. Run \`skaile install\` first.`);
@@ -6130,7 +6263,7 @@ function makeWhyCommand() {
 var _defaultFormatHelp = Help.prototype.formatHelp;
 var pkg = JSON.parse(
   readFileSync(
-    path14__default.resolve(path14__default.dirname(fileURLToPath(import.meta.url)), "../../package.json"),
+    path15__default.resolve(path15__default.dirname(fileURLToPath(import.meta.url)), "../../package.json"),
     "utf-8"
   )
 );
@@ -6198,6 +6331,7 @@ Execution:
   clear                        Unset current session
 
 Validation:
+  validate [path]              Check manifest schemas + canonical asset names/refs
   validate versions            Check asset version fields and flow pins
   validate changelog           Check changelogs for modified domains
 
@@ -6241,6 +6375,11 @@ Advanced:
 `;
   }
 });
+var BACKEND_DEFAULTS = {
+  "claude-code": { driver: "claude-sdk", provider: "anthropic", model: "claude-sonnet-4-6" },
+  omp: { driver: "omp" },
+  codex: { driver: "codex", provider: "openai" }
+};
 program.command("init [project-dir]").description("Initialize a project directory (defaults to current directory)").option("--backend <name>", "Coding-agent backend (claude-code | omp | codex)", "claude-code").option("--no-git", "Skip git init and .gitignore").action(async (projectDir, opts) => {
   const { execSync: execSync3 } = await import('child_process');
   const { existsSync: existsSync12, mkdirSync: mkdirSync3, readFileSync: readFileSync6, writeFileSync: writeFileSync2 } = await import('fs');
@@ -6254,25 +6393,26 @@ program.command("init [project-dir]").description("Initialize a project director
     process.exitCode = 1;
     return;
   }
-  const resolved = path14__default.resolve(projectDir ?? ".");
-  const projectName = path14__default.basename(resolved);
+  const resolved = path15__default.resolve(projectDir ?? ".");
+  const projectName = path15__default.basename(resolved);
   const created = [];
   if (!existsSync12(resolved)) {
     mkdirSync3(resolved, { recursive: true });
     created.push(".");
   }
-  const skaileDir = path14__default.join(resolved, ".skaile");
+  const skaileDir = path15__default.join(resolved, ".skaile");
   if (!existsSync12(skaileDir)) {
-    mkdirSync3(path14__default.join(skaileDir, "sessions"), { recursive: true });
+    mkdirSync3(path15__default.join(skaileDir, "sessions"), { recursive: true });
     created.push(".skaile/");
   }
-  const settingsPath = path14__default.join(skaileDir, "settings.json");
+  const settingsPath = path15__default.join(skaileDir, "settings.json");
   if (!existsSync12(settingsPath)) {
     writeFileSync2(settingsPath, "{}\n");
     created.push(".skaile/settings.json");
   }
-  const wsConfigPath = path14__default.join(resolved, "skaile.yaml");
+  const wsConfigPath = path15__default.join(resolved, "skaile.yaml");
   if (!existsSync12(wsConfigPath)) {
+    const backendDefaults = BACKEND_DEFAULTS[backend];
     writeFileSync2(
       wsConfigPath,
       stringify({
@@ -6281,9 +6421,10 @@ program.command("init [project-dir]").description("Initialize a project director
         "agent-config": {
           default: {
             agent: backend,
-            provider: "anthropic",
-            model: "claude-sonnet-4-6",
-            driver: "claude-sdk",
+            // provider/model are omitted for backends that don't fix them (omp, codex).
+            ...backendDefaults.provider ? { provider: backendDefaults.provider } : {},
+            ...backendDefaults.model ? { model: backendDefaults.model } : {},
+            driver: backendDefaults.driver,
             max_turns: 200
           }
         }
@@ -6292,14 +6433,14 @@ program.command("init [project-dir]").description("Initialize a project director
     created.push("skaile.yaml");
   }
   for (const dir of new Set(Object.values(DRIVER_TARGETS[backend].local))) {
-    const full = path14__default.join(resolved, dir);
+    const full = path15__default.join(resolved, dir);
     if (!existsSync12(full)) {
       mkdirSync3(full, { recursive: true });
       created.push(`${dir}/`);
     }
   }
   if (opts.git) {
-    const gitignorePath = path14__default.join(resolved, ".gitignore");
+    const gitignorePath = path15__default.join(resolved, ".gitignore");
     const entries = ["node_modules/", ".skaile/sessions/", "*.log", ".env", ".env.local"];
     const existing = existsSync12(gitignorePath) ? readFileSync6(gitignorePath, "utf-8") : "";
     const have = new Set(existing.split("\n").map((l) => l.trim()));
@@ -6310,7 +6451,7 @@ program.command("init [project-dir]").description("Initialize a project director
 `);
       if (!existing) created.push(".gitignore");
     }
-    if (!existsSync12(path14__default.join(resolved, ".git"))) {
+    if (!existsSync12(path15__default.join(resolved, ".git"))) {
       try {
         execSync3("git init", { cwd: resolved, stdio: "pipe" });
         created.push(".git/");
@@ -6321,10 +6462,10 @@ program.command("init [project-dir]").description("Initialize a project director
     }
   }
   try {
-    const fs11 = await import('fs');
+    const fs12 = await import('fs');
     const { userConfigPath, saveConfig, getConfigDefaults } = await import('../library/index.js');
     const userCfgPath = userConfigPath();
-    if (!fs11.existsSync(userCfgPath)) {
+    if (!fs12.existsSync(userCfgPath)) {
       const defaults = getConfigDefaults();
       saveConfig(userCfgPath, {
         catalog: { url: defaults.catalog.url, cache_ttl: defaults.catalog.cache_ttl }
@@ -6337,7 +6478,7 @@ program.command("init [project-dir]").description("Initialize a project director
     );
   }
   try {
-    const { ensureSourcesCloned } = await import('../ensure-sources-OJUBGX6Z.js');
+    const { ensureSourcesCloned } = await import('../ensure-sources-CVULUVH4.js');
     const hydrate = ensureSourcesCloned(resolved, { quiet: true });
     for (const n of hydrate.cloned) created.push(`~/.skaile/sources/${n}/`);
     if (hydrate.failed.length > 0) {
@@ -6351,7 +6492,7 @@ program.command("init [project-dir]").description("Initialize a project director
   logOk(`Initialized project at ${S.heading(resolved)}`);
   console.log();
   console.log(S.heading("  Next steps:"));
-  const isCurrentDir = resolved === path14__default.resolve(".");
+  const isCurrentDir = resolved === path15__default.resolve(".");
   let step = 1;
   if (!isCurrentDir) {
     console.log(`  ${S.dim(`${step}.`)} ${S.cmd(`cd ${projectDir}`)}`);
@@ -6363,7 +6504,7 @@ program.command("init [project-dir]").description("Initialize a project director
   console.log();
 });
 program.command("setup").description("Interactive provider setup wizard").action(async () => {
-  const { cmdSetup } = await import('../setup-J7CYEQOF.js');
+  const { cmdSetup } = await import('../setup-YNLFR5GB.js');
   await cmdSetup([], { projectDir: process.cwd() });
 });
 program.addCommand(makeInstallCommand());