cecli-dev 0.99.11__tar.gz → 0.99.12__tar.gz

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.99.11
+Version: 0.99.12
 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.99.11 → cecli_dev-0.99.12}/cecli/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.99.10.dev"
+__version__ = "0.99.12.dev"
 safe_version = __version__
 
 try:

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.99.11'
-__version_tuple__ = version_tuple = (0, 99, 11)
+__version__ = version = '0.99.12'
+__version_tuple__ = version_tuple = (0, 99, 12)
 
-__commit_id__ = commit_id = 'g2e5e3b75c'
+__commit_id__ = commit_id = 'gdd84a43a9'

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/coders/agent_coder.py

@@ -282,9 +282,7 @@ class AgentCoder(Coder):
                             content_parts.append(item.text)
                 return "".join(content_parts)
             except Exception as e:
-                self.io.tool_warning(
-                    (f"Executing {tool_name} on {server.name} failed:\nError: {e}")
-                )
+                self.io.tool_warning(f"Executing {tool_name} on {server.name} failed:\nError: {e}")
                 return f"Error executing tool call {tool_name}: {e}"
 
         result, interrupted = await interruptible(_exec_async(), self.interrupt_event)
@@ -381,7 +379,10 @@ class AgentCoder(Coder):
         try:
             result = '<context name="symbol_outline" from="agent">\n'
             result += "## Symbol Outline (Current Context)\n\n"
-            result += "Code definitions (classes, functions, methods, etc.) found in files currently in chat context."
+            result += (
+                "Code definitions (classes, functions, methods, etc.) found in files currently in"
+                " chat context."
+            )
             result += "\n\n"
             files_to_outline = list(self.abs_fnames) + list(self.abs_read_only_fnames)
             if not files_to_outline:
@@ -522,7 +523,10 @@ class AgentCoder(Coder):
                         )
                 if editable_files:
                     result += "\n".join(editable_files) + "\n\n"
-                    result += f"**Total editable: {len(editable_files)} files, {editable_tokens:,} tokens**\n\n"
+                    result += (
+                        f"**Total editable: {len(editable_files)} files,"
+                        f" {editable_tokens:,} tokens**\n\n"
+                    )
                 else:
                     result += "No editable files in context\n\n"
             if self.abs_read_only_fnames:
@@ -542,7 +546,10 @@ class AgentCoder(Coder):
                         )
                 if readonly_files:
                     result += "\n".join(readonly_files) + "\n\n"
-                    result += f"**Total read-only: {len(readonly_files)} files, {readonly_tokens:,} tokens**\n\n"
+                    result += (
+                        f"**Total read-only: {len(readonly_files)} files,"
+                        f" {readonly_tokens:,} tokens**\n\n"
+                    )
                 else:
                     result += "No read-only files in context\n\n"
             extra_tokens = sum(self.context_block_tokens.values())
@@ -730,7 +737,7 @@ class AgentCoder(Coder):
                 self.model_kwargs = {}
                 result_message = f"Error executing {tool_name}: {e}"
                 self.io.tool_error(
-                    (f"Error during {tool_name} execution: {e}\n{traceback.format_exc()}")
+                    f"Error during {tool_name} execution: {e}\n{traceback.format_exc()}"
                 )
             tool_responses.append(
                 {"role": "tool", "tool_call_id": tool_call.id, "content": result_message}
@@ -1020,8 +1027,8 @@ class AgentCoder(Coder):
             context_parts.append("## File Editing Tools Disabled")
             context_parts.append(
                 "File editing tools are currently disabled. Use `ReadRange` to determine the"
-                " current content hash prefixes needed to perform an edit and activate them when you"
-                " are ready to edit a file."
+                " current content hash prefixes needed to perform an edit and activate them when"
+                " you are ready to edit a file."
             )
 
         context_parts.append("\n\n")

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/coders/base_coder.py

@@ -453,7 +453,6 @@ class Coder:
 
         # Initialize conversation system if enabled
         ConversationService.get_chunks(self).initialize_conversation_system()
-        self.observation_manager = ObservationManager.get_instance(self)
 
         self.commands = commands or Commands(self.io, self, args=args)
         self.commands.coder = self
@@ -1752,7 +1751,7 @@ class Coder:
             return
 
         # Trigger background observation/reflection check
-        await self.observation_manager.check_and_trigger()
+        await ObservationManager.get_instance(self).check_and_trigger()
 
         manager = ConversationService.get_manager(self)
         done_messages = manager.get_messages_dict(MessageTag.DONE)
@@ -1789,8 +1788,8 @@ class Coder:
                 if not text:
                     raise ValueError(f"Summarization of {tag} messages returned empty.")
 
-                if self.observation_manager.observations:
-                    obs_text = "\n".join(self.observation_manager.observations)
+                if ObservationManager.get_instance(self).observations:
+                    obs_text = "\n".join(ObservationManager.get_instance(self).observations)
                     text = f"HISTORICAL OBSERVATIONS:\n{obs_text}\n\n{text}"
 
                 manager.clear_tag(tag)
@@ -2780,7 +2779,6 @@ class Coder:
 
     def _print_tool_call_info(self, server_tool_calls):
         """Print information about an MCP tool call."""
-        self.io.ring_bell()
         # self.io.tool_output("Preparing to run MCP tools", bold=False)
 
         for server, tool_calls in server_tool_calls.items():

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/commands/clear.py

@@ -2,6 +2,7 @@ from typing import List
 
 from cecli.commands.utils.base_command import BaseCommand
 from cecli.commands.utils.helpers import format_command_result
+from cecli.helpers.observations.manager import ObservationManager
 
 
 class ClearCommand(BaseCommand):
@@ -19,7 +20,7 @@ class ClearCommand(BaseCommand):
         ConversationService.get_manager(coder).clear_tag(MessageTag.FILE_CONTEXTS)
 
         ConversationService.get_files(coder).reset()
-        coder.observation_manager.reset()
+        ObservationManager.get_instance(coder).reset()
 
         # Clear TUI output if available
         if coder.tui and coder.tui():

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/commands/reset.py

@@ -3,6 +3,7 @@ from typing import List
 from cecli.commands.utils.base_command import BaseCommand
 from cecli.commands.utils.helpers import format_command_result
 from cecli.helpers.conversation import ConversationService
+from cecli.helpers.observations.manager import ObservationManager
 
 
 class ResetCommand(BaseCommand):
@@ -24,7 +25,7 @@ class ResetCommand(BaseCommand):
             # Re-initialize Conversation components with current coder
             ConversationService.get_manager(coder).initialize(reformat=True)
             ConversationService.get_files(coder)  # Ensure instance exists/initialized
-            coder.observation_manager.reset()
+            ObservationManager.get_instance(coder).reset()
 
             # Clear TUI output if available
             if coder.tui and coder.tui():

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/helpers/observations/manager.py

@@ -26,17 +26,21 @@ class ObservationManager:
         if self.is_processing:
             return
 
-        manager = ConversationService.get_manager(self.coder)
-        cur_messages = manager.get_messages_dict(MessageTag.CUR)
+        cur_messages = ConversationService.get_manager(self.coder).get_messages_dict(MessageTag.CUR)
 
         # Calculate unobserved tokens
         unobserved = cur_messages[self._last_observed_index :]
+        current_index = len(cur_messages)
+
         if not unobserved:
             return
 
         tokens = self.coder.summarizer.count_tokens(unobserved)
 
-        if tokens >= self.observation_threshold:
+        if (
+            tokens >= self.observation_threshold
+            and (not self._last_observed_index or current_index - self._last_observed_index >= 10)
+        ) or tokens >= 2 * self.observation_threshold:
             asyncio.create_task(self.run_observation(unobserved))
             self._last_observed_index = len(cur_messages)
 
@@ -50,8 +54,7 @@ class ObservationManager:
     async def run_observation(self, messages):
         self.is_processing = True
         try:
-            manager = ConversationService.get_manager(self.coder)
-            all_messages = manager.get_messages_dict()
+            all_messages = ConversationService.get_manager(self.coder).get_messages_dict()
             prompt = self.coder.gpt_prompts.observation_prompt
             observation = await self.coder.summarizer.summarize_all_as_text(
                 all_messages, prompt, max_tokens=8192

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/io.py

@@ -1718,13 +1718,13 @@ class InputOutput:
                 "$toastXml = $template.GetXml(); "
                 "$toastXml.GetElementsByTagName('text')[0].AppendChild"
                 "($template.CreateTextNode('cecli')) > $null; "
-                f"$toastXml.GetElementsByTagName('text')[1].AppendChild"
+                "$toastXml.GetElementsByTagName('text')[1].AppendChild"
                 f"($template.CreateTextNode('{NOTIFICATION_MESSAGE}')) > $null; "
                 "$toast = [Windows.UI.Notifications.ToastNotification]::new($toastXml); "
                 "[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier('cecli')"
                 '.Show($toast)"'
             )
-            return "powershell -command" + ps_command
+            return "powershell -WindowStyle Hidden -Command" + ps_command
 
         return None  # Unknown system
 
@@ -1739,9 +1739,7 @@ class InputOutput:
                     "stderr": subprocess.DEVNULL,
                 }
                 if platform.system() == "Windows":
-                    kwargs["creationflags"] = (
-                        subprocess.CREATE_NO_WINDOW | subprocess.DETACHED_PROCESS
-                    )
+                    kwargs["creationflags"] = subprocess.CREATE_NO_WINDOW
                 else:
                     # For non-Windows systems, start a new session to detach
                     kwargs["start_new_session"] = True

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/main.py

@@ -1194,15 +1194,21 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
     if args.exit:
         return await graceful_exit(coder)
     if args.auto_load:
-        try:
-            from cecli.sessions import SessionManager
+        if await pre_init_io.confirm_ask(
+            "Do you want to load your previous session?",
+            acknowledge=True,
+            explicit_yes_required=True,
+        ):
+            try:
+                from cecli.sessions import SessionManager
 
-            session_manager = SessionManager(coder, io)
-            await session_manager.load_session(
-                args.auto_save_session_name if args.auto_save_session_name else "auto-save"
-            )
-        except Exception:
-            pass
+                session_manager = SessionManager(coder, io)
+                await session_manager.load_session(
+                    args.auto_save_session_name if args.auto_save_session_name else "auto-save",
+                    switch=False,
+                )
+            except Exception:
+                pass
 
     if suppress_pre_init:
         await graceful_exit(coder)

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/models.py

@@ -1172,6 +1172,26 @@ class Model(ModelSettings):
             sorted_tools = sorted(
                 effective_tools, key=lambda x: x.get("function", {}).get("name", "Invalid Name")
             )
+
+            try:
+                # Deep copy to avoid modifying original tool schemas
+                sorted_tools = json.loads(json.dumps(sorted_tools))
+
+                for tool in sorted_tools:
+                    function_schema = tool.get("function")
+                    if function_schema and "description" in function_schema:
+                        desc = function_schema.get("description")
+                        if isinstance(desc, str):
+                            # Escape the description string for JSON, but without the outer quotes.
+                            # This is a workaround for issues with special characters in descriptions.
+                            function_schema["description"] = json.dumps(desc, ensure_ascii=False)[
+                                1:-1
+                            ]
+            except (TypeError, json.JSONDecodeError):
+                # If deep copy fails, proceed with original tools.
+                # This is a safeguard.
+                pass
+
             kwargs["tools"] = sorted_tools
 
         if functions and len(functions) == 1:

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/sessions.py

@@ -88,7 +88,7 @@ class SessionManager:
 
         return sessions
 
-    async def load_session(self, session_identifier: str) -> bool:
+    async def load_session(self, session_identifier: str, switch=True) -> bool:
         """Load a saved session by name or file path."""
         if not session_identifier:
             self.io.tool_error("Please provide a session name or file path.")
@@ -113,7 +113,7 @@ class SessionManager:
 
         # Apply session data
         applied, loaded_edit_format = await self._apply_session_data(session_data, session_file)
-        if applied:
+        if applied and switch:
             from cecli.commands import SwitchCoderSignal
 
             edit_format_to_switch_to = self.coder.edit_format

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/tools/context_manager.py

@@ -32,8 +32,7 @@ class Tool(BaseTool):
                         "type": "array",
                         "items": {"type": "string"},
                         "description": (
-                            "List of file paths to add as read-only. "
-                            "Limit to at most 2 at a time."
+                            "List of file paths to add as read-only. Limit to at most 2 at a time."
                         ),
                     },
                     "create": {

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/tools/edit_text.py

@@ -37,7 +37,7 @@ class Tool(BaseTool):
                 "Can handle an array of up to 10 edits across multiple files. "
                 "Each edit must include its own file_path and operation type. "
                 "Use content hash ranges with the start_line and end_line parameters with format "
-                '"{4 char hash}" (without the braces). For empty files, use "@000" as the '
+                "`{4 char hash}` (without the braces). For empty files, use `@000` as the "
                 "content hash references."
             ),
             "parameters": {
@@ -71,14 +71,14 @@ class Tool(BaseTool):
                                 "start_line": {
                                     "type": "string",
                                     "description": (
-                                        'Content hash for start line: "{4 char hash}" (without '
+                                        "Content hash for start line: `{4 char hash}` (without "
                                         "the braces)"
                                     ),
                                 },
                                 "end_line": {
                                     "type": "string",
                                     "description": (
-                                        'Content hash for end line: "{4 char hash}" (without the'
+                                        "Content hash for end line: `{4 char hash}` (without the"
                                         " braces)"
                                     ),
                                 },

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/tools/load_skill.py

@@ -7,10 +7,7 @@ class Tool(BaseTool):
         "type": "function",
         "function": {
             "name": "LoadSkill",
-            "description": (
-                "Load a skill by name (agent mode only). Adds skill to include list and removes"
-                " from exclude list."
-            ),
+            "description": "Load a skill by name.",
             "parameters": {
                 "type": "object",
                 "properties": {

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/tools/read_range.py

@@ -22,17 +22,16 @@ class Tool(BaseTool):
             "name": "ReadRange",
             "description": (
                 "Get content hash prefixes of content between start and end patterns in files."
-                " Accepts an array of `show` objects, each with file_path, start_text,"
-                " end_text. These values must be lines from the content of the file."
-                " They can contain up to 3 lines but newlines should generally be avoided."
-                " Avoid using generic keywords and symbols."
-                "Special markers @000 and 000@ represent the file boundaries and can be"
-                " used for start_text and end_text for the first and last lines of"
-                " the file respectively. Avoid using both of the special markers together on non-empty files."
-                " Never use content hashes as the start_text and end_text values."
-                " Do not use the same pattern for the start_text and end_text."
-                " It is best to use function names, variable declarations and other block identifiers as "
-                " start_texts and end_texts."
+                " Accepts an array of `show` objects, each with file_path, start_text, end_text."
+                " These values must be lines from the content of the file. They can contain up to 3"
+                " lines but newlines should generally be avoided. Avoid using generic keywords and"
+                " symbols.Special markers @000 and 000@ represent the file boundaries and can be"
+                " used for start_text and end_text for the first and last lines of the file"
+                " respectively. Avoid using both of the special markers together on non-empty"
+                " files. Never use content hashes as the start_text and end_text values. Do not use"
+                " the same pattern for the start_text and end_text. It is best to use function"
+                " names, variable declarations and other block identifiers as start_texts and"
+                " end_texts."
             ),
             "parameters": {
                 "type": "object",
@@ -127,7 +126,10 @@ class Tool(BaseTool):
                     error_outputs.append(
                         cls.format_error(
                             coder,
-                            f"Show operation {show_index + 1}: Provide both 'start_text' and 'end_text'.",
+                            (
+                                f"Show operation {show_index + 1}: Provide both 'start_text' and"
+                                " 'end_text'."
+                            ),
                             file_path,
                             start_text,
                             end_text,
@@ -284,7 +286,10 @@ class Tool(BaseTool):
                             error_outputs.append(
                                 cls.format_error(
                                     coder,
-                                    f"End pattern '{end_text}' not found in {file_path}. Do not search for it again.",
+                                    (
+                                        f"End pattern '{end_text}' not found in {file_path}. Do not"
+                                        " search for it again."
+                                    ),
                                     file_path,
                                     start_text,
                                     end_text,
@@ -297,7 +302,10 @@ class Tool(BaseTool):
                             error_outputs.append(
                                 cls.format_error(
                                     coder,
-                                    f"End pattern '{end_text}' not found after start pattern in {file_path}.",
+                                    (
+                                        f"End pattern '{end_text}' not found after start pattern in"
+                                        f" {file_path}."
+                                    ),
                                     file_path,
                                     start_text,
                                     end_text,
@@ -314,7 +322,7 @@ class Tool(BaseTool):
                         cls.format_error(
                             coder,
                             (
-                                f"Special markers cannot be used for ranges greater than 200 lines."
+                                "Special markers cannot be used for ranges greater than 200 lines."
                                 f" The resolved range is {e_idx - s_idx + 1} lines."
                                 " Pick more refined boundaries."
                             ),
@@ -466,7 +474,8 @@ class Tool(BaseTool):
                     )
                 if already_up_to_details:
                     coder.io.tool_output(
-                        f"Lines already up to date in context for {len(already_up_to_details)} operation(s)"
+                        "Lines already up to date in context for"
+                        f" {len(already_up_to_details)} operation(s)"
                     )
 
                     detail_str = "\n".join(already_up_to_details)

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/tools/remove_skill.py

@@ -7,10 +7,7 @@ class Tool(BaseTool):
         "type": "function",
         "function": {
             "name": "RemoveSkill",
-            "description": (
-                "Remove a skill by name (agent mode only). Removes skill from include list and adds"
-                " to exclude list."
-            ),
+            "description": "Remove a skill by name.",
             "parameters": {
                 "type": "object",
                 "properties": {

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/tools/thinking.py

@@ -11,8 +11,8 @@ class Tool(BaseTool):
         "function": {
             "name": "Thinking",
             "description": (
-                "Use this tool to store useful facts for later "
-                "keep a scratch pad of your current efforts "
+                "Use this tool to store useful facts for later, "
+                "keep a scratch pad of your current efforts, "
                 "and clarify your thoughts and intentions for your next steps."
             ),
             "parameters": {

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli/tools/utils/registry.py

@@ -6,6 +6,7 @@ this provides centralized tool registration, discovery, and filtering
 based on agent configuration.
 """
 
+import json
 import traceback
 from pathlib import Path
 from typing import Dict, List, Optional, Set, Type
@@ -32,6 +33,16 @@ class ToolRegistry:
             except Exception:
                 pass
 
+            description = tool_class.SCHEMA["function"]["description"]
+            wrapped = f'"{description}"'
+
+            try:
+                json.loads(wrapped)
+            except json.JSONDecodeError:
+                tool_class.SCHEMA["function"]["description"] = json.dumps(
+                    description, ensure_ascii=False
+                )[1:-1]
+
         if not name and hasattr(tool_class, "NORM_NAME"):
             name = tool_class.NORM_NAME
 

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/cecli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.99.11
+Version: 0.99.12
 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.99.11 → cecli_dev-0.99.12}/tests/basic/test_models.py

@@ -810,3 +810,55 @@ class TestModels:
                     output_found = any("$10.50/1m/output" in call for call in calls)
                     assert input_found, "Input pricing format incorrect"
                     assert output_found, "Output pricing format incorrect"
+
+    @patch("cecli.models.litellm.acompletion")
+    async def test_tool_description_escaping(self, mock_acompletion):
+        """
+        Test that tool descriptions with special characters are properly escaped.
+        """
+        model = Model("gpt-4")
+        messages = [{"role": "user", "content": "Hello"}]
+
+        # A complex description with various special characters
+        complex_description = (
+            'This is a "test" description with `special` characters like \\, \n, and *.'
+        )
+
+        # Mock tool with the complex description
+        mock_tool = {
+            "type": "function",
+            "function": {
+                "name": "test_tool",
+                "description": complex_description,
+                "parameters": {
+                    "type": "object",
+                    "properties": {},
+                    "required": [],
+                },
+            },
+        }
+
+        await model.send_completion(messages, functions=None, stream=False, tools=[mock_tool])
+
+        # Verify that acompletion was called
+        mock_acompletion.assert_called_once()
+
+        # Get the keyword arguments passed to acompletion
+        call_kwargs = mock_acompletion.call_args.kwargs
+
+        # Check that the 'tools' argument is present and correctly formatted
+        assert "tools" in call_kwargs
+        sent_tools = call_kwargs["tools"]
+        assert isinstance(sent_tools, list)
+        assert len(sent_tools) == 1
+
+        # Verify the description of the sent tool
+        sent_tool_function = sent_tools[0].get("function", {})
+        sent_description = sent_tool_function.get("description")
+
+        # The description should be a JSON-escaped string
+        # Expected: 'This is a \\"test\\" description with `special` characters like \\\\, \\n, and *.'
+        expected_escaped_description = (
+            'This is a \\"test\\" description with `special` characters like \\\\, \\n, and *.'
+        )
+        assert sent_description == expected_escaped_description

{cecli_dev-0.99.11 → cecli_dev-0.99.12}/tests/helpers/observations/test_observation_manager.py

@@ -71,7 +71,6 @@ async def test_compact_context_with_observations():
     # Mock observation manager with some observations
     obs_manager = ObservationManager.get_instance(coder)
     obs_manager.observations = ["Observation 1"]
-    coder.observation_manager = obs_manager
 
     # Mock prompts
     coder.gpt_prompts = MagicMock()
@@ -136,7 +135,6 @@ async def test_compact_context_with_observations_integration():
     # Mock observation manager with some observations
     obs_manager = ObservationManager.get_instance(coder)
     obs_manager.observations = ["Observation 1"]
-    coder.observation_manager = obs_manager
 
     # Mock prompts
     coder.gpt_prompts = MagicMock()