mirror of
https://github.com/openai/codex.git
synced 2026-09-08 15:50:34 +00:00
80858a8cce
## What changed - Add `codex exec fork <SESSION_ID> [PROMPT]` for creating a new thread from an existing session ID or thread name. - Allow creating the fork without starting a turn, or immediately continue it with a prompt and optional images. - Preserve the source thread ID in the emitted session configuration while leaving the source session unchanged. ## Testing - Add CLI parsing coverage and an end-to-end test for promptless and prompted forks, thread naming, copied history, and unsupported promptless options. GitOrigin-RevId: b8f28b238a1526cc486c5beb886a63f68b8e7986
124 lines
3.3 KiB
Rust
124 lines
3.3 KiB
Rust
use super::*;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[test]
|
|
fn resume_parses_prompt_after_global_flags() {
|
|
const PROMPT: &str = "echo resume-with-global-flags-after-subcommand";
|
|
let cli = Cli::parse_from([
|
|
"codex-exec",
|
|
"resume",
|
|
"--last",
|
|
"--json",
|
|
"--model",
|
|
"gpt-5.2-codex",
|
|
"--dangerously-bypass-approvals-and-sandbox",
|
|
"--skip-git-repo-check",
|
|
"--ephemeral",
|
|
"--ignore-user-config",
|
|
"--ignore-rules",
|
|
PROMPT,
|
|
]);
|
|
|
|
assert!(cli.ephemeral);
|
|
assert!(cli.ignore_user_config);
|
|
assert!(cli.ignore_rules);
|
|
let Some(Command::Resume(args)) = cli.command else {
|
|
panic!("expected resume command");
|
|
};
|
|
let effective_prompt = args.prompt.clone().or_else(|| {
|
|
if args.last {
|
|
args.session_id.clone()
|
|
} else {
|
|
None
|
|
}
|
|
});
|
|
assert_eq!(effective_prompt.as_deref(), Some(PROMPT));
|
|
}
|
|
|
|
#[test]
|
|
fn resume_accepts_output_flags_after_subcommand() {
|
|
const PROMPT: &str = "echo resume-with-output-file";
|
|
let cli = Cli::parse_from([
|
|
"codex-exec",
|
|
"resume",
|
|
"session-123",
|
|
"-o",
|
|
"/tmp/resume-output.md",
|
|
"--output-schema",
|
|
"/tmp/schema.json",
|
|
PROMPT,
|
|
]);
|
|
|
|
assert_eq!(
|
|
cli.last_message_file,
|
|
Some(PathBuf::from("/tmp/resume-output.md"))
|
|
);
|
|
assert_eq!(cli.output_schema, Some(PathBuf::from("/tmp/schema.json")));
|
|
let Some(Command::Resume(args)) = cli.command else {
|
|
panic!("expected resume command");
|
|
};
|
|
assert_eq!(args.session_id.as_deref(), Some("session-123"));
|
|
assert_eq!(args.prompt.as_deref(), Some(PROMPT));
|
|
}
|
|
|
|
#[test]
|
|
fn fork_parses_prompt_after_global_flags() {
|
|
const PROMPT: &str = "continue on the fork";
|
|
let cli = Cli::parse_from([
|
|
"codex-exec",
|
|
"fork",
|
|
"session-123",
|
|
"--json",
|
|
"--model",
|
|
"gpt-5.2-codex",
|
|
"--skip-git-repo-check",
|
|
"--ephemeral",
|
|
PROMPT,
|
|
]);
|
|
|
|
assert!(cli.json);
|
|
assert!(cli.ephemeral);
|
|
let Some(Command::Fork(args)) = cli.command else {
|
|
panic!("expected fork command");
|
|
};
|
|
assert_eq!(args.session_id, "session-123");
|
|
assert_eq!(args.prompt.as_deref(), Some(PROMPT));
|
|
}
|
|
|
|
#[test]
|
|
fn parses_config_isolation_flags() {
|
|
let cli = Cli::parse_from([
|
|
"codex-exec",
|
|
"--ignore-user-config",
|
|
"--ignore-rules",
|
|
"summarize",
|
|
]);
|
|
|
|
assert!(cli.ignore_user_config);
|
|
assert!(cli.ignore_rules);
|
|
}
|
|
|
|
#[test]
|
|
fn approve_for_me_flag_applies_to_resume_when_passed_at_exec_root() {
|
|
for flag in ["--approve-for-me", "--not-so-yolo"] {
|
|
let cli = Cli::parse_from(["codex-exec", flag, "resume", "--last"]);
|
|
|
|
assert!(cli.auto_review);
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn approve_for_me_flag_conflicts_with_other_sandbox_modes() {
|
|
for conflicting_args in [
|
|
vec!["--sandbox", "read-only"],
|
|
vec!["--dangerously-bypass-approvals-and-sandbox"],
|
|
] {
|
|
let mut args = vec!["codex-exec", "--approve-for-me"];
|
|
args.extend(conflicting_args);
|
|
args.push("summarize");
|
|
|
|
let error = Cli::try_parse_from(args).expect_err("flags should conflict");
|
|
assert_eq!(error.kind(), clap::error::ErrorKind::ArgumentConflict);
|
|
}
|
|
}
|