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

klaude_code/session/export.py

@@ -421,10 +421,39 @@ def _render_diff_span(span: model.DiffSpan, line_kind: str) -> str:
     return f'<span class="diff-span">{text}</span>'
 
 
-def _get_diff_ui_extra(ui_extra: model.ToolResultUIExtra | None) -> model.DiffUIExtra | None:
-    if isinstance(ui_extra, model.DiffUIExtra):
-        return ui_extra
-    return None
+def _render_markdown_doc(doc: model.MarkdownDocUIExtra) -> str:
+    encoded = _escape_html(doc.content)
+    file_path = _escape_html(doc.file_path)
+    header = f'<div class="diff-file">{file_path} <span style="font-weight: normal; color: var(--text-dim); font-size: 12px; margin-left: 8px;">(markdown content)</span></div>'
+
+    # Using a container that mimics diff-view but for markdown
+    content = (
+        f'<div class="markdown-content markdown-body" data-raw="{encoded}" '
+        f'style="padding: 12px; border: 1px solid var(--border); border-radius: var(--radius-md); background: var(--bg-body); margin-top: 4px;">'
+        f'<noscript><pre style="white-space: pre-wrap;">{encoded}</pre></noscript>'
+        f"</div>"
+    )
+
+    line_count = doc.content.count("\n") + 1
+    open_attr = " open"
+
+    return (
+        f'<details class="diff-collapsible"{open_attr}>'
+        f"<summary>File Content ({line_count} lines)</summary>"
+        f'<div style="margin-top: 8px;">'
+        f"{header}"
+        f"{content}"
+        f"</div>"
+        f"</details>"
+    )
+
+
+def _collect_ui_extras(ui_extra: model.ToolResultUIExtra | None) -> list[model.ToolResultUIExtra]:
+    if ui_extra is None:
+        return []
+    if isinstance(ui_extra, model.MultiUIExtra):
+        return list(ui_extra.items)
+    return [ui_extra]
 
 
 def _build_add_only_diff(text: str, file_path: str) -> model.DiffUIExtra:
@@ -446,21 +475,28 @@ def _build_add_only_diff(text: str, file_path: str) -> model.DiffUIExtra:
 def _get_mermaid_link_html(
     ui_extra: model.ToolResultUIExtra | None, tool_call: model.ToolCallItem | None = None
 ) -> str | None:
-    if tool_call and tool_call.name == "Mermaid":
+    code = ""
+    link: str | None = None
+    line_count = 0
+
+    if isinstance(ui_extra, model.MermaidLinkUIExtra):
+        code = ui_extra.code
+        link = ui_extra.link
+        line_count = ui_extra.line_count
+
+    if not code and tool_call and tool_call.name == "Mermaid":
         try:
             args = json.loads(tool_call.arguments)
             code = args.get("code", "")
         except (json.JSONDecodeError, TypeError):
             code = ""
-    else:
-        code = ""
+        line_count = code.count("\n") + 1 if code else 0
 
-    if not code and not isinstance(ui_extra, model.MermaidLinkUIExtra):
+    if not code and not link:
         return None
 
     # Prepare code for rendering and copy
     escaped_code = _escape_html(code) if code else ""
-    line_count = code.count("\n") + 1 if code else 0
 
     # Build Toolbar
     toolbar_items: list[str] = []
@@ -477,8 +513,6 @@ def _get_mermaid_link_html(
             '<button type="button" class="fullscreen-mermaid-btn" title="View Fullscreen">Fullscreen</button>'
         )
 
-    link = ui_extra.link if isinstance(ui_extra, model.MermaidLinkUIExtra) else None
-
     if link:
         link_url = _escape_html(link)
         buttons_html.append(
@@ -567,19 +601,26 @@ def _format_tool_call(tool_call: model.ToolCallItem, result: model.ToolResultIte
     ]
 
     if result:
-        diff_ui = _get_diff_ui_extra(result.ui_extra)
-        mermaid_html = _get_mermaid_link_html(result.ui_extra, tool_call)
+        extras = _collect_ui_extras(result.ui_extra)
+
+        mermaid_extra = next((x for x in extras if isinstance(x, model.MermaidLinkUIExtra)), None)
+        mermaid_source = mermaid_extra if mermaid_extra else result.ui_extra
+        mermaid_html = _get_mermaid_link_html(mermaid_source, tool_call)
 
         should_hide_text = tool_call.name in ("TodoWrite", "update_plan") and result.status != "error"
 
-        if tool_call.name == "Edit" and not diff_ui and result.status != "error":
+        if (
+            tool_call.name == "Edit"
+            and not any(isinstance(x, model.DiffUIExtra) for x in extras)
+            and result.status != "error"
+        ):
             try:
                 args_data = json.loads(tool_call.arguments)
                 file_path = args_data.get("file_path", "Unknown file")
                 old_string = args_data.get("old_string", "")
                 new_string = args_data.get("new_string", "")
                 if old_string == "" and new_string:
-                    diff_ui = _build_add_only_diff(new_string, file_path)
+                    extras.append(_build_add_only_diff(new_string, file_path))
             except (json.JSONDecodeError, TypeError):
                 pass
 
@@ -591,8 +632,11 @@ def _format_tool_call(tool_call: model.ToolCallItem, result: model.ToolResultIte
             else:
                 items_to_render.append(_render_text_block(result.output))
 
-        if diff_ui:
-            items_to_render.append(_render_diff_block(diff_ui))
+        for extra in extras:
+            if isinstance(extra, model.DiffUIExtra):
+                items_to_render.append(_render_diff_block(extra))
+            elif isinstance(extra, model.MarkdownDocUIExtra):
+                items_to_render.append(_render_markdown_doc(extra))
 
         if mermaid_html:
             items_to_render.append(mermaid_html)

klaude_code/session/session.py

@@ -197,6 +197,28 @@ class Session(BaseModel):
         )
         self._store.append_and_flush(session_id=self.id, items=items, meta=meta)
 
+    def fork(self, *, new_id: str | None = None) -> Session:
+        """Create a new session as a fork of the current session.
+
+        The forked session copies metadata and conversation history, but does not
+        modify the current session.
+        """
+
+        forked = Session.create(id=new_id, work_dir=self.work_dir)
+
+        forked.sub_agent_state = None
+        forked.model_name = self.model_name
+        forked.model_config_name = self.model_config_name
+        forked.model_thinking = self.model_thinking.model_copy(deep=True) if self.model_thinking is not None else None
+        forked.file_tracker = {k: v.model_copy(deep=True) for k, v in self.file_tracker.items()}
+        forked.todos = [todo.model_copy(deep=True) for todo in self.todos]
+
+        items = [it.model_copy(deep=True) for it in self.conversation_history]
+        if items:
+            forked.append_history(items)
+
+        return forked
+
     async def wait_for_flush(self) -> None:
         await self._store.wait_for_flush(self.id)
 
@@ -224,7 +246,7 @@ class Session(BaseModel):
     def need_turn_start(self, prev_item: model.ConversationItem | None, item: model.ConversationItem) -> bool:
         if not isinstance(
             item,
-            model.ReasoningEncryptedItem | model.ReasoningTextItem | model.AssistantMessageItem | model.ToolCallItem,
+            model.ReasoningTextItem | model.AssistantMessageItem | model.ToolCallItem,
         ):
             return False
         if prev_item is None: