aria-code 0.161.0__tar.gz → 0.162.0__tar.gz

{aria_code-0.161.0/src/aria_code.egg-info → aria_code-0.162.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.161.0
+Version: 0.162.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.161.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.161.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.162.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.162.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.161.0 → aria_code-0.162.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.161.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.161.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.162.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.162.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.161.0 → aria_code-0.162.0}/pyproject.toml

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

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

{aria_code-0.161.0 → aria_code-0.162.0/src/aria_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.161.0
+Version: 0.162.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.161.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.161.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.162.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.162.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.161.0 → aria_code-0.162.0}/src/aria_code.egg-info/SOURCES.txt

@@ -731,6 +731,7 @@ tests/test_native_go_stream.py
 tests/test_native_index.py
 tests/test_native_installer.py
 tests/test_native_runtime_domain.py
+tests/test_native_session_export.py
 tests/test_native_training_compare.py
 tests/test_native_training_dataset.py
 tests/test_natural_language_routing.py

{aria_code-0.161.0 → aria_code-0.162.0}/tests/test_dispatcher_pins_match_the_release.py

@@ -35,7 +35,7 @@ ROOT = pathlib.Path(__file__).resolve().parents[1]
 PACKAGE_JSON = ROOT / "npm" / "package.json"
 BUMP = ROOT / "scripts" / "bump_version.py"
 
-# Kept in step with scripts/make_platform_packages.py PLATFORM_KEYS.
+# Kept in step with go/buildtools/packages.go platformKeys.
 PLATFORM_KEYS = ("darwin-arm64", "darwin-x64", "linux-x64", "linux-arm64", "win32-x64")
 
 

{aria_code-0.161.0 → aria_code-0.162.0}/tests/test_doctor_describes_the_current_install.py

@@ -104,9 +104,9 @@ class ThePlatformKeyMatchesTheOnesWePublish(unittest.TestCase):
                 self.assertEqual(doctor.npm_platform_key(system, machine), expected)
 
     def test_the_keys_match_the_package_generator(self) -> None:
