Skip to content

Switchyard lets LLM applications route traffic across models and providers while preserving native OpenAI and Anthropic API compatibility - enabling flexible model selection, benchmarking, and cost/performance optimization.

Rust

fix(libsy): preserve routing across Codex environment updates (#1191)

ryan-lempkabdd7647b5d55
diff --git a/crates/libsy/src/algorithms/composite.rs b/crates/libsy/src/algorithms/composite.rs
index 7d22e8a0f..a426c7f34 100644
--- a/crates/libsy/src/algorithms/composite.rs
+++ b/crates/libsy/src/algorithms/composite.rs
@@ -456,12 +456,18 @@ mod tests {
{
call.name = "Write".into();
}
+ let mut context_update = write.clone();
+ context_update.llm_request.messages.push(Message::text(
+ Role::User,
+ "<environment_context><current_date>2026-10-31</current_date></environment_context>",
+ ));
let mut state = State::default();
for (p_solve, request, target, prompt) in [
(1.0, user_turn_request(), first_target, first_prompt),
(1.0, turn_request(true), "strong", "EF capable"),
(0.0, user_turn_request(), "strong", "CF capable"),
(0.0, write, "weak", "CF efficient"),
+ (1.0, context_update, "weak", "CF efficient"),
(1.0, user_turn_request(), first_target, first_prompt),
(0.0, user_turn_request(), "strong", "CF capable"),
] {
diff --git a/crates/libsy/src/algorithms/llm_class.rs b/crates/libsy/src/algorithms/llm_class.rs
index 450c67077..010cd93a5 100644
--- a/crates/libsy/src/algorithms/llm_class.rs
+++ b/crates/libsy/src/algorithms/llm_class.rs
@@ -18,7 +18,7 @@ pub use decision::DecisionJudgeConfig;
use super::escalation;
use super::fall_through::FallThrough;
use super::util::DEFAULT_JUDGE_MAX_OUTPUT_TOKENS;
-use super::util::affinity::{AffinityRouter, ClassifyTrigger};
+use super::util::affinity::{AffinityRouter, ClassifyTrigger, is_user_turn};
use super::util::classifier_contract::{
ClassifierContract, ClassifierContractConfig, ClassifierResponseFormat,
};
@@ -104,7 +104,7 @@ impl TaskClassifierVerdict {
fn trim_messages(messages: &[Message], recent_turn_window: usize) -> Vec<Message> {
let is_instruction = |message: &Message| matches!(message.role, Role::System | Role::Developer);
let mut kept: Vec<&Message> = messages.iter().filter(|m| is_instruction(m)).collect();
- let Some(task) = messages.iter().position(|m| m.role == Role::User) else {
+ let Some(task) = messages.iter().position(is_user_turn) else {
return kept.into_iter().cloned().collect();
};
kept.push(&messages[task]);
@@ -169,9 +169,9 @@ fn task_messages(messages: &[Message]) -> Vec<Message> {
| ContentBlock::Reasoning { .. }
)
};
- let mut user_messages = messages.iter().filter(|message| {
- message.role == Role::User && message.content.iter().any(is_task_content)
- });
+ let mut user_messages = messages
+ .iter()
+ .filter(|message| is_user_turn(message) && message.content.iter().any(is_task_content));
let Some(opening_task) = user_messages.next() else {
return Vec::new();
};
@@ -1832,6 +1832,10 @@ mod tests {
llm_request: LlmRequest {
messages: vec![
Message::text(Role::System, "client instructions"),
+ Message::text(
+ Role::User,
+ "<environment_context>setup</environment_context>",
+ ),
Message::text(Role::User, "initial task"),
Message::text(Role::Assistant, "old response"),
Message::text(Role::User, "old follow-up"),
@@ -1899,6 +1903,10 @@ mod tests {
#[test]
fn default_task_input_keeps_user_content_around_tool_results() {
+ let context = Message::text(
+ Role::User,
+ "<environment_context><current_date>2026-10-31</current_date></environment_context>",
+ );
let mut result = tool_result("call-1");
result.role = Role::User;
let mut mixed = result.clone();
@@ -1911,11 +1919,13 @@ mod tests {
let mut request = Request {
llm_request: LlmRequest {
messages: vec![
+ context.clone(),
result.clone(),
Message::text(Role::User, "initial task"),
tool_call("call-1"),
mixed,
result.clone(),
+ context,
],
..LlmRequest::default()
},
diff --git a/crates/libsy/src/algorithms/util/affinity.rs b/crates/libsy/src/algorithms/util/affinity.rs
index 1e7a8d80d..b236cf876 100644
--- a/crates/libsy/src/algorithms/util/affinity.rs
+++ b/crates/libsy/src/algorithms/util/affinity.rs
@@ -48,18 +48,33 @@ pub enum ClassifyTrigger {
NewSession,
}
-/// Anthropic carries tool results as a `Role::User` message, so role alone cannot tell a
-/// human turn from a tool continuation.
+/// Tool results and standalone Codex environment updates do not start a user turn.
pub(crate) fn is_user_turn(message: &Message) -> bool {
message.role == Role::User
- && !message
- .content
- .iter()
- .all(|block| matches!(block, ContentBlock::ToolResult(_)))
+ && message.content.iter().any(|block| {
+ !matches!(block, ContentBlock::ToolResult(_)) && !is_environment_context(block)
+ })
+}
+
+fn is_environment_context(block: &ContentBlock) -> bool {
+ matches!(block, ContentBlock::Text { text } if text.trim()
+ .strip_prefix("<environment_context>")
+ .and_then(|context| context.split_once("</environment_context>"))
+ .is_some_and(|(_, rest)| rest.trim().is_empty()))
+}
+
+pub(crate) fn is_environment_update(message: &Message) -> bool {
+ message.role == Role::User
+ && !message.content.is_empty()
+ && message.content.iter().all(is_environment_context)
}
pub(crate) fn has_new_user_turn(messages: &[Message]) -> bool {
- messages.last().is_some_and(is_user_turn)
+ messages
+ .iter()
+ .rev()
+ .find(|message| !is_environment_update(message))
+ .is_some_and(is_user_turn)
}
/// Who started the request, `user` or `agent` (GitHub Copilot's convention).
@@ -325,6 +340,42 @@ mod tests {
/// Boxed, thread-safe error type keeping the test helpers ergonomic.
type BoxErr = Box<dyn std::error::Error + Send + Sync>;
+ #[test]
+ fn environment_updates_preserve_real_user_content() {
+ let context =
+ "<environment_context><current_date>2026-10-31</current_date></environment_context>";
+ assert!(!is_user_turn(&Message::text(
+ Role::User,
+ format!(" {context}\n")
+ )));
+ assert!(is_user_turn(&Message::text(
+ Role::User,
+ format!("{context}\nfix the parser")
+ )));
+ assert!(is_user_turn(&Message::text(
+ Role::User,
+ format!("explain this: {context}")
+ )));
+ let mut mixed = Message::text(Role::User, context);
+ mixed.content.push(ContentBlock::Text {
+ text: "fix the parser".into(),
+ });
+ assert!(is_user_turn(&mixed));
+ for (role, expected) in [
+ (Role::User, true),
+ (Role::Assistant, false),
+ (Role::Tool, false),
+ ] {
+ assert_eq!(
+ has_new_user_turn(&[
+ Message::text(role, "follow-up"),
+ Message::text(Role::User, context),
+ ]),
+ expected
+ );
+ }
+ }
+
fn fixed_model(target: &str) -> ModelId {
ModelId::from(target)
}
diff --git a/crates/libsy/src/algorithms/vgr/tests.rs b/crates/libsy/src/algorithms/vgr/tests.rs
index 741eaf732..a0b43f4ac 100644
--- a/crates/libsy/src/algorithms/vgr/tests.rs
+++ b/crates/libsy/src/algorithms/vgr/tests.rs
@@ -112,6 +112,10 @@ fn router_typing_selects_the_verification_regime() {
let mut follow_up = session.llm_request.messages.clone();
follow_up.extend([
Message::text(Role::Assistant, "The build passes."),
+ Message::text(
+ Role::User,
+ "<environment_context>update</environment_context>",
+ ),
Message::text(Role::User, "What is 1+1?"),
]);
let follow_up = request(follow_up);
diff --git a/crates/libsy/src/algorithms/vgr/text.rs b/crates/libsy/src/algorithms/vgr/text.rs
index 887093da7..6148a5b1a 100644
--- a/crates/libsy/src/algorithms/vgr/text.rs
+++ b/crates/libsy/src/algorithms/vgr/text.rs
@@ -11,7 +11,7 @@ use regex::Regex;
use serde_json::Value;
use switchyard_protocol::{ContentBlock, InstructionBlock, Message, Request, Role, ToolResult};
-use crate::algorithms::util::affinity::{initiated_by_user, is_user_turn};
+use crate::algorithms::util::affinity::{initiated_by_user, is_environment_update, is_user_turn};
use crate::algorithms::util::tool_signals::classify_text;
/// One flattened turn: instructions first, then messages.
@@ -128,7 +128,12 @@ pub(super) fn has_tool_trajectory(request: &Request) -> bool {
pub(super) fn starts_user_turn(messages: &[Message], index: usize) -> bool {
let (Some(message), Some(previous)) = (
messages.get(index),
- index.checked_sub(1).and_then(|i| messages.get(i)),
+ messages.get(..index).and_then(|previous| {
+ previous
+ .iter()
+ .rev()
+ .find(|message| !is_environment_update(message))
+ }),
) else {
return false;
};