mirror of
https://github.com/openai/codex.git
synced 2026-05-03 21:01:55 +03:00
## Why The recent `codex-tools` migration steps have moved shared tool models and low-coupling spec helpers out of `codex-core`, but `core/src/tools/spec.rs` still owned a large block of pure collaboration-tool spec construction. Those builders do not need session state or runtime behavior; they only need a small amount of core-owned configuration injected at the seam. Moving that cohesive slice into `codex-tools` makes the crate boundary more honest and removes a substantial amount of passive tool-spec logic from `codex-core` without trying to move the runtime-coupled multi-agent handlers at the same time. ## What changed - added `agent_tool.rs`, `request_user_input_tool.rs`, and `agent_job_tool.rs` to `codex-tools`, with sibling `*_tests.rs` coverage and an exports-only `lib.rs` - moved the pure `ToolSpec` builders for: - collaboration tools such as `spawn_agent`, `send_input`, `send_message`, `assign_task`, `resume_agent`, `wait_agent`, `list_agents`, and `close_agent` - `request_user_input` - agent-job specs `spawn_agents_on_csv` and `report_agent_job_result` - rewired `core/src/tools/spec.rs` to call the extracted builders while still supplying the core-owned inputs, such as spawn-agent role descriptions and wait timeout bounds - updated the `core/src/tools/spec.rs` seam tests to build expected collaboration specs through `codex-tools` - updated `codex-rs/tools/README.md` so the crate documentation reflects the broader collaboration-tool boundary ## Test plan - `CARGO_TARGET_DIR=/tmp/codex-tools-collab-specs cargo test -p codex-tools` - `CARGO_TARGET_DIR=/tmp/codex-core-collab-specs cargo test -p codex-core --lib tools::spec::` - `just fix -p codex-tools -p codex-core` - `just argument-comment-lint` ## References - #15923 - #15928 - #15944 - #15953 - #16031 - #16047 - #16129 - #16132 - #16138
141 lines
5.9 KiB
Rust
141 lines
5.9 KiB
Rust
use super::*;
|
|
use pretty_assertions::assert_eq;
|
|
use std::collections::BTreeMap;
|
|
|
|
#[test]
|
|
fn spawn_agents_on_csv_tool_requires_csv_and_instruction() {
|
|
assert_eq!(
|
|
create_spawn_agents_on_csv_tool(),
|
|
ToolSpec::Function(ResponsesApiTool {
|
|
name: "spawn_agents_on_csv".to_string(),
|
|
description: "Process a CSV by spawning one worker sub-agent per row. The instruction string is a template where `{column}` placeholders are replaced with row values. Each worker must call `report_agent_job_result` with a JSON object (matching `output_schema` when provided); missing reports are treated as failures. This call blocks until all rows finish and automatically exports results to `output_csv_path` (or a default path)."
|
|
.to_string(),
|
|
strict: false,
|
|
defer_loading: None,
|
|
parameters: JsonSchema::Object {
|
|
properties: BTreeMap::from([
|
|
(
|
|
"csv_path".to_string(),
|
|
JsonSchema::String {
|
|
description: Some("Path to the CSV file containing input rows.".to_string()),
|
|
},
|
|
),
|
|
(
|
|
"instruction".to_string(),
|
|
JsonSchema::String {
|
|
description: Some(
|
|
"Instruction template to apply to each CSV row. Use {column_name} placeholders to inject values from the row."
|
|
.to_string(),
|
|
),
|
|
},
|
|
),
|
|
(
|
|
"id_column".to_string(),
|
|
JsonSchema::String {
|
|
description: Some("Optional column name to use as stable item id.".to_string()),
|
|
},
|
|
),
|
|
(
|
|
"output_csv_path".to_string(),
|
|
JsonSchema::String {
|
|
description: Some("Optional output CSV path for exported results.".to_string()),
|
|
},
|
|
),
|
|
(
|
|
"max_concurrency".to_string(),
|
|
JsonSchema::Number {
|
|
description: Some(
|
|
"Maximum concurrent workers for this job. Defaults to 16 and is capped by config."
|
|
.to_string(),
|
|
),
|
|
},
|
|
),
|
|
(
|
|
"max_workers".to_string(),
|
|
JsonSchema::Number {
|
|
description: Some(
|
|
"Alias for max_concurrency. Set to 1 to run sequentially.".to_string(),
|
|
),
|
|
},
|
|
),
|
|
(
|
|
"max_runtime_seconds".to_string(),
|
|
JsonSchema::Number {
|
|
description: Some(
|
|
"Maximum runtime per worker before it is failed. Defaults to 1800 seconds."
|
|
.to_string(),
|
|
),
|
|
},
|
|
),
|
|
(
|
|
"output_schema".to_string(),
|
|
JsonSchema::Object {
|
|
properties: BTreeMap::new(),
|
|
required: None,
|
|
additional_properties: None,
|
|
},
|
|
),
|
|
]),
|
|
required: Some(vec!["csv_path".to_string(), "instruction".to_string()]),
|
|
additional_properties: Some(false.into()),
|
|
},
|
|
output_schema: None,
|
|
})
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn report_agent_job_result_tool_requires_result_payload() {
|
|
assert_eq!(
|
|
create_report_agent_job_result_tool(),
|
|
ToolSpec::Function(ResponsesApiTool {
|
|
name: "report_agent_job_result".to_string(),
|
|
description:
|
|
"Worker-only tool to report a result for an agent job item. Main agents should not call this."
|
|
.to_string(),
|
|
strict: false,
|
|
defer_loading: None,
|
|
parameters: JsonSchema::Object {
|
|
properties: BTreeMap::from([
|
|
(
|
|
"job_id".to_string(),
|
|
JsonSchema::String {
|
|
description: Some("Identifier of the job.".to_string()),
|
|
},
|
|
),
|
|
(
|
|
"item_id".to_string(),
|
|
JsonSchema::String {
|
|
description: Some("Identifier of the job item.".to_string()),
|
|
},
|
|
),
|
|
(
|
|
"result".to_string(),
|
|
JsonSchema::Object {
|
|
properties: BTreeMap::new(),
|
|
required: None,
|
|
additional_properties: None,
|
|
},
|
|
),
|
|
(
|
|
"stop".to_string(),
|
|
JsonSchema::Boolean {
|
|
description: Some(
|
|
"Optional. When true, cancels the remaining job items after this result is recorded."
|
|
.to_string(),
|
|
),
|
|
},
|
|
),
|
|
]),
|
|
required: Some(vec![
|
|
"job_id".to_string(),
|
|
"item_id".to_string(),
|
|
"result".to_string(),
|
|
]),
|
|
additional_properties: Some(false.into()),
|
|
},
|
|
output_schema: None,
|
|
})
|
|
);
|
|
}
|