agents-inc 0.152.1 → 0.154.0

package/dist/commands/edit.js

@@ -1,76 +1,70 @@
 #!/usr/bin/env node
+import {
+  Spinner
+} from "../chunk-ZBPEFQ4G.js";
 import {
   runWizardSession
-} from "../chunk-MVR3SYMN.js";
-import "../chunk-XHUODHZ4.js";
-import "../chunk-MWG4VU64.js";
-import "../chunk-TJJPWUMA.js";
-import "../chunk-TUPYW2IQ.js";
-import "../chunk-SKQWRUPX.js";
-import "../chunk-LASI35KT.js";
-import "../chunk-GRVKW3CC.js";
-import "../chunk-L7SZXUBJ.js";
-import "../chunk-ZPPHXXAP.js";
-import "../chunk-R5NOI2LP.js";
-import "../chunk-BNSRA6HL.js";
-import "../chunk-F7T5AFFN.js";
-import "../chunk-MQ7FLIYS.js";
-import "../chunk-FVDKAVOL.js";
+} from "../chunk-QUDQTO3O.js";
+import "../chunk-R7JV22QK.js";
+import "../chunk-MJFIO5SX.js";
+import "../chunk-NSJ2S7R5.js";
+import "../chunk-JC7DBPRD.js";
+import "../chunk-GUDGCFSF.js";
+import "../chunk-BZ4CZBOM.js";
+import "../chunk-NKCY2ULI.js";
+import "../chunk-NFH6SA62.js";
+import "../chunk-IXEDSKMH.js";
+import "../chunk-AURY6RT6.js";
+import "../chunk-WRRP47PY.js";
+import "../chunk-2IMYK4WN.js";
 import "../chunk-TSIU7DME.js";
-import "../chunk-QRDTLVXG.js";
-import "../chunk-J27W6TXS.js";
-import "../chunk-SX5H6TSC.js";
-import "../chunk-5GUOIJSG.js";
-import "../chunk-MJ2KHG24.js";
-import "../chunk-DTSG5XZB.js";
-import "../chunk-MM7CTTAV.js";
-import "../chunk-KXYVJGJP.js";
-import "../chunk-P44SXVH3.js";
-import "../chunk-LDP5ASDM.js";
-import "../chunk-Q45ZU6HD.js";
-import "../chunk-WBCPLH66.js";
-import "../chunk-RNJWAKMO.js";
 import "../chunk-XVAQG2CV.js";
-import {
-  Spinner
-} from "../chunk-IUQBOCSU.js";
-import {
-  ERROR_MESSAGES,
-  STATUS_MESSAGES
-} from "../chunk-ODNDXQH2.js";
+import "../chunk-LA3JPESW.js";
+import "../chunk-J27W6TXS.js";
+import "../chunk-AKQ5QISO.js";
+import "../chunk-CHNA5RVS.js";
+import "../chunk-ONWEOS77.js";
+import "../chunk-V3ENMW7G.js";
+import "../chunk-DRKSYJZ2.js";
+import "../chunk-Q5FLW4JG.js";
+import "../chunk-6CNRMCFM.js";
 import {
   compileAgentsAllScopes,
   detectProject,
   loadSource,
   writeProjectConfig
-} from "../chunk-STMHDOZD.js";
+} from "../chunk-XMEIVWAS.js";
 import {
   discoverInstalledSkills,
-  installPluginSkills,
-  pluginInstallFailureError,
+  removeCompiledAgents,
   uninstallPluginSkills
-} from "../chunk-SBHBBZKF.js";
+} from "../chunk-ZU6DAR4S.js";
 import {
   copyLocalSkills
-} from "../chunk-IHUY4M22.js";
+} from "../chunk-UW44KSYL.js";
 import {
   loadAgentDefs
-} from "../chunk-QZZJFYUQ.js";
-import "../chunk-E5X6RJ4E.js";
-import "../chunk-LZ52XEPR.js";
+} from "../chunk-PRJD5MMQ.js";
+import "../chunk-TUQF577Z.js";
+import "../chunk-B66SC72V.js";
 import {
   render
 } from "../chunk-JFLVEFFP.js";
 import {
   formatScopeTag
-} from "../chunk-5UWKOOIS.js";
+} from "../chunk-QQTYMW7N.js";
 import {
   BaseCommand,
-  EXIT_CODES,
-  source_default
-} from "../chunk-KR65TPKC.js";
-import "../chunk-ZL7PFNHN.js";
+  EXIT_CODES
+} from "../chunk-FMYHWKGG.js";
+import "../chunk-7VZV4O6B.js";
+import "../chunk-K3O3YQYG.js";
 import {
+  ERROR_MESSAGES,
+  INFO_MESSAGES,
+  INSTALL_MODE_DESCRIPTIONS,
+  STATUS_MESSAGES,
+  activeAgentNames,
   activeAgentScopeMap,
   applyMigratedGlobalSources,
   buildMarketplacePluginRef,
@@ -83,20 +77,22 @@ import {
   installBaseDir,
   isActiveAt,
   isHomeDirectory,
+  localSkillsCopied,
   migrateLocalSkillScope,
   mutateGlobal,
+  recompileSummary,
   resolveInstallPaths,
-  toClaudePluginScope
-} from "../chunk-EEPELKOM.js";
+  toClaudePluginScope,
+  unresolvedSkillRemovalReasons
+} from "../chunk-CBF4ZYV3.js";
 import {
-  getErrorMessage,
-  remove
-} from "../chunk-PMM2MYMA.js";
+  getErrorMessage
+} from "../chunk-4VCWL2IG.js";
 import {
   getSkillById,
   getSkillDisplayName,
   matrix
-} from "../chunk-WKTHWQKM.js";
+} from "../chunk-IPJOMAWC.js";
 import {
   typedKeys
 } from "../chunk-VASLW636.js";
@@ -106,19 +102,44 @@ import {
   EDIT_PROJECT_SETUP_FLAG,
   EJECT_SOURCE,
   formatSourceDisplayName
-} from "../chunk-76ADG7LQ.js";
-import "../chunk-UBEDZ4FD.js";
+} from "../chunk-R54KIGN2.js";
+import "../chunk-VZRO7RYT.js";
 
 // src/cli/commands/edit.tsx
 import path from "path";
+import chalk from "chalk";
 import { Flags } from "@oclif/core";
 import { difference, indexBy } from "remeda";
 import { jsx } from "react/jsx-runtime";
+var RECOMPILE_SUBJECT = "agents";
 function formatDualScopeTransition(displayName, to) {
   const isAdd = to === "project";
   const prefix = isAdd ? "+" : "-";
   const color = isAdd ? CLI_COLORS.SUCCESS : CLI_COLORS.ERROR;
-  return source_default.hex(color)(`  ${prefix} ${displayName} [P]`);
+  return chalk.hex(color)(`  ${prefix} ${displayName} [P]`);
+}
+function formatSkillScopeChangeLine(skillId, change, dualScopeSkillTransitions) {
+  const displayName = getSkillDisplayName(skillId);
+  if (dualScopeSkillTransitions.has(skillId)) {
+    return formatDualScopeTransition(displayName, change.to);
+  }
+  const isGlobalToProject = change.from === "global" && change.to === "project";
+  const prefix = isGlobalToProject ? "+" : "~";
+  const color = isGlobalToProject ? CLI_COLORS.SUCCESS : CLI_COLORS.WARNING;
+  return chalk.hex(color)(`  ${prefix} ${displayName}`) + chalk.hex(CLI_COLORS.NEUTRAL)(scopeArrow(change));
+}
+function formatAgentScopeChangeLine(agentName, change, dualScopeAgentTransitions) {
+  const agentSuffix = chalk.hex(CLI_COLORS.NEUTRAL)(" (agent)");
+  if (dualScopeAgentTransitions.has(agentName)) {
+    return formatDualScopeTransition(agentName, change.to) + agentSuffix;
+  }
+  return chalk.hex(CLI_COLORS.WARNING)(`  ~ ${agentName}`) + chalk.hex(CLI_COLORS.NEUTRAL)(scopeArrow(change));
+}
+function scopeArrow(change) {
+  return ` (${formatScopeTag(change.from)} \u2192 ${formatScopeTag(change.to)})`;
+}
+function loadedSourceLabel(sourceResult) {
+  return sourceResult.marketplace ?? sourceResult.sourceConfig.source;
 }
 var Edit = class _Edit extends BaseCommand {
   static summary = "Edit skills in the plugin";
@@ -127,22 +148,9 @@ var Edit = class _Edit extends BaseCommand {
     {
       description: "Open the edit wizard",
       command: "<%= config.bin %> <%= command.id %>"
-    },
-    {
-      description: "Edit with a custom source",
-      command: "<%= config.bin %> <%= command.id %> --source github:org/marketplace"
-    },
-    {
-      description: "Force refresh skills from remote",
-      command: "<%= config.bin %> <%= command.id %> --refresh"
     }
   ];
   static flags = {
-    ...BaseCommand.baseFlags,
-    refresh: Flags.boolean({
-      description: "Force refresh from remote sources",
-      default: false
-    }),
     [EDIT_PROJECT_SETUP_FLAG]: Flags.boolean({
       description: "Internal: this run continues an `init` project setup",
       default: false,
@@ -152,15 +160,16 @@ var Edit = class _Edit extends BaseCommand {
   async run() {
     const { flags } = await this.parse(_Edit);
     const cwd = process.cwd();
-    const { unmount, clear: clearSpinner } = render(
-      /* @__PURE__ */ jsx(Spinner, { label: STATUS_MESSAGES.LOADING_SKILLS })
+    await this.ensureConfigReadable(cwd);
+    const context = await this.loadContextUnderSpinner();
+    await this.ensureSavedSkillsReadable(
+      context.projectConfig?.skills ?? [],
+      context.sourceResult.matrix,
+      context.projectDir
     );
-    const context = await this.loadContext(flags);
-    clearSpinner();
-    unmount();
     const result = await this.runEditWizard(context, cwd);
     if (!result) this.error("Cancelled", { exit: EXIT_CODES.CANCELLED });
-    this.reportValidationErrors(result);
+    this.reportValidationErrors(result.validation);
     const activeNewSkills = result.skills.filter((s) => !s.excluded);
     const activeNewAgents = result.agentConfigs.filter((a) => !a.excluded);
     const activeOldSkills = (context.projectConfig?.skills ?? []).filter((s) => !s.excluded);
@@ -179,13 +188,24 @@ var Edit = class _Edit extends BaseCommand {
     });
     const isProjectSetup = flags[EDIT_PROJECT_SETUP_FLAG] && !isHomeDirectory(cwd);
     if (!hasAnyChanges(changes)) {
-      this.log(source_default.hex(CLI_COLORS.NEUTRAL)("No changes made."));
+      this.log(chalk.hex(CLI_COLORS.NEUTRAL)("No changes made."));
       if (!isProjectSetup) return;
-      await this.writeConfigAndCompile(result, context, flags, cwd);
+      await this.writeConfigAndCompile(result, context, cwd);
       this.logCompletionSummary(changes);
       return;
     }
-    this.logChangeSummary(changes, filteredResult.skills, filteredOldConfig?.skills ?? []);
+    const removalReasons = await unresolvedSkillRemovalReasons(
+      result.unresolvableSkillIds,
+      activeOldSkills,
+      context.projectDir,
+      loadedSourceLabel(context.sourceResult)
+    );
+    this.logChangeSummary(
+      changes,
+      filteredResult.skills,
+      filteredOldConfig?.skills ?? [],
+      removalReasons
+    );
     const migratedSkillIds = await this.applyMigrations(
       changes,
       filteredResult,
@@ -199,11 +219,30 @@ var Edit = class _Edit extends BaseCommand {
     await this.applyPluginChanges(changes, filteredResult, activeOldSkills, context, cwd);
     await this.copyNewLocalSkills(changes, filteredResult, context, cwd);
     await this.removeDeletedLocalSkills(changes, activeOldSkills, cwd);
-    await this.writeConfigAndCompile(result, context, flags, cwd);
+    await this.writeConfigAndCompile(result, context, cwd);
     await this.cleanupStaleAgentFiles(changes, activeOldAgents, cwd);
     this.logCompletionSummary(changes);
   }
-  async loadContext(flags) {
+  /**
+   * The load below, behind a spinner that comes down whichever way the await ends.
+   *
+   * The cleanup is a `finally` because all three of `loadContext`'s refusals are raised
+   * while this spinner is mounted, and oclif would otherwise paint its error under an Ink
+   * tree still repainting over it. Never a `catch`: the throw reaches oclif untouched, or
+   * both the error rendering and the pinned exit codes change with it.
+   */
+  async loadContextUnderSpinner() {
+    const { unmount, clear: clearSpinner } = render(
+      /* @__PURE__ */ jsx(Spinner, { label: STATUS_MESSAGES.LOADING_SKILLS })
+    );
+    try {
+      return await this.loadContext();
+    } finally {
+      clearSpinner();
+      unmount();
+    }
+  }
+  async loadContext() {
     const detected = await detectProject();
     if (!detected) {
       this.error(ERROR_MESSAGES.NO_INSTALLATION, {
@@ -215,12 +254,7 @@ var Edit = class _Edit extends BaseCommand {
     let sourceResult;
     let startupMessages = [];
     try {
-      const loaded = await loadSource({
-        sourceFlag: flags.source,
-        projectDir,
-        forceRefresh: flags.refresh,
-        captureStartupMessages: true
-      });
+      const loaded = await loadSource({ projectDir, captureStartupMessages: true });
       sourceResult = loaded.sourceResult;
       startupMessages = loaded.startupMessages;
       const sourceInfo = sourceResult.isLocal ? "local" : sourceResult.sourceConfig.sourceOrigin;
@@ -236,9 +270,9 @@ var Edit = class _Edit extends BaseCommand {
       const discoveredSkills = await discoverAllPluginSkills(projectDir);
       const pluginSkillIds = typedKeys(discoveredSkills);
       const excludedConfigIds = new Set(
-        projectConfig?.skills?.filter((s) => s.excluded).map((s) => s.id) ?? []
+        projectConfig?.skills.filter((s) => s.excluded).map((s) => s.id) ?? []
       );
-      const configSkillIds = projectConfig?.skills?.filter((s) => !s.excluded).map((s) => s.id) ?? [];
+      const configSkillIds = projectConfig?.skills.filter((s) => !s.excluded).map((s) => s.id) ?? [];
       const filteredPluginSkillIds = pluginSkillIds.filter((id) => !excludedConfigIds.has(id));
       const mergedIds = /* @__PURE__ */ new Set([...filteredPluginSkillIds, ...configSkillIds]);
       currentSkillIds = [...mergedIds];
@@ -259,22 +293,24 @@ var Edit = class _Edit extends BaseCommand {
     };
   }
   async runEditWizard(context, cwd) {
-    const { projectConfig, projectDir, currentSkillIds } = context;
+    const { projectConfig, currentSkillIds } = context;
+    const selectedAgents = projectConfig?.agents && activeAgentNames(projectConfig.agents);
     return runWizardSession({
       hydrate: {
         initialStep: "build",
-        initialDomains: projectConfig?.domains,
-        initialAgents: projectConfig?.selectedAgents,
+        ...projectConfig?.selectedDomains !== void 0 && {
+          initialDomains: projectConfig.selectedDomains
+        },
+        ...selectedAgents !== void 0 && { initialAgents: selectedAgents },
         installedSkillIds: currentSkillIds,
-        installedSkillConfigs: projectConfig?.skills,
-        installedAgentConfigs: projectConfig?.agents,
+        ...projectConfig?.skills !== void 0 && { installedSkillConfigs: projectConfig.skills },
+        ...projectConfig?.agents !== void 0 && { installedAgentConfigs: projectConfig.agents },
         isEditingFromGlobalScope: isHomeDirectory(cwd)
       },
       props: {
         version: this.config.version,
-        initialAgents: projectConfig?.selectedAgents,
+        initialAgents: selectedAgents,
         installedSkillIds: currentSkillIds,
-        projectDir,
         startupMessages: context.startupMessages
       },
       onCancel: () => this.log("\nEdit cancelled"),
@@ -299,8 +335,16 @@ var Edit = class _Edit extends BaseCommand {
    * `executeMigration` acted on this run are rewritten, and only their `source` field. Global
    * entries this session merely displayed, re-scoped or deselected are untouched, as are
    * `marketplace`, `stack`, `agents` and every other registered project's view of them.
-   * Refusing the switch instead is not an option — driving a global-scope migration from a
-   * project directory is a supported flow (`scope-aware-local-copy` lifecycle tests).
+   *
+   * Driving a global-scope migration from a project directory is NOT a supported flow, and this
+   * method is no longer the thing that permits it. The wizard now refuses it at source: the two
+   * bulk install-mode keys are withdrawn, and `setInstallMode` ignores a project-context call
+   * against a global slot the hydration snapshot owns — the same authority the Sources grid
+   * already enforced by rendering that row inert. What still reaches here is the residue that
+   * authority leaves legitimate: a mode change committed on the project half of a `[P][G]` pair
+   * and then carried to global scope by a P->G collapse (`s`) in the same session. The entry is
+   * the project's own to configure at the moment it is configured, and global at the moment it
+   * is written — so the migration is real, and the global config must record it.
    *
    * Runs BEFORE `writeConfigAndCompile`, so the global config written here is the one
    * the wizard write reloads, keeps (existing wins in `mergeGlobalConfigs`) and inlines
@@ -322,6 +366,10 @@ var Edit = class _Edit extends BaseCommand {
       const report = await mutateGlobal(
         { kind: "migrate-skill-sources", sources: migratedSources },
         {
+          // The deps contract in config-gate/deps.ts declares
+          // `() => Promise<MergedSkillsMatrix>`; this caller happens to have its
+          // matrix in hand already.
+          // eslint-disable-next-line @typescript-eslint/require-await -- deps contract
           loadMatrix: async () => context.sourceResult.matrix,
           loadAgents: async () => (await loadAgentDefs({ projectDir: cwd })).agents
         }
@@ -331,14 +379,7 @@ var Edit = class _Edit extends BaseCommand {
       this.warn(`Could not record global source change: ${getErrorMessage(error)}`);
     }
   }
-  reportValidationErrors(result) {
-    if (result.validation.errors.length > 0) {
-      for (const err of result.validation.errors) {
-        this.warn(err.message);
-      }
-    }
-  }
-  logChangeSummary(changes, newSkills, oldSkills) {
+  logChangeSummary(changes, newSkills, oldSkills, removalReasons) {
     const {
       addedSkills,
       removedSkills,
@@ -351,27 +392,30 @@ var Edit = class _Edit extends BaseCommand {
       dualScopeAgentTransitions
     } = changes;
     this.log(`
-${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
+${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     for (const skillId of addedSkills) {
       const scope = newSkills.find((s) => s.id === skillId)?.scope;
       const scopeLabel = scope ? ` ${formatScopeTag(scope)}` : "";
       this.log(
-        source_default.hex(CLI_COLORS.SUCCESS)(`  + ${getSkillById(skillId).displayName}${scopeLabel}`)
+        chalk.hex(CLI_COLORS.SUCCESS)(`  + ${getSkillById(skillId).displayName}${scopeLabel}`)
       );
     }
     for (const skillId of removedSkills) {
       const scope = oldSkills.find((s) => s.id === skillId)?.scope;
       const scopeLabel = scope ? ` ${formatScopeTag(scope)}` : "";
-      this.log(source_default.hex(CLI_COLORS.ERROR)(`  - ${getSkillDisplayName(skillId)}${scopeLabel}`));
+      const reason = removalReasons.get(skillId);
+      this.log(
+        chalk.hex(CLI_COLORS.ERROR)(`  - ${getSkillDisplayName(skillId)}${scopeLabel}`) + (reason ? chalk.hex(CLI_COLORS.NEUTRAL)(` (${reason})`) : "")
+      );
     }
     for (const agentName of addedAgents) {
       this.log(
-        source_default.hex(CLI_COLORS.SUCCESS)(`  + ${agentName}`) + source_default.hex(CLI_COLORS.NEUTRAL)(" (agent)")
+        chalk.hex(CLI_COLORS.SUCCESS)(`  + ${agentName}`) + chalk.hex(CLI_COLORS.NEUTRAL)(" (agent)")
       );
     }
     for (const agentName of removedAgents) {
       this.log(
-        source_default.hex(CLI_COLORS.ERROR)(`  - ${agentName}`) + source_default.hex(CLI_COLORS.NEUTRAL)(" (agent)")
+        chalk.hex(CLI_COLORS.ERROR)(`  - ${agentName}`) + chalk.hex(CLI_COLORS.NEUTRAL)(" (agent)")
       );
     }
     for (const [skillId, change] of sourceChanges) {
@@ -379,75 +423,49 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       const fromLabel = formatSourceDisplayName(change.from);
       const toLabel = formatSourceDisplayName(change.to);
       this.log(
-        source_default.hex(CLI_COLORS.WARNING)(`  ~ ${displayName}`) + source_default.hex(CLI_COLORS.NEUTRAL)(` (${fromLabel} \u2192 ${toLabel})`)
+        chalk.hex(CLI_COLORS.WARNING)(`  ~ ${displayName}`) + chalk.hex(CLI_COLORS.NEUTRAL)(` (${fromLabel} \u2192 ${toLabel})`)
       );
     }
     for (const [skillId, change] of scopeChanges) {
-      const displayName = getSkillDisplayName(skillId);
-      if (dualScopeSkillTransitions.has(skillId)) {
-        this.log(formatDualScopeTransition(displayName, change.to));
-        continue;
-      }
-      const fromLabel = formatScopeTag(change.from);
-      const toLabel = formatScopeTag(change.to);
-      const isGlobalToProject = change.from === "global" && change.to === "project";
-      const prefix = isGlobalToProject ? "+" : "~";
-      const color = isGlobalToProject ? CLI_COLORS.SUCCESS : CLI_COLORS.WARNING;
-      this.log(
-        source_default.hex(color)(`  ${prefix} ${displayName}`) + source_default.hex(CLI_COLORS.NEUTRAL)(` (${fromLabel} \u2192 ${toLabel})`)
-      );
+      this.log(formatSkillScopeChangeLine(skillId, change, dualScopeSkillTransitions));
     }
     for (const [agentName, change] of agentScopeChanges) {
-      if (dualScopeAgentTransitions.has(agentName)) {
-        this.log(
-          formatDualScopeTransition(agentName, change.to) + source_default.hex(CLI_COLORS.NEUTRAL)(" (agent)")
-        );
-        continue;
-      }
-      const fromLabel = formatScopeTag(change.from);
-      const toLabel = formatScopeTag(change.to);
-      this.log(
-        source_default.hex(CLI_COLORS.WARNING)(`  ~ ${agentName}`) + source_default.hex(CLI_COLORS.NEUTRAL)(` (${fromLabel} \u2192 ${toLabel})`)
-      );
+      this.log(formatAgentScopeChangeLine(agentName, change, dualScopeAgentTransitions));
     }
     this.log("");
   }
   async applyMigrations(_changes, filteredResult, activeOldSkills, context, cwd) {
     const migrationPlan = detectMigrations(activeOldSkills, filteredResult.skills);
-    const hasMigrations = migrationPlan.toEject.length > 0 || migrationPlan.toPlugin.length > 0;
-    if (hasMigrations) {
-      if (migrationPlan.toEject.length > 0) {
-        this.log(
-          source_default.hex(CLI_COLORS.NEUTRAL)(
-            `Switching ${migrationPlan.toEject.length} skill(s) to eject`
-          )
-        );
-      }
-      if (migrationPlan.toPlugin.length > 0) {
-        this.log(
-          source_default.hex(CLI_COLORS.NEUTRAL)(
-            `Switching ${migrationPlan.toPlugin.length} skill(s) to plugin`
-          )
-        );
-        await this.requireMarketplaceOrExit(context.sourceResult, "migrate skills to plugin mode");
-      }
-      const migrationResult = await executeMigration(migrationPlan, cwd, context.sourceResult);
-      for (const warning of migrationResult.warnings) {
-        this.warn(warning);
-      }
-      for (const item of migrationResult.failedPluginInstalls) {
-        this.warn(`Failed to install plugin ${item.id}: ${item.error}`);
-      }
-      if (migrationResult.failedPluginInstalls.length > 0) {
-        this.error(pluginInstallFailureError(migrationResult.failedPluginInstalls.length), {
-          exit: EXIT_CODES.ERROR
-        });
-      }
-    }
-    return /* @__PURE__ */ new Set([
+    const migratedSkillIds = /* @__PURE__ */ new Set([
       ...migrationPlan.toEject.map((m) => m.id),
       ...migrationPlan.toPlugin.map((m) => m.id)
     ]);
+    if (migratedSkillIds.size === 0) return migratedSkillIds;
+    if (migrationPlan.toEject.length > 0) {
+      this.logModeSwitch(migrationPlan.toEject.length, INSTALL_MODE_DESCRIPTIONS.eject);
+    }
+    if (migrationPlan.toPlugin.length > 0) {
+      this.logModeSwitch(migrationPlan.toPlugin.length, INSTALL_MODE_DESCRIPTIONS.plugin);
+      await this.requireMarketplaceOrExit(context.sourceResult, "migrate skills to plugin mode");
+      this.announcePluginInstall();
+    }
+    const migrationResult = await executeMigration(migrationPlan, cwd, context.sourceResult);
+    for (const warning of migrationResult.warnings) {
+      this.warn(warning);
+    }
+    if (migrationPlan.toEject.length > 0) {
+      this.log(
+        chalk.hex(CLI_COLORS.NEUTRAL)(localSkillsCopied(migrationResult.ejectedSkills.length))
+      );
+    }
+    if (migrationPlan.toPlugin.length > 0) {
+      this.reportPluginInstalls(migrationResult.pluginInstalls);
+    }
+    return migratedSkillIds;
+  }
+  /** Names what this run is switching, in the words `init` describes an install mode with. */
+  logModeSwitch(count, modeDescription) {
+    this.log(chalk.hex(CLI_COLORS.NEUTRAL)(`Switching ${count} skill(s) to ${modeDescription}`));
   }
   async applyScopeChanges(changes, filteredResult, context, cwd) {
     const { scopeChanges } = changes;
@@ -503,20 +521,7 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       "install or uninstall plugin skills"
     );
     if (addedPluginSkills.length > 0) {
-      const pluginResult = await installPluginSkills(addedPluginSkills, marketplace, cwd);
-      if (pluginResult.installed.length > 0) {
-        this.log(
-          source_default.hex(CLI_COLORS.NEUTRAL)(`Installed ${pluginResult.installed.length} plugin(s)`)
-        );
-      }
-      for (const item of pluginResult.failed) {
-        this.warn(`Failed to install plugin ${item.id}: ${item.error}`);
-      }
-      if (pluginResult.failed.length > 0) {
-        this.error(pluginInstallFailureError(pluginResult.failed.length), {
-          exit: EXIT_CODES.ERROR
-        });
-      }
+      await this.installPluginSkillsReported(addedPluginSkills, marketplace, cwd);
     }
     if (removedPluginSkills.length > 0) {
       const uninstallResult = await uninstallPluginSkills(
@@ -527,7 +532,7 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       );
       if (uninstallResult.uninstalled.length > 0) {
         this.log(
-          source_default.hex(CLI_COLORS.NEUTRAL)(`Removed ${uninstallResult.uninstalled.length} plugin(s)`)
+          chalk.hex(CLI_COLORS.NEUTRAL)(`Removed ${uninstallResult.uninstalled.length} plugin(s)`)
         );
       }
       for (const item of uninstallResult.failed) {
@@ -542,7 +547,7 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     );
     if (addedLocalSkills.length > 0) {
       const copyResult = await copyLocalSkills(addedLocalSkills, cwd, context.sourceResult);
-      this.log(source_default.hex(CLI_COLORS.NEUTRAL)(`Copied ${copyResult.totalCopied} local skill(s)`));
+      this.log(chalk.hex(CLI_COLORS.NEUTRAL)(localSkillsCopied(copyResult.totalCopied)));
     }
   }
   async removeDeletedLocalSkills(changes, activeOldSkills, cwd) {
@@ -554,12 +559,10 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       await deleteLocalSkill(deleteDir, skillId);
     }
   }
-  async writeConfigAndCompile(result, context, flags, cwd) {
+  async writeConfigAndCompile(result, context, cwd) {
     let agentDefsResult;
     try {
-      agentDefsResult = await loadAgentDefs({
-        forceRefresh: flags.refresh
-      });
+      agentDefsResult = await loadAgentDefs({});
     } catch (error) {
       this.handleError(error);
     }
@@ -569,7 +572,6 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
         wizardResult: result,
         sourceResult: context.sourceResult,
         projectDir: cwd,
-        sourceFlag: flags.source,
         agents: agentDefsResult.agents,
         // A full `cc edit` pass is authoritative over the roster it owns, so deselected entries
         // are removed rather than union-preserved (D-233 Scenario C). Global-context edit owns
@@ -580,6 +582,9 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     } catch (error) {
       this.warn(`Could not update config: ${getErrorMessage(error)}`);
     }
+    if (configResult) {
+      this.reportUnassignedSkills(configResult.config);
+    }
     try {
       const agentScopeMap = activeAgentScopeMap(result.agentConfigs);
       const { allSkills } = await discoverInstalledSkills(cwd);
@@ -589,19 +594,23 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
         skills: allSkills,
         agentScopeMap
       });
-      if (compilationResult.failed.length > 0) {
+      const { compiled, rewritten, failed, warnings } = compilationResult;
+      const summary = recompileSummary(
+        rewritten.length,
+        compiled.length - rewritten.length,
+        RECOMPILE_SUBJECT
+      );
+      if (failed.length > 0) {
         this.log(
-          source_default.hex(CLI_COLORS.NEUTRAL)(`Recompiled ${compilationResult.compiled.length} agents`) + source_default.hex(CLI_COLORS.WARNING)(` (${compilationResult.failed.length} failed)`)
+          chalk.hex(CLI_COLORS.NEUTRAL)(summary) + chalk.hex(CLI_COLORS.WARNING)(` (${failed.length} failed)`)
         );
-        for (const warning of compilationResult.warnings) {
+        for (const warning of warnings) {
           this.warn(warning);
         }
-      } else if (compilationResult.compiled.length > 0) {
-        this.log(
-          source_default.hex(CLI_COLORS.NEUTRAL)(`Recompiled ${compilationResult.compiled.length} agents`)
-        );
+      } else if (compiled.length > 0) {
+        this.log(chalk.hex(CLI_COLORS.NEUTRAL)(summary));
       } else {
-        this.log(source_default.hex(CLI_COLORS.NEUTRAL)("No agents to recompile"));
+        this.log(chalk.hex(CLI_COLORS.NEUTRAL)(INFO_MESSAGES.NO_AGENTS_TO_RECOMPILE));
       }
     } catch (error) {
       this.warn(`Agent recompilation failed: ${getErrorMessage(error)}`);
@@ -611,57 +620,25 @@ ${source_default.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       this.reportPropagatedRecompile(configResult.propagation);
     }
   }
-  /**
-   * Renders the recompile the gated write already performed on every OTHER
-   * registered project this run's global change was propagated into.
-   */
-  reportPropagatedRecompile(propagation) {
-    if (propagation.propagated.updated.length === 0) return;
-    const { recompiledCount, failedCount, warnings } = propagation.recompile;
-    for (const warning of warnings) {
-      this.warn(warning);
-    }
-    const summary = source_default.hex(CLI_COLORS.NEUTRAL)(
-      `Recompiled agents in ${recompiledCount} registered project(s)`
-    );
-    this.log(
-      failedCount > 0 ? summary + source_default.hex(CLI_COLORS.WARNING)(` (${failedCount} failed)`) : summary
-    );
-  }
   async cleanupStaleAgentFiles(changes, oldAgents, cwd) {
-    const { agentScopeChanges, removedAgents } = changes;
-    for (const [agentName, change] of agentScopeChanges) {
-      if (change.from === "global") continue;
-      const oldAgentPath = path.join(
-        resolveInstallPaths(cwd, "project").agentsDir,
-        `${agentName}.md`
-      );
-      try {
-        await remove(oldAgentPath);
-      } catch (error) {
-        this.warn(`Could not remove old agent file ${oldAgentPath}: ${getErrorMessage(error)}`);
-      }
-    }
-    for (const agentName of removedAgents) {
-      const oldScope = oldAgents.find((a) => a.name === agentName)?.scope ?? "project";
-      const agentPath = path.join(resolveInstallPaths(cwd, oldScope).agentsDir, `${agentName}.md`);
-      try {
-        await remove(agentPath);
-      } catch (error) {
-        this.warn(`Could not remove agent file ${agentPath}: ${getErrorMessage(error)}`);
+    for (const removal of planStaleAgentRemovals(changes, oldAgents, cwd)) {
+      const { failed } = await removeCompiledAgents(removal);
+      for (const { name, error } of failed) {
+        const agentPath = path.join(removal.agentsDir, `${name}.md`);
+        this.warn(`Could not remove agent file ${agentPath}: ${error}`);
       }
     }
   }
   logCompletionSummary(_changes) {
     this.log(`
-${source_default.hex(CLI_COLORS.SUCCESS)("\u2713 Done")}
+${chalk.hex(CLI_COLORS.SUCCESS)("\u2713 Done")}
 `);
   }
 };
 function detectConfigChanges(oldConfig, wizardResult, fullEntries) {
-  const oldSkillIds = oldConfig?.skills?.map((s) => s.id) ?? [];
+  const oldSkillIds = oldConfig?.skills.map((s) => s.id) ?? [];
   const newSkillIds = wizardResult.skills.map((s) => s.id);
-  const oldAgentNames = oldConfig?.agents?.map((a) => a.name) ?? [];
+  const oldAgentNames = oldConfig?.agents.map((a) => a.name) ?? [];
   const newAgentNames = wizardResult.agentConfigs.map((a) => a.name);
   const oldSkillsById = indexBy(oldConfig?.skills ?? [], (s) => s.id);
   const oldAgentsByName = indexBy(oldConfig?.agents ?? [], (a) => a.name);
@@ -727,6 +704,24 @@ function detectDualScopeTransitions(scopeChanges, fullNew, fullOld, getKey) {
   }
   return result;
 }
+var STALE_AGENT_SCOPES = ["project", "global"];
+var UNRECORDED_AGENT_SCOPE = "project";
+function installedScope(name, oldAgents) {
+  return oldAgents.find((agent) => agent.name === name)?.scope ?? UNRECORDED_AGENT_SCOPE;
+}
+function planStaleAgentRemovals(changes, oldAgents, cwd) {
+  const supersededByGlobal = [...changes.agentScopeChanges].filter(([, change]) => change.from !== "global").map(([name]) => ({ name, scope: "project" }));
+  const deselected = changes.removedAgents.map((name) => ({
+    name,
+    scope: installedScope(name, oldAgents)
+  }));
+  const stale = [...supersededByGlobal, ...deselected];
+  const removalAtScope = (scope) => ({
+    agentsDir: resolveInstallPaths(cwd, scope).agentsDir,
+    agents: stale.filter((agent) => agent.scope === scope).map((agent) => agent.name)
+  });
+  return STALE_AGENT_SCOPES.map(removalAtScope).filter((removal) => removal.agents.length > 0);
+}
 function hasAnyChanges(changes) {
   return changes.addedSkills.length > 0 || changes.removedSkills.length > 0 || changes.addedAgents.length > 0 || changes.removedAgents.length > 0 || changes.sourceChanges.size > 0 || changes.scopeChanges.size > 0 || changes.agentScopeChanges.size > 0;
 }