chore: add ability to mark api stability as beta/alpha

2026-09-23 20:00:42 +01:00 · 2026-09-23 09:26:44 +05:30
80 changed files with 975 additions and 1355 deletions
--- a/docs/api/openapi.yml
+++ b/docs/api/openapi.yml
--- a/docs/contributing/go/handler.md
+++ b/docs/contributing/go/handler.md
@@ -179,6 +179,7 @@ The `handler.New` function ties the HTTP handler to OpenAPI metadata via `OpenAP
 - **SuccessStatusCode**: The HTTP status for successful responses (for example, `http.StatusOK`, `http.StatusCreated`, `http.StatusNoContent`).
 - **ErrorStatusCodes**: Additional error status codes beyond the standard ones automatically added by `handler.New`.
 - **SecuritySchemes**: Auth mechanisms and scopes required by the operation.
+- **Stability**: Maturity marker (`handler.StabilityAlpha`, `handler.StabilityBeta`, `handler.StabilityStable`) emitted as the `x-stability` extension on every operation. Unset is emitted as `stable`.

 The generic handler:

--- a/ee/query-service/app/api/featureFlags.go
+++ b/ee/query-service/app/api/featureFlags.go
@@ -80,6 +80,15 @@ func (ah *APIHandler) getFeatureFlags(w http.ResponseWriter, r *http.Request) {
 		Route:      "",
 	})

+	aiObservability := ah.Signoz.Flagger.BooleanOrEmpty(ctx, flagger.FeatureEnableAIObservability, evalCtx)
+	featureSet = append(featureSet, &licensetypes.Feature{
+		Name:       valuer.NewString(flagger.FeatureEnableAIObservability.String()),
+		Active:     aiObservability,
+		Usage:      0,
+		UsageLimit: -1,
+		Route:      "",
+	})
+
 	metricsReduction := ah.Signoz.Flagger.BooleanOrEmpty(ctx, flagger.FeatureEnableMetricsReduction, evalCtx)
 	featureSet = append(featureSet, &licensetypes.Feature{
 		Name:       valuer.NewString(flagger.FeatureEnableMetricsReduction.String()),
--- a/frontend/.storybook/preview.tsx
+++ b/frontend/.storybook/preview.tsx
@@ -1,7 +1,6 @@
 import type { Preview } from '@storybook/react-vite';
 import type { SetupWorker } from 'msw';
 import { setupWorker } from 'msw';
-import { configure } from 'storybook/test';

 import { settleForCapture } from '../src/storybook/visual/settleForCapture';
 import PageDocs from '../src/storybook/docs/PageDocs';
@@ -84,10 +83,6 @@ const translationsReady = i18n.loadNamespaces(
 	),
 );

-// testing-library's 1s default for `findBy*` and `waitFor` is shorter than a
-// popup or a query takes to land on a loaded CI runner.
-configure({ asyncUtilTimeout: 10_000 });
-
 const preview: Preview = {
 	parameters: {
 		layout: 'fullscreen',
--- a/frontend/.storybook/test-runner.ts
+++ b/frontend/.storybook/test-runner.ts
@@ -30,8 +30,6 @@ interface CapturedMessage {
 	text: string;
 }

-const PREPARE_TIMEOUT_MS = 180_000;
-
 const messagesByPage = new WeakMap<Page, CapturedMessage[]>();

 /**
@@ -54,15 +52,6 @@ const config: TestRunnerConfig = {
 	// msw logs every mocked request at `log`; keep it out of the failure dump
 	// unless the job is re-run with debug logging (GitHub sets RUNNER_DEBUG=1).
 	logLevel: process.env.RUNNER_DEBUG === '1' ? 'info' : 'warn',
-	// The runner's default prepare, minus Playwright's 30s navigation timeout: on
-	// a cold dev server the first load compiles the whole preview, which outlasts
-	// it on a shared CI runner.
-	async prepare({ page }): Promise<void> {
-		await page.goto(new URL('iframe.html', process.env.TARGET_URL).toString(), {
-			waitUntil: 'load',
-			timeout: PREPARE_TIMEOUT_MS,
-		});
-	},
 	async preVisit(page): Promise<void> {
 		const existing = messagesByPage.get(page);
 		if (existing) {
--- a/frontend/src/AppRoutes/Private.tsx
+++ b/frontend/src/AppRoutes/Private.tsx
@@ -8,6 +8,7 @@ import { ORG_PREFERENCES } from 'constants/orgPreferences';
 import ROUTES from 'constants/routes';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
+import { useIsAIObservabilityEnabled } from 'hooks/useIsAIObservabilityEnabled';
 import { isEmpty } from 'lodash-es';
 import { useAppContext } from 'providers/App/App';
 import { LicensePlatform, LicenseState } from 'types/api/licensesV3/getActive';
@@ -43,6 +44,7 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {

 	const isAdmin = user.role === USER_ROLES.ADMIN;
 	const isAIAssistantEnabled = useIsAIAssistantEnabled();
+	const isAIObservabilityEnabled = useIsAIObservabilityEnabled();
 	const mapRoutes = useMemo(
 		() =>
 			new Map(
@@ -133,6 +135,14 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 		return <Redirect to={ROUTES.HOME} />;
 	}

+	if (
+		(pathname.startsWith(`${ROUTES.AI_OBSERVABILITY_BASE}/`) ||
+			pathname === ROUTES.AI_OBSERVABILITY_BASE) &&
+		!isAIObservabilityEnabled
+	) {
+		return <Redirect to={ROUTES.HOME} />;
+	}
+
 	// Check for workspace access restriction (cloud only)
 	const isCloudPlatform = activeLicense?.platform === LicensePlatform.CLOUD;

--- a/frontend/src/assets/Logos/anthropic-api-monitoring.svg
+++ b/frontend/src/assets/Logos/anthropic-api-monitoring.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" id="Layer_1" xmlns:x="ns_extend;" xmlns:i="ns_ai;" xmlns:graph="ns_graphs;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 92.2 65" style="enable-background:new 0 0 92.2 65;" xml:space="preserve">
 <style type="text/css">
-  .st0{fill:#7A8291;}
+  .st0{fill:#FFFFFF;}
 </style>
 <metadata>
  <sfw xmlns="ns_sfw;">
--- a/frontend/src/assets/Logos/antigravity.svg
+++ b/frontend/src/assets/Logos/antigravity.svg
@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 16 15" xmlns="http://www.w3.org/2000/svg">
-	<path d="M14.0777 13.984C14.945 14.6345 16.2458 14.2008 15.0533 13.0084C11.476 9.53949 12.2349 0 7.79033 0C3.34579 0 4.10461 9.53949 0.527295 13.0084C-0.773543 14.3092 0.635692 14.6345 1.50293 13.984C4.86344 11.7076 4.64663 7.69664 7.79033 7.69664C10.934 7.69664 10.7172 11.7076 14.0777 13.984Z" fill="#4285F4" />
-</svg>
--- a/frontend/src/assets/Logos/aurora.svg
+++ b/frontend/src/assets/Logos/aurora.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><g fill="none" fill-rule="evenodd"><path fill="#c925d1" d="M0 0h64v64H0z"/><path fill="#fff" d="M36.213 16.011h-2.016v-2.005h2.016V12h2.017v2.006h2.016v2.005H38.23v2.006h-2.017zm9.074 8.023h-2.016v-2.006h2.016v-2.005h2.016v2.005h2.017v2.006h-2.017v2.006h-2.016v-2.006m-3.434 22.64c-1.495-3.292-4.482-6.263-7.792-7.75 3.31-1.487 6.297-4.459 7.792-7.75 1.494 3.291 4.482 6.263 7.791 7.75-3.31 1.487-6.297 4.458-7.79 7.75m12.139-8.753c-5.202 0-11.13-5.898-11.13-11.071 0-.555-.452-1.003-1.009-1.003s-1.008.448-1.008 1.003c0 5.173-5.93 11.071-11.13 11.071-.558 0-1.009.448-1.009 1.003s.45 1.003 1.008 1.003c5.202 0 11.13 5.898 11.13 11.07 0 .554.452 1.003 1.01 1.003.556 0 1.007-.45 1.007-1.003 0-5.172 5.93-11.07 11.13-11.07.558 0 1.009-.45 1.009-1.003 0-.555-.45-1.003-1.008-1.003m-31.39-19.904c6.85 0 10.587 1.988 10.587 3.008s-3.737 3.009-10.586 3.009-10.587-1.988-10.587-3.009 3.737-3.008 10.587-3.008m-.35 15.15c-5.012 0-8.62-1.063-10.236-2.19v-7.113c2.367 1.433 6.487 2.176 10.587 2.176s8.22-.743 10.586-2.176v6.484c-1.016 1.406-5.247 2.819-10.936 2.819M33.19 45.975c0 1.435-4.126 3.52-10.59 3.52-6.46 0-10.583-2.085-10.583-3.52v-4.407c2.258 1.354 6.014 2.192 10.276 2.192 2.942 0 5.786-.413 8.01-1.166l-.651-1.898c-2.019.682-4.633 1.058-7.359 1.058-5.39 0-9.252-1.402-10.276-2.76v-5.707c2.411 1.176 6.113 1.885 10.237 1.885 3.92 0 8.34-.725 10.936-2.269v2.162h2.016v-14.04c0-3.292-6.34-5.014-12.602-5.014S10 17.733 10 21.025v24.95c0 3.59 6.49 5.526 12.598 5.526 6.112 0 12.607-1.937 12.607-5.526v-2.887h-2.016z"/></g></svg>
--- a/frontend/src/assets/Logos/clickhouse.svg
+++ b/frontend/src/assets/Logos/clickhouse.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" id="Layer_1" xmlns:x="ns_extend;" xmlns:i="ns_ai;" xmlns:graph="ns_graphs;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50.6 50.6" style="enable-background:new 0 0 50.6 50.6;" xml:space="preserve">
 <style type="text/css">
-  .st0{fill:#7A8291;}
+  .st0{fill:#FFFFFF;}
 </style>
 <metadata>
  <sfw xmlns="ns_sfw;">
--- a/frontend/src/assets/Logos/cline.svg
+++ b/frontend/src/assets/Logos/cline.svg
@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path d="m23.365 13.556-1.442-2.895V8.994c0-2.764-2.218-5.002-4.954-5.002h-2.464c.178-.367.276-.779.276-1.213A2.77 2.77 0 0 0 12.018 0a2.77 2.77 0 0 0-2.763 2.779c0 .434.098.846.276 1.213H7.067c-2.736 0-4.954 2.238-4.954 5.002v1.667L.64 13.549c-.149.29-.149.636 0 .927l1.472 2.855v1.667C2.113 21.762 4.33 24 7.067 24h9.902c2.736 0 4.954-2.238 4.954-5.002V17.33l1.44-2.865c.143-.286.143-.622.002-.91m-12.854 2.36a2.27 2.27 0 0 1-2.261 2.273 2.27 2.27 0 0 1-2.261-2.273v-4.042A2.27 2.27 0 0 1 8.249 9.6a2.267 2.267 0 0 1 2.262 2.274zm7.285 0a2.27 2.27 0 0 1-2.26 2.273 2.27 2.27 0 0 1-2.262-2.273v-4.042A2.267 2.267 0 0 1 15.535 9.6a2.267 2.267 0 0 1 2.261 2.274z" fill="#7A8291" />
-</svg>
--- a/frontend/src/assets/Logos/confluent-kafka.svg
+++ b/frontend/src/assets/Logos/confluent-kafka.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" id="Layer_1" xmlns:x="ns_extend;" xmlns:i="ns_ai;" xmlns:graph="ns_graphs;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 43 43" style="enable-background:new 0 0 43 43;" xml:space="preserve">
 <style type="text/css">
-  .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#0074A2;}
+  .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
 </style>
 <metadata>
  <sfw xmlns="ns_sfw;">
--- a/frontend/src/assets/Logos/cursor.svg
+++ b/frontend/src/assets/Logos/cursor.svg
@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path d="M11.503.131 1.891 5.678a.84.84 0 0 0-.42.726v11.188c0 .3.162.575.42.724l9.609 5.55a1 1 0 0 0 .998 0l9.61-5.55a.84.84 0 0 0 .42-.724V6.404a.84.84 0 0 0-.42-.726L12.497.131a1.01 1.01 0 0 0-.996 0M2.657 6.338h18.55c.263 0 .43.287.297.515L12.23 22.918c-.062.107-.229.064-.229-.06V12.335a.59.59 0 0 0-.295-.51l-9.11-5.257c-.109-.063-.064-.23.061-.23" fill="#7A8291" />
-</svg>
--- a/frontend/src/assets/Logos/datadog.svg
+++ b/frontend/src/assets/Logos/datadog.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 800.5 907.77" style="enable-background:new 0 0 800.5 907.77;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#8B5CC7;}
+	.st0{fill:#FFFFFF;}
 </style>
 <path class="st0" d="M303.36,238.61c31.36-21.37,71.76-12.97,65-6.53c-12.89,12.28,4.26,8.65,6.11,31.31
 	c1.36,16.69-4.09,25.88-8.78,31.11c-9.79,1.28-21.69,3.67-36.02,8.33c-8.48,2.76-15.85,5.82-22.31,8.9
--- a/frontend/src/assets/Logos/daytona.svg
+++ b/frontend/src/assets/Logos/daytona.svg
@@ -1,10 +0,0 @@
-<svg role="img" viewBox="0 0 275 287" xmlns="http://www.w3.org/2000/svg">
-	<path d="M14.5584 193.736H114.275V227.925H14.5584V193.736Z" fill="#7A8291" />
-	<path d="M148.464 74.076H262.426V108.265H148.464V74.076Z" fill="#7A8291" />
-	<path d="M88.6338 84.6127L173.246 0L197.422 24.175L112.809 108.788L88.6338 84.6127Z" fill="#7A8291" />
-	<path d="M89.157 170.084L24.175 105.102L0 129.277L64.9819 194.259L89.157 170.084Z" fill="#7A8291" />
-	<path d="M174.629 217.911L106.133 286.407L81.9577 262.232L150.454 193.736L174.629 217.911Z" fill="#7A8291" />
-	<path d="M174.106 132.44L250.66 208.994L274.835 184.819L198.281 108.265L174.106 132.44Z" fill="#7A8291" />
-	<path d="M88.6338 48.434V131.057H54.4451L54.4451 48.434H88.6338Z" fill="#7A8291" />
-	<path d="M208.294 168.094V270.66H174.106V168.094H208.294Z" fill="#7A8291" />
-</svg>
--- a/frontend/src/assets/Logos/deno.svg
+++ b/frontend/src/assets/Logos/deno.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#7A8291" viewBox="0 0 24 24"><title>Deno</title><path d="M1.105 18.02A11.9 11.9 0 0 1 0 12.985q0-.698.078-1.376a12 12 0 0 1 .231-1.34A12 12 0 0 1 4.025 4.02a12 12 0 0 1 5.46-2.771 12 12 0 0 1 3.428-.23c1.452.112 2.825.477 4.077 1.05a12 12 0 0 1 2.78 1.774 12.02 12.02 0 0 1 4.053 7.078A12 12 0 0 1 24 12.985q0 .454-.036.914a12 12 0 0 1-.728 3.305 12 12 0 0 1-2.38 3.875c-1.33 1.357-3.02 1.962-4.43 1.936a4.4 4.4 0 0 1-2.724-1.024c-.99-.853-1.391-1.83-1.53-2.919a5 5 0 0 1 .128-1.518c.105-.38.37-1.116.76-1.437-.455-.197-1.04-.624-1.226-.829-.045-.05-.04-.13 0-.183a.155.155 0 0 1 .177-.053c.392.134.869.267 1.372.35.66.111 1.484.25 2.317.292 2.03.1 4.153-.813 4.812-2.627s.403-3.609-1.96-4.685-3.454-2.356-5.363-3.128c-1.247-.505-2.636-.205-4.06.582-3.838 2.121-7.277 8.822-5.69 15.032a.191.191 0 0 1-.315.19 12 12 0 0 1-1.25-1.634 12 12 0 0 1-.769-1.404M11.57 6.087c.649-.051 1.214.501 1.31 1.236.13.979-.228 1.99-1.41 2.013-1.01.02-1.315-.997-1.248-1.614.066-.616.574-1.575 1.35-1.635"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="#fff" viewBox="0 0 24 24"><title>Deno</title><path d="M1.105 18.02A11.9 11.9 0 0 1 0 12.985q0-.698.078-1.376a12 12 0 0 1 .231-1.34A12 12 0 0 1 4.025 4.02a12 12 0 0 1 5.46-2.771 12 12 0 0 1 3.428-.23c1.452.112 2.825.477 4.077 1.05a12 12 0 0 1 2.78 1.774 12.02 12.02 0 0 1 4.053 7.078A12 12 0 0 1 24 12.985q0 .454-.036.914a12 12 0 0 1-.728 3.305 12 12 0 0 1-2.38 3.875c-1.33 1.357-3.02 1.962-4.43 1.936a4.4 4.4 0 0 1-2.724-1.024c-.99-.853-1.391-1.83-1.53-2.919a5 5 0 0 1 .128-1.518c.105-.38.37-1.116.76-1.437-.455-.197-1.04-.624-1.226-.829-.045-.05-.04-.13 0-.183a.155.155 0 0 1 .177-.053c.392.134.869.267 1.372.35.66.111 1.484.25 2.317.292 2.03.1 4.153-.813 4.812-2.627s.403-3.609-1.96-4.685-3.454-2.356-5.363-3.128c-1.247-.505-2.636-.205-4.06.582-3.838 2.121-7.277 8.822-5.69 15.032a.191.191 0 0 1-.315.19 12 12 0 0 1-1.25-1.634 12 12 0 0 1-.769-1.404M11.57 6.087c.649-.051 1.214.501 1.31 1.236.13.979-.228 1.99-1.41 2.013-1.01.02-1.315-.997-1.248-1.614.066-.616.574-1.575 1.35-1.635"/></svg>
--- a/frontend/src/assets/Logos/document-load.svg
+++ b/frontend/src/assets/Logos/document-load.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" fill="#7A8291" viewBox="0 0 50 50"><path d="M7 2v46h36V14.594l-.281-.313-12-12L30.406 2Zm2 2h20v12h12v30H9Zm22 1.438L39.563 14H31ZM15 22v2h20v-2Zm0 6v2h16v-2Zm0 6v2h20v-2Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" fill="#FFF" viewBox="0 0 50 50"><path d="M7 2v46h36V14.594l-.281-.313-12-12L30.406 2Zm2 2h20v12h12v30H9Zm22 1.438L39.563 14H31ZM15 22v2h20v-2Zm0 6v2h16v-2Zm0 6v2h20v-2Z"/></svg>
--- a/frontend/src/assets/Logos/e2b.svg
+++ b/frontend/src/assets/Logos/e2b.svg
@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path d="M9 6h10v12H9a4 4 0 0 1-4-4v-4a4 4 0 0 1 4-4zm1.2 4.6h8.8v.9h-8.8zm0 3.6h8.8v.9h-8.8z" fill="#7A8291" fill-rule="evenodd" />
-</svg>
--- a/frontend/src/assets/Logos/emqx.svg
+++ b/frontend/src/assets/Logos/emqx.svg
@@ -1,5 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path d="M6.5 5.5h13a1.5 1.5 0 0 1 0 3h-13a1.5 1.5 0 0 1 0-3z" fill="#00B173" />
-	<path d="M4 10.5h10a1.5 1.5 0 0 1 0 3H4a1.5 1.5 0 0 1 0-3z" fill="#00B173" />
-	<path d="M6.5 15.5h13a1.5 1.5 0 0 1 0 3h-13a1.5 1.5 0 0 1 0-3z" fill="#00B173" />
-</svg>
--- a/frontend/src/assets/Logos/from-log-file.svg
+++ b/frontend/src/assets/Logos/from-log-file.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 115.28 122.88"><path d="M25.38 57h64.88V37.34H69.59c-2.17 0-5.19-1.17-6.62-2.6s-2.3-4.01-2.3-6.17V7.64H8.15c-.18 0-.32.09-.41.18-.15.1-.19.23-.19.42v106.45c0 .14.09.32.18.41.09.14.28.18.41.18h81.51c.18 0 .17-.09.27-.18.14-.09.33-.28.33-.41v-11.16H25.38c-4.14 0-7.56-3.4-7.56-7.56V64.55c0-4.15 3.4-7.55 7.56-7.55m4.11 11.38h7.43v18.15h11.63v5.92H29.49zm20.4 12.05c0-3.93 1.09-6.99 3.28-9.17 2.19-2.19 5.24-3.28 9.15-3.28 4.01 0 7.09 1.08 9.26 3.22 2.17 2.15 3.25 5.16 3.25 9.04 0 2.81-.47 5.11-1.42 6.91q-1.425 2.7-4.11 4.2t-6.69 1.5c-2.71 0-4.96-.43-6.74-1.29-1.78-.87-3.22-2.23-4.32-4.11-1.11-1.87-1.66-4.21-1.66-7.02m7.42.01c0 2.43.45 4.17 1.36 5.23s2.14 1.59 3.7 1.59c1.6 0 2.84-.52 3.71-1.56.88-1.04 1.32-2.9 1.32-5.6 0-2.26-.46-3.92-1.37-4.96-.92-1.05-2.16-1.57-3.73-1.57-1.5 0-2.71.53-3.62 1.59-.91 1.08-1.37 2.83-1.37 5.28m33.11 3.3v-5.01h11.49v10.23c-2.2 1.5-4.15 2.53-5.83 3.07-1.69.54-3.7.81-6.02.81-2.86 0-5.19-.49-6.99-1.46s-3.19-2.42-4.18-4.35c-.99-1.92-1.48-4.13-1.48-6.63 0-2.63.54-4.91 1.62-6.85s2.67-3.41 4.76-4.42c1.63-.78 3.83-1.17 6.58-1.17 2.66 0 4.64.24 5.96.72s2.41 1.23 3.28 2.24 1.52 2.3 1.96 3.85l-7.16 1.29c-.3-.91-.8-1.61-1.5-2.09-.71-.49-1.6-.73-2.7-.73-1.62 0-2.92.57-3.89 1.7s-1.45 2.92-1.45 5.37c0 2.6.49 4.46 1.47 5.57.97 1.11 2.34 1.68 4.09 1.68q1.245 0 2.37-.36c.75-.24 1.61-.65 2.59-1.22v-2.25h-4.97zM97.79 57h9.93c4.16 0 7.56 3.41 7.56 7.56v31.42c0 4.15-3.41 7.56-7.56 7.56h-9.93v13.55c0 1.61-.65 3.04-1.7 4.1a5.74 5.74 0 0 1-4.1 1.7H5.81a5.74 5.74 0 0 1-4.1-1.7 5.74 5.74 0 0 1-1.7-4.1V5.85c0-1.61.65-3.04 1.7-4.1a5.8 5.8 0 0 1 4.1-1.7h58.72c.13-.05.27-.05.41-.05.64 0 1.29.28 1.75.69h.09c.09.05.14.09.23.18L97 31.23c.51.51.88 1.2.88 1.98 0 .23-.05.41-.09.65zM67.52 27.97V8.94l21.43 21.7H70.19c-.74 0-1.38-.32-1.89-.78-.46-.46-.78-1.15-.78-1.89" style="fill:#7A8291;fill-rule:evenodd;clip-rule:evenodd"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 115.28 122.88"><path d="M25.38 57h64.88V37.34H69.59c-2.17 0-5.19-1.17-6.62-2.6s-2.3-4.01-2.3-6.17V7.64H8.15c-.18 0-.32.09-.41.18-.15.1-.19.23-.19.42v106.45c0 .14.09.32.18.41.09.14.28.18.41.18h81.51c.18 0 .17-.09.27-.18.14-.09.33-.28.33-.41v-11.16H25.38c-4.14 0-7.56-3.4-7.56-7.56V64.55c0-4.15 3.4-7.55 7.56-7.55m4.11 11.38h7.43v18.15h11.63v5.92H29.49zm20.4 12.05c0-3.93 1.09-6.99 3.28-9.17 2.19-2.19 5.24-3.28 9.15-3.28 4.01 0 7.09 1.08 9.26 3.22 2.17 2.15 3.25 5.16 3.25 9.04 0 2.81-.47 5.11-1.42 6.91q-1.425 2.7-4.11 4.2t-6.69 1.5c-2.71 0-4.96-.43-6.74-1.29-1.78-.87-3.22-2.23-4.32-4.11-1.11-1.87-1.66-4.21-1.66-7.02m7.42.01c0 2.43.45 4.17 1.36 5.23s2.14 1.59 3.7 1.59c1.6 0 2.84-.52 3.71-1.56.88-1.04 1.32-2.9 1.32-5.6 0-2.26-.46-3.92-1.37-4.96-.92-1.05-2.16-1.57-3.73-1.57-1.5 0-2.71.53-3.62 1.59-.91 1.08-1.37 2.83-1.37 5.28m33.11 3.3v-5.01h11.49v10.23c-2.2 1.5-4.15 2.53-5.83 3.07-1.69.54-3.7.81-6.02.81-2.86 0-5.19-.49-6.99-1.46s-3.19-2.42-4.18-4.35c-.99-1.92-1.48-4.13-1.48-6.63 0-2.63.54-4.91 1.62-6.85s2.67-3.41 4.76-4.42c1.63-.78 3.83-1.17 6.58-1.17 2.66 0 4.64.24 5.96.72s2.41 1.23 3.28 2.24 1.52 2.3 1.96 3.85l-7.16 1.29c-.3-.91-.8-1.61-1.5-2.09-.71-.49-1.6-.73-2.7-.73-1.62 0-2.92.57-3.89 1.7s-1.45 2.92-1.45 5.37c0 2.6.49 4.46 1.47 5.57.97 1.11 2.34 1.68 4.09 1.68q1.245 0 2.37-.36c.75-.24 1.61-.65 2.59-1.22v-2.25h-4.97zM97.79 57h9.93c4.16 0 7.56 3.41 7.56 7.56v31.42c0 4.15-3.41 7.56-7.56 7.56h-9.93v13.55c0 1.61-.65 3.04-1.7 4.1a5.74 5.74 0 0 1-4.1 1.7H5.81a5.74 5.74 0 0 1-4.1-1.7 5.74 5.74 0 0 1-1.7-4.1V5.85c0-1.61.65-3.04 1.7-4.1a5.8 5.8 0 0 1 4.1-1.7h58.72c.13-.05.27-.05.41-.05.64 0 1.29.28 1.75.69h.09c.09.05.14.09.23.18L97 31.23c.51.51.88 1.2.88 1.98 0 .23-.05.41-.09.65zM67.52 27.97V8.94l21.43 21.7H70.19c-.74 0-1.38-.32-1.89-.78-.46-.46-.78-1.15-.78-1.89" style="fill:#D1D5DB;fill-rule:evenodd;clip-rule:evenodd"/></svg>
--- a/frontend/src/assets/Logos/haystack.svg
+++ b/frontend/src/assets/Logos/haystack.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#0E9A89" viewBox="0 0 24 24"><title>Haystack</title><path d="M2.008 0C.9 0 0 .9 0 2.008v19.984C0 23.1.9 24 2.008 24h19.984C23.1 24 24 23.1 24 21.992V2.008C24 .9 23.1 0 21.992 0Zm9.963 3.84c3.43 0 6.21 2.763 6.21 6.17v6.488a.27.27 0 0 1-.27.268 2.423 2.423 0 0 1-2.43-2.414V10.01c0-1.927-1.572-3.488-3.51-3.488S8.547 8.085 8.547 10.01v1.608a.263.263 0 0 0 .259.268h1.54a.27.27 0 0 0 .275-.263V9.945c0-.74.604-1.341 1.35-1.341s1.35.6 1.35 1.341V20.03a.275.275 0 0 1-.28.268 2.41 2.41 0 0 1-2.42-2.404v-3.23a.275.275 0 0 0-.276-.269H8.811a.264.264 0 0 0-.264.263v1.08c0 1.333-1.175 2.414-2.517 2.414a.27.27 0 0 1-.27-.268v-7.872c0-3.408 2.78-6.171 6.21-6.171"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="#fff" viewBox="0 0 24 24"><title>Haystack</title><path d="M2.008 0C.9 0 0 .9 0 2.008v19.984C0 23.1.9 24 2.008 24h19.984C23.1 24 24 23.1 24 21.992V2.008C24 .9 23.1 0 21.992 0Zm9.963 3.84c3.43 0 6.21 2.763 6.21 6.17v6.488a.27.27 0 0 1-.27.268 2.423 2.423 0 0 1-2.43-2.414V10.01c0-1.927-1.572-3.488-3.51-3.488S8.547 8.085 8.547 10.01v1.608a.263.263 0 0 0 .259.268h1.54a.27.27 0 0 0 .275-.263V9.945c0-.74.604-1.341 1.35-1.341s1.35.6 1.35 1.341V20.03a.275.275 0 0 1-.28.268 2.41 2.41 0 0 1-2.42-2.404v-3.23a.275.275 0 0 0-.276-.269H8.811a.264.264 0 0 0-.264.263v1.08c0 1.333-1.175 2.414-2.517 2.414a.27.27 0 0 1-.27-.268v-7.872c0-3.408 2.78-6.171 6.21-6.171"/></svg>
--- a/frontend/src/assets/Logos/kafka.svg
+++ b/frontend/src/assets/Logos/kafka.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="154" height="250" preserveAspectRatio="xMidYMid" viewBox="0 0 256 416"><path d="M201.816 230.216c-16.186 0-30.697 7.171-40.634 18.461l-25.463-18.026c2.703-7.442 4.255-15.433 4.255-23.797 0-8.219-1.498-16.076-4.112-23.408l25.406-17.835c9.936 11.233 24.409 18.365 40.548 18.365 29.875 0 54.184-24.305 54.184-54.184s-24.309-54.184-54.184-54.184-54.184 24.305-54.184 54.184c0 5.348.808 10.505 2.258 15.389l-25.423 17.844c-10.62-13.175-25.911-22.374-43.333-25.182v-30.64c24.544-5.155 43.037-26.962 43.037-53.019C124.171 24.305 99.862 0 69.987 0S15.803 24.305 15.803 54.184c0 25.708 18.014 47.246 42.067 52.769v31.038C25.044 143.753 0 172.401 0 206.854c0 34.621 25.292 63.374 58.355 68.94v32.774c-24.299 5.341-42.552 27.011-42.552 52.894 0 29.879 24.309 54.184 54.184 54.184s54.184-24.305 54.184-54.184c0-25.883-18.253-47.553-42.552-52.894v-32.775a69.97 69.97 0 0 0 42.6-24.776l25.633 18.143c-1.423 4.84-2.22 9.946-2.22 15.24 0 29.879 24.309 54.184 54.184 54.184S256 314.279 256 284.4s-24.309-54.184-54.184-54.184m0-126.695c14.487 0 26.27 11.788 26.27 26.271s-11.783 26.27-26.27 26.27-26.27-11.787-26.27-26.27 11.783-26.271 26.27-26.271m-158.1-49.337c0-14.483 11.784-26.27 26.271-26.27s26.27 11.787 26.27 26.27-11.783 26.27-26.27 26.27-26.271-11.787-26.271-26.27m52.541 307.278c0 14.483-11.783 26.27-26.27 26.27s-26.271-11.787-26.271-26.27 11.784-26.27 26.271-26.27 26.27 11.787 26.27 26.27m-26.272-117.97c-20.205 0-36.642-16.434-36.642-36.638 0-20.205 16.437-36.642 36.642-36.642 20.204 0 36.641 16.437 36.641 36.642 0 20.204-16.437 36.638-36.641 36.638m131.831 67.179c-14.487 0-26.27-11.788-26.27-26.271s11.783-26.27 26.27-26.27 26.27 11.787 26.27 26.27-11.783 26.271-26.27 26.271" style="fill:#7A8291"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="154" height="250" preserveAspectRatio="xMidYMid" viewBox="0 0 256 416"><path d="M201.816 230.216c-16.186 0-30.697 7.171-40.634 18.461l-25.463-18.026c2.703-7.442 4.255-15.433 4.255-23.797 0-8.219-1.498-16.076-4.112-23.408l25.406-17.835c9.936 11.233 24.409 18.365 40.548 18.365 29.875 0 54.184-24.305 54.184-54.184s-24.309-54.184-54.184-54.184-54.184 24.305-54.184 54.184c0 5.348.808 10.505 2.258 15.389l-25.423 17.844c-10.62-13.175-25.911-22.374-43.333-25.182v-30.64c24.544-5.155 43.037-26.962 43.037-53.019C124.171 24.305 99.862 0 69.987 0S15.803 24.305 15.803 54.184c0 25.708 18.014 47.246 42.067 52.769v31.038C25.044 143.753 0 172.401 0 206.854c0 34.621 25.292 63.374 58.355 68.94v32.774c-24.299 5.341-42.552 27.011-42.552 52.894 0 29.879 24.309 54.184 54.184 54.184s54.184-24.305 54.184-54.184c0-25.883-18.253-47.553-42.552-52.894v-32.775a69.97 69.97 0 0 0 42.6-24.776l25.633 18.143c-1.423 4.84-2.22 9.946-2.22 15.24 0 29.879 24.309 54.184 54.184 54.184S256 314.279 256 284.4s-24.309-54.184-54.184-54.184m0-126.695c14.487 0 26.27 11.788 26.27 26.271s-11.783 26.27-26.27 26.27-26.27-11.787-26.27-26.27 11.783-26.271 26.27-26.271m-158.1-49.337c0-14.483 11.784-26.27 26.271-26.27s26.27 11.787 26.27 26.27-11.783 26.27-26.27 26.27-26.271-11.787-26.271-26.27m52.541 307.278c0 14.483-11.783 26.27-26.27 26.27s-26.271-11.787-26.271-26.27 11.784-26.27 26.271-26.27 26.27 11.787 26.27 26.27m-26.272-117.97c-20.205 0-36.642-16.434-36.642-36.638 0-20.205 16.437-36.642 36.642-36.642 20.204 0 36.641 16.437 36.641 36.642 0 20.204-16.437 36.638-36.641 36.638m131.831 67.179c-14.487 0-26.27-11.788-26.27-26.271s11.783-26.27 26.27-26.27 26.27 11.787 26.27 26.27-11.783 26.271-26.27 26.271" style="fill:#fff"/></svg>
--- a/frontend/src/assets/Logos/karpenter.svg
+++ b/frontend/src/assets/Logos/karpenter.svg
@@ -1,5 +0,0 @@
-<svg role="img" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
-	<g transform="translate(2.1186441,37.661017)">
-		<path d="m 237.70492,0 c 76.95771,0 139.34426,62.386551 139.34426,139.34426 v 0 l -1.8e-4,197.00774 65.57395,-1.5e-4 c 31.68847,0 57.37705,25.68858 57.37705,57.37705 v 0 V 443 h -7.54607 c -18.22527,0 -33.09496,-14.59276 -33.43754,-32.81482 v 0 -8.22465 l -0.003,-0.40664 c -0.21715,-13.39321 -11.14191,-24.18352 -24.58687,-24.18352 v 0 H 106.55738 C 47.707363,377.37037 0,329.66301 0,270.81299 v 0 -131.46873 C 0,62.386551 62.386551,0 139.34426,0 v 0 z m -8.19672,41.018518 h -81.96722 l -1.76212,0.01428 C 87.741593,41.97378 40.983607,89.314381 40.983607,147.5759 v 0 123.20218 l 0.0088,1.08438 c 0.579068,35.71525 29.711746,64.48939 65.564993,64.48939 v 0 h 163.9344 c 36.2154,0 65.57377,-29.35838 65.57377,-65.57377 v 0 -123.20218 l -0.0143,-1.76213 C 335.11031,87.776505 287.76971,41.018518 229.5082,41.018518 Z m -81.63935,65.629632 c 9.34426,0 16.72131,7.62944 16.72131,17.22778 v 0 49.96055 l 56.80328,-58.57444 c 7.37705,-6.89111 17.45902,-7.38334 24.59017,-0.73834 v 0 0.24611 c 6.88524,6.39889 6.39344,16.98167 -1.22951,23.87278 v 0 l -42.04918,43.31556 48.93442,69.89555 c 5.90164,8.61389 4.18033,19.44278 -3.68852,24.61111 -8.60656,4.92223 -18.44262,2.21501 -24.34426,-6.39888 v 0 l -44.0164,-64.48112 -15,15.75112 v 40.36222 c 0,9.84444 -7.37705,17.22778 -16.72131,17.22778 -9.34426,0 -16.72131,-7.38334 -16.72131,-17.22778 v 0 -137.82222 c 0,-9.59834 7.37705,-17.22778 16.72131,-17.22778 z" fill="#5C62B0" fill-rule="evenodd" />
-	</g>
-</svg>
--- a/frontend/src/assets/Logos/langchain.svg
+++ b/frontend/src/assets/Logos/langchain.svg
@@ -1 +1 @@
-<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>LangChain</title><path d="M8.373 14.502c.013-.06.024-.118.038-.17l.061.145c.115.28.229.557.506.714-.012.254-.334.357-.552.326-.048-.114-.115-.228-.255-.164-.143.056-.3-.01-.266-.185.333-.012.407-.371.468-.666zM18.385 9.245c-.318 0-.616.122-.839.342l-.902.887c-.243.24-.368.572-.343.913l.006.056c.032.262.149.498.337.682.13.128.273.21.447.266a.866.866 0 01-.247.777l-.056.055a2.022 2.022 0 01-1.355-1.555l-.01-.057-.046.037c-.03.024-.06.05-.088.078l-.902.887a1.156 1.156 0 000 1.65c.231.228.535.342.84.342.304 0 .607-.114.838-.341l.902-.888a1.156 1.156 0 00-.436-1.921.953.953 0 01.276-.842 2.062 2.062 0 011.371 1.57l.01.057.047-.037c.03-.024.06-.05.088-.078l.902-.888a1.155 1.155 0 000-1.65 1.188 1.188 0 00-.84-.342z" fill="#3B8686"></path><path clip-rule="evenodd" d="M17.901 6H6.1C2.736 6 0 8.692 0 12s2.736 6 6.099 6H17.9C21.264 18 24 15.308 24 12s-2.736-6-6.099-6zm-5.821 9.407c-.195.04-.414.047-.562-.106-.045.1-.136.077-.221.056a.797.797 0 00-.061-.014c-.01.025-.017.048-.026.073-.329.021-.575-.309-.732-.558a4.991 4.991 0 00-.473-.21c-.172-.07-.345-.14-.509-.23a2.218 2.218 0 00-.004.173c-.002.244-.004.503-.227.651-.007.295.236.292.476.29.207-.003.41-.005.447.184a.485.485 0 01-.05.003c-.046 0-.092 0-.127.034-.117.111-.242.063-.372.013-.12-.046-.243-.094-.367-.02a2.318 2.318 0 00-.262.154.97.97 0 01-.548.194c-.024-.036-.014-.059.006-.08a.562.562 0 00.043-.056c.019-.028.035-.057.051-.084.054-.095.103-.18.242-.22-.185-.029-.344.055-.5.137l-.004.002a4.21 4.21 0 01-.065.034c-.097.04-.154.009-.212-.023-.082-.045-.168-.092-.376.04-.04-.032-.02-.061.002-.086.091-.109.21-.125.345-.119-.351-.193-.604-.056-.81.055-.182.098-.327.176-.471-.012-.065.017-.102.063-.138.108-.015.02-.03.038-.047.055-.035-.039-.027-.083-.018-.128l.005-.026a.242.242 0 00.003-.03l-.027-.01c-.053-.022-.105-.044-.09-.124-.117-.04-.2.03-.286.094-.054-.041-.01-.095.032-.145a.279.279 0 00.045-.065c.038-.065.103-.067.166-.069.054-.001.108-.003.145-.042.133-.075.297-.036.462.003.121.028.242.057.354.042.203.025.454-.18.352-.385-.186-.233-.184-.528-.183-.813v-.143c-.016-.108-.172-.233-.328-.358-.12-.095-.24-.191-.298-.28-.16-.177-.285-.382-.409-.585l-.015-.024c-.212-.404-.297-.86-.382-1.315-.103-.546-.205-1.09-.526-1.54-.266.144-.612.075-.841-.118-.12.107-.13.247-.138.396l-.001.014c-.297-.292-.26-.844-.023-1.17.097-.128.213-.233.342-.326.03-.021.04-.042.039-.074.235-1.04 1.836-.839 2.342-.103.167.206.281.442.395.678.137.283.273.566.5.795.22.237.452.463.684.689.359.35.718.699 1.032 1.089.49.587.839 1.276 1.144 1.97.05.092.08.193.11.293.044.15.089.299.2.417.026.035.084.088.149.148.156.143.357.328.289.409.009.019.027.04.05.06.032.028.074.058.116.088.122.087.25.178.16.25zm7.778-3.545l-.902.887c-.24.237-.537.413-.859.51l-.017.005-.006.015A2.021 2.021 0 0117.6 14l-.902.888c-.393.387-.916.6-1.474.6-.557 0-1.08-.213-1.474-.6a2.03 2.03 0 010-2.9l.902-.888c.242-.238.531-.409.859-.508l.016-.004.006-.016c.105-.272.265-.516.475-.724l.902-.887c.393-.387.917-.6 1.474-.6.558 0 1.08.213 1.474.6.394.387.61.902.61 1.45 0 .549-.216 1.064-.61 1.45v.001z" fill="#3B8686" fill-rule="evenodd"></path></svg>
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>LangChain</title><path d="M8.373 14.502c.013-.06.024-.118.038-.17l.061.145c.115.28.229.557.506.714-.012.254-.334.357-.552.326-.048-.114-.115-.228-.255-.164-.143.056-.3-.01-.266-.185.333-.012.407-.371.468-.666zM18.385 9.245c-.318 0-.616.122-.839.342l-.902.887c-.243.24-.368.572-.343.913l.006.056c.032.262.149.498.337.682.13.128.273.21.447.266a.866.866 0 01-.247.777l-.056.055a2.022 2.022 0 01-1.355-1.555l-.01-.057-.046.037c-.03.024-.06.05-.088.078l-.902.887a1.156 1.156 0 000 1.65c.231.228.535.342.84.342.304 0 .607-.114.838-.341l.902-.888a1.156 1.156 0 00-.436-1.921.953.953 0 01.276-.842 2.062 2.062 0 011.371 1.57l.01.057.047-.037c.03-.024.06-.05.088-.078l.902-.888a1.155 1.155 0 000-1.65 1.188 1.188 0 00-.84-.342z" fill="#1C3C3C"></path><path clip-rule="evenodd" d="M17.901 6H6.1C2.736 6 0 8.692 0 12s2.736 6 6.099 6H17.9C21.264 18 24 15.308 24 12s-2.736-6-6.099-6zm-5.821 9.407c-.195.04-.414.047-.562-.106-.045.1-.136.077-.221.056a.797.797 0 00-.061-.014c-.01.025-.017.048-.026.073-.329.021-.575-.309-.732-.558a4.991 4.991 0 00-.473-.21c-.172-.07-.345-.14-.509-.23a2.218 2.218 0 00-.004.173c-.002.244-.004.503-.227.651-.007.295.236.292.476.29.207-.003.41-.005.447.184a.485.485 0 01-.05.003c-.046 0-.092 0-.127.034-.117.111-.242.063-.372.013-.12-.046-.243-.094-.367-.02a2.318 2.318 0 00-.262.154.97.97 0 01-.548.194c-.024-.036-.014-.059.006-.08a.562.562 0 00.043-.056c.019-.028.035-.057.051-.084.054-.095.103-.18.242-.22-.185-.029-.344.055-.5.137l-.004.002a4.21 4.21 0 01-.065.034c-.097.04-.154.009-.212-.023-.082-.045-.168-.092-.376.04-.04-.032-.02-.061.002-.086.091-.109.21-.125.345-.119-.351-.193-.604-.056-.81.055-.182.098-.327.176-.471-.012-.065.017-.102.063-.138.108-.015.02-.03.038-.047.055-.035-.039-.027-.083-.018-.128l.005-.026a.242.242 0 00.003-.03l-.027-.01c-.053-.022-.105-.044-.09-.124-.117-.04-.2.03-.286.094-.054-.041-.01-.095.032-.145a.279.279 0 00.045-.065c.038-.065.103-.067.166-.069.054-.001.108-.003.145-.042.133-.075.297-.036.462.003.121.028.242.057.354.042.203.025.454-.18.352-.385-.186-.233-.184-.528-.183-.813v-.143c-.016-.108-.172-.233-.328-.358-.12-.095-.24-.191-.298-.28-.16-.177-.285-.382-.409-.585l-.015-.024c-.212-.404-.297-.86-.382-1.315-.103-.546-.205-1.09-.526-1.54-.266.144-.612.075-.841-.118-.12.107-.13.247-.138.396l-.001.014c-.297-.292-.26-.844-.023-1.17.097-.128.213-.233.342-.326.03-.021.04-.042.039-.074.235-1.04 1.836-.839 2.342-.103.167.206.281.442.395.678.137.283.273.566.5.795.22.237.452.463.684.689.359.35.718.699 1.032 1.089.49.587.839 1.276 1.144 1.97.05.092.08.193.11.293.044.15.089.299.2.417.026.035.084.088.149.148.156.143.357.328.289.409.009.019.027.04.05.06.032.028.074.058.116.088.122.087.25.178.16.25zm7.778-3.545l-.902.887c-.24.237-.537.413-.859.51l-.017.005-.006.015A2.021 2.021 0 0117.6 14l-.902.888c-.393.387-.916.6-1.474.6-.557 0-1.08-.213-1.474-.6a2.03 2.03 0 010-2.9l.902-.888c.242-.238.531-.409.859-.508l.016-.004.006-.016c.105-.272.265-.516.475-.724l.902-.887c.393-.387.917-.6 1.474-.6.558 0 1.08.213 1.474.6.394.387.61.902.61 1.45 0 .549-.216 1.064-.61 1.45v.001z" fill="#1C3C3C" fill-rule="evenodd"></path></svg>
--- a/frontend/src/assets/Logos/meta.svg
+++ b/frontend/src/assets/Logos/meta.svg
@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path d="M6.915 4.03c-1.968 0-3.683 1.28-4.871 3.113C.704 9.208 0 11.883 0 14.449c0 .706.07 1.369.21 1.973a6.624 6.624 0 0 0 .265.86 5.297 5.297 0 0 0 .371.761c.696 1.159 1.818 1.927 3.593 1.927 1.497 0 2.633-.671 3.965-2.444.76-1.012 1.144-1.626 2.663-4.32l.756-1.339.186-.325c.061.1.121.196.183.3l2.152 3.595c.724 1.21 1.665 2.556 2.47 3.314 1.046.987 1.992 1.22 3.06 1.22 1.075 0 1.876-.355 2.455-.843a3.743 3.743 0 0 0 .81-.973c.542-.939.861-2.127.861-3.745 0-2.72-.681-5.357-2.084-7.45-1.282-1.912-2.957-2.93-4.716-2.93-1.047 0-2.088.467-3.053 1.308-.652.57-1.257 1.29-1.82 2.05-.69-.875-1.335-1.547-1.958-2.056-1.182-.966-2.315-1.303-3.454-1.303zm10.16 2.053c1.147 0 2.188.758 2.992 1.999 1.132 1.748 1.647 4.195 1.647 6.4 0 1.548-.368 2.9-1.839 2.9-.58 0-1.027-.23-1.664-1.004-.496-.601-1.343-1.878-2.832-4.358l-.617-1.028a44.908 44.908 0 0 0-1.255-1.98c.07-.109.141-.224.211-.327 1.12-1.667 2.118-2.602 3.358-2.602zm-10.201.553c1.265 0 2.058.791 2.675 1.446.307.327.737.871 1.234 1.579l-1.02 1.566c-.757 1.163-1.882 3.017-2.837 4.338-1.191 1.649-1.81 1.817-2.486 1.817-.524 0-1.038-.237-1.383-.794-.263-.426-.464-1.13-.464-2.046 0-2.221.63-4.535 1.66-6.088.454-.687.964-1.226 1.533-1.533a2.264 2.264 0 0 1 1.088-.285z" fill="#0467DF" />
-</svg>
--- a/frontend/src/assets/Logos/modal.svg
+++ b/frontend/src/assets/Logos/modal.svg
@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path d="M4.89 5.57 0 14.002l2.521 4.4h5.05l4.396-7.718 4.512 7.709 4.996.037L24 14.057l-4.857-8.452-5.073-.015-2.076 3.598L9.94 5.57Zm.837.729h3.787l1.845 3.252H7.572Zm9.189.021 3.803.012 4.228 7.355-3.736-.027zm-9.82.346L6.94 9.914l-4.209 7.389-1.892-3.3Zm9.187.014 4.297 7.343-1.892 3.282-4.3-7.344zm-6.713 3.6h3.79l-4.212 7.394H3.361Zm11.64 4.109 3.74.027-1.893 3.281-3.74-.027z" fill="#3E9C2A" />
-</svg>
--- a/frontend/src/assets/Logos/ollama.svg
+++ b/frontend/src/assets/Logos/ollama.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#7A8291" viewBox="0 0 24 24"><title>Ollama</title><path d="M16.361 10.26a.9.9 0 0 0-.558.47l-.072.148.001.207c0 .193.004.217.059.353.076.193.152.312.291.448.24.238.51.3.872.205a.86.86 0 0 0 .517-.436.75.75 0 0 0 .08-.498c-.064-.453-.33-.782-.724-.897a1.1 1.1 0 0 0-.466 0m-9.203.005c-.305.096-.533.32-.65.639a1.2 1.2 0 0 0-.06.52c.057.309.31.59.598.667.362.095.632.033.872-.205.14-.136.215-.255.291-.448.055-.136.059-.16.059-.353l.001-.207-.072-.148a.9.9 0 0 0-.565-.472 1 1 0 0 0-.474.007m4.184 2c-.131.071-.223.25-.195.383.031.143.157.288.353.407.105.063.112.072.117.136.004.038-.01.146-.029.243-.02.094-.036.194-.036.222.002.074.07.195.143.253.064.052.076.054.255.059.164.005.198.001.264-.03.169-.082.212-.234.15-.525-.052-.243-.042-.28.087-.355.137-.08.281-.219.324-.314a.365.365 0 0 0-.175-.48.4.4 0 0 0-.181-.033c-.126 0-.207.03-.355.124l-.085.053-.053-.032c-.219-.13-.259-.145-.391-.143a.4.4 0 0 0-.193.032m.39-2.195c-.373.036-.475.05-.654.086a4.5 4.5 0 0 0-.951.328c-.94.46-1.589 1.226-1.787 2.114-.04.176-.045.234-.045.53 0 .294.005.357.043.524.264 1.16 1.332 2.017 2.714 2.173.3.033 1.596.033 1.896 0 1.11-.125 2.064-.727 2.493-1.571.114-.226.169-.372.22-.602.039-.167.044-.23.044-.523 0-.297-.005-.355-.045-.531-.288-1.29-1.539-2.304-3.072-2.497a7 7 0 0 0-.855-.031zm.645.937a3.3 3.3 0 0 1 1.44.514c.223.148.537.458.671.662.166.251.26.508.303.82.02.143.01.251-.043.482-.08.345-.332.705-.672.957a3 3 0 0 1-.689.348c-.382.122-.632.144-1.525.138-.582-.006-.686-.01-.853-.042q-.856-.16-1.35-.68c-.264-.28-.385-.535-.45-.946-.03-.192.025-.509.137-.776.136-.326.488-.73.836-.963.403-.269.934-.46 1.422-.512.187-.02.586-.02.773-.002m-5.503-11a1.65 1.65 0 0 0-.683.298C5.617.74 5.173 1.666 4.985 2.819c-.07.436-.119 1.04-.119 1.503 0 .544.064 1.24.155 1.721.02.107.031.202.023.208l-.187.152a5.3 5.3 0 0 0-.949 1.02 5.5 5.5 0 0 0-.94 2.339 6.6 6.6 0 0 0-.023 1.357c.091.78.325 1.438.727 2.04l.13.195-.037.064c-.269.452-.498 1.105-.605 1.732-.084.496-.095.629-.095 1.294 0 .67.009.803.088 1.266.095.555.288 1.143.503 1.534.071.128.243.393.264.407.007.003-.014.067-.046.141a7.4 7.4 0 0 0-.548 1.873 5 5 0 0 0-.071.991c0 .56.031.832.148 1.279L3.42 24h1.478l-.05-.091c-.297-.552-.325-1.575-.068-2.597.117-.472.25-.819.498-1.296l.148-.29v-.177c0-.165-.003-.184-.057-.293a.9.9 0 0 0-.194-.25 1.7 1.7 0 0 1-.385-.543c-.424-.92-.506-2.286-.208-3.451.124-.486.329-.918.544-1.154a.8.8 0 0 0 .223-.531c0-.195-.07-.355-.224-.522a3.14 3.14 0 0 1-.817-1.729c-.14-.96.114-2.005.69-2.834.563-.814 1.353-1.336 2.237-1.475.199-.033.57-.028.776.01.226.04.367.028.512-.041.179-.085.268-.19.374-.431.093-.215.165-.333.36-.576.234-.29.46-.489.822-.729.413-.27.884-.467 1.352-.561.17-.035.25-.04.569-.04s.398.005.569.04a4.07 4.07 0 0 1 1.914.997c.117.109.398.457.488.602.034.057.095.177.132.267.105.241.195.346.374.43.14.068.286.082.503.045.343-.058.607-.053.943.016 1.144.23 2.14 1.173 2.581 2.437.385 1.108.276 2.267-.296 3.153-.097.15-.193.27-.333.419-.301.322-.301.722-.001 1.053.493.539.801 1.866.708 3.036-.062.772-.26 1.463-.533 1.854a2 2 0 0 1-.224.258.9.9 0 0 0-.194.25c-.054.109-.057.128-.057.293v.178l.148.29c.248.476.38.823.498 1.295.253 1.008.231 2.01-.059 2.581a1 1 0 0 0-.044.098c0 .006.329.009.732.009h.73l.02-.074.036-.134c.019-.076.057-.3.088-.516a9 9 0 0 0 0-1.258c-.11-.875-.295-1.57-.597-2.226-.032-.074-.053-.138-.046-.141a1.4 1.4 0 0 0 .108-.152c.376-.569.607-1.284.724-2.228.031-.26.031-1.378 0-1.628-.083-.645-.182-1.082-.348-1.525a6 6 0 0 0-.329-.7l-.038-.064.131-.194c.402-.604.636-1.262.727-2.04a6.6 6.6 0 0 0-.024-1.358 5.5 5.5 0 0 0-.939-2.339 5.3 5.3 0 0 0-.95-1.02l-.186-.152a.7.7 0 0 1 .023-.208c.208-1.087.201-2.443-.017-3.503-.19-.924-.535-1.658-.98-2.082-.354-.338-.716-.482-1.15-.455-.996.059-1.8 1.205-2.116 3.01a7 7 0 0 0-.097.726c0 .036-.007.066-.015.066a1 1 0 0 1-.149-.078A4.86 4.86 0 0 0 12 3.03c-.832 0-1.687.243-2.456.698a1 1 0 0 1-.148.078c-.008 0-.015-.03-.015-.066a7 7 0 0 0-.097-.725C8.997 1.392 8.337.319 7.46.048a2 2 0 0 0-.585-.041Zm.293 1.402c.248.197.523.759.682 1.388.03.113.06.244.069.292.007.047.026.152.041.233.067.365.098.76.102 1.24l.002.475-.12.175-.118.178h-.278c-.324 0-.646.041-.954.124l-.238.06c-.033.007-.038-.003-.057-.144a8.4 8.4 0 0 1 .016-2.323c.124-.788.413-1.501.696-1.711.067-.05.079-.049.157.013m9.825-.012c.17.126.358.46.498.888.28.854.36 2.028.212 3.145-.019.14-.024.151-.057.144l-.238-.06a3.7 3.7 0 0 0-.954-.124h-.278l-.119-.178-.119-.175.002-.474c.004-.669.066-1.19.214-1.772.157-.623.434-1.185.68-1.382.078-.062.09-.063.159-.012"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="#fff" viewBox="0 0 24 24"><title>Ollama</title><path d="M16.361 10.26a.9.9 0 0 0-.558.47l-.072.148.001.207c0 .193.004.217.059.353.076.193.152.312.291.448.24.238.51.3.872.205a.86.86 0 0 0 .517-.436.75.75 0 0 0 .08-.498c-.064-.453-.33-.782-.724-.897a1.1 1.1 0 0 0-.466 0m-9.203.005c-.305.096-.533.32-.65.639a1.2 1.2 0 0 0-.06.52c.057.309.31.59.598.667.362.095.632.033.872-.205.14-.136.215-.255.291-.448.055-.136.059-.16.059-.353l.001-.207-.072-.148a.9.9 0 0 0-.565-.472 1 1 0 0 0-.474.007m4.184 2c-.131.071-.223.25-.195.383.031.143.157.288.353.407.105.063.112.072.117.136.004.038-.01.146-.029.243-.02.094-.036.194-.036.222.002.074.07.195.143.253.064.052.076.054.255.059.164.005.198.001.264-.03.169-.082.212-.234.15-.525-.052-.243-.042-.28.087-.355.137-.08.281-.219.324-.314a.365.365 0 0 0-.175-.48.4.4 0 0 0-.181-.033c-.126 0-.207.03-.355.124l-.085.053-.053-.032c-.219-.13-.259-.145-.391-.143a.4.4 0 0 0-.193.032m.39-2.195c-.373.036-.475.05-.654.086a4.5 4.5 0 0 0-.951.328c-.94.46-1.589 1.226-1.787 2.114-.04.176-.045.234-.045.53 0 .294.005.357.043.524.264 1.16 1.332 2.017 2.714 2.173.3.033 1.596.033 1.896 0 1.11-.125 2.064-.727 2.493-1.571.114-.226.169-.372.22-.602.039-.167.044-.23.044-.523 0-.297-.005-.355-.045-.531-.288-1.29-1.539-2.304-3.072-2.497a7 7 0 0 0-.855-.031zm.645.937a3.3 3.3 0 0 1 1.44.514c.223.148.537.458.671.662.166.251.26.508.303.82.02.143.01.251-.043.482-.08.345-.332.705-.672.957a3 3 0 0 1-.689.348c-.382.122-.632.144-1.525.138-.582-.006-.686-.01-.853-.042q-.856-.16-1.35-.68c-.264-.28-.385-.535-.45-.946-.03-.192.025-.509.137-.776.136-.326.488-.73.836-.963.403-.269.934-.46 1.422-.512.187-.02.586-.02.773-.002m-5.503-11a1.65 1.65 0 0 0-.683.298C5.617.74 5.173 1.666 4.985 2.819c-.07.436-.119 1.04-.119 1.503 0 .544.064 1.24.155 1.721.02.107.031.202.023.208l-.187.152a5.3 5.3 0 0 0-.949 1.02 5.5 5.5 0 0 0-.94 2.339 6.6 6.6 0 0 0-.023 1.357c.091.78.325 1.438.727 2.04l.13.195-.037.064c-.269.452-.498 1.105-.605 1.732-.084.496-.095.629-.095 1.294 0 .67.009.803.088 1.266.095.555.288 1.143.503 1.534.071.128.243.393.264.407.007.003-.014.067-.046.141a7.4 7.4 0 0 0-.548 1.873 5 5 0 0 0-.071.991c0 .56.031.832.148 1.279L3.42 24h1.478l-.05-.091c-.297-.552-.325-1.575-.068-2.597.117-.472.25-.819.498-1.296l.148-.29v-.177c0-.165-.003-.184-.057-.293a.9.9 0 0 0-.194-.25 1.7 1.7 0 0 1-.385-.543c-.424-.92-.506-2.286-.208-3.451.124-.486.329-.918.544-1.154a.8.8 0 0 0 .223-.531c0-.195-.07-.355-.224-.522a3.14 3.14 0 0 1-.817-1.729c-.14-.96.114-2.005.69-2.834.563-.814 1.353-1.336 2.237-1.475.199-.033.57-.028.776.01.226.04.367.028.512-.041.179-.085.268-.19.374-.431.093-.215.165-.333.36-.576.234-.29.46-.489.822-.729.413-.27.884-.467 1.352-.561.17-.035.25-.04.569-.04s.398.005.569.04a4.07 4.07 0 0 1 1.914.997c.117.109.398.457.488.602.034.057.095.177.132.267.105.241.195.346.374.43.14.068.286.082.503.045.343-.058.607-.053.943.016 1.144.23 2.14 1.173 2.581 2.437.385 1.108.276 2.267-.296 3.153-.097.15-.193.27-.333.419-.301.322-.301.722-.001 1.053.493.539.801 1.866.708 3.036-.062.772-.26 1.463-.533 1.854a2 2 0 0 1-.224.258.9.9 0 0 0-.194.25c-.054.109-.057.128-.057.293v.178l.148.29c.248.476.38.823.498 1.295.253 1.008.231 2.01-.059 2.581a1 1 0 0 0-.044.098c0 .006.329.009.732.009h.73l.02-.074.036-.134c.019-.076.057-.3.088-.516a9 9 0 0 0 0-1.258c-.11-.875-.295-1.57-.597-2.226-.032-.074-.053-.138-.046-.141a1.4 1.4 0 0 0 .108-.152c.376-.569.607-1.284.724-2.228.031-.26.031-1.378 0-1.628-.083-.645-.182-1.082-.348-1.525a6 6 0 0 0-.329-.7l-.038-.064.131-.194c.402-.604.636-1.262.727-2.04a6.6 6.6 0 0 0-.024-1.358 5.5 5.5 0 0 0-.939-2.339 5.3 5.3 0 0 0-.95-1.02l-.186-.152a.7.7 0 0 1 .023-.208c.208-1.087.201-2.443-.017-3.503-.19-.924-.535-1.658-.98-2.082-.354-.338-.716-.482-1.15-.455-.996.059-1.8 1.205-2.116 3.01a7 7 0 0 0-.097.726c0 .036-.007.066-.015.066a1 1 0 0 1-.149-.078A4.86 4.86 0 0 0 12 3.03c-.832 0-1.687.243-2.456.698a1 1 0 0 1-.148.078c-.008 0-.015-.03-.015-.066a7 7 0 0 0-.097-.725C8.997 1.392 8.337.319 7.46.048a2 2 0 0 0-.585-.041Zm.293 1.402c.248.197.523.759.682 1.388.03.113.06.244.069.292.007.047.026.152.041.233.067.365.098.76.102 1.24l.002.475-.12.175-.118.178h-.278c-.324 0-.646.041-.954.124l-.238.06c-.033.007-.038-.003-.057-.144a8.4 8.4 0 0 1 .016-2.323c.124-.788.413-1.501.696-1.711.067-.05.079-.049.157.013m9.825-.012c.17.126.358.46.498.888.28.854.36 2.028.212 3.145-.019.14-.024.151-.057.144l-.238-.06a3.7 3.7 0 0 0-.954-.124h-.278l-.119-.178-.119-.175.002-.474c.004-.669.066-1.19.214-1.772.157-.623.434-1.185.68-1.382.078-.062.09-.063.159-.012"/></svg>
--- a/frontend/src/assets/Logos/openai.svg
+++ b/frontend/src/assets/Logos/openai.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#7A8291" d="M44.559 19.646a11.957 11.957 0 0 0-1.028-9.822 12.094 12.094 0 0 0-13.026-5.802A11.962 11.962 0 0 0 21.485 0 12.097 12.097 0 0 0 9.95 8.373a11.964 11.964 0 0 0-7.997 5.8A12.097 12.097 0 0 0 3.44 28.356a11.957 11.957 0 0 0 1.028 9.822 12.094 12.094 0 0 0 13.026 5.802 11.953 11.953 0 0 0 9.02 4.02 12.096 12.096 0 0 0 11.54-8.379 11.964 11.964 0 0 0 7.997-5.8 12.099 12.099 0 0 0-1.491-14.177zM26.517 44.863a8.966 8.966 0 0 1-5.759-2.082 6.85 6.85 0 0 0 .284-.16L30.6 37.1c.49-.278.79-.799.786-1.361V22.265l4.04 2.332a.141.141 0 0 1 .078.111v11.16a9.006 9.006 0 0 1-8.987 8.995zM7.191 36.608a8.957 8.957 0 0 1-1.073-6.027c.071.042.195.119.284.17l9.558 5.52a1.556 1.556 0 0 0 1.57 0l11.67-6.738v4.665a.15.15 0 0 1-.057.124l-9.662 5.579a9.006 9.006 0 0 1-12.288-3.293zM4.675 15.744a8.966 8.966 0 0 1 4.682-3.943c0 .082-.005.228-.005.33v11.042a1.555 1.555 0 0 0 .785 1.359l11.669 6.736-4.04 2.333a.143.143 0 0 1-.136.012L7.967 28.03a9.006 9.006 0 0 1-3.293-12.284zm33.19 7.724L26.196 16.73l4.04-2.331a.143.143 0 0 1 .136-.012l9.664 5.579c4.302 2.485 5.776 7.989 3.29 12.29a8.991 8.991 0 0 1-4.68 3.943V24.827a1.553 1.553 0 0 0-.78-1.36zm4.02-6.051c-.07-.044-.195-.119-.283-.17l-9.558-5.52a1.556 1.556 0 0 0-1.57 0l-11.67 6.738V13.8a.15.15 0 0 1 .057-.124l9.662-5.574a8.995 8.995 0 0 1 13.36 9.315zm-25.277 8.315-4.04-2.333a.141.141 0 0 1-.079-.11v-11.16a8.997 8.997 0 0 1 14.753-6.91c-.073.04-.2.11-.283.161L17.4 10.9a1.552 1.552 0 0 0-.786 1.36l-.006 13.469zM18.803 21l5.198-3.002 5.197 3V27l-5.197 3-5.198-3z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#fff" d="M44.559 19.646a11.957 11.957 0 0 0-1.028-9.822 12.094 12.094 0 0 0-13.026-5.802A11.962 11.962 0 0 0 21.485 0 12.097 12.097 0 0 0 9.95 8.373a11.964 11.964 0 0 0-7.997 5.8A12.097 12.097 0 0 0 3.44 28.356a11.957 11.957 0 0 0 1.028 9.822 12.094 12.094 0 0 0 13.026 5.802 11.953 11.953 0 0 0 9.02 4.02 12.096 12.096 0 0 0 11.54-8.379 11.964 11.964 0 0 0 7.997-5.8 12.099 12.099 0 0 0-1.491-14.177zM26.517 44.863a8.966 8.966 0 0 1-5.759-2.082 6.85 6.85 0 0 0 .284-.16L30.6 37.1c.49-.278.79-.799.786-1.361V22.265l4.04 2.332a.141.141 0 0 1 .078.111v11.16a9.006 9.006 0 0 1-8.987 8.995zM7.191 36.608a8.957 8.957 0 0 1-1.073-6.027c.071.042.195.119.284.17l9.558 5.52a1.556 1.556 0 0 0 1.57 0l11.67-6.738v4.665a.15.15 0 0 1-.057.124l-9.662 5.579a9.006 9.006 0 0 1-12.288-3.293zM4.675 15.744a8.966 8.966 0 0 1 4.682-3.943c0 .082-.005.228-.005.33v11.042a1.555 1.555 0 0 0 .785 1.359l11.669 6.736-4.04 2.333a.143.143 0 0 1-.136.012L7.967 28.03a9.006 9.006 0 0 1-3.293-12.284zm33.19 7.724L26.196 16.73l4.04-2.331a.143.143 0 0 1 .136-.012l9.664 5.579c4.302 2.485 5.776 7.989 3.29 12.29a8.991 8.991 0 0 1-4.68 3.943V24.827a1.553 1.553 0 0 0-.78-1.36zm4.02-6.051c-.07-.044-.195-.119-.283-.17l-9.558-5.52a1.556 1.556 0 0 0-1.57 0l-11.67 6.738V13.8a.15.15 0 0 1 .057-.124l9.662-5.574a8.995 8.995 0 0 1 13.36 9.315zm-25.277 8.315-4.04-2.333a.141.141 0 0 1-.079-.11v-11.16a8.997 8.997 0 0 1 14.753-6.91c-.073.04-.2.11-.283.161L17.4 10.9a1.552 1.552 0 0 0-.786 1.36l-.006 13.469zM18.803 21l5.198-3.002 5.197 3V27l-5.197 3-5.198-3z"/></svg>
--- a/frontend/src/assets/Logos/openrouter.svg
+++ b/frontend/src/assets/Logos/openrouter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#7A8291" viewBox="0 0 24 24"><title>OpenRouter</title><path d="M16.778 1.844v1.919q-.569-.026-1.138-.032-.708-.008-1.415.037c-1.93.126-4.023.728-6.149 2.237-2.911 2.066-2.731 1.95-4.14 2.75-.396.223-1.342.574-2.185.798-.841.225-1.753.333-1.751.333v4.229s.768.108 1.61.333c.842.224 1.789.575 2.185.799 1.41.798 1.228.683 4.14 2.75 2.126 1.509 4.22 2.11 6.148 2.236.88.058 1.716.041 2.555.005v1.918l7.222-4.168-7.222-4.17v2.176c-.86.038-1.611.065-2.278.021-1.364-.09-2.417-.357-3.979-1.465-2.244-1.593-2.866-2.027-3.68-2.508.889-.518 1.449-.906 3.822-2.59 1.56-1.109 2.614-1.377 3.978-1.466.667-.044 1.418-.017 2.278.02v2.176L24 6.014Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="#fff" viewBox="0 0 24 24"><title>OpenRouter</title><path d="M16.778 1.844v1.919q-.569-.026-1.138-.032-.708-.008-1.415.037c-1.93.126-4.023.728-6.149 2.237-2.911 2.066-2.731 1.95-4.14 2.75-.396.223-1.342.574-2.185.798-.841.225-1.753.333-1.751.333v4.229s.768.108 1.61.333c.842.224 1.789.575 2.185.799 1.41.798 1.228.683 4.14 2.75 2.126 1.509 4.22 2.11 6.148 2.236.88.058 1.716.041 2.555.005v1.918l7.222-4.168-7.222-4.17v2.176c-.86.038-1.611.065-2.278.021-1.364-.09-2.417-.357-3.979-1.465-2.244-1.593-2.866-2.027-3.68-2.508.889-.518 1.449-.906 3.822-2.59 1.56-1.109 2.614-1.377 3.978-1.466.667-.044 1.418-.017 2.278.02v2.176L24 6.014Z"/></svg>
--- a/frontend/src/assets/Logos/podman.svg
+++ b/frontend/src/assets/Logos/podman.svg
--- a/frontend/src/assets/Logos/sglang.svg
+++ b/frontend/src/assets/Logos/sglang.svg
@@ -1,10 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<g fill="none" stroke="#A5300F" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round">
-		<path d="M17.4 7.7c0 4.6-4.7 4.9-4.7 8.6" />
-		<path d="M8 10.7c3.3 0 4.2 2.4 4.2 5.6" />
-		<circle cx="17.4" cy="4.6" r="3.1" fill="#FADDCD" />
-		<circle cx="4.9" cy="10.7" r="3.1" fill="#FADDCD" />
-		<rect x="7.9" y="16.3" width="9.6" height="6.6" rx="1.6" fill="#FADDCD" />
-		<path d="M11.3 18.6 9.9 19.9l1.4 1.3M14.1 18.6l1.4 1.3-1.4 1.3M13.1 18.3l-1.2 3.3" stroke-width="1.1" />
-	</g>
-</svg>
--- a/frontend/src/assets/Logos/vercel.svg
+++ b/frontend/src/assets/Logos/vercel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1155 1000"><path fill="#7A8291" d="m577.3 0 577.4 1000H0z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1155 1000"><path fill="#fff" d="m577.3 0 577.4 1000H0z"/></svg>
--- a/frontend/src/assets/Logos/vllm.svg
+++ b/frontend/src/assets/Logos/vllm.svg
@@ -1,4 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path d="m23.6 0-8.721 4.59L9.829 24h7.41z" fill="#30A2FF" />
-	<path d="M9.83 24V5.142H.4z" fill="#FDB515" />
-</svg>
--- a/frontend/src/assets/Logos/zap.svg
+++ b/frontend/src/assets/Logos/zap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="800" height="800" fill="#7A8291" stroke="#7A8291" viewBox="0 0 24 24"><path d="M20.98 11.802a1 1 0 0 0-.738-.771l-6.86-1.716 2.537-5.921a1 1 0 0 0-.317-1.192.996.996 0 0 0-1.234.024l-11 9a1 1 0 0 0 .39 1.744l6.719 1.681-3.345 5.854A1 1 0 0 0 8 22a1 1 0 0 0 .6-.2l12-9a1 1 0 0 0 .38-.998z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="800" fill="#fff" stroke="#fff" viewBox="0 0 24 24"><path d="M20.98 11.802a1 1 0 0 0-.738-.771l-6.86-1.716 2.537-5.921a1 1 0 0 0-.317-1.192.996.996 0 0 0-1.234.024l-11 9a1 1 0 0 0 .39 1.744l6.719 1.681-3.345 5.854A1 1 0 0 0 8 22a1 1 0 0 0 .6-.2l12-9a1 1 0 0 0 .38-.998z"/></svg>
--- a/frontend/src/constants/features.ts
+++ b/frontend/src/constants/features.ts
@@ -8,5 +8,6 @@ export enum FeatureKeys {
 	PREMIUM_SUPPORT = 'premium_support',
 	ANOMALY_DETECTION = 'anomaly_detection',
 	USE_JSON_BODY = 'use_json_body',
+	ENABLE_AI_OBSERVABILITY = 'enable_ai_observability',
 	ENABLE_METRICS_REDUCTION = 'enable_metrics_reduction',
 }
--- a/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.tsx
@@ -1,6 +1,5 @@
-import { useCallback, useEffect } from 'react';
+import { useCallback } from 'react';
 import { Tabs } from 'antd';
-import logEvent from 'api/common/logEvent';
 import { useConfirmableAction } from 'hooks/useConfirmableAction';

 import AttributeMappingActions from './components/AttributeMappingActions/AttributeMappingActions';
@@ -21,10 +20,6 @@ function LLMObservabilityAttributeMapping(): JSX.Element {
 	const groupDrawer = useGroupFormDrawer();
 	const spanTest = useTestSpanMapper(editor.snapshot, editor.groups);

-	useEffect(() => {
-		void logEvent('AI Observability Attribute Mapping: Page visited', {});
-	}, []);
-
 	const { discard } = editor;
 	// Discarding wipes the whole working copy, so gate it behind a confirm
 	// prompt rather than firing straight from the button.
--- a/frontend/src/container/LLMObservability/AttributeMapping/TestTab/useTestSpanMapper.ts
+++ b/frontend/src/container/LLMObservability/AttributeMapping/TestTab/useTestSpanMapper.ts
@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import logEvent from 'api/common/logEvent';
 import {
 	RenderErrorResponseDTO,
 	SpantypesSpanMapperTestSpanDTO,
@@ -127,7 +126,6 @@ export function useTestSpanMapper(
 			{ data: body },
 			{
 				onSuccess: (response) => {
-					void logEvent('AI Observability Attribute Mapping: Test run', {});
 					setTestedAttributes(submittedAttributes);
 					setTestedResource(submittedResource);
 					setResult(response.data?.spans ?? []);
--- a/frontend/src/container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor.ts
+++ b/frontend/src/container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor.ts
@@ -2,7 +2,6 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { cloneDeep, isEqual } from 'lodash-es';
 import { toast } from '@signozhq/ui/sonner';
 import { useQueryClient } from 'react-query';
-import logEvent from 'api/common/logEvent';
 import {
 	useCreateSpanMapper,
 	useCreateSpanMapperGroup,
@@ -263,7 +262,6 @@ export function useAttributeMappingEditor(): AttributeMappingEditor {
 		setSaveError(null);
 		try {
 			await persistDraft(snapshot, draft, mutations);
-			void logEvent('AI Observability Attribute Mapping: Changes saved', {});
 			// Refresh the groups list in place — it stays mounted, so this just
 			// swaps in fresh data without a loading flash. Using the query's own
 			// refetch keeps it scoped to the groups list; the per-group mapper
--- a/frontend/src/container/LLMObservability/Explorer/Explorer.tsx
+++ b/frontend/src/container/LLMObservability/Explorer/Explorer.tsx
@@ -173,7 +173,7 @@ function Explorer(): JSX.Element {

 	useEffect(() => {
 		if (!logEventCalledRef.current) {
-			logEvent('AI Observability Explorer: Page visited', {});
+			logEvent('Traces Explorer: Page visited', {});
 			logEventCalledRef.current = true;
 		}
 	}, []);
--- a/frontend/src/container/LLMObservability/Explorer/ListView/ListView.tsx
+++ b/frontend/src/container/LLMObservability/Explorer/ListView/ListView.tsx
@@ -173,7 +173,7 @@ function ListView({

 	useEffect(() => {
 		if (!isLoading && !isFetching && !isError && rows.length !== 0) {
-			void logEvent('AI Observability Explorer: Data present', {
+			void logEvent('Traces Explorer: Data present', {
 				panelType,
 			});
 		}
--- a/frontend/src/container/LLMObservability/Explorer/TracesView/TracesView.tsx
+++ b/frontend/src/container/LLMObservability/Explorer/TracesView/TracesView.tsx
@@ -159,7 +159,7 @@ function TracesView({

 	useEffect(() => {
 		if (!isLoading && !isFetching && !isError && rows.length !== 0) {
-			void logEvent('AI Observability Explorer: Data present', {
+			void logEvent('Traces Explorer: Data present', {
 				panelType: 'TRACE',
 			});
 		}
--- a/frontend/src/container/LLMObservability/Overview/Overview.tsx
+++ b/frontend/src/container/LLMObservability/Overview/Overview.tsx
@@ -1,6 +1,4 @@
-import { useEffect } from 'react';
 import { Typography } from '@signozhq/ui/typography';
-import logEvent from 'api/common/logEvent';
 import Spinner from 'components/Spinner';
 import DashboardContainer from 'pages/DashboardPage/DashboardContainer';

@@ -10,10 +8,6 @@ import styles from './Overview.module.scss';
 function Overview(): JSX.Element {
 	const { dashboard, isLoading, isError, error, refetch } = useSystemDashboard();

-	useEffect(() => {
-		void logEvent('AI Observability Overview: Page visited', {});
-	}, []);
-
 	const renderContent = (): JSX.Element => {
 		if (isLoading) {
 			return <Spinner tip="Loading dashboard..." />;
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx
@@ -1,7 +1,5 @@
-import { useEffect } from 'react';
 import { Badge } from '@signozhq/ui/badge';
 import { Tabs } from 'antd';
-import logEvent from 'api/common/logEvent';
 import { useListUnmappedLLMModels } from 'api/generated/services/llmpricingrules';
 import { parseAsStringEnum, useQueryState } from 'nuqs';

@@ -22,10 +20,6 @@ function LLMObservabilityModelPricing(): JSX.Element {
 	const { data } = useListUnmappedLLMModels();
 	const unpricedCount = data?.data?.items?.length ?? 0;

-	useEffect(() => {
-		void logEvent('AI Observability Model Pricing: Page visited', {});
-	}, []);
-
 	return (
 		<div
 			className={styles.llmObservabilityModelPricing}
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/hooks/useModelCostDrawer.ts
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/hooks/useModelCostDrawer.ts
@@ -1,7 +1,6 @@
 import { useCallback, useState } from 'react';
 import { toast } from '@signozhq/ui/sonner';
 import { useQueryClient } from 'react-query';
-import logEvent from 'api/common/logEvent';
 import {
 	getListLLMPricingRulesQueryKey,
 	getListUnmappedLLMModelsQueryKey,
@@ -95,10 +94,6 @@ export function useModelCostDrawer(): UseModelCostDrawerResult {
 				await createOrUpdate({
 					data: { rules: [buildRulePayload(draft)] },
 				});
-				void logEvent('AI Observability Model Pricing: Model cost saved', {
-					mode,
-					modelName: draft.modelName,
-				});
 				await invalidateList();
 				setIsOpen(false);
 				setSelectedRuleId(null);
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/hooks/useModelCostDelete.ts
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/hooks/useModelCostDelete.ts
@@ -1,7 +1,6 @@
 import { useCallback, useState } from 'react';
 import { toast } from '@signozhq/ui/sonner';
 import { useQueryClient } from 'react-query';
-import logEvent from 'api/common/logEvent';
 import {
 	getListLLMPricingRulesQueryKey,
 	useDeleteLLMPricingRule,
@@ -47,9 +46,6 @@ export function useModelCostDelete(): UseModelCostDeleteResult {
 		}
 		try {
 			await deleteRuleApi({ pathParams: { id: pendingDelete.id } });
-			void logEvent('AI Observability Model Pricing: Model cost deleted', {
-				modelName: pendingDelete.modelName,
-			});
 			await queryClient.invalidateQueries({
 				queryKey: getListLLMPricingRulesQueryKey(),
 			});
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/hooks/useUnpricedModelMapping.ts
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/hooks/useUnpricedModelMapping.ts
@@ -1,7 +1,6 @@
 import { useCallback, useState } from 'react';
 import { toast } from '@signozhq/ui/sonner';
 import { useQueryClient } from 'react-query';
-import logEvent from 'api/common/logEvent';
 import {
 	getListLLMPricingRulesQueryKey,
 	getListUnmappedLLMModelsQueryKey,
@@ -46,10 +45,6 @@ export function useUnpricedModelMapping(): UseUnpricedModelMappingResult {
 			setIsSaving(true);
 			try {
 				await createOrUpdate({ data: { rules: [payload] } });
-				void logEvent('AI Observability Model Pricing: Unpriced model mapped', {
-					modelName: model.modelName,
-					billingModelName: rule.modelName,
-				});
 				await Promise.all([
 					queryClient.invalidateQueries({
 						queryKey: getListUnmappedLLMModelsQueryKey(),
--- a/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.ts
+++ b/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.ts
@@ -4,13 +4,11 @@ import amazonMskUrl from '@/assets/Logos/amazon-msk.svg';
 import androidJavaMonitoringUrl from '@/assets/Logos/android-java-monitoring.svg';
 import androidKotlinMonitoringUrl from '@/assets/Logos/android-kotlin-monitoring.svg';
 import anthropicApiMonitoringUrl from '@/assets/Logos/anthropic-api-monitoring.svg';
-import antigravityUrl from '@/assets/Logos/antigravity.svg';
 import apacheDruidUrl from '@/assets/Logos/apache-druid.svg';
 import apacheUrl from '@/assets/Logos/apache.svg';
 import apiGatewayUrl from '@/assets/Logos/api-gateway.svg';
 import argocdUrl from '@/assets/Logos/argocd.svg';
 import aspnetUrl from '@/assets/Logos/aspnet.svg';
-import auroraUrl from '@/assets/Logos/aurora.svg';
 import auth0Url from '@/assets/Logos/auth0.svg';
 import autogenUrl from '@/assets/Logos/autogen.svg';
 import awsAlbUrl from '@/assets/Logos/aws-alb.svg';
@@ -30,7 +28,6 @@ import celeryUrl from '@/assets/Logos/celery.svg';
 import certManagerUrl from '@/assets/Logos/cert-manager.svg';
 import claudeCodeUrl from '@/assets/Logos/claude-code.svg';
 import clickhouseUrl from '@/assets/Logos/clickhouse.svg';
-import clineUrl from '@/assets/Logos/cline.svg';
 import cloudflareUrl from '@/assets/Logos/cloudflare.svg';
 import cloudnativePgUrl from '@/assets/Logos/cloudnative-pg.svg';
 import cloudwatchLogsUrl from '@/assets/Logos/cloudwatch-logs.svg';
@@ -39,10 +36,8 @@ import confluentKafkaUrl from '@/assets/Logos/confluent-kafka.svg';
 import convexLogoUrl from '@/assets/Logos/convex-logo.svg';
 import cppUrl from '@/assets/Logos/cpp.svg';
 import crewAiUrl from '@/assets/Logos/crew-ai.svg';
-import cursorUrl from '@/assets/Logos/cursor.svg';
 import dashboardsUrl from '@/assets/Logos/dashboards.svg';
 import datadogUrl from '@/assets/Logos/datadog.svg';
-import daytonaUrl from '@/assets/Logos/daytona.svg';
 import dbosUrl from '@/assets/Logos/dbos.svg';
 import deepseekUrl from '@/assets/Logos/deepseek.svg';
 import denoUrl from '@/assets/Logos/deno.svg';
@@ -52,7 +47,6 @@ import documentLoadUrl from '@/assets/Logos/document-load.svg';
 import dotnetUrl from '@/assets/Logos/dotnet.svg';
 import dspyUrl from '@/assets/Logos/dspy.svg';
 import dynamodbUrl from '@/assets/Logos/dynamodb.svg';
-import e2bUrl from '@/assets/Logos/e2b.svg';
 import ec2Url from '@/assets/Logos/ec2.svg';
 import ecsUrl from '@/assets/Logos/ecs.svg';
 import eksUrl from '@/assets/Logos/eks.svg';
@@ -61,7 +55,6 @@ import elasticsearchUrl from '@/assets/Logos/elasticsearch.svg';
 import elbUrl from '@/assets/Logos/elb.svg';
 import elixirUrl from '@/assets/Logos/elixir.svg';
 import elkUrl from '@/assets/Logos/elk.svg';
-import emqxUrl from '@/assets/Logos/emqx.svg';
 import envoyUrl from '@/assets/Logos/envoy.svg';
 import externalApiMonitoringUrl from '@/assets/Logos/external-api-monitoring.svg';
 import fluentbitUrl from '@/assets/Logos/fluentbit.svg';
@@ -108,7 +101,6 @@ import javascriptUrl from '@/assets/Logos/javascript.svg';
 import jbossUrl from '@/assets/Logos/jboss.svg';
 import jenkinsUrl from '@/assets/Logos/jenkins.svg';
 import kafkaUrl from '@/assets/Logos/kafka.svg';
-import karpenterUrl from '@/assets/Logos/karpenter.svg';
 import kedaUrl from '@/assets/Logos/keda.svg';
 import kongUrl from '@/assets/Logos/kong.svg';
 import kubernetesUrl from '@/assets/Logos/kubernetes.svg';
@@ -124,11 +116,9 @@ import logrusUrl from '@/assets/Logos/logrus.svg';
 import logsUrl from '@/assets/Logos/logs.svg';
 import logstashUrl from '@/assets/Logos/logstash.svg';
 import mastraUrl from '@/assets/Logos/mastra.svg';
-import metaUrl from '@/assets/Logos/meta.svg';
 import metricsUrl from '@/assets/Logos/metrics.svg';
 import microsoftSqlServerUrl from '@/assets/Logos/microsoft-sql-server.svg';
 import mistralUrl from '@/assets/Logos/mistral.svg';
-import modalUrl from '@/assets/Logos/modal.svg';
 import mongoUrl from '@/assets/Logos/mongo.svg';
 import n8nUrl from '@/assets/Logos/n8n.svg';
 import neonUrl from '@/assets/Logos/neon.svg';
@@ -151,7 +141,6 @@ import phpUrl from '@/assets/Logos/php.svg';
 import pinoUrl from '@/assets/Logos/pino.svg';
 import pipecatUrl from '@/assets/Logos/pipecat.svg';
 import planetscaleUrl from '@/assets/Logos/planetscale.svg';
-import podmanUrl from '@/assets/Logos/podman.svg';
 import postgresqlUrl from '@/assets/Logos/postgresql.svg';
 import prometheusUrl from '@/assets/Logos/prometheus.svg';
 import pydanticAiUrl from '@/assets/Logos/pydantic-ai.svg';
@@ -169,7 +158,6 @@ import rubyOnRailsUrl from '@/assets/Logos/ruby-on-rails.svg';
 import rustUrl from '@/assets/Logos/rust.svg';
 import s3Url from '@/assets/Logos/s3.svg';
 import scalaUrl from '@/assets/Logos/scala.svg';
-import sglangUrl from '@/assets/Logos/sglang.svg';
 import signozBrandLogoUrl from '@/assets/Logos/signoz-brand-logo.svg';
 import slogUrl from '@/assets/Logos/slog.svg';
 import slurmUrl from '@/assets/Logos/slurm.svg';
@@ -191,7 +179,6 @@ import traceloopUrl from '@/assets/Logos/traceloop.svg';
 import tracesUrl from '@/assets/Logos/traces.svg';
 import vectorUrl from '@/assets/Logos/vector.svg';
 import vercelUrl from '@/assets/Logos/vercel.svg';
-import vllmUrl from '@/assets/Logos/vllm.svg';
 import vmUrl from '@/assets/Logos/vm.svg';
 import vpcUrl from '@/assets/Logos/vpc.svg';
 import windowsUrl from '@/assets/Logos/windows.svg';
@@ -1027,64 +1014,35 @@ const onboardingConfigWithLinks = [
 			'tracing',
 		],
 		id: 'golang',
-		link: '/docs/instrumentation/golang/overview/',
+		link: '/docs/instrumentation/opentelemetry-golang/',
 		question: {
-			desc: 'How do you want to instrument your application?',
-			helpText:
-				'The SDK needs code changes. Compile-time instrumentation rebuilds the binary with otelc. eBPF attaches to a running binary and needs neither.',
-			helpLink: '/docs/instrumentation/golang/overview/',
-			helpLinkText: 'Compare the options →',
+			desc: 'What is your Environment?',
 			type: 'select',
-			entityID: 'framework',
+			entityID: 'environment',
 			options: [
 				{
-					key: 'golang-sdk',
-					label: 'OpenTelemetry SDK',
-					imgUrl: goUrl,
+					key: 'vm',
+					label: 'VM',
+					imgUrl: vmUrl,
 					link: '/docs/instrumentation/opentelemetry-golang/',
-					question: {
-						desc: 'What is your Environment?',
-						type: 'select',
-						entityID: 'environment',
-						options: [
-							{
-								key: 'vm',
-								label: 'VM',
-								imgUrl: vmUrl,
-								link: '/docs/instrumentation/opentelemetry-golang/',
-							},
-							{
-								key: 'k8s',
-								label: 'Kubernetes',
-								imgUrl: kubernetesUrl,
-								link: '/docs/instrumentation/opentelemetry-golang/',
-							},
-							{
-								key: 'windows',
-								label: 'Windows',
-								imgUrl: windowsUrl,
-								link: '/docs/instrumentation/opentelemetry-golang/',
-							},
-							{
-								key: 'docker',
-								label: 'Docker',
-								imgUrl: dockerUrl,
-								link: '/docs/instrumentation/opentelemetry-golang/',
-							},
-						],
-					},
 				},
 				{
-					key: 'golang-compile-time',
-					label: 'Compile-Time (otelc)',
-					imgUrl: goUrl,
-					link: '/docs/instrumentation/golang/compile-time-instrumentation/',
+					key: 'k8s',
+					label: 'Kubernetes',
+					imgUrl: kubernetesUrl,
+					link: '/docs/instrumentation/opentelemetry-golang/',
 				},
 				{
-					key: 'golang-ebpf',
-					label: 'eBPF',
-					imgUrl: opentelemetryUrl,
-					link: '/docs/instrumentation/golang/ebpf-instrumentation/',
+					key: 'windows',
+					label: 'Windows',
+					imgUrl: windowsUrl,
+					link: '/docs/instrumentation/opentelemetry-golang/',
+				},
+				{
+					key: 'docker',
+					label: 'Docker',
+					imgUrl: dockerUrl,
+					link: '/docs/instrumentation/opentelemetry-golang/',
 				},
 			],
 		},
@@ -2910,28 +2868,22 @@ const onboardingConfigWithLinks = [
 					imgUrl: lambdaUrl,
 					link: '/docs/aws-monitoring/lambda/lambda-traces/',
 					question: {
-						desc: 'How is your Lambda function packaged?',
+						desc: 'Which runtime does your Lambda function use?',
 						helpText:
-							'Zip functions use the OpenTelemetry auto-instrumentation layer, except Go, which has no layer and needs the SDK in your code. Layers do not attach to container images, so those bake instrumentation into the image.',
+							'Python, Node.js, Java, and Ruby use the OpenTelemetry auto-instrumentation layer. Go has no layer, so you add the SDK to your code.',
 						options: [
 							{
 								key: 'aws-lambda-traces-auto',
-								label: 'Zip - Python, Node.js, Java, Ruby',
+								label: 'Python, Node.js, Java, Ruby',
 								imgUrl: lambdaUrl,
 								link: '/docs/aws-monitoring/lambda/lambda-traces/',
 							},
 							{
 								key: 'aws-lambda-traces-golang',
-								label: 'Zip - Go',
+								label: 'Go',
 								imgUrl: goUrl,
 								link: '/docs/aws-monitoring/lambda/lambda-traces-golang/',
 							},
-							{
-								key: 'aws-lambda-traces-container-image',
-								label: 'Container Image',
-								imgUrl: dockerUrl,
-								link: '/docs/aws-monitoring/lambda/lambda-traces-container-image/',
-							},
 						],
 					},
 				},
@@ -7537,455 +7489,5 @@ const onboardingConfigWithLinks = [
 		id: 'mysql-logs',
 		link: '/docs/integrations/opentelemetry-mysql/',
 	},
-	{
-		dataSource: 'cursor',
-		label: 'Cursor',
-		imgUrl: cursorUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'ai coding assistant',
-			'cursor',
-			'cursor ai',
-			'cursor observability',
-			'cursor traces',
-			'ide',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'token usage',
-			'traces',
-			'tracing',
-		],
-		id: 'cursor',
-		link: '/docs/cursor-observability/',
-	},
-	{
-		dataSource: 'antigravity-cli',
-		label: 'Antigravity CLI',
-		imgUrl: antigravityUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'ai coding assistant',
-			'antigravity',
-			'antigravity cli',
-			'cli',
-			'google antigravity',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'quota',
-			'tool calls',
-			'traces',
-			'tracing',
-		],
-		id: 'antigravity-cli',
-		link: '/docs/antigravity-cli-monitoring/',
-	},
-	{
-		dataSource: 'qwen-code',
-		label: 'Qwen Code',
-		imgUrl: qwenUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'ai coding assistant',
-			'cli',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'qwen',
-			'qwen code',
-			'qwen code cli',
-			'token spend',
-			'traces',
-			'tracing',
-		],
-		id: 'qwen-code',
-		link: '/docs/qwen-code-observability/',
-	},
-	{
-		dataSource: 'deepseek-harness',
-		label: 'DeepSeek Harness',
-		imgUrl: deepseekUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'ai coding assistant',
-			'deepseek',
-			'deepseek harness',
-			'dsh',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'token spend',
-			'traces',
-			'tracing',
-		],
-		id: 'deepseek-harness',
-		link: '/docs/deepseek-harness-observability/',
-	},
-	{
-		dataSource: 'muse-spark',
-		label: 'Meta Muse Spark',
-		imgUrl: metaUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'llm',
-			'llm monitoring',
-			'meta',
-			'meta model api',
-			'monitoring',
-			'muse',
-			'muse spark',
-			'observability',
-			'prompt cache',
-			'reasoning tokens',
-			'traces',
-			'tracing',
-		],
-		id: 'muse-spark',
-		link: '/docs/muse-spark-monitoring/',
-	},
-	{
-		dataSource: 'openai-agents-sdk',
-		label: 'OpenAI Agents SDK',
-		imgUrl: openaiUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'agents sdk',
-			'handoffs',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'openai',
-			'openai agents sdk',
-			'tool calls',
-			'traces',
-			'tracing',
-		],
-		id: 'openai-agents-sdk',
-		link: '/docs/openai-agents-sdk-observability/',
-	},
-	{
-		dataSource: 'e2b',
-		label: 'E2B Sandbox',
-		imgUrl: e2bUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'code execution',
-			'e2b',
-			'e2b sandbox',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'sandbox',
-			'traces',
-			'tracing',
-		],
-		id: 'e2b',
-		link: '/docs/e2b-monitoring/',
-	},
-	{
-		dataSource: 'daytona',
-		label: 'Daytona Sandbox',
-		imgUrl: daytonaUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'code execution',
-			'daytona',
-			'daytona sandbox',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'sandbox',
-			'traces',
-			'tracing',
-		],
-		id: 'daytona',
-		link: '/docs/daytona-monitoring/',
-	},
-	{
-		dataSource: 'vercel-sandbox',
-		label: 'Vercel Sandbox',
-		imgUrl: vercelUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'code execution',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'sandbox',
-			'traces',
-			'tracing',
-			'vercel',
-			'vercel sandbox',
-		],
-		id: 'vercel-sandbox',
-		link: '/docs/vercel-sandbox-observability/',
-	},
-	{
-		dataSource: 'modal',
-		label: 'Modal',
-		imgUrl: modalUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'container metrics',
-			'llm',
-			'llm monitoring',
-			'modal',
-			'modal functions',
-			'modal sandbox',
-			'monitoring',
-			'observability',
-			'sandbox',
-			'serverless',
-			'traces',
-			'tracing',
-		],
-		id: 'modal',
-		link: '/docs/integrations/modal/',
-	},
-	{
-		dataSource: 'cline',
-		label: 'Cline',
-		imgUrl: clineUrl,
-		tags: ['LLM Monitoring'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'ai coding assistant',
-			'cline',
-			'cline monitoring',
-			'cost per model',
-			'llm',
-			'llm monitoring',
-			'metrics',
-			'monitoring',
-			'observability',
-			'token usage',
-			'vs code',
-		],
-		id: 'cline',
-		link: '/docs/cline-monitoring/',
-	},
-	{
-		dataSource: 'muse-code',
-		label: 'Meta Muse Code',
-		imgUrl: metaUrl,
-		tags: ['LLM Monitoring'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'agent',
-			'ai coding assistant',
-			'cli',
-			'llm',
-			'llm monitoring',
-			'meta',
-			'metrics',
-			'monitoring',
-			'muse',
-			'muse code',
-			'observability',
-			'prompt cache',
-			'token usage',
-		],
-		id: 'muse-code',
-		link: '/docs/muse-code-monitoring/',
-	},
-	{
-		dataSource: 'vllm',
-		label: 'vLLM',
-		imgUrl: vllmUrl,
-		tags: ['LLM Monitoring'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'inference server',
-			'kv cache',
-			'llm',
-			'llm monitoring',
-			'metrics',
-			'monitoring',
-			'observability',
-			'time to first token',
-			'token throughput',
-			'vllm',
-		],
-		id: 'vllm',
-		link: '/docs/vllm-observability/',
-	},
-	{
-		dataSource: 'sglang',
-		label: 'SGLang',
-		imgUrl: sglangUrl,
-		tags: ['LLM Monitoring'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'inference server',
-			'kv cache',
-			'llm',
-			'llm monitoring',
-			'metrics',
-			'monitoring',
-			'observability',
-			'sglang',
-			'time to first token',
-			'token throughput',
-		],
-		id: 'sglang',
-		link: '/docs/sglang-observability/',
-	},
-	{
-		dataSource: 'karpenter',
-		label: 'Karpenter',
-		imgUrl: karpenterUrl,
-		tags: ['infrastructure monitoring', 'metrics'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'autoscaling',
-			'disruption',
-			'karpenter',
-			'karpenter metrics',
-			'kubernetes',
-			'metrics',
-			'monitoring',
-			'node provisioning',
-			'observability',
-			'opentelemetry karpenter',
-			'prometheus',
-		],
-		id: 'karpenter',
-		link: '/docs/metrics-management/opentelemetry-karpenter-metrics/',
-	},
-	{
-		dataSource: 'podman',
-		label: 'Podman',
-		imgUrl: podmanUrl,
-		tags: ['infrastructure monitoring', 'metrics'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'container metrics',
-			'containers',
-			'metrics',
-			'monitoring',
-			'observability',
-			'opentelemetry podman',
-			'podman',
-			'podman metrics',
-		],
-		id: 'podman',
-		link: '/docs/metrics-management/opentelemetry-podman-metrics/',
-	},
-	{
-		dataSource: 'emqx',
-		label: 'EMQX',
-		imgUrl: emqxUrl,
-		tags: ['Messaging Queues', 'metrics'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'broker',
-			'emqx',
-			'emqx metrics',
-			'iot',
-			'messaging queues',
-			'metrics',
-			'monitoring',
-			'mqtt',
-			'observability',
-			'opentelemetry emqx',
-		],
-		id: 'emqx',
-		link: '/docs/integrations/opentelemetry-emqx/',
-	},
-	{
-		dataSource: 'aws-rds-aurora',
-		label: 'AWS RDS Aurora',
-		imgUrl: auroraUrl,
-		tags: ['AWS', 'database'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'aurora',
-			'aurora mysql',
-			'aurora postgresql',
-			'aws',
-			'cloudwatch',
-			'database',
-			'metrics',
-			'monitoring',
-			'observability',
-			'rds',
-			'rds aurora',
-		],
-		id: 'aws-rds-aurora',
-		link: '/docs/integrations/aws-rds-aurora/',
-	},
-	{
-		dataSource: 'gcp-cloud-storage',
-		label: 'GCP Cloud Storage',
-		imgUrl: gcpCloudStorageUrl,
-		tags: ['GCP'],
-		module: 'dashboards',
-		relatedSearchKeywords: [
-			'bucket',
-			'cloud storage',
-			'gcp',
-			'gcp cloud storage',
-			'gcp integration',
-			'gcs',
-			'google cloud',
-			'metrics',
-			'monitoring',
-			'object storage',
-			'observability',
-		],
-		id: 'gcp-cloud-storage',
-		link: '/integrations/gcp?service=cloudstorage',
-		internalRedirect: true,
-	},
-	{
-		dataSource: 'aws-lambda-microvms',
-		label: 'AWS Lambda MicroVMs',
-		imgUrl: lambdaUrl,
-		tags: ['AWS'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'aws',
-			'lambda',
-			'lambda microvms',
-			'logs',
-			'metrics',
-			'microvm',
-			'monitoring',
-			'observability',
-			'opentelemetry collector',
-			'serverless',
-			'traces',
-		],
-		id: 'aws-lambda-microvms',
-		link: '/docs/aws-monitoring/lambda-microvms/',
-	},
 ];
 export default onboardingConfigWithLinks;
--- a/frontend/src/container/SideNav/NavItem/NavItem.styles.scss
+++ b/frontend/src/container/SideNav/NavItem/NavItem.styles.scss
@@ -114,4 +114,8 @@
 			}
 		}
 	}
+
+	.beta-tag {
+		padding-right: 0;
+	}
 }
--- a/frontend/src/container/SideNav/NavItem/NavItem.tsx
+++ b/frontend/src/container/SideNav/NavItem/NavItem.tsx
@@ -51,7 +51,7 @@ export default function NavItem({
 			data-testid={dataTestId}
 		>
 			{showIcon && <div className="nav-item-active-marker" />}
-			<div className="nav-item-data">
+			<div className={cx('nav-item-data', isBeta ? 'beta-tag' : '')}>
 				{showIcon && (
 					<div className={cx('nav-item-icon', isEarlyAccess ? 'noz-wave' : '')}>
 						{icon}
--- a/frontend/src/container/SideNav/SideNav.tsx
+++ b/frontend/src/container/SideNav/SideNav.tsx
@@ -47,6 +47,7 @@ import { useKeyboardHotkeys } from 'hooks/hotkeys/useKeyboardHotkeys';
 import useComponentPermission from 'hooks/useComponentPermission';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
+import { useIsAIObservabilityEnabled } from 'hooks/useIsAIObservabilityEnabled';
 import { useNotifications } from 'hooks/useNotifications';
 import history from 'lib/history';
 import { isArray } from 'lodash-es';
@@ -254,6 +255,7 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 	const isAdmin = user.role === USER_ROLES.ADMIN;
 	const isEditor = user.role === USER_ROLES.EDITOR;
 	const isAIAssistantEnabled = useIsAIAssistantEnabled();
+	const isAIObservabilityEnabled = useIsAIObservabilityEnabled();
 	const aiAssistantActiveConversationId = useAIAssistantStore(
 		(s) => s.activeConversationId,
 	);
@@ -293,6 +295,9 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 			if (item.key === ROUTES.INTEGRATIONS) {
 				return shouldShowIntegrationsValue;
 			}
+			if (item.key === ROUTES.AI_OBSERVABILITY_OVERVIEW) {
+				return isAIObservabilityEnabled;
+			}
 			return item.isEnabled;
 		};

@@ -309,6 +314,7 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 		isEnterpriseSelfHostedUser,
 		isAdmin,
 		isEditor,
+		isAIObservabilityEnabled,
 	]);

 	// Track if we've done the initial sync (to avoid overwriting user actions during session)
--- a/frontend/src/container/SideNav/menuItems.tsx
+++ b/frontend/src/container/SideNav/menuItems.tsx
@@ -293,7 +293,9 @@ export const defaultMoreMenuItems: SidebarItem[] = [
 		label: 'AI Observability',
 		icon: <Brain size={16} />,
 		isBeta: true,
-		isEnabled: true,
+		// Gated behind the `enable_ai_observability` feature flag in
+		// SideNav's `computedSecondaryMenuItems`; disabled by default.
+		isEnabled: false,
 		itemKey: 'ai-observability',
 	},
 	{
--- a/frontend/src/hooks/useIsAIObservabilityEnabled.ts
+++ b/frontend/src/hooks/useIsAIObservabilityEnabled.ts
@@ -0,0 +1,11 @@
+import { FeatureKeys } from 'constants/features';
+import { useAppContext } from 'providers/App/App';
+
+export function useIsAIObservabilityEnabled(): boolean {
+	const { featureFlags } = useAppContext();
+	return (
+		featureFlags?.find(
+			(flag) => flag.name === FeatureKeys.ENABLE_AI_OBSERVABILITY,
+		)?.active || false
+	);
+}
--- a/frontend/src/lib/query/tests/panelTypeDataSourceFormValuesMap.test.ts
+++ b/frontend/src/lib/query/tests/panelTypeDataSourceFormValuesMap.test.ts
@@ -1,135 +0,0 @@
-import {
-	type BuilderField,
-	panelTypeDataSourceFormValuesMap,
-	type PartialPanelTypes,
-} from 'lib/query/panelTypeDataSourceFormValuesMap';
-import { isStaticPanelKind } from 'pages/DashboardPage/DashboardContainer/Panels/capabilities';
-import { PANEL_KIND_TO_PANEL_TYPE } from 'pages/DashboardPage/DashboardContainer/Panels/types/panelKind';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { DataSource } from 'types/common/queryBuilder';
-
-/**
- * The map is composed from a few shape rules rather than spelled out per panel type
- * and data source. These specs pin the rules themselves — each one fails only when a
- * rule changes, which is the moment to stop and decide, rather than whenever any
- * field moves.
- *
- * The composition it replaced was checked cell by cell against the previous literal
- * table, which is in git history at `main:frontend/src/lib/query/panelQuery.ts`.
- */
-function fieldsFor(
-	panelType: keyof PartialPanelTypes,
-	dataSource: DataSource,
-): BuilderField[] {
-	return panelTypeDataSourceFormValuesMap[panelType][dataSource].builder
-		.queryData;
-}
-
-/** Fields present in `to` but not in `from`. */
-function added(from: BuilderField[], to: BuilderField[]): BuilderField[] {
-	return to.filter((field) => !from.includes(field)).sort();
-}
-
-/** Panel types built on the aggregating field list. */
-const AGGREGATING_TYPES: (keyof PartialPanelTypes)[] = [
-	PANEL_TYPES.AREA,
-	PANEL_TYPES.BAR,
-	PANEL_TYPES.HISTOGRAM,
-	PANEL_TYPES.TABLE,
-	PANEL_TYPES.PIE,
-];
-
-/** Panel types that reduce each series to one cell or slice. */
-const SCALAR_TYPES: (keyof PartialPanelTypes)[] = [
-	PANEL_TYPES.TABLE,
-	PANEL_TYPES.PIE,
-];
-
-describe('panelTypeDataSourceFormValuesMap', () => {
-	const seriesLogs = fieldsFor(PANEL_TYPES.TIME_SERIES, DataSource.LOGS);
-	const seriesMetrics = fieldsFor(PANEL_TYPES.TIME_SERIES, DataSource.METRICS);
-
-	// A kind with no entry throws on switch: handleQueryChange reads
-	// map[panelType][dataSource] straight through, and the cast at its call site
-	// hides the gap. Static kinds return before that call, so they are exempt.
-	it('covers every panel kind that can be switched to', () => {
-		const uncovered = Object.entries(PANEL_KIND_TO_PANEL_TYPE)
-			.filter(([kind]) => !isStaticPanelKind(kind as never))
-			.map(([, panelType]) => panelType)
-			.filter((panelType) => !(panelType in panelTypeDataSourceFormValuesMap));
-
-		expect(uncovered).toStrictEqual([]);
-	});
-
-	it('shares one builder surface between logs and traces', () => {
-		Object.values(panelTypeDataSourceFormValuesMap).forEach((sources) => {
-			expect(sources[DataSource.LOGS].builder.queryData).toStrictEqual(
-				sources[DataSource.TRACES].builder.queryData,
-			);
-		});
-	});
-
-	// The provider pushes onto the list it reads from this map, so two cells backed by
-	// one instance would leak fields into each other.
-	it('gives every cell its own array instance', () => {
-		const arrays = Object.values(panelTypeDataSourceFormValuesMap).flatMap(
-			(sources) =>
-				Object.values(sources).map((source) => source.builder.queryData),
-		);
-
-		expect(new Set(arrays).size).toBe(arrays.length);
-	});
-
-	// One consequence of composing: the aggregating types share a single field list, so
-	// an edit meant for charts reaches table and pie too.
-	it.each(AGGREGATING_TYPES)(
-		'gives %s the same non-metrics fields as a time series',
-		(panelType) => {
-			expect(fieldsFor(panelType, DataSource.LOGS)).toStrictEqual(seriesLogs);
-		},
-	);
-
-	it('adds both metrics aggregation steps for metrics', () => {
-		expect(added(seriesLogs, seriesMetrics)).toStrictEqual([
-			'spaceAggregation',
-			'timeAggregation',
-		]);
-	});
-
-	it.each(SCALAR_TYPES)('offers reduceTo to %s on metrics only', (panelType) => {
-		expect(
-			added(seriesMetrics, fieldsFor(panelType, DataSource.METRICS)),
-		).toStrictEqual(['reduceTo']);
-		expect(fieldsFor(panelType, DataSource.LOGS)).not.toContain('reduceTo');
-	});
-
-	it('drops grouping, paging and ordering for a single value', () => {
-		const value = fieldsFor(PANEL_TYPES.VALUE, DataSource.LOGS);
-
-		expect(added(value, seriesLogs)).toStrictEqual([
-			'groupBy',
-			'limit',
-			'orderBy',
-		]);
-		expect(value).toContain('reduceTo');
-	});
-
-	it('offers no aggregation fields to raw rows', () => {
-		const rows = fieldsFor(PANEL_TYPES.LIST, DataSource.LOGS);
-
-		expect(rows).not.toContain('aggregateAttribute');
-		expect(rows).not.toContain('aggregateOperator');
-		expect(rows).not.toContain('groupBy');
-		expect(rows).not.toContain('having');
-		expect(rows).not.toContain('stepInterval');
-	});
-
-	it('drops paging and ordering for metrics rows', () => {
-		expect(
-			added(
-				fieldsFor(PANEL_TYPES.LIST, DataSource.METRICS),
-				fieldsFor(PANEL_TYPES.LIST, DataSource.LOGS),
-			),
-		).toStrictEqual(['functions', 'limit', 'orderBy']);
-	});
-});
--- a/frontend/src/lib/query/panelQuery.ts
+++ b/frontend/src/lib/query/panelQuery.ts
@@ -1,7 +1,7 @@
 /**
 * Panel query shaping shared by the dashboard panel editor and the query
- * builder: the panel-type switch and the dirty-check used to decide whether a
- * panel has unsaved query edits.
+ * builder: the per-panel-type field allowlist, the panel-type switch, and the
+ * dirty-check used to decide whether a panel has unsaved query edits.
 */
 import {
 	initialQueryBuilderFormValuesMap,
@@ -9,11 +9,7 @@ import {
 } from 'constants/queryBuilder';
 import { cloneDeep, isEqual, set, unset } from 'lodash-es';
 import { IBuilderQuery, Query } from 'types/api/queryBuilder/queryBuilderData';
-
-import {
-	panelTypeDataSourceFormValuesMap,
-	PartialPanelTypes,
-} from 'lib/query/panelTypeDataSourceFormValuesMap';
+import { DataSource } from 'types/common/queryBuilder';

 // Asks "would saving the current panel change the persisted widget spec?".
 //
@@ -95,6 +91,453 @@ export const getIsQueryModified = (
 	);
 };

+export type PartialPanelTypes = {
+	[PANEL_TYPES.BAR]: 'bar';
+	[PANEL_TYPES.LIST]: 'list';
+	[PANEL_TYPES.TABLE]: 'table';
+	[PANEL_TYPES.TIME_SERIES]: 'graph';
+	[PANEL_TYPES.VALUE]: 'value';
+	[PANEL_TYPES.PIE]: 'pie';
+	[PANEL_TYPES.HISTOGRAM]: 'histogram';
+};
+
+export const panelTypeDataSourceFormValuesMap: Record<
+	keyof PartialPanelTypes,
+	Record<DataSource, any>
+> = {
+	[PANEL_TYPES.BAR]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'legend',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'timeAggregation',
+					'filters',
+					'filter',
+					'spaceAggregation',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'stepInterval',
+					'legend',
+					'queryName',
+					'disabled',
+					'functions',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'legend',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.TIME_SERIES]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'legend',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'timeAggregation',
+					'filters',
+					'filter',
+					'spaceAggregation',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'stepInterval',
+					'legend',
+					'queryName',
+					'disabled',
+					'functions',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'legend',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.HISTOGRAM]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'legend',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'timeAggregation',
+					'filters',
+					'filter',
+					'spaceAggregation',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'stepInterval',
+					'legend',
+					'queryName',
+					'disabled',
+					'functions',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'legend',
+					'expression',
+					'aggregations',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.TABLE]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'expression',
+					'legend',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'timeAggregation',
+					'filters',
+					'filter',
+					'spaceAggregation',
+					'groupBy',
+					'reduceTo',
+					'limit',
+					'having',
+					'orderBy',
+					'stepInterval',
+					'legend',
+					'queryName',
+					'expression',
+					'disabled',
+					'functions',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'expression',
+					'legend',
+					'aggregations',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.PIE]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'expression',
+					'legend',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'timeAggregation',
+					'filters',
+					'filter',
+					'spaceAggregation',
+					'groupBy',
+					'reduceTo',
+					'limit',
+					'having',
+					'orderBy',
+					'stepInterval',
+					'legend',
+					'queryName',
+					'expression',
+					'disabled',
+					'functions',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'groupBy',
+					'limit',
+					'having',
+					'orderBy',
+					'functions',
+					'stepInterval',
+					'disabled',
+					'queryName',
+					'expression',
+					'legend',
+					'aggregations',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.LIST]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'queryName',
+					'filters',
+					'filter',
+					'limit',
+					'orderBy',
+					'functions',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: ['queryName', 'filters', 'filter', 'aggregations'],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'queryName',
+					'filters',
+					'filter',
+					'limit',
+					'orderBy',
+					'functions',
+					'aggregations',
+				],
+			},
+		},
+	},
+	[PANEL_TYPES.VALUE]: {
+		[DataSource.LOGS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'reduceTo',
+					'having',
+					'functions',
+					'stepInterval',
+					'queryName',
+					'expression',
+					'disabled',
+					'legend',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.METRICS]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'timeAggregation',
+					'filters',
+					'filter',
+					'spaceAggregation',
+					'having',
+					'reduceTo',
+					'stepInterval',
+					'legend',
+					'queryName',
+					'expression',
+					'disabled',
+					'functions',
+					'aggregations',
+				],
+			},
+		},
+		[DataSource.TRACES]: {
+			builder: {
+				queryData: [
+					'aggregateAttribute',
+					'aggregateOperator',
+					'filters',
+					'filter',
+					'reduceTo',
+					'having',
+					'functions',
+					'stepInterval',
+					'queryName',
+					'expression',
+					'disabled',
+					'legend',
+					'aggregations',
+				],
+			},
+		},
+	},
+};
+
 export function handleQueryChange(
 	newPanelType: keyof PartialPanelTypes,
 	supersetQuery: Query,
@@ -112,7 +555,7 @@ export function handleQueryChange(
 					panelTypeDataSourceFormValuesMap[newPanelType][dataSource].builder
 						.queryData;

-				fieldsToSelect.forEach((field) => {
+				fieldsToSelect.forEach((field: keyof IBuilderQuery) => {
 					set(tempQuery, field, supersetQuery.builder.queryData[index][field]);
 				});

--- a/frontend/src/lib/query/panelTypeDataSourceFormValuesMap.ts
+++ b/frontend/src/lib/query/panelTypeDataSourceFormValuesMap.ts
@@ -1,140 +0,0 @@
-/**
- * Builder fields carried across a panel-type switch, per panel type and data source.
- * Each shape is cut from the widest one by omission.
- */
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-
-export type PartialPanelTypes = {
-	[PANEL_TYPES.BAR]: 'bar';
-	[PANEL_TYPES.LIST]: 'list';
-	[PANEL_TYPES.TABLE]: 'table';
-	[PANEL_TYPES.TIME_SERIES]: 'graph';
-	[PANEL_TYPES.AREA]: 'area';
-	[PANEL_TYPES.VALUE]: 'value';
-	[PANEL_TYPES.PIE]: 'pie';
-	[PANEL_TYPES.HISTOGRAM]: 'histogram';
-};
-
-export type BuilderField = keyof IBuilderQuery;
-
-export type PanelTypeFormValues = {
-	builder: { queryData: BuilderField[] };
-};
-
-/** A field added to `IBuilderQuery` fails to compile here until answered either way. */
-const IS_CARRIED = {
-	queryName: true,
-	aggregateOperator: true,
-	aggregateAttribute: true,
-	aggregations: true,
-	timeAggregation: true,
-	spaceAggregation: true,
-	functions: true,
-	filter: true,
-	filters: true,
-	groupBy: true,
-	expression: true,
-	disabled: true,
-	having: true,
-	limit: true,
-	stepInterval: true,
-	orderBy: true,
-	reduceTo: true,
-	legend: true,
-	// `dataSource` is appended by the provider; the rest drive surfaces this switch
-	// does not reach.
-	dataSource: false,
-	temporality: false,
-	pageSize: false,
-	offset: false,
-	selectColumns: false,
-	source: false,
-	builderQueryType: false,
-} satisfies Record<BuilderField, boolean>;
-
-function omit(
-	fields: readonly BuilderField[],
-	...omitted: BuilderField[]
-): BuilderField[] {
-	return fields.filter((field) => !omitted.includes(field));
-}
-
-const METRICS_AGGREGATION: readonly BuilderField[] = [
-	'timeAggregation',
-	'spaceAggregation',
-];
-
-const SCALAR_METRICS: readonly BuilderField[] = (
-	Object.entries(IS_CARRIED) as [BuilderField, boolean][]
-)
-	.filter(([, carried]) => carried)
-	.map(([field]) => field);
-
-// `reduceTo` is offered for metrics only, an asymmetry carried over from the old table.
-const SERIES_METRICS: readonly BuilderField[] = omit(
-	SCALAR_METRICS,
-	'reduceTo',
-);
-
-const SERIES: readonly BuilderField[] = omit(
-	SERIES_METRICS,
-	...METRICS_AGGREGATION,
-);
-
-const SINGLE_VALUE_METRICS: readonly BuilderField[] = omit(
-	SCALAR_METRICS,
-	'groupBy',
-	'limit',
-	'orderBy',
-);
-const SINGLE_VALUE: readonly BuilderField[] = omit(
-	SINGLE_VALUE_METRICS,
-	...METRICS_AGGREGATION,
-);
-
-const RAW_ROWS: readonly BuilderField[] = omit(
-	SERIES,
-	'aggregateAttribute',
-	'aggregateOperator',
-	'groupBy',
-	'having',
-	'stepInterval',
-	'disabled',
-	'legend',
-	'expression',
-);
-const RAW_ROWS_METRICS: readonly BuilderField[] = omit(
-	RAW_ROWS,
-	'limit',
-	'orderBy',
-	'functions',
-);
-
-/** Each cell gets its own copy; a shared instance would let cells contaminate
- * each other. */
-function bySource(
-	logsAndTraces: readonly BuilderField[],
-	metrics: readonly BuilderField[],
-): Record<DataSource, PanelTypeFormValues> {
-	return {
-		[DataSource.LOGS]: { builder: { queryData: [...logsAndTraces] } },
-		[DataSource.TRACES]: { builder: { queryData: [...logsAndTraces] } },
-		[DataSource.METRICS]: { builder: { queryData: [...metrics] } },
-	};
-}
-
-export const panelTypeDataSourceFormValuesMap: Record<
-	keyof PartialPanelTypes,
-	Record<DataSource, PanelTypeFormValues>
-> = {
-	[PANEL_TYPES.TIME_SERIES]: bySource(SERIES, SERIES_METRICS),
-	[PANEL_TYPES.AREA]: bySource(SERIES, SERIES_METRICS),
-	[PANEL_TYPES.BAR]: bySource(SERIES, SERIES_METRICS),
-	[PANEL_TYPES.HISTOGRAM]: bySource(SERIES, SERIES_METRICS),
-	[PANEL_TYPES.TABLE]: bySource(SERIES, SCALAR_METRICS),
-	[PANEL_TYPES.PIE]: bySource(SERIES, SCALAR_METRICS),
-	[PANEL_TYPES.VALUE]: bySource(SINGLE_VALUE, SINGLE_VALUE_METRICS),
-	[PANEL_TYPES.LIST]: bySource(RAW_ROWS, RAW_ROWS_METRICS),
-};
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelTypeSwitch.ts
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelTypeSwitch.ts
@@ -7,8 +7,10 @@ import type {
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import type { PANEL_TYPES } from 'constants/queryBuilder';
-import { handleQueryChange } from 'lib/query/panelQuery';
-import type { PartialPanelTypes } from 'lib/query/panelTypeDataSourceFormValuesMap';
+import {
+	handleQueryChange,
+	type PartialPanelTypes,
+} from 'lib/query/panelQuery';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { DashboardDetailEvents } from 'pages/DashboardPage/constants/events';
 import type {
--- a/frontend/src/pages/DashboardPage/DashboardContainer/hooks/tests/useGetQueryRangeV5.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/hooks/tests/useGetQueryRangeV5.test.tsx
@@ -1,113 +0,0 @@
-import type { PropsWithChildren } from 'react';
-import { QueryClient, QueryClientProvider, UseQueryResult } from 'react-query';
-import { renderHook, RenderHookResult, waitFor } from '@testing-library/react';
-import { AxiosError, AxiosHeaders } from 'axios';
-import { queryRangeV5 } from 'api/generated/services/querier';
-import type {
-	Querybuildertypesv5QueryRangeRequestDTO,
-	QueryRangeV5200,
-} from 'api/generated/services/sigNoz.schemas';
-
-import { useGetQueryRangeV5 } from '../useGetQueryRangeV5';
-
-jest.mock('api/generated/services/querier', () => ({
-	queryRangeV5: jest.fn(),
-}));
-
-const mockQueryRangeV5 = queryRangeV5 as jest.Mock;
-
-const REQUEST = {} as Querybuildertypesv5QueryRangeRequestDTO;
-const KEY_A = ['query-range', 'panel-1', 'window-a'];
-const KEY_B = ['query-range', 'panel-1', 'window-b'];
-
-function clientError(): AxiosError {
-	return new AxiosError('bad query', 'ERR_BAD_REQUEST', undefined, undefined, {
-		status: 400,
-		statusText: 'Bad Request',
-		data: {},
-		headers: {},
-		config: { headers: new AxiosHeaders() },
-	});
-}
-
-interface Props {
-	enabled: boolean;
-	queryKey?: unknown[];
-}
-
-function renderQuery(
-	initial: Props,
-	client = new QueryClient(),
-): RenderHookResult<UseQueryResult<QueryRangeV5200, Error>, Props> {
-	const wrapper = ({ children }: PropsWithChildren): JSX.Element => (
-		<QueryClientProvider client={client}>{children}</QueryClientProvider>
-	);
-	return renderHook(
-		({ enabled, queryKey = KEY_A }: Props) =>
-			useGetQueryRangeV5({ requestPayload: REQUEST, queryKey, enabled }),
-		{ wrapper, initialProps: initial },
-	);
-}
-
-describe('useGetQueryRangeV5 enabled gating', () => {
-	beforeEach(() => {
-		mockQueryRangeV5.mockReset();
-	});
-
-	it('does not fetch while disabled and fetches once when enabled', async () => {
-		mockQueryRangeV5.mockResolvedValue({ status: 'success', data: {} });
-		const { rerender } = renderQuery({ enabled: false });
-		expect(mockQueryRangeV5).not.toHaveBeenCalled();
-
-		rerender({ enabled: true });
-		await waitFor(() => expect(mockQueryRangeV5).toHaveBeenCalledTimes(1));
-	});
-
-	it('serves a successful key from cache when re-enabled', async () => {
-		mockQueryRangeV5.mockResolvedValue({ status: 'success', data: {} });
-		const { result, rerender } = renderQuery({ enabled: true });
-		await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-		rerender({ enabled: false });
-		rerender({ enabled: true });
-		await waitFor(() => expect(result.current.isFetching).toBe(false));
-		expect(mockQueryRangeV5).toHaveBeenCalledTimes(1);
-	});
-
-	it('does not re-run an errored key when re-enabled', async () => {
-		mockQueryRangeV5.mockRejectedValue(clientError());
-		const { result, rerender } = renderQuery({ enabled: true });
-		await waitFor(() => expect(result.current.isError).toBe(true));
-
-		rerender({ enabled: false });
-		rerender({ enabled: true });
-		await waitFor(() => expect(result.current.isFetching).toBe(false));
-		expect(mockQueryRangeV5).toHaveBeenCalledTimes(1);
-		expect(result.current.isError).toBe(true);
-	});
-
-	it('still gates a new key while disabled after a prior key errored', async () => {
-		mockQueryRangeV5.mockRejectedValue(clientError());
-		const { result, rerender } = renderQuery({ enabled: true });
-		await waitFor(() => expect(result.current.isError).toBe(true));
-
-		rerender({ enabled: false });
-		rerender({ enabled: false, queryKey: KEY_B });
-		await waitFor(() => expect(result.current.isFetching).toBe(false));
-		expect(mockQueryRangeV5).toHaveBeenCalledTimes(1);
-
-		rerender({ enabled: true, queryKey: KEY_B });
-		await waitFor(() => expect(mockQueryRangeV5).toHaveBeenCalledTimes(2));
-	});
-
-	it('re-runs an errored key on manual refetch', async () => {
-		mockQueryRangeV5.mockRejectedValue(clientError());
-		const { result } = renderQuery({ enabled: true });
-		await waitFor(() => expect(result.current.isError).toBe(true));
-
-		mockQueryRangeV5.mockResolvedValue({ status: 'success', data: {} });
-		await result.current.refetch();
-		await waitFor(() => expect(result.current.isSuccess).toBe(true));
-		expect(mockQueryRangeV5).toHaveBeenCalledTimes(2);
-	});
-});
--- a/frontend/src/pages/DashboardPage/DashboardContainer/hooks/useGetQueryRangeV5.ts
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/hooks/useGetQueryRangeV5.ts
@@ -1,4 +1,4 @@
-import { useQuery, useQueryClient, UseQueryResult } from 'react-query';
+import { useQuery, UseQueryResult } from 'react-query';
 import { isAxiosError } from 'axios';
 import { queryRangeV5 } from 'api/generated/services/querier';
 import type {
@@ -50,15 +50,10 @@ export function useGetQueryRangeV5({
 	keepPreviousData,
 	cacheTime,
 }: UseGetQueryRangeV5Args): UseQueryResult<QueryRangeV5200, Error> {
-	const queryClient = useQueryClient();
-	// An errored key has no data, so it is always stale; keep it enabled so
-	// re-enabling doesn't re-run it.
-	const hasErrored = queryClient.getQueryState(queryKey)?.status === 'error';
-
 	return useQuery<QueryRangeV5200, Error>({
 		queryKey,
 		queryFn: ({ signal }) => queryRangeV5(requestPayload, signal),
-		enabled: enabled || hasErrored,
+		enabled,
 		retry: retryUnlessClientError,
 		keepPreviousData,
 		cacheTime,
--- a/frontend/src/pages/DashboardPage/PanelEditorPage/stories/PanelEditorPage.stories.tsx
+++ b/frontend/src/pages/DashboardPage/PanelEditorPage/stories/PanelEditorPage.stories.tsx
@@ -67,8 +67,6 @@ export const NoPreviewData: Story = {
 /** The editor remains usable while the independently fetched preview has failed. */
 export const PreviewQueryError: Story = {
 	args: { dataState: 'error' },
-	// The mocked queries deliberately fail; the resulting console errors are the state under test.
-	parameters: { allowConsoleErrors: true },
 };

 /** A locked dashboard: the editor still opens, but it cannot save. */
--- a/frontend/src/pages/DashboardPage/stories/DashboardPage.stories.tsx
+++ b/frontend/src/pages/DashboardPage/stories/DashboardPage.stories.tsx
@@ -91,8 +91,6 @@ export const NoData: Story = {
 /** A partial data failure: the dashboard remains visible while panel queries fail. */
 export const PanelQueryError: Story = {
 	args: { dataState: 'error' },
-	// The mocked queries deliberately fail; the resulting console errors are the state under test.
-	parameters: { allowConsoleErrors: true },
 };

 /** The panels mid-fetch, with the header, variable bar and grid already laid out. */
--- a/frontend/src/pages/MessagingQueues/stories/MessagingQueues.stories.tsx
+++ b/frontend/src/pages/MessagingQueues/stories/MessagingQueues.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
-import { expect, screen, userEvent, waitFor, within } from 'storybook/test';
+import { screen, userEvent, within } from 'storybook/test';

 import { storyMocks } from '@/storybook/controls/defineStoryMocks';
 import type { PageStoryArgs } from '@/storybook/runtime/resolveStory';
@@ -56,18 +56,13 @@ export const ConfigurationChecklist: Story = {

 		// The button reads plain "Configuration" while the checks are in flight and
 		// ignores clicks until they land, so the count is what to wait on.
-		const button = await canvas.findByRole(
-			'button',
-			{ name: /missing configuration/i },
-			untilLoaded,
+		await userEvent.click(
+			await canvas.findByRole(
+				'button',
+				{ name: /missing configuration/i },
+				untilLoaded,
+			),
 		);
-		// The count shows once any one check lands; the button stays loading, and
-		// ignores clicks, until all three have.
-		await waitFor(
-			() => expect(button).not.toHaveClass('ant-btn-loading'),
-			untilLoaded,
-		);
-		await userEvent.click(button);
 		// The modal header and its title both carry the text.
 		await screen.findAllByText(
 			'Kafka Service Attributes',
--- a/frontend/src/pages/Settings/Billing/stories/Billing.stories.tsx
+++ b/frontend/src/pages/Settings/Billing/stories/Billing.stories.tsx
@@ -170,6 +170,4 @@ export const Loading: Story = {
 /** Error: the usage request failed, leaving the plan card with nothing to report. */
 export const Error: Story = {
 	args: { dataState: 'error' },
-	// The mocked usage request deliberately fails; the resulting console errors are the state under test.
-	parameters: { allowConsoleErrors: true },
 };
--- a/frontend/src/pages/Settings/ServiceAccounts/stories/ServiceAccounts.stories.tsx
+++ b/frontend/src/pages/Settings/ServiceAccounts/stories/ServiceAccounts.stories.tsx
@@ -106,11 +106,7 @@ export const SearchNoResults: Story = {

 /** Error: the list request failed while the rest of the settings shell stays usable. */
 export const LoadError: Story = {
-	// The deliberate 500 is the state under test.
-	parameters: {
-		msw: { handlers: [accountsLoadError] },
-		allowConsoleErrors: true,
-	},
+	parameters: { msw: { handlers: [accountsLoadError] } },
 };

 /** An account opened up: the name and the roles it acts under. */
--- a/frontend/src/providers/QueryBuilder.tsx
+++ b/frontend/src/providers/QueryBuilder.tsx
@@ -32,7 +32,7 @@ import ROUTES from 'constants/routes';
 import {
 	panelTypeDataSourceFormValuesMap,
 	PartialPanelTypes,
-} from 'lib/query/panelTypeDataSourceFormValuesMap';
+} from 'lib/query/panelQuery';
 import { OptionsQuery } from 'container/OptionsMenu/types';
 import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
 import { updateStepInterval } from 'hooks/queryBuilder/useStepInterval';
@@ -767,11 +767,12 @@ export function QueryBuilderProvider({
 							queryItem.dataSource
 						].builder.queryData;

-					// `dataSource` travels with the panel type's fields, but on a copy:
-					// `propsRequired` is the list the map holds, and pushing onto it grew
-					// that array by one entry on every call.
+					// `dataSource` travels with the panel type's fields, but is appended to a
+					// copy: `propsRequired` is the list held in
+					// `panelTypeDataSourceFormValuesMap`, and pushing onto it grew that
+					// module-level array by one entry on every call.
 					if (propsRequired) {
-						[...propsRequired, 'dataSource'].forEach((p) => {
+						[...propsRequired, 'dataSource'].forEach((p: any) => {
 							set(queryItem, p, get(newQueryItem, p));
 						});
 					}
--- a/frontend/src/storybook/foundations/Layering.stories.tsx
+++ b/frontend/src/storybook/foundations/Layering.stories.tsx
@@ -1,5 +1,12 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
-import { expect, screen, userEvent, waitFor, within } from 'storybook/test';
+import {
+	expect,
+	screen,
+	userEvent,
+	waitFor,
+	waitForElementToBeRemoved,
+	within,
+} from 'storybook/test';

 import LayeringFixture from './LayeringFixture';

@@ -46,9 +53,7 @@ export const SelectOverDrawer: Story = {
 		const drawer = await screen.findByRole('dialog', { name: 'Layering drawer' });

 		await userEvent.keyboard('{Escape}');
-		// The close can finish before this runs, which `waitForElementToBeRemoved`
-		// rejects instead of passing.
-		await waitFor(() => expect(drawer).not.toBeInTheDocument());
+		await waitForElementToBeRemoved(drawer);
 		await userEvent.click(trigger);
 		await userEvent.click(
 			await screen.findByRole('combobox', { name: 'Drawer environment' }),
--- a/pkg/apiserver/signozapiserver/alertmanager.go
+++ b/pkg/apiserver/signozapiserver/alertmanager.go
@@ -145,6 +145,7 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusCreated,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusConflict},
 			Deprecated:          false,
+			Stability:           handler.StabilityBeta,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbCreate)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -173,6 +174,7 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusOK,
 			ErrorStatusCodes:    []int{http.StatusBadRequest},
 			Deprecated:          false,
+			Stability:           handler.StabilityBeta,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbList)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -199,6 +201,7 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusOK,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 			Deprecated:          false,
+			Stability:           handler.StabilityBeta,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbRead)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -226,6 +229,7 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusOK,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 			Deprecated:          false,
+			Stability:           handler.StabilityBeta,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbUpdate)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -253,6 +257,7 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusNoContent,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 			Deprecated:          false,
+			Stability:           handler.StabilityBeta,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbDelete)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -281,6 +286,7 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusOK,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 			Deprecated:          false,
+			Stability:           handler.StabilityBeta,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbUpdate)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -308,6 +314,7 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusNoContent,
 			ErrorStatusCodes:    []int{http.StatusBadRequest},
 			Deprecated:          false,
+			Stability:           handler.StabilityBeta,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbCreate)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
--- a/pkg/flagger/registry.go
+++ b/pkg/flagger/registry.go
@@ -9,6 +9,7 @@ var (
 	FeaturePutMetersInZeus        = featuretypes.MustNewName("put_meters_in_zeus")
 	FeatureUseMeterReporter       = featuretypes.MustNewName("use_meter_reporter")
 	FeatureUseJSONBody            = featuretypes.MustNewName("use_json_body")
+	FeatureEnableAIObservability  = featuretypes.MustNewName("enable_ai_observability")
 	FeatureEnableMetricsReduction = featuretypes.MustNewName("enable_metrics_reduction")
 	FeatureResolveSemconvFamilies = featuretypes.MustNewName("resolve_semconv_families")
 )
@@ -63,6 +64,14 @@ func MustNewRegistry() featuretypes.Registry {
 			DefaultVariant: featuretypes.MustNewName("disabled"),
 			Variants:       featuretypes.NewBooleanVariants(),
 		},
+		&featuretypes.Feature{
+			Name:           FeatureEnableAIObservability,
+			Kind:           featuretypes.KindBoolean,
+			Stage:          featuretypes.StageExperimental,
+			Description:    "Controls whether ai observability is enabled",
+			DefaultVariant: featuretypes.MustNewName("disabled"),
+			Variants:       featuretypes.NewBooleanVariants(),
+		},
 		&featuretypes.Feature{
 			Name:           FeatureEnableMetricsReduction,
 			Kind:           featuretypes.KindBoolean,
--- a/pkg/http/handler/handler.go
+++ b/pkg/http/handler/handler.go
@@ -62,6 +62,10 @@ func (handler *handler) ServeOpenAPI(opCtx openapi.OperationContext) {
 	opCtx.SetDescription(handler.openAPIDef.Description)
 	opCtx.SetIsDeprecated(handler.openAPIDef.Deprecated)

+	if exposer, ok := opCtx.(openapi3.OperationExposer); ok {
+		exposer.Operation().WithMapOfAnythingItem(openAPIStabilityKey, handler.openAPIDef.Stability.StringValue())
+	}
+
 	// Add security schemes
 	for _, securityScheme := range handler.openAPIDef.SecuritySchemes {
 		opCtx.AddSecurity(securityScheme.Name, securityScheme.Scopes...)
--- a/pkg/http/handler/handler_test.go
+++ b/pkg/http/handler/handler_test.go
@@ -0,0 +1,52 @@
+package handler
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/swaggest/openapi-go/openapi3"
+)
+
+func TestServeOpenAPIStability(t *testing.T) {
+	testCases := []struct {
+		subtestName            string
+		stability              Stability
+		expectedExtensionValue any
+	}{
+		{
+			subtestName:            "beta is emitted as x-stability",
+			stability:              StabilityBeta,
+			expectedExtensionValue: "beta",
+		},
+		{
+			subtestName:            "alpha is emitted as x-stability",
+			stability:              StabilityAlpha,
+			expectedExtensionValue: "alpha",
+		},
+		{
+			subtestName:            "unset is emitted as stable",
+			stability:              Stability{},
+			expectedExtensionValue: "stable",
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.subtestName, func(t *testing.T) {
+			reflector := openapi3.NewReflector()
+			opCtx, err := reflector.NewOperationContext(http.MethodGet, "/test")
+			require.NoError(t, err)
+
+			New(func(http.ResponseWriter, *http.Request) {}, OpenAPIDef{
+				ID:                "test",
+				SuccessStatusCode: http.StatusOK,
+				Stability:         testCase.stability,
+			}).ServeOpenAPI(opCtx)
+			require.NoError(t, reflector.AddOperation(opCtx))
+
+			operation := reflector.Spec.Paths.MapOfPathItemValues["/test"].MapOfOperationValues["get"]
+			assert.Equal(t, testCase.expectedExtensionValue, operation.MapOfAnything["x-stability"])
+		})
+	}
+}
--- a/pkg/http/handler/openapi.go
+++ b/pkg/http/handler/openapi.go
@@ -3,12 +3,32 @@ package handler
 import (
 	"reflect"

+	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/gorilla/mux"
 	"github.com/swaggest/jsonschema-go"
 	openapigo "github.com/swaggest/openapi-go"
 	"github.com/swaggest/rest/openapi"
 )

+const openAPIStabilityKey string = "x-stability"
+
+var (
+	StabilityAlpha  = Stability{valuer.NewString("alpha")}
+	StabilityBeta   = Stability{valuer.NewString("beta")}
+	StabilityStable = Stability{valuer.NewString("stable")}
+)
+
+// Stability is emitted as the x-stability extension on every operation; unset means stable.
+type Stability struct{ valuer.String }
+
+func (stability Stability) StringValue() string {
+	if stability.IsZero() {
+		return StabilityStable.String.StringValue()
+	}
+
+	return stability.String.StringValue()
+}
+
 // OpenAPIExample is a named example for an OpenAPI operation.
 type OpenAPIExample struct {
 	Name        string
@@ -32,6 +52,7 @@ type OpenAPIDef struct {
 	SuccessStatusCode   int
 	ErrorStatusCodes    []int
 	Deprecated          bool
+	Stability           Stability
 	SecuritySchemes     []OpenAPISecurityScheme
 }

--- a/pkg/modules/dashboard/impldashboard/fs/definitions/ai-o11y-overview.json
+++ b/pkg/modules/dashboard/impldashboard/fs/definitions/ai-o11y-overview.json
@@ -1,5 +1,5 @@
 {
-  "version": 3,
+  "version": 2,
  "definition": {
    "schemaVersion": "v6",
    "name": "signoz---ai-o11y-overview",
@@ -437,7 +437,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -489,7 +489,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -722,7 +722,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -782,7 +782,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -850,7 +850,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -868,7 +868,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -886,7 +886,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -904,7 +904,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -961,7 +961,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -979,7 +979,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -997,7 +997,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -1015,7 +1015,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -1076,7 +1076,7 @@
                            "stepInterval": 0,
                            "disabled": true,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -1175,7 +1175,7 @@
                            "stepInterval": 0,
                            "disabled": true,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -1192,7 +1192,7 @@
                            "stepInterval": 0,
                            "disabled": true,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -1248,7 +1248,7 @@
                    "spec": {
                      "queries": [
                        {
-                          "type": "builder_ai_query",
+                          "type": "builder_query",
                          "spec": {
                            "name": "A",
                            "signal": "traces",
@@ -1282,7 +1282,7 @@
                          }
                        },
                        {
-                          "type": "builder_ai_query",
+                          "type": "builder_query",
                          "spec": {
                            "name": "B",
                            "signal": "traces",
@@ -1353,7 +1353,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -2075,7 +2075,7 @@
                            "stepInterval": 0,
                            "disabled": false,
                            "filter": {
-                              "expression": "gen_ai.request.model EXISTS AND gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
+                              "expression": "gen_ai.request.model IN $model AND gen_ai.provider.name IN $provider AND deployment.environment IN $environment AND service.name IN $service_name"
                            },
                            "aggregations": [
                              {
@@ -2724,7 +2724,7 @@
                    "spec": {
                      "queries": [
                        {
-                          "type": "builder_ai_query",
+                          "type": "builder_query",
                          "spec": {
                            "name": "A",
                            "signal": "traces",
--- a/pkg/modules/spanmapper/implspanmapper/fs/definitions/gen_ai.agent.json
+++ b/pkg/modules/spanmapper/implspanmapper/fs/definitions/gen_ai.agent.json
@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 1,
  "definition": {
    "name": "gen_ai.agent",
    "condition": {
@@ -68,7 +68,7 @@
            {
              "key": "final_result",
              "context": "attribute",
-              "operation": "move",
+              "operation": "copy",
              "priority": 10
            }
          ]
--- a/pkg/modules/spanmapper/implspanmapper/fs/definitions/gen_ai.llm.json
+++ b/pkg/modules/spanmapper/implspanmapper/fs/definitions/gen_ai.llm.json
@@ -1,5 +1,5 @@
 {
-  "version": 3,
+  "version": 2,
  "definition": {
    "name": "gen_ai.llm",
    "condition": {
@@ -250,19 +250,19 @@
            {
              "key": "gen_ai.prompt",
              "context": "attribute",
-              "operation": "move",
+              "operation": "copy",
              "priority": 30
            },
            {
              "key": "ai.prompt.messages",
              "context": "attribute",
-              "operation": "move",
+              "operation": "copy",
              "priority": 20
            },
            {
              "key": "input.value",
              "context": "attribute",
-              "operation": "move",
+              "operation": "copy",
              "priority": 10
            }
          ]
@@ -276,25 +276,25 @@
            {
              "key": "gen_ai.completion",
              "context": "attribute",
-              "operation": "move",
+              "operation": "copy",
              "priority": 30
            },
            {
              "key": "ai.response.toolCalls",
              "context": "attribute",
-              "operation": "move",
+              "operation": "copy",
              "priority": 25
            },
            {
              "key": "ai.response.text",
              "context": "attribute",
-              "operation": "move",
+              "operation": "copy",
              "priority": 20
            },
            {
              "key": "output.value",
              "context": "attribute",
-              "operation": "move",
+              "operation": "copy",
              "priority": 10
            }
          ]
--- a/pkg/query-service/app/http_handler.go
+++ b/pkg/query-service/app/http_handler.go
@@ -1478,6 +1478,15 @@ func (aH *APIHandler) getFeatureFlags(w http.ResponseWriter, r *http.Request) {
 		Route:      "",
 	})

+	aiObservability := aH.Signoz.Flagger.BooleanOrEmpty(r.Context(), flagger.FeatureEnableAIObservability, evalCtx)
+	featureSet = append(featureSet, &licensetypes.Feature{
+		Name:       valuer.NewString(flagger.FeatureEnableAIObservability.String()),
+		Active:     aiObservability,
+		Usage:      0,
+		UsageLimit: -1,
+		Route:      "",
+	})
+
 	aH.Respond(w, featureSet)
 }

--- a/pkg/signoz/provider.go
+++ b/pkg/signoz/provider.go
@@ -255,8 +255,6 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewNormalizeQuickFilterFieldsFactory(sqlstore),
 		sqlmigration.NewAddSpanMapperOriginFactory(sqlstore, sqlschema),
 		sqlmigration.NewAddCloudIntegrationTuplesFactory(sqlstore),
-		sqlmigration.NewAddNotificationChannelTuplesFactory(sqlstore),
-		sqlmigration.NewAddAIObservabilityQuickFiltersFactory(sqlstore),
 	)
 }

--- a/pkg/sqlmigration/129_add_notification_channel_tuples.go
+++ b/pkg/sqlmigration/129_add_notification_channel_tuples.go
@@ -1,140 +0,0 @@
-package sqlmigration
-
-import (
-	"context"
-	"database/sql"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/oklog/ulid/v2"
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/dialect"
-	"github.com/uptrace/bun/migrate"
-)
-
-type addNotificationChannelTuples struct {
-	sqlstore sqlstore.SQLStore
-}
-
-func NewAddNotificationChannelTuplesFactory(sqlstore sqlstore.SQLStore) factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(factory.MustNewName("add_notification_channel_tuples"), func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-		return &addNotificationChannelTuples{sqlstore: sqlstore}, nil
-	})
-}
-
-func (migration *addNotificationChannelTuples) Register(migrations *migrate.Migrations) error {
-	return migrations.Register(migration.Up, migration.Down)
-}
-
-func (migration *addNotificationChannelTuples) Up(ctx context.Context, db *bun.DB) error {
-	tx, err := db.BeginTx(ctx, nil)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = tx.Rollback() }()
-
-	var storeID string
-	err = tx.QueryRowContext(ctx, `SELECT id FROM store WHERE name = ? LIMIT 1`, "signoz").Scan(&storeID)
-	if err != nil {
-		return err
-	}
-
-	var orgIDs []string
-	err = tx.NewSelect().
-		Table("organizations").
-		Column("id").
-		Scan(ctx, &orgIDs)
-	if err != nil && err != sql.ErrNoRows {
-		return err
-	}
-
-	isPG := migration.sqlstore.BunDB().Dialect().Name() == dialect.PG
-
-	// notification-channel moved from legacy role gates to CheckResources. Existing
-	// organizations need the same tuples that new organizations receive from the
-	// managed-role registry at bootstrap.
-	tuples := []migrationTuple{
-		{authtypes.SigNozAdminRoleName, "metaresource", "notification-channel", "create"},
-		{authtypes.SigNozAdminRoleName, "metaresource", "notification-channel", "read"},
-		{authtypes.SigNozAdminRoleName, "metaresource", "notification-channel", "update"},
-		{authtypes.SigNozAdminRoleName, "metaresource", "notification-channel", "delete"},
-		{authtypes.SigNozAdminRoleName, "metaresource", "notification-channel", "list"},
-		{authtypes.SigNozEditorRoleName, "metaresource", "notification-channel", "read"},
-		{authtypes.SigNozEditorRoleName, "metaresource", "notification-channel", "list"},
-		{authtypes.SigNozViewerRoleName, "metaresource", "notification-channel", "read"},
-		{authtypes.SigNozViewerRoleName, "metaresource", "notification-channel", "list"},
-	}
-
-	for _, orgID := range orgIDs {
-		for _, tuple := range tuples {
-			entropy := ulid.DefaultEntropy()
-			now := time.Now().UTC()
-			tupleID := ulid.MustNew(ulid.Timestamp(now), entropy).String()
-
-			objectID := "organization/" + orgID + "/" + tuple.objectName + "/*"
-			roleSubject := "organization/" + orgID + "/role/" + tuple.roleName
-
-			if isPG {
-				user := "role:" + roleSubject + "#assignee"
-				result, err := tx.ExecContext(ctx, `
-					INSERT INTO tuple (store, object_type, object_id, relation, _user, user_type, ulid, inserted_at)
-					VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-					ON CONFLICT (store, object_type, object_id, relation, _user) DO NOTHING`,
-					storeID, tuple.objectType, objectID, tuple.relation, user, "userset", tupleID, now,
-				)
-				if err != nil {
-					return err
-				}
-				rowsAffected, err := result.RowsAffected()
-				if err != nil {
-					return err
-				}
-				if rowsAffected == 0 {
-					continue
-				}
-				_, err = tx.ExecContext(ctx, `
-					INSERT INTO changelog (store, object_type, object_id, relation, _user, operation, ulid, inserted_at)
-					VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-					ON CONFLICT (store, ulid, object_type) DO NOTHING`,
-					storeID, tuple.objectType, objectID, tuple.relation, user, 0, tupleID, now,
-				)
-				if err != nil {
-					return err
-				}
-			} else {
-				result, err := tx.ExecContext(ctx, `
-					INSERT INTO tuple (store, object_type, object_id, relation, user_object_type, user_object_id, user_relation, user_type, ulid, inserted_at)
-					VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-					ON CONFLICT (store, object_type, object_id, relation, user_object_type, user_object_id, user_relation) DO NOTHING`,
-					storeID, tuple.objectType, objectID, tuple.relation, "role", roleSubject, "assignee", "userset", tupleID, now,
-				)
-				if err != nil {
-					return err
-				}
-				rowsAffected, err := result.RowsAffected()
-				if err != nil {
-					return err
-				}
-				if rowsAffected == 0 {
-					continue
-				}
-				_, err = tx.ExecContext(ctx, `
-					INSERT INTO changelog (store, object_type, object_id, relation, user_object_type, user_object_id, user_relation, operation, ulid, inserted_at)
-					VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-					ON CONFLICT (store, ulid, object_type) DO NOTHING`,
-					storeID, tuple.objectType, objectID, tuple.relation, "role", roleSubject, "assignee", 0, tupleID, now,
-				)
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return tx.Commit()
-}
-
-func (migration *addNotificationChannelTuples) Down(context.Context, *bun.DB) error {
-	return nil
-}
--- a/pkg/sqlmigration/130_add_ai_observability_quick_filters.go
+++ b/pkg/sqlmigration/130_add_ai_observability_quick_filters.go
@@ -1,91 +0,0 @@
-package sqlmigration
-
-import (
-	"context"
-	"time"
-
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/migrate"
-
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type storableAIObservabilityQuickFilter struct {
-	bun.BaseModel `bun:"table:quick_filter"`
-
-	ID        valuer.UUID `bun:"id,pk,type:text"`
-	OrgID     string      `bun:"org_id,type:text,notnull"`
-	Filter    string      `bun:"filter,type:text,notnull"`
-	Source    string      `bun:"source,type:text,notnull"`
-	CreatedAt time.Time   `bun:"created_at"`
-	UpdatedAt time.Time   `bun:"updated_at"`
-}
-
-type addAIObservabilityQuickFilters struct{}
-
-func NewAddAIObservabilityQuickFiltersFactory(sqlstore sqlstore.SQLStore) factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(factory.MustNewName("add_ai_o11y_quick_filters"), func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-		return &addAIObservabilityQuickFilters{}, nil
-	})
-}
-
-func (migration *addAIObservabilityQuickFilters) Register(migrations *migrate.Migrations) error {
-	return migrations.Register(migration.Up, migration.Down)
-}
-
-func (migration *addAIObservabilityQuickFilters) Up(ctx context.Context, db *bun.DB) error {
-	filters := []telemetryFieldKeyOutput{
-		{Name: "deployment.environment", FieldContext: "resource", FieldDataType: "string"},
-		{Name: "gen_ai.operation.name", FieldContext: "attribute", FieldDataType: "string"},
-		{Name: "gen_ai.provider.name", FieldContext: "attribute", FieldDataType: "string"},
-		{Name: "gen_ai.request.model", FieldContext: "attribute", FieldDataType: "string"},
-		{Name: "service.name", FieldContext: "resource", FieldDataType: "string"},
-		{Name: "gen_ai.tool.name", FieldContext: "attribute", FieldDataType: "string"},
-		{Name: "gen_ai.agent.name", FieldContext: "attribute", FieldDataType: "string"},
-	}
-
-	filterJSON, err := marshalUnescaped(filters)
-	if err != nil {
-		return err
-	}
-
-	tx, err := db.BeginTx(ctx, nil)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = tx.Rollback() }()
-
-	var orgIDs []string
-	if err := tx.NewSelect().Table("organizations").Column("id").Scan(ctx, &orgIDs); err != nil {
-		return err
-	}
-
-	if len(orgIDs) == 0 {
-		return tx.Commit()
-	}
-
-	now := time.Now()
-	rows := make([]*storableAIObservabilityQuickFilter, 0, len(orgIDs))
-	for _, orgID := range orgIDs {
-		rows = append(rows, &storableAIObservabilityQuickFilter{
-			ID:        valuer.GenerateUUID(),
-			OrgID:     orgID,
-			Filter:    string(filterJSON),
-			Source:    "ai_observability",
-			CreatedAt: now,
-			UpdatedAt: now,
-		})
-	}
-
-	if _, err := tx.NewInsert().Model(&rows).On("CONFLICT (org_id, source) DO NOTHING").Exec(ctx); err != nil {
-		return err
-	}
-
-	return tx.Commit()
-}
-
-func (migration *addAIObservabilityQuickFilters) Down(context.Context, *bun.DB) error {
-	return nil
-}
--- a/pkg/types/coretypes/registry_resource.go
+++ b/pkg/types/coretypes/registry_resource.go
@@ -47,7 +47,7 @@ var (
 	ResourceRole                                         = NewResourceRole()
 	ResourceServiceAccount                               = NewResourceServiceAccount()
 	ResourceUser                                         = NewResourceUser()
-	ResourceMetaResourceNotificationChannel              = NewResourceMetaResource(KindNotificationChannel, VerbCreate, VerbList, VerbRead, VerbUpdate, VerbDelete)
+	ResourceMetaResourceNotificationChannel              = NewResourceMetaResource(KindNotificationChannel)
 	ResourceMetaResourceRoutePolicy                      = NewResourceMetaResource(KindRoutePolicy)
 	ResourceMetaResourceApdexSetting                     = NewResourceMetaResource(KindApdexSetting)
 	ResourceMetaResourceAuthDomain                       = NewResourceMetaResource(KindAuthDomain)
--- a/tests/e2e/conftest.py
+++ b/tests/e2e/conftest.py
@@ -0,0 +1,39 @@
+# TODO: remove this file once enable_ai_observability flag is removed or defaulted to True
+import pytest
+from testcontainers.core.container import Network
+
+from fixtures import types
+from fixtures.signoz import create_signoz
+
+
+@pytest.fixture(name="signoz", scope="package")
+def signoz_e2e(  # pylint: disable=too-many-arguments,too-many-positional-arguments
+    network: Network,
+    zeus: types.TestContainerDocker,
+    gateway: types.TestContainerDocker,
+    sqlstore: types.TestContainerSQL,
+    clickhouse: types.TestContainerClickhouse,
+    request: pytest.FixtureRequest,
+    pytestconfig: pytest.Config,
+) -> types.SigNoz:
+    """
+    E2E-scoped SigNoz override. Enables the experimental AI/LLM Observability
+    module (disabled by default in pkg/flagger/registry.go) so its routes render
+    instead of redirecting to /home — required by the llm-o11y e2e specs. Scoped
+    to the e2e package via this conftest so normal integration tests keep the
+    stock feature set. Follows the same pattern as
+    tests/integration/tests/metricreduction/conftest.py.
+    """
+    return create_signoz(
+        network=network,
+        zeus=zeus,
+        gateway=gateway,
+        sqlstore=sqlstore,
+        clickhouse=clickhouse,
+        request=request,
+        pytestconfig=pytestconfig,
+        cache_key="signoz_e2e",
+        env_overrides={
+            "SIGNOZ_FLAGGER_CONFIG_BOOLEAN_ENABLE__AI__OBSERVABILITY": True,
+        },
+    )
--- a/tests/e2e/tests/llm-o11y/attribute-mapping.spec.ts
+++ b/tests/e2e/tests/llm-o11y/attribute-mapping.spec.ts
@@ -9,7 +9,6 @@ import { authToken } from '../../helpers/common';
 test.describe.configure({ mode: 'serial' });

 const GROUP_NAME = 'e2e-attr-mapping-happy';
-const GROUP_CONDITION = 'my_company.llm.';

 const TARGET_ATTR = 'gen_ai.content.prompt';
 const SOURCE_ATTR = 'my_company.llm.input';
@@ -35,8 +34,6 @@ test.describe('LLM Observability — Attribute Mapping', () => {
 		const groupDrawer = page.getByTestId('group-form-drawer');
 		await expect(groupDrawer).toBeVisible();
 		await page.getByTestId('group-form-name').fill(GROUP_NAME);
-		await page.getByTestId('group-form-attribute-add').click();
-		await page.getByTestId('group-form-attribute-0').fill(GROUP_CONDITION);
 		await page.getByTestId('group-form-save').click();
 		await expect(groupDrawer).toBeHidden();
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><g fill="none" fill-rule="evenodd"><path fill="#c925d1" d="M0 0h64v64H0z"/><path fill="#fff" d="M36.213 16.011h-2.016v-2.005h2.016V12h2.017v2.006h2.016v2.005H38.23v2.006h-2.017zm9.074 8.023h-2.016v-2.006h2.016v-2.005h2.016v2.005h2.017v2.006h-2.017v2.006h-2.016v-2.006m-3.434 22.64c-1.495-3.292-4.482-6.263-7.792-7.75 3.31-1.487 6.297-4.459 7.792-7.75 1.494 3.291 4.482 6.263 7.791 7.75-3.31 1.487-6.297 4.458-7.79 7.75m12.139-8.753c-5.202 0-11.13-5.898-11.13-11.071 0-.555-.452-1.003-1.009-1.003s-1.008.448-1.008 1.003c0 5.173-5.93 11.071-11.13 11.071-.558 0-1.009.448-1.009 1.003s.45 1.003 1.008 1.003c5.202 0 11.13 5.898 11.13 11.07 0 .554.452 1.003 1.01 1.003.556 0 1.007-.45 1.007-1.003 0-5.172 5.93-11.07 11.13-11.07.558 0 1.009-.45 1.009-1.003 0-.555-.45-1.003-1.008-1.003m-31.39-19.904c6.85 0 10.587 1.988 10.587 3.008s-3.737 3.009-10.586 3.009-10.587-1.988-10.587-3.009 3.737-3.008 10.587-3.008m-.35 15.15c-5.012 0-8.62-1.063-10.236-2.19v-7.113c2.367 1.433 6.487 2.176 10.587 2.176s8.22-.743 10.586-2.176v6.484c-1.016 1.406-5.247 2.819-10.936 2.819M33.19 45.975c0 1.435-4.126 3.52-10.59 3.52-6.46 0-10.583-2.085-10.583-3.52v-4.407c2.258 1.354 6.014 2.192 10.276 2.192 2.942 0 5.786-.413 8.01-1.166l-.651-1.898c-2.019.682-4.633 1.058-7.359 1.058-5.39 0-9.252-1.402-10.276-2.76v-5.707c2.411 1.176 6.113 1.885 10.237 1.885 3.92 0 8.34-.725 10.936-2.269v2.162h2.016v-14.04c0-3.292-6.34-5.014-12.602-5.014S10 17.733 10 21.025v24.95c0 3.59 6.49 5.526 12.598 5.526 6.112 0 12.607-1.937 12.607-5.526v-2.887h-2.016z"/></g></svg>