trcc-linux 9.2.6__tar.gz → 9.2.9__tar.gz

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/.gitignore

@@ -78,7 +78,7 @@ src/trcc/data/ui_*.json
 # ──────────────────────────────────────────────
 # Dev / reference files (not for distribution)
 # ──────────────────────────────────────────────
-
+dev*
 # Dev scripts at root
 /test_*.py
 /probe_*.py

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 9.2.6
+Version: 9.2.9
 Summary: Linux implementation of Thermalright LCD Control Center
 Project-URL: Homepage, https://github.com/Lexonight1/thermalright-trcc-linux
 Project-URL: Documentation, https://github.com/Lexonight1/thermalright-trcc-linux#readme
@@ -26,6 +26,7 @@ Requires-Python: >=3.10
 Requires-Dist: click>=7.0
 Requires-Dist: fastapi>=0.100
 Requires-Dist: numpy>=1.24.0
+Requires-Dist: prompt-toolkit>=3.0.0
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: pyside6>=6.5.0
 Requires-Dist: python-multipart>=0.0.6

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "9.2.6"
+version = "9.2.9"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"
@@ -39,6 +39,7 @@ dependencies = [
     "tzdata>=2024.1; sys_platform == 'win32'",
     "uvicorn[standard]>=0.20",
     "python-multipart>=0.0.6",
+    "prompt_toolkit>=3.0.0",
     "wmi>=1.5.1; sys_platform == 'win32'",
 ]
 

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/src/trcc/__version__.py

@@ -1,4 +1,4 @@
 """TRCC Linux version information. History in doc/CHANGELOG.md."""
 
-__version__ = "9.2.6"
+__version__ = "9.2.9"
 __version_info__ = tuple(int(x) for x in __version__.split("."))

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/src/trcc/adapters/system/macos/sensors.py

@@ -20,6 +20,7 @@ import ctypes.util
 import datetime
 import logging
 import platform
+import re
 import struct
 import subprocess
 import threading
@@ -205,6 +206,7 @@ class MacOSSensorEnumerator(SensorEnumeratorABC):
             SensorInfo('psutil:mem_used', 'Memory Used', 'memory', 'MB', 'psutil'),
             SensorInfo('psutil:mem_total', 'Memory Total', 'memory', 'MB', 'psutil'),
             SensorInfo('psutil:mem_percent', 'Memory Usage', 'memory', '%', 'psutil'),
+            SensorInfo('computed:disk_percent', 'Disk Usage', 'disk_io', '%', 'computed'),
             SensorInfo('computed:disk_read', 'Disk Read', 'disk_io', 'MB/s', 'computed'),
             SensorInfo('computed:disk_write', 'Disk Write', 'disk_io', 'MB/s', 'computed'),
             SensorInfo('computed:net_up', 'Network Upload', 'network_io', 'KB/s', 'computed'),
@@ -296,6 +298,7 @@ class MacOSSensorEnumerator(SensorEnumeratorABC):
         readings['psutil:mem_used'] = mem.used / (1024 * 1024)
         readings['psutil:mem_total'] = mem.total / (1024 * 1024)
         readings['psutil:mem_percent'] = mem.percent
+        readings['computed:disk_percent'] = self._poll_apfs_disk_percent()
 
         # SMC (Intel) or IOKit (Apple Silicon)
         if IS_APPLE_SILICON:
@@ -388,6 +391,35 @@ class MacOSSensorEnumerator(SensorEnumeratorABC):
         except Exception:
             pass
 
+    def _poll_apfs_disk_percent(self) -> float:
+        """Read APFS container disk usage via diskutil.
+
+        psutil.disk_usage('/') only reports the root snapshot volume (~3%),
+        not the actual APFS container usage. `diskutil apfs list` gives real
+        container-level numbers.
+        """
+        try:
+            result = subprocess.run(
+                ['diskutil', 'apfs', 'list'],
+                capture_output=True, text=True, timeout=5,
+            )
+            capacity = 0
+            in_use = 0
+            for line in result.stdout.splitlines():
+                if 'Size (Capacity Ceiling)' in line:
+                    m = re.search(r'(\d+)\s+B', line)
+                    if m:
+                        capacity = int(m.group(1))
+                elif 'Capacity In Use By Volumes' in line:
+                    m = re.search(r'(\d+)\s+B', line)
+                    if m:
+                        in_use = int(m.group(1))
+            if capacity > 0:
+                return round(in_use / capacity * 100, 1)
+        except Exception:
+            log.debug("diskutil apfs list failed", exc_info=True)
+        return psutil.disk_usage('/').percent
+
     def _read_smc_key(self, key: str) -> float | None:
         """Read a single SMC key value (Intel Macs only).
 
@@ -467,6 +499,7 @@ class MacOSSensorEnumerator(SensorEnumeratorABC):
         mapping['mem_available'] = 'psutil:mem_used'
 
         # Disk / Network
+        mapping['disk_percent'] = 'computed:disk_percent'
         mapping['disk_read'] = 'computed:disk_read'
         mapping['disk_write'] = 'computed:disk_write'
         mapping['net_up'] = 'computed:net_up'
@@ -490,7 +523,6 @@ def _parse_metric(line: str) -> float:
         "CPU die temperature: 45.23 C" → 45.23
         "Fan: 1200 rpm" → 1200.0
     """
-    import re
     match = re.search(r'([\d.]+)', line.split(':')[-1])
     if match:
         return float(match.group(1))

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/src/trcc/api/display.py

@@ -48,47 +48,39 @@ def set_color(body: HexColorRequest) -> dict:
     """Send solid color to LCD."""
     from trcc.api import stop_overlay_loop, stop_video_playback
     from trcc.core.app import TrccApp
-    from trcc.core.commands.lcd import SendColorCommand
 
     stop_video_playback()
     stop_overlay_loop()
     r, g, b = parse_hex_or_400(body.hex)
     _get_display()
-    result = TrccApp.get().lcd_bus.dispatch(SendColorCommand(r=r, g=g, b=b))
-    return dispatch_result(result.payload)
+    return dispatch_result(TrccApp.get().lcd.send_color(r, g, b))
 
 
 @router.post("/brightness")
 def set_brightness(body: BrightnessRequest) -> dict:
     """Set display brightness (1=25%, 2=50%, 3=100%). Persists to config."""
     from trcc.core.app import TrccApp
-    from trcc.core.commands.lcd import SetBrightnessCommand
 
     _get_display()
-    result = TrccApp.get().lcd_bus.dispatch(SetBrightnessCommand(level=body.level))
-    return dispatch_result(result.payload)
+    return dispatch_result(TrccApp.get().lcd.set_brightness(body.level))
 
 
 @router.post("/rotation")
 def set_rotation(body: RotationRequest) -> dict:
     """Set display rotation (0, 90, 180, 270). Persists to config."""
     from trcc.core.app import TrccApp
-    from trcc.core.commands.lcd import SetRotationCommand
 
     _get_display()
-    result = TrccApp.get().lcd_bus.dispatch(SetRotationCommand(degrees=body.degrees))
-    return dispatch_result(result.payload)
+    return dispatch_result(TrccApp.get().lcd.set_rotation(body.degrees))
 
 
 @router.post("/split")
 def set_split(body: SplitRequest) -> dict:
     """Set split mode (0=off, 1-3=Dynamic Island). Persists to config."""
     from trcc.core.app import TrccApp
-    from trcc.core.commands.lcd import SetSplitModeCommand
 
     _get_display()
-    result = TrccApp.get().lcd_bus.dispatch(SetSplitModeCommand(mode=body.mode))
-    return dispatch_result(result.payload)
+    return dispatch_result(TrccApp.get().lcd.set_split_mode(body.mode))
 
 
 @router.post("/reset")
