klaude-code 1.8.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

klaude_code/ui/rich/live.py

@@ -7,6 +7,8 @@ from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
 from rich.live import Live
 from rich.segment import Segment
 
+from klaude_code.const import CROP_ABOVE_LIVE_REFRESH_PER_SECOND
+
 
 class CropAbove:
     def __init__(self, renderable: RenderableType, style: str = "") -> None:
@@ -33,7 +35,7 @@ class CropAboveLive(Live):
         renderable: RenderableType | None = None,
         *,
         console: Console | None = None,
-        refresh_per_second: float = 4,
+        refresh_per_second: float = CROP_ABOVE_LIVE_REFRESH_PER_SECOND,
         transient: bool = False,
         get_renderable: Any | None = None,
         style: str = "",

klaude_code/ui/rich/markdown.py

@@ -18,7 +18,7 @@ from rich.table import Table
 from rich.text import Text
 from rich.theme import Theme
 
-from klaude_code import const
+from klaude_code.const import MARKDOWN_RIGHT_MARGIN, MARKDOWN_STREAM_LIVE_REPAINT_ENABLED, UI_REFRESH_RATE_FPS
 from klaude_code.ui.rich.code_panel import CodePanel
 
 
@@ -55,8 +55,6 @@ class Divider(MarkdownElement):
 
 
 class MarkdownTable(TableElement):
-    """A table element with MINIMAL_HEAVY_HEAD box style."""
-
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         table = Table(box=box.MARKDOWN, border_style=console.get_style("markdown.table.border"))
 
@@ -69,7 +67,27 @@ class MarkdownTable(TableElement):
                 row_content = [element.content for element in row.cells]
                 table.add_row(*row_content)
 
-        yield table
+        # Render table and strip top/bottom blank lines that MARKDOWN box adds
+        segments = list(console.render(table, options))
+
+        # Skip leading blank line (before first newline)
+        first_newline_idx = next((i for i, s in enumerate(segments) if s.text == "\n"), None)
+        if first_newline_idx is not None:
+            first_line = "".join(s.text for s in segments[:first_newline_idx])
+            if not first_line.strip():
+                segments = segments[first_newline_idx + 1 :]
+
+        # Skip trailing blank line (after last newline)
+        while len(segments) >= 2 and segments[-1].text == "\n":
+            prev_newline = next((i for i in range(len(segments) - 2, -1, -1) if segments[i].text == "\n"), None)
+            if prev_newline is not None:
+                between = "".join(s.text for s in segments[prev_newline + 1 : -1])
+                if not between.strip():
+                    segments = segments[: prev_newline + 1]
+                    continue
+            break
+
+        yield from segments
 
 
 class LeftHeading(Heading):
@@ -135,7 +153,7 @@ class MarkdownStream:
         mark: str | None = None,
         mark_style: StyleType | None = None,
         left_margin: int = 0,
-        right_margin: int = const.MARKDOWN_RIGHT_MARGIN,
+        right_margin: int = MARKDOWN_RIGHT_MARGIN,
         markdown_class: Callable[..., Markdown] | None = None,
     ) -> None:
         """Initialize the markdown stream.
@@ -162,7 +180,7 @@ class MarkdownStream:
 
         # Streaming control
         self.when: float = 0.0  # Timestamp of last update
-        self.min_delay: float = 1.0 / 20  # Minimum time between updates (20fps)
+        self.min_delay: float = 1.0 / UI_REFRESH_RATE_FPS
         self._parser: MarkdownIt = MarkdownIt("commonmark")
 
         self.theme = theme
@@ -201,6 +219,20 @@ class MarkdownStream:
 
         last = top_level[-1]
         assert last.map is not None
+
+        # When the buffer ends mid-line, markdown-it-py can temporarily classify
+        # some lines as a thematic break (hr). For example, a trailing "- --"
+        # parses as an hr, but appending a non-hr character ("- --0") turns it
+        # into a list item, which should belong to the previous list block.
+        #
+        # Because stable_line is clamped to be monotonic, advancing to the hr's
+        # start line would be irreversible and can split a list across
+        # stable/live, producing a render mismatch.
+        if last.type == "hr" and not text.endswith("\n"):
+            prev = top_level[-2]
+            assert prev.map is not None
+            return max(prev.map[0], 0)
+
         start_line = last.map[0]
         return max(start_line, 0)
 
@@ -414,7 +446,7 @@ class MarkdownStream:
                 self._live_sink(None)
             return
 
-        if const.MARKDOWN_STREAM_LIVE_REPAINT_ENABLED and self._live_sink is not None:
+        if 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)
 

klaude_code/ui/rich/quote.py

@@ -1,9 +1,12 @@
-from typing import Any
+from typing import TYPE_CHECKING, Any, Self
 
 from rich.console import Console, ConsoleOptions, RenderResult
 from rich.segment import Segment
 from rich.style import Style
 
+if TYPE_CHECKING:
+    from rich.console import RenderableType
+
 
 class Quote:
     """Wrapper to add quote prefix to any content"""
@@ -32,3 +35,75 @@ class Quote:
             yield prefix_segment
             yield from line
             yield new_line
+
+
+class TreeQuote:
+    """Wrapper to add a tree-style prefix to any content."""
+
+    def __init__(
+        self,
+        content: Any,
+        *,
+        prefix_first: str | None = None,
+        prefix_middle: str = "│ ",
+        prefix_last: str = "└ ",
+        style: str | Style = "magenta",
+        style_first: str | Style | None = None,
+    ):
+        self.content = content
+        self.prefix_first = prefix_first
+        self.prefix_middle = prefix_middle
+        self.prefix_last = prefix_last
+        self.style = style
+        self.style_first = style_first
+
+    @classmethod
+    def for_tool_call(cls, content: "RenderableType", *, mark: str, style: str, style_first: str) -> Self:
+        """Create a tree quote for tool call display.
+
+        The mark appears on the first line, with continuation lines using "│ ".
+        """
+        return cls(
+            content,
+            prefix_first=f"{mark} ",
+            prefix_middle="│ ",
+            prefix_last="│ ",
+            style=style,
+            style_first=style_first,
+        )
+
+    @classmethod
+    def for_tool_result(
+        cls, content: "RenderableType", *, is_last: bool, style: str = "tool.result.tree_prefix"
+    ) -> Self:
+        """Create a tree quote for tool result display.
+
+        Uses "└ " for the last result in a turn, "│ " otherwise.
+        """
+        return cls(content, prefix_last="└ " if is_last else "│ ", style=style)
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        # Reduce width to leave space for prefix
+        prefix_width = max(
+            len(self.prefix_middle),
+            len(self.prefix_last),
+            len(self.prefix_first) if self.prefix_first is not None else 0,
+        )
+        render_options = options.update(width=options.max_width - prefix_width)
+
+        quote_style = console.get_style(self.style) if isinstance(self.style, str) else self.style
+        first_style = console.get_style(self.style_first) if isinstance(self.style_first, str) else self.style_first
+
+        new_line = Segment("\n")
+        lines = console.render_lines(self.content, render_options)
+        line_count = len(lines)
+
+        for idx, line in enumerate(lines):
+            if idx == 0 and self.prefix_first is not None:
+                yield Segment(self.prefix_first, first_style or quote_style)
+            else:
+                is_last = idx == line_count - 1
+                prefix = self.prefix_last if is_last else self.prefix_middle
+                yield Segment(prefix, quote_style)
+            yield from line
+            yield new_line

klaude_code/ui/rich/status.py

@@ -16,7 +16,13 @@ from rich.style import Style
 from rich.table import Table
 from rich.text import Text
 
-from klaude_code import const
+from klaude_code.const import (
+    SPINNER_BREATH_PERIOD_SECONDS,
+    STATUS_HINT_TEXT,
+    STATUS_SHIMMER_ALPHA_SCALE,
+    STATUS_SHIMMER_BAND_HALF_WIDTH,
+    STATUS_SHIMMER_PADDING,
+)
 from klaude_code.ui.rich.theme import ThemeKey
 from klaude_code.ui.terminal.color import get_last_terminal_background_rgb
 
@@ -91,7 +97,7 @@ def current_hint_text(*, min_time_width: int = 0) -> str:
 
     # Keep the signature stable; min_time_width is intentionally ignored.
     _ = min_time_width
-    return const.STATUS_HINT_TEXT
+    return STATUS_HINT_TEXT
 
 
 def current_elapsed_text(*, min_time_width: int = 0) -> str | None:
@@ -152,18 +158,18 @@ def _shimmer_profile(main_text: str) -> list[tuple[str, float]]:
     if not chars:
         return []
 
-    padding = const.STATUS_SHIMMER_PADDING
+    padding = STATUS_SHIMMER_PADDING
     char_count = len(chars)
     period = char_count + padding * 2
 
     # Use same period as breathing spinner for visual consistency
-    sweep_seconds = max(const.SPINNER_BREATH_PERIOD_SECONDS, 0.1)
+    sweep_seconds = max(SPINNER_BREATH_PERIOD_SECONDS, 0.1)
 
     elapsed = _elapsed_since_start()
     # Complete one full sweep in sweep_seconds, regardless of text length
     pos_f = (elapsed / sweep_seconds % 1.0) * period
     pos = int(pos_f)
-    band_half_width = const.STATUS_SHIMMER_BAND_HALF_WIDTH
+    band_half_width = STATUS_SHIMMER_BAND_HALF_WIDTH
 
     profile: list[tuple[str, float]] = []
     for index, ch in enumerate(chars):
@@ -189,7 +195,7 @@ def _shimmer_style(console: Console, base_style: Style, intensity: float) -> Sty
     if intensity <= 0.0:
         return base_style
 
-    alpha = max(0.0, min(1.0, intensity * const.STATUS_SHIMMER_ALPHA_SCALE))
+    alpha = max(0.0, min(1.0, intensity * STATUS_SHIMMER_ALPHA_SCALE))
 
     base_color = base_style.color or Color.default()
     base_triplet = base_color.get_truecolor()
@@ -213,7 +219,7 @@ def _breathing_intensity() -> float:
     then returning to 0, giving a subtle "breathing" effect.
     """
 
-    period = max(const.SPINNER_BREATH_PERIOD_SECONDS, 0.1)
+    period = max(SPINNER_BREATH_PERIOD_SECONDS, 0.1)
     elapsed = _elapsed_since_start()
     phase = (elapsed % period) / period
     return 0.5 * (1.0 - math.cos(2.0 * math.pi * phase))
@@ -224,7 +230,7 @@ def _breathing_glyph() -> str:
 
     Alternates between glyphs at each breath cycle (when intensity reaches 0).
     """
-    period = max(const.SPINNER_BREATH_PERIOD_SECONDS, 0.1)
+    period = max(SPINNER_BREATH_PERIOD_SECONDS, 0.1)
     elapsed = _elapsed_since_start()
     cycle = int(elapsed / period)
     return BREATHING_SPINNER_GLYPHS[cycle % len(BREATHING_SPINNER_GLYPHS)]

klaude_code/ui/rich/theme.py

@@ -124,6 +124,7 @@ class ThemeKey(str, Enum):
     # ERROR
     ERROR = "error"
     ERROR_BOLD = "error.bold"
+    ERROR_DIM = "error.dim"
     INTERRUPT = "interrupt"
     # METADATA
     METADATA = "metadata"
@@ -154,6 +155,7 @@ class ThemeKey(str, Enum):
     TOOL_PARAM = "tool.param"
     TOOL_PARAM_BOLD = "tool.param.bold"
     TOOL_RESULT = "tool.result"
+    TOOL_RESULT_TREE_PREFIX = "tool.result.tree_prefix"
     TOOL_RESULT_TRUNCATED = "tool.result.truncated"
     TOOL_RESULT_BOLD = "tool.result.bold"
     TOOL_MARK = "tool.mark"
@@ -161,6 +163,7 @@ class ThemeKey(str, Enum):
     TOOL_REJECTED = "tool.rejected"
     TOOL_TIMEOUT = "tool.timeout"
     TOOL_RESULT_MERMAID = "tool.result.mermaid"
+    SUB_AGENT_FOOTER = "sub_agent.footer"
     # BASH SYNTAX
     BASH_COMMAND = "bash.command"
     BASH_ARGUMENT = "bash.argument"
@@ -197,8 +200,8 @@ class ThemeKey(str, Enum):
     CONFIG_STATUS_PRIMARY = "config.status.primary"
     CONFIG_STATUS_ERROR = "config.status.error"
     CONFIG_ITEM_NAME = "config.item.name"
+    CONFIG_MODEL_ID = "config.model.id"
     CONFIG_PARAM_LABEL = "config.param.label"
-    CONFIG_PANEL_BORDER = "config.panel.border"
 
     def __str__(self) -> str:
         return self.value
@@ -216,6 +219,7 @@ class Themes:
 
 def get_theme(theme: str | None = None) -> Themes:
     palette = LIGHT_PALETTE if theme == "light" else DARK_PALETTE
+
     return Themes(
         app_theme=Theme(
             styles={
@@ -234,6 +238,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 # ERROR
                 ThemeKey.ERROR.value: palette.red,
                 ThemeKey.ERROR_BOLD.value: "bold " + palette.red,
+                ThemeKey.ERROR_DIM.value: "dim " + palette.red,
                 ThemeKey.INTERRUPT.value: "reverse bold " + palette.red,
                 # USER_INPUT
                 ThemeKey.USER_INPUT.value: palette.magenta,
@@ -263,13 +268,15 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.TOOL_PARAM.value: palette.green,
                 ThemeKey.TOOL_PARAM_BOLD.value: "bold " + palette.green,
                 ThemeKey.TOOL_RESULT.value: palette.grey_green,
+                ThemeKey.TOOL_RESULT_TREE_PREFIX.value: palette.grey_green + " dim",
                 ThemeKey.TOOL_RESULT_BOLD.value: "bold " + palette.grey_green,
-                ThemeKey.TOOL_RESULT_TRUNCATED.value: palette.yellow,
+                ThemeKey.TOOL_RESULT_TRUNCATED.value: palette.yellow + " dim",
                 ThemeKey.TOOL_MARK.value: "bold",
                 ThemeKey.TOOL_APPROVED.value: palette.green + " bold reverse",
                 ThemeKey.TOOL_REJECTED.value: palette.red + " bold reverse",
                 ThemeKey.TOOL_TIMEOUT.value: palette.yellow,
                 ThemeKey.TOOL_RESULT_MERMAID: palette.blue + " underline",
+                ThemeKey.SUB_AGENT_FOOTER.value: "dim " + palette.grey2,
                 # BASH SYNTAX
                 ThemeKey.BASH_COMMAND.value: "bold " + palette.green,
                 ThemeKey.BASH_ARGUMENT.value: palette.green,
@@ -300,13 +307,13 @@ 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.grey1,
+                ThemeKey.CONFIG_TABLE_HEADER.value: "bold " + palette.grey1,
                 ThemeKey.CONFIG_STATUS_OK.value: palette.green,
-                ThemeKey.CONFIG_STATUS_PRIMARY.value: palette.yellow,
+                ThemeKey.CONFIG_STATUS_PRIMARY.value: "bold " + palette.yellow,
                 ThemeKey.CONFIG_STATUS_ERROR.value: palette.red,
                 ThemeKey.CONFIG_ITEM_NAME.value: palette.cyan,
-                ThemeKey.CONFIG_PARAM_LABEL.value: palette.grey1,
-                ThemeKey.CONFIG_PANEL_BORDER.value: palette.grey3,
+                ThemeKey.CONFIG_MODEL_ID.value: palette.blue,
+                ThemeKey.CONFIG_PARAM_LABEL.value: "dim",
                 ThemeKey.CONFIG_PROVIDER.value: palette.cyan + " bold",
             }
         ),

klaude_code/ui/terminal/image.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+from typing import IO
+
+
+def print_kitty_image(file_path: str | Path, *, height: int | None = None, file: IO[str] | None = None) -> None:
+    """Print an image to the terminal using Kitty graphics protocol.
+
+    This intentionally bypasses Rich rendering to avoid interleaving Live refreshes
+    with raw escape sequences.
+    """
+
+    path = Path(file_path) if isinstance(file_path, str) else file_path
+    if not path.exists():
+        print(f"Image not found: {path}", file=file or sys.stdout, flush=True)
+        return
+
+    try:
+        from term_image.image import KittyImage  # type: ignore[import-untyped]
+
+        KittyImage.forced_support = True  # type: ignore[reportUnknownMemberType]
+        img = KittyImage.from_file(path)  # type: ignore[reportUnknownMemberType]
+        if height is not None:
+            img.height = height  # type: ignore[reportUnknownMemberType]
+
+        out = file or sys.stdout
+        print("", file=out)
+        print(str(img), file=out)
+        print("", file=out)
+        out.flush()
+    except Exception:
+        print(f"Saved image: {path}", file=file or sys.stdout, flush=True)

klaude_code/ui/terminal/notifier.py

@@ -7,6 +7,7 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import TextIO, cast
 
+from klaude_code.const import NOTIFY_COMPACT_LIMIT
 from klaude_code.trace import DebugType, log_debug
 
 # Environment variable for tmux test signal channel
@@ -102,7 +103,7 @@ class TerminalNotifier:
         return term.lower() not in {"", "dumb"}
 
 
-def _compact(text: str, limit: int = 160) -> str:
+def _compact(text: str, limit: int = NOTIFY_COMPACT_LIMIT) -> str:
     squashed = " ".join(text.split())
     if len(squashed) > limit:
         return squashed[: limit - 3] + "…"

klaude_code/ui/terminal/progress_bar.py

@@ -1,5 +1,5 @@
 """
