@agent-native/core 0.97.0 → 0.98.1

package/corpus/templates/analytics/app/components/layout/CommandPalette.tsx

@@ -18,6 +18,7 @@ import {
   IconMoon,
   IconHistory,
   IconLanguage,
+  IconRefresh,
 } from "@tabler/icons-react";
 import { useQuery } from "@tanstack/react-query";
 import { useTheme } from "next-themes";
@@ -126,70 +127,54 @@ function CommandLoadingGroup({
 }
 
 async function fetchSavedConfigs(): Promise<SavedConfig[]> {
-  try {
-    const rows = await callAction(
-      "list-explorer-configs",
-      {},
-      { method: "GET" },
-    );
-    return (Array.isArray(rows) ? rows : []) as SavedConfig[];
-  } catch {
-    return [];
-  }
+  const rows = await callAction("list-explorer-configs", {}, { method: "GET" });
+  return (Array.isArray(rows) ? rows : []) as SavedConfig[];
 }
 
 async function fetchExplorerDashboards(): Promise<ExplorerDashboard[]> {
-  try {
-    const result = await callAction(
-      "list-explorer-dashboards",
-      {
-        hidden: "all",
-      },
-      { method: "GET" },
-    );
-    const dashboards =
-      result && typeof result === "object" && "dashboards" in result
-        ? (result as { dashboards: unknown[] }).dashboards
-        : [];
-    return (Array.isArray(dashboards) ? dashboards : [])
-      .filter((d: any) => d && d.name)
-      .map((d: any) => ({
-        id: d.id,
-        name: d.name,
-        hiddenAt: typeof d.hiddenAt === "string" ? d.hiddenAt : null,
-      }));
-  } catch {
-    return [];
-  }
+  const result = await callAction(
+    "list-explorer-dashboards",
+    {
+      hidden: "all",
+    },
+    { method: "GET" },
+  );
+  const dashboards =
+    result && typeof result === "object" && "dashboards" in result
+      ? (result as { dashboards: unknown[] }).dashboards
+      : [];
+  return (Array.isArray(dashboards) ? dashboards : [])
+    .filter((d: any) => d && d.name)
+    .map((d: any) => ({
+      id: d.id,
+      name: d.name,
+      hiddenAt: typeof d.hiddenAt === "string" ? d.hiddenAt : null,
+    }));
 }
 
 async function fetchSqlDashboards(
   t: (key: string) => string,
 ): Promise<{ id: string; name: string; hiddenAt: string | null }[]> {
-  try {
-    const rows = await callAction(
-      "list-sql-dashboards",
-      { hidden: "all" },
-      { method: "GET" },
-    );
-    return (Array.isArray(rows) ? rows : [])
-      .filter((d: any) => d && typeof d.id === "string" && d.id.length > 0)
-      .map((d: any) => ({
-        id: d.id,
-        name:
-          typeof d.name === "string" && d.name.trim().length > 0
-            ? d.name
-            : t("commandPalette.untitledDashboard"),
-        hiddenAt: typeof d.hiddenAt === "string" ? d.hiddenAt : null,
-      }));
-  } catch {
-    return [];
-  }
+  const rows = await callAction(
+    "list-sql-dashboards",
+    { hidden: "all" },
+    { method: "GET" },
+  );
+  return (Array.isArray(rows) ? rows : [])
+    .filter((d: any) => d && typeof d.id === "string" && d.id.length > 0)
+    .map((d: any) => ({
+      id: d.id,
+      name:
+        typeof d.name === "string" && d.name.trim().length > 0
+          ? d.name
+          : t("commandPalette.untitledDashboard"),
+      hiddenAt: typeof d.hiddenAt === "string" ? d.hiddenAt : null,
+    }));
 }
 
 async function fetchExtensions(): Promise<ExtensionSearchItem[]> {
   const res = await fetch(agentNativePath("/_agent-native/extensions"));
-  if (!res.ok) return [];
+  if (!res.ok) throw new Error(`Failed to load extensions (${res.status})`);
   const data = await res.json();
   return (Array.isArray(data) ? data : [])
     .filter((extension: any) => {
@@ -230,7 +215,7 @@ export function CommandPalette() {
   const { resolvedTheme, setTheme } = useTheme();
   const isDark = resolvedTheme === "dark";
 
-  const { data: savedCharts = [], isFetching: savedChartsFetching } = useQuery({
+  const savedChartsQuery = useQuery({
     queryKey: ["explorer-configs-palette"],
     queryFn: fetchSavedConfigs,
     staleTime: 30_000,
@@ -239,10 +224,7 @@ export function CommandPalette() {
 
   const dashboardsSync = useChangeVersions(["dashboards", "action"]);
 
-  const {
-    data: explorerDashboards = [],
-    isFetching: explorerDashboardsFetching,
-  } = useQuery({
+  const explorerDashboardsQuery = useQuery({
     queryKey: ["explorer-dashboards-palette", dashboardsSync],
     queryFn: fetchExplorerDashboards,
     staleTime: 30_000,
@@ -250,18 +232,15 @@ export function CommandPalette() {
     placeholderData: (prev) => prev,
   });
 
-  const { data: sqlDashboards = [], isFetching: sqlDashboardsFetching } =
-    useQuery({
-      queryKey: ["sql-dashboards-palette", dashboardsSync],
-      queryFn: () => fetchSqlDashboards(t),
-      staleTime: 30_000,
-      enabled: open,
-      placeholderData: (prev) => prev,
-    });
-
-  const { data: extensions = [], isFetching: extensionsFetching } = useQuery<
-    ExtensionSearchItem[]
-  >({
+  const sqlDashboardsQuery = useQuery({
+    queryKey: ["sql-dashboards-palette", dashboardsSync],
+    queryFn: () => fetchSqlDashboards(t),
+    staleTime: 30_000,
+    enabled: open,
+    placeholderData: (prev) => prev,
+  });
+
+  const extensionsQuery = useQuery<ExtensionSearchItem[]>({
     queryKey: ["extensions"],
     queryFn: fetchExtensions,
     staleTime: 30_000,
@@ -269,6 +248,28 @@ export function CommandPalette() {
     placeholderData: (prev) => prev,
   });
 
+  const savedCharts = savedChartsQuery.data ?? [];
+  const explorerDashboards = explorerDashboardsQuery.data ?? [];
+  const sqlDashboards = sqlDashboardsQuery.data ?? [];
+  const extensions = extensionsQuery.data ?? [];
+  const savedChartsFetching = savedChartsQuery.isFetching;
+  const explorerDashboardsFetching = explorerDashboardsQuery.isFetching;
+  const sqlDashboardsFetching = sqlDashboardsQuery.isFetching;
+  const extensionsFetching = extensionsQuery.isFetching;
+  const asyncGroupsErrored =
+    savedChartsQuery.isError ||
+    explorerDashboardsQuery.isError ||
+    sqlDashboardsQuery.isError ||
+    extensionsQuery.isError;
+  const retryAsyncGroups = () => {
+    void Promise.all([
+      savedChartsQuery.refetch(),
+      explorerDashboardsQuery.refetch(),
+      sqlDashboardsQuery.refetch(),
+      extensionsQuery.refetch(),
+    ]);
+  };
+
   useEffect(() => {
     const handler = (e: KeyboardEvent) => {
       if ((e.metaKey || e.ctrlKey) && e.key === "k") {
@@ -310,6 +311,7 @@ export function CommandPalette() {
     <>
       <CommandDialog
         open={open}
+        motion="instant"
         onOpenChange={(next) => {
           setOpen(next);
           if (!next) setSearchQuery("");
@@ -321,10 +323,23 @@ export function CommandPalette() {
           onValueChange={setSearchQuery}
         />
         <CommandList>
-          {!asyncGroupsLoading && (
+          {!asyncGroupsLoading && !asyncGroupsErrored && (
             <CommandEmpty>{t("commandPalette.noResults")}</CommandEmpty>
           )}
 
+          {asyncGroupsErrored && (
+            <CommandGroup heading={t("commandPalette.loadFailed")} forceMount>
+              <CommandItem
+                forceMount
+                value="retry failed command palette data"
+                onSelect={retryAsyncGroups}
+              >
+                <IconRefresh className="me-2 h-4 w-4 text-muted-foreground" />
+                {t("sidebar.retry")}
+              </CommandItem>
+            </CommandGroup>
+          )}
+
           {explorerDashboardsFetching && explorerDashboards.length === 0 && (
             <CommandLoadingGroup
               heading={t("commandPalette.groupExplorerDashboards")}

package/corpus/templates/analytics/app/components/layout/Header.tsx

@@ -63,7 +63,7 @@ export function Header() {
       </div>
       <div className="flex items-center gap-2 shrink-0">
         {actions}
-        <RunsTray />
+        <RunsTray pollMs={0} />
         <AgentToggleButton />
       </div>
     </header>

package/corpus/templates/analytics/app/components/layout/Sidebar.tsx

@@ -68,6 +68,20 @@ type SidebarDashboard = {
   /** Id of the dashboard this one nests under in the sidebar, if any. */
   parentId?: string;
 };
+
+const SIDEBAR_SYNC_SETTLE_MS = 500;
+
+function useSettledSyncVersion(version: number): number {
+  const [settledVersion, setSettledVersion] = useState(version);
+  useEffect(() => {
+    const timeout = window.setTimeout(
+      () => setSettledVersion(version),
+      SIDEBAR_SYNC_SETTLE_MS,
+    );
+    return () => window.clearTimeout(timeout);
+  }, [version]);
+  return settledVersion;
+}
 import {
   DevDatabaseLink,
   FeedbackButton,
@@ -133,6 +147,7 @@ import type { ResourceAccess } from "@/lib/resource-access";
 
 import { NewAnalysisDialog } from "./NewAnalysisDialog";
 import { NewDashboardDialog } from "./NewDashboardDialog";
+import { SidebarLoadError } from "./SidebarLoadError";
 
 type AnalysisHiddenFilter = "visible" | "hidden";
 
@@ -277,7 +292,7 @@ function SidebarSectionSettingsPopover({
           <PopoverTrigger asChild>
             <button
               type="button"
-              className="flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-muted-foreground/65 opacity-0 transition-all hover:bg-sidebar-accent hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring group-hover/section:opacity-100 data-[state=open]:opacity-100"
+              className="flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-muted-foreground/65 opacity-0 transition-[opacity,color,background-color] hover:bg-sidebar-accent hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring group-hover/section:opacity-100 data-[state=open]:opacity-100"
               aria-label={settingsLabel}
             >
               <IconFilter className="h-3.5 w-3.5" />
@@ -600,7 +615,7 @@ function SortableRow({
     <div ref={setNodeRef} style={style} className="group/item relative min-w-0">
       <button
         type="button"
-        className="absolute -start-4 top-1/2 z-10 -translate-y-1/2 cursor-grab rounded p-1 text-muted-foreground/30 opacity-0 transition-colors hover:text-muted-foreground/60 group-hover/item:opacity-100 active:cursor-grabbing"
+        className="absolute -start-4 top-1/2 z-10 -translate-y-1/2 cursor-grab rounded p-1 text-muted-foreground/30 opacity-0 transition-[opacity,color] hover:text-muted-foreground/60 group-hover/item:opacity-100 active:cursor-grabbing"
         aria-label={t("sidebar.dragItemPersonal", { name })}
         {...attributes}
         {...listeners}
@@ -916,7 +931,7 @@ function SortableDashboardItem({
               <div
                 key={sv.id}
                 className={cn(
-                  "group/sv flex items-center gap-1 rounded-md pe-1 transition-all",
+                  "group/sv flex items-center gap-1 rounded-md pe-1 transition-[opacity,color,background-color]",
                   isSubviewActive
                     ? "bg-primary/10 text-primary"
                     : "text-muted-foreground/70 hover:bg-sidebar-accent/50 hover:text-primary",
@@ -975,7 +990,7 @@ function SortableDashboardItem({
                       <Tooltip>
                         <TooltipTrigger asChild>
                           <PopoverTrigger asChild>
-                            <button className="opacity-0 group-hover/sv:opacity-100 p-0.5 rounded text-muted-foreground/50 hover:text-foreground transition-all shrink-0">
+                            <button className="opacity-0 group-hover/sv:opacity-100 p-0.5 rounded text-muted-foreground/50 hover:text-foreground transition-[opacity,color,background-color] shrink-0">
                               <IconTrash className="h-2.5 w-2.5" />
                             </button>
                           </PopoverTrigger>
@@ -1117,28 +1132,24 @@ type SqlDashboardListItem = {
 async function fetchSqlDashboards(
   t: (key: string) => string,
 ): Promise<SqlDashboardListItem[]> {
-  try {
-    const rows = await callAction("list-sql-dashboards", {}, { method: "GET" });
-    return (Array.isArray(rows) ? rows : [])
-      .filter((d: any) => d && typeof d.id === "string" && d.id.length > 0)
-      .map((d: any) => ({
-        id: d.id,
-        name:
-          typeof d.name === "string" && d.name.trim().length > 0
-            ? d.name
-            : t("sidebar.untitledDashboard"),
-        visibility:
-          d.visibility === "org" || d.visibility === "public"
-            ? (d.visibility as Visibility)
-            : ("private" as Visibility),
-        parentId:
-          typeof d.parentId === "string" && d.parentId.trim().length > 0
-            ? d.parentId
-            : undefined,
-      }));
-  } catch {
-    return [];
-  }
+  const rows = await callAction("list-sql-dashboards", {}, { method: "GET" });
+  return (Array.isArray(rows) ? rows : [])
+    .filter((d: any) => d && typeof d.id === "string" && d.id.length > 0)
+    .map((d: any) => ({
+      id: d.id,
+      name:
+        typeof d.name === "string" && d.name.trim().length > 0
+          ? d.name
+          : t("sidebar.untitledDashboard"),
+      visibility:
+        d.visibility === "org" || d.visibility === "public"
+          ? (d.visibility as Visibility)
+          : ("private" as Visibility),
+      parentId:
+        typeof d.parentId === "string" && d.parentId.trim().length > 0
+          ? d.parentId
+          : undefined,
+    }));
 }
 
 async function fetchSidebarAnalyses(
@@ -1152,31 +1163,27 @@ async function fetchSidebarAnalyses(
     hiddenAt: string | null;
   }[]
 > {
-  try {
-    const rows = await callAction(
-      "list-analyses",
-      {
-        ...(hidden === "hidden" ? { hidden: "hidden" } : {}),
-      } as Record<string, unknown>,
-      { method: "GET" },
-    );
-    return (Array.isArray(rows) ? rows : [])
-      .filter((a: any) => a && typeof a.id === "string" && a.id.length > 0)
-      .map((a: any) => ({
-        id: a.id,
-        name:
-          typeof a.name === "string" && a.name.trim().length > 0
-            ? a.name
-            : t("sidebar.untitledAnalysis"),
-        visibility:
-          a.visibility === "org" || a.visibility === "public"
-            ? a.visibility
-            : ("private" as Visibility),
-        hiddenAt: typeof a.hiddenAt === "string" ? a.hiddenAt : null,
-      }));
-  } catch {
-    return [];
-  }
+  const rows = await callAction(
+    "list-analyses",
+    {
+      ...(hidden === "hidden" ? { hidden: "hidden" } : {}),
+    } as Record<string, unknown>,
+    { method: "GET" },
+  );
+  return (Array.isArray(rows) ? rows : [])
+    .filter((a: any) => a && typeof a.id === "string" && a.id.length > 0)
+    .map((a: any) => ({
+      id: a.id,
+      name:
+        typeof a.name === "string" && a.name.trim().length > 0
+          ? a.name
+          : t("sidebar.untitledAnalysis"),
+      visibility:
+        a.visibility === "org" || a.visibility === "public"
+          ? a.visibility
+          : ("private" as Visibility),
+      hiddenAt: typeof a.hiddenAt === "string" ? a.hiddenAt : null,
+    }));
 }
 
 type PrefetchedSqlDashboard = {
@@ -1507,7 +1514,7 @@ function AnalyticsChatsSection({ isAskRoute }: { isAskRoute: boolean }) {
                           <button
                             type="button"
                             aria-label={t("chat.optionsFor", { title })}
-                            className="pointer-events-auto rounded p-0.5 text-muted-foreground/50 opacity-0 transition-all hover:text-foreground focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring group-hover/item:opacity-100 group-focus-within/item:opacity-100 data-[state=open]:opacity-100 data-[state=open]:text-foreground"
+                            className="pointer-events-auto rounded p-0.5 text-muted-foreground/50 opacity-0 transition-[opacity,color,background-color] hover:text-foreground focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring group-hover/item:opacity-100 group-focus-within/item:opacity-100 data-[state=open]:opacity-100 data-[state=open]:text-foreground"
                           >
                             <IconDots className="h-3 w-3" />
                           </button>
@@ -1758,26 +1765,36 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
 
   // Fold per-source counters into sidebar list query keys so agent-driven
   // create/rename/archive/delete shows up without a manual refresh. We
-  // depend on `action` too because the agent runner emits an `action`
-  // event for every successful tool call — even when the matching
-  // resource-table emit (`dashboards` / `analyses`) is missed (e.g. event
-  // batching). See `use-change-version.ts` in @agent-native/core.
-  const dashboardsSync = useChangeVersions(["dashboards", "action"]);
-  const analysesSync = useChangeVersions(["analyses", "action"]);
+  // Domain counters keep these lists targeted. Folding the generic `action`
+  // counter into the keys makes unrelated background work cancel and restart
+  // both sidebar reads.
+  const dashboardsSync = useSettledSyncVersion(
+    useChangeVersions(["dashboards"]),
+  );
+  const analysesSync = useSettledSyncVersion(useChangeVersions(["analyses"]));
   const dashboardsSyncRef = useRef(dashboardsSync);
   const analysesSyncRef = useRef(analysesSync);
   dashboardsSyncRef.current = dashboardsSync;
   analysesSyncRef.current = analysesSync;
 
-  const { data: sqlDashboards = [], isLoading: sqlDashboardsLoading } =
-    useQuery({
-      queryKey: ["sql-dashboards-sidebar", dashboardsSync],
-      queryFn: () => fetchSqlDashboards(t),
-      staleTime: 30_000,
-      placeholderData: (prev) => prev,
-    });
+  const {
+    data: sqlDashboards = [],
+    isLoading: sqlDashboardsLoading,
+    isError: sqlDashboardsError,
+    refetch: refetchSqlDashboards,
+  } = useQuery({
+    queryKey: ["sql-dashboards-sidebar", dashboardsSync],
+    queryFn: () => fetchSqlDashboards(t),
+    staleTime: 30_000,
+    placeholderData: (prev) => prev,
+  });
 
-  const { data: analysesList = [], isLoading: analysesLoading } = useQuery({
+  const {
+    data: analysesList = [],
+    isLoading: analysesLoading,
+    isError: analysesError,
+    refetch: refetchAnalyses,
+  } = useQuery({
     queryKey: ["analyses-sidebar", analysesSync, analysisHiddenFilter],
     queryFn: () => fetchSidebarAnalyses(t, analysisHiddenFilter),
     staleTime: 30_000,
@@ -2387,6 +2404,18 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
         }
       },
     },
+    {
+      icon: IconChartBar,
+      label: t("navigation.dashboards"),
+      href: "/dashboards",
+      active: isAdhocActive,
+    },
+    {
+      icon: IconReportAnalytics,
+      label: t("navigation.analyses"),
+      href: "/analyses",
+      active: location.pathname.startsWith("/analyses"),
+    },
     {
       icon: IconPlayerPlay,
       label: t("navigation.sessions"),
@@ -2421,18 +2450,6 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
       href: "/data-dictionary",
       active: location.pathname.startsWith("/data-dictionary"),
     },
-    {
-      icon: IconChartBar,
-      label: t("navigation.dashboards"),
-      href: "/dashboards",
-      active: isAdhocActive,
-    },
-    {
-      icon: IconReportAnalytics,
-      label: t("navigation.analyses"),
-      href: "/analyses",
-      active: location.pathname.startsWith("/analyses"),
-    },
     {
       icon: IconSettings,
       label: t("navigation.settings"),
@@ -2544,10 +2561,10 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
           <div className="flex min-h-0 flex-1 flex-col overflow-y-auto overflow-x-hidden py-2">
             <nav className="grid min-w-0 items-start px-2 text-sm font-medium lg:px-4 space-y-1">
               {/* Ask section */}
-              <div className="group/section min-w-0 space-y-1">
+              <div className="order-1 group/section min-w-0 space-y-1">
                 <div
                   className={cn(
-                    "flex w-full min-w-0 items-center rounded-lg transition-all hover:text-primary",
+                    "flex w-full min-w-0 items-center rounded-lg transition-colors hover:text-primary",
                     isAskRoute
                       ? "bg-sidebar-accent text-sidebar-accent-foreground"
                       : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2600,7 +2617,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
               <Link
                 to="/sessions"
                 className={cn(
-                  "flex items-center gap-3 rounded-lg px-3 py-2 transition-all hover:text-primary",
+                  "order-4 flex items-center gap-3 rounded-lg px-3 py-2 transition-colors hover:text-primary",
                   location.pathname.startsWith("/sessions")
                     ? "bg-sidebar-accent text-sidebar-accent-foreground"
                     : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2614,7 +2631,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
               <Link
                 to="/monitoring"
                 className={cn(
-                  "flex items-center gap-3 rounded-lg px-3 py-2 transition-all hover:text-primary",
+                  "order-5 flex items-center gap-3 rounded-lg px-3 py-2 transition-colors hover:text-primary",
                   location.pathname.startsWith("/monitoring")
                     ? "bg-sidebar-accent text-sidebar-accent-foreground"
                     : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2628,7 +2645,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
                 <Link
                   to="/agents?view=dashboards"
                   className={cn(
-                    "flex items-center gap-3 rounded-lg px-3 py-2 transition-all hover:text-primary",
+                    "order-6 flex items-center gap-3 rounded-lg px-3 py-2 transition-colors hover:text-primary",
                     location.pathname.startsWith("/agents")
                       ? "bg-sidebar-accent text-sidebar-accent-foreground"
                       : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2643,7 +2660,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
               <Link
                 to="/data-sources"
                 className={cn(
-                  "flex items-center gap-3 rounded-lg px-3 py-2 transition-all hover:text-primary",
+                  "order-7 flex items-center gap-3 rounded-lg px-3 py-2 transition-colors hover:text-primary",
                   location.pathname === "/data-sources"
                     ? "bg-sidebar-accent text-sidebar-accent-foreground"
                     : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2657,7 +2674,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
               <Link
                 to="/data-dictionary"
                 className={cn(
-                  "flex items-center gap-3 rounded-lg px-3 py-2 transition-all hover:text-primary",
+                  "order-8 flex items-center gap-3 rounded-lg px-3 py-2 transition-colors hover:text-primary",
                   location.pathname.startsWith("/data-dictionary")
                     ? "bg-sidebar-accent text-sidebar-accent-foreground"
                     : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2668,10 +2685,10 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
               </Link>
 
               {/* Dashboards section */}
-              <div className="group/section min-w-0 space-y-1">
+              <div className="order-2 group/section min-w-0 space-y-1">
                 <div
                   className={cn(
-                    "flex w-full min-w-0 items-center rounded-lg transition-all hover:text-primary",
+                    "flex w-full min-w-0 items-center rounded-lg transition-colors hover:text-primary",
                     isAdhocActive
                       ? "text-sidebar-accent-foreground"
                       : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2806,6 +2823,13 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
                               />
                             </div>
                           ))}
+                        {sqlDashboardsError && sqlDashboards.length === 0 && (
+                          <SidebarLoadError
+                            message={t("sidebar.dashboardsLoadFailed")}
+                            retryLabel={t("sidebar.retry")}
+                            onRetry={() => void refetchSqlDashboards()}
+                          />
+                        )}
                         <NewDashboardDialog />
                       </div>
                     </SortableContext>
@@ -2814,10 +2838,10 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
               </div>
 
               {/* Analyses section */}
-              <div className="group/section min-w-0 space-y-1">
+              <div className="order-3 group/section min-w-0 space-y-1">
                 <div
                   className={cn(
-                    "flex w-full min-w-0 items-center rounded-lg transition-all hover:text-primary",
+                    "flex w-full min-w-0 items-center rounded-lg transition-colors hover:text-primary",
                     location.pathname.startsWith("/analyses")
                       ? "text-sidebar-accent-foreground"
                       : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2941,11 +2965,20 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
                               />
                             </div>
                           ))}
-                        {!analysesLoading && sortedAnalyses.length === 0 && (
-                          <p className="px-3 py-1 text-[11px] text-muted-foreground/60">
-                            {t("sidebar.noAnalysesYet")}
-                          </p>
+                        {analysesError && sortedAnalyses.length === 0 && (
+                          <SidebarLoadError
+                            message={t("sidebar.analysesLoadFailed")}
+                            retryLabel={t("sidebar.retry")}
+                            onRetry={() => void refetchAnalyses()}
+                          />
                         )}
+                        {!analysesLoading &&
+                          !analysesError &&
+                          sortedAnalyses.length === 0 && (
+                            <p className="px-3 py-1 text-[11px] text-muted-foreground/60">
+                              {t("sidebar.noAnalysesYet")}
+                            </p>
+                          )}
                         <NewAnalysisDialog />
                       </div>
                     </SortableContext>
@@ -2964,7 +2997,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
                       key={item.href}
                       to={item.href}
                       className={cn(
-                        "flex items-center gap-3 rounded-lg px-3 py-2 transition-all hover:text-primary",
+                        "flex items-center gap-3 rounded-lg px-3 py-2 transition-colors hover:text-primary",
                         isActive
                           ? "bg-sidebar-accent text-sidebar-accent-foreground"
                           : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -2999,7 +3032,7 @@ export function Sidebar({ mobile }: { mobile?: boolean } = {}) {
                               )
                             }
                             aria-label={t("sidebar.search")}
-                            className="flex items-center justify-center rounded-lg p-2 text-muted-foreground transition-all hover:text-primary cursor-pointer hover:bg-sidebar-accent/50"
+                            className="flex items-center justify-center rounded-lg p-2 text-muted-foreground transition-colors hover:text-primary cursor-pointer hover:bg-sidebar-accent/50"
                           >
                             <IconSearch className="h-4 w-4" />
                           </button>

package/corpus/templates/analytics/app/components/layout/SidebarLoadError.tsx

@@ -0,0 +1,24 @@
+type SidebarLoadErrorProps = {
+  message: string;
+  retryLabel: string;
+  onRetry: () => void;
+};
+
+export function SidebarLoadError({
+  message,
+  retryLabel,
+  onRetry,
+}: SidebarLoadErrorProps) {
+  return (
+    <div className="px-3 py-1 text-[11px] text-destructive" role="status">
+      <span>{message}</span>{" "}
+      <button
+        type="button"
+        className="font-medium underline underline-offset-2 hover:text-destructive/80"
+        onClick={onRetry}
+      >
+        {retryLabel}
+      </button>
+    </div>
+  );
+}