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

klaude_code/cli/cost_cmd.py

@@ -179,7 +179,7 @@ def render_cost_table(daily_stats: dict[str, DailyStats]) -> Table:
         show_header=True,
         header_style="bold",
         border_style="bright_black dim",
-        padding=(0, 1, 0, 2),
+        padding=(0, 1, 0, 1),
         box=ASCII_HORIZONAL,
     )
 

klaude_code/cli/runtime.py

@@ -25,7 +25,6 @@ from klaude_code.ui.modes.repl import build_repl_status_snapshot
 from klaude_code.ui.modes.repl.input_prompt_toolkit import REPLStatusSnapshot
 from klaude_code.ui.terminal.color import is_light_terminal_background
 from klaude_code.ui.terminal.control import install_sigint_double_press_exit, start_esc_interrupt_monitor
-from klaude_code.ui.terminal.progress_bar import OSC94States, emit_osc94
 
 
 class PrintCapable(Protocol):
@@ -269,11 +268,6 @@ async def cleanup_app_components(components: AppComponents) -> None:
         await components.event_queue.put(events.EndEvent())
         await components.display_task
     finally:
-        # Always attempt to clear Ghostty progress bar and restore cursor visibility
-        # Best-effort only; never fail cleanup due to OSC errors
-        with contextlib.suppress(Exception):
-            emit_osc94(OSC94States.HIDDEN)
-
         # Ensure the terminal cursor is visible even if Rich's Status spinner
         # did not get a chance to stop cleanly (e.g. on KeyboardInterrupt).
         # If this fails the shell can still recover via `reset`/`stty sane`.
@@ -452,8 +446,7 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
             print(MSG, file=sys.stderr)
 
     def _hide_progress() -> None:
-        with contextlib.suppress(Exception):
-            emit_osc94(OSC94States.HIDDEN)
+        return
 
     restore_sigint = install_sigint_double_press_exit(_show_toast_once, _hide_progress)
 

klaude_code/command/debug_cmd.py

@@ -72,7 +72,7 @@ class DebugCommand(CommandABC):
                     session_id=agent.session.id,
                     item=message.DeveloperMessage(
                         parts=message.text_parts_from_str(content),
-                        command_output=model.CommandOutput(command_name=self.name),
+                        ui_extra=model.build_command_output_extra(self.name),
                     ),
                 )
             ]

klaude_code/command/export_online_cmd.py

@@ -42,7 +42,7 @@ class ExportOnlineCommand(CommandABC):
                 session_id=agent.session.id,
                 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),
+                    ui_extra=model.build_command_output_extra(self.name, is_error=True),
                 ),
             )
             return CommandResult(events=[event])
@@ -59,7 +59,7 @@ class ExportOnlineCommand(CommandABC):
                     session_id=agent.session.id,
                     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),
+                        ui_extra=model.build_command_output_extra(self.name, is_error=True),
                     ),
                 )
                 return CommandResult(events=[event])
@@ -73,7 +73,7 @@ class ExportOnlineCommand(CommandABC):
                 session_id=agent.session.id,
                 item=message.DeveloperMessage(
                     parts=message.text_parts_from_str(f"Session deployed to: {url}"),
-                    command_output=model.CommandOutput(command_name=self.name),
+                    ui_extra=model.build_command_output_extra(self.name),
                 ),
             )
             return CommandResult(events=[event])
@@ -84,7 +84,7 @@ class ExportOnlineCommand(CommandABC):
                 session_id=agent.session.id,
                 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),
+                    ui_extra=model.build_command_output_extra(self.name, is_error=True),
                 ),
             )
             return CommandResult(events=[event])

klaude_code/command/fork_session_cmd.py

@@ -207,7 +207,7 @@ class ForkSessionCommand(CommandABC):
                 session_id=agent.session.id,
                 item=message.DeveloperMessage(
                     parts=message.text_parts_from_str("(no messages to fork)"),
-                    command_output=model.CommandOutput(command_name=self.name),
+                    ui_extra=model.build_command_output_extra(self.name),
                 ),
             )
             return CommandResult(events=[event], persist_user_input=False, persist_events=False)
@@ -227,8 +227,8 @@ class ForkSessionCommand(CommandABC):
                 session_id=agent.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.build_command_output_extra(
+                        self.name,
                         ui_extra=model.SessionIdUIExtra(session_id=new_session.id),
                     ),
                 ),
