klaude-code 1.2.14__py3-none-any.whl → 1.2.16__py3-none-any.whl

klaude_code/ui/rich/markdown.py

@@ -4,8 +4,10 @@ from __future__ import annotations
 import contextlib
 import io
 import time
+from collections.abc import Callable
 from typing import Any, ClassVar
 
+from rich import box
 from rich.console import Console, ConsoleOptions, Group, RenderableType, RenderResult
 from rich.live import Live
 from rich.markdown import CodeBlock, Heading, Markdown
@@ -30,9 +32,18 @@ class NoInsetCodeBlock(CodeBlock):
             self.lexer_name,
             theme=self.theme,
             word_wrap=True,
-            padding=(0, 1),
+            padding=(0, 0),
         )
-        yield Panel.fit(syntax, padding=0, border_style="markdown.code.panel")
+        yield Panel.fit(syntax, padding=(0, 0), box=box.HORIZONTALS, border_style="markdown.code.border")
+
+
+class ThinkingCodeBlock(CodeBlock):
+    """A code block for thinking content that uses grey styling instead of syntax highlighting."""
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        code = str(self.text).rstrip()
+        text = Text(code, "markdown.code.block")
+        yield text
 
 
 class LeftHeading(Heading):
@@ -41,16 +52,10 @@ class LeftHeading(Heading):
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
         text = self.text
         text.justify = "left"  # Override justification
-        # if self.tag == "h1":
-        #     from rich.panel import Panel
-        #     from rich import box
-        #     # Draw a border around h1s, but keep text left-aligned
-        #     yield Panel(
-        #         text,
-        #         box=box.SQUARE,
-        #         style="markdown.h1.border",
-        #     )
-        if self.tag == "h2":
+        if self.tag == "h1":
+            h1_text = text.assemble((" ", "markdown.h1"), text, (" ", "markdown.h1"))
+            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")
         else:
@@ -68,6 +73,17 @@ class NoInsetMarkdown(Markdown):
     }
 
 
+class ThinkingMarkdown(Markdown):
+    """Markdown for thinking content with grey-styled code blocks and left-justified headings."""
+
+    elements: ClassVar[dict[str, type[Any]]] = {
+        **Markdown.elements,
+        "fence": ThinkingCodeBlock,
+        "code_block": ThinkingCodeBlock,
+        "heading_open": LeftHeading,
+    }
+
+
 class MarkdownStream:
     """Streaming markdown renderer that progressively displays content with a live updating window.
 
@@ -84,6 +100,7 @@ class MarkdownStream:
         spinner: Spinner | None = None,
         mark: str | None = None,
         indent: int = 0,
+        markdown_class: Callable[..., Markdown] | None = None,
     ) -> None:
         """Initialize the markdown stream.
 
@@ -93,6 +110,7 @@ class MarkdownStream:
             console (Console, optional): External console to use for rendering
             mark (str | None, optional): Marker shown before the first non-empty line when indent >= 2
             indent (int, optional): Number of spaces to indent all rendered lines on the left
+            markdown_class: Markdown class to use for rendering (defaults to NoInsetMarkdown)
         """
         self.printed: list[str] = []  # Stores lines that have already been printed
 
@@ -108,16 +126,13 @@ class MarkdownStream:
         self.when: float = 0.0  # Timestamp of last update
         self.min_delay: float = 1.0 / 20  # Minimum time between updates (20fps)
         self.live_window: int = const.MARKDOWN_STREAM_LIVE_WINDOW
-        # Track the maximum height the live window has ever reached
-        # so we only pad when it shrinks from a previous height,
-        # instead of always padding to live_window from the start.
-        self._live_window_seen_height: int = 0
 
         self.theme = theme
         self.console = console
         self.spinner: Spinner | None = spinner
         self.mark: str | None = mark
         self.indent: int = max(indent, 0)
+        self.markdown_class: Callable[..., Markdown] = markdown_class or NoInsetMarkdown
 
     @property
     def _live_started(self) -> bool:
@@ -154,7 +169,7 @@ class MarkdownStream:
             width=effective_width,
         )
 
-        markdown = NoInsetMarkdown(text, **self.mdargs)
+        markdown = self.markdown_class(text, **self.mdargs)
         temp_console.print(markdown)
         output = string_io.getvalue()
 
@@ -205,18 +220,16 @@ class MarkdownStream:
         Markdown going to the console works better in terminal scrollback buffers.
         The live window doesn't play nice with terminal scrollback.
         """
