Skip to content

Commit 1774bde

Browse files
authored
Merge pull request #28 from zhujian0805/main
fix: combine goose menu into single unified list
2 parents ce8da86 + 932f045 commit 1774bde

1 file changed

Lines changed: 6 additions & 18 deletions

File tree

code_assistant_manager/tools/goose.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -371,31 +371,21 @@ def _show_and_select_model(
371371
"""Show menu to select and set default model from all available options."""
372372
from code_assistant_manager.menu.menus import display_centered_menu
373373

374-
# Build menu options
374+
# Build menu options - unified list of all available models
375375
all_options = []
376376
option_to_provider = {}
377-
377+
378378
# Add endpoint models
379379
if endpoint_models:
380-
all_options.append("═══ FROM ENDPOINTS ═══")
381-
option_to_provider[len(all_options) - 1] = None # Separator entry
382-
383380
for endpoint_name, models in endpoint_models.items():
384381
for model in models:
385382
provider_name = self._sanitize_provider_name(endpoint_name)
386383
display = f"{model} ({provider_name})"
387384
all_options.append(display)
388385
option_to_provider[len(all_options) - 1] = (provider_name, model)
389-
386+
390387
# Add custom providers
391388
if custom_models:
392-
if all_options:
393-
all_options.append("") # Empty separator
394-
option_to_provider[len(all_options) - 1] = None
395-
396-
all_options.append("═══ CUSTOM PROVIDERS ═══")
397-
option_to_provider[len(all_options) - 1] = None # Separator entry
398-
399389
for provider_name, models in custom_models.items():
400390
for model in models:
401391
display = f"{model} ({provider_name})"
@@ -407,16 +397,14 @@ def _show_and_select_model(
407397

408398
# Show menu
409399
success, idx = display_centered_menu(
410-
"Select default Goose provider and model:",
400+
"Select default Goose provider/model:",
411401
all_options,
412402
"Cancel"
413403
)
414404

415405
if success and idx is not None and idx in option_to_provider:
416-
result = option_to_provider[idx]
417-
if result: # Not a separator
418-
provider_name, model_name = result
419-
self._write_default_to_config(provider_name, model_name)
406+
provider_name, model_name = option_to_provider[idx]
407+
self._write_default_to_config(provider_name, model_name)
420408

421409

422410
def _write_default_to_config(self, provider_name: str, model_name: str) -> None:

0 commit comments

Comments
 (0)