From 8577b3d1e62da69b3e82d8da30c2e4c8fbe185a3 Mon Sep 17 00:00:00 2001
From: Shantur Rathore <i@shantur.com>
Date: Sun, 23 Nov 2025 14:42:09 +0000
Subject: [PATCH] show loading status only for errors

---
 packages/ui/src/renderer/loading/main.tsx | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/ui/src/renderer/loading/main.tsx b/packages/ui/src/renderer/loading/main.tsx
index da12874e..f0d5f91c 100644
--- a/packages/ui/src/renderer/loading/main.tsx
+++ b/packages/ui/src/renderer/loading/main.tsx
@@ -1,4 +1,4 @@
-import { createSignal, onCleanup, onMount } from "solid-js"
+import { Show, createSignal, onCleanup, onMount } from "solid-js"
 import { render } from "solid-js/web"
 import iconUrl from "../../images/CodeNomad-Icon.png"
 import { runtimeEnv, isTauriHost } from "../../lib/runtime-env"
@@ -18,12 +18,6 @@ const phrases = [
   "Persuading the AI to give you keyboard control…",
 ]
 
-const hostStatusMap: Record<typeof runtimeEnv.host, string> = {
-  electron: "Starting desktop shell…",
-  tauri: "Starting native shell…",
-  web: "Connecting to CodeNomad…",
-}
-
 interface CliStatus {
   state?: string
   url?: string | null
@@ -71,7 +65,7 @@ function annotateDocument() {
 function LoadingApp() {
   const [phrase, setPhrase] = createSignal(pickPhrase())
   const [error, setError] = createSignal<string | null>(null)
-  const [status, setStatus] = createSignal<string>(hostStatusMap[runtimeEnv.host] ?? "Starting services…")
+  const [status, setStatus] = createSignal<string | null>(null)
 
   const changePhrase = () => setPhrase(pickPhrase(phrase()))
 
@@ -88,7 +82,7 @@ function LoadingApp() {
         const readyUnlisten = await tauriBridge.event.listen("cli:ready", (event) => {
           const payload = (event?.payload as CliStatus) || {}
           setError(null)
-          setStatus("Launching CodeNomad…")
+          setStatus(null)
           navigateTo(payload.url)
         })
         const errorUnlisten = await tauriBridge.event.listen("cli:error", (event) => {
@@ -100,13 +94,14 @@ function LoadingApp() {
         })
         const statusUnlisten = await tauriBridge.event.listen("cli:status", (event) => {
           const payload = (event?.payload as CliStatus) || {}
-          if (payload.state && payload.state !== "ready") {
-            setStatus(payload.state === "starting" ? "Starting services…" : "Preparing CodeNomad…")
-            setError(null)
-          }
           if (payload.state === "error" && payload.error) {
             setError(payload.error)
             setStatus("Encountered an issue")
+            return
+          }
+          if (payload.state && payload.state !== "ready") {
+            setError(null)
+            setStatus(null)
           }
         })
         unsubscribers.push(readyUnlisten, errorUnlisten, statusUnlisten)
@@ -144,7 +139,7 @@ function LoadingApp() {
       <img src={iconUrl} alt="CodeNomad" class="loading-logo" width="180" height="180" />
       <div class="loading-heading">
         <h1 class="loading-title">CodeNomad</h1>
-        <p class="loading-status">{status()}</p>
+        <Show when={status()}>{(statusText) => <p class="loading-status">{statusText()}</p>}</Show>
       </div>
       <div class="loading-card">
         <div class="loading-row">