agents-inc 0.172.0 → 0.174.0

package/dist/commands/edit.js

@@ -6,16 +6,16 @@ import {
   editorPayloadForInstallation,
   publishSeedConfig,
   skillsAuthoredHere
-} from "../chunk-6LUTY35Q.js";
+} from "../chunk-3PJZ4QNJ.js";
 import {
   unofferablePlacementsFound
-} from "../chunk-MOL2J5HS.js";
+} from "../chunk-ECPFYHDX.js";
 import {
   openUrl
-} from "../chunk-5PPB6HT6.js";
+} from "../chunk-TVEDNGVP.js";
 import {
   fetchSeedConfig
-} from "../chunk-A3ZAXL5T.js";
+} from "../chunk-QCX66KBM.js";
 import {
   Confirm
 } from "../chunk-OZXAJNLA.js";
@@ -24,11 +24,10 @@ import {
 } from "../chunk-P6CYS4JK.js";
 import {
   summaryPanelBlock
-} from "../chunk-33JICQD5.js";
-import "../chunk-N33AKFLR.js";
+} from "../chunk-H5E6IO2L.js";
 import {
   hostCompileNotices
-} from "../chunk-255DGUCH.js";
+} from "../chunk-6PGXTLA4.js";
 import {
   compileAgentsAllScopes,
   compileProjectScope,
@@ -38,29 +37,29 @@ import {
   projectsAFanOutReaches,
   sayCapturedWarnings,
   writeProjectConfig
-} from "../chunk-6CRA46YO.js";
+} from "../chunk-R7GKQBZJ.js";
 import {
   copyLocalSkills,
   discoverInstalledSkills,
   removeCompiledAgents,
   uninstallPluginSkills
-} from "../chunk-Y23MP2OC.js";
+} from "../chunk-REHVGFJE.js";
 import {
   loadAgentDefs
-} from "../chunk-KCLBLK3F.js";
-import "../chunk-NISWBQNS.js";
-import "../chunk-LUKDDHSI.js";
+} from "../chunk-7BHDKEGK.js";
+import "../chunk-IXVGBUWI.js";
+import "../chunk-EFXVYQGT.js";
 import "../chunk-KIK5EZYD.js";
 import {
   agentChangesAmong,
   formatScopeTag
-} from "../chunk-G7NUK3BF.js";
+} from "../chunk-FQF6VHO3.js";
 import {
   installationToName,
   providerFlag,
   providerNamedBy,
   refuseAnAmbiguousInstallation
-} from "../chunk-MBIOZ5LW.js";
+} from "../chunk-ORO2T4K2.js";
 import {
   BaseCommand,
   EXIT_CODES,
@@ -74,7 +73,7 @@ import {
   restoreInstalledGlobal,
   sameAssignments,
   writeExternalSkills
-} from "../chunk-7ZOWSCAO.js";
+} from "../chunk-IAQFZFWD.js";
 import {
   ERROR_MESSAGES,
   INCOMPLETE_WORK_RECOVERY,
@@ -115,14 +114,16 @@ import {
   seedToInstallSelection,
   sharedConfigDestinations,
   sharedConfigNeedsTerminal,
+  stoppingOnARefusal,
   subAgentChanged,
   unplaceableKept
-} from "../chunk-VILFCMRN.js";
+} from "../chunk-E45IT3HC.js";
 import {
   getSkillById,
   getSkillDisplayName,
+  getSkillEntryDisplayName,
   inertLine
-} from "../chunk-7OG635DK.js";
+} from "../chunk-AIBVAYHS.js";
 import {
   CLI_COLORS,
   CLI_INVOKE_COMMAND,
@@ -133,7 +134,7 @@ import {
   formatSourceDisplayName,
   isActiveAt,
   isGlobalTombstone
-} from "../chunk-MHAQWMNJ.js";
+} from "../chunk-WUSEZFER.js";
 import "../chunk-GHHJYNAN.js";
 
 // src/cli/commands/edit.tsx
@@ -182,17 +183,25 @@ function sourceChangeLine(skillId, change) {
   const to = formatSourceDisplayName(change.to);
   return changeLine("~", getSkillDisplayName(skillId), ` (${from} \u2192 ${to})`);
 }
+function removedSkillLine(skillId, oldSkills) {
+  const removed = installedEntryOf(skillId, oldSkills);
+  return changeLine("-", `${getSkillEntryDisplayName(removed)} ${formatScopeTag(removed.scope)}`);
+}
+function installedEntryOf(skillId, oldSkills) {
+  const entry = oldSkills.find((s) => s.id === skillId);
+  if (entry === void 0) throw new Error(`Removed skill '${skillId}' has no installed entry`);
+  return entry;
+}
 function scopeLabelOf(skillId, skills) {
   const skill = skills.find((s) => s.id === skillId);
   return skill === void 0 ? "" : ` ${formatScopeTag(skill.scope)}`;
 }
 function changeSummaryLines(changes, newSkills, oldSkills) {
   const addedSkill = (id) => changeLine("+", `${inertLine(getSkillById(id).displayName)}${scopeLabelOf(id, newSkills)}`);
-  const removedSkill = (id) => changeLine("-", `${getSkillDisplayName(id)}${scopeLabelOf(id, oldSkills)}`);
   const joinedGlobalDetail = ` ${formatScopeTag("global")} (agent: skills added)`;
   return [
     ...changes.addedSkills.map(addedSkill),
-    ...changes.removedSkills.map(removedSkill),
+    ...changes.removedSkills.map((id) => removedSkillLine(id, oldSkills)),
     ...changes.addedAgents.map((name) => changeLine("+", name, AGENT_DETAIL)),
     ...changes.removedAgents.map((name) => changeLine("-", name, AGENT_DETAIL)),
     ...[...changes.sourceChanges].map(([id, change]) => sourceChangeLine(id, change)),
@@ -238,7 +247,7 @@ function changedSubAgents(changes, { result, installedGlobal }, projectConfig) {
     ...changes.tuningChanges.keys(),
     ...changes.joinedGlobalAgents
   ]).filter((name) => !arrivingOrLeaving.has(name));
-  const after = { agents: result.agentConfigs, stack: result.assignedStack };
+  const after = { agents: result.agentConfigs, skills: result.skills, stack: result.assignedStack };
   if (installedGlobal === null) return agentChangesAmong(changed, projectConfig, after);
   const [heldGlobal, ownedHere] = partition(changed, (name) => isHeldGlobally(name, result));
   return [
@@ -444,8 +453,9 @@ var Edit = class _Edit extends BaseCommand {
   async applyApprovedChanges(changes, active, result, context, editRoot) {
     const { selection: activeSelection, oldSkills, oldAgents } = active;
     this.logChangeSummary(changes, activeSelection.skills, oldSkills);
-    await this.applyMigrations(changes, active, context, editRoot);
-    await this.applyScopeChanges(changes, activeSelection, context, editRoot);
+    const migrationPlan = migrationPlanOf(changes, active);
+    await this.applyMigrations(migrationPlan, context, editRoot);
+    await this.applyScopeChanges(migrationPlan.scopeChanges, context, editRoot);
     await this.applyCollapsedPairs(changes, context, editRoot);
     await this.applyPluginChanges(changes, activeSelection, oldSkills, context, editRoot);
     await this.copyNewLocalSkills(changes, activeSelection, context, editRoot);
@@ -675,10 +685,9 @@ var Edit = class _Edit extends BaseCommand {
     }
     const { installation, config: projectConfig } = detected;
     try {
-      const { sourceResult, startupMessages } = await loadSource({
-        projectDir: installation.projectDir,
-        captureStartupMessages: true
-      });
+      const { sourceResult, startupMessages } = await stoppingOnARefusal(
+        () => loadSource({ projectDir: installation.projectDir, captureStartupMessages: true })
+      );
       return { installation, projectConfig, sourceResult, startupMessages };
     } catch (error) {
       this.handleError(error);
@@ -692,8 +701,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     }
     this.log("");
   }
-  async applyMigrations(changes, active, context, editRoot) {
-    const migrationPlan = migrationPlanOf(changes, active);
+  async applyMigrations(migrationPlan, context, editRoot) {
     if (migrationPlan.toEject.length === 0 && migrationPlan.toPlugin.length === 0) return;
     this.announceMigrations(migrationPlan);
     if (migrationPlan.toPlugin.length > 0) {
@@ -765,21 +773,23 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     this.log(chalk.hex(CLI_COLORS.NEUTRAL)(installingBesideGlobalCopies(count)));
   }
   /**
-   * A collapsed `[P][G]` pair is not a move: its project half is dropped
-   * ({@link applyCollapsedPairs}).
+   * Only moves that keep their mode: a switch lands at its new scope ({@link applyMigrations}). A
+   * collapsed `[P][G]` pair is not a move: its project half is dropped ({@link applyCollapsedPairs}).
    */
-  async applyScopeChanges(changes, filteredResult, context, editRoot) {
-    const scopeChanges = scopeMovesOf(changes);
-    await moveEjectedSkillCopies(scopeChanges, filteredResult.skills, editRoot.dir);
-    if (!movesAPluginSkill(scopeChanges, filteredResult.skills)) return;
+  async applyScopeChanges(scopeMoves, context, editRoot) {
+    const [copyMoves, pluginMoves] = partition(
+      scopeMoves,
+      (move) => move.newSource === EJECT_SOURCE
+    );
+    await moveEjectedSkillCopies(copyMoves, editRoot.dir);
+    if (pluginMoves.length === 0) return;
     const marketplace = await this.requireMarketplaceOrExit(
       context.sourceResult,
       "migrate plugin skill scopes",
       hostAt(editRoot.dir)
     );
     const pluginScopeResult = await migratePluginSkillScopes(
-      scopeChanges,
-      filteredResult.skills,
+      pluginMoves,
       marketplace,
       editRoot.dir
     );
@@ -1135,20 +1145,11 @@ function scopeMovesOf(changes) {
   const collapsed = new Set(changes.collapsedPairs.map(({ projectHalf }) => projectHalf.id));
   return new Map([...changes.scopeChanges].filter(([id]) => !collapsed.has(id)));
 }
-async function moveEjectedSkillCopies(scopeMoves, skills, projectDir) {
-  for (const [skillId, change] of scopeMoves) {
-    const skillConfig = skills.find((s) => s.id === skillId);
-    if (skillConfig?.origin === EJECT_SOURCE) {
-      await migrateLocalSkillScope(skillId, change.from, projectDir);
-    }
+async function moveEjectedSkillCopies(copyMoves, projectDir) {
+  for (const move of copyMoves) {
+    await migrateLocalSkillScope(move.id, move.oldScope, projectDir);
   }
 }
-function movesAPluginSkill(scopeMoves, skills) {
-  return [...scopeMoves.keys()].some((skillId) => {
-    const skill = skills.find((s) => s.id === skillId);
-    return skill !== void 0 && skill.origin !== EJECT_SOURCE;
-  });
-}
 var STALE_AGENT_SCOPES = ["project", "global"];
 var UNRECORDED_AGENT_SCOPE = "project";
 function installedScope(name, oldAgents) {
@@ -1173,22 +1174,18 @@ function hasAnyChanges(changes) {
 function changesTheConfig(changes) {
   return changes.reassignedAgents.length > 0 || changes.joinedGlobalAgents.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) {
+async function migratePluginSkillScopes(pluginMoves, marketplace, projectDir) {
   const host = hostAt(projectDir);
   const failed = [];
-  for (const [skillId, change] of scopeChanges) {
-    const skillConfig = skills.find((s) => s.id === skillId);
-    if (!skillConfig || skillConfig.origin === EJECT_SOURCE) {
-      continue;
-    }
-    const pluginRef = buildMarketplacePluginRef(skillId, marketplace);
+  for (const move of pluginMoves) {
+    const pluginRef = buildMarketplacePluginRef(move.id, marketplace);
     try {
-      if (change.from === "project") {
+      if (move.oldScope === "project") {
         await host.uninstallPlugin(pluginRef, "project", projectDir);
       }
-      await host.installPlugin(pluginRef, change.to, projectDir);
+      await host.installPlugin(pluginRef, move.newScope, projectDir);
     } catch (error) {
-      failed.push({ id: skillId, error: getErrorMessage(error) });
+      failed.push({ id: move.id, error: getErrorMessage(error) });
     }
   }
   return { failed };