agents-inc 0.168.0 → 0.170.0

package/dist/commands/edit.js

@@ -1,18 +1,22 @@
 #!/usr/bin/env node
+import {
+  awaitUnderSpinner
+} from "../chunk-NEZ4OAOL.js";
 import {
   publishSeedConfig,
   seedPayloadForInstallation,
   skillsAuthoredHere
-} from "../chunk-4DRFEYCE.js";
+} from "../chunk-SZYQISA2.js";
 import {
   RemovalPlanConfirm
-} from "../chunk-W6GO2CYX.js";
+} from "../chunk-USVBYQSQ.js";
 import {
   unofferablePlacementsFound
-} from "../chunk-KTLKR4YY.js";
+} from "../chunk-WTWMGH2C.js";
 import {
   arrivalLines,
   arrivalsByScope,
+  joinedStatement,
   notInstalledGlobally,
   openUrl,
   readInstalledGlobal,
@@ -21,87 +25,54 @@ import {
   sameAssignments,
   skillLabel,
   withUnplaceableAssignees
-} from "../chunk-EH2PGPLP.js";
-import {
-  runWizardSession
-} from "../chunk-X6ZZEYO3.js";
-import "../chunk-PCFUXQJA.js";
-import "../chunk-KQ3PDARZ.js";
-import "../chunk-PLX2FLEQ.js";
-import "../chunk-HL3GYRMR.js";
-import "../chunk-JVUN6AOO.js";
-import "../chunk-QWFG7Y3R.js";
-import "../chunk-6WGXTB2L.js";
-import "../chunk-L3W2JWBA.js";
-import "../chunk-HI6YB7XP.js";
-import "../chunk-23DNVNFP.js";
-import "../chunk-7PYXS2QU.js";
-import "../chunk-GRL73YPF.js";
-import "../chunk-DJEO3F2H.js";
-import "../chunk-YN3SWF53.js";
-import "../chunk-4HWOYYY7.js";
-import "../chunk-TSIU7DME.js";
-import "../chunk-JOEA52NR.js";
-import {
-  awaitUnderSpinner
-} from "../chunk-VRXX4D6K.js";
-import "../chunk-3DIDV6H3.js";
-import "../chunk-XQHZPINL.js";
-import "../chunk-JPMV4E4E.js";
-import "../chunk-LFUJCRCT.js";
-import "../chunk-WTJ3AY33.js";
-import "../chunk-SLBL3WIP.js";
+} from "../chunk-6HNXYYVF.js";
 import {
   fetchSeedConfig
-} from "../chunk-ZUGH4MQG.js";
+} from "../chunk-OYJQUA3D.js";
 import {
   promptConfirm
 } from "../chunk-4AAOOAIN.js";
 import "../chunk-OZXAJNLA.js";
 import {
   hostCompileNotices
-} from "../chunk-27AVGFXH.js";
+} from "../chunk-F5EBEATU.js";
 import {
-  applyMigratedGlobalSources,
   compileAgentsAllScopes,
   compileProjectScope,
   detectProject,
   loadSource,
   movedGlobalAgentInputs,
-  mutateGlobal,
   sayCapturedWarnings,
   writeProjectConfig
-} from "../chunk-5JUQKGCP.js";
+} from "../chunk-7RDMTR64.js";
 import {
   copyLocalSkills,
   discoverInstalledSkills,
   removeCompiledAgents,
   uninstallPluginSkills
-} from "../chunk-TW35AEB4.js";
+} from "../chunk-F2BHT5C4.js";
 import {
   loadAgentDefs
-} from "../chunk-GE7NUPMI.js";
-import "../chunk-JIBCVXXL.js";
-import "../chunk-3LZNY46H.js";
-import "../chunk-4UKMQUAU.js";
-import "../chunk-JFLVEFFP.js";
+} from "../chunk-HED2DAXZ.js";
+import "../chunk-3G7X2WKI.js";
+import "../chunk-BMRUNMPV.js";
 import {
   formatScopeTag
-} from "../chunk-WNLF5EDZ.js";
+} from "../chunk-NIHUOWE4.js";
+import "../chunk-JFLVEFFP.js";
 import {
   providerFlag,
   providerNamedBy,
   refuseAnAmbiguousInstallation
-} from "../chunk-HR7TK2XW.js";
+} from "../chunk-RIPSGNLU.js";
 import {
   BaseCommand,
   EXIT_CODES,
   carriedSkillsThatDiffer,
   registerExternalSkills,
   writeExternalSkills
-} from "../chunk-H4ZKGGTE.js";
-import "../chunk-VVRI35SK.js";
-import "../chunk-CMJBKQUH.js";
+} from "../chunk-V3KTSP3Q.js";
+import "../chunk-CLPUWOSA.js";
 import {
   ERROR_MESSAGES,
   INCOMPLETE_WORK_RECOVERY,
@@ -116,53 +87,45 @@ import {
   carriedSkillsWritten,
   deleteLocalSkill,
   detectMigrations,
-  discoverAllPluginSkills,
+  editorSkillMetadataUnusableError,
   ejectCopyFailureError,
   executeMigration,
-  foldLocalSkillIntoGlobal,
   getErrorMessage,
   holdsItsOwnInstallation,
   hostAt,
   isHomeDirectory,
   keptAsInstalledGlobally,
   keptUnassigned,
+  loadProjectConfig,
   localSkillsCopied,
   migrateLocalSkillScope,
   nothingInstalledToApplyTo,
-  plural,
   projectCopyRemoved,
   providerInUse,
   recompileSummary,
   resolveInstallPaths,
-  seedToWizardResult,
+  seedToInstallSelection,
   sharedConfigDestinations,
   sharedConfigNeedsTerminal,
   skippedUnknownAgents,
   skippedUnknownSkills,
-  unplaceableKept,
-  unresolvedSkillRemovalReasons,
-  wizardNeedsTerminal
-} from "../chunk-C2UISKIM.js";
+  unplaceableKept
+} from "../chunk-MQ6CGZNJ.js";
 import {
   getSkillById,
-  getSkillDisplayName,
-  matrix,
-  typedKeys
-} from "../chunk-NU2K5G54.js";
+  getSkillDisplayName
+} from "../chunk-52HDHJ7I.js";
 import {
   CLI_COLORS,
   CLI_INVOKE_COMMAND,
-  EDIT_PROJECT_SETUP_FLAG,
-  EDIT_PROJECT_SETUP_MARKETPLACE_FLAG,
   EJECT_SOURCE,
-  activeAgentNames,
   activeAgentScopeMap,
   editorConfigUrl,
   formatSourceDisplayName,
   isActiveAt,
   isGlobalTombstone
-} from "../chunk-AG3ZVM3B.js";
-import "../chunk-OI2H6M5I.js";
+} from "../chunk-PJWGTNOX.js";
+import "../chunk-NQW25DCF.js";
 
 // src/cli/commands/edit.tsx
 import path from "path";