-Use OSC 9;4;... to control progress bar in terminal like Ghostty
+Use OSC 9;4;… to control progress bar in terminal like Ghostty
 States:
   0/hidden
   1/normal
@@ -71,17 +71,17 @@ if __name__ == "__main__":
     # Clear progress bar
     emit_osc94(OSC94States.HIDDEN)
 
-    print("Waiting...")
+    print("Waiting…")
     # Indeterminate
     emit_osc94(OSC94States.INDETERMINATE)
 
     time.sleep(2)
-    print("Error...")
+    print("Error…")
     # Error
     emit_osc94(OSC94States.ERROR)
 
     time.sleep(2)
-    print("Warning...")
+    print("Warning…")
     # Warning
     emit_osc94(OSC94States.WARNING)
     time.sleep(2)

klaude_code/ui/terminal/selector.py

@@ -88,12 +88,30 @@ def build_model_select_items(models: list[Any]) -> list[SelectItem[str]]:
 
 
 def _restyle_title(title: list[tuple[str, str]], cls: str) -> list[tuple[str, str]]:
-    """Re-apply a style class while keeping text attributes like bold/italic."""
-    keep_attrs = {"bold", "italic", "underline", "reverse", "blink", "strike"}
+    """Re-apply a style class while keeping existing style tokens.
+
+    This is used to highlight the currently-pointed item. We want to:
+    - preserve explicit colors (e.g. `fg:ansibrightblack`) defined by callers
+    - preserve existing classes (e.g. `class:msg`, `class:meta`) so their
+      non-color attributes remain in effect
+    - preserve text attributes like bold/italic/dim
+    """
+
+    keep_attrs = {"bold", "italic", "underline", "reverse", "blink", "strike", "dim"}
     restyled: list[tuple[str, str]] = []
     for old_style, text in title:
