mirror of
https://github.com/openai/codex.git
synced 2026-11-18 23:02:23 +00:00
Add working-directory commands to the TUI (#38894)
## What changed - Add `/cd [path]` for changing an idle local session's working directory while preserving conversation history. Relative paths resolve from the current directory, and omitting the path selects `~`. - Reload project configuration, instructions, permissions, keybindings, file search, and hooks for the destination before replacing the active session. - Reject unsafe transitions, including active or queued work, background terminals, remote environments, untrusted destinations, and incompatible permission profiles. - Add `/pwd` and its `/cwd` alias to display the current working directory, and discard asynchronous results left over from the previous directory. ## Testing - Cover command parsing, aliases, default paths, session eligibility, transition failures, history preservation, destination policy loading, hooks, and stale events. GitOrigin-RevId: 1a987c029f157a087ba02c0f26e022260409132b
This commit is contained in:
1 parent
375996d3f5
commit
ed32158e90
18 files changed
+776
-24
No files matched your search
@@ -4867,6 +4867,7 @@ async fn make_test_app() -> App {
|
||||
chat_widget,
|
||||
workspace_command_runner: None,
|
||||
launch_cwd: config.cwd.to_path_buf(),
|
||||
runtime_working_directory_override: None,
|
||||
config,
|
||||
state_db: None,
|
||||
cli_kv_overrides: Vec::new(),
|
||||
@@ -4942,6 +4943,7 @@ async fn make_test_app_with_channels() -> (
|
||||
chat_widget,
|
||||
workspace_command_runner: None,
|
||||
launch_cwd: config.cwd.to_path_buf(),
|
||||
runtime_working_directory_override: None,
|
||||
config,
|
||||
state_db: None,
|
||||
cli_kv_overrides: Vec::new(),
|
||||
@@ -6362,12 +6364,16 @@ async fn remote_resume_keeps_server_only_cwd_out_of_local_config() -> Result<()>
|
||||
|
||||
#[tokio::test]
|
||||
async fn in_app_resume_uses_configured_or_explicit_cwd() -> Result<()> {
|
||||
for (configured_mode, has_explicit_cwd, has_remote_exec, expected_directory) in [
|
||||
("current", false, false, "launch"),
|
||||
("session", false, false, "session"),
|
||||
("session", true, false, "explicit"),
|
||||
("session", false, true, "session"),
|
||||
("session", true, true, "explicit"),
|
||||
for (configured_mode, has_explicit_cwd, has_remote_exec, has_runtime_cwd, expected_directory) in [
|
||||
("current", false, false, false, "launch"),
|
||||
("session", false, false, false, "session"),
|
||||
("session", true, false, false, "explicit"),
|
||||
("session", false, true, false, "session"),
|
||||
("session", true, true, false, "explicit"),
|
||||
("current", false, false, true, "runtime"),
|
||||
("current", true, false, true, "runtime"),
|
||||
("session", false, false, true, "runtime"),
|
||||
("session", true, false, true, "runtime"),
|
||||
] {
|
||||
let temp_dir = tempdir()?;
|
||||
let codex_home = temp_dir.path().join("codex-home");
|
||||
@@ -6375,15 +6381,25 @@ async fn in_app_resume_uses_configured_or_explicit_cwd() -> Result<()> {
|
||||
let active_cwd = temp_dir.path().join("active");
|
||||
let session_cwd = temp_dir.path().join("session");
|
||||
let explicit_cwd = temp_dir.path().join("explicit");
|
||||
let runtime_cwd = temp_dir.path().join("runtime");
|
||||
std::fs::create_dir_all(&codex_home)?;
|
||||
std::fs::create_dir_all(&launch_cwd)?;
|
||||
std::fs::create_dir_all(&active_cwd)?;
|
||||
std::fs::create_dir_all(&session_cwd)?;
|
||||
std::fs::create_dir_all(&explicit_cwd)?;
|
||||
std::fs::create_dir_all(&runtime_cwd)?;
|
||||
std::fs::write(
|
||||
codex_home.join("config.toml"),
|
||||
format!("[tui]\nresume_cwd = \"{configured_mode}\"\n"),
|
||||
)?;
|
||||
if has_runtime_cwd {
|
||||
crate::legacy_core::config::set_project_trust_level(
|
||||
codex_home.as_path(),
|
||||
runtime_cwd.as_path(),
|
||||
codex_protocol::config_types::TrustLevel::Trusted,
|
||||
)
|
||||
.map_err(|error| color_eyre::eyre::eyre!(error.to_string()))?;
|
||||
}
|
||||
let config = ConfigBuilder::default()
|
||||
.codex_home(codex_home.clone())
|
||||
.loader_overrides(LoaderOverrides::without_managed_config_for_tests())
|
||||
@@ -6455,6 +6471,30 @@ async fn in_app_resume_uses_configured_or_explicit_cwd() -> Result<()> {
|
||||
app.chat_widget
|
||||
.handle_thread_session_quiet(test_thread_session(ThreadId::new(), active_cwd));
|
||||
let mut tui = crate::tui::test_support::make_test_tui()?;
|
||||
if has_runtime_cwd {
|
||||
let started = app_server
|
||||
.start_thread_with_session_start_source(
|
||||
&app.config,
|
||||
/*session_start_source*/ None,
|
||||
)
|
||||
.await?;
|
||||
let empty_thread_id = started.session.thread_id;
|
||||
app.replace_chat_widget_with_app_server_thread(
|
||||
&mut tui,
|
||||
started,
|
||||
crate::app::session_lifecycle::ThreadAttachPresentation::SessionLineage,
|
||||
/*initial_user_message*/ None,
|
||||
)
|
||||
.await?;
|
||||
app.change_working_directory(&mut tui, &mut app_server, runtime_cwd.clone().abs())
|
||||
.await;
|
||||
|
||||
assert_ne!(app.chat_widget.thread_id(), Some(empty_thread_id));
|
||||
assert_eq!(
|
||||
app.runtime_working_directory_override.as_deref(),
|
||||
Some(runtime_cwd.as_path()),
|
||||
);
|
||||
}
|
||||
|
||||
let control = app
|
||||
.resume_target_session(
|
||||
|
||||
Reference in new issue
Block a user