klaude-code 2.2.0__py3-none-any.whl → 2.4.0__py3-none-any.whl

klaude_code/app/runtime.py

@@ -55,24 +55,11 @@ async def initialize_app_components(
 
     config = load_config()
 
-    if init_config.banana:
-        # Banana mode is strict: it requires the built-in Nano Banana image model to be available.
-        required_model = "nano-banana-pro@or"
-        available = {m.model_name for m in config.iter_model_entries(only_available=True)}
-        if required_model not in available:
-            log(
-                (
-                    f"Error: --banana requires model '{required_model}', but it is not available in the current environment",
-                    "red",
-                )
-            )
-            log(("Hint: set OPENROUTER_API_KEY (Nano Banana Pro is configured via OpenRouter by default)", "yellow"))
-            raise typer.Exit(2)
-
     try:
         llm_clients = build_llm_clients(
             config,
             model_override=init_config.model,
+            skip_sub_agents=init_config.vanilla or init_config.banana,
         )
     except ValueError as exc:
         if init_config.model:
@@ -92,7 +79,7 @@ async def initialize_app_components(
     elif init_config.vanilla:
         model_profile_provider = VanillaModelProfileProvider()
     else:
-        model_profile_provider = DefaultModelProfileProvider()
+        model_profile_provider = DefaultModelProfileProvider(config=config)
 
     event_queue: asyncio.Queue[events.Event] = asyncio.Queue()
 

klaude_code/cli/list_model.py

@@ -181,7 +181,7 @@ def format_env_var_display(value: str | None) -> Text:
 
 def _get_model_params_display(model: ModelConfig) -> list[Text]:
     """Get display elements for model parameters."""
-    param_strings = format_model_params(model.model_params)
+    param_strings = format_model_params(model)
     if param_strings:
         return [Text(s) for s in param_strings]
     return [Text("")]
@@ -243,18 +243,34 @@ def _build_provider_info_panel(provider: ProviderConfig, available: bool) -> Quo
 
 
 def _build_models_table(
-    provider: ProviderConfig, main_model: str | None, sub_agent_models: dict[str, str] | None = None
+    provider: ProviderConfig,
+    config: Config,
 ) -> Table:
     """Build a table for models under a provider."""
     provider_available = not provider.is_api_key_missing()
 
+    def _resolve_selector(value: str | None) -> str | None:
+        if not value:
+            return None
+        try:
+            resolved = config.resolve_model_location_prefer_available(value) or config.resolve_model_location(value)
+        except ValueError:
+            return None
+        if resolved is None:
+            return None
+        return f"{resolved[0]}@{resolved[1]}"
+
+    default_selector = _resolve_selector(config.main_model)
+
     # Build reverse mapping: model_name -> list of agent roles using it
     model_to_agents: dict[str, list[str]] = {}
-    if sub_agent_models:
-        for agent_role, model_name in sub_agent_models.items():
-            if model_name not in model_to_agents:
-                model_to_agents[model_name] = []
-            model_to_agents[model_name].append(agent_role)
+    for agent_role, model_name in (config.sub_agent_models or {}).items():
+        selector = _resolve_selector(model_name)
+        if selector is None:
+            continue
+        if selector not in model_to_agents:
+            model_to_agents[selector] = []
+        model_to_agents[selector].append(agent_role)
 
     models_table = Table.grid(
         padding=(0, 2),
@@ -270,15 +286,16 @@ def _build_models_table(
 
         if not provider_available:
             name = Text.assemble((prefix, ThemeKey.LINES), (model.model_name, "dim"))
-            model_id = Text(model.model_params.model or "", style="dim")
+            model_id = Text(model.model_id or "", style="dim")
             params = Text("(unavailable)", style="dim")
         else:
             # Build role tags for this model
             roles: list[str] = []
-            if model.model_name == main_model:
+            selector = f"{model.model_name}@{provider.provider_name}"
+            if selector == default_selector:
                 roles.append("default")
-            if model.model_name in model_to_agents:
-                roles.extend(role.lower() for role in model_to_agents[model.model_name])
+            if selector in model_to_agents:
+                roles.extend(role.lower() for role in model_to_agents[selector])
 
             if roles:
                 name = Text.assemble(
@@ -288,7 +305,7 @@ def _build_models_table(
                 )
             else:
                 name = Text.assemble((prefix, ThemeKey.LINES), (model.model_name, ThemeKey.CONFIG_ITEM_NAME))
-            model_id = Text(model.model_params.model or "")
+            model_id = Text(model.model_id or "")
             params = Text(" · ").join(_get_model_params_display(model))
 
         models_table.add_row(name, model_id, params)
@@ -350,6 +367,6 @@ def display_models_and_providers(config: Config, *, show_all: bool = False):
         console.print()
 
         # Models table for this provider
-        models_table = _build_models_table(provider, config.main_model, config.sub_agent_models)
+        models_table = _build_models_table(provider, config)
         console.print(models_table)
         console.print("\n")

klaude_code/cli/main.py

@@ -124,18 +124,28 @@ def main_callback(
             raise typer.Exit(2)
 
         from klaude_code.app.runtime import AppInitConfig
-        from klaude_code.tui.command.model_select import select_model_interactive
+        from klaude_code.tui.command.model_picker import ModelSelectStatus, select_model_interactive
         from klaude_code.tui.runner import run_interactive
 
         update_terminal_title()
 
         chosen_model = model
         if banana:
-            # Banana mode always uses the built-in Nano Banana Pro image model.
-            chosen_model = "nano-banana-pro@or"
+            keywords = ["gemini-3-pro-image", "gemini-2.5-flash-image"]
+            model_result = select_model_interactive(keywords=keywords)
+            if model_result.status == ModelSelectStatus.SELECTED and model_result.model is not None:
+                chosen_model = model_result.model
+            elif model_result.status == ModelSelectStatus.CANCELLED:
+                return
+            else:
+                log(("Error: no available nano-banana model", "red"))
+                log(("Hint: set OPENROUTER_API_KEY or GOOGLE_API_KEY to enable nano-banana models", "yellow"))
+                raise typer.Exit(2)
         elif model or select_model:
-            chosen_model = select_model_interactive(preferred=model)
-            if chosen_model is None:
+            model_result = select_model_interactive(preferred=model)
+            if model_result.status == ModelSelectStatus.SELECTED and model_result.model is not None:
+                chosen_model = model_result.model
+            else:
                 return
 
         # Resolve session id before entering asyncio loop
@@ -162,7 +172,12 @@ def main_callback(
             cfg = load_config()
 
             if session_meta.model_config_name:
-                if any(m.model_name == session_meta.model_config_name for m in cfg.iter_model_entries()):
+                try:
+                    model_is_known = cfg.has_model_config_name(session_meta.model_config_name)
+                except ValueError:
+                    model_is_known = False
+
+                if model_is_known:
                     chosen_model = session_meta.model_config_name
                 else:
                     log(
@@ -176,9 +191,9 @@ def main_callback(
                 raw_model = session_meta.model_name.strip()
                 if raw_model:
                     matches = [
-                        m.model_name
+                        m.selector
                         for m in cfg.iter_model_entries()
-                        if (m.model_params.model or "").strip().lower() == raw_model.lower()
+                        if (m.model_id or "").strip().lower() == raw_model.lower()
                     ]
                     if len(matches) == 1:
                         chosen_model = matches[0]
@@ -189,9 +204,10 @@ def main_callback(
 
             cfg = load_config()
             if cfg.main_model is None:
-                chosen_model = select_model_interactive()
-                if chosen_model is None:
+                model_result = select_model_interactive()
+                if model_result.status != ModelSelectStatus.SELECTED or model_result.model is None:
                     raise typer.Exit(1)
+                chosen_model = model_result.model
                 # Save the selection as default
                 cfg.main_model = chosen_model
                 from klaude_code.config.config import config_path