klaude-code 1.2.25__py3-none-any.whl → 1.2.27__py3-none-any.whl

klaude_code/ui/renderers/tools.py

@@ -18,8 +18,8 @@ from klaude_code.ui.rich.theme import ThemeKey
 
 # Tool markers (Unicode symbols for UI display)
 MARK_GENERIC = "⚒"
-MARK_BASH = "→"
-MARK_PLAN = "▪"
+MARK_BASH = "$"
+MARK_PLAN = "Ξ"
 MARK_READ = "←"
 MARK_EDIT = "±"
 MARK_WRITE = "+"
@@ -528,19 +528,28 @@ def render_tool_call(e: events.ToolCallEvent) -> RenderableType | None:
 def _extract_diff(ui_extra: model.ToolResultUIExtra | None) -> model.DiffUIExtra | None:
     if isinstance(ui_extra, model.DiffUIExtra):
         return ui_extra
+    if isinstance(ui_extra, model.MultiUIExtra):
+        for item in ui_extra.items:
+            if isinstance(item, model.DiffUIExtra):
+                return item
     return None
 
 
 def _extract_markdown_doc(ui_extra: model.ToolResultUIExtra | None) -> model.MarkdownDocUIExtra | None:
     if isinstance(ui_extra, model.MarkdownDocUIExtra):
         return ui_extra
+    if isinstance(ui_extra, model.MultiUIExtra):
+        for item in ui_extra.items:
+            if isinstance(item, model.MarkdownDocUIExtra):
+                return item
     return None
 
 
 def render_markdown_doc(md_ui: model.MarkdownDocUIExtra, *, code_theme: str) -> RenderableType:
     """Render markdown document content in a panel."""
+    header = render_path(md_ui.file_path, ThemeKey.TOOL_PARAM_FILE_PATH)
     return Panel.fit(
-        NoInsetMarkdown(md_ui.content, code_theme=code_theme),
+        Group(header, Text(""), NoInsetMarkdown(md_ui.content, code_theme=code_theme)),
         box=box.SIMPLE,
         border_style=ThemeKey.LINES,
         style=ThemeKey.WRITE_MARKDOWN_PANEL,
@@ -562,6 +571,19 @@ def render_tool_result(e: events.ToolResultEvent, *, code_theme: str = "monokai"
         error_msg = truncate_display(e.result)
         return r_errors.render_error(error_msg)
 
+    # Render multiple ui blocks if present
+    if isinstance(e.ui_extra, model.MultiUIExtra) and e.ui_extra.items:
+        rendered: list[RenderableType] = []
+        for item in e.ui_extra.items:
+            if isinstance(item, model.MarkdownDocUIExtra):
+                rendered.append(Padding.indent(render_markdown_doc(item, code_theme=code_theme), level=2))
+            elif isinstance(item, model.DiffUIExtra):
+                show_file_name = e.tool_name == tools.APPLY_PATCH
+                rendered.append(
+                    Padding.indent(r_diffs.render_structured_diff(item, show_file_name=show_file_name), level=2)
+                )
+        return Group(*rendered) if rendered else None
+
     # Show truncation info if output was truncated and saved to file
     truncation_info = get_truncation_info(e)
     if truncation_info:
@@ -580,6 +602,8 @@ def render_tool_result(e: events.ToolResultEvent, *, code_theme: str = "monokai"
                 return Padding.indent(render_markdown_doc(md_ui, code_theme=code_theme), level=2)
             return Padding.indent(r_diffs.render_structured_diff(diff_ui) if diff_ui else Text(""), level=2)
         case tools.APPLY_PATCH:
+            if md_ui:
+                return Padding.indent(render_markdown_doc(md_ui, code_theme=code_theme), level=2)
             if diff_ui:
                 return Padding.indent(r_diffs.render_structured_diff(diff_ui, show_file_name=True), level=2)
             if len(e.result.strip()) == 0:

klaude_code/ui/rich/markdown.py

@@ -1,4 +1,3 @@
-# copy from https://github.com/Aider-AI/aider/blob/main/aider/mdstream.py
 from __future__ import annotations
 
 import contextlib
@@ -9,11 +8,13 @@ from typing import Any, ClassVar
 
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
+from rich import box
 from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
-from rich.markdown import CodeBlock, Heading, Markdown, MarkdownElement
+from rich.markdown import CodeBlock, Heading, Markdown, MarkdownElement, TableElement
 from rich.rule import Rule
 from rich.style import Style, StyleType
 from rich.syntax import Syntax
+from rich.table import Table
 from rich.text import Text
 from rich.theme import Theme
 
@@ -53,6 +54,24 @@ class Divider(MarkdownElement):
         yield Rule(style=style, characters="-")
 
 
+class MinimalHeavyHeadTable(TableElement):
+    """A table element with MINIMAL_HEAVY_HEAD box style."""
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        table = Table(box=box.MARKDOWN)
+
+        if self.header is not None and self.header.row is not None:
+            for column in self.header.row.cells:
+                table.add_column(column.content)
+
+        if self.body is not None:
+            for row in self.body.rows:
+                row_content = [element.content for element in row.cells]
+                table.add_row(*row_content)
+
+        yield table
+
+
 class LeftHeading(Heading):
     """A heading class that renders left-justified."""
 
@@ -64,7 +83,7 @@ class LeftHeading(Heading):
             yield h1_text
         elif self.tag == "h2":
             text.stylize(Style(bold=True, underline=False))
-            yield Rule(title=text, characters="·", style="markdown.h2.border", align="left")
+            yield text
         else:
             yield text
 
@@ -78,6 +97,7 @@ class NoInsetMarkdown(Markdown):
         "code_block": NoInsetCodeBlock,
         "heading_open": LeftHeading,
         "hr": Divider,
+        "table_open": MinimalHeavyHeadTable,
     }
 
 
@@ -90,6 +110,7 @@ class ThinkingMarkdown(Markdown):
         "code_block": ThinkingCodeBlock,
         "heading_open": LeftHeading,
         "hr": Divider,
+        "table_open": MinimalHeavyHeadTable,
     }
 
 
@@ -171,7 +192,7 @@ class MarkdownStream:
 
         try:
             tokens = self._parser.parse(text)
-        except Exception:
+        except Exception:  # markdown-it-py may raise various internal errors during parsing
             return 0
 
         top_level: list[Token] = [token for token in tokens if token.level == 0 and token.map is not None]
@@ -341,9 +362,6 @@ class MarkdownStream:
     def update(self, text: str, final: bool = False) -> None:
         """Update the display with the latest full markdown buffer."""
 
-        if self._live_sink is None:
-            return
-
         now = time.time()
         if not final and now - self.when < self.min_delay:
             return
@@ -374,18 +392,20 @@ class MarkdownStream:
             self._stable_source_line_count = stable_line
 
         if final:
-            self._live_sink(None)
+            if self._live_sink is not None:
+                self._live_sink(None)
             return
 
-        apply_mark_live = self._stable_source_line_count == 0
-        live_lines = self._render_markdown_to_lines(live_source, apply_mark=apply_mark_live)
+        if const.MARKDOWN_STREAM_LIVE_REPAINT_ENABLED and self._live_sink is not None:
+            apply_mark_live = self._stable_source_line_count == 0
+            live_lines = self._render_markdown_to_lines(live_source, apply_mark=apply_mark_live)
 
-        if self._stable_rendered_lines and not self._stable_rendered_lines[-1].strip():
-            while live_lines and not live_lines[0].strip():
-                live_lines.pop(0)
+            if self._stable_rendered_lines and not self._stable_rendered_lines[-1].strip():
+                while live_lines and not live_lines[0].strip():
+                    live_lines.pop(0)
 
-        live_text = Text.from_ansi("".join(live_lines))
-        self._live_sink(live_text)
+            live_text = Text.from_ansi("".join(live_lines))
+            self._live_sink(live_text)
 
         elapsed = time.time() - start
         self.min_delay = min(max(elapsed * 6, 1.0 / 30), 0.5)

klaude_code/ui/rich/theme.py

@@ -276,7 +276,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.RESUME_FLAG.value: "bold reverse " + palette.green,
                 ThemeKey.RESUME_INFO.value: palette.green,
                 # CONFIGURATION DISPLAY
-                ThemeKey.CONFIG_TABLE_HEADER.value: palette.green,
+                ThemeKey.CONFIG_TABLE_HEADER.value: palette.grey1,
                 ThemeKey.CONFIG_STATUS_OK.value: palette.green,
                 ThemeKey.CONFIG_STATUS_PRIMARY.value: palette.yellow,
                 ThemeKey.CONFIG_STATUS_ERROR.value: palette.red,
@@ -291,7 +291,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 "markdown.code.border": palette.grey3,
                 "markdown.h1": "bold reverse",
                 "markdown.h1.border": palette.grey3,
-                "markdown.h2.border": palette.grey3,
+                "markdown.h2": "bold underline",
                 "markdown.h3": "bold " + palette.grey1,
                 "markdown.h4": "bold " + palette.grey2,
                 "markdown.hr": palette.grey3,
@@ -311,7 +311,6 @@ def get_theme(theme: str | None = None) -> Themes:
                 "markdown.code.border": palette.grey3,
                 "markdown.h1": "bold reverse",
                 "markdown.h1.border": palette.grey3,
-                "markdown.h2.border": palette.grey3,
                 "markdown.h3": "bold " + palette.grey1,
                 "markdown.h4": "bold " + palette.grey2,
                 "markdown.hr": palette.grey3,
@@ -329,7 +328,6 @@ def get_theme(theme: str | None = None) -> Themes:
             Style(color=palette.blue),
             Style(color=palette.purple),
             Style(color=palette.orange),
-            Style(color=palette.red),
             Style(color=palette.grey1),
             Style(color=palette.yellow),
         ],
