agents-inc 0.156.0 → 0.158.0

package/dist/commands/edit.js

@@ -3,85 +3,87 @@ import {
   publishSeedConfig,
   seedPayloadForInstallation,
   skillsAuthoredHere
-} from "../chunk-2H7UWE2G.js";
+} from "../chunk-DP6YQFVO.js";
 import {
   RemovalPlanConfirm
-} from "../chunk-D2CAV7MG.js";
+} from "../chunk-4DMFK67G.js";
 import "../chunk-OZXAJNLA.js";
 import {
   seedToWizardResult
-} from "../chunk-MO5FGLVS.js";
+} from "../chunk-54QLV3OH.js";
 import {
   runWizardSession
-} from "../chunk-IXRZAHZF.js";
-import "../chunk-TNGMF4UX.js";
-import "../chunk-LJCNUP6M.js";
-import "../chunk-HTYH7CKN.js";
-import "../chunk-PCC4LBKB.js";
-import "../chunk-HG4JPXJT.js";
-import "../chunk-6RLV45HN.js";
-import "../chunk-ILUVL7WM.js";
-import "../chunk-HXKOIWLU.js";
-import "../chunk-QWVXOCXO.js";
-import "../chunk-GS2NZ3GD.js";
-import "../chunk-VPASBA7P.js";
-import "../chunk-PNMM5HNX.js";
-import "../chunk-CLFHC2DK.js";
-import "../chunk-5OKLCVM4.js";
-import "../chunk-5F2YR5XV.js";
+} from "../chunk-XNYHMRVJ.js";
+import "../chunk-PNRLBPGS.js";
+import "../chunk-4ABNXKAR.js";
+import "../chunk-Q7CAE5NN.js";
+import "../chunk-EEAX7E2X.js";
+import "../chunk-JG3B47P3.js";
+import "../chunk-3Q2N7CSY.js";
+import "../chunk-DZD25NHW.js";
+import "../chunk-P6OKOH62.js";
+import "../chunk-3NBXQSW2.js";
+import "../chunk-SJ4T5YLG.js";
+import "../chunk-YXI3BTQQ.js";
+import "../chunk-L4FHSOL5.js";
+import "../chunk-OQB2CKBT.js";
+import "../chunk-KVVXINCJ.js";
+import "../chunk-6DBE562W.js";
 import "../chunk-TSIU7DME.js";
 import "../chunk-XVAQG2CV.js";
 import {
   Spinner
 } from "../chunk-ZBPEFQ4G.js";
-import "../chunk-4A4L3YIW.js";
+import "../chunk-2PN4QXON.js";
 import "../chunk-J27W6TXS.js";
-import "../chunk-SY4X2LND.js";
-import "../chunk-WFRTHH3A.js";
+import "../chunk-KUZBMEWR.js";
+import "../chunk-TZRXWFF5.js";
 import "../chunk-WTJ3AY33.js";
