@@ -143,18 +143,30 @@ fn goose_connection_test_uses_the_draft_model_and_environment() {
143143 let ( dir, _, _app, view) = fixture ( ) ;
144144 let goose = dir. path ( ) . join ( "goose" ) ;
145145 let script = r#"#!/bin/sh
146+ if [ "$1" = acp ]; then
147+ read request
148+ case "$request" in *providers/list*) ;; *) exit 1;; esac
149+ case "$TEST_DEFAULT" in
150+ missing) printf '%s\n' '{"jsonrpc":"2.0","id":1,"result":{"entries":[]}}';;
151+ mismatch) printf '%s\n' '{"jsonrpc":"2.0","id":1,"result":{"entries":[{"providerId":"anthropic","defaultModel":"other-model"}]}}';;
152+ invalid) printf '%s\n' '{"jsonrpc":"2.0","id":1,"result":{"entries":[{"providerId":"openai","defaultModel":"bad\nmodel"}]}}';;
153+ *) printf '%s\n' '{"jsonrpc":"2.0","id":1,"result":{"entries":[{"providerId":"openai","defaultModel":"provider-default"}]}}';;
154+ esac
155+ exit
156+ fi
146157[ "$1 $2 $3" = 'run --text Reply OK.' ] || exit 1
147158[ "$4 $5 $6 $7 $8 $9" = '--no-session --no-profile --max-turns 1 --quiet --output-format' ] || exit 1
148159[ "${10}" = 'json' ] || exit 1
149160[ "$GOOSE_PROVIDER" = 'openai' ] || exit 1
150- [ "$GOOSE_MODEL" = 'effective-model' ] || exit 1
151- [ "$GOOSE_MAX_TOKENS" = '10' ] || exit 1
152- [ "$GOOSE_THINKING_EFFORT" = 'off' ] || exit 1
161+ case "$GOOSE_MODEL" in effective-model|provider-default) ;; *) exit 1;; esac
153162[ "$(pwd)" = '__WORKSPACE__' ] || exit 1
163+ printf '%s\n' 'prompt' >> prompts
154164if [ "$OPENAI_API_KEY" = 'draft-key' ]; then
155- printf '%s\n' '{"metadata":{"status":"completed"},"messages":[{"role":"assistant","content":[{"type":"text","text":"OK"}]}]}'
165+ printf '%s\n' '{"metadata":{"status":"completed","total_tokens":4},"messages":[{"role":"assistant","content":[{"type":"text","text":"OK"}]}]}'
166+ elif [ "$BAD_STYLE" = text ]; then
167+ printf '%s\n' '{"metadata":{"status":"completed","total_tokens":0},"messages":[{"role":"assistant","content":[{"type":"text","text":"Ran into this error: API key not valid."}]}]}'
156168else
157- printf '%s\n' '{"metadata":{"status":"completed"},"messages":[{"role":"assistant","content":[{"type":"error","error":"authentication failed"}]}]}'
169+ printf '%s\n' '{"metadata":{"status":"completed","total_tokens":4 },"messages":[{"role":"assistant","content":[{"type":"error","error":"authentication failed"}]}]}'
158170fi
159171"#
160172 . replace (
174186 "host" : "" , "filter" : "" , "action" : "test" , "edit" : edit
175187 } } ) ,
176188 ) ;
177- assert_eq ! ( result. unwrap( ) [ "models" ] , json!( [ ] ) ) ;
178- let mut bad = edit;
179- bad[ "environment" ] [ "OPENAI_API_KEY" ] = json ! ( "bad-key" ) ;
189+ let result = result. unwrap ( ) ;
190+ assert_eq ! ( result[ "models" ] , json!( [ ] ) ) ;
191+ assert ! ( result. get( "testedModel" ) . is_none( ) ) ;
192+ assert ! ( !result. to_string( ) . contains( "effective-model" ) ) ;
193+ let mut automatic = edit. clone ( ) ;
194+ automatic[ "harness" ] [ "model" ] = json ! ( "" ) ;
195+ automatic[ "environment" ]
196+ . as_object_mut ( )
197+ . unwrap ( )
198+ . remove ( "GOOSE_MODEL" ) ;
180199 let ticket = invoke ( & view, "agent_models_begin" , json ! ( { } ) ) . unwrap ( ) ;
181- let error = invoke (
200+ let result = invoke (
182201 & view,
183202 "agent_models_run" ,
184203 json ! ( { "ticket" : ticket, "request" : {
185- "host" : "" , "filter" : "" , "action" : "test" , "edit" : bad
204+ "host" : "" , "filter" : "" , "action" : "test" , "edit" : automatic
186205 } } ) ,
187206 )
188- . unwrap_err ( ) ;
189- assert ! ( error. to_string( ) . contains( "could not complete a request" ) ) ;
207+ . unwrap ( ) ;
208+ assert_eq ! ( result[ "testedModel" ] , "openai/provider-default" ) ;
209+ let prompts = std:: fs:: read_to_string ( dir. path ( ) . join ( "prompts" ) ) . unwrap ( ) ;
210+ for case in [ "missing" , "mismatch" , "invalid" ] {
211+ let mut unavailable = automatic. clone ( ) ;
212+ unavailable[ "environment" ] [ "TEST_DEFAULT" ] = json ! ( case) ;
213+ let ticket = invoke ( & view, "agent_models_begin" , json ! ( { } ) ) . unwrap ( ) ;
214+ assert ! (
215+ invoke(
216+ & view,
217+ "agent_models_run" ,
218+ json!( { "ticket" : ticket, "request" : {
219+ "host" : "" , "filter" : "" , "action" : "test" , "edit" : unavailable
220+ } } )
221+ )
222+ . is_err( ) ,
223+ "{case}"
224+ ) ;
225+ assert_eq ! (
226+ std:: fs:: read_to_string( dir. path( ) . join( "prompts" ) ) . unwrap( ) ,
227+ prompts
228+ ) ;
229+ }
230+ let mut bad = automatic;
231+ bad[ "environment" ] [ "OPENAI_API_KEY" ] = json ! ( "bad-key" ) ;
232+ for style in [ "error-content" , "text" ] {
233+ bad[ "environment" ] [ "BAD_STYLE" ] = json ! ( style) ;
234+ let ticket = invoke ( & view, "agent_models_begin" , json ! ( { } ) ) . unwrap ( ) ;
235+ let error = invoke (
236+ & view,
237+ "agent_models_run" ,
238+ json ! ( { "ticket" : ticket, "request" : {
239+ "host" : "" , "filter" : "" , "action" : "test" , "edit" : bad
240+ } } ) ,
241+ )
242+ . unwrap_err ( ) ;
243+ assert ! (
244+ error. to_string( ) . contains( "could not complete a request" ) ,
245+ "{style}"
246+ ) ;
247+ }
190248
249+ let mut bad = edit. clone ( ) ;
191250 let sidecar = dir. path ( ) . join ( "goose-acp" ) ;
192251 let temporary = dir. path ( ) . join ( "temporary-session" ) ;
193252 std:: fs:: write (
194253 & sidecar,
195254 r#"#!/bin/sh
196255[ "$#" -eq 0 ] || exit 1
197- [ "$GOOSE_PROVIDER $GOOSE_MODEL $GOOSE_MAX_TOKENS $GOOSE_THINKING_EFFORT $GOOSE_MODE" = 'openai effective-model 10 off chat' ] || exit 1
198- [ "$(pwd)" = '__WORKSPACE__' ] || exit 1
199256read request
257+ case "$request" in *'"method":"_goose/unstable/providers/list"'*)
258+ printf '%s\n' '{"jsonrpc":"2.0","id":1,"result":{"entries":[{"providerId":"openai","defaultModel":"provider-default"}]}}'
259+ exit 0;; esac
260+ [ "$(pwd)" = '__WORKSPACE__' ] || exit 1
261+ [ "$GOOSE_PROVIDER $GOOSE_MODE" = 'openai chat' ] || exit 1
262+ case "$GOOSE_MODEL" in effective-model|provider-default) ;; *) exit 1;; esac
200263printf '%s\n' '{"jsonrpc":"2.0","id":1,"result":{"protocolVersion":1,"agentCapabilities":{"sessionCapabilities":{"delete":{}}}}}'
201264read request
202265case "$request" in *'"hidden":true'*) ;; *) exit 1 ;; esac
@@ -226,7 +289,18 @@ printf '%s\n' '{"jsonrpc":"2.0","id":4,"result":{}}'
226289 std:: fs:: set_permissions ( & sidecar, std:: fs:: Permissions :: from_mode ( 0o700 ) ) . unwrap ( ) ;
227290 bad[ "harness" ] [ "command" ] = json ! ( sidecar) ;
228291 bad[ "harness" ] [ "args" ] = json ! ( [ ] ) ;
229- for key in [ "draft-key" , "bad-key" ] {
292+ for ( key, default_model) in [
293+ ( "draft-key" , false ) ,
294+ ( "bad-key" , false ) ,
295+ ( "draft-key" , true ) ,
296+ ] {
297+ if default_model {
298+ bad[ "harness" ] [ "model" ] = json ! ( "" ) ;
299+ bad[ "environment" ]
300+ . as_object_mut ( )
301+ . unwrap ( )
302+ . remove ( "GOOSE_MODEL" ) ;
303+ }
230304 bad[ "environment" ] [ "OPENAI_API_KEY" ] = json ! ( key) ;
231305 let ticket = invoke ( & view, "agent_models_begin" , json ! ( { } ) ) . unwrap ( ) ;
232306 let result = invoke (
@@ -237,7 +311,13 @@ printf '%s\n' '{"jsonrpc":"2.0","id":4,"result":{}}'
237311 } } ) ,
238312 ) ;
239313 if key == "draft-key" {
240- assert_eq ! ( result. unwrap( ) [ "models" ] , json!( [ ] ) ) ;
314+ let result = result. unwrap ( ) ;
315+ assert_eq ! ( result[ "models" ] , json!( [ ] ) ) ;
316+ if default_model {
317+ assert_eq ! ( result[ "testedModel" ] , "openai/provider-default" ) ;
318+ } else {
319+ assert ! ( result. get( "testedModel" ) . is_none( ) ) ;
320+ }
241321 } else {
242322 let error = result. unwrap_err ( ) . to_string ( ) ;
243323 assert ! ( error. contains( "could not complete a request" ) ) ;
0 commit comments