@@ -282,7 +282,7 @@ test("a catalog refresh cannot replace an existing session's model", async ({ pa
282282 } )
283283
284284 const control = page . locator ( '[data-action="composer-model"]' )
285- await expect ( control ) . toHaveText ( "OpenCode / Alpha" )
285+ await expect ( control ) . toHaveText ( "Alpha" )
286286 await view . editor . fill ( "Keep my selected model" )
287287
288288 catalog . current = provider ( beta )
@@ -295,7 +295,7 @@ test("a catalog refresh cannot replace an existing session's model", async ({ pa
295295 data : { } ,
296296 } ,
297297 ] )
298- await expect ( control ) . toHaveText ( "OpenCode / alpha (unavailable)" )
298+ await expect ( control ) . toHaveText ( "alpha (unavailable)" )
299299 await view . editor . press ( "Enter" )
300300 await expect ( page . getByText ( "Select an agent and model" , { exact : true } ) ) . toBeVisible ( )
301301 await expect ( view . editor ) . toHaveText ( "Keep my selected model" )
@@ -312,7 +312,7 @@ test("a catalog refresh cannot replace an existing session's model", async ({ pa
312312 data : { } ,
313313 } ,
314314 ] )
315- await expect ( control ) . toHaveText ( "OpenCode / Alpha" )
315+ await expect ( control ) . toHaveText ( "Alpha" )
316316 await expect ( page . getByRole ( "button" , { name : "Choose model variant" , exact : true } ) ) . toHaveText ( "high" )
317317 await view . editor . press ( "Enter" )
318318 await expect . poll ( ( ) => prompts . length ) . toBe ( 1 )
@@ -329,13 +329,13 @@ test("a catalog refresh cannot replace an existing session's model", async ({ pa
329329 data : { } ,
330330 } ,
331331 ] )
332- await expect ( control ) . toHaveText ( "OpenCode / alpha (unavailable)" )
332+ await expect ( control ) . toHaveText ( "alpha (unavailable)" )
333333 await control . click ( )
334334 await page
335335 . getByRole ( "dialog" , { name : "Select model" } )
336336 . getByRole ( "button" , { name : "Beta Free" , exact : true } )
337337 . click ( )
338- await expect ( control ) . toHaveText ( "OpenCode / Beta" )
338+ await expect ( control ) . toHaveText ( "Beta" )
339339 await view . editor . fill ( "Use the replacement I chose" )
340340 await view . editor . press ( "Enter" )
341341 await expect . poll ( ( ) => prompts . length ) . toBe ( 2 )
@@ -387,8 +387,8 @@ test("an existing session's model never shows a fallback while its agent loads",
387387 const agentLoaded = page . waitForResponse ( ( response ) => new URL ( response . url ( ) ) . pathname === "/api/agent" )
388388 agents . resolve ( )
389389 await agentLoaded
390- await expect ( control ) . toHaveText ( "OpenCode / Alpha" )
391- expect ( await page . evaluate ( ( ) => [ ...( window . __chipTexts ?? [ ] ) ] ) ) . toEqual ( [ "OpenCode / Alpha" ] )
390+ await expect ( control ) . toHaveText ( "Alpha" )
391+ expect ( await page . evaluate ( ( ) => [ ...( window . __chipTexts ?? [ ] ) ] ) ) . toEqual ( [ "Alpha" ] )
392392} )
393393
394394test ( "a send pressed while the Location's plugins activate waits, Esc cancels it, and it sends once catalogs load" , async ( {
@@ -459,7 +459,7 @@ test("an opened session in another Location names its model from a loaded catalo
459459
460460 const control = page . locator ( '[data-action="composer-model"]' )
461461 await page . goto ( sessionHref ( "ses_warm_here" ) )
462- await expect ( control ) . toHaveText ( "OpenCode / Alpha" )
462+ await expect ( control ) . toHaveText ( "Alpha" )
463463
464464 const held = await holdRoute (
465465 page ,
@@ -470,7 +470,7 @@ test("an opened session in another Location names its model from a loaded catalo
470470 try {
471471 await page . locator ( `[data-slot="vertical-tabs"] a[href="${ sessionHref ( "ses_warm_there" , SERVER ) } "]` ) . click ( )
472472 await held . arrived
473- await expect ( control ) . toHaveText ( "OpenCode / Beta" )
473+ await expect ( control ) . toHaveText ( "Beta" )
474474 await expect ( page . getByRole ( "button" , { name : "Choose model variant" } ) ) . toHaveText ( "high" )
475475 const painted = await control . elementHandle ( )
476476
@@ -488,7 +488,7 @@ test("an opened session in another Location names its model from a loaded catalo
488488 await Promise . all ( loaded )
489489 await expect ( page . getByRole ( "dialog" ) ) . toBeVisible ( )
490490 // The loaded selection keeps the same chip instead of replacing it.
491- await expect ( control ) . toHaveText ( "OpenCode / Beta" )
491+ await expect ( control ) . toHaveText ( "Beta" )
492492 expect ( await painted ?. evaluate ( ( element ) => element . isConnected ) ) . toBe ( true )
493493 } finally {
494494 held . release ( )
@@ -501,33 +501,120 @@ declare global {
501501 }
502502}
503503
504- test ( "names a Console- managed provider without its workspace unless a direct connection shares it " , async ( {
504+ test ( "a managed composer label follows direct connections, not picker filtering or model identity " , async ( {
505505 page,
506506} ) => {
507- const sessions = [
508- { id : "ses_managed_root" , model : { id : "alpha" , providerID : "opencode" } } ,
509- { id : "ses_managed_openai" , model : { id : "gpt" , providerID : "console-openai" } } ,
510- ]
507+ const sessionID = "ses_managed_provider"
508+ const connected = { direct : false }
509+ const switches : unknown [ ] = [ ]
510+ const prompts : Parameters < NonNullable < MockServerConfig [ "onPrompt" ] > > [ 0 ] [ "body" ] [ ] = [ ]
511+ page . on ( "request" , ( request ) => {
512+ if ( request . method ( ) === "POST" && new URL ( request . url ( ) ) . pathname === `/api/session/${ sessionID } /model` )
513+ switches . push ( request . postDataJSON ( ) )
514+ } )
511515
512- const managed = { integrationID : "opencode" }
513- await openSession ( page , {
516+ const view = await openSession ( page , {
514517 name : "ManagedProvider" ,
515- sessions : sessions . map ( ( session ) => ( { ... session , agent : "build" } ) ) ,
516- provider : {
518+ sessions : [ { id : sessionID , agent : "build" , model : { id : "gpt" , providerID : "console-openai" } } ] ,
519+ provider : ( ) => ( {
517520 all : [
518- { ...managed , id : "opencode" , name : "Anomaly / OpenCode" , models : { alpha : { id : "alpha" , name : "Alpha" } } } ,
519- { ...managed , id : "console-openai" , name : "Anomaly / OpenAI" , models : { gpt : { id : "gpt" , name : "GPT" } } } ,
520- { id : "openai" , name : "OpenAI" , models : { gpt : { id : "gpt" , name : "GPT" } } } ,
521+ {
522+ id : "opencode" ,
523+ integrationID : "opencode" ,
524+ name : "Anomaly / OpenCode" ,
525+ models : { } ,
526+ } ,
527+ {
528+ id : "console-openai" ,
529+ canonical : "openai" ,
530+ integrationID : "opencode" ,
531+ name : "Anomaly / OpenAI" ,
532+ models : { gpt : { id : "gpt" , name : "GPT" } } ,
533+ } ,
534+ ...( connected . direct
535+ ? [
536+ {
537+ id : "openai" ,
538+ name : "OpenAI" ,
539+ models : { "direct-model" : { id : "direct-model" , name : "Direct Model" } } ,
540+ } ,
541+ ]
542+ : [ ] ) ,
521543 ] ,
522- connected : [ "opencode" , "console-openai" , "openai" ] ,
544+ connected : [ "opencode" , "console-openai" , ... ( connected . direct ? [ "openai" ] : [ ] ) ] ,
523545 default : { } ,
546+ } ) ,
547+ onPrompt : ( input ) => void prompts . push ( input . body ) ,
548+ seed : {
549+ storage : {
550+ "opencode.global.dat:model" : {
551+ user : [
552+ { providerID : "console-openai" , modelID : "gpt" , visibility : "show" } ,
553+ { providerID : "openai" , modelID : "direct-model" , visibility : "show" } ,
554+ ] ,
555+ } ,
556+ } ,
524557 } ,
525558 } )
526559
527560 const control = page . locator ( '[data-action="composer-model"]' )
528- await expect ( control ) . toHaveText ( "OpenCode / Alpha" )
529- await page . goto ( sessionHref ( sessions [ 1 ] ! . id ) )
530- await expect ( control ) . toHaveText ( "Anomaly / OpenAI / GPT" )
561+ const picker = page . getByRole ( "dialog" , { name : "Select model" , exact : true } )
562+ const selected = picker . locator ( '[data-option-key="console-openai:gpt"]' )
563+ await expect ( control ) . toHaveText ( "OpenAI / GPT" )
564+
565+ connected . direct = true
566+ await view . push ( [
567+ {
568+ id : "evt_direct_connected" ,
569+ created : T0 + 1 ,
570+ type : "provider.updated" ,
571+ location : { directory : view . directory } ,
572+ data : { } ,
573+ } ,
574+ {
575+ id : "evt_direct_models_connected" ,
576+ created : T0 + 2 ,
577+ type : "model.updated" ,
578+ location : { directory : view . directory } ,
579+ data : { } ,
580+ } ,
581+ ] )
582+ await expect ( control ) . toHaveText ( "OpenCode / OpenAI / GPT" )
583+ await expect ( control ) . toHaveAccessibleName ( "OpenCode / OpenAI / GPT" )
584+ await control . click ( )
585+ const search = picker . getByRole ( "combobox" , { name : "Search models" , exact : true } )
586+ await expect ( picker . locator ( '[data-option-key="openai:direct-model"]' ) ) . toBeVisible ( )
587+ await search . fill ( "GPT" )
588+ await expect ( picker . locator ( '[data-option-key="openai:direct-model"]' ) ) . toHaveCount ( 0 )
589+ await expect ( selected ) . toHaveAttribute ( "aria-current" , "true" )
590+ await expect ( control ) . toHaveText ( "OpenCode / OpenAI / GPT" )
591+ await search . press ( "Escape" )
592+ await expect ( picker ) . toBeHidden ( )
593+
594+ connected . direct = false
595+ await view . push ( [
596+ {
597+ id : "evt_direct_disconnected" ,
598+ created : T0 + 3 ,
599+ type : "provider.updated" ,
600+ location : { directory : view . directory } ,
601+ data : { } ,
602+ } ,
603+ {
604+ id : "evt_direct_models_disconnected" ,
605+ created : T0 + 4 ,
606+ type : "model.updated" ,
607+ location : { directory : view . directory } ,
608+ data : { } ,
609+ } ,
610+ ] )
611+ await expect ( control ) . toHaveText ( "OpenAI / GPT" )
612+
613+ await view . editor . fill ( "Keep the managed provider selected" )
614+ await view . editor . press ( "Enter" )
615+ await expect . poll ( ( ) => prompts . length ) . toBe ( 1 )
616+ expect ( prompts [ 0 ] ) . toMatchObject ( { text : "Keep the managed provider selected" } )
617+ expect ( switches ) . toEqual ( [ ] )
531618} )
532619
533620async function draft ( page : Page ) {
0 commit comments