cecli-dev 0.96.4__tar.gz → 0.96.6__tar.gz

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.96.4
+Version: 0.96.6
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli
@@ -131,14 +131,14 @@ or
 uv pip install --native-tls cecli-dev
 ```
 
-The package exports a `cecli` command that accepts all of Aider's configuration options
+The package exports a `cecli` command that accepts all of Aider's configuration options (and a few more!)
 
 ### Tool Installation
 ```bash
 uv tool install --native-tls --python python3.12 cecli-dev
 ```
 
-Use the tool installation so aider doesn't interfere with your development environment
+Use the tool installation so cecli doesn't interfere with your development environment
 
 ## Configuration
 
@@ -155,15 +155,15 @@ cache-prompts: true
 check-update: true
 debug: false
 enable-context-compaction: true
-context-compaction-max-tokens: 64000
-env-file: .aider.env
+context-compaction-max-tokens: 0.8
+env-file: .cecli.env
 show-model-warnings: true
-use-enhanced-map: true
+use-enhanced-map: true.p
 watch-files: false
 tui: true
 
 agent-config:
-  large_file_token_threshold: 12500
+  large_file_token_threshold: 8192
   skip_cli_confirmations: false
 
 mcp-servers:
@@ -173,7 +173,7 @@ mcp-servers:
       url: https://mcp.context7.com/mcp
 ```
 
-Use the adjacent .aider.env file to store model api keys as environment variables, e.g:
+Use the adjacent .cecli.env file to store model api keys as environment variables, e.g:
 
 ```
 ANTHROPIC_API_KEY="..."
@@ -185,7 +185,7 @@ DEEPSEEK_API_KEY="..."
 
 ### Run Program
 
-If you are in the directory with your .aider.conf.yml file, then simply running `cecli` or `aider-ce` will start the agent with your configuration. For best results, since terminal emulators can be finicky, we highly suggest running:
+If you are in the directory with your .cecli.conf.yml file, then simply running `cecli` or `aider-ce` will start the agent with your configuration. For best results, since terminal emulators can be finicky, we highly suggest running:
 
 ```bash
 cecli --terminal-setup
@@ -210,7 +210,7 @@ This command will make sure all commands ran by the coding agent happen in conte
 
 ## Project Roadmap/Goals
 
-The current priorities are to improve core capabilities and user experience of the Aider project
+The current priorities are to improve core capabilities and user experience of the `cecli` project
 
 1. **Base Asynchronicity (cecli coroutine-experiment branch)**
   * [x] Refactor codebase to have the main loop run asynchronously