@@ -96,13 +88,11 @@ def reset_display() -> dict:
     """Reset device by sending solid red frame."""
     from trcc.api import stop_overlay_loop, stop_video_playback
     from trcc.core.app import TrccApp
-    from trcc.core.commands.lcd import ResetDisplayCommand
 
     stop_video_playback()
     stop_overlay_loop()
     _get_display()
-    result = TrccApp.get().lcd_bus.dispatch(ResetDisplayCommand())
-    return dispatch_result(result.payload)
+    return dispatch_result(TrccApp.get().lcd.reset())
 
 
 @router.post("/mask")
@@ -124,9 +114,8 @@ async def load_mask(image: UploadFile) -> dict:
 
     try:
         from trcc.core.app import TrccApp
-        from trcc.core.commands.lcd import LoadMaskCommand
-        result = TrccApp.get().lcd_bus.dispatch(LoadMaskCommand(mask_path=tmp_path))
-        return dispatch_result(result.payload)
+        result = TrccApp.get().lcd.load_mask_standalone(tmp_path)
+        return dispatch_result(result)
     finally:
         Path(tmp_path).unlink(missing_ok=True)
 
@@ -149,12 +138,10 @@ async def render_overlay(dc_path: str, send: bool = True) -> dict:
         raise HTTPException(status_code=400, detail="Invalid overlay path")
 
     from trcc.core.app import TrccApp
-    from trcc.core.commands.lcd import RenderOverlayFromDCCommand
 
     _get_display()
-    result = TrccApp.get().lcd_bus.dispatch(
-        RenderOverlayFromDCCommand(dc_path=safe_path, send=send))
-    return dispatch_result(result.payload)
+    result = TrccApp.get().lcd.render_overlay_from_dc(safe_path, send=send)
+    return dispatch_result(result)
 
 
 @router.get("/status")
@@ -249,13 +236,12 @@ def test_display() -> dict:
     ]
 
     from trcc.core.app import TrccApp
-    from trcc.core.commands.lcd import SendColorCommand
     from trcc.services import ImageService
 
-    bus = TrccApp.get().lcd_bus
+    lcd = TrccApp.get().lcd
     for r, g, b, _name in colors:
         img = ImageService.solid_color(r, g, b, w, h)
-        bus.dispatch(SendColorCommand(r=r, g=g, b=b))
+        lcd.send_color(r, g, b)
         time.sleep(1)
 
     # Update preview with last frame
@@ -406,9 +392,7 @@ async def create_theme(
 
     if mask_path:
         from trcc.core.app import TrccApp
-        from trcc.core.commands.lcd import LoadMaskCommand
-        mask_result = TrccApp.get().lcd_bus.dispatch(
-            LoadMaskCommand(mask_path=str(mask_path))).payload
+        mask_result = TrccApp.get().lcd.load_mask_standalone(str(mask_path))
         if not mask_result.get("success"):
             raise HTTPException(status_code=400, detail=mask_result.get("error", "Mask load failed"))
         img = mask_result.get("image", img)

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/src/trcc/api/i18n.py

@@ -34,11 +34,10 @@ def set_language(code: str) -> dict:
     from fastapi import HTTPException
 
     from trcc.core.app import TrccApp
-    from trcc.core.commands.initialize import SetLanguageCommand
     from trcc.core.i18n import LANGUAGE_NAMES
 
-    result = TrccApp.get().os_bus.dispatch(SetLanguageCommand(code=code))
-    if not result.success:
+    result = TrccApp.get().set_language(code)
+    if not result["success"]:
         raise HTTPException(
             status_code=400,
             detail=f"Unknown language code '{code}'. Use GET /i18n/languages for valid codes.",

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/src/trcc/api/led.py

@@ -32,31 +32,33 @@ def _get_led():
     return _led_dispatcher
 
 
+def _led():
+    """Get LEDDevice from TrccApp. Raises 409 if not connected."""
+    from trcc.core.app import TrccApp
+    from trcc.core.led_device import LEDDevice
+    _get_led()
+    led: LEDDevice = TrccApp.get().led
+    return led
+
+
 # ── Global operations ──────────────────────────────────────────────────
 
 @router.post("/color")
 def set_color(body: HexColorRequest) -> dict:
     """Set LED static color."""
     from trcc.api import stop_led_loop
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetLEDColorCommand
 
     stop_led_loop()
     r, g, b = parse_hex_or_400(body.hex)
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(SetLEDColorCommand(r=r, g=g, b=b))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_color(r, g, b))
 
 
 @router.post("/mode")
 def set_mode(body: ModeRequest) -> dict:
     """Set LED effect mode (static, breathing, colorful, rainbow, temp_linked, load_linked)."""
     from trcc.api import start_led_loop, stop_led_loop
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetLEDModeCommand
     from trcc.core.models import LEDMode
 
-    _get_led()
     try:
         mode = LEDMode[body.mode.upper()]
     except KeyError:
@@ -64,7 +66,7 @@ def set_mode(body: ModeRequest) -> dict:
             status_code=400,
             detail=f"Unknown mode '{body.mode}'. Choose: {', '.join(m.name.lower() for m in LEDMode)}",
         )
