klaude-code 2.9.1__py3-none-any.whl → 2.10.0__py3-none-any.whl

klaude_code/core/reminders.py

@@ -4,9 +4,13 @@ import shlex
 from dataclasses import dataclass
 from pathlib import Path
 
-from pydantic import BaseModel
-
-from klaude_code.const import MEMORY_FILE_NAMES, REMINDER_COOLDOWN_TURNS, TODO_REMINDER_TOOL_CALL_THRESHOLD
+from klaude_code.const import REMINDER_COOLDOWN_TURNS, TODO_REMINDER_TOOL_CALL_THRESHOLD
+from klaude_code.core.memory import (
+    Memory,
+    discover_memory_files_near_paths,
+    format_memories_reminder,
+    get_memory_paths,
+)
 from klaude_code.core.tool import BashTool, ReadTool, build_todo_context
 from klaude_code.core.tool.context import ToolContext
 from klaude_code.core.tool.file._utils import hash_text_sha256
@@ -382,28 +386,6 @@ def _compute_file_content_sha256(path: str) -> str | None:
         return None
 
 
-def get_memory_paths() -> list[tuple[Path, str]]:
-    return [
-        (
-            Path.home() / ".claude" / "CLAUDE.md",
-            "user's private global instructions for all projects",
-        ),
-        (
-            Path.home() / ".codex" / "AGENTS.md",
-            "user's private global instructions for all projects",
-        ),
-        (Path.cwd() / "AGENTS.md", "project instructions, checked into the codebase"),
-        (Path.cwd() / "CLAUDE.md", "project instructions, checked into the codebase"),
-        (Path.cwd() / ".claude" / "CLAUDE.md", "project instructions, checked into the codebase"),
-    ]
-
-
-class Memory(BaseModel):
-    path: str
-    instruction: str
-    content: str
-
-
 def get_last_user_message_image_paths(session: Session) -> list[str]:
     """Get image file paths from the last user message in conversation history."""
     for item in reversed(session.conversation_history):
@@ -502,7 +484,7 @@ def _mark_memory_loaded(session: Session, path: str) -> None:
 
 async def memory_reminder(session: Session) -> message.DeveloperMessage | None:
     """CLAUDE.md AGENTS.md"""
-    memory_paths = get_memory_paths()
+    memory_paths = get_memory_paths(work_dir=session.work_dir)
     memories: list[Memory] = []
     for memory_path, instruction in memory_paths:
         path_str = str(memory_path)
@@ -514,21 +496,12 @@ async def memory_reminder(session: Session) -> message.DeveloperMessage | None:
             except (PermissionError, UnicodeDecodeError, OSError):
                 continue
     if len(memories) > 0:
-        memories_str = "\n\n".join(
-            [f"Contents of {memory.path} ({memory.instruction}):\n\n{memory.content}" for memory in memories]
-        )
         loaded_files = [
             model.MemoryFileLoaded(path=memory.path, mentioned_patterns=_extract_at_patterns(memory.content))
             for memory in memories
         ]
         return message.DeveloperMessage(
-            parts=message.text_parts_from_str(
-                f"""<system-reminder>
-Loaded memory files. Follow these instructions. Do not mention them to the user unless explicitly asked.
-
-{memories_str}
-</system-reminder>"""
-            ),
+            parts=message.text_parts_from_str(format_memories_reminder(memories, include_header=True)),
             ui_extra=model.DeveloperUIExtra(items=[model.MemoryLoadedUIItem(files=loaded_files)]),
         )
     return None
@@ -546,68 +519,23 @@ async def last_path_memory_reminder(
         return None
 
     paths = list(session.file_tracker.keys())
-    memories: list[Memory] = []
-
-    cwd = Path.cwd().resolve()
-    seen_memory_files: set[str] = set()
-
-    for p_str in paths:
-        p = Path(p_str)
-        full = (cwd / p).resolve() if not p.is_absolute() else p.resolve()
-        try:
-            _ = full.relative_to(cwd)
-        except ValueError:
-            # Not under cwd; skip
-            continue
-
-        # Determine the deepest directory to scan (file parent or directory itself)
-        deepest_dir = full if full.is_dir() else full.parent
-
-        # Iterate each directory level from cwd to deepest_dir
-        try:
-            rel_parts = deepest_dir.relative_to(cwd).parts
-        except ValueError:
-            # Shouldn't happen due to check above, but guard anyway
-            continue
-
-        current_dir = cwd
-        for part in rel_parts:
-            current_dir = current_dir / part
-            for fname in MEMORY_FILE_NAMES:
-                mem_path = current_dir / fname
-                mem_path_str = str(mem_path)
-                if mem_path_str in seen_memory_files or _is_memory_loaded(session, mem_path_str):
-                    continue
-                if mem_path.exists() and mem_path.is_file():
-                    try:
-                        text = mem_path.read_text(encoding="utf-8", errors="replace")
-                    except (PermissionError, UnicodeDecodeError, OSError):
-                        continue
-                    _mark_memory_loaded(session, mem_path_str)
-                    seen_memory_files.add(mem_path_str)
-                    memories.append(
-                        Memory(
-                            path=mem_path_str,
-                            instruction="project instructions, discovered near last accessed path",
-                            content=text,
-                        )
-                    )
+    memories = discover_memory_files_near_paths(
+        paths,
+        work_dir=session.work_dir,
+        is_memory_loaded=lambda p: _is_memory_loaded(session, p),
+        mark_memory_loaded=lambda p: _mark_memory_loaded(session, p),
+    )
 
     if len(memories) > 0:
-        memories_str = "\n\n".join(
-            [f"Contents of {memory.path} ({memory.instruction}):\n\n{memory.content}" for memory in memories]
-        )
         loaded_files = [
             model.MemoryFileLoaded(path=memory.path, mentioned_patterns=_extract_at_patterns(memory.content))
             for memory in memories
         ]
         return message.DeveloperMessage(
-            parts=message.text_parts_from_str(
-                f"""<system-reminder>{memories_str}
-</system-reminder>"""
-            ),
+            parts=message.text_parts_from_str(format_memories_reminder(memories, include_header=False)),
             ui_extra=model.DeveloperUIExtra(items=[model.MemoryLoadedUIItem(files=loaded_files)]),
         )
+    return None
 
 
 ALL_REMINDERS = [

klaude_code/core/turn.py

@@ -194,11 +194,17 @@ class TurnExecutor:
                 and self._turn_result.assistant_message is not None
                 and self._turn_result.assistant_message.parts
             ):
-                session_ctx.append_history([self._turn_result.assistant_message])
-                # Add continuation prompt to avoid Anthropic thinking block requirement
-                session_ctx.append_history(
-                    [message.UserMessage(parts=[message.TextPart(text="<system>continue</system>")])]
+                # Discard partial message if it only contains thinking parts
+                has_non_thinking = any(
+                    not isinstance(part, message.ThinkingTextPart)
+                    for part in self._turn_result.assistant_message.parts
                 )
+                if has_non_thinking:
+                    session_ctx.append_history([self._turn_result.assistant_message])
+                    # Add continuation prompt to avoid Anthropic thinking block requirement
+                    session_ctx.append_history(
+                        [message.UserMessage(parts=[message.TextPart(text="<system>continue</system>")])]
+                    )
             yield events.TurnEndEvent(session_id=session_ctx.session_id)
             raise TurnError(self._turn_result.stream_error.error)
 

klaude_code/protocol/events.py

@@ -14,6 +14,9 @@ __all__ = [
     "AssistantTextDeltaEvent",
     "AssistantTextEndEvent",
     "AssistantTextStartEvent",
+    "BashCommandEndEvent",
+    "BashCommandOutputDeltaEvent",
+    "BashCommandStartEvent",
     "CommandOutputEvent",
     "CompactionEndEvent",
     "CompactionStartEvent",
@@ -81,6 +84,19 @@ class CommandOutputEvent(Event):
     is_error: bool = False
 
 
+class BashCommandStartEvent(Event):
+    command: str
+
+
+class BashCommandOutputDeltaEvent(Event):
+    content: str
+
+
+class BashCommandEndEvent(Event):
+    exit_code: int | None = None
+    cancelled: bool = False
+
+
 class TaskStartEvent(Event):
     sub_agent_state: model.SubAgentState | None = None
     model_id: str | None = None
@@ -166,6 +182,7 @@ class WelcomeEvent(Event):
     llm_config: llm_param.LLMConfigParameter
     show_klaude_code_info: bool = True
     loaded_skills: dict[str, list[str]] = Field(default_factory=dict)
+    loaded_memories: dict[str, list[str]] = Field(default_factory=dict)
 
 
 class ErrorEvent(Event):

klaude_code/protocol/op.py

@@ -24,6 +24,7 @@ class OperationType(Enum):
     """Enumeration of supported operation types."""
 
     RUN_AGENT = "run_agent"
+    RUN_BASH = "run_bash"
     CONTINUE_AGENT = "continue_agent"
     COMPACT_SESSION = "compact_session"
     CHANGE_MODEL = "change_model"
@@ -60,6 +61,17 @@ class RunAgentOperation(Operation):
         await handler.handle_run_agent(self)
 
 
+class RunBashOperation(Operation):
+    """Operation for running a user-entered bash-mode command."""
+
+    type: OperationType = OperationType.RUN_BASH
+    session_id: str
+    command: str
+
+    async def execute(self, handler: OperationHandler) -> None:
+        await handler.handle_run_bash(self)
+
+
 class ContinueAgentOperation(Operation):
     """Operation for continuing an agent task without adding a new user message.
 

klaude_code/protocol/op_handler.py

@@ -22,6 +22,7 @@ if TYPE_CHECKING:
         InterruptOperation,
         ResumeSessionOperation,
         RunAgentOperation,
+        RunBashOperation,
     )
 
 
@@ -32,6 +33,10 @@ class OperationHandler(Protocol):
         """Handle a run agent operation."""
         ...
 
+    async def handle_run_bash(self, operation: RunBashOperation) -> None:
+        """Handle a bash-mode command execution operation."""
+        ...
+
     async def handle_continue_agent(self, operation: ContinueAgentOperation) -> None:
         """Handle a continue agent operation (resume without adding user message)."""
         ...

klaude_code/tui/command/resume_cmd.py

@@ -34,7 +34,7 @@ def select_session_sync(session_ids: list[str] | None = None) -> str | None:
             if msg == "⋮":
                 title.append(("class:msg", f"    {msg}\n"))
             else:
-                prefix = "└─" if is_last else "├─"
+                prefix = "╰─" if is_last else "├─"
                 title.append(("fg:ansibrightblack dim", f"    {prefix} "))
                 title.append(("class:msg", f"{msg}\n"))
         title.append(("", "\n"))

klaude_code/tui/commands.py

@@ -38,6 +38,21 @@ class RenderCommandOutput(RenderCommand):
     event: events.CommandOutputEvent
 
 
+@dataclass(frozen=True, slots=True)
+class RenderBashCommandStart(RenderCommand):
+    event: events.BashCommandStartEvent
+
+
+@dataclass(frozen=True, slots=True)
+class AppendBashCommandOutput(RenderCommand):
+    event: events.BashCommandOutputDeltaEvent
+
+
+@dataclass(frozen=True, slots=True)
+class RenderBashCommandEnd(RenderCommand):
+    event: events.BashCommandEndEvent
+
+
 @dataclass(frozen=True, slots=True)
 class RenderTurnStart(RenderCommand):
     event: events.TurnStartEvent

klaude_code/tui/components/command_output.py

@@ -1,5 +1,4 @@
 from rich.console import RenderableType
-from rich.padding import Padding
 from rich.table import Table
 from rich.text import Text
 
@@ -19,7 +18,7 @@ def render_command_output(e: events.CommandOutputEvent) -> RenderableType:
         case _:
             content = e.content or "(no content)"
             style = ThemeKey.TOOL_RESULT if not e.is_error else ThemeKey.ERROR
-            return Padding.indent(truncate_middle(content, base_style=style), level=2)
+            return truncate_middle(content, base_style=style)
 
 
 def _format_tokens(tokens: int) -> str:
@@ -44,7 +43,7 @@ def _format_cost(cost: float | None, currency: str = "USD") -> str:
 def _render_fork_session_output(e: events.CommandOutputEvent) -> RenderableType:
     """Render fork session output with usage instructions."""
     if not isinstance(e.ui_extra, model.SessionIdUIExtra):
-        return Padding.indent(Text(e.content, style=ThemeKey.TOOL_RESULT), level=2)
+        return Text(e.content, style=ThemeKey.TOOL_RESULT)
 
     grid = Table.grid(padding=(0, 1))
     session_id = e.ui_extra.session_id
@@ -54,7 +53,7 @@ def _render_fork_session_output(e: events.CommandOutputEvent) -> RenderableType:
     grid.add_row(Text("Session forked. Resume command copied to clipboard:", style=ThemeKey.TOOL_RESULT))
     grid.add_row(Text(f"  klaude -r {short_id}", style=ThemeKey.TOOL_RESULT_BOLD))
 
-    return Padding.indent(grid, level=2)
+    return grid
 
 
 def _render_status_output(e: events.CommandOutputEvent) -> RenderableType:
@@ -95,4 +94,4 @@ def _render_status_output(e: events.CommandOutputEvent) -> RenderableType:
                 usage_detail = "(no usage data)"
             table.add_row(f"{model_label}:", usage_detail)
 
-    return Padding.indent(table, level=2)
+    return table

klaude_code/tui/components/developer.py

@@ -6,7 +6,7 @@ from klaude_code.tui.components.common import create_grid
 from klaude_code.tui.components.rich.theme import ThemeKey
 from klaude_code.tui.components.tools import render_path
 
-REMINDER_BULLET = "  ⧉"
+REMINDER_BULLET = "⧉"
 
 
 def need_render_developer_message(e: events.DeveloperMessageEvent) -> bool:
@@ -56,8 +56,6 @@ def render_developer_message(e: events.DeveloperMessageEvent) -> RenderableType:
                             text = "Todo hasn't been updated recently"
                         case "empty":
                             text = "Todo list is empty"
-                        case _:
-                            text = "Todo reminder"
                     grid = create_grid()
                     grid.add_row(
                         Text(REMINDER_BULLET, style=ThemeKey.REMINDER),

klaude_code/tui/components/metadata.py

@@ -34,8 +34,8 @@ def _render_task_metadata_block(
     content = Text()
     if metadata.provider is not None:
         content.append_text(Text(metadata.provider.lower().replace(" ", "-"), style=ThemeKey.METADATA))
-        content.append_text(Text("/", style=ThemeKey.METADATA_DIM))
-    content.append_text(Text(metadata.model_name, style=ThemeKey.METADATA_BOLD))
+        content.append_text(Text("/", style=ThemeKey.METADATA))
+    content.append_text(Text(metadata.model_name, style=ThemeKey.METADATA))
     if metadata.description:
         content.append_text(Text(" ", style=ThemeKey.METADATA)).append_text(
             Text(metadata.description, style=ThemeKey.METADATA_ITALIC)
@@ -47,18 +47,18 @@ def _render_task_metadata_block(
     if metadata.usage is not None:
         # Tokens: ↑37k ◎5k ↓907 ∿45k ⌗ 100
         token_text = Text()
-        token_text.append("↑", style=ThemeKey.METADATA_DIM)
+        token_text.append("↑", style=ThemeKey.METADATA)
         token_text.append(format_number(metadata.usage.input_tokens), style=ThemeKey.METADATA)
         if metadata.usage.cached_tokens > 0:
-            token_text.append(" ◎", style=ThemeKey.METADATA_DIM)
+            token_text.append(" ◎", style=ThemeKey.METADATA)
             token_text.append(format_number(metadata.usage.cached_tokens), style=ThemeKey.METADATA)
-        token_text.append(" ↓", style=ThemeKey.METADATA_DIM)
+        token_text.append(" ↓", style=ThemeKey.METADATA)
         token_text.append(format_number(metadata.usage.output_tokens), style=ThemeKey.METADATA)
         if metadata.usage.reasoning_tokens > 0:
-            token_text.append(" ∿", style=ThemeKey.METADATA_DIM)
+            token_text.append(" ∿", style=ThemeKey.METADATA)
             token_text.append(format_number(metadata.usage.reasoning_tokens), style=ThemeKey.METADATA)
         if metadata.usage.image_tokens > 0:
-            token_text.append(" ⊡", style=ThemeKey.METADATA_DIM)
+            token_text.append(" ⊡", style=ThemeKey.METADATA)
             token_text.append(format_number(metadata.usage.image_tokens), style=ThemeKey.METADATA)
         parts.append(token_text)
 
@@ -66,7 +66,7 @@ def _render_task_metadata_block(
     if metadata.usage is not None and metadata.usage.total_cost is not None:
         parts.append(
             Text.assemble(
-                (currency_symbol, ThemeKey.METADATA_DIM),
+                (currency_symbol, ThemeKey.METADATA),
                 (f"{metadata.usage.total_cost:.4f}", ThemeKey.METADATA),
             )
         )
@@ -79,9 +79,9 @@ def _render_task_metadata_block(
             parts.append(
                 Text.assemble(
                     (context_size, ThemeKey.METADATA),
-                    ("/", ThemeKey.METADATA_DIM),
+                    ("/", ThemeKey.METADATA),
                     (effective_limit_str, ThemeKey.METADATA),
-                    (f"({metadata.usage.context_usage_percent:.1f}%)", ThemeKey.METADATA_DIM),
+                    (f"({metadata.usage.context_usage_percent:.1f}%)", ThemeKey.METADATA),
                 )
             )
 
@@ -90,7 +90,7 @@ def _render_task_metadata_block(
             parts.append(
                 Text.assemble(
                     (f"{metadata.usage.throughput_tps:.1f}", ThemeKey.METADATA),
-                    ("tps", ThemeKey.METADATA_DIM),
+                    ("tps", ThemeKey.METADATA),
                 )
             )
 
@@ -101,7 +101,7 @@ def _render_task_metadata_block(
             parts.append(
                 Text.assemble(
                     (ftl_str, ThemeKey.METADATA),
-                    ("-ftl", ThemeKey.METADATA_DIM),
+                    ("-ftl", ThemeKey.METADATA),
                 )
             )
 
@@ -110,7 +110,7 @@ def _render_task_metadata_block(
         parts.append(
             Text.assemble(
                 (f"{metadata.task_duration_s:.1f}", ThemeKey.METADATA),
-                ("s", ThemeKey.METADATA_DIM),
+                ("s", ThemeKey.METADATA),
             )
         )
 
@@ -120,13 +120,13 @@ def _render_task_metadata_block(
         parts.append(
             Text.assemble(
                 (str(metadata.turn_count), ThemeKey.METADATA),
-                (suffix, ThemeKey.METADATA_DIM),
+                (suffix, ThemeKey.METADATA),
             )
         )
 
     if parts:
-        content.append_text(Text(" ", style=ThemeKey.METADATA_DIM))
-        content.append_text(Text(" ", style=ThemeKey.METADATA_DIM).join(parts))
+        content.append_text(Text(" ", style=ThemeKey.METADATA))
+        content.append_text(Text(" ", style=ThemeKey.METADATA).join(parts))
 
     grid.add_row(mark, content)
     return grid
@@ -138,14 +138,14 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
 
     has_sub_agents = len(e.metadata.sub_agent_task_metadata) > 0
     # Use an extra space for the main agent mark to align with two-character marks (├─, └─)
-    main_mark_text = "✓"
+    main_mark_text = "●"
     main_mark = Text(main_mark_text, style=ThemeKey.METADATA)
 
     renderables.append(_render_task_metadata_block(e.metadata.main_agent, mark=main_mark, show_context_and_time=True))
 
     # Render each sub-agent metadata block
     for meta in e.metadata.sub_agent_task_metadata:
-        sub_mark = Text("  └", style=ThemeKey.METADATA_DIM)
+        sub_mark = Text("  └", style=ThemeKey.METADATA)
         renderables.append(_render_task_metadata_block(meta, mark=sub_mark, show_context_and_time=True))
 
     # Add total cost line when there are sub-agents
@@ -162,11 +162,11 @@ def render_task_metadata(e: events.TaskMetadataEvent) -> RenderableType:
 
         currency_symbol = "¥" if currency == "CNY" else "$"
         total_line = Text.assemble(
-            ("  └", ThemeKey.METADATA_DIM),
-            (" Σ ", ThemeKey.METADATA_DIM),
-            ("total ", ThemeKey.METADATA_DIM),
-            (currency_symbol, ThemeKey.METADATA_DIM),
-            (f"{total_cost:.4f}", ThemeKey.METADATA_DIM),
+            ("  └", ThemeKey.METADATA),
+            (" Σ ", ThemeKey.METADATA),
+            ("total ", ThemeKey.METADATA),
+            (currency_symbol, ThemeKey.METADATA),
+            (f"{total_cost:.4f}", ThemeKey.METADATA),
         )
 
         renderables.append(total_line)

klaude_code/tui/components/rich/code_panel.py

@@ -14,12 +14,12 @@ from rich.style import StyleType
 if TYPE_CHECKING:
     from rich.console import Console, ConsoleOptions, RenderResult
 
-# Box drawing characters
-TOP_LEFT = "┌"  # ┌
-TOP_RIGHT = "┐"  # ┐
-BOTTOM_LEFT = "└"  # └
-BOTTOM_RIGHT = "┘"  # ┘
-HORIZONTAL = "─"  # ─
+# Box drawing characters (rounded corners)
+TOP_LEFT = "╭"
+TOP_RIGHT = "╮"
+BOTTOM_LEFT = "╰"
+BOTTOM_RIGHT = "╯"
+HORIZONTAL = "─"
 
 
 class CodePanel(JupyterMixin):
@@ -32,10 +32,10 @@ class CodePanel(JupyterMixin):
         >>> console.print(CodePanel(Syntax(code, "python")))
 
     Renders as:
-        ┌──────────────────────────┐
+        ╭──────────────────────────╮
         code line 1
         code line 2
-        └──────────────────────────┘
+        ╰──────────────────────────╯
     """
 
     def __init__(
@@ -44,7 +44,9 @@ class CodePanel(JupyterMixin):
         *,
         border_style: StyleType = "none",
         expand: bool = False,
-        padding: int = 1,
+        padding: int = 0,
+        title: str | None = None,
+        title_style: StyleType = "none",
     ) -> None:
         """Initialize the CodePanel.
 
@@ -52,12 +54,16 @@ class CodePanel(JupyterMixin):
             renderable: A console renderable object.
             border_style: The style of the border. Defaults to "none".
             expand: If True, expand to fill available width. Defaults to False.
-            padding: Left/right padding for content. Defaults to 1.
+            padding: Left/right padding for content. Defaults to 0.
+            title: Optional title to display in the top border. Defaults to None.
+            title_style: The style of the title. Defaults to "none".
         """
         self.renderable = renderable
         self.border_style = border_style
         self.expand = expand
         self.padding = padding
+        self.title = title
+        self.title_style = title_style
 
     @staticmethod
     def _measure_max_line_cells(lines: list[list[Segment]]) -> int:
@@ -93,11 +99,20 @@ class CodePanel(JupyterMixin):
         new_line = Segment.line()
         pad_segment = Segment(" " * pad) if pad > 0 else None
 
-        # Top border: ┌───...───┐
-        top_border = (
-            TOP_LEFT + (HORIZONTAL * (border_width - 2)) + TOP_RIGHT if border_width >= 2 else HORIZONTAL * border_width
-        )
-        yield Segment(top_border, border_style)
+        # Top border: ╭───...───╮ or ╭ title ───...───╮
+        if self.title and border_width >= len(self.title) + 4:
+            title_part = f" {self.title} "
+            title_style = console.get_style(self.title_style)
+            remaining = border_width - 2 - len(title_part)
+            yield Segment(TOP_LEFT, border_style)
+            yield Segment(title_part, title_style)
+            yield Segment((HORIZONTAL * remaining) + TOP_RIGHT, border_style)
+        elif border_width >= 2:
+            top_border = TOP_LEFT + (HORIZONTAL * (border_width - 2)) + TOP_RIGHT
+            yield Segment(top_border, border_style)
+        else:
+            top_border = HORIZONTAL * border_width
+            yield Segment(top_border, border_style)
         yield new_line
 
         # Content lines with padding
@@ -109,7 +124,7 @@ class CodePanel(JupyterMixin):
                 yield pad_segment
             yield new_line
 
-        # Bottom border: └───...───┘
+        # Bottom border: ╰───...───╯
         bottom_border = (
             BOTTOM_LEFT + (HORIZONTAL * (border_width - 2)) + BOTTOM_RIGHT
             if border_width >= 2