@@ -200,13 +163,9 @@ function scopeArrow(change) {
 function formatValueChangeLine(subject, change, kind) {
   return chalk.hex(CLI_COLORS.WARNING)(`  ~ ${subject}`) + chalk.hex(CLI_COLORS.NEUTRAL)(` (${kind}: ${change.from} \u2192 ${change.to})`);
 }
-function loadedSourceLabel(sourceResult) {
-  return sourceResult.marketplace ?? sourceResult.sourceConfig.source;
-}
-function resolveEditRoot(installation, cwd, setupRequested) {
-  const dir = setupRequested ? cwd : installation.projectDir;
-  const isGlobal = isHomeDirectory(dir);
-  return { dir, isGlobal, isProjectSetup: setupRequested && !isGlobal };
+function resolveEditRoot(installation) {
+  const dir = installation.projectDir;
+  return { dir, isGlobal: isHomeDirectory(dir) };
 }
 function sharedConfigPlan(changes, kept) {
   const dropped = droppedProjectHalves(changes);
@@ -228,12 +187,11 @@ function removalSections(skills, agents) {
   ].filter((section) => section.items.length > 0);
 }
 function droppedProjectHalves(changes) {
-  const droppedSkills = changes.collapsedPairs.filter((pair) => !pair.folded);
   const droppedAgents = [...changes.agentScopeChanges].filter(
     ([name, change]) => change.to === "global" && changes.dualScopeAgentTransitions.has(name)
   );
   return {
-    skillIds: droppedSkills.map(({ projectHalf }) => projectHalf.id),
+    skillIds: changes.collapsedPairs.map(({ projectHalf }) => projectHalf.id),
     agentNames: droppedAgents.map(([name]) => name)
   };
 }
@@ -241,13 +199,11 @@ function planHeading(sections) {
   if (sections.length === 0) return SHARED_CONFIG_APPLY.NOTHING_REMOVED;
   return SHARED_CONFIG_APPLY.PREVIEW_HEADING;
 }
-function compilesGlobalScope(producer, editRoot, written) {
-  if (editRoot.isGlobal || producer === "wizard") return true;
-  return movedGlobalAgentInputs(written);
+function compilesGlobalScope(editRoot, written) {
+  return editRoot.isGlobal || movedGlobalAgentInputs(written);
 }
 function withReassignments(changes, result, installedStack, editRoot) {
   const { assignedStack } = result;
-  if (assignedStack === void 0) return { ...changes, reassignedAgents: [] };
   const ownedHere = (agent) => editRoot.isGlobal || isActiveAt(agent, "project");
   const countedAsAdded = (agent) => changes.addedAgents.includes(agent.name);
   const rowsMoved = (agent) => !sameAssignments(assignedStack[agent.name], installedStack?.[agent.name]);
@@ -303,41 +259,31 @@ function applyAuthority(editRoot) {
   return editRoot.isGlobal ? "all" : "owned";
 }
 var Edit = class _Edit extends BaseCommand {
-  static summary = "Edit skills in the plugin";
-  static description = "Modify the currently installed skills via interactive wizard";
+  static summary = "Open this installation in the editor, or apply a configuration with --from";
+  static description = "Open this installation in agentsinc.sh/editor, or apply a configuration built there with --from";
   static examples = [
     {
-      description: "Open the edit wizard",
+      description: "Open this installation in the editor",
       command: "<%= config.bin %> <%= command.id %>"
     },
-    {
-      description: "Open this installation in the editor instead of the wizard",
-      command: "<%= config.bin %> <%= command.id %> --ui"
-    },
     {
       description: "Apply a configuration built in the editor, by its id",
       command: "<%= config.bin %> <%= command.id %> --from <id>"
+    },
+    {
+      description: "Look at a shared configuration without applying it",
+      command: "<%= config.bin %> <%= command.id %> --ui --from <id>"
     }
   ];
   static flags = {
     ui: Flags.boolean({
-      description: "Open agentsinc.sh/editor instead of the wizard \u2014 the id --from names, or this installation",
+      description: "Open agentsinc.sh/editor on this installation, or on the id --from names without applying it \u2014 what a bare edit does",
       default: false
     }),
     from: Flags.string({
       description: "Apply a configuration shared from agentsinc.sh by its id, removing whatever it leaves out \u2014 from a project, only the project's own entries",
       helpValue: "<id>"
     }),
-    [EDIT_PROJECT_SETUP_FLAG]: Flags.boolean({
-      description: "Internal: this run continues an `init` project setup",
-      default: false,
-      hidden: true
-    }),
-    [EDIT_PROJECT_SETUP_MARKETPLACE_FLAG]: Flags.string({
-      description: "Internal: the marketplace `init --marketplace` named for that project setup",
-      hidden: true,
-      dependsOn: [EDIT_PROJECT_SETUP_FLAG]
-    }),
     provider: providerFlag()
   };
   /** The exit code is decided once, after every path through `applyEdit`. */
@@ -357,17 +303,16 @@ var Edit = class _Edit extends BaseCommand {
     );
     await this.ensureConfigReadable(cwd);
     await this.refuseUnofferablePlacements(cwd);
-    if (flags.ui) return this.openInEditor(cwd);
-    const payload = flags.from === void 0 ? null : await this.fetchSharedConfigOrFail(flags.from);
-    const context = await this.loadContextUnderSpinner(flags[EDIT_PROJECT_SETUP_MARKETPLACE_FLAG]);
-    const editRoot = resolveEditRoot(context.installation, cwd, flags[EDIT_PROJECT_SETUP_FLAG]);
+    if (flags.from === void 0) return this.openInEditor(cwd);
+    const payload = await this.fetchSharedConfigOrFail(flags.from);
+    const context = await this.loadContextUnderSpinner();
+    const editRoot = resolveEditRoot(context.installation);
     await this.ensureSavedSkillsReadable(
       context.projectConfig?.skills ?? [],
       context.sourceResult.matrix,
-      context.projectDir
+      editRoot.dir
     );
-    const selection = payload ? await this.selectionFromSharedConfig(payload, context, editRoot) : await this.selectionFromWizard(context, editRoot);
-    if (!selection) this.error("Cancelled", { exit: EXIT_CODES.CANCELLED });
+    const selection = await this.selectionFromSharedConfig(payload, context, editRoot);
     const { result } = selection;
     this.reportValidationErrors(result.validation);
     const activeNewSkills = result.skills.filter((s) => !s.excluded);
@@ -380,18 +325,21 @@ var Edit = class _Edit extends BaseCommand {
       agentConfigs: activeNewAgents
     };
     const filteredOldConfig = context.projectConfig ? { ...context.projectConfig, skills: activeOldSkills, agents: activeOldAgents } : null;
-    const planned = withReassignments(
-      detectConfigChanges(filteredOldConfig, filteredResult, {
-        newSkills: result.skills,
-        oldSkills: context.projectConfig?.skills ?? [],
-        newAgents: result.agentConfigs,
-        oldAgents: context.projectConfig?.agents ?? []
-      }),
-      filteredResult,
-      context.projectConfig?.stack,
-      editRoot
-    );
-    const rewritten = selection.producer === "shared" ? await this.confirmAndWriteCarried(selection, planned, filteredResult) : [];
+    const planned = {
+      ...withReassignments(
+        detectConfigChanges(filteredOldConfig, filteredResult, {
+          newSkills: result.skills,
+          oldSkills: context.projectConfig?.skills ?? [],
+          newAgents: result.agentConfigs,
+          oldAgents: context.projectConfig?.agents ?? []
+        }),
+        filteredResult,
+        context.projectConfig?.stack,
+        editRoot
+      ),
+      joinedGlobalAgents: selection.joinedGlobalAgents
+    };
+    const rewritten = await this.confirmAndWriteCarried(selection, planned, filteredResult);
     const changes = {
       ...planned,
       rewrittenSkills: difference(rewritten, planned.addedSkills)
@@ -399,24 +347,9 @@ var Edit = class _Edit extends BaseCommand {
     const authority = applyAuthority(editRoot);
     if (!hasAnyChanges(changes)) {
       this.log(chalk.hex(CLI_COLORS.NEUTRAL)("No changes made."));
-      if (!editRoot.isProjectSetup) return;
-      await this.writeConfigAndCompile(result, context, editRoot, authority, selection.producer);
-      await this.reportWhatThisHostCannotCarry(editRoot);
-      this.logCompletionSummary(changes);
       return;
     }
-    const removalReasons = await unresolvedSkillRemovalReasons(
-      result.unresolvableSkillIds,
-      activeOldSkills,
-      context.projectDir,
-      loadedSourceLabel(context.sourceResult)
-    );
-    this.logChangeSummary(
-      changes,
-      filteredResult.skills,
-      filteredOldConfig?.skills ?? [],
-      removalReasons
-    );
+    this.logChangeSummary(changes, filteredResult.skills, filteredOldConfig?.skills ?? []);
     const migratedSkillIds = await this.applyMigrations(
       changes,
       filteredResult,
@@ -424,31 +357,17 @@ var Edit = class _Edit extends BaseCommand {
       context,
       editRoot
     );
-    await this.recordGlobalSourceMigrations(
-      migratedSkillIds,
-      filteredResult.skills,
-      editRoot,
-      context
-    );
     await this.applyScopeChanges(changes, filteredResult, context, editRoot);
-    await this.applyCollapsedPairs(changes, filteredResult, context, editRoot);
+    await this.applyCollapsedPairs(changes, context, editRoot);
     await this.applySourceChanges(changes, activeOldSkills, editRoot, migratedSkillIds);
     await this.applyPluginChanges(changes, filteredResult, activeOldSkills, context, editRoot);
     await this.copyNewLocalSkills(changes, filteredResult, context, editRoot);
     await this.removeDeletedLocalSkills(changes, activeOldSkills, editRoot);
-    await this.writeConfigAndCompile(result, context, editRoot, authority, selection.producer);
+    await this.writeConfigAndCompile(result, context, editRoot, authority);
     await this.cleanupStaleAgentFiles(changes, activeOldAgents, editRoot);
     await this.reportWhatThisHostCannotCarry(editRoot);
     this.logCompletionSummary(changes);
   }
-  async selectionFromWizard(context, editRoot) {
-    if (!process.stdin.isTTY) {
-      this.error(wizardNeedsTerminal("edit"), { exit: EXIT_CODES.ERROR });
-    }
-    const result = await this.runEditWizard(context, editRoot);
-    if (!result) return null;
-    return { producer: "wizard", result };
-  }
   /**
    * A shared configuration applies destructively, except for a skill written here (`forkedFrom`)
    * and an id this catalogue cannot place — both disclosed in the confirm. From a project the
@@ -487,14 +406,15 @@ var Edit = class _Edit extends BaseCommand {
     if (skippedSkillIds.length > 0) this.warn(skippedUnknownSkills(skippedSkillIds));
     if (skippedAgentNames.length > 0) this.warn(skippedUnknownAgents(skippedAgentNames));
     return {
-      producer: "shared",
       result: held.result,
       kept: [
         ...keptStatements(reconciled.kept),
         ...unassignedStatement(reconciled.unassigned),
+        ...joinedStatement(held),
         ...keptAsInstalledStatement(held, revisedGlobally)
       ],
-      carried: arrivingCarried
+      carried: arrivingCarried,
+      joinedGlobalAgents: held.joined.map(({ agentName }) => agentName)
     };
   }
   /** Best-effort: an unreadable directory protects nothing and must not fail an apply. */
@@ -524,7 +444,7 @@ var Edit = class _Edit extends BaseCommand {
   }
   decodeSeedOrFail(payload, sourceMatrix) {
     try {
-      return seedToWizardResult(payload, sourceMatrix);
+      return seedToInstallSelection(payload, sourceMatrix);
     } catch (error) {
       this.handleError(error);
     }
@@ -580,6 +500,7 @@ var Edit = class _Edit extends BaseCommand {
    * nothing on disk.
    */
   async openInEditor(projectDir) {
+    await this.ensureInstalledSkillsReadable(projectDir);
     const prepared = await seedPayloadForInstallation(projectDir);
     if (!prepared.ok) {
       this.error(prepared.error, { exit: EXIT_CODES.ERROR });
@@ -591,6 +512,20 @@ var Edit = class _Edit extends BaseCommand {
     }
     await this.handToBrowser(published.id);
   }
+  /**
+   * The payload reads every ejected skill's metadata.yaml for its provenance, and no catalogue is
+   * loaded here to resolve a skill around it, so every installed entry is asked about — not only
+   * those a catalogue lacks, as `edit --from` asks. The config read is the one the payload reads.
+   */
+  async ensureInstalledSkillsReadable(projectDir) {
+    const loaded = await loadProjectConfig(projectDir);
+    if (!loaded) return;
+    await this.refuseUnusableSavedSkillMetadata(
+      loaded.config.skills,
+      projectDir,
+      editorSkillMetadataUnusableError
+    );
+  }
   /** Opens an id rather than applying it; `--from` without `--ui` is the destructive apply. */
   async openSharedInEditor(id, cwd) {
     const url = editorConfigUrl(id);
@@ -610,13 +545,10 @@ var Edit = class _Edit extends BaseCommand {
     const opened = await openUrl(editorConfigUrl(id));
     if (!opened.ok) this.warn(opened.error);
   }
-  async loadContextUnderSpinner(setupMarketplace) {
-    return awaitUnderSpinner(
-      STATUS_MESSAGES.LOADING_SKILLS,
-      () => this.loadContext(setupMarketplace)
-    );
+  async loadContextUnderSpinner() {
+    return awaitUnderSpinner(STATUS_MESSAGES.LOADING_SKILLS, () => this.loadContext());
   }
-  async loadContext(setupMarketplace) {
+  async loadContext() {
     const detected = await detectProject();
     if (!detected) {
       this.error(ERROR_MESSAGES.NO_INSTALLATION, {
@@ -624,113 +556,17 @@ var Edit = class _Edit extends BaseCommand {
       });
     }
     const { installation, config: projectConfig } = detected;
-    const projectDir = installation.projectDir;
-    let sourceResult;
-    let startupMessages = [];
     try {
-      const loaded = await loadSource({
-        projectDir,
-        ...setupMarketplace !== void 0 && { sourceFlag: setupMarketplace },
+      const { sourceResult, startupMessages } = await loadSource({
+        projectDir: installation.projectDir,
         captureStartupMessages: true
       });
-      sourceResult = loaded.sourceResult;
-      startupMessages = loaded.startupMessages;
-      const sourceInfo = sourceResult.isLocal ? "local" : sourceResult.sourceConfig.sourceOrigin;
-      startupMessages.push({
-        level: "info",
-        text: `Loaded ${plural(Object.keys(matrix.skills).length, "skill")} (${sourceInfo})`
-      });
+      return { installation, projectConfig, sourceResult, startupMessages };
     } catch (error) {
       this.handleError(error);
     }
-    let currentSkillIds;
-    try {
-      const discoveredSkills = await discoverAllPluginSkills(projectDir);
-      const pluginSkillIds = typedKeys(discoveredSkills);
-      const excludedConfigIds = new Set(
-        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];
-      startupMessages.push({
-        level: "info",
-        text: `Found ${plural(currentSkillIds.length, "installed skill")}`
-      });
-    } catch (error) {
-      this.handleError(error);
-    }
-    return {
-      installation,
-      projectConfig,
-      projectDir,
-      sourceResult,
-      startupMessages,
-      currentSkillIds,
-      ...setupMarketplace !== void 0 && sourceResult.marketplace !== void 0 && { setupMarketplace: sourceResult.marketplace }
-    };
   }
-  async runEditWizard(context, editRoot) {
-    const { projectConfig, currentSkillIds } = context;
-    const selectedAgents = projectConfig?.agents && activeAgentNames(projectConfig.agents);
-    return runWizardSession({
-      hydrate: {
-        initialStep: "build",
-        ...projectConfig?.selectedDomains !== void 0 && {
-          initialDomains: projectConfig.selectedDomains
-        },
-        ...selectedAgents !== void 0 && { initialAgents: selectedAgents },
-        installedSkillIds: currentSkillIds,
-        ...projectConfig?.skills !== void 0 && { installedSkillConfigs: projectConfig.skills },
-        ...projectConfig?.agents !== void 0 && { installedAgentConfigs: projectConfig.agents },
-        isEditingFromGlobalScope: editRoot.isGlobal,
-        ...context.setupMarketplace !== void 0 && {
-          setupMarketplace: context.setupMarketplace
-        }
-      },
-      props: {
-        version: this.config.version,
-        initialAgents: selectedAgents,
-        installedSkillIds: currentSkillIds,
-        startupMessages: context.startupMessages
-      },
-      onCancel: () => this.log("\nEdit cancelled"),
-      clearTerminal: () => this.clearTerminal()
-    });
-  }
-  /**
-   * Records in the GLOBAL config the install-mode migrations this run already performed under
-   * `$HOME`, and only their `origin`: `executeMigration` resolves paths from each skill's own
-   * scope, so leaving the record alone would contradict the disk and the plugin registry. The
-   * reachable case is a mode change on a `[P][G]` pair's project half, carried to global by `s`.
-   * Runs before `writeConfigAndCompile`, through the gate so every other project is refreshed.
-   */
-  async recordGlobalSourceMigrations(migratedSkillIds, newSkills, editRoot, context) {
-    if (editRoot.isGlobal) return;
-    const migratedSources = new Map(
-      newSkills.filter((s) => migratedSkillIds.has(s.id) && isActiveAt(s, "global")).map((s) => [s.id, s.origin])
-    );
-    if (migratedSources.size === 0) return;
-    try {
-      const report = await mutateGlobal(
-        { kind: "migrate-skill-sources", sources: migratedSources },
-        {
-          // config-gate/deps.ts declares `loadMatrix` async; the matrix is already in hand.
-          // eslint-disable-next-line @typescript-eslint/require-await -- deps contract
-          loadMatrix: async () => context.sourceResult.matrix,
-          loadAgents: async () => (await loadAgentDefs()).agents
-        }
-      );
-      this.reportFanOut(report);
-    } catch (error) {
-      this.reportIncompleteWork(
-        `Could not record global origin change: ${getErrorMessage(error)}`,
-        INCOMPLETE_WORK_RECOVERY.INSPECT_INSTALLATION
-      );
-    }
-  }
-  logChangeSummary(changes, newSkills, oldSkills, removalReasons) {
+  logChangeSummary(changes, newSkills, oldSkills) {
     const {
       addedSkills,
       removedSkills,
@@ -743,6 +579,7 @@ var Edit = class _Edit extends BaseCommand {
       dualScopeAgentTransitions,
       tuningChanges,
       reassignedAgents,
+      joinedGlobalAgents,
       rewrittenSkills
     } = changes;
     this.log(`
@@ -757,10 +594,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     for (const skillId of removedSkills) {
       const scope = oldSkills.find((s) => s.id === skillId)?.scope;
       const scopeLabel = scope ? ` ${formatScopeTag(scope)}` : "";
-      const reason = removalReasons.get(skillId);
-      this.log(
-        chalk.hex(CLI_COLORS.ERROR)(`  - ${getSkillDisplayName(skillId)}${scopeLabel}`) + (reason ? chalk.hex(CLI_COLORS.NEUTRAL)(` (${reason})`) : "")
-      );
+      this.log(chalk.hex(CLI_COLORS.ERROR)(`  - ${getSkillDisplayName(skillId)}${scopeLabel}`));
     }
     for (const agentName of addedAgents) {
       this.log(
@@ -794,6 +628,11 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
         chalk.hex(CLI_COLORS.WARNING)(`  ~ ${agentName}`) + chalk.hex(CLI_COLORS.NEUTRAL)(" (agent: skills reassigned)")
       );
     }
+    for (const agentName of joinedGlobalAgents) {
+      this.log(
+        chalk.hex(CLI_COLORS.WARNING)(`  ~ ${agentName}`) + chalk.hex(CLI_COLORS.NEUTRAL)(` ${formatScopeTag("global")} (agent: skills added)`)
+      );
+    }
     for (const skillId of rewrittenSkills) {
       this.log(
         chalk.hex(CLI_COLORS.WARNING)(`  ~ ${getSkillDisplayName(skillId)}`) + chalk.hex(CLI_COLORS.NEUTRAL)(" (skill: files rewritten)")
@@ -856,7 +695,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     this.log(chalk.hex(CLI_COLORS.NEUTRAL)(`Switching ${count} skill(s) to ${modeDescription}`));
   }
   /**
-   * A collapsed `[P][G]` pair is not a move: its project half is dropped or folded
+   * A collapsed `[P][G]` pair is not a move: its project half is dropped
    * ({@link applyCollapsedPairs}).
    */
   async applyScopeChanges(changes, filteredResult, context, editRoot) {
@@ -891,22 +730,14 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     }
   }
   /**
-   * A Local half `s` folded into a Local global install moves there, replacing the global copy.
-   * Every other half is removed at project scope only. The global install's mode is
+   * Each project half is removed at project scope only. The global install's mode is
    * {@link applyMigrations}' to change. The uninstall is diagnostic, as every one here is.
    */
-  async applyCollapsedPairs(changes, filteredResult, context, editRoot) {
-    const [foldedCopies, removedPairs] = partition(
-      changes.collapsedPairs,
-      (pair) => foldsItsCopyIntoGlobal(pair, filteredResult.skills)
-    );
+  async applyCollapsedPairs(changes, context, editRoot) {
     const [ejectedHalves, pluginHalves] = partition(
-      removedPairs.map(({ projectHalf }) => projectHalf),
+      changes.collapsedPairs.map(({ projectHalf }) => projectHalf),
       (half) => half.origin === EJECT_SOURCE
     );
-    for (const { projectHalf } of foldedCopies) {
-      await foldLocalSkillIntoGlobal(editRoot.dir, projectHalf.id);
-    }
     for (const half of ejectedHalves) {
       await deleteLocalSkill(editRoot.dir, half.id, half.scope);
     }
@@ -1012,7 +843,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       await deleteLocalSkill(editRoot.dir, skillId, oldSkill.scope);
     }
   }
-  async writeConfigAndCompile(result, context, editRoot, authority, producer) {
+  async writeConfigAndCompile(result, context, editRoot, authority) {
     let agentDefsResult;
     try {
       agentDefsResult = await loadAgentDefs();
@@ -1022,7 +853,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     let configResult;
     try {
       configResult = await writeProjectConfig({
-        wizardResult: result,
+        selection: result,
         sourceResult: context.sourceResult,
         projectDir: editRoot.dir,
         agentDefs: agentDefsResult,
@@ -1037,7 +868,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     try {
       const agentScopeMap = activeAgentScopeMap(result.agentConfigs);
       const { allSkills } = await discoverInstalledSkills(editRoot.dir);
-      const compile = compilesGlobalScope(producer, editRoot, configResult.propagation) ? compileAgentsAllScopes : compileProjectScope;
+      const compile = compilesGlobalScope(editRoot, configResult.propagation) ? compileAgentsAllScopes : compileProjectScope;
       const compilationResult = await compile({
         projectDir: editRoot.dir,
         sourcePath: agentDefsResult.sourcePath,
@@ -1102,21 +933,21 @@ ${chalk.hex(CLI_COLORS.SUCCESS)("\u2713 Done")}
 `);
   }
 };
-function detectConfigChanges(oldConfig, wizardResult, fullEntries) {
+function detectConfigChanges(oldConfig, selection, fullEntries) {
   const oldSkillIds = oldConfig?.skills.map((s) => s.id) ?? [];
-  const newSkillIds = wizardResult.skills.map((s) => s.id);
+  const newSkillIds = selection.skills.map((s) => s.id);
   const oldAgentNames = oldConfig?.agents.map((a) => a.name) ?? [];
-  const newAgentNames = wizardResult.agentConfigs.map((a) => a.name);
+  const newAgentNames = selection.agentConfigs.map((a) => a.name);
   const oldSkillsById = indexBy(oldConfig?.skills ?? [], (s) => s.id);
   const oldAgentsByName = indexBy(oldConfig?.agents ?? [], (a) => a.name);
   const scopeChanges = detectPropertyChanges(
-    wizardResult.skills,
+    selection.skills,
     oldSkillsById,
     (s) => s.id,
     (s) => s.scope
   );
   const agentScopeChanges = detectPropertyChanges(
-    wizardResult.agentConfigs,
+    selection.agentConfigs,
     oldAgentsByName,
     (a) => a.name,
     (a) => a.scope
@@ -1130,8 +961,7 @@ function detectConfigChanges(oldConfig, wizardResult, fullEntries) {
   const collapsedPairs = collapsedPairsOf(
     scopeChanges,
     dualScopeSkillTransitions,
-    fullEntries?.oldSkills ?? [],
-    wizardResult.foldedSkillIds ?? []
+    fullEntries?.oldSkills ?? []
   );
   return {
     addedSkills: difference(newSkillIds, oldSkillIds),
@@ -1139,7 +969,7 @@ function detectConfigChanges(oldConfig, wizardResult, fullEntries) {
     addedAgents: difference(newAgentNames, oldAgentNames),
     removedAgents: difference(oldAgentNames, newAgentNames),
     sourceChanges: detectPropertyChanges(
-      wizardResult.skills,
+      selection.skills,
       indexBy(withMaskedGlobalsRestored(oldConfig?.skills ?? [], collapsedPairs), (s) => s.id),
       (s) => s.id,
       (s) => s.origin
@@ -1155,7 +985,7 @@ function detectConfigChanges(oldConfig, wizardResult, fullEntries) {
       (a) => a.name
     ),
     tuningChanges: detectPropertyChanges(
-      wizardResult.agentConfigs,
+      selection.agentConfigs,
       oldAgentsByName,
       (a) => a.name,
       describeTuning
@@ -1194,20 +1024,12 @@ function detectDualScopeTransitions(scopeChanges, fullNew, fullOld, getKey) {
   }
   return result;
 }
-function collapsedPairsOf(scopeChanges, dualScopeSkillTransitions, fullOldSkills, foldedSkillIds) {
+function collapsedPairsOf(scopeChanges, dualScopeSkillTransitions, fullOldSkills) {
   return [...scopeChanges].filter(([id, change]) => change.to === "global" && dualScopeSkillTransitions.has(id)).map(([id]) => ({
     projectHalf: oldHalfOf(fullOldSkills, id, (skill) => isActiveAt(skill, "project")),
-    maskedGlobal: oldHalfOf(fullOldSkills, id, isGlobalTombstone),
-    folded: foldedSkillIds.includes(id)
+    maskedGlobal: oldHalfOf(fullOldSkills, id, isGlobalTombstone)
   }));
 }
-function foldsItsCopyIntoGlobal(pair, newSkills) {
-  const { projectHalf, folded } = pair;
-  const globalEntry = newSkills.find(
-    (skill) => skill.id === projectHalf.id && isActiveAt(skill, "global")
-  );
-  return folded && projectHalf.origin === EJECT_SOURCE && globalEntry?.origin === EJECT_SOURCE;
-}
 function oldHalfOf(fullOldSkills, id, isHalf) {
   const half = fullOldSkills.find((skill) => skill.id === id && isHalf(skill));
   if (half === void 0) {
@@ -1253,7 +1075,7 @@ function planStaleAgentRemovals(changes, oldAgents, editRoot) {
   return STALE_AGENT_SCOPES.map(removalAtScope).filter((removal) => removal.agents.length > 0);
 }
 function hasAnyChanges(changes) {
-  return changes.reassignedAgents.length > 0 || changes.rewrittenSkills.length > 0 || 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 || changes.tuningChanges.size > 0;
+  return changes.reassignedAgents.length > 0 || changes.joinedGlobalAgents.length > 0 || changes.rewrittenSkills.length > 0 || 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 || changes.tuningChanges.size > 0;
 }
 async function migratePluginSkillScopes(scopeChanges, skills, marketplace, projectDir) {
   const host = hostAt(projectDir);
@@ -1278,7 +1100,6 @@ async function migratePluginSkillScopes(scopeChanges, skills, marketplace, proje
   return { migrated, failed };
 }
 export {
-  applyMigratedGlobalSources,
   Edit as default,
   detectConfigChanges,
   migratePluginSkillScopes