@skaile/workspaces 5.4.0 → 5.6.0

package/dist/{chunk-BATL2CWI.js → chunk-4CTGEEN6.js}

@@ -1,22 +1,107 @@
-import { getStoreManifestsDir } from './chunk-Y5OCUOXF.js';
-import { readManifestSourceConfig, discoverAssetsInTree } from './chunk-Y7UBRRKG.js';
-import { deployAll, removeAsset, canonicalEntryRef, createScaffold } from './chunk-37DN45RR.js';
-import { resolveConfiguredDriverTarget, GLOBAL_INSTALL_DIR_NAME, resolveLibraryDir, buildLibraryLockEntries, writeLock, buildLockFile, readLock, verifyLock, mergeLockFile, extractForPatch, generatePatch, savePatch, applyPatch } from './chunk-QEXEHXX5.js';
-import { resolveRuntimeAssets, factoryAssetRoots } from './chunk-JCATNLY3.js';
-import { deployedBase, deployedDir, isDeployed } from './chunk-XGIS325V.js';
-import { loadMcpServerDeclarations, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, getGlobalCacheDir, sourceCacheKey, getRepoCommit, matchPin, coerceVersion, resolveAll, buildProvenanceIndex, ensureRepo, sourceShortName, scanRepo, SKAILE_YAML_DEFAULT, checkRepoStatus, resolveAsset, readLinks, storeManifestSlug } from './chunk-6IGFSUTE.js';
-import { globalSkaileDir, globalCacheRoot, migrateLegacyDir } from './chunk-MFHKHXDE.js';
-import { scanDirectory, parseRequires } from './chunk-LFMX2UEF.js';
-import { parseAssetRef, parseAssetRefLoose, assetRefToStr, slugifyAssetName } from './chunk-WX74MVNA.js';
+import { getStoreManifestsDir } from './chunk-MX3UQXLU.js';
+import { readManifestSourceConfig, discoverAssetsInTree } from './chunk-XOGG7VDZ.js';
+import { installAgent, installTargetOf, deployAll, removeAsset, canonicalEntryRef, createScaffold } from './chunk-IPWR33AW.js';
 import { appendHistory, getRecentHistory, clearHistory } from './chunk-KTBKW2FI.js';
 import { commitChanges } from './chunk-UQ6LFBPZ.js';
+import { driverTargetSupportsAgents, CODEX_IDENTITY_DIR } from './chunk-VKSXST23.js';
+import { resolveConfiguredDriverTarget, GLOBAL_INSTALL_DIR_NAME, resolveLibraryDir, buildLibraryLockEntries, writeLock, buildLockFile, readLock, verifyLock, mergeLockFile, extractForPatch, generatePatch, savePatch, applyPatch } from './chunk-TZCQ7ZWQ.js';
+import { resolveRuntimeAssets, factoryAssetRoots } from './chunk-BF33SCLY.js';
+import { deployedBase, deployedDir, isDeployed } from './chunk-46OVMT76.js';
+import { resolveSkWorkspaceConfig, effectiveAgentInstances, resolveAgentDefinitionDir, loadMcpServerDeclarations, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, getGlobalCacheDir, sourceCacheKey, getRepoCommit, matchPin, coerceVersion, resolveAll, buildProvenanceIndex, ensureRepo, sourceShortName, scanRepo, SKAILE_YAML_DEFAULT, checkRepoStatus, resolveAsset, readLinks, storeManifestSlug } from './chunk-2W4LBLIN.js';
+import { globalSkaileDir, globalCacheRoot, migrateLegacyDir } from './chunk-MFHKHXDE.js';
+import { DRIVER_TARGETS } from './chunk-CPSIPIX7.js';
+import { scanDirectory, parseRequires } from './chunk-PA7WLID3.js';
+import { parseAssetRef, parseAssetRefLoose, assetRefToStr, slugifyAssetName } from './chunk-AO7VJ6G6.js';
 import { spawnSync } from 'child_process';