-    result = dispatch_result(TrccApp.get().led_bus.dispatch(SetLEDModeCommand(mode=mode)).payload)
+    result = dispatch_result(_led().set_mode(mode))
     if result.get("animated"):
         start_led_loop()
     else:
@@ -75,36 +77,22 @@ def set_mode(body: ModeRequest) -> dict:
 @router.post("/brightness")
 def set_brightness(body: LEDBrightnessRequest) -> dict:
     """Set LED brightness (0-100)."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetLEDBrightnessCommand
-
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(SetLEDBrightnessCommand(level=body.level))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_brightness(body.level))
 
 
 @router.post("/off")
 def turn_off() -> dict:
     """Turn LEDs off."""
     from trcc.api import stop_led_loop
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import ToggleLEDCommand
 
     stop_led_loop()
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(ToggleLEDCommand(on=False))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().toggle_global(on=False))
 
 
 @router.post("/sensor")
 def set_sensor(body: LEDSensorRequest) -> dict:
     """Set CPU/GPU sensor source for temp/load linked modes."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetLEDSensorSourceCommand
-
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(SetLEDSensorSourceCommand(source=body.source))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_sensor_source(body.source))
 
 
 # ── Zone operations ────────────────────────────────────────────────────
@@ -112,23 +100,15 @@ def set_sensor(body: LEDSensorRequest) -> dict:
 @router.post("/zones/{zone}/color")
 def set_zone_color(zone: int, body: HexColorRequest) -> dict:
     """Set color for a specific LED zone."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetZoneColorCommand
-
     r, g, b = parse_hex_or_400(body.hex)
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(SetZoneColorCommand(zone=zone, r=r, g=g, b=b))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_zone_color(zone, r, g, b))
 
 
 @router.post("/zones/{zone}/mode")
 def set_zone_mode(zone: int, body: ModeRequest) -> dict:
     """Set effect mode for a specific LED zone."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetZoneModeCommand
     from trcc.core.models import LEDMode
 
-    _get_led()
     try:
         mode = LEDMode[body.mode.upper()]
     except KeyError:
@@ -136,41 +116,25 @@ def set_zone_mode(zone: int, body: ModeRequest) -> dict:
             status_code=400,
             detail=f"Unknown mode '{body.mode}'. Choose: {', '.join(m.name.lower() for m in LEDMode)}",
         )
-    result = TrccApp.get().led_bus.dispatch(SetZoneModeCommand(zone=zone, mode=mode))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_zone_mode(zone, mode))
 
 
 @router.post("/zones/{zone}/brightness")
 def set_zone_brightness(zone: int, body: LEDBrightnessRequest) -> dict:
     """Set brightness for a specific LED zone (0-100)."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetZoneBrightnessCommand
-
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(SetZoneBrightnessCommand(zone=zone, level=body.level))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_zone_brightness(zone, body.level))
 
 
 @router.post("/zones/{zone}/toggle")
 def toggle_zone(zone: int, body: ToggleRequest) -> dict:
     """Toggle a specific LED zone on/off."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import ToggleZoneCommand
-
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(ToggleZoneCommand(zone=zone, on=body.on))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().toggle_zone(zone, body.on))
 
 
 @router.post("/sync")
 def set_sync(body: ZoneSyncRequest) -> dict:
     """Enable/disable zone sync (circulate/select-all)."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetZoneSyncCommand
-
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(SetZoneSyncCommand(enabled=body.enabled, interval=body.interval or 0))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_zone_sync(body.enabled, body.interval or 0))
 
 
 # ── Segment operations ─────────────────────────────────────────────────
@@ -178,34 +142,19 @@ def set_sync(body: ZoneSyncRequest) -> dict:
 @router.post("/segments/{index}/toggle")
 def toggle_segment(index: int, body: ToggleRequest) -> dict:
     """Toggle a specific LED segment on/off."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import ToggleSegmentCommand
-
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(ToggleSegmentCommand(index=index, on=body.on))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().toggle_segment(index, body.on))
 
 
 @router.post("/clock")
 def set_clock(body: ClockFormatRequest) -> dict:
     """Set LED segment display clock format (12h/24h)."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetClockFormatCommand
-
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(SetClockFormatCommand(is_24h=body.is_24h))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_clock_format(body.is_24h))
 
 
 @router.post("/temp-unit")
 def set_temp_unit(body: TempUnitRequest) -> dict:
     """Set LED segment display temperature unit (C/F)."""
-    from trcc.core.app import TrccApp
-    from trcc.core.commands.led import SetTempUnitLEDCommand
-
-    _get_led()
-    result = TrccApp.get().led_bus.dispatch(SetTempUnitLEDCommand(unit=body.unit))
-    return dispatch_result(result.payload)
+    return dispatch_result(_led().set_temp_unit(body.unit))
 
 
 # ── Test endpoint ─────────────────────────────────────────────────────
@@ -216,11 +165,7 @@ def test_led(
     mode: str = "static",
     segments: int = 64,
 ) -> dict:
-    """Run LED preview with real system metrics. No device needed.
-
-    Returns computed LED colors for the given mode and segment count.
-    Useful for testing without hardware.
-    """
+    """Run LED preview with real system metrics. No device needed."""
     from trcc.core.models import LEDMode, LEDState
     from trcc.services.led import LEDService
 

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/src/trcc/api/themes.py

@@ -238,10 +238,8 @@ def load_theme(body: ThemeLoadRequest) -> dict:
         w, h = _parse_resolution(body.resolution)
 
     from trcc.core.app import TrccApp
-    from trcc.core.commands.lcd import LoadThemeByNameCommand
 
-    result = TrccApp.get().lcd_bus.dispatch(
-        LoadThemeByNameCommand(name=body.name, width=w, height=h)).payload
+    result = TrccApp.get().lcd.load_theme_by_name(body.name, w, h)
     if not result.get("success"):
         return dispatch_result(result)
 

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/src/trcc/cli/__init__.py

@@ -210,6 +210,58 @@ def _cmd_gui(
     return gui(verbose=_verbose, decorated=decorated, start_hidden=resume)
 
 
+@app.command("shell")
+def _cmd_shell() -> int:
+    """Open interactive TRCC shell — type commands without the 'trcc' prefix."""
+    import shlex
+
+    import click
+    from prompt_toolkit import PromptSession
+    from prompt_toolkit.completion import WordCompleter
+    from prompt_toolkit.history import FileHistory
+
+    from trcc.core.paths import USER_DATA_DIR
+
+    # Build tab-completer from all registered commands
+    click_app = typer.main.get_command(app)
+    commands = sorted(click_app.commands.keys())  # type: ignore[union-attr]
+    completer = WordCompleter(commands, sentence=True)
+
+    history_file = Path(USER_DATA_DIR) / "shell_history"
+    session: PromptSession = PromptSession(
+        history=FileHistory(str(history_file)),
+        completer=completer,
+    )
+
+    print("TRCC shell — type commands without 'trcc' prefix. Tab to complete. Ctrl+D to exit.")
+    while True:
+        try:
+            text = session.prompt("trcc> ").strip()
+        except KeyboardInterrupt:
+            continue
+        except EOFError:
+            break
+
+        if not text:
+            continue
+        if text in ("exit", "quit"):
+            break
+
+        try:
+            args = shlex.split(text)
+            click_app.main(args, standalone_mode=False)
+        except click.exceptions.Exit:
+            pass
+        except click.exceptions.Abort:
+            print("\nAborted.")
+        except SystemExit:
+            pass
+        except Exception as e:
+            print(f"Error: {e}")
+
+    return 0
+
+
 @app.command("detect")
 def _cmd_detect(
     all_devices: Annotated[bool, typer.Option(
@@ -1125,12 +1177,11 @@ def _ensure_self_signed_cert() -> Optional[tuple[str, str]]:
 def main():
     """Main CLI entry point — composition root.
 
-    Initialization via commands:
-      1. InitPlatformCommand  — logging, OS, settings, renderer
-      2. DiscoverDevicesCommand — triggered per command that needs a device
+    Initialization:
+      1. init_platform()  — logging, OS, settings, renderer
+      2. discover() — triggered per command that needs a device
     """
     from trcc.core.app import AppEvent, AppObserver, TrccApp
-    from trcc.core.commands.initialize import InitPlatformCommand
 
     trcc_app = TrccApp.init()
 
@@ -1153,10 +1204,10 @@ def main():
         _progress_obs = _CliProgressObserver()
         trcc_app.register(_progress_obs)
 
-    trcc_app.os_bus.dispatch(InitPlatformCommand(
+    trcc_app.init_platform(
         verbosity=_verbose,
         renderer_factory=_renderer_factory,
-    ))
+    )
 
     try:
         result = app(standalone_mode=False, obj=trcc_app)

{trcc_linux-9.2.6 → trcc_linux-9.2.9}/src/trcc/cli/_device.py

@@ -125,21 +125,15 @@ def detect(show_all=False, detect_fn=None, platform_setup=None):
             print(hint)
         return 1
 
-    if show_all:
-        selected = Settings.get_selected_device()
+    selected = Settings.get_selected_device()
+    if show_all or len(devices) > 1:
         for i, dev in enumerate(devices, 1):
-            marker = "*" if dev.scsi_device == selected else " "
+            marker = "*" if dev.path == selected else " "
             print(f"{marker} [{i}] {_format(dev, probe=True)}")
         if len(devices) > 1:
             print("\nUse 'trcc select N' to switch devices")
     else:
-        selected = Settings.get_selected_device()
-        dev = None
-        if selected:
-            dev = next((d for d in devices if d.scsi_device == selected), None)
-        if not dev:
-            dev = devices[0]
-        print(f"Active: {_format(dev, probe=True)}")
+        print(f"Active: {_format(devices[0], probe=True)}")
 
     for warning in platform_setup.check_device_permissions(devices):
         print(f"\n{warning}")
@@ -162,10 +156,12 @@ def select(number, detect_fn=None):
         return 1
 
     if number < 1 or number > len(devices):
-        print(f"Invalid device number. Use 1-{len(devices)}")
+        print("Invalid device number. Available devices:")
+        for i, dev in enumerate(devices, 1):
+            print(f"  [{i}] {_format(dev)}")
         return 1
 
     device = devices[number - 1]
-    Settings.save_selected_device(device.scsi_device)
-    print(f"Selected: {device.scsi_device} ({device.product_name})")
+    Settings.save_selected_device(device.path)
+    print(f"Selected: {_format(device)}")
     return 0