Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Group external agent config migration into a module (#35992)

charlesgong-openaif9b18d04ba78
diff --git a/codex-rs/tui/src/app/app_server_events.rs b/codex-rs/tui/src/app/app_server_events.rs
index 8925ba8db2..2a8c26b458 100644
--- a/codex-rs/tui/src/app/app_server_events.rs
+++ b/codex-rs/tui/src/app/app_server_events.rs
@@ -132,7 +132,7 @@ impl App {
self.fetch_plugins_list(app_server_client, cwd);
if should_report_completion {
self.chat_widget.add_plain_history_lines(
- crate::external_agent_config_migration_flow::external_agent_config_migration_finished_lines(notification),
+ crate::external_agent_config_migration::flow::external_agent_config_migration_finished_lines(notification),
);
}
return;
diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs
index aa67d98ace..f820122163 100644
--- a/codex-rs/tui/src/app/event_dispatch.rs
+++ b/codex-rs/tui/src/app/event_dispatch.rs
@@ -8,7 +8,7 @@ use super::session_lifecycle::ThreadAttachPresentation;
use super::*;
use crate::app_server_session::ForkGoalContinuation;
use crate::config_update::format_config_error;
-use crate::external_agent_config_migration_flow::ExternalAgentConfigMigrationFlowOutcome;
+use crate::external_agent_config_migration::flow::ExternalAgentConfigMigrationFlowOutcome;
#[cfg(target_os = "windows")]
use codex_config::types::WindowsSandboxModeToml;
@@ -118,7 +118,7 @@ impl App {
tui.frame_requester().schedule_frame();
}
AppEvent::OpenExternalAgentConfigMigration => {
- match crate::external_agent_config_migration_flow::handle_external_agent_config_migration_prompt(
+ match crate::external_agent_config_migration::flow::handle_external_agent_config_migration_prompt(
tui,
app_server,
&self.config,
@@ -130,7 +130,7 @@ impl App {
}
Ok(ExternalAgentConfigMigrationFlowOutcome::NoItems) => {
self.chat_widget.add_info_message(
- crate::external_agent_config_migration_flow::EXTERNAL_AGENT_CONFIG_MIGRATION_NO_ITEMS_MESSAGE
+ crate::external_agent_config_migration::flow::EXTERNAL_AGENT_CONFIG_MIGRATION_NO_ITEMS_MESSAGE
.to_string(),
/*hint*/ None,
);
diff --git a/codex-rs/tui/src/external_agent_config_migration_flow.rs b/codex-rs/tui/src/external_agent_config_migration/flow.rs
similarity index 95%
rename from codex-rs/tui/src/external_agent_config_migration_flow.rs
rename to codex-rs/tui/src/external_agent_config_migration/flow.rs
index c802664f41..7b40b09e81 100644
--- a/codex-rs/tui/src/external_agent_config_migration_flow.rs
+++ b/codex-rs/tui/src/external_agent_config_migration/flow.rs
@@ -1,11 +1,5 @@
use crate::app_server_session::AppServerSession;
use crate::app_server_session::EXTERNAL_AGENT_CONFIG_IMPORT_IN_PROGRESS_MESSAGE;
-use crate::external_agent_config_migration::ExternalAgentConfigMigrationOutcome;
-use crate::external_agent_config_migration::run_external_agent_config_migration_prompt;
-use crate::external_agent_config_migration_model::external_agent_config_migration_item_count;
-use crate::external_agent_config_migration_model::external_agent_config_migration_type_label;
-use crate::external_agent_config_migration_source::ExternalAgentConfigMigrationSource;
-use crate::external_agent_config_migration_source::run_external_agent_config_source_prompt;
use crate::legacy_core::config::Config;
use crate::tui;
use codex_app_server_protocol::ExternalAgentConfigDetectParams;
@@ -15,6 +9,13 @@ use codex_app_server_protocol::ExternalAgentConfigMigrationItemType;
use ratatui::prelude::Stylize as _;
use ratatui::text::Line;
+use super::ExternalAgentConfigMigrationOutcome;
+use super::model::external_agent_config_migration_item_count;
+use super::model::external_agent_config_migration_type_label;
+use super::run_external_agent_config_migration_prompt;
+use super::source::ExternalAgentConfigMigrationSource;
+use super::source::run_external_agent_config_source_prompt;
+
pub(crate) const EXTERNAL_AGENT_CONFIG_MIGRATION_NO_ITEMS_MESSAGE: &str =
"No compatible setup was found to import.";
pub(crate) const EXTERNAL_AGENT_CONFIG_MIGRATION_REMOTE_UNAVAILABLE_MESSAGE: &str = "Import from other apps is unavailable in remote sessions. Start Codex locally and run /import.";
@@ -374,5 +375,5 @@ pub(crate) async fn handle_external_agent_config_migration_prompt(
}
#[cfg(test)]
-#[path = "external_agent_config_migration_flow_tests.rs"]
+#[path = "flow_tests.rs"]
mod tests;
diff --git a/codex-rs/tui/src/external_agent_config_migration_flow_tests.rs b/codex-rs/tui/src/external_agent_config_migration/flow_tests.rs
similarity index 100%
rename from codex-rs/tui/src/external_agent_config_migration_flow_tests.rs
rename to codex-rs/tui/src/external_agent_config_migration/flow_tests.rs
diff --git a/codex-rs/tui/src/external_agent_config_migration.rs b/codex-rs/tui/src/external_agent_config_migration/mod.rs
similarity index 98%
rename from codex-rs/tui/src/external_agent_config_migration.rs
rename to codex-rs/tui/src/external_agent_config_migration/mod.rs
index 2722f49f43..ff6c344b8d 100644
--- a/codex-rs/tui/src/external_agent_config_migration.rs
+++ b/codex-rs/tui/src/external_agent_config_migration/mod.rs
@@ -1,9 +1,4 @@
use crate::diff_render::display_path_for;
-use crate::external_agent_config_migration_model::ExternalAgentConfigMigrationGroupModel;
-use crate::external_agent_config_migration_model::external_agent_config_migration_count_summary;
-use crate::external_agent_config_migration_model::external_agent_config_migration_groups;
-use crate::external_agent_config_migration_model::external_agent_config_migration_item_detail;
-use crate::external_agent_config_migration_model::external_agent_config_migration_item_label;
use crate::tui::FrameRequester;
use crate::tui::Tui;
use crate::tui::TuiEvent;
@@ -17,7 +12,16 @@ use ratatui::prelude::Stylize as _;
use ratatui::text::Line;
use tokio_stream::StreamExt;
+pub(crate) mod flow;
+mod model;
mod render;
+mod source;
+
+use self::model::ExternalAgentConfigMigrationGroupModel;
+use self::model::external_agent_config_migration_count_summary;
+use self::model::external_agent_config_migration_groups;
+use self::model::external_agent_config_migration_item_detail;
+use self::model::external_agent_config_migration_item_label;
#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) enum ExternalAgentConfigMigrationOutcome {
diff --git a/codex-rs/tui/src/external_agent_config_migration_model.rs b/codex-rs/tui/src/external_agent_config_migration/model.rs
similarity index 100%
rename from codex-rs/tui/src/external_agent_config_migration_model.rs
rename to codex-rs/tui/src/external_agent_config_migration/model.rs
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration_flow__tests__external_agent_config_migration_messages.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__flow__tests__external_agent_config_migration_messages.snap
similarity index 96%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration_flow__tests__external_agent_config_migration_messages.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__flow__tests__external_agent_config_migration_messages.snap
index a671456043..59a70e4e0e 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration_flow__tests__external_agent_config_migration_messages.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__flow__tests__external_agent_config_migration_messages.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration_flow_tests.rs
+source: tui/src/external_agent_config_migration/flow_tests.rs
expression: messages
---
• Import started. You can keep working while it finishes.
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration_source__tests__external_agent_config_source_prompt.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__source__tests__external_agent_config_source_prompt.snap
similarity index 72%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration_source__tests__external_agent_config_source_prompt.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__source__tests__external_agent_config_source_prompt.snap
index 0e994508bf..106cad41f2 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration_source__tests__external_agent_config_source_prompt.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__source__tests__external_agent_config_source_prompt.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration_source_tests.rs
+source: tui/src/external_agent_config_migration/source_tests.rs
expression: terminal.backend()
---
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize.snap
similarity index 94%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize.snap
index 035518e05c..08ff99ff9f 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration.rs
+source: tui/src/external_agent_config_migration/mod.rs
expression: rendered
---
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action.snap
similarity index 93%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action.snap
index a59e82b274..74655a4db8 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration.rs
+source: tui/src/external_agent_config_migration/mod.rs
expression: rendered
---
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action_windows.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action_windows.snap
similarity index 93%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action_windows.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action_windows.snap
index 04651bdf88..128059f200 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action_windows.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_action_windows.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration.rs
+source: tui/src/external_agent_config_migration/mod.rs
expression: rendered
---
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_windows.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_windows.snap
similarity index 94%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_windows.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_windows.snap
index f802f1ab56..69475cc7f3 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_windows.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_customize_windows.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration.rs
+source: tui/src/external_agent_config_migration/mod.rs
expression: rendered
---
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt.snap
similarity index 92%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt.snap
index cbf3bf8e30..8998de2ecd 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration.rs
+source: tui/src/external_agent_config_migration/mod.rs
expression: rendered
---
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt_windows.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt_windows.snap
similarity index 92%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt_windows.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt_windows.snap
index cbf3bf8e30..8998de2ecd 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt_windows.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_prompt_windows.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration.rs
+source: tui/src/external_agent_config_migration/mod.rs
expression: rendered
---
diff --git a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_secondary_source_customize.snap b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_secondary_source_customize.snap
similarity index 87%
rename from codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_secondary_source_customize.snap
rename to codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_secondary_source_customize.snap
index c344e341e6..47f673802f 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_secondary_source_customize.snap
+++ b/codex-rs/tui/src/external_agent_config_migration/snapshots/codex_tui__external_agent_config_migration__tests__external_agent_config_migration_secondary_source_customize.snap
@@ -1,5 +1,5 @@
---
-source: tui/src/external_agent_config_migration.rs
+source: tui/src/external_agent_config_migration/mod.rs
expression: rendered
---
diff --git a/codex-rs/tui/src/external_agent_config_migration_source.rs b/codex-rs/tui/src/external_agent_config_migration/source.rs
similarity index 99%
rename from codex-rs/tui/src/external_agent_config_migration_source.rs
rename to codex-rs/tui/src/external_agent_config_migration/source.rs
index 463313ca66..92e64a2bf3 100644
--- a/codex-rs/tui/src/external_agent_config_migration_source.rs
+++ b/codex-rs/tui/src/external_agent_config_migration/source.rs
@@ -196,5 +196,5 @@ impl WidgetRef for &ExternalAgentConfigSourceScreen {
}
#[cfg(test)]
-#[path = "external_agent_config_migration_source_tests.rs"]
+#[path = "source_tests.rs"]
mod tests;
diff --git a/codex-rs/tui/src/external_agent_config_migration_source_tests.rs b/codex-rs/tui/src/external_agent_config_migration/source_tests.rs
similarity index 100%
rename from codex-rs/tui/src/external_agent_config_migration_source_tests.rs
rename to codex-rs/tui/src/external_agent_config_migration/source_tests.rs
diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs
index 7c3e6736ca..ccc0e4c451 100644
--- a/codex-rs/tui/src/lib.rs
+++ b/codex-rs/tui/src/lib.rs
@@ -118,9 +118,6 @@ mod diff_render;
mod exec_cell;
mod exec_command;
mod external_agent_config_migration;
-mod external_agent_config_migration_flow;
-mod external_agent_config_migration_model;
-mod external_agent_config_migration_source;
mod external_editor;
mod file_search;
mod frames;