Merge pull request #472 from dwash96/v0.98.0

V0.98.0

Author: dwash96

CONTRIBUTING.md

@@ -159,4 +159,4 @@ The project's documentation is built using Jekyll and hosted on GitHub Pages. To
    bundle exec jekyll serve
    ```
 
-The built documentation will be available in the `aider/website/_site` directory.
+The built documentation will be available in the `cecli/website/_site` directory.

README.md

@@ -165,9 +165,9 @@ The current priorities are to improve core capabilities and user experience of t
 
 7. **Sub Agents**
   * [ ] Add `/fork` and `/rejoin` commands to manually manage parts of the conversation history
-  * [ ] Add an instance-able view of the conversation system so sub agents get their own context and workspaces
-  * [ ] Modify coder classes to have discrete identifiers for themselves/management utilities for them to have their own slices of the world
-  * [ ] Refactor global files like todo lists to live inside instance folders to avoid state conflicts
+  * [x] Add an instance-able view of the conversation system so sub agents get their own context and workspaces
+  * [x] Modify coder classes to have discrete identifiers for themselves/management utilities for them to have their own slices of the world
+  * [x] Refactor global files like todo lists to live inside instance folders to avoid state conflicts
   * [ ] Add a `spawn` tool that launches a sub agent as a background command that the parent model waits for to finish
   * [ ] Add visibility into active sub agent calls in TUI
 

benchmark/benchmark.py

@@ -990,7 +990,7 @@ async def run_test_real(
 
     from cecli import models
     from cecli.coders import Coder
-    from cecli.helpers.conversation import ConversationFiles, ConversationManager
+    from cecli.helpers.conversation import ConversationService
     from cecli.io import InputOutput
     from cecli.main import SwitchCoderSignal
 
@@ -1211,13 +1211,12 @@ async def run_test_real(
     dur = 0
     test_outcomes = []
 
-    ConversationManager.initialize(
-        coder,
+    ConversationService.get_manager(coder).initialize(
         reset=True,
         reformat=True,
     )
 
-    ConversationFiles.reset()
+    ConversationService.get_files(coder).reset()
 
     for i in range(tries):
         start = time.time()

cecli/__init__.py

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

cecli/args.py

@@ -14,7 +14,7 @@
     MarkdownHelpFormatter,
     YamlHelpFormatter,
 )
-from cecli.deprecated_args import add_deprecated_model_args
+from cecli.deprecated_args import add_deprecated_mcp_args, add_deprecated_model_args
 
 from .dump import dump  # noqa: F401
 
@@ -364,10 +364,11 @@ def get_parser(default_config_files, git_root):
         default=None,
     )
     group.add_argument(
-        "--mcp-servers-file",
-        metavar="MCP_CONFIG_FILE",
-        help="Specify a file path with MCP server configurations",
-        default=None,
+        "--mcp-servers-files",
+        metavar="MCP_CONFIG_FILES",
+        help="Specify a file path with MCP server configurations (can be specified multiple times)",
+        action="append",
+        default=[],
     )
     group.add_argument(
         "--mcp-transport",
@@ -961,6 +962,12 @@ def get_parser(default_config_files, git_root):
         metavar="FILE",
         help="specify a read-only file (can be used multiple times, glob patterns supported)",
     ).complete = shtab.FILE
+    group.add_argument(
+        "--rules",
+        action="append",
+        metavar="FILE",
+        help="specify a rules file (can be used multiple times, glob patterns supported)",
+    ).complete = shtab.FILE
     group.add_argument(
         "--vim",
         action="store_true",
@@ -1089,6 +1096,9 @@ def get_parser(default_config_files, git_root):
     # Add deprecated model shortcut arguments
     add_deprecated_model_args(parser, group)
 
+    group = parser.add_argument_group("Deprecated agent settings")
+    add_deprecated_mcp_args(parser, group)
+
     return parser