klaude-code 2.8.0__py3-none-any.whl → 2.9.0__py3-none-any.whl

klaude_code/tui/input/prompt_toolkit.py

@@ -20,6 +20,7 @@ from prompt_toolkit.key_binding import merge_key_bindings
 from prompt_toolkit.layout import Float
 from prompt_toolkit.layout.containers import Container, FloatContainer, Window
 from prompt_toolkit.layout.controls import BufferControl, UIContent
+from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.layout.menus import CompletionsMenu, MultiColumnCompletionsMenu
 from prompt_toolkit.patch_stdout import patch_stdout
 from prompt_toolkit.styles import Style
@@ -61,9 +62,9 @@ COMPLETION_SELECTED_LIGHT_BG = "ansigreen"
 COMPLETION_SELECTED_UNKNOWN_BG = "ansigreen"
 COMPLETION_MENU = "ansibrightblack"
 INPUT_PROMPT_STYLE = "ansimagenta bold"
-PLACEHOLDER_TEXT_STYLE_DARK_BG = "fg:#5a5a5a italic"
-PLACEHOLDER_TEXT_STYLE_LIGHT_BG = "fg:#7a7a7a italic"
-PLACEHOLDER_TEXT_STYLE_UNKNOWN_BG = "fg:#8a8a8a italic"
+PLACEHOLDER_TEXT_STYLE_DARK_BG = "fg:#5a5a5a"
+PLACEHOLDER_TEXT_STYLE_LIGHT_BG = "fg:#7a7a7a"
+PLACEHOLDER_TEXT_STYLE_UNKNOWN_BG = "fg:#8a8a8a"
 PLACEHOLDER_SYMBOL_STYLE_DARK_BG = "bg:#2a2a2a fg:#5a5a5a"
 PLACEHOLDER_SYMBOL_STYLE_LIGHT_BG = "bg:#e6e6e6 fg:#7a7a7a"
 PLACEHOLDER_SYMBOL_STYLE_UNKNOWN_BG = "bg:#2a2a2a fg:#8a8a8a"
@@ -81,6 +82,9 @@ def _left_align_completion_menus(container: Container) -> None:
     cursor (`xcursor=True`). That makes the popup indent as the caret moves.
     We walk the layout tree and rewrite the Float positioning for completion menus
     to keep them fixed at the left edge.
