dreadnode 2.0.3__tar.gz → 2.0.4__tar.gz

{dreadnode-2.0.3 → dreadnode-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dreadnode
-Version: 2.0.3
+Version: 2.0.4
 Summary: Dreadnode SDK
 Project-URL: Homepage, https://dreadnode.io
 Project-URL: Documentation, https://docs.dreadnode.io
@@ -19,7 +19,7 @@ Requires-Dist: gepa>=0.1.1
 Requires-Dist: httpx<1.0.0,>=0.28.0
 Requires-Dist: jsonpath-ng>=1.7.0
 Requires-Dist: jsonref>=1.1.0
-Requires-Dist: litellm>=1.80.11
+Requires-Dist: litellm<=1.82.2,>=1.80.11
 Requires-Dist: logfire<=3.20.0,>=3.5.3
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mcp<2.0.0,>=1.25.0

{dreadnode-2.0.3 → dreadnode-2.0.4}/dreadnode/app/cli/task.py

@@ -158,6 +158,7 @@ def sync(
     *,
     force: t.Annotated[bool, cyclopts.Parameter(negative=())] = False,
     public: t.Annotated[bool, cyclopts.Parameter(negative=())] = False,
+    workers: t.Annotated[int, cyclopts.Parameter(help="Parallel upload workers.")] = 8,
     registry: RegistryConfig = RegistryConfig(),
 ) -> None:
     """Sync task environments from a directory to the platform."""
@@ -166,7 +167,9 @@ def sync(
         directory,
         force=force,
         public=public,
+        max_workers=workers,
         on_progress=_sync_progress,
+        on_status=lambda msg: print(msg),
     )
 
     total = len(result.uploaded) + len(result.skipped) + len(result.failed)

{dreadnode-2.0.3 → dreadnode-2.0.4}/dreadnode/app/main.py

@@ -1819,13 +1819,37 @@ class Dreadnode:
         result.blobs_skipped += oci_result.blobs_existed
         return result
 
+    def _fetch_remote_task_digests(self, org: str) -> dict[str, str]:
+        """Fetch all remote task OCI digests in bulk via paginated list.
+
+        Returns a mapping of ``{task_name: oci_layer_sha}`` for every task
+        that has a recorded OCI digest.
+        """
+        digests: dict[str, str] = {}
+        page = 1
+        while True:
+            resp = self.api.list_tasks(org, page=page, limit=100)
+            for item in resp.get("tasks", []):
+                name = item.get("name")
+                raw = item.get("oci_digest")
+                if name and isinstance(raw, str) and raw:
+                    sha = raw.split(":", 1)[-1] if ":" in raw else raw
+                    digests[name] = sha
+            total = resp.get("total", 0)
+            if page * 100 >= total:
+                break
+            page += 1
+        return digests
+
     def sync_environments(
         self,
         directory: str | Path,
         *,
         force: bool = False,
         public: bool = False,
+        max_workers: int = 8,
         on_progress: t.Callable[[str, str, str | None], None] | None = None,
+        on_status: t.Callable[[str], None] | None = None,
     ) -> EnvironmentSyncResult:
         """Sync task environments from a directory to the platform.
 
@@ -1837,11 +1861,15 @@ class Dreadnode:
             directory: Root directory containing task subdirectories.
             force: Upload even when the remote SHA matches.
             public: Set ``is_public=True`` after upload.
+            max_workers: Maximum parallel build/upload threads.
             on_progress: Optional callback ``(name, status, error)`` for each task.
 
         Returns:
             :class:`EnvironmentSyncResult` with uploaded/skipped/failed details.
         """
+        import concurrent.futures
+        import threading
+
         from dreadnode.packaging.oci import build_environment
 
         if not self.can_sync:
@@ -1851,13 +1879,18 @@ class Dreadnode:
 
         from dreadnode.packaging.task_validation import discover_task_directories
 
+        _status = on_status or (lambda _msg: None)
+
         root = Path(directory).resolve()
         if not root.is_dir():
             raise FileNotFoundError(f"Task directory not found: {root}")
 
         org = self.session.org_key
 
+        _status("Discovering tasks...")
         task_dirs, conflicts = discover_task_directories(root)
+        _status(f"Found {len(task_dirs)} task(s)")
+
         if conflicts and on_progress:
             for parent, nested in conflicts:
                 on_progress(
@@ -1869,9 +1902,17 @@ class Dreadnode:
         result = EnvironmentSyncResult(
             failed=[(nested.name, f"nested inside {parent.name}") for parent, nested in conflicts],
         )
-        oci_client = self.storage.oci_client()
 
-        for task_dir in task_dirs:
+        # Batch-fetch all remote digests (one paginated call vs N individual GETs)
+        _status("Fetching remote digests...")
+        remote_digests = self._fetch_remote_task_digests(org) if not force else {}
+        _status(
+            f"Fetched {len(remote_digests)} remote digest(s), syncing with {max_workers} workers..."
+        )
+
+        lock = threading.Lock()
+
+        def _sync_one(task_dir: Path) -> None:
             dir_name = task_dir.name
             try:
                 env_name, env_version = _load_environment_metadata(task_dir)
@@ -1883,33 +1924,42 @@ class Dreadnode:
                     raise ValueError("Environment OCI image has no layers")  # noqa: TRY301
                 local_sha = image.layers[0].digest.split(":", 1)[-1]
 
-                remote_sha = self._get_remote_task_sha(org, env_name)
+                remote_sha = remote_digests.get(env_name)
                 if not force and remote_sha and remote_sha == local_sha:
-                    result.skipped.append(env_name)
+                    with lock:
+                        result.skipped.append(env_name)
                     if on_progress:
                         on_progress(env_name, "skipped", None)
-                    continue
+                    return
 
+                # Each thread gets its own OCI client (own httpx.Client)
+                oci_client = self.storage.oci_client()
                 push_result = oci_client.push(resolved_name, env_version, image)
                 if not push_result.success:
                     msg = "; ".join(push_result.errors) or "OCI push failed"
-                    result.failed.append((env_name, msg))
+                    with lock:
+                        result.failed.append((env_name, msg))
                     if on_progress:
                         on_progress(env_name, "failed", msg)
-                    continue
+                    return
 
                 if public:
                     self.api.update_task_visibility(org, env_name, is_public=True)
 
-                result.uploaded.append(env_name)
+                with lock:
+                    result.uploaded.append(env_name)
                 if on_progress:
                     on_progress(env_name, "uploaded", None)
 
             except Exception as exc:
-                result.failed.append((dir_name, str(exc)))
+                with lock:
+                    result.failed.append((dir_name, str(exc)))
                 if on_progress:
                     on_progress(dir_name, "failed", str(exc))
 
+        with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as pool:
+            list(pool.map(_sync_one, task_dirs))
+
         return result
 
     def pull_package(

{dreadnode-2.0.3 → dreadnode-2.0.4}/dreadnode/app/server/app.py

@@ -812,6 +812,7 @@ def create_agent(
         instructions=instructions,
         tools=tools,
         hooks=hooks,
+        max_steps=500,
     )
 
 

{dreadnode-2.0.3 → dreadnode-2.0.4}/dreadnode/app/tui/app.py

@@ -549,6 +549,11 @@ class DreadnodeTextualApp(App[None]):
     @on(ComposerInput.Submitted)
     def _on_composer_submitted(self, event: ComposerInput.Submitted) -> None:
         value = event.value
+        logger.debug(
+            "Composer submitted | length={} | has_session={}",
+            len(value),
+            self.active_session_id is not None,
+        )
         self.query_one("#slash-overlay", SlashOverlay).hide()
         self.query_one("#mention-overlay", MentionOverlay).hide()
         self._dismiss_welcome()
@@ -596,7 +601,10 @@ class DreadnodeTextualApp(App[None]):
         else:
             # Show user message + thinking indicator immediately (before @work schedules)
             # so the first render frame already shows the conversation with user input.
+            # For new sessions (no active session yet), we still show thinking state
+            # immediately so the UI feels responsive during session creation.
             session = self._active_session()
+            conv = self.query_one("#conversation", ConversationView)
             if session is not None:
                 sid = session.info.session_id
                 self._turn_counts.setdefault(sid, 0)
@@ -607,13 +615,10 @@ class DreadnodeTextualApp(App[None]):
                 record = self.sessions.get(sid)
                 if record is not None:
                     record.transcript.append(entry)
-                conv = self.query_one("#conversation", ConversationView)
                 conv.append_entry(entry)
-                self._set_status("Thinking", busy=True)
-                conv.query_one(ToolProgress).show_activity("thinking")
-                self._send_chat(value, _user_entry_shown=True)
-            else:
-                self._send_chat(value)
+            self._set_status("Thinking", busy=True)
+            conv.query_one(ToolProgress).show_activity("thinking")
+            self._send_chat(value, _user_entry_shown=session is not None)
 
     def _submit_human_prompt_response(self, prompt: HumanPrompt, raw_value: str) -> None:
         """Handle composer submission while a human prompt is active."""
@@ -1140,6 +1145,7 @@ class DreadnodeTextualApp(App[None]):
                 self._last_quit_time = now
                 return
             self.workers.cancel_group(self, "session")
+            self._commit_draft_to_transcript(self.active_session_id or "")
             self._set_status("Interrupted", busy=False)
             self._set_composer_enabled(True)
             self.query_one("#composer", ComposerInput).focus()
@@ -1190,6 +1196,7 @@ class DreadnodeTextualApp(App[None]):
                 self._flash("Prompt cancelled", severity="warning")
                 return
             self.workers.cancel_group(self, "session")
+            self._commit_draft_to_transcript(self.active_session_id or "")
             self._set_status("Interrupted", busy=False)
             self._set_composer_enabled(True)
             composer.focus()
@@ -1354,6 +1361,7 @@ class DreadnodeTextualApp(App[None]):
 
     @work(exit_on_error=False)
     async def _boot(self) -> None:
+        boot_t0 = time.monotonic()
         self._clear_platform_proxy_state()
         self._set_status("Starting runtime", busy=True)
         override_url = self._platform_override_url()
@@ -1401,6 +1409,7 @@ class DreadnodeTextualApp(App[None]):
         api = ApiClient(platform_profile.url, api_key=platform_profile.api_key)
         backoffs = [1.0, 2.0, 4.0]
         response: httpx.Response | None = None
+        t0 = time.monotonic()
         for attempt in range(len(backoffs) + 1):
             try:
                 response = await asyncio.to_thread(api._request, "GET", "/user")
@@ -1423,6 +1432,7 @@ class DreadnodeTextualApp(App[None]):
                 return
 
             if response.is_success:
+                logger.debug("Boot timing | validate_key={:.0f}ms", (time.monotonic() - t0) * 1000)
                 break
 
             # Server error (5xx) — retry with backoff
@@ -1445,8 +1455,12 @@ class DreadnodeTextualApp(App[None]):
             return
 
         try:
+            t0 = time.monotonic()
             await asyncio.to_thread(api.get_organization, org)
             workspaces = await asyncio.to_thread(api.list_workspaces, org)
+            logger.debug(
+                "Boot timing | validate_org_workspace={:.0f}ms", (time.monotonic() - t0) * 1000
+            )
         except Exception as exc:
             self._set_status("Authentication required", busy=False)
             logger.warning("Boot: failed to validate org/workspace: {}", exc)
@@ -1462,11 +1476,21 @@ class DreadnodeTextualApp(App[None]):
         try:
             self._connection_manager.set_api_context(api, org, workspace)
             self._connection_manager.local_client.set_platform_profile(platform_profile)
+            t0 = time.monotonic()
             await self._connection_manager.local_client.start()
+            logger.debug("Boot timing | runtime_start={:.0f}ms", (time.monotonic() - t0) * 1000)
+            t0 = time.monotonic()
             await self._refresh_runtime()
+            logger.debug("Boot timing | refresh_runtime={:.0f}ms", (time.monotonic() - t0) * 1000)
+            t0 = time.monotonic()
             await self._refresh_server_sessions()
+            logger.debug("Boot timing | refresh_sessions={:.0f}ms", (time.monotonic() - t0) * 1000)
             try:
+                t0 = time.monotonic()
                 await self._refresh_platform_models_and_key(api)
+                logger.debug(
+                    "Boot timing | platform_models_and_key={:.0f}ms", (time.monotonic() - t0) * 1000
+                )
             except AuthenticationError:
                 self._handle_authentication_error("Session expired — please sign in again")
             # Resume a specific session if requested, otherwise start fresh.
@@ -1477,6 +1501,7 @@ class DreadnodeTextualApp(App[None]):
                 self._sync_conversation()
             self.authenticated = True
             self._refresh_skill_names()
+            logger.info("Boot timing | total={:.0f}ms", (time.monotonic() - boot_t0) * 1000)
             self._flash("Connected to Dreadnode runtime", severity="success")
             self._write_activity("Connected to Dreadnode runtime", style="success")
             self._set_status("Ready", busy=False)
@@ -1853,6 +1878,7 @@ class DreadnodeTextualApp(App[None]):
     @work(exclusive=True, group="session")
     async def _switch_session(self, session_id: str) -> None:
         logger.info("Session switch | session={}", session_id[:8])
+        self._dismiss_welcome()
         if self.active_session_id is not None:
             self._inline_activity_sessions.discard(self.active_session_id)
         self.active_session_id = session_id
@@ -1922,9 +1948,12 @@ class DreadnodeTextualApp(App[None]):
 
     @work(exit_on_error=False, exclusive=True, group="session")
     async def _send_chat(self, message: str, _user_entry_shown: bool = False) -> None:
+        send_t0 = time.monotonic()
         session = self._active_session()
         if session is None:
+            t0 = time.monotonic()
             await self.__create_new_session()
+            logger.debug("Send timing | create_session={:.0f}ms", (time.monotonic() - t0) * 1000)
             session = self._active_session()
             if session is None:
                 self._flash("Failed to create a session", severity="error")
@@ -1953,7 +1982,15 @@ class DreadnodeTextualApp(App[None]):
             len(message),
         )
         try:
+            t0 = time.monotonic()
             await self._ensure_litellm_key_fresh()
+            logger.debug(
+                "Send timing | ensure_litellm_key={:.0f}ms", (time.monotonic() - t0) * 1000
+            )
+            logger.debug(
+                "Send timing | pre_stream_total={:.0f}ms", (time.monotonic() - send_t0) * 1000
+            )
+            first_event = True
             async for event in self.server_client.stream_chat(
                 session_id=session.info.session_id,
                 message=message,
@@ -1961,6 +1998,12 @@ class DreadnodeTextualApp(App[None]):
                 agent=None if session.info.agent == "default" else session.info.agent,
                 generate_params_extra=self.generate_params_extra or None,
             ):
+                if first_event:
+                    logger.debug(
+                        "Send timing | first_sse_event={:.0f}ms",
+                        (time.monotonic() - send_t0) * 1000,
+                    )
+                    first_event = False
                 self._handle_event(event, session.info.session_id)
         except AuthenticationError:
             self._handle_authentication_error("Session expired — please sign in again")
@@ -2338,6 +2381,13 @@ class DreadnodeTextualApp(App[None]):
 
         if event_type == "agent_end":
             stop_reason = str(payload.get("stop_reason", "")).lower()
+            logger.debug(
+                "Agent end | session={} | stop_reason={} | status={} | error={}",
+                session_id[:8],
+                stop_reason or "finished",
+                normalized.status or "ok",
+                normalized.error_text or "none",
+            )
             if normalized.error_text:
                 logger.error(
                     "Agent ended with error: {} (type={}, payload={})",
@@ -2380,6 +2430,34 @@ class DreadnodeTextualApp(App[None]):
                     TranscriptEntry(kind="error", title="agent", body="run ended with an error"),
                     session_id,
                 )
+            elif stop_reason == "max_steps_reached":
+                logger.warning(
+                    "Agent hit max steps | session={} | payload={}",
+                    session_id[:8],
+                    payload,
+                )
+                self._append_transcript(
+                    TranscriptEntry(
+                        kind="error",
+                        title="agent",
+                        body="stopped — reached the maximum number of steps. Send a follow-up message to continue.",
+                    ),
+                    session_id,
+                )
+            elif stop_reason == "stalled":
+                logger.warning(
+                    "Agent stalled | session={} | payload={}",
+                    session_id[:8],
+                    payload,
+                )
+                self._append_transcript(
+                    TranscriptEntry(
+                        kind="error",
+                        title="agent",
+                        body="stopped — agent appears stalled. Send a follow-up message to continue.",
+                    ),
+                    session_id,
+                )
             return
 
         if event_type == "human_prompt":
@@ -3650,7 +3728,11 @@ class DreadnodeTextualApp(App[None]):
     async def _refresh_platform_models_and_key(self, api: ApiClient) -> None:
         self._clear_platform_proxy_state()
         try:
+            t0 = time.monotonic()
             preferences = await asyncio.to_thread(api.get_user_preferences)
+            logger.debug(
+                "Boot timing | get_user_preferences={:.0f}ms", (time.monotonic() - t0) * 1000
+            )
         except Exception as exc:
             logger.warning("Failed to fetch user preferences: {}", exc)
             return
@@ -3676,7 +3758,11 @@ class DreadnodeTextualApp(App[None]):
             logger.debug("Cannot provision LiteLLM key: no org context available")
             return
         try:
+            t0 = time.monotonic()
             result = await asyncio.to_thread(api.provision_inference_key, org)
+            logger.debug(
+                "LiteLLM key provisioned | elapsed={:.0f}ms", (time.monotonic() - t0) * 1000
+            )
         except Exception as exc:
             if self._is_litellm_service_unavailable(exc):
                 self._flash(_PLATFORM_MODELS_UNAVAILABLE_MESSAGE, severity="info")

{dreadnode-2.0.3 → dreadnode-2.0.4}/dreadnode/app/tui/client.py

@@ -4,6 +4,7 @@ import asyncio
 import contextlib
 import json
 import os
+import shlex
 import subprocess
 import tempfile
 import time
@@ -363,8 +364,14 @@ class RuntimeServerClient:
     async def _start_in_process(self) -> None:
         """Initialize the FastAPI app in-process and connect via ASGI transport."""
         logger.info("Starting in-process runtime server")
+        from dreadnode.app.server.app import _warm_litellm, initialize_app
         from dreadnode.app.server.app import app as server_app
-        from dreadnode.app.server.app import initialize_app
+
+        # Warm litellm in background — the lifespan does this for uvicorn,
+        # but in-process mode skips lifespan events. Fire before initialize_app
+        # so the ~2s import overlaps with app init and boot network calls.
+        loop = asyncio.get_running_loop()
+        loop.run_in_executor(None, _warm_litellm)
 
         await asyncio.to_thread(
             initialize_app,
@@ -825,15 +832,15 @@ class RuntimeServerClient:
             str(DEFAULT_SERVER_PORT),
         ]
         if self._platform_server:
-            command.extend(["--platform-server", self._platform_server])
+            command.extend(["--platform-server", shlex.quote(self._platform_server)])
         if self._platform_api_key:
-            command.extend(["--api-key", self._platform_api_key])
+            command.extend(["--api-key", shlex.quote(self._platform_api_key)])
         if self._platform_organization:
-            command.extend(["--organization", self._platform_organization])
+            command.extend(["--organization", shlex.quote(self._platform_organization)])
         if self._platform_workspace:
-            command.extend(["--workspace", self._platform_workspace])
+            command.extend(["--workspace", shlex.quote(self._platform_workspace)])
         if self._platform_project:
-            command.extend(["--project", self._platform_project])
+            command.extend(["--project", shlex.quote(self._platform_project)])
 
         self._owned_log_file = tempfile.NamedTemporaryFile(  # noqa: SIM115 - manually owned across subprocess lifecycle
             mode="w+",

{dreadnode-2.0.3 → dreadnode-2.0.4}/dreadnode/app/tui/dreadnode.tcss

@@ -285,9 +285,16 @@ PermissionPrompt.-active {
     padding: 1 2;
 }
 
+#auth-form-wrapper {
+    width: 1fr;
+    height: auto;
+    align: center top;
+}
+
 #auth-content {
     width: 1fr;
-    height: 1fr;
+    max-width: 80;
+    height: auto;
 }
 
 #auth-methods,
@@ -307,13 +314,13 @@ PermissionPrompt.-active {
 #auth-intro {
     color: $fg-subtle;
     margin-bottom: 1;
-    text-align: center;
 }
 
 #auth-banner {
     color: $brand;
     text-align: center;
-    margin-bottom: 1;
+    margin-top: 3;
+    margin-bottom: 0;
 }
 
 #auth-method-prompt {
@@ -374,10 +381,29 @@ PermissionPrompt.-active {
     margin-bottom: 1;
 }
 
-#auth-api-key {
+#auth-key-bar {
+    height: auto;
     width: 1fr;
-    max-width: 72;
     margin-bottom: 1;
+    padding: 0;
+}
+
+#auth-key-chevron {
+    width: 2;
+    height: 1;
+    color: $accent;
+    background: transparent;
+    padding: 0;
+}
+
+#auth-api-key {
+    width: 1fr;
+    border: none;
+    background: transparent;
+    color: $fg;
+    height: auto;
+    min-height: 1;
+    padding: 0;
 }
 
 .-hidden {

{dreadnode-2.0.3 → dreadnode-2.0.4}/dreadnode/app/tui/screens/auth.py

@@ -12,7 +12,7 @@ from datetime import datetime, timezone
 from rich.text import Text
 from textual import on, work
 from textual.binding import Binding
-from textual.containers import Container, Vertical
+from textual.containers import Container, Horizontal, Vertical
 from textual.screen import ModalScreen
 from textual.widgets import Input, OptionList, Static
 from textual.widgets.option_list import Option
@@ -62,7 +62,7 @@ class AuthModal(ModalScreen[ServerConfig | None]):
     """Full-screen auth modal — blocks all TUI interaction until authenticated."""
 
     BINDINGS: t.ClassVar[list[Binding]] = [
-        Binding("escape", "cancel", "Cancel", show=False),
+        Binding("escape", "escape", "Back / Cancel", show=False, priority=True),
         Binding("ctrl+c", "cancel", "Cancel", show=False),
         Binding("up", "move_selection(-1)", "Up", show=False),
         Binding("down", "move_selection(1)", "Down", show=False),
@@ -70,7 +70,6 @@ class AuthModal(ModalScreen[ServerConfig | None]):
         Binding("1", "select_method(0)", "Browser", show=False),
         Binding("2", "select_method(1)", "API key", show=False),
         Binding("r", "retry", "Retry", show=False),
-        Binding("b", "back", "Back", show=False),
     ]
 
     def __init__(
@@ -110,31 +109,38 @@ class AuthModal(ModalScreen[ServerConfig | None]):
         self._open_browser = webbrowser.open
 
     def compose(self) -> ComposeResult:
-        with Container(id="auth-modal"), Vertical(id="auth-content"):
-            with Vertical(id="auth-methods"):
-                yield _AuthBanner(id="auth-banner")
-                yield Static("", id="auth-reason")
-                yield Static("", id="auth-update-banner")
+        with Vertical(id="auth-modal"):
+            yield _AuthBanner(id="auth-banner")
+            yield Static("", id="auth-reason")
+            yield Static("", id="auth-update-banner")
+            with Container(id="auth-form-wrapper"), Vertical(id="auth-content"):
                 yield Static(
                     "Dreadnode can be used with your browser or by entering an API key directly.",
                     id="auth-intro",
                 )
-                yield Static("Select login method:", id="auth-method-prompt")
-                yield OptionList(id="auth-method-list")
-                yield Static(
-                    "Use Up/Down to move, Enter/click/1/2 to select", id="auth-method-help"
-                )
-            with Vertical(id="auth-device", classes="-hidden"):
-                yield Static("Waiting for browser authorization...", id="auth-status")
-                yield Static("", id="auth-user-code")
-                yield Static("", id="auth-verification-url")
-                yield Static("", id="auth-device-help")
-                yield Static("", id="auth-error")
-            with Vertical(id="auth-key", classes="-hidden"):
-                yield Static("Paste your API key:", id="auth-key-title")
-                yield Input(placeholder="dn_...", password=True, id="auth-api-key")
-                yield Static("Enter to submit, b to go back, Esc to cancel", id="auth-key-help")
-                yield Static("", id="auth-key-error")
+                with Vertical(id="auth-methods"):
+                    yield Static("Select login method:", id="auth-method-prompt")
+                    yield OptionList(id="auth-method-list")
+                    yield Static(
+                        "Use Up/Down to move, Enter/click/1/2 to select",
+                        id="auth-method-help",
+                    )
+                with Vertical(id="auth-device", classes="-hidden"):
+                    yield Static("Waiting for browser authorization...", id="auth-status")
+                    yield Static("", id="auth-user-code")
+                    yield Static("", id="auth-verification-url")
+                    yield Static("", id="auth-device-help")
+                    yield Static("", id="auth-error")
+                with Vertical(id="auth-key", classes="-hidden"):
+                    yield Static("Paste your API key:", id="auth-key-title")
+                    with Horizontal(id="auth-key-bar"):
+                        yield Static(">", id="auth-key-chevron")
+                        yield Input(placeholder="dn_...", id="auth-api-key")
+                    yield Static(
+                        "Enter to submit, Esc to go back",
+                        id="auth-key-help",
+                    )
+                    yield Static("", id="auth-key-error")
 
     def on_mount(self) -> None:
         if self._reason:
@@ -150,6 +156,13 @@ class AuthModal(ModalScreen[ServerConfig | None]):
         self._cancel_auth_workers()
         self.dismiss(None)
 
+    def action_escape(self) -> None:
+        if self._active_view == "method":
+            self.action_cancel()
+        else:
+            self._cancel_auth_workers()
+            self._show_method_view()
+
     def action_move_selection(self, direction: int) -> None:
         if self._active_view != "method":
             return
@@ -180,12 +193,6 @@ class AuthModal(ModalScreen[ServerConfig | None]):
             return
         self._begin_device_code_flow()
 
-    def action_back(self) -> None:
-        if self._active_view == "method":
-            return
-        self._cancel_auth_workers()
-        self._show_method_view()
-
     @on(Input.Submitted, "#auth-api-key")
     def _on_api_key_submitted(self) -> None:
         self._submit_api_key_from_input()
@@ -249,9 +256,7 @@ class AuthModal(ModalScreen[ServerConfig | None]):
         self.query_one("#auth-methods", Vertical).add_class("-hidden")
         self.query_one("#auth-key", Vertical).add_class("-hidden")
         self.query_one("#auth-device", Vertical).remove_class("-hidden")
-        self.query_one("#auth-device-help", Static).update(
-            "r to retry, b to go back, Esc to cancel"
-        )
+        self.query_one("#auth-device-help", Static).update("r to retry, Esc to go back")
         self._set_device_error("")
 
     def _begin_device_code_flow(self) -> None: