refactor: remove automatic dev server reboot on theme changes and simplify theme state management

Author: dxlliv

bin/lib/installWizardFlow.js

@@ -331,17 +331,13 @@ export async function executeInstallPlan(ctx) {
       ctx.setConfigRestartHintTimer(null)
     }
     if (ctx.isDevServerUp()) {
-      if (nextTheme !== config.theme) {
-        ctx.rebootDevServer()
-      } else {
-        ctx.setConfigRestartHintUntil(Date.now() + 5000)
-        ctx.setConfigRestartHintTimer(setTimeout(() => {
-          ctx.setConfigRestartHintUntil(0)
-          ctx.setConfigRestartHintTimer(null)
-          ctx.renderClient()
-          ctx.screen.render()
-        }, 5000))
-      }
+      ctx.setConfigRestartHintUntil(Date.now() + 5000)
+      ctx.setConfigRestartHintTimer(setTimeout(() => {
+        ctx.setConfigRestartHintUntil(0)
+        ctx.setConfigRestartHintTimer(null)
+        ctx.renderClient()
+        ctx.screen.render()
+      }, 5000))
     }
 
     ctx.renderAll()
@@ -689,17 +685,13 @@ export async function runStartupInstallFlow(ctx, { isStartup = false } = {}) {
       ctx.setConfigRestartHintTimer(null)
     }
     if (ctx.isDevServerUp()) {
-      if (nextTheme !== config.theme) {
-        ctx.rebootDevServer()
-      } else {
-        ctx.setConfigRestartHintUntil(Date.now() + 5000)
-        ctx.setConfigRestartHintTimer(setTimeout(() => {
-          ctx.setConfigRestartHintUntil(0)
-          ctx.setConfigRestartHintTimer(null)
-          ctx.renderClient()
-          ctx.screen.render()
-        }, 5000))
-      }
+      ctx.setConfigRestartHintUntil(Date.now() + 5000)
+      ctx.setConfigRestartHintTimer(setTimeout(() => {
+        ctx.setConfigRestartHintUntil(0)
+        ctx.setConfigRestartHintTimer(null)
+        ctx.renderClient()
+        ctx.screen.render()
+      }, 5000))
     }
 
     ctx.renderAll()

go/tui/helpers.go

@@ -809,6 +809,17 @@ func catalogSourceLabel(item bridge.CatalogEntry, localGitDirs map[string]bool)
 	return "—"
 }
 
+// activeThemeName returns the currently selected theme (pending overrides saved config).
+func activeThemeName(ctx *bridge.WorkspaceContext, pendingTheme *string) string {
+	if pendingTheme != nil {
+		return *pendingTheme
+	}
+	if ctx != nil && ctx.Config.Theme != nil {
+		return *ctx.Config.Theme
+	}
+	return ""
+}
+
 func (m *TuiModel) getInstallMethods(pkg *bridge.CatalogEntry) []InstallMethod {
 	var methods []InstallMethod
 

go/tui/helpers_test.go

@@ -71,3 +71,27 @@ func TestCatalogSourceLabel(t *testing.T) {
 		})
 	}
 }
+
+func TestActiveThemeName(t *testing.T) {
+	nova := "@owdproject/theme-nova"
+	gnome := "@owdproject/theme-gnome"
+	ctx := &bridge.WorkspaceContext{
+		Config: bridge.Config{Theme: &nova},
+	}
+
+	if got := activeThemeName(ctx, nil); got != nova {
+		t.Fatalf("expected saved theme %q, got %q", nova, got)
+	}
+
+	if got := activeThemeName(ctx, &gnome); got != gnome {
+		t.Fatalf("expected pending theme %q, got %q", gnome, got)
+	}
+
+	if got := activeThemeName(nil, &gnome); got != gnome {
+		t.Fatalf("expected pending theme without ctx %q, got %q", gnome, got)
+	}
+
+	if got := activeThemeName(nil, nil); got != "" {
+		t.Fatalf("expected empty theme, got %q", got)
+	}
+}

