klaude-code 2.1.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

klaude_code/app/__init__.py

@@ -4,9 +4,8 @@ This package coordinates core execution (Executor) with frontend displays.
 Terminal-specific rendering and input handling live in `klaude_code.tui`.
 """
 
-from .runtime import AppInitConfig, run_exec
+from .runtime import AppInitConfig
 
 __all__ = [
     "AppInitConfig",
-    "run_exec",
 ]

klaude_code/app/runtime.py

@@ -9,12 +9,15 @@ import typer
 from klaude_code import ui
 from klaude_code.config import Config, load_config
 from klaude_code.core.agent import Agent
-from klaude_code.core.agent_profile import DefaultModelProfileProvider, VanillaModelProfileProvider
+from klaude_code.core.agent_profile import (
+    DefaultModelProfileProvider,
+    NanoBananaModelProfileProvider,
+    VanillaModelProfileProvider,
+)
 from klaude_code.core.executor import Executor
 from klaude_code.core.manager import build_llm_clients
 from klaude_code.log import DebugType, log, set_debug_logging
 from klaude_code.protocol import events, op
-from klaude_code.protocol.message import UserInputPayload
 from klaude_code.session.session import Session, close_default_store
 
 
@@ -25,8 +28,8 @@ class AppInitConfig:
     model: str | None
     debug: bool
     vanilla: bool
+    banana: bool
     debug_filters: set[DebugType] | None = None
-    stream_json: bool = False
 
 
 @dataclass
@@ -56,6 +59,7 @@ async def initialize_app_components(
         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:
@@ -70,7 +74,12 @@ async def initialize_app_components(
             log((f"Error: failed to load the default model configuration: {exc}", "red"))
         raise typer.Exit(2) from None
 
-    model_profile_provider = VanillaModelProfileProvider() if init_config.vanilla else DefaultModelProfileProvider()
+    if init_config.banana:
+        model_profile_provider = NanoBananaModelProfileProvider()
+    elif init_config.vanilla:
+        model_profile_provider = VanillaModelProfileProvider()
+    else:
+        model_profile_provider = DefaultModelProfileProvider(config=config)
 
     event_queue: asyncio.Queue[events.Event] = asyncio.Queue()
 
@@ -176,40 +185,3 @@ async def handle_keyboard_interrupt(executor: Executor) -> None:
         log(("Resume with:", "dim"), (f"klaude --resume-by-id {session_id}", "green"))
     with contextlib.suppress(Exception):
         await executor.submit(op.InterruptOperation(target_session_id=None))
-
-
-async def run_exec(init_config: AppInitConfig, input_content: str) -> None:
-    """Run a single task non-interactively (exec mode)."""
-    from klaude_code.ui.terminal.title import update_terminal_title
-
-    display = ui.create_exec_display(debug=init_config.debug, stream_json=init_config.stream_json)
-    components = await initialize_app_components(
-        init_config=init_config,
-        display=display,
-        on_model_change=update_terminal_title,
-    )
-
-    try:
-        session_id = await initialize_session(components.executor, components.event_queue)
-        backfill_session_model_config(
-            components.executor.context.current_agent,
-            init_config.model,
-            components.config.main_model,
-            is_new_session=True,
-        )
-
-        if session_id is None:
-            raise RuntimeError("No active session")
-
-        op_id = await components.executor.submit(
-            op.RunAgentOperation(
-                session_id=session_id,
-                input=UserInputPayload(text=input_content),
-            )
-        )
-        await components.executor.wait_for(op_id)
-        await components.event_queue.join()
-    except KeyboardInterrupt:
-        await handle_keyboard_interrupt(components.executor)
-    finally:
-        await cleanup_app_components(components)

klaude_code/cli/list_model.py

@@ -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),
@@ -275,10 +291,11 @@ def _build_models_table(
         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(
@@ -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

@@ -13,44 +13,6 @@ from klaude_code.session import Session
 from klaude_code.tui.command.resume_cmd import select_session_sync
 from klaude_code.ui.terminal.title import update_terminal_title
 
-
-def read_input_content(cli_argument: str) -> str | None:
-    """Read and merge input from stdin and CLI argument.
-
-    Args:
-        cli_argument: The input content passed as CLI argument.
-
-    Returns:
-        The merged input content, or None if no input was provided.
-    """
-    from klaude_code.log import log
-
-    parts: list[str] = []
-
-    # Handle stdin input
-    if not sys.stdin.isatty():
-        try:
-            stdin = sys.stdin.read().rstrip("\n")
-            if stdin:
-                parts.append(stdin)
-        except (OSError, ValueError) as e:
-            # Expected I/O-related errors when reading from stdin (e.g. broken pipe, closed stream).
-            log((f"Error reading from stdin: {e}", "red"))
-        except Exception as e:
-            # Unexpected errors are still reported but kept from crashing the CLI.
-            log((f"Unexpected error reading from stdin: {e}", "red"))
-
-    if cli_argument:
-        parts.append(cli_argument)
-
-    content = "\n".join(parts)
-    if len(content) == 0:
-        log(("Error: No input content provided", "red"))
-        return None
-
-    return content
-
-
 ENV_HELP = """\
 Environment Variables:
 
