Defer override context updates to next user turn

codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json

@@ -1893,6 +1893,22 @@
         }
       ]
     },
+    "CollaborationMode": {
+      "description": "Collaboration mode for a Codex session.",
+      "properties": {
+        "mode": {
+          "$ref": "#/definitions/ModeKind"
+        },
+        "settings": {
+          "$ref": "#/definitions/Settings"
+        }
+      },
+      "required": [
+        "mode",
+        "settings"
+      ],
+      "type": "object"
+    },
     "CommandExecutionApprovalDecision": {
       "oneOf": [
         {
@@ -2361,6 +2377,17 @@
         {
           "description": "Conversation history was rolled back by dropping the last N user turns.",
           "properties": {
+            "model_visible_state": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/ModelVisibleState"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Model-visible session state after rollback.\n\nThis lets clients synchronize UI mode/model indicators with core after history rewind. Optional for backward compatibility with older persisted events."
+            },
             "num_turns": {
               "description": "Number of user turns that were removed from context.",
               "format": "uint32",
@@ -5857,6 +5884,21 @@
       ],
       "type": "string"
     },
+    "ModelVisibleState": {
+      "properties": {
+        "collaboration_mode": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/CollaborationMode"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "type": "object"
+    },
     "NetworkAccess": {
       "description": "Represents whether outbound network access is available to the agent.",
       "enum": [
@@ -8366,6 +8408,34 @@
       "title": "SetDefaultModelResponse",
       "type": "object"
     },
+    "Settings": {
+      "description": "Settings for a collaboration mode.",
+      "properties": {
+        "developer_instructions": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "model": {
+          "type": "string"
+        },
+        "reasoning_effort": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ReasoningEffort"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "required": [
+        "model"
+      ],
+      "type": "object"
+    },
     "SkillDependencies": {
       "properties": {
         "tools": {