fix(codex): map http_headers to universal headers field

Remove redundant http_headers field from MCPServerConfigOmni model.
Codex's http_headers should map to the universal headers field, not be
a separate field.

Root cause: Initial implementation incorrectly added http_headers as a
separate Codex-specific field in Omni model, when it's semantically
identical to the universal headers field.

Solution:
- Remove http_headers from MCPServerConfigOmni (line 688)
- Update MCPServerConfigCodex.from_omni() to map headers → http_headers
- Update CodexHostStrategy._flatten_toml_server() to map TOML http_headers → headers
- Update CodexHostStrategy._to_toml_server() to map headers → TOML http_headers

Data flow:
- CLI: --header → Omni headers → Codex http_headers → TOML http_headers
- TOML: http_headers → MCPServerConfig headers → Omni headers → Codex http_headers

This ensures proper mapping between universal headers and Codex http_headers
while maintaining correct TOML format for Codex configuration files.

Author: LittleCoinCoin

hatch/mcp_host_config/models.py

@@ -623,9 +623,17 @@ class MCPServerConfigCodex(MCPServerConfigBase):
 
     @classmethod
     def from_omni(cls, omni: 'MCPServerConfigOmni') -> 'MCPServerConfigCodex':
-        """Convert Omni model to Codex-specific model."""
+        """Convert Omni model to Codex-specific model.
+
+        Maps universal 'headers' field to Codex-specific 'http_headers' field.
+        """
         supported_fields = set(cls.model_fields.keys())
         codex_data = omni.model_dump(include=supported_fields, exclude_unset=True)
+
+        # Map universal 'headers' to Codex 'http_headers'
+        if hasattr(omni, 'headers') and omni.headers is not None:
+            codex_data['http_headers'] = omni.headers
+
         return cls.model_validate(codex_data)
 
 
@@ -685,8 +693,8 @@ class MCPServerConfigOmni(BaseModel):
     enabled_tools: Optional[List[str]] = None
     disabled_tools: Optional[List[str]] = None
     bearer_token_env_var: Optional[str] = None
-    http_headers: Optional[Dict[str, str]] = None
     env_http_headers: Optional[Dict[str, str]] = None
+    # Note: http_headers maps to universal 'headers' field, not a separate Codex field
 
     @field_validator('url')
     @classmethod

hatch/mcp_host_config/strategies.py

@@ -750,16 +750,31 @@ def _flatten_toml_server(self, server_data: Dict[str, Any]) -> Dict[str, Any]:
 
         Becomes:
             {"command": "npx", "args": [...], "env": {"VAR": "value"}}
+
+        Also maps Codex-specific 'http_headers' to universal 'headers' field.
         """
         # TOML already parses nested tables into nested dicts
         # So [mcp_servers.name.env] becomes {"env": {...}}
-        return dict(server_data)
+        data = dict(server_data)
+
+        # Map Codex 'http_headers' to universal 'headers' for MCPServerConfig
+        if 'http_headers' in data:
+            data['headers'] = data.pop('http_headers')
+
+        return data
 
     def _to_toml_server(self, server_config: MCPServerConfig) -> Dict[str, Any]:
-        """Convert MCPServerConfig to TOML-compatible dict structure."""
+        """Convert MCPServerConfig to TOML-compatible dict structure.
+
+        Maps universal 'headers' field back to Codex-specific 'http_headers'.
+        """
         data = server_config.model_dump(exclude_unset=True)
 
         # Remove 'name' field as it's the table key in TOML
         data.pop('name', None)
 
+        # Map universal 'headers' to Codex 'http_headers' for TOML
+        if 'headers' in data:
+            data['http_headers'] = data.pop('headers')
+
         return data