fix: roll back plugin index on config write conflicts

src/cli/plugins-cli.ts

@@ -8,10 +8,8 @@ import type { PluginInstallRecord } from "../config/types.plugins.js";
 import { enablePluginInConfig } from "../plugins/enable.js";
 import {
   loadInstalledPluginIndexInstallRecords,
-  PLUGIN_INSTALLS_CONFIG_PATH,
   removePluginInstallRecordFromRecords,
   withoutPluginInstallRecords,
-  writePersistedInstalledPluginIndexInstallRecords,
   withPluginInstallRecords,
 } from "../plugins/installed-plugin-index-records.js";
 import { listMarketplacePlugins } from "../plugins/marketplace.js";
@@ -44,6 +42,7 @@ import {
 } from "./plugins-command-helpers.js";
 import { setPluginEnabledInConfig } from "./plugins-config.js";
 import { runPluginInstallCommand } from "./plugins-install-command.js";
+import { commitPluginInstallRecordsWithConfig } from "./plugins-install-record-commit.js";
 import { formatPluginLine } from "./plugins-list-format.js";
 import { refreshPluginRegistryAfterConfigMutation } from "./plugins-registry-refresh.js";
 import { resolvePluginUninstallId } from "./plugins-uninstall-selection.js";
@@ -691,17 +690,18 @@ export function registerPluginsCli(program: Command) {
         defaultRuntime.log(theme.warn(warning));
       }
 
-      await writePersistedInstalledPluginIndexInstallRecords(
-        removePluginInstallRecordFromRecords(installRecords, pluginId),
-      );
-      await replaceConfigFile({
-        nextConfig: withoutPluginInstallRecords(result.config),
+      const nextInstallRecords = removePluginInstallRecordFromRecords(installRecords, pluginId);
+      const nextConfig = withoutPluginInstallRecords(result.config);
+      await commitPluginInstallRecordsWithConfig({
+        previousInstallRecords: installRecords,
+        nextInstallRecords,
+        nextConfig,
         ...(snapshot.hash !== undefined ? { baseHash: snapshot.hash } : {}),
-        writeOptions: { unsetPaths: [Array.from(PLUGIN_INSTALLS_CONFIG_PATH)] },
       });
       await refreshPluginRegistryAfterConfigMutation({
-        config: withoutPluginInstallRecords(result.config),
+        config: nextConfig,
         reason: "source-changed",
+        installRecords: nextInstallRecords,
         logger: {
           warn: (message) => defaultRuntime.log(theme.warn(message)),
         },