+
+    Note: We intentionally keep Y positioning (ycursor) unchanged so that the
+    completion menu stays near the cursor/input line.
     """
     if isinstance(container, FloatContainer):
         for flt in container.floats:
@@ -300,6 +304,10 @@ class PromptToolkitInput(InputProviderABC):
             key_bindings=kb,
             completer=ThreadedCompleter(create_repl_completer(command_info_provider=self._command_info_provider)),
             complete_while_typing=True,
+            # Keep the bottom toolbar stable while completion menus open/close.
+            # Reserving space dynamically can make the non-fullscreen prompt
+            # "jump" by printing extra lines.
+            reserve_space_for_menu=0,
             erase_when_done=True,
             mouse_support=False,
             style=Style.from_dict(
@@ -417,41 +425,40 @@ class PromptToolkitInput(InputProviderABC):
 
             original_height = input_window.height
 
+            # Keep a comfortable multiline editing area even when no completion
+            # space is reserved. (We set reserve_space_for_menu=0 to avoid the
+            # bottom toolbar jumping when completions open/close.)
+            base_rows = 10
+
             def _height():  # type: ignore[no-untyped-def]
                 picker_open = (self._model_picker is not None and self._model_picker.is_open) or (
                     self._thinking_picker is not None and self._thinking_picker.is_open
                 )
 
-                try:
-                    complete_state = self._session.default_buffer.complete_state
-                    completion_open = complete_state is not None and bool(complete_state.completions)
-                except Exception:
-                    completion_open = False
-
                 try:
                     original_height_value = original_height() if callable(original_height) else original_height
                 except Exception:
                     original_height_value = None
-                original_height_int = original_height_value if isinstance(original_height_value, int) else None
+                original_min = 0
+                if isinstance(original_height_value, Dimension):
+                    original_min = int(original_height_value.min)
+                elif isinstance(original_height_value, int):
+                    original_min = int(original_height_value)
 
-                if picker_open or completion_open:
-                    target_rows = 24 if picker_open else 14
+                target_rows = 24 if picker_open else base_rows
 
-                    # Cap to the current terminal size.
-                    # Leave a small buffer to avoid triggering "Window too small".
-                    try:
-                        rows = get_app().output.get_size().rows
-                    except Exception:
-                        rows = 0
+                # Cap to the current terminal size.
+                # Leave a small buffer to avoid triggering "Window too small".
+                try:
+                    rows = get_app().output.get_size().rows
+                except Exception:
+                    rows = 0
 
-                    expanded = max(3, min(target_rows, rows - 2))
-                    if original_height_int is not None:
-                        expanded = max(original_height_int, expanded)
-                    return expanded
+                desired = max(original_min, target_rows)
+                if rows > 0:
+                    desired = max(3, min(desired, rows - 2))
 
-                if callable(original_height):
-                    return original_height()
-                return original_height
+                return Dimension(min=desired, preferred=desired)
 
             input_window.height = _height
 
@@ -583,7 +590,7 @@ class PromptToolkitInput(InputProviderABC):
             except (AttributeError, RuntimeError):
                 pass
 
-        # Priority: update_message > debug_log_path
+        # Priority: update_message > debug_log_path > shortcut hints
         display_text: str | None = None
         text_style: str = ""
         if update_message:
@@ -593,31 +600,25 @@ class PromptToolkitInput(InputProviderABC):
             display_text = f"Debug log: {debug_log_path}"
             text_style = "fg:ansibrightblack"
 
-        # If nothing to show, return a blank line to actively clear any previously
-        # rendered content. (When `bottom_toolbar` is a callable, prompt_toolkit
-        # will still reserve the toolbar line.)
-        if not display_text:
+        if display_text:
+            left_text = " " + display_text
             try:
                 terminal_width = shutil.get_terminal_size().columns
+                padding = " " * max(0, terminal_width - len(left_text))
             except (OSError, ValueError):
-                terminal_width = 0
-            return FormattedText([("", " " * max(0, terminal_width))])
+                padding = ""
 
-        left_text = " " + display_text
-        try:
-            terminal_width = shutil.get_terminal_size().columns
-            padding = " " * max(0, terminal_width - len(left_text))
-        except (OSError, ValueError):
-            padding = ""
+            toolbar_text = left_text + padding
+            return FormattedText([(text_style, toolbar_text)])
 
-        toolbar_text = left_text + padding
-        return FormattedText([(text_style, toolbar_text)])
+        # Show shortcut hints when nothing else to display
+        return self._render_shortcut_hints()
 
     # -------------------------------------------------------------------------
-    # Placeholder
+    # Shortcut hints (bottom toolbar)
     # -------------------------------------------------------------------------
 
-    def _render_input_placeholder(self) -> FormattedText:
+    def _render_shortcut_hints(self) -> FormattedText:
         if self._is_light_terminal_background is True:
             text_style = PLACEHOLDER_TEXT_STYLE_LIGHT_BG
             symbol_style = PLACEHOLDER_SYMBOL_STYLE_LIGHT_BG
@@ -630,27 +631,27 @@ class PromptToolkitInput(InputProviderABC):
 
         return FormattedText(
             [
-                (text_style, " " * 10),
+                (text_style, " "),
                 (symbol_style, " @ "),
                 (text_style, " "),
                 (text_style, "files"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " $ "),
                 (text_style, " "),
                 (text_style, "skills"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " / "),
                 (text_style, " "),
                 (text_style, "commands"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " ctrl-l "),
                 (text_style, " "),
                 (text_style, "models"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " ctrl-t "),
                 (text_style, " "),
                 (text_style, "think"),
-                (text_style, "  "),
+                (text_style, " • "),
                 (symbol_style, " ctrl-v "),
                 (text_style, " "),
                 (text_style, "paste image"),
@@ -679,7 +680,6 @@ class PromptToolkitInput(InputProviderABC):
             # proper styling instead of showing raw escape codes.
             with patch_stdout(raw=True):
                 line: str = await self._session.prompt_async(
-                    placeholder=self._render_input_placeholder(),
                     bottom_toolbar=self._get_bottom_toolbar,
                 )
             if self._post_prompt is not None:

klaude_code/tui/machine.py

@@ -49,7 +49,7 @@ from klaude_code.tui.commands import (
 from klaude_code.tui.components.rich import status as r_status
 from klaude_code.tui.components.rich.theme import ThemeKey
 from klaude_code.tui.components.thinking import extract_last_bold_header, normalize_thinking_content
-from klaude_code.tui.components.tools import get_tool_active_form, is_sub_agent_tool
+from klaude_code.tui.components.tools import get_task_active_form, get_tool_active_form, is_sub_agent_tool
 
 # Tools that complete quickly and don't benefit from streaming activity display.
 # For models without fine-grained tool JSON streaming (e.g., Gemini), showing these
@@ -97,10 +97,6 @@ class ActivityState:
         self._sub_agent_tool_calls: dict[str, int] = {}
         self._sub_agent_tool_calls_by_id: dict[str, str] = {}
 
-    @property
-    def is_composing(self) -> bool:
-        return self._composing and not self._tool_calls and not self._sub_agent_tool_calls
-
     def set_composing(self, composing: bool) -> None:
         self._composing = composing
         if not composing:
@@ -321,7 +317,7 @@ class _SessionState:
 
     @property
     def should_show_sub_agent_thinking_header(self) -> bool:
-        return bool(self.sub_agent_state and self.sub_agent_state.sub_agent_type == "ImageGen")
+        return bool(self.sub_agent_state and self.sub_agent_state.sub_agent_type == tools.IMAGE_GEN)
 
     @property
     def should_extract_reasoning_header(self) -> bool:
@@ -607,11 +603,14 @@ class DisplayStateMachine:
                 # Skip activity state for fast tools on non-streaming models (e.g., Gemini)
                 # to avoid flash-and-disappear effect
                 if not is_replay and not s.should_skip_tool_activity(e.tool_name):
-                    tool_active_form = get_tool_active_form(e.tool_name)
-                    if is_sub_agent_tool(e.tool_name):
-                        self._spinner.add_sub_agent_tool_call(e.tool_call_id, tool_active_form)
+                    if e.tool_name == tools.TASK:
+                        pass
                     else:
-                        self._spinner.add_tool_call(tool_active_form)
+                        tool_active_form = get_tool_active_form(e.tool_name)
+                        if is_sub_agent_tool(e.tool_name):
+                            self._spinner.add_sub_agent_tool_call(e.tool_call_id, tool_active_form)
+                        else:
+                            self._spinner.add_tool_call(tool_active_form)
 
                 if not is_replay:
                     cmds.extend(self._spinner_update_commands())
@@ -629,12 +628,17 @@ class DisplayStateMachine:
                         primary.thinking_stream_active = False
                         cmds.append(EndThinkingStream(session_id=primary.session_id))
 
+                if not is_replay and e.tool_name == tools.TASK and not s.should_skip_tool_activity(e.tool_name):
+                    tool_active_form = get_task_active_form(e.arguments)
+                    self._spinner.add_sub_agent_tool_call(e.tool_call_id, tool_active_form)
+                    cmds.extend(self._spinner_update_commands())
+
                 cmds.append(RenderToolCall(e))
                 return cmds
 
             case events.ToolResultEvent() as e:
                 if not is_replay and is_sub_agent_tool(e.tool_name):
-                    self._spinner.finish_sub_agent_tool_call(e.tool_call_id, get_tool_active_form(e.tool_name))
+                    self._spinner.finish_sub_agent_tool_call(e.tool_call_id)
                     cmds.extend(self._spinner_update_commands())
 
                 if s.is_sub_agent and not e.is_error:

klaude_code/tui/renderer.py

@@ -184,13 +184,6 @@ class TUICommandRenderer:
     def is_sub_agent_session(self, session_id: str) -> bool:
         return session_id in self._sessions and self._sessions[session_id].sub_agent_state is not None
 
-    def _should_display_sub_agent_thinking_header(self, session_id: str) -> bool:
-        # Hardcoded: only show sub-agent thinking headers for ImageGen.
-        st = self._sessions.get(session_id)
-        if st is None or st.sub_agent_state is None:
-            return False
-        return st.sub_agent_state.sub_agent_type == "ImageGen"
-
     def _advance_sub_agent_color_index(self) -> None:
         palette_size = len(self.themes.sub_agent_colors)
         if palette_size == 0:
@@ -379,6 +372,7 @@ class TUICommandRenderer:
             live_sink=self.set_stream_renderable,
             mark=c_assistant.ASSISTANT_MESSAGE_MARK,
             left_margin=MARKDOWN_LEFT_MARGIN,
+            image_callback=self.display_image,
         )
 
     def _flush_thinking(self) -> None:
@@ -416,21 +410,12 @@ class TUICommandRenderer:
             if image_path is not None:
                 self.display_image(str(image_path))
 
-        renderable = c_tools.render_tool_result(e, code_theme=self.themes.code_theme, session_id=e.session_id)
-        if renderable is not None:
-            self.print(renderable)
+        if not is_sub_agent and isinstance(e.ui_extra, model.ImageUIExtra):
+            self.display_image(e.ui_extra.file_path)
 
-    def display_thinking(self, content: str) -> None:
-        renderable = c_thinking.render_thinking(
-            content,
-            code_theme=self.themes.code_theme,
-            style=ThemeKey.THINKING,
-        )
+        renderable = c_tools.render_tool_result(e, code_theme=self.themes.code_theme, session_id=e.session_id)
         if renderable is not None:
-            self.console.push_theme(theme=self.themes.thinking_markdown_theme)
             self.print(renderable)
-            self.console.pop_theme()
-            self.print()
 
     def display_thinking_header(self, header: str) -> None:
         stripped = header.strip()
@@ -450,6 +435,13 @@ class TUICommandRenderer:
         with self.session_print_context(e.session_id):
             self.print(c_developer.render_developer_message(e))
 
+        # Display images from @ file references and user attachments
+        if e.item.ui_extra:
+            for ui_item in e.item.ui_extra.items:
+                if isinstance(ui_item, (model.AtFileImagesUIItem, model.UserImagesUIItem)):
+                    for image_path in ui_item.paths:
+                        self.display_image(image_path)
+
     def display_command_output(self, e: events.CommandOutputEvent) -> None:
         with self.session_print_context(e.session_id):
             self.print(c_command_output.render_command_output(e))
@@ -689,7 +681,7 @@ class TUICommandRenderer:
                 case PrintBlankLine():
                     self.print()
                 case PrintRuleLine():
-                    self.console.print(Rule(characters="─", style=ThemeKey.LINES))
+                    self.console.print(Rule(characters="─", style=ThemeKey.LINES_DIM))
                 case EmitOsc94Error():
                     emit_osc94(OSC94States.ERROR)
                 case EmitTmuxSignal():

klaude_code/tui/runner.py

@@ -327,5 +327,6 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
         if not exit_hint_printed:
             active_session_id = components.executor.context.current_session_id()
             if active_session_id and Session.exists(active_session_id):
+                short_id = Session.shortest_unique_prefix(active_session_id)
                 log(f"Session ID: {active_session_id}")
-                log(f"Resume with: klaude --resume {active_session_id}")
+                log(f"Resume with: klaude -r {short_id}")

klaude_code/tui/terminal/image.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import base64
 import shutil
-import struct
 import subprocess
 import sys
 import tempfile
@@ -12,8 +11,8 @@ from typing import IO
 # Kitty graphics protocol chunk size (4096 is the recommended max)
 _CHUNK_SIZE = 4096
 
-# Max columns for non-wide images
-_MAX_COLS = 120
+# Max columns for image display
+_MAX_COLS = 80
 
 # Image formats that need conversion to PNG
 _NEEDS_CONVERSION = {".jpg", ".jpeg", ".gif", ".bmp", ".webp", ".tiff", ".tif"}
@@ -40,26 +39,10 @@ def _convert_to_png(path: Path) -> bytes | None:
     return None
 
 
-def _get_png_dimensions(data: bytes) -> tuple[int, int] | None:
-    """Extract width and height from PNG file header."""
-    # PNG: 8-byte signature + IHDR chunk (4 len + 4 type + 4 width + 4 height)
-    if len(data) < 24 or data[:8] != b"\x89PNG\r\n\x1a\n":
-        return None
-    width, height = struct.unpack(">II", data[16:24])
-    return width, height
-
-
 def print_kitty_image(file_path: str | Path, *, 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. Image size adapts based on aspect ratio:
-    - Landscape images: fill terminal width
-    - Portrait images: limit height to avoid oversized display
-
-    Args:
-        file_path: Path to the image file (PNG recommended).
-        file: Output file stream. Defaults to stdout.
+    Only specifies column width; Kitty auto-scales height to preserve aspect ratio.
     """
     path = Path(file_path) if isinstance(file_path, str) else file_path
     if not path.exists():