@@ -76,101 +38,6 @@ register_cost_commands(app)
 register_self_update_commands(app)
 
 
-@app.command("exec")
-def exec_command(
-    input_content: str = typer.Argument("", help="Input message to execute"),
-    model: str | None = typer.Option(
-        None,
-        "--model",
-        "-m",
-        help="Override model config name (uses main model by default)",
-        rich_help_panel="LLM",
-    ),
-    select_model: bool = typer.Option(
-        False,
-        "--select-model",
-        "-s",
-        help="Interactively choose a model at startup",
-        rich_help_panel="LLM",
-    ),
-    debug: bool = typer.Option(
-        False,
-        "--debug",
-        "-d",
-        help="Enable debug mode",
-        rich_help_panel="Debug",
-    ),
-    debug_filter: str | None = typer.Option(
-        None,
-        "--debug-filter",
-        help=DEBUG_FILTER_HELP,
-        rich_help_panel="Debug",
-    ),
-    vanilla: bool = typer.Option(
-        False,
-        "--vanilla",
-        help="Vanilla mode exposes the model's raw API behavior: it provides only minimal tools (Bash, Read & Edit) and omits system prompts and reminders.",
-    ),
-    stream_json: bool = typer.Option(
-        False,
-        "--stream-json",
-        help="Stream all events as JSON lines to stdout.",
-    ),
-) -> None:
-    """Execute non-interactively with provided input."""
-    update_terminal_title()
-
-    merged_input = read_input_content(input_content)
-    if merged_input is None:
-        raise typer.Exit(1)
-
-    from klaude_code.app.runtime import AppInitConfig, run_exec
-    from klaude_code.config import load_config
-    from klaude_code.tui.command.model_select import select_model_interactive
-
-    chosen_model = model
-    if model or select_model:
-        chosen_model = select_model_interactive(preferred=model)
-        if chosen_model is None:
-            raise typer.Exit(1)
-    else:
-        # Check if main_model is configured; if not, trigger interactive selection
-        config = load_config()
-        if config.main_model is None:
-            chosen_model = select_model_interactive()
-            if chosen_model is None:
-                raise typer.Exit(1)
-            # Save the selection as default
-            config.main_model = chosen_model
-            from klaude_code.config.config import config_path
-            from klaude_code.log import log
-
-            asyncio.run(config.save())
-            log(f"Saved main_model={chosen_model} to {config_path}", style="cyan")
-
-    debug_enabled, debug_filters, log_path = prepare_debug_logging(debug, debug_filter)
-
-    init_config = AppInitConfig(
-        model=chosen_model,
-        debug=debug_enabled,
-        vanilla=vanilla,
-        debug_filters=debug_filters,
-        stream_json=stream_json,
-    )
-
-    if log_path:
-        from klaude_code.log import log
-
-        log(f"Debug log: {log_path}", style="dim")
-
-    asyncio.run(
-        run_exec(
-            init_config=init_config,
-            input_content=merged_input,
-        )
-    )
-
-
 @app.callback(invoke_without_command=True)
 def main_callback(
     ctx: typer.Context,
@@ -220,13 +87,23 @@ def main_callback(
     vanilla: bool = typer.Option(
         False,
         "--vanilla",
-        help="Vanilla mode exposes the model's raw API behavior: it provides only minimal tools (Bash, Read & Edit) and omits system prompts and reminders.",
+        help="Vanilla mode exposes the model's raw API behavior: it provides only minimal tools (Bash, Read, Write & Edit) and omits system prompts and reminders.",
+    ),
+    banana: bool = typer.Option(
+        False,
+        "--banana",
+        help="Image generation mode with Nano Banana",
+        rich_help_panel="LLM",
     ),
 ) -> None:
     # Only run interactive mode when no subcommand is invoked
     if ctx.invoked_subcommand is None:
         from klaude_code.log import log
 
+        if vanilla and banana:
+            log(("Error: --banana cannot be combined with --vanilla", "red"))
+            raise typer.Exit(2)
+
         resume_by_id_value = resume_by_id.strip() if resume_by_id is not None else None
         if resume_by_id_value == "":
             log(("Error: --resume-by-id cannot be empty", "red"))
@@ -241,35 +118,34 @@ def main_callback(
             log(("Hint: run `klaude --resume` to select an existing session", "yellow"))
             raise typer.Exit(2)
 
-        # In non-interactive environments, default to exec-mode behavior.
-        # This allows: echo "…" | klaude
         if not sys.stdin.isatty() or not sys.stdout.isatty():
-            if continue_ or resume or resume_by_id is not None:
-                log(("Error: --continue/--resume options require a TTY", "red"))
-                log(("Hint: use `klaude exec` for non-interactive usage", "yellow"))
-                raise typer.Exit(2)
-
-            exec_command(
-                input_content="",
-                model=model,
-                select_model=select_model,
-                debug=debug,
-                debug_filter=debug_filter,
-                vanilla=vanilla,
-                stream_json=False,
-            )
-            return
+            log(("Error: interactive mode requires a TTY", "red"))
+            log(("Hint: run klaude from an interactive terminal", "yellow"))
+            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_select import ModelSelectStatus, select_model_interactive
         from klaude_code.tui.runner import run_interactive
 
         update_terminal_title()
 
         chosen_model = model
-        if model or select_model:
-            chosen_model = select_model_interactive(preferred=model)
-            if chosen_model is None:
+        if banana:
+            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:
+            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
@@ -296,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(
@@ -310,7 +191,7 @@ 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()
                     ]
@@ -323,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
@@ -340,6 +222,7 @@ def main_callback(
             model=chosen_model,
             debug=debug_enabled,
             vanilla=vanilla,
+            banana=banana,
             debug_filters=debug_filters,
         )
 

klaude_code/config/assets/builtin_config.yaml

@@ -7,7 +7,7 @@ provider_list:
   protocol: anthropic
   api_key: ${ANTHROPIC_API_KEY}
   model_list:
-  - model_name: sonnet@ant
+  - model_name: sonnet
     model_params:
       model: claude-sonnet-4-5-20250929
       context_limit: 200000
@@ -18,7 +18,7 @@ provider_list:
         output: 15.0
         cache_read: 0.3
         cache_write: 3.75
-  - model_name: opus@ant
+  - model_name: opus
     model_params:
       model: claude-opus-4-5-20251101
       context_limit: 200000
@@ -187,10 +187,10 @@ provider_list:
         input: 0.5
         output: 3.0
         cache_read: 0.05
-  - model_name: nano-banana-pro@or
+  - model_name: nano-banana-pro
     model_params:
       model: google/gemini-3-pro-image-preview
-      context_limit: 1048576
+      context_limit: 66000
       modalities:
       - image
       - text
@@ -199,6 +199,18 @@ provider_list:
         output: 12
         cache_read: 0.2
         image: 120
+  - model_name: nano-banana
+    model_params:
+      model: google/gemini-2.5-flash-image
+      context_limit: 33000
+      modalities:
+      - image
+      - text
+      cost:
+        input: 0.3
+        output: 2.5
+        cache_read: 0.03
+        image: 30
   - model_name: grok
     model_params:
       model: x-ai/grok-4.1-fast
@@ -234,7 +246,7 @@ provider_list:
   protocol: google
   api_key: ${GOOGLE_API_KEY}
   model_list:
-  - model_name: gemini-pro@google
+  - model_name: gemini-pro
     model_params:
       model: gemini-3-pro-preview
       context_limit: 1048576
@@ -242,7 +254,7 @@ provider_list:
         input: 2.0
         output: 12.0
         cache_read: 0.2
-  - model_name: gemini-flash@google
+  - model_name: gemini-flash
     model_params:
       model: gemini-3-flash-preview
       context_limit: 1048576
@@ -250,6 +262,18 @@ provider_list:
         input: 0.5
         output: 3.0
         cache_read: 0.05
+  - model_name: nano-banana-pro
+    model_params:
+      model: gemini-3-pro-image-preview
+      context_limit: 66000
+      modalities:
+      - image
+      - text
+      cost:
+        input: 2
+        output: 12
+        cache_read: 0.2
+        image: 120
 
 - provider_name: bedrock
   protocol: bedrock
@@ -257,7 +281,7 @@ provider_list:
   aws_secret_key: ${AWS_SECRET_ACCESS_KEY}
   aws_region: ${AWS_REGION}
   model_list:
-  - model_name: sonnet@bedrock
+  - model_name: sonnet
     model_params:
       model: us.anthropic.claude-sonnet-4-5-20250929-v1:0
       context_limit: 200000
@@ -266,6 +290,7 @@ provider_list:
         output: 15.0
         cache_read: 0.3
         cache_write: 3.75
+
 - provider_name: deepseek
   protocol: anthropic
   api_key: ${DEEPSEEK_API_KEY}
@@ -289,7 +314,7 @@ provider_list:
   api_key: ${MOONSHOT_API_KEY}
   base_url: https://api.moonshot.cn/anthropic
   model_list:
-  - model_name: kimi@moonshot
+  - model_name: kimi
     model_params:
       model: kimi-k2-thinking
       context_limit: 262144
@@ -305,7 +330,7 @@ provider_list:
 - provider_name: claude-max
   protocol: claude_oauth
   model_list:
-  - model_name: sonnet@claude-max
+  - model_name: sonnet
     model_params:
       model: claude-sonnet-4-5-20250929
       context_limit: 200000
@@ -314,7 +339,7 @@ provider_list:
         output: 15.0
         cache_read: 0.3
         cache_write: 3.75
-  - model_name: opus@claude-max
+  - model_name: opus
     model_params:
       model: claude-opus-4-5-20251101
       context_limit: 200000
@@ -327,7 +352,7 @@ provider_list:
         output: 25.0
         cache_read: 0.5
         cache_write: 6.25
-  - model_name: haiku@claude-max
+  - model_name: haiku
     model_params:
       model: claude-haiku-4-5-20251001
       context_limit: 200000
@@ -351,6 +376,3 @@ provider_list:
         input: 1.75
         output: 14.0
         cache_read: 0.17
-
-sub_agent_models:
-  ImageGen: nano-banana-pro@or