-        attrs = [tok for tok in old_style.split() if tok in keep_attrs]
-        style = f"{cls} {' '.join(attrs)}".strip()
+        tokens = old_style.split()
+        attrs = [tok for tok in tokens if tok in keep_attrs]
+        style_tokens = [tok for tok in tokens if tok not in keep_attrs]
+
+        if cls in style_tokens:
+            style_tokens = [tok for tok in style_tokens if tok != cls]
+
+        # Place the highlight class first, so existing per-token styles (classes
+        # or explicit fg/bg) keep their precedence. This prevents highlight from
+        # accidentally overriding caller-defined colors.
+        combined = [cls, *style_tokens, *attrs]
+        style = " ".join(tok for tok in combined if tok)
         restyled.append((style, text))
     return restyled
 

klaude_code/ui/utils/common.py

@@ -1,6 +1,10 @@
 import re
 import subprocess
 from pathlib import Path
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from klaude_code.protocol.llm_param import LLMConfigModelParameter, OpenRouterProviderRouting
 
 LEADING_NEWLINES_REGEX = re.compile(r"^\n{2,}")
 
@@ -88,3 +92,54 @@ def show_path_with_tilde(path: Path | None = None):
         return f"~/{relative_path}"
     except ValueError:
         return str(path)
+
+
+def format_model_params(model_params: "LLMConfigModelParameter") -> list[str]:
+    """Format model parameters in a concise style.
+
+    Returns a list of formatted parameter strings like:
+    - "reasoning medium"
+    - "thinking budget 10000"
+    - "verbosity 2"
+    - "provider-routing: {…}"
+    """
+    parts: list[str] = []
+
+    if model_params.thinking:
+        if model_params.thinking.reasoning_effort:
+            parts.append(f"reasoning {model_params.thinking.reasoning_effort}")
+        if model_params.thinking.reasoning_summary:
+            parts.append(f"summary {model_params.thinking.reasoning_summary}")
+        if model_params.thinking.budget_tokens:
+            parts.append(f"thinking budget {model_params.thinking.budget_tokens}")
+
+    if model_params.verbosity:
+        parts.append(f"verbosity {model_params.verbosity}")
+
+    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.image_config:
+        if model_params.image_config.aspect_ratio:
+            parts.append(f"image aspect {model_params.image_config.aspect_ratio}")
+        if model_params.image_config.image_size:
+            parts.append(f"image size {model_params.image_config.image_size}")
+
+    return parts
+
+
+def _format_provider_routing(pr: "OpenRouterProviderRouting") -> str:
+    """Format provider routing settings concisely."""
+    items: list[str] = []
+    if pr.sort:
+        items.append(pr.sort)
+    if pr.only:
+        items.append(">".join(pr.only))
+    if pr.order:
+        items.append(">".join(pr.order))
+    if pr.ignore:
+        items.append(f"ignore {'>'.join(pr.ignore)}")
+    return " · ".join(items) if items else ""

