aria-code 0.91.0__tar.gz → 0.92.0__tar.gz

{aria_code-0.91.0/src/aria_code.egg-info → aria_code-0.92.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.91.0
+Version: 0.92.0
 Summary: Open-source AI agent for coding, financial analysis and logistics operations: numbers you can check, client data kept apart, actions a person approves
 License: Apache-2.0
 Project-URL: Homepage, https://github.com/artheras/aria-code

{aria_code-0.91.0 → aria_code-0.92.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aria-code"
-version = "0.91.0"
+version = "0.92.0"
 description = "Open-source AI agent for coding, financial analysis and logistics operations: numbers you can check, client data kept apart, actions a person approves"
 readme = "README.md"
 license = { text = "Apache-2.0" }

{aria_code-0.91.0 → aria_code-0.92.0}/src/aria_code/_version.py

@@ -17,4 +17,4 @@ from __future__ import annotations
 
 __all__ = ["__version__"]
 
-__version__ = "0.91.0"
+__version__ = "0.92.0"

{aria_code-0.91.0 → aria_code-0.92.0}/src/aria_code/agents/base.py

@@ -103,6 +103,7 @@ class BaseAgent(ABC):
         self.on_tool_end = on_tool_end
         self.config   = config or {}
         self.lang     = lang
+        self.llm_error: Optional[str] = None   # why the last model call gave nothing, if it failed
         self.memory   = []         # Short-term conversation history for multi-turn context
 
     async def fetch_data(self, symbol: str) -> Dict[str, Any]:
@@ -234,10 +235,14 @@ class BaseAgent(ABC):
                     elif t == "tool_end" and self.on_tool_end:
                         self.on_tool_end(event.get("tool_name", ""), event.get("tool_result", None))
                     elif t == "error":
-                        logger.warning(f"[{self.name}] LLM 错误: {event.get('message')}")
+                        # The caller falls back to a template and says so; a
+                        # WARNING here went to the terminal as a raw log line.
+                        self.llm_error = str(event.get("message") or "error")
+                        logger.info(f"[{self.name}] LLM 错误: {event.get('message')}")
                         break
             except Exception as e:
-                logger.warning(f"[{self.name}] LLM 调用失败: {e}")
+                self.llm_error = str(e) or type(e).__name__
+                logger.info(f"[{self.name}] LLM 调用失败: {e}")
                 break
 
             # 将当前 Assistant 的回复加入消息流

{aria_code-0.91.0 → aria_code-0.92.0}/src/aria_code/agents/portfolio_agent.py

@@ -176,20 +176,24 @@ class PortfolioAgent(BaseAgent):
     async def analyze_portfolio(
         self, symbols: List[str], data: Dict[str, Any]
     ) -> AgentResult:
+        zh = self.lang != "en"
         if len(symbols) < 2:
             return AgentResult(
                 agent=self.name, symbol=",".join(symbols),
-                analysis="组合分析需要至少 2 个标的。",
+                analysis=("组合分析需要至少 2 个标的。" if zh
+                          else "A portfolio analysis needs at least 2 symbols."),
                 confidence=0.0, signal="HOLD",
-                key_points=["标的数量不足"],
+                key_points=["标的数量不足" if zh else "Not enough symbols"],
             )
 
         if data.get("error") == "insufficient_data":
             return AgentResult(
                 agent=self.name, symbol=",".join(symbols),
-                analysis="无法获取足够的历史价格数据进行组合分析。",
+                analysis=("无法获取足够的历史价格数据进行组合分析。" if zh
+                          else "Not enough price history could be fetched to analyse the portfolio."),
                 confidence=0.3, signal="HOLD",
-                key_points=["历史数据不足（需要 >20 个交易日）"],
+                key_points=["历史数据不足（需要 >20 个交易日）" if zh
+                            else "Not enough history (needs more than 20 trading days)"],
             )
 
         valid_syms = data.get("valid_symbols", symbols)
@@ -210,12 +214,12 @@ class PortfolioAgent(BaseAgent):
 
         analysis = await self._call_llm(self._SYSTEM, prompt, max_tokens=650)
         if not analysis:
-            analysis = _template_analysis(valid_syms, data)
+            analysis = _template_analysis(valid_syms, data, self.lang)
 
         verdict    = _extract_verdict(analysis)
         signal     = _verdict_to_signal(verdict)
         confidence = _estimate_confidence(data)
-        key_points = _build_key_points(data, verdict)
+        key_points = _build_key_points(data, verdict, self.lang)
 
         return AgentResult(
             agent=self.name,
@@ -225,6 +229,9 @@ class PortfolioAgent(BaseAgent):
             signal=signal,
             key_points=key_points,
             data_used={
+                # The verdict itself: the signal maps NEEDS_ATTENTION to SELL,
+                # and a banner built from the signal said HIGH_RISK.
+                "verdict": verdict,
                 "n": len(valid_syms),
                 "port_vol_ann": data.get("port_vol_ann"),
                 "div_ratio": data.get("div_ratio"),
@@ -312,35 +319,45 @@ def _estimate_confidence(d: Dict) -> float:
     return min(round(base, 2), 0.75)
 
 
-def _build_key_points(d: Dict, verdict: str) -> List[str]:
+def _build_key_points(d: Dict, verdict: str, lang: str = "zh") -> List[str]:
+    zh  = lang != "en"
     pts = []
     n   = len(d.get("valid_symbols", []))
     if d.get("weight_source") == "ledger":
-        pts.append(f"{n} 个标的，按真实持仓成本加权")
+        pts.append(f"{n} 个标的，按真实持仓成本加权" if zh
+                   else f"{n} symbols, weighted by the cost of your real positions")
     else:
-        pts.append(f"{n} 个标的，等权配置（无真实持仓数据，非实际风险暴露）")
+        pts.append(f"{n} 个标的，等权配置（无真实持仓数据，非实际风险暴露）" if zh
+                   else f"{n} symbols, equal weight (no real positions recorded, so not your actual exposure)")
 
     port_vol = d.get("port_vol_ann", 0)
     if port_vol:
-        risk_lv = "高风险" if port_vol > 0.30 else ("中等" if port_vol > 0.18 else "低风险")
-        pts.append(f"组合年化波动 {port_vol*100:.1f}%（{risk_lv}）")
+        if zh:
+            risk_lv = "高风险" if port_vol > 0.30 else ("中等" if port_vol > 0.18 else "低风险")
+            pts.append(f"组合年化波动 {port_vol*100:.1f}%（{risk_lv}）")
+        else:
+            risk_lv = "high" if port_vol > 0.30 else ("medium" if port_vol > 0.18 else "low")
+            pts.append(f"Annualised portfolio volatility {port_vol*100:.1f}% ({risk_lv})")
 
     div_r = d.get("div_ratio", 1)
     if div_r < 1.1:
-        pts.append(f"分散度不足（ratio {div_r:.2f}x，标的相关性高）")
+        pts.append(f"分散度不足（ratio {div_r:.2f}x，标的相关性高）" if zh
+                   else f"Poorly diversified (ratio {div_r:.2f}x, the symbols move together)")
     else:
-        pts.append(f"分散度合理（ratio {div_r:.2f}x）")
+        pts.append(f"分散度合理（ratio {div_r:.2f}x）" if zh
+                   else f"Reasonably diversified (ratio {div_r:.2f}x)")
 
     high_corr = d.get("high_corr", [])
     if high_corr:
         top = high_corr[0]
-        pts.append(f"最高相关对: {top['sym1']}↔{top['sym2']} ({top['corr']:+.2f})")
+        pts.append(f"{'最高相关对' if zh else 'Most correlated pair'}: "
+                   f"{top['sym1']}↔{top['sym2']} ({top['corr']:+.2f})")
 
-    pts.append(f"整体评级: {verdict}")
+    pts.append(f"{'整体评级' if zh else 'Overall'}: {verdict}")
     return pts[:6]
 
 
-def _template_analysis(symbols: List[str], d: Dict) -> str:
+def _template_analysis(symbols: List[str], d: Dict, lang: str = "zh") -> str:
     high_corr = d.get("high_corr", [])
     port_vol  = d.get("port_vol_ann", 0)
     div_r     = d.get("div_ratio", 1)
@@ -351,6 +368,18 @@ def _template_analysis(symbols: List[str], d: Dict) -> str:
     elif len(high_corr) >= 3 or port_vol > 0.30:
         verdict = "HIGH_RISK"
 
+    if lang == "en":
+        lines = [f"{','.join(symbols)} portfolio report (template)"]
+        lines.append(f"Annualised volatility: {port_vol*100:.1f}%")
+        lines.append(f"Diversification ratio: {div_r:.2f}x")
+        if high_corr:
+            lines.append(f"{len(high_corr)} highly correlated pairs, the highest "
+                         f"{high_corr[0]['sym1']}↔{high_corr[0]['sym2']} {high_corr[0]['corr']:+.2f}")
+        else:
+            lines.append("No highly correlated pairs.")
+        lines.append(f"\n{verdict}")
+        return "\n".join(lines)
+
     lines = [f"{','.join(symbols)} 组合分析报告（模板）"]
     lines.append(f"年化波动率: {port_vol*100:.1f}%")
     lines.append(f"分散度系数: {div_r:.2f}x")

{aria_code-0.91.0 → aria_code-0.92.0}/src/aria_code/apps/cli/commands/portfolio_cmds.py

@@ -688,8 +688,13 @@ class PortfolioCommandsMixin:
             else:
                 symbols = self.terminal.config.get("watchlist", ["AAPL", "MSFT", "GOOGL", "NVDA", "TSLA"])[:10]
 
+        _lang = "zh" if str(self.terminal.config.get("ui_lang", "en")).lower().startswith("zh") else "en"
+        _T = (lambda a, b: a) if _lang == "zh" else (lambda a, b: b)
+
         if not symbols:
-            msg = "请先设置 watchlist、记录持仓（/journal add buy ...）或指定标的：/portfolio analyze AAPL TSLA MSFT"
+            msg = _T("请先设置 watchlist、记录持仓（/journal add buy ...）或指定标的：/portfolio analyze AAPL TSLA MSFT",
+                     "Set a watchlist, record positions (/journal add buy ...) or name the symbols: "
+                     "/portfolio analyze AAPL TSLA MSFT")
             self.context.console.print(f"[yellow]{msg}[/yellow]") if self.context.has_rich else print(msg)
             return
 
@@ -697,36 +702,34 @@ class PortfolioCommandsMixin:
         _use_new = False
         try:
             from agents.portfolio_agent import PortfolioAgent as _PA
-            from providers.llm.registry import get_provider as _get_prov, list_available_providers as _laps
             _use_new = True
         except ImportError:
             pass
 
         if _use_new:
             if sym_parts:
-                hdr = f"分析组合：{' '.join(symbols)}"
+                hdr = _T(f"分析组合：{' '.join(symbols)}", f"portfolio of {' '.join(symbols)}")
             elif ledger_weights:
-                hdr = "分析真实持仓组合（按成本加权）"
+                hdr = _T("分析真实持仓组合（按成本加权）", "your positions, weighted by cost")
             else:
-                hdr = "分析 watchlist 组合（等权，无真实持仓数据）"
+                hdr = _T("分析 watchlist 组合（等权，无真实持仓数据）",
+                         "watchlist, equal weight (no positions recorded)")
             if rebalance:
-                hdr = "再平衡方案：" + hdr
+                hdr = _T("再平衡方案：", "Rebalance · ") + hdr
+            _sym_label = _T("标的", "Symbols")
             if self.context.has_rich:
                 self.context.console.print()
                 self.context.console.print(f"  [bold cyan]━━━ /portfolio {hdr} ━━━[/bold cyan]")
-                self.context.console.print(f"  [dim]标的 ({len(symbols)}): {', '.join(symbols)}[/dim]")
+                self.context.console.print(f"  [dim]{_sym_label} ({len(symbols)}): {', '.join(symbols)}[/dim]")
                 self.context.console.print()
             else:
-                print(f"\n  ━━━ /portfolio ━━━\n  标的: {', '.join(symbols)}\n")
+                print(f"\n  ━━━ /portfolio ━━━\n  {_sym_label}: {', '.join(symbols)}\n")
 
-            _llm = None
-            try:
-                all_avail = [p for p in _laps() if p["available"]]
-                chosen    = [p for p in all_avail if p.get("local")] or all_avail
-                if chosen:
-                    _llm = _get_prov(chosen[0]["name"])
-            except Exception as _e:
-                logger.debug("portfolio LLM provider init failed: %s", _e)
+            # The model the session is configured for. This took the first
+            # local provider, so a Gemini session asked Ollama, which was not
+            # running, and printed the connection error as a log line.
+            from aria_code.apps.cli.commands.team import build_team_llm_provider
+            _llm = build_team_llm_provider(self.terminal.config)
 
             tokens: list = []
             def _on_tok(t):
@@ -734,42 +737,46 @@ class PortfolioCommandsMixin:
                 _sys.stdout.write(t); _sys.stdout.flush()
 
             try:
-                agent  = _PA(llm_provider=_llm, on_token=_on_tok)
+                agent  = _PA(llm_provider=_llm, on_token=_on_tok, lang=_lang)
                 result = await agent.run_portfolio(symbols, weights=ledger_weights)
-                print()  # 换行（流式输出后）
+                if tokens:
+                    print()  # 换行（流式输出后）
 
                 if not result:
                     if self.context.has_rich:
-                        self.context.console.print("[yellow]  ⚠ 组合分析返回空结果[/yellow]")
+                        self.context.console.print(f"[yellow]  {_T('组合分析返回空结果', 'The portfolio analysis came back empty')}[/yellow]")
                     return
 
+                if not tokens and getattr(agent, "llm_error", None):
+                    _note = _T("模型不可用，以下仅为统计结果", "Model unavailable, so this is the statistics only")
+                    if self.context.has_rich:
+                        self.context.console.print(f"  [dim]{_note}[/dim]")
+                    else:
+                        print(f"  {_note}")
+
+                # The verdict the analysis reached. Rebuilt from the signal,
+                # NEEDS_ATTENTION (signal SELL) came out as HIGH_RISK.
+                _port_verdict = str((result.data_used or {}).get("verdict") or "NEEDS_ATTENTION")
                 if self.context.has_rich:
                     self.context.console.print()
                     for pt in (result.key_points or []):
                         self.context.console.print(f"  [dim]• {pt}[/dim]")
                     self.context.console.print()
-                    # Derive portfolio verdict from signal for the banner
-                    _port_verdict = {
-                        "BUY":        "HEALTHY",
-                        "HOLD":       "NEEDS_ATTENTION",
-                        "SELL":       "HIGH_RISK",
-                        "STRONG_BUY": "HEALTHY",
-                        "STRONG_SELL":"HIGH_RISK",
-                    }.get(result.signal.upper() if result.signal else "HOLD", "NEEDS_ATTENTION")
                     _subtitle = " · ".join(result.key_points[:2]) if result.key_points else ""
                     _print_verdict_banner(_port_verdict, subtitle=_subtitle,
-                                          confidence=result.confidence)
+                                          confidence=result.confidence, lang=_lang)
                 else:
                     for pt in result.key_points:
                         print(f"  • {pt}")
-                    print(f"\n  置信度: {result.confidence:.0%}  信号: {result.signal}")
+                    print(f"\n  {_T('置信度', 'Confidence')}: {result.confidence:.0%}  {_port_verdict}")
 
                 if rebalance and self.context.has_rich:
-                    self.context.console.print("\n  [dim]提示: 再平衡建议已包含在上方分析中。"
-                                  "如需详细方案，可追问 Aria 具体操作步骤。[/dim]")
+                    self.context.console.print("\n  [dim]" + _T(
+                        "提示: 再平衡建议已包含在上方分析中。如需详细方案，可追问 Aria 具体操作步骤。",
+                        "The rebalancing suggestions are in the analysis above; ask Aria for the steps.") + "[/dim]")
 
             except Exception as e:
-                msg = f"组合分析失败: {e}"
+                msg = _T(f"组合分析失败: {e}", f"Portfolio analysis failed: {e}")
                 self.context.console.print(f"  [red]{msg}[/red]") if self.context.has_rich else print(f"  {msg}")
             return
 

{aria_code-0.91.0 → aria_code-0.92.0}/src/aria_code/apps/cli/helpers.py

@@ -33,52 +33,70 @@ __all__ = [
 ]
 
 
-def _load_project_context() -> str:
-    """Load ARIA.md / CLAUDE.md by walking up from cwd (Claude Code style).
+# Per directory: the AGENTS.md family (the convention Codex and other agents
+# share) and Aria's own ARIA.md are both read; CLAUDE.md only when neither is
+# there. AGENTS.override.md stands in for AGENTS.md, as in Codex.
+_AGENTS_NAMES = ("AGENTS.override.md", "AGENTS.md")
+_ARIA_NAMES = ("ARIA.md", ".aria.md")
+_FALLBACK_NAMES = ("CLAUDE.md",)
+
+
+def _project_rule_files(directory: pathlib.Path) -> list[pathlib.Path]:
+    picked = []
+    for family in (_AGENTS_NAMES, _ARIA_NAMES):
+        hit = next((directory / n for n in family if (directory / n).is_file()), None)
+        if hit:
+            picked.append(hit)
+    if not picked:
+        picked = [directory / n for n in _FALLBACK_NAMES if (directory / n).is_file()][:1]
+    return picked
 
-    Search order per directory: ARIA.md → .aria.md → CLAUDE.md
-    Walks up at most 5 levels, stops at home dir.
-    Multiple files are concatenated (child file takes precedence at top).
-    Total cap: 12KB.
+
+def _load_project_context() -> str:
+    """Load AGENTS.md / ARIA.md / CLAUDE.md by walking up from cwd.
+
+    Only ARIA.md and CLAUDE.md were read, so a repository set up for Codex
+    and other agents through AGENTS.md gave Aria none of its rules. The walk
+    now stops at the repository root (a parent of the repository is not part
+    of the project), files nearer the working directory come first and get
+    first claim on the size cap, and ~/.arthera/ARIA.md comes last. It came
+    first, so a long global profile could crowd the project's rules out.
     """
     _MAX_BYTES = 12288
     _MAX_LEVELS = 5
-    _NAMES = ("ARIA.md", ".aria.md", "CLAUDE.md")
 
     home = pathlib.Path.home()
     cwd  = pathlib.Path.cwd().resolve()
 
-    found: list[tuple[pathlib.Path, str]] = []  # (file_path, content)
+    found: list[tuple[pathlib.Path, str]] = []  # nearest first
+    seen_text: set[str] = set()
+
+    def add(path: pathlib.Path) -> None:
+        try:
+            content = path.read_text(encoding="utf-8")
+        except Exception:
+            return
+        key = content.strip()
+        if key and key not in seen_text:      # a CLAUDE.md copied to AGENTS.md, a symlink
+            seen_text.add(key)
+            found.append((path, content))
+
     current = cwd
     for _ in range(_MAX_LEVELS):
-        for name in _NAMES:
-            p = current / name
-            if p.is_file():
-                try:
-                    content = p.read_text(encoding="utf-8")
-                    found.append((p, content))
-                except Exception:
-                    pass
-                break  # only one file per directory level
-        if current == home or current.parent == current:
+        for path in _project_rule_files(current):
+            add(path)
+        if current == home or current.parent == current or (current / ".git").exists():
             break
         current = current.parent
 
-    # Global user file — lowest priority background layer, project files override it.
-    # Lives at ~/.arthera/ARIA.md; user can edit with /memory edit global
+    # Global user file — lowest priority; /memory edit global edits it.
     _global_aria = home / ".arthera" / "ARIA.md"
     if _global_aria.is_file() and not any(f == _global_aria for f, _ in found):
-        try:
-            _gc = _global_aria.read_text(encoding="utf-8")
-            if _gc.strip():
-                found.insert(0, (_global_aria, _gc))   # prepend = lowest priority
-        except Exception:
-            pass
+        add(_global_aria)
 
     if not found:
         return ""
 
-    # Child directories first (most specific context wins), then parents
     blocks: list[str] = []
     total = 0
     for fpath, content in found:
@@ -89,7 +107,9 @@ def _load_project_context() -> str:
         if total >= _MAX_BYTES:
             break
 
-    return "\n\n## Project Context\n" + "\n\n".join(blocks)
+    header = ("\n\n## Project Context\n"
+              "Where these files disagree, the one listed first (nearest the working directory) wins.\n\n")
+    return header + "\n\n".join(blocks)
 
 
 def _display_value(value, digits: int = 2, suffix: str = "") -> str:

{aria_code-0.91.0 → aria_code-0.92.0}/src/aria_code/apps/cli/local_tool_schemas.py

@@ -93,13 +93,14 @@ def build_local_tool_schemas(
         "type": "function",
         "function": {
             "name": "edit_file",
-            "description": "Edit a file by replacing old_string with new_string. Read the file first to get the exact text to replace.",
+            "description": "Edit a file by replacing old_string with new_string. Read the file first to get the exact text to replace. old_string must match exactly one place: include enough surrounding lines to make it unique, or set replace_all to change every match.",
             "parameters": {
                 "type": "object",
                 "properties": {
                     "path": {"type": "string", "description": "File path to edit"},
                     "old_string": {"type": "string", "description": "Exact text to find and replace (must match exactly)"},
                     "new_string": {"type": "string", "description": "Replacement text"},
+                    "replace_all": {"type": "boolean", "description": "Replace every match instead of requiring exactly one (default false)"},
                 },
                 "required": ["path", "old_string", "new_string"],
             },