@skaile/workspaces 0.22.0-beta.0 → 0.22.0-beta.1

package/dist/cli/index.js

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
-import { AI_RESOURCES } from '../chunk-2M3XTMOL.js';
-import { openCatalogSource, openLibrary, createFullRegistry, openLibraryManager } from '../chunk-UZVHJ7LX.js';
+import { openCatalogSource, openLibrary, createFullRegistry, openLibraryManager } from '../chunk-3ECS5PFD.js';
 import { logErr, S, logOk, colorRef, logInfo, logWarn, kindColorPad, kindColor, formatRelativeTime } from '../chunk-4NDWKA64.js';
-import { getStoreConfig, storeFetch, saveStoreTokens, clearStoreTokens, isStoreAuthenticated } from '../chunk-F3MGZ5E6.js';
+import { getStoreConfig, storeFetch, saveStoreTokens, clearStoreTokens, isStoreAuthenticated } from '../chunk-XIHFJVOD.js';
+import { AI_RESOURCES } from '../chunk-2M3XTMOL.js';
 import { LocalSecretsProvider } from '../chunk-JDX54X4Y.js';
-import { resolveLibraryDir, LocalCatalogSource, skaileHomeDir } from '../chunk-KA46DUM4.js';
+import { resolveLibraryDir, LocalCatalogSource, skaileHomeDir } from '../chunk-JHF66MCK.js';
 import '../chunk-R7FOF242.js';
-import '../chunk-SL6JVGRD.js';
+import '../chunk-D7K72XEY.js';
 import '../chunk-OKRUTSG7.js';
-import { runFlow, resumeFlow } from '../chunk-CSDQBWE6.js';
+import { runFlow, resumeFlow } from '../chunk-DKGDOALM.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-NGC7ZQI4.js';
-import { buildClaudePluginFiles } from '../chunk-J2FCO6TM.js';
+import { runAgentChat, loadSessionById, loadSession, listSessions, setCurrentSession, deleteSession, clearSession, loadAgentManifest, compileComposition, MarkdownStreamer, resolveMixin } from '../chunk-V3QMSM5I.js';
+import { buildClaudePluginFiles } from '../chunk-NJLHHZIW.js';
 import '../chunk-X5YPJV4N.js';
 import '../chunk-O7SG5PC2.js';
 import '../chunk-W2O5LWYU.js';
@@ -20,28 +20,29 @@ import '../chunk-7PTP3SQJ.js';
 import '../chunk-PBWMV5GM.js';
 import '../chunk-W3UDISS2.js';
 import '../chunk-TDSRLMDB.js';
-import '../chunk-XHFMUGDD.js';
+import '../chunk-M5TE6YI5.js';
 import '../chunk-DQWREFRQ.js';
 import '../chunk-KOVLSBXK.js';
 import '../chunk-RRVQAE5D.js';
-import '../chunk-IGQEXBBG.js';
-import '../chunk-G6GKWGOW.js';
-import '../chunk-GKM6MDUC.js';
+import '../chunk-6VTG73UY.js';
+import '../chunk-LV2HPH3C.js';
+import '../chunk-LT4DLEYE.js';
+import '../chunk-APAOQLPT.js';
 import '../chunk-6MB7CRME.js';
 import '../chunk-QAVZOJCV.js';
-import '../chunk-UZRY5UI2.js';
+import '../chunk-6E6PKKAD.js';
 import { loadAllFlows } from '../chunk-ICS76R4T.js';
 import '../chunk-GZWJGNNN.js';
 import '../chunk-FVTV7M76.js';
-import { AssetManager } from '../chunk-2DNSSQ22.js';
-import '../chunk-MO4JPTRD.js';
-import { readLock, resolveSettings, globalSettingsPath, projectSettingsPath, loadSettings, saveSettings, portableSpawn, portableSpawnSync, WorkspaceYamlEditor } from '../chunk-RENHNO4J.js';
+import { AssetManager } from '../chunk-VCYXVP2S.js';
+import '../chunk-PTIHB2TV.js';
+import { readLock, resolveSettings, globalSettingsPath, projectSettingsPath, loadSettings, saveSettings, portableSpawn, portableSpawnSync, WorkspaceYamlEditor } from '../chunk-UMOENHVH.js';
 import { DRIVER_DEFAULTS } from '../chunk-K5GBV4SA.js';
 import '../chunk-KLNL7QHN.js';