@@ -339,7 +337,6 @@ def get_theme(theme: str | None = None) -> Themes:
             Style(bgcolor=palette.blue_sub_background),
             Style(bgcolor=palette.purple_background),
             Style(bgcolor=palette.orange_background),
-            Style(bgcolor=palette.red_background),
             Style(bgcolor=palette.grey_background),
             Style(bgcolor=palette.yellow_background),
         ],

klaude_code/ui/terminal/color.py

@@ -182,7 +182,7 @@ def _parse_osc_color_response(data: bytes) -> tuple[int, int, int] | None:
 
     try:
         text = data.decode("ascii", errors="ignore")
-    except Exception:
+    except LookupError:  # encoding lookup failure (should not happen with "ascii")
         return None
 
     match = _OSC_BG_REGEX.search(text)

klaude_code/ui/terminal/control.py

@@ -48,7 +48,7 @@ def start_esc_interrupt_monitor(
         try:
             fd = sys.stdin.fileno()
             old = termios.tcgetattr(fd)
-        except Exception as exc:  # pragma: no cover - environment dependent
+        except OSError as exc:  # pragma: no cover - environment dependent
             log((f"esc monitor init error: {exc}", "r red"))
             return
 
@@ -60,7 +60,7 @@ def start_esc_interrupt_monitor(
                     continue
                 try:
                     ch = os.read(fd, 1).decode(errors="ignore")
-                except Exception:
+                except OSError:
                     continue
                 if ch != "\x1b":
                     continue
@@ -71,7 +71,7 @@ def start_esc_interrupt_monitor(
                 while r2:
                     try:
                         seq += os.read(fd, 1).decode(errors="ignore")
-                    except Exception:
+                    except OSError:
                         break
                     r2, _, _ = select.select([sys.stdin], [], [], 0.0)
 
@@ -127,7 +127,7 @@ def install_sigint_double_press_exit(
 
     try:
         signal.signal(signal.SIGINT, _handler)
-    except Exception:  # pragma: no cover - platform dependent
+    except (OSError, ValueError):  # pragma: no cover - platform dependent
         # If installing the handler fails, restore() will be a no-op.
         return lambda: None
 

{klaude_code-1.2.25.dist-info → klaude_code-1.2.27.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.2.25
-Summary: Add your description here
+Version: 1.2.27
+Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: ddgs>=9.9.3
@@ -21,7 +21,7 @@ Description-Content-Type: text/markdown
 
 # Klaude Code
 
-Multi-model code agent CLI.
+Minimal code agent CLI.
 
 ## Features
 - **Multi-provider**: Anthropic, OpenAI Responses API, OpenRouter
@@ -92,147 +92,141 @@ klaude [--model <name>] [--select-model]
 
 ### Configuration
 
-An example config will be created in `~/.klaude/klaude-config.yaml` when first run.
+#### Quick Start (Zero Config)
 
-Open the configuration file in editor:
+Klaude comes with built-in provider configurations. Just set an API key environment variable and start using it:
+
+```bash
+# Pick one (or more) of these:
+export ANTHROPIC_API_KEY=sk-ant-xxx      # Claude models
+export OPENAI_API_KEY=sk-xxx             # GPT models
+export OPENROUTER_API_KEY=sk-or-xxx      # OpenRouter (multi-provider)
+export DEEPSEEK_API_KEY=sk-xxx           # DeepSeek models
+export MOONSHOT_API_KEY=sk-xxx           # Moonshot/Kimi models
+
+# Then just run:
+klaude
+```
+
+On first run, you'll be prompted to select a model. Your choice is saved as `main_model`.
+
+#### Built-in Providers
+
+| Provider    | Env Variable          | Models                                                                        |
+|-------------|-----------------------|-------------------------------------------------------------------------------|
+| anthropic   | `ANTHROPIC_API_KEY`   | sonnet, opus                                                                  |
+| openai      | `OPENAI_API_KEY`      | gpt-5.2                                                                       |
+| openrouter  | `OPENROUTER_API_KEY`  | gpt-5.2, gpt-5.2-fast, gpt-5.1-codex-max, sonnet, opus, haiku, kimi, gemini-* |
+| deepseek    | `DEEPSEEK_API_KEY`    | deepseek                                                                      |
+| moonshot    | `MOONSHOT_API_KEY`    | kimi@moonshot                                                                 |
+| codex       | N/A (OAuth)           | gpt-5.2-codex                                                                 |
+
+List all configured providers and models:
+
+```bash
+klaude list
+```
+
+Models from providers without a valid API key are shown as dimmed/unavailable.
+
+#### Custom Configuration
+
+User config file: `~/.klaude/klaude-config.yaml`
+
+Open in editor:
 
 ```bash
 klaude config
 ```
 
-An example config yaml:
+##### Adding Models to Built-in Providers
+
+You can add custom models to existing providers without redefining the entire provider:
 
 ```yaml
+# Just specify provider_name and your new models - no need for protocol/api_key
 provider_list:
-- provider_name: openrouter
-  protocol: openrouter # support <responses|openrouter|anthropic|openai>
-  api_key: <your-openrouter-api-key>
-
-- provider_name: openai-responses
-  protocol: responses
-  api_key: <your-openai-api-key>
-
-- provider_name: anthropic
-  protocol: anthropic
-  api_key: <your-anthropic-api-key>
-
-- provider_name: moonshot
-  protocol: anthropic
-  base_url: https://api.moonshot.cn/anthropic
-  api_key: <your-api-key>
-
-- provider_name: deepseek
-  protocol: anthropic
-  base_url: https://api.deepseek.com/anthropic
-  api_key: <your-api-key>
-
-model_list:
-
-- model_name: deepseek
-  provider: deepseek
-  model_params:
-    model: deepseek-reasoner
-    context_limit: 128000
-    thinking:
-      type: enabled
-      budget_tokens: 8192
-    cost:
-      currency: CNY
-      input: 2
-      output: 3
-      cache_read: 0.2
-
-- model_name: codex-max
-  provider: openai-responses
-  model_params:
-    model: gpt-5.1-codex-max
-    thinking:
-      reasoning_effort: medium
-    context_limit: 400000
-    max_tokens: 128000
-    cost:
-      input: 1.25
-      output: 10
-      cache_read: 0.13
-
-- model_name: gpt-5.1
-  provider: openrouter
-  model_params:
-    model: openai/gpt-5.1
-    context_limit: 400000
-    max_tokens: 128000
-    verbosity: high
-    thinking:
-      reasoning_effort: high
-    cost:
-      input: 1.25
-      output: 10
-      cache_read: 0.13
-
-- model_name: kimi@moonshot
-  provider: moonshot
-  model_params:
-    model: kimi-k2-thinking
-    context_limit: 262144
-    thinking:
-      type: enabled
-      budget_tokens: 8192
-    cost:
-      currency: CNY
-      input: 4
-      output: 16
-      cache_read: 1
-
-- model_name: opus
-  provider: openrouter
-  model_params:
-    model: anthropic/claude-4.5-opus
-    context_limit: 200000
-    provider_routing:
-      only: [ google-vertex ]
-    verbosity: high
-    thinking:
-      type: enabled
-      budget_tokens: 31999
-    cost:
-      input: 5
-      output: 25
-      cache_read: 0.5
-      cache_write: 6.25
-
-- model_name: gemini
-  provider: openrouter
-  model_params:
-    model: google/gemini-3-pro-preview
-    context_limit: 1048576
-    thinking:
-      reasoning_effort: medium
-    cost:
-      input: 2
-      output: 12
-      cache_read: 0.2
-
-- model_name: haiku
-  provider: anthropic
-  model_params:
-    model: claude-haiku-4-5-20251001
-    context_limit: 200000
-    cost:
-      input: 1
-      output: 5
-      cache_read: 0.1
-      cache_write: 1.25
+  - provider_name: openrouter
+    model_list:
+      - model_name: my-custom-model
+        model_params:
+          model: some-provider/some-model-id
+          context_limit: 200000
+```
+
+Your models are merged with built-in models. To override a built-in model, use the same `model_name`.
 
+##### Overriding Provider Settings
+
+Override provider-level settings (like api_key) while keeping built-in models:
+
+```yaml
+provider_list:
+  - provider_name: anthropic
+    api_key: sk-my-custom-key  # Override the default ${ANTHROPIC_API_KEY}
+    # Built-in models (sonnet, opus) are still available
+```
+
+##### Adding New Providers
+
+For providers not in the built-in list, you must specify `protocol`:
+
+```yaml
+provider_list:
+  - provider_name: my-azure-openai
+    protocol: openai
+    api_key: ${AZURE_OPENAI_KEY}
+    base_url: https://my-instance.openai.azure.com/
+    is_azure: true
+    azure_api_version: "2024-02-15-preview"
+    model_list:
+      - model_name: gpt-4-azure
+        model_params:
+          model: gpt-4
+          context_limit: 128000
+```
+
+##### Full Example
+
+```yaml
+# User configuration - merged with built-in config
 main_model: opus
 
 sub_agent_models:
-  oracle: gpt-5.1
-  explore: haiku
+  oracle: gpt-4.1
+  explore: sonnet
   task: opus
-  webagent: haiku
+  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
+- `openai` - OpenAI-compatible API
+- `responses` - OpenAI Responses API (for o-series, GPT-5, Codex)
+- `openrouter` - OpenRouter API
+- `codex` - OpenAI Codex CLI (OAuth-based)
+
 List configured providers and models:
 
 ```bash