Merge f5d320beaa into sapling-pr-archive-bolinfest

codex-rs/Cargo.lock

@@ -475,7 +475,6 @@ dependencies = [
  "clap",
  "codex-core",
  "codex-exec",
- "codex-interactive",
  "codex-repl",
  "codex-tui",
  "serde_json",
@@ -554,16 +553,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "codex-interactive"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "codex-core",
- "tokio",
-]
-
 [[package]]
 name = "codex-repl"
 version = "0.1.0"

codex-rs/Cargo.toml

@@ -7,7 +7,6 @@ members = [
     "core",
     "exec",
     "execpolicy",
-    "interactive",
     "repl",
     "tui",
 ]

codex-rs/cli/Cargo.toml

@@ -12,7 +12,6 @@ anyhow = "1"
 clap = { version = "4", features = ["derive"] }
 codex-core = { path = "../core" }
 codex-exec = { path = "../exec" }
-codex-interactive = { path = "../interactive" }
 codex-repl = { path = "../repl" }
 codex-tui = { path = "../tui" }
 serde_json = "1"

codex-rs/cli/src/main.rs

@@ -7,7 +7,6 @@ use clap::ArgAction;
 use clap::Parser;
 use codex_core::SandboxModeCliArg;
 use codex_exec::Cli as ExecCli;
-use codex_interactive::Cli as InteractiveCli;
 use codex_repl::Cli as ReplCli;
 use codex_tui::Cli as TuiCli;
 
@@ -25,7 +24,7 @@ use crate::proto::ProtoCli;
 )]
 struct MultitoolCli {
     #[clap(flatten)]
-    interactive: InteractiveCli,
+    interactive: TuiCli,
 
     #[clap(subcommand)]
     subcommand: Option<Subcommand>,
@@ -37,10 +36,6 @@ enum Subcommand {
     #[clap(visible_alias = "e")]
     Exec(ExecCli),
 
-    /// Run the TUI.
-    #[clap(visible_alias = "t")]
-    Tui(TuiCli),
-
     /// Run the REPL.
     #[clap(visible_alias = "r")]
     Repl(ReplCli),
@@ -89,14 +84,11 @@ async fn main() -> anyhow::Result<()> {
 
     match cli.subcommand {
         None => {
-            codex_interactive::run_main(cli.interactive).await?;
+            codex_tui::run_main(cli.interactive)?;
         }
         Some(Subcommand::Exec(exec_cli)) => {
             codex_exec::run_main(exec_cli).await?;
         }
-        Some(Subcommand::Tui(tui_cli)) => {
-            codex_tui::run_main(tui_cli)?;
-        }
         Some(Subcommand::Repl(repl_cli)) => {
             codex_repl::run_main(repl_cli).await?;
         }

codex-rs/interactive/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "codex-interactive"
-version = "0.1.0"
-edition = "2021"
-
-[[bin]]
-name = "codex-interactive"
-path = "src/main.rs"
-
-[lib]
-name = "codex_interactive"
-path = "src/lib.rs"
-
-[dependencies]
-anyhow = "1"
-clap = { version = "4", features = ["derive"] }
-codex-core = { path = "../core", features = ["cli"] }
-tokio = { version = "1", features = [
-    "io-std",
-    "macros",
-    "process",
-    "rt-multi-thread",
-    "signal",
-] }

codex-rs/interactive/src/cli.rs

@@ -1,33 +0,0 @@
-use clap::Parser;
-use codex_core::ApprovalModeCliArg;
-use codex_core::SandboxModeCliArg;
-use std::path::PathBuf;
-
-#[derive(Parser, Debug)]
-#[command(version)]
-pub struct Cli {
-    /// Optional image(s) to attach to the initial prompt.
-    #[arg(long = "image", short = 'i', value_name = "FILE", value_delimiter = ',', num_args = 1..)]
-    pub images: Vec<PathBuf>,
-
-    /// Model the agent should use.
-    #[arg(long, short = 'm')]
-    pub model: Option<String>,
-
-    /// Configure when the model requires human approval before executing a command.
-    #[arg(long = "ask-for-approval", short = 'a', value_enum, default_value_t = ApprovalModeCliArg::OnFailure)]
-    pub approval_policy: ApprovalModeCliArg,
-
-    /// Configure the process restrictions when a command is executed.
-    ///
-    /// Uses OS-specific sandboxing tools; Seatbelt on OSX, landlock+seccomp on Linux.
-    #[arg(long = "sandbox", short = 's')]
-    pub sandbox_policy: Option<SandboxModeCliArg>,
-
-    /// Allow running Codex outside a Git repository.
-    #[arg(long = "skip-git-repo-check", default_value_t = false)]
-    pub skip_git_repo_check: bool,
-
-    /// Initial instructions for the agent.
-    pub prompt: Option<String>,
-}

codex-rs/interactive/src/lib.rs

@@ -1,7 +0,0 @@
-mod cli;
-pub use cli::Cli;
-
-pub async fn run_main(_cli: Cli) -> anyhow::Result<()> {
-    eprintln!("Interactive mode is not implemented yet.");
-    std::process::exit(1);
-}

codex-rs/interactive/src/main.rs

@@ -1,11 +0,0 @@
-use clap::Parser;
-use codex_interactive::run_main;
-use codex_interactive::Cli;
-
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    let cli = Cli::parse();
-    run_main(cli).await?;
-
-    Ok(())
-}