changes

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

@@ -1152,7 +1152,6 @@
           "type": "object"
         },
         {
-<<<<<<< HEAD
           "properties": {
             "id": {
               "$ref": "#/definitions/v2/RequestId"
@@ -1177,8 +1176,6 @@
           "type": "object"
         },
         {
-=======
->>>>>>> 4c42cf4a4 (changes)
           "properties": {
             "id": {
               "$ref": "#/definitions/v2/RequestId"
@@ -9321,12 +9318,32 @@
               "null"
             ]
           },
+          "allowUnixSockets": {
+            "description": "Legacy compatibility view derived from `unix_sockets`.",
+            "items": {
+              "type": "string"
+            },
+            "type": [
+              "array",
+              "null"
+            ]
+          },
           "allowUpstreamProxy": {
             "type": [
               "boolean",
               "null"
             ]
           },
+          "allowedDomains": {
+            "description": "Legacy compatibility view derived from `domains`.",
+            "items": {
+              "type": "string"
+            },
+            "type": [
+              "array",
+              "null"
+            ]
+          },
           "dangerouslyAllowAllUnixSockets": {
             "type": [
               "boolean",
@@ -9339,10 +9356,21 @@
               "null"
             ]
           },
+          "deniedDomains": {
+            "description": "Legacy compatibility view derived from `domains`.",
+            "items": {
+              "type": "string"
+            },
+            "type": [
+              "array",
+              "null"
+            ]
+          },
           "domains": {
             "additionalProperties": {
               "$ref": "#/definitions/v2/NetworkDomainPermission"
             },
+            "description": "Canonical network permission map for `experimental_network`.",
             "type": [
               "object",
               "null"
@@ -9374,6 +9402,7 @@
             "additionalProperties": {
               "$ref": "#/definitions/v2/NetworkUnixSocketPermission"
             },
+            "description": "Canonical unix socket permission map for `experimental_network`.",
             "type": [
               "object",
               "null"
@@ -13368,7 +13397,6 @@
         "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.",
@@ -13391,8 +13419,6 @@
         "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.",