-        gen = (ROOT / "scripts" / "make_platform_packages.py").read_text(encoding="utf-8")
-        match = re.search(r"PLATFORM_KEYS = \(([^)]*)\)", gen)
-        self.assertIsNotNone(match, "make_platform_packages.py has no PLATFORM_KEYS")
+        gen = (ROOT / "go" / "buildtools" / "packages.go").read_text(encoding="utf-8")
+        match = re.search(r"platformKeys = \[\]string\{([^}]*)\}", gen)
+        self.assertIsNotNone(match, "packages.go has no platformKeys")
         published = set(re.findall(r'"([a-z0-9-]+)"', match.group(1)))
         produced = {v for v in self.CASES.values() if v}
         self.assertEqual(

{aria_code-0.161.0 → aria_code-0.162.0}/tests/test_license_consistency.py

@@ -62,7 +62,7 @@ class EveryManifestAgreesWithTheLicenseFile(unittest.TestCase):
     def test_the_platform_package_generator(self) -> None:
         # Each per-platform binary package is published separately, so a stale
         # string here ships five wrong manifests rather than one.
-        text = (ROOT / "scripts" / "make_platform_packages.py").read_text(encoding="utf-8")
+        text = (ROOT / "go" / "buildtools" / "packages.go").read_text(encoding="utf-8")
         found = set(re.findall(r'"license":\s*"([^"]+)"', text))
         self.assertEqual(found, {self.spdx}, f"generator stamps {found or 'nothing'}")
 

{aria_code-0.161.0 → aria_code-0.162.0}/tests/test_native_binary_entrypoints.py

@@ -36,7 +36,7 @@ MAC_SCRIPT = ROOT / "scripts" / "build_native_binary.sh"
 EXPECTED_ENTRYPOINTS = {"aria_cli.py", "aria_mcp_server.py"}
 
 # A bare continuation argument, not a YAML path-filter list item or a helper
-# command such as `python scripts/verify_native_frontend.py`.
+# command such as `python scripts/pyinstaller_collect_args.py`.
 _PY_ARG = re.compile(r"[\w./${}]+\.py")
 
 
@@ -66,8 +66,8 @@ class EntryPointExtraction(unittest.TestCase):
     def test_path_filters_and_helper_commands_are_not_freeze_arguments(self):
         text = '''
       - 'src/aria_code/apps/cli/app_server.py'
-      - 'scripts/verify_native_frontend.py'
-        python scripts/verify_native_frontend.py
+      - 'scripts/pyinstaller_collect_args.py'
+        python scripts/pyinstaller_collect_args.py
         pyinstaller --onedir --name aria-code-bin
           src/aria_code/aria_cli.py
           "$PROJECT_ROOT/src/aria_code/aria_mcp_server.py" \\

aria_code-0.162.0/tests/test_native_go_app.py

@@ -0,0 +1,155 @@
+"""Exercise the actual Go app executable and its Rust containment barrier."""
+import json
+import os
+import queue
+import subprocess
+import threading
+import time
+import zipfile
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+
+import pytest
+
+
+def test_model_picker_and_file_references_through_native_binary(tmp_path):
+    calls = []
+
+    class Handler(BaseHTTPRequestHandler):
+        def log_message(self, *args):
+            pass
+
+        def do_GET(self):
+            assert self.path == "/v1/models"
+            self.send_response(200)
+            self.end_headers()
+            self.wfile.write(b'{"data":[{"id":"fixture-local-model"}]}')
+
+        def do_POST(self):
+            assert self.path == "/v1/chat/completions"
+            calls.append(json.loads(self.rfile.read(int(self.headers["Content-Length"]))))
+            self.send_response(200)
+            self.send_header("Content-Type", "text/event-stream")
+            self.end_headers()
+            self.wfile.write(b'data: {"choices":[{"delta":{"content":"Read the provided evidence."},"finish_reason":"stop"}]}\n\ndata: [DONE]\n\n')
+
+    service = ThreadingHTTPServer(("127.0.0.1", 0), Handler)
+    threading.Thread(target=service.serve_forever, daemon=True).start()
+    state, project = tmp_path / "state", tmp_path / "project"
+    state.mkdir()
+    project.mkdir()
+    (state / "config.json").write_text(json.dumps({"local_provider": "google"}), encoding="utf-8")
+    (state / "providers.json").write_text('{"model_providers":{}}', encoding="utf-8")
+    (project / "design notes.txt").write_text("UNIQUE_REFERENCE_EVIDENCE", encoding="utf-8")
+    with zipfile.ZipFile(project / "report.docx", "w", zipfile.ZIP_DEFLATED) as document:
+        document.writestr("word/document.xml", '<document><p><t>OFFICE_DOCUMENT_EVIDENCE 中文</t></p></document>')
+    process = subprocess.Popen(
+        [binary(), "app"], cwd=project,
+        env=dict(os.environ, ARIA_HOME=str(state), OLLAMA_HOST=f"http://127.0.0.1:{service.server_port}"),
+        stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, encoding="utf-8",
+    )
+    events = queue.Queue()
+
+    def reader():
+        for line in process.stdout:
+            events.put(json.loads(line))
+
+    threading.Thread(target=reader, daemon=True).start()
+
+    def send(**fields):
+        process.stdin.write(json.dumps(dict(protocol=1, **fields)) + "\n")
+        process.stdin.flush()
+
+    def until(kind):
+        while True:
+            event = events.get(timeout=10)
+            assert event["type"] not in ("protocol.error", "session.failed"), event
+            if event["type"] == kind:
+                return event
+
+    try:
+        process.stdin.write("\n")
+        process.stdin.flush()
+        ready = until("session.ready")
+        sid = ready["session_id"]
+        send(type="completion.request", session_id=sid, text="read @des")
+        assert until("completion.result")["candidates"] == ['read @file:"design notes.txt"']
+        send(type="turn.submit", turn_id="choose", text="/model")
+        dialog = until("input.requested")
+        send(type="dialog.respond", turn_id="choose", request_id=dialog["request_id"], choice=1)
+        dialog = until("input.requested")
+        assert dialog["choices"][0][0] == "fixture-local-model"
+        send(type="dialog.respond", turn_id="choose", request_id=dialog["request_id"], choice=0)
+        assert until("turn.completed")["status"] == "ok"
+        assert until("session.state")["provider"] == "ollama"
+        send(type="turn.submit", turn_id="read", text='Explain @file:"design notes.txt" and @report.docx')
+        assert until("tool.completed")["success"] is True
+        assert until("turn.completed")["status"] == "ok"
+        until("session.state")
+        assert len(calls) == 1 and calls[0]["model"] == "fixture-local-model"
+        assert "UNIQUE_REFERENCE_EVIDENCE" in json.dumps(calls[0]["messages"])
+        assert "OFFICE_DOCUMENT_EVIDENCE" in json.dumps(calls[0]["messages"])
+        saved = json.loads((state / "sessions" / f"{sid}.json").read_text(encoding="utf-8"))
+        assert "UNIQUE_REFERENCE_EVIDENCE" in json.dumps(saved["provider_contents"])
+        assert all(m["content"] != "/model" for m in saved["messages"])
+        send(type="shutdown")
+        until("session.closed")
+        assert process.wait(timeout=10) == 0
+    finally:
+        if process.poll() is None:
+            process.kill()
+            process.wait(timeout=10)
+        service.shutdown()
+        service.server_close()
+
+
+def binary():
+    value = os.environ.get("ARIA_GO_RUNTIME_BINARY")
+    if not value:
+        pytest.skip("The native-runtime CI job builds this executable")
+    return value
+
+
+def test_native_app_does_not_touch_state_before_the_host_barrier(tmp_path):
+    program = binary()
+    state = tmp_path / "state"
+    project = tmp_path / "project"
+    state.mkdir()
+    project.mkdir()
+    cfg = state / "config.json"
+    original = json.dumps(dict(local_provider="google", model="gemini-3.5-flash"))
+    cfg.write_text(original, encoding="utf-8")
+    env = dict(os.environ, ARIA_HOME=str(state))
+    process = subprocess.Popen([program, "app"], cwd=project, env=env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, encoding="utf-8")
+    events = queue.Queue()
+    def read():
+        for line in process.stdout:
+            events.put(json.loads(line))
+    threading.Thread(target=read, daemon=True).start()
+    try:
+        time.sleep(0.2)
+        assert not (state / "sessions").exists()
+        assert cfg.read_text(encoding="utf-8") == original
+        assert events.empty()
+        process.stdin.write("\n")
+        process.stdin.flush()
+        assert events.get(timeout=5)["type"] == "session.ready"
+        process.stdin.write(json.dumps(dict(protocol=1, type="shutdown")) + "\n")
+        process.stdin.flush()
+        assert events.get(timeout=5)["type"] == "session.closed"
+        assert process.wait(timeout=5) == 0
+    finally:
+        if process.poll() is None:
+            process.kill()
+            process.wait()
+
+
+def test_unsupported_native_provider_preserves_existing_user_state(tmp_path):
+    cfg = tmp_path / "config.json"
+    original = json.dumps(dict(local_provider="undeclared-test-provider", last_session_id="previous"))
+    cfg.write_text(original, encoding="utf-8")
+    process = subprocess.run([binary(), "app"], input="\n", env=dict(os.environ, ARIA_HOME=str(tmp_path)), capture_output=True, text=True, encoding="utf-8", timeout=5)
+    assert process.returncode != 0
+    assert cfg.read_text(encoding="utf-8") == original
+    assert not (tmp_path / "sessions").exists()
+    events = [json.loads(line) for line in process.stdout.splitlines()]
+    assert [event["type"] for event in events] == ["session.failed", "session.closed"]

{aria_code-0.161.0 → aria_code-0.162.0}/tests/test_native_go_stream.py

@@ -84,6 +84,7 @@ def stream(tmp_path):
         process = subprocess.run(command, cwd=project, env=call_env, input=data,
                                  capture_output=True, text=True, encoding="utf-8", timeout=10)
         events = [json.loads(line) for line in process.stdout.splitlines()]
+        assert events, (process.returncode, process.stderr)
         assert events[0]["type"] == "turn.started"
         assert events[-1]["type"] == "turn.completed"
         assert sum(e["type"] == "turn.completed" for e in events) == 1

aria_code-0.162.0/tests/test_native_session_export.py

@@ -0,0 +1,87 @@
+"""Actual native application exports, compared with the retained Python oracle."""
+import csv
+import io
+import json
+import os
+import queue
+import subprocess
+import threading
+
+import pytest
+
+from aria_code.apps.cli.session_export import build_session_export_payload
+
+
+def test_native_exports_saved_history_without_model_call(tmp_path):
+    program = os.environ.get("ARIA_GO_RUNTIME_BINARY")
+    if not program:
+        pytest.skip("native-runtime CI supplies the built executable")
+    state, project = tmp_path / "state", tmp_path / "project"
+    (state / "sessions").mkdir(parents=True)
+    project.mkdir()
+    (state / "config.json").write_text(json.dumps({"local_provider": "google", "model": "gemini-3.5-flash"}), encoding="utf-8")
+    messages = [
+        {"role": "user", "content": '请分析这家公司的库存、运输和仓储成本，给我具体建议。'},
+        {"role": "assistant", "content": '建议先计算库存周转，再核对运输和仓储成本。\n"这些结论"需要根据实际数据逐项验证。'},
+    ]
+    session = state / "sessions" / "export-test.json"
+    session.write_text(json.dumps({"id": "export-test", "messages": messages, "metadata": {}}), encoding="utf-8")
+    process = subprocess.Popen(
+        [program, "app", "--resume", "export-test", "--allow-tools", "write_file"],
+        cwd=project, env=dict(os.environ, ARIA_HOME=str(state)),
+        stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+        text=True, encoding="utf-8",
+    )
+    events = queue.Queue()
+    def read():
+        for line in process.stdout:
+            events.put(json.loads(line))
+    threading.Thread(target=read, daemon=True).start()
+    def send(value):
+        process.stdin.write(json.dumps(dict(protocol=1, **value)) + "\n")
+        process.stdin.flush()
+    def until(kind):
+        while True:
+            event = events.get(timeout=10)
+            assert event["type"] not in ("session.failed", "protocol.error"), event
+            if event["type"] == kind:
+                return event
+    try:
+        process.stdin.write("\n")
+        process.stdin.flush()
+        assert "/export" in until("session.ready")["commands"]
+        for fmt in ("json", "csv", "md", "sft", "ipynb"):
+            filename = f"export {fmt}.txt"
+            send(dict(type="turn.submit", turn_id=f"export-{fmt}", text=f"/export {fmt} {filename}"))
+            completed = until("turn.completed")
+            assert completed["status"] == "ok", completed
+            actual = (project / filename).read_text(encoding="utf-8")
+            expected, _, _ = build_session_export_payload(fmt, messages)
+            if fmt in ("json", "sft", "ipynb"):
+                assert json.loads(actual) == json.loads(expected)
+            elif fmt == "csv":
+                assert list(csv.reader(io.StringIO(actual))) == list(csv.reader(io.StringIO(expected)))
+            else:
+                assert actual == expected
+        # Slash commands cannot enter or overwrite the saved model conversation.
+        assert json.loads(session.read_text(encoding="utf-8"))["messages"] == messages
+        send(dict(type="turn.submit", turn_id="full-export", text="/export session portable.json"))
+        assert until("turn.completed")["status"] == "ok"
+        until("session.state")
+        original_files = set((state / "sessions").glob("*.json"))
+        send(dict(type="turn.submit", turn_id="import", text="/import portable.json"))
+        assert until("turn.completed")["status"] == "ok"
+        assert until("session.state")["session_id"] == "export-test"
+        imported_files = set((state / "sessions").glob("*.json")) - original_files
+        assert len(imported_files) == 1
+        imported = imported_files.pop()
+        assert json.loads(imported.read_text(encoding="utf-8"))["messages"] == messages
+        send(dict(type="session.resume", session_id=imported.stem))
+        assert until("session.ready")["session_id"] == imported.stem
+        send(dict(type="shutdown"))
+        until("session.closed")
+        assert process.wait(timeout=10) == 0
+    finally:
+        if process.poll() is None:
+            process.kill()
+            process.wait(timeout=10)

{aria_code-0.161.0 → aria_code-0.162.0}/tests/test_platform_package_assembly.py

@@ -25,27 +25,21 @@ of the two shows up.
 
 from __future__ import annotations
 
-import importlib.util
 import pathlib
 import json
 import shutil
 import subprocess
-import sys
 import tempfile
 import unittest
 
 import yaml
+from native_packaging_support import fixture_archive, build_tool
 
 ROOT = pathlib.Path(__file__).resolve().parents[1]
 WORKFLOW = ROOT / ".github" / "workflows" / "build-native-binaries.yml"
 
-_spec = importlib.util.spec_from_file_location(
-    "package_onedir", ROOT / "scripts" / "package_onedir.py")
-package_onedir = importlib.util.module_from_spec(_spec)
-_spec.loader.exec_module(package_onedir)
-
 # What each platform's two artifacts are called, as the upload steps name them.
-# Each artifact is the archive of a --onedir build (scripts/package_onedir.py).
+# Each artifact is the archive of a --onedir build.
 ARTIFACTS = {
     "darwin-arm64": ("aria-code-macos-arm64", "aria-code-bin.tar.gz",
                      "aria-code-mcp-macos-arm64", "aria-code-mcp-bin.tar.gz"),
@@ -83,19 +77,21 @@ def _assemble_script() -> str:
 def _run(script: str, built: pathlib.Path, *, capture_args: bool = True):
     """Run the step's script under GitHub's shell flags, in a sandbox."""
     work = built.parent
-    # The real step ends by invoking python; replace that call with an echo of
+    # The real step ends by invoking the Go packager; replace that call with an echo of
     # the arguments, so this tests the bash that builds them rather than
-    # re-testing make_platform_packages.py (which has its own tests).
+    # re-testing the native packager (which has its own tests).
     if capture_args:
         script = script.replace(
-            'python scripts/make_platform_packages.py --version "$VERSION" \\\n'
+            '"$RUNNER_TEMP/aria-bundle" packages --version "$VERSION" \\\n'
             '  --out npm/platforms "${ARGS[@]}"',
             'printf "ARG:%s\\n" "${ARGS[@]}"')
         # The folded-scalar form in YAML collapses the continuation; handle both.
         script = script.replace(
-            'python scripts/make_platform_packages.py --version "$VERSION" '
+            '"$RUNNER_TEMP/aria-bundle" packages --version "$VERSION" '
             '--out npm/platforms "${ARGS[@]}"',
             'printf "ARG:%s\\n" "${ARGS[@]}"')
+    else:
+        shutil.copy2(build_tool(), work / "aria-bundle")
     out = work / "github_output"
     out.touch()
     return subprocess.run(
@@ -103,6 +99,7 @@ def _run(script: str, built: pathlib.Path, *, capture_args: bool = True):
         cwd=work, capture_output=True, text=True, timeout=60,
         env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin",
              "INPUT_TAG": "v9.9.9", "GITHUB_REF_NAME": "v9.9.9",
+             "RUNNER_TEMP": str(work),
              "GITHUB_OUTPUT": str(out)},
     )
 
@@ -125,12 +122,22 @@ class _Fixture(unittest.TestCase):
             exe = build / (f"{name}.exe" if archive.endswith(".zip") else name)
             exe.write_bytes(b"\x7fELF")
             (self.built / directory).mkdir(parents=True, exist_ok=True)
-            produced = package_onedir.pack(build, self.built / directory,
+            produced = fixture_archive(build, self.built / directory,
                                            use_zip=archive.endswith(".zip"))
             assert produced.name == archive, (produced.name, archive)
 
 
 class AFullSetOfArtifactsAssembles(_Fixture):
+    def test_actual_workflow_builds_all_ten_packages_with_native_tool(self) -> None:
+        for platform in ARTIFACTS:
+            self.place(platform)
+        proc = _run(self.script, self.built, capture_args=False)
+        self.assertEqual(proc.returncode, 0, proc.stderr)
+        packages = list((self.tmp / "npm" / "platforms").iterdir())
+        self.assertEqual(len(packages), 10)
+        for package in packages:
+            self.assertEqual(json.loads((package / "package.json").read_text())["version"], "9.9.9")
+
     def test_the_step_succeeds_and_passes_every_binary(self) -> None:
         for platform in ARTIFACTS:
             self.place(platform)
@@ -208,7 +215,7 @@ class PlatformPackagesAreSplit(_Fixture):
         for platform in ARTIFACTS:
             self.place(platform)
         out = self.tmp / "packages"
-        args = [sys.executable, str(ROOT / "scripts" / "make_platform_packages.py"),
+        args = [str(build_tool()), "packages",
                 "--version", "9.9.9", "--out", str(out)]
         for platform, (cli_dir, cli_file, mcp_dir, mcp_file) in ARTIFACTS.items():
             args += ["--binary", f"{platform}={self.built / cli_dir / cli_file}",

{aria_code-0.161.0 → aria_code-0.162.0}/tests/test_platform_packages.py

@@ -9,7 +9,6 @@ a filename without .exe is simply not found on Windows.
 
 from __future__ import annotations
 
-import importlib.util
 import json
 import os
 import pathlib
@@ -17,32 +16,28 @@ import re
 import stat
 import tempfile
 import unittest
+import shutil
+
+from native_packaging_support import fixture_archive, run_tool
 
 ROOT = pathlib.Path(__file__).resolve().parents[1]
-SCRIPT = ROOT / "scripts" / "make_platform_packages.py"
 JS_MODULE = ROOT / "npm" / "lib" / "platform.js"
 
 
-def _load():
-    spec = importlib.util.spec_from_file_location("make_platform_packages", SCRIPT)
-    module = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(module)
-    return module
-
-
-mpp = _load()
-package_onedir = mpp.package_onedir
+GO_SOURCE = ROOT / "go" / "buildtools" / "packages.go"
 
 
 class KeysAgreeWithTheDispatcher(unittest.TestCase):
-    def test_python_and_javascript_list_the_same_platforms(self):
+    def test_go_and_javascript_list_the_same_platforms(self):
         """Two lists, one truth. A key in one and not the other ships a package
         the dispatcher never looks for, or looks for one nobody built."""
         js = JS_MODULE.read_text(encoding="utf-8")
         block = re.search(r"PLATFORM_KEYS = Object\.freeze\(\[(.*?)\]\)", js, re.S)
         self.assertIsNotNone(block, "could not find PLATFORM_KEYS in platform.js")
         from_js = tuple(re.findall(r'"([^"]+)"', block.group(1)))
-        self.assertEqual(from_js, mpp.PLATFORM_KEYS)
+        go = re.search(r'platformKeys = \[\]string\{([^}]*)\}', GO_SOURCE.read_text())
+        self.assertIsNotNone(go)
+        self.assertEqual(from_js, tuple(re.findall(r'"([^"]+)"', go.group(1))))
 
 
 def _onedir_archive(tmp: pathlib.Path, name: str, *, windows: bool = False,
@@ -70,18 +65,24 @@ def _onedir_archive(tmp: pathlib.Path, name: str, *, windows: bool = False,
         os.symlink("Python.framework/Versions/Current/Python", internal / "Python")
         if extra_link:
             os.symlink(extra_link[1], internal / extra_link[0])
-    return package_onedir.pack(root, tmp / "archives" / name, use_zip=windows)
+    return fixture_archive(root, tmp / "archives" / name, use_zip=windows)
 
 
 class GeneratedPackages(unittest.TestCase):
     def setUp(self):
         self.tmp = pathlib.Path(tempfile.mkdtemp())
+        self.addCleanup(shutil.rmtree, self.tmp, True)
         self.out = self.tmp / "platforms"
 
     def _build(self, key, mcp=False, **archive):
         name = "aria-code-mcp-bin" if mcp else "aria-code-bin"
         source = _onedir_archive(self.tmp, name, windows=key.startswith("win32"), **archive)
-        return mpp.build_one(key, "9.9.9", source, self.out, mcp=mcp)
+        other = "aria-code-bin" if mcp else "aria-code-mcp-bin"
+        peer = _onedir_archive(self.tmp, other, windows=key.startswith("win32"))
+        cli, server = (peer, source) if mcp else (source, peer)
+        run_tool("packages", "--version", "9.9.9", "--out", self.out,
+                 "--binary", f"{key}={cli}", "--mcp", f"{key}={server}")
+        return self.out / f"aria-code-{'mcp-' if mcp else ''}{key}"
 
     def test_windows_binaries_get_exe_and_nothing_else_does(self):
         win = self._build("win32-x64")
@@ -149,7 +150,8 @@ class GeneratedPackages(unittest.TestCase):
     def test_an_archive_of_the_wrong_build_is_refused(self):
         source = _onedir_archive(self.tmp, "aria-code-mcp-bin")
         with self.assertRaises(SystemExit):
-            mpp.build_one("linux-x64", "9.9.9", source, self.out)
+            run_tool("packages", "--version", "9.9.9", "--out", self.out,
+                     "--binary", f"linux-x64={source}", "--mcp", f"linux-x64={source}")
 
     def test_rebuilding_replaces_rather_than_accumulates(self):
         pkg = self._build("linux-x64")
@@ -163,15 +165,15 @@ class GeneratedPackages(unittest.TestCase):
 class ArgumentHandling(unittest.TestCase):
     def test_an_unknown_platform_key_is_refused(self):
         with self.assertRaises(SystemExit):
-            mpp._pairs(["sunos-x64=/dev/null"], "--binary")
+            run_tool("packages", "--binary", "sunos-x64=/dev/null")
 
     def test_a_missing_file_is_refused_rather_than_packaged_empty(self):
         with self.assertRaises(SystemExit):
-            mpp._pairs(["linux-x64=/nonexistent/aria-code-bin"], "--binary")
+            run_tool("packages", "--binary", "linux-x64=/nonexistent/aria-code-bin")
 
     def test_a_pair_without_an_equals_sign_is_refused(self):
         with self.assertRaises(SystemExit):
-            mpp._pairs(["linux-x64"], "--binary")
+            run_tool("packages", "--binary", "linux-x64")
 
 
 if __name__ == "__main__":