@@ -80,20 +63,9 @@ def print_kitty_image(file_path: str | Path, *, file: IO[str] | None = None) ->
         out = file or sys.stdout
 
         term_size = shutil.get_terminal_size()
-        dimensions = _get_png_dimensions(data)
-
-        # Determine sizing strategy based on aspect ratio
-        if dimensions is not None:
-            img_width, img_height = dimensions
-            if img_width > 2 * img_height:
-                # Wide landscape (width > 2x height): fill terminal width
-                size_param = f"c={term_size.columns}"
-            else:
-                # Other images: limit width to 80% of terminal
-                size_param = f"c={min(_MAX_COLS, term_size.columns * 4 // 5)}"
-        else:
-            # Fallback: limit width to 80% of terminal
-            size_param = f"c={min(_MAX_COLS, term_size.columns * 4 // 5)}"
+        # Only specify columns, let Kitty auto-scale height to preserve aspect ratio
+        target_cols = min(_MAX_COLS, term_size.columns)
+        size_param = f"c={target_cols}"
         print("", file=out)
         _write_kitty_graphics(out, encoded, size_param=size_param)
         print("", file=out)

klaude_code/ui/common.py

@@ -1,17 +1,8 @@
-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,}")
-
-
-def remove_leading_newlines(text: str) -> str:
-    return text.lstrip("\n")
-
 
 def format_number(tokens: int) -> str:
     if tokens < 1000:
