klaude-code 1.2.8__py3-none-any.whl → 1.2.10__py3-none-any.whl

klaude_code/session/export.py

@@ -159,20 +159,35 @@ def _format_cost(cost: float, currency: str = "USD") -> str:
     return f"{symbol}{cost:.4f}"
 
 
-def _render_metadata_item(item: model.ResponseMetadataItem) -> str:
-    # Model Name [@ Provider]
+def _render_single_metadata(
+    metadata: model.TaskMetadata,
+    *,
+    indent: int = 0,
+    show_context: bool = True,
+) -> str:
+    """Render a single TaskMetadata block as HTML.
+
+    Args:
+        metadata: The TaskMetadata to render.
+        indent: Number of spaces to indent (0 for main, 2 for sub-agents).
+        show_context: Whether to show context usage percent.
+
+    Returns:
+        HTML string for this metadata block.
+    """
     parts: list[str] = []
 
-    model_parts = [f'<span class="metadata-model">{_escape_html(item.model_name)}</span>']
-    if item.provider:
-        provider = _escape_html(item.provider.lower().replace(" ", "-"))
+    # Model Name [@ Provider]
+    model_parts = [f'<span class="metadata-model">{_escape_html(metadata.model_name)}</span>']
+    if metadata.provider:
+        provider = _escape_html(metadata.provider.lower().replace(" ", "-"))
         model_parts.append(f'<span class="metadata-provider">@{provider}</span>')
 
     parts.append("".join(model_parts))
 
     # Stats
-    if item.usage:
-        u = item.usage
+    if metadata.usage:
+        u = metadata.usage
         # Input with cost
         input_stat = f"input: {_format_token_count(u.input_tokens)}"
         if u.input_cost is not None:
@@ -194,22 +209,39 @@ def _render_metadata_item(item: model.ResponseMetadataItem) -> str:
 
         if u.reasoning_tokens > 0:
             parts.append(f'<span class="metadata-stat">thinking: {_format_token_count(u.reasoning_tokens)}</span>')
-        if u.context_usage_percent is not None:
+        if show_context and u.context_usage_percent is not None:
             parts.append(f'<span class="metadata-stat">context: {u.context_usage_percent:.1f}%</span>')
         if u.throughput_tps is not None:
             parts.append(f'<span class="metadata-stat">tps: {u.throughput_tps:.1f}</span>')
 
-    if item.task_duration_s is not None:
-        parts.append(f'<span class="metadata-stat">time: {item.task_duration_s:.1f}s</span>')
+    if metadata.task_duration_s is not None:
+        parts.append(f'<span class="metadata-stat">time: {metadata.task_duration_s:.1f}s</span>')
 
     # Total cost
-    if item.usage is not None and item.usage.total_cost is not None:
-        parts.append(f'<span class="metadata-stat">cost: {_format_cost(item.usage.total_cost, item.usage.currency)}</span>')
+    if metadata.usage is not None and metadata.usage.total_cost is not None:
+        parts.append(
+            f'<span class="metadata-stat">cost: {_format_cost(metadata.usage.total_cost, metadata.usage.currency)}</span>'
+        )
 
     divider = '<span class="metadata-divider">/</span>'
     joined_html = divider.join(parts)
 
-    return f'<div class="response-metadata"><div class="metadata-line">{joined_html}</div></div>'
+    indent_style = f' style="padding-left: {indent}em;"' if indent > 0 else ""
+    return f'<div class="metadata-line"{indent_style}>{joined_html}</div>'
+
+
+def _render_metadata_item(item: model.TaskMetadataItem) -> str:
+    """Render TaskMetadataItem including main agent and sub-agents."""
+    lines: list[str] = []
+
+    # Main agent metadata
+    lines.append(_render_single_metadata(item.main, indent=0, show_context=True))
+
+    # Sub-agent metadata with indent
+    for sub in item.sub_agent_task_metadata:
+        lines.append(_render_single_metadata(sub, indent=1, show_context=False))
+
+    return f'<div class="response-metadata">{"".join(lines)}</div>'
 
 
 def _render_assistant_message(index: int, content: str, timestamp: datetime) -> str:
@@ -262,7 +294,7 @@ def _try_render_todo_args(arguments: str) -> str | None:
             return None
 
         return f'<div class="todo-list">{"".join(items_html)}</div>'
