mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
feedback
This commit is contained in:
@@ -122,15 +122,6 @@ impl Codex {
|
||||
// experimental resume path (undocumented)
|
||||
let resume_path = config.experimental_resume.clone();
|
||||
info!("resume_path: {resume_path:?}");
|
||||
// Use a bounded channel for submissions to retain backpressure on the
|
||||
// producer of Ops, but avoid blocking the agent on event delivery to
|
||||
// the UI. If the event queue fills and is not drained (e.g., if the
|
||||
// UI forwarder task exits unexpectedly), a bounded channel here would
|
||||
// cause the agent to block inside `send(event).await`, which in turn
|
||||
// prevents it from handling interrupts (Ctrl-C) or any further Ops.
|
||||
// An unbounded channel for events ensures the agent never deadlocks on
|
||||
// UI delivery; the UI remains responsible for rendering/consuming at
|
||||
// its own pace.
|
||||
let (tx_sub, rx_sub) = async_channel::bounded(64);
|
||||
let (tx_event, rx_event) = async_channel::unbounded();
|
||||
|
||||
@@ -1383,8 +1374,6 @@ async fn try_run_turn(
|
||||
return Ok(output);
|
||||
}
|
||||
ResponseEvent::OutputTextDelta(delta) => {
|
||||
// Stream assistant text into in-memory conversation history so
|
||||
// subsequent turns (e.g. tool calls) see the partial message.
|
||||
{
|
||||
let mut st = sess.state.lock().unwrap();
|
||||
st.history.append_assistant_text(&delta);
|
||||
|
||||
@@ -48,7 +48,6 @@ impl ConversationHistory {
|
||||
append_text_content(last_content, new_content);
|
||||
}
|
||||
_ => {
|
||||
// Note agent-loop.ts also does filtering on some of the fields.
|
||||
self.items.push(item.clone());
|
||||
}
|
||||
}
|
||||
@@ -144,3 +143,103 @@ fn append_text_delta(content: &mut Vec<crate::models::ContentItem>, delta: &str)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::models::ContentItem;
|
||||
|
||||
fn assistant_msg(text: &str) -> ResponseItem {
|
||||
ResponseItem::Message {
|
||||
id: None,
|
||||
role: "assistant".to_string(),
|
||||
content: vec![ContentItem::OutputText {
|
||||
text: text.to_string(),
|
||||
}],
|
||||
}
|
||||
}
|
||||
|
||||
fn user_msg(text: &str) -> ResponseItem {
|
||||
ResponseItem::Message {
|
||||
id: None,
|
||||
role: "user".to_string(),
|
||||
content: vec![ContentItem::OutputText {
|
||||
text: text.to_string(),
|
||||
}],
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn merges_adjacent_assistant_messages() {
|
||||
let mut h = ConversationHistory::default();
|
||||
let a1 = assistant_msg("Hello");
|
||||
let a2 = assistant_msg(", world!");
|
||||
h.record_items([&a1, &a2]);
|
||||
|
||||
let items = h.contents();
|
||||
assert_eq!(items.len(), 1, "adjacent assistant messages should merge");
|
||||
if let ResponseItem::Message { role, content, .. } = &items[0] {
|
||||
assert_eq!(role, "assistant");
|
||||
let text = match &content[0] {
|
||||
ContentItem::OutputText { text } => text,
|
||||
_ => panic!("expected OutputText"),
|
||||
};
|
||||
assert_eq!(text, "Hello, world!");
|
||||
} else {
|
||||
panic!("expected Message");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn append_assistant_text_creates_and_appends() {
|
||||
let mut h = ConversationHistory::default();
|
||||
h.append_assistant_text("Hello");
|
||||
h.append_assistant_text(", world");
|
||||
|
||||
// Now record a final full assistant message and verify it merges.
|
||||
let final_msg = assistant_msg("!");
|
||||
h.record_items([&final_msg]);
|
||||
|
||||
let items = h.contents();
|
||||
assert_eq!(items.len(), 1);
|
||||
if let ResponseItem::Message { role, content, .. } = &items[0] {
|
||||
assert_eq!(role, "assistant");
|
||||
let text = match &content[0] {
|
||||
ContentItem::OutputText { text } => text,
|
||||
_ => panic!("expected OutputText"),
|
||||
};
|
||||
assert_eq!(text, "Hello, world!");
|
||||
} else {
|
||||
panic!("expected Message");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn filters_non_api_messages() {
|
||||
let mut h = ConversationHistory::default();
|
||||
// System message is not an API message; Other is ignored.
|
||||
let system = ResponseItem::Message {
|
||||
id: None,
|
||||
role: "system".to_string(),
|
||||
content: vec![ContentItem::OutputText {
|
||||
text: "ignored".to_string(),
|
||||
}],
|
||||
};
|
||||
h.record_items([&system, &ResponseItem::Other]);
|
||||
|
||||
// User and assistant should be retained.
|
||||
let u = user_msg("hi");
|
||||
let a = assistant_msg("hello");
|
||||
h.record_items([&u, &a]);
|
||||
|
||||
let items = h.contents();
|
||||
assert_eq!(items.len(), 2);
|
||||
match (&items[0], &items[1]) {
|
||||
(ResponseItem::Message { role: r0, .. }, ResponseItem::Message { role: r1, .. }) => {
|
||||
assert_eq!(r0, "user");
|
||||
assert_eq!(r1, "assistant");
|
||||
}
|
||||
_ => panic!("expected two Message items"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user