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

klaude_code/tui/components/welcome.py

@@ -0,0 +1,99 @@
+from importlib.metadata import PackageNotFoundError, version
+
+from rich.console import Group, RenderableType
+from rich.text import Text
+
+from klaude_code.log import is_debug_enabled
+from klaude_code.protocol import events
+from klaude_code.tui.components.rich.quote import Quote
+from klaude_code.tui.components.rich.theme import ThemeKey
+from klaude_code.ui.common import format_model_params
+
+
+def _get_version() -> str:
+    """Get the current version of klaude-code."""
+    try:
+        return version("klaude-code")
+    except PackageNotFoundError:
+        return "unknown"
+
+
+def render_welcome(e: events.WelcomeEvent) -> RenderableType:
+    """Render the welcome panel with model info and settings.
+
+    Args:
+        e: The welcome event.
+    """
+    debug_mode = is_debug_enabled()
+
+    panel_content = Text()
+
+    if e.show_klaude_code_info:
+        # First line: Klaude Code version
+        klaude_code_style = ThemeKey.WELCOME_DEBUG_TITLE if debug_mode else ThemeKey.WELCOME_HIGHLIGHT_BOLD
+        panel_content.append_text(Text("Klaude Code", style=klaude_code_style))
+        panel_content.append_text(Text(f" v{_get_version()}", style=ThemeKey.WELCOME_INFO))
+        panel_content.append_text(Text("\n"))
+
+    # Model line: model @ provider · params...
+    panel_content.append_text(
+        Text.assemble(
+            (str(e.llm_config.model), ThemeKey.WELCOME_HIGHLIGHT),
+            (" @ ", ThemeKey.WELCOME_INFO),
+            (e.llm_config.provider_name, ThemeKey.WELCOME_INFO),
+        )
+    )
+
+    # Use format_model_params for consistent formatting
+    param_strings = format_model_params(e.llm_config)
+
+    # Check if we have sub-agent models to show
+    has_sub_agents = e.show_sub_agent_models and e.sub_agent_models
+
+    # Render config items with tree-style prefixes
+    for i, param_str in enumerate(param_strings):
+        is_last = i == len(param_strings) - 1 and not has_sub_agents
+        prefix = "└─ " if is_last else "├─ "
+        panel_content.append_text(
+            Text.assemble(
+                ("\n", ThemeKey.WELCOME_INFO),
+                (prefix, ThemeKey.LINES),
+                (param_str, ThemeKey.WELCOME_INFO),
+            )
+        )
+
+    # Render sub-agent models
+    if has_sub_agents:
+        # Add sub-agents header with tree prefix
+        panel_content.append_text(
+            Text.assemble(
+                ("\n", ThemeKey.WELCOME_INFO),
+                ("└─ ", ThemeKey.LINES),
+                ("sub-agents:", ThemeKey.WELCOME_INFO),
+            )
+        )
+        sub_agent_items = list(e.sub_agent_models.items())
+        max_type_len = max(len(t) for t in e.sub_agent_models)
+        for i, (sub_agent_type, sub_llm_config) in enumerate(sub_agent_items):
+            is_last = i == len(sub_agent_items) - 1
+            prefix = "└─ " if is_last else "├─ "
+            panel_content.append_text(
+                Text.assemble(
+                    ("\n", ThemeKey.WELCOME_INFO),
+                    ("   ", ThemeKey.WELCOME_INFO),  # Indentation for sub-items
+                    (prefix, ThemeKey.LINES),
+                    (sub_agent_type.lower().ljust(max_type_len), ThemeKey.WELCOME_INFO),
+                    (": ", ThemeKey.LINES),
+                    (str(sub_llm_config.model), ThemeKey.WELCOME_HIGHLIGHT),
+                    (" @ ", ThemeKey.WELCOME_INFO),
+                    (sub_llm_config.provider_name, ThemeKey.WELCOME_INFO),
+                )
+            )
+
+    border_style = ThemeKey.WELCOME_DEBUG_BORDER if debug_mode else ThemeKey.LINES
+
+    if e.show_klaude_code_info:
+        groups = ["", Quote(panel_content, style=border_style, prefix="▌ "), ""]
+    else:
+        groups = [Quote(panel_content, style=border_style, prefix="▌ "), ""]
+    return Group(*groups)

