fix(app-server): restore typed MCP status inventory

Author: gersmann

codex/app_server/models.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Literal
+from typing import Literal
 
 from pydantic import BaseModel, Field
 from pydantic import ConfigDict as PydanticConfigDict
@@ -217,11 +217,11 @@ class ConfigRequirementsReadResult(AppServerResultModel):
 
 
 class McpServerStatus(AppServerResultModel):
-    auth_status: str
+    auth_status: protocol.McpAuthStatus
     name: str
-    resource_templates: list[dict[str, Any]]
-    resources: list[dict[str, Any]]
-    tools: dict[str, dict[str, Any]]
+    resource_templates: list[protocol.ResourceTemplate]
+    resources: list[protocol.Resource]
+    tools: dict[str, protocol.Tool]
 
 
 class McpServerStatusListResult(AppServerResultModel):

codex/protocol/types.py

@@ -1,7 +1,7 @@
 # generated by datamodel-codegen:
 # ruff: noqa: F821
 #   filename:  codex_app_server_protocol.schemas.json
-#   timestamp: 2026-04-22T13:29:29+00:00
+#   timestamp: 2026-04-22T18:36:41+00:00
 
 from __future__ import annotations
 
@@ -6543,6 +6543,60 @@ class ServerNotification(RootModel):
     ]
 
 
+class McpAuthStatus(RootModel[Literal["unsupported", "notLoggedIn", "bearerToken", "oAuth"]]):
+    root: Literal["unsupported", "notLoggedIn", "bearerToken", "oAuth"]
+
+
+class Resource(BaseModel):
+    field_meta: Annotated[Any | None, Field(alias="_meta")] = None
+    annotations: Any | None = None
+    description: str | None = None
+    icons: list[Any] | None = None
+    mimeType: str | None = None
+    name: str
+    size: int | None = None
+    title: str | None = None
+    uri: str
+
+
+class ResourceTemplate(BaseModel):
+    annotations: Any | None = None
+    description: str | None = None
+    mimeType: str | None = None
+    name: str
+    title: str | None = None
+    uriTemplate: str
+
+
+class Tool(BaseModel):
+    field_meta: Annotated[Any | None, Field(alias="_meta")] = None
+    annotations: Any | None = None
+    description: str | None = None
+    icons: list[Any] | None = None
+    inputSchema: Any
+    name: str
+    outputSchema: Any | None = None
+    title: str | None = None
+
+
+class McpServerStatus(BaseModel):
+    authStatus: McpAuthStatus
+    name: str
+    resourceTemplates: list[ResourceTemplate]
+    resources: list[Resource]
+    tools: dict[str, Tool]
+
+
+class ListMcpServerStatusResponse(BaseModel):
+    data: list[McpServerStatus]
+    nextCursor: Annotated[
+        str | None,
+        Field(
+            description="Opaque cursor to pass to the next call to continue after the last item. If None, there are no more items to return."
+        ),
+    ] = None
+
+
 ClientRequest.model_rebuild()
 ServerRequest.model_rebuild()
 ServerNotification.model_rebuild()

scripts/generate_protocol_types.py

@@ -4,12 +4,19 @@
 from __future__ import annotations
 
 import argparse
+import re
 import subprocess  # nosec B404
 import sys
 import tempfile
 from pathlib import Path
 
 SUBPROCESS_TIMEOUT_SECONDS = 300
+EXTRA_PROTOCOL_SCHEMA_FILES = (
+    # Response-only schemas are not reachable from the ClientRequest/
+    # ServerRequest/ServerNotification envelope, but they are part of the
+    # app-server protocol and are used by the SDK's typed RPC result models.
+    "v2/ListMcpServerStatusResponse.json",
+)
 
 
 def parse_args() -> argparse.Namespace:
@@ -100,6 +107,52 @@ def generate_protocol_models(*, schema_path: Path, output_path: Path) -> None:
     )
 
 
+def extract_generated_model_definitions(text: str) -> str:
+    lines = text.splitlines()
+    for index, line in enumerate(lines):
+        if line.startswith("class "):
+            return "\n".join(lines[index:]).strip() + "\n"
+    raise ValueError("generated model file does not contain any class definitions")
+
+
+def append_generated_model_definitions(*, target_path: Path, generated_path: Path) -> None:
+    target = target_path.read_text(encoding="utf-8")
+    definitions = extract_generated_model_definitions(
+        generated_path.read_text(encoding="utf-8")
+    ).rstrip()
+    target_lines = target.splitlines()
+    insert_at = next(
+        (
+            index
+            for index, line in enumerate(target_lines)
+            if re.match(r"^\w+\.model_rebuild\(\)\s*$", line)
+        ),
+        len(target_lines),
+    )
+
+    updated = (
+        "\n".join(target_lines[:insert_at]).rstrip()
+        + "\n\n"
+        + definitions
+        + "\n\n"
+        + "\n".join(target_lines[insert_at:]).lstrip()
+    ).rstrip()
+    target_path.write_text(updated + "\n", encoding="utf-8")
+
+
+def append_extra_protocol_models(*, schema_dir: Path, output_path: Path) -> None:
+    with tempfile.TemporaryDirectory(prefix="codex-extra-protocol-models-") as temp_dir:
+        temp_path = Path(temp_dir)
+        for relative_schema_path in EXTRA_PROTOCOL_SCHEMA_FILES:
+            schema_path = schema_dir / relative_schema_path
+            generated_path = temp_path / f"{schema_path.stem}.py"
+            generate_protocol_models(schema_path=schema_path, output_path=generated_path)
+            append_generated_model_definitions(
+                target_path=output_path,
+                generated_path=generated_path,
+            )
+
+
 def build_postprocess_command(*, output_path: Path) -> list[str]:
     return [sys.executable, "scripts/postprocess_protocol_types.py", str(output_path)]
 
@@ -124,6 +177,7 @@ def main() -> int:
             experimental=args.experimental,
         )
         generate_protocol_models(schema_path=schema_path, output_path=output_path)
+        append_extra_protocol_models(schema_dir=schema_dir, output_path=output_path)
 
     postprocess_protocol_models(output_path)
     return 0

tests/test_app_server_client.py

@@ -1523,9 +1523,37 @@ def list_mcp_status(message: JsonObject) -> JsonObject:
                         {
                             "name": "github",
                             "authStatus": "oAuth",
-                            "tools": {},
-                            "resources": [],
-                            "resourceTemplates": [],
+                            "tools": {
+                                "repo_status": {
+                                    "_meta": {"origin": "pytest"},
+                                    "annotations": {"readOnlyHint": True},
+                                    "description": "Read repository status",
+                                    "inputSchema": {"type": "object", "properties": {}},
+                                    "name": "repo_status",
+                                    "outputSchema": {"type": "object"},
+                                    "title": "Repo status",
+                                }
+                            },
+                            "resources": [
+                                {
+                                    "_meta": {"origin": "pytest"},
+                                    "description": "Repository README",
+                                    "mimeType": "text/markdown",
+                                    "name": "readme",
+                                    "size": 12,
+                                    "title": "README",
+                                    "uri": "file:///repo/README.md",
+                                }
+                            ],
+                            "resourceTemplates": [
+                                {
+                                    "description": "Repository files",
+                                    "mimeType": "text/plain",
+                                    "name": "repo_files",
+                                    "title": "Repository files",
+                                    "uriTemplate": "file:///repo/{path}",
+                                }
+                            ],
                         }
                     ],
                     "nextCursor": None,
@@ -1747,6 +1775,21 @@ def windows_sandbox_setup_start(message: JsonObject) -> JsonObject:
         assert reload_result == EmptyResult()
         assert oauth_result.authorization_url == "https://example.com/oauth"
         assert mcp_status[0].name == "github"
