Add startup worktree MVP

This commit is contained in:
starr-openai
2026-04-01 20:45:26 -07:00
parent d4464125c5
commit d70c05423b
6 changed files with 649 additions and 17 deletions
+13
View File
@@ -63,6 +63,10 @@ pub struct Cli {
#[clap(long = "cd", short = 'C', value_name = "DIR")]
pub cwd: Option<PathBuf>,
/// Create a new local git worktree and start the session from that checkout.
#[arg(long = "worktree", default_value_t = false, global = true)]
pub worktree: bool,
/// Allow running Codex outside a Git repository.
#[arg(long = "skip-git-repo-check", global = true, default_value_t = false)]
pub skip_git_repo_check: bool,
@@ -312,4 +316,13 @@ mod tests {
assert_eq!(args.session_id.as_deref(), Some("session-123"));
assert_eq!(args.prompt.as_deref(), Some(PROMPT));
}
#[test]
fn parse_worktree_flag() {
let cli = Cli::parse_from(["codex-exec", "--worktree", "--cd", "/tmp/repo", "hello"]);
assert!(cli.worktree);
assert_eq!(cli.cwd, Some(PathBuf::from("/tmp/repo")));
assert_eq!(cli.prompt.as_deref(), Some("hello"));
}
}
+117 -6
View File
@@ -66,6 +66,9 @@ use codex_core::config_loader::format_config_error_with_source;
use codex_core::format_exec_policy_error_with_source;
use codex_core::path_utils;
use codex_feedback::CodexFeedback;
use codex_git_utils::CodexManagedWorktree;
use codex_git_utils::GitToolingError;
use codex_git_utils::create_codex_managed_worktree;
use codex_git_utils::get_git_repo_root;
use codex_otel::set_parent_from_context;
use codex_otel::traceparent_context_from_env;
@@ -165,6 +168,14 @@ struct ExecRunArgs {
stderr_with_ansi: bool,
}
#[derive(Debug, PartialEq, Eq)]
struct StartupCwd {
resolved_cwd: Option<PathBuf>,
config_cwd: AbsolutePathBuf,
}
type WorktreeCreator = fn(&Path, &Path) -> Result<CodexManagedWorktree, GitToolingError>;
fn exec_root_span() -> tracing::Span {
info_span!(
"codex.exec",
@@ -174,6 +185,33 @@ fn exec_root_span() -> tracing::Span {
)
}
fn resolve_startup_cwd(
requested_cwd: Option<PathBuf>,
codex_home: &Path,
worktree_creator: Option<WorktreeCreator>,
) -> anyhow::Result<StartupCwd> {
let config_cwd = match requested_cwd.as_deref() {
Some(path) => AbsolutePathBuf::from_absolute_path(path.canonicalize()?)?,
None => AbsolutePathBuf::current_dir()?,
};
let Some(worktree_creator) = worktree_creator else {
return Ok(StartupCwd {
resolved_cwd: requested_cwd,
config_cwd,
});
};
let worktree = worktree_creator(config_cwd.as_path(), codex_home)
.map_err(|err| anyhow::anyhow!("failed to create worktree: {err}"))?;
let config_cwd = AbsolutePathBuf::from_absolute_path(&worktree.worktree_workspace_root)?;
Ok(StartupCwd {
resolved_cwd: Some(worktree.worktree_workspace_root),
config_cwd,
})
}
pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result<()> {
if let Err(err) = set_default_originator("codex_exec".to_string()) {
tracing::warn!(?err, "Failed to set codex exec originator override {err:?}");
@@ -189,6 +227,7 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result
full_auto,
dangerously_bypass_approvals_and_sandbox,
cwd,
worktree,
skip_git_repo_check,
add_dir,
ephemeral,
@@ -201,6 +240,14 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result
config_overrides,
} = cli;
// Fail no-prompt stdin reads before creating a detached worktree so
// `codex-exec --worktree </dev/null` does not leak a checkout.
let prompt = if worktree && command.is_none() && prompt.is_none() {
Some(resolve_root_prompt(None))
} else {
prompt
};
let (_stdout_with_ansi, stderr_with_ansi) = match color {
cli::Color::Always => (true, true),
cli::Color::Never => (false, false),
@@ -240,12 +287,6 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result
}
};
let resolved_cwd = cwd.clone();
let config_cwd = match resolved_cwd.as_deref() {
Some(path) => AbsolutePathBuf::from_absolute_path(path.canonicalize()?)?,
None => AbsolutePathBuf::current_dir()?,
};
// we load config.toml here to determine project state.
#[allow(clippy::print_stderr)]
let codex_home = match find_codex_home() {
@@ -256,6 +297,15 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result
}
};
let StartupCwd {
resolved_cwd,
config_cwd,
} = resolve_startup_cwd(
cwd,
codex_home.as_path(),
worktree.then_some(create_codex_managed_worktree),
)?;
#[allow(clippy::print_stderr)]
let config_toml = match load_config_as_toml_with_cli_overrides(
&codex_home,
@@ -1699,6 +1749,67 @@ mod tests {
);
}
#[test]
fn resolve_startup_cwd_uses_requested_cwd_without_worktree() {
let codex_home = tempdir().expect("create temp codex home");
let cwd = tempdir().expect("create temp cwd");
let startup_cwd = resolve_startup_cwd(
Some(cwd.path().to_path_buf()),
codex_home.path(),
/*worktree_creator*/ None,
)
.expect("resolve startup cwd");
assert_eq!(
startup_cwd,
StartupCwd {
resolved_cwd: Some(cwd.path().to_path_buf()),
config_cwd: AbsolutePathBuf::from_absolute_path(
cwd.path().canonicalize().expect("canonicalize cwd")
)
.expect("absolute cwd"),
}
);
}
#[test]
fn resolve_startup_cwd_uses_worktree_workspace_root_when_enabled() {
let codex_home = tempdir().expect("create temp codex home");
let cwd = tempdir().expect("create temp cwd");
let startup_cwd = resolve_startup_cwd(
Some(cwd.path().to_path_buf()),
codex_home.path(),
Some(|source_cwd, codex_home| {
let worktree_git_root = codex_home.join("worktrees/fake/project");
let worktree_git_dir = worktree_git_root.join(".git");
let marker_path = worktree_git_dir.join("codex-managed");
Ok(CodexManagedWorktree {
source_cwd: source_cwd.to_path_buf(),
source_repo_root: source_cwd.to_path_buf(),
worktree_git_root: worktree_git_root.clone(),
worktree_git_dir,
worktree_workspace_root: worktree_git_root.join("nested/path"),
starting_ref: "main".to_string(),
marker_path,
})
}),
)
.expect("resolve startup cwd");
let expected_worktree_workspace_root =
codex_home.path().join("worktrees/fake/project/nested/path");
assert_eq!(
startup_cwd,
StartupCwd {
resolved_cwd: Some(expected_worktree_workspace_root.clone()),
config_cwd: AbsolutePathBuf::from_absolute_path(&expected_worktree_workspace_root)
.expect("absolute worktree cwd"),
}
);
}
#[test]
fn builds_uncommitted_review_request() {
let args = ReviewArgs {