tescmd 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

tescmd/cli/auth.py

@@ -3,8 +3,10 @@
 from __future__ import annotations
 
 import json
+import os
 import sys
 import time
+import uuid
 import webbrowser
 from pathlib import Path
 from typing import TYPE_CHECKING
@@ -31,9 +33,11 @@ from tescmd.models.config import AppSettings
 
 if TYPE_CHECKING:
     from tescmd.cli.main import AppContext
+    from tescmd.deploy.tailscale_serve import KeyServer
     from tescmd.output.formatter import OutputFormatter
+    from tescmd.telemetry.tailscale import TailscaleManager
 
-DEVELOPER_PORTAL_URL = "https://developer.tesla.com"
+DEVELOPER_PORTAL_URL = "https://developer.tesla.com/dashboard"
 
 
 # ---------------------------------------------------------------------------
@@ -49,7 +53,12 @@ auth_group = click.Group("auth", help="Authentication commands")
 
 
 @auth_group.command("login")
-@click.option("--port", type=int, default=8085, help="Local callback port")
+@click.option(
+    "--port",
+    type=int,
+    default=None,
+    help="Local callback port (default: 8085 or TESCMD_OAUTH_PORT)",
+)
 @click.option(
     "--reconsent",
     is_flag=True,
@@ -57,15 +66,20 @@ auth_group = click.Group("auth", help="Authentication commands")
     help="Force Tesla to re-display the scope consent screen.",
 )
 @global_options
-def login_cmd(app_ctx: AppContext, port: int, reconsent: bool) -> None:
+def login_cmd(app_ctx: AppContext, port: int | None, reconsent: bool) -> None:
     """Log in via OAuth2 PKCE flow."""
     run_async(_cmd_login(app_ctx, port, reconsent=reconsent))
 
 
-async def _cmd_login(app_ctx: AppContext, port: int, *, reconsent: bool = False) -> None:
+async def _cmd_login(app_ctx: AppContext, port: int | None, *, reconsent: bool = False) -> None:
+    from tescmd.models.auth import DEFAULT_PORT
+
     formatter = app_ctx.formatter
     settings = AppSettings()
 
+    if port is None:
+        port = DEFAULT_PORT
+
     client_id = settings.client_id
     client_secret = settings.client_secret
 
@@ -267,11 +281,24 @@ async def _cmd_refresh(app_ctx: AppContext) -> None:
     scopes: list[str] = meta.get("scopes", DEFAULT_SCOPES)
     region: str = meta.get("region", "na")
 
-    token_data = await refresh_access_token(
-        refresh_token=rt,
-        client_id=settings.client_id,
-        client_secret=settings.client_secret,
-    )
+    from tescmd.api.errors import AuthError
+    from tescmd.cli._client import reauth_on_expired_refresh
+
+    try:
+        token_data = await refresh_access_token(
+            refresh_token=rt,
+            client_id=settings.client_id,
+            client_secret=settings.client_secret,
+        )
+    except AuthError as exc:
+        if "login_required" not in str(exc):
+            raise
+        await reauth_on_expired_refresh(store, settings)
+        if formatter.format == "json":
+            formatter.output({"status": "re-authenticated"}, command="auth.refresh")
+        else:
+            formatter.rich.info("")
+        return
 
     store.save(
         access_token=token_data.access_token,
@@ -351,9 +378,10 @@ async def _cmd_register(app_ctx: AppContext) -> None:
         region=region,
     )
 
+    already = bool(_result.get("already_registered"))
     if formatter.format == "json":
         data: dict[str, object] = {
-            "status": "registered",
+            "status": "already_registered" if already else "registered",
             "region": region,
             "domain": domain,
         }
@@ -361,7 +389,10 @@ async def _cmd_register(app_ctx: AppContext) -> None:
             data["partner_scopes"] = partner_scopes
         formatter.output(data, command="auth.register")
     else:
-        formatter.rich.info("[green]Registration successful.[/green]")
+        if already:
+            formatter.rich.info("[green]Already registered — no action needed.[/green]")
+        else:
+            formatter.rich.info("[green]Registration successful.[/green]")
         if partner_scopes:
             formatter.rich.info(f"Partner scopes: {', '.join(partner_scopes)}")
             missing = sorted(set(PARTNER_SCOPES) - set(partner_scopes))
