changes

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

@@ -1152,6 +1152,7 @@
           "type": "object"
         },
         {
+<<<<<<< HEAD
           "properties": {
             "id": {
               "$ref": "#/definitions/v2/RequestId"
@@ -1176,6 +1177,8 @@
           "type": "object"
         },
         {
+=======
+>>>>>>> 4c42cf4a4 (changes)
           "properties": {
             "id": {
               "$ref": "#/definitions/v2/RequestId"
@@ -13365,6 +13368,7 @@
         "title": "ThreadRealtimeStartedNotification",
         "type": "object"
       },
+<<<<<<< HEAD
       "ThreadRealtimeTranscriptUpdatedNotification": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "description": "EXPERIMENTAL - flat transcript delta emitted whenever realtime transcript text changes.",
@@ -13387,6 +13391,8 @@
         "title": "ThreadRealtimeTranscriptUpdatedNotification",
         "type": "object"
       },
+=======
+>>>>>>> 4c42cf4a4 (changes)
       "ThreadResumeParams": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "description": "There are three ways to resume a thread: 1. By thread_id: load the thread from disk by thread_id and resume it. 2. By history: instantiate the thread from memory and resume it. 3. By path: load the thread from disk by path and resume it.\n\nThe precedence is: history > path > thread_id. If using history or path, the thread_id param will be ignored.\n\nPrefer using thread_id whenever possible.",