chore(protocol): tidy codegen postprocess\n\n- Rename awkward Record3Cstring2Cnever3E to EmptyObject in generated types\n- Drop unused optional Field(...) fixup; keep semantics from schema\n- Disable datamodel-codegen timestamp to reduce diff noise

Author: gersmann

.github/workflows/codex-autoreview.yml

@@ -5,8 +5,6 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
   issue_comment:
     types: [created]
-  pull_request_review:
-    types: [submitted]
   pull_request_review_comment:
     types: [created]
 

Makefile

@@ -68,6 +68,7 @@ gen-protocol:
 		--use-union-operator \
 		--use-standard-collections \
 		--use-title-as-name \
+		--disable-timestamp \
 		--target-python-version 3.12 \
 		--output codex/protocol/types.py
 	@python3 scripts/postprocess_protocol_types.py

codex/protocol/types.py

@@ -1,7 +1,6 @@
 # generated by datamodel-codegen:
 # ruff: noqa: F821
 #   filename:  protocol.schema.json
-#   timestamp: 2025-09-14T17:06:06+00:00
 
 from __future__ import annotations
 
@@ -440,8 +439,8 @@ class ResponseItem2(BaseModelWithExtras):
 
 class ResponseItem3(BaseModelWithExtras):
     action: LocalShellAction
-    call_id: str | None = Field(None, description="Set when using the Responses API.")
-    id: str | None = Field(None, description="Set when using the chat completions API.")
+    call_id: str | None = Field(..., description="Set when using the Responses API.")
+    id: str | None = Field(..., description="Set when using the chat completions API.")
     status: LocalShellStatus
     type: Literal["local_shell_call"]
 
@@ -963,16 +962,16 @@ class InputItemLocalImage(BaseModelWithExtras):
     type: Literal["localImage"]
 
 
-class Record3Cstring2Cnever3E(RootModel[dict[str, Any] | None]):
+class EmptyObject(RootModel[dict[str, Any] | None]):
     root: dict[str, Any] | None = None
 
 
 class AddConversationListenerParams(BaseModelWithExtras):
     conversationId: ConversationId
 
 
-class AgentReasoningSectionBreakEvent(RootModel[Record3Cstring2Cnever3E]):
-    root: Record3Cstring2Cnever3E
+class AgentReasoningSectionBreakEvent(RootModel[EmptyObject]):
+    root: EmptyObject
 
 
 class Annotations(BaseModelWithExtras):
@@ -1023,8 +1022,8 @@ class ArchiveConversationParams(BaseModelWithExtras):
     rolloutPath: str
 
 
-class ArchiveConversationResponse(RootModel[Record3Cstring2Cnever3E]):
-    root: Record3Cstring2Cnever3E
+class ArchiveConversationResponse(RootModel[EmptyObject]):
+    root: EmptyObject
 
 
 class AudioContent(BaseModelWithExtras):
@@ -1034,8 +1033,8 @@ class AudioContent(BaseModelWithExtras):
     type: str
 
 
-class CancelLoginChatGptResponse(RootModel[Record3Cstring2Cnever3E]):
-    root: Record3Cstring2Cnever3E
+class CancelLoginChatGptResponse(RootModel[EmptyObject]):
+    root: EmptyObject
 
 
 class EmbeddedResourceResource(RootModel[TextResourceContents | BlobResourceContents]):
@@ -1112,8 +1111,8 @@ class InterruptConversationResponse(BaseModelWithExtras):
     abortReason: TurnAbortReason
 
 
-class LogoutChatGptResponse(RootModel[Record3Cstring2Cnever3E]):
-    root: Record3Cstring2Cnever3E
+class LogoutChatGptResponse(RootModel[EmptyObject]):
+    root: EmptyObject
 
 
 class NewConversationParams(BaseModelWithExtras):
@@ -1169,8 +1168,8 @@ class Profile(BaseModelWithExtras):
     modelVerbosity: Verbosity | None = None
 
 
-class RemoveConversationSubscriptionResponse(RootModel[Record3Cstring2Cnever3E]):
-    root: Record3Cstring2Cnever3E
+class RemoveConversationSubscriptionResponse(RootModel[EmptyObject]):
+    root: EmptyObject
 
 
 class ResourceLink(BaseModelWithExtras):
@@ -1230,8 +1229,8 @@ class SendUserMessageParams(BaseModelWithExtras):
     items: list[InputItem]
 
 
-class SendUserMessageResponse(RootModel[Record3Cstring2Cnever3E]):
-    root: Record3Cstring2Cnever3E
+class SendUserMessageResponse(RootModel[EmptyObject]):
+    root: EmptyObject
 
 
 class SendUserTurnParams(BaseModelWithExtras):
@@ -1245,8 +1244,8 @@ class SendUserTurnParams(BaseModelWithExtras):
     summary: ReasoningSummary
 
 
-class SendUserTurnResponse(RootModel[Record3Cstring2Cnever3E]):
-    root: Record3Cstring2Cnever3E
+class SendUserTurnResponse(RootModel[EmptyObject]):
+    root: EmptyObject
 
 
 class ServerCapabilities(BaseModelWithExtras):

scripts/postprocess_protocol_types.py

@@ -49,42 +49,14 @@ def main() -> int:
         lines.insert(insert_at, "# ruff: noqa: F821")
         s = "\n".join(lines) + ("\n" if not s.endswith("\n") else "")
 
-    # Convert optional fields that were marked required via Field(...)
-    # Examples to fix:
-    #   foo: str | None = Field(..., description='x')  -> Field(None, ...)
-    #   foo: Optional[int] = Field(...)               -> Field(None)
-    def _fix_optional_field_required(text: str) -> str:
-        # With kwargs, union syntax
-        text = re.sub(
-            r"^(\s+[A-Za-z_][A-Za-z0-9_]*\s*:\s*[^\n=]*\|\s*None\s*=\s*)Field\(\s*\.\.\.(\s*,[^)]*)\)",
-            r"\1Field(None\2)",
-            text,
-            flags=re.M,
-        )
-        # Without kwargs, union syntax
-        text = re.sub(
-            r"^(\s+[A-Za-z_][A-Za-z0-9_]*\s*:\s*[^\n=]*\|\s*None\s*=\s*)Field\(\s*\.\.\.\s*\)",
-            r"\1Field(None)",
-            text,
-            flags=re.M,
-        )
-        # With kwargs, Optional[...] syntax
-        text = re.sub(
-            r"^(\s+[A-Za-z_][A-Za-z0-9_]*\s*:\s*Optional\[[^\]]+\]\s*=\s*)Field\(\s*\.\.\.(\s*,[^)]*)\)",
-            r"\1Field(None\2)",
-            text,
-            flags=re.M,
-        )
-        # Without kwargs, Optional[...] syntax
-        text = re.sub(
-            r"^(\s+[A-Za-z_][A-Za-z0-9_]*\s*:\s*Optional\[[^\]]+\]\s*=\s*)Field\(\s*\.\.\.\s*\)",
-            r"\1Field(None)",
-            text,
-            flags=re.M,
-        )
-        return text
-
-    s = _fix_optional_field_required(s)
+    # Rename awkward auto-generated aliases to more readable names.
+    # Example: datamodel-codegen renders TS Record<string, never> as "Record3Cstring2Cnever3E".
+    rename_map = {
+        "Record3Cstring2Cnever3E": "EmptyObject",
+    }
+    for old, new in rename_map.items():
+        # Replace class declarations and all references (word boundary safe)
+        s = re.sub(rf"\b{old}\b", new, s)
 
     # Append model_rebuild() calls for union RootModel wrappers to resolve forward refs
     wrappers = [