go/tui/tui.go

@@ -99,20 +99,6 @@ func (m *TuiModel) loadCatalogCmd(force bool) tea.Cmd {
 	}
 }
 
-func (m *TuiModel) rebootServerCmd() tea.Cmd {
-	return func() tea.Msg {
-		m.runtime.msgChan <- logLineMsg("ℹ Theme change detected. Rebooting dev server…")
-		var metaDir string
-		if m.ctx != nil {
-			metaDir = m.ctx.Paths.MetaDir
-		}
-		stopServeTaskSync(m.workspaceRoot, metaDir, m.runtime)
-		time.Sleep(1500 * time.Millisecond)
-		m.RunServeTask()
-		return nil
-	}
-}
-
 func (m *TuiModel) checkServerStatusCmd() tea.Cmd {
 	return func() tea.Msg {
 		if m.ctx == nil {
@@ -317,13 +303,10 @@ func (m *TuiModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if len(items) > 0 && m.selectedIndex < len(items) {
 				pkg := items[m.selectedIndex]
 				if m.activeTab == 3 { // Themes (radiobox)
-					active := false
-					if m.ctx != nil && m.ctx.Config.Theme != nil && *m.ctx.Config.Theme == pkg.Name {
-						active = true
-					}
-					if active {
+					current := activeThemeName(m.ctx, m.pendingTheme)
+					if current == pkg.Name && m.pendingTheme != nil {
 						m.pendingTheme = nil
-					} else {
+					} else if current != pkg.Name {
 						themeName := pkg.Name
 						m.pendingTheme = &themeName
 					}
@@ -395,15 +378,6 @@ func (m *TuiModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.err = msg.Err
 			m.statusMsg = fmt.Sprintf("Error loading workspace: %v", msg.Err)
 		} else {
-			themeChanged := false
-			if m.ctx != nil && m.ctx.Config.Theme != nil && msg.Ctx.Config.Theme != nil {
-				if *m.ctx.Config.Theme != *msg.Ctx.Config.Theme {
-					themeChanged = true
-				}
-			} else if (m.ctx != nil && m.ctx.Config.Theme == nil && msg.Ctx.Config.Theme != nil) || (m.ctx != nil && m.ctx.Config.Theme != nil && msg.Ctx.Config.Theme == nil) {
-				themeChanged = true
-			}
-
 			m.ctx = msg.Ctx
 			m.statusMsg = "Workspace loaded."
 
@@ -413,12 +387,6 @@ func (m *TuiModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.StartLogTailer(logPath)
 			}
 
-			if themeChanged && m.serverRunning {
-				m.statusMsg = "Rebooting server for theme change…"
-				m.activeTask = TaskServe
-				return m, m.rebootServerCmd()
-			}
-
 			return m, m.checkServerStatusCmd()
 		}
 
@@ -505,6 +473,9 @@ func (m *TuiModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if msg.Success {
 			m.statusMsg = "Task completed."
 			m.addLog("✓ Wizard completed successfully")
+			if m.serverRunning {
+				m.addLog("ℹ desktop.config.ts updated — Nuxt restarts automatically (see dev server log)")
+			}
 
 			if m.startServerAfterSetup {
 				m.startServerAfterSetup = false

go/tui/view.go

@@ -358,14 +358,7 @@ func (m *TuiModel) renderCatalogRow(item bridge.CatalogEntry, selected bool, w,
 	// ── Badge (checkbox / radiobox) ─────────────────────────────
 	var badge string
 	if item.Kind == "theme" {
-		active := false
-		if m.ctx != nil && m.ctx.Config.Theme != nil && *m.ctx.Config.Theme == item.Name {
-			active = true
-		}
-		if m.pendingTheme != nil && *m.pendingTheme == item.Name {
-			active = true
-		}
-		if active {
+		if activeThemeName(m.ctx, m.pendingTheme) == item.Name {
 			badge = accentStyle.Render("◉")
 		} else {
 			badge = subtleStyle.Render("○")