@@ -425,7 +456,10 @@ async def _auto_register(
             domain=domain,
             region=region,
         )
-        formatter.rich.info("[green]Registration successful.[/green]")
+        if _result.get("already_registered"):
+            formatter.rich.info("[green]Already registered — no action needed.[/green]")
+        else:
+            formatter.rich.info("[green]Registration successful.[/green]")
         if partner_scopes:
             missing = sorted(set(PARTNER_SCOPES) - set(partner_scopes))
             if missing:
@@ -445,12 +479,21 @@ def _interactive_setup(
     redirect_uri: str,
     *,
     domain: str = "",
+    tailscale_hostname: str = "",
+    full_tier: bool = False,
+    force: bool = False,
 ) -> tuple[str, str]:
     """Walk the user through first-time Tesla API credential setup.
 
     When *domain* is provided (e.g. from the setup wizard), the developer
     portal instructions show ``https://{domain}`` as the Allowed Origin URL.
     Tesla's Fleet API requires the origin to match the registration domain.
+
+    When *full_tier* is True and *tailscale_hostname* is provided (or
+    auto-detected), the user is offered the chance to start a Tailscale
+    Funnel so Tesla can verify the origin URL when the portal app config
+    is saved.  The Tailscale prompt appears **before** the browser is
+    opened so the developer portal steps (1-6) are uninterrupted.
     """
     info = formatter.rich.info
     origin_url = f"https://{domain}" if domain else f"http://localhost:{port}"
@@ -464,116 +507,222 @@ def _interactive_setup(
     )
     info("")
 
-    # Offer to open the developer portal
+    # --- Tailscale detection + Funnel prompt (before browser opens) ----
+    # Only shown during the full setup wizard — the standalone ``auth
+    # setup`` command is credentials-only and defaults full_tier=False.
+    ts_hostname = tailscale_hostname if full_tier else ""
+    ts_funnel_started = False
+    _ts_manager: TailscaleManager | None = None
+    _key_server: KeyServer | None = None
+
+    if full_tier:
+        if not ts_hostname:
+            try:
+                from tescmd.deploy.tailscale_serve import is_tailscale_serve_ready
+
+                if run_async(is_tailscale_serve_ready()):
+                    from tescmd.telemetry.tailscale import TailscaleManager
+
+                    ts_hostname = run_async(TailscaleManager().get_hostname())
+            except Exception:
+                pass
+
+        if ts_hostname:
+            ts_origin = f"https://{ts_hostname}"
+
+            info(f"[green]Tailscale detected:[/green] {ts_hostname}")
+            info("")
+            info(f"  Adding [cyan]{ts_origin}[/cyan] as an Allowed Origin URL")
+            info("  will let [cyan]tescmd serve[/cyan] stream telemetry without")
+            info("  extra portal changes later.")
+            info("")
+            try:
+                answer = input(
+                    "Start Tailscale Funnel so Tesla can verify the URL? [Y/n] "
+                ).strip()
+            except (EOFError, KeyboardInterrupt):
+                answer = "n"
+
+            if answer.lower() != "n":
+                info("Starting Tailscale Funnel...")
+                try:
+                    from tescmd.crypto.keys import (
+                        generate_ec_key_pair,
+                        has_key_pair,
+                        load_public_key_pem,
+                    )
+                    from tescmd.deploy.tailscale_serve import KeyServer
+                    from tescmd.telemetry.tailscale import TailscaleManager
+
+                    key_dir = Path(AppSettings().config_dir).expanduser() / "keys"
+
+                    if not has_key_pair(key_dir):
+                        info("Generating EC P-256 key pair...")
+                        generate_ec_key_pair(key_dir)
+
+                    pem = load_public_key_pem(key_dir)
+                    _key_server = KeyServer(pem, port=0)
+                    _local_port = _key_server.server_address[1]
+                    _key_server.start()
+
+                    _ts_manager = TailscaleManager()
+                    run_async(_ts_manager.start_funnel(_local_port))
+
+                    ts_funnel_started = True
+                    info(f"[green]Funnel active — {ts_origin} is reachable.[/green]")
+                except Exception as exc:
+                    if _key_server is not None:
+                        _key_server.stop()
+                        _key_server = None
+                    _ts_manager = None
+                    info(f"[yellow]Could not start Funnel: {exc}[/yellow]")
+                    info("[dim]You can add the origin URL manually later.[/dim]")
+                    ts_hostname = ""
+
+    # --- Open browser + credential prompts (with guaranteed cleanup) ---
     try:
