aria-code 0.128.0__tar.gz → 0.130.0__tar.gz

{aria_code-0.128.0/src/aria_code.egg-info → aria_code-0.130.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.128.0
+Version: 0.130.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
@@ -172,7 +172,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.128.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.128.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.130.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.130.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.128.0 → aria_code-0.130.0}/README.md

@@ -15,7 +15,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.128.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.128.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.130.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.130.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.128.0 → aria_code-0.130.0}/pyproject.toml

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

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

{aria_code-0.128.0 → aria_code-0.130.0}/src/aria_code/aria_relay_server.py

@@ -38,6 +38,9 @@ WebSocket 注册流程:
                         飞书 Verification Token（次选）——校验事件体里的 token
                         ⚠️ 二者至少配一个，否则 /feishu/event 一律拒绝。
                         仅本地联调可设 RELAY_ALLOW_UNVERIFIED_EVENTS=1 绕过。
+                        ⚠️ 不支持飞书「加密推送」：Encrypt Key 只用于校验签名，事件体
+                        不会被解密。开了加密推送，事件体只有 {"encrypt": ...}，所有消息
+                        都会被静默忽略。飞书后台请保持加密推送关闭。
   RELAY_SECRET          部署级别的注册口令（可选）。每台电脑另有自己的令牌和绑定码，
                         见下方 client_credentials：没有它们，任何人都能冒充或绑定别人的电脑。
   RELAY_STORE           状态存储：sqlite（默认，DB_PATH）或 firestore。Cloud Run 上必须用
@@ -45,6 +48,12 @@ WebSocket 注册流程:
   RELAY_FIRESTORE_PROJECT / RELAY_FIRESTORE_DATABASE  可选，默认当前项目和 (default) 数据库
   DB_PATH               SQLite 路径（默认 ./relay.db）
   MESSAGE_TIMEOUT       等待用户本机回复的超时秒数（默认 90）
