aru-code 0.12.0__tar.gz → 0.13.0__tar.gz

{aru_code-0.12.0/aru_code.egg-info → aru_code-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aru-code
-Version: 0.12.0
+Version: 0.13.0
 Summary: A Claude Code clone built with Agno agents
 Author-email: Estevao <estevaofon@gmail.com>
 License-Expression: MIT

aru_code-0.13.0/aru/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.13.0"

{aru_code-0.12.0 → aru_code-0.13.0}/aru/agent_factory.py

@@ -12,8 +12,14 @@ def create_general_agent(
     session: Session,
     config: AgentConfig | None = None,
     model_override: str | None = None,
+    env_context: str = "",
 ):
-    """Create the general-purpose agent."""
+    """Create the general-purpose agent.
+
+    Args:
+        env_context: Environment context (cwd, tree, git status) to include
+            in the system prompt. Placed in instructions so it's cacheable.
+    """
     from agno.agent import Agent
     from agno.compression.manager import CompressionManager
 
@@ -21,6 +27,8 @@ def create_general_agent(
     from aru.runtime import get_ctx
 
     extra = config.get_extra_instructions() if config else ""
+    if env_context:
+        extra = f"{extra}\n\n{env_context}" if extra else env_context
     model_ref = model_override or session.model_ref
 
     return Agent(
@@ -40,7 +48,8 @@ def create_general_agent(
 
 
 def create_custom_agent_instance(agent_def: CustomAgent, session: Session,
-                                  config: AgentConfig | None = None):
+                                  config: AgentConfig | None = None,
+                                  env_context: str = ""):
     """Create an Agno Agent from a CustomAgent definition."""
     from agno.agent import Agent
     from agno.compression.manager import CompressionManager
@@ -52,6 +61,8 @@ def create_custom_agent_instance(agent_def: CustomAgent, session: Session,
     tools = resolve_tools(agent_def.tools)
 
     extra = config.get_extra_instructions() if config else ""
+    if env_context:
+        extra = f"{extra}\n\n{env_context}" if extra else env_context
     parts = [agent_def.system_prompt, BASE_INSTRUCTIONS]
     if extra:
         parts.append(extra)

{aru_code-0.12.0 → aru_code-0.13.0}/aru/cli.py

@@ -71,6 +71,7 @@ from aru.runner import (  # noqa: F401
     _MUTATION_TOOLS,
     _build_file_context,
     _extract_plan_file_paths,
+    build_env_context,
     execute_plan_steps,
     run_agent_capture,
 )
@@ -156,6 +157,11 @@ async def run_cli(skip_permissions: bool = False, resume_id: str | None = None):
 
     extra_instructions = config.get_extra_instructions()
 
+    def _build_env_ctx() -> str:
+        """Build fresh environment context for agent system prompt."""
+        from aru.runner import build_env_context
+        return build_env_context(session)
+
     # Resume or create session
     if resume_id:
         if resume_id == "last":
@@ -183,6 +189,9 @@ async def run_cli(skip_permissions: bool = False, resume_id: str | None = None):
         _sync_model(session)
         _render_home(session, skip_permissions)
 
+    # Apply tree_depth from config
+    session._tree_max_depth = config.tree_depth
+
     # Wire file-mutation callback and atexit cleanup
     ctx.on_file_mutation = session.invalidate_context_cache
     atexit.register(lambda: cleanup_processes(ctx.tracked_processes))
@@ -192,9 +201,12 @@ async def run_cli(skip_permissions: bool = False, resume_id: str | None = None):
     paste_state = PasteState()
     prompt_session = _create_prompt_session(paste_state, config)
 
-    # Startup: load MCP tools
-    from aru.tools.codebase import load_mcp_tools
-    await load_mcp_tools()
+    # Startup: load MCP tools in background (don't block REPL)
+    async def _load_mcp_background():
+        from aru.tools.codebase import load_mcp_tools
+        await load_mcp_tools()
+
+    asyncio.create_task(_load_mcp_background())
 
     while True:
         try:
@@ -359,15 +371,14 @@ async def run_cli(skip_permissions: bool = False, resume_id: str | None = None):
             continue
 
         if user_input.lower() == "/mcp":
-            from aru.tools.codebase import ALL_TOOLS
-            from agno.tools import Function
-            mcp_tools = [t for t in ALL_TOOLS if isinstance(t, Function) and getattr(t, "name", "").count("__") > 0]
-            if not mcp_tools:
+            from aru.tools.mcp_client import get_mcp_manager
+            manager = get_mcp_manager()
+            if not manager or not manager.catalog:
                 console.print("[dim]No MCP tools loaded. Check aru.mcp.json config.[/dim]")
             else:
-                console.print(f"[bold]Loaded MCP Tools ({len(mcp_tools)}):[/bold]\n")
-                for t in mcp_tools:
-                    console.print(f"  [bold cyan]{t.name}[/bold cyan]  [dim]{t.description}[/dim]")
+                console.print(f"[bold]MCP Tools ({len(manager.catalog)}):[/bold]\n")
+                for entry in manager.catalog.values():
+                    console.print(f"  [bold cyan]{entry.name}[/bold cyan]  [dim]{entry.description}[/dim]")
             continue
 
         if user_input.lower() == "/help":
@@ -436,16 +447,17 @@ async def run_cli(skip_permissions: bool = False, resume_id: str | None = None):
                 prompt = render_command_template(cmd_def.template, cmd_args)
                 console.print(f"[bold magenta]Running /{cmd_name}...[/bold magenta]")
 
+                env_ctx = _build_env_ctx()
                 if cmd_def.agent and cmd_def.agent in config.custom_agents:
                     agent_def = config.custom_agents[cmd_def.agent]
-                    agent = create_custom_agent_instance(agent_def, session, config)
+                    agent = create_custom_agent_instance(agent_def, session, config, env_context=env_ctx)
                 elif cmd_def.agent:
                     console.print(f"[yellow]Warning: agent '{cmd_def.agent}' not found, using default[/yellow]")
-                    agent = create_general_agent(session, config, model_override=cmd_def.model)
+                    agent = create_general_agent(session, config, model_override=cmd_def.model, env_context=env_ctx)
                 elif cmd_def.model:
-                    agent = create_general_agent(session, config, model_override=cmd_def.model)
+                    agent = create_general_agent(session, config, model_override=cmd_def.model, env_context=env_ctx)
                 else:
-                    agent = create_general_agent(session, config)
+                    agent = create_general_agent(session, config, env_context=env_ctx)
                 session.add_message("user", user_input)
                 run_result = await run_agent_capture(agent, prompt, session, images=attached_images or None)
                 if run_result.content:
@@ -458,7 +470,7 @@ async def run_cli(skip_permissions: bool = False, resume_id: str | None = None):
                     prompt = render_skill_template(skill.content, cmd_args)
                     console.print(f"[bold magenta]Running skill /{cmd_name}...[/bold magenta]")
 
-                    agent = create_general_agent(session, config)
+                    agent = create_general_agent(session, config, env_context=_build_env_ctx())
                     session.add_message("user", user_input)
                     run_result = await run_agent_capture(agent, prompt, session, images=attached_images or None)
                     if run_result.content:
@@ -470,7 +482,7 @@ async def run_cli(skip_permissions: bool = False, resume_id: str | None = None):
                 else:
                     from aru.permissions import permission_scope
                     console.print(f"[bold magenta]Running agent /{cmd_name}...[/bold magenta]")
-                    agent = create_custom_agent_instance(agent_def, session, config)
+                    agent = create_custom_agent_instance(agent_def, session, config, env_context=_build_env_ctx())
                     session.add_message("user", user_input)
                     with permission_scope(agent_def.permission):
                         run_result = await run_agent_capture(agent, cmd_args or user_input, session, images=attached_images or None)
@@ -498,14 +510,14 @@ async def run_cli(skip_permissions: bool = False, resume_id: str | None = None):
                 agent_def = config.custom_agents[agent_name]
                 from aru.permissions import permission_scope
                 console.print(f"[bold magenta]Routing to @{agent_name}...[/bold magenta]")
-                agent = create_custom_agent_instance(agent_def, session, config)
+                agent = create_custom_agent_instance(agent_def, session, config, env_context=_build_env_ctx())
                 session.add_message("user", user_input)
                 with permission_scope(agent_def.permission):
                     run_result = await run_agent_capture(agent, message_text, session, images=attached_images or None)
                 if run_result.content:
                     session.add_message("assistant", run_result.with_tools_summary())
             else:
-                agent = create_general_agent(session, config)
+                agent = create_general_agent(session, config, env_context=_build_env_ctx())
                 session.add_message("user", user_input)
                 run_result = await run_agent_capture(agent, user_input, session, images=attached_images or None)
                 if run_result.content:

{aru_code-0.12.0 → aru_code-0.13.0}/aru/config.py

@@ -160,6 +160,7 @@ class AgentConfig:
     model_aliases: dict[str, str] = field(default_factory=dict)
     custom_agents: dict[str, CustomAgent] = field(default_factory=dict)
     plan_reviewer: bool = True
+    tree_depth: int = 2  # max depth for directory tree in system prompt
 
     @property
     def has_instructions(self) -> bool:
@@ -515,6 +516,10 @@ def load_config(cwd: str | None = None) -> AgentConfig:
                         config.model_aliases = data["model_aliases"]
                     if "plan_reviewer" in data:
                         config.plan_reviewer = bool(data["plan_reviewer"])
+                    if "tree_depth" in data:
+                        td = data["tree_depth"]
+                        if isinstance(td, int) and 0 <= td <= 5:
+                            config.tree_depth = td
                     # Resolve instructions (local files, globs, URLs)
                     if "instructions" in data and isinstance(data["instructions"], list):
                         entries = [str(e) for e in data["instructions"] if isinstance(e, str)]

{aru_code-0.12.0 → aru_code-0.13.0}/aru/context.py

@@ -10,12 +10,16 @@ from __future__ import annotations
 
 # ── Constants ──────────────────────────────────────────────────────
 
-# Pruning: protect the most recent N chars of assistant content from eviction
+# Pruning: protect the most recent N chars of content from eviction
 PRUNE_PROTECT_CHARS = 50_000  # ~14K tokens
 # Pruning: minimum chars that must be freeable to justify a prune pass
 PRUNE_MINIMUM_CHARS = 20_000  # ~5.7K tokens
 # Placeholder that replaces evicted content
 PRUNED_PLACEHOLDER = "[previous output cleared to save context]"
+# User messages larger than this threshold are truncated when outside protection window
+PRUNE_USER_MSG_THRESHOLD = 2_000  # ~570 tokens — catches @file mentions
+# How many chars to keep from the start of a pruned user message
+PRUNE_USER_MSG_KEEP = 500  # ~140 tokens — enough to understand the request
 
 # Truncation: universal limits for any tool output
 TRUNCATE_MAX_LINES = 500
@@ -80,24 +84,24 @@ Be concise but complete. This summary replaces the full conversation history."""
 # ── Layer 1: Pruning ──────────────────────────────────────────────
 
 def prune_history(history: list[dict[str, str]]) -> list[dict[str, str]]:
-    """Replace old assistant messages with a short placeholder to reduce tokens.
+    """Replace old messages with a short placeholder to reduce tokens.
 
-    Walks backward through history, protecting the most recent assistant
-    content (up to PRUNE_PROTECT_CHARS). Older assistant messages beyond
-    that budget are replaced with a compact placeholder.
+    Walks backward through history, protecting the most recent content
+    (up to PRUNE_PROTECT_CHARS total across both roles). Older messages
+    beyond that budget are pruned:
+    - Assistant messages: replaced entirely with placeholder
+    - User messages over PRUNE_USER_MSG_THRESHOLD: truncated to first N chars
 
     Returns a new list (does not mutate the input).
     """
     if len(history) <= 2:
         return list(history)
 
-    # Calculate total assistant chars
-    total_assistant_chars = sum(
-        len(msg["content"]) for msg in history if msg["role"] == "assistant"
-    )
+    # Calculate total prunable chars (both roles)
+    total_chars = sum(len(msg["content"]) for msg in history)
 
     # Not enough to prune
-    if total_assistant_chars < PRUNE_PROTECT_CHARS + PRUNE_MINIMUM_CHARS:
+    if total_chars < PRUNE_PROTECT_CHARS + PRUNE_MINIMUM_CHARS:
         return list(history)
 
     # Walk backward, protecting recent content
@@ -106,17 +110,22 @@ def prune_history(history: list[dict[str, str]]) -> list[dict[str, str]]:
 
     for i in range(len(result) - 1, -1, -1):
         msg = result[i]
-        if msg["role"] != "assistant":
-            continue
-
         msg_len = len(msg["content"])
+
         if protected + msg_len <= PRUNE_PROTECT_CHARS:
             # Still within protection window
             protected += msg_len
         else:
-            # Beyond protection window — prune this message
-            if msg["content"] != PRUNED_PLACEHOLDER:
-                result[i] = {"role": "assistant", "content": PRUNED_PLACEHOLDER}
+            # Beyond protection window — prune
+            if msg["role"] == "assistant":
+                if msg["content"] != PRUNED_PLACEHOLDER:
+                    result[i] = {"role": "assistant", "content": PRUNED_PLACEHOLDER}
+            elif msg["role"] == "user" and msg_len > PRUNE_USER_MSG_THRESHOLD:
+                # Large user messages (e.g. @file mentions with file contents)
+                # are truncated to keep a brief summary of the original request
+                truncated = msg["content"][:PRUNE_USER_MSG_KEEP] + \
+                    f"\n\n[... {msg_len - PRUNE_USER_MSG_KEEP:,} chars pruned to save context ...]"
+                result[i] = {"role": "user", "content": truncated}
 
     return result
 

{aru_code-0.12.0 → aru_code-0.13.0}/aru/runner.py

@@ -26,6 +26,24 @@ from aru.permissions import get_skip_permissions
 _MUTATION_TOOLS = {"write_file", "write_files", "edit_file", "edit_files", "bash", "run_command"}
 
 
+def build_env_context(session, cwd: str | None = None) -> str:
+    """Build environment context string (cwd, git status) for system prompt.
+
+    This context goes into agent instructions (system prompt) so it's cached
+    by the provider between turns. Tree is omitted — the model uses
+    glob_search/list_directory on demand instead of paying upfront tokens.
+    """
+    cwd = cwd or os.getcwd()
+    parts = [f"The current working directory is: {cwd}"]
+
+    if session:
+        git_status = session.get_cached_git_status(cwd)
+        if git_status:
+            parts.append(f"Git status:\n{git_status}")
+
+    return "\n\n".join(parts)
+
+
 @dataclass
 class AgentRunResult:
     """Result from run_agent_capture including text output and tool call history."""
@@ -77,35 +95,24 @@ async def run_agent_capture(agent, message: str, session=None, lightweight: bool
         display = StreamingDisplay(status)
         tracker = display.tool_tracker
 
-        # Build enriched message with environment context (using cache)
-        dynamic_parts = []
-        cwd = os.getcwd()
-        dynamic_parts.append(f"The current working directory is: {cwd}")
+        # Build message — environment context (tree/git/cwd) is now in the
+        # system prompt (agent instructions) so it's cacheable across turns.
+        # Only plan progress and budget warnings are added here.
+        msg_parts = []
 
         if session and not lightweight:
-            env_context_parts = []
-            tree_text = session.get_cached_tree(cwd)
-            if tree_text:
-                env_context_parts.append(f"Directory Tree (max depth 3):\n```text\n{tree_text}\n```")
-
-            git_status = session.get_cached_git_status(cwd)
-            if git_status:
-                env_context_parts.append(f"Git status:\n{git_status}")
-
-            if env_context_parts:
-                dynamic_parts.append("## Environment Context\n" + "\n\n".join(env_context_parts))
-
-            # Include only compact plan progress (not full plan text)
             if session.current_plan:
-                dynamic_parts.append(f"## Active Plan\nTask: {session.plan_task}\n\n{session.render_plan_progress()}")
+                msg_parts.append(f"## Active Plan\nTask: {session.plan_task}\n\n{session.render_plan_progress()}")
 
-            # Token budget warning
             warning = session.check_budget_warning()
             if warning:
                 console.print(warning)
 
-        dynamic_context = "\n\n".join(dynamic_parts)
-        run_message = f"{dynamic_context}\n\n---\n\n## Current Task/Message\n{message}"
+        if msg_parts:
+            prefix = "\n\n".join(msg_parts)
+            run_message = f"{prefix}\n\n---\n\n{message}"
+        else:
+            run_message = message
 
         # Build conversation history as real messages for the LLM
         from aru.context import prune_history

{aru_code-0.12.0 → aru_code-0.13.0}/aru/session.py

@@ -145,6 +145,8 @@ class Session:
         self._cached_tree: str | None = None
         self._cached_git_status: str | None = None
         self._context_dirty: bool = True
+        # Tree depth for env context (configurable via aru.json "tree_depth")
+        self._tree_max_depth: int = 2
         # Token budget (0 = unlimited)
         self.token_budget: int = 0
 
@@ -229,7 +231,7 @@ class Session:
         """Regenerate tree and git status caches."""
         try:
             from aru.tools.codebase import get_project_tree
-            self._cached_tree = get_project_tree(cwd, max_depth=3) or None
+            self._cached_tree = get_project_tree(cwd, max_depth=self._tree_max_depth) or None
         except Exception:
             self._cached_tree = None
         try:

{aru_code-0.12.0 → aru_code-0.13.0}/aru/tools/codebase.py

@@ -632,8 +632,10 @@ def get_project_tree(root_dir: str, max_depth: int = 3, max_files_per_dir: int =
             lines.append(f"{file_indent}{f}")
             
     result = "\n".join(lines)
-    if len(result) > 15000:
-        return result[:15000] + "\n... [Tree truncated due to size]"
+    # Cap size — tree goes in system prompt now, keep it compact
+    max_chars = 5000
+    if len(result) > max_chars:
+        return result[:max_chars] + "\n... [Tree truncated due to size]"
     return result
 
 
@@ -1098,15 +1100,12 @@ ALL_TOOLS = [
     web_search,
     web_fetch,
     delegate_task,
-    code_structure,
-    find_dependencies,
-    rank_files,
 ]
 
 # Task list tools for executor subtask tracking
 from aru.tools.tasklist import create_task_list, update_task
 
-# Executor tools — full write/execute capability, no discovery overhead
+# Executor tools — full write/execute capability
 EXECUTOR_TOOLS = [
     create_task_list,
     update_task,
@@ -1123,10 +1122,9 @@ EXECUTOR_TOOLS = [
     web_search,
     web_fetch,
     delegate_task,
-    code_structure,
 ]
 
-# General-purpose tools — everything except niche analysis tools
+# General-purpose tools
 GENERAL_TOOLS = [
     read_file,
     read_file_smart,
@@ -1147,6 +1145,10 @@ GENERAL_TOOLS = [
 TOOL_REGISTRY: dict[str, object] = {f.__name__: f for f in ALL_TOOLS}
 TOOL_REGISTRY["create_task_list"] = create_task_list
 TOOL_REGISTRY["update_task"] = update_task
+# Kept in registry for custom agents that may reference them via resolve_tools
+TOOL_REGISTRY["code_structure"] = code_structure
+TOOL_REGISTRY["find_dependencies"] = find_dependencies
+TOOL_REGISTRY["rank_files"] = rank_files
 
 
 def resolve_tools(tool_spec: list[str] | dict[str, bool]) -> list:

{aru_code-0.12.0 → aru_code-0.13.0/aru_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aru-code
-Version: 0.12.0
+Version: 0.13.0
 Summary: A Claude Code clone built with Agno agents
 Author-email: Estevao <estevaofon@gmail.com>
 License-Expression: MIT

{aru_code-0.12.0 → aru_code-0.13.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aru-code"
-version = "0.12.0"
+version = "0.13.0"
 description = "A Claude Code clone built with Agno agents"
 readme = "README.md"
 license = "MIT"

aru_code-0.12.0/aru/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.12.0"