+        assert isinstance(mcp_status[0].auth_status, protocol.McpAuthStatus)
+        assert mcp_status[0].auth_status.root == "oAuth"
+        assert isinstance(mcp_status[0].tools["repo_status"], protocol.Tool)
+        assert mcp_status[0].tools["repo_status"].field_meta == {"origin": "pytest"}
+        assert mcp_status[0].tools["repo_status"].inputSchema == {
+            "type": "object",
+            "properties": {},
+        }
+        assert mcp_status[0].tools["repo_status"].outputSchema == {"type": "object"}
+        assert isinstance(mcp_status[0].resources[0], protocol.Resource)
+        assert mcp_status[0].resources[0].field_meta == {"origin": "pytest"}
+        assert mcp_status[0].resources[0].mimeType == "text/markdown"
+        assert mcp_status[0].resources[0].uri == "file:///repo/README.md"
+        assert isinstance(mcp_status[0].resource_templates[0], protocol.ResourceTemplate)
+        assert mcp_status[0].resource_templates[0].uriTemplate == "file:///repo/{path}"
         assert mcp_status_page.data[0].name == "github"
         assert mcp_status_alias[0].name == "github"
         assert mcp_status_page_alias.data[0].name == "github"

tests/test_protocol_codegen.py

@@ -8,3 +8,14 @@ def test_generated_protocol_types_do_not_use_legacy_conint() -> None:
 
     assert " conint" not in content
     assert "conint(" not in content
+
+
+def test_generated_protocol_types_include_mcp_status_response_models() -> None:
+    content = Path("codex/protocol/types.py").read_text(encoding="utf-8")
+
+    assert "class McpAuthStatus" in content
+    assert "class Resource(BaseModel)" in content
+    assert "class ResourceTemplate(BaseModel)" in content
+    assert "class Tool(BaseModel)" in content
+    assert "class McpServerStatus(BaseModel)" in content
+    assert "class ListMcpServerStatusResponse(BaseModel)" in content

tests/test_protocol_generation_scripts.py

@@ -109,6 +109,46 @@ def fake_run_stage(name: str, command: list[str]) -> None:
     }
 
 
+def test_generate_protocol_types_inserts_extra_response_models_before_rebuilds(
+    tmp_path: Path,
+) -> None:
+    module = _load_script_module(
+        "generate_protocol_types_extra", "scripts/generate_protocol_types.py"
+    )
+    target_path = tmp_path / "types.py"
+    generated_path = tmp_path / "ListMcpServerStatusResponse.py"
+    target_path.write_text(
+        "# generated by datamodel-codegen:\n"
+        "from pydantic import BaseModel\n\n"
+        "class Existing(BaseModel):\n"
+        "    pass\n\n"
+        "ClientRequest.model_rebuild()\n",
+        encoding="utf-8",
+    )
+    generated_path.write_text(
+        "# generated by datamodel-codegen:\n"
+        "from pydantic import BaseModel\n\n"
+        "class ListMcpServerStatusResponse(BaseModel):\n"
+        "    data: list[str]\n",
+        encoding="utf-8",
+    )
+
+    module.append_generated_model_definitions(
+        target_path=target_path,
+        generated_path=generated_path,
+    )
+
+    assert target_path.read_text(encoding="utf-8") == (
+        "# generated by datamodel-codegen:\n"
+        "from pydantic import BaseModel\n\n"
+        "class Existing(BaseModel):\n"
+        "    pass\n\n"
+        "class ListMcpServerStatusResponse(BaseModel):\n"
+        "    data: list[str]\n\n"
+        "ClientRequest.model_rebuild()\n"
+    )
+
+
 def test_postprocess_protocol_types_main_uses_explicit_path(
     monkeypatch: pytest.MonkeyPatch,
     tmp_path: Path,