{klaude_code-1.8.0.dist-info → klaude_code-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.8.0
+Version: 2.0.0
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
@@ -9,11 +9,12 @@ Requires-Dist: diff-match-patch>=20241021
 Requires-Dist: google-genai>=1.56.0
 Requires-Dist: markdown-it-py>=4.0.0
 Requires-Dist: openai>=1.102.0
-Requires-Dist: pillow>=12.0.0
+Requires-Dist: pillow>=9.1,<11.0
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=14.1.0
+Requires-Dist: term-image>=0.7.2
 Requires-Dist: trafilatura>=2.0.0
 Requires-Dist: typer>=0.17.3
 Requires-Python: >=3.13
@@ -120,11 +121,12 @@ On first run, you'll be prompted to select a model. Your choice is saved as `mai
 | Provider    | Env Variable          | Models                                                                        |
 |-------------|-----------------------|-------------------------------------------------------------------------------|
 | anthropic   | `ANTHROPIC_API_KEY`   | sonnet, opus                                                                  |
+| claude      | N/A (OAuth)           | sonnet@claude, opus@claude (requires Claude Pro/Max subscription)             |
 | 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                                                                 |
+| codex       | N/A (OAuth)           | gpt-5.2-codex (requires ChatGPT Pro subscription)                             |
 
 List all configured providers and models:
 
@@ -134,6 +136,26 @@ klaude list
 
 Models from providers without a valid API key are shown as dimmed/unavailable.
 
+#### OAuth Login
+
+For subscription-based providers (Claude Pro/Max, ChatGPT Pro), use the login command:
+
+```bash
+# Interactive provider selection
+klaude login
+
+# Or specify provider directly
+klaude login claude   # Claude Pro/Max subscription
+klaude login codex    # ChatGPT Pro subscription
+```
+
+To logout:
+
+```bash
+klaude logout claude
+klaude logout codex
+```
+
 #### Custom Configuration
 
 User config file: `~/.klaude/klaude-config.yaml`
@@ -240,7 +262,6 @@ provider_list:
 main_model: opus
 
 sub_agent_models:
-  oracle: gpt-4.1
   explore: sonnet
   task: opus
   webagent: sonnet
@@ -269,12 +290,13 @@ provider_list:
 ##### Supported Protocols
 
 - `anthropic` - Anthropic Claude API
+- `claude_oauth` - Claude OAuth (for Claude Pro/Max subscribers)
 - `openai` - OpenAI-compatible 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` - OpenAI Codex CLI (OAuth-based)
+- `codex_oauth` - OpenAI Codex CLI (OAuth-based, for ChatGPT Pro subscribers)
 
 List configured providers and models:
 
@@ -374,4 +396,4 @@ The main agent can spawn specialized sub-agents for specific tasks:
 | **Explore** | Fast codebase exploration - find files, search code, answer questions about the codebase |
 | **Task** | Handle complex multi-step tasks autonomously |
 | **WebAgent** | Search the web, fetch pages, and analyze content |
-| **Oracle** | Advanced reasoning advisor for code reviews, architecture planning, and bug analysis |
+| **ImageGen** | Generate images from text prompts via OpenRouter Nano Banana Pro |