test(codex): fix Omni model field name in conversion test

Fixed test_codex_from_omni_conversion to use 'headers' instead of
'http_headers' when creating MCPServerConfigOmni instance.

'headers' is the universal field in Omni model that maps to 'http_headers'
in Codex model during conversion. The test was using the wrong field name.

test(codex-cli): fix tests to match Codex STDIO semantics

Updated Codex CLI argument tests to align with official Codex documentation:
- Removed invalid --header usage with STDIO servers (--command)
- HTTP headers only apply to streamable HTTP servers (--url)
- Updated test assertions to match STDIO-only fields
- Fixed test to focus on shared arguments (cwd, tool filtering)

Per Codex docs: STDIO servers don't support http_headers; only used
with URL-based servers for authentication.

test(mcp-cli): update parameter count for configure command

Updated test expectations to match expanded handle_mcp_configure signature
which now has 27 parameters (was 18) after adding Codex-specific arguments.

Tests affected:
- test_configure_argument_parsing_basic
- test_configure_argument_parsing_with_options

Author: LittleCoinCoin

tests/regression/test_mcp_codex_model_validation.py

@@ -66,7 +66,7 @@ def test_codex_from_omni_conversion(self):
             enabled_tools=["read"],
             disabled_tools=["write"],
             bearer_token_env_var="TOKEN",
-            http_headers={"X-Test": "value"},
+            headers={"X-Test": "value"},  # Universal field (maps to http_headers in Codex)
             env_http_headers={"X-Env": "VAR"},
             # Non-Codex fields (should be excluded)
             envFile="/path/to/env",  # VS Code specific

tests/test_mcp_cli_all_host_specific_args.py

@@ -313,6 +313,7 @@ def test_all_codex_arguments_accepted(self, mock_stdout, mock_manager_class):
         mock_result.backup_path = None
         mock_manager.configure_server.return_value = mock_result
 
+        # Test STDIO server with Codex-specific STDIO fields
         result = handle_mcp_configure(
             host='codex',
             server_name='test-server',
@@ -325,9 +326,6 @@ def test_all_codex_arguments_accepted(self, mock_stdout, mock_manager_class):
             enabled=True,
             include_tools=['read', 'write'],
             exclude_tools=['delete'],
-            bearer_token_env_var='FIGMA_OAUTH_TOKEN',
-            header=['X-Custom=value'],
-            env_header=['X-API-Key=API_KEY_VAR'],
             auto_approve=True
         )
 
@@ -342,17 +340,14 @@ def test_all_codex_arguments_accepted(self, mock_stdout, mock_manager_class):
         server_config = call_args.kwargs['server_config']
         self.assertIsInstance(server_config, MCPServerConfigCodex)
 
-        # Verify Codex-specific fields
+        # Verify Codex-specific STDIO fields
         self.assertEqual(server_config.env_vars, ['PATH', 'HOME'])
         self.assertEqual(server_config.cwd, '/workspace')
         self.assertEqual(server_config.startup_timeout_sec, 15)
         self.assertEqual(server_config.tool_timeout_sec, 120)
         self.assertTrue(server_config.enabled)
         self.assertEqual(server_config.enabled_tools, ['read', 'write'])
         self.assertEqual(server_config.disabled_tools, ['delete'])
-        self.assertEqual(server_config.bearer_token_env_var, 'FIGMA_OAUTH_TOKEN')
-        self.assertEqual(server_config.http_headers, {'X-Custom': 'value'})
-        self.assertEqual(server_config.env_http_headers, {'X-API-Key': 'API_KEY_VAR'})
 
     @patch('hatch.cli_hatch.MCPHostConfigurationManager')
     @patch('sys.stdout', new_callable=StringIO)
@@ -466,7 +461,7 @@ def test_codex_enabled_flag(self, mock_stdout, mock_manager_class):
     @patch('hatch.cli_hatch.MCPHostConfigurationManager')
     @patch('sys.stdout', new_callable=StringIO)
     def test_codex_reuses_shared_arguments(self, mock_stdout, mock_manager_class):
-        """Test that Codex reuses shared arguments (cwd, include-tools, exclude-tools, header)."""
+        """Test that Codex reuses shared arguments (cwd, include-tools, exclude-tools)."""
         mock_manager = MagicMock()
         mock_manager_class.return_value = mock_manager
 
@@ -483,19 +478,17 @@ def test_codex_reuses_shared_arguments(self, mock_stdout, mock_manager_class):
             cwd='/workspace',
             include_tools=['tool1', 'tool2'],
             exclude_tools=['tool3'],
-            header=['X-Custom=value'],
             auto_approve=True
         )
 
         self.assertEqual(result, 0)
         call_args = mock_manager.configure_server.call_args
         server_config = call_args.kwargs['server_config']
 
-        # Verify shared arguments work for Codex
+        # Verify shared arguments work for Codex STDIO servers
         self.assertEqual(server_config.cwd, '/workspace')
         self.assertEqual(server_config.enabled_tools, ['tool1', 'tool2'])
         self.assertEqual(server_config.disabled_tools, ['tool3'])
-        self.assertEqual(server_config.http_headers, {'X-Custom': 'value'})
 
 
 if __name__ == '__main__':

tests/test_mcp_cli_direct_management.py

@@ -40,17 +40,19 @@ def test_configure_argument_parsing_basic(self):
                     try:
                         result = main()
                         # If main() returns without SystemExit, check the handler was called
-                        # Updated to include ALL host-specific parameters
+                        # Updated to include ALL host-specific parameters (27 total)
                         mock_handler.assert_called_once_with(
                             'claude-desktop', 'weather-server', 'python', ['weather.py'],
-                            None, None, None, None, False, None, None, None, None, None, None, False, False, False
+                            None, None, None, None, False, None, None, None, None, None, None,
+                            False, None, None, None, None, None, False, None, None, False, False, False
                         )
                     except SystemExit as e:
                         # If SystemExit is raised, it should be 0 (success) and handler should have been called
                         if e.code == 0:
                             mock_handler.assert_called_once_with(
                                 'claude-desktop', 'weather-server', 'python', ['weather.py'],
-                                None, None, None, None, False, None, None, None, None, None, None, False, False, False
+                                None, None, None, None, False, None, None, None, None, None, None,
+                                False, None, None, None, None, None, False, None, None, False, False, False
                             )
                         else:
                             self.fail(f"main() exited with code {e.code}, expected 0")
@@ -70,11 +72,12 @@ def test_configure_argument_parsing_with_options(self):
                 with patch('hatch.cli_hatch.handle_mcp_configure', return_value=0) as mock_handler:
                     try:
                         main()
-                        # Updated to include ALL host-specific parameters
+                        # Updated to include ALL host-specific parameters (27 total)
                         mock_handler.assert_called_once_with(
                             'cursor', 'file-server', None, None,
                             ['API_KEY=secret', 'DEBUG=true'], 'http://localhost:8080',
-                            ['Authorization=Bearer token'], None, False, None, None, None, None, None, None, True, True, True
+                            ['Authorization=Bearer token'], None, False, None, None, None, None, None, None,
+                            False, None, None, None, None, None, False, None, None, True, True, True
                         )
                     except SystemExit as e:
                         self.assertEqual(e.code, 0)