mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
Reuse code-mode tool catalogs across executions (#61846)
## Why Repeated executions with the same tools resend the full catalog and duplicate tool metadata. Catalog revisions let clients reuse an acknowledged catalog within a session. ## What changed - Negotiate catalog revision support over stdio and gRPC, retaining full requests for hosts without support. - Send tool definitions when installing a revision, then reference that revision for matching executions. Commit client catalog state only after execution admission succeeds; concurrent admissions can send full requests. - Keep immutable tool snapshots for each cell, reject invalid, unknown, or conflicting revisions, and share identical definitions and runtime metadata across sessions in the same process. ## Testing Add tests for acknowledged reuse, abandoned admissions, changed definitions, revision conflicts, session isolation, snapshot lifetimes, and shared metadata. GitOrigin-RevId: d2f29bf668bc2279715f5f1b7d24310923c57d33
This commit is contained in:
@@ -14,7 +14,6 @@ use codex_code_mode_protocol::CodeModeOutputTruncation;
|
||||
use codex_code_mode_protocol::CodeModeSessionCellExecutionLimits;
|
||||
use codex_code_mode_protocol::CodeModeSessionDelegate;
|
||||
use codex_code_mode_protocol::CodeModeSessionOptions;
|
||||
use codex_code_mode_protocol::ExecuteRequest;
|
||||
use codex_code_mode_protocol::StartedCell;
|
||||
use codex_code_mode_protocol::TerminateRequest;
|
||||
use codex_code_mode_protocol::WaitOutcome;
|
||||
@@ -34,6 +33,8 @@ use codex_code_mode_protocol::host::ProtocolVersion;
|
||||
use codex_code_mode_protocol::host::RequestId;
|
||||
use codex_code_mode_protocol::host::SESSION_RESOURCE_LIMITS_CAPABILITY;
|
||||
use codex_code_mode_protocol::host::SupportedProtocolVersions;
|
||||
use codex_code_mode_protocol::host::TOOL_CATALOG_CAPABILITY;
|
||||
use codex_code_mode_protocol::host::WireExecuteRequest;
|
||||
use codex_code_mode_protocol::host::YIELD_OBSERVATION_CAPABILITY;
|
||||
use codex_protocol::shell_environment::scrub_non_inheritable_env_vars;
|
||||
use tokio::io::AsyncBufReadExt;
|
||||
@@ -220,11 +221,14 @@ impl Connection {
|
||||
Capability::new(BOUNDED_OUTPUT_CAPABILITY).map_err(|error| error.to_string())?;
|
||||
let delegate_capacity = Capability::new(LARGE_DELEGATE_CAPACITY_CAPABILITY)
|
||||
.map_err(|error| error.to_string())?;
|
||||
let catalog_capability =
|
||||
Capability::new(TOOL_CATALOG_CAPABILITY).map_err(|error| error.to_string())?;
|
||||
let optional_capabilities = CapabilitySet::try_new([
|
||||
session_limits_capability,
|
||||
yield_capability,
|
||||
output_capability,
|
||||
delegate_capacity,
|
||||
catalog_capability,
|
||||
])
|
||||
.map_err(|error| error.to_string())?;
|
||||
let hello = ClientHello::new(
|
||||
@@ -341,7 +345,7 @@ impl Connection {
|
||||
self.alive.load(Ordering::Acquire)
|
||||
}
|
||||
|
||||
fn supports(&self, capability: &str) -> bool {
|
||||
pub(super) fn supports(&self, capability: &str) -> bool {
|
||||
self.capabilities
|
||||
.iter()
|
||||
.any(|value| value.as_str() == capability)
|
||||
@@ -392,7 +396,7 @@ impl Connection {
|
||||
pub(super) async fn execute(
|
||||
&self,
|
||||
session: RemoteSession,
|
||||
request: ExecuteRequest,
|
||||
request: WireExecuteRequest,
|
||||
delegate: Arc<dyn CodeModeSessionDelegate>,
|
||||
yield_signal: Option<CancellationToken>,
|
||||
) -> Result<StartedCell, String> {
|
||||
|
||||
@@ -3,13 +3,13 @@ use std::sync::Arc;
|
||||
use codex_code_mode_protocol::CodeModeOutputTruncation;
|
||||
use codex_code_mode_protocol::CodeModeSessionDelegate;
|
||||
use codex_code_mode_protocol::CodeModeSessionOptions;
|
||||
use codex_code_mode_protocol::ExecuteRequest;
|
||||
use codex_code_mode_protocol::TerminateRequest;
|
||||
use codex_code_mode_protocol::WaitOutcome;
|
||||
use codex_code_mode_protocol::WaitRequest;
|
||||
use codex_code_mode_protocol::host::ClientToHost;
|
||||
use codex_code_mode_protocol::host::EncodedFrame;
|
||||
use codex_code_mode_protocol::host::HostRequest;
|
||||
use codex_code_mode_protocol::host::WireExecuteRequest;
|
||||
use codex_code_mode_protocol::host::WireOutputTruncation;
|
||||
use codex_code_mode_protocol::host::WireSessionCellExecutionLimits;
|
||||
use codex_code_mode_protocol::host::WireWaitRequest;
|
||||
@@ -144,7 +144,7 @@ impl ConnectionDriver {
|
||||
fn execute(
|
||||
&mut self,
|
||||
session: RemoteSession,
|
||||
request: ExecuteRequest,
|
||||
request: WireExecuteRequest,
|
||||
delegate: Arc<dyn CodeModeSessionDelegate>,
|
||||
caller_cancellation: CancellationToken,
|
||||
yield_signal: Option<CancellationToken>,
|
||||
@@ -154,15 +154,6 @@ impl ConnectionDriver {
|
||||
let _ = response_tx.send(Err(err));
|
||||
return true;
|
||||
}
|
||||
let request = match request.try_into() {
|
||||
Ok(request) => request,
|
||||
Err(err) => {
|
||||
let _ = response_tx.send(Err(format!(
|
||||
"failed to encode code-mode execute request: {err}"
|
||||
)));
|
||||
return true;
|
||||
}
|
||||
};
|
||||
let request_id = match self.requests.allocate_id() {
|
||||
Ok(id) => id,
|
||||
Err(err) => {
|
||||
|
||||
@@ -2,7 +2,6 @@ use std::sync::Arc;
|
||||
|
||||
use codex_code_mode_protocol::CodeModeSessionDelegate;
|
||||
use codex_code_mode_protocol::CodeModeSessionOptions;
|
||||
use codex_code_mode_protocol::ExecuteRequest;
|
||||
use codex_code_mode_protocol::RuntimeResponse;
|
||||
use codex_code_mode_protocol::StartedCell;
|
||||
use codex_code_mode_protocol::TerminateRequest;
|
||||
@@ -14,6 +13,7 @@ use codex_code_mode_protocol::host::HostToClient;
|
||||
use codex_code_mode_protocol::host::RequestId;
|
||||
use codex_code_mode_protocol::host::SessionId;
|
||||
use codex_code_mode_protocol::host::WireCellId;
|
||||
use codex_code_mode_protocol::host::WireExecuteRequest;
|
||||
use codex_code_mode_protocol::host::WireWaitRequest;
|
||||
use tokio::sync::mpsc;
|
||||
use tokio::sync::oneshot;
|
||||
@@ -39,7 +39,7 @@ pub(in crate::remote_session::connection) enum DriverCommand {
|
||||
Execute {
|
||||
session: RemoteSession,
|
||||
delegate: Arc<dyn CodeModeSessionDelegate>,
|
||||
request: ExecuteRequest,
|
||||
request: WireExecuteRequest,
|
||||
caller_cancellation: CancellationToken,
|
||||
yield_signal: Option<CancellationToken>,
|
||||
response_tx: oneshot::Sender<Result<DeliveredExecute, String>>,
|
||||
|
||||
@@ -12,7 +12,6 @@ use codex_code_mode_protocol::CodeModeSession;
|
||||
use codex_code_mode_protocol::CodeModeSessionCellExecutionLimits;
|
||||
use codex_code_mode_protocol::CodeModeSessionDelegate;
|
||||
use codex_code_mode_protocol::CodeModeSessionOptions;
|
||||
use codex_code_mode_protocol::ExecuteRequest;
|
||||
use codex_code_mode_protocol::NotificationFuture;
|
||||
use codex_code_mode_protocol::TerminateRequest;
|
||||
use codex_code_mode_protocol::ToolInvocationFuture;
|
||||
@@ -30,6 +29,7 @@ use codex_code_mode_protocol::host::HostToClient;
|
||||
use codex_code_mode_protocol::host::MAX_PENDING_DELEGATE_CALLS;
|
||||
use codex_code_mode_protocol::host::RequestId;
|
||||
use codex_code_mode_protocol::host::SessionId;
|
||||
use codex_code_mode_protocol::host::WireExecuteRequest;
|
||||
use codex_code_mode_protocol::host::WireNestedToolCall;
|
||||
use codex_code_mode_protocol::host::WireResult;
|
||||
use codex_code_mode_protocol::host::WireRuntimeResponse;
|
||||
@@ -154,7 +154,8 @@ impl DriverHarness {
|
||||
.send(DriverCommand::Execute {
|
||||
session,
|
||||
delegate,
|
||||
request: ExecuteRequest {
|
||||
request: WireExecuteRequest {
|
||||
catalog_revision: None,
|
||||
tool_call_id: format!("call-{request_id}"),
|
||||
enabled_tools: Vec::new(),
|
||||
source: "await new Promise(() => {})".to_string(),
|
||||
@@ -585,7 +586,8 @@ async fn deferred_delegates_follow_cell_readiness_and_cancellation() {
|
||||
.send(DriverCommand::Execute {
|
||||
delegate: delegate.clone(),
|
||||
session: session.clone(),
|
||||
request: ExecuteRequest {
|
||||
request: WireExecuteRequest {
|
||||
catalog_revision: None,
|
||||
tool_call_id: tool_call_id.to_string(),
|
||||
enabled_tools: Vec::new(),
|
||||
source: "text('done')".to_string(),
|
||||
@@ -773,7 +775,8 @@ async fn dropped_open_waiter_shuts_down_committed_session() {
|
||||
.send(DriverCommand::Execute {
|
||||
delegate: Arc::new(RecordingDelegate::default()),
|
||||
session: session.clone(),
|
||||
request: ExecuteRequest {
|
||||
request: WireExecuteRequest {
|
||||
catalog_revision: None,
|
||||
tool_call_id: "call-1".to_string(),
|
||||
enabled_tools: Vec::new(),
|
||||
source: "text('ok')".to_string(),
|
||||
@@ -1731,7 +1734,8 @@ async fn abandoned_execute_is_tracked_and_terminated_after_admission() {
|
||||
.send(DriverCommand::Execute {
|
||||
delegate: delegate.clone(),
|
||||
session: session.clone(),
|
||||
request: ExecuteRequest {
|
||||
request: WireExecuteRequest {
|
||||
catalog_revision: None,
|
||||
tool_call_id: "call-1".to_string(),
|
||||
enabled_tools: Vec::new(),
|
||||
source: "await new Promise(() => {})".to_string(),
|
||||
@@ -1830,7 +1834,8 @@ async fn delivered_but_unclaimed_execute_is_terminated_when_the_caller_is_cancel
|
||||
.send(DriverCommand::Execute {
|
||||
delegate: delegate.clone(),
|
||||
session: session.clone(),
|
||||
request: ExecuteRequest {
|
||||
request: WireExecuteRequest {
|
||||
catalog_revision: None,
|
||||
tool_call_id: "call-1".to_string(),
|
||||
enabled_tools: Vec::new(),
|
||||
source: "await new Promise(() => {})".to_string(),
|
||||
@@ -1995,7 +2000,8 @@ async fn connection_failure_closes_every_live_cell_once() {
|
||||
.send(DriverCommand::Execute {
|
||||
delegate: delegate.clone(),
|
||||
session,
|
||||
request: ExecuteRequest {
|
||||
request: WireExecuteRequest {
|
||||
catalog_revision: None,
|
||||
tool_call_id: "call-1".to_string(),
|
||||
enabled_tools: Vec::new(),
|
||||
source: "await new Promise(() => {})".to_string(),
|
||||
@@ -2175,7 +2181,8 @@ async fn dropped_shutdown_waiter_does_not_abort_remote_cleanup() {
|
||||
.send(DriverCommand::Execute {
|
||||
delegate: Arc::new(RecordingDelegate::default()),
|
||||
session,
|
||||
request: ExecuteRequest {
|
||||
request: WireExecuteRequest {
|
||||
catalog_revision: None,
|
||||
tool_call_id: "call-2".to_string(),
|
||||
enabled_tools: Vec::new(),
|
||||
source: "text('unreachable')".to_string(),
|
||||
|
||||
Reference in New Issue
Block a user