klaude-code 2.0.2__py3-none-any.whl → 2.1.1__py3-none-any.whl

klaude_code/session/session.py

@@ -289,7 +289,7 @@ class Session(BaseModel):
             return True
         return isinstance(prev_item, (message.UserMessage, message.ToolResultMessage, message.DeveloperMessage))
 
-    def get_history_item(self) -> Iterable[events.HistoryItemEvent]:
+    def get_history_item(self) -> Iterable[events.ReplayEventUnion]:
         seen_sub_agent_sessions: set[str] = set()
         prev_item: message.HistoryEvent | None = None
         last_assistant_content: str = ""
@@ -314,8 +314,8 @@ class Session(BaseModel):
                             response_id=am.response_id,
                             session_id=self.id,
                         )
-                    yield events.AssistantMessageEvent(
-                        thinking_text=thinking_text,
+                    yield events.ResponseCompleteEvent(
+                        thinking_text=thinking_text or None,
                         content=content,
                         response_id=am.response_id,
                         session_id=self.id,
@@ -350,8 +350,6 @@ class Session(BaseModel):
                         is_last_in_turn=is_last_in_turn,
                     )
                     yield from self._iter_sub_agent_history(tr, seen_sub_agent_sessions)
-                    if tr.status == "aborted":
-                        yield events.InterruptEvent(session_id=self.id)
                 case message.UserMessage() as um:
                     images = [part for part in um.parts if isinstance(part, message.ImageURLPart)]
                     yield events.UserMessageEvent(
@@ -360,7 +358,8 @@ class Session(BaseModel):
                         images=images or None,
                     )
                 case model.TaskMetadataItem() as mt:
-                    yield events.TaskMetadataEvent(session_id=self.id, metadata=mt)
+                    if self.sub_agent_state is None:
+                        yield events.TaskMetadataEvent(session_id=self.id, metadata=mt)
                 case message.DeveloperMessage() as dm:
                     yield events.DeveloperMessageEvent(session_id=self.id, item=dm)
                 case message.StreamErrorItem() as se:
@@ -377,7 +376,7 @@ class Session(BaseModel):
 
     def _iter_sub_agent_history(
         self, tool_result: message.ToolResultMessage, seen_sub_agent_sessions: set[str]
-    ) -> Iterable[events.HistoryItemEvent]:
+    ) -> Iterable[events.ReplayEventUnion]:
         ui_extra = tool_result.ui_extra
         if not isinstance(ui_extra, model.SessionIdUIExtra):
             return

klaude_code/skill/assets/create-plan/SKILL.md

@@ -0,0 +1,76 @@
+---
+name: create-plan
+description: Create a concise plan. Use when a user explicitly asks for a plan related to a coding task.
+metadata:
+  short-description: Create a plan
+---
+
+# Create Plan
+
+## Goal
+
+Turn a user prompt into a **single, actionable plan** delivered in the final assistant message.
+
+## Minimal workflow
+
+1. **Scan context quickly**
+   - Read `README.md` and any obvious docs (`docs/`, `CONTRIBUTING.md`, `ARCHITECTURE.md`).
+   - Skim relevant files (the ones most likely touched).
+   - Identify constraints (language, frameworks, CI/test commands, deployment shape).
+
+2. **Ask follow-ups only if blocking**
+   - Ask **at most 1–2 questions**.
+   - Only ask if you cannot responsibly plan without the answer; prefer multiple-choice.
+   - If unsure but not blocked, make a reasonable assumption and proceed.
+
+3. **Create a plan using the template below**
+   - Start with **1 short paragraph** describing the intent and approach.
+   - Clearly call out what is **in scope** and what is **not in scope** in short.
+   - Then provide a **small checklist** of action items (default 6–10 items).
+      - Each checklist item should be a concrete action and, when helpful, mention files/commands.
+      - **Make items atomic and ordered**: discovery → changes → tests → rollout.
+      - **Verb-first**: “Add…”, “Refactor…”, “Verify…”, “Ship…”.
+   - Include at least one item for **tests/validation** and one for **edge cases/risk** when applicable.
+   - If there are unknowns, include a tiny **Open questions** section (max 3).
+
+4. **Write the plan to `plan.md` in the current working directory**
+   - Use the Write tool to save the plan to `./plan.md`
+   - If `plan.md` already exists, overwrite it with the new plan
+
+5. **Do not preface the plan with meta explanations; output only the plan as per template**
+
+## Plan template (follow exactly)
+
+```markdown
+# Plan
+
+<1–3 sentences: what we’re doing, why, and the high-level approach.>
+
+## Scope
+- In:
+- Out:
+
+## Action items
+[ ] <Step 1>
+[ ] <Step 2>
+[ ] <Step 3>
+[ ] <Step 4>
+[ ] <Step 5>
+[ ] <Step 6>
+
+## Open questions
+- <Question 1>
+- <Question 2>
+- <Question 3>
+```
+
+## Checklist item guidance
+Good checklist items:
+- Point to likely files/modules: src/..., app/..., services/...
+- Name concrete validation: “Run npm test”, “Add unit tests for X”
+- Include safe rollout when relevant: feature flag, migration plan, rollback note
+
+Avoid:
+- Vague steps (“handle backend”, “do auth”)
+- Too many micro-steps
+- Writing code snippets (keep the plan implementation-agnostic)