@@ -243,7 +243,7 @@ class ForkSessionCommand(CommandABC):
                 session_id=agent.session.id,
                 item=message.DeveloperMessage(
                     parts=message.text_parts_from_str("(fork cancelled)"),
-                    command_output=model.CommandOutput(command_name=self.name),
+                    ui_extra=model.build_command_output_extra(self.name),
                 ),
             )
             return CommandResult(events=[event], persist_user_input=False, persist_events=False)
@@ -264,8 +264,8 @@ class ForkSessionCommand(CommandABC):
                 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.build_command_output_extra(
+                    self.name,
                     ui_extra=model.SessionIdUIExtra(session_id=new_session.id),
                 ),
             ),

klaude_code/command/help_cmd.py

@@ -43,7 +43,7 @@ Available slash commands:"""
             session_id=agent.session.id,
             item=message.DeveloperMessage(
                 parts=message.text_parts_from_str("\n".join(lines)),
-                command_output=model.CommandOutput(command_name=self.name),
+                ui_extra=model.build_command_output_extra(self.name),
             ),
         )
 

klaude_code/command/model_cmd.py

@@ -76,7 +76,7 @@ class ModelCommand(CommandABC):
                         session_id=agent.session.id,
                         item=message.DeveloperMessage(
                             parts=message.text_parts_from_str("(no change)"),
-                            command_output=model.CommandOutput(command_name=self.name),
+                            ui_extra=model.build_command_output_extra(self.name),
                         ),
                     )
                 ]

klaude_code/command/registry.py

@@ -183,6 +183,15 @@ async def dispatch_command(user_input: message.UserInputPayload, agent: Agent, *
             if isinstance(command_identifier, commands.CommandName)
             else None
         )
+        ui_extra = (
+            model.build_command_output_extra(
+                command_output.command_name,
+                ui_extra=command_output.ui_extra,
+                is_error=command_output.is_error,
+            )
+            if command_output is not None
+            else None
+        )
         return CommandResult(
             events=[
                 events.DeveloperMessageEvent(
@@ -191,7 +200,7 @@ async def dispatch_command(user_input: message.UserInputPayload, agent: Agent, *
                         parts=message.text_parts_from_str(
                             f"Command {command_identifier} error: [{e.__class__.__name__}] {e!s}"
                         ),
-                        command_output=command_output,
+                        ui_extra=ui_extra,
                     ),
                 )
             ]

klaude_code/command/release_notes_cmd.py

@@ -77,7 +77,7 @@ class ReleaseNotesCommand(CommandABC):
             session_id=agent.session.id,
             item=message.DeveloperMessage(
                 parts=message.text_parts_from_str(content),
-                command_output=model.CommandOutput(command_name=self.name),
+                ui_extra=model.build_command_output_extra(self.name),
             ),
         )
 

klaude_code/command/resume_cmd.py

@@ -92,7 +92,7 @@ class ResumeCommand(CommandABC):
                     parts=message.text_parts_from_str(
                         "Cannot resume: current session already has messages. Use `klaude -r` to start a new instance with session selection."
                     ),
-                    command_output=model.CommandOutput(command_name=self.name, is_error=True),
+                    ui_extra=model.build_command_output_extra(self.name, is_error=True),
                 ),
             )
             return CommandResult(events=[event], persist_user_input=False, persist_events=False)
@@ -103,7 +103,7 @@ class ResumeCommand(CommandABC):
                 session_id=agent.session.id,
                 item=message.DeveloperMessage(
                     parts=message.text_parts_from_str("(no session selected)"),
-                    command_output=model.CommandOutput(command_name=self.name),
+                    ui_extra=model.build_command_output_extra(self.name),
                 ),
             )
             return CommandResult(events=[event], persist_user_input=False, persist_events=False)

klaude_code/command/status_cmd.py

@@ -141,8 +141,8 @@ class StatusCommand(CommandABC):
             session_id=session.id,
             item=message.DeveloperMessage(
                 parts=message.text_parts_from_str(format_status_content(aggregated)),
-                command_output=model.CommandOutput(
-                    command_name=self.name,
+                ui_extra=model.build_command_output_extra(
+                    self.name,
                     ui_extra=model.SessionStatusUIExtra(
                         usage=aggregated.total,
                         task_count=aggregated.task_count,

klaude_code/command/terminal_setup_cmd.py

@@ -229,7 +229,7 @@ class TerminalSetupCommand(CommandABC):
                     session_id=agent.session.id,
                     item=message.DeveloperMessage(
                         parts=message.text_parts_from_str(msg),
-                        command_output=model.CommandOutput(command_name=self.name, is_error=False),
+                        ui_extra=model.build_command_output_extra(self.name),
                     ),
                 )
             ]
@@ -243,7 +243,7 @@ class TerminalSetupCommand(CommandABC):
                     session_id=agent.session.id,
                     item=message.DeveloperMessage(
                         parts=message.text_parts_from_str(msg),
-                        command_output=model.CommandOutput(command_name=self.name, is_error=True),
+                        ui_extra=model.build_command_output_extra(self.name, is_error=True),
                     ),
                 )
             ]

klaude_code/command/thinking_cmd.py

@@ -82,7 +82,7 @@ class ThinkingCommand(CommandABC):
                         session_id=agent.session.id,
                         item=message.DeveloperMessage(
                             parts=message.text_parts_from_str("(no change)"),
-                            command_output=model.CommandOutput(command_name=self.name),
+                            ui_extra=model.build_command_output_extra(self.name),
                         ),
                     )
                 ]

klaude_code/config/assets/builtin_config.yaml

@@ -347,6 +347,10 @@ provider_list:
         reasoning_effort: medium
       context_limit: 400000
       max_tokens: 128000
+      cost:
+        input: 1.75
+        output: 14.0
+        cache_read: 0.17
 
 sub_agent_models:
   ImageGen: nano-banana-pro@or

klaude_code/const.py

@@ -122,13 +122,14 @@ TOOL_OUTPUT_TRUNCATION_DIR = "/tmp/klaude"  # Directory for saving full truncate
 TAB_EXPAND_WIDTH = 8  # Tab expansion width for text rendering
 DIFF_PREFIX_WIDTH = 4  # Width of line number prefix in diff display
 MAX_DIFF_LINES = 500  # Maximum lines to show in diff output
-INVALID_TOOL_CALL_MAX_LENGTH = 500  # Maximum length for invalid tool call display
-TRUNCATE_DISPLAY_MAX_LINE_LENGTH = 1000  # Maximum line length for truncated display
-TRUNCATE_DISPLAY_MAX_LINES = 6  # Maximum lines for truncated display
+INVALID_TOOL_CALL_MAX_LENGTH = 200  # Maximum length for invalid tool call display
+TRUNCATE_DISPLAY_MAX_LINE_LENGTH = 200  # Maximum line length for truncated display
+TRUNCATE_DISPLAY_MAX_LINES = 4  # Maximum lines for truncated display
 MIN_HIDDEN_LINES_FOR_INDICATOR = 5  # Minimum hidden lines before showing truncation indicator
 SUB_AGENT_RESULT_MAX_LINES = 10  # Maximum lines for sub-agent result display
 TRUNCATE_HEAD_MAX_LINES = 2  # Maximum lines for sub-agent error display
 BASH_OUTPUT_PANEL_THRESHOLD = 10  # Bash output line threshold for CodePanel display
+BASH_MULTILINE_STRING_TRUNCATE_MAX_LINES = 2  # Max lines shown for heredoc / multiline string tokens in bash tool calls
 URL_TRUNCATE_MAX_LENGTH = 400  # Maximum length for URL truncation in display
 QUERY_DISPLAY_TRUNCATE_LENGTH = 80  # Maximum length for search query display
 NOTIFY_COMPACT_LIMIT = 160  # Maximum length for notification body text
@@ -141,6 +142,7 @@ NOTIFY_COMPACT_LIMIT = 160  # Maximum length for notification body text
 UI_REFRESH_RATE_FPS = 10  # UI refresh rate (frames per second)
 CROP_ABOVE_LIVE_REFRESH_PER_SECOND = 4.0  # CropAboveLive default refresh rate
 MARKDOWN_STREAM_LIVE_REPAINT_ENABLED = True  # Enable live area for streaming markdown
+MARKDOWN_STREAM_SYNCHRONIZED_OUTPUT_ENABLED = True  # Use terminal "Synchronized Output" to reduce flicker
 STREAM_MAX_HEIGHT_SHRINK_RESET_LINES = 20  # Reset stream height ceiling after this shrinkage
 MARKDOWN_LEFT_MARGIN = 2  # Left margin (columns) for markdown rendering
 MARKDOWN_RIGHT_MARGIN = 2  # Right margin (columns) for markdown rendering

klaude_code/core/executor.py

@@ -176,35 +176,6 @@ class ExecutorContext:
         """Initialize an agent for a session and replay history to UI."""
         await self._ensure_agent(operation.session_id)
 
-    async def handle_user_input(self, operation: op.UserInputOperation) -> None:
-        """Handle a user input operation.
-
-        Core should not parse slash commands. The UI/CLI layer is responsible for
-        turning raw user input into one or more operations.
-        """
-
-        if operation.session_id is None:
-            raise ValueError("session_id cannot be None")
-
-        session_id = operation.session_id
-        agent = await self._ensure_agent(session_id)
-        user_input = operation.input
-
-        await self.emit_event(
-            events.UserMessageEvent(content=user_input.text, session_id=session_id, images=user_input.images)
-        )
-        agent.session.append_history(
-            [message.UserMessage(parts=message.parts_from_text_and_images(user_input.text, user_input.images))]
-        )
-
-        await self.handle_run_agent(
-            op.RunAgentOperation(
-                id=operation.id,
-                session_id=session_id,
-                input=user_input,
-            )
-        )
-
     async def handle_run_agent(self, operation: op.RunAgentOperation) -> None:
         agent = await self._ensure_agent(operation.session_id)
         existing_active = self.task_manager.get(operation.id)
@@ -234,7 +205,7 @@ class ExecutorContext:
             default_note = " (saved as default)" if operation.save_as_default else ""
             developer_item = message.DeveloperMessage(
                 parts=message.text_parts_from_str(f"Switched to: {llm_config.model}{default_note}"),
-                command_output=model.CommandOutput(command_name=commands.CommandName.MODEL),
+                ui_extra=model.build_command_output_extra(commands.CommandName.MODEL),
             )
             agent.session.append_history([developer_item])
             await self.emit_event(events.DeveloperMessageEvent(session_id=agent.session.id, item=developer_item))
@@ -243,7 +214,11 @@ class ExecutorContext:
             self._on_model_change(llm_client.model_name)
 
         if operation.emit_welcome_event:
-            await self.emit_event(events.WelcomeEvent(llm_config=llm_config, work_dir=str(agent.session.work_dir)))
+            await self.emit_event(
+                events.WelcomeEvent(
+                    llm_config=llm_config, work_dir=str(agent.session.work_dir), show_klaude_code_info=False
+                )
+            )
 
     async def handle_change_thinking(self, operation: op.ChangeThinkingOperation) -> None:
         """Handle a change thinking operation.