-        # On the first call, start the Live renderer
         if not self._live_started:
             initial_content = self._live_renderable(Text(""), final=False)
+            # transient=False keeps final frame on screen after stop()
             self.live = Live(
                 initial_content,
                 refresh_per_second=1.0 / self.min_delay,
                 console=self.console,
             )
             self.live.start()
-            # Note: self._live_started is now a property derived from self.live
 
-        # If live rendering isn't available (e.g., after a final update), stop.
         if self.live is None:
             return
 
@@ -236,61 +249,36 @@ class MarkdownStream:
 
         num_lines = len(lines)
 
-        # How many lines have "left" the live window and are now considered stable?
-        # Or if final, consider all lines to be stable.
-        if not final:
-            num_lines = max(num_lines - self.live_window, 0)
+        # Reserve last live_window lines for Live area to keep height stable
+        num_lines = max(num_lines - self.live_window, 0)
 
-        # If there is new stable content, append only the new part
-        # Update Live window to prevent visual duplication
-        if final or num_lines > 0:
-            # Lines to append to stable area
+        # Print new stable lines above Live window
+        if num_lines > 0:
             num_printed = len(self.printed)
             to_append_count = num_lines - num_printed
 
             if to_append_count > 0:
-                # Print new stable lines above Live window
                 append_chunk = lines[num_printed:num_lines]
                 append_chunk_text = Text.from_ansi("".join(append_chunk))
                 live = self.live
                 assert live is not None
-                live.console.print(append_chunk_text)  # Print above Live area
-
-                # Track printed stable lines
+                live.console.print(append_chunk_text)
                 self.printed = lines[:num_lines]
 
-        # Handle final update cleanup
+        rest_lines = lines[num_lines:]
+
+        # Final: render remaining lines without spinner, then stop Live
         if final:
             live = self.live
             assert live is not None
-            live.update(Text(""))
+            rest = "".join(rest_lines)
+            rest_text = Text.from_ansi(rest)
+            final_renderable = self._live_renderable(rest_text, final=True)
+            live.update(final_renderable)
             live.stop()
             self.live = None
             return
 
-        # Update Live window to prevent timing issues
-        # with console.print above. We pad the live region
-        # so that its height stays stable when it shrinks
-        # from a previously reached height, avoiding spinner jitter.
-        rest_lines = lines[num_lines:]
-
-        if not final:
-            current_height = len(rest_lines)
-
-            # Update the maximum height we've seen so far for this live window.
-            if current_height > self._live_window_seen_height:
-                # Never exceed configured live_window, even if logic changes later.
-                self._live_window_seen_height = min(current_height, self.live_window)
-
-            target_height = min(self._live_window_seen_height, self.live_window)
-            if target_height > 0 and current_height < target_height:
-                # Pad only up to the maximum height we've seen so far.
-                # This keeps the Live region height stable without overshooting,
-                # which can cause the spinner to jump by a line.
-                pad_count = target_height - current_height
-                # Pad after the existing lines so spinner visually stays at the bottom.
-                rest_lines = rest_lines + ["\n"] * pad_count
-
         rest = "".join(rest_lines)
         rest = Text.from_ansi(rest)
         live = self.live

klaude_code/ui/rich/status.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 import contextlib
 import math
+import random
 import time
 
 import rich.status as rich_status
-from rich._spinners import SPINNERS
 from rich.color import Color
 from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
 from rich.spinner import Spinner as RichSpinner
@@ -17,18 +17,25 @@ from klaude_code import const
 from klaude_code.ui.rich.theme import ThemeKey
 from klaude_code.ui.terminal.color import get_last_terminal_background_rgb
 
-BREATHING_SPINNER_NAME = "dot"
+# Use an existing Rich spinner name; BreathingSpinner overrides its rendering
+BREATHING_SPINNER_NAME = "dots"
+
+# Alternating glyphs for the breathing spinner - switches at each "transparent" point
+# All glyphs are center-symmetric (point-symmetric)
+_BREATHING_SPINNER_GLYPHS_BASE = [
+    # Stars
+    "✦",
+    "✶",
+    "✲",
+    "⏺",
+    "◆",
+    "❖",
+]
+
+# Shuffle glyphs on module load for variety across sessions
+BREATHING_SPINNER_GLYPHS = _BREATHING_SPINNER_GLYPHS_BASE.copy()
+random.shuffle(BREATHING_SPINNER_GLYPHS)
 
-SPINNERS.update(
-    {
-        BREATHING_SPINNER_NAME: {
-            "interval": 100,
-            # Frames content is ignored by the custom breathing spinner implementation,
-            # but we keep a single-frame list for correct width measurement.
-            "frames": ["⏺"],
-        }
-    }
-)
 
 _process_start: float | None = None
 
@@ -126,6 +133,17 @@ def _breathing_intensity() -> float:
     return 0.5 * (1.0 - math.cos(2.0 * math.pi * phase))
 
 
+def _breathing_glyph() -> str:
+    """Get the current glyph for the breathing spinner.
+
+    Alternates between glyphs at each breath cycle (when intensity reaches 0).
+    """
+    period = max(const.SPINNER_BREATH_PERIOD_SECONDS, 0.1)
+    elapsed = _elapsed_since_start()
+    cycle = int(elapsed / period)
+    return BREATHING_SPINNER_GLYPHS[cycle % len(BREATHING_SPINNER_GLYPHS)]
+
+
 def _breathing_style(console: Console, base_style: Style, intensity: float) -> Style:
     """Blend a base style's foreground color toward terminal background.
 
@@ -159,7 +177,7 @@ class ShimmerStatusText:
     def __init__(self, main_text: str | Text, main_style: ThemeKey) -> None:
         self._main_text = main_text if isinstance(main_text, Text) else Text(main_text)
         self._main_style = main_style
-        self._hint_text = Text(" (esc to interrupt)")
+        self._hint_text = Text(const.STATUS_HINT_TEXT)
         self._hint_style = ThemeKey.STATUS_HINT
 
     def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
@@ -219,7 +237,7 @@ class BreathingSpinner(RichSpinner):
         intensity = _breathing_intensity()
         style = _breathing_style(console, base_style, intensity)
 
-        glyph = self.frames[0] if self.frames else "⏺"
+        glyph = _breathing_glyph()
         frame = Text(glyph, style=style)
 
         if not self.text:

klaude_code/ui/rich/theme.py

@@ -14,12 +14,12 @@ class Palette:
     blue: str
     orange: str
     magenta: str
-    grey_blue: str
     grey1: str
     grey2: str
     grey3: str
     grey_green: str
     purple: str
+    lavender: str
     diff_add: str
     diff_remove: str
     code_theme: str
@@ -29,17 +29,17 @@ class Palette:
 LIGHT_PALETTE = Palette(
     red="red",
     yellow="yellow",
-    green="spring_green4",
+    green="#00875f",
     cyan="cyan",
-    blue="#3678b7",
+    blue="#3078C5",
     orange="#d77757",
     magenta="magenta",
-    grey_blue="steel_blue",
     grey1="#667e90",
     grey2="#93a4b1",
     grey3="#c4ced4",
-    grey_green="#96a696",
-    purple="slate_blue3",
+    grey_green="#96a096",
+    purple="#5f5fd7",
+    lavender="#5f87af",
     diff_add="#2e5a32 on #e8f5e9",
     diff_remove="#5a2e32 on #ffebee",
     code_theme="ansi_light",
@@ -47,19 +47,19 @@ LIGHT_PALETTE = Palette(
 )
 
 DARK_PALETTE = Palette(
-    red="indian_red",
+    red="#d75f5f",
     yellow="yellow",
-    green="sea_green3",
+    green="#5fd787",
     cyan="cyan",
-    blue="deep_sky_blue1",
+    blue="#00afff",
     orange="#e6704e",
     magenta="magenta",
-    grey_blue="steel_blue",
     grey1="#99aabb",
     grey2="#778899",
     grey3="#646464",
     grey_green="#6d8672",
     purple="#afbafe",
+    lavender="#9898b8",
     diff_add="#c8e6c9 on #2e4a32",
     diff_remove="#ffcdd2 on #4a2e32",
     code_theme="ansi_dark",
@@ -107,6 +107,7 @@ class ThemeKey(str, Enum):
     TOOL_MARK = "tool.mark"
     TOOL_APPROVED = "tool.approved"
     TOOL_REJECTED = "tool.rejected"
+    TOOL_TIMEOUT = "tool.timeout"
     # THINKING
     THINKING = "thinking"
     THINKING_BOLD = "thinking.bold"
@@ -174,9 +175,9 @@ def get_theme(theme: str | None = None) -> Themes:
                 ThemeKey.USER_INPUT_AT_PATTERN.value: palette.purple,
                 ThemeKey.USER_INPUT_SLASH_COMMAND.value: "bold reverse " + palette.blue,
                 # METADATA
-                ThemeKey.METADATA.value: palette.grey_blue,
-                ThemeKey.METADATA_DIM.value: "dim " + palette.grey_blue,
-                ThemeKey.METADATA_BOLD.value: "bold " + palette.grey_blue,
+                ThemeKey.METADATA.value: palette.lavender,
+                ThemeKey.METADATA_DIM.value: "dim " + palette.lavender,
+                ThemeKey.METADATA_BOLD.value: "bold " + palette.lavender,
                 # SPINNER_STATUS
                 ThemeKey.SPINNER_STATUS.value: palette.blue,
                 ThemeKey.SPINNER_STATUS_TEXT.value: palette.blue,
@@ -196,6 +197,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 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,
                 # THINKING
                 ThemeKey.THINKING.value: "italic " + palette.grey2,
                 ThemeKey.THINKING_BOLD.value: "bold italic " + palette.grey1,
@@ -232,7 +234,7 @@ def get_theme(theme: str | None = None) -> Themes:
         markdown_theme=Theme(
             styles={
                 "markdown.code": palette.purple,
-                "markdown.code.panel": palette.grey3,
+                "markdown.code.border": palette.grey3,
                 "markdown.h1": "bold reverse",
                 "markdown.h1.border": palette.grey3,
                 "markdown.h2.border": palette.grey3,
@@ -245,8 +247,7 @@ def get_theme(theme: str | None = None) -> Themes:
         ),
         thinking_markdown_theme=Theme(
             styles={
-                "markdown.code": palette.grey1 + " on " + palette.text_background,
-                "markdown.code.panel": palette.grey3,
+                "markdown.code": palette.grey1 + " italic on " + palette.text_background,
                 "markdown.h1": "bold reverse",
                 "markdown.h1.border": palette.grey3,
                 "markdown.h2.border": palette.grey3,
@@ -255,6 +256,7 @@ def get_theme(theme: str | None = None) -> Themes:
                 "markdown.hr": palette.grey3,
                 "markdown.item.bullet": palette.grey2,
                 "markdown.item.number": palette.grey2,
+                "markdown.code.block": palette.grey1,
                 "markdown.strong": "bold italic " + palette.grey1,
             }
         ),
@@ -265,7 +267,6 @@ def get_theme(theme: str | None = None) -> Themes:
             Style(color=palette.blue),
             Style(color=palette.purple),
             Style(color=palette.orange),
-            Style(color=palette.grey_blue),
             Style(color=palette.red),
             Style(color=palette.grey1),
             Style(color=palette.yellow),

{klaude_code-1.2.14.dist-info → klaude_code-1.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.2.14
+Version: 1.2.16
 Summary: Add your description here
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: openai>=1.102.0
@@ -22,6 +22,7 @@ An minimal and opinionated code agent with multi-model support.
 ## Key Features
 - **Adaptive Tooling**: Model-aware toolsets (Claude Code tools for Sonnet, Codex `apply_patch` for GPT-5.1/Codex).
 - **Multi-Provider Support**: Compatible with `anthropic-messages-api`,`openai-responses-api`, and `openai-compatible-api`(`openrouter-api`),  featuring interleaved thinking, OpenRouter's provider sorting etc.
+- **Structured Sub-Agent Output**: Main agent defines output JSON schema for sub-agents; sub-agents use `report_back` tool with constrained decoding to return schema-compliant structured data.
 - **Skill System**: Extensible support for loading Claude Skills.
 - **Session Management**: Robust context preservation with resumable sessions (`--continue`).
 - **Simple TUI**: Clean interface offering full visibility into model responses, reasoning and actions.
@@ -107,7 +108,7 @@ model_list:
     provider_routing:
       sort: throughput
 main_model: gpt-5.1-codex
-subagent_models:
+sub_agent_models:
   oracle: gpt-5.1-high
   explore: haiku
   task: sonnet