klaude_code/tui/input/prompt_toolkit.py

@@ -455,7 +455,7 @@ class PromptToolkitInput(InputProviderABC):
         config = load_config()
         models: list[ModelEntry] = sorted(
             config.iter_model_entries(only_available=True),
-            key=lambda m: m.model_name.lower(),
+            key=lambda m: (m.model_name.lower(), m.provider.lower()),
         )
         if not models:
             return [], None
@@ -468,6 +468,15 @@ class PromptToolkitInput(InputProviderABC):
                 initial = self._get_current_model_config_name()
         if initial is None:
             initial = config.main_model
+        if isinstance(initial, str) and initial and "@" not in initial:
+            try:
+                resolved = config.resolve_model_location_prefer_available(initial) or config.resolve_model_location(
+                    initial
+                )
+            except ValueError:
+                resolved = None
+            if resolved is not None:
+                initial = f"{resolved[0]}@{resolved[1]}"
         return items, initial
 
     def _open_model_picker(self) -> None:
@@ -608,6 +617,10 @@ class PromptToolkitInput(InputProviderABC):
                 (symbol_style, " ctrl-t "),
                 (text_style, " "),
                 (text_style, "think"),
+                (text_style, "  "),
+                (symbol_style, " ctrl-v "),
+                (text_style, " "),
+                (text_style, "paste image"),
             ]
         )
 

klaude_code/tui/renderer.py

@@ -61,6 +61,7 @@ from klaude_code.tui.components import sub_agent as c_sub_agent
 from klaude_code.tui.components import thinking as c_thinking
 from klaude_code.tui.components import tools as c_tools
 from klaude_code.tui.components import user_input as c_user_input
+from klaude_code.tui.components import welcome as c_welcome
 from klaude_code.tui.components.common import truncate_head, truncate_middle
 from klaude_code.tui.components.rich import status as r_status
 from klaude_code.tui.components.rich.live import CropAboveLive, SingleLine
@@ -511,7 +512,7 @@ class TUICommandRenderer:
             self.print()
 
     def display_welcome(self, event: events.WelcomeEvent) -> None:
-        self.print(c_metadata.render_welcome(event))
+        self.print(c_welcome.render_welcome(event))
 
     def display_user_message(self, event: events.UserMessageEvent) -> None:
         self.print(c_user_input.render_user_input(event.content))
@@ -567,10 +568,8 @@ class TUICommandRenderer:
                 self.print(
                     c_sub_agent.render_sub_agent_result(
                         event.task_result,
-                        code_theme=self.themes.code_theme,
                         has_structured_output=event.has_structured_output,
                         description=description,
-                        style=ThemeKey.TOOL_RESULT,
                     )
                 )
 

klaude_code/tui/runner.py

@@ -77,12 +77,12 @@ async def submit_user_input_payload(
         raise ValueError("Multiple RunAgentOperation results are not supported")
 
     for run_op in run_ops:
-        run_op.persist_user_input = cmd_result.persist_user_input
+        run_op.persist_user_input = cmd_result.persist
         run_op.emit_user_message_event = False
 
     if cmd_result.events:
         for evt in cmd_result.events:
-            if cmd_result.persist_events and isinstance(evt, events.DeveloperMessageEvent):
+            if cmd_result.persist and isinstance(evt, events.DeveloperMessageEvent):
                 agent.session.append_history([evt.item])
             await executor.context.emit_event(evt)
 

klaude_code/tui/terminal/selector.py

@@ -19,6 +19,8 @@ from prompt_toolkit.layout.containers import Container, ScrollOffsets
 from prompt_toolkit.layout.controls import BufferControl, FormattedTextControl
 from prompt_toolkit.styles import Style, merge_styles
 
+from klaude_code.ui.common import format_model_params
+
 
 @dataclass(frozen=True, slots=True)
 class SelectItem[T]:
@@ -49,26 +51,14 @@ def build_model_select_items(models: list[Any]) -> list[SelectItem[str]]:
     max_model_name_length = max(len(m.model_name) for m in models)
     num_width = len(str(len(models)))
 
-    def _thinking_info(m: Any) -> str:
-        thinking = m.model_params.thinking
-        if not thinking:
-            return ""
-        if thinking.reasoning_effort:
-            return f"reasoning {thinking.reasoning_effort}"
-        if thinking.budget_tokens:
-            return f"thinking budget {thinking.budget_tokens}"
-        return "thinking (configured)"
-
     items: list[SelectItem[str]] = []
     for idx, m in enumerate(models, 1):
         model_id = m.model_params.model or "N/A"
-        first_line_prefix = f"{m.model_name:<{max_model_name_length}} → "
-        thinking_info = _thinking_info(m)
+        # Display the base model name only; provider stays in the meta section.
+        display_name = m.model_name
+        first_line_prefix = f"{display_name:<{max_model_name_length}} → "
         meta_parts: list[str] = [m.provider]
-        if thinking_info:
-            meta_parts.append(thinking_info)
-        if m.model_params.verbosity:
-            meta_parts.append(f"verbosity {m.model_params.verbosity}")
+        meta_parts.extend(format_model_params(m.model_params))
         meta_str = " · ".join(meta_parts)
         title = [
             ("class:meta", f"{idx:>{num_width}}. "),
@@ -76,8 +66,8 @@ def build_model_select_items(models: list[Any]) -> list[SelectItem[str]]:
             ("class:msg bold", model_id),
             ("class:meta", f"  {meta_str}\n"),
         ]
-        search_text = f"{m.model_name} {model_id} {m.provider}"
-        items.append(SelectItem(title=title, value=m.model_name, search_text=search_text))
+        search_text = f"{m.selector} {m.model_name} {model_id} {m.provider}"
+        items.append(SelectItem(title=title, value=m.selector, search_text=search_text))
 
     return items
 

klaude_code/ui/__init__.py

@@ -10,33 +10,9 @@ Terminal (Rich/prompt-toolkit) UI lives in `klaude_code.tui`.
 from .core.display import DisplayABC
 from .core.input import InputProviderABC
 from .debug_mode import DebugEventDisplay
-from .exec_mode import ExecDisplay, StreamJsonDisplay
-
-
-def create_exec_display(debug: bool = False, stream_json: bool = False) -> DisplayABC:
-    """
-    Create a display for exec (non-interactive) mode.
-
-    Args:
-        debug: If True, wrap the display with DebugEventDisplay to log all events.
-        stream_json: If True, stream all events as JSON lines instead of normal output.
-
-    Returns:
-        A DisplayABC implementation that only outputs task results.
-    """
-    if stream_json:
-        return StreamJsonDisplay()
-    exec_display = ExecDisplay()
-    if debug:
-        return DebugEventDisplay(exec_display)
-    return exec_display
-
 
 __all__ = [
     "DebugEventDisplay",
     "DisplayABC",
-    "ExecDisplay",
     "InputProviderABC",
-    "StreamJsonDisplay",
-    "create_exec_display",
 ]

klaude_code/ui/common.py

@@ -101,6 +101,7 @@ def format_model_params(model_params: "LLMConfigModelParameter") -> list[str]:
     - "reasoning medium"
     - "thinking budget 10000"
     - "verbosity 2"
+    - "image generation"
     - "provider-routing: {…}"
     """
     parts: list[str] = []
@@ -119,8 +120,8 @@ def format_model_params(model_params: "LLMConfigModelParameter") -> list[str]:
     if model_params.provider_routing:
         parts.append(f"provider routing {_format_provider_routing(model_params.provider_routing)}")
 
-    if model_params.modalities:
-        parts.append(f"modalities {','.join(model_params.modalities)}")
+    if model_params.modalities and any(m.casefold() == "image" for m in model_params.modalities):
+        parts.append("image generation")
 
     if model_params.image_config:
         if model_params.image_config.aspect_ratio:

klaude_code/ui/core/display.py

@@ -10,8 +10,8 @@ class DisplayABC(ABC):
     Abstract base class for UI display implementations.
 
     A Display is responsible for rendering events from the executor to the user.
-    Implementations can range from simple text output (ExecDisplay) to rich
-    interactive terminals (TUIDisplay) or debugging wrappers (DebugEventDisplay).
+    Implementations can range from minimal text output to rich interactive
+    terminals (TUIDisplay) or debugging wrappers (DebugEventDisplay).
 
     Lifecycle:
         1. start() is called once before any events are consumed.

{klaude_code-2.1.1.dist-info → klaude_code-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 2.1.1
+Version: 2.3.0
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
@@ -25,21 +25,19 @@ Description-Content-Type: text/markdown
 Minimal code agent CLI.
 
 ## Features
-- **Multi-provider**: Anthropic, OpenAI Responses API, OpenRouter
+- **Multi-provider**: Anthropic Message API, OpenAI Responses API, OpenRouter, Claude Max OAuth and ChatGPT Codex OAuth etc.
 - **Keep reasoning item in context**: Interleaved thinking support
-- **Model-aware tools**: Claude Code tools for Sonnet, `apply_patch` for GPT-5/Codex
-- **Structured sub-agent output**: Define JSON schema, get schema-compliant responses via constrained decoding
+- **Model-aware tools**: Claude Code tool set for Opus, `apply_patch` for GPT-5/Codex
+- **Reminders**: Cooldown-based todo tracking, instruction reinforcement and external file change reminder
+- **Sub-agents**: Task, Explore, Web, ImageGen
+- **Structured sub-agent output**: Main agent defines JSON schema and get schema-compliant responses via constrained decoding
 - **Recursive `@file` mentions**: Circular dependency protection, relative path resolution
-- **Reminders**: Cooldown-based todo tracking and instruction reinforcement
 - **External file sync**: Monitoring for external edits (linter, manual)
 - **Interrupt handling**: Ctrl+C preserves partial responses and synthesizes tool cancellation results
 - **Output truncation**: Large outputs saved to file system with snapshot links
-- **Skills**: Built-in + user + project Agent Skills (with implicit invocation by Skill tool or explicit invocation by typing `$`)
+- **Agent Skills**: Built-in + user + project Agent Skills (with implicit invocation by Skill tool or explicit invocation by typing `$`)
 - **Sessions**: Resumable with `--continue`
-- **Cost tracking**: Automatic API cost calculation and display (USD/CNY)
-- **Version update check**: Background PyPI version check with upgrade prompts
-- **Terminal title**: Shows current directory and model name
-- **Mermaid diagrams**: Interactive local HTML viewer with zoom, pan, and SVG export
+- **Mermaid diagrams**: Terminal image preview and Interactive local HTML viewer with zoom, pan, and SVG export
 - **Extras**: Slash commands, sub-agents, image paste, terminal notifications, auto-theming
 
 ## Installation
@@ -59,32 +57,23 @@ Or use the built-in alias command:
 ```bash
 klaude update
 klaude upgrade
-```
-
-To show version:
-
-```bash
 klaude --version
-klaude -v
-klaude version
+
 ```
 
 ## Usage
 
-### Interactive Mode
-
 ```bash
 klaude [--model <name>] [--select-model]
 ```
 
 **Options:**
-- `--version`/`-V`/`-v`: Show version and exit.
 - `--model`/`-m`: Preferred model name (exact match picks immediately; otherwise opens the interactive selector filtered by this value).
 - `--select-model`/`-s`: Open the interactive model selector at startup (shows all models unless `--model` is also provided).
 - `--continue`/`-c`: Resume the most recent session.
 - `--resume`/`-r`: Select a session to resume for this project.
 - `--resume-by-id <id>`: Resume a session by its ID directly.
-- `--vanilla`: Minimal mode with only basic tools (Bash, Read, Edit) and no system prompts.
+- `--vanilla`: Minimal mode with only basic tools (Bash, Read, Edit, Write) and no system prompts.
 
 **Model selection behavior:**
 - Default: uses `main_model` from config.
@@ -255,48 +244,16 @@ provider_list:
           context_limit: 128000
 ```
 
-##### Full Example
-
-```yaml
-# User configuration - merged with built-in config
-main_model: opus
-
-sub_agent_models:
-  explore: sonnet
-  task: opus
-  webagent: sonnet
-
-provider_list:
-  # Add models to built-in openrouter
-  - provider_name: openrouter
-    model_list:
-      - model_name: qwen-coder
-        model_params:
-          model: qwen/qwen-2.5-coder-32b-instruct
-          context_limit: 131072
-
-  # Add a completely new provider
-  - provider_name: local-ollama
-    protocol: openai
-    base_url: http://localhost:11434/v1
-    api_key: ollama
-    model_list:
-      - model_name: local-llama
-        model_params:
-          model: llama3.2
-          context_limit: 8192
-```
-
 ##### Supported Protocols
 
-- `anthropic` - Anthropic Claude API
+- `anthropic` - Anthropic Messages API
 - `claude_oauth` - Claude OAuth (for Claude Pro/Max subscribers)
-- `openai` - OpenAI-compatible API
+- `openai` - OpenAI Chat Completion API
 - `responses` - OpenAI Responses API (for o-series, GPT-5, Codex)
-- `openrouter` - OpenRouter API
-- `google` - Google Gemini API
-- `bedrock` - AWS Bedrock (uses AWS credentials instead of api_key)
 - `codex_oauth` - OpenAI Codex CLI (OAuth-based, for ChatGPT Pro subscribers)
+- `openrouter` - OpenRouter API (handling `reasoning_details` for interleaved thinking)
+- `google` - Google Gemini API
+- `bedrock` - AWS Bedrock for Claude(uses AWS credentials instead of api_key)
 
 List configured providers and models:
 
@@ -338,6 +295,7 @@ Inside the interactive session (`klaude`), use these commands to streamline your
 - `/model` - Switch the active LLM during the session.
 - `/thinking` - Configure model thinking/reasoning level.
 - `/clear` - Clear the current conversation context.
+- `/copy` - Copy last assistant message.
 - `/status` - Show session usage statistics (cost, tokens, model breakdown).
 - `/resume` - Select and resume a previous session.
 - `/fork-session` - Fork current session to a new session ID (supports interactive fork point selection).
@@ -364,29 +322,6 @@ Inside the interactive session (`klaude`), use these commands to streamline your
 | `Backspace`          | Delete character or selected text           |
 | `c` (with selection) | Copy selected text to clipboard             |
 
-### Non-Interactive Headless Mode (exec)
-
-Execute a single command without starting the interactive REPL:
-
-```bash
-# Direct input
-klaude exec "what is 2+2?"
-
-# Pipe input
-echo "hello world" | klaude exec
-
-# With model selection
-
-# Exact model name (non-interactive)
-echo "generate quicksort in python" | klaude exec --model gpt-5.1
-
-# Partial/ambiguous name opens the interactive selector (filtered)
-echo "generate quicksort in python" | klaude exec --model gpt
-
-# Stream all events as JSON lines (for programmatic processing)
-klaude exec "what is 2+2?" --stream-json
-```
-
 ### Sub-Agents
 
 The main agent can spawn specialized sub-agents for specific tasks: