codex: rename injected message module

codex-rs/core/src/codex/timer_runtime.rs

@@ -31,13 +31,13 @@ use super::Event;
 use super::EventMsg;
 use super::INITIAL_SUBMIT_ID;
 use super::Session;
-use crate::messages::MessageInvocationContext;
-use crate::messages::MessageInvocationKind;
-use crate::messages::MessagePayload;
-use crate::messages::db_message_to_thread_message;
-use crate::messages::injected_message_event;
-use crate::messages::message_prompt_input_item;
-use crate::messages::validate_meta;
+use crate::injected_message::MessageInvocationContext;
+use crate::injected_message::MessageInvocationKind;
+use crate::injected_message::MessagePayload;
+use crate::injected_message::db_message_to_thread_message;
+use crate::injected_message::injected_message_event;
+use crate::injected_message::message_prompt_input_item;
+use crate::injected_message::validate_meta;
 use crate::pending_input::GeneratedMessageInput;
 use crate::pending_input::PendingInputItem;
 use crate::timers::ClaimedTimer;

codex-rs/core/src/codex/timer_runtime_tests.rs

@@ -1,5 +1,5 @@
 use super::make_session_and_context_with_rx;
-use crate::messages::MessagePayload;
+use crate::injected_message::MessagePayload;
 use crate::timers::MAX_ACTIVE_TIMERS_PER_THREAD;
 use crate::timers::ThreadTimerTrigger;
 use crate::timers::TimerDelivery;

codex-rs/core/src/codex_thread.rs

@@ -29,7 +29,7 @@ use std::path::PathBuf;
 use tokio::sync::Mutex;
 use tokio::sync::watch;
 
-use crate::messages::MessagePayload;
+use crate::injected_message::MessagePayload;
 use crate::timers::ThreadTimer;
 use crate::timers::ThreadTimerTrigger;
 use crate::timers::TimerDelivery;

codex-rs/core/src/lib.rs

@@ -59,12 +59,12 @@ mod original_image_detail;
 pub use codex_mcp::MCP_SANDBOX_STATE_CAPABILITY;
 pub use codex_mcp::MCP_SANDBOX_STATE_METHOD;
 pub use codex_mcp::SandboxState;
+pub mod injected_message;
 mod mcp_openai_file;
 mod mcp_tool_call;
 mod memories;
 pub(crate) mod mention_syntax;
 pub(crate) mod message_history;
-pub mod messages;
 pub(crate) mod pending_input;
 pub(crate) mod utils;
 pub use mention_syntax::PLUGIN_TEXT_MENTION_SIGIL;

codex-rs/core/src/timers.rs

@@ -4,10 +4,10 @@
 //! message injected when a timer fires, and the persistent state shape used to
 //! restore timers after a harness restart.
 
-use crate::messages::MessageInvocationContext;
-use crate::messages::MessageInvocationKind;
-use crate::messages::MessagePayload;
-use crate::messages::validate_meta;
+use crate::injected_message::MessageInvocationContext;
+use crate::injected_message::MessageInvocationKind;
+use crate::injected_message::MessagePayload;
+use crate::injected_message::validate_meta;
 use crate::timer_trigger::TimerTrigger;
 use crate::timer_trigger::TriggerTiming;
 use crate::timer_trigger::next_run_after_due;
@@ -482,7 +482,7 @@ pub fn build_thread_timer_create_params(
 pub(crate) fn timer_prompt_input_item(
     timer: &TimerInvocationContext,
 ) -> codex_protocol::models::ResponseInputItem {
-    crate::messages::message_prompt_input_item(&timer_message_invocation_context(timer))
+    crate::injected_message::message_prompt_input_item(&timer_message_invocation_context(timer))
 }
 
 pub(crate) fn timer_message_invocation_context(
@@ -552,7 +552,7 @@ mod tests {
     use super::TimerInvocationContext;
     use super::TimersState;
     use super::timer_prompt_input_item;
-    use crate::messages::MessagePayload;
+    use crate::injected_message::MessagePayload;
     use crate::timer_trigger::TimerTrigger;
     use chrono::TimeZone;
     use chrono::Utc;

codex-rs/core/src/tools/handlers/timers.rs

@@ -7,7 +7,7 @@ use serde::Deserialize;
 use std::collections::BTreeMap;
 
 use crate::function_tool::FunctionCallError;
-use crate::messages::MessagePayload;
+use crate::injected_message::MessagePayload;
 use crate::timers::ThreadTimerTrigger;
 use crate::timers::TimerDelivery;
 use crate::tools::context::FunctionToolOutput;

codex-rs/core/tests/suite/timers.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use anyhow::anyhow;
 use chrono::Utc;
-use codex_core::messages::MessagePayload;
+use codex_core::injected_message::MessagePayload;
 use codex_core::timers::TIMER_FIRED_BACKGROUND_EVENT_PREFIX;
 use codex_core::timers::ThreadTimer;
 use codex_core::timers::ThreadTimerTrigger;