-        answer = input("Open the Tesla Developer Portal in your browser? [Y/n] ")
-    except (EOFError, KeyboardInterrupt):
-        info("")
-        return ("", "")
-
-    if answer.strip().lower() != "n":
-        webbrowser.open(DEVELOPER_PORTAL_URL)
-        info("[dim]Browser opened.[/dim]")
-
-    info("")
-    info(
-        "Follow these steps to create a Fleet API application."
-        " If you already have one, skip to the credentials prompt below."
-    )
-    info("")
-
-    # Step 1 — Registration
-    info("[bold]Step 1 — Registration[/bold]")
-    info("  Select [cyan]Just for me[/cyan] and click Next.")
-    info("")
-
-    # Step 2 — Application Details
-    info("[bold]Step 2 — Application Details[/bold]")
-    info("  Application Name:  [cyan]tescmd[/cyan]  (or anything you like)")
-    info("  Description:       [cyan]Personal CLI tool for vehicle status and control[/cyan]")
-    info(
-        "  Purpose of Usage:  [cyan]Query vehicle data and send commands from the terminal[/cyan]"
-    )
-    info("  Click Next.")
-    info("")
+        try:
+            answer = input("Open the Tesla Developer Portal in your browser? [Y/n] ")
+        except (EOFError, KeyboardInterrupt):
+            info("")
+            return ("", "")
 
-    # Step 3 — Client Details
-    info("[bold]Step 3 — Client Details[/bold]")
-    info(
-        "  OAuth Grant Type:    [cyan]Authorization Code and"
-        " Machine-to-Machine[/cyan]  (the default)"
-    )
-    info(f"  Allowed Origin URL:  [cyan]{origin_url}[/cyan]")
-    info(f"  Allowed Redirect URI: [cyan]{redirect_uri}[/cyan]")
-    info("  Allowed Returned URL: (leave empty)")
-    info("")
-    info(
-        "  [dim]For telemetry streaming, add your Tailscale hostname"
-        " as an additional origin:[/dim]"
-    )
-    info("  [dim]  https://<machine>.tailnet.ts.net[/dim]")
-    info("  Click Next.")
-    info("")
+        if answer.strip().lower() != "n":
+            webbrowser.open(DEVELOPER_PORTAL_URL)
+            info("[dim]Browser opened.[/dim]")
 
-    # Step 4 — API & Scopes
-    info("[bold]Step 4 — API & Scopes[/bold]")
-    info("  Under [bold]Fleet API[/bold], check at least:")
-    info("    [cyan]Vehicle Information[/cyan]")
-    info("    [cyan]Vehicle Location[/cyan]")
-    info("    [cyan]Vehicle Commands[/cyan]")
-    info("    [cyan]Vehicle Charging Management[/cyan]")
-    info("  Click Next.")
-    info("")
+        info("")
+        info(
+            "Follow these steps to create a Fleet API application."
+            " If you already have one, skip to the credentials prompt below."
+        )
+        info("")
 
-    # Step 5 — Billing Details
-    info("[bold]Step 5 — Billing Details[/bold]")
-    info("  Click [cyan]Skip and Submit[/cyan] at the bottom of the page.")
-    info("")
+        # Step 1 — Create New Application
+        info("[bold]Step 1 — Create New Application[/bold]")
+        info("  Select [cyan]Just for me[/cyan] and click Next.")
+        info("")
 
-    # Post-creation
-    info("[bold]Step 6 — Copy your credentials[/bold]")
-    info(
-        "  Open your dashboard:"
-        " [link=https://developer.tesla.com/en_US/dashboard]"
-        "developer.tesla.com/dashboard[/link]"
-    )
-    info("  Click [cyan]View Details[/cyan] on your app.")
-    info("  Under the [cyan]Credentials & APIs[/cyan] tab you'll see your")
-    info("  Client ID (copy icon) and Client Secret (eye icon to reveal).")
-    info("")
+        # Step 2 — Application Details
+        #
+        # Generate a unique app name so the user doesn't collide with anyone
+        # else on the Tesla Developer Portal.  Reuse a previously saved name
+        # if setup is being re-run.
+        saved_app_name = "" if force else os.environ.get("TESLA_APP_NAME", "")
+        app_name = saved_app_name or f"tescmd-{uuid.uuid4().hex[:8]}"
+
+        info("[bold]Step 2 — Application Details[/bold]")
+        info(f"  Application Name:  [cyan]{app_name}[/cyan]")
+        info("  Description:       [cyan]Personal CLI tool for vehicle status and control[/cyan]")
+        info(
+            "  Purpose of Usage:  [cyan]Query vehicle data and send commands"
+            " from the terminal[/cyan]"
+        )
+        info("  Click Next.")
+        info("")
 
-    # Prompt for Client ID
-    try:
-        client_id = input("Client ID: ").strip()
-    except (EOFError, KeyboardInterrupt):
+        # Step 3 — Client Details
+        info("[bold]Step 3 — Client Details[/bold]")
+        info(
+            "  OAuth Grant Type:    [cyan]Authorization Code and"
+            " Machine-to-Machine[/cyan]  (the default)"
+        )
+        info(f"  Allowed Origin URL:  [cyan]{origin_url}[/cyan]")
+        if ts_hostname:
+            info(f"  [bold]Also add:[/bold]          [cyan]https://{ts_hostname}[/cyan]")
+        info(f"  Allowed Redirect URI: [cyan]{redirect_uri}[/cyan]")
+        info("  Allowed Returned URL: (leave empty)")
+        info("")
+        if not ts_hostname:
+            info(
+                "  [dim]For telemetry streaming, add your Tailscale hostname"
+                " as an additional origin:[/dim]"
+            )
+            info("  [dim]  https://<machine>.tailnet.ts.net[/dim]")
+        info("  Click Next.")
         info("")
-        return ("", "")
 
-    if not client_id:
-        info("[yellow]No Client ID provided. Setup cancelled.[/yellow]")
-        return ("", "")
+        # Step 4 — API & Scopes
+        info("[bold]Step 4 — API & Scopes[/bold]")
+        if full_tier:
+            info("  Under [bold]Fleet API[/bold], click [cyan]Select All[/cyan].")
+        else:
+            info("  Under [bold]Fleet API[/bold], check at least:")
+            info("    [cyan]Vehicle Information[/cyan]")
+            info("    [cyan]Vehicle Location[/cyan]")
+            info("    [cyan]Energy Information[/cyan]")
+            info("    [cyan]User Data[/cyan]")
+        info("  Click Next.")
+        info("")
 
-    # Prompt for Client Secret (optional for public clients)
-    try:
-        client_secret = input("Client Secret (optional, press Enter to skip): ").strip()
-    except (EOFError, KeyboardInterrupt):
+        # Step 5 — Billing Details
+        info("[bold]Step 5 — Billing Details (Optional)[/bold]")
+        info("  Click [cyan]Skip and Submit[/cyan] at the bottom of the page.")
         info("")
-        return ("", "")
 
-    # Offer to persist credentials to .env
-    info("")
-    try:
-        save = input("Save credentials to .env file? [Y/n] ")
-    except (EOFError, KeyboardInterrupt):
+        # Post-creation
+        info("[bold]Step 6 — Copy your credentials[/bold]")
+        info(
+            "  Open your dashboard:"
+            " [link=https://developer.tesla.com/en_US/dashboard]"
+            "developer.tesla.com/dashboard[/link]"
+        )
+        info("  Click [cyan]View Details[/cyan] on your app.")
+        info("  Under the [cyan]Credentials & APIs[/cyan] tab you'll see your")
+        info("  Client ID (copy icon) and Client Secret (eye icon to reveal).")
         info("")
-        return (client_id, client_secret)
 
