Merge remote-tracking branch 'origin/main' into hooks-posttooluse-bash-fix

# Conflicts:
#	codex-rs/core/tests/suite/shell_snapshot.rs
#	codex-rs/exec/src/event_processor_with_human_output.rs
#	codex-rs/tui/tests/suite/model_availability_nux.rs
#	codex-rs/tui_app_server/tests/suite/model_availability_nux.rs

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

@@ -8558,6 +8558,21 @@
         },
         "type": "object"
       },
+      "MarketplaceLoadErrorInfo": {
+        "properties": {
+          "marketplacePath": {
+            "$ref": "#/definitions/v2/AbsolutePathBuf"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "marketplacePath",
+          "message"
+        ],
+        "type": "object"
+      },
       "McpAuthStatus": {
         "enum": [
           "unsupported",
@@ -9516,6 +9531,13 @@
             },
             "type": "array"
           },
+          "marketplaceLoadErrors": {
+            "default": [],
+            "items": {
+              "$ref": "#/definitions/v2/MarketplaceLoadErrorInfo"
+            },
+            "type": "array"
+          },
           "marketplaces": {
             "items": {
               "$ref": "#/definitions/v2/PluginMarketplaceEntry"