@@ -29,6 +29,8 @@ mod tests_run {
2929 reasoning_effort : None ,
3030 reasoning_summary : None ,
3131 full_auto : true ,
32+ mcp : None ,
33+ inherit_mcp : true ,
3234 }
3335 }
3436
@@ -66,4 +68,221 @@ mod tests_run {
6668 assert ! ( validate_model_name( Some ( "gpt-4.1" ) , false , Some ( "github" ) ) . is_ok( ) ) ;
6769 }
6870
71+ // MCP Configuration Tests
72+ mod mcp_tests {
73+ use super :: * ;
74+
75+ #[ test]
76+ fn camel_to_snake_converts_correctly ( ) {
77+ assert_eq ! ( camel_to_snake( "bearerTokenEnvVar" ) , "bearer_token_env_var" ) ;
78+ assert_eq ! ( camel_to_snake( "httpHeaders" ) , "http_headers" ) ;
79+ assert_eq ! ( camel_to_snake( "envHttpHeaders" ) , "env_http_headers" ) ;
80+ assert_eq ! ( camel_to_snake( "startupTimeoutSec" ) , "startup_timeout_sec" ) ;
81+ assert_eq ! ( camel_to_snake( "toolTimeoutSec" ) , "tool_timeout_sec" ) ;
82+ assert_eq ! ( camel_to_snake( "enabledTools" ) , "enabled_tools" ) ;
83+ assert_eq ! ( camel_to_snake( "disabledTools" ) , "disabled_tools" ) ;
84+ assert_eq ! ( camel_to_snake( "envVars" ) , "env_vars" ) ;
85+ assert_eq ! ( camel_to_snake( "command" ) , "command" ) ;
86+ assert_eq ! ( camel_to_snake( "url" ) , "url" ) ;
87+ }
88+
89+ #[ test]
90+ fn json_to_toml_inline_string ( ) {
91+ let json = JsonValue :: String ( "hello" . to_string ( ) ) ;
92+ assert_eq ! ( json_to_toml_inline( & json) , "\" hello\" " ) ;
93+ }
94+
95+ #[ test]
96+ fn json_to_toml_inline_string_escapes_quotes ( ) {
97+ let json = JsonValue :: String ( "hello \" world\" " . to_string ( ) ) ;
98+ assert_eq ! ( json_to_toml_inline( & json) , "\" hello \\ \" world\\ \" \" " ) ;
99+ }
100+
101+ #[ test]
102+ fn json_to_toml_inline_number ( ) {
103+ let json = JsonValue :: Number ( serde_json:: Number :: from ( 42 ) ) ;
104+ assert_eq ! ( json_to_toml_inline( & json) , "42" ) ;
105+ }
106+
107+ #[ test]
108+ fn json_to_toml_inline_bool ( ) {
109+ assert_eq ! ( json_to_toml_inline( & JsonValue :: Bool ( true ) ) , "true" ) ;
110+ assert_eq ! ( json_to_toml_inline( & JsonValue :: Bool ( false ) ) , "false" ) ;
111+ }
112+
113+ #[ test]
114+ fn json_to_toml_inline_array ( ) {
115+ let json = serde_json:: json!( [ "a" , "b" , "c" ] ) ;
116+ assert_eq ! ( json_to_toml_inline( & json) , "[\" a\" , \" b\" , \" c\" ]" ) ;
117+ }
118+
119+ #[ test]
120+ fn json_to_toml_inline_object_converts_keys ( ) {
121+ let json = serde_json:: json!( {
122+ "bearerTokenEnvVar" : "TOKEN" ,
123+ "httpHeaders" : { }
124+ } ) ;
125+ let result = json_to_toml_inline ( & json) ;
126+ // The result should contain snake_case keys
127+ assert ! ( result. contains( "bearer_token_env_var" ) ) ;
128+ assert ! ( result. contains( "http_headers" ) ) ;
129+ }
130+
131+ #[ test]
132+ fn json_to_toml_inline_stdio_config ( ) {
133+ let json = serde_json:: json!( {
134+ "command" : "npx" ,
135+ "args" : [ "-y" , "my-mcp-server" ] ,
136+ "env" : { "NODE_ENV" : "production" } ,
137+ "envVars" : [ "HOME" , "PATH" ] ,
138+ "cwd" : "/app"
139+ } ) ;
140+ let result = json_to_toml_inline ( & json) ;
141+ assert ! ( result. contains( "command = \" npx\" " ) ) ;
142+ assert ! ( result. contains( "args = [\" -y\" , \" my-mcp-server\" ]" ) ) ;
143+ assert ! ( result. contains( "env_vars = [\" HOME\" , \" PATH\" ]" ) ) ;
144+ assert ! ( result. contains( "cwd = \" /app\" " ) ) ;
145+ }
146+
147+ #[ test]
148+ fn json_to_toml_inline_http_config ( ) {
149+ let json = serde_json:: json!( {
150+ "url" : "https://api.example.com/mcp" ,
151+ "bearerTokenEnvVar" : "API_TOKEN"
152+ } ) ;
153+ let result = json_to_toml_inline ( & json) ;
154+ assert ! ( result. contains( "url = \" https://api.example.com/mcp\" " ) ) ;
155+ assert ! ( result. contains( "bearer_token_env_var = \" API_TOKEN\" " ) ) ;
156+ }
157+
158+ #[ test]
159+ fn build_cli_includes_mcp_servers ( ) {
160+ let mut req = base_internal_request ( ) ;
161+ req. mcp = Some ( serde_json:: json!( {
162+ "test-server" : {
163+ "command" : "npx" ,
164+ "args" : [ "test" ]
165+ }
166+ } ) ) ;
167+
168+ let cli = build_cli ( & req, None , false ) ;
169+ let overrides: Vec < & str > = cli. config_overrides . raw_overrides
170+ . iter ( )
171+ . map ( |s| s. as_str ( ) )
172+ . collect ( ) ;
173+
174+ // Check that MCP server is in overrides
175+ assert ! ( overrides. iter( ) . any( |o| o. starts_with( "mcp_servers.test-server=" ) ) ) ;
176+ }
177+
178+ #[ test]
179+ fn build_cli_clears_mcp_when_inherit_false ( ) {
180+ let mut req = base_internal_request ( ) ;
181+ req. inherit_mcp = false ;
182+ req. mcp = Some ( serde_json:: json!( {
183+ "custom" : { "command" : "test" }
184+ } ) ) ;
185+
186+ let cli = build_cli ( & req, None , false ) ;
187+ let overrides: Vec < & str > = cli. config_overrides . raw_overrides
188+ . iter ( )
189+ . map ( |s| s. as_str ( ) )
190+ . collect ( ) ;
191+
192+ // Should have mcp_servers={} to clear global config first
193+ assert ! ( overrides. contains( & "mcp_servers={}" ) ) ;
194+ // And then the custom server
195+ assert ! ( overrides. iter( ) . any( |o| o. starts_with( "mcp_servers.custom=" ) ) ) ;
196+ }
197+
198+ #[ test]
199+ fn build_cli_does_not_clear_mcp_when_inherit_true ( ) {
200+ let mut req = base_internal_request ( ) ;
201+ req. inherit_mcp = true ;
202+ req. mcp = Some ( serde_json:: json!( {
203+ "custom" : { "command" : "test" }
204+ } ) ) ;
205+
206+ let cli = build_cli ( & req, None , false ) ;
207+ let overrides: Vec < & str > = cli. config_overrides . raw_overrides
208+ . iter ( )
209+ . map ( |s| s. as_str ( ) )
210+ . collect ( ) ;
211+
212+ // Should NOT have mcp_servers={} when inheriting
213+ assert ! ( !overrides. contains( & "mcp_servers={}" ) ) ;
214+ // But should still have the custom server
215+ assert ! ( overrides. iter( ) . any( |o| o. starts_with( "mcp_servers.custom=" ) ) ) ;
216+ }
217+
218+ #[ test]
219+ fn run_request_parses_mcp_config ( ) {
220+ let request = RunRequest {
221+ prompt : "test" . to_string ( ) ,
222+ input_items : None ,
223+ thread_id : None ,
224+ images : None ,
225+ model : None ,
226+ model_provider : None ,
227+ oss : None ,
228+ sandbox_mode : None ,
229+ approval_mode : None ,
230+ workspace_write_options : None ,
231+ review_mode : None ,
232+ review_hint : None ,
233+ working_directory : None ,
234+ skip_git_repo_check : Some ( true ) ,
235+ output_schema : None ,
236+ tool_choice : None ,
237+ base_url : None ,
238+ api_key : None ,
239+ linux_sandbox_path : None ,
240+ reasoning_effort : None ,
241+ reasoning_summary : None ,
242+ full_auto : None ,
243+ mcp : Some ( serde_json:: json!( {
244+ "server1" : { "command" : "npx" , "args" : [ "test" ] }
245+ } ) ) ,
246+ inherit_mcp : Some ( false ) ,
247+ } ;
248+
249+ let internal = request. into_internal ( ) . expect ( "parse should succeed" ) ;
250+ assert ! ( internal. mcp. is_some( ) ) ;
251+ assert ! ( !internal. inherit_mcp) ;
252+ }
253+
254+ #[ test]
255+ fn run_request_defaults_inherit_mcp_to_true ( ) {
256+ let request = RunRequest {
257+ prompt : "test" . to_string ( ) ,
258+ input_items : None ,
259+ thread_id : None ,
260+ images : None ,
261+ model : None ,
262+ model_provider : None ,
263+ oss : None ,
264+ sandbox_mode : None ,
265+ approval_mode : None ,
266+ workspace_write_options : None ,
267+ review_mode : None ,
268+ review_hint : None ,
269+ working_directory : None ,
270+ skip_git_repo_check : Some ( true ) ,
271+ output_schema : None ,
272+ tool_choice : None ,
273+ base_url : None ,
274+ api_key : None ,
275+ linux_sandbox_path : None ,
276+ reasoning_effort : None ,
277+ reasoning_summary : None ,
278+ full_auto : None ,
279+ mcp : None ,
280+ inherit_mcp : None ,
281+ } ;
282+
283+ let internal = request. into_internal ( ) . expect ( "parse should succeed" ) ;
284+ assert ! ( internal. inherit_mcp) ;
285+ }
286+ }
287+
69288}
0 commit comments