klaude-code 1.9.0__tar.gz → 2.0.0__tar.gz

{klaude_code-1.9.0 → klaude_code-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.9.0
+Version: 2.0.0
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
@@ -9,11 +9,12 @@ Requires-Dist: diff-match-patch>=20241021
 Requires-Dist: google-genai>=1.56.0
 Requires-Dist: markdown-it-py>=4.0.0
 Requires-Dist: openai>=1.102.0
-Requires-Dist: pillow>=12.0.0
+Requires-Dist: pillow>=9.1,<11.0
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=14.1.0
+Requires-Dist: term-image>=0.7.2
 Requires-Dist: trafilatura>=2.0.0
 Requires-Dist: typer>=0.17.3
 Requires-Python: >=3.13
@@ -395,3 +396,4 @@ The main agent can spawn specialized sub-agents for specific tasks:
 | **Explore** | Fast codebase exploration - find files, search code, answer questions about the codebase |
 | **Task** | Handle complex multi-step tasks autonomously |
 | **WebAgent** | Search the web, fetch pages, and analyze content |
+| **ImageGen** | Generate images from text prompts via OpenRouter Nano Banana Pro |

{klaude_code-1.9.0 → klaude_code-2.0.0}/README.md

@@ -374,3 +374,4 @@ The main agent can spawn specialized sub-agents for specific tasks:
 | **Explore** | Fast codebase exploration - find files, search code, answer questions about the codebase |
 | **Task** | Handle complex multi-step tasks autonomously |
 | **WebAgent** | Search the web, fetch pages, and analyze content |
+| **ImageGen** | Generate images from text prompts via OpenRouter Nano Banana Pro |

{klaude_code-1.9.0 → klaude_code-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "1.9.0"
+version = "2.0.0"
 description = "Minimal code agent CLI"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -16,11 +16,12 @@ dependencies = [
     "google-genai>=1.56.0",
     "markdown-it-py>=4.0.0",
     "openai>=1.102.0",
-    "pillow>=12.0.0",
+    "pillow>=9.1,<11.0",
     "prompt-toolkit>=3.0.52",
     "pydantic>=2.11.7",
     "pyyaml>=6.0.2",
     "rich>=14.1.0",
+    "term-image>=0.7.2",
     "trafilatura>=2.0.0",
     "typer>=0.17.3",
 ]

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/auth/base.py

@@ -4,11 +4,10 @@ import json
 import time
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Any, Generic, TypeVar, cast
+from typing import Any, cast
 
 from pydantic import BaseModel
 
-
 KLAUDE_AUTH_FILE = Path.home() / ".klaude" / "klaude-auth.json"
 
 
@@ -24,10 +23,7 @@ class BaseAuthState(BaseModel):
         return time.time() + buffer_seconds >= self.expires_at
 
 
-T = TypeVar("T", bound=BaseAuthState)
-
-
-class BaseTokenManager(ABC, Generic[T]):
+class BaseTokenManager[T: BaseAuthState](ABC):
     """Base class for OAuth token management."""
 
     def __init__(self, auth_file: Path | None = None):

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/cli/auth_cmd.py

@@ -56,20 +56,20 @@ def login_command(
                 state = token_manager.get_state()
                 if state and not state.is_expired():
                     log(("You are already logged in to Codex.", "green"))
-                    log(f"  Account ID: {state.account_id[:8]}...")
+                    log(f"  Account ID: {state.account_id[:8]}…")
                     expires_dt = datetime.datetime.fromtimestamp(state.expires_at, tz=datetime.UTC)
                     log(f"  Expires: {expires_dt.strftime('%Y-%m-%d %H:%M:%S UTC')}")
                     if not typer.confirm("Do you want to re-login?"):
                         return
 
-            log("Starting Codex OAuth login flow...")
+            log("Starting Codex OAuth login flow…")
             log("A browser window will open for authentication.")
 
             try:
                 oauth = CodexOAuth(token_manager)
                 state = oauth.login()
                 log(("Login successful!", "green"))
-                log(f"  Account ID: {state.account_id[:8]}...")
+                log(f"  Account ID: {state.account_id[:8]}…")
                 expires_dt = datetime.datetime.fromtimestamp(state.expires_at, tz=datetime.UTC)
                 log(f"  Expires: {expires_dt.strftime('%Y-%m-%d %H:%M:%S UTC')}")
             except Exception as e:
@@ -90,7 +90,7 @@ def login_command(
                     if not typer.confirm("Do you want to re-login?"):
                         return
 
-            log("Starting Claude OAuth login flow...")
+            log("Starting Claude OAuth login flow…")
             log("A browser window will open for authentication.")
             log("After login, paste the authorization code in the terminal.")
 

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/cli/list_model.py

@@ -50,7 +50,7 @@ def _get_codex_status_rows() -> list[tuple[Text, Text]]:
                 Text.assemble(
                     ("Logged in", ThemeKey.CONFIG_STATUS_OK),
                     (
-                        f" (account: {state.account_id[:8]}..., expires: {expires_dt.strftime('%Y-%m-%d %H:%M UTC')})",
+                        f" (account: {state.account_id[:8]}…, expires: {expires_dt.strftime('%Y-%m-%d %H:%M UTC')})",
                         "dim",
                     ),
                 ),

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/cli/main.py

@@ -286,7 +286,7 @@ def main_callback(
             raise typer.Exit(2)
 
         # In non-interactive environments, default to exec-mode behavior.
-        # This allows: echo "..." | klaude
+        # This allows: echo "…" | klaude
         if not sys.stdin.isatty() or not sys.stdout.isatty():
             if continue_ or resume or resume_by_id is not None:
                 log(("Error: --continue/--resume options require a TTY", "red"))

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/cli/runtime.py

@@ -17,8 +17,8 @@ from klaude_code.core.agent import Agent, DefaultModelProfileProvider, VanillaMo
 from klaude_code.core.executor import Executor
 from klaude_code.core.manager import build_llm_clients
 from klaude_code.protocol import events, llm_param, op
-from klaude_code.protocol import model as protocol_model
-from klaude_code.protocol.model import UserInputPayload
+from klaude_code.protocol import message as protocol_message
+from klaude_code.protocol.message import UserInputPayload
 from klaude_code.session.session import Session, close_default_store
 from klaude_code.trace import DebugType, log, set_debug_logging
 from klaude_code.ui.modes.repl import build_repl_status_snapshot
@@ -105,9 +105,11 @@ async def submit_user_input_payload(
     if result.persist_user_input:
         agent.session.append_history(
             [
-                protocol_model.UserMessageItem(
-                    content=persisted_user_input.text,
-                    images=persisted_user_input.images,
+                protocol_message.UserMessage(
+                    parts=protocol_message.parts_from_text_and_images(
+                        persisted_user_input.text,
+                        persisted_user_input.images,
+                    )
                 )
             ]
         )

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/cli/self_update.py

@@ -228,7 +228,7 @@ def update_command(
         log(f"To update, install uv and run `uv tool upgrade {PACKAGE_NAME}`.")
         raise typer.Exit(1)
 
-    log(f"Running `uv tool upgrade {PACKAGE_NAME}`...")
+    log(f"Running `uv tool upgrade {PACKAGE_NAME}`…")
     result = subprocess.run(["uv", "tool", "upgrade", PACKAGE_NAME], check=False)
     if result.returncode != 0:
         log((f"Error: update failed (exit code {result.returncode}).", "red"))

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/cli/session_cmd.py

@@ -25,7 +25,7 @@ def _session_confirm(sessions: list[Session.SessionMetaBrief], message: str) ->
         first_msg_text = s.user_messages[0] if s.user_messages else ""
         first_msg = first_msg_text.strip().replace("\n", " ")[:50]
         if len(first_msg_text) > 50:
-            first_msg += "..."
+            first_msg += "…"
         log(f"  {_fmt(s.updated_at)}  {msg_count_display:>3} msgs  {first_msg}")
 
     items: list[SelectItem[bool]] = [

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/clear_cmd.py

@@ -1,5 +1,5 @@
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
-from klaude_code.protocol import commands, model, op
+from klaude_code.protocol import commands, message, op
 
 
 class ClearCommand(CommandABC):
@@ -13,8 +13,12 @@ class ClearCommand(CommandABC):
     def summary(self) -> str:
         return "Clear conversation history and free up context"
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         del user_input  # unused
+        import os
+
+        os.system("cls" if os.name == "nt" else "clear")
+
         return CommandResult(
             operations=[op.ClearSessionOperation(session_id=agent.session.id)],
             persist_user_input=False,

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/command_abc.py

@@ -4,7 +4,7 @@ from typing import Protocol
 from pydantic import BaseModel
 
 from klaude_code.llm import LLMClientABC
-from klaude_code.protocol import commands, llm_param, model, op
+from klaude_code.protocol import commands, llm_param, message, op
 from klaude_code.protocol import events as protocol_events
 from klaude_code.session.session import Session
 
@@ -78,7 +78,7 @@ class CommandABC(ABC):
         return "additional instructions"
 
     @abstractmethod
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         """
         Execute the command.
 

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/debug_cmd.py

@@ -1,5 +1,5 @@
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
-from klaude_code.protocol import commands, events, model
+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
 
 
@@ -45,7 +45,7 @@ class DebugCommand(CommandABC):
     def placeholder(self) -> str:
         return "filter types"
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         raw = user_input.text.strip()
 
         # /debug (no args) - enable debug
@@ -70,8 +70,8 @@ class DebugCommand(CommandABC):
             events=[
                 events.DeveloperMessageEvent(
                     session_id=agent.session.id,
-                    item=model.DeveloperMessageItem(
-                        content=content,
+                    item=message.DeveloperMessage(
+                        parts=message.text_parts_from_str(content),
                         command_output=model.CommandOutput(command_name=self.name),
                     ),
                 )

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/export_cmd.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
-from klaude_code.protocol import commands, model, op
+from klaude_code.protocol import commands, message, op
 
 
 class ExportCommand(CommandABC):
@@ -29,7 +29,7 @@ class ExportCommand(CommandABC):
     def is_interactive(self) -> bool:
         return False
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         output_path = self._normalize_output_path(user_input.text, agent)
         return CommandResult(
             operations=[

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/export_online_cmd.py

@@ -10,7 +10,7 @@ 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, model
+from klaude_code.protocol import commands, events, message, model
 from klaude_code.session.export import build_export_html
 
 
@@ -33,15 +33,15 @@ class ExportOnlineCommand(CommandABC):
     def is_interactive(self) -> bool:
         return False
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         del user_input  # unused
         # Check if npx or surge is available
         surge_cmd = self._get_surge_command()
         if not surge_cmd:
             event = events.DeveloperMessageEvent(
                 session_id=agent.session.id,
-                item=model.DeveloperMessageItem(
-                    content="surge.sh CLI not found. Install with: npm install -g surge",
+                item=message.DeveloperMessage(
+                    parts=message.text_parts_from_str("surge.sh CLI not found. Install with: npm install -g surge"),
                     command_output=model.CommandOutput(command_name=self.name, is_error=True),
                 ),
             )
@@ -50,29 +50,29 @@ class ExportOnlineCommand(CommandABC):
         try:
             console = Console()
             # Check login status inside status context since npx surge whoami can be slow
-            with console.status(Text("Checking surge.sh login status...", style="dim"), spinner_style="dim"):
+            with console.status(Text("Checking surge.sh login status…", style="dim"), spinner_style="dim"):
                 logged_in = self._is_surge_logged_in(surge_cmd)
 
             if not logged_in:
                 login_cmd = " ".join([*surge_cmd, "login"])
                 event = events.DeveloperMessageEvent(
                     session_id=agent.session.id,
-                    item=model.DeveloperMessageItem(
-                        content=f"Not logged in to surge.sh. Please run: {login_cmd}",
+                    item=message.DeveloperMessage(
+                        parts=message.text_parts_from_str(f"Not logged in to surge.sh. Please run: {login_cmd}"),
                         command_output=model.CommandOutput(command_name=self.name, is_error=True),
                     ),
                 )
                 return CommandResult(events=[event])
 
-            with console.status(Text("Deploying to surge.sh...", style="dim"), spinner_style="dim"):
+            with console.status(Text("Deploying to surge.sh…", style="dim"), spinner_style="dim"):
                 html_doc = self._build_html(agent)
                 domain = self._generate_domain()
                 url = self._deploy_to_surge(surge_cmd, html_doc, domain)
 
             event = events.DeveloperMessageEvent(
                 session_id=agent.session.id,
-                item=model.DeveloperMessageItem(
-                    content=f"Session deployed to: {url}",
+                item=message.DeveloperMessage(
+                    parts=message.text_parts_from_str(f"Session deployed to: {url}"),
                     command_output=model.CommandOutput(command_name=self.name),
                 ),
             )
@@ -82,8 +82,8 @@ class ExportOnlineCommand(CommandABC):
 
             event = events.DeveloperMessageEvent(
                 session_id=agent.session.id,
-                item=model.DeveloperMessageItem(
-                    content=f"Failed to deploy session: {exc}\n{traceback.format_exc()}",
+                item=message.DeveloperMessage(
+                    parts=message.text_parts_from_str(f"Failed to deploy session: {exc}\n{traceback.format_exc()}"),
                     command_output=model.CommandOutput(command_name=self.name, is_error=True),
                 ),
             )

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/fork_session_cmd.py

@@ -6,7 +6,7 @@ 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, model
+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
 
@@ -41,29 +41,29 @@ def _truncate(text: str, max_len: int = 60) -> str:
     text = text.replace("\n", " ").strip()
     if len(text) <= max_len:
         return text
-    return text[: max_len - 3] + "..."
+    return text[: max_len - 1] + "…"
 
 
-def _build_fork_points(conversation_history: list[model.ConversationItem]) -> list[ForkPoint]:
+def _build_fork_points(conversation_history: list[message.HistoryEvent]) -> list[ForkPoint]:
     """Build list of fork points from conversation history.
 
     Fork points are:
-    - Each UserMessageItem position (for UI display, including first which would be empty session)
+    - Each UserMessage position (for UI display, including first which would be empty session)
     - The end of the conversation (fork entire conversation)
     """
     fork_points: list[ForkPoint] = []
     user_indices: list[int] = []
 
     for i, item in enumerate(conversation_history):
-        if isinstance(item, model.UserMessageItem):
+        if isinstance(item, message.UserMessage):
             user_indices.append(i)
 
-    # For each UserMessageItem, create a fork point at that position
+    # For each UserMessage, create a fork point at that position
     for i, user_idx in enumerate(user_indices):
         user_item = conversation_history[user_idx]
-        assert isinstance(user_item, model.UserMessageItem)
+        assert isinstance(user_item, message.UserMessage)
 
-        # Find the end of this "task" (next UserMessageItem or end of history)
+        # Find the end of this "task" (next UserMessage or end of history)
         next_user_idx = user_indices[i + 1] if i + 1 < len(user_indices) else len(conversation_history)
 
         # Count tool calls by name and find last assistant message in this segment
@@ -71,15 +71,19 @@ def _build_fork_points(conversation_history: list[model.ConversationItem]) -> li
         last_assistant_content = ""
         for j in range(user_idx, next_user_idx):
             item = conversation_history[j]
-            if isinstance(item, model.ToolCallItem):
-                tool_stats[item.name] = tool_stats.get(item.name, 0) + 1
-            elif isinstance(item, model.AssistantMessageItem) and item.content:
-                last_assistant_content = item.content
-
+            if isinstance(item, message.AssistantMessage):
+                for part in item.parts:
+                    if isinstance(part, message.ToolCallPart):
+                        tool_stats[part.tool_name] = tool_stats.get(part.tool_name, 0) + 1
+                text = message.join_text_parts(item.parts)
+                if text:
+                    last_assistant_content = text
+
+        user_text = message.join_text_parts(user_item.parts)
         fork_points.append(
             ForkPoint(
                 history_index=user_idx,
-                user_message=user_item.content or "(empty)",
+                user_message=user_text or "(empty)",
                 tool_call_stats=tool_stats,
                 last_assistant_summary=_truncate(last_assistant_content) if last_assistant_content else "",
             )
@@ -195,14 +199,14 @@ class ForkSessionCommand(CommandABC):
     def is_interactive(self) -> bool:
         return True
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         del user_input  # unused
 
         if agent.session.messages_count == 0:
             event = events.DeveloperMessageEvent(
                 session_id=agent.session.id,
-                item=model.DeveloperMessageItem(
-                    content="(no messages to fork)",
+                item=message.DeveloperMessage(
+                    parts=message.text_parts_from_str("(no messages to fork)"),
                     command_output=model.CommandOutput(command_name=self.name),
                 ),
             )
@@ -221,8 +225,8 @@ class ForkSessionCommand(CommandABC):
 
             event = events.DeveloperMessageEvent(
                 session_id=agent.session.id,
-                item=model.DeveloperMessageItem(
-                    content=f"Session forked successfully. New session id: {new_session.id}",
+                item=message.DeveloperMessage(
+                    parts=message.text_parts_from_str(f"Session forked successfully. New session id: {new_session.id}"),
                     command_output=model.CommandOutput(
                         command_name=self.name,
                         ui_extra=model.SessionIdUIExtra(session_id=new_session.id),
@@ -237,8 +241,8 @@ class ForkSessionCommand(CommandABC):
         if selected == "cancelled":
             event = events.DeveloperMessageEvent(
                 session_id=agent.session.id,
-                item=model.DeveloperMessageItem(
-                    content="(fork cancelled)",
+                item=message.DeveloperMessage(
+                    parts=message.text_parts_from_str("(fork cancelled)"),
                     command_output=model.CommandOutput(command_name=self.name),
                 ),
             )
@@ -256,8 +260,10 @@ class ForkSessionCommand(CommandABC):
 
         event = events.DeveloperMessageEvent(
             session_id=agent.session.id,
-            item=model.DeveloperMessageItem(
-                content=f"Session forked ({fork_description}). New session id: {new_session.id}",
+            item=message.DeveloperMessage(
+                parts=message.text_parts_from_str(
+                    f"Session forked ({fork_description}). New session id: {new_session.id}"
+                ),
                 command_output=model.CommandOutput(
                     command_name=self.name,
                     ui_extra=model.SessionIdUIExtra(session_id=new_session.id),

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/help_cmd.py

@@ -1,5 +1,5 @@
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
-from klaude_code.protocol import commands, events, model
+from klaude_code.protocol import commands, events, message, model
 
 
 class HelpCommand(CommandABC):
@@ -13,7 +13,7 @@ class HelpCommand(CommandABC):
     def summary(self) -> str:
         return "Show help and available commands"
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         del user_input  # unused
         lines: list[str] = [
             """
@@ -41,8 +41,8 @@ Available slash commands:"""
 
         event = events.DeveloperMessageEvent(
             session_id=agent.session.id,
-            item=model.DeveloperMessageItem(
-                content="\n".join(lines),
+            item=message.DeveloperMessage(
+                parts=message.text_parts_from_str("\n".join(lines)),
                 command_output=model.CommandOutput(command_name=self.name),
             ),
         )

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/model_cmd.py

@@ -4,7 +4,7 @@ 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, model, op
+from klaude_code.protocol import commands, events, message, model, op
 from klaude_code.ui.terminal.selector import SelectItem, select_one
 
 SELECT_STYLE = Style(
@@ -65,7 +65,7 @@ class ModelCommand(CommandABC):
     def placeholder(self) -> str:
         return "model name"
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         selected_model = await asyncio.to_thread(select_model_interactive, preferred=user_input.text)
 
         current_model = agent.profile.llm_client.model_name if agent.profile else None
@@ -74,8 +74,8 @@ class ModelCommand(CommandABC):
                 events=[
                     events.DeveloperMessageEvent(
                         session_id=agent.session.id,
-                        item=model.DeveloperMessageItem(
-                            content="(no change)",
+                        item=message.DeveloperMessage(
+                            parts=message.text_parts_from_str("(no change)"),
                             command_output=model.CommandOutput(command_name=self.name),
                         ),
                     )

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/model_select.py

@@ -50,7 +50,7 @@ def select_model_interactive(preferred: str | None = None) -> str | None:
         selected = select_one(
             message=message,
             items=items,
-            pointer="->",
+            pointer="→",
             use_search_filter=True,
             initial_value=config.main_model,
             style=Style(

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/prompt-commit.md

@@ -6,9 +6,18 @@ description: Commit current git changes
 
 ### Step 1: Detect version control system
 
-Check if `jj` is available in the current environment.
+Check if `jj` is available in the current environment. (check in your <env> tag)
 
-### Step 2A: If jj is available
+### Step 2: Run pre-commit checks
+
+Before creating a commit, run the following checks:
+
+1. Run the project's linter to check and fix code style issues
+2. Run the project's test suite to ensure all tests pass
+3. If either check fails, stop the commit process and report the errors to the user
+4. If both checks pass, proceed to the next step
+
+### Step 3A: If jj is available
 
 1. Run `jj status` and `jj log -r 'ancestors(@, 10)'` to see working copy changes and the last 10 changes
 2. For each change that has no description (shows as "(no description set)"):

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/prompt_command.py

@@ -3,7 +3,7 @@ from importlib.resources import files
 import yaml
 
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
-from klaude_code.protocol import commands, model, op
+from klaude_code.protocol import commands, message, op
 from klaude_code.trace import log_debug
 
 
@@ -55,7 +55,7 @@ class PromptCommand(CommandABC):
     def support_addition_params(self) -> bool:
         return True
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         self._ensure_loaded()
         template_content = self._content or ""
         user_input_text = user_input.text.strip() or "<none>"
@@ -71,7 +71,7 @@ class PromptCommand(CommandABC):
             operations=[
                 op.RunAgentOperation(
                     session_id=agent.session.id,
-                    input=model.UserInputPayload(text=final_prompt, images=user_input.images),
+                    input=message.UserInputPayload(text=final_prompt, images=user_input.images),
                 )
             ]
         )

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/refresh_cmd.py

@@ -1,5 +1,5 @@
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
-from klaude_code.protocol import commands, events, model
+from klaude_code.protocol import commands, events, message
 
 
 class RefreshTerminalCommand(CommandABC):
@@ -17,7 +17,7 @@ class RefreshTerminalCommand(CommandABC):
     def is_interactive(self) -> bool:
         return True
 
-    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+    async def run(self, agent: Agent, user_input: message.UserInputPayload) -> CommandResult:
         del user_input  # unused
         import os
 

{klaude_code-1.9.0 → klaude_code-2.0.0}/src/klaude_code/command/registry.py

@@ -3,7 +3,7 @@ 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.protocol import commands, events, model, op
+from klaude_code.protocol import commands, events, message, model, op
 from klaude_code.trace import log_debug
 
 if TYPE_CHECKING:
@@ -133,7 +133,7 @@ def is_slash_command_name(name: str) -> bool:
     return _resolve_command_key(name) is not None
 
 
-async def dispatch_command(user_input: model.UserInputPayload, agent: Agent, *, submission_id: str) -> CommandResult:
+async def dispatch_command(user_input: message.UserInputPayload, agent: Agent, *, submission_id: str) -> CommandResult:
     _ensure_commands_loaded()
     # Detect command name
     raw = user_input.text
@@ -168,7 +168,7 @@ async def dispatch_command(user_input: model.UserInputPayload, agent: Agent, *,
     command_identifier: commands.CommandName | str = command.name
 
     try:
-        user_input_for_command = model.UserInputPayload(text=rest, images=user_input.images)
+        user_input_for_command = message.UserInputPayload(text=rest, images=user_input.images)
         result = await command.run(agent, user_input_for_command)
         ops = list(result.operations or [])
         for operation in ops:
@@ -187,8 +187,10 @@ async def dispatch_command(user_input: model.UserInputPayload, agent: Agent, *,
             events=[
                 events.DeveloperMessageEvent(
                     session_id=agent.session.id,
-                    item=model.DeveloperMessageItem(
-                        content=f"Command {command_identifier} error: [{e.__class__.__name__}] {e!s}",
+                    item=message.DeveloperMessage(
+                        parts=message.text_parts_from_str(
+                            f"Command {command_identifier} error: [{e.__class__.__name__}] {e!s}"
+                        ),
                         command_output=command_output,
                     ),
                 )