aru-code 0.20.0__tar.gz → 0.20.1__tar.gz

{aru_code-0.20.0/aru_code.egg-info → aru_code-0.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aru-code
-Version: 0.20.0
+Version: 0.20.1
 Summary: A Claude Code clone built with Agno agents
 Author-email: Estevao <estevaofon@gmail.com>
 License-Expression: MIT
@@ -312,8 +312,47 @@ Without any `aru.json` config, aru applies safe defaults:
 - Bash → ~40 safe command prefixes auto-allowed (`ls`, `git status`, `grep`, etc.), rest → `ask`
 - Sensitive files (`*.env`, `*.env.*`) → `deny` for read/edit/write (except `*.env.example`)
 
-> `aru.json` can also be placed at `.aru/config.json`.
->
+#### Config file locations
+
+Aru loads configuration from two levels, with project settings overriding global ones:
+
+| Level | Path | Purpose |
+|-------|------|---------|
+| **Global (user)** | `~/.aru/config.json` | Defaults that apply to all projects (model, aliases, permissions, providers) |
+| **Project** | `aru.json` or `.aru/config.json` | Project-specific overrides |
+
+Global config is loaded first, then the project config is **deep-merged** on top — scalar values and lists are replaced, nested objects (like `permission`, `providers`, `model_aliases`) are merged recursively. This means you can set your preferred model and aliases globally and only override what's different per project.
+
+**Example `~/.aru/config.json`:**
+
+```json
+{
+  "default_model": "anthropic/claude-sonnet-4-6",
+  "model_aliases": {
+    "sonnet": "anthropic/claude-sonnet-4-6",
+    "opus": "anthropic/claude-opus-4-6"
+  },
+  "permission": {
+    "read": "allow",
+    "glob": "allow",
+    "grep": "allow"
+  }
+}
+```
+
+Then a project `aru.json` only needs project-specific settings:
+
+```json
+{
+  "default_model": "ollama/codellama",
+  "permission": {
+    "bash": { "pytest *": "allow" }
+  }
+}
+```
+
+The result: `default_model` becomes `ollama/codellama`, `model_aliases` come from global, and `permission` merges both levels (`read`, `glob`, `grep` from global + `bash` from project).
+
 > A full `aru.json` config reference here: [`aru.json`](./aru.json)
 
 ### AGENTS.md

{aru_code-0.20.0 → aru_code-0.20.1}/README.md

@@ -265,8 +265,47 @@ Without any `aru.json` config, aru applies safe defaults:
 - Bash → ~40 safe command prefixes auto-allowed (`ls`, `git status`, `grep`, etc.), rest → `ask`
 - Sensitive files (`*.env`, `*.env.*`) → `deny` for read/edit/write (except `*.env.example`)
 
-> `aru.json` can also be placed at `.aru/config.json`.
->
+#### Config file locations
+
+Aru loads configuration from two levels, with project settings overriding global ones:
+
+| Level | Path | Purpose |
+|-------|------|---------|
+| **Global (user)** | `~/.aru/config.json` | Defaults that apply to all projects (model, aliases, permissions, providers) |
+| **Project** | `aru.json` or `.aru/config.json` | Project-specific overrides |
+
+Global config is loaded first, then the project config is **deep-merged** on top — scalar values and lists are replaced, nested objects (like `permission`, `providers`, `model_aliases`) are merged recursively. This means you can set your preferred model and aliases globally and only override what's different per project.
+
+**Example `~/.aru/config.json`:**
+
+```json
+{
+  "default_model": "anthropic/claude-sonnet-4-6",
+  "model_aliases": {
+    "sonnet": "anthropic/claude-sonnet-4-6",
+    "opus": "anthropic/claude-opus-4-6"
+  },
+  "permission": {
+    "read": "allow",
+    "glob": "allow",
+    "grep": "allow"
+  }
+}
+```
+
+Then a project `aru.json` only needs project-specific settings:
+
+```json
+{
+  "default_model": "ollama/codellama",
+  "permission": {
+    "bash": { "pytest *": "allow" }
+  }
+}
+```
+
+The result: `default_model` becomes `ollama/codellama`, `model_aliases` come from global, and `permission` merges both levels (`read`, `glob`, `grep` from global + `bash` from project).
+
 > A full `aru.json` config reference here: [`aru.json`](./aru.json)
 
 ### AGENTS.md

aru_code-0.20.1/aru/__init__.py

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

{aru_code-0.20.0 → aru_code-0.20.1}/aru/config.py

@@ -436,6 +436,63 @@ def _discover_agents(search_roots: list[Path]) -> dict[str, CustomAgent]:
     return agents
 
 
+def _load_json_file(path: Path) -> dict | None:
+    """Read and parse a JSON file, returning None on any error."""
+    if not path.is_file():
+        return None
+    try:
+        content = path.read_text(encoding="utf-8")
+        data = json.loads(content)
+        return data if isinstance(data, dict) else None
+    except (OSError, UnicodeDecodeError, json.JSONDecodeError):
+        return None
+
+
+def _deep_merge(base: dict, override: dict) -> dict:
+    """Recursively merge override into base. Override values win for scalars;
+    dicts are merged recursively; lists are replaced (not concatenated)."""
+    result = base.copy()
+    for key, value in override.items():
+        if key in result and isinstance(result[key], dict) and isinstance(value, dict):
+            result[key] = _deep_merge(result[key], value)
+        else:
+            result[key] = value
+    return result
+
+
+def _apply_config_data(config: AgentConfig, data: dict, root: Path) -> None:
+    """Apply a merged config dict to an AgentConfig object."""
+    if "permission" in data:
+        config.permissions = data["permission"]
+    if "providers" in data:
+        from aru.providers import load_providers_from_config
+        load_providers_from_config(data)
+    if "default_model" in data:
+        config.default_model = data["default_model"]
+    if "model_aliases" in data and isinstance(data["model_aliases"], dict):
+        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
+    if "plugins" in data and isinstance(data["plugins"], list):
+        config.plugin_specs = data["plugins"]
+    if "tools" in data and isinstance(data["tools"], dict):
+        tools_cfg = data["tools"]
+        if "disabled" in tools_cfg and isinstance(tools_cfg["disabled"], list):
+            config.disabled_tools = [str(t) for t in tools_cfg["disabled"]]
+    if "instructions" in data and isinstance(data["instructions"], list):
+        entries = [str(e) for e in data["instructions"] if isinstance(e, str)]
+        config.rules_instructions = _resolve_instructions(entries, root)
+    if "agent" in data and isinstance(data["agent"], dict):
+        for agent_name, agent_data in data["agent"].items():
+            if agent_name in config.custom_agents and isinstance(agent_data, dict):
+                if "permission" in agent_data:
+                    config.custom_agents[agent_name].permission = agent_data["permission"]
+
+
 def load_config(cwd: str | None = None) -> AgentConfig:
     """Load agent configuration from AGENTS.md and .agents/ directory.
 
@@ -492,52 +549,27 @@ def load_config(cwd: str | None = None) -> AgentConfig:
     config.skills = _discover_skills(skill_roots)
     config.custom_agents = _discover_agents(skill_roots)
 
-    # Load opencode-style config (aru.json or .aru/config.json)
-    config_paths = [root / "aru.json", root / ".aru" / "config.json"]
-    for config_path in config_paths:
-        if config_path.is_file():
-            try:
-                content = config_path.read_text(encoding="utf-8")
-                data = json.loads(content)
-                if isinstance(data, dict):
-                    if "permission" in data:
-                        config.permissions = data["permission"]
-                    # Load provider configuration
-                    if "providers" in data:
-                        from aru.providers import load_providers_from_config
-                        load_providers_from_config(data)
-                    # Store default model and aliases for CLI
-                    if "default_model" in data:
-                        config.default_model = data["default_model"]
-                    if "model_aliases" in data and isinstance(data["model_aliases"], dict):
-                        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
-                    # Plugin specs
-                    if "plugins" in data and isinstance(data["plugins"], list):
-                        config.plugin_specs = data["plugins"]
-                    # Custom tools config
-                    if "tools" in data and isinstance(data["tools"], dict):
-                        tools_cfg = data["tools"]
-                        if "disabled" in tools_cfg and isinstance(tools_cfg["disabled"], list):
-                            config.disabled_tools = [str(t) for t in tools_cfg["disabled"]]
-                    # 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)]
-                        config.rules_instructions = _resolve_instructions(entries, root)
-                    # Agent-level permission overrides from aru.json
-                    if "agent" in data and isinstance(data["agent"], dict):
-                        for agent_name, agent_data in data["agent"].items():
-                            if agent_name in config.custom_agents and isinstance(agent_data, dict):
-                                if "permission" in agent_data:
-                                    config.custom_agents[agent_name].permission = agent_data["permission"]
-                break
-            except (OSError, UnicodeDecodeError, json.JSONDecodeError):
-                pass
+    # Load config: global (~/.aru/config.json) first, then project-level on top.
+    # Project values override global values via deep merge.
+    home = Path.home()
+    global_config_paths = [home / ".aru" / "config.json"]
+    project_config_paths = [root / "aru.json", root / ".aru" / "config.json"]
+
+    merged_data: dict = {}
+    for config_path in global_config_paths:
+        data = _load_json_file(config_path)
+        if data is not None:
+            merged_data = data
+            break
+
+    for config_path in project_config_paths:
+        data = _load_json_file(config_path)
+        if data is not None:
+            merged_data = _deep_merge(merged_data, data)
+            break
+
+    if merged_data:
+        _apply_config_data(config, merged_data, root)
 
     return config
 

{aru_code-0.20.0 → aru_code-0.20.1}/aru/runner.py

@@ -195,6 +195,7 @@ async def run_agent_capture(agent, message: str, session=None, lightweight: bool
                     )
                     pending_tool_uses[tool_id] = assistant_blocks[-1]
                     if accumulated[display._flushed_len:]:
+                        display.content = None
                         live.stop()
                         display.flush()
                         live.start()
@@ -280,6 +281,10 @@ async def run_agent_capture(agent, message: str, session=None, lightweight: bool
                         )
                         break
 
+            # Clear live content before the Live context exits so its final
+            # render doesn't duplicate text that we print explicitly below.
+            display.content = None
+
         ctx.live = None
         ctx.display = None
 

{aru_code-0.20.0 → aru_code-0.20.1/aru_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aru-code
-Version: 0.20.0
+Version: 0.20.1
 Summary: A Claude Code clone built with Agno agents
 Author-email: Estevao <estevaofon@gmail.com>
 License-Expression: MIT
@@ -312,8 +312,47 @@ Without any `aru.json` config, aru applies safe defaults:
 - Bash → ~40 safe command prefixes auto-allowed (`ls`, `git status`, `grep`, etc.), rest → `ask`
 - Sensitive files (`*.env`, `*.env.*`) → `deny` for read/edit/write (except `*.env.example`)
 
-> `aru.json` can also be placed at `.aru/config.json`.
->
+#### Config file locations
+
+Aru loads configuration from two levels, with project settings overriding global ones:
+
+| Level | Path | Purpose |
+|-------|------|---------|
+| **Global (user)** | `~/.aru/config.json` | Defaults that apply to all projects (model, aliases, permissions, providers) |
+| **Project** | `aru.json` or `.aru/config.json` | Project-specific overrides |
+
+Global config is loaded first, then the project config is **deep-merged** on top — scalar values and lists are replaced, nested objects (like `permission`, `providers`, `model_aliases`) are merged recursively. This means you can set your preferred model and aliases globally and only override what's different per project.
+
+**Example `~/.aru/config.json`:**
+
+```json
+{
+  "default_model": "anthropic/claude-sonnet-4-6",
+  "model_aliases": {
+    "sonnet": "anthropic/claude-sonnet-4-6",
+    "opus": "anthropic/claude-opus-4-6"
+  },
+  "permission": {
+    "read": "allow",
+    "glob": "allow",
+    "grep": "allow"
+  }
+}
+```
+
+Then a project `aru.json` only needs project-specific settings:
+
+```json
+{
+  "default_model": "ollama/codellama",
+  "permission": {
+    "bash": { "pytest *": "allow" }
+  }
+}
+```
+
+The result: `default_model` becomes `ollama/codellama`, `model_aliases` come from global, and `permission` merges both levels (`read`, `glob`, `grep` from global + `bash` from project).
+
 > A full `aru.json` config reference here: [`aru.json`](./aru.json)
 
 ### AGENTS.md

{aru_code-0.20.0 → aru_code-0.20.1}/pyproject.toml

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

aru_code-0.20.0/aru/__init__.py

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