@@ -279,13 +254,17 @@ class ExecutorContext:
         if operation.emit_switch_message:
             developer_item = message.DeveloperMessage(
                 parts=message.text_parts_from_str(f"Thinking changed: {current} -> {new_status}"),
-                command_output=model.CommandOutput(command_name=commands.CommandName.THINKING),
+                ui_extra=model.build_command_output_extra(commands.CommandName.THINKING),
             )
             agent.session.append_history([developer_item])
             await self.emit_event(events.DeveloperMessageEvent(session_id=agent.session.id, item=developer_item))
 
         if operation.emit_welcome_event:
-            await self.emit_event(events.WelcomeEvent(work_dir=str(agent.session.work_dir), llm_config=config))
+            await self.emit_event(
+                events.WelcomeEvent(
+                    work_dir=str(agent.session.work_dir), llm_config=config, show_klaude_code_info=False
+                )
+            )
 
     async def handle_clear_session(self, operation: op.ClearSessionOperation) -> None:
         agent = await self._ensure_agent(operation.session_id)
@@ -297,7 +276,7 @@ class ExecutorContext:
 
         developer_item = message.DeveloperMessage(
             parts=message.text_parts_from_str("started new conversation"),
-            command_output=model.CommandOutput(command_name=commands.CommandName.CLEAR),
+            ui_extra=model.build_command_output_extra(commands.CommandName.CLEAR),
         )
         await self.emit_event(events.DeveloperMessageEvent(session_id=agent.session.id, item=developer_item))
         await self.emit_event(
@@ -348,7 +327,7 @@ class ExecutorContext:
             await asyncio.to_thread(self._open_file, output_path)
             developer_item = message.DeveloperMessage(
                 parts=message.text_parts_from_str(f"Session exported and opened: {output_path}"),
-                command_output=model.CommandOutput(command_name=commands.CommandName.EXPORT),
+                ui_extra=model.build_command_output_extra(commands.CommandName.EXPORT),
             )
             agent.session.append_history([developer_item])
             await self.emit_event(events.DeveloperMessageEvent(session_id=agent.session.id, item=developer_item))
@@ -357,7 +336,7 @@ class ExecutorContext:
 
             developer_item = message.DeveloperMessage(
                 parts=message.text_parts_from_str(f"Failed to export session: {exc}\n{traceback.format_exc()}"),
-                command_output=model.CommandOutput(command_name=commands.CommandName.EXPORT, is_error=True),
+                ui_extra=model.build_command_output_extra(commands.CommandName.EXPORT, is_error=True),
             )
             agent.session.append_history([developer_item])
             await self.emit_event(events.DeveloperMessageEvent(session_id=agent.session.id, item=developer_item))

klaude_code/core/reminders.py

@@ -71,10 +71,13 @@ def get_at_patterns_with_source(session: Session) -> list[AtPatternSource]:
                 patterns.append(AtPatternSource(pattern=path_str, mentioned_in=None))
             break
 
-        if isinstance(item, message.DeveloperMessage) and item.memory_mentioned:
-            for memory_path, mentioned_patterns in item.memory_mentioned.items():
-                for pattern in mentioned_patterns:
-                    patterns.append(AtPatternSource(pattern=pattern, mentioned_in=memory_path))
+        if isinstance(item, message.DeveloperMessage) and item.ui_extra:
+            for ui_item in item.ui_extra.items:
+                if not isinstance(ui_item, model.MemoryLoadedUIItem):
+                    continue
+                for mem in ui_item.files:
+                    for pattern in mem.mentioned_patterns:
+                        patterns.append(AtPatternSource(pattern=pattern, mentioned_in=mem.path))
     return patterns
 
 
@@ -113,7 +116,8 @@ def _is_tracked_file_unchanged(session: Session, path: str) -> bool:
 async def _load_at_file_recursive(
     session: Session,
     pattern: str,
-    at_files: dict[str, model.AtPatternParseResult],
+    at_ops: list[model.AtFileOp],
+    formatted_blocks: list[str],
     collected_images: list[message.ImageURLPart],
     visited: set[str],
     base_dir: Path | None = None,
@@ -135,14 +139,15 @@ async def _load_at_file_recursive(
             args = ReadTool.ReadArguments(file_path=path_str)
             tool_result = await ReadTool.call_with_args(args)
             images = [part for part in tool_result.parts if isinstance(part, message.ImageURLPart)]
-            at_files[path_str] = model.AtPatternParseResult(
-                path=path_str,
-                tool_name=tools.READ,
-                result=tool_result.output_text,
-                tool_args=args.model_dump_json(exclude_none=True),
-                operation="Read",
-                mentioned_in=mentioned_in,
+
+            tool_args = args.model_dump_json(exclude_none=True)
+            formatted_blocks.append(
+                f"""Called the {tools.READ} tool with the following input: {tool_args}
+Result of calling the {tools.READ} tool:
+{tool_result.output_text}
+"""
             )
+            at_ops.append(model.AtFileOp(operation="Read", path=path_str, mentioned_in=mentioned_in))
             if images:
                 collected_images.extend(images)
 
@@ -155,7 +160,8 @@ async def _load_at_file_recursive(
                         await _load_at_file_recursive(
                             session,
                             nested,
-                            at_files,
+                            at_ops,
+                            formatted_blocks,
                             collected_images,
                             visited,
                             base_dir=path.parent,
@@ -165,13 +171,15 @@ async def _load_at_file_recursive(
             quoted_path = shlex.quote(path_str)
             args = BashTool.BashArguments(command=f"ls {quoted_path}")
             tool_result = await BashTool.call_with_args(args)
-            at_files[path_str] = model.AtPatternParseResult(
-                path=path_str + "/",
-                tool_name=tools.BASH,
-                result=tool_result.output_text,
-                tool_args=args.model_dump_json(exclude_none=True),
-                operation="List",
+
+            tool_args = args.model_dump_json(exclude_none=True)
+            formatted_blocks.append(
+                f"""Called the {tools.BASH} tool with the following input: {tool_args}
+Result of calling the {tools.BASH} tool:
+{tool_result.output_text}
+"""
             )
+            at_ops.append(model.AtFileOp(operation="List", path=path_str + "/", mentioned_in=mentioned_in))
     finally:
         reset_tool_context(context_token)
 
@@ -184,7 +192,8 @@ async def at_file_reader_reminder(
     if not at_pattern_sources:
         return None
 
-    at_files: dict[str, model.AtPatternParseResult] = {}  # path -> content
+    at_ops: list[model.AtFileOp] = []
+    formatted_blocks: list[str] = []
     collected_images: list[message.ImageURLPart] = []
     visited: set[str] = set()
 
@@ -192,30 +201,23 @@ async def at_file_reader_reminder(
         await _load_at_file_recursive(
             session,
             source.pattern,
-            at_files,
+            at_ops,
+            formatted_blocks,
             collected_images,
             visited,
             mentioned_in=source.mentioned_in,
         )
 
-    if len(at_files) == 0:
+    if len(formatted_blocks) == 0:
         return None
 
-    at_files_str = "\n\n".join(
-        [
-            f"""Called the {result.tool_name} tool with the following input: {result.tool_args}
-Result of calling the {result.tool_name} tool:
-{result.result}
-"""
-            for result in at_files.values()
-        ]
-    )
+    at_files_str = "\n\n".join(formatted_blocks)
     return message.DeveloperMessage(
         parts=message.parts_from_text_and_images(
             f"""<system-reminder>{at_files_str}\n</system-reminder>""",
             collected_images or None,
         ),
-        at_files=list(at_files.values()),
+        ui_extra=model.DeveloperUIExtra(items=[model.AtFileOpsUIItem(ops=at_ops)]),
     )
 
 
@@ -299,7 +301,7 @@ Here are the existing contents of your todo list:
 
 {model.todo_list_str(session.todos)}</system-reminder>"""
             ),
-            todo_use=True,
+            ui_extra=model.DeveloperUIExtra(items=[model.TodoReminderUIItem(reason="not_used_recently")]),
         )
 
     if session.need_todo_not_used_cooldown_counter > 0:
@@ -357,10 +359,12 @@ async def file_changed_externally_reminder(
         )
         return message.DeveloperMessage(
             parts=message.parts_from_text_and_images(
-                f"""<system-reminder>{changed_files_str}""",
+                f"""<system-reminder>{changed_files_str}</system-reminder>""",
                 collected_images or None,
             ),
-            external_file_changes=[file_path for file_path, _, _ in changed_files],
+            ui_extra=model.DeveloperUIExtra(
+                items=[model.ExternalFileChangesUIItem(paths=[file_path for file_path, _, _ in changed_files])]
+            ),
         )
 
     return None
@@ -426,7 +430,7 @@ async def image_reminder(session: Session) -> message.DeveloperMessage | None:
         parts=message.text_parts_from_str(
             f"<system-reminder>User attached {image_count} image{'s' if image_count > 1 else ''} in their message. Make sure to analyze and reference these images as needed.</system-reminder>"
         ),
-        user_image_count=image_count,
+        ui_extra=model.DeveloperUIExtra(items=[model.UserImagesUIItem(count=image_count)]),
     )
 
 
@@ -456,7 +460,7 @@ async def skill_reminder(session: Session) -> message.DeveloperMessage | None:
 
     return message.DeveloperMessage(
         parts=message.text_parts_from_str(content),
-        skill_name=skill.name,
+        ui_extra=model.DeveloperUIExtra(items=[model.SkillActivatedUIItem(name=skill.name)]),
     )
 
 
@@ -487,7 +491,7 @@ async def memory_reminder(session: Session) -> message.DeveloperMessage | None:
         path_str = str(memory_path)
         if memory_path.exists() and memory_path.is_file() and not _is_memory_loaded(session, path_str):
             try:
-                text = memory_path.read_text()
+                text = memory_path.read_text(encoding="utf-8", errors="replace")
                 _mark_memory_loaded(session, path_str)
                 memories.append(Memory(path=path_str, instruction=instruction, content=text))
             except (PermissionError, UnicodeDecodeError, OSError):
@@ -496,32 +500,19 @@ async def memory_reminder(session: Session) -> message.DeveloperMessage | None:
         memories_str = "\n\n".join(
             [f"Contents of {memory.path} ({memory.instruction}):\n\n{memory.content}" for memory in memories]
         )
-        # Build memory_mentioned: extract @ patterns from each memory's content
-        memory_mentioned: dict[str, list[str]] = {}
-        for memory in memories:
-            patterns = _extract_at_patterns(memory.content)
-            if patterns:
-                memory_mentioned[memory.path] = patterns
-
+        loaded_files = [
+            model.MemoryFileLoaded(path=memory.path, mentioned_patterns=_extract_at_patterns(memory.content))
+            for memory in memories
+        ]
         return message.DeveloperMessage(
             parts=message.text_parts_from_str(
-                f"""<system-reminder>As you answer the user's questions, you can use the following context:
+                f"""<system-reminder>
+Loaded memory files. Follow these instructions. Do not mention them to the user unless explicitly asked.
 
-# claudeMd
-Codebase and user instructions are shown below. Be sure to adhere to these instructions. IMPORTANT: These instructions OVERRIDE any default behavior and you MUST follow them exactly as written.
 {memories_str}
-
-#important-instruction-reminders
-Do what has been asked; nothing more, nothing less.
-NEVER create files unless they're absolutely necessary for achieving your goal.
-ALWAYS prefer editing an existing file to creating a new one.
-NEVER proactively create documentation files (*.md) or README files. Only create documentation files if explicitly requested by the User.
-
-IMPORTANT: this context may or may not be relevant to your tasks. You should not respond to this context unless it is highly relevant to your task.
 </system-reminder>"""
             ),
-            memory_paths=[memory.path for memory in memories],
-            memory_mentioned=memory_mentioned or None,
+            ui_extra=model.DeveloperUIExtra(items=[model.MemoryLoadedUIItem(files=loaded_files)]),
         )
     return None
 
@@ -572,7 +563,7 @@ async def last_path_memory_reminder(
                     continue
                 if mem_path.exists() and mem_path.is_file():
                     try:
-                        text = mem_path.read_text()
+                        text = mem_path.read_text(encoding="utf-8", errors="replace")
                     except (PermissionError, UnicodeDecodeError, OSError):
                         continue
                     _mark_memory_loaded(session, mem_path_str)
@@ -589,20 +580,16 @@ async def last_path_memory_reminder(
         memories_str = "\n\n".join(
             [f"Contents of {memory.path} ({memory.instruction}):\n\n{memory.content}" for memory in memories]
         )
-        # Build memory_mentioned: extract @ patterns from each memory's content
-        memory_mentioned: dict[str, list[str]] = {}
-        for memory in memories:
-            patterns = _extract_at_patterns(memory.content)
-            if patterns:
-                memory_mentioned[memory.path] = patterns
-
+        loaded_files = [
+            model.MemoryFileLoaded(path=memory.path, mentioned_patterns=_extract_at_patterns(memory.content))
+            for memory in memories
+        ]
         return message.DeveloperMessage(
             parts=message.text_parts_from_str(
                 f"""<system-reminder>{memories_str}
 </system-reminder>"""
             ),
-            memory_paths=[memory.path for memory in memories],
-            memory_mentioned=memory_mentioned or None,
+            ui_extra=model.DeveloperUIExtra(items=[model.MemoryLoadedUIItem(files=loaded_files)]),
         )
 
 

klaude_code/core/tool/__init__.py

@@ -1,7 +1,6 @@
 from .file.apply_patch import DiffError, process_patch
 from .file.apply_patch_tool import ApplyPatchTool
 from .file.edit_tool import EditTool
-from .file.move_tool import MoveTool
 from .file.read_tool import ReadTool
 from .file.write_tool import WriteTool
 from .report_back_tool import ReportBackTool
@@ -36,7 +35,6 @@ __all__ = [
     "EditTool",
     "FileTracker",
     "MermaidTool",
-    "MoveTool",
     "ReadTool",
     "ReportBackTool",
     "SafetyCheckResult",