merge master, accept theirs for known conflict files

2026-06-03 21:53:47 +08:00
parent db79ee2c80 f86ca99548
commit fdf9c43731
20 changed files with 4448 additions and 1108 deletions
@@ -75,7 +75,7 @@ function AppShell({
  const [navJustActivated, setNavJustActivated] = useState<WebViewKey | null>(null);
  const isAuthView = activeView === "login";
  const isImmersiveView = activeView === "agent" || activeView === "avatarConsole";
-  const showFloatingNav = !isAuthView && !isImmersiveView && activeView !== "home";
+  const showFloatingNav = (!isAuthView || !!session) && !isImmersiveView && activeView !== "home";
  const toolSurfaceViews = [
    "workbench",
    "canvas",