cecli-dev 0.100.6rc6__tar.gz → 0.100.6rc8__tar.gz

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.100.6rc6
+Version: 0.100.6rc8
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.100.6rc6'
-__version_tuple__ = version_tuple = (0, 100, 6, 'rc6')
+__version__ = version = '0.100.6rc8'
+__version_tuple__ = version_tuple = (0, 100, 6, 'rc8')
 
-__commit_id__ = commit_id = 'gb2b12bdf9'
+__commit_id__ = commit_id = 'g2da275a7a'

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/coders/agent_coder.py

@@ -91,6 +91,7 @@ class AgentCoder(Coder):
         self.allowed_context_blocks = set()
         self.context_block_tokens = {}
         self.context_blocks_cache = {}
+        self.current_tasks = []
         self.hot_reload_enabled = False
         self.tokens_calculated = False
         self.skip_cli_confirmations = False
@@ -160,7 +161,9 @@ class AgentCoder(Coder):
             config, ["tools_includelist", "tools_whitelist"], []
         )
         config["tools_excludelist"] = nested.getter(
-            config, ["tools_excludelist", "tools_blacklist"], []
+            config,
+            ["tools_excludelist", "tools_blacklist"],
+            ["gitbranch", "gitdiff", "gitlog", "gitremote", "gitshow", "gitstatus"],
         )
 
         config["servers_includelist"] = nested.getter(
@@ -174,7 +177,7 @@ class AgentCoder(Coder):
                 config,
                 "include_context_blocks",
                 {
-                    "context_summary",
+                    # "context_summary",
                     # "directory_structure",
                     "environment_info",
                     # "git_status",
@@ -611,7 +614,7 @@ class AgentCoder(Coder):
                 percentage = total_tokens / max_input_tokens * 100
                 result += f" ({percentage:.1f}% of limit)"
                 if percentage > 80:
-                    result += "\n\n⚠️ **Context is getting full!**\n"
+                    result += "\n\n⚠ **Context is getting full!**\n"
                     result += "- Remove non-essential files via the `ContextManager` tool.\n"
                     result += "- Keep only essential files in context for best performance"
             result += "\n</context>"
@@ -808,6 +811,9 @@ class AgentCoder(Coder):
                     "# Fix any linting errors below, if possible and then continue with your task.",
                     1,
                 )
+                ConversationService.get_manager(self).remove_message_by_hash_key(
+                    ("lint_errors", "agent")
+                )
                 ConversationService.get_manager(self).add_message(
                     message_dict=dict(role="user", content=lint_errors),
                     tag=MessageTag.CUR,
@@ -1265,16 +1271,20 @@ class AgentCoder(Coder):
         abs_path = self.abs_root_path(file_path)
         rel_path = self.get_rel_fname(abs_path)
         if not os.path.isfile(abs_path):
-            self.io.tool_output(f"⚠️ File '{file_path}' not found")
+            self.io.tool_output(f"⚠ File '{file_path}' not found", type="tool-result")
             return "File not found"
         if abs_path in self.abs_fnames:
             if explicit:
-                self.io.tool_output(f"📎 File '{file_path}' already in context as editable")
+                self.io.tool_output(
+                    f"🗀  File '{file_path}' already in context as editable", type="tool-result"
+                )
                 return "File already in context as editable"
             return "File already in context as editable"
         if abs_path in self.abs_read_only_fnames:
             if explicit:
-                self.io.tool_output(f"📎 File '{file_path}' already in context as read-only")
+                self.io.tool_output(
+                    f"🗀  File '{file_path}' already in context as read-only", type="tool-result"
+                )
                 return "File already in context as read-only"
             return "File already in context as read-only"
         try:
@@ -1285,13 +1295,18 @@ class AgentCoder(Coder):
                 file_tokens = self.get_active_model().token_count(content)
                 if file_tokens > self.large_file_token_threshold:
                     self.io.tool_output(
-                        f"⚠️ '{file_path}' is very large ({file_tokens} tokens). Use"
-                        " /context-management to toggle truncation off if needed."
+                        (
+                            f"⚠ '{file_path}' is very large ({file_tokens} tokens). Use"
+                            " /context-management to toggle truncation off if needed."
+                        ),
+                        type="tool-result",
                     )
             self.abs_read_only_fnames.add(abs_path)
             self.files_added_in_exploration.add(rel_path)
             if explicit:
-                self.io.tool_output(f"📎 Viewed '{file_path}' (added to context as read-only)")
+                self.io.tool_output(
+                    f"🗀  Viewed '{file_path}' (added to context as read-only)", type="tool-result"
+                )
                 return "Viewed file (added to context as read-only)"
             else:
                 return "Added file to context as read-only"
@@ -1419,9 +1434,8 @@ Todo list does not exist. Please update it with the `UpdateTodoList` tool.</cont
             if content is None or not content.strip():
                 return None
             result = '<context name="todo_list" from="agent">\n'
-            result += "## Current Todo List\n\n"
-            result += "Below is the current todo list managed via the `UpdateTodoList` tool:\n\n"
-            result += f"```\n{content}\n```\n"
+            result += "## Current Active Tasks\n\n"
+            result += f"```{"\n".join(self.current_tasks)}```\n"
             result += "</context>"
             return result
         except Exception as e:

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/coders/base_coder.py

@@ -1107,7 +1107,7 @@ class Coder(metaclass=UsageMeta):
 
                             # Add message about showing definitions instead of full content
                             # self.io.tool_output(
-                            #    f"⚠️ '{relative_fname}' is very large ({file_tokens} tokens). "
+                            #    f"⚠ '{relative_fname}' is very large ({file_tokens} tokens). "
                             #    "Use /context-management to toggle truncation off if needed."
                             # )
 
@@ -1175,7 +1175,7 @@ class Coder(metaclass=UsageMeta):
 
                         # Add message about showing definitions instead of full content
                         # self.io.tool_output(
-                        #    f"⚠️ '{relative_fname}' is very large ({file_tokens} tokens). "
+                        #    f"⚠ '{relative_fname}' is very large ({file_tokens} tokens). "
                         #    "Use /context-management to toggle truncation off if needed."
                         # )
 

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/commands/utils/helpers.py

@@ -273,7 +273,7 @@ def format_command_result(
         io.tool_error(f"Error in {command_name}: {str(error)}")
         return f"Error: {str(error)}"
     else:
-        io.tool_output(f"✅ {success_message}")
+        io.tool_output(f"✓ {success_message}")
         return f"Successfully executed {command_name}."
 
 

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/helpers/conversation/files.py

@@ -272,25 +272,28 @@ class ConversationFiles:
             self._file_diffs[abs_fname] = diff
 
             rel_fname = fname
+            prefix_str = ""
 
             if coder:
                 rel_fname = coder.get_rel_fname(fname)
+                prefix_str = "content ID prefixed " if getattr(coder, "hashlines") else ""
 
             # Add diff message to conversation
             content_hash = xxhash.xxh3_128_hexdigest(diff.encode("utf-8"))
+
             diff_message = {
                 "role": "user",
                 "content": (
-                    f"{rel_fname} has been updated. Review this git diff of the changes to"
-                    f" ensure the modifications are intended:\n\n{diff}"
+                    f"{rel_fname} has been updated. Review this {prefix_str}diff of the changes to"
+                    f" ensure all modifications are appropriate:\n\n{diff}"
                 ),
             }
 
             assistant_msg = {
                 "role": "assistant",
                 "content": (
-                    f"Thank you for sharing this diff of the updates to {rel_fname}."
-                    " I will review their contents next turn."
+                    f"Thank you for sharing this {prefix_str}diff of the updates to {rel_fname}."
+                    " I will review their contents."
                 ),
             }
 

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/helpers/conversation/integration.py

@@ -104,6 +104,9 @@ class ConversationChunks:
                     priority=75 + i,
                 )
 
+        if self._cancel_post_message_injections():
+            return
+
         # Add system reminder as a pre-prompt context block
         use_reminders = getattr(coder.args, "use_reminders", True)
         if (
@@ -165,6 +168,9 @@ class ConversationChunks:
         if not coder:
             return
 
+        # if self._cancel_post_message_injections():
+        #     return
+
         message = random.choice(
             [
                 "Given the above, please call any tools necessary to make progress on your task",
@@ -179,7 +185,7 @@ class ConversationChunks:
                 ),
                 (
                     "Continue making progress. If you have reached the goal, summarize the results."
-                    " Otherwise, call the next necessary tool."
+                    " Otherwise, call the next necessary tools."
                 ),
                 (
                     "Please use the proper tools to fulfill the next steps of this task based on"
@@ -278,7 +284,11 @@ class ConversationChunks:
 
         self._last_clear_count += 1
 
-        if should_clear and self._last_clear_count >= 20:
+        if (
+            should_clear
+            and self._last_clear_count >= 20
+            and diff_tokens + other_tokens > coder.context_compaction_max_tokens * 0.5
+        ):
             self._last_clear_count = 0
 
             # Clear all diff messages
@@ -344,6 +354,9 @@ class ConversationChunks:
         if not coder:
             return
 
+        if self._cancel_post_message_injections():
+            return
+
         # Get relative paths for display
         readonly_rel_files = []
         if hasattr(coder, "abs_read_only_fnames"):
@@ -976,6 +989,9 @@ class ConversationChunks:
         if not hasattr(coder, "use_enhanced_context") or not coder.use_enhanced_context:
             return
 
+        if self._cancel_post_message_injections():
+            return
+
         # Add post-message blocks as dict with block type as key
         message_blocks = {}
 
@@ -1059,6 +1075,17 @@ class ConversationChunks:
     def flush_removals(self):
         self._deferred_removals.clear()
 
+    def _cancel_post_message_injections(self):
+        coder = self.get_coder()
+        if not coder:
+            return False
+
+        # Add system reminder as a pre-prompt context block
+        if coder.edit_format in ("agent", "subagent") and coder.turn_count % 5 != 0:
+            return True
+
+        return False
+
     def _shuffle_reminders(self, content: str) -> str:
         """
         If the string is a critical_reminders block, shuffle all bulleted points

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/helpers/hashline.py

@@ -1453,23 +1453,23 @@ def apply_hashline_operations(
                     # Check for overlapping lines to prevent duplication
                     # This handles cases where the model underspecifies the range and
                     # the replacement text includes lines that already exist after the range
-                    max_overlap_check = 2  # Check up to 2 lines for overlap
+                    # max_overlap_check = 2  # Check up to 2 lines for overlap
 
                     # Check for overlapping lines BEFORE the range (bidirectional stitching)
-                    start_idx, replacement_lines = _apply_start_stitching(
-                        hashed_lines,
-                        start_idx,
-                        end_idx,
-                        replacement_lines,
-                        resolved_ops,
-                        resolved,
-                        max_overlap_check,
-                    )
+                    # start_idx, replacement_lines = _apply_start_stitching(
+                    #    hashed_lines,
+                    #    start_idx,
+                    #    end_idx,
+                    #    replacement_lines,
+                    #    resolved_ops,
+                    #    resolved,
+                    #    max_overlap_check,
+                    # )
 
                     # Now check for overlapping lines AFTER the range
-                    end_idx, replacement_lines = _apply_end_stitching(
-                        hashed_lines, start_idx, end_idx, replacement_lines, max_overlap_check
-                    )
+                    # end_idx, replacement_lines = _apply_end_stitching(
+                    #    hashed_lines, start_idx, end_idx, replacement_lines, max_overlap_check
+                    # )
 
                     hashed_lines[start_idx : end_idx + 1] = replacement_lines
                 else:

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/helpers/requests.py

@@ -13,6 +13,8 @@ def add_reasoning_content(messages):
     for msg in messages:
         if msg.get("role") == "assistant" and "reasoning_content" not in msg:
             msg["reasoning_content"] = ""
+        if msg.get("provider_specific_fields", None):
+            msg["provider_specific_fields"].pop("reasoning_content", None)
     return messages
 
 
@@ -162,6 +164,28 @@ def add_continue_for_no_prefill(model, messages, tools):
     return messages
 
 
+def prevent_consecutive_assistant_messages(messages):
+    """Insert '(empty request)' user messages between consecutive assistant messages.
+
+    Args:
+        messages: List of message dictionaries
+
+    Returns:
+        List of messages with '(empty request)' inserted between consecutive
+        assistant messages
+    """
+    result = []
+    for i, msg in enumerate(messages):
+        result.append(msg)
+        if (
+            i < len(messages) - 1
+            and msg.get("role") == "assistant"
+            and messages[i + 1].get("role") == "assistant"
+        ):
+            result.append({"role": "user", "content": "(empty request)"})
+    return result
+
+
 def model_request_parser(model, messages, tools):
     messages = thought_signature(model, messages)
     messages = remove_empty_tool_calls(messages)
@@ -169,4 +193,5 @@ def model_request_parser(model, messages, tools):
     messages = ensure_alternating_roles(messages)
     messages = add_reasoning_content(messages)
     messages = add_continue_for_no_prefill(model, messages, tools)
+    messages = prevent_consecutive_assistant_messages(messages)
     return messages

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/io.py

@@ -1674,6 +1674,7 @@ class InputOutput:
 
     def stream_print(self, *messages, **kwargs):
         kwargs.pop("coder_uuid", None)
+        kwargs.pop("type", None)
 
         with self.console.capture() as capture:
             self.console.print(*messages, **kwargs)

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/prompts/agent.yml

@@ -19,58 +19,58 @@ repo_content_prefix: |
   These files should be helpful for navigating the codebase.
 
 main_system: |
-  <context name="role_and_directives">
   ## Core Directives
   **Act Proactively**: Autonomously use tools to fulfill the request.
   **Be Decisive**: Do not repeat searches or ask redundant questions. Trust your findings and be confident in your edits.
   **Be Efficient**: Use multiple tools each response when exploring. Batch tool calls when the schema allows you to. Respect usage limits while maximizing the utility of each response.
   **Be Persistent**: Do not take short cuts. Work through your task until completion. No task takes too long as long as you are making progress towards the goal.
-  </context>
 
-  <context name="file_format">
-  ### 1. FILE FORMAT
+  ## FILE FORMAT
   File contents will be prefixed with identifiers. Each line starts with a case-sensitive content ID followed by `::`. These are used to target where editing tools will perform edits.
   They are algorithmically generated, maintained, and subject to change. Do not search for these content IDs. Focus on the lines they identify.
 
-  **Example File Format :**
+  **Example File**
+  ```
   il9n::#!/usr/bin/env python3
   faoZ::
   uXdn::def example_method():
   WAR5::  return "example"
   vwkS::
-  </context>
+  ```
 
-  <context name="workflow_and_tool_usage">
   ## Core Workflow
   1. **Plan**: Start by using `UpdateTodoList` to outline the task.
   2. **Explore**: Use discovery tools (`ExploreCode`, `Grep`, `Ls`) to research and gather understanding for you task. Modify search terms when errors are encountered.
   3. **Execute**: Mark files as editable with `ContextManager` before attempting edits.  Proactively use skills if they are available. Review diff outputs after edit to ensure the proper changes were made.
-  4. **Verify & Recover**: If an edit fails or introduces linting errors, use `UndoChange` immediately.
+  4. **Verify & Recover**: If an edit fails or introduces linting errors, fix the error immediately. Use `UndoChange` if the errors are too complex to incrementally modify.
   5. **Yield**: Use the `Yield` tool after accomplishing the goal and verifying any changes made. Provide helpful summaries of any changes.
 
   ## Todo List Management
   - Break complex goals into meaningful sub-tasks so the problem remains tractable
   - Use `UpdateTodoList` to keep the state synchronized as you complete subtasks.
 
-  **Atomic Scope:** Include the **entire function or logical block** in edits. Never return partial syntax or broken closures. Do not attempt to replace just the beginning or end of a closure.
-  **Indentation**: Preserve all necessary whitespace (spaces, tabs, and newlines) as well as stylistic indentation and line spacings.
-  </context>
-
-  Use the `.cecli/temp` directory for all temporary, test, or scratch files.
-  Always reply in {language}.
-
-system_reminder: |
-  <context name="critical_reminders">
   ## Operational Rules
   - **Scope**: No unrequested refactors. Avoid full-file rewrites. Only modify what you are asked to.
   - **Hygiene**: Use `ContextManager`/`RemoveSkill` to evict unneeded files/skills immediately after use.
   - **Outputs**: Tool calls trigger turns. Never include tool syntax in final user summaries.
   - **Sandbox**: Perform all verification and temp logic in `.cecli/temp`.
-  - **Responses**: Reason out loud through the problem but be brief.
+  - **Responses**: Reason out loud through the problem but be brief.  
+  - **Edits:** Include the **entire function or logical block** in edits. Never return partial syntax or broken closures. Do not attempt to replace just the beginning or end of a closure.
+  - **Indentation**: Preserve all necessary whitespace (spaces, tabs, and newlines) as well as stylistic indentation and line spacings.  
+  - **Finishing Up**: Be detailed in your `Yield` tool summary in describing your task, findings, efforts and results.
+
+  Always reply in {language}.
+
+system_reminder: |
+  <context name="critical_reminders">
+  - Prefer the `ReadRange` tool to cli commands for file reading
+  - Pay close attention to indentation and styling when editing files  
+  - Batch tool calls as often as possible
+  - Reason out loud through problems but be brief.   
 
   {lazy_prompt}
   {shell_cmd_reminder}
-  </context>
+  </context>""
 
 try_again: |
   My previous exploration was insufficient. I will now adjust my strategy, use more specific search patterns, and manage my context more aggressively to find the correct solution.

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/prompts/subagent.yml

@@ -4,54 +4,54 @@
 _inherits: [agent, base]
 
 main_system: |
-  <context name="role_and_directives">
   ## Core Directives
   **Act Proactively**: Autonomously use tools to fulfill the request.
   **Be Decisive**: Do not repeat searches or ask redundant questions. Trust your findings and be confident in your edits.
   **Be Efficient**: Use multiple tools each response when exploring. Batch tool calls when the schema allows you to. Respect usage limits while maximizing the utility of each response.
   **Be Persistent**: Do not take short cuts. Work through your task until completion. No task takes too long as long as you are making progress towards the goal.
-  </context>
 
-  <context name="file_format">
-  ### 1. FILE FORMAT
-  File contents will be prefixed with identifiers. Each line starts with a case-sensitive content hash followed by `::`. These are used to target where editing tools will perform edits.
-  They are algorithmically generated, maintained, and subject to change. Do not search for these content hashes. Focus on the lines they identify.
+  ## FILE FORMAT
+  File contents will be prefixed with identifiers. Each line starts with a case-sensitive content ID followed by `::`. These are used to target where editing tools will perform edits.
+  They are algorithmically generated, maintained, and subject to change. Do not search for these content IDs. Focus on the lines they identify.
 
-  **Example File Format :**
+  **Example File**
+  ```
   il9n::#!/usr/bin/env python3
   faoZ::
   uXdn::def example_method():
   WAR5::  return "example"
   vwkS::
-  </context>
+  ```
 
-  <context name="workflow_and_tool_usage">
   ## Core Workflow
   1. **Plan**: Start by using `UpdateTodoList` to outline the task.
   2. **Explore**: Use discovery tools (`ExploreCode`, `Grep`, `Ls`) to research and gather understanding for you task. Modify search terms when errors are encountered.
   3. **Execute**: Mark files as editable with `ContextManager` before attempting edits.  Proactively use skills if they are available. Review diff outputs after edit to ensure the proper changes were made.
-  4. **Verify & Recover**: If an edit fails or introduces linting errors, use `UndoChange` immediately.
+  4. **Verify & Recover**: If an edit fails or introduces linting errors, fix the error immediately. Use `UndoChange` if the errors are too complex to incrementally modify.
   5. **Yield**: Use the `Yield` tool after accomplishing the goal and verifying any changes made. Provide helpful summaries of any changes.
 
   ## Todo List Management
   - Break complex goals into meaningful sub-tasks so the problem remains tractable
   - Use `UpdateTodoList` to keep the state synchronized as you complete subtasks.
 
-  **Atomic Scope:** Include the **entire function or logical block** in edits. Never return partial syntax or broken closures. Do not attempt to replace just the beginning or end of a closure.
-  **Indentation**: Preserve all necessary whitespace (spaces, tabs, and newlines) as well as stylistic indentation and line spacings.
-  </context>
-
-  Use the `.cecli/temp` directory for all temporary, test, or scratch files.
-  Always reply in {language}.
-
-system_reminder: |
-  <context name="critical_reminders">
   ## Operational Rules
   - **Scope**: No unrequested refactors. Avoid full-file rewrites. Only modify what you are asked to.
   - **Hygiene**: Use `ContextManager`/`RemoveSkill` to evict unneeded files/skills immediately after use.
   - **Outputs**: Tool calls trigger turns. Never include tool syntax in final user summaries.
   - **Sandbox**: Perform all verification and temp logic in `.cecli/temp`.
-  - **Responses**: Reason out loud through the problem but be brief.
+  - **Responses**: Reason out loud through the problem but be brief.  
+  - **Edits:** Include the **entire function or logical block** in edits. Never return partial syntax or broken closures. Do not attempt to replace just the beginning or end of a closure.
+  - **Indentation**: Preserve all necessary whitespace (spaces, tabs, and newlines) as well as stylistic indentation and line spacings.  
+  - **Finishing Up**: Be detailed in your `Yield` tool summary in describing your task, findings, efforts and results.
+
+  Always reply in {language}.
+
+system_reminder: |
+  <context name="critical_reminders">
+  - Prefer the `ReadRange` tool to cli commands for file reading
+  - Pay close attention to indentation and styling when editing files  
+  - Batch tool calls as often as possible
+  - Reason out loud through problems but be brief. 
 
   **Finishing Up**: 
   Be very detailed in your `Yield` tool summary in describing your task, findings, efforts and results.

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/reasoning_tags.py

@@ -7,8 +7,8 @@ from cecli.dump import dump  # noqa
 # Standard tag identifier
 REASONING_TAG = "thinking-content-" + "7bbeb8e1441453ad999a0bbba8a46d4b"
 # Output formatting
-REASONING_START = "--------------\n► **THINKING**"
-REASONING_END = "------------\n► **ANSWER**"
+REASONING_START = "--------------\n"
+REASONING_END = "--------------\n"
 
 
 def remove_reasoning_content(res, reasoning_tag):

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/tools/command.py

@@ -161,7 +161,7 @@ class Tool(BaseTool):
         """
         Execute command in background.
         """
-        coder.io.tool_output(f"⚙️ Starting background command: {command_string}")
+        coder.io.tool_output(f"⛭ Starting background command: {command_string}", type="tool-result")
 
         # Use static manager to start background command
         command_key = BackgroundCommandManager.start_background_command(
@@ -193,7 +193,9 @@ class Tool(BaseTool):
 
         from cecli.helpers.background_commands import CircularBuffer
 
-        coder.io.tool_output(f"⚙️ Executing shell command with {timeout}s timeout.")
+        coder.io.tool_output(
+            f"⛭ Executing shell command with {timeout}s timeout.", type="tool-result"
+        )
 
         shell = os.environ.get("SHELL", "/bin/sh")
 
@@ -278,7 +280,7 @@ class Tool(BaseTool):
 
                 # Output to TUI console if TUI exists (same logic as _execute_foreground)
                 if coder.tui and coder.tui():
-                    coder.io.tool_output(output_content)
+                    coder.io.tool_output(output_content, type="tool-result")
 
                 if exit_code == 0:
                     return (
@@ -296,7 +298,8 @@ class Tool(BaseTool):
             if elapsed >= timeout:
                 # Timeout elapsed, process continues in background
                 coder.io.tool_output(
-                    f"⏱️ Command exceeded {timeout}s timeout, continuing in background..."
+                    f"⏱️ Command exceeded {timeout}s timeout, continuing in background...",
+                    type="tool-result",
                 )
 
                 # Get any output captured so far
@@ -322,7 +325,7 @@ class Tool(BaseTool):
             tui = coder.tui()
             should_print = False
 
-        coder.io.tool_output("⚙️ Executing shell command.")
+        coder.io.tool_output("⛭ Executing shell command.", type="tool-result")
 
         # Use run_cmd_subprocess for non-interactive execution
         exit_status, combined_output = run_cmd_subprocess(
@@ -360,7 +363,7 @@ class Tool(BaseTool):
             )
 
         if tui:
-            coder.io.tool_output(output_content)
+            coder.io.tool_output(output_content, type="tool-result")
 
         if exit_status == 0:
             return f"Shell command executed successfully (exit code 0). Output:\n{output_content}"

{cecli_dev-0.100.6rc6 → cecli_dev-0.100.6rc8}/cecli/tools/command_interactive.py

@@ -53,10 +53,14 @@ class Tool(BaseTool):
             if not confirmed:
                 # This happens if the user explicitly says 'no' this time.
                 # If 'Always' was chosen previously, confirm_ask returns True directly.
-                coder.io.tool_output(f"Skipped execution of shell command: {command_string}")
+                coder.io.tool_output(
+                    f"Skipped execution of shell command: {command_string}", type="tool-result"
+                )
                 return "Shell command execution skipped by user."
 
-            coder.io.tool_output(f"⚙️ Starting interactive shell command: {command_string}")
+            coder.io.tool_output(
+                f"⛭ Starting interactive shell command: {command_string}", type="tool-result"
+            )
 
             tui = coder.tui() if coder.tui else None
 
@@ -71,19 +75,23 @@ class Tool(BaseTool):
 
             if tui:
                 # Notify user and suspend TUI for interactive command
-                coder.io.tool_output(">>> Suspending TUI for interactive command <<<")
+                coder.io.tool_output(
+                    ">>> Suspending TUI for interactive command <<<", type="tool-result"
+                )
                 exit_status, combined_output = tui.run_obstructive(_run_interactive)
             else:
-                coder.io.tool_output(">>> You may need to interact with the command below <<<")
+                coder.io.tool_output(
+                    ">>> You may need to interact with the command below <<<", type="tool-result"
+                )
                 coder.io.tool_output(" \n")
                 await coder.io.stop_input_task()
                 await asyncio.sleep(1)
                 exit_status, combined_output = _run_interactive()
                 await asyncio.sleep(1)
-                coder.io.tool_output(" \n")
-                coder.io.tool_output(" \n")
+                coder.io.tool_output(" \n", type="tool-result")
+                coder.io.tool_output(" \n", type="tool-result")
 
-            coder.io.tool_output(">>> Interactive command finished <<<")
+            coder.io.tool_output(">>> Interactive command finished <<<", type="tool-result")
 
             # Format the output for the result message, include more content
             output_content = combined_output or ""