@@ -33,67 +24,6 @@ def format_number(tokens: int) -> str:
             return f"{m}M{remaining}k"
 
 
-def get_current_git_branch(path: Path | None = None) -> str | None:
-    """Get current git branch name, return None if not in a git repository"""
-    if path is None:
-        path = Path.cwd()
-
-    try:
-        # Check if in git repository
-        git_dir = subprocess.run(
-            ["git", "rev-parse", "--git-dir"],
-            cwd=path,
-            capture_output=True,
-            text=True,
-            timeout=2,
-        )
-
-        if git_dir.returncode != 0:
-            return None
-
-        # Get current branch name
-        result = subprocess.run(
-            ["git", "branch", "--show-current"],
-            cwd=path,
-            capture_output=True,
-            text=True,
-            timeout=2,
-        )
-
-        if result.returncode == 0:
-            branch = result.stdout.strip()
-            return branch if branch else None
-
-        # Fallback: get HEAD reference
-        head_file = subprocess.run(
-            ["git", "rev-parse", "--abbrev-ref", "HEAD"],
-            cwd=path,
-            capture_output=True,
-            text=True,
-            timeout=2,
-        )
-
-        if head_file.returncode == 0:
-            branch = head_file.stdout.strip()
-            return branch if branch and branch != "HEAD" else None
-
-    except (subprocess.TimeoutExpired, subprocess.SubprocessError, FileNotFoundError):
-        pass
-
-    return None
-
-
-def show_path_with_tilde(path: Path | None = None):
-    if path is None:
-        path = Path.cwd()
-
-    try:
-        relative_path = path.relative_to(Path.home())
-        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.
 

