mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
Merge remote-tracking branch 'origin/main' into jif/parallel-tool-calls
# Conflicts: # codex-rs/core/src/client_common.rs # codex-rs/core/src/codex.rs # codex-rs/core/src/config.rs # codex-rs/core/src/lib.rs # codex-rs/core/src/tools/handlers/apply_patch.rs # codex-rs/core/src/tools/handlers/mod.rs # codex-rs/core/src/tools/handlers/plan.rs # codex-rs/core/src/tools/handlers/read_file.rs # codex-rs/core/src/tools/handlers/view_image.rs # codex-rs/core/src/tools/mod.rs # codex-rs/core/src/tools/registry.rs # codex-rs/core/src/tools/router.rs # codex-rs/core/src/tools/spec.rs # codex-rs/core/tests/suite/mod.rs # codex-rs/core/tests/suite/read_file.rs # codex-rs/core/tests/suite/view_image.rs
This commit is contained in:
@@ -11,6 +11,7 @@ pub const JSONRPC_VERSION: &str = "2.0";
|
||||
#[serde(untagged)]
|
||||
pub enum RequestId {
|
||||
String(String),
|
||||
#[ts(type = "number")]
|
||||
Integer(i64),
|
||||
}
|
||||
|
||||
|
||||
@@ -727,6 +727,7 @@ pub struct FuzzyFileSearchParams {
|
||||
pub struct FuzzyFileSearchResult {
|
||||
pub root: String,
|
||||
pub path: String,
|
||||
pub file_name: String,
|
||||
pub score: u32,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub indices: Option<Vec<u32>>,
|
||||
|
||||
Reference in New Issue
Block a user