cecli-dev 0.100.12__tar.gz → 1.0.0rc1__tar.gz

{cecli_dev-0.100.12 → cecli_dev-1.0.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.100.12
+Version: 1.0.0rc1
 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.100.12 → cecli_dev-1.0.0rc1}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.100.12'
-__version_tuple__ = version_tuple = (0, 100, 12)
+__version__ = version = '1.0.0rc1'
+__version_tuple__ = version_tuple = (1, 0, 0, 'rc1')
 
-__commit_id__ = commit_id = 'gc92e7dc31'
+__commit_id__ = commit_id = 'ge71e8173f'

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

@@ -98,7 +98,7 @@ class AgentCoder(Coder):
         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)
+        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()
 
@@ -167,6 +167,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(
@@ -184,6 +189,7 @@ class AgentCoder(Coder):
         config["servers_excludelist"] = nested.getter(
             config, ["servers_excludelist", "servers_blacklist"], []
         )
+
         config["include_context_blocks"] = set(
             nested.getter(
                 config,
@@ -203,6 +209,10 @@ 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")
+
         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 +302,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)}
@@ -331,9 +342,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):
         """
@@ -364,6 +380,7 @@ class AgentCoder(Coder):
                 "servers",
                 "sub_agents",
                 "loaded_skills",
+                "orchestration",
             ]
             for block_type in block_types:
                 if block_type in self.allowed_context_blocks:
@@ -400,6 +417,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)
         ):
@@ -878,7 +897,7 @@ class AgentCoder(Coder):
                 {
                     "role": "tool",
                     "tool_call_id": tool_call.id,
-                    "content": result,
+                    "content": str(result),
                 }
             )
         return tool_responses
@@ -1582,6 +1601,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.

{cecli_dev-0.100.12 → cecli_dev-1.0.0rc1}/cecli/coders/base_coder.py

@@ -4239,9 +4239,12 @@ class Coder(metaclass=UsageMeta):
         if tokens < warn_number_of_tokens:
             return
 
-        self.io.tool_warning("Warning: it's best to only add files that need changes to the chat.")
-        self.io.tool_warning(urls.edit_errors)
-        self.warning_given = True
+        if self.context_compaction_current_ratio > 0.5:
+            self.io.tool_warning(
+                "Warning: it's best to only add files that need changes to the chat."
+            )
+            self.io.tool_warning(urls.edit_errors)
+            self.warning_given = True
 
     async def prepare_to_edit(self, edits):
         res = []

{cecli_dev-0.100.12 → cecli_dev-1.0.0rc1}/cecli/helpers/agents/service.py

@@ -228,7 +228,7 @@ class AgentService:
     @property
     def max_sub_agents(self) -> int:
         """Return the max number of sub-agents allowed for this coder."""
-        return getattr(self.coder, "max_sub_agents", 3)
+        return getattr(self.coder, "max_sub_agents", 30)
 
     # ------------------------------------------------------------------ #
     # Internal helpers
@@ -495,7 +495,7 @@ class AgentService:
             )
 
         new_coder = await Coder.create(**kwargs)
-        new_coder.max_sub_agents = getattr(self.coder, "max_sub_agents", 3)
+        new_coder.max_sub_agents = getattr(self.coder, "max_sub_agents", 30)
         # IOProxy wrapping is handled by base_coder.py's Coder.__init__
 
         # Re-acquire the lock to register — we must re-check max agents since

{cecli_dev-0.100.12 → cecli_dev-1.0.0rc1}/cecli/helpers/conversation/files.py

@@ -116,9 +116,7 @@ class ConversationFiles:
                 try:
                     content = coder.io.read_text(abs_fname, silent=True)
                     if coder.hashlines:
-                        content, json_str = hashline_formatted(
-                            content, file_name=abs_fname, partial=False, expanded=False
-                        )
+                        content, json_str = hashline_formatted(content, file_name=abs_fname)
                         self._file_json_contents[abs_fname] = json_str
                 except Exception:
                     content = ""  # Empty content for unreadable files
@@ -236,9 +234,7 @@ class ConversationFiles:
         try:
             current_content = coder.io.read_text(abs_fname, silent=True)
             if coder.hashlines:
-                current_content, _ = hashline_formatted(
-                    current_content, file_name=abs_fname, partial=False, expanded=False
-                )
+                current_content, _ = hashline_formatted(current_content, file_name=abs_fname)
         except Exception:
             return None
 
@@ -607,12 +603,30 @@ class ConversationFiles:
             ):
                 continue
 
-            _, json_str = hashline_formatted(
-                range_content,
+            # Hash the full content first so that adjacent-line hashes
+            # are computed with proper surrounding context from the complete
+            # file, then extract only the range's lines. This ensures content
+            # IDs are consistent with other tools (e.g., ReadFile) that hash
+            # the full file content.
+            full_prefixed, _ = hashline_formatted(
+                content,
                 file_name=abs_fname,
-                partial=True,
-                expanded=False,
-                start_line=start_line_adj,
+                total_lines=len(content_lines),
+                start_line=1,
+            )
+            prefixed_lines = full_prefixed.splitlines()
+            range_prefixed_lines = prefixed_lines[start_line_adj - 1 : end_line_adj]
+            range_prefixed_content = "\n".join(range_prefixed_lines)
+
+            json_str = json.dumps(
+                {
+                    "file_name": abs_fname,
+                    "start_line": start_line_adj,
+                    "end_line": end_line_adj,
+                    "total_lines": len(content_lines),
+                    "prefixed_contents": range_prefixed_content,
+                },
+                ensure_ascii=False,
             )
             results.append(json.loads(json_str))
 

{cecli_dev-0.100.12 → cecli_dev-1.0.0rc1}/cecli/helpers/conversation/integration.py

@@ -809,6 +809,10 @@ class ConversationChunks:
                 block = coder._generate_context_block("servers")
                 if block:
                     message_blocks["servers"] = block
+            if "orchestration" in coder.allowed_context_blocks:
+                block = coder._generate_context_block("orchestration")
+                if block:
+                    message_blocks["orchestration"] = block
 
         # Add static blocks to conversation manager with stable hash keys
         for block_type, block_content in message_blocks.items():

{cecli_dev-0.100.12 → cecli_dev-1.0.0rc1}/cecli/helpers/grep_ast/grep_ast.py

@@ -214,17 +214,24 @@ class TreeContext:
             # reset
             output += "\033[0m\n"
 
-        dots = not (0 in self.show_lines)
+        # dots = not (0 in self.show_lines)
+        in_gap = False
+        gap_start = -1
         for i, line in enumerate(self.lines):
             if i not in self.show_lines:
-                if dots:
-                    if self.line_number:
-                        output += "...⋮...\n"
-                    else:
-                        output += "⋮\n"
-                    dots = False
+                if not in_gap:
+                    in_gap = True
+                    gap_start = i
                 continue
 
+            if in_gap:
+                omitted = i - gap_start
+                if self.line_number:
+                    output += f"...⋮... [{omitted} lines omitted (L{gap_start + 1}–L{i})]\n"
+                else:
+                    output += f"⋮ [{omitted} lines omitted]\n"
+                in_gap = False
+
             if i in self.lines_of_interest and self.mark_lois:
                 spacer = "█"
                 if self.color:
@@ -237,7 +244,7 @@ class TreeContext:
                 line_output = f"{i + 1: 3}" + line_output
             output += line_output + "\n"
 
-            dots = True
+            # dots = True
 
         return output
 

{cecli_dev-0.100.12 → cecli_dev-1.0.0rc1}/cecli/helpers/hashline.py

@@ -30,7 +30,7 @@ def hashline(text: str, start_line: int = 1) -> str:
 
 
 def hashline_formatted(
-    text: str, file_name: str, partial: bool, expanded: bool, start_line: int = 1
+    text: str, file_name: str, total_lines: int = 0, start_line: int = 1
 ) -> tuple[str, str]:
     """
     Generate hashline-formatted content and return it as both raw hashline text and a JSON structure.
@@ -55,8 +55,7 @@ def hashline_formatted(
         "file_name": file_name,
         "start_line": start_line,
         "end_line": end_line,
-        "partial": partial,
-        "expanded": expanded,
+        "total_lines": total_lines if total_lines else hp.total,
         "prefixed_contents": prefixed,
     }
 

cecli_dev-1.0.0rc1/cecli/helpers/hashpos/hashpos.py

@@ -0,0 +1,247 @@
+import re
+
+import xxhash
+
+
+class HashPos:
+    # 1024-character Base1024 corpus
+    B1024 = (
+        "0123456789ABCDEFGHIJ"
+        "KLMNOPQRSTUVWXYZabcd"
+        "efghijklmnopqrstuvwx"
+        "yz¡£§©«®°±·»¿×ßæðøĐđ"
+        "ıłœəαβγδεηθικλμνοπρς"
+        "στυφχωАБВГДЕЗИКЛМНОП"
+        "РСТУФЦЧЭЯабвгдежзикл"
+        "мнопрстуфхцчшщъыьэюя"
+        "іאבדהוחילמנערשת،ابةت"
+        "ثجحخدذرزسشصضطظعغفقكل"
+        "منهوىيپکگیकतनपमरलसहন"
+        "রกขคงจชณดตถทนบปผพมยร"
+        "ลวสหอะาเแใไ‐–—―‘’“”„"
+        "†•′※€←→−─│█■●★☆♥♪、。《"
+        "》「」『』【】〜あいうえおかきくけこさし"
+        "すせそたちっつてとなにのはまみめもやよら"
+        "りるれろわをんアィイウェエオカキクコサシ"
+        "スセタチッテトナニフマムメャュョラリルレ"
+        "ロン・ー一万三上下不与专业东两个中为主么"
+        "义之也书了事二于五些交产享京人亿今介从他"
+        "付代以们件价任份企会传但位体何余作你使例"
+        "供価保信修倍值停像元先入全公共关其具内円"
+        "册再写出击分列则初利别到制前力功加务动動"
+        "包化北区十午华单南即历原去县参及友反发取"
+        "变口只可台右号司合同名后向否含听启告员周"
+        "命和品哈商問器四回因国图土在地场型城基報"
+        "場增声处备复外多大天失头女好如始子字存学"
+        "安完定实客家容密对导将小少尔就局展山岁州"
+        "工左已市布常平年并广序库应店度建开式引张"
+        "当录形影径待後得微心必志态思性总息您情意"
+        "感成我或户所手打技投报拉持指按换据排接推"
+        "提播支收改放政效数整文料断新方族无日时明"
+        "易星是時景更最月有服期木未本机权束条来板"
+        "构果查标样格案模次款止正此步歳段每比民気"
+        "水求江没治法注活流海消清游源火点無然片版"
+        "物特率环现球理生用由电男画界番登的目直相"
+        "省看県真知码确示社票私种科秒称移程税空立"
+        "站章端笑符第等简算管米类系素索约级线组经"
+        "结给统编网置美老考者而联能自至色节英藏行"
+        "表装西要見见规视角解言計記話読计认议记论"
+        "设证评试话该语误说请读调象责败货费资起超"
+        "路身车转载辑输达过运近还这进连述退送选通"
+        "速造連道部都配释里重量金错长開間関门闭问"
+        "间队阳陆限院除雅集雷需非面音页项题首验高"
+        "黑가간개거게결경고공과구그글기나내는능니"
+        "다당대도동되된드든들디라래러력로록료류른"
+        "를름리만메면명목문미버번보복부분비사산상"
+        "색생서성세션소수스습시식신아야어에여열오"
+        "와요용우운원위으은을음의이인일임입자작장"
+        "재적전정제져조주지진째체출치크태터턴트하"
+        "한할함해호화환회�ª²³´µ¹º¼½ÀÁ"
+        "ÂÃÄÇ"
+    )
+
+    # We escape every individual character just to be completely safe from regex metacharacters
+    _B1024_REGEX_SET = "".join(re.escape(c) for c in B1024)
+
+    # Regex pattern for HashPos format: {3-char-hash}::
+    HASH_PREFIX_RE = re.compile(rf"^([{_B1024_REGEX_SET}]{{3}})::")
+    # Regex for normalization: 3 hash chars optionally followed by '::'
+    NORMALIZE_RE = re.compile(rf"^([{_B1024_REGEX_SET}]{{3}})(?:)?::")
+    # Regex for a raw 3-character fragment
+    FRAGMENT_RE = re.compile(rf"^[{_B1024_REGEX_SET}]{{3}}$")
+
+    # Looser pattern: any 3 chars with at least one non-ASCII followed by ::
+    _LOOSE_PREFIX_RE = re.compile(r"^(?=.{0,2}[^\x00-\x7f]).{3}::")
+
+    def __init__(self, source_text: str = ""):
+        self.lines = source_text.splitlines()
+        self.total = len(self.lines)
+
+    def _get_line_hash(self, text: str) -> int:
+        """
+        Creates a 20-bit digest of the current line's text.
+        """
+        return xxhash.xxh3_64_intdigest(text.encode("utf-8")) & 0xFFFFF
+
+    def _get_adjacent_hash(self, line_idx: int) -> int:
+        """
+        Creates a 10-bit digest of specific surrounding lines at offsets
+        -7, -5, -3, -2, +2, +3, +5, +7 to provide local context.
+        """
+        offsets = [-7, -5, -3, -2, 2, 3, 5, 7]
+        adjacent_lines = []
+
+        for offset in offsets:
+            target_idx = line_idx + offset
+            if 0 <= target_idx < self.total:
+                adjacent_lines.append(self.lines[target_idx])
+
+        context = "\n".join(adjacent_lines)
+        return xxhash.xxh3_64_intdigest(context.encode("utf-8")) & 0x3FF
+
+    def generate_private_id(self, text: str) -> str:
+        """
+        Generates a fast 12-bit (3 hex chars) hash based purely on the line text.
+        """
+        bits = xxhash.xxh3_64_intdigest(text.encode("utf-8")) & 0xFFF
+        return f"{bits:03x}"
+
+    def generate_public_id(self, text: str, line_idx: int) -> str:
+        """
+        Generates a 3-character Base1024 ID.
+        Layout: [20-bit Line Hash] [10-bit Adjacent Hash] = 30 bits total.
+        Each Base1024 character holds 10 bits.
+        """
+        line_hash = self._get_line_hash(text)
+        adj_hash = self._get_adjacent_hash(line_idx)
+
+        # Pack the 30-bit integer
+        packed = (line_hash << 10) | adj_hash
+
+        res = ""
+        for _ in range(3):
+            # Extract 10 bits at a time using modulo 1024
+            res += self.B1024[packed % 1024]
+            packed //= 1024
+        return res
+
+    def unpack_public_id(self, public_id: str) -> tuple[int, int]:
+        """
+        Reverses the Public ID back into its (Line Hash, Adjacent Hash) values.
+        """
+        packed = 0
+        for i, char in enumerate(public_id):
+            # Each character restores 10 bits
+            packed |= self.B1024.index(char) << (10 * i)
+
+        # Extract bits based on layout
+        line_hash = (packed >> 10) & 0xFFFFF
+        adj_hash = packed & 0x3FF
+
+        return line_hash, adj_hash
+
+    def format_content(self, use_private_ids: bool = False, start_line: int = 1) -> str:
+        formatted_lines = []
+        for i, line in enumerate(self.lines):
+            prefix = (
+                self.generate_private_id(line)
+                if use_private_ids
+                else self.generate_public_id(line, i)
+            )
+            if line.strip():
+                formatted_lines.append(f"{prefix}::{line}")
+            else:
+                formatted_lines.append(f"{line}")
+
+        return "\n".join(formatted_lines)
+
+    def resolve_to_lines(self, public_id: str, start_line: int = 1) -> list[int]:
+        target_line_hash, target_adj_hash = self.unpack_public_id(public_id)
+        matches = []
+
+        # 1. Primary Filter: Find all lines whose 20-bit line content hash matches
+        for i, line in enumerate(self.lines):
+            if self._get_line_hash(line) == target_line_hash:
+                matches.append(i)
+
+        if not matches:
+            return []
+
+        # If perfectly unique (highly likely given 20 bits of line entropy), return immediately
+        if len(matches) == 1:
+            return matches
+
+        # 2. Tie-Breaking Heuristic:
+        # If multiple identical lines exist, score them based on adjacency match.
+        def score_match(idx: int) -> int:
+            # Adjacency match: 0 means exact match, 1 means mismatch (we want lower scores)
+            return 0 if self._get_adjacent_hash(idx) == target_adj_hash else 1
+
+        matches.sort(key=score_match)
+
+        return matches
+
+    def resolve_range(self, start_id: str, end_id: str) -> tuple[int, int]:
+        """
+        Resolves a block range from two Public IDs.
+        """
+        starts = self.resolve_to_lines(start_id)
+        ends = self.resolve_to_lines(end_id)
+
+        if not starts or not ends:
+            raise ValueError(f"Could not resolve IDs: {start_id}..{end_id}")
+
+        for s in starts:
+            for e in ends:
+                if s <= e:
+                    return s, e
+
+        raise ValueError(
+            f"Found matches for {start_id} and {end_id}, but no logically ordered range or unique matches."
+        )
+
+    @staticmethod
+    def strip_prefix(text: str) -> str:
+        """
+        Remove HashPos prefixes from the start of every line.
+        Also strips any 3-char sequence with at least one non-ASCII char followed by ::.
+        """
+        lines = text.splitlines(keepends=True)
+        result_lines = []
+        for line in lines:
+            stripped_line = HashPos.HASH_PREFIX_RE.sub("", line, count=1)
+            if stripped_line == line:
+                stripped_line = HashPos._LOOSE_PREFIX_RE.sub("", line, count=1)
+            result_lines.append(stripped_line)
+
+        return "".join(result_lines)
+
+    @staticmethod
+    def extract_prefix(line: str) -> str:
+        """
+        Extract the hash prefix from a line if it has a HashPos prefix.
+        """
+        match = HashPos.HASH_PREFIX_RE.match(line)
+        if match:
+            return match.group(1)
+        return ""
+
+    @staticmethod
+    def normalize(hashpos_str: str) -> str:
+        """
+        Normalize a HashPos string to the 3-character hash fragment.
+        """
+        if hashpos_str is None:
+            raise ValueError("HashPos string cannot be None")
+
+        if HashPos.FRAGMENT_RE.match(hashpos_str):
+            return hashpos_str
+
+        match = HashPos.NORMALIZE_RE.match(hashpos_str)
+        if match:
+            return match.group(1)
+
+        raise ValueError(
+            f"Invalid HashPos format '{hashpos_str}'. "
+            r"Expected a 3-character string from the Base1024 character set."
+        )

cecli_dev-1.0.0rc1/cecli/helpers/orchestration/__init__.py

@@ -0,0 +1,35 @@
+"""
+Orchestration module for programmatic tool calling in agent mode.
+
+Public API:
+- AgentExecutionEnv: sandboxed execution environment
+- AgentProxy / ToolProxy: proxies for calling tools from generated code
+- build_orchestration_context_block: context block builder
+- SecurityError / SecurityFilter / LoopYieldInjector: security components
+"""
+
+from cecli.helpers.orchestration.environment import (
+    AgentExecutionEnv,
+    AgentProxy,
+    ToolProxy,
+    build_orchestration_context_block,
+)
+from cecli.helpers.orchestration.security import (
+    LoopYieldInjector,
+    SecurityError,
+    SecurityFilter,
+    _cooperative_yield,
+)
+from cecli.helpers.orchestration.service import OrchestrationService
+
+__all__ = [
+    "AgentExecutionEnv",
+    "AgentProxy",
+    "ToolProxy",
+    "build_orchestration_context_block",
+    "SecurityError",
+    "SecurityFilter",
+    "LoopYieldInjector",
+    "_cooperative_yield",
+    "OrchestrationService",
+]