merge upstream/dev/friel/watchdog-runtime-and-prompts into collab stack

codex-rs/app-server-protocol/src/protocol/thread_history.rs

@@ -2529,6 +2529,7 @@ mod tests {
                 prompt: "inspect the repo".into(),
                 model: "gpt-5.4-mini".into(),
                 reasoning_effort: codex_protocol::openai_models::ReasoningEffort::Medium,
+                spawn_mode: codex_protocol::protocol::AgentSpawnMode::Spawn,
                 status: AgentStatus::Running,
             }),
         ];