+
+事件应答:
+  飞书约 3 秒内收不到应答就会重发事件。所以 /feishu/event 先应答 {"code": 0}，
+  转发和等待本机回复放在应答之后执行；按 event_id（旧版事件为 uuid）去重，
+  重发的事件只应答、不再转发。卡片按钮事件例外：飞书要用应答里的 toast/卡片，
+  所以仍同步等待本机（最多 2.5 秒）。
 """
 
 from __future__ import annotations
@@ -62,7 +71,7 @@ from contextlib import asynccontextmanager
 from typing import Any, Optional
 
 import httpx
-from fastapi import FastAPI, HTTPException, Request, WebSocket, WebSocketDisconnect
+from fastapi import BackgroundTasks, FastAPI, HTTPException, Request, WebSocket, WebSocketDisconnect
 from fastapi.responses import JSONResponse
 
 logger = logging.getLogger("aria.relay_server")
@@ -78,7 +87,8 @@ _ALLOW_UNVERIFIED_EVENTS   = os.environ.get(
     "RELAY_ALLOW_UNVERIFIED_EVENTS", "").strip().lower() in {"1", "true", "yes", "on"}
 _DB_PATH           = os.environ.get("DB_PATH", "./relay.db")
 _MSG_TIMEOUT       = int(os.environ.get("MESSAGE_TIMEOUT", "90"))
-_FEISHU_API        = "https://open.feishu.cn/open-apis"
+# Overridable so contract tests can point the relay at a fake Feishu.
+_FEISHU_API        = os.environ.get("FEISHU_API_BASE", "https://open.feishu.cn/open-apis").rstrip("/")
 
 
 # ── Persistent state (relay_store.py) ─────────────────────────────────────────
@@ -160,7 +170,9 @@ def _client_for_bind_code(code: str) -> Optional[str]:
 # ── WebSocket connection registry ─────────────────────────────────────────────
 
 _connections: dict[str, WebSocket] = {}   # client_id → WebSocket
-_pending_responses: dict[str, asyncio.Future] = {}   # request_id → Future
+# request_id → (client_id it was sent to, Future). Only that client may answer:
+# any connected client could otherwise resolve another machine's request.
+_pending_responses: dict[str, tuple[str, asyncio.Future]] = {}
 
 
 # ── Sending on a client's behalf ─────────────────────────────────────────────
@@ -226,7 +238,6 @@ async def _send_for_client(client_id: str, request: dict) -> dict:
     if refused:
         logger.warning("refused send for %s: %s", client_id, refused)
         return {"code": -1, "msg": f"relay refused: {refused}"}
-    token = await _get_tenant_token()
     body = {"msg_type": request["msg_type"], "content": request["content"]}
     if request["op"] == "reply":
         url = f"{_FEISHU_API}/im/v1/messages/{request['target']}/reply"
@@ -234,6 +245,7 @@ async def _send_for_client(client_id: str, request: dict) -> dict:
         url = f"{_FEISHU_API}/im/v1/messages?receive_id_type=chat_id"
         body["receive_id"] = request["target"]
     try:
+        token = await _get_tenant_token()
         async with httpx.AsyncClient() as client:
             resp = await client.post(url, headers={"Authorization": f"Bearer {token}"}, json=body, timeout=15)
         result = resp.json()
@@ -269,7 +281,12 @@ async def _get_tenant_token() -> str:
         )
         data = resp.json()
 
-    token = data.get("tenant_access_token", "")
+    token = data.get("tenant_access_token", "") if isinstance(data, dict) else ""
+    if resp.status_code != 200 or data.get("code", 0) != 0 or not token:
+        # Not cached: an empty token kept for two hours made every send fail
+        # until it expired. The next call tries again.
+        raise RuntimeError(f"Feishu tenant token: HTTP {resp.status_code}, "
+                           f"code {data.get('code') if isinstance(data, dict) else '?'}")
     expire = int(data.get("expire", 7200))
     _feishu_token_cache.update({"token": token, "expires_at": now + expire})
     return token
@@ -332,7 +349,7 @@ async def _route_to_client(client_id: str, payload: dict, timeout: Optional[floa
 
     req_id = f"req_{uuid.uuid4().hex[:10]}"
     future: asyncio.Future = asyncio.get_event_loop().create_future()
-    _pending_responses[req_id] = future
+    _pending_responses[req_id] = (client_id, future)
 
     try:
         await ws.send_text(json.dumps({
@@ -349,6 +366,15 @@ async def _route_to_client(client_id: str, payload: dict, timeout: Optional[floa
         _pending_responses.pop(req_id, None)
 
 
+def _resolve_response(client_id: str, message: dict) -> bool:
+    """Hand a client's answer to the request waiting for it — if it was sent to that client."""
+    owner, future = _pending_responses.get(message.get("id", ""), (None, None))
+    if future is None or owner != client_id or future.done():
+        return False
+    future.set_result(message.get("result"))
+    return True
+
+
 # ── FastAPI app ───────────────────────────────────────────────────────────────
 
 @asynccontextmanager
@@ -427,10 +453,7 @@ async def ws_endpoint(websocket: WebSocket):
                 continue
 
             if response_msg.get("type") == "response":
-                req_id = response_msg.get("id", "")
-                future = _pending_responses.get(req_id)
-                if future and not future.done():
-                    future.set_result(response_msg.get("result"))
+                _resolve_response(client_id, response_msg)
 
     except WebSocketDisconnect:
         pass
@@ -439,7 +462,10 @@ async def ws_endpoint(websocket: WebSocket):
     except Exception as e:
         logger.exception("WebSocket error: %s", e)
     finally:
-        if client_id:
+        # A reconnect registers a new socket under the same client_id before
+        # the old one is noticed as gone, and a refused registration never
+        # registered at all: neither may remove the live connection.
+        if client_id and _connections.get(client_id) is websocket:
             _connections.pop(client_id, None)
             logger.info("Client disconnected: %s", client_id)
 