-import "../chunk-OKH64JZE.js";
+import "../chunk-WCZNQECQ.js";
 import {
   fetchSeedConfig,
   registerExternalSkills,
   writeExternalSkills
-} from "../chunk-PMUABBPG.js";
+} from "../chunk-LKI3ENGQ.js";
 import {
   promptConfirm
 } from "../chunk-JCPANDNR.js";
 import {
+  applyMigratedGlobalSources,
   compileAgentsAllScopes,
   detectProject,
   loadSource,
+  mutateGlobal,
+  normalizeProjectPath,
   writeProjectConfig
-} from "../chunk-WUQ3MTPF.js";
+} from "../chunk-H2DHTJKW.js";
 import {
+  copyLocalSkills,
   discoverInstalledSkills,
   removeCompiledAgents,
   uninstallPluginSkills
-} from "../chunk-5QZAK6J7.js";
+} from "../chunk-H25VRR2T.js";
 import {
   loadAgentDefs
-} from "../chunk-MHRC3KRX.js";
-import {
-  copyLocalSkills
-} from "../chunk-F2AMBBIA.js";
-import "../chunk-ZUAZHDKP.js";
-import "../chunk-Y5Y7XHVU.js";
+} from "../chunk-H4CL23HG.js";
+import "../chunk-WMVOJY6V.js";
+import "../chunk-PZNXBORZ.js";
 import {
   render
 } from "../chunk-JFLVEFFP.js";
 import {
   formatScopeTag,
   orderDomains
-} from "../chunk-F5T6TV4Z.js";
+} from "../chunk-IK6YOXZH.js";
 import {
   BaseCommand,
   EXIT_CODES
-} from "../chunk-YO2LTXB4.js";
-import "../chunk-UMH2YZKG.js";
-import "../chunk-G47TDUK3.js";
+} from "../chunk-X52QUV4U.js";
+import "../chunk-TPQ5M3BW.js";
+import "../chunk-QNAMXQKF.js";
 import {
   ERROR_MESSAGES,
+  INCOMPLETE_WORK_RECOVERY,
   INFO_MESSAGES,
   INSTALL_MODE_DESCRIPTIONS,
   SHARED_CONFIG_APPLY,
@@ -89,7 +91,7 @@ import {
   STATUS_MESSAGES,
   activeAgentNames,
   activeAgentScopeMap,
-  applyMigratedGlobalSources,
+  agentsNotCompiled,
   authoredHereKept,
   buildMarketplacePluginRef,
   carriedSkillsWritten,
@@ -101,6 +103,7 @@ import {
   ejectCopyFailureError,
   execCommand,
   executeMigration,
+  getErrorMessage,
   globallyInstalledRemoved,
   installBaseDir,
   isActiveAt,
@@ -108,8 +111,6 @@ import {
   loadProjectConfigFromDir,
   localSkillsCopied,
   migrateLocalSkillScope,
-  mutateGlobal,
-  normalizeProjectPath,
   recompileSummary,
   resolveInstallPaths,
   sharedConfigDestinations,
@@ -119,20 +120,15 @@ import {
   toClaudePluginScope,
   unplaceableKept,
   unresolvedSkillRemovalReasons
-} from "../chunk-WCAUUBHO.js";
-import {
-  getErrorMessage
-} from "../chunk-XAXJWXI4.js";
+} from "../chunk-3PJLLBUS.js";
 import {
   getCategoryDomain,
   getSkillById,
   getSkillDisplayName,
-  matrix
-} from "../chunk-RWOYPOMR.js";
-import {
+  matrix,
   typedEntries,
   typedKeys
-} from "../chunk-VASLW636.js";
+} from "../chunk-7Z4N4JWQ.js";
 import {
   CLI_COLORS,
   CLI_INVOKE_COMMAND,
@@ -140,7 +136,7 @@ import {
   EJECT_SOURCE,
   editorConfigUrl,
   formatSourceDisplayName
-} from "../chunk-IO5YBKHV.js";
+} from "../chunk-G6G2FT2G.js";
 import "../chunk-VZRO7RYT.js";
 
 // src/cli/commands/edit.tsx
@@ -284,6 +280,11 @@ function scopeArrow(change) {
 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 globalScopePlan(changes, kept) {
   const sections = removalSections(changes.removedSkills, changes.removedAgents);
   return { heading: planHeading(sections), sections, statements: kept };
@@ -345,8 +346,8 @@ function catalogueStatement(kept) {
   if (kept.unplaceableSkillIds.length === 0) return [];
   return [unplaceableKept(kept.unplaceableSkillIds)];
 }
-function applyAuthority(producer, cwd) {
-  if (isHomeDirectory(cwd)) return "all";
+function applyAuthority(producer, editRoot) {
+  if (editRoot.isGlobal) return "all";
   return producer === "shared" ? "all" : "owned";
 }
 var Edit = class _Edit extends BaseCommand {
@@ -381,7 +382,19 @@ var Edit = class _Edit extends BaseCommand {
       hidden: true
     })
   };
+  /**
+   * The command in two statements: do the work, then answer for it.
+   *
+   * `applyEdit` owns every path through the edit and returns however it likes; the exit code is
+   * decided once, here, after the last of them. Deciding it inside `applyEdit` would mean
+   * deciding it at each of that method's three endings, and an ending added later would inherit
+   * the exit-0 default silently — which is the defect this pair exists to close.
+   */
   async run() {
+    await this.applyEdit();
+    this.exitIfWorkIncomplete();
+  }
+  async applyEdit() {
     const { flags } = await this.parse(_Edit);
     const cwd = process.cwd();
     await this.ensureConfigReadable(cwd);
@@ -391,12 +404,13 @@ var Edit = class _Edit extends BaseCommand {
     if (flags.ui) return this.openInEditor(cwd);
     const payload = flags.from === void 0 ? null : await this.fetchSharedConfigOrFail(flags.from);
     const context = await this.loadContextUnderSpinner();
+    const editRoot = resolveEditRoot(context.installation, cwd, flags[EDIT_PROJECT_SETUP_FLAG]);
     await this.ensureSavedSkillsReadable(
       context.projectConfig?.skills ?? [],
       context.sourceResult.matrix,
       context.projectDir
     );
-    const selection = payload ? await this.selectionFromSharedConfig(payload, context, cwd) : await this.selectionFromWizard(context, cwd);
+    const selection = payload ? await this.selectionFromSharedConfig(payload, context, editRoot) : await this.selectionFromWizard(context, editRoot);
     if (!selection) this.error("Cancelled", { exit: EXIT_CODES.CANCELLED });
     const { result } = selection;
     this.reportValidationErrors(result.validation);
@@ -416,21 +430,20 @@ var Edit = class _Edit extends BaseCommand {
       newAgents: result.agentConfigs,
       oldAgents: context.projectConfig?.agents ?? []
     });
-    const isProjectSetup = flags[EDIT_PROJECT_SETUP_FLAG] && !isHomeDirectory(cwd);
     if (selection.producer === "shared") {
       await this.confirmSharedConfigOrCancel(
         changes,
         selection.kept,
         { skills: activeOldSkills, agents: activeOldAgents },
-        cwd
+        editRoot
       );
       await this.writeCarriedSkills(selection.carried);
     }
-    const authority = applyAuthority(selection.producer, cwd);
+    const authority = applyAuthority(selection.producer, editRoot);
     if (!hasAnyChanges(changes)) {
       this.log(chalk.hex(CLI_COLORS.NEUTRAL)("No changes made."));
-      if (!isProjectSetup) return;
-      await this.writeConfigAndCompile(result, context, cwd, authority);
+      if (!editRoot.isProjectSetup) return;
+      await this.writeConfigAndCompile(result, context, editRoot, authority);
       this.logCompletionSummary(changes);
       return;
     }
@@ -451,21 +464,26 @@ var Edit = class _Edit extends BaseCommand {
       filteredResult,
       activeOldSkills,
       context,
-      cwd
+      editRoot
+    );
+    await this.recordGlobalSourceMigrations(
+      migratedSkillIds,
+      filteredResult.skills,
+      editRoot,
+      context
     );
-    await this.recordGlobalSourceMigrations(migratedSkillIds, filteredResult.skills, cwd, context);
-    await this.applyScopeChanges(changes, filteredResult, context, cwd);
-    await this.applySourceChanges(changes, activeOldSkills, cwd, migratedSkillIds);
-    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, cwd, authority);
-    await this.cleanupStaleAgentFiles(changes, activeOldAgents, cwd);
+    await this.applyScopeChanges(changes, filteredResult, 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);
+    await this.cleanupStaleAgentFiles(changes, activeOldAgents, editRoot);
     this.logCompletionSummary(changes);
   }
   /** The interactive producer: open the wizard on what is installed, return what was chosen. */
-  async selectionFromWizard(context, cwd) {
-    const result = await this.runEditWizard(context, cwd);
+  async selectionFromWizard(context, editRoot) {
+    const result = await this.runEditWizard(context, editRoot);
     if (!result) return null;
     return { producer: "wizard", result };
   }
@@ -484,20 +502,20 @@ var Edit = class _Edit extends BaseCommand {
    * changes is who the removal reaches — which the confirm names, rather than this putting the
    * entry back and calling the reach impossible.
    */
-  async selectionFromSharedConfig(payload, context, cwd) {
+  async selectionFromSharedConfig(payload, context, editRoot) {
     const { matrix: sourceMatrix } = context.sourceResult;
-    const carried = this.registerExternalSkillsOrFail(payload, sourceMatrix, cwd);
+    const carried = this.registerExternalSkillsOrFail(payload, sourceMatrix, editRoot.dir);
     const { result, skippedSkillIds, skippedAgentNames } = this.decodeSeedOrFail(
       payload,
       sourceMatrix
     );
-    this.refuseProjectScopedContentAtHome(result, cwd);
+    this.refuseProjectScopedContentAtHome(result, editRoot.dir);
     if (skippedSkillIds.length > 0) this.warn(skippedUnknownSkills(skippedSkillIds));
     if (skippedAgentNames.length > 0) this.warn(skippedUnknownAgents(skippedAgentNames));
     const reconciled = reconcileSharedConfig({
       decoded: result,
       installed: context.projectConfig,
-      authoredHere: await this.readAuthoredHere(context.projectConfig, cwd),
+      authoredHere: await this.readAuthoredHere(context.projectConfig, editRoot.dir),
       // The ids the decode above could not place. They are the skips just reported, read as
       // what STAYS rather than as what did not arrive: the payload named them, so their absence
       // from the decode is this catalogue's limit and not an instruction to delete anything.
@@ -519,10 +537,10 @@ var Edit = class _Edit extends BaseCommand {
    * consequence of an unanswered question is that the entry is treated as the CLI's own, which
    * is what every other command already assumes about it.
    */
-  async readAuthoredHere(projectConfig, cwd) {
+  async readAuthoredHere(projectConfig, editRoot) {
     if (!projectConfig) return /* @__PURE__ */ new Set();
     try {
-      return await skillsAuthoredHere(projectConfig, cwd);
+      return await skillsAuthoredHere(projectConfig, editRoot);
     } catch (error) {
       this.warn(`Could not tell which skills were written here: ${getErrorMessage(error)}`);
       return /* @__PURE__ */ new Set();
@@ -590,8 +608,13 @@ var Edit = class _Edit extends BaseCommand {
    * is the whole of the gate; inside a project a global removal reaches projects nobody here is
    * looking at, so it is shown apart and the reach is named.
    */
-  async confirmSharedConfigOrCancel(changes, kept, installed, cwd) {
-    const plan = isHomeDirectory(cwd) ? globalScopePlan(changes, kept) : projectScopePlan(changes, kept, installed, await this.otherRegisteredProjects(cwd));
+  async confirmSharedConfigOrCancel(changes, kept, installed, editRoot) {
+    const plan = editRoot.isGlobal ? globalScopePlan(changes, kept) : projectScopePlan(
+      changes,
+      kept,
+      installed,
+      await this.otherRegisteredProjects(editRoot.dir)
+    );
     const outcome = await promptConfirm(({ onConfirm, onCancel }) => /* @__PURE__ */ jsx(
       RemovalPlanConfirm,
       {
@@ -618,10 +641,10 @@ var Edit = class _Edit extends BaseCommand {
    * read leaves the disclosure counting nobody rather than failing an apply — and the statement
    * it produces then is the one that says no other project is registered.
    */
-  async otherRegisteredProjects(cwd) {
+  async otherRegisteredProjects(editRoot) {
     try {
       const global = await loadProjectConfigFromDir(os.homedir());
-      const here = normalizeProjectPath(cwd);
+      const here = normalizeProjectPath(editRoot);
       return (global?.config.projects ?? []).filter((projectDir) => projectDir !== here);
     } catch (error) {
       this.warn(`Could not tell which projects share this install: ${getErrorMessage(error)}`);
@@ -742,7 +765,7 @@ var Edit = class _Edit extends BaseCommand {
       currentSkillIds
     };
   }
-  async runEditWizard(context, cwd) {
+  async runEditWizard(context, editRoot) {
     const { projectConfig, currentSkillIds } = context;
     const selectedAgents = projectConfig?.agents && activeAgentNames(projectConfig.agents);
     return runWizardSession({
@@ -755,7 +778,7 @@ var Edit = class _Edit extends BaseCommand {
         installedSkillIds: currentSkillIds,
         ...projectConfig?.skills !== void 0 && { installedSkillConfigs: projectConfig.skills },
         ...projectConfig?.agents !== void 0 && { installedAgentConfigs: projectConfig.agents },
-        isEditingFromGlobalScope: isHomeDirectory(cwd)
+        isEditingFromGlobalScope: editRoot.isGlobal
       },
       props: {
         version: this.config.version,
@@ -806,8 +829,8 @@ var Edit = class _Edit extends BaseCommand {
    * OTHER registered project's config and agents are stale until this write fans out —
    * which is why it goes through the gate rather than straight to the file.
    */
-  async recordGlobalSourceMigrations(migratedSkillIds, newSkills, cwd, context) {
-    if (isHomeDirectory(cwd)) return;
+  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])
     );
@@ -826,7 +849,10 @@ var Edit = class _Edit extends BaseCommand {
       );
       this.reportPropagatedRecompile(report);
     } catch (error) {
-      this.warn(`Could not record global origin change: ${getErrorMessage(error)}`);
+      this.reportIncompleteWork(
+        `Could not record global origin change: ${getErrorMessage(error)}`,
+        INCOMPLETE_WORK_RECOVERY.INSPECT_INSTALLATION
+      );
     }
   }
   logChangeSummary(changes, newSkills, oldSkills, removalReasons) {
@@ -884,7 +910,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     }
     this.log("");
   }
-  async applyMigrations(_changes, filteredResult, activeOldSkills, context, cwd) {
+  async applyMigrations(_changes, filteredResult, activeOldSkills, context, editRoot) {
     const migrationPlan = detectMigrations(activeOldSkills, filteredResult.skills);
     const migratedSkillIds = /* @__PURE__ */ new Set([
       ...migrationPlan.toEject.map((m) => m.id),
@@ -899,7 +925,11 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       await this.requireMarketplaceOrExit(context.sourceResult, "migrate skills to plugin mode");
       this.announcePluginInstall();
     }
-    const migrationResult = await executeMigration(migrationPlan, cwd, context.sourceResult);
+    const migrationResult = await executeMigration(
+      migrationPlan,
+      editRoot.dir,
+      context.sourceResult
+    );
     for (const warning of migrationResult.warnings) {
       this.warn(warning);
     }
@@ -938,12 +968,12 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
   logModeSwitch(count, modeDescription) {
     this.log(chalk.hex(CLI_COLORS.NEUTRAL)(`Switching ${count} skill(s) to ${modeDescription}`));
   }
-  async applyScopeChanges(changes, filteredResult, context, cwd) {
+  async applyScopeChanges(changes, filteredResult, context, editRoot) {
     const { scopeChanges } = changes;
     for (const [skillId, change] of scopeChanges) {
       const skillConfig = filteredResult.skills.find((s) => s.id === skillId);
       if (skillConfig?.origin === EJECT_SOURCE) {
-        await migrateLocalSkillScope(skillId, change.from, cwd);
+        await migrateLocalSkillScope(skillId, change.from, editRoot.dir);
       }
     }
     const hasPluginScopeChanges = [...scopeChanges.keys()].some((skillId) => {
@@ -959,13 +989,16 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       scopeChanges,
       filteredResult.skills,
       marketplace,
-      cwd
+      editRoot.dir
     );
     for (const item of pluginScopeResult.failed) {
-      this.warn(`Failed to migrate plugin scope for ${item.id}: ${item.error}`);
+      this.reportIncompleteWork(
+        `Failed to migrate plugin scope for ${item.id}: ${item.error}`,
+        INCOMPLETE_WORK_RECOVERY.INSPECT_INSTALLATION
+      );
     }
   }
-  async applySourceChanges(changes, activeOldSkills, cwd, migratedSkillIds) {
+  async applySourceChanges(changes, activeOldSkills, editRoot, migratedSkillIds) {
     const { sourceChanges } = changes;
     for (const [skillId, change] of sourceChanges) {
       if (migratedSkillIds.has(skillId)) {
@@ -973,12 +1006,12 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       }
       if (change.from === EJECT_SOURCE) {
         const oldSkill = activeOldSkills.find((s) => s.id === skillId);
-        const deleteDir = installBaseDir(cwd, oldSkill?.scope);
+        const deleteDir = installBaseDir(editRoot.dir, oldSkill?.scope);
         await deleteLocalSkill(deleteDir, skillId);
       }
     }
   }
-  async applyPluginChanges(changes, filteredResult, activeOldSkills, context, cwd) {
+  async applyPluginChanges(changes, filteredResult, activeOldSkills, context, editRoot) {
     const { addedSkills, removedSkills } = changes;
     const addedPluginSkills = filteredResult.skills.filter(
       (s) => addedSkills.includes(s.id) && s.origin !== EJECT_SOURCE
@@ -995,7 +1028,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       await this.installPluginSkillsReported(
         addedPluginSkills,
         marketplace,
-        cwd,
+        editRoot.dir,
         context.sourceResult.matrix
       );
     }
@@ -1004,7 +1037,7 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
         removedPluginSkills,
         activeOldSkills,
         marketplace,
-        cwd
+        editRoot.dir
       );
       if (uninstallResult.uninstalled.length > 0) {
         this.log(
@@ -1016,26 +1049,30 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       }
     }
   }
-  async copyNewLocalSkills(changes, filteredResult, context, cwd) {
+  async copyNewLocalSkills(changes, filteredResult, context, editRoot) {
     const { addedSkills } = changes;
     const addedLocalSkills = filteredResult.skills.filter(
       (s) => addedSkills.includes(s.id) && s.origin === EJECT_SOURCE
     );
     if (addedLocalSkills.length > 0) {
-      const copyResult = await copyLocalSkills(addedLocalSkills, cwd, context.sourceResult);
+      const copyResult = await copyLocalSkills(
+        addedLocalSkills,
+        editRoot.dir,
+        context.sourceResult
+      );
       this.log(chalk.hex(CLI_COLORS.NEUTRAL)(localSkillsCopied(copyResult.totalCopied)));
     }
   }
-  async removeDeletedLocalSkills(changes, activeOldSkills, cwd) {
+  async removeDeletedLocalSkills(changes, activeOldSkills, editRoot) {
     const { removedSkills } = changes;
     for (const skillId of removedSkills) {
       const oldSkill = activeOldSkills.find((s) => s.id === skillId);
       if (oldSkill?.origin !== EJECT_SOURCE) continue;
-      const deleteDir = installBaseDir(cwd, oldSkill.scope);
+      const deleteDir = installBaseDir(editRoot.dir, oldSkill.scope);
       await deleteLocalSkill(deleteDir, skillId);
     }
   }
-  async writeConfigAndCompile(result, context, cwd, authority) {
+  async writeConfigAndCompile(result, context, editRoot, authority) {
     let agentDefsResult;
     try {
       agentDefsResult = await loadAgentDefs();
@@ -1047,10 +1084,10 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
       configResult = await writeProjectConfig({
         wizardResult: result,
         sourceResult: context.sourceResult,
-        projectDir: cwd,
-        agents: agentDefsResult.agents,
+        projectDir: editRoot.dir,
+        agentDefs: agentDefsResult,
         // 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). `applyAuthority` decides
+        // are removed rather than union-preserved. `applyAuthority` decides
         // how much that is from the producer and the directory, and hands the same word to the
         // merger and to the global config the project branch of the gate commits.
         authoritativeScope: authority
@@ -1063,9 +1100,9 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
     this.reportUnassignedSkills(configResult.config);
     try {
       const agentScopeMap = activeAgentScopeMap(result.agentConfigs);
-      const { allSkills } = await discoverInstalledSkills(cwd);
+      const { allSkills } = await discoverInstalledSkills(editRoot.dir);
       const compilationResult = await compileAgentsAllScopes({
-        projectDir: cwd,
+        projectDir: editRoot.dir,
         sourcePath: agentDefsResult.sourcePath,
         skills: allSkills,
         agentScopeMap
@@ -1083,27 +1120,35 @@ ${chalk.hex(CLI_COLORS.WHITE).bold("Changes:")}`);
         for (const warning of warnings) {
           this.warn(warning);
         }
+        this.recordIncompleteWork(agentsNotCompiled(failed), INCOMPLETE_WORK_RECOVERY.RECOMPILE);
       } else if (compiled.length > 0) {
         this.log(chalk.hex(CLI_COLORS.NEUTRAL)(summary));
       } else {
         this.log(chalk.hex(CLI_COLORS.NEUTRAL)(INFO_MESSAGES.NO_AGENTS_TO_RECOMPILE));
       }
     } catch (error) {
-      this.warn(`Agent recompilation failed: ${getErrorMessage(error)}`);
+      this.reportIncompleteWork(
+        `Agent recompilation failed: ${getErrorMessage(error)}`,
+        INCOMPLETE_WORK_RECOVERY.RECOMPILE
+      );
       this.log(`You can manually recompile with '${CLI_INVOKE_COMMAND} compile'.`);
     }
     this.reportPropagatedRecompile(configResult.propagation);
   }
-  async cleanupStaleAgentFiles(changes, oldAgents, cwd) {
-    for (const removal of planStaleAgentRemovals(changes, oldAgents, cwd)) {
+  async cleanupStaleAgentFiles(changes, oldAgents, editRoot) {
+    for (const removal of planStaleAgentRemovals(changes, oldAgents, editRoot.dir)) {
       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}`);
+        this.reportIncompleteWork(
+          `Could not remove agent file ${agentPath}: ${error}`,
+          INCOMPLETE_WORK_RECOVERY.DELETE_AGENT_FILE
+        );
       }
     }
   }
   logCompletionSummary(_changes) {
+    if (this.hasIncompleteWork) return;
     this.log(`
 ${chalk.hex(CLI_COLORS.SUCCESS)("\u2713 Done")}
 `);
@@ -1183,7 +1228,7 @@ 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) {
+function planStaleAgentRemovals(changes, oldAgents, editRoot) {
   const supersededByGlobal = [...changes.agentScopeChanges].filter(([, change]) => change.from !== "global").map(([name]) => ({ name, scope: "project" }));
   const deselected = changes.removedAgents.map((name) => ({
     name,
@@ -1191,7 +1236,7 @@ function planStaleAgentRemovals(changes, oldAgents, cwd) {
   }));
   const stale = [...supersededByGlobal, ...deselected];
   const removalAtScope = (scope) => ({
-    agentsDir: resolveInstallPaths(cwd, scope).agentsDir,
+    agentsDir: resolveInstallPaths(editRoot, 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);