clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-29 15:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(worktree): route interactive flow through app-server

Browse Source
This commit is contained in:
Felipe Coury
2026-05-09 21:36:06 -03:00
parent 5dc9cf6907
commit c0a6795347
44 changed files with 2279 additions and 1226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
codex-rs/cli/src/main.rs
View File

@@ -760,14 +760,6 @@ async fn run_debug_app_server_command(cmd: DebugAppServerCommand) -> anyhow::Res
}
}
fn resolve_worktree_options_for_tui(
cli: &mut TuiCli,
remote: Option<&str>,
remote_auth_token_env: Option<&str>,
) -> anyhow::Result<Option<WorktreeResolution>> {
resolve_worktree_options_for_shared_cli(&mut cli.shared, remote, remote_auth_token_env)
}
fn resolve_worktree_options_for_shared_cli(
shared: &mut SharedCliOptions,
remote: Option<&str>,
@@ -1121,11 +1113,6 @@ async fn cli_main(arg0_paths: Arg0DispatchPaths) -> anyhow::Result<()> {
&mut interactive.config_overrides,
root_config_overrides.clone(),
);
resolve_worktree_options_for_tui(
&mut interactive,
root_remote.as_deref(),
root_remote_auth_token_env.as_deref(),
)?;
let exit_info = run_interactive_tui(
interactive,
root_remote.clone(),
@@ -1299,14 +1286,6 @@ async fn cli_main(arg0_paths: Arg0DispatchPaths) -> anyhow::Result<()> {
include_non_interactive,
config_overrides,
);
resolve_worktree_options_for_tui(
&mut interactive,
remote.remote.as_deref().or(root_remote.as_deref()),
remote
.remote_auth_token_env
.as_deref()
.or(root_remote_auth_token_env.as_deref()),
)?;
let exit_info = run_interactive_tui(
interactive,
remote.remote.or(root_remote.clone()),
@@ -1333,14 +1312,6 @@ async fn cli_main(arg0_paths: Arg0DispatchPaths) -> anyhow::Result<()> {
all,
config_overrides,
);
resolve_worktree_options_for_tui(
&mut interactive,
remote.remote.as_deref().or(root_remote.as_deref()),
remote
.remote_auth_token_env
.as_deref()
.or(root_remote_auth_token_env.as_deref()),
)?;
let exit_info = run_interactive_tui(
interactive,
remote.remote.or(root_remote.clone()),