RemoteRF 2.1.10__tar.gz → 2.2.1__tar.gz

{remoterf-2.1.10/src/remoterf.egg-info → remoterf-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.1.10
+Version: 2.2.1
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author-email: Ethan Ge <ethoGalaxy@gmail.com>
 License-Expression: GPL-3.0-or-later
@@ -43,13 +43,13 @@ python --version
 
 ## Installation
 
-Use the package manager [pip](https://pip.pypa.io/en/stable/) to install remoteRF. It is recommended that you install this package within a [virtual environment](https://docs.python.org/3/library/venv.html).
+Use the package manager [pip](https://pip.pypa.io/en/stable/) to install remoterf. It is recommended that you install this package within a [virtual environment](https://docs.python.org/3/library/venv.html).
 
 ```bash
 python3 -m venv venv        # Create virtual environment
 source venv/bin/activate    # Activate virtual environment
 
-pip install remoterf        # Install remoteRF
+pip install remoterf        # Install remoterf
 ```
 
 ## NI USRP-2901, Ettus B205-mini, B200-family, and USRP N210
@@ -64,7 +64,7 @@ After reserving a server-local `usrp` inventory entry, fetch or refresh its
 Dynamic v2 package with the reservation token:
 
 ```python
-from remoteRF.drivers import ensure_driver
+from remoterf.drivers import ensure_driver
 
 ensure_driver(token="reservation-token")
 ```
@@ -72,7 +72,7 @@ ensure_driver(token="reservation-token")
 Both supported initialization forms then use the same generated runtime:
 
 ```python
-from remoteRF.drivers.usrp import uhd
+from remoterf.drivers.usrp import uhd
 
 with uhd.usrp.MultiUSRP(token="reservation-token") as usrp:
     print(usrp.remoterf_capabilities)
@@ -80,7 +80,7 @@ with uhd.usrp.MultiUSRP(token="reservation-token") as usrp:
 ```
 
 ```python
-from remoteRF.drivers.usrp import MultiUSRP
+from remoterf.drivers.usrp import MultiUSRP
 
 usrp = MultiUSRP("reservation-token")
 try:
@@ -94,7 +94,7 @@ leading region reported by native UHD is changed on a partial receive:
 
 ```python
 import numpy as np
-from remoteRF.drivers.usrp import uhd
+from remoterf.drivers.usrp import uhd
 
 with uhd.usrp.MultiUSRP(token="reservation-token") as usrp:
     stream_args = uhd.usrp.StreamArgs("fc32", "sc16")
@@ -108,7 +108,7 @@ with uhd.usrp.MultiUSRP(token="reservation-token") as usrp:
 
 The generated package includes native-like namespaces, aliases, overload
 stubs, deterministic `close()`, context managers, opaque session-bound
-handles, and typed errors in `remoteRF.core.v2_errors`. Streamers are never
+handles, and typed errors in `remoterf.core.v2_errors`. Streamers are never
 silently recreated after a disconnect; reopen a new device session and
 configure a new stream explicitly.
 
@@ -123,12 +123,12 @@ RTL-SDR clients are generated from the server's `rtl_sdr` schema. The machine
 running client code does not need `librtlsdr` or PyRtlSdr:
 
 ```python
-from remoteRF.drivers import ensure_driver
+from remoterf.drivers import ensure_driver
 
 token = "reservation-token"
 ensure_driver(token=token)
 
-from remoteRF.drivers.rtl_sdr import RtlSdr
+from remoterf.drivers.rtl_sdr import RtlSdr
 
 sdr = RtlSdr(token)
 sdr.sample_rate = 2_048_000
@@ -160,12 +160,12 @@ machine physically connected to the radar needs `pyserial` or a CP210x driver.
 The initial parser profile supports xWR68xx mmWave SDK 3 out-of-box TLV output.
 
 ```python
-from remoteRF.drivers import ensure_driver
+from remoterf.drivers import ensure_driver
 
 token = "reservation-token"
 ensure_driver(token=token)
 
-from remoteRF.drivers.ti_mmwave import TiMmWave, decode_frame
+from remoterf.drivers.ti_mmwave import TiMmWave, decode_frame
 
 radar = TiMmWave(token)
 print(radar.device_info)
@@ -323,7 +323,7 @@ Here is a explained sample script to get you going!
 #### Python Script:
 
 ```python
-from remoteRF.drivers.adalm_pluto import *  # Imports device Pluto SDR remote drivers. Change depending on desired device.
+from remoterf.drivers.adalm_pluto import *  # Imports device Pluto SDR remote drivers. Change depending on desired device.
 
 sdr = adi.Pluto(    # Device initialization.
     token = 'example_token'     # Place the prior token here.
@@ -332,12 +332,12 @@ sdr = adi.Pluto(    # Device initialization.
 # You can now use this 'sdr' as you normally would with the default Pluto drivers.
 ```
 
-If converting a existing `non-remoteRF` compatible script:
+If converting a existing `non-remoterf` compatible script:
 
 ```diff
 - import existing_device_drivers 
 
-+ from remoteRF.drivers.device_drivers import *
++ from remoterf.drivers.device_drivers import *
 
 - device = device(init)
 

{remoterf-2.1.10 → remoterf-2.2.1}/README.md

@@ -18,13 +18,13 @@ python --version
 
 ## Installation
 
-Use the package manager [pip](https://pip.pypa.io/en/stable/) to install remoteRF. It is recommended that you install this package within a [virtual environment](https://docs.python.org/3/library/venv.html).
+Use the package manager [pip](https://pip.pypa.io/en/stable/) to install remoterf. It is recommended that you install this package within a [virtual environment](https://docs.python.org/3/library/venv.html).
 
 ```bash
 python3 -m venv venv        # Create virtual environment
 source venv/bin/activate    # Activate virtual environment
 
-pip install remoterf        # Install remoteRF
+pip install remoterf        # Install remoterf
 ```
 
 ## NI USRP-2901, Ettus B205-mini, B200-family, and USRP N210
@@ -39,7 +39,7 @@ After reserving a server-local `usrp` inventory entry, fetch or refresh its
 Dynamic v2 package with the reservation token:
 
 ```python
-from remoteRF.drivers import ensure_driver
+from remoterf.drivers import ensure_driver
 
 ensure_driver(token="reservation-token")
 ```
@@ -47,7 +47,7 @@ ensure_driver(token="reservation-token")
 Both supported initialization forms then use the same generated runtime:
 
 ```python
-from remoteRF.drivers.usrp import uhd
+from remoterf.drivers.usrp import uhd
 
 with uhd.usrp.MultiUSRP(token="reservation-token") as usrp:
     print(usrp.remoterf_capabilities)
@@ -55,7 +55,7 @@ with uhd.usrp.MultiUSRP(token="reservation-token") as usrp:
 ```
 
 ```python
-from remoteRF.drivers.usrp import MultiUSRP
+from remoterf.drivers.usrp import MultiUSRP
 
 usrp = MultiUSRP("reservation-token")
 try:
@@ -69,7 +69,7 @@ leading region reported by native UHD is changed on a partial receive:
 
 ```python
 import numpy as np
-from remoteRF.drivers.usrp import uhd
+from remoterf.drivers.usrp import uhd
 
 with uhd.usrp.MultiUSRP(token="reservation-token") as usrp:
     stream_args = uhd.usrp.StreamArgs("fc32", "sc16")
@@ -83,7 +83,7 @@ with uhd.usrp.MultiUSRP(token="reservation-token") as usrp:
 
 The generated package includes native-like namespaces, aliases, overload
 stubs, deterministic `close()`, context managers, opaque session-bound
-handles, and typed errors in `remoteRF.core.v2_errors`. Streamers are never
+handles, and typed errors in `remoterf.core.v2_errors`. Streamers are never
 silently recreated after a disconnect; reopen a new device session and
 configure a new stream explicitly.
 
@@ -98,12 +98,12 @@ RTL-SDR clients are generated from the server's `rtl_sdr` schema. The machine
 running client code does not need `librtlsdr` or PyRtlSdr:
 
 ```python
-from remoteRF.drivers import ensure_driver
+from remoterf.drivers import ensure_driver
 
 token = "reservation-token"
 ensure_driver(token=token)
 
-from remoteRF.drivers.rtl_sdr import RtlSdr
+from remoterf.drivers.rtl_sdr import RtlSdr
 
 sdr = RtlSdr(token)
 sdr.sample_rate = 2_048_000
@@ -135,12 +135,12 @@ machine physically connected to the radar needs `pyserial` or a CP210x driver.
 The initial parser profile supports xWR68xx mmWave SDK 3 out-of-box TLV output.
 
 ```python
-from remoteRF.drivers import ensure_driver
+from remoterf.drivers import ensure_driver
 
 token = "reservation-token"
 ensure_driver(token=token)
 
-from remoteRF.drivers.ti_mmwave import TiMmWave, decode_frame
+from remoterf.drivers.ti_mmwave import TiMmWave, decode_frame
 
 radar = TiMmWave(token)
 print(radar.device_info)
@@ -298,7 +298,7 @@ Here is a explained sample script to get you going!
 #### Python Script:
 
 ```python
-from remoteRF.drivers.adalm_pluto import *  # Imports device Pluto SDR remote drivers. Change depending on desired device.
+from remoterf.drivers.adalm_pluto import *  # Imports device Pluto SDR remote drivers. Change depending on desired device.
 
 sdr = adi.Pluto(    # Device initialization.
     token = 'example_token'     # Place the prior token here.
@@ -307,12 +307,12 @@ sdr = adi.Pluto(    # Device initialization.
 # You can now use this 'sdr' as you normally would with the default Pluto drivers.
 ```
 
-If converting a existing `non-remoteRF` compatible script:
+If converting a existing `non-remoterf` compatible script:
 
 ```diff
 - import existing_device_drivers 
 
-+ from remoteRF.drivers.device_drivers import *
++ from remoterf.drivers.device_drivers import *
 
 - device = device(init)
 

{remoterf-2.1.10 → remoterf-2.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoterf"
-version = "2.1.10"
+version = "2.2.1"
 description = "A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts."
 readme = "README.md"
 license = "GPL-3.0-or-later"
@@ -31,12 +31,12 @@ classifiers = [
 ]
 
 [project.scripts]
-remoterf = "remoteRF.remoterf_cli:main"
+remoterf = "remoterf.remoterf_cli:main"
 
 [tool.setuptools]
 package-dir = { "" = "src" }
-# src/remoteRF.py: see its docstring (upgrades from 2.0.7-2.0.13).
-py-modules = ["remoteRF"]
+# src/remoterf.py: see its docstring (upgrades from 2.0.14-2.1.x).
+py-modules = ["remoterf"]
 
 [tool.setuptools.packages.find]
 where = ["src"]

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/config/config.py

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# src/remoteRF/core/remoterf_config.py
+# src/remoterf/core/remoterf_config.py
 
 from __future__ import annotations
 

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/core/app.py

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from remoteRF.core.grpc_client import addr as server_addr, handle_admin_command
+from remoterf.core.grpc_client import addr as server_addr, handle_admin_command
 from . import *
 from ..common.utils import *
 
@@ -536,10 +536,9 @@ def _federated_reservations_for_range(start_day, end_day):
 
 def _federated_reserve_slot(device_id, chosen_day, chosen_slot, slot_start_str, slot_end_str):
     handle = account.reserve_device(device_id, chosen_slot[0], chosen_slot[1])
-    printf("Reservation successful for ", (Sty.BOLD, Sty.GREEN), f"{chosen_day.strftime('%Y-%m-%d')} {slot_start_str}-{slot_end_str}.", Sty.CYAN)
-    printf("Your device handle -> ", Sty.BOLD, f"{handle}", (Sty.BOLD, Sty.GREEN))
-    printf("Use it where a token goes, e.g. adi.Pluto(\"" + handle + "\"); it works while you are logged in to this home.", Sty.DEFAULT)
-    printf("The first call can take ~20 s while the radio powers on.", Sty.GRAY)
+    # Worded as a lab account's reservation; the handle goes where a token goes.
+    printf("Reservation successful on device ", (Sty.BOLD, Sty.GREEN), f"{str(device_id).rsplit(':', 1)[-1]}", Sty.MAGENTA, " for ", Sty.DEFAULT, f"{chosen_day.strftime('%Y-%m-%d')} {slot_start_str}-{slot_end_str}.", Sty.CYAN)
+    printf("Your Token -> ", Sty.BOLD, f"{handle}", (Sty.BOLD, Sty.GREEN))
     account.install_reserved_driver(handle, device_id)
 
 
@@ -1062,7 +1061,7 @@ def enroll(code=None):
     # register. Here we are already logged in somewhere, so strip it -- and
     # say so if it names a different lab than this one.
     try:
-        from remoteRF.deployment import homes
+        from remoterf.deployment import homes
 
         host, code = homes.parse_code(code)
     except Exception:  # noqa: BLE001 - not in that form; send as typed

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/core/direct_path.py

@@ -50,11 +50,18 @@ import threading
 import time
 from typing import Callable, Optional
 
-from aioice import Candidate, Connection
-from aioquic.asyncio.protocol import QuicConnectionProtocol
-from aioquic.quic import events
-from aioquic.quic.configuration import QuicConfiguration
-from aioquic.quic.connection import QuicConnection
+try:
+    from aioice import Candidate, Connection
+    from aioquic.asyncio.protocol import QuicConnectionProtocol
+    from aioquic.quic import events
+    from aioquic.quic.configuration import QuicConfiguration
+    from aioquic.quic.connection import QuicConnection
+
+    _BROKEN = None
+except Exception as _exc:  # noqa: BLE001 - e.g. conda swapped in a cryptography pip's pyOpenSSL cannot use
+    Candidate = Connection = QuicConnectionProtocol = QuicConfiguration = QuicConnection = object
+    events = None
+    _BROKEN = f"{type(_exc).__name__}: {_exc}"
 
 from ..common.grpc import grpc_pb2
 from ..common.utils import map_arg, unmap_arg
@@ -136,7 +143,7 @@ STUN_SECONDS = 1.5  # a STUN server answers in milliseconds or not at all
 
 
 def enabled() -> bool:
-    return os.getenv("REMOTERF_DIRECT", "1").strip().lower() not in {"0", "off", "no", "false"}
+    return _BROKEN is None and os.getenv("REMOTERF_DIRECT", "1").strip().lower() not in {"0", "off", "no", "false"}
 
 
 def wants(function_name: str) -> bool:
@@ -742,6 +749,8 @@ def current(token: Optional[str] = None) -> Optional[DirectPath]:
 
 def describe() -> str:
     """What device calls use right now, for the shell."""
+    if _BROKEN is not None:
+        return f"relay (direct path unavailable: {_BROKEN}; fix: pip install --force-reinstall remoterf)"
     if not enabled():
         return "relay (direct path disabled: REMOTERF_DIRECT=0)"
     path = _path

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/core/grpc_client.py

@@ -225,15 +225,16 @@ def _device_token(function_name, args):
 def rpc_client(*, function_name, args, connection=None):
     global tcp_calls
     tcp_calls += 1
-    ref = _federated_ref(function_name, args) if connection is None else None
-    if ref is not None:
-        return _finish(_federated_call(ref, function_name, args))
     wire = os.getenv("REMOTERF_RX_WIRE", "i16").strip().lower()
     if wire and function_name.endswith(":rx:CALL0"):
         # Gate I slice 3: c64 halves the samples on the wire, i16 (the default)
         # quarters them when they are integer IQ; the driver still sees a complex
         # array. REMOTERF_RX_WIRE="" or "c128" opts out (servers ignore unknown).
+        # Also through a HOME, whose relay caps each response at ~768 KiB.
         args = {**args, "wire": map_arg(wire)}
+    ref = _federated_ref(function_name, args) if connection is None else None
+    if ref is not None:
+        return _finish(_federated_call(ref, function_name, args))
     if connection is None and direct_path.wants(function_name):
         path = direct_path.current(token=_device_token(function_name, args))
         if path is not None:

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/drivers/dynamic_device.py

@@ -24,7 +24,7 @@ When a device is reserved, call install_driver(device_id) to:
 
 After install_driver() the user can do:
 
-    from remoteRF.drivers.pluto import *
+    from remoterf.drivers.pluto import *
     sdr = adi.Pluto(token)
 
 On first device init, pass device_id to also check for schema updates:
@@ -158,7 +158,7 @@ def _client_class_name(schema: dict) -> str:
     return str(schema.get("client_class") or _default_class_name(schema.get("device_type", "unknown")))
 
 
-_CLIENT_MODULE_PREFIX = "remoteRF.drivers.support."
+_CLIENT_MODULE_PREFIX = "remoterf.drivers.support."
 _CLIENT_CTOR_SENTINELS = {"$self", "$result"}
 _CLIENT_OBJECT_KINDS = {
     "module",
@@ -1405,7 +1405,7 @@ _DRIVERS_DIR = Path(__file__).parent
 
 def _write_driver_files(schema: dict) -> Path:
     pkg_dir = _write_v2_driver_files(schema) if str(schema.get("schema_version")) == "2.0" else _write_v1_driver_files(schema)
-    stale = f"remoteRF.drivers.{pkg_dir.name}"
+    stale = f"remoterf.drivers.{pkg_dir.name}"
     for name in [m for m in sys.modules if m == stale or m.startswith(stale + ".")]:
         del sys.modules[name]
     return pkg_dir
@@ -1570,10 +1570,10 @@ def ensure_driver(*, token: str = None, device_id: int = None, device_name: str
     the reservation (and therefore never had install_driver run automatically).
     Pass the reservation token — the server resolves which device it belongs to.
 
-        from remoteRF.drivers import ensure_driver
+        from remoterf.drivers import ensure_driver
         ensure_driver(token=token)
 
-        from remoteRF.drivers.pluto import *
+        from remoterf.drivers.pluto import *
         sdr = adi.Pluto(token)
 
     One IDL:get_drivers RPC is always made (to resolve device_type and hash).
@@ -1611,7 +1611,7 @@ def ensure_driver(*, token: str = None, device_id: int = None, device_name: str
             f"Driver for '{device_type}' updated "
             f"(was {(current_hash or '?')[:16]}…, "
             f"now {schema.get('schema_hash','?')[:16]}…).\n"
-            f"Reimport before continuing: from remoteRF.drivers.{device_type} import *"
+            f"Reimport before continuing: from remoterf.drivers.{device_type} import *"
         )
 
 
@@ -1653,7 +1653,7 @@ def install_driver_if_stale(*, token: str, current_hash: str) -> bool:
     If the driver was reinstalled, reimport the package before using the
     new class:
 
-        from remoteRF.drivers.pluto import *
+        from remoterf.drivers.pluto import *
     """
     schema = fetch_idl(token=token, prefer_v2=True)
     if schema.get("schema_hash") == current_hash:
@@ -1666,6 +1666,6 @@ def install_driver_if_stale(*, token: str, current_hash: str) -> bool:
     print(
         f"Driver for '{device_type}' updated "
         f"(was {current_hash[:16]}…, now {schema.get('schema_hash','?')[:16]}…).\n"
-        f"Reimport before continuing: from remoteRF.drivers.{device_type} import *"
+        f"Reimport before continuing: from remoterf.drivers.{device_type} import *"
     )
     return True

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/drivers/dynamic_v2.py

@@ -678,7 +678,7 @@ def build_uhd_bindings(schema: dict, *, transport_factory=DynamicV2Transport):
                 if install_driver_if_stale(token=self.token, current_hash=schema["schema_hash"]):
                     raise RemoteRFProtocolError(
                         f"the server's {device_type} driver changed and the local copy "
-                        f"was updated; reimport remoteRF.drivers.{device_type} and retry",
+                        f"was updated; reimport remoterf.drivers.{device_type} and retry",
                         details=dict(exc.details),
                     ) from exc
                 raise

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/drivers/ti_mmwave/__init__.py

@@ -19,7 +19,7 @@ from . import ti_mmwave_remote as adi
 from .ti_mmwave_remote import TiMmWave
 
 __all__ = ["adi", "TiMmWave"]
-ti_mmwave = _import_module("remoteRF.drivers.support.ti_mmwave")
+ti_mmwave = _import_module("remoterf.drivers.support.ti_mmwave")
 __all__.append("ti_mmwave")
 if hasattr(ti_mmwave, "bind_client_class"):
     ti_mmwave.bind_client_class("TiMmWave", TiMmWave)

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/drivers/ti_mmwave/ti_mmwave_remote.py

@@ -18,7 +18,7 @@
 
 _PREFIX = "Ti_mmwave"
 _SCHEMA_HASH = "sha256:320a89d95075a472d7899ff2f98b9fdee05c0be96fa5651bf5c4f0e5d276a1c4"
-_CLIENT_MODULES = {'ti_mmwave': 'remoteRF.drivers.support.ti_mmwave'}
+_CLIENT_MODULES = {'ti_mmwave': 'remoterf.drivers.support.ti_mmwave'}
 _CLIENT_OBJECTS = {}
 
 from importlib import import_module as _import_module

{remoterf-2.1.10/src/remoteRF → remoterf-2.2.1/src/remoterf}/remoterf_cli.py

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# src/remoteRF/cli.py
+# src/remoterf/cli.py
 from __future__ import annotations
 
 import argparse
@@ -39,10 +39,10 @@ def _installed_version() -> str:
 
 def _connected_server(timeout_seconds: float = SERVER_CONNECT_TIMEOUT_SECONDS) -> str | None:
     """Return the configured endpoint only after its gRPC channel is ready."""
-    from remoteRF.deployment.state import load_target
+    from remoterf.deployment.state import load_target
     target = load_target()
     if target and target['transport'] == 'https-json':
-        from remoteRF.deployment.backend import selected_backend
+        from remoterf.deployment.backend import selected_backend
         backend = selected_backend()
         try:
             return backend.transport.origin
@@ -50,7 +50,7 @@ def _connected_server(timeout_seconds: float = SERVER_CONNECT_TIMEOUT_SECONDS) -
             backend.close()
     import grpc
 
-    from remoteRF.core.grpc_client import active_endpoint, get_active_channel
+    from remoterf.core.grpc_client import active_endpoint, get_active_channel
 
     try:
         channel = get_active_channel()
@@ -97,8 +97,8 @@ def _read_dotenv_kv(path: Path) -> dict[str, str]:
     return out
 
 def _ensure_config_present() -> tuple[bool, str]:
-    from remoteRF.deployment.state import load_target
-    from remoteRF.deployment.direct import resolve_active_profile
+    from remoterf.deployment.state import load_target
+    from remoterf.deployment.direct import resolve_active_profile
     target = load_target()
     if target and target['transport'] == 'https-json':
         return True, ''
@@ -189,7 +189,7 @@ def _account_shell(*, register: bool, enrollment_code: str | None = None,
         if _connected_server() is None:
             _print_server_unavailable()
             return 2
-        from remoteRF.core.acc_login import main as account_main
+        from remoterf.core.acc_login import main as account_main
         return int(
             account_main(
                 register=register,
@@ -218,9 +218,9 @@ def _use_global(*, register: bool, show_banner: bool = True) -> int:
     A Global-native account is complete on its own: it needs no deployment
     HOME, and having one grants no access to any deployment.
     """
-    from remoteRF.deployment import homes
-    from remoteRF.deployment.backend import HttpsJsonAccountBackend
-    from remoteRF.deployment.state import origin, select_target
+    from remoterf.deployment import homes
+    from remoterf.deployment.backend import HttpsJsonAccountBackend
+    from remoterf.deployment.state import origin, select_target
 
     try:
         selected = origin(_global_origin())
@@ -249,7 +249,7 @@ def _working(label: str):
     if not sys.stdout.isatty():
         yield
         return
-    from remoteRF.common.utils.banner import supports_unicode
+    from remoterf.common.utils.banner import supports_unicode
 
     frames = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏" if supports_unicode() else "|/-\\"
     stop = threading.Event()
@@ -294,7 +294,7 @@ def _reason(exc: BaseException) -> str:
 
 
 def _use_home(name: str, *, register: bool, enrollment_code: str | None = None) -> int:
-    from remoteRF.deployment import homes
+    from remoterf.deployment import homes
 
     try:
         home = homes.load_home(name)
@@ -312,25 +312,39 @@ def _use_home(name: str, *, register: bool, enrollment_code: str | None = None)
     )
 
 
+def _agree_to_tos() -> bool:
+    """Every registration is a fresh agreement, whoever is at the keyboard --
+    and starting one forgets the old agreement, so backing out here means
+    the next login asks too."""
+    from remoterf.config.config import _confirm_tos, forget_tos_agreement, remember_tos_agreement
+
+    forget_tos_agreement()
+    if not _confirm_tos("Do you agree to the RemoteRF Terms of Service? [y/N]: ",
+                        "Registration cancelled."):
+        return False
+    remember_tos_agreement()
+    return True
+
+
+def _register_global() -> int:
+    """`remoterf -r global`: straight to a Global account, same agreement as -r."""
+    print_client_banner(_installed_version(), server="")
+    if not _agree_to_tos():
+        return 1
+    return _use_global(register=True, show_banner=False)
+
+
 def _register() -> int:
     """`remoterf -r`: a deployment enrollment code, or a Global account."""
     from remoterf_federation_core import ValidationError
 
-    from remoteRF.deployment import homes
-
-    from remoteRF.config.config import _confirm_tos, forget_tos_agreement, remember_tos_agreement
+    from remoterf.deployment import homes
 
     # The banner opens the session; the target is not known yet, so the shell
     # below must not print it a second time.
     print_client_banner(_installed_version(), server="")
-    # Every registration is a fresh agreement, whoever is at the keyboard --
-    # and starting one forgets the old agreement, so backing out here means
-    # the next login asks too.
-    forget_tos_agreement()
-    if not _confirm_tos("Do you agree to the RemoteRF Terms of Service? [y/N]: ",
-                        "Registration cancelled."):
+    if not _agree_to_tos():
         return 1
-    remember_tos_agreement()
     try:
         entered = input('Enrollment code (Enter for a RemoteRF Global account): ').strip()
     except (EOFError, KeyboardInterrupt):
@@ -362,8 +376,8 @@ def _register() -> int:
 
 
 def _login(target: str | None) -> int:
-    from remoteRF.config.config import require_tos_for_login
-    from remoteRF.deployment import homes
+    from remoterf.config.config import require_tos_for_login
+    from remoterf.deployment import homes
 
     if not require_tos_for_login():
         return 1
@@ -404,7 +418,7 @@ def _print_pick_a_target() -> int:
 
 
 def _print_homes() -> int:
-    from remoteRF.deployment import homes
+    from remoterf.deployment import homes
 
     homes.migrate_legacy_target()
     saved = homes.homes()
@@ -434,8 +448,8 @@ def main() -> int:
         return 0
 
     if argv[0] in ("--register", "-register", "-r"):
-        if len(argv) == 2 and argv[1] == "global":
-            return _use_global(register=True)
+        if len(argv) == 2 and argv[1].lstrip("-") == "global":
+            return _register_global()
         if len(argv) > 1:
             print("ERROR: --register takes no arguments (or 'global')")
             return 2
@@ -451,14 +465,14 @@ def main() -> int:
         return _print_homes()
 
     if argv[0] in ("--version", "-version", "-v"):
-        from remoteRF.version import main as version_main
+        from remoterf.version import main as version_main
         
         print("RemoteRF version:", end=" ")
         version_main()
         return 0
 
     if argv[0] in ("--config", "-config", "-c"):
-        from remoteRF.config.config import configure, wipe_config
+        from remoterf.config.config import configure, wipe_config
 
         addr = None
         wipe = False
@@ -527,13 +541,13 @@ def main() -> int:
             return int(wipe_config(yes=yes))
 
         if addr is not None:
-            from remoteRF.deployment.state import origin, select_target, select_direct
+            from remoterf.deployment.state import origin, select_target, select_direct
             # Explicit host:port (even with a scheme) remains direct by default.
             stripped = addr.strip().split('://', 1)[-1]
             use_https = account_transport == 'https-json' or (':' not in stripped and account_transport != 'grpc')
             if use_https:
-                from remoteRF.deployment.backend import HttpsJsonAccountBackend
-                from remoteRF.config.config import _confirm_tos
+                from remoterf.deployment.backend import HttpsJsonAccountBackend
+                from remoterf.config.config import _confirm_tos
                 try:
                     selected_origin = origin(addr)
                     if not _confirm_tos():