33d3ecbccc
# Tool System Refactor - Centralizes tool definitions and execution in `core/src/tools/*`: specs (`spec.rs`), handlers (`handlers/*`), router (`router.rs`), registry/dispatch (`registry.rs`), and shared context (`context.rs`). One registry now builds the model-visible tool list and binds handlers. - Router converts model responses to tool calls; Registry dispatches with consistent telemetry via `codex-rs/otel` and unified error handling. Function, Local Shell, MCP, and experimental `unified_exec` all flow through this path; legacy shell aliases still work. - Rationale: reduce per‑tool boilerplate, keep spec/handler in sync, and make adding tools predictable and testable. Example: `read_file` - Spec: `core/src/tools/spec.rs` (see `create_read_file_tool`, registered by `build_specs`). - Handler: `core/src/tools/handlers/read_file.rs` (absolute `file_path`, 1‑indexed `offset`, `limit`, `L#: ` prefixes, safe truncation). - E2E test: `core/tests/suite/read_file.rs` validates the tool returns the requested lines. ## Next steps: - Decompose `handle_container_exec_with_params` - Add parallel tool calls
65 lines
1.6 KiB
Rust
65 lines
1.6 KiB
Rust
mod backends;
|
|
mod cache;
|
|
mod runner;
|
|
mod sandbox;
|
|
|
|
pub(crate) use backends::ExecutionMode;
|
|
pub(crate) use runner::ExecutionRequest;
|
|
pub(crate) use runner::Executor;
|
|
pub(crate) use runner::ExecutorConfig;
|
|
pub(crate) use runner::normalize_exec_result;
|
|
|
|
pub(crate) mod linkers {
|
|
use crate::exec::ExecParams;
|
|
use crate::exec::StdoutStream;
|
|
use crate::executor::backends::ExecutionMode;
|
|
use crate::executor::runner::ExecutionRequest;
|
|
use crate::tools::context::ExecCommandContext;
|
|
|
|
pub struct PreparedExec {
|
|
pub(crate) context: ExecCommandContext,
|
|
pub(crate) request: ExecutionRequest,
|
|
}
|
|
|
|
impl PreparedExec {
|
|
pub fn new(
|
|
context: ExecCommandContext,
|
|
params: ExecParams,
|
|
approval_command: Vec<String>,
|
|
mode: ExecutionMode,
|
|
stdout_stream: Option<StdoutStream>,
|
|
use_shell_profile: bool,
|
|
) -> Self {
|
|
let request = ExecutionRequest {
|
|
params,
|
|
approval_command,
|
|
mode,
|
|
stdout_stream,
|
|
use_shell_profile,
|
|
};
|
|
|
|
Self { context, request }
|
|
}
|
|
}
|
|
}
|
|
|
|
pub mod errors {
|
|
use crate::error::CodexErr;
|
|
use crate::function_tool::FunctionCallError;
|
|
use thiserror::Error;
|
|
|
|
#[derive(Debug, Error)]
|
|
pub enum ExecError {
|
|
#[error(transparent)]
|
|
Function(#[from] FunctionCallError),
|
|
#[error(transparent)]
|
|
Codex(#[from] CodexErr),
|
|
}
|
|
|
|
impl ExecError {
|
|
pub(crate) fn rejection(msg: impl Into<String>) -> Self {
|
|
FunctionCallError::RespondToModel(msg.into()).into()
|
|
}
|
|
}
|
|
}
|