@@ -500,7 +526,7 @@ def _verify_feishu_request(headers: dict, body: bytes, payload: dict) -> tuple[b
 
 
 @app.post("/feishu/event")
-async def feishu_event(request: Request):
+async def feishu_event(request: Request, background: BackgroundTasks):
     """Feishu Developer Console → Event Subscription → Request URL: /feishu/event"""
     body = await request.body()
     try:
@@ -535,6 +561,43 @@ async def feishu_event(request: Request):
             return result
         return {"toast": {"type": "error", "content": "Aria 本机未及时响应，请稍后再试。"}}
 
+    # Feishu retries an event it did not get an answer to within about 3 s.
+    # Forwarding waits for the machine (up to MESSAGE_TIMEOUT), so the answer
+    # goes back now and the work runs after it; a retry of an event already
+    # taken is acknowledged and dropped instead of reaching the machine twice.
+    if _seen_event(payload):
+        return {"code": 0}
+    background.add_task(_handle_message, payload)
+    return {"code": 0}
+
+
+_EVENT_TTL = 8 * 3600     # Feishu's last retry comes about six hours after the first try
+_seen_events: dict[str, float] = {}   # event id → when it may be forgotten
+
+
+def _seen_event(payload: dict) -> bool:
+    """True when this event was already taken; records it otherwise."""
+    event_id = str((payload.get("header") or {}).get("event_id") or payload.get("uuid") or "")
+    if not event_id:
+        return False
+    now = time.time()
+    for stale in [key for key, expires in _seen_events.items() if expires < now]:
+        _seen_events.pop(stale, None)
+    if event_id in _seen_events:
+        return True
+    _seen_events[event_id] = now + _EVENT_TTL
+    return False
+
+
+async def _handle_message(payload: dict) -> None:
+    """A message event, after Feishu has had its answer: bind, or forward."""
+    try:
+        await _deliver(payload)
+    except Exception:
+        logger.exception("handling a Feishu event failed")
+
+
+async def _deliver(payload: dict) -> None:
     # Extract sender + message_id
     event = payload.get("event", {})
     message = event.get("message", {})
@@ -543,7 +606,7 @@ async def feishu_event(request: Request):
     message_id     = message.get("message_id", "")
 
     if not feishu_user_id:
-        return {"code": 0}
+        return
 
     # Handle /bind command
     msg_type = message.get("message_type", "")
@@ -564,13 +627,13 @@ async def feishu_event(request: Request):
                 await _send_feishu_text(
                     feishu_user_id,
                     "❌ 绑定码无效。请在你电脑上运行 aria-code 的配置向导，使用它显示的绑定码。")
-                return {"code": 0}
+                return
             _bind(feishu_user_id, client_id)
             await _send_feishu_text(
                 feishu_user_id,
                 "✅ 绑定成功！你的 Aria 实例已连接。\n现在可以直接发消息与你的 Aria 交互了。"
             )
-            return {"code": 0}
+            return
 
     # Route to local aria instance
     result = await _route_to_local(feishu_user_id, payload)
@@ -592,8 +655,6 @@ async def feishu_event(request: Request):
                 color="yellow",
             )
 
-    return {"code": 0}
-
 
 # ── Status endpoint ───────────────────────────────────────────────────────────
 

aria_code-0.130.0/src/aria_code/runtime/native_index.py

