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

klaude_code/core/tool/file/apply_patch_tool.py

@@ -20,7 +20,7 @@ class ApplyPatchHandler:
     @classmethod
     async def handle_apply_patch(cls, patch_text: str) -> model.ToolResultItem:
         try:
-            output, diff_ui = await asyncio.to_thread(cls._apply_patch_in_thread, patch_text)
+            output, ui_extra = await asyncio.to_thread(cls._apply_patch_in_thread, patch_text)
         except apply_patch_module.DiffError as error:
             return model.ToolResultItem(status="error", output=str(error))
         except Exception as error:  # pragma: no cover  # unexpected errors bubbled to tool result
@@ -28,11 +28,11 @@ class ApplyPatchHandler:
         return model.ToolResultItem(
             status="success",
             output=output,
-            ui_extra=diff_ui,
+            ui_extra=ui_extra,
         )
 
     @staticmethod
-    def _apply_patch_in_thread(patch_text: str) -> tuple[str, model.DiffUIExtra]:
+    def _apply_patch_in_thread(patch_text: str) -> tuple[str, model.ToolResultUIExtra]:
         ap = apply_patch_module
         normalized_start = patch_text.lstrip()
         if not normalized_start.startswith("*** Begin Patch"):
@@ -69,6 +69,16 @@ class ApplyPatchHandler:
         commit = ap.patch_to_commit(patch, orig)
         diff_ui = ApplyPatchHandler._commit_to_structured_diff(commit)
 
+        md_items: list[model.MarkdownDocUIExtra] = []
+        for change_path, change in commit.changes.items():
+            if change.type == apply_patch_module.ActionType.ADD and change_path.endswith(".md"):
+                md_items.append(
+                    model.MarkdownDocUIExtra(
+                        file_path=resolve_path(change_path),
+                        content=change.new_content or "",
+                    )
+                )
+
         def write_fn(path: str, content: str) -> None:
             resolved = resolve_path(path)
             if os.path.isdir(resolved):
@@ -102,6 +112,16 @@ class ApplyPatchHandler:
                     file_tracker.pop(resolved, None)
 
         ap.apply_commit(commit, write_fn, remove_fn)
+
+        # apply_patch can include multiple operations. If we added markdown files,
+        # return a MultiUIExtra so UI can render markdown previews (without showing a diff for those markdown adds).
+        if md_items:
+            items: list[model.MultiUIExtraItem] = []
+            items.extend(md_items)
+            if diff_ui.files:
+                items.append(diff_ui)
+            return "Done!", model.MultiUIExtra(items=items)
+
         return "Done!", diff_ui
 
     @staticmethod
@@ -110,6 +130,9 @@ class ApplyPatchHandler:
         for path in sorted(commit.changes):
             change = commit.changes[path]
             if change.type == apply_patch_module.ActionType.ADD:
+                # For markdown files created via Add File, we render content via MarkdownDocUIExtra instead of a diff.
+                if path.endswith(".md"):
+                    continue
                 files.append(build_structured_file_diff("", change.new_content or "", file_path=path))
             elif change.type == apply_patch_module.ActionType.DELETE:
                 files.append(build_structured_file_diff(change.old_content or "", "", file_path=path))

klaude_code/core/tool/file/edit_tool.py

@@ -88,7 +88,7 @@ class EditTool(ToolABC):
     async def call(cls, arguments: str) -> model.ToolResultItem:
         try:
             args = EditTool.EditArguments.model_validate_json(arguments)
-        except Exception as e:  # pragma: no cover - defensive
+        except ValueError as e:  # pragma: no cover - defensive
             return model.ToolResultItem(status="error", output=f"Invalid arguments: {e}")
 
         file_path = os.path.abspath(args.file_path)
@@ -150,7 +150,7 @@ class EditTool(ToolABC):
                 # Backward-compat: old sessions only stored mtime.
                 try:
                     current_mtime = Path(file_path).stat().st_mtime
-                except Exception:
+                except OSError:
                     current_mtime = tracked_status.mtime
                 if current_mtime != tracked_status.mtime:
                     return model.ToolResultItem(
@@ -188,7 +188,7 @@ class EditTool(ToolABC):
         # Write back
         try:
             await asyncio.to_thread(write_text, file_path, after)
-        except Exception as e:  # pragma: no cover
+        except (OSError, UnicodeError) as e:  # pragma: no cover
             return model.ToolResultItem(status="error", output=f"<tool_use_error>{e}</tool_use_error>")
 
         # Prepare UI extra: unified diff with 3 context lines
@@ -233,7 +233,7 @@ class EditTool(ToolABC):
                     plus_range = plus.split(" ")[0]
                     start = int(plus_range.split(",")[0]) if "," in plus_range else int(plus_range)
                     after_line_no = start - 1
-                except Exception:
+                except (ValueError, IndexError):
                     after_line_no = 0
                 continue
             if line.startswith(" ") or (line.startswith("+") and not line.startswith("+++ ")):

klaude_code/core/tool/file/write_tool.py

@@ -49,7 +49,7 @@ class WriteTool(ToolABC):
     async def call(cls, arguments: str) -> model.ToolResultItem:
         try:
             args = WriteArguments.model_validate_json(arguments)
-        except Exception as e:  # pragma: no cover - defensive
+        except ValueError as e:  # pragma: no cover - defensive
             return model.ToolResultItem(status="error", output=f"Invalid arguments: {e}")
 
         file_path = os.path.abspath(args.file_path)
@@ -79,7 +79,7 @@ class WriteTool(ToolABC):
             try:
                 before = await asyncio.to_thread(read_text, file_path)
                 before_read_ok = True
-            except Exception:
+            except OSError:
                 before = ""
                 before_read_ok = False
 
@@ -98,7 +98,7 @@ class WriteTool(ToolABC):
                 # Backward-compat: old sessions only stored mtime, or we couldn't hash.
                 try:
                     current_mtime = Path(file_path).stat().st_mtime
-                except Exception:
+                except OSError:
                     current_mtime = tracked_status.mtime
                 if current_mtime != tracked_status.mtime:
                     return model.ToolResultItem(
@@ -111,7 +111,7 @@ class WriteTool(ToolABC):
 
         try:
             await asyncio.to_thread(write_text, file_path, args.content)
-        except Exception as e:  # pragma: no cover
+        except (OSError, UnicodeError) as e:  # pragma: no cover
             return model.ToolResultItem(status="error", output=f"<tool_use_error>{e}</tool_use_error>")
 
         if file_tracker is not None:

klaude_code/core/tool/shell/bash_tool.py

@@ -274,7 +274,7 @@ class BashTool(ToolABC):
                     proc.terminate()
             except ProcessLookupError:
                 return
-            except Exception:
+            except OSError:
                 # Fall back to kill below.
                 pass
 
@@ -356,7 +356,7 @@ class BashTool(ToolABC):
         except asyncio.CancelledError:
             # Propagate cooperative cancellation so outer layers can handle interrupts correctly.
             raise
-        except Exception as e:  # safeguard against unexpected failures
+        except OSError as e:  # safeguard: catch remaining OS-level errors (permissions, resources, etc.)
             return model.ToolResultItem(
                 status="error",
                 output=f"Execution error: {e}",

klaude_code/llm/openai_compatible/stream.py

@@ -20,6 +20,7 @@ from typing import Any, Literal, cast
 import httpx
 import openai
 import openai.types
+import pydantic
 from openai import AsyncStream
 from openai.types.chat.chat_completion_chunk import ChatCompletionChunk
 
@@ -204,7 +205,7 @@ async def parse_chat_completions_stream(
                 try:
                     usage = openai.types.CompletionUsage.model_validate(choice_usage)
                     metadata_tracker.set_usage(convert_usage(usage, param.context_limit, param.max_tokens))
-                except Exception:
+                except pydantic.ValidationError:
                     pass
 
             delta = cast(Any, getattr(choice0, "delta", None))

klaude_code/protocol/model.py

@@ -151,6 +151,28 @@ class SessionStatusUIExtra(BaseModel):
     by_model: list["TaskMetadata"] = []
 
 
+MultiUIExtraItem = (
+    DiffUIExtra
+    | TodoListUIExtra
+    | SessionIdUIExtra
+    | MermaidLinkUIExtra
+    | TruncationUIExtra
+    | MarkdownDocUIExtra
+    | SessionStatusUIExtra
+)
+
+
+class MultiUIExtra(BaseModel):
+    """A container UIExtra that can render multiple UI blocks for a single tool result.
+
+    This is primarily used by tools like apply_patch which can perform multiple
+    operations in one invocation.
+    """
+
+    type: Literal["multi"] = "multi"
+    items: list[MultiUIExtraItem]
+
+
 ToolResultUIExtra = Annotated[
     DiffUIExtra
     | TodoListUIExtra
@@ -158,7 +180,8 @@ ToolResultUIExtra = Annotated[
     | MermaidLinkUIExtra
     | TruncationUIExtra
     | MarkdownDocUIExtra
-    | SessionStatusUIExtra,
+    | SessionStatusUIExtra
+    | MultiUIExtra,
     Field(discriminator="type"),
 ]
 

klaude_code/session/export.py

@@ -702,7 +702,7 @@ def _render_sub_agent_session(
 
     try:
         sub_session = Session.load(session_id)
-    except Exception:
+    except (OSError, json.JSONDecodeError, ValueError):
         return None
 
     sub_history = sub_session.conversation_history

klaude_code/session/selector.py

@@ -23,7 +23,7 @@ def resume_select_session() -> str | None:
     def _fmt(ts: float) -> str:
         try:
             return time.strftime("%m-%d %H:%M:%S", time.localtime(ts))
-        except Exception:
+        except (ValueError, OSError):
             return str(ts)
 
     try:
@@ -76,6 +76,6 @@ def resume_select_session() -> str | None:
             idx = int(raw)
             if 1 <= idx <= len(sessions):
                 return str(sessions[idx - 1].id)
-        except Exception:
+        except (ValueError, EOFError):
             return None
     return None

klaude_code/session/session.py

@@ -7,7 +7,7 @@ from collections.abc import Iterable, Sequence
 from pathlib import Path
 from typing import Any, cast
 
-from pydantic import BaseModel, Field, PrivateAttr
+from pydantic import BaseModel, Field, PrivateAttr, ValidationError
 
 from klaude_code.protocol import events, llm_param, model, tools
 from klaude_code.session.store import JsonlSessionStore, ProjectPaths, build_meta_snapshot
@@ -124,7 +124,7 @@ class Session(BaseModel):
                 if isinstance(k, str) and isinstance(v, dict):
                     try:
                         file_tracker[k] = model.FileStatus.model_validate(v)
-                    except Exception:
+                    except ValidationError:
                         continue
 
         todos_raw = raw.get("todos")
@@ -135,7 +135,7 @@ class Session(BaseModel):
                     continue
                 try:
                     todos.append(model.TodoItem.model_validate(todo_raw))
-                except Exception:
+                except ValidationError:
                     continue
 
         created_at = float(raw.get("created_at", time.time()))
@@ -306,7 +306,7 @@ class Session(BaseModel):
         seen_sub_agent_sessions.add(session_id)
         try:
             sub_session = Session.load(session_id)
-        except Exception:
+        except (OSError, json.JSONDecodeError, ValueError):
             return
         yield from sub_session.get_history_item()
 

klaude_code/ui/modes/repl/completers.py

@@ -204,7 +204,7 @@ class _SkillCompleter(Completer):
             from klaude_code.skill import get_available_skills
 
             return get_available_skills()
-        except Exception:
+        except (ImportError, RuntimeError):
             return []
 
     def is_skill_context(self, document: Document) -> bool:
@@ -497,7 +497,7 @@ class _AtFilesCompleter(Completer):
             try:
                 if (cwd / s).is_dir():
                     uniq[idx] = f"{s}/"
-            except Exception:
+            except OSError:
                 continue
         return uniq
 
@@ -530,7 +530,7 @@ class _AtFilesCompleter(Completer):
             if tag != "search":
                 return root, None
             return root, kw
-        except Exception:
+        except ValueError:
             return None, None
 
     # ---- Utilities ----
@@ -680,7 +680,7 @@ class _AtFilesCompleter(Completer):
                 if p.is_dir() and not rel.endswith("/"):
                     rel += "/"
                 items.append(rel)
-        except Exception:
+        except OSError:
             return []
         return items[: min(self._max_results, 100)]
 

klaude_code/ui/modes/repl/event_handler.py

@@ -122,6 +122,7 @@ class ActivityState:
 
     def __init__(self) -> None:
         self._composing: bool = False
+        self._buffer_length: int = 0
         self._tool_calls: dict[str, int] = {}
 
     @property
@@ -134,6 +135,11 @@ class ActivityState:
 
     def set_composing(self, composing: bool) -> None:
         self._composing = composing
+        if not composing:
+            self._buffer_length = 0
+
+    def set_buffer_length(self, length: int) -> None:
+        self._buffer_length = length
 
     def add_tool_call(self, tool_name: str) -> None:
         self._tool_calls[tool_name] = self._tool_calls.get(tool_name, 0) + 1
@@ -143,6 +149,7 @@ class ActivityState:
 
     def reset(self) -> None:
         self._composing = False
+        self._buffer_length = 0
         self._tool_calls = {}
 
     def get_activity_text(self) -> Text | None:
@@ -159,7 +166,12 @@ class ActivityState:
                 first = False
             return activity_text
         if self._composing:
-            return Text("Composing")
+            # Main status text with creative verb
+            text = Text.assemble(
+                ("Composing ", ThemeKey.STATUS_TEXT_BOLD),
+                (f"({self._buffer_length:,})", ThemeKey.STATUS_TEXT),
+            )
+            return text
         return None
 
 
@@ -206,6 +218,10 @@ class SpinnerStatusState:
             self._reasoning_status = None
         self._activity.set_composing(composing)
 
+    def set_buffer_length(self, length: int) -> None:
+        """Set buffer length for composing state display."""
+        self._activity.set_buffer_length(length)
+
     def add_tool_call(self, tool_name: str) -> None:
         """Add a tool call to the accumulator."""
         self._activity.add_tool_call(tool_name)
@@ -230,7 +246,7 @@ class SpinnerStatusState:
         """Get current spinner status as rich Text (without context)."""
         activity_text = self._activity.get_activity_text()
 
-        base_status = self._todo_status or self._reasoning_status
+        base_status = self._reasoning_status or self._todo_status
 
         if base_status:
             result = Text(base_status, style=ThemeKey.STATUS_TEXT_BOLD)
@@ -375,7 +391,7 @@ class DisplayEventHandler:
                 },
                 theme=self.renderer.themes.thinking_markdown_theme,
                 console=self.renderer.console,
-                live_sink=self.renderer.set_stream_renderable,
+                live_sink=self.renderer.set_stream_renderable if const.MARKDOWN_STREAM_LIVE_REPAINT_ENABLED else None,
                 mark=THINKING_MESSAGE_MARK,
                 mark_style=ThemeKey.THINKING,
                 left_margin=const.MARKDOWN_LEFT_MARGIN,
@@ -412,12 +428,15 @@ class DisplayEventHandler:
                 mdargs={"code_theme": self.renderer.themes.code_theme},
                 theme=self.renderer.themes.markdown_theme,
                 console=self.renderer.console,
-                live_sink=self.renderer.set_stream_renderable,
+                live_sink=self.renderer.set_stream_renderable if const.MARKDOWN_STREAM_LIVE_REPAINT_ENABLED else None,
                 mark=ASSISTANT_MESSAGE_MARK,
                 left_margin=const.MARKDOWN_LEFT_MARGIN,
             )
             self.assistant_stream.start(mdstream)
         self.assistant_stream.append(event.content)
+        self.spinner_status.set_buffer_length(len(self.assistant_stream.buffer))
+        if not first_delta:
+            self._update_spinner()
         if first_delta and self.assistant_stream.mdstream is not None:
             self.assistant_stream.mdstream.update(self.assistant_stream.buffer)
         await self.stage_manager.transition_to(Stage.ASSISTANT)

klaude_code/ui/modes/repl/input_prompt_toolkit.py

@@ -118,7 +118,7 @@ class PromptToolkitInput(InputProviderABC):
             try:
                 status = self._status_provider()
                 update_message = status.update_message
-            except Exception:
+            except (AttributeError, RuntimeError):
                 pass
 
         # If update available, show only the update message
@@ -127,7 +127,7 @@ class PromptToolkitInput(InputProviderABC):
             try:
                 terminal_width = shutil.get_terminal_size().columns
                 padding = " " * max(0, terminal_width - len(left_text))
-            except Exception:
+            except (OSError, ValueError):
                 padding = ""
             toolbar_text = left_text + padding
             return FormattedText([("#ansiyellow", toolbar_text)])
@@ -151,7 +151,7 @@ class PromptToolkitInput(InputProviderABC):
                 # Add context if available
                 if status.context_usage_percent is not None:
                     right_parts.append(f"context {status.context_usage_percent:.1f}%")
-            except Exception:
+            except (AttributeError, RuntimeError):
                 pass
 
         # Build left and right text with borders
@@ -163,7 +163,7 @@ class PromptToolkitInput(InputProviderABC):
             terminal_width = shutil.get_terminal_size().columns
             used_width = len(left_text) + len(right_text)
             padding = " " * max(0, terminal_width - used_width)
-        except Exception:
+        except (OSError, ValueError):
             padding = ""
 
         # Build result with style

klaude_code/ui/modes/repl/key_bindings.py

@@ -52,7 +52,7 @@ def create_key_bindings(
                 buf.delete_before_cursor()  # remove the sentinel backslash  # type: ignore[reportUnknownMemberType]
                 buf.insert_text("\n")  # type: ignore[reportUnknownMemberType]
                 return
-        except Exception:
+        except (AttributeError, TypeError):
             # Fall through to default behavior if anything goes wrong
             pass
 
@@ -111,7 +111,7 @@ def create_key_bindings(
 
             if should_refresh:
                 buf.start_completion(select_first=False)  # type: ignore[reportUnknownMemberType]
-        except Exception:
+        except (AttributeError, TypeError):
             pass
 
     @kb.add("left")
@@ -136,7 +136,7 @@ def create_key_bindings(
             # Default behavior: move one character left when possible.
             if doc.cursor_position > 0:  # type: ignore[reportUnknownMemberType]
                 buf.cursor_left()  # type: ignore[reportUnknownMemberType]
-        except Exception:
+        except (AttributeError, IndexError, TypeError):
             pass
 
     @kb.add("right")
@@ -163,7 +163,7 @@ def create_key_bindings(
             # Default behavior: move one character right when possible.
             if doc.cursor_position < len(doc.text):  # type: ignore[reportUnknownMemberType]
                 buf.cursor_right()  # type: ignore[reportUnknownMemberType]
-        except Exception:
+        except (AttributeError, IndexError, TypeError):
             pass
 
     return kb

klaude_code/ui/modes/repl/renderer.py

@@ -332,23 +332,28 @@ class REPLRenderer:
         self._bottom_live.start()
 
     def _bottom_renderable(self) -> RenderableType:
-        stream = self._stream_renderable
-        if stream is not None:
-            current_width = self.console.size.width
-            if self._stream_last_width != current_width:
-                height = len(self.console.render_lines(stream, self.console.options, pad=False))
-                self._stream_last_height = height
-                self._stream_last_width = current_width
-                self._stream_max_height = max(self._stream_max_height, height)
-            else:
-                height = self._stream_last_height
-
-            pad_lines = max(self._stream_max_height - height, 0)
-            if pad_lines:
-                stream = Padding(stream, (0, 0, pad_lines, 0))
-
-        stream_part: RenderableType = stream if stream is not None else Group()
-        gap_part: RenderableType = Text("") if self._spinner_visible else Group()
+        stream_part: RenderableType = Group()
+        gap_part: RenderableType = Group()
+
+        if const.MARKDOWN_STREAM_LIVE_REPAINT_ENABLED:
+            stream = self._stream_renderable
+            if stream is not None:
+                current_width = self.console.size.width
+                if self._stream_last_width != current_width:
+                    height = len(self.console.render_lines(stream, self.console.options, pad=False))
+                    self._stream_last_height = height
+                    self._stream_last_width = current_width
+                    self._stream_max_height = max(self._stream_max_height, height)
+                else:
+                    height = self._stream_last_height
+
+                pad_lines = max(self._stream_max_height - height, 0)
+                if pad_lines:
+                    stream = Padding(stream, (0, 0, pad_lines, 0))
+                stream_part = stream
+
+            gap_part = Text("") if self._spinner_visible else Group()
+
         status_part: RenderableType = SingleLine(self._status_spinner) if self._spinner_visible else Group()
         return Group(stream_part, gap_part, status_part)
 

klaude_code/ui/renderers/diffs.py

@@ -148,7 +148,7 @@ def render_diff(diff_text: str, show_file_name: bool = False) -> RenderableType:
                 plus = parts[2]  # like '+12,4'
                 new_start = int(plus[1:].split(",")[0])
                 new_ln = new_start
-            except Exception:
+            except (IndexError, ValueError):
                 new_ln = None
             if has_rendered_diff_content:
                 grid.add_row(Text(f"{'⋮':>{const.DIFF_PREFIX_WIDTH}}", style=ThemeKey.TOOL_RESULT), "")

klaude_code/ui/renderers/metadata.py

@@ -1,4 +1,4 @@
-from importlib.metadata import version
+from importlib.metadata import PackageNotFoundError, version
 
 from rich import box
 from rich.console import Group, RenderableType
@@ -17,7 +17,7 @@ def _get_version() -> str:
     """Get the current version of klaude-code."""
     try:
         return version("klaude-code")
-    except Exception:
+    except PackageNotFoundError:
         return "unknown"
 
 

klaude_code/ui/renderers/sub_agent.py

@@ -68,24 +68,22 @@ def render_sub_agent_result(
     panel_style: Style | None = None,
 ) -> RenderableType:
     stripped_result = result.strip()
-
-    # Add markdown heading if description is provided
-    if description:
-        stripped_result = f"# {description}\n\n{stripped_result}"
-
     result_panel_style = panel_style or ThemeKey.SUB_AGENT_RESULT_PANEL
 
     # Use rich JSON for structured output
     if has_structured_output:
         try:
-            return Panel.fit(
-                Group(
-                    Text(
-                        "use /export to view full output",
-                        style=ThemeKey.TOOL_RESULT,
-                    ),
-                    JSON(stripped_result),
+            group_elements: list[RenderableType] = [
+                Text(
+                    "use /export to view full output",
+                    style=ThemeKey.TOOL_RESULT,
                 ),
+                JSON(stripped_result),
+            ]
+            if description:
+                group_elements.insert(0, NoInsetMarkdown(f"# {description}", code_theme=code_theme, style=style or ""))
+            return Panel.fit(
+                Group(*group_elements),
                 box=box.SIMPLE,
                 border_style=ThemeKey.LINES,
                 style=result_panel_style,
@@ -94,6 +92,10 @@ def render_sub_agent_result(
             # Fall back to markdown if not valid JSON
             pass
 
+    # Add markdown heading if description is provided for non-structured output
+    if description:
+        stripped_result = f"# {description}\n\n{stripped_result}"
+
     lines = stripped_result.splitlines()
     if len(lines) > const.SUB_AGENT_RESULT_MAX_LINES:
         hidden_count = len(lines) - const.SUB_AGENT_RESULT_MAX_LINES

klaude_code/ui/renderers/thinking.py

@@ -10,7 +10,7 @@ from klaude_code.ui.rich.markdown import ThinkingMarkdown
 from klaude_code.ui.rich.theme import ThemeKey
 
 # UI markers
-THINKING_MESSAGE_MARK = "⠶"
+THINKING_MESSAGE_MARK = "⸫"
 
 
 def normalize_thinking_content(content: str) -> str: