aria-code 0.82.0__tar.gz → 0.84.0__tar.gz

{aria_code-0.82.0/src/aria_code.egg-info → aria_code-0.84.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.82.0
+Version: 0.84.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.82.0 → aria_code-0.84.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aria-code"
-version = "0.82.0"
+version = "0.84.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.82.0 → aria_code-0.84.0}/src/aria_code/_version.py

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

aria_code-0.84.0/src/aria_code/apps/cli/commands/catalog.py

@@ -0,0 +1,160 @@
+"""Shared CLI command metadata.
+
+This module is intentionally UI-free so future channel adapters such as Feishu
+or a local gateway can reuse the same command categories without importing the
+large terminal implementation.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import FrozenSet, Tuple
+
+
+@dataclass(frozen=True)
+class DirectCommandSpec:
+    name: str
+    method_name: str
+    async_method: bool = False
+    watchable: bool = False
+    aliases: Tuple[str, ...] = ()
+
+    @property
+    def names(self) -> Tuple[str, ...]:
+        return (self.name, *self.aliases)
+
+
+DIRECT_COMMANDS: Tuple[DirectCommandSpec, ...] = (
+    DirectCommandSpec("quote", "cmd_quote", async_method=True, watchable=True),
+    DirectCommandSpec("backtest", "cmd_backtest", async_method=True),
+    DirectCommandSpec("health", "cmd_health", async_method=True, watchable=True),
+    DirectCommandSpec("doctor", "cmd_doctor"),
+    DirectCommandSpec("tools", "cmd_tools"),
+    DirectCommandSpec("skills", "cmd_skills"),
+    DirectCommandSpec("sessions", "cmd_sessions"),
+    DirectCommandSpec("watch", "cmd_watch", aliases=("watchlist",)),
+    DirectCommandSpec("export", "cmd_export", async_method=True),
+    DirectCommandSpec("tv", "cmd_tv", async_method=True),
+    DirectCommandSpec("ashare", "cmd_ashare", async_method=True, aliases=("a-share",)),
+    DirectCommandSpec("markets", "cmd_markets"),
+    DirectCommandSpec("orchestrate", "cmd_orchestrate"),
+)
+
+
+DIRECT_COMMAND_MAP = {
+    alias: spec
+    for spec in DIRECT_COMMANDS
+    for alias in spec.names
+}
+
+
+WATCHABLE_DIRECT_COMMANDS: FrozenSet[str] = frozenset(
+    alias
+    for spec in DIRECT_COMMANDS
+    if spec.watchable
+    for alias in spec.names
+)
+
+
+# Commands shown by default in /help. Other slash commands remain executable but
+# are hidden to keep the startup surface compact.
+VISIBLE_SLASH_COMMANDS: FrozenSet[str] = frozenset({
+    # Session
+    "/help", "/clear", "/compact", "/cost", "/status", "/health",
+    "/regen", "/undo", "/rewind", "/copy", "/recap", "/btw",
+    # Sessions
+    "/save", "/load", "/sessions", "/recall", "/export",
+    # Config
+    "/model", "/thinking", "/config", "/permissions", "/privacy",
+    # Setup & discovery
+    "/setup", "/apikey", "/doctor", "/architecture", "/mcp", "/skills", "/tools", "/packages", "/markets",
+    # Auth
+    "/login", "/logout", "/whoami",
+    # Persistent data (direct writes)
+    "/alert", "/journal", "/watch", "/note", "/todo", "/memory",
+    # Broker
+    "/broker", "/account", "/positions", "/orders", "/paper", "/trade",
+    # Code & project
+    "/project", "/init", "/review", "/code", "/plan", "/orchestrate", "/run", "/tasks", "/delegate", "/canva", "/completions", "/lsp",
+    # Research
+    "/team", "/warehouse", "/deep",
+    # Quant
+    "/backtest", "/wf", "/tv", "/ashare",
+    # UI generation
+    "/ui",
+    # Other
+    "/artifacts", "/vision", "/upload-image", "/file", "/strategy", "/accuracy",
+})
+
+
+# ── What "/" shows ────────────────────────────────────────────────────────────
+# The "/" popup listed every command — 167 of them plus 14 skills, 92 without
+# a category — and /help printed about 90 lines. Codex lists only session
+# controls under "/", shows eight rows, and takes tasks in plain language.
+# Aria keeps every command runnable by name; the popup opens on these two
+# tiers, and typing narrows it over everything.
+
+# Session and setup controls, in popup order.
+CORE_SLASH_COMMANDS: Tuple[str, ...] = (
+    "/help", "/model", "/review", "/plan", "/init", "/status", "/sessions", "/clear",
+    "/compact", "/copy", "/rewind", "/permissions", "/config", "/doctor", "/login",
+)
+
+# One way into each capability: building code, financial analysis, logistics.
+ENTRY_SLASH_COMMANDS: Tuple[str, ...] = (
+    "/code", "/ta", "/backtest", "/team", "/report", "/portfolio", "/inventory", "/carriers",
+)
+
+# Second names for a command; the popup lists the command once.
+COMMAND_ALIASES = {"/upload-image": "/vision"}
+
+
+@dataclass(frozen=True)
+class HelpTopic:
+    key: str
+    title_en: str
+    title_zh: str
+    commands: Tuple[str, ...]
+
+
+HELP_TOPICS: Tuple[HelpTopic, ...] = (
+    HelpTopic("code", "Code and projects", "代码与项目", (
+        "/code", "/project", "/init", "/review", "/plan", "/run", "/read", "/write", "/edit", "/ls",
+        "/search", "/verify", "/scaffold", "/apply", "/changes", "/git")),
+    HelpTopic("market", "Market research", "市场研究", (
+        "/quote", "/analyze", "/ta", "/chart", "/tv", "/deep", "/team", "/report", "/news", "/markets",
+        "/watch", "/alert")),
+    HelpTopic("quant", "Quant and portfolios", "量化与组合", (
+        "/backtest", "/wf", "/compare", "/auto-strategy", "/execution", "/portfolio", "/risk",
+        "/optimize", "/stress", "/factors")),
+    HelpTopic("logistics", "Logistics", "物流", ("/inventory", "/carriers", "/warehouse")),
+    HelpTopic("data", "Notes, files and artifacts", "笔记、文件与产物", (
+        "/journal", "/note", "/todo", "/memory", "/artifacts", "/strategy", "/accuracy", "/file",
+        "/vision", "/ui")),
+    HelpTopic("broker", "Broker and trading", "券商与交易", (
+        "/broker", "/paper", "/trade", "/account", "/positions", "/orders")),
+    HelpTopic("session", "Session", "会话", (
+        "/clear", "/compact", "/cost", "/status", "/health", "/regen", "/undo", "/rewind", "/copy",
+        "/recap", "/btw", "/save", "/load", "/sessions", "/export", "/export-pdf")),
+    HelpTopic("config", "Setup", "设置", (
+        "/model", "/thinking", "/config", "/permissions", "/privacy", "/local", "/update", "/setup",
+        "/apikey", "/doctor", "/mcp", "/login", "/logout", "/skills", "/tools", "/packages")),
+)
+
+HELP_TOPIC_MAP = {topic.key: topic for topic in HELP_TOPICS}
+
+
+def popup_rank(name: str) -> int:
+    """0 for a core command, 1 for an entry point, 2 for everything else."""
+    if name in CORE_SLASH_COMMANDS:
+        return 0
+    if name in ENTRY_SLASH_COMMANDS:
+        return 1
+    return 2
+
+
+def short_description(description: str) -> str:
+    """The description without its usage tail: "Technical indicators: /ta AAPL …" → "Technical indicators"."""
+    text = str(description or "")
+    cut = text.find(": /")
+    return (text[:cut] if cut > 0 else text).strip()

{aria_code-0.82.0 → aria_code-0.84.0}/src/aria_code/apps/cli/commands/core_cmds.py

@@ -117,7 +117,11 @@ class CoreCommandsMixin:
         # Contextual help: /help <command>
         from aria_code.apps.cli.skills_catalog import SKILLS
         target = args.strip().lower()
-        if target:
+        if target and target != "all":
+            from aria_code.apps.cli.commands.catalog import HELP_TOPIC_MAP
+            if target in HELP_TOPIC_MAP:
+                self._print_help_topic(HELP_TOPIC_MAP[target])
+                return
             cmd_key = target if target.startswith("/") else f"/{target}"
             if cmd_key in self.commands:
                 _, desc = self.commands[cmd_key]
@@ -149,7 +153,11 @@ class CoreCommandsMixin:
             self.context.console.print(f"[dim]No help for: {target}. Try /help[/dim]" if self.context.has_rich else f"No help for: {target}")
             return
 
-        # Full help listing
+        if not target:
+            self._print_help_overview()
+            return
+
+        # /help all: every command, grouped
         if self.context.has_rich:
             self.context.console.print()
 
@@ -248,6 +256,105 @@ class CoreCommandsMixin:
             print("\nSkills:")
             for s in SKILLS:
                 print(f"  {s['command']:20s} {s['description']}")
+    def _print_help_overview(self) -> None:
+        """One screen: what to type, the core commands, a way into each capability.
+
+        /help printed about 90 lines — every group, every skill — so the
+        commands that matter scrolled out of view. The rest is a topic away.
+        """
+        from aria_code.apps.cli.commands.catalog import (
+            CORE_SLASH_COMMANDS, ENTRY_SLASH_COMMANDS, HELP_TOPICS, short_description,
+        )
+        zh = str(self.terminal.config.get("ui_lang", "en")).lower().startswith("zh")
+        T = (lambda a, b: a) if zh else (lambda a, b: b)
+        core = [(n, short_description(self.commands[n][1])) for n in CORE_SLASH_COMMANDS if n in self.commands]
+        entry = [(n, short_description(self.commands[n][1])) for n in ENTRY_SLASH_COMMANDS if n in self.commands]
+        examples = (
+            T("给 utils.py 补上测试并运行", "Add tests for utils.py and run them"),
+            T("NVDA 这周走势怎么样？", "How's NVDA this week?"),
+            T("看看 skus.csv 哪些 SKU 该补货", "Which SKUs in skus.csv need reordering?"),
+        )
+        topics = " · ".join(t.key for t in HELP_TOPICS)
+        if not self.context.has_rich:
+            print("\n" + T("直接描述要做的事，Aria 会选择工具：", "Describe what you want; Aria picks the tools:"))
+            for example in examples:
+                print(f"  {example}")
+            print("\n" + T("常用命令", "Commands"))
+            for name, desc in core + entry:
+                print(f"  {name:13s} {desc}")
+            print("\n" + T(f"更多：/help {topics} · all · <命令>", f"More: /help {topics} · all · <command>"))
+            return
+
+        from rich.text import Text
+
+        console = self.context.console
+        console.print()
+        console.print(f"[bold]{T('直接描述要做的事', 'Describe what you want')}[/bold]  "
+                      f"[dim]{T('Aria 会选择工具', 'Aria picks the tools')}[/dim]")
+        for example in examples:
+            console.print(f"  [#C08050]{example}[/#C08050]")
+        console.print()
+
+        name_width = max(len(name) for name, _ in core + entry)
+        # indent 2, name, gap 2, description, gap 3, name, gap 2, description
+        desc_width = max(12, (console.width - 2 - 2 * name_width - 2 - 3 - 2) // 2)
+
+        def cell(text: str) -> str:
+            return text if len(text) <= desc_width else text[:desc_width - 1] + "…"
+
+        two_columns = console.width >= 96
+        if not two_columns:
+            desc_width = max(12, console.width - 2 - name_width - 2)
+
+        def grid(rows):
+            if two_columns:
+                half = (len(rows) + 1) // 2
+                pairs = zip(rows[:half], rows[half:] + [("", "")])
+            else:
+                pairs = ((row, ("", "")) for row in rows)
+            lines = Text()
+            for left, right in pairs:
+                lines.append("  " + left[0].ljust(name_width + 2), style="bold #C08050")
+                lines.append(cell(left[1]).ljust(desc_width + 3) if right[0] else cell(left[1]), style="dim")
+                if right[0]:
+                    lines.append(right[0].ljust(name_width + 2), style="bold #C08050")
+                    lines.append(cell(right[1]), style="dim")
+                lines.append("\n")
+            lines.rstrip()
+            return lines
+
+        console.print(f"[bold]{T('命令', 'Commands')}[/bold]")
+        console.print(grid(core))
+        console.print()
+        console.print(f"[bold]{T('开始一项任务', 'Start a task')}[/bold]  "
+                      f"[dim]{T('代码 · 金融分析 · 物流', 'code · financial analysis · logistics')}[/dim]")
+        console.print(grid(entry))
+        console.print()
+        console.print(f"[dim]{T('更多', 'More')}: /help {topics} · all · <{T('命令', 'command')}>[/dim]")
+        console.print(f"[dim]@ {T('附加上下文', 'attaches context')} · ! {T('运行 shell 命令', 'runs a shell command')}"
+                      f" · Esc {T('中断', 'interrupts')}[/dim]")
+        console.print()
+
+    def _print_help_topic(self, topic) -> None:
+        from aria_code.apps.cli.commands.catalog import short_description
+
+        zh = str(self.terminal.config.get("ui_lang", "en")).lower().startswith("zh")
+        rows = [(n, self.commands[n][1]) for n in topic.commands if n in self.commands]
+        title = topic.title_zh if zh else topic.title_en
+        if not self.context.has_rich:
+            print(f"\n{title}")
+            for name, desc in rows:
+                print(f"  {name:16s} {desc}")
+            return
+        from rich.markup import escape
+
+        console = self.context.console
+        console.print()
+        console.print(f"[bold]{title}[/bold]")
+        for name, desc in rows:
+            console.print(f"  [bold #C08050]{name:16s}[/bold #C08050][dim]{escape(desc)}[/dim]", highlight=False)
+        console.print()
+
     async def cmd_artifacts(self, args: str):
         from aria_code.ui.render.output import display_path as _display_path
         from aria_code.apps.cli.helpers import _copy_text_to_clipboard, _open_path_or_url, _reveal_path_in_finder

{aria_code-0.82.0 → aria_code-0.84.0}/src/aria_code/apps/cli/prompts/coding.py

@@ -26,6 +26,12 @@ CODING_SYSTEM_PROMPT = (
     "For multi-file projects: emit one <tool_call> per file in the SAME response (up to 5 write_file calls). "
     "Then run/verify in the NEXT response. Never mix write_file and run_command in the same response.\n\n"
 
+    "## FINAL SUMMARY\n"
+    "The user has already seen every step: each file written, with a preview, and each command's "
+    "output. End with 1-4 sentences: which files changed, what was verified and the result "
+    "(\"3 tests passed\"), and anything left open. Do NOT paste file contents, diffs or command "
+    "output back; quote a line or two only when it matters.\n\n"
+
     "## ABSOLUTELY FORBIDDEN\n"
     "1. NEVER pass slash-commands (/config, /model, /note, /apikey, etc.) to run_command — "
     "   they are NOT shell commands. To change policy tell the user to type the slash command directly.\n"

{aria_code-0.82.0 → aria_code-0.84.0}/src/aria_code/apps/cli/prompts/system_prompts.py

@@ -46,6 +46,8 @@ def build_response_style_rule(lang: str) -> str:
             "- For analysis: Conclusion -> Evidence -> Risk/Limitations -> Next.\n"
             "- Keep output compact: avoid repeated disclaimers, generic education, and duplicated sections.\n"
             "- Keep the interactive answer near one terminal screen (about 24 lines) unless the user explicitly requests detail.\n"
+            "- After using tools, do not paste back what the user already saw: name the files you wrote or changed and "
+            "quote only the lines that matter, and summarise command output (\"4 tests passed\") instead of reprinting it.\n"
             "- Never invent data. If a field is unavailable, omit it or note 'N/A' and continue with available data.\n\n"
         )
     return (
@@ -59,6 +61,7 @@ def build_response_style_rule(lang: str) -> str:
         "- 分析类回答按：结论 -> 依据 -> 风险/限制 -> 下一步。\n"
         "- 输出要紧凑：避免重复免责声明、泛泛教学和重复章节。\n"
         "- 交互回答尽量控制在一屏（约24行）；用户明确要求详细内容时除外。\n"
+        "- 用过工具后不要重复用户已看到的内容：写入或修改的文件只说文件名并只引用关键几行，命令输出用一句话概括（如“4 个测试全部通过”），不要整段重贴。\n"
         "- 绝不编造数据。字段不可用时说明数据源未返回，并继续使用已有数据。\n\n"
     )
 

{aria_code-0.82.0 → aria_code-0.84.0}/src/aria_code/apps/cli/runtime_consumer.py

@@ -33,15 +33,44 @@ _REPETITION_NOTICE = (
 
 
 def _redact_activity_text(value: Any, limit: int = 90) -> str:
+    """One line, secrets masked — for anything echoed to the screen or a log.
+
+    Shell commands are now shown on their step line, so this also covers
+    "Authorization: Bearer …", credentials in URLs and the usual key shapes.
+    """
     text = re.sub(r"\s+", " ", str(value or "")).strip()
     text = re.sub(
-        r"(?i)(api[_-]?key|token|password|secret)(\s*[=:]\s*|\s+)[^\s]+",
+        r"(?i)(api[_-]?key|token|password|passwd|secret)(\s*[=:]\s*|\s+)[^\s]+",
         r"\1\2***",
         text,
     )
+    text = re.sub(r"(?i)\b(bearer|basic)\s+[A-Za-z0-9._~+/=-]+", r"\1 ***", text)
+    text = re.sub(r"://[^/\s:@]+:[^@\s]+@", "://***@", text)
+    text = re.sub(r"\b(sk|pk|rk)-[A-Za-z0-9_-]{8,}|\bgh[pousr]_[A-Za-z0-9]{12,}|\bAIza[0-9A-Za-z_-]{20,}"
+                  r"|\bxox[abposr]-[A-Za-z0-9-]{10,}", "***", text)
     return text[:limit]
 
 
+# How long the runtime measured a tool call to take, carried with its result.
+MEASURED_ELAPSED_KEY = "_elapsed_s"
+
+
+def with_measured_elapsed(result: Any, elapsed: Any) -> Any:
+    if isinstance(result, dict) and isinstance(elapsed, (int, float)):
+        return {**result, MEASURED_ELAPSED_KEY: float(elapsed)}
+    return result
+
+
+def approval_subject(tool_name: str, params: dict[str, Any]) -> str:
+    """What an answered approval leaves behind: the file, or the command with secrets masked."""
+    if tool_name == "run_command":
+        return _redact_activity_text(params.get("command", ""), limit=80)
+    for key in ("path", "file_path"):
+        if params.get(key):
+            return Path(str(params[key])).name
+    return tool_name.replace("_", " ")
+
+
 def _tool_activity_hint(tool: str, params: dict[str, Any]) -> str:
     """Return one safe, useful argument for a compact activity row."""
     if not isinstance(params, dict):
@@ -506,6 +535,11 @@ class TerminalRuntimeEventConsumer:
         if not starts:
             self.tool_start_times.pop(tool, None)
         elapsed_ms = int((time.time() - started_at) * 1000)
+        # The runtime times each call itself. Measuring from the announcement
+        # counted the person reading an approval, and results of a batch
+        # arrive together — "✓ writing file test_fx.py 13.9s" for a 9ms write.
+        if isinstance(summary, dict) and isinstance(summary.get(MEASURED_ELAPSED_KEY), (int, float)):
+            elapsed_ms = int(summary[MEASURED_ELAPSED_KEY] * 1000)
         params_queue = self.tool_params.get(tool) or []
         params = params_queue.pop(0) if params_queue else {}
         if not params_queue:
@@ -519,6 +553,10 @@ class TerminalRuntimeEventConsumer:
             detail = ""
             if not ok and isinstance(summary, dict):
                 detail = str(summary.get("error") or "")[:90]
+            elif ok:
+                # Name what was done: two bare "✓ writing file" lines in a row
+                # did not say which file each was.
+                detail = _tool_activity_hint(tool, params)
             self.print_tool_done(tool, elapsed_ms, success=ok, summary=detail)
 
         ts = time.strftime("%H:%M:%S")
@@ -588,7 +626,7 @@ class TerminalRuntimeEventConsumer:
         elif isinstance(event, AgentEventToolCall):
             self.on_tool_call(event.tool, event.params)
         elif isinstance(event, AgentEventToolResult):
-            self.on_tool_result(event.tool, event.result)
+            self.on_tool_result(event.tool, with_measured_elapsed(event.result, getattr(event, "elapsed", None)))
         elif isinstance(event, AgentEventStatus):
             self.on_status(event.state, event.message)
 
@@ -638,7 +676,9 @@ class TerminalApprovalEventConsumer:
         if not approval.approved:
             from aria_code.ui.render.output import print_tool_blocked
 
-            print_tool_blocked(tool_name, "用户取消", console=self.console, has_rich=self.has_rich)
+            zh = str(self.terminal.config.get("ui_lang", "en")).lower().startswith("zh")
+            print_tool_blocked(tool_name, "用户取消" if zh else "declined", console=self.console,
+                               has_rich=self.has_rich)
         return approval
 
     def apply(self, tool_params: dict, approval: ApprovalDecision) -> dict:
@@ -649,7 +689,9 @@ class TerminalApprovalEventConsumer:
             try:
                 self.save_config(self.terminal.config)
                 if self.has_rich:
-                    self.console.print("  [dim]策略已升级为 balanced 并保存[/dim]")
+                    zh = str(self.terminal.config.get("ui_lang", "en")).lower().startswith("zh")
+                    self.console.print("  [dim]策略已升级为 balanced 并保存[/dim]" if zh else
+                                       "  [dim]Policy set to balanced and saved[/dim]")
             except Exception:
                 pass
         return tool_params

{aria_code-0.82.0 → aria_code-0.84.0}/src/aria_code/apps/cli/tool_executor.py

@@ -57,7 +57,7 @@ def _command_approval_prefix(command: str) -> tuple[str, ...]:
     return ()
 
 
-def _arrow_select(options, selected: int = 0, title: str = "") -> int:
+def _arrow_select(options, selected: int = 0, title: str = "", **_kwargs) -> int:
     return len(options) - 1
 
 
@@ -472,7 +472,10 @@ def _confirm_tool_execution_decision(tool_name: str, params: dict,
                 ("Allow & set balanced", "允许并升级策略（本会话有效）" if zh else "and use balanced for this session"),
                 ("No", "拒绝执行" if zh else "do not run it"),
             ]
-            choice = _arrow_select(options, selected=0, title="")
+            # Imported here: aria_cli rebinds this function to its own globals.
+            from aria_code.apps.cli.runtime_consumer import approval_subject as _subject
+            choice = _arrow_select(options, selected=0, title="",
+                                   collapse_to=_subject(tool_name, params))
             if choice == 0:
                 return ApprovalDecision.allow(policy="balanced", user_approved=True)
             if choice == 1:
@@ -518,7 +521,10 @@ def _confirm_tool_execution_decision(tool_name: str, params: dict,
         ("Yes, allow all tools",             "本会话内所有工具自动允许" if zh else "every tool, this session"),
         ("No",                               ""),
     ]
-    choice = _arrow_select(options, selected=0, title="")
+    # Imported here: aria_cli rebinds this function to its own globals.
+    from aria_code.apps.cli.runtime_consumer import approval_subject as _subject
+    choice = _arrow_select(options, selected=0, title="",
+                           collapse_to=_subject(tool_name, params))
 
     if choice == 0:
         if tool_name == "run_command":

{aria_code-0.82.0 → aria_code-0.84.0}/src/aria_code/apps/cli/tools/system_tools.py

@@ -77,6 +77,41 @@ def _cprint(msg: str, *, console, has_rich: bool) -> None:
         print(plain)
 
 
+OUTPUT_PREVIEW_LINES = 5
+
+
+def print_command_outcome(console, returncode: int, stdout: str, stderr: str, full_output_path: str = "") -> None:
+    """One step line and the last few lines of what the command printed.
+
+    This printed "Command completed (exit 0)", up to six stdout lines and
+    "full output saved" — and nothing at all for `python3 -m unittest -v`,
+    whose report goes to stderr, so the model pasted the test results into
+    its answer instead. Lines are plain text: program output such as
+    "[/dim]" is not Rich markup. As Codex does, the tail is kept — that is
+    where "OK" or the failure is — and the rest is counted.
+    """
+    from rich.text import Text
+
+    lines = stdout.rstrip().splitlines() + (stderr.rstrip().splitlines() if stderr.strip() else [])
+    ok = returncode == 0
+    head = Text("  ⎿  ", style="dim")
+    head.append(f"exit {returncode}", style="green" if ok else "red")
+    if lines:
+        head.append(f" · {len(lines)} line{'s' if len(lines) != 1 else ''}", style="dim")
+    console.print(head)
+    notes = []
+    if len(lines) > OUTPUT_PREVIEW_LINES:
+        notes.append(f"… +{len(lines) - OUTPUT_PREVIEW_LINES} lines")
+    if full_output_path:
+        from aria_code.ui.render.output import display_path
+
+        notes.append(f"full output saved: {display_path(full_output_path)}")
+    if notes:
+        console.print(Text("     " + " · ".join(notes), style="dim"))
+    for line in lines[-OUTPUT_PREVIEW_LINES:]:
+        console.print(Text("     " + line[:160], style="dim" if ok else "red"), overflow="ellipsis", no_wrap=True)
+
+
 def tool_run_command(
     params: dict,
     *,
@@ -374,20 +409,8 @@ def tool_run_command(
         # ── End auto-fix ─────────────────────────────────────────────────────
 
         if has_rich and console is not None:
-            if result.returncode == 0:
-                console.print(f"  [green]Command completed[/green] [dim](exit {result.returncode})[/dim]")
-            else:
-                console.print(f"  [dim]Command exited {result.returncode}[/dim]")
-            out_preview = output.strip().splitlines()[:6]
-            for ol in out_preview:
-                console.print(f"    [dim]{ol[:120]}[/dim]")
-            if len(output.strip().splitlines()) > 6:
-                console.print("    [dim]...truncated[/dim]")
-            if output_artifact.get("full_output_path"):
-                console.print("    [dim]full output saved[/dim]")
-            if stderr.strip() and result.returncode != 0:
-                for el in stderr.strip().splitlines()[:3]:
-                    console.print(f"    [red]{el[:120]}[/red]")
+            print_command_outcome(console, result.returncode, output, stderr,
+                                  output_artifact.get("full_output_path", ""))
         else:
             print(f"  Command exit: {result.returncode}")
         data = {

{aria_code-0.82.0 → aria_code-0.84.0}/src/aria_code/aria_cli.py

@@ -2623,7 +2623,10 @@ def _format_tool_params(tool_name: str, params: dict) -> str:
         # Basename only — informative without leaking full workspace paths.
         return _short(pathlib.Path(str(params.get("path", ""))).name or "file tool", 40)
     if tool_name == "run_command":
-        return "shell tool"
+        # The command itself, secrets masked: "shell tool" said nothing, while
+        # the approval menu under it named the command anyway.
+        from apps.cli.runtime_consumer import _redact_activity_text
+        return _short(_redact_activity_text(params.get("command", ""), limit=200) or "shell", 72)
     if tool_name == "list_files":
         return _short(params.get("pattern") or params.get("path") or "file tool", 40)
     if tool_name == "search_code":
@@ -2782,7 +2785,7 @@ def _print_tool_done(tool_name: str, elapsed_ms: int, success: bool = True, summ
         return
     action = _TOOL_ACTION_LABELS.get(tool_name, tool_name.replace("_", " "))
     icon   = "[green]✓[/green]" if success else "[red]✗[/red]"
-    t_txt  = f"({elapsed_ms}ms)" if elapsed_ms > 0 else ""
+    t_txt  = ("" if elapsed_ms <= 0 else f"{elapsed_ms}ms" if elapsed_ms < 1000 else f"{elapsed_ms / 1000:.1f}s")
     if summary:
         # 单行预算:summary 按显示宽度(CJK 记 2 格)截断,保证图标+动作+摘要+时长
         # 排在同一行——否则 Rich 整行回卷,时长 chip 顶格孤立在下一行,树形缩进被破坏。

{aria_code-0.82.0 → aria_code-0.84.0}/src/aria_code/runtime/gateway.py

@@ -126,7 +126,9 @@ async def run_turn(
                 on_tool_call(ev.tool, dict(ev.params))
         elif isinstance(ev, AgentEventToolResult):
             if on_tool_result is not None:
-                on_tool_result(ev.tool, dict(ev.result))
+                from aria_code.apps.cli.runtime_consumer import with_measured_elapsed
+
+                on_tool_result(ev.tool, with_measured_elapsed(dict(ev.result), getattr(ev, "elapsed", None)))
         elif isinstance(ev, AgentEventStatus):
             if on_status is not None:
                 phase = getattr(ev, "phase", "") or getattr(ev, "state", "") or ""