Merge origin/main into codex/workspace-owner-usage-nudge

Resolve the TUI and config schema conflicts between the workspace owner usage nudge work and the latest main changes without rewriting branch history. Made-with: Cursor
2026-04-25 15:15:15 +00:00 · 2026-04-16 12:15:16 -07:00
parent 316baa8ca5 71174574ad
commit 1aba3c4ae7
402 changed files with 22084 additions and 6301 deletions
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
@@ -11297,6 +11297,12 @@
            "id": {
              "type": "string"
            },
+            "mcpAppResourceUri": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
            "result": {
              "anyOf": [
                {