-    except Exception:
+    except (json.JSONDecodeError, KeyError, TypeError):
         return None
 
 
@@ -336,11 +368,9 @@ def _render_diff_block(diff: str) -> str:
 
 
 def _get_diff_text(ui_extra: model.ToolResultUIExtra | None) -> str | None:
-    if ui_extra is None:
-        return None
-    if ui_extra.type != model.ToolResultUIExtraType.DIFF_TEXT:
-        return None
-    return ui_extra.diff_text
+    if isinstance(ui_extra, model.DiffTextUIExtra):
+        return ui_extra.diff_text
+    return None
 
 
 def _get_mermaid_link_html(
@@ -350,14 +380,12 @@ def _get_mermaid_link_html(
         try:
             args = json.loads(tool_call.arguments)
             code = args.get("code", "")
-        except Exception:
+        except (json.JSONDecodeError, TypeError):
             code = ""
     else:
         code = ""
 
-    if not code and (
-        ui_extra is None or ui_extra.type != model.ToolResultUIExtraType.MERMAID_LINK or not ui_extra.mermaid_link
-    ):
+    if not code and not isinstance(ui_extra, model.MermaidLinkUIExtra):
         return None
 
     # Prepare code for rendering and copy
@@ -376,11 +404,7 @@ def _get_mermaid_link_html(
             f'<button type="button" class="copy-mermaid-btn" data-code="{escaped_code}" title="Copy Mermaid Code">Copy Code</button>'
         )
 
-    link = (
-        ui_extra.mermaid_link.link
-        if (ui_extra and ui_extra.type == model.ToolResultUIExtraType.MERMAID_LINK and ui_extra.mermaid_link)
-        else None
-    )
+    link = ui_extra.link if isinstance(ui_extra, model.MermaidLinkUIExtra) else None
 
     if link:
         link_url = _escape_html(link)
@@ -423,7 +447,7 @@ def _format_tool_call(tool_call: model.ToolCallItem, result: model.ToolResultIte
         try:
             parsed = json.loads(tool_call.arguments)
             args_text = json.dumps(parsed, ensure_ascii=False, indent=2)
-        except Exception:
+        except (json.JSONDecodeError, TypeError):
             args_text = tool_call.arguments
 
         args_html = _escape_html(args_text or "")
@@ -445,7 +469,7 @@ def _format_tool_call(tool_call: model.ToolCallItem, result: model.ToolResultIte
                 parsed_args = json.loads(tool_call.arguments)
                 if parsed_args.get("command") in {"create", "str_replace", "insert"}:
                     force_collapse = True
-            except Exception:
+            except (json.JSONDecodeError, TypeError):
                 pass
 
         should_collapse = force_collapse or _should_collapse(args_html)
@@ -482,7 +506,7 @@ def _format_tool_call(tool_call: model.ToolCallItem, result: model.ToolResultIte
                 new_string = args_data.get("new_string", "")
                 if old_string == "" and new_string:
                     diff_text = "\n".join(f"+{line}" for line in new_string.splitlines())
-            except Exception:
+            except (json.JSONDecodeError, TypeError):
                 pass
 
         items_to_render: list[str] = []
@@ -544,7 +568,7 @@ def _build_messages_html(
         elif isinstance(item, model.AssistantMessageItem):
             assistant_counter += 1
             blocks.append(_render_assistant_message(assistant_counter, item.content or "", item.created_at))
-        elif isinstance(item, model.ResponseMetadataItem):
+        elif isinstance(item, model.TaskMetadataItem):
             blocks.append(_render_metadata_item(item))
         elif isinstance(item, model.DeveloperMessageItem):
             content = _escape_html(item.content or "")

klaude_code/session/session.py

@@ -5,7 +5,7 @@ from collections.abc import Iterable, Sequence
 from pathlib import Path
 from typing import ClassVar
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, PrivateAttr
 
 from klaude_code.protocol import events, model
 
@@ -19,8 +19,6 @@ class Session(BaseModel):
     file_tracker: dict[str, float] = Field(default_factory=dict)
     # Todo list for the session
     todos: list[model.TodoItem] = Field(default_factory=list)  # pyright: ignore[reportUnknownVariableType]
-    # Messages count, redundant state for performance optimization to avoid reading entire jsonl file
-    messages_count: int = Field(default=0)
     # Model name used for this session
     # Used in list method SessionMetaBrief
     model_name: str | None = None
@@ -33,6 +31,27 @@ class Session(BaseModel):
     need_todo_empty_cooldown_counter: int = Field(exclude=True, default=0)
     need_todo_not_used_cooldown_counter: int = Field(exclude=True, default=0)
 
+    # Cached messages count (computed property)
+    _messages_count_cache: int | None = PrivateAttr(default=None)
+
+    @property
+    def messages_count(self) -> int:
+        """Count of user and assistant messages in conversation history.
+
+        This is a cached property that is invalidated when append_history is called.
+        """
+        if self._messages_count_cache is None:
+            self._messages_count_cache = sum(
+                1
+                for it in self.conversation_history
+                if isinstance(it, (model.UserMessageItem, model.AssistantMessageItem))
+            )
+        return self._messages_count_cache
+
+    def _invalidate_messages_count_cache(self) -> None:
+        """Invalidate the cached messages count."""
+        self._messages_count_cache = None
+
     # Internal: mapping for (de)serialization of conversation items
     _TypeMap: ClassVar[dict[str, type[BaseModel]]] = {
         # Messages
@@ -50,7 +69,7 @@ class Session(BaseModel):
         "AssistantMessageDelta": model.AssistantMessageDelta,
         "StartItem": model.StartItem,
         "StreamErrorItem": model.StreamErrorItem,
-        "ResponseMetadataItem": model.ResponseMetadataItem,
+        "TaskMetadataItem": model.TaskMetadataItem,
         "InterruptItem": model.InterruptItem,
     }
 
@@ -84,7 +103,17 @@ class Session(BaseModel):
         return self._messages_dir() / f"{prefix}-{self.id}.jsonl"
 
     @classmethod
-    def load(cls, id: str) -> "Session":
+    def create(cls, id: str | None = None) -> "Session":
+        """Create a new session without checking for existing files."""
+        return Session(id=id or uuid.uuid4().hex, work_dir=Path.cwd())
+
+    @classmethod
+    def load(cls, id: str, *, skip_if_missing: bool = False) -> "Session":
+        """Load an existing session or create a new one if not found."""
+
+        if skip_if_missing:
+            return Session(id=id, work_dir=Path.cwd())
+
         # Load session metadata
         sessions_dir = cls._sessions_dir()
         session_candidates = sorted(
@@ -109,7 +138,6 @@ class Session(BaseModel):
         loaded_memory = list(raw.get("loaded_memory", []))
         created_at = float(raw.get("created_at", time.time()))
         updated_at = float(raw.get("updated_at", created_at))
-        messages_count = int(raw.get("messages_count", 0))
         model_name = raw.get("model_name")
 
         sess = Session(
@@ -121,7 +149,6 @@ class Session(BaseModel):
             loaded_memory=loaded_memory,
             created_at=created_at,
             updated_at=updated_at,
-            messages_count=messages_count,
             model_name=model_name,
         )
 
@@ -150,14 +177,11 @@ class Session(BaseModel):
                     item = cls_type(**data)
                     # pyright: ignore[reportAssignmentType]
                     history.append(item)  # type: ignore[arg-type]
-                except Exception:
+                except (json.JSONDecodeError, KeyError, TypeError):
                     # Best-effort load; skip malformed lines
                     continue
             sess.conversation_history = history
-            # Update messages count based on loaded history (only UserMessageItem and AssistantMessageItem)
-            sess.messages_count = sum(
-                1 for it in history if isinstance(it, (model.UserMessageItem, model.AssistantMessageItem))
-            )
+            # messages_count is now a computed property, no need to set it
 
         return sess
 
@@ -190,10 +214,8 @@ class Session(BaseModel):
     def append_history(self, items: Sequence[model.ConversationItem]):
         # Append to in-memory history
         self.conversation_history.extend(items)
-        # Update messages count (only UserMessageItem and AssistantMessageItem)
-        self.messages_count += sum(
-            1 for it in items if isinstance(it, (model.UserMessageItem, model.AssistantMessageItem))
-        )
+        # Invalidate messages count cache
+        self._invalidate_messages_count_cache()
 
         # Incrementally persist to JSONL under messages directory
         messages_dir = self._messages_dir()
@@ -230,7 +252,7 @@ class Session(BaseModel):
                 if ts > latest_ts:
                     latest_ts = ts
                     latest_id = sid
-            except Exception:
+            except (json.JSONDecodeError, KeyError, TypeError, OSError):
                 continue
         return latest_id
 
@@ -295,8 +317,8 @@ class Session(BaseModel):
                         content=ri.content,
                         session_id=self.id,
                     )
-                case model.ResponseMetadataItem() as mt:
-                    yield events.ResponseMetadataEvent(
+                case model.TaskMetadataItem() as mt:
+                    yield events.TaskMetadataEvent(
                         session_id=self.id,
                         metadata=mt,
                     )
@@ -383,7 +405,7 @@ class Session(BaseModel):
                                         text_parts.append(text)
                             return " ".join(text_parts) if text_parts else None
                         return None
-            except Exception:
+            except (json.JSONDecodeError, KeyError, TypeError, OSError):
                 return None
             return None
 
@@ -391,7 +413,7 @@ class Session(BaseModel):
         for p in sessions_dir.glob("*.json"):
             try:
                 data = json.loads(p.read_text())
-            except Exception:
+            except (json.JSONDecodeError, OSError):
                 # Skip unreadable files
                 continue
             # Filter out sub-agent sessions

klaude_code/session/templates/export_session.html

@@ -21,7 +21,7 @@
       rel="stylesheet"
     />
     <link
-      href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;700&family=IBM+Plex+Sans:wght@400;500;700&display=swap"
+      href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&family=IBM+Plex+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap"
       rel="stylesheet"
     />
     <style>
@@ -411,6 +411,9 @@
         font-size: var(--font-size-xs);
         color: var(--text-dim);
         border-left: 2px solid transparent;
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
       }
       .metadata-line {
         display: flex;

klaude_code/ui/core/input.py

@@ -68,4 +68,4 @@ class InputProviderABC(ABC):
             UserInputPayload with text and optional images.
         """
         raise NotImplementedError
-        yield UserInputPayload(text="")  # pyright: ignore[reportUnreachable]
+        yield UserInputPayload(text="")

klaude_code/ui/modes/repl/__init__.py

@@ -22,11 +22,7 @@ def build_repl_status_snapshot(agent: "Agent | None", update_message: str | None
     tool_calls = 0
 
     if agent is not None:
-        profile = agent.profile
-        if profile is not None:
-            model_name = profile.llm_client.model_name or ""
-        else:
-            model_name = "N/A"
+        model_name = agent.profile.llm_client.model_name or ""
 
         history = agent.session.conversation_history
         for item in history:

klaude_code/ui/modes/repl/clipboard.py

@@ -40,19 +40,19 @@ class ClipboardCaptureState:
         """Capture image from clipboard, save to disk, and return a tag like [Image #N]."""
         try:
             clipboard_data = ImageGrab.grabclipboard()
-        except Exception:
+        except OSError:
             return None
         if not isinstance(clipboard_data, Image.Image):
             return None
         try:
             self._images_dir.mkdir(parents=True, exist_ok=True)
-        except Exception:
+        except OSError:
             return None
         filename = f"clipboard_{uuid.uuid4().hex[:8]}.png"
         path = self._images_dir / filename
         try:
             clipboard_data.save(path, "PNG")
-        except Exception:
+        except OSError:
             return None
         tag = f"[Image #{self._counter}]"
         self._counter += 1
@@ -123,7 +123,7 @@ def _encode_image_file(file_path: str) -> ImageURLPart | None:
         # Clipboard images are always saved as PNG
         data_url = f"data:image/png;base64,{encoded}"
         return ImageURLPart(image_url=ImageURLPart.ImageURL(url=data_url, id=None))
-    except Exception:
+    except OSError:
         return None
 
 
@@ -148,5 +148,5 @@ def copy_to_clipboard(text: str) -> None:
                     input=text.encode("utf-8"),
                     check=True,
                 )
-    except Exception:
+    except (OSError, subprocess.SubprocessError):
         pass