-import { existsSync, readdirSync, rmSync, lstatSync, unlinkSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
-import path, { resolve, join, sep, dirname } from 'path';
+import { existsSync, rmSync, readdirSync, lstatSync, unlinkSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
+import path, { join, resolve, dirname, sep, posix } from 'path';
 import { gt } from 'semver';
 import { stringify, parse } from 'yaml';
 import fs from 'fs/promises';
 
+var ledgerPath = (projectDir) => join(projectDir, ".skaile", "agent-instances-managed.json");
+function readLedger(projectDir) {
+  const p = ledgerPath(projectDir);
+  if (!existsSync(p)) return { version: 1, targets: {} };
+  try {
+    const parsed = JSON.parse(readFileSync(p, "utf-8"));
+    return { version: 1, targets: parsed.targets ?? {} };
+  } catch {
+    return { version: 1, targets: {} };
+  }
+}
+function writeLedger(projectDir, ledger) {
+  const p = ledgerPath(projectDir);
+  mkdirSync(dirname(p), { recursive: true });
+  writeFileSync(p, `${JSON.stringify(ledger, null, 2)}
+`, "utf-8");
+}
+function installAgentInstances(opts) {
+  const { projectDir, driverTarget, log } = opts;
+  const result = { instances: [], removed: [], warnings: [] };
+  if (!driverTargetSupportsAgents(driverTarget)) return result;
+  const wsConfig = opts.wsConfig ?? resolveSkWorkspaceConfig(projectDir);
+  const instances = effectiveAgentInstances(wsConfig);
+  const agentDeployDir = deployedBase("agent", driverTarget, false, projectDir);
+  const skillsRelDir = DRIVER_TARGETS[driverTarget]?.local.skill ?? "";
+  const ledger = readLedger(projectDir);
+  const previous = ledger.targets[driverTarget] ?? {};
+  const owned = {};
+  for (const [id, instance] of Object.entries(instances)) {
+    let srcDir;
+    try {
+      srcDir = resolveAgentDefinitionDir(projectDir, instance.ref);
+    } catch (err) {
+      result.warnings.push(
+        `agent instance "${id}": ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+    if (srcDir === void 0 || !existsSync(join(srcDir, "agent.yaml"))) {
+      if (srcDir !== void 0) {
+        result.warnings.push(
+          `agent instance "${id}": ${instance.ref} resolves to ${srcDir}, which has no agent.yaml`
+        );
+      }
+      if (previous[id]) owned[id] = previous[id];
+      continue;
+    }
+    const rendered = installAgent(
+      srcDir,
+      agentDeployDir,
+      projectDir,
+      driverTarget,
+      skillsRelDir,
+      id,
+      /* includeSubAgents */
+      true,
+      /* @__PURE__ */ new Set(),
+      wsConfig,
+      log,
+      instance
+    );
+    result.warnings.push(...rendered.warnings);
+    const files = [...new Set(rendered.created)];
+    owned[id] = files;
+    result.instances.push({ id, files });
+  }
+  const claimed = new Set(Object.values(owned).flat());
+  const root = resolve(projectDir);
+  const removable = [resolve(agentDeployDir), resolve(dirname(agentDeployDir), CODEX_IDENTITY_DIR)];
+  for (const rel of Object.values(previous).flat()) {
+    if (claimed.has(rel)) continue;
+    const abs = resolve(root, rel);
+    if (!removable.some((dir) => abs.startsWith(dir + sep)) || !existsSync(abs)) continue;
+    rmSync(abs, { recursive: true, force: true });
+    result.removed.push(rel);
+  }
+  const nextTargets = { ...ledger.targets };
+  if (Object.keys(owned).length > 0) nextTargets[driverTarget] = owned;
+  else delete nextTargets[driverTarget];
+  if (JSON.stringify(nextTargets) !== JSON.stringify(ledger.targets)) {
+    writeLedger(projectDir, { version: 1, targets: nextTargets });
+  }
+  return result;
+}
 var TARGET_MCP_CONFIG = {
   "claude-code": ".mcp.json"
 };
@@ -199,7 +284,6 @@ function pinsBySlug(sources) {
 var MD_BY_KIND = {
   skill: "SKILL.md",
   agent: "AGENT.md",
-  bundle: "BUNDLE.md",
   "mcp-server": "MCP.md",
   connector: "CONNECTOR.md",
   prompt: "PROMPT.md",
@@ -211,19 +295,13 @@ function matchManifestPath(kind, paths) {
     const hit = paths.find((p) => p.endsWith(exact));
     if (hit) return hit;
   }
+  if (kind === "preset") return paths.find((p) => p.endsWith(".preset.yaml"));
   if (kind === "prompt") return paths.find((p) => p.endsWith(".prompt.md"));
   if (kind === "flow") {
     return paths.find((p) => p.endsWith(".flow.yaml") || p.endsWith(".flow.json"));
   }
   return void 0;
 }
-var NON_DEPLOYABLE_KINDS = /* @__PURE__ */ new Set([
-  "bundle",
-  "mcp-server",
-  "persona",
-  "ruleset",
-  "knowledge"
-]);
 function unscopedName(x) {
   return x.includes("/") ? x.split("/").pop() : x;
 }
@@ -254,7 +332,7 @@ function indexLockByKindName(lock) {
   }
   return lockByKindName;
 }
-function libraryDiskHashes(libPath, cache) {
+function libraryDiskHashes(libPath, cache, registry) {
   let hashes = cache.get(libPath);
   if (!hashes) {
     const sourceConfig = readManifestSourceConfig(libPath, "library") ?? {
@@ -265,7 +343,7 @@ function libraryDiskHashes(libPath, cache) {
       dev_paths: []
     };
     hashes = new Map(
-      discoverAssetsInTree(libPath, { sourceConfig }).assets.map((a) => [
+      discoverAssetsInTree(libPath, { sourceConfig, registry }).assets.map((a) => [
         `${a.kind}:${a.name}`,
         a.sha256
       ])
@@ -420,6 +498,9 @@ var AssetManager = class {
   driverTarget;
   /** Whether this instance operates in global-install mode. */
   global;
+  /** Asset-kind registry shared with the host (one instance per process). */
+  registry;
+  _knownKinds;
   /** Explicit global-harness override (global mode only); else auto-resolved. */
   harnessesOverride;
   /** Injected catalog fetcher (tests / custom); falls back to a built one. */
@@ -430,15 +511,32 @@ var AssetManager = class {
   catalogUrlOverride;
   /** Injected index SQLite path override (tests); else the default index.db. */
   indexPathOverride;
+  /** Sink for cross-library collision warnings; else `console.warn`. */
+  onLibraryCollision;
   constructor(opts) {
     this.projectDir = resolve(opts.projectDir);
     this.global = opts.global ?? false;
+    this.registry = opts.registry;
     this.driverTarget = opts.driverTarget ?? (this.global ? void 0 : resolveConfiguredDriverTarget(this.projectDir)) ?? "claude-code";
     this.harnessesOverride = opts.harnesses ?? opts.backends;
     this.injectedStoreFetcher = opts.storeFetcher;
     this.injectedAssetFetcher = opts.assetFetcher;
     this.catalogUrlOverride = opts.catalogUrl;
     this.indexPathOverride = opts.indexPath;
+    this.onLibraryCollision = opts.onLibraryCollision;
+  }
+  /** Registered kind names — the `knownKinds` argument of the manifest scanners. */
+  get knownKinds() {
+    this._knownKinds ??= new Set(this.registry.getAllKinds());
+    return this._knownKinds;
+  }
+  /**
+   * The harness component dir a kind installs into (its provider's
+   * `installTarget`), or `undefined` for composition-only kinds, which are only
+   * cached in the store cache and composed at session start.
+   */
+  installTarget(kind) {
+    return installTargetOf(this.registry, kind);
   }
   /**
    * Root for this manager's **state** — config SSOT, lock, cache, history.
@@ -490,7 +588,13 @@ var AssetManager = class {
   /** Deploy options for one harness. In global mode, `driverTarget` is the
    * fan-out target (not the constructor's `driverTarget`, which is project-only). */
   deployOptsFor(target, link) {
-    return { driverTarget: target, global: this.global, cwd: this.projectDir, link: link === true };
+    return {
+      registry: this.registry,
+      driverTarget: target,
+      global: this.global,
+      cwd: this.projectDir,
+      link: link === true
+    };
   }
   /**
    * Render the project's declared MCP servers into the driver target's own
@@ -512,6 +616,29 @@ var AssetManager = class {
       );
     }
   }
+  /**
+   * Render every agent instance of `skaile.yaml` into the driver target's native
+   * agent files (`.claude/agents/<id>.md`, …) and prune the renderings of
+   * instances that left the config. Runs after the skills deploy, so composed
+   * skills resolve. Project scope only. Never fails an install — a render error
+   * is warned and swallowed.
+   */
+  renderAgentInstances() {
+    if (this.global) return {};
+    try {
+      const result = installAgentInstances({
+        projectDir: this.projectDir,
+        driverTarget: this.driverTarget
+      });
+      for (const w of result.warnings) console.warn(`skaile: ${w}`);
+      return { agentInstances: result.instances, agentFilesRemoved: result.removed };
+    } catch (err) {
+      console.warn(
+        `skaile: could not render agent instances for ${this.driverTarget}: ${err instanceof Error ? err.message : String(err)}`
+      );
+      return {};
+    }
+  }
   loadConfig() {
     const config = this.global ? resolveGlobalSkWorkspaceConfig() : resolveSkWorkspaceConfig(this.projectDir);
     const sources = config.sources ?? [];
@@ -661,7 +788,7 @@ var AssetManager = class {
     const isDefaultLib = new Map(roots.map((r) => [r.name, r.isDefault]));
     for (const { name, dir } of roots) {
       const publisher = readDeclaredPublisher(dir) ?? slugifyAssetName(name);
-      for (const entry of await scanDirectory(dir, publisher)) {
+      for (const entry of await scanDirectory(dir, publisher, { knownKinds: this.knownKinds })) {
         const key = `${entry.kind}:@${entry.publisher}/${entry.name}`;
         const list = byKey.get(key);
         if (list) list.push({ entry, library: name });
@@ -710,10 +837,11 @@ var AssetManager = class {
     const libraries = new Set(candidates.map((c) => c.library));
     if (libraries.size < 2) return;
     const held = candidates.map((c) => `${c.library} (${c.entry.version || "unversioned"})`);
-    const msg = `skaile: ${key} exists in ${libraries.size} libraries: ${held.join(", ")} \u2014 using ${chosen.library} (${chosen.entry.version || "unversioned"}). Highest version wins; an equal version goes to the default library, then by name. Pin a version (${key}#<version>) to choose another.`;
+    const msg = `${key} exists in ${libraries.size} libraries: ${held.join(", ")} \u2014 using ${chosen.library} (${chosen.entry.version || "unversioned"}). Highest version wins; an equal version goes to the default library, then by name. Pin a version (${key}#<version>) to choose another.`;
     if (this.warnedLibraryCollisions.has(msg)) return;
     this.warnedLibraryCollisions.add(msg);
-    console.warn(msg);
+    if (this.onLibraryCollision) this.onLibraryCollision(msg);
+    else console.warn(`skaile: ${msg}`);
   }
   /**
    * Open the local index and snapshot its libraries + asset definitions.
@@ -752,7 +880,7 @@ var AssetManager = class {
         const publisher = e.publisher ?? "";
         const def = newestLibraryDef(snap, name, { kind: e.kind, publisher, name: e.name });
         const libPath = this.libraryPath(name, snap);
-        const sha256 = (libPath ? libraryDiskHashes(libPath, diskHashes).get(`${e.kind}:${e.name}`) : void 0) ?? def?.sha256;
+        const sha256 = (libPath ? libraryDiskHashes(libPath, diskHashes, this.registry).get(`${e.kind}:${e.name}`) : void 0) ?? def?.sha256;
         return {
           kind: e.kind,
           publisher,
@@ -791,7 +919,7 @@ var AssetManager = class {
         );
         continue;
       }
-      const found = (await scanDirectory(libPath, publisher)).find(
+      const found = (await scanDirectory(libPath, publisher, { knownKinds: this.knownKinds })).find(
         (x) => x.kind === kind && x.name === name
       );
       if (!found) {
@@ -807,7 +935,7 @@ var AssetManager = class {
         continue;
       }
       if (origin.sha256) {
-        const onDisk = libraryDiskHashes(libPath, diskHashes).get(`${kind}:${name}`);
+        const onDisk = libraryDiskHashes(libPath, diskHashes, this.registry).get(`${kind}:${name}`);
         if (onDisk !== void 0 && onDisk !== origin.sha256) {
           missing.push(
             `${ref} (library "${origin.name}" content changed since lock \u2014 or the lock predates the one shared asset hash; re-lock with \`skaile install\`)`
@@ -853,7 +981,8 @@ var AssetManager = class {
       overrides: opts.overrides,
       stores: opts.stores,
       storeFetcher: this.storeFetcherFor(opts.stores),
-      projectDir: this.projectDir
+      projectDir: this.projectDir,
+      knownKinds: this.knownKinds
     });
     if (first.missing.length === 0) return first;
     const fallback = await this.globalStoreFallback(opts.stores);
@@ -865,7 +994,8 @@ var AssetManager = class {
         overrides: opts.overrides,
         stores,
         storeFetcher: this.storeFetcherFor(stores),
-        projectDir: this.projectDir
+        projectDir: this.projectDir,
+        knownKinds: this.knownKinds
       });
       return retry.missing.length < first.missing.length ? retry : first;
     } catch {
@@ -916,7 +1046,7 @@ var AssetManager = class {
    * Fetch + SHA-verify the bytes of every store-resolved candidate that needs
    * bytes on disk into `.skaile/cache/store/`, reusing the same verified-fetch
    * path the pointer-only `library.install` uses (`installFromManifest` flat
-   * mode). That is the deployable kinds plus `mcp-server` — see the skip guard.
+   * mode). Every kind with bytes, composition-only kinds included.
    *
    * @returns Map of candidate key → staged primary-manifest path.
    */
@@ -924,7 +1054,6 @@ var AssetManager = class {
     const staged = /* @__PURE__ */ new Map();
     let installFromManifest;
     for (const c of resolved) {
-      if (NON_DEPLOYABLE_KINDS.has(c.kind) && c.kind !== "mcp-server") continue;
       if (!c.files || c.files.length === 0 || !c.sourceUrl || !c.commit) continue;
       if (this.candidateHasLocalBytes(c, repositories)) continue;
       if (!installFromManifest) {
@@ -994,7 +1123,12 @@ var AssetManager = class {
   }
   /** Build a copy-deploy catalog entry pointing at staged store bytes. */
   stagedCandidateToEntry(c, stagedManifestPath) {
+    const paths = (c.files ?? []).map((f) => f.path);
+    const root = commonDirPrefix(paths);
+    const manifestDir = posix.dirname(this.stagedManifestRel(c));
+    const files = paths.map((p) => root && p.startsWith(`${root}/`) ? p.slice(root.length + 1) : p).map((p) => posix.relative(manifestDir, p)).filter((rel) => rel !== "" && !rel.startsWith(".."));
     const entry = {
+      files,
       name: c.name,
       kind: c.kind,
       description: c.description ?? "",
@@ -1036,13 +1170,17 @@ var AssetManager = class {
     const cloneError = this.ensureSourceClones(repositories, sources);
     if (cloneError) return cloneError;
     const provenanceIndex = await buildProvenanceIndex(this.buildClones(repositories), {
-      projectDir: this.projectDir
-    });
-    const { resolved, missing, overridesApplied } = await this.resolveWithStores(dependencies, {
-      provenanceIndex,
-      overrides,
-      stores
+      projectDir: this.projectDir,
+      knownKinds: this.knownKinds
     });
+    const { resolved, missing, overridesApplied, presets } = await this.resolveWithStores(
+      dependencies,
+      {
+        provenanceIndex,
+        overrides,
+        stores
+      }
+    );
     const lib = await this.resolveLibraryEntries(missing);
     const directLock = this.directInstallLockEntries();
     const libraryLock = { ...directLock, ...await this.libraryLockEntries(lib) };
@@ -1056,6 +1194,7 @@ var AssetManager = class {
       )
     ];
     await this.renderDriverMcpConfig();
+    const agentRender = this.renderAgentInstances();
     const lockWritten = resolved.length > 0 || lib.entries.length > 0 || existsSync(this.lockPath);
     if (lockWritten) {
       writeLock(this.lockPath, buildLockFile(resolved, overridesApplied, libraryLock));
@@ -1063,7 +1202,16 @@ var AssetManager = class {
     this.recordInstallHistory(deployed, removed);
     const { npmInstalled, npmFailed } = await this.installRuntimeAssetDeps();
     const stillMissing = missing.filter((m) => !lib.resolved.has(m));
-    return { deployed, removed, missing: stillMissing, lockWritten, npmInstalled, npmFailed };
+    return {
+      deployed,
+      removed,
+      missing: stillMissing,
+      lockWritten,
+      npmInstalled,
+      npmFailed,
+      presets,
+      ...agentRender
+    };
   }
   /**
    * Ensure all source clones are present/up to date. Returns an early
@@ -1176,11 +1324,27 @@ var AssetManager = class {
         const src = new RemoteCatalogSource({ baseUrl: storeUrl });
         try {
           const m = await src.getInstallManifest(ref);
+          let deps;
+          let gap;
+          try {
+            let row = await src.resolve(ref);
+            if (row === null && !src.cache.airGapped) row = await src.revalidate(ref);
+            deps = row?.requires;
+            if (row === null) gap = `has no catalog row for ${ref}`;
+            else if (deps === void 0)
+              gap = `has a cached catalog row for ${ref} without dependencies`;
+          } catch (err) {
+            gap = `dependency lookup for ${ref} failed \u2014 ${err}`;
+          }
+          if (gap) {
+            console.warn(`skaile: store ${storeUrl} ${gap}; installing without its dependencies`);
+          }
           return {
             sourceUrl: m.source.url,
             commit: m.source.commitSha,
             sha256: m.sha256,
-            files: m.files
+            files: m.files,
+            deps
           };
         } catch (err) {
           if (err instanceof CatalogHttpError && err.status === 404) return null;
@@ -1301,7 +1465,14 @@ var AssetManager = class {
       )
     ];
     await this.renderDriverMcpConfig();
-    return { deployed, removed: [], missing: library.missing, lockWritten: false };
+    const agentRender = this.renderAgentInstances();
+    return {
+      deployed,
+      removed: [],
+      missing: library.missing,
+      lockWritten: false,
+      ...agentRender
+    };
   }
   /**
    * Add a single asset (and its transitive dependencies) to the workspace.
@@ -1324,7 +1495,8 @@ var AssetManager = class {
     parseAssetRef(ref);
     this.ensureSourceClonesQuiet(repositories, sources);
     const provenanceIndex = await buildProvenanceIndex(this.buildClones(repositories), {
-      projectDir: this.projectDir
+      projectDir: this.projectDir,
+      knownKinds: this.knownKinds
     });
     const { resolved, missing, overridesApplied } = await this.resolveWithStores([ref], {
       provenanceIndex,
@@ -1354,6 +1526,7 @@ var AssetManager = class {
     }
     this.addDependencyToConfig(ref);
     await this.renderDriverMcpConfig();
+    this.renderAgentInstances();
     if (resolved.length > 0 || lib.entries.length > 0) {
       const fresh = buildLockFile(resolved, overridesApplied, await this.libraryLockEntries(lib));
       writeLock(this.lockPath, mergeLockFile(this.tryReadLock(), fresh));
@@ -1397,37 +1570,37 @@ var AssetManager = class {
     );
   }
   /**
-   * Bundles in the configured sources (and the bundled factory source) that list
-   * `ref` as a member, for the `skaile add` discoverability hint. Membership is
-   * not a dependency: nothing here installs the bundle or its siblings.
+   * Presets in the configured sources (and the bundled factory source) that list
+   * `ref` as an asset item, for the `skaile add` discoverability hint. Membership is
+   * not a dependency: nothing here installs the preset or its siblings.
    *
    * Matches on kind + name, and on publisher only when both sides carry one, so
-   * a bare `skill:x` member line still matches `skill:@pub/x`. Bundles already
+   * a bare `skill:x` item still matches `skill:@pub/x`. Presets already
    * declared in `skaile.yaml` are left out. Best-effort: any failure yields `[]`,
    * so it can never fail an `add` that succeeded.
    *
    * @param ref - The added asset ref (`kind:name`, `kind:@pub/name`, optionally pinned).
-   * @returns One `{ name, ref }` per containing bundle, deduped by `ref`; `ref` is
-   *   the `skaile add` form (`bundle:@pub/name`, or `bundle:name` without a publisher).
+   * @returns One `{ name, ref }` per containing preset, deduped by `ref`; `ref` is
+   *   the `skaile add` form (`preset:@pub/name`, or `preset:name` without a publisher).
    */
-  async bundlesContaining(ref) {
+  async presetsContaining(ref) {
     const target = memberIdentity(ref);
-    if (!target || target.kind === "bundle") return [];
+    if (!target || target.kind === "preset") return [];
     try {
       const sameAsset = (id, want) => !!id && id.kind === want.kind && id.name === want.name && (!id.publisher || !want.publisher || id.publisher === want.publisher);
       const declared = this.loadConfig().dependencies.map(memberIdentity);
       const out = [];
       const seen = /* @__PURE__ */ new Set();
-      for (const b of await this.search(void 0, "bundle")) {
-        const members = [...b.dependencies, ...b.requires.map((d) => `${d.kind}:${d.name}`)];
+      for (const p of await this.search(void 0, "preset")) {
+        const members = [...p.dependencies, ...p.requires.map((d) => `${d.kind}:${d.name}`)];
         if (!members.some((m) => sameAsset(memberIdentity(m), target))) continue;
-        const publisher = b.publisher?.replace(/^@/, "");
-        const bundleId = { kind: "bundle", name: b.name, publisher };
-        if (declared.some((d) => sameAsset(d, bundleId))) continue;
-        const bundleRef = publisher ? assetRefToStr({ kind: "bundle", name: b.name, publisher }) : `bundle:${b.name}`;
-        if (seen.has(bundleRef)) continue;
-        seen.add(bundleRef);
-        out.push({ name: b.name, ref: bundleRef });
+        const publisher = p.publisher?.replace(/^@/, "");
+        const presetId = { kind: "preset", name: p.name, publisher };
+        if (declared.some((d) => sameAsset(d, presetId))) continue;
+        const presetRef = publisher ? assetRefToStr({ kind: "preset", name: p.name, publisher }) : `preset:${p.name}`;
+        if (seen.has(presetRef)) continue;
+        seen.add(presetRef);
+        out.push({ name: p.name, ref: presetRef });
       }
       return out;
     } catch {
@@ -1609,10 +1782,12 @@ var AssetManager = class {
    *
    * @param ref - Asset ref in `kind:name` form (e.g. `skill:my-skill`).
    * @returns `true` if the asset was found and removed, `false` if it was not deployed.
+   *   A `preset:` ref has no deployed files: it is found when declared in `skaile.yaml`, and
+   *   only its declaration goes — its expanded items leave with the next `skaile install`.
    */
   remove(ref) {
     const parsed = parseAssetRef(ref);
-    let ok = false;
+    let ok = parsed.kind === "preset" ? this.removeDependencyFromConfig(parsed) : false;
     for (const t of this.targetHarnesses()) {
       if (removeAsset(parsed.kind, parsed.name, this.deployOptsFor(t))) ok = true;
     }
@@ -1663,7 +1838,7 @@ var AssetManager = class {
     for (const [name, decl] of Object.entries(repositories)) {
       const repoDir = this.resolveRepoDir(decl, name);
       if (!repoDir) continue;
-      all = [...all, ...await scanRepo(repoDir, name)];
+      all = [...all, ...await scanRepo(repoDir, name, { knownKinds: this.knownKinds })];
     }
     if (kind) all = all.filter((e) => e.kind === kind);
     if (query) {
@@ -1707,7 +1882,7 @@ var AssetManager = class {
     for (const [name, decl] of Object.entries(repositories)) {
       const repoDir = this.resolveRepoDir(decl, name);
       if (!repoDir) continue;
-      const entries = await scanRepo(repoDir, name);
+      const entries = await scanRepo(repoDir, name, { knownKinds: this.knownKinds });
       const match = entries.find(
         (e) => e.kind === parsed.kind && e.name === parsed.name && (!parsed.publisher || e.publisher === parsed.publisher)
       );
@@ -1726,7 +1901,11 @@ var AssetManager = class {
    * @returns Shallow {@link CatalogEntry} objects (description and version will be empty).
    */
   listDeployed(kind) {
-    const kinds = kind ? [kind] : ["skill", "agent", "prompt", "flow", "contract"];
+    const kinds = kind ? [this.installTarget(kind)].filter((k) => k !== void 0) : [
+      ...new Set(
+        this.registry.getAllProviders().map((p) => p.installTarget).filter((t) => t !== void 0)
+      )
+    ];
     const result = [];
     const seen = /* @__PURE__ */ new Set();
     for (const k of kinds) {
@@ -1738,7 +1917,7 @@ var AssetManager = class {
           if (item.isDirectory() || item.isSymbolicLink()) {
             name = item.name;
           } else if (item.isFile()) {
-            name = item.name.replace(/\.prompt\.md$/, "").replace(/\.flow\.(yaml|json)$/, "").replace(/\.bundle\.yaml$/, "").replace(/\.(md|toml|yaml|json)$/, "");
+            name = item.name.replace(/\.prompt\.md$/, "").replace(/\.flow\.(yaml|json)$/, "").replace(/\.(md|toml|yaml|json)$/, "");
           } else {
             continue;
           }
@@ -1776,8 +1955,9 @@ var AssetManager = class {
     if (this.global || this.driverTarget === "claude-code") return [];
     const tracked = /* @__PURE__ */ new Map();
     const track = (kind, name) => {
-      if (kind && name && !NON_DEPLOYABLE_KINDS.has(kind)) {
-        tracked.set(`${kind}:${name}`, { kind, name });
+      const component = kind ? this.installTarget(kind) : void 0;
+      if (kind && name && component) {
+        tracked.set(`${kind}:${name}`, { kind, name, component });
       }
     };
     const lock = this.tryReadLock();
@@ -1798,8 +1978,7 @@ var AssetManager = class {
     } catch {
     }
     const out = [];
-    for (const { kind, name } of tracked.values()) {
-      const k = kind;
+    for (const { kind, name, component: k } of tracked.values()) {
       const legacy = deployedDir(k, name, "claude-code", false, this.projectDir);
       if (legacy === deployedDir(k, name, this.driverTarget, false, this.projectDir)) continue;
       if (isDeployed(k, name, "claude-code", false, this.projectDir)) {
@@ -1813,11 +1992,12 @@ var AssetManager = class {
    * with a reconciliation {@link DeclaredState}:
    *
    * - `declared` — in `skaile.yaml`, not yet resolved into the lock.
-   * - `installed` — declared + locked, and (for deployable kinds) materialized on
-   *   disk. An `mcp-server` is instead checked against the declarations the runner
-   *   would actually wire (store-staged or materialized `MCP.md`); the remaining
-   *   non-deployable kinds ({@link NON_DEPLOYABLE_KINDS}) count as installed once
-   *   locked — they are resolved at session start with no on-disk footprint here.
+   * - `installed` — declared + locked, and (for kinds with an `installTarget`)
+   *   materialized on disk. An `mcp-server` is instead checked against the
+   *   declarations the runner would actually wire (store-staged or materialized
+   *   `MCP.md`); the remaining composition-only kinds (no `installTarget`) count as
+   *   installed once locked — they are resolved at session start with no harness
+   *   footprint here.
    * - `drift` — declared + locked but the deployed files are missing on disk.
    * - `invalid` — the `dependencies:` entry isn't a parseable canonical ref. Only
    *   surfaced in the unfiltered listing (a `kind` filter can't classify it).
@@ -1859,7 +2039,7 @@ var AssetManager = class {
         continue;
       }
       if (kind && parsed.kind !== kind) continue;
-      const locked = lockKeys.some(
+      const locked = parsed.kind === "preset" ? lock !== null : lockKeys.some(
         (k) => k.kind === parsed.kind && k.name === parsed.name && (!parsed.publisher || k.publisher === parsed.publisher)
       );
       let state;
@@ -1868,17 +2048,20 @@ var AssetManager = class {
       } else if (parsed.kind === "mcp-server") {
         const wired = await wiredMcpNames();
         state = wired.has(parsed.name) || wired.has(unscopedName(parsed.name)) ? "installed" : "drift";
-      } else if (NON_DEPLOYABLE_KINDS.has(parsed.kind)) {
-        state = "installed";
       } else {
-        const onDisk = isDeployed(
-          parsed.kind,
-          parsed.name,
-          this.driverTarget,
-          this.global,
-          this.projectDir
-        );
-        state = onDisk ? "installed" : "drift";
+        const component = this.installTarget(parsed.kind);
+        if (!component) {
+          state = "installed";
+        } else {
+          const onDisk = isDeployed(
+            component,
+            parsed.name,
+            this.driverTarget,
+            this.global,
+            this.projectDir
+          );
+          state = onDisk ? "installed" : "drift";
+        }
       }
       out.push({ ref, kind: parsed.kind, name: parsed.name, state });
     }
@@ -1921,18 +2104,16 @@ var AssetManager = class {
         continue;
       }
       if (opts?.kind && parsed.kind !== opts.kind) continue;
-      const locked = lockKeys.some(
+      const locked = parsed.kind === "preset" ? lock !== null : lockKeys.some(
         (k) => k.kind === parsed.kind && k.name === parsed.name && (!parsed.publisher || k.publisher === parsed.publisher)
       );
       for (const harness of harnesses) {
         let state;
         if (!locked) {
           state = "declared";
-        } else if (NON_DEPLOYABLE_KINDS.has(parsed.kind)) {
-          state = "installed";
         } else {
-          const onDisk = isDeployed(parsed.kind, parsed.name, harness, true);
-          state = onDisk ? "installed" : "drift";
+          const component = this.installTarget(parsed.kind);
+          state = !component || isDeployed(component, parsed.name, harness, true) ? "installed" : "drift";
         }
         out.push({ ref, kind: parsed.kind, name: parsed.name, state, harness });
       }
@@ -2090,8 +2271,9 @@ var AssetManager = class {
     for (const [ref, entry] of Object.entries(lock.assets)) {
       if (reported.has(ref) || entry.library?.installed) continue;
       const { publisher, kind, name, version } = parseCanonicalLockKey(ref);
-      if (!kind || !name || NON_DEPLOYABLE_KINDS.has(kind)) continue;
-      if (isDeployed(kind, name, this.driverTarget, this.global, this.projectDir)) {
+      const component = kind ? this.installTarget(kind) : void 0;
+      if (!kind || !name || !component) continue;
+      if (isDeployed(component, name, this.driverTarget, this.global, this.projectDir)) {
         continue;
       }
       result.push({
@@ -2124,8 +2306,10 @@ var AssetManager = class {
     const parsed = parseAssetRef(ref);
     const entry = await this.info(ref);
     if (!entry || !existsSync(entry.source)) return { status: "not-found" };
+    const component = this.installTarget(parsed.kind);
+    if (!component) return { status: "not-deployed" };
     const deployedPath = join(
-      deployedBase(parsed.kind, this.driverTarget, this.global, this.projectDir),
+      deployedBase(component, this.driverTarget, this.global, this.projectDir),
       parsed.name
     );
     if (!existsSync(deployedPath)) return { status: "not-deployed" };
@@ -2147,7 +2331,8 @@ var AssetManager = class {
     const { repositories, sources, stores, dependencies, overrides } = this.loadConfig();
     this.ensureSourceClonesQuiet(repositories, sources);
     const provenanceIndex = await buildProvenanceIndex(this.buildClones(repositories), {
-      projectDir: this.projectDir
+      projectDir: this.projectDir,
+      knownKinds: this.knownKinds
     });
     const { resolved, missing, overridesApplied } = await this.resolveWithStores(dependencies, {
       provenanceIndex,
@@ -2262,18 +2447,11 @@ var AssetManager = class {
       for (const req of full.requires) {
         const dep = memberIdentity(`${req.kind}:${req.name}`);
         if (!dep) continue;
-        if (!isDeployed(
-          dep.kind,
-          dep.name,
-          this.driverTarget,
-          this.global,
-          this.projectDir
-        )) {
-          const inRepos = await resolveAsset(
-            { kind: dep.kind, name: dep.name },
-            repositories,
-            this.reposDir
-          ) !== null;
+        const depComponent = this.installTarget(dep.kind);
+        if (depComponent && !isDeployed(depComponent, dep.name, this.driverTarget, this.global, this.projectDir)) {
+          const inRepos = await resolveAsset({ kind: dep.kind, name: dep.name }, repositories, this.reposDir, {
+            knownKinds: this.knownKinds
+          }) !== null;
           issues.push({
             assetKind: entry.kind,
             assetName: entry.name,
@@ -2291,7 +2469,7 @@ var AssetManager = class {
    * Create a minimal asset scaffold directory (delegates to {@link createScaffold}).
    *
    * @param name - Asset name (also used as the directory name).
-   * @param kind - Asset kind: `skill` | `agent` | `bundle` | `flow` | `prompt` | `contract`.
+   * @param kind - Asset kind: `skill` | `agent` | `preset` | `flow` | `prompt` | `contract`.
    * @param destDir - Parent directory to create the asset in.
    * @param opts - Optional scaffold content (`description`).
    * @returns `{ ok: true, path }` on success, `{ ok: false, path: errorMessage }` if the
@@ -2352,14 +2530,9 @@ var AssetManager = class {
     if (!lock) return removed;
     for (const ref of Object.keys(lock.assets)) {
       const { kind, name } = parseCanonicalLockKey(ref);
-      if (!kind || !name) continue;
-      const dest = deployedDir(
-        kind,
-        name,
-        this.driverTarget,
-        this.global,
-        this.projectDir
-      );
+      const component = kind ? this.installTarget(kind) : void 0;
+      if (!kind || !name || !component) continue;
+      const dest = deployedDir(component, name, this.driverTarget, this.global, this.projectDir);
       try {
         const stat = lstatSync(dest);
         if (stat.isSymbolicLink()) unlinkSync(dest);
@@ -2440,9 +2613,9 @@ var AssetManager = class {
    */
   removeDependencyFromConfig(target) {
     const configPath = join(this.stateRoot, "skaile.yaml");
-    if (!existsSync(configPath)) return;
+    if (!existsSync(configPath)) return false;
     const raw = parse(readFileSync(configPath, "utf8")) ?? {};
-    if (!Array.isArray(raw.dependencies)) return;
+    if (!Array.isArray(raw.dependencies)) return false;
     const wantPub = target.publisher?.replace(/^@/, "");
     const idx = raw.dependencies.findIndex((dep) => {
       if (typeof dep !== "string") return false;
@@ -2451,10 +2624,10 @@ var AssetManager = class {
       const havePub = p.publisher?.replace(/^@/, "");
       return wantPub === void 0 || havePub === void 0 || havePub === wantPub;
     });
-    if (idx !== -1) {
-      raw.dependencies.splice(idx, 1);
-      writeFileSync(configPath, stringify(raw, { lineWidth: 120 }));
-    }
+    if (idx === -1) return false;
+    raw.dependencies.splice(idx, 1);
+    writeFileSync(configPath, stringify(raw, { lineWidth: 120 }));
+    return true;
   }
   resolveRepoDir(decl, name) {
     const links = readLinks(this.projectDir);
@@ -2473,6 +2646,6 @@ var AssetManager = class {
   }
 };
 
-export { AssetManager, FACTORY_SOURCE_URL, MissingManifestError, NON_DEPLOYABLE_KINDS, normalizeRepoUrl, parseCanonicalLockKey, parseRefTolerant, renderMcpServerConfig, softDepName };
-//# sourceMappingURL=chunk-BATL2CWI.js.map
-//# sourceMappingURL=chunk-BATL2CWI.js.map
+export { AssetManager, FACTORY_SOURCE_URL, MissingManifestError, installAgentInstances, normalizeRepoUrl, parseCanonicalLockKey, parseRefTolerant, renderMcpServerConfig, softDepName };
+//# sourceMappingURL=chunk-4CTGEEN6.js.map
+//# sourceMappingURL=chunk-4CTGEEN6.js.map