-import '../chunk-TTY56FQQ.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, findWorkspaceRoot, workspaceConfigFilename } from '../chunk-TKOLD2O7.js';
-import '../chunk-WIR34WMU.js';
-import { ASSET_KINDS } from '../chunk-X5Y4EGZB.js';
+import '../chunk-GFNW72LW.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, findWorkspaceRoot, workspaceConfigFilename } from '../chunk-J3VKAEQP.js';
+import '../chunk-4AZKT2BU.js';
+import { ASSET_KINDS } from '../chunk-I3UEM3FX.js';
 import '../chunk-JKNWJ64A.js';
 import { SUPPORTED_DRIVER_TARGETS } from '../chunk-O4JH3KUE.js';
 import { openSqlite } from '../chunk-24UIWON4.js';
@@ -50,7 +51,6 @@ import '../chunk-UQ6LFBPZ.js';
 import '../chunk-6FNCZYJY.js';
 import '../chunk-NELZIQ2E.js';
 import '../chunk-CGYEHQOX.js';
-import '../chunk-LV2HPH3C.js';
 import '../chunk-NSBPE2FW.js';
 import * as fs10 from 'fs';
 import fs10__default, { readFileSync, existsSync, writeFileSync, rmSync, statSync } from 'fs';
@@ -309,7 +309,7 @@ function makeSearchCommand() {
     }
     if (showStore) {
       try {
-        const { getStoreConfig: getStoreConfig2, storeFetch: storeFetch2 } = await import('../store-client-ZSLNOOQG.js');
+        const { getStoreConfig: getStoreConfig2, storeFetch: storeFetch2 } = await import('../store-client-5WBRUC5U.js');
         const config = getStoreConfig2();
         const params = {};
         if (query) params.q = query;
@@ -336,7 +336,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((ref, opts) => {
+  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),
       global: opts.global,
@@ -345,7 +345,7 @@ function makeAddCommand() {
     const spinner5 = p5.spinner();
     spinner5.start(`Adding ${ref}`);
     try {
-      const added = am2.add(ref);
+      const added = await am2.add(ref);
       spinner5.stop("Done");
       if (added.length === 0) logInfo("Nothing added (already up to date or not found).");
       else for (const a of added) logOk(a);
@@ -411,7 +411,7 @@ function makeInfoCommand() {
     console.log(`  kind:        ${kindColor(entry.kind)}`);
     if (entry.version) console.log(`  version:     ${entry.version}`);
     if (entry.description) console.log(`  description: ${entry.description}`);
-    if (entry.repository) console.log(`  repository:  ${S.dim(entry.repository)}`);
+    if (entry.publisher) console.log(`  repository:  ${S.dim(entry.publisher)}`);
     console.log(`  source:      ${S.dim(entry.source)}`);
     if (entry.requires.length) {
       console.log(`  requires:`);
@@ -471,7 +471,7 @@ function makeCatalogCommand() {
     const cfg = resolveConfig({ projectDir });
     const baseUrl = opts.url ?? cfg.catalog.url;
     if (isLocalCatalogUrl(baseUrl)) {
-      const { resolveCatalogSource } = await import('../open-library-DWAQFUSQ.js');
+      const { resolveCatalogSource } = await import('../open-library-M4DB3D3J.js');
       let resolved;
       try {
         resolved = await resolveCatalogSource({ projectDir: opts.projectDir });
@@ -1432,7 +1432,7 @@ 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-6OENKNFW.js');
+    const { ensurePluginsLoaded } = await import('../plugin-store-AJ3FGXIC.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     for (const f of result.failed) logWarn(f.error);
   }
@@ -1443,9 +1443,10 @@ async function runUp(opts) {
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const { resolveDeployTarget, pluginRegistry } = await import('../plugin-registry/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
+  const overrideConfig = opts.target === config.deploy?.target ? config.deploy?.config : void 0;
   const resolution = await resolveDeployTarget(
     { deploy: config.deploy },
-    opts.target ? { target: opts.target, config: config.deploy?.config ?? {}, reason: "cli --target" } : void 0,
+    opts.target ? { target: opts.target, config: overrideConfig, reason: "cli --target" } : void 0,
     pluginRegistry
   );
   const { ctx, controller } = await buildDeployContext(projectDir);
@@ -1493,8 +1494,15 @@ async function restoreFromHandle(projectDir) {
     logErr(`unknown deploy target "${stored.targetId}" \u2014 is its plugin installed?`);
     return null;
   }
+  const parsed = target.payloadSchema.safeParse(stored.payload);
+  if (!parsed.success) {
+    logErr(
+      `deploy handle for "${stored.targetId}" is malformed: ${parsed.error.message}. Remove ${S.cmd(".skaile/deploy/handle.json")} to reset.`
+    );
+    return null;
+  }
   const { ctx } = await buildDeployContext(projectDir);
-  const handle = await target.restore(stored.payload, ctx);
+  const handle = await target.restore(parsed.data, ctx);
   return { target, handle, ctx };
 }
 async function runDown(opts) {
@@ -2207,7 +2215,7 @@ function buildVisibleRows(rows, collapsedSources, collapsedDomains) {
       if (collapsedSources.has(row.source)) return false;
       return !hasCollapsedAncestor(row.source, row.domain, collapsedDomains, true);
     }
-    const source = row.entry?.repository || "other";
+    const source = row.entry?.publisher || "other";
     const domain = row.entry?.domain || "other";
     if (collapsedSources.has(source)) return false;
     return !hasCollapsedAncestor(source, domain, collapsedDomains, false);
@@ -2242,7 +2250,7 @@ function isAsset(r) {
   return r.type === "asset";
 }
 function inSource(r, source) {
-  return (r.entry?.repository || "other") === source;
+  return (r.entry?.publisher || "other") === source;
 }
 function inDomain(r, source, domain) {
   if (!inSource(r, source)) return false;
@@ -2300,7 +2308,7 @@ function actOnHeader(row, action3) {
   return false;
 }
 async function loadAssets() {
-  const { gatherAssetFeeds } = await import('../asset-feeds-PJDJ3QYI.js');
+  const { gatherAssetFeeds } = await import('../asset-feeds-QXCSAJRN.js');
   const { entries, notes } = await gatherAssetFeeds(am, am.projectDir);
   if (notes.length > 0) {
     state.message = notes.map((n) => `[${n.feed}] ${n.message}`).join(" \u2022 ");
@@ -2308,7 +2316,7 @@ async function loadAssets() {
   const installed = new Set(am.listDeployed().map((e) => `${e.kind}:${e.name}`));
   const bySource = /* @__PURE__ */ new Map();
   for (const e of entries) {
-    const source = e.repository || "other";
+    const source = e.publisher || "other";
     const domain = e.domain || "other";
     if (!bySource.has(source)) bySource.set(source, /* @__PURE__ */ new Map());
     const domainMap = bySource.get(source);
@@ -2357,7 +2365,7 @@ async function loadAssets() {
 async function loadSourcesAndLibraries() {
   try {
     const [{ openLibraryManager: openLibraryManager2 }, { skaileHomeDir: skaileHomeDir2 }] = await Promise.all([
-      import('../open-library-DWAQFUSQ.js'),
+      import('../open-library-M4DB3D3J.js'),
       import('../library/index.js')
     ]);
     const { manager, library, close } = await openLibraryManager2();
@@ -2654,7 +2662,7 @@ async function showInfo() {
   console.log(`  ${S.rule(50)}`);
   if (e.version) console.log(`  version:     ${e.version}`);
   if (e.description) console.log(`  description: ${e.description}`);
-  if (e.repository) console.log(`  source:      ${pc5.dim(e.repository)}`);
+  if (e.publisher) console.log(`  source:      ${pc5.dim(e.publisher)}`);
   console.log(`  manifest:    ${pc5.dim(e.source)}`);
   console.log(`  installed:   ${row.installed ? pc5.green("yes") : pc5.red("no")}`);
   if (e.requires.length) {
@@ -2955,7 +2963,7 @@ function makeNpxCommand() {
     const am2 = new AssetManager({ projectDir, global: opts.global, driverTarget: opts.target });
     spinner5.start(`Installing ${skillRef}`);
     try {
-      const added = am2.add(skillRef);
+      const added = await am2.add(skillRef);
       spinner5.stop("Done");
       if (added.length === 0) {
         logInfo(`${opts.skill} already deployed or not found in source.`);
@@ -3620,7 +3628,7 @@ function makeOutdatedCommand() {
     console.log(`  ${S.rule(nameW + 40)}`);
     for (const e of filtered) {
       console.log(
-        `  ${kindColorPad(e.kind)}  ${e.name.padEnd(nameW)}  ${S.dim(e.repository)}  ${pc5.yellow(`${e.behind} commit(s) behind`)}`
+        `  ${kindColorPad(e.kind)}  ${e.name.padEnd(nameW)}  ${S.dim(e.publisher)}  ${pc5.yellow(`${e.behind} commit(s) behind`)}`
       );
     }
     console.log();
@@ -3683,7 +3691,7 @@ function action2(fn) {
   };
 }
 async function reconcileAndReport(projectDir, plugins) {
-  const { reconcilePlugins } = await import('../plugin-store-6OENKNFW.js');
+  const { reconcilePlugins } = await import('../plugin-store-AJ3FGXIC.js');
   if (plugins.length === 0) {
     logInfo("No plugins declared \u2014 nothing to reconcile.");
     return;
@@ -3699,7 +3707,7 @@ async function reconcileAndReport(projectDir, plugins) {
 async function runInstall2(spec, opts) {
   const projectDir = path14__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName } = await import('../plugin-store-6OENKNFW.js');
+  const { specName } = await import('../plugin-store-AJ3FGXIC.js');
   const yamlPath = path14__default.join(projectDir, "skaile.yaml");
   const editor = WorkspaceYamlEditor2.load(yamlPath);
   const replaced = editor.addPlugin(spec, specName);
@@ -3711,7 +3719,7 @@ async function runInstall2(spec, opts) {
 async function runRemove(name, opts) {
   const projectDir = path14__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName } = await import('../plugin-store-6OENKNFW.js');
+  const { specName } = await import('../plugin-store-AJ3FGXIC.js');
   const yamlPath = path14__default.join(projectDir, "skaile.yaml");
   const editor = WorkspaceYamlEditor2.load(yamlPath);
   const removed = editor.removePlugin(name, specName);
@@ -3739,7 +3747,7 @@ async function runList(opts) {
   const registry = createPluginRegistry();
   if (declared.length > 0) {
     try {
-      const { loadPlugins } = await import('../plugin-store-6OENKNFW.js');
+      const { loadPlugins } = await import('../plugin-store-AJ3FGXIC.js');
       const result = await loadPlugins(projectDir, declared, registry);
       for (const f of result.failed) logWarn(f.error);
     } catch (err) {
@@ -3942,7 +3950,7 @@ function makeInstallCommand() {
       const spinner6 = p5.spinner();
       spinner6.start(`Installing ${ref}`);
       try {
-        const { openCatalogSource: openCatalogSource2, openLibrary: openLibrary2 } = await import('../open-library-DWAQFUSQ.js');
+        const { openCatalogSource: openCatalogSource2, openLibrary: openLibrary2 } = await import('../open-library-M4DB3D3J.js');
         const catalog = await openCatalogSource2({ projectDir: path14__default.resolve(opts.projectDir) });
         if (!supportsInstallManifest(catalog)) {
           throw new Error(
@@ -3974,7 +3982,7 @@ function makeInstallCommand() {
     }
     const projectDir = path14__default.resolve(opts.projectDir);
     try {
-      const { ensureSourcesCloned } = await import('../ensure-sources-COGVKY44.js');
+      const { ensureSourcesCloned } = await import('../ensure-sources-SL2S4UEX.js');
       const hydrate = ensureSourcesCloned(projectDir, { quiet: true });
       if (hydrate.cloned.length > 0) {
         logOk(`Cloned source(s): ${hydrate.cloned.join(", ")}`);
@@ -4008,13 +4016,6 @@ function makeInstallCommand() {
       if (result.missing.length > 0) {
         for (const m of result.missing) logErr(`Missing: ${m}`);
       }
-      if (result.collisions.length > 0) {
-        for (const c of result.collisions) {
-          logWarn(
-            `${c.key} resolved from ${S.bold(c.resolvedFrom)}, also found in: ${c.shadowedIn.join(", ")}. Use @repo qualifier to pin.`
-          );
-        }
-      }
       if (result.lockWritten) {
         logInfo(`Lock file written: ${S.dim("skaile.lock.yaml")}`);
       }
@@ -4439,7 +4440,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-6OENKNFW.js');
+    const { ensurePluginsLoaded } = await import('../plugin-store-AJ3FGXIC.js');
     const { pluginRegistry } = await import('../plugin-registry/index.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     if (result.loaded.length > 0) {
@@ -5315,13 +5316,14 @@ function readProjectSources(yamlPath) {
   }
 }
 function ensureClone(entry, opts = {}) {
-  const dest = sourceClonePath(entry.name);
+  const slug = deriveSlug(entry.url);
+  const dest = sourceClonePath(slug);
   if (existsSync(dest)) {
     if (!opts.force) return false;
     rmSync(dest, { recursive: true, force: true });
   }
   const args = ["clone", entry.url, dest];
-  if (entry.branch) args.splice(1, 0, "--branch", entry.branch);
+  if (entry.pin) args.splice(1, 0, "--branch", entry.pin);
   const clone = spawnSync("git", args, { stdio: "inherit" });
   if (clone.status !== 0) {
     logErr(`git clone failed for ${entry.url}`);
@@ -5332,13 +5334,14 @@ function ensureClone(entry, opts = {}) {
 async function refreshManifestCache(entry, includeDev = false) {
   const { manager, library, close } = await openLibraryManager();
   try {
-    const dest = sourceClonePath(entry.name);
-    const existing = (await manager.listLibraries()).find((l) => l.name === entry.name);
+    const slug = deriveSlug(entry.url);
+    const dest = sourceClonePath(slug);
+    const existing = (await manager.listLibraries()).find((l) => l.name === slug);
     const lib = existing ?? await manager.addLibrary({
-      name: entry.name,
+      name: slug,
       path: dest,
       backend: "git",
-      backendConfig: { url: entry.url, branch: entry.branch ?? "main", authHint: "ssh" },
+      backendConfig: { url: entry.url, branch: entry.pin ?? "main", authHint: "ssh" },
       ownership: "reader"
     });
     const catalog = new LocalCatalogSource(library, lib.id, dest, createFullRegistry());
@@ -5368,20 +5371,19 @@ function makeSourceCommand() {
   const cmd = new Command("source").description(
     "Manage github sources for the current project (recorded in skaile.yaml)"
   );
-  cmd.command("add <git-url>").description("Clone a github repo and register it in this project's skaile.yaml").option("--name <slug>", "Override the derived slug").option("--branch <branch>", "Branch to track (default: main)").option("--force", "Remove an existing clone and re-clone", false).option("--dev", "Also index dev-only assets under the source's dev_paths", false).action(
+  cmd.command("add <git-url>").description("Clone a github repo and register it in this project's skaile.yaml").option("--name <slug>", "[deprecated] no-op \u2014 the source entry stores only the URL").option("--pin <ref>", "Pin a branch, tag, or 40-char SHA").option("--branch <branch>", "[deprecated] alias for --pin").option("--force", "Remove an existing clone and re-clone", false).option("--dev", "Also index dev-only assets under the source's dev_paths", false).action(
     async (url, opts) => {
       const yamlPath = requireProjectYamlPath();
-      const slug = opts.name ?? deriveSlug(url);
-      const entry = { name: slug, url };
-      if (opts.branch) entry.branch = opts.branch;
-      const editor = WorkspaceYamlEditor.load(yamlPath);
-      const existing = editor.getSources().find((s) => s.name === slug);
-      if (existing && existing.url !== url) {
-        logErr(
-          `A source named "${slug}" already exists in ${yamlPath} with a different url (${existing.url}). Pass --name to use a different slug.`
+      if (opts.name) {
+        logWarn(
+          "the --name flag is deprecated; the source entry now stores only the URL (the cache slug is derived from it)."
         );
-        process.exit(1);
       }
+      const pin = opts.pin ?? opts.branch;
+      const slug = deriveSlug(url);
+      const entry = { url };
+      if (pin) entry.pin = pin;
+      const editor = WorkspaceYamlEditor.load(yamlPath);
       editor.setSource(entry);
       editor.save();
       const dest = sourceClonePath(slug);
@@ -5411,69 +5413,77 @@ function makeSourceCommand() {
     console.log();
     console.log(S.heading("  Sources"));
     for (const s of sources) {
-      const cached = existsSync(sourceClonePath(s.name)) ? "" : S.warn(" (not cached)");
-      console.log(`  ${S.cmd(s.name.padEnd(24))}  ${S.dim(s.url)}${cached}`);
+      const slug = deriveSlug(s.url);
+      const cached = existsSync(sourceClonePath(slug)) ? "" : S.warn(" (not cached)");
+      console.log(`  ${S.cmd(slug.padEnd(24))}  ${S.dim(s.url)}${cached}`);
     }
     console.log(`
   ${S.dim(`${sources.length} source(s)`)}
 `);
   });
-  cmd.command("show <name>").description("Show details for a source").action(async (name) => {
+  cmd.command("show <name-or-url>").description("Show details for a source (matched by URL or derived slug)").action(async (key) => {
     const yamlPath = requireProjectYamlPath();
-    const entry = readProjectSources(yamlPath).find((s) => s.name === name);
+    const entry = readProjectSources(yamlPath).find(
+      (s) => s.url === key || deriveSlug(s.url) === key
+    );
     if (!entry) {
-      logErr(`No source named "${name}" in ${yamlPath}.`);
+      logErr(`No source matching "${key}" in ${yamlPath}.`);
       process.exit(1);
     }
+    const slug = deriveSlug(entry.url);
     console.log(
       JSON.stringify(
         {
           ...entry,
-          clonePath: sourceClonePath(entry.name),
-          cached: existsSync(sourceClonePath(entry.name))
+          slug,
+          clonePath: sourceClonePath(slug),
+          cached: existsSync(sourceClonePath(slug))
         },
         null,
         2
       )
     );
   });
-  cmd.command("remove <name>").description("Remove a source from this project's skaile.yaml").option("--purge", "Also delete the cached clone from ~/.skaile/sources/", false).action(async (name, opts) => {
+  cmd.command("remove <name-or-url>").description("Remove a source from this project's skaile.yaml (matched by URL or slug)").option("--purge", "Also delete the cached clone from ~/.skaile/sources/", false).action(async (key, opts) => {
     const yamlPath = requireProjectYamlPath();
     const editor = WorkspaceYamlEditor.load(yamlPath);
-    const removed = editor.removeSource(name);
-    if (!removed) {
-      logErr(`No source named "${name}" in ${yamlPath}.`);
+    const match = editor.getSources().find((s) => s.url === key || deriveSlug(s.url) === key);
+    if (!match) {
+      logErr(`No source matching "${key}" in ${yamlPath}.`);
       process.exit(1);
     }
+    const slug = deriveSlug(match.url);
+    editor.removeSource(match.url);
     editor.save();
-    await dropManifestCache(name, opts.purge);
+    await dropManifestCache(slug, opts.purge);
     logOk(
-      opts.purge ? `Removed source "${name}" and purged its clone.` : `Removed source "${name}" from skaile.yaml (clone left in ~/.skaile/sources/).`
+      opts.purge ? `Removed source "${slug}" and purged its clone.` : `Removed source "${slug}" from skaile.yaml (clone left in ~/.skaile/sources/).`
     );
   });
-  cmd.command("sync [name]").description("Pull upstream changes and refresh the manifest cache").option("--dev", "Also index dev-only assets under each source's dev_paths", false).action(async (name, opts) => {
+  cmd.command("sync [name]").description("Pull upstream changes and refresh the manifest cache").option("--dev", "Also index dev-only assets under each source's dev_paths", false).action(async (key, opts) => {
     const yamlPath = requireProjectYamlPath();
     const all = readProjectSources(yamlPath);
-    const targets = name ? all.filter((s) => s.name === name) : all;
+    const targets = key ? all.filter((s) => s.url === key || deriveSlug(s.url) === key) : all;
     if (targets.length === 0) {
-      logInfo(name ? `No source named "${name}".` : "No sources in skaile.yaml.");
+      logInfo(key ? `No source matching "${key}".` : "No sources in skaile.yaml.");
       return;
     }
     for (const entry of targets) {
-      const dest = sourceClonePath(entry.name);
+      const slug = deriveSlug(entry.url);
+      const dest = sourceClonePath(slug);
       if (!existsSync(dest)) {
         ensureClone(entry);
-        logOk(`${entry.name}: cloned to ${dest}.`);
+        logOk(`${slug}: cloned to ${dest}.`);
       } else {
         const pull = spawnSync("git", ["pull", "--ff-only"], { cwd: dest, stdio: "inherit" });
         if (pull.status !== 0) {
-          logWarn(`${entry.name}: git pull failed, skipping manifest refresh.`);
+          logWarn(`${slug}: git pull failed, skipping manifest refresh.`);
           continue;
         }
       }
       const result = await refreshManifestCache(entry, opts.dev);
-      logOk(`${entry.name}: indexed ${result.assetsUpdated} of ${result.assetsFound} asset(s).`);
-      for (const err of result.errors) logWarn(`${entry.name}: ${err}`);
+      logOk(`${slug}: indexed ${result.assetsUpdated} of ${result.assetsFound} asset(s).`);
+      for (const err of result.errors) logWarn(`${slug}: ${err}`);
     }
   });
   cmd.command("patch <ref>").description("Extract an asset for editing against the source").action((_ref) => {
@@ -5696,13 +5706,6 @@ function makeUpdateCommand() {
       } else {
         logInfo("Nothing to update.");
       }
-      if (result.collisions.length > 0) {
-        for (const c of result.collisions) {
-          logWarn(
-            `${c.key} resolved from ${S.heading(c.resolvedFrom)}, also found in: ${c.shadowedIn.join(", ")}`
-          );
-        }
-      }
     }
   );
 }
@@ -6284,8 +6287,7 @@ program.command("init [project-dir]").description("Initialize a project director
             driver: "claude-sdk",
             max_turns: 200
           }
-        },
-        ai_resources: []
+        }
       })
     );
     created.push("skaile.yaml");
@@ -6305,7 +6307,7 @@ program.command("init [project-dir]").description("Initialize a project director
     const append = entries.filter((e) => !have.has(e));
     if (append.length > 0) {
       const prefix = existing && !existing.endsWith("\n") ? "\n" : "";
-      writeFileSync2(gitignorePath, existing + prefix + `${append.join("\n")}
+      writeFileSync2(gitignorePath, `${existing + prefix}${append.join("\n")}
 `);
       if (!existing) created.push(".gitignore");
     }
@@ -6336,7 +6338,7 @@ program.command("init [project-dir]").description("Initialize a project director
     );
   }
   try {
-    const { ensureSourcesCloned } = await import('../ensure-sources-COGVKY44.js');
+    const { ensureSourcesCloned } = await import('../ensure-sources-SL2S4UEX.js');
     const hydrate = ensureSourcesCloned(resolved, { quiet: true });
     for (const n of hydrate.cloned) created.push(`~/.skaile/sources/${n}/`);
     if (hydrate.failed.length > 0) {
@@ -6362,7 +6364,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-ACMP3QZC.js');
+  const { cmdSetup } = await import('../setup-GBSQX7JF.js');
   await cmdSetup([], { projectDir: process.cwd() });
 });
 program.addCommand(makeInstallCommand());