Merge remote-tracking branch 'origin/main'

# Conflicts:
#	mobile/garyx-mobile/App/GaryxMobile/GaryxMobileModel+ThreadStream.swift

Author: Pyiner

TODO.md

@@ -0,0 +1,11 @@
+# TODO
+
+> 临时兼容债清单：这里记录的是为了当前版本兼容而保留、但不应该长期存在的设计债。清掉对应债务后，需要同步删除相关兼容代码。
+
+1. 删除旧 subprocess plugin 的 `dispatch_outbound` 兼容 adapter。
+   当前内置 channel 和新 subprocess plugin 已统一到 `StreamDispatchEnvelope` /
+   `dispatch_stream_event` outbound 契约；旧 subprocess plugin 仍可能只声明
+   `dispatch_outbound` 能力，所以 `garyx-channels` 暂时保留
+   `StreamEvent` -> `ChannelOutboundContent` -> `dispatch_outbound` 的 adapter。
+   这个 adapter 只是兼容旧插件的边界妥协，不是长期主路径。等所有受支持插件都声明
+   `capabilities.dispatch_stream_event = true` 后，应删除该 fallback adapter 和对应测试。

codex-sdk/src/client.rs

@@ -9,8 +9,8 @@ use crate::error::CodexError;
 use crate::transport::CodexTransport;
 use crate::types::{
     Capabilities, ClientInfo, InitializeParams, InputItem, JsonRpcNotification, ThreadForkParams,
-    ThreadResumeParams, ThreadStartParams, TurnInterruptParams, TurnStartParams, TurnSteerParams,
-    extract_thread_id, extract_turn_id,
+    ThreadResumeParams, ThreadStartParams, TurnInterruptParams, TurnStartOptions, TurnStartParams,
+    TurnSteerParams, extract_thread_id, extract_turn_id,
 };
 
 // ---------------------------------------------------------------------------
@@ -173,12 +173,26 @@ impl CodexClient {
         &self,
         thread_id: &str,
         input: Vec<InputItem>,
+    ) -> Result<String, CodexError> {
+        self.start_turn_with_options(thread_id, input, TurnStartOptions::default())
+            .await
+    }
+
+    /// Start a turn with optional sticky execution settings.
+    pub async fn start_turn_with_options(
+        &self,
+        thread_id: &str,
+        input: Vec<InputItem>,
+        options: TurnStartOptions,
     ) -> Result<String, CodexError> {
         self.require_initialized()?;
 
         let params = TurnStartParams {
             thread_id: thread_id.to_owned(),
             input,
+            model: options.model,
+            effort: options.effort,
+            service_tier: options.service_tier,
         };
         let value = serde_json::to_value(&params)
             .map_err(|e| CodexError::Fatal(format!("serialize error: {e}")))?;

codex-sdk/src/lib.rs

@@ -19,5 +19,5 @@ pub use types::{
     AgentMessageDelta, Capabilities, ClientInfo, CommandApprovalRequest, FileChangeApprovalRequest,
     InitializeParams, InputItem, ItemEventParams, JsonRpcNotification, ThreadForkParams,
     ThreadResumeParams, ThreadStartParams, TurnCompletedParams, TurnInfo, TurnInterruptParams,
-    TurnStartParams, TurnSteerParams, UsageInfo,
+    TurnStartOptions, TurnStartParams, TurnSteerParams, UsageInfo,
 };

codex-sdk/src/types.rs

@@ -170,6 +170,24 @@ pub enum InputItem {
 pub struct TurnStartParams {
     pub thread_id: String,
     pub input: Vec<InputItem>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub effort: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub service_tier: Option<String>,
+}
+
+/// Optional sticky execution settings for `turn/start`.
+///
+/// The current app-server schema applies these to the current turn and
+/// subsequent turns. Omit fields to let the thread or local Codex defaults
+/// decide.
+#[derive(Debug, Clone, Default)]
+pub struct TurnStartOptions {
+    pub model: Option<String>,
+    pub effort: Option<String>,
+    pub service_tier: Option<String>,
 }
 
 /// Parameters for `turn/steer`.

codex-sdk/src/types/tests.rs

@@ -193,11 +193,18 @@ fn test_turn_start_params_serialization() {
         input: vec![InputItem::Text {
             text: "hi".to_owned(),
         }],
+        model: Some("gpt-5.4".to_owned()),
+        effort: Some("medium".to_owned()),
+        service_tier: Some("priority".to_owned()),
     };
     let val = serde_json::to_value(&params).unwrap();
     assert_eq!(val["threadId"], "th_1");
     assert_eq!(val["input"][0]["type"], "text");
     assert_eq!(val["input"][0]["text"], "hi");
+    assert_eq!(val["model"], "gpt-5.4");
+    assert_eq!(val["effort"], "medium");
+    assert_eq!(val["serviceTier"], "priority");
+    assert!(val.get("modelReasoningEffort").is_none());
 }
 
 #[test]