@@ -223,14 +223,14 @@ The current priorities are to improve core capabilities and user experience of t
 
 3. **Context Discovery** - [Discussion](https://github.com/dwash96/cecli/issues/46)
   * [ ] Develop AST-based search capabilities
-  * [ ] Enhance file search with ripgrep integration
+  * [x] Enhance file search with ripgrep integration
   * [ ] Implement RAG (Retrieval-Augmented Generation) for better code retrieval
   * [ ] Build an explicit workflow and local tooling for internal discovery mechanisms
 
 4. **Context Delivery** - [Discussion](https://github.com/dwash96/cecli/issues/47)
   * [ ] Use workflow for internal discovery to better target file snippets needed for specific tasks
   * [ ] Add support for partial files and code snippets in model completion messages
-  * [ ] Update message request structure for optimal caching
+  * [x] Update message request structure for optimal caching
 
 5. **TUI Experience** - [Discussion](https://github.com/dwash96/cecli/issues/48)
   * [x] Add a full TUI (probably using textual) to have a visual interface competitive with the other coding agent terminal programs

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/README.md

@@ -47,14 +47,14 @@ or
 uv pip install --native-tls cecli-dev
 ```
 
-The package exports a `cecli` command that accepts all of Aider's configuration options
+The package exports a `cecli` command that accepts all of Aider's configuration options (and a few more!)
 
 ### Tool Installation
 ```bash
 uv tool install --native-tls --python python3.12 cecli-dev
 ```
 
-Use the tool installation so aider doesn't interfere with your development environment
+Use the tool installation so cecli doesn't interfere with your development environment
 
 ## Configuration
 
@@ -71,15 +71,15 @@ cache-prompts: true
 check-update: true
 debug: false
 enable-context-compaction: true
-context-compaction-max-tokens: 64000
-env-file: .aider.env
+context-compaction-max-tokens: 0.8
+env-file: .cecli.env
 show-model-warnings: true
-use-enhanced-map: true
+use-enhanced-map: true.p
 watch-files: false
 tui: true
 
 agent-config:
-  large_file_token_threshold: 12500
+  large_file_token_threshold: 8192
   skip_cli_confirmations: false
 
 mcp-servers:
@@ -89,7 +89,7 @@ mcp-servers:
       url: https://mcp.context7.com/mcp
 ```
 
-Use the adjacent .aider.env file to store model api keys as environment variables, e.g:
+Use the adjacent .cecli.env file to store model api keys as environment variables, e.g:
 
 ```
 ANTHROPIC_API_KEY="..."
@@ -101,7 +101,7 @@ DEEPSEEK_API_KEY="..."
 
 ### Run Program
 
-If you are in the directory with your .aider.conf.yml file, then simply running `cecli` or `aider-ce` will start the agent with your configuration. For best results, since terminal emulators can be finicky, we highly suggest running:
+If you are in the directory with your .cecli.conf.yml file, then simply running `cecli` or `aider-ce` will start the agent with your configuration. For best results, since terminal emulators can be finicky, we highly suggest running:
 
 ```bash
 cecli --terminal-setup
@@ -126,7 +126,7 @@ This command will make sure all commands ran by the coding agent happen in conte
 
 ## Project Roadmap/Goals
 
-The current priorities are to improve core capabilities and user experience of the Aider project
+The current priorities are to improve core capabilities and user experience of the `cecli` project
 
 1. **Base Asynchronicity (cecli coroutine-experiment branch)**
   * [x] Refactor codebase to have the main loop run asynchronously
@@ -139,14 +139,14 @@ The current priorities are to improve core capabilities and user experience of t
 
 3. **Context Discovery** - [Discussion](https://github.com/dwash96/cecli/issues/46)
   * [ ] Develop AST-based search capabilities
-  * [ ] Enhance file search with ripgrep integration
+  * [x] Enhance file search with ripgrep integration
   * [ ] Implement RAG (Retrieval-Augmented Generation) for better code retrieval
   * [ ] Build an explicit workflow and local tooling for internal discovery mechanisms
 
 4. **Context Delivery** - [Discussion](https://github.com/dwash96/cecli/issues/47)
   * [ ] Use workflow for internal discovery to better target file snippets needed for specific tasks
   * [ ] Add support for partial files and code snippets in model completion messages
-  * [ ] Update message request structure for optimal caching
+  * [x] Update message request structure for optimal caching
 
 5. **TUI Experience** - [Discussion](https://github.com/dwash96/cecli/issues/48)
   * [x] Add a full TUI (probably using textual) to have a visual interface competitive with the other coding agent terminal programs

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/cecli/__init__.py

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

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/cecli/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.96.4'
-__version_tuple__ = version_tuple = (0, 96, 4)
+__version__ = version = '0.96.6'
+__version_tuple__ = version_tuple = (0, 96, 6)
 
-__commit_id__ = commit_id = 'gd0299f30a'
+__commit_id__ = commit_id = 'g275cf49cc'

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/cecli/coders/agent_coder.py

@@ -724,6 +724,7 @@ class AgentCoder(Coder):
         ) = await self._process_tool_commands(content)
         if self.agent_finished:
             self.tool_usage_history = []
+            self.reflected_message = None
             if self.files_edited_by_tools:
                 _ = await self.auto_commit(self.files_edited_by_tools)
             return False

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/cecli/coders/architect_coder.py

@@ -61,6 +61,14 @@ class ArchitectCoder(AskCoder):
         if self.verbose:
             editor_coder.show_announcements()
 
+        postamble = """
+        The above changes are proposed changes.
+        You must repeat SEARCH/REPLACE blocks in order to apply edits.
+        Shell commands must also be duplicated in order to run them.
+        """
+
+        content = f"Please implement all requested changes from:\n{content}\n{postamble}"
+
         try:
             await editor_coder.generate(user_message=content, preproc=False)
 

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/cecli/coders/base_coder.py

@@ -38,7 +38,7 @@ import cecli.prompts.utils.system as prompts
 from cecli import __version__, models, urls, utils
 from cecli.commands import Commands, SwitchCoderSignal
 from cecli.exceptions import LiteLLMExceptions
-from cecli.helpers import coroutines, nested
+from cecli.helpers import command_parser, coroutines, nested
 from cecli.helpers.conversation import (
     ConversationChunks,
     ConversationManager,
@@ -1584,6 +1584,7 @@ class Coder:
                 pass
 
             if not self.reflected_message:
+                await self.auto_save_session(force=True)
                 break
 
             if self.num_reflections >= self.max_reflections:
@@ -1603,6 +1604,8 @@ class Coder:
             if self.enable_context_compaction:
                 await self.compact_context_if_needed()
 
+            await self.auto_save_session(force=True)
+
     async def check_and_open_urls(self, exc, friendly_msg=None):
         """Check exception for URLs, offer to open in a browser, with user-friendly error msgs."""
         text = str(exc)
@@ -2862,7 +2865,13 @@ class Coder:
             if self.args.tui:
                 message = f"Add file to the chat? ({rel_fname})"
 
-            if await self.io.confirm_ask(message, subject=rel_fname, group=group, allow_never=True):
+            if await self.io.confirm_ask(
+                message,
+                subject=rel_fname,
+                group=group,
+                group_response=str(new_mentions),
+                allow_never=True,
+            ):
                 self.add_rel_fname(rel_fname)
                 added_fnames.append(rel_fname)
             else:
@@ -3776,7 +3785,7 @@ class Coder:
     def apply_edits_dry_run(self, edits):
         return edits
 
-    async def auto_save_session(self):
+    async def auto_save_session(self, force=False):
         """Automatically save the current session to {auto-save-session-name}.json."""
         if not getattr(self.args, "auto_save", False):
             return
@@ -3789,11 +3798,17 @@ class Coder:
             self._autosave_future = None
 
         if self._autosave_future and not self._autosave_future.done():
-            return
+            if force:
+                try:
+                    await self._autosave_future
+                except Exception:
+                    pass
+            else:
+                return
 
         # Throttle autosave to run at most once every 15 seconds
         current_time = time.time()
-        if current_time - self._last_autosave_time >= 15.0:
+        if current_time - self._last_autosave_time >= 15.0 or force:
             try:
                 self._last_autosave_time = current_time
                 session_manager = SessionManager(self, self.io)
@@ -3832,7 +3847,7 @@ class Coder:
             self.commands.cmd_running_event.set()  # Command finished
 
     async def handle_shell_commands(self, commands_str, group):
-        commands = commands_str.strip().split(";")
+        commands = command_parser.split_shell_commands(commands_str)
         command_count = sum(
             1 for cmd in commands if cmd.strip() and not cmd.strip().startswith("#")
         )

cecli_dev-0.96.6/cecli/helpers/command_parser.py

@@ -0,0 +1,179 @@
+from typing import List
+
+
+def split_shell_commands(commands_str: str) -> List[str]:
+    """
+    Split shell commands on semicolons, respecting quoted strings and heredoc boundaries.
+
+    Args:
+        commands_str: String containing shell commands separated by semicolons
+
+    Returns:
+        List of command strings split at semicolons outside quotes/heredocs
+    """
+    if not commands_str:
+        return []
+
+    commands: List[str] = []
+    current_command = []
+
+    # State tracking
+    in_single_quote = False
+    in_double_quote = False
+    in_heredoc = False
+    heredoc_delimiter = ""
+    heredoc_ignore_tabs = False  # True for <<-EOF (dash before delimiter)
+    heredoc_seen_newline = False  # Have we seen a newline since entering heredoc?
+    escaped = False
+
+    i = 0
+    n = len(commands_str)
+
+    while i < n:
+        char = commands_str[i]
+
+        if escaped:
+            # Current character is escaped, treat it as literal
+            current_command.append(char)
+            escaped = False
+            i += 1
+            continue
+
+        if char == "\\":
+            # Escape character
+            escaped = True
+            current_command.append(char)
+            i += 1
+            continue
+
+        if not in_heredoc:
+            # Not in heredoc, handle quotes and semicolons
+            if char == "'" and not in_double_quote:
+                in_single_quote = not in_single_quote
+                current_command.append(char)
+            elif char == '"' and not in_single_quote:
+                in_double_quote = not in_double_quote
+                current_command.append(char)
+            elif char == ";" and not in_single_quote and not in_double_quote:
+                # Split at semicolon outside quotes
+                command = "".join(current_command).strip()
+                if command:
+                    commands.append(command)
+                current_command = []
+            else:
+                # Check for heredoc start (<<)
+                if char == "<" and i + 1 < n and commands_str[i + 1] == "<":
+                    # Remember position for capturing the heredoc start
+                    heredoc_start_pos = i
+                    i += 2  # Skip "<<"
+
+                    # Check for dash (<<-)
+                    if i < n and commands_str[i] == "-":
+                        heredoc_ignore_tabs = True
+                        i += 1
+
+                    # Skip whitespace before delimiter
+                    while i < n and commands_str[i] in (" ", "\t"):
+                        i += 1
+
+                    # Parse delimiter (can be quoted or unquoted)
+                    delimiter_start = i
+
+                    # Check for quotes
+                    if i < n and commands_str[i] in ("'", '"'):
+                        quote_char = commands_str[i]
+                        i += 1
+                        delimiter_start = i
+
+                        # Find closing quote
+                        while i < n and commands_str[i] != quote_char:
+                            i += 1
+
+                        heredoc_delimiter = commands_str[delimiter_start:i]
+                        if i < n:
+                            i += 1  # Skip closing quote
+                    else:
+                        # Unquoted delimiter - alphanumeric and underscore only
+                        while i < n and (commands_str[i].isalnum() or commands_str[i] == "_"):
+                            i += 1
+                        heredoc_delimiter = commands_str[delimiter_start:i]
+
+                    if heredoc_delimiter:
+                        # Valid heredoc found - capture the entire heredoc start
+                        heredoc_start_text = commands_str[heredoc_start_pos:i]
+                        current_command.append(heredoc_start_text)
+
+                        # Enter heredoc mode
+                        in_heredoc = True
+                        heredoc_seen_newline = False
+                        continue
+                    else:
+                        # Not a valid heredoc, treat as normal "<<"
+                        current_command.append("<<")
+                        continue
+                else:
+                    current_command.append(char)
+        else:
+            # Inside heredoc
+            current_command.append(char)
+
+            # Track if we've seen a newline (heredoc content starts after newline)
+            if char == "\n":
+                heredoc_seen_newline = True
+
+                # Look ahead to see if next line starts with delimiter
+                j = i + 1
+
+                # Skip leading whitespace (tabs if heredoc_ignore_tabs)
+                while j < n and commands_str[j] in (" ", "\t"):
+                    if heredoc_ignore_tabs and commands_str[j] == "\t":
+                        j += 1
+                    elif not heredoc_ignore_tabs:
+                        j += 1
+                    else:
+                        break
+
+                # Check if we have the delimiter at this position
+                if (
+                    j + len(heredoc_delimiter) <= n
+                    and commands_str[j : j + len(heredoc_delimiter)] == heredoc_delimiter
+                ):
+                    # Check what comes after delimiter
+                    k = j + len(heredoc_delimiter)
+                    if k >= n or commands_str[k] in (" ", "\t", "\n", "\r", ";"):
+                        # Found heredoc end
+                        in_heredoc = False
+                        heredoc_delimiter = ""
+                        heredoc_ignore_tabs = False
+                        heredoc_seen_newline = False
+            elif char == ";" and not heredoc_seen_newline:
+                # Semicolon before seeing a newline in heredoc mode
+                # This means heredoc start was immediately followed by semicolon
+                # Not a real heredoc - split at this semicolon
+                in_heredoc = False
+                heredoc_delimiter = ""
+                heredoc_ignore_tabs = False
+                heredoc_seen_newline = False
+
+                # Remove the semicolon from current_command
+                current_command.pop()
+
+                # Split at this semicolon
+                command = "".join(current_command).strip()
+                if command:
+                    commands.append(command)
+                current_command = []
+                continue
+
+        i += 1
+
+    # Add the last command if any
+    if escaped:
+        # Handle trailing escape character
+        current_command.append("\\")
+
+    command = "".join(current_command).strip()
+    if command:
+        commands.append(command)
+
+    return commands

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/cecli/io.py

@@ -148,7 +148,6 @@ class AutoCompleter(Completer):
         self.rel_fnames = rel_fnames
         self.encoding = encoding
         self.abs_read_only_fnames = abs_read_only_fnames or []
-        self.post_filter_commands = ["/add"]
 
         fname_to_rel_fnames = defaultdict(list)
         for rel_fname in addable_rel_fnames:
@@ -214,22 +213,48 @@ class AutoCompleter(Completer):
 
     def get_command_completions(self, document, complete_event, text, words):
         if len(words) == 1 and not text[-1].isspace():
+            # Handle command completion (e.g., typing "/ad" should complete to "/add")
             partial = words[0].lower()
-            candidates = [cmd for cmd in self.command_names if cmd.startswith(partial)]
+            # Strip leading '/' if present for comparison with command names
+            if partial.startswith("/"):
+                partial = partial[1:]
+            # Compare with command names without leading '/'
+            candidates = [cmd for cmd in self.command_names if cmd[1:].startswith(partial)]
             for candidate in sorted(candidates):
+                # Add back the leading '/' for the completion
                 yield Completion(candidate, start_position=-len(words[-1]))
             return
 
-        if len(words) <= 1 or text[-1].isspace():
-            return
+        # Handle command followed by space: trigger auto-completion with empty partial
+        if text[-1].isspace():
+            # We have a command followed by space, trigger auto-completion with empty string
+            if len(words) == 1:
+                # Command with no arguments yet, just a trailing space
+                partial = ""
+                # We need to get the command name without the trailing space
+                # The command is words[0] but might have leading '/'
+                cmd_text = words[0]
+            else:
+                # Command with arguments and trailing space
+                partial = ""
+                cmd_text = text.rstrip()  # Remove trailing space for matching
+        else:
+            # No trailing space
+            if len(words) <= 1:
+                return
+            partial = words[-1].lower()
+            cmd_text = text
 
-        cmd = words[0]
-        partial = words[-1].lower()
+        # Pass the text (without trailing space if present) to matching_commands
+        matches, matched_cmd, _ = self.commands.matching_commands(cmd_text.rstrip())
+        if not matches:
+            return
 
-        matches, _, _ = self.commands.matching_commands(cmd)
         if len(matches) == 1:
             cmd = matches[0]
-        elif cmd not in matches:
+        elif matched_cmd in matches:
+            cmd = matched_cmd
+        else:
             return
 
         raw_completer = self.commands.get_raw_completions(cmd)
@@ -242,11 +267,14 @@ class AutoCompleter(Completer):
         if candidates is None:
             return
 
-        if cmd in self.post_filter_commands:
-            candidates = [word for word in candidates if partial in word.lower()]
+        candidates = [word for word in candidates if partial in word.lower()]
 
         for candidate in sorted(candidates):
-            yield Completion(candidate, start_position=-len(words[-1]))
+            # Calculate start position based on partial, not words[-1]
+            # When partial is empty (trailing space), start_position should be 0
+            # When partial is not empty, replace that many characters
+            start_position = -len(partial) if partial else 0
+            yield Completion(candidate, start_position=start_position)
 
     def get_completions(self, document, complete_event):
         self.tokenize()
@@ -256,8 +284,9 @@ class AutoCompleter(Completer):
         if not words:
             return
 
-        if text and text[-1].isspace():
-            # don't keep completing after a space
+        if text and text[-1].isspace() and not text.startswith("/"):
+            # don't keep completing after a space for non-commands
+            # For commands, we want to allow completion with empty string partial
             return
 
         if text[0] == "/":
@@ -1235,11 +1264,11 @@ class InputOutput:
 
             if self.yes is True and not explicit_yes_required:
                 res = "y"
+            elif group_response and group_response in self.group_responses:
+                return self.group_responses[group_response]
             elif group and group.preference:
                 res = group.preference
                 self.user_input(f"{question} - {res}", log_only=False)
-            elif group_response and group_response in self.group_responses:
-                return self.group_responses[group_response]
             else:
                 # Ring the bell if needed
                 self.ring_bell()

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/cecli/main.py

@@ -1202,6 +1202,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             return await graceful_exit(coder)
         except SwitchCoderSignal as switch:
             coder.ok_to_warm_cache = False
+            await coder.auto_save_session(force=True)
 
             if hasattr(switch, "placeholder") and switch.placeholder is not None:
                 io.placeholder = switch.placeholder
@@ -1229,6 +1230,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
 
         except SystemExit:
             sys.settrace(None)
+            await coder.auto_save_session(force=True)
             return await graceful_exit(coder)
 
 

{cecli_dev-0.96.4 → cecli_dev-0.96.6}/cecli/tui/app.py

@@ -884,7 +884,9 @@ class TUI(App):
         suggestions = []
         commands = self.worker.coder.commands
 
-        if len(text) and text[-1] == " ":
+        # Only return early for non-commands ending with space
+        # For commands, we want to allow completion with empty string partial
+        if len(text) and text[-1] == " " and not text.startswith("/"):
             return
 
         if "@" in text:
@@ -905,12 +907,21 @@ class TUI(App):
                     suggestions = all_commands
                 else:
                     suggestions = [c for c in all_commands if c.startswith(cmd_part)]
-            elif len(parts) > 1:
+            else:
                 # Complete command argument
+                # This handles both:
+                # 1. len(parts) > 1: command with arguments
+                # 2. len(parts) == 1 and text.endswith(" "): command with trailing space
                 cmd_name = cmd_part
-                end_lookup = text.rsplit(maxsplit=1)
 
-                arg_prefix = end_lookup[-1]
+                if text.endswith(" "):
+                    # Command with trailing space, empty argument prefix
+                    arg_prefix = ""
+                else:
+                    # Get the last word as argument prefix
+                    end_lookup = text.rsplit(maxsplit=1)
+                    arg_prefix = end_lookup[-1]
+
                 arg_prefix_lower = arg_prefix.lower()
 
                 # Check if this command needs path-based completion
@@ -955,8 +966,14 @@ class TUI(App):
         """Calculate the new text after applying completion."""
         if current_text.startswith("/"):
             parts = current_text.rsplit(maxsplit=1)
-            if len(parts) == 1:
-                # Replace entire command
+
+            # Check if we have a command with trailing space
+            # This is when we want to insert argument completions after the space
+            if len(parts) == 1 and current_text.endswith(" "):
+                # Command with trailing space, insert completion after space
+                return current_text + completion
+            elif len(parts) == 1:
+                # Replace entire command (command name completion)
                 # Only add space if command takes arguments
                 commands = self.worker.coder.commands
                 try: