changes

2026-05-01 20:02:05 +03:00 · 2026-03-19 18:58:13 -07:00
parent 4420fe6f41
commit c7615f7a9b
27 changed files with 1193 additions and 675 deletions
--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
@@ -4310,6 +4310,7 @@
      "type": "object"
    },
    {
+<<<<<<< HEAD
      "properties": {
        "id": {
          "$ref": "#/definitions/RequestId"
@@ -4334,6 +4335,8 @@
      "type": "object"
    },
    {
+=======
+>>>>>>> 4c42cf4a4 (changes)
      "properties": {
        "id": {
          "$ref": "#/definitions/RequestId"