-    if save.strip().lower() != "n":
+        # Prompt for Client ID (required — retry on empty)
+        client_id = ""
+        for _ in range(3):
+            try:
+                client_id = input("Client ID: ").strip()
+            except (EOFError, KeyboardInterrupt):
+                info("")
+                return ("", "")
+            if client_id:
+                break
+            info("[yellow]Client ID is required.[/yellow]")
+
+        if not client_id:
+            info("[yellow]No Client ID provided. Setup cancelled.[/yellow]")
+            return ("", "")
+
+        # Prompt for Client Secret (required — retry on empty)
+        client_secret = ""
+        for _ in range(3):
+            try:
+                client_secret = input("Client Secret: ").strip()
+            except (EOFError, KeyboardInterrupt):
+                info("")
+                return ("", "")
+            if client_secret:
+                break
+            info("[yellow]Client Secret is required.[/yellow]")
+
+        if not client_secret:
+            info("[yellow]No Client Secret provided. Setup cancelled.[/yellow]")
+            return ("", "")
+
+        # Persist credentials to .env
+        info("")
         _write_env_file(client_id, client_secret)
+        if not saved_app_name:
+            _write_env_value("TESLA_APP_NAME", app_name)
         info("[green]Credentials saved to .env[/green]")
 
-    info("")
-    return (client_id, client_secret)
+        info("")
+        return (client_id, client_secret)
+    finally:
+        if ts_funnel_started:
+            if _key_server is not None:
+                _key_server.stop()
+            if _ts_manager is not None:
+                try:
+                    run_async(_ts_manager.stop_funnel())
+                except Exception as exc:
+                    info(f"[yellow]Warning: Failed to stop Tailscale Funnel: {exc}[/yellow]")
+                    info("[dim]You may need to run 'tailscale funnel --bg off' manually.[/dim]")
 
 
 def _prompt_for_domain(formatter: OutputFormatter) -> str:

tescmd/cli/energy.py

@@ -9,6 +9,7 @@ import click
 from tescmd._internal.async_utils import run_async
 from tescmd.cli._client import TTL_SLOW, cached_api_call, get_energy_api, invalidate_cache_for_site
 from tescmd.cli._options import global_options
+from tescmd.models.energy import SiteInfo
 
 if TYPE_CHECKING:
     from tescmd.cli.main import AppContext
@@ -66,6 +67,7 @@ async def _cmd_status(app_ctx: AppContext, site_id: int) -> None:
             endpoint="energy.status",
             fetch=lambda: api.site_info(site_id),
             ttl=TTL_SLOW,
+            model_class=SiteInfo,
         )
     finally:
         await client.close()

tescmd/cli/key.py

