425c8dc372
## Summary - add a shared git-ref resolver and use it for `codex cloud exec` and TUI task submission - expose a new `--branch` flag to override the git ref passed to cloud tasks - cover the git-ref resolution behavior with new async unit tests and supporting dev dependencies ## Testing - cargo test -p codex-cloud-tasks ------ [Codex Task](https://chatgpt.com/codex/tasks/task_i_692decc6cbec8332953470ef063e11ab) --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Jeremy Rose <172423086+nornagon-openai@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@openai.com>
88 lines
2.4 KiB
Rust
88 lines
2.4 KiB
Rust
use clap::Args;
|
|
use clap::Parser;
|
|
use codex_common::CliConfigOverrides;
|
|
|
|
#[derive(Parser, Debug, Default)]
|
|
#[command(version)]
|
|
pub struct Cli {
|
|
#[clap(skip)]
|
|
pub config_overrides: CliConfigOverrides,
|
|
|
|
#[command(subcommand)]
|
|
pub command: Option<Command>,
|
|
}
|
|
|
|
#[derive(Debug, clap::Subcommand)]
|
|
pub enum Command {
|
|
/// Submit a new Codex Cloud task without launching the TUI.
|
|
Exec(ExecCommand),
|
|
/// Show the status of a Codex Cloud task.
|
|
Status(StatusCommand),
|
|
/// Apply the diff for a Codex Cloud task locally.
|
|
Apply(ApplyCommand),
|
|
/// Show the unified diff for a Codex Cloud task.
|
|
Diff(DiffCommand),
|
|
}
|
|
|
|
#[derive(Debug, Args)]
|
|
pub struct ExecCommand {
|
|
/// Task prompt to run in Codex Cloud.
|
|
#[arg(value_name = "QUERY")]
|
|
pub query: Option<String>,
|
|
|
|
/// Target environment identifier (see `codex cloud` to browse).
|
|
#[arg(long = "env", value_name = "ENV_ID")]
|
|
pub environment: String,
|
|
|
|
/// Number of assistant attempts (best-of-N).
|
|
#[arg(
|
|
long = "attempts",
|
|
default_value_t = 1usize,
|
|
value_parser = parse_attempts
|
|
)]
|
|
pub attempts: usize,
|
|
|
|
/// Git branch to run in Codex Cloud (defaults to current branch).
|
|
#[arg(long = "branch", value_name = "BRANCH")]
|
|
pub branch: Option<String>,
|
|
}
|
|
|
|
fn parse_attempts(input: &str) -> Result<usize, String> {
|
|
let value: usize = input
|
|
.parse()
|
|
.map_err(|_| "attempts must be an integer between 1 and 4".to_string())?;
|
|
if (1..=4).contains(&value) {
|
|
Ok(value)
|
|
} else {
|
|
Err("attempts must be between 1 and 4".to_string())
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Args)]
|
|
pub struct StatusCommand {
|
|
/// Codex Cloud task identifier to inspect.
|
|
#[arg(value_name = "TASK_ID")]
|
|
pub task_id: String,
|
|
}
|
|
|
|
#[derive(Debug, Args)]
|
|
pub struct ApplyCommand {
|
|
/// Codex Cloud task identifier to apply.
|
|
#[arg(value_name = "TASK_ID")]
|
|
pub task_id: String,
|
|
|
|
/// Attempt number to apply (1-based).
|
|
#[arg(long = "attempt", value_parser = parse_attempts, value_name = "N")]
|
|
pub attempt: Option<usize>,
|
|
}
|
|
|
|
#[derive(Debug, Args)]
|
|
pub struct DiffCommand {
|
|
/// Codex Cloud task identifier to display.
|
|
#[arg(value_name = "TASK_ID")]
|
|
pub task_id: String,
|
|
|
|
/// Attempt number to display (1-based).
|
|
#[arg(long = "attempt", value_parser = parse_attempts, value_name = "N")]
|
|
pub attempt: Option<usize>,
|
|
}
|