support plugins in external agent config migration (#17855)

codex-rs/app-server/README.md

@@ -196,8 +196,8 @@ Example with notification opt-out:
 - `windowsSandbox/setupStart` — start Windows sandbox setup for the selected mode (`elevated` or `unelevated`); accepts an optional absolute `cwd` to target setup for a specific workspace, returns `{ started: true }` immediately, and later emits `windowsSandbox/setupCompleted`.
 - `feedback/upload` — submit a feedback report (classification + optional reason/logs, conversation_id, and optional `extraLogFiles` attachments array); returns the tracking thread id.
 - `config/read` — fetch the effective config on disk after resolving config layering.
-- `externalAgentConfig/detect` — detect migratable external-agent artifacts with `includeHome` and optional `cwds`; each detected item includes `cwd` (`null` for home).
-- `externalAgentConfig/import` — apply selected external-agent migration items by passing explicit `migrationItems` with `cwd` (`null` for home).
+- `externalAgentConfig/detect` — detect migratable external-agent artifacts with `includeHome` and optional `cwds`; each detected item includes `cwd` (`null` for home), and plugin migration items may additionally include structured `details` grouping plugin ids under each detected marketplace name.
+- `externalAgentConfig/import` — apply selected external-agent migration items by passing explicit `migrationItems` with `cwd` (`null` for home) and any plugin `details` returned by detect.
 - `config/value/write` — write a single config key/value to the user's config.toml on disk.
 - `config/batchWrite` — apply multiple config edits atomically to the user's config.toml on disk, with optional `reloadUserConfig: true` to hot-reload loaded threads.
 - `configRequirements/read` — fetch loaded requirements constraints from `requirements.toml` and/or MDM (or `null` if none are configured), including allow-lists (`allowedApprovalPolicies`, `allowedSandboxModes`, `allowedWebSearchModes`), pinned feature values (`featureRequirements`), `enforceResidency`, and `network` constraints such as canonical domain/socket permissions plus `managedAllowedDomainsOnly`.

codex-rs/app-server/src/external_agent_config_api.rs

@@ -6,6 +6,8 @@ use codex_app_server_protocol::ExternalAgentConfigImportResponse;
 use codex_app_server_protocol::ExternalAgentConfigMigrationItem;
 use codex_app_server_protocol::ExternalAgentConfigMigrationItemType;
 use codex_app_server_protocol::JSONRPCErrorError;
+use codex_app_server_protocol::MigrationDetails;
+use codex_app_server_protocol::PluginsMigration;
 use codex_core::external_agent_config::ExternalAgentConfigDetectOptions;
 use codex_core::external_agent_config::ExternalAgentConfigMigrationItem as CoreMigrationItem;
 use codex_core::external_agent_config::ExternalAgentConfigMigrationItemType as CoreMigrationItemType;
@@ -51,12 +53,25 @@ impl ExternalAgentConfigApi {
                         CoreMigrationItemType::AgentsMd => {
                             ExternalAgentConfigMigrationItemType::AgentsMd
                         }
+                        CoreMigrationItemType::Plugins => {
+                            ExternalAgentConfigMigrationItemType::Plugins
+                        }
                         CoreMigrationItemType::McpServerConfig => {
                             ExternalAgentConfigMigrationItemType::McpServerConfig
                         }
                     },
                     description: migration_item.description,
                     cwd: migration_item.cwd,
+                    details: migration_item.details.map(|details| MigrationDetails {
+                        plugins: details
+                            .plugins
+                            .into_iter()
+                            .map(|plugin| PluginsMigration {
+                                marketplace_name: plugin.marketplace_name,
+                                plugin_names: plugin.plugin_names,
+                            })
+                            .collect(),
+                    }),
                 })
                 .collect(),
         })
@@ -82,15 +97,33 @@ impl ExternalAgentConfigApi {
                             ExternalAgentConfigMigrationItemType::AgentsMd => {
                                 CoreMigrationItemType::AgentsMd
                             }
+                            ExternalAgentConfigMigrationItemType::Plugins => {
+                                CoreMigrationItemType::Plugins
+                            }
                             ExternalAgentConfigMigrationItemType::McpServerConfig => {
                                 CoreMigrationItemType::McpServerConfig
                             }
                         },
                         description: migration_item.description,
                         cwd: migration_item.cwd,
+                        details: migration_item.details.map(|details| {
+                            codex_core::external_agent_config::MigrationDetails {
+                                plugins: details
+                                    .plugins
+                                    .into_iter()
+                                    .map(|plugin| {
+                                        codex_core::external_agent_config::PluginsMigration {
+                                            marketplace_name: plugin.marketplace_name,
+                                            plugin_names: plugin.plugin_names,
+                                        }
+                                    })
+                                    .collect(),
+                            }
+                        }),
                     })
                     .collect(),
             )
+            .await
             .map_err(map_io_error)?;
 
         Ok(ExternalAgentConfigImportResponse {})