mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
57f337a8e9
## Why Standalone image-generation extensions emitted turn items through the low-level event path, bypassing host-owned finalization such as image persistence and contributor processing. At the same time, the generated-image save-path hint must remain visible to the model through the extension tool's `FunctionCallOutput`, rather than the legacy built-in developer-message path. ## What changed - Extended `ExtensionTurnItem` to support image-generation items while keeping the extension-facing emitter API limited to `emit_started` and `emit_completed`. - Routed extension completion through core `finalize_turn_item`, so standalone image-generation items receive host-owned processing and persisted `saved_path` values before publication. - Kept legacy built-in image generation on its existing developer-message hint path, while standalone image generation returns its deterministic saved-path hint in `FunctionCallOutput`. - Shared the image artifact path and output-hint formatting used by core and the image-generation extension. - Passed thread identity through extension tool calls so standalone image generation can construct the same intended artifact path as core. - Added an app-server integration test covering real standalone image generation, saved artifact publication, model-visible output hint wiring, and absence of the legacy developer-message hint. ## Validation - `just fmt` - `just test -p codex-image-generation-extension` - `just test -p codex-web-search-extension` - `just test -p codex-goal-extension` - `just test -p codex-memories-extension` - Targeted `codex-core` tests for image save history, extension completion finalization, and contributor execution - `just test -p codex-app-server standalone_image_generation_returns_saved_path_hint_to_model` - `just fix -p codex-core` - `just fix -p codex-image-generation-extension` - `just bazel-lock-update` - `just bazel-lock-check`
104 lines
3.4 KiB
Rust
104 lines
3.4 KiB
Rust
use crate::FunctionCallError;
|
|
use crate::ToolName;
|
|
use crate::ToolPayload;
|
|
use codex_protocol::items::ImageGenerationItem;
|
|
use codex_protocol::items::WebSearchItem;
|
|
use codex_protocol::models::ResponseItem;
|
|
use codex_utils_output_truncation::TruncationPolicy;
|
|
use std::future::Future;
|
|
use std::pin::Pin;
|
|
use std::sync::Arc;
|
|
|
|
/// Raw response history snapshot available when an extension tool is invoked.
|
|
#[derive(Clone, Debug, Default)]
|
|
pub struct ConversationHistory {
|
|
items: Arc<[ResponseItem]>,
|
|
}
|
|
|
|
impl ConversationHistory {
|
|
pub fn new(items: Vec<ResponseItem>) -> Self {
|
|
Self {
|
|
items: items.into(),
|
|
}
|
|
}
|
|
|
|
pub fn items(&self) -> &[ResponseItem] {
|
|
&self.items
|
|
}
|
|
}
|
|
|
|
/// Future returned when an extension tool emits a visible turn-item lifecycle event.
|
|
pub type TurnItemEmissionFuture<'a> = Pin<Box<dyn Future<Output = ()> + Send + 'a>>;
|
|
|
|
/// Visible turn items that an extension may publish into the host lifecycle.
|
|
#[derive(Clone, Debug, PartialEq)]
|
|
pub enum ExtensionTurnItem {
|
|
WebSearch(WebSearchItem),
|
|
ImageGeneration(ImageGenerationItem),
|
|
}
|
|
|
|
/// Host-provided capability for extension tools to emit visible turn items.
|
|
///
|
|
/// Implementations route lifecycle events through the host's normal item event
|
|
/// pipeline, including any persistence and client delivery owned by the host.
|
|
pub trait TurnItemEmitter: Send + Sync {
|
|
/// Emits the beginning of one visible turn item.
|
|
fn emit_started<'a>(&'a self, item: ExtensionTurnItem) -> TurnItemEmissionFuture<'a>;
|
|
|
|
/// Emits one visible turn item after host-owned finalization.
|
|
fn emit_completed<'a>(&'a self, item: ExtensionTurnItem) -> TurnItemEmissionFuture<'a>;
|
|
}
|
|
|
|
/// Turn-item emitter used when a caller does not expose visible item emission.
|
|
#[derive(Debug, Default, Clone, Copy)]
|
|
pub struct NoopTurnItemEmitter;
|
|
|
|
impl TurnItemEmitter for NoopTurnItemEmitter {
|
|
fn emit_started<'a>(&'a self, _item: ExtensionTurnItem) -> TurnItemEmissionFuture<'a> {
|
|
Box::pin(std::future::ready(()))
|
|
}
|
|
|
|
fn emit_completed<'a>(&'a self, _item: ExtensionTurnItem) -> TurnItemEmissionFuture<'a> {
|
|
Box::pin(std::future::ready(()))
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct ToolCall {
|
|
pub turn_id: String,
|
|
pub call_id: String,
|
|
pub tool_name: ToolName,
|
|
pub model: String,
|
|
pub truncation_policy: TruncationPolicy,
|
|
pub conversation_history: ConversationHistory,
|
|
pub turn_item_emitter: Arc<dyn TurnItemEmitter>,
|
|
pub payload: ToolPayload,
|
|
}
|
|
|
|
impl std::fmt::Debug for ToolCall {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
f.debug_struct("ToolCall")
|
|
.field("turn_id", &self.turn_id)
|
|
.field("call_id", &self.call_id)
|
|
.field("tool_name", &self.tool_name)
|
|
.field("model", &self.model)
|
|
.field("truncation_policy", &self.truncation_policy)
|
|
.field("conversation_history", &self.conversation_history)
|
|
.field("turn_item_emitter", &"<host turn item emitter>")
|
|
.field("payload", &self.payload)
|
|
.finish()
|
|
}
|
|
}
|
|
|
|
impl ToolCall {
|
|
pub fn function_arguments(&self) -> Result<&str, FunctionCallError> {
|
|
match &self.payload {
|
|
ToolPayload::Function { arguments } => Ok(arguments),
|
|
_ => Err(FunctionCallError::Fatal(format!(
|
|
"tool {} invoked with incompatible payload",
|
|
self.tool_name
|
|
))),
|
|
}
|
|
}
|
|
}
|