resolve merge conflicts

2026-04-25 07:05:38 +00:00 · 2026-03-17 11:54:11 -07:00
parent 990f6c8f56 c2108761b4
commit 5c200d85ef
1516 changed files with 150243 additions and 6962 deletions
--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
@@ -506,6 +506,9 @@
    },
    "DynamicToolSpec": {
      "properties": {
+        "deferLoading": {
+          "type": "boolean"
+        },
        "description": {
          "type": "string"
        },