Skip to content

Commit 8e8b70d

Browse files
committed
v0.64.0
1 parent a3a6020 commit 8e8b70d

15 files changed

Lines changed: 163 additions & 111 deletions

File tree

codex-rs/Cargo.lock

Lines changed: 138 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codex-rs/app-server/tests/common/mcp_process.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ use tokio::process::Child;
1111
use tokio::process::ChildStdin;
1212
use tokio::process::ChildStdout;
1313

14+
use anyhow::Context;
15+
use anyhow::anyhow;
1416
use codex_app_server_protocol::AddConversationListenerParams;
1517
use codex_app_server_protocol::ArchiveConversationParams;
1618
use codex_app_server_protocol::CancelLoginAccountParams;
@@ -49,8 +51,6 @@ use codex_app_server_protocol::ThreadStartParams;
4951
use codex_app_server_protocol::TurnInterruptParams;
5052
use codex_app_server_protocol::TurnStartParams;
5153
use tokio::process::Command;
52-
use anyhow::anyhow;
53-
use anyhow::Context;
5454

5555
pub struct McpProcess {
5656
next_request_id: AtomicI64,
@@ -87,10 +87,9 @@ impl McpProcess {
8787
.ancestors()
8888
.nth(3)
8989
.unwrap_or_else(|| Path::new(env!("CARGO_MANIFEST_DIR")));
90-
let candidate = workspace_dir.join("target/debug").join(format!(
91-
"codex-app-server{}",
92-
std::env::consts::EXE_SUFFIX
93-
));
90+
let candidate = workspace_dir
91+
.join("target/debug")
92+
.join(format!("codex-app-server{}", std::env::consts::EXE_SUFFIX));
9493
candidate
9594
.exists()
9695
.then_some(candidate)

codex-rs/apply-patch/tests/suite/cli.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ fn test_apply_patch_cli_add_and_update() -> anyhow::Result<()> {
1616
*** End Patch"#
1717
);
1818
let mut cmd = cargo::cargo_bin_cmd!("apply_patch");
19-
cmd
20-
.arg(add_patch)
19+
cmd.arg(add_patch)
2120
.current_dir(tmp.path())
2221
.assert()
2322
.success()
@@ -34,8 +33,7 @@ fn test_apply_patch_cli_add_and_update() -> anyhow::Result<()> {
3433
*** End Patch"#
3534
);
3635
let mut cmd = cargo::cargo_bin_cmd!("apply_patch");
37-
cmd
38-
.arg(update_patch)
36+
cmd.arg(update_patch)
3937
.current_dir(tmp.path())
4038
.assert()
4139
.success()

codex-rs/apply-patch/tests/suite/tool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use assert_cmd::cargo;
21
use assert_cmd::Command;
2+
use assert_cmd::cargo;
33
use pretty_assertions::assert_eq;
44
use std::fs;
55
use std::path::Path;

codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_payload.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ impl RateLimitStatusPayload {
4242
}
4343
}
4444

45-
#[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
46-
#[derive(Default)]
45+
#[derive(
46+
Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize, Default,
47+
)]
4748
pub enum PlanType {
4849
#[serde(rename = "guest")]
4950
#[default]
@@ -73,4 +74,3 @@ pub enum PlanType {
7374
#[serde(rename = "edu")]
7475
Edu,
7576
}
76-

codex-rs/core/src/tools/handlers/read_file.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,6 @@ mod defaults {
466466
}
467467
}
468468

469-
470-
471469
pub fn offset() -> usize {
472470
1
473471
}

codex-rs/core/tests/common/test_codex_exec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![allow(clippy::expect_used)]
22
use codex_core::auth::CODEX_API_KEY_ENV_VAR;
3-
use std::path::PathBuf;
43
use std::path::Path;
4+
use std::path::PathBuf;
55
use tempfile::TempDir;
66
use wiremock::MockServer;
77

codex-rs/core/tests/suite/cli_stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use assert_cmd::Command as AssertCommand;
2-
use std::env;
32
use codex_core::RolloutRecorder;
43
use codex_core::protocol::GitInfo;
54
use core_test_support::fs_wait;
65
use core_test_support::skip_if_no_network;
6+
use std::env;
77
use std::time::Duration;
88
use tempfile::TempDir;
99
use uuid::Uuid;

codex-rs/exec/tests/suite/sandbox.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@ async fn spawn_command_under_sandbox(
4141
env: HashMap<String, String>,
4242
) -> std::io::Result<Child> {
4343
use codex_core::landlock::spawn_command_under_linux_sandbox;
44-
let codex_linux_sandbox_exe = PathBuf::from(
45-
std::env::var("CARGO_BIN_EXE_codex-exec").map_err(|e| {
44+
let codex_linux_sandbox_exe =
45+
PathBuf::from(std::env::var("CARGO_BIN_EXE_codex-exec").map_err(|e| {
4646
io::Error::new(
4747
io::ErrorKind::NotFound,
4848
format!("missing CARGO_BIN_EXE_codex-exec: {e}"),
4949
)
50-
})?,
51-
);
50+
})?);
5251
spawn_command_under_linux_sandbox(
5352
codex_linux_sandbox_exe,
5453
command,

codex-rs/mcp-server/src/codex_tool_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use codex_protocol::config_types::SandboxMode;
55
use codex_utils_json_to_toml::json_to_toml;
66
use mcp_types::Tool;
77
use mcp_types::ToolInputSchema;
8-
use schemars::generate::SchemaSettings;
98
use schemars::JsonSchema;
9+
use schemars::generate::SchemaSettings;
1010
use serde::Deserialize;
1111
use serde::Serialize;
1212
use std::collections::HashMap;

0 commit comments

Comments
 (0)