klaude_code/skill/loader.py

@@ -1,11 +1,10 @@
-import re
 from dataclasses import dataclass
 from pathlib import Path
 from typing import ClassVar
 
 import yaml
 
-from klaude_code.trace import log_debug
+from klaude_code.log import log_debug
 
 
 @dataclass
@@ -14,12 +13,12 @@ class Skill:
 
     name: str  # Skill identifier (lowercase-hyphen)
     description: str  # What the skill does and when to use it
-    content: str  # Full markdown instructions
-    location: str  # Skill location: 'system', 'user', or 'project'
+    location: str  # Skill source: 'system', 'user', or 'project'
+    skill_path: Path
+    base_dir: Path
     license: str | None = None
     allowed_tools: list[str] | None = None
     metadata: dict[str, str] | None = None
-    skill_path: Path | None = None
 
     @property
     def short_description(self) -> str:
@@ -31,17 +30,6 @@ class Skill:
             return self.metadata["short-description"]
         return self.description
 
-    def to_prompt(self) -> str:
-        """Convert skill to prompt format for agent consumption"""
-        return f"""# Skill: {self.name}
-
-{self.description}
-
----
-
-{self.content}
-"""
-
 
 class SkillLoader:
     """Load and manage Claude Skills from SKILL.md files"""
@@ -79,7 +67,6 @@ class SkillLoader:
 
             # Parse YAML frontmatter
             frontmatter: dict[str, object] = {}
-            markdown_content = content
 
             if content.startswith("---"):
                 parts = content.split("---", 2)
@@ -87,7 +74,6 @@ class SkillLoader:
                     loaded: object = yaml.safe_load(parts[1])
                     if isinstance(loaded, dict):
                         frontmatter = dict(loaded)  # type: ignore[arg-type]
-                    markdown_content = parts[2].strip()
 
             # Extract skill metadata
             name = str(frontmatter.get("name", ""))
@@ -96,10 +82,6 @@ class SkillLoader:
             if not name or not description:
                 return None
 
-            # Process relative paths in content
-            skill_dir = skill_path.parent
-            processed_content = self._process_skill_paths(markdown_content, skill_dir)
-
             # Create Skill object
             license_val = frontmatter.get("license")
             allowed_tools_val = frontmatter.get("allowed-tools")
@@ -118,12 +100,12 @@ class SkillLoader:
             skill = Skill(
                 name=name,
                 description=description,
-                content=processed_content,
                 location=location,
                 license=str(license_val) if license_val is not None else None,
                 allowed_tools=allowed_tools,
                 metadata=metadata,
-                skill_path=skill_path,
+                skill_path=skill_path.resolve(),
+                base_dir=skill_path.parent.resolve(),
             )
 
             return skill
