cecli-dev 0.100.6rc7__tar.gz → 0.100.7__tar.gz

{cecli_dev-0.100.6rc7 → cecli_dev-0.100.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.100.6rc7
+Version: 0.100.7
 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.6rc7 → cecli_dev-0.100.7}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.100.6rc7'
-__version_tuple__ = version_tuple = (0, 100, 6, 'rc7')
+__version__ = version = '0.100.7'
+__version_tuple__ = version_tuple = (0, 100, 7)
 
-__commit_id__ = commit_id = 'g7f1d0176c'
+__commit_id__ = commit_id = 'gedcb2b7f6'

{cecli_dev-0.100.6rc7 → cecli_dev-0.100.7}/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
@@ -152,6 +153,7 @@ class AgentCoder(Coder):
             config, "skip_cli_confirmations", nested.getter(config, "yolo", [])
         )
         config["command_timeout"] = nested.getter(config, "command_timeout", 30)
+        config["allowed_commands"] = nested.getter(config, "allowed_commands", [])
         config["hot_reload"] = nested.getter(config, "hot_reload", False)
         config["allow_nested_delegation"] = nested.getter(config, "allow_nested_delegation", False)
 
@@ -160,7 +162,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 +178,7 @@ class AgentCoder(Coder):
                 config,
                 "include_context_blocks",
                 {
-                    "context_summary",
+                    # "context_summary",
                     # "directory_structure",
                     "environment_info",
                     # "git_status",
@@ -611,7 +615,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 +812,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 +1272,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 +1296,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"
@@ -1418,10 +1434,11 @@ Todo list does not exist. Please update it with the `UpdateTodoList` tool.</cont
             content = self.io.read_text(abs_path)
             if content is None or not content.strip():
                 return None
+
+            current_tasks = "\n".join(self.current_tasks)
             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"```{current_tasks}```\n"
             result += "</context>"
             return result
         except Exception as e:

{cecli_dev-0.100.6rc7 → cecli_dev-0.100.7}/cecli/coders/base_coder.py

@@ -419,6 +419,8 @@ class Coder(metaclass=UsageMeta):
         uuid: str = "",
         parent_uuid: str = "",
     ):
+        from cecli.helpers.agents.service import AgentService
+
         # initialize from args.map_cache_dir
         self.coroutines = coroutines
         # Per-instance tool and server filtering dictionaries
@@ -427,6 +429,7 @@ class Coder(metaclass=UsageMeta):
         self.registered_servers = {"included": set(), "excluded": set()}
         self.interrupt_event = ThreadSafeEvent()
         self.uuid = str(generate_unique_id())
+        self.reflected_message = None
 
         if uuid:
             self.uuid = str(uuid)
@@ -543,8 +546,10 @@ class Coder(metaclass=UsageMeta):
 
         self.show_diffs = show_diffs
 
-        # Initialize conversation system if enabled
+        # Initialize all registry sub systems
+        AgentService.get_instance(self)
         ConversationService.get_chunks(self).initialize_conversation_system()
+        ObservationService.get_instance(self)
 
         self.commands = commands or Commands(self.io, self, args=args)
         self.commands.coder = self
@@ -1107,7 +1112,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 +1180,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."
                         # )
 
@@ -2560,7 +2565,9 @@ class Coder(metaclass=UsageMeta):
                     return
         finally:
             if self.mdstream:
-                content_to_show = self.live_incremental_response(True)
+                content_to_show = (
+                    "" if self.tui and self.tui() else self.live_incremental_response(True)
+                )
                 self.stream_wrapper(content_to_show, final=True)
             self.mdstream = None
 
@@ -3583,24 +3590,13 @@ class Coder(metaclass=UsageMeta):
                         except AttributeError:
                             reasoning_content = None
 
-                    if reasoning_content:
-                        if nested.getter(self.args, "show_thinking"):
-                            if not self.got_reasoning_content:
-                                text += f"<{REASONING_TAG}>\n\n"
-                            text += reasoning_content
-                            self.got_reasoning_content = True
-                            received_content = True
-                        self.token_profiler.on_token()
-                        self.io.update_spinner_suffix(reasoning_content)
-                        self.partial_response_reasoning_content += reasoning_content
-
                     try:
                         content = chunk.choices[0].delta.content
                         if content:
                             if self.got_reasoning_content and not self.ended_reasoning_content:
                                 text += f"\n\n</{self.reasoning_tag_name}>\n\n"
-                                self.ended_reasoning_content = True
 
+                            self.ended_reasoning_content = True
                             text += content
                             received_content = True
                             self.token_profiler.on_token()
@@ -3608,6 +3604,22 @@ class Coder(metaclass=UsageMeta):
                     except AttributeError:
                         pass
 
+                    if reasoning_content:
+                        if (
+                            nested.getter(self.args, "show_thinking")
+                            and not self.ended_reasoning_content
+                        ):
+                            if not self.got_reasoning_content:
+                                text += f"<{REASONING_TAG}>\n\n"
+
+                            text += reasoning_content
+                            self.got_reasoning_content = True
+                            received_content = True
+
+                        self.token_profiler.on_token()
+                        self.io.update_spinner_suffix(reasoning_content)
+                        self.partial_response_reasoning_content += reasoning_content
+
                 self.partial_response_content += text
 
                 chunk_index += 1
@@ -3634,6 +3646,16 @@ class Coder(metaclass=UsageMeta):
         except (asyncio.CancelledError, KeyboardInterrupt):
             raise KeyboardInterrupt
 
+        if (
+            self.show_pretty()
+            and nested.getter(self.args, "show_thinking")
+            and self.got_reasoning_content
+            and not self.ended_reasoning_content
+        ):
+            self.partial_response_content += f"\n\n</{self.reasoning_tag_name}>\n\n"
+            content_to_show = self.live_incremental_response(False)
+            self.stream_wrapper(content_to_show, final=False)
+
         # The Part Doing the Heavy Lifting Now
         self.consolidate_chunks()
 
@@ -3657,6 +3679,12 @@ class Coder(metaclass=UsageMeta):
         func_err = None
         content_err = None
 
+        if len(self.partial_response_chunks):
+            last_chunk = self.partial_response_chunks[len(self.partial_response_chunks) - 1]
+            if last_chunk:
+                if getattr(last_chunk, "usage", None):
+                    response.usage = last_chunk.usage
+
         # Collect provider-specific fields from chunks to preserve them
         # We need to track both by ID (primary) and index (fallback) since
         # early chunks might not have IDs established yet
@@ -3848,6 +3876,7 @@ class Coder(metaclass=UsageMeta):
             cache_hit_tokens = (
                 getattr(completion.usage, "prompt_cache_hit_tokens", 0)
                 or getattr(completion.usage, "cache_read_input_tokens", 0)
+                or nested.getter(completion.usage, "prompt_tokens_details.cached_tokens", 0)
                 or 0
             )
             cache_write_tokens = getattr(completion.usage, "cache_creation_input_tokens", 0) or 0
@@ -4463,7 +4492,7 @@ class Coder(metaclass=UsageMeta):
             if output:
                 accumulated_output += f"Output from {command}\n{output}\n"
 
-        print(accumulated_output)
+        self.io.tool_output(accumulated_output)
 
         if accumulated_output.strip() and await self.io.confirm_ask(
             "Add command output to the chat?", allow_never=True

{cecli_dev-0.100.6rc7 → cecli_dev-0.100.7}/cecli/commands/run.py

@@ -37,7 +37,7 @@ class RunCommand(BaseCommand):
         )
 
         if coder.args.tui:
-            print(combined_output)
+            coder.io.tool_warning(combined_output)
         else:
             # This print statement, for whatever reason,
             # allows the thread to properly yield control of the terminal

{cecli_dev-0.100.6rc7 → cecli_dev-0.100.7}/cecli/commands/utils/base_command.py

@@ -159,6 +159,12 @@ class BaseCommand(ABC, metaclass=CommandMeta):
         await new_coder.generate(user_message=user_msg, preproc=False)
         coder.coder_commit_hashes = new_coder.coder_commit_hashes
 
+        # Transfer files added during the /agent (or other temp-coder) turn back to the original
+        if new_coder.abs_fnames - original_coder.abs_fnames:
+            original_coder.abs_fnames.update(new_coder.abs_fnames)
+        if new_coder.abs_read_only_fnames - original_coder.abs_read_only_fnames:
+            original_coder.abs_read_only_fnames.update(new_coder.abs_read_only_fnames)
+
         # Clear manager and restore original state
         ConversationService.get_manager(original_coder).initialize(
             reset=True,

{cecli_dev-0.100.6rc7 → cecli_dev-0.100.7}/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.6rc7 → cecli_dev-0.100.7}/cecli/helpers/agents/service.py

@@ -571,11 +571,13 @@ class AgentService:
         Returns:
             The ``asyncio.Task`` wrapping ``generate()``.
         """
+        from cecli.commands import SwitchCoderSignal
 
         async def _run_generate():
             info.status = SubAgentStatus.RUNNING
             try:
                 await info.coder.generate(user_message=user_message, preproc=True)
+
                 if info.status == SubAgentStatus.RUNNING:
                     info.status = SubAgentStatus.FINISHED
                     info.summary = info.summary or DEFAULT_SUMMARY_COMPLETED
@@ -597,6 +599,8 @@ class AgentService:
                 )
                 await self._inject_sub_agent_result(info)
                 raise
+            except SwitchCoderSignal:
+                raise
 
         # Cancel any previous generate task to prevent duplicate concurrent generates
         if info.generate_task is not None and not info.generate_task.done():
@@ -604,8 +608,15 @@ class AgentService:
 
         task = asyncio.create_task(_run_generate())
         info.generate_task = task
+
+        def _raise_if_signal(exc):
+            if isinstance(exc, SwitchCoderSignal):
+                raise exc
+
         # Suppress "Task exception was never retrieved" for fire-and-forget tasks
-        task.add_done_callback(lambda t: t.exception() if not t.cancelled() else None)
+        task.add_done_callback(
+            lambda t: _raise_if_signal(t.exception()) if not t.cancelled() else None
+        )
         return task
 
     async def _inject_sub_agent_result(self, info: SubAgentInfo) -> None:

{cecli_dev-0.100.6rc7 → cecli_dev-0.100.7}/cecli/helpers/conversation/files.py

@@ -272,16 +272,19 @@ 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 diff of the changes to"
+                    f"{rel_fname} has been updated. Review this {prefix_str}diff of the changes to"
                     f" ensure all modifications are appropriate:\n\n{diff}"
                 ),
             }
@@ -289,7 +292,7 @@ class ConversationFiles:
             assistant_msg = {
                 "role": "assistant",
                 "content": (
-                    f"Thank you for sharing this diff of the updates to {rel_fname}."
+                    f"Thank you for sharing this {prefix_str}diff of the updates to {rel_fname}."
                     " I will review their contents."
                 ),
             }

{cecli_dev-0.100.6rc7 → cecli_dev-0.100.7}/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