Merge remote-tracking branch 'origin/dev/friel/fork-context-inherits-parent-model' into repair/watchdog-prompt-layering

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

@@ -467,6 +467,7 @@ async fn spawn_agent_role_overrides_requested_model_and_reasoning_settings() ->
                         description: Some("Custom role".to_string()),
                         config_file: Some(role_path),
                         nickname_candidates: None,
+                        fork_context: None,
                     },
                 );
             })
@@ -515,6 +516,7 @@ async fn spawn_agent_tool_description_mentions_role_locked_settings() -> Result<
                 description: Some("Custom role".to_string()),
                 config_file: Some(role_path),
                 nickname_candidates: None,
+                fork_context: None,
             },
         );
     });