@agent-native/core 0.97.0 → 0.98.1

package/corpus/templates/analytics/actions/install-dashboard-template.ts

@@ -18,7 +18,12 @@ import {
   getDashboardCatalogEntry,
   listDashboardCatalog,
 } from "../server/lib/dashboard-catalog";
-import { getDashboard, upsertDashboard } from "../server/lib/dashboards-store";
+import {
+  getDashboard,
+  upsertDashboard,
+  upsertDashboardWithRetry,
+  type DashboardRecord,
+} from "../server/lib/dashboards-store";
 
 async function syncToCollab(
   dashboardId: string,
@@ -145,6 +150,17 @@ export default defineAction({
     // in ONE atomic save instead of looping update-dashboard (which times out
     // on the ~40s hosted run budget). Non-destructive: existing panels and
     // their order are preserved; only template panels with a new id are added.
+    //
+    // This is a genuine read-modify-write of an EXISTING dashboard (an agent
+    // merging a template while a human drags a panel, or two merge calls
+    // racing), so the save is fenced through `upsertDashboardWithRetry`.
+    // `computeMerge` is invoked with the freshest `DashboardRecord` on every
+    // attempt and recomputes `existingIds`/`appended`/`mergedConfig` from
+    // THAT record's config — never from a closure over the earlier `target`
+    // read — so a lost race re-merges against whatever the concurrent writer
+    // actually saved instead of clobbering it. `seedConfig`/`seedPanels` are
+    // the template's own panels and don't depend on dashboard state, so they
+    // are computed once outside the retry loop.
     if (args.mergePanels) {
       const targetId = args.dashboardId?.trim();
       if (!targetId) {
@@ -152,6 +168,7 @@ export default defineAction({
           "mergePanels=true requires dashboardId (the existing dashboard to append the template's panels to).",
         );
       }
+
       const target = await getDashboard(targetId, ctx);
       if (!target) {
         throw new Error(
@@ -159,16 +176,6 @@ export default defineAction({
         );
       }
 
-      const targetConfig = target.config as Record<string, unknown>;
-      const existingPanels = Array.isArray(targetConfig.panels)
-        ? (targetConfig.panels as Array<Record<string, unknown>>)
-        : [];
-      const existingIds = new Set(
-        existingPanels
-          .map((panel) => (typeof panel?.id === "string" ? panel.id : null))
-          .filter((id): id is string => !!id),
-      );
-
       const seedConfig = cloneDashboardConfig(entry) as unknown as Record<
         string,
         unknown
@@ -177,49 +184,78 @@ export default defineAction({
         ? (seedConfig.panels as unknown as Array<Record<string, unknown>>)
         : [];
 
-      const addedPanelIds: string[] = [];
-      const skippedExistingIds: string[] = [];
-      const appended: Array<Record<string, unknown>> = [];
-      for (const panel of seedPanels) {
-        const id = typeof panel?.id === "string" ? panel.id : null;
-        if (id && existingIds.has(id)) {
-          skippedExistingIds.push(id);
-          continue;
-        }
-        appended.push(panel);
-        if (id) {
-          addedPanelIds.push(id);
-          existingIds.add(id);
+      function computeMerge(existing: Pick<DashboardRecord, "config">) {
+        const targetConfig = existing.config as Record<string, unknown>;
+        const existingPanels = Array.isArray(targetConfig.panels)
+          ? (targetConfig.panels as Array<Record<string, unknown>>)
+          : [];
+        const existingIds = new Set(
+          existingPanels
+            .map((panel) => (typeof panel?.id === "string" ? panel.id : null))
+            .filter((id): id is string => !!id),
+        );
+
+        const addedPanelIds: string[] = [];
+        const skippedExistingIds: string[] = [];
+        const appended: Array<Record<string, unknown>> = [];
+        for (const panel of seedPanels) {
+          const id = typeof panel?.id === "string" ? panel.id : null;
+          if (id && existingIds.has(id)) {
+            skippedExistingIds.push(id);
+            continue;
+          }
+          appended.push(panel);
+          if (id) {
+            addedPanelIds.push(id);
+            existingIds.add(id);
+          }
         }
+
+        let mergedConfig: Record<string, unknown> = {
+          ...targetConfig,
+          panels: [...existingPanels, ...appended],
+        };
+        const filterMerge = mergeMissingFilters(mergedConfig, seedConfig);
+        mergedConfig = filterMerge.config;
+
+        return {
+          mergedConfig,
+          addedPanelIds,
+          skippedExistingIds,
+          appended,
+          filterMerge,
+        };
       }
 
-      let mergedConfig: Record<string, unknown> = {
-        ...targetConfig,
-        panels: [...existingPanels, ...appended],
-      };
-      const filterMerge = mergeMissingFilters(mergedConfig, seedConfig);
-      mergedConfig = filterMerge.config;
-      const panelCount = (mergedConfig.panels as unknown[]).length;
+      let computed = computeMerge(target);
+      let savedTitle = target.title;
 
-      if (appended.length > 0 || filterMerge.addedFilterIds.length > 0) {
-        const saved = await upsertDashboard(
+      if (
+        computed.appended.length > 0 ||
+        computed.filterMerge.addedFilterIds.length > 0
+      ) {
+        const saved = await upsertDashboardWithRetry(
           targetId,
-          target.kind,
-          mergedConfig,
           ctx,
+          (existing) => {
+            computed = computeMerge(existing);
+            return { kind: existing.kind, body: computed.mergedConfig };
+          },
         );
-        await syncToCollab(targetId, mergedConfig);
-        targetConfig.name = saved.title;
+        await syncToCollab(targetId, saved.config as Record<string, unknown>);
+        savedTitle = saved.title;
       }
 
+      const panelCount = (computed.mergedConfig.panels as unknown[]).length;
+
       return {
         templateId: entry.id,
         templateName: entry.name,
         dashboardId: targetId,
-        name: target.title,
+        name: savedTitle,
         merged: true,
-        addedPanelIds,
-        skippedExistingIds,
+        addedPanelIds: computed.addedPanelIds,
+        skippedExistingIds: computed.skippedExistingIds,
         panelCount,
         urlPath: `/dashboards/${targetId}`,
         deepLink: buildDeepLink({
@@ -228,9 +264,9 @@ export default defineAction({
           params: { dashboardId: targetId },
         }),
         message:
-          appended.length > 0
-            ? `Added ${addedPanelIds.length} panel(s) from "${entry.name}" to "${target.title}"; ${skippedExistingIds.length} already present. Dashboard now has ${panelCount} panel(s).`
-            : `No new panels to add from "${entry.name}" — all ${skippedExistingIds.length} template panel id(s) already present. Dashboard has ${panelCount} panel(s).`,
+          computed.appended.length > 0
+            ? `Added ${computed.addedPanelIds.length} panel(s) from "${entry.name}" to "${savedTitle}"; ${computed.skippedExistingIds.length} already present. Dashboard now has ${panelCount} panel(s).`
+            : `No new panels to add from "${entry.name}" — all ${computed.skippedExistingIds.length} template panel id(s) already present. Dashboard has ${panelCount} panel(s).`,
       };
     }
 

package/corpus/templates/analytics/actions/list-explorer-dashboards.ts

@@ -6,7 +6,7 @@ import {
 import { z } from "zod";
 
 import {
-  listDashboards,
+  listDashboardSummaries,
   type DashboardArchiveFilter,
   type DashboardHiddenFilter,
 } from "../server/lib/dashboards-store";
@@ -48,7 +48,7 @@ export default defineAction({
     const ctx = { email, orgId };
     const archived = parseArchivedFilter(args.archived);
     const hidden = parseHiddenFilter(args.hidden);
-    const rows = await listDashboards(ctx, {
+    const rows = await listDashboardSummaries(ctx, {
       kind: "explorer",
       archived,
       hidden,
@@ -56,7 +56,7 @@ export default defineAction({
     return {
       dashboards: rows.map((d) => ({
         id: d.id,
-        ...(d.config as Record<string, unknown>),
+        name: d.name,
         ownerEmail: d.ownerEmail,
         orgId: d.orgId,
         visibility: d.visibility,

package/corpus/templates/analytics/actions/list-sql-dashboards.ts

@@ -7,7 +7,7 @@ import {
 import { z } from "zod";
 
 import {
-  listDashboards,
+  listDashboardSummaries,
   type DashboardArchiveFilter,
   type DashboardHiddenFilter,
 } from "../server/lib/dashboards-store";
@@ -65,10 +65,15 @@ export default defineAction({
     const ctx = { email, orgId };
     const archived = parseArchivedFilter(args.archived);
     const hidden = parseHiddenFilter(args.hidden);
-    const rows = await listDashboards(ctx, { kind: "sql", archived, hidden });
+    const rows = await listDashboardSummaries(ctx, {
+      kind: "sql",
+      archived,
+      hidden,
+    });
     return rows.map((d) => ({
       id: d.id,
-      ...(d.config as Record<string, unknown>),
+      name: d.name,
+      ...(d.parentId ? { parentId: d.parentId } : {}),
       ownerEmail: d.ownerEmail,
       orgId: d.orgId,
       visibility: d.visibility,

package/corpus/templates/analytics/actions/navigate.ts

@@ -1,7 +1,47 @@
 import { defineAction } from "@agent-native/core";
-import { writeAppState } from "@agent-native/core/application-state";
+import { writeAppStateForCurrentTab } from "@agent-native/core/application-state";
+import {
+  getRequestOrgId,
+  getRequestUserEmail,
+} from "@agent-native/core/server";
 import { z } from "zod";
 
+import { listDashboardSummaries } from "../server/lib/dashboards-store";
+
+function normalizeDashboardName(value: string): string {
+  return value.trim().replace(/\s+/g, " ").toLowerCase();
+}
+
+async function resolveDashboardIdByName(name: string): Promise<string> {
+  const email = getRequestUserEmail();
+  if (!email) throw new Error("Dashboard navigation requires authentication.");
+  const orgId = getRequestOrgId() || null;
+  const dashboards = await listDashboardSummaries(
+    { email, orgId },
+    { kind: "sql", archived: "active", hidden: "visible" },
+  );
+  const normalized = normalizeDashboardName(name);
+  const withoutDashboardSuffix = normalized.replace(/\s+dashboard$/, "");
+  const matches = dashboards.filter((dashboard) => {
+    const candidate = normalizeDashboardName(dashboard.name);
+    return candidate === normalized || candidate === withoutDashboardSuffix;
+  });
+  if (matches.length === 0) {
+    throw new Error(
+      `No accessible dashboard named "${name.trim()}" was found.`,
+    );
+  }
+  if (matches.length === 1) return matches[0]!.id;
+
+  const ownedMatches = matches.filter(
+    (dashboard) => dashboard.ownerEmail.toLowerCase() === email.toLowerCase(),
+  );
+  if (ownedMatches.length === 1) return ownedMatches[0]!.id;
+  throw new Error(
+    `More than one accessible dashboard is named "${name.trim()}". Use its dashboard id instead.`,
+  );
+}
+
 export default defineAction({
   description:
     "Navigate the UI to a specific view, dashboard, analysis, extension, Analytics session recording, Monitoring tab (uptime checks, public status pages, or captured errors), or Analytics agent-admin surface. For filter changes (dashboard filter query params like ?f_date=... or session filters like ?range=30d&q=signup), use the framework-level `set-search-params` tool instead of this action.",
@@ -16,6 +56,14 @@ export default defineAction({
       .string()
       .optional()
       .describe("Dashboard ID to open (used with view=adhoc)"),
+    dashboardName: z
+      .string()
+      .trim()
+      .min(1)
+      .optional()
+      .describe(
+        'Accessible SQL dashboard name to open when its id is unknown (for example, "Agent Native" or "Agent Native dashboard").',
+      ),
     analysisId: z
       .string()
       .optional()
@@ -70,6 +118,7 @@ export default defineAction({
     if (
       !args.view &&
       !args.dashboardId &&
+      !args.dashboardName &&
       !args.analysisId &&
       !args.extensionId &&
       !args.recordingId &&
@@ -81,13 +130,18 @@ export default defineAction({
       !args.errorIssueId
     ) {
       throw new Error(
-        "At least --view, --dashboardId, --analysisId, --extensionId, --recordingId, --agentsView, --dbAdminConnectionId, --monitoringView, --monitorId, --statusPageId, or --errorIssueId is required.",
+        "At least --view, --dashboardId, --dashboardName, --analysisId, --extensionId, --recordingId, --agentsView, --dbAdminConnectionId, --monitoringView, --monitorId, --statusPageId, or --errorIssueId is required.",
       );
     }
+    const dashboardId =
+      args.dashboardId ??
+      (args.dashboardName
+        ? await resolveDashboardIdByName(args.dashboardName)
+        : undefined);
     const nav: Record<string, string> = {};
     if (args.view) nav.view = args.view === "overview" ? "ask" : args.view;
-    if (args.dashboardId) {
-      nav.dashboardId = args.dashboardId;
+    if (dashboardId) {
+      nav.dashboardId = dashboardId;
       if (!args.view) nav.view = "adhoc";
     }
     if (args.analysisId) {
@@ -133,7 +187,7 @@ export default defineAction({
       nav.monitoringView = "errors";
       if (!args.view) nav.view = "monitoring";
     }
-    await writeAppState("navigate", nav);
+    await writeAppStateForCurrentTab("navigate", nav);
 
     const parts: string[] = [];
     if (nav.view) parts.push(nav.view);

package/corpus/templates/analytics/actions/rename-analysis.ts

@@ -5,7 +5,7 @@ import {
 } from "@agent-native/core/server";
 import { z } from "zod";
 
-import { upsertAnalysis } from "../server/lib/dashboards-store";
+import { upsertAnalysisWithRetry } from "../server/lib/dashboards-store";
 
 function resolveScope() {
   const orgId = getRequestOrgId() || null;
@@ -25,7 +25,13 @@ export default defineAction({
     if (!name) throw new Error("name is required");
 
     const ctx = resolveScope();
-    const analysis = await upsertAnalysis(args.id, { name }, ctx);
+    // Fenced through the retry helper: the patch below only ever touches
+    // `name`, so a concurrent edit (e.g. save-analysis re-running with fresh
+    // results) racing this rename is never silently overwritten — a lost
+    // race just re-reads the freshest record and reapplies the rename.
+    const analysis = await upsertAnalysisWithRetry(args.id, ctx, () => ({
+      name,
+    }));
     return { id: analysis.id, name: analysis.name };
   },
 });

package/corpus/templates/analytics/actions/rename-dashboard.ts

@@ -10,7 +10,7 @@ import {
 } from "@agent-native/core/server";
 import { z } from "zod";
 
-import { getDashboard, upsertDashboard } from "../server/lib/dashboards-store";
+import { upsertDashboardWithRetry } from "../server/lib/dashboards-store";
 
 function resolveScope() {
   const orgId = getRequestOrgId() || null;
@@ -47,12 +47,13 @@ export default defineAction({
     if (!name) throw new Error("name is required");
 
     const ctx = resolveScope();
-    const dashboard = await getDashboard(args.id, ctx);
-    if (!dashboard) throw new Error("Dashboard not found");
-
-    const config = { ...dashboard.config, name };
-    const updated = await upsertDashboard(args.id, dashboard.kind, config, ctx);
-    await syncToCollab(args.id, config);
+    // Recomputed on every retry attempt from the freshest dashboard config, so
+    // a concurrent panel edit (mutate-dashboard/update-dashboard) racing this
+    // rename is never silently overwritten by a stale config snapshot.
+    const updated = await upsertDashboardWithRetry(args.id, ctx, (existing) => {
+      return { kind: existing.kind, body: { ...existing.config, name } };
+    });
+    await syncToCollab(args.id, updated.config);
     return { id: updated.id, name: updated.title };
   },
 });

package/corpus/templates/analytics/actions/view-screen.ts

@@ -1,8 +1,5 @@
 import { defineAction } from "@agent-native/core";
-import {
-  readAppState,
-  readAppStateForCurrentTab,
-} from "@agent-native/core/application-state";
+import { readAppStateForCurrentTab } from "@agent-native/core/application-state";
 import {
   getRequestUserEmail,
   getRequestOrgId,
@@ -37,12 +34,12 @@ export default defineAction({
   readOnly: true,
   run: async () => {
     const navigation = await readAppStateForCurrentTab("navigation");
-    const url = (await readAppState("__url__")) as {
+    const url = (await readAppStateForCurrentTab("__url__")) as {
       pathname?: string;
       search?: string;
       searchParams?: Record<string, string>;
     } | null;
-    const selectedObject = await readAppState("selected-object");
+    const selectedObject = await readAppStateForCurrentTab("selected-object");
 
     const screen: Record<string, unknown> = {};
     if (navigation) screen.navigation = navigation;
@@ -466,34 +463,15 @@ export default defineAction({
       const email = getRequestUserEmail();
       if (email) {
         const orgId = getRequestOrgId() || null;
-        const [keys, catalog] = await Promise.all([
-          listAnalyticsPublicKeys({
-            userEmail: email,
-            orgId,
-          }),
-          listDashboardCatalog({
-            email,
-            orgId,
-          }),
-        ]);
-        const llmTemplate = catalog.find(
-          (template) => template.id === "agent-observability-llm",
-        );
+        const keys = await listAnalyticsPublicKeys({
+          userEmail: email,
+          orgId,
+        });
         screen.firstPartyAnalytics = {
           activeKeys: keys.filter((key: any) => !key.revokedAt).length,
           serverEnv: "AGENT_NATIVE_ANALYTICS_PUBLIC_KEY",
           browserEnv: "VITE_AGENT_NATIVE_ANALYTICS_PUBLIC_KEY",
         };
-        if (llmTemplate) {
-          screen.llmObservabilityDashboard = {
-            templateId: llmTemplate.id,
-            name: llmTemplate.name,
-            installed: llmTemplate.installed,
-            installedDashboardIds: llmTemplate.installedDashboards.map(
-              (dashboard) => dashboard.id,
-            ),
-          };
-        }
       }
     } else if (nav?.view === "settings") {
       screen.page = "settings";

package/corpus/templates/analytics/app/components/ProviderCorpusJobNotifier.tsx

@@ -4,6 +4,7 @@ import { useNavigate } from "react-router";
 import { toast } from "sonner";
 
 import { useAuth } from "@/components/auth/AuthProvider";
+import { subscribeProviderCorpusJobSync } from "@/lib/provider-corpus-job-sync";
 
 type ProviderCorpusJobStatus =
   | "running"
@@ -41,23 +42,39 @@ type ProviderCorpusJobsResponse = {
 
 const STORAGE_KEY = "analytics.providerCorpusJobNotifier.seen.v1";
 const RECENT_WINDOW_MS = 24 * 60 * 60 * 1_000;
+const ACTIVE_JOB_POLL_MS = 15_000;
+
+export function providerCorpusJobsRefetchInterval(query: {
+  state: { data?: unknown };
+}): number | false {
+  const jobs = (query.state.data as ProviderCorpusJobsResponse | undefined)
+    ?.jobs;
+  return jobs?.some((entry) => entry.job.status === "running")
+    ? ACTIVE_JOB_POLL_MS
+    : false;
+}
 
 export function ProviderCorpusJobNotifier() {
   const { auth, isLoading } = useAuth();
   const t = useT();
   const navigate = useNavigate();
   const seenRef = useRef<Record<string, string> | null>(null);
-  const { data } = useActionQuery(
+  const { data, refetch } = useActionQuery(
     "provider-corpus-jobs",
     { operation: "list", limit: 20 },
     {
       enabled: Boolean(auth) && !isLoading,
-      refetchInterval: 15_000,
-      refetchIntervalInBackground: true,
+      refetchInterval: providerCorpusJobsRefetchInterval,
+      refetchIntervalInBackground: false,
       retry: false,
     },
   );
 
+  useEffect(() => {
+    if (!auth || isLoading) return;
+    return subscribeProviderCorpusJobSync(() => void refetch());
+  }, [auth, isLoading, refetch]);
+
   useEffect(() => {
     const jobs = (data as ProviderCorpusJobsResponse | undefined)?.jobs ?? [];
     if (!jobs.length) return;

package/corpus/templates/analytics/app/components/ResourceLoadError.tsx

@@ -0,0 +1,42 @@
+import { Button } from "@/components/ui/button";
+
+type ResourceLoadErrorProps = {
+  message: string;
+  retryLabel: string;
+  onRetry: () => void;
+  inline?: boolean;
+};
+
+export function ResourceLoadError({
+  message,
+  retryLabel,
+  onRetry,
+  inline = false,
+}: ResourceLoadErrorProps) {
+  if (inline) {
+    return (
+      <div className="px-2 py-2 text-xs 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>
+    );
+  }
+
+  return (
+    <div
+      className="flex h-64 flex-col items-center justify-center gap-2 text-sm text-destructive"
+      role="status"
+    >
+      <span>{message}</span>
+      <Button size="sm" variant="outline" onClick={onRetry}>
+        {retryLabel}
+      </Button>
+    </div>
+  );
+}

package/corpus/templates/analytics/app/components/dashboard/SqlChart.tsx

@@ -1004,6 +1004,7 @@ export function SqlChart({
   const {
     data: result,
     isLoading,
+    isFetching,
     error: queryError,
   } = useSqlQuery(
     ["sql-chart", panel.id, sql, panel.source],
@@ -1079,7 +1080,7 @@ export function SqlChart({
       : "min-h-[250px]";
   const placeholderPadY = isMetric ? "py-2" : "py-8";
 
-  if (!loadData || isLoading) {
+  if (!loadData || isLoading || isFetching) {
     return <SqlChartLoadingSkeleton panel={panel} />;
   }