@@ -585,13 +585,12 @@ async def _cmd_enroll(
     formatter.rich.info("")
     formatter.rich.info(f"  Enrollment URL: [link={enroll_url}]{enroll_url}[/link]")
     formatter.rich.info("")
-    formatter.rich.info("  1. Open the URL above [bold]on your phone[/bold]")
-    formatter.rich.info("  2. Tap [bold]Finish Setup[/bold] on the web page")
-    formatter.rich.info("  3. The Tesla app will show an [bold]Add Virtual Key[/bold] prompt")
-    formatter.rich.info("  4. Approve it")
+    formatter.rich.info("  1. Scan the QR code on the page above with your phone[/bold]")
+    formatter.rich.info("  2. The Tesla app will show an [bold]Add Virtual Key[/bold] prompt")
+    formatter.rich.info("  3. Select all Scopes (if shown) and approve it")
     formatter.rich.info("")
     formatter.rich.info("  [dim]If the prompt doesn't appear, force-quit the Tesla app,[/dim]")
-    formatter.rich.info("  [dim]go back to your browser, and tap Finish Setup again.[/dim]")
+    formatter.rich.info("  [dim]and scan the QR code again.[/dim]")
     formatter.rich.info("━" * 55)
     formatter.rich.info("")
 
@@ -601,11 +600,11 @@ async def _cmd_enroll(
         formatter.rich.info("")
 
     formatter.rich.info("After approving in the Tesla app, try a command:")
-    formatter.rich.info("  [cyan]tescmd security lock --wake[/cyan]")
+    formatter.rich.info("  [cyan]tescmd vehicle list[/cyan]")
     formatter.rich.info("  [cyan]tescmd charge status --wake[/cyan]")
     formatter.rich.info("")
     formatter.rich.info(
-        "[dim]Tip: This URL must be opened on your phone, not a desktop browser.[/dim]"
+        "[dim]Tip: The QR code must be scanned on your phone that has the Tesla app installed.[/dim]"
     )
 
 

tescmd/cli/main.py

@@ -6,6 +6,7 @@ import dataclasses
 import logging
 
 import click
+from dotenv import load_dotenv
 
 from tescmd._internal.async_utils import run_async
 from tescmd.api.errors import (
@@ -62,6 +63,13 @@ class AppContext:
         return self._formatter
 
 
+# ---------------------------------------------------------------------------
+# Load .env into os.environ before Click resolves any envvar= options.
+# This ensures TESLA_VIN, TESCMD_MCP_CLIENT_ID, etc. from .env files
+# are visible to Click's envvar resolution.
+# ---------------------------------------------------------------------------
+load_dotenv(override=False)
+
 # ---------------------------------------------------------------------------
 # Root Click group
 # ---------------------------------------------------------------------------
@@ -160,11 +168,14 @@ def _register_commands() -> None:
     from tescmd.cli.climate import climate_group
     from tescmd.cli.energy import energy_group
     from tescmd.cli.key import key_group
+    from tescmd.cli.mcp_cmd import mcp_group
     from tescmd.cli.media import media_group
     from tescmd.cli.nav import nav_group
+    from tescmd.cli.openclaw import openclaw_group
     from tescmd.cli.partner import partner_group
     from tescmd.cli.raw import raw_group
     from tescmd.cli.security import security_group
+    from tescmd.cli.serve import serve_cmd
     from tescmd.cli.setup import setup_cmd
     from tescmd.cli.sharing import sharing_group
     from tescmd.cli.software import software_group
@@ -180,11 +191,14 @@ def _register_commands() -> None:
     cli.add_command(climate_group)
     cli.add_command(energy_group)
     cli.add_command(key_group)
+    cli.add_command(mcp_group)
     cli.add_command(media_group)
     cli.add_command(nav_group)
+    cli.add_command(openclaw_group)
     cli.add_command(partner_group)
     cli.add_command(raw_group)
     cli.add_command(security_group)
+    cli.add_command(serve_cmd)
     cli.add_command(setup_cmd)
     cli.add_command(sharing_group)
     cli.add_command(status_cmd)
@@ -563,14 +577,19 @@ def _handle_session_error(
     formatter.rich.error(message)
     formatter.rich.info("")
     formatter.rich.info("Possible causes:")
-    formatter.rich.info("  - Vehicle is temporarily unreachable")
-    formatter.rich.info("  - Local key pair is corrupted")
-    formatter.rich.info("  - Key was re-generated but not re-enrolled")
+    formatter.rich.info("  - Vehicle is temporarily unreachable or asleep")
+    formatter.rich.info("  - Session expired — retry once and a fresh handshake will occur")
+    formatter.rich.info(
+        "  - Local key pair is corrupted or was re-generated without re-enrollment"
+    )
     formatter.rich.info("")
-    formatter.rich.info("Try again, or if the problem persists:")
-    formatter.rich.info("  [cyan]tescmd key generate --force[/cyan]  (regenerate key pair)")
-    formatter.rich.info("  [cyan]tescmd key deploy[/cyan]            (re-deploy public key)")
-    formatter.rich.info("  [cyan]tescmd key enroll[/cyan]            (re-enroll on vehicle)")
+    formatter.rich.info("Try:")
+    formatter.rich.info("  1. Re-run the command (sessions auto-refresh)")
+    formatter.rich.info("  2. Use [cyan]--verbose[/cyan] to see fault codes and signing details")
+    formatter.rich.info("  3. If repeated failures, re-enroll:")
+    formatter.rich.info(
+        "     [cyan]tescmd key generate --force && tescmd key deploy && tescmd key enroll[/cyan]"
+    )
 
 
 def _handle_keyring_error(
@@ -642,4 +661,4 @@ def _handle_tunnel_error(
         " [cyan]https://login.tailscale.com/admin/acls[/cyan]"
     )
     formatter.rich.info("")
-    formatter.rich.info("Install telemetry deps: [cyan]pip install tescmd[telemetry][/cyan]")
+    formatter.rich.info("Telemetry deps are included with tescmd.")