fix merge conflict errors

2026-04-29 00:55:38 +00:00 · 2026-03-05 12:00:30 -08:00
parent 4a715ef4cb
commit 1ed80dbd5a
2 changed files with 14 additions and 12 deletions
--- a/codex-rs/app-server-protocol/schema/json/EventMsg.json
+++ b/codex-rs/app-server-protocol/schema/json/EventMsg.json
@@ -544,12 +544,6 @@
        }
      ]
    },
-    "EscalationStatus": {
-      "enum": [
-        "approved",
-        "rejected"
-      ],
-      "type": "string"
    "ElicitationRequest": {
      "oneOf": [
        {
@@ -600,6 +594,13 @@
        }
      ]
    },
+    "EscalationStatus": {
+      "enum": [
+        "approved",
+        "rejected"
+      ],
+      "type": "string"
+    },
    "EventMsg": {
      "description": "Response event from the agent NOTE: Make sure none of these values have optional types, as it will mess up the extension code-gen.",
      "oneOf": [