cecli-dev 0.95.6.dev1__tar.gz → 0.95.8__tar.gz

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/.github/workflows/ubuntu-tests.yml

@@ -59,3 +59,5 @@ jobs:
     - name: Run tests
       run: |
         pytest
+      env:
+        CECLI_TUI: "false"

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/.github/workflows/windows-tests.yml

@@ -47,3 +47,5 @@ jobs:
     - name: Run tests
       run: |
         pytest
+      env:
+        CECLI_TUI: "false"

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/CONTRIBUTING.md

@@ -1,4 +1,3 @@
-
 # Contributing to the Project
 
 We welcome contributions in the form of bug reports, feature requests,
@@ -24,30 +23,29 @@ ensure that your contributions can be integrated smoothly.
 
 ```bash
 # Clone the repository
-git clone https://github.com/dwash96/aider-ce.git
-cd aider-ce
+git clone https://github.com/dwash96/cecli.git
+cd cecli
 
 # Make a venv
 python3 -m venv venv
 source venv/bin/activate
 
-# Install UV because it's superior
+# Install UV because it's superior (skip if you already have it installed globally)
 pip install uv
 
 # Build Project
 uv pip install --native-tls -e .
 
 # Add tool chain
-uv install --native-tls pre-commit
+uv pip install --native-tls pre-commit
 pre-commit install
 
 # Run Program
-aider-ce
-
-# OR!
-
 cecli
 
+# OR! (legacy)
+aider-ce
+
 ```
 
 ### Building the Docker Image

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.95.6.dev1
+Version: 0.95.8
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli
@@ -99,14 +99,15 @@ LLMs are a part of our lives from here on out so join us in learning about and c
 
 ## Documentation/Other Notes:
 
-* [Agent Mode](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/agent-mode.md)
-* [MCP Configuration](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/mcp.md)
-* [TUI Configuration](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/tui.md)
-* [Skills](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/skills.md)
-* [Session Management](https://github.com/dwash96/cecli/blob/main/aider/website/docs/sessions.md)
+* [Agent Mode](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/agent-mode.md)
+* [MCP Configuration](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/mcp.md)
+* [TUI Configuration](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/tui.md)
+* [Skills](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/skills.md)
+* [Session Management](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/sessions.md)
 * [Custom Commands](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/custom-commands.md)
+* [Custom System Prompts](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/custom-system-prompts.md)
 * [Custom Tools](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/agent-mode.md#creating-custom-tools)
-* [Advanced Model Configuration](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/model-aliases.md#advanced-model-settings)
+* [Advanced Model Configuration](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/model-aliases.md#advanced-model-settings)
 * [Aider Original Documentation (still mostly applies)](https://aider.chat/)
 
 You can see a selection of the enhancements and updates by comparing the help output:
@@ -120,20 +121,20 @@ This project can be installed using several methods:
 
 ### Package Installation
 ```bash
-pip install cecli.dev
+pip install cecli-dev
 ```
 
 or
 
 ```bash
-uv pip install --native-tls cecli.dev
+uv pip install --native-tls cecli-dev
 ```
 
 The package exports a `cecli` command that accepts all of Aider's configuration options
 
 ### Tool Installation
 ```bash
-uv tool install --native-tls --python python3.12 cecli.dev
+uv tool install --native-tls --python python3.12 cecli-dev
 ```
 
 Use the tool installation so aider doesn't interfere with your development environment
@@ -183,7 +184,15 @@ 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. If you want additional sandboxing, we publish a docker container that can be ran as follows:
+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:
+
+```bash
+cecli --terminal-setup
+```
+
+On first run to configure keybindings for the program (notably `shift+enter`). Support for terminals is ongoing so feel free to make a github issue or chat in the discord for us to figure out what's needed to support automatically setting up a given terminal.
+
+If you want additional sandboxing, we publish a docker container that can be ran as follows:
 
 ```bash
 docker pull dustinwashington/aider-ce

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/README.md

@@ -16,14 +16,15 @@ LLMs are a part of our lives from here on out so join us in learning about and c
 
 ## Documentation/Other Notes:
 
-* [Agent Mode](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/agent-mode.md)
-* [MCP Configuration](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/mcp.md)
-* [TUI Configuration](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/tui.md)
-* [Skills](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/skills.md)
-* [Session Management](https://github.com/dwash96/cecli/blob/main/aider/website/docs/sessions.md)
+* [Agent Mode](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/agent-mode.md)
+* [MCP Configuration](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/mcp.md)
+* [TUI Configuration](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/tui.md)
+* [Skills](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/skills.md)
+* [Session Management](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/sessions.md)
 * [Custom Commands](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/custom-commands.md)
+* [Custom System Prompts](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/custom-system-prompts.md)
 * [Custom Tools](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/agent-mode.md#creating-custom-tools)
-* [Advanced Model Configuration](https://github.com/dwash96/cecli/blob/main/aider/website/docs/config/model-aliases.md#advanced-model-settings)
+* [Advanced Model Configuration](https://github.com/dwash96/cecli/blob/main/cecli/website/docs/config/model-aliases.md#advanced-model-settings)
 * [Aider Original Documentation (still mostly applies)](https://aider.chat/)
 
 You can see a selection of the enhancements and updates by comparing the help output:
@@ -37,20 +38,20 @@ This project can be installed using several methods:
 
 ### Package Installation
 ```bash
-pip install cecli.dev
+pip install cecli-dev
 ```
 
 or
 
 ```bash
-uv pip install --native-tls cecli.dev
+uv pip install --native-tls cecli-dev
 ```
 
 The package exports a `cecli` command that accepts all of Aider's configuration options
 
 ### Tool Installation
 ```bash
-uv tool install --native-tls --python python3.12 cecli.dev
+uv tool install --native-tls --python python3.12 cecli-dev
 ```
 
 Use the tool installation so aider doesn't interfere with your development environment
@@ -100,7 +101,15 @@ 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. If you want additional sandboxing, we publish a docker container that can be ran as follows:
+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:
+
+```bash
+cecli --terminal-setup
+```
+
+On first run to configure keybindings for the program (notably `shift+enter`). Support for terminals is ongoing so feel free to make a github issue or chat in the discord for us to figure out what's needed to support automatically setting up a given terminal.
+
+If you want additional sandboxing, we publish a docker container that can be ran as follows:
 
 ```bash
 docker pull dustinwashington/aider-ce
@@ -463,4 +472,4 @@ The current priorities are to improve core capabilities and user experience of t
 <td></td>
 </tr>
 </tbody>
-</table>
+</table>

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/cecli/__init__.py

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

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/cecli/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.95.6.dev1'
-__version_tuple__ = version_tuple = (0, 95, 6, 'dev1')
+__version__ = version = '0.95.8'
+__version_tuple__ = version_tuple = (0, 95, 8)
 
-__commit_id__ = commit_id = 'gb8df37217'
+__commit_id__ = commit_id = 'g930eeb2cb'

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/cecli/args.py

@@ -242,13 +242,34 @@ def get_parser(default_config_files, git_root):
         ),
     )
 
+    #######
+    group = parser.add_argument_group("Customization Settings")
+    group.add_argument(
+        "--custom",
+        metavar="CUSTOM_JSON",
+        help=(
+            "Specify cecli customizations configurations (for prompts, commands, etc.) as a JSON"
+            " string"
+        ),
+        default=None,
+    )
     ########
     group = parser.add_argument_group("TUI Settings")
+
+    env_val = os.environ.get("CECLI_TUI")
+
+    if env_val is not None and env_val.lower() == "false":
+        tui_default = False
+        linear_output_default = True
+    else:
+        tui_default = None
+        linear_output_default = None
+
     group.add_argument(
         "--tui",
         action=argparse.BooleanOptionalAction,
-        default=None,
-        help="Launch Textual TUI interface (experimental)",
+        default=tui_default,
+        help="Launch Textual TUI interface",
     )
     group.add_argument(
         "--tui-config",
@@ -435,6 +456,17 @@ def get_parser(default_config_files, git_root):
         default=False,
         help="Restore the previous chat history messages (default: False)",
     )
+    #########
+    group = parser.add_argument_group("Input settings")
+    group.add_argument(
+        "--terminal-setup",
+        action=argparse.BooleanOptionalAction,
+        default=False,
+        help=(
+            "Auto-configure terminal emulator for shift+enter support for new lines (default:"
+            " False)"
+        ),
+    )
     ##########
     group = parser.add_argument_group("Output settings")
     group.add_argument(
@@ -803,8 +835,8 @@ def get_parser(default_config_files, git_root):
     group.add_argument(
         "--linear-output",
         action=argparse.BooleanOptionalAction,
-        help="Run input and output sequentially instead of us simultaneous streams (default: True)",
-        default=True,
+        help="Run input and output sequentially instead of us simultaneous streams (default: None)",
+        default=linear_output_default,
     )
     group.add_argument(
         "--debug",
@@ -975,12 +1007,6 @@ def get_parser(default_config_files, git_root):
             " specified, a default command for your OS may be used."
         ),
     )
-    group.add_argument(
-        "--command-paths",
-        help="JSON array of paths to custom commands files",
-        action="append",
-        default=None,
-    )
     group.add_argument(
         "--command-prefix",
         default=None,

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/cecli/coders/agent_coder.py

@@ -16,6 +16,7 @@ from litellm import experimental_mcp_client
 
 from cecli import urls, utils
 from cecli.change_tracker import ChangeTracker
+from cecli.helpers import nested
 from cecli.helpers.similarity import (
     cosine_similarity,
     create_bigram_vector,
@@ -105,50 +106,61 @@ class AgentCoder(Coder):
                 self.io.tool_warning(f"Failed to parse agent-config JSON: {e}")
                 return {}
 
-        if "large_file_token_threshold" not in config:
-            config["large_file_token_threshold"] = 25000
-
-        if "tools_paths" not in config:
-            config["tools_paths"] = []
-        if "tools_includelist" not in config:
-            config["tools_includelist"] = []
-        if "tools_excludelist" not in config:
-            config["tools_excludelist"] = []
+        config["large_file_token_threshold"] = nested.getter(
+            config, "large_file_token_threshold", 25000
+        )
+        config["skip_cli_confirmations"] = nested.getter(
+            config, "skip_cli_confirmations", nested.getter(config, "yolo", [])
+        )
 
-        if "include_context_blocks" in config:
-            self.allowed_context_blocks = set(config["include_context_blocks"])
-        else:
-            self.allowed_context_blocks = {
-                "context_summary",
-                "directory_structure",
-                "environment_info",
-                "git_status",
-                "symbol_outline",
-                "todo_list",
-                "skills",
-            }
+        config["tools_paths"] = nested.getter(config, "tools_paths", [])
+        config["tools_includelist"] = nested.getter(
+            config, ["tools_includelist", "tools_whitelist"], []
+        )
+        config["tools_excludelist"] = nested.getter(
+            config, ["tools_excludelist", "tools_blacklist"], []
+        )
 
-        if "exclude_context_blocks" in config:
-            for context_block in config["exclude_context_blocks"]:
-                try:
-                    self.allowed_context_blocks.remove(context_block)
-                except KeyError:
-                    pass
+        config["include_context_blocks"] = set(
+            nested.getter(
+                config,
+                "include_context_blocks",
+                {
+                    "context_summary",
+                    "directory_structure",
+                    "environment_info",
+                    "git_status",
+                    "symbol_outline",
+                    "todo_list",
+                    "skills",
+                },
+            )
+        )
+        config["exclude_context_blocks"] = set(nested.getter(config, "exclude_context_blocks", []))
 
         self.large_file_token_threshold = config["large_file_token_threshold"]
-        self.skip_cli_confirmations = config.get(
-            "skip_cli_confirmations", config.get("yolo", False)
-        )
+        self.skip_cli_confirmations = config["skip_cli_confirmations"]
+
+        self.allowed_context_blocks = config["include_context_blocks"]
+
+        for context_block in config["exclude_context_blocks"]:
+            try:
+                self.allowed_context_blocks.remove(context_block)
+            except KeyError:
+                pass
 
         if "skills" in self.allowed_context_blocks:
-            if "skills_paths" not in config:
-                config["skills_paths"] = []
-            if "skills_includelist" not in config:
-                config["skills_includelist"] = []
-            if "skills_excludelist" not in config:
-                config["skills_excludelist"] = []
-
-        if "skills" not in self.allowed_context_blocks or not config.get("skills_paths", []):
+            config["skills_paths"] = nested.getter(config, "skills_paths", [])
+            config["skills_includelist"] = nested.getter(
+                config, ["skills_includelist", "skills_whitelist"], []
+            )
+            config["skills_excludelist"] = nested.getter(
+                config, ["skills_excludelist", "skills_blacklist"], []
+            )
+
+        if "skills" not in self.allowed_context_blocks or not nested.getter(
+            config, "skills_paths", []
+        ):
             config["tools_excludelist"].append("loadskill")
             config["tools_excludelist"].append("removeskill")
 

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/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
+from cecli.helpers import coroutines, nested
 from cecli.helpers.profiler import TokenProfiler
 from cecli.history import ChatSummary
 from cecli.io import ConfirmGroup, InputOutput
@@ -61,7 +61,7 @@ from cecli.tools.utils.registry import ToolRegistry
 from cecli.utils import format_tokens, is_image_file
 
 from ..dump import dump  # noqa: F401
-from ..prompts.utils.prompt_registry import registry
+from ..prompts.utils.registry import PromptObject, PromptRegistry
 from .chat_chunks import ChatChunks
 
 
@@ -564,6 +564,29 @@ class Coder:
             except Exception as e:
                 self.io.tool_warning(f"Could not remove todo list file {todo_file_path}: {e}")
 
+        customizations = dict()
+        try:
+            if self.args:
+                customizations = nested.getter(self.args, "custom", "{}")
+                customizations = json.loads(customizations)
+        except (json.JSONDecodeError, TypeError):
+            customizations = dict()
+            pass
+
+        self.custom = customizations
+
+        if nested.getter(self.custom, "prompt_map.all", None):
+            prompts = PromptRegistry.get_prompt(nested.getter(self.custom, "prompt_map.all"))
+            prompt_obj = PromptObject(prompts)
+            Coder._prompt_cache[self.prompt_format] = prompt_obj
+
+        if nested.getter(self.custom, f"prompt_map.{self.prompt_format}", None):
+            prompts = PromptRegistry.get_prompt(
+                nested.getter(self.custom, f"prompt_map.{self.prompt_format}")
+            )
+            prompt_obj = PromptObject(prompts)
+            Coder._prompt_cache[self.prompt_format] = prompt_obj
+
         # validate the functions jsonschema
         if self.functions:
             from jsonschema import Draft7Validator
@@ -600,14 +623,7 @@ class Coder:
             return Coder._prompt_cache[prompt_name]
 
         # Get prompts from registry
-        prompts = registry.get_prompt(prompt_name)
-
-        # Create a simple object that allows attribute access
-        class PromptObject:
-            def __init__(self, prompts_dict):
-                for key, value in prompts_dict.items():
-                    setattr(self, key, value)
-
+        prompts = PromptRegistry.get_prompt(prompt_name)
         # Cache the prompt object
         prompt_obj = PromptObject(prompts)
         Coder._prompt_cache[prompt_name] = prompt_obj

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/cecli/commands/__init__.py

@@ -51,6 +51,7 @@ from .run import RunCommand
 from .save import SaveCommand
 from .save_session import SaveSessionCommand
 from .settings import SettingsCommand
+from .terminal_setup import TerminalSetupCommand
 from .test import TestCommand
 from .think_tokens import ThinkTokensCommand
 from .tokens import TokensCommand
@@ -123,6 +124,7 @@ CommandRegistry.register(CopyContextCommand)
 CommandRegistry.register(CommandPrefixCommand)
 CommandRegistry.register(LoadSkillCommand)
 CommandRegistry.register(RemoveSkillCommand)
+CommandRegistry.register(TerminalSetupCommand)
 
 
 __all__ = [
@@ -187,6 +189,7 @@ __all__ = [
     "CommandPrefixCommand",
     "LoadSkillCommand",
     "RemoveSkillCommand",
+    "TerminalSetupCommand",
     "SwitchCoderSignal",
     "Commands",
 ]

{cecli_dev-0.95.6.dev1 → cecli_dev-0.95.8}/cecli/commands/core.py

@@ -5,7 +5,7 @@ import sys
 from pathlib import Path
 
 from cecli.commands.utils.registry import CommandRegistry
-from cecli.helpers import plugin_manager
+from cecli.helpers import nested, plugin_manager
 from cecli.helpers.file_searcher import handle_core_files
 from cecli.repo import ANY_GIT_ERROR
 
@@ -80,13 +80,16 @@ class Commands:
         self.editor = editor
         self.original_read_only_fnames = set(original_read_only_fnames or [])
 
+        customizations = dict()
         try:
-            self.custom_commands = json.loads(getattr(self.args, "command_paths", "[]"))
-        except (json.JSONDecodeError, TypeError) as e:
-            self.io.tool_warning(f"Failed to parse command paths JSON: {e}")
-            self.custom_commands = []
-
-        # Load custom commands from plugin paths
+            if self.args:
+                customizations = nested.getter(self.args, "custom", "{}")
+                customizations = json.loads(customizations)
+        except (json.JSONDecodeError, TypeError):
+            customizations = dict()
+            pass
+
+        self.custom_commands = nested.getter(customizations, "command-paths", [])
         self._load_custom_commands(self.custom_commands)
 
         self.cmd_running_event = asyncio.Event()