klaude-code 1.9.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

klaude_code/ui/renderers/sub_agent.py

@@ -8,9 +8,10 @@ from rich.panel import Panel
 from rich.style import Style
 from rich.text import Text
 
-from klaude_code import const
+from klaude_code.const import SUB_AGENT_RESULT_MAX_LINES
 from klaude_code.protocol import events, model
 from klaude_code.protocol.sub_agent import get_sub_agent_profile_by_tool
+from klaude_code.ui.renderers.common import truncate_head
 from klaude_code.ui.rich.markdown import NoInsetMarkdown
 from klaude_code.ui.rich.theme import ThemeKey
 
@@ -46,9 +47,15 @@ def render_sub_agent_call(e: model.SubAgentState, style: Style | None = None) ->
         f" {e.sub_agent_desc} ",
         style=Style(color=style.color if style else None, bold=True, reverse=True),
     )
+    resume_note = Text("")
+    if e.resume:
+        resume_note = Text(
+            f" resume:{e.resume[:7]} ",
+            style=Style(color=style.color if style else None, dim=True),
+        )
     elements: list[RenderableType] = [
-        Text.assemble((e.sub_agent_type, ThemeKey.TOOL_NAME), " ", desc),
-        Text(e.sub_agent_prompt, style=style or ""),
+        Text.assemble((e.sub_agent_type, ThemeKey.TOOL_NAME), " ", desc, resume_note),
+        truncate_head(e.sub_agent_prompt, base_style=style or "", truncated_style=ThemeKey.STATUS_HINT, max_lines=10),
     ]
     if e.output_schema:
         elements.append(Text("\nExpected Output Format JSON:", style=style or ""))
@@ -58,6 +65,20 @@ def render_sub_agent_call(e: model.SubAgentState, style: Style | None = None) ->
     return Group(*elements)
 
 
+def _extract_agent_id_footer(text: str) -> tuple[str, str | None]:
+    """Extract agentId footer from result text if present.
+
+    Returns (main_content, footer_line) where footer_line is None if not found.
+    """
+    lines = text.rstrip().splitlines()
+    if len(lines) >= 2 and lines[-1].startswith("agentId:"):
+        # Check if there's an empty line before the footer
+        if lines[-2] == "":
+            return "\n".join(lines[:-2]), lines[-1]
+        return "\n".join(lines[:-1]), lines[-1]
+    return text, None
+
+
 def render_sub_agent_result(
     result: str,
     *,
@@ -70,6 +91,10 @@ def render_sub_agent_result(
     stripped_result = result.strip()
     result_panel_style = panel_style or ThemeKey.SUB_AGENT_RESULT_PANEL
 
+    # Extract agentId footer for separate styling
+    main_content, agent_id_footer = _extract_agent_id_footer(stripped_result)
+    stripped_result = main_content.strip()
+
     # Use rich JSON for structured output
     if has_structured_output:
         try:
@@ -82,6 +107,8 @@ def render_sub_agent_result(
             ]
             if description:
                 group_elements.insert(0, NoInsetMarkdown(f"# {description}", code_theme=code_theme, style=style or ""))
+            if agent_id_footer:
+                group_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
             return Panel.fit(
                 Group(*group_elements),
                 box=box.SIMPLE,
@@ -92,32 +119,41 @@ def render_sub_agent_result(
             # Fall back to markdown if not valid JSON
             pass
 
+    if not stripped_result:
+        return Text()
+
     # 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
-        head_count = const.SUB_AGENT_RESULT_MAX_LINES // 2
-        tail_count = const.SUB_AGENT_RESULT_MAX_LINES - head_count
+    if len(lines) > SUB_AGENT_RESULT_MAX_LINES:
+        hidden_count = len(lines) - SUB_AGENT_RESULT_MAX_LINES
+        head_count = SUB_AGENT_RESULT_MAX_LINES // 2
+        tail_count = SUB_AGENT_RESULT_MAX_LINES - head_count
         head_text = "\n".join(lines[:head_count])
         tail_text = "\n".join(lines[-tail_count:])
-        return Panel.fit(
-            Group(
-                NoInsetMarkdown(head_text, code_theme=code_theme, style=style or ""),
-                Text(
-                    f"\n( … more {hidden_count} lines — use /export to view full output )\n",
-                    style=ThemeKey.TOOL_RESULT_TRUNCATED,
-                ),
-                NoInsetMarkdown(tail_text, code_theme=code_theme, style=style or ""),
+        truncated_elements: list[RenderableType] = [
+            NoInsetMarkdown(head_text, code_theme=code_theme, style=style or ""),
+            Text(
+                f"( … more {hidden_count} lines — use /export to view full output )",
+                style=ThemeKey.TOOL_RESULT_TRUNCATED,
             ),
+            NoInsetMarkdown(tail_text, code_theme=code_theme, style=style or ""),
+        ]
+        if agent_id_footer:
+            truncated_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
+        return Panel.fit(
+            Group(*truncated_elements),
             box=box.SIMPLE,
             border_style=ThemeKey.LINES,
             style=result_panel_style,
         )
+    normal_elements: list[RenderableType] = [NoInsetMarkdown(stripped_result, code_theme=code_theme)]
+    if agent_id_footer:
+        normal_elements.append(Text(agent_id_footer, style=ThemeKey.SUB_AGENT_FOOTER))
     return Panel.fit(
-        NoInsetMarkdown(stripped_result, code_theme=code_theme),
+        Group(*normal_elements),
         box=box.SIMPLE,
         border_style=ThemeKey.LINES,
         style=result_panel_style,
@@ -132,6 +168,7 @@ def build_sub_agent_state_from_tool_call(e: events.ToolCallEvent) -> model.SubAg
     description = profile.name
     prompt = ""
     output_schema: dict[str, Any] | None = None
+    resume: str | None = None
     if e.arguments:
         try:
             payload: dict[str, object] = json.loads(e.arguments)
@@ -143,6 +180,9 @@ def build_sub_agent_state_from_tool_call(e: events.ToolCallEvent) -> model.SubAg
         prompt_value = payload.get("prompt") or payload.get("task")
         if isinstance(prompt_value, str):
             prompt = prompt_value.strip()
+        resume_value = payload.get("resume")
+        if isinstance(resume_value, str) and resume_value.strip():
+            resume = resume_value.strip()
         # Extract output_schema if profile supports it
         if profile.output_schema_arg:
             schema_value = payload.get(profile.output_schema_arg)
@@ -152,5 +192,6 @@ def build_sub_agent_state_from_tool_call(e: events.ToolCallEvent) -> model.SubAg
         sub_agent_type=profile.name,
         sub_agent_desc=description,
         sub_agent_prompt=prompt,
+        resume=resume,
         output_schema=output_schema,
     )

klaude_code/ui/renderers/thinking.py

@@ -4,7 +4,7 @@ from rich.console import RenderableType
 from rich.padding import Padding
 from rich.text import Text
 
-from klaude_code import const
+from klaude_code.const import MARKDOWN_RIGHT_MARGIN
 from klaude_code.ui.renderers.common import create_grid
 from klaude_code.ui.rich.markdown import ThinkingMarkdown
 from klaude_code.ui.rich.theme import ThemeKey
@@ -37,6 +37,41 @@ def normalize_thinking_content(content: str) -> str:
     return text
 
 
+def extract_last_bold_header(text: str) -> str | None:
+    """Extract the latest complete bold header ("**…**") from text.
+
+    We treat a bold segment as a "header" only if it appears at the beginning
+    of a line (ignoring leading whitespace). This avoids picking up incidental
+    emphasis inside paragraphs.
+
+    Returns None if no complete bold segment is available yet.
+    """
+
+    last: str | None = None
+    i = 0
+    while True:
+        start = text.find("**", i)
+        if start < 0:
+            break
+
+        line_start = text.rfind("\n", 0, start) + 1
+        if text[line_start:start].strip():
+            i = start + 2
+            continue
+
+        end = text.find("**", start + 2)
+        if end < 0:
+            break
+
+        inner = " ".join(text[start + 2 : end].split())
+        if inner and "\n" not in inner:
+            last = inner
+
+        i = end + 2
+
+    return last
+
+
 def render_thinking(content: str, *, code_theme: str, style: str) -> RenderableType | None:
     """Render thinking content as markdown with left mark.
 
@@ -55,7 +90,7 @@ def render_thinking(content: str, *, code_theme: str, style: str) -> RenderableT
                 code_theme=code_theme,
                 style=style,
             ),
-            (0, const.MARKDOWN_RIGHT_MARGIN, 0, 0),
+            (0, MARKDOWN_RIGHT_MARGIN, 0, 0),
         ),
     )
     return grid