@@ -0,0 +1,92 @@
+"""Project-graph imports and Python definitions from ``aria-native index``.
+
+Parsing every Python file twice — ``repo_map`` for its definitions,
+``project_graph`` for its imports, each an ``ast.parse`` and a walk — is most
+of the time a graph build takes. The Rust ``aria-graph`` crate does both in
+parallel; the callers ask it first and keep the Python implementation for
+everything it does not answer:
+
+* no binary — ``ARIA_NATIVE_BINARY`` or ``aria-native`` on ``PATH`` — or
+  ``ARIA_NATIVE_GRAPH=off``;
+* too few files to be worth a process (``_MIN_FILES``);
+* the binary failing, timing out or answering out of shape;
+* a file its parser rejects or cannot read (``fallback``), which Python then
+  handles itself.
+
+The two implementations must agree; ``tests/test_native_index.py`` holds them
+to it on this repository and on edge cases.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import shutil
+import subprocess
+from pathlib import Path
+from typing import Optional, Sequence
+
+_MIN_FILES = 32
+_TIMEOUT = 120
+
+
+def native_binary() -> Optional[str]:
+    configured = os.environ.get("ARIA_NATIVE_BINARY", "").strip()
+    if configured:
+        return configured if Path(configured).is_file() else None
+    return shutil.which("aria-native")
+
+
+def enabled() -> bool:
+    return os.environ.get("ARIA_NATIVE_GRAPH", "").strip().lower() not in ("0", "off", "false", "no")
+
+
+def _call(command: str, payload: dict, wanted: Sequence[str], key: str,
+          minimum: Optional[int]) -> Optional[tuple[dict, list[str]]]:
+    """``(answers by path, paths left to Python)`` from ``aria-native index <command>``, or None."""
+    if len(wanted) < (_MIN_FILES if minimum is None else minimum) or not enabled():
+        return None
+    binary = native_binary()
+    if not binary:
+        return None
+    try:
+        done = subprocess.run([binary, "index", command], input=json.dumps(payload), capture_output=True,
+                              text=True, encoding="utf-8", timeout=_TIMEOUT, check=False)
+        if done.returncode != 0:
+            return None
+        data = json.loads(done.stdout)
+    except (OSError, ValueError, subprocess.SubprocessError):
+        return None
+    answers, fallback = data.get(key), data.get("fallback")
+    if not isinstance(answers, dict) or not isinstance(fallback, list):
+        return None
+    paths = set(wanted)
+    if not set(answers) | set(fallback) >= paths:   # every file answered one way or the other
+        return None
+    return ({path: answer for path, answer in answers.items() if path in paths},
+            [path for path in fallback if path in paths])
+
+
+def resolve_imports(root: Path, files: Sequence[tuple[str, str]], parse: Sequence[str],
+                    *, minimum: Optional[int] = None) -> Optional[tuple[dict[str, list[str]], list[str]]]:
+    """``(imports by path, paths to parse in Python)``, or None to do it all in Python."""
+    payload = {"root": str(root), "files": [list(f) for f in files], "parse": list(parse)}
+    result = _call("imports", payload, parse, "imports", minimum)
+    if result is None:
+        return None
+    imports, fallback = result
+    return {path: list(found) for path, found in imports.items()}, fallback
+
+
+def python_symbols(root: Path, parse: Sequence[str], *, minimum: Optional[int] = None,
+                   ) -> Optional[tuple[dict[str, list[tuple[str, str, int, str]]], list[str]]]:
+    """``(definitions by path as (name, kind, line, parent), paths for Python)``, or None."""
+    result = _call("symbols", {"root": str(root), "parse": list(parse)}, parse, "symbols", minimum)
+    if result is None:
+        return None
+    symbols, fallback = result
+    try:
+        return ({path: [(str(n), str(k), int(line), str(p)) for n, k, line, p in found]
+                 for path, found in symbols.items()}, fallback)
+    except (TypeError, ValueError):
+        return None

{aria_code-0.128.0 → aria_code-0.130.0}/src/aria_code/runtime/project_graph.py

@@ -394,7 +394,7 @@ def _js_imports(root: Path, path: str, files) -> list[str]:
     for spec in _JS_IMPORT.findall(source):
         base = os.path.normpath(str(folder / spec))
         candidates = [base, *(base + ext for ext in _JS_EXTENSIONS),
-                      *(f"{base}/index{ext}" for ext in _JS_EXTENSIONS)]
+                      *(os.path.join(base, f"index{ext}") for ext in _JS_EXTENSIONS)]
         hit = next((c for c in candidates if c in files), None)
         if hit:
             found.append(hit)

{aria_code-0.128.0 → aria_code-0.130.0}/src/aria_code/runtime/repo_map.py

@@ -49,12 +49,15 @@ establishes the truth once it gets there.
 from __future__ import annotations
 
 import ast
+import os
 import re
 import time
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Dict, Iterable, List, Optional, Sequence, Set, Tuple
 
+from . import native_index
+
 __all__ = [
     "REPO_MAP_SCHEMAS",
     "REPO_MAP_TOOLS",
@@ -363,6 +366,8 @@ class RepoMap:
         paths = self._walk()
         previous = self.files if not force else {}
         files: Dict[str, FileEntry] = {}
+        order: List[str] = []   # walk order, which ranking ties fall back on
+        stale: List[Tuple[str, Path, os.stat_result, str]] = []
 
         for path in paths:
             try:
@@ -376,25 +381,32 @@ class RepoMap:
             except ValueError:
                 rel = str(path)
 
+            order.append(rel)
             cached = previous.get(rel)
             if cached is not None and cached.mtime == stat.st_mtime and cached.size == stat.st_size:
                 files[rel] = cached
                 continue
+            stale.append((rel, path, stat, LANGUAGES.get(path.suffix.lower(), "")))
+
+        # Python definitions come from the native indexer when it can answer
+        # (one parallel pass); everything it does not is extracted here.
+        native = native_index.python_symbols(
+            self.root, [rel for rel, _path, _stat, language in stale if language == "python"])
+        parsed = native[0] if native is not None else {}
+
+        for rel, path, stat, language in stale:
+            if rel in parsed:
+                symbols = [Symbol(name=n, kind=k, line=line, parent=p) for n, k, line, p in parsed[rel]]
+            else:
+                try:
+                    source = path.read_text(encoding="utf-8", errors="replace")
+                except (OSError, UnicodeError):
+                    continue
+                symbols = extract_symbols(source, language)
+            files[rel] = FileEntry(path=rel, language=language, symbols=symbols,
+                                   mtime=stat.st_mtime, size=stat.st_size)
 
-            language = LANGUAGES.get(path.suffix.lower(), "")
-            try:
-                source = path.read_text(encoding="utf-8", errors="replace")
-            except (OSError, UnicodeError):
-                continue
-            files[rel] = FileEntry(
-                path=rel,
-                language=language,
-                symbols=extract_symbols(source, language),
-                mtime=stat.st_mtime,
-                size=stat.st_size,
-            )
-
-        self.files = files
+        self.files = {rel: files[rel] for rel in order if rel in files}
         self._index()
         self.built_at = time.time()
         self.scan_seconds = self.built_at - started

{aria_code-0.128.0 → aria_code-0.130.0/src/aria_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.128.0
+Version: 0.130.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
@@ -172,7 +172,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.128.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.128.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.130.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.130.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.128.0 → aria_code-0.130.0}/src/aria_code.egg-info/SOURCES.txt

@@ -733,7 +733,9 @@ tests/test_quant_engine_namespace.py
 tests/test_rebind_contract.py
 tests/test_rebind_namespace_contract.py
 tests/test_relay_client_credentials.py
+tests/test_relay_contract.py
 tests/test_relay_event_verification.py
+tests/test_relay_reliability.py
 tests/test_relay_sends_for_clients.py
 tests/test_relay_store.py
 tests/test_relay_url.py

{aria_code-0.128.0 → aria_code-0.130.0}/tests/test_native_index.py

@@ -31,7 +31,12 @@ def _build(root: Path, monkeypatch, native: bool) -> dict[str, list[str]]:
     graph = pg.ProjectGraph(root).build()
     if native:
         assert calls and calls[0] is not None, "the native resolver was not used"
-    return {path: info["imports"] for path, info in graph.files.items()}
+    return {_slash(path): [_slash(i) for i in info["imports"]] for path, info in graph.files.items()}
+
+
+def _slash(path: str) -> str:
+    """Windows paths use backslashes; the expectations below are written with '/'."""
+    return path.replace("\\", "/")
 
 
 def _write(root: Path, files: dict[str, str | bytes]) -> Path:
@@ -137,3 +142,96 @@ def test_a_rejected_file_is_handed_back_to_python(tmp_path, monkeypatch):
     imports, fallback = native_index.resolve_imports(
         root, [("a.py", "python"), ("b.py", "python")], ["a.py", "b.py"], minimum=0)
     assert fallback == ["a.py"] and imports == {"b.py": ["a.py"]}
+
+
+# ── definitions (repo_map) ─────────────────────────────────────────────────
+
+from aria_code.runtime.repo_map import RepoMap  # noqa: E402
+
+SYMBOL_CASES = {
+    "mod.py": """
+        import os
+        LIMIT = 3
+        lower = 1
+        XY = 2
+        A = B = 4
+        (C, D) = 5, 6
+        NAME: str = "x"
+        ÉTAT_GLOBAL = 1
+
+        @decorator(
+            "multi-line",
+        )
+        # a comment between decorator and def
+        @other
+        async def run():
+            def inner(): ...
+
+        class Gate(Base, metaclass=Meta):
+            TOKEN = 1
+
+            @property
+            def check(self): ...
+
+            async def wait(self): ...
+
+            if True:
+                def hidden(self): ...
+
+            class Nested:
+                def deep(self): ...
+    """,
+    "crlf.py": b"class Windows:\r\n    def line(self):\r\n        pass\r\n\r\nLATER = 1\r\n",
+    "bom.py": b"\xef\xbb\xbfdef bom(): ...\n",
+    "broken.py": "def oops(:\n    pass\n",
+    "match_case.py": "match x:\n    case 1:\n        def not_top(): ...\nTOP_LEVEL = 1\n",
+    "web/app.ts": "export function notPython() {}\n",
+}
+
+
+def _symbols(root: Path, monkeypatch, native: bool) -> dict[str, list[tuple]]:
+    monkeypatch.setenv("ARIA_NATIVE_GRAPH", "on" if native else "off")
+    monkeypatch.setattr(native_index, "_MIN_FILES", 0)
+    if native:
+        calls = []
+        real = native_index.python_symbols
+
+        def spy(*args, **kwargs):
+            result = real(*args, **kwargs)
+            calls.append(result)
+            return result
+
+        monkeypatch.setattr(native_index, "python_symbols", spy)
+    repo = RepoMap(root).build()
+    if native:
+        assert calls and calls[0] is not None, "the native extractor was not used"
+    return {_slash(path): [(s.name, s.kind, s.line, s.parent) for s in entry.symbols]
+            for path, entry in repo.files.items()}
+
+
+@needs_binary
+def test_definitions_are_extracted_the_same_way(tmp_path, monkeypatch):
+    root = _write(tmp_path, SYMBOL_CASES)
+    python = _symbols(root, monkeypatch, native=False)
+    native = _symbols(root, monkeypatch, native=True)
+    assert native == python
+    assert list(native) == list(python)   # walk order is kept
+    assert python["crlf.py"] == [("Windows", "class", 1, ""), ("line", "def", 2, "Windows"), ("LATER", "const", 5, "")]
+    assert python["bom.py"] == [] and python["broken.py"] == []
+    assert ("run", "async def", 16, "") in python["mod.py"]   # the def line, not the decorator
+    assert ("check", "def", 23, "Gate") in python["mod.py"]
+
+
+@needs_binary
+@pytest.mark.timeout(300)
+def test_this_repository_has_the_same_definitions(monkeypatch):
+    assert _symbols(REPO, monkeypatch, native=True) == _symbols(REPO, monkeypatch, native=False)
+
+
+@needs_binary
+def test_an_unreadable_or_rejected_file_is_left_to_python(tmp_path, monkeypatch):
+    root = _write(tmp_path, {"ok.py": "def fine(): ...\n", "bad.py": "def oops(:\n"})
+    monkeypatch.setenv("ARIA_NATIVE_GRAPH", "on")
+    found, fallback = native_index.python_symbols(root, ["ok.py", "bad.py", "gone.py"], minimum=0)
+    assert found == {"ok.py": [("fine", "def", 1, "")]}
+    assert fallback == ["bad.py", "gone.py"]