openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-27 18:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(stack): finish 20260330 collab integration

Browse Source
This commit is contained in:
Friel
2026-03-30 02:36:50 +00:00
parent 845a0e571a
commit 54ec91e277
9 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/agent/control.rs
+1 -1
View File
@@ -27,9 +27,9 @@ use codex_protocol::models::FunctionCallOutputBody;
use codex_protocol::models::FunctionCallOutputPayload;
use codex_protocol::models::ResponseInputItem;
use codex_protocol::models::ResponseItem;
use codex_protocol::protocol::ForkReferenceItem;
use codex_protocol::protocol::AGENT_INBOX_KIND;
use codex_protocol::protocol::AgentInboxPayload;
use codex_protocol::protocol::ForkReferenceItem;
use codex_protocol::protocol::InitialHistory;
use codex_protocol::protocol::InterAgentCommunication;
use codex_protocol::protocol::Op;
codex-rs/core/src/thread_manager.rs
+1 -1
View File
@@ -34,8 +34,8 @@ use codex_protocol::ThreadId;
use codex_protocol::config_types::CollaborationModeMask;
#[cfg(test)]
use codex_protocol::models::ResponseItem;
use codex_protocol::openai_models::ModelsResponse;
use codex_protocol::openai_models::ModelPreset;
use codex_protocol::openai_models::ModelsResponse;
use codex_protocol::protocol::ForkReferenceItem;
use codex_protocol::protocol::InitialHistory;
use codex_protocol::protocol::McpServerRefreshConfig;
codex-rs/core/src/thread_manager_tests.rs
+1 -1
View File
@@ -14,8 +14,8 @@ use codex_protocol::protocol::UserMessageEvent;
use core_test_support::PathExt;
use core_test_support::responses::mount_models_once;
use pretty_assertions::assert_eq;
use std::path::Path;
use std::collections::HashMap;
use std::path::Path;
use std::time::Duration;
use tempfile::tempdir;
use wiremock::MockServer;
codex-rs/core/src/tools/handlers/multi_agents.rs
-1
View File
@@ -21,7 +21,6 @@ use async_trait::async_trait;
use codex_protocol::ThreadId;
use codex_protocol::models::ResponseInputItem;
use codex_protocol::openai_models::ReasoningEffort;
use codex_protocol::protocol::AgentSpawnMode;
use codex_protocol::protocol::CollabAgentInteractionBeginEvent;
use codex_protocol::protocol::CollabAgentInteractionEndEvent;
use codex_protocol::protocol::CollabAgentRef;
codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
+1 -1
View File
@@ -109,7 +109,7 @@ impl ToolHandler for Handler {
role_name,
/*task_name*/ None,
)?;
let mut candidates_to_try = if fork_context {
let candidates_to_try = if fork_context {
vec![SpawnAgentModelCandidate {
model: None,
reasoning_effort: None,
codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs
+1 -1
View File
@@ -114,7 +114,7 @@ impl ToolHandler for Handler {
}
(_, initial_operation) => initial_operation,
};
let mut candidates_to_try = if fork_context {
let candidates_to_try = if fork_context {
vec![SpawnAgentModelCandidate {
model: None,
reasoning_effort: None,
codex-rs/core/src/tools/spec.rs
-2
View File
@@ -41,8 +41,6 @@ use codex_protocol::protocol::SandboxPolicy;
use codex_protocol::protocol::SessionSource;
use codex_protocol::protocol::SubAgentSource;
use codex_tools::CommandToolOptions;
use codex_tools::FreeformTool;
use codex_tools::FreeformToolFormat;
use codex_tools::ResponsesApiNamespace;
use codex_tools::ResponsesApiNamespaceTool;
use codex_tools::ResponsesApiTool;
codex-rs/tui/src/chatwidget/tests.rs
-1
View File
@@ -2454,7 +2454,6 @@ async fn collab_spawn_end_shows_requested_model_and_effort() {
new_agent_nickname: Some("Robie".to_string()),
new_agent_role: Some("explorer".to_string()),
prompt: "Explore the repo".to_string(),
spawn_mode: codex_protocol::protocol::AgentSpawnMode::Spawn,
model: "gpt-5".to_string(),
reasoning_effort: ReasoningEffortConfig::High,
spawn_mode: codex_protocol::protocol::AgentSpawnMode::Spawn,
codex-rs/tui/src/multi_agents.rs
-2
View File
@@ -610,7 +610,6 @@ mod tests {
new_agent_nickname: Some("Robie".to_string()),
new_agent_role: Some("explorer".to_string()),
prompt: "Compute 11! and reply with just the integer result.".to_string(),
spawn_mode: AgentSpawnMode::Spawn,
model: "gpt-5".to_string(),
reasoning_effort: ReasoningEffortConfig::High,
spawn_mode: AgentSpawnMode::Spawn,
@@ -750,7 +749,6 @@ mod tests {
new_agent_nickname: Some("Robie".to_string()),
new_agent_role: Some("explorer".to_string()),
prompt: String::new(),
spawn_mode: AgentSpawnMode::Spawn,
model: "gpt-5".to_string(),
reasoning_effort: ReasoningEffortConfig::High,
spawn_mode: AgentSpawnMode::Spawn,