agents-inc 0.175.0 → 0.176.0

package/dist/commands/edit.js

@@ -6,16 +6,16 @@ import {
   editorPayloadForInstallation,
   publishSeedConfig,
   skillsAuthoredHere
-} from "../chunk-MFCZARV2.js";
+} from "../chunk-B7AVWSK2.js";
 import {
   unofferablePlacementsFound
-} from "../chunk-YLFKFVQP.js";
+} from "../chunk-ZBI6GFJD.js";
 import {
   openUrl
-} from "../chunk-P5XEK7HC.js";
+} from "../chunk-H6WUOW5F.js";
 import {
   fetchSeedConfig
-} from "../chunk-SRII2GMF.js";
+} from "../chunk-SN64WNWE.js";
 import {
   Confirm
 } from "../chunk-OZXAJNLA.js";
@@ -24,10 +24,10 @@ import {
 } from "../chunk-P6CYS4JK.js";
 import {
   summaryPanelBlock
-} from "../chunk-6HJVH27C.js";
+} from "../chunk-C2BSCEDN.js";
 import {
   hostCompileNotices
-} from "../chunk-EHEBN4NB.js";
+} from "../chunk-U672FZVC.js";
 import {
   compileAgentsAllScopes,
   compileProjectScope,
@@ -37,23 +37,22 @@ import {
   projectsAFanOutReaches,
   sayCapturedWarnings,
   writeProjectConfig
-} from "../chunk-SNXEYAFP.js";
+} from "../chunk-CKBWEWHZ.js";
 import {
   copyLocalSkills,
   discoverInstalledSkills,
+  pluginRefsOf,
   removeCompiledAgents,
+  removeUnderFirstNameHeld,
   uninstallPluginSkills
-} from "../chunk-Q4NWATGH.js";
+} from "../chunk-XMQIWPIR.js";
 import {
   loadAgentDefs
-} from "../chunk-DQB3E2SX.js";
-import "../chunk-SI2LLEIR.js";
-import "../chunk-GNMRXXRY.js";
+} from "../chunk-JNRACLNS.js";
+import "../chunk-EC3JXT23.js";
+import "../chunk-MQZNDK5F.js";
 import "../chunk-KIK5EZYD.js";
-import {
-  agentChangesAmong,
-  formatScopeTag
-} from "../chunk-ICHWAFAC.js";
+import "../chunk-5CFHP6Z5.js";
 import {
   BaseCommand,
   EXIT_CODES,
@@ -72,7 +71,12 @@ import {
   restoreInstalledGlobal,
   sameAssignments,
   writeExternalSkills
-} from "../chunk-37QFHJUW.js";
+} from "../chunk-JTMSFBCA.js";
+import {
+  agentChangesAmong,
+  formatScopeTag,
+  namedByActiveEntries
+} from "../chunk-FACDJH6O.js";
 import {
   ERROR_MESSAGES,
   INCOMPLETE_WORK_RECOVERY,
@@ -95,6 +99,7 @@ import {
   getErrorMessage,
   holdsItsOwnInstallation,
   hostAt,
+  idNamesAnotherMarketplace,
   initProviderToNameAt,
   installingBesideGlobalCopies,
   isHomeDirectory,
@@ -116,13 +121,13 @@ import {
   stoppingOnARefusal,
   subAgentChanged,
   unplaceableKept
-} from "../chunk-YM3VEDAP.js";
+} from "../chunk-ENET4IF6.js";
 import {
   getSkillById,
   getSkillDisplayName,
   getSkillEntryDisplayName,
   inertLine
-} from "../chunk-TG3SPPZY.js";
+} from "../chunk-UE4Z3YMB.js";
 import {
   CLI_COLORS,
   CLI_INVOKE_COMMAND,
@@ -434,6 +439,7 @@ var Edit = class _Edit extends BaseCommand {
   async applySharedConfig(id, namedProvider) {
     const payload = await this.fetchSharedConfigOrFail(id, namedProvider);
     const context = await this.loadContextUnderSpinner();
+    this.sayWhenItNamesAnotherMarketplace(payload, context.sourceResult);
     const editRoot = resolveEditRoot(context.installation);
     await this.ensureSavedSkillsReadable(
       context.projectConfig?.skills ?? [],
@@ -539,6 +545,11 @@ var Edit = class _Edit extends BaseCommand {
     }
     return fetched.payload;
   }
+  /** An apply always reads the installation's own marketplace; one an id names is never fetched. */
+  sayWhenItNamesAnotherMarketplace({ marketplace: named }, { sourceConfig: { source: used } }) {
+    if (named === void 0 || named === used) return;
+    this.log(idNamesAnotherMarketplace(named, used));
+  }
   decodeSeedOrFail(payload, sourceMatrix) {
     try {
       return seedToInstallSelection(payload, sourceMatrix);
@@ -556,7 +567,13 @@ var Edit = class _Edit extends BaseCommand {
   async writeCarriedSkills(carried) {
     if (carried.length === 0) return;
     await writeExternalSkills(carried);
-    this.log(carriedSkillsWritten(carried.map((skill) => skill.id)));
+    const recorded = carried.map(({ id, skill }) => ({ id, displayName: skill.displayName }));
+    this.log(
+      carriedSkillsWritten(
+        carried.map(({ id }) => id),
+        namedByActiveEntries(recorded)
+      )
+    );
   }
   /**
    * A destructive apply nobody can confirm must never become a yes. Asked only of a run that changes
@@ -620,7 +637,7 @@ var Edit = class _Edit extends BaseCommand {
     const outcome = await promptConfirm(({ onConfirm, onCancel }) => /* @__PURE__ */ jsx(Confirm, { message: SHARED_CONFIG_APPLY.CONFIRM, onConfirm, onCancel }));
     if (outcome === "confirmed") return;
     this.log("\nEdit cancelled");
-    this.error("Cancelled", { exit: EXIT_CODES.CANCELLED });
+    this.exit(EXIT_CODES.CANCELLED);
   }
   /** `edit` rewrites the file, so it must not let a user curate a roster no command acts on. */
   async refuseUnofferablePlacements(cwd) {
@@ -1185,18 +1202,22 @@ async function migratePluginSkillScopes(pluginMoves, marketplace, projectDir) {
   const host = hostAt(projectDir);
   const failed = [];
   for (const move of pluginMoves) {
-    const pluginRef = buildMarketplacePluginRef(move.id, marketplace);
     try {
-      if (move.oldScope === "project") {
-        await host.uninstallPlugin(pluginRef, "project", projectDir);
-      }
-      await host.installPlugin(pluginRef, move.newScope, projectDir);
+      await movePluginScope(host, move, marketplace, projectDir);
     } catch (error) {
       failed.push({ id: move.id, error: getErrorMessage(error) });
     }
   }
   return { failed };
 }
+async function movePluginScope(host, move, marketplace, projectDir) {
+  if (move.oldScope === "project") {
+    const oldRefs = pluginRefsOf(move.id, move.oldSource, marketplace);
+    await removeUnderFirstNameHeld(host, oldRefs, "project", projectDir);
+  }
+  const newRef = buildMarketplacePluginRef(move.id, move.newSource);
+  await host.installPlugin(newRef, move.newScope, projectDir);
+}
 export {
   Edit as default
 };