mirror of
https://github.com/openai/codex.git
synced 2026-11-19 23:05:23 +00:00
Defer resume picker and directory changes to a fresh TUI stack (#43376)
## Why Session transitions need stack headroom for embedded-server initialization and configuration loading. Running them inside event dispatch risks exhausting the TUI thread's stack. ## What changed - Queue `/resume` and valid `/cd` requests for processing after event dispatch returns. - Reject additional `/cd` requests while one is pending, and recheck the source session, working directory, idle state, and remote-environment restrictions before applying it. ## Testing Add a Unix PTY regression test that exercises `/resume`, worktree conversation forks, `/cd`, and new worktree conversations through the real TUI event loop. Update the directory-change test to verify that dispatch queues the request without immediately changing configuration. GitOrigin-RevId: 4950921931dfaba9e55e6bb04f98f7ba64b72122
This commit is contained in:
1 parent
694b6319d3
commit
5ecb3afd1b
11 files changed
+283
-5
No files matched your search
@@ -126,7 +126,8 @@ impl App {
|
||||
thread_id,
|
||||
requested_cwd,
|
||||
} => {
|
||||
if self.primary_thread_id != Some(thread_id)
|
||||
if self.pending_working_directory_change.is_some()
|
||||
|| self.primary_thread_id != Some(thread_id)
|
||||
|| !self.chat_widget.can_change_working_directory(thread_id)
|
||||
{
|
||||
self.chat_widget.add_error_message(
|
||||
@@ -148,7 +149,12 @@ impl App {
|
||||
);
|
||||
match std::fs::metadata(cwd.as_path()) {
|
||||
Ok(metadata) if metadata.is_dir() => {
|
||||
self.change_working_directory(tui, app_server, cwd).await;
|
||||
self.pending_working_directory_change =
|
||||
Some(working_directory::PendingWorkingDirectoryChange {
|
||||
source_thread_id: thread_id,
|
||||
source_cwd: self.config.cwd.clone(),
|
||||
destination: cwd,
|
||||
});
|
||||
}
|
||||
Ok(_) => self
|
||||
.chat_widget
|
||||
@@ -278,7 +284,7 @@ impl App {
|
||||
.await;
|
||||
}
|
||||
AppEvent::OpenResumePicker => {
|
||||
return Box::pin(self.open_resume_picker(tui, app_server)).await;
|
||||
self.pending_open_resume_picker = true;
|
||||
}
|
||||
AppEvent::OpenExternalAgentConfigMigration => {
|
||||
match crate::external_agent_config_migration::flow::handle_external_agent_config_migration_prompt(
|
||||
|
||||
Reference in new issue
Block a user