@@ -144,6 +126,15 @@ class SkillLoader:
             List of successfully loaded Skill objects
         """
         skills: list[Skill] = []
+        priority = {"system": 0, "user": 1, "project": 2}
+
+        def register(skill: Skill) -> None:
+            existing = self.loaded_skills.get(skill.name)
+            if existing is None:
+                self.loaded_skills[skill.name] = skill
+                return
+            if priority.get(skill.location, -1) >= priority.get(existing.location, -1):
+                self.loaded_skills[skill.name] = skill
 
         # Load system-level skills first (lowest priority, can be overridden)
         system_dir = self.SYSTEM_SKILLS_DIR.expanduser()
@@ -152,7 +143,7 @@ class SkillLoader:
                 skill = self.load_skill(skill_file, location="system")
                 if skill:
                     skills.append(skill)
-                    self.loaded_skills[skill.name] = skill
+                    register(skill)
 
         # Load user-level skills (override system skills if same name)
         for user_dir in self.USER_SKILLS_DIRS:
@@ -165,7 +156,7 @@ class SkillLoader:
                     skill = self.load_skill(skill_file, location="user")
                     if skill:
                         skills.append(skill)
-                        self.loaded_skills[skill.name] = skill
+                        register(skill)
 
         # Load project-level skills (override user skills if same name)
         project_dir = self.PROJECT_SKILLS_DIR.resolve()
@@ -174,13 +165,14 @@ class SkillLoader:
                 skill = self.load_skill(skill_file, location="project")
                 if skill:
                     skills.append(skill)
-                    self.loaded_skills[skill.name] = skill
+                    register(skill)
 
         # Log discovery summary
-        if skills:
-            system_count = sum(1 for s in skills if s.location == "system")
-            user_count = sum(1 for s in skills if s.location == "user")
-            project_count = sum(1 for s in skills if s.location == "project")
+        if self.loaded_skills:
+            selected = list(self.loaded_skills.values())
+            system_count = sum(1 for s in selected if s.location == "system")
+            user_count = sum(1 for s in selected if s.location == "user")
+            project_count = sum(1 for s in selected if s.location == "project")
             parts: list[str] = []
             if system_count > 0:
                 parts.append(f"{system_count} system")
@@ -188,7 +180,7 @@ class SkillLoader:
                 parts.append(f"{user_count} user")
             if project_count > 0:
                 parts.append(f"{project_count} project")
-            log_debug(f"Discovered {len(skills)} Claude Skills ({', '.join(parts)})")
+            log_debug(f"Loaded {len(self.loaded_skills)} Claude Skills ({', '.join(parts)})")
 
         return skills
 
@@ -224,62 +216,14 @@ class SkillLoader:
             XML string with all skill metadata
         """
         xml_parts: list[str] = []
-        for skill in self.loaded_skills.values():
-            xml_parts.append(f"""<skill>
+        # Prefer showing higher-priority skills first (project > user > system).
+        location_order = {"project": 0, "user": 1, "system": 2}
+        for skill in sorted(self.loaded_skills.values(), key=lambda s: location_order.get(s.location, 3)):
+            xml_parts.append(
+                f"""<skill>
 <name>{skill.name}</name>
 <description>{skill.description}</description>
-<location>{skill.location}</location>
-</skill>""")
+<location>{skill.skill_path}</location>
+</skill>"""
+            )
         return "\n".join(xml_parts)
-
-    def _process_skill_paths(self, content: str, skill_dir: Path) -> str:
-        """Convert relative paths to absolute paths for Level 3+
-
-        Supports:
-        - scripts/, examples/, templates/, reference/ directories
-        - Markdown document references
-        - Markdown links [text](path)
-
-        Args:
-            content: Original skill content
-            skill_dir: Directory containing the SKILL.md file
-
-        Returns:
-            Content with absolute paths
-        """
-        # Pattern 1: Directory-based paths (scripts/, examples/, etc.)
-        # e.g., "python scripts/generate.py" -> "python /abs/path/to/scripts/generate.py"
-        dir_pattern = r"\b(scripts|examples|templates|reference)/([^\s\)]+)"
-
-        def replace_dir_path(match: re.Match[str]) -> str:
-            directory = match.group(1)
-            filename = match.group(2)
-            abs_path = skill_dir / directory / filename
-            return str(abs_path)
-
-        content = re.sub(dir_pattern, replace_dir_path, content)
-
-        # Pattern 2: Markdown links [text](./path or path)
-        # e.g., "[Guide](./docs/guide.md)" -> "[Guide](`/abs/path/to/docs/guide.md`) (use the Read tool to access)"
-        link_pattern = r"\[([^\]]+)\]\((\./)?([^\)]+\.md)\)"
-
-        def replace_link(match: re.Match[str]) -> str:
-            text = match.group(1)
-            filename = match.group(3)
-            abs_path = skill_dir / filename
-            return f"[{text}](`{abs_path}`) (use the Read tool to access)"
-
-        content = re.sub(link_pattern, replace_link, content)
-
-        # Pattern 3: Standalone markdown references
-        # e.g., "see reference.md" -> "see `/abs/path/to/reference.md` (use the Read tool to access)"
-        standalone_pattern = r"(?<!\])\b(\w+\.md)\b(?!\))"
-
-        def replace_standalone(match: re.Match[str]) -> str:
-            filename = match.group(1)
-            abs_path = skill_dir / filename
-            return f"`{abs_path}` (use the Read tool to access)"
-
-        content = re.sub(standalone_pattern, replace_standalone, content)
-
-        return content

klaude_code/skill/manager.py

@@ -68,3 +68,41 @@ def list_skill_names() -> list[str]:
         List of skill names
     """
     return _ensure_initialized().list_skills()
+
+
+def format_available_skills_for_system_prompt() -> str:
+    """Format skills metadata for inclusion in the system prompt.
+
+    This follows the progressive-disclosure approach:
+    - Keep only name/description + file location in the always-on system prompt
+    - Load the full SKILL.md content on demand via the Read tool when needed
+    """
+
+    try:
+        loader = _ensure_initialized()
+        skills_xml = loader.get_skills_xml().strip()
+        if not skills_xml:
+            return ""
+
+        return f"""\
+# Skills
+
+Skills are optional task-specific instructions stored as `SKILL.md` files.
+
+How to use skills:
+- Use the metadata in <available_skills> to decide whether a skill applies.
+- When the task matches a skill's description, use the `Read` tool to load the `SKILL.md` at the given <location>.
+- If the user explicitly activates a skill by starting their message with `$skill-name`, prioritize that skill.
+
+Important:
+- Only use skills listed in <available_skills> below.
+- Keep context small: do NOT load skill files unless needed.
+
+The list below is metadata only (name/description/location). The full instructions live in the referenced file.
+
+<available_skills>
+{skills_xml}
+</available_skills>"""
+    except Exception:
+        # Skills are an optional enhancement; do not fail prompt construction if discovery breaks.
+        return ""

klaude_code/skill/system_skills.py

@@ -11,7 +11,7 @@ from contextlib import contextmanager
 from importlib import resources
 from pathlib import Path
 
-from klaude_code.trace import log_debug
+from klaude_code.log import log_debug
 
 # Marker file name for tracking installed skills version
 SYSTEM_SKILLS_MARKER_FILENAME = ".klaude-system-skills.marker"

klaude_code/tui/__init__.py

@@ -0,0 +1,8 @@
+"""Terminal (TUI) frontend for klaude-code.
+
+This package contains all terminal-specific UI code (Rich rendering,
+prompt-toolkit input, and terminal integrations).
+
+The tui layer may depend on `klaude_code.ui`, but `klaude_code.ui` must not
+depend on `klaude_code.tui`.
+"""

klaude_code/{command → tui/command}/__init__.py

@@ -30,6 +30,7 @@ def ensure_commands_loaded() -> None:
 
     # Import and register commands in display order
     from .clear_cmd import ClearCommand
+    from .copy_cmd import CopyCommand
     from .debug_cmd import DebugCommand
     from .export_cmd import ExportCommand
     from .export_online_cmd import ExportOnlineCommand
@@ -49,6 +50,7 @@ def ensure_commands_loaded() -> None:
     register(RefreshTerminalCommand())
     register(ThinkingCommand())
     register(ModelCommand())
+    register(CopyCommand())
     register(ForkSessionCommand())
     register(ResumeCommand())
     load_prompt_commands()
@@ -66,6 +68,7 @@ def ensure_commands_loaded() -> None:
 def __getattr__(name: str) -> object:
     _commands_map = {
         "ClearCommand": "clear_cmd",
+        "CopyCommand": "copy_cmd",
         "DebugCommand": "debug_cmd",
         "ExportCommand": "export_cmd",
         "ExportOnlineCommand": "export_online_cmd",

klaude_code/{command → tui/command}/clear_cmd.py

@@ -1,6 +1,7 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, message, op
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class ClearCommand(CommandABC):
     """Clear current session and start a new conversation"""

klaude_code/tui/command/copy_cmd.py

@@ -0,0 +1,53 @@
+from klaude_code.protocol import commands, events, message, model
+from klaude_code.tui.input.clipboard import copy_to_clipboard
+
+from .command_abc import Agent, CommandABC, CommandResult
+
+
+class CopyCommand(CommandABC):
+    """Copy the last assistant message to system clipboard."""
+
+    @property
+    def name(self) -> commands.CommandName:
+        return commands.CommandName.COPY
+
+    @property
+    def summary(self) -> str:
+        return "Copy last assistant message to clipboard"
+
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
+        del user_input  # unused
+
+        last = _get_last_assistant_text(agent.session.conversation_history)
+        if not last:
+            return _developer_message(agent, "(no assistant message to copy)", self.name)
+
+        copy_to_clipboard(last)
+        return _developer_message(agent, "Copied last assistant message to clipboard.", self.name)
+
+
+def _get_last_assistant_text(history: list[message.HistoryEvent]) -> str:
+    for item in reversed(history):
+        if not isinstance(item, message.AssistantMessage):
+            continue
+        content = message.join_text_parts(item.parts)
+        images = [part for part in item.parts if isinstance(part, message.ImageFilePart)]
+        formatted = message.format_saved_images(images, content)
+        return formatted.strip()
+    return ""
+
+
+def _developer_message(agent: Agent, content: str, command_name: commands.CommandName) -> CommandResult:
+    return CommandResult(
+        events=[
+            events.DeveloperMessageEvent(
+                session_id=agent.session.id,
+                item=message.DeveloperMessage(
+                    parts=message.text_parts_from_str(content),
+                    ui_extra=model.build_command_output_extra(command_name),
+                ),
+            )
+        ],
+        persist_user_input=False,
+        persist_events=False,
+    )

klaude_code/{command → tui/command}/debug_cmd.py

@@ -1,6 +1,7 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
+from klaude_code.log import DebugType, get_current_log_file, is_debug_enabled, set_debug_logging
 from klaude_code.protocol import commands, events, message, model
-from klaude_code.trace import DebugType, get_current_log_file, is_debug_enabled, set_debug_logging
+
+from .command_abc import Agent, CommandABC, CommandResult
 
 
 def _format_status() -> str:

klaude_code/{command → tui/command}/export_cmd.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, message, op
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class ExportCommand(CommandABC):
     """Export the current session into a standalone HTML transcript."""

klaude_code/{command → tui/command}/export_online_cmd.py

@@ -9,10 +9,11 @@ from pathlib import Path
 from rich.console import Console
 from rich.text import Text
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message, model
 from klaude_code.session.export import build_export_html
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class ExportOnlineCommand(CommandABC):
     """Export and deploy the current session to surge.sh as a static webpage."""

klaude_code/{command → tui/command}/fork_session_cmd.py

@@ -5,10 +5,11 @@ from typing import Literal
 
 from prompt_toolkit.styles import Style
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message, model
-from klaude_code.ui.modes.repl.clipboard import copy_to_clipboard
-from klaude_code.ui.terminal.selector import SelectItem, select_one
+from klaude_code.tui.input.clipboard import copy_to_clipboard
+from klaude_code.tui.terminal.selector import SelectItem, select_one
+
+from .command_abc import Agent, CommandABC, CommandResult
 
 FORK_SELECT_STYLE = Style(
     [

klaude_code/{command → tui/command}/help_cmd.py

@@ -1,6 +1,7 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message, model
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class HelpCommand(CommandABC):
     """Display help information for all available slash commands."""

klaude_code/{command → tui/command}/model_cmd.py

@@ -2,10 +2,11 @@ import asyncio
 
 from prompt_toolkit.styles import Style
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
-from klaude_code.command.model_select import select_model_interactive
 from klaude_code.protocol import commands, events, message, model, op
-from klaude_code.ui.terminal.selector import SelectItem, select_one
+from klaude_code.tui.terminal.selector import SelectItem, select_one
+
+from .command_abc import Agent, CommandABC, CommandResult
+from .model_select import select_model_interactive
 
 SELECT_STYLE = Style(
     [

klaude_code/{command → tui/command}/model_select.py

@@ -4,7 +4,7 @@ import sys
 
 from klaude_code.config.config import load_config
 from klaude_code.config.select_model import match_model_from_config
-from klaude_code.trace import log
+from klaude_code.log import log
 
 
 def select_model_interactive(preferred: str | None = None) -> str | None:
@@ -38,7 +38,7 @@ def select_model_interactive(preferred: str | None = None) -> str | None:
     # Interactive selection
     from prompt_toolkit.styles import Style
 
-    from klaude_code.ui.terminal.selector import build_model_select_items, select_one
+    from klaude_code.tui.terminal.selector import build_model_select_items, select_one
 
     config = load_config()
     names = [m.model_name for m in result.filtered_models]

klaude_code/{command → tui/command}/prompt_command.py

@@ -2,9 +2,10 @@ from importlib.resources import files
 
 import yaml
 
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
+from klaude_code.log import log_debug
 from klaude_code.protocol import commands, message, op
-from klaude_code.trace import log_debug
+
+from .command_abc import Agent, CommandABC, CommandResult
 
 
 class PromptCommand(CommandABC):
@@ -30,7 +31,7 @@ class PromptCommand(CommandABC):
             return
 
         try:
-            raw_text = files("klaude_code.command").joinpath(self.template_name).read_text(encoding="utf-8")
+            raw_text = files("klaude_code.tui.command").joinpath(self.template_name).read_text(encoding="utf-8")
 
             if raw_text.startswith("---"):
                 parts = raw_text.split("---", 2)

klaude_code/{command → tui/command}/refresh_cmd.py

@@ -1,6 +1,7 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, message
 
+from .command_abc import Agent, CommandABC, CommandResult
+
 
 class RefreshTerminalCommand(CommandABC):
     """Refresh terminal display"""
@@ -26,6 +27,7 @@ class RefreshTerminalCommand(CommandABC):
         return CommandResult(
             events=[
                 events.WelcomeEvent(
+                    session_id=agent.session.id,
                     work_dir=str(agent.session.work_dir),
                     llm_config=agent.get_llm_client().get_llm_config(),
                 ),

klaude_code/{command → tui/command}/registry.py

@@ -1,10 +1,11 @@
 from importlib.resources import files
 from typing import TYPE_CHECKING
 
-from klaude_code.command.command_abc import Agent, CommandResult
-from klaude_code.command.prompt_command import PromptCommand
+from klaude_code.log import log_debug
 from klaude_code.protocol import commands, events, message, model, op
-from klaude_code.trace import log_debug
+
+from .command_abc import Agent, CommandResult
+from .prompt_command import PromptCommand
 
 if TYPE_CHECKING:
     from .command_abc import CommandABC
@@ -82,7 +83,7 @@ def register(cmd: "CommandABC") -> None:
 def load_prompt_commands():
     """Dynamically load prompt-based commands from the command directory."""
     try:
-        command_files = files("klaude_code.command").iterdir()
+        command_files = files("klaude_code.tui.command").iterdir()
         for file_path in command_files:
             name = file_path.name
             if (name.startswith("prompt_") or name.startswith("prompt-")) and name.endswith(".md"):
@@ -94,7 +95,7 @@ def load_prompt_commands():
 
 def _ensure_commands_loaded() -> None:
     """Ensure all commands are loaded (lazy initialization)."""
-    from klaude_code.command import ensure_commands_loaded
+    from klaude_code.tui.command import ensure_commands_loaded
 
     ensure_commands_loaded()