cecli-dev 0.100.14__tar.gz → 1.0.0__tar.gz

{cecli_dev-0.100.14 → cecli_dev-1.0.0}/.github/workflows/ubuntu-tests.yml

@@ -50,6 +50,7 @@ jobs:
         uv pip install --system \
           pytest \
           pytest-asyncio \
+          pytest-env \
           pytest-mock \
           -r requirements/requirements.in \
           -r requirements/requirements-help.in \

{cecli_dev-0.100.14 → cecli_dev-1.0.0}/.gitignore

@@ -41,6 +41,7 @@ cecli/_version.py
 cecli/website/Gemfile.lock
 *.pyc
 env/
+__pycache__/
 
 # Ignore Folders
 cecli/website/_site/*

{cecli_dev-0.100.14 → cecli_dev-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.100.14
+Version: 1.0.0
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli
@@ -18,50 +18,49 @@ Classifier: Topic :: Software Development
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pydub>=0.25.1
 Requires-Dist: configargparse>=1.7.1
-Requires-Dist: GitPython>=3.1.45
-Requires-Dist: jsonschema>=4.25.0
-Requires-Dist: rich>=14.1.0
-Requires-Dist: prompt_toolkit
-Requires-Dist: backoff>=2.2.1
-Requires-Dist: pathspec>=0.12.1
-Requires-Dist: diskcache>=5.6.3
-Requires-Dist: packaging>=25.0
-Requires-Dist: sounddevice>=0.5.2
-Requires-Dist: soundfile>=0.13.1
-Requires-Dist: beautifulsoup4>=4.13.4
-Requires-Dist: PyYAML>=6.0.2
-Requires-Dist: diff-match-patch>=20241021
-Requires-Dist: pypandoc>=1.15
-Requires-Dist: litellm!=1.82.7,!=1.82.8,>=1.80.11
-Requires-Dist: flake8>=7.3.0
-Requires-Dist: importlib_resources
-Requires-Dist: pyperclip>=1.9.0
+Requires-Dist: shtab>=1.7.2
+Requires-Dist: oslex>=0.1.3
 Requires-Dist: pexpect>=4.9.0
-Requires-Dist: json5>=0.12.0
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: watchfiles>=1.1.0
-Requires-Dist: socksio>=1.0.0
-Requires-Dist: pillow>=11.3.0
-Requires-Dist: shtab>=1.7.2
-Requires-Dist: oslex>=0.1.3
+Requires-Dist: GitPython>=3.1.45
+Requires-Dist: pathspec>=0.12.1
+Requires-Dist: litellm!=1.82.7,!=1.82.8,>=1.80.11
 Requires-Dist: mcp>=1.24.0
-Requires-Dist: textual>=6.0.0
-Requires-Dist: tomlkit>=0.14.0
+Requires-Dist: socksio>=1.0.0
 Requires-Dist: truststore
-Requires-Dist: xxhash>=3.6.0
-Requires-Dist: py-cymbal>=0.2.1
 Requires-Dist: cryptography>=42.0.0
+Requires-Dist: xxhash>=3.6.0
+Requires-Dist: beautifulsoup4>=4.13.4
+Requires-Dist: pypandoc>=1.15
+Requires-Dist: diskcache>=5.6.3
 Requires-Dist: json-repair>=0.60.1
+Requires-Dist: jsonschema>=4.25.0
+Requires-Dist: PyYAML>=6.0.2
+Requires-Dist: tomli>=2.3.0; python_version <= "3.10"
+Requires-Dist: tomlkit>=0.14.0
+Requires-Dist: diff-match-patch>=20241021
+Requires-Dist: pyperclip>=1.9.0
+Requires-Dist: pydub>=0.25.1
+Requires-Dist: sounddevice>=0.5.2
+Requires-Dist: soundfile>=0.13.1
+Requires-Dist: pillow>=11.3.0
+Requires-Dist: prompt_toolkit
+Requires-Dist: rich>=14.1.0
+Requires-Dist: textual>=8.2.8
+Requires-Dist: blinker>=1.9.0
+Requires-Dist: websockets>=16.1.1
 Requires-Dist: marisa-trie>=1.0
-Requires-Dist: rapidfuzz>=3.0
 Requires-Dist: ngram>=4.0.3
+Requires-Dist: rapidfuzz>=3.0
 Requires-Dist: rustworkx>=0.15.0
 Requires-Dist: scipy>=1.15.3
 Requires-Dist: orjson>=3.11.6
+Requires-Dist: py-cymbal>=0.2.1
 Requires-Dist: importlib-metadata>=7.2.1
-Requires-Dist: tomli>=2.3.0; python_version <= "3.10"
+Requires-Dist: importlib_resources
+Requires-Dist: packaging>=25.0
 Requires-Dist: tree-sitter==0.23.2; python_version < "3.10"
 Requires-Dist: tree-sitter>=0.25.1; python_version >= "3.10"
 Requires-Dist: tree-sitter-language-pack<=0.13.0
@@ -81,6 +80,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: cogapp; extra == "dev"
 Requires-Dist: semver; extra == "dev"
 Requires-Dist: codespell; extra == "dev"
+Requires-Dist: flake8>=7.3.0; extra == "dev"
 Requires-Dist: uv; extra == "dev"
 Requires-Dist: memray; sys_platform != "win32" and extra == "dev"
 Requires-Dist: objgraph; extra == "dev"
@@ -219,8 +219,10 @@ This command will make sure all commands ran by the coding agent happen in conte
 * [TUI Configuration](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/tui.md)
 * [Skills](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/skills.md)
 * [Subagents](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/subagents.md)
+* [Persistent Memory](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/persistent-memory.md)
 * [Session Management](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/sessions.md)
 * [Hooks](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/hooks.md)
+* [Agent Client Protocol (ACP)](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/api.md)
 * [Workspaces](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/workspaces.md)
 * [Custom Commands](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/custom-commands.md)
 * [Custom System Prompts](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/custom-system-prompts.md)
@@ -241,11 +243,11 @@ The current priorities are to improve core capabilities and user experience of t
   * [x] [Include import information in repo map for richer context](https://github.com/Aider-AI/aider/issues/2688)
   * [x] [Handle non-unique symbols that break down in large codebases](https://github.com/Aider-AI/aider/issues/2341)
 
-3. **Context Discovery** - [Discussion](https://github.com/cecli-dev/cecli/issues/46)
-  * [ ] Develop AST-based search capabilities
+3. **Context Discovery** - [Discussion - Done with Cymbal Library](https://github.com/cecli-dev/cecli/issues/46)
+  * [x] Develop AST-based search capabilities
   * [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
+  * [x] Implement RAG (Retrieval-Augmented Generation) for better code retrieval
+  * [x] Build an explicit workflow and local tooling for internal discovery mechanisms
 
 4. **Context Delivery** - [Discussion](https://github.com/cecli-dev/cecli/issues/47)
   * [x] Use workflow for internal discovery to better target file snippets needed for specific tasks (ExploreCode and ReadRange)
@@ -285,11 +287,11 @@ The current priorities are to improve core capabilities and user experience of t
   * [x] Update agent mode edit tools to work with hashline identification
   * [x] Update internal file diff representation to support hashline propagation
 
-10. **Dynamic Context Management** 
+10. **Dynamic Context Management (Accomplished with subagents, orchestrate, and the facts db)** 
   * [x] Update compaction to use observational memory sub agent calls to generate decision records that are used as the compaction basis
-  * [ ] Persist decision records to disk for sessions with some settings for managing lifetimes of such persistence
-  * [ ] Integrate RLM to extract information from decision records on disk and other definable notes
-  * [ ] Add a "describe" tool that launches a sub agent workflow that populates an RLM call's context with:
+  * [x] Persist decision records to disk for sessions with some settings for managing lifetimes of such persistence
+  * [x] Integrate RLM-like facility to extract information from decision records on disk and other definable notes
+  * [x] Add a "describe" tool that launches a sub agent workflow that populates an RLM call's context with:
     * Current Conversation History
     * Past Decision Records
     * Repo Map Found Files

{cecli_dev-0.100.14 → cecli_dev-1.0.0}/README.md

@@ -123,8 +123,10 @@ This command will make sure all commands ran by the coding agent happen in conte
 * [TUI Configuration](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/tui.md)
 * [Skills](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/skills.md)
 * [Subagents](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/subagents.md)
+* [Persistent Memory](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/persistent-memory.md)
 * [Session Management](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/sessions.md)
 * [Hooks](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/hooks.md)
+* [Agent Client Protocol (ACP)](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/api.md)
 * [Workspaces](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/workspaces.md)
 * [Custom Commands](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/custom-commands.md)
 * [Custom System Prompts](https://github.com/cecli-dev/cecli/blob/main/cecli/website/docs/config/custom-system-prompts.md)
@@ -145,11 +147,11 @@ The current priorities are to improve core capabilities and user experience of t
   * [x] [Include import information in repo map for richer context](https://github.com/Aider-AI/aider/issues/2688)
   * [x] [Handle non-unique symbols that break down in large codebases](https://github.com/Aider-AI/aider/issues/2341)
 
-3. **Context Discovery** - [Discussion](https://github.com/cecli-dev/cecli/issues/46)
-  * [ ] Develop AST-based search capabilities
+3. **Context Discovery** - [Discussion - Done with Cymbal Library](https://github.com/cecli-dev/cecli/issues/46)
+  * [x] Develop AST-based search capabilities
   * [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
+  * [x] Implement RAG (Retrieval-Augmented Generation) for better code retrieval
+  * [x] Build an explicit workflow and local tooling for internal discovery mechanisms
 
 4. **Context Delivery** - [Discussion](https://github.com/cecli-dev/cecli/issues/47)
   * [x] Use workflow for internal discovery to better target file snippets needed for specific tasks (ExploreCode and ReadRange)
@@ -189,11 +191,11 @@ The current priorities are to improve core capabilities and user experience of t
   * [x] Update agent mode edit tools to work with hashline identification
   * [x] Update internal file diff representation to support hashline propagation
 
-10. **Dynamic Context Management** 
+10. **Dynamic Context Management (Accomplished with subagents, orchestrate, and the facts db)** 
   * [x] Update compaction to use observational memory sub agent calls to generate decision records that are used as the compaction basis
-  * [ ] Persist decision records to disk for sessions with some settings for managing lifetimes of such persistence
-  * [ ] Integrate RLM to extract information from decision records on disk and other definable notes
-  * [ ] Add a "describe" tool that launches a sub agent workflow that populates an RLM call's context with:
+  * [x] Persist decision records to disk for sessions with some settings for managing lifetimes of such persistence
+  * [x] Integrate RLM-like facility to extract information from decision records on disk and other definable notes
+  * [x] Add a "describe" tool that launches a sub agent workflow that populates an RLM call's context with:
     * Current Conversation History
     * Past Decision Records
     * Repo Map Found Files

{cecli_dev-0.100.14 → cecli_dev-1.0.0}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.100.14'
-__version_tuple__ = version_tuple = (0, 100, 14)
+__version__ = version = '1.0.0'
+__version_tuple__ = version_tuple = (1, 0, 0)
 
-__commit_id__ = commit_id = 'gd2fa11692'
+__commit_id__ = commit_id = 'gfff4a888e'

{cecli_dev-0.100.14 → cecli_dev-1.0.0}/cecli/args.py

@@ -18,6 +18,72 @@ from cecli.deprecated_args import add_deprecated_mcp_args, add_deprecated_model_
 
 from .dump import dump  # noqa: F401
 
+# ── Deep-merge field sets ────────────────────────────────────────────
+# These define which config keys require special merge handling for
+# .cecli.conf.yml files (deep-merge instead of shallow-overwrite).
+
+DEEP_MERGE_LIST_FIELDS: frozenset[str] = frozenset(
+    {
+        # ── Top-level argparse action="append" args ──────────────────
+        # These are excluded from configargparse for .cecli.conf.yml files
+        # (to prevent shallow overwrite), so they must be deep-merged here.
+        "rules",
+        "file",
+        "read",
+        "mcp_servers_files",
+        "set_env",
+        "api_key",
+        "alias",
+        "exempt_paths",
+        "lint_cmd",
+        # ── Nested agent-config array fields ─────────────────────────
+        "skills_paths",
+        "skills_includelist",
+        "skills_excludelist",
+        "skills_init",
+        "subagent_paths",
+        "tools_paths",
+        "tools_includelist",
+        "tools_excludelist",
+        "servers_includelist",
+        "servers_excludelist",
+        "allowed_commands",
+    }
+)
+
+
+DEEP_MERGE_JSON_FIELDS: frozenset[str] = frozenset(
+    {
+        "agent_config",
+        "mcp_servers",
+        "hooks",
+        "model_providers",
+        "security_config",
+        "retries",
+        "custom",
+        "tui_config",
+    }
+)
+
+
+# Agent-config array fields (subset of DEEP_MERGE_LIST_FIELDS used by
+# agent_coder to validate agent config before passing to sub-agents).
+AGENT_CONFIG_LIST_FIELDS: frozenset[str] = frozenset(
+    {
+        "skills_paths",
+        "skills_includelist",
+        "skills_excludelist",
+        "skills_init",
+        "subagent_paths",
+        "tools_paths",
+        "tools_includelist",
+        "tools_excludelist",
+        "servers_includelist",
+        "servers_excludelist",
+        "allowed_commands",
+    }
+)
+
 
 def resolve_cecli_ignore_path(path_str, git_root=None):
     path = Path(path_str)
@@ -378,6 +444,12 @@ def get_parser(default_config_files, git_root):
             " (default: False)"
         ),
     )
+    group.add_argument(
+        "--auto-memory",
+        action=argparse.BooleanOptionalAction,
+        default=False,
+        help="Enable/disable automatic fact memorization after changes and compaction (default: True)",
+    )
     group.add_argument(
         "--session-encrypt",
         action=argparse.BooleanOptionalAction,
@@ -452,6 +524,14 @@ def get_parser(default_config_files, git_root):
         default=True,
         help="Enable automatic compaction of chat history to conserve tokens (default: False)",
     )
+    group.add_argument(
+        "--max-compaction-retries",
+        type=int,
+        default=3,
+        metavar="N",
+        choices=range(1, 11),
+        help="Maximum number of compactions per request before propagating the error (default: 3, min: 1, max: 10)",
+    )
     group.add_argument(
         "--context-compaction-max-tokens",
         type=float,
@@ -467,6 +547,15 @@ def get_parser(default_config_files, git_root):
         default=4096,
         help="The target maximum number of tokens for the generated summary. (default: 4096)",
     )
+    group.add_argument(
+        "--ignore-context-limit",
+        action=argparse.BooleanOptionalAction,
+        default=False,
+        help=(
+            "Ignore the model's context window limit when sending requests."
+            " WARNING: This may cause API errors or truncated responses. (default: False)"
+        ),
+    )
 
     ##########
     group = parser.add_argument_group("Cache settings")
@@ -1162,6 +1251,15 @@ def get_parser(default_config_files, git_root):
         ),
     )
 
+    ##########
+    group = parser.add_argument_group("Server settings")
+    group.add_argument(
+        "--server-config",
+        metavar="SERVER_CONFIG_JSON",
+        help="Specify server configuration (WebSocket and headless) as a JSON/YAML string",
+        default=None,
+    )
+
     ##########
     group = parser.add_argument_group("Deprecated model settings")
     # Add deprecated model shortcut arguments

{cecli_dev-0.100.14 → cecli_dev-1.0.0}/cecli/coders/agent_coder.py

@@ -12,6 +12,7 @@ from collections import defaultdict
 from datetime import datetime
 from pathlib import Path
 
+from cecli.args import AGENT_CONFIG_LIST_FIELDS
 from cecli.change_tracker import ChangeTracker
 from cecli.helpers import nested, responses
 from cecli.helpers.agents.service import AgentService
@@ -62,19 +63,19 @@ class AgentCoder(Coder):
         self.max_tool_vector_history = 20
         self.read_tools = {
             "command",
-            "commandinteractive",
             "explorecode",
             "ls",
             "readfile",
             "grep",
             "thinking",
             "updatetodolist",
+            "searchfacts",
         }
         self.write_tools = {
             "command",
-            "commandinteractive",
             "editfile",
             "undochange",
+            "replacefacts",
         }
         self.edit_allowed = True
         self.max_tool_calls = 10000
@@ -83,6 +84,7 @@ class AgentCoder(Coder):
         self.change_tracker = ChangeTracker()
         self.args = kwargs.get("args")
         self.files_added_in_exploration = set()
+        self.file_read_cache = set()
         self.tool_call_count = 0
         self.turn_count = 0
         self.max_reflections = 15
@@ -97,8 +99,9 @@ class AgentCoder(Coder):
         self.tokens_calculated = False
         self.skip_cli_confirmations = False
         self.agent_finished = False
-        self.agent_config = self._get_agent_config()
-        self.max_sub_agents = self.agent_config.get("max_sub_agents", 3)
+        init_metadata = kwargs.pop("init_metadata", {})
+        self.agent_config = self._get_agent_config(config=init_metadata)
+        self.max_sub_agents = self.agent_config.get("max_sub_agents", 30)
         self.sub_agent_paths = self.agent_config.get("subagent_paths", [])
         self._setup_agent()
 
@@ -134,22 +137,53 @@ class AgentCoder(Coder):
     def _setup_agent(self):
         os.makedirs(".cecli/temp", exist_ok=True)
 
-    def _get_agent_config(self):
+    def _get_agent_config(self, config=None):
         """
         Parse and return agent configuration from args.agent_config.
 
+        Args:
+            config: Optional dict of metadata (e.g. sub-agent front matter)
+                    that is merged on top of args.agent_config. Parameter
+                    takes priority over args.agent_config values.
+
         Returns:
             dict: Agent configuration with defaults for missing values
         """
-        config = {}
-        if (
+        config = config or {}
+
+        # init_metadata provides agent-config directly, replacing args
+        if "agent_config" in config and config["agent_config"]:
+            config = config["agent_config"]
+        # Primary agent: load from args.agent_config
+        elif (
             hasattr(self, "args")
             and self.args
             and hasattr(self.args, "agent_config")
             and self.args.agent_config
         ):
             try:
-                config = json.loads(self.args.agent_config)
+                args_config = json.loads(self.args.agent_config)
+
+                # Validate that array fields are lists, wrap scalars in lists
+                list_fields = AGENT_CONFIG_LIST_FIELDS
+
+                for field in list_fields:
+                    if field in args_config:
+                        if args_config[field] is None:
+                            # YAML null / JSON null -> treat as empty list
+                            args_config[field] = []
+                        elif not isinstance(args_config[field], list):
+                            self.start_up_errors.append(
+                                f"agent-config field '{field}' should be a list but got "
+                                f"{type(args_config[field]).__name__}, wrapping in list"
+                            )
+                            args_config[field] = [args_config[field]]
+
+                # Merge metadata (caller-provided config) on top of
+                # args.agent_config so sub-agent front matter takes priority.
+                args_config.update(config)
+                config = args_config
+
             except (json.JSONDecodeError, TypeError) as e:
                 self.start_up_errors.append(f"Failed to parse agent-config JSON: {e}")
                 return {}
@@ -167,6 +201,11 @@ class AgentCoder(Coder):
         config["hot_reload"] = nested.getter(config, "hot_reload", False)
         config["diff_colors"] = nested.getter(config, "diff_colors", True)
         config["allow_nested_delegation"] = nested.getter(config, "allow_nested_delegation", False)
+        config["allow_orchestration"] = nested.getter(config, "allow_orchestration", True)
+        config["max_sub_agents"] = nested.getter(config, "max_sub_agents", 30)
+
+        if config["max_sub_agents"] == -1:
+            config["max_sub_agents"] = 2 ^ 31 - 1
 
         config["tools_paths"] = nested.getter(config, ["tools_paths", "tool_paths"], [])
         config["tools_includelist"] = nested.getter(
@@ -175,15 +214,28 @@ class AgentCoder(Coder):
         config["tools_excludelist"] = nested.getter(
             config,
             ["tools_excludelist", "tools_blacklist"],
-            ["gitbranch", "gitdiff", "gitlog", "gitremote", "gitshow", "gitstatus"],
+            [
+                "gitbranch",
+                "gitdiff",
+                "gitlog",
+                "gitremote",
+                "gitshow",
+                "gitstatus",
+                "searchfacts",
+                "replacefacts",
+            ],
         )
 
+        if config["tools_includelist"]:
+            config["tools_includelist"].append("yield")
+
         config["servers_includelist"] = nested.getter(
             config, ["servers_includelist", "servers_whitelist"], []
         )
         config["servers_excludelist"] = nested.getter(
             config, ["servers_excludelist", "servers_blacklist"], []
         )
+
         config["include_context_blocks"] = set(
             nested.getter(
                 config,
@@ -203,6 +255,14 @@ class AgentCoder(Coder):
         )
         config["exclude_context_blocks"] = set(nested.getter(config, "exclude_context_blocks", []))
 
+        if config["allow_orchestration"]:
+            config["include_context_blocks"].add("orchestration")
+            config["exclude_context_blocks"].discard("orchestration")
+        else:
+            config["include_context_blocks"].discard("orchestration")
+            config["exclude_context_blocks"].add("orchestration")
+            config["tools_excludelist"].append("orchestrate")
+
         self.large_file_token_threshold = config["large_file_token_threshold"]
         self.skip_cli_confirmations = config["skip_cli_confirmations"]
         self.hot_reload_enabled = config["hot_reload"]
@@ -292,6 +352,7 @@ class AgentCoder(Coder):
 
     async def _execute_mcp_tool(self, server, tool_name, params):
         """Helper to execute a single MCP tool call, created from legacy format."""
+        from cecli.tools.utils.responses import ToolResponse
 
         async def _exec_async():
             function_dict = {"name": tool_name, "arguments": json.dumps(params)}
@@ -350,9 +411,14 @@ class AgentCoder(Coder):
 
         result, interrupted = await interruptible(_exec_async(), self.interrupt_event)
 
+        response = ToolResponse(tool_name)
         if interrupted:
-            return "Tool execution interrupted by user."
-        return result
+            response.append_error("Tool execution interrupted by user.")
+        elif isinstance(result, str) and result.startswith("Error executing tool call"):
+            response.append_error(result)
+        else:
+            response.append_result(result)
+        return response
 
     def _calculate_context_block_tokens(self, force=False):
         """
@@ -383,6 +449,7 @@ class AgentCoder(Coder):
                 "servers",
                 "sub_agents",
                 "loaded_skills",
+                "orchestration",
             ]
             for block_type in block_types:
                 if block_type in self.allowed_context_blocks:
@@ -419,6 +486,8 @@ class AgentCoder(Coder):
             content = self.get_servers_context()
         elif block_name == "loaded_skills":
             content = self.get_skills_content()
+        elif block_name == "orchestration":
+            content = self.get_orchestration_context()
         elif block_name == "sub_agents" and (
             not self.parent_uuid or self.agent_config.get("allow_nested_delegation", False)
         ):
@@ -897,7 +966,7 @@ class AgentCoder(Coder):
                 {
                     "role": "tool",
                     "tool_call_id": tool_call.id,
-                    "content": result,
+                    "content": str(result),
                 }
             )
         return tool_responses
@@ -1601,6 +1670,23 @@ Todo list does not exist. Please update it with the `UpdateTodoList` tool.</cont
             self.io.tool_error(f"Error generating servers context: {str(e)}")
             return None
 
+    def get_orchestration_context(self):
+        """
+        Generate a context block for the Orchestrate tool if allowed.
+
+        Only returns content if ``allow_orchestration`` is enabled in the agent config.
+        """
+        if not self.use_enhanced_context:
+            return None
+
+        try:
+            from cecli.helpers.orchestration import build_orchestration_context_block
+
+            return build_orchestration_context_block(self.agent_config)
+        except Exception as e:
+            self.io.tool_error(f"Error generating orchestration context: {str(e)}")
+            return None
+
     def get_sub_agents_context(self):
         """
         Generate a context block for registered sub-agents.