{klaude_code-2.8.0.dist-info → klaude_code-2.9.0.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 2.8.0
+Version: 2.9.0
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: ddgs>=9.9.3
 Requires-Dist: diff-match-patch>=20241021
+Requires-Dist: filelock>=3.20.3
 Requires-Dist: google-genai>=1.56.0
 Requires-Dist: markdown-it-py>=4.0.0
 Requires-Dist: openai>=1.102.0
@@ -23,7 +24,7 @@ Description-Content-Type: text/markdown
 Minimal code agent CLI.
 
 ## Features
-- **Multi-provider**: Anthropic Message API, OpenAI Responses API, OpenRouter, Claude Max OAuth and ChatGPT Codex OAuth etc.
+- **Multi-provider**: Anthropic Message API, OpenAI Responses API, OpenRouter, ChatGPT Codex OAuth etc.
 - **Keep reasoning item in context**: Interleaved thinking support
 - **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
@@ -107,7 +108,6 @@ 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                                                                      |
@@ -139,7 +139,6 @@ klaude auth login deepseek    # Set DEEPSEEK_API_KEY
 klaude auth login moonshot    # Set MOONSHOT_API_KEY
 
 # OAuth login for subscription-based providers
-klaude auth login claude      # Claude Pro/Max subscription
 klaude auth login codex       # ChatGPT Pro subscription
 ```
 
@@ -148,7 +147,6 @@ API keys are stored in `~/.klaude/klaude-auth.json` and used as fallback when en
 To logout from OAuth providers:
 
 ```bash
-klaude auth logout claude
 klaude auth logout codex
 ```
 
@@ -201,7 +199,6 @@ provider_list:
 ##### Supported Protocols
 
 - `anthropic` - Anthropic Messages API
-- `claude_oauth` - Claude OAuth (for Claude Pro/Max subscribers)
 - `openai` - OpenAI Chat Completion API
 - `responses` - OpenAI Responses API (for o-series, GPT-5, Codex)
 - `codex_oauth` - OpenAI Codex CLI (OAuth-based, for ChatGPT Pro subscribers)