test(explorer): add e2e coverage for the list order-by

Covers the two reported bugs, back navigation on traces and a deep link on
logs, and the two paths that unit tests cannot reach: the URL round trip and
the clear between the LLM raw tabs.

The order-by control gets a data-testid. Its four mount points share no other
hook, since the LLM trace view styles it with a CSS module.

docs/api/openapi.yml

@@ -1,219 +1,5 @@
 components:
   schemas:
-    AiobservabilitytypesBlobPart:
-      properties:
-        content:
-          type: string
-        mime_type:
-          nullable: true
-          type: string
-        modality:
-          type: string
-        type:
-          type: string
-      required:
-      - type
-      - modality
-      - content
-      type: object
-    AiobservabilitytypesChatMessage:
-      properties:
-        name:
-          nullable: true
-          type: string
-        parts:
-          $ref: '#/components/schemas/AiobservabilitytypesParts'
-        role:
-          type: string
-      required:
-      - role
-      - parts
-      type: object
-    AiobservabilitytypesCompactionPart:
-      properties:
-        content:
-          nullable: true
-          type: string
-        id:
-          nullable: true
-          type: string
-        type:
-          type: string
-      required:
-      - type
-      type: object
-    AiobservabilitytypesFilePart:
-      properties:
-        file_id:
-          type: string
-        mime_type:
-          nullable: true
-          type: string
-        modality:
-          type: string
-        type:
-          type: string
-      required:
-      - type
-      - modality
-      - file_id
-      type: object
-    AiobservabilitytypesGenericPart:
-      additionalProperties: {}
-      type: object
-    AiobservabilitytypesGenericServerToolCall:
-      additionalProperties: {}
-      type: object
-    AiobservabilitytypesGenericServerToolCallResponse:
-      additionalProperties: {}
-      type: object
-    AiobservabilitytypesInputMessages:
-      items:
-        $ref: '#/components/schemas/AiobservabilitytypesChatMessage'
-      type: array
-    AiobservabilitytypesOutputMessage:
-      properties:
-        finish_reason:
-          nullable: true
-          type: string
-        name:
-          nullable: true
-          type: string
-        parts:
-          $ref: '#/components/schemas/AiobservabilitytypesParts'
-        role:
-          type: string
-      required:
-      - role
-      - parts
-      type: object
-    AiobservabilitytypesOutputMessages:
-      items:
-        $ref: '#/components/schemas/AiobservabilitytypesOutputMessage'
-      type: array
-    AiobservabilitytypesPart:
-      discriminator:
-        mapping:
-          blob: '#/components/schemas/AiobservabilitytypesBlobPart'
-          compaction: '#/components/schemas/AiobservabilitytypesCompactionPart'
-          file: '#/components/schemas/AiobservabilitytypesFilePart'
-          reasoning: '#/components/schemas/AiobservabilitytypesReasoningPart'
-          server_tool_call: '#/components/schemas/AiobservabilitytypesServerToolCallPart'
-          server_tool_call_response: '#/components/schemas/AiobservabilitytypesServerToolCallResponsePart'
-          text: '#/components/schemas/AiobservabilitytypesTextPart'
-          tool_call: '#/components/schemas/AiobservabilitytypesToolCallRequestPart'
-          tool_call_response: '#/components/schemas/AiobservabilitytypesToolCallResponsePart'
-          uri: '#/components/schemas/AiobservabilitytypesUriPart'
-        propertyName: type
-      oneOf:
-      - $ref: '#/components/schemas/AiobservabilitytypesTextPart'
-      - $ref: '#/components/schemas/AiobservabilitytypesToolCallRequestPart'
-      - $ref: '#/components/schemas/AiobservabilitytypesToolCallResponsePart'
-      - $ref: '#/components/schemas/AiobservabilitytypesServerToolCallPart'
-      - $ref: '#/components/schemas/AiobservabilitytypesServerToolCallResponsePart'
-      - $ref: '#/components/schemas/AiobservabilitytypesBlobPart'
-      - $ref: '#/components/schemas/AiobservabilitytypesFilePart'
-      - $ref: '#/components/schemas/AiobservabilitytypesUriPart'
-      - $ref: '#/components/schemas/AiobservabilitytypesReasoningPart'
-      - $ref: '#/components/schemas/AiobservabilitytypesCompactionPart'
-      - $ref: '#/components/schemas/AiobservabilitytypesGenericPart'
-      type: object
-    AiobservabilitytypesParts:
-      items:
-        $ref: '#/components/schemas/AiobservabilitytypesPart'
-      type: array
-    AiobservabilitytypesReasoningPart:
-      properties:
-        content:
-          type: string
-        type:
-          type: string
-      required:
-      - type
-      - content
-      type: object
-    AiobservabilitytypesServerToolCallPart:
-      properties:
-        id:
-          nullable: true
-          type: string
-        name:
-          type: string
-        server_tool_call:
-          $ref: '#/components/schemas/AiobservabilitytypesGenericServerToolCall'
-        type:
-          type: string
-      required:
-      - type
-      - name
-      - server_tool_call
-      type: object
-    AiobservabilitytypesServerToolCallResponsePart:
-      properties:
-        id:
-          nullable: true
-          type: string
-        server_tool_call_response:
-          $ref: '#/components/schemas/AiobservabilitytypesGenericServerToolCallResponse'
-        type:
-          type: string
-      required:
-      - type
-      - server_tool_call_response
-      type: object
-    AiobservabilitytypesTextPart:
-      properties:
-        content:
-          type: string
-        type:
-          type: string
-      required:
-      - type
-      - content
-      type: object
-    AiobservabilitytypesToolCallRequestPart:
-      properties:
-        arguments: {}
-        id:
-          nullable: true
-          type: string
-        name:
-          type: string
-        type:
-          type: string
-      required:
-      - type
-      - name
-      type: object
-    AiobservabilitytypesToolCallResponsePart:
-      properties:
-        id:
-          nullable: true
-          type: string
-        response:
-          nullable: true
-        type:
-          type: string
-      required:
-      - type
-      - response
-      type: object
-    AiobservabilitytypesUriPart:
-      properties:
-        mime_type:
-          nullable: true
-          type: string
-        modality:
-          type: string
-        type:
-          type: string
-        uri:
-          type: string
-      required:
-      - type
-      - modality
-      - uri
-      type: object
     AlertmanagertypesChannel:
       properties:
         createdAt:
@@ -3581,69 +3367,6 @@ components:
         repeatVariable:
           type: string
       type: object
-    DashboardtypesAIBuilderQuerySpec:
-      properties:
-        aggregations:
-          items:
-            $ref: '#/components/schemas/Querybuildertypesv5TraceAggregation'
-          nullable: true
-          type: array
-        bucketOptions:
-          $ref: '#/components/schemas/Querybuildertypesv5BucketOptions'
-        cursor:
-          type: string
-        disabled:
-          type: boolean
-        filter:
-          $ref: '#/components/schemas/Querybuildertypesv5Filter'
-        functions:
-          items:
-            $ref: '#/components/schemas/Querybuildertypesv5Function'
-          nullable: true
-          type: array
-        groupBy:
-          items:
-            $ref: '#/components/schemas/Querybuildertypesv5GroupByKey'
-          nullable: true
-          type: array
-        having:
-          $ref: '#/components/schemas/Querybuildertypesv5Having'
-        legend:
-          type: string
-        limit:
-          type: integer
-        limitBy:
-          $ref: '#/components/schemas/Querybuildertypesv5LimitBy'
-        name:
-          type: string
-        offset:
-          type: integer
-        order:
-          items:
-            $ref: '#/components/schemas/Querybuildertypesv5OrderBy'
-          nullable: true
-          type: array
-        secondaryAggregations:
-          items:
-            $ref: '#/components/schemas/Querybuildertypesv5SecondaryAggregation'
-          nullable: true
-          type: array
-        selectFields:
-          items:
-            $ref: '#/components/schemas/TelemetrytypesTelemetryFieldKey'
-          nullable: true
-          type: array
-        signal:
-          enum:
-          - traces
-          type: string
-        source:
-          $ref: '#/components/schemas/TelemetrytypesSource'
-        stepInterval:
-          $ref: '#/components/schemas/Querybuildertypesv5Step'
-      required:
-      - signal
-      type: object
     DashboardtypesAreaChartAppearance:
       properties:
         fillMode:
@@ -3702,13 +3425,6 @@ components:
           nullable: true
           type: number
       type: object
-    DashboardtypesAxisScale:
-      enum:
-      - auto
-      - linear
-      - log
-      - symlog
-      type: string
     DashboardtypesBarChartPanelSpec:
       properties:
         axes:
@@ -4451,7 +4167,6 @@ components:
           signoz/ListPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesListPanelSpec'
           signoz/NumberPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesNumberPanelSpec'
           signoz/PieChartPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesPieChartPanelSpec'
-          signoz/ScatterPlotPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec'
           signoz/TablePanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTablePanelSpec'
           signoz/TextPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTextPanelSpec'
           signoz/TimeSeriesPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTimeSeriesPanelSpec'
@@ -4467,7 +4182,6 @@ components:
       - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesListPanelSpec'
       - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTextPanelSpec'
       - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesHeatmapPanelSpec'
-      - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec'
       type: object
     DashboardtypesPanelPluginKind:
       enum:
@@ -4481,7 +4195,6 @@ components:
       - signoz/ListPanel
       - signoz/TextPanel
       - signoz/HeatmapPanel
-      - signoz/ScatterPlotPanel
       type: string
     DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAreaChartPanelSpec:
       properties:
@@ -4567,18 +4280,6 @@ components:
       - kind
       - spec
       type: object
-    DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec:
-      properties:
-        kind:
-          enum:
-          - signoz/ScatterPlotPanel
-          type: string
-        spec:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotPanelSpec'
-      required:
-      - kind
-      - spec
-      type: object
     DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTablePanelSpec:
       properties:
         kind:
@@ -4658,16 +4359,6 @@ components:
         visualization:
           $ref: '#/components/schemas/DashboardtypesBasicVisualization'
       type: object
-    DashboardtypesPointDiameter:
-      maximum: 40
-      minimum: 2
-      nullable: true
-      type: integer
-    DashboardtypesPointOpacity:
-      maximum: 1
-      minimum: 0.1
-      nullable: true
-      type: number
     DashboardtypesPostableDashboardV2:
       properties:
         generateName:
@@ -4729,7 +4420,6 @@ components:
     DashboardtypesQueryPlugin:
       discriminator:
         mapping:
-          signoz/AIBuilderQuery: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpec'
           signoz/BuilderQuery: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpec'
           signoz/ClickHouseSQL: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5ClickHouseQuery'
           signoz/CompositeQuery: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5CompositeQuery'
@@ -4739,7 +4429,6 @@ components:
         propertyName: kind
       oneOf:
       - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpec'
-      - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpec'
       - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5CompositeQuery'
       - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5QueryBuilderFormula'
       - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5PromQuery'
@@ -4749,25 +4438,12 @@ components:
     DashboardtypesQueryPluginKind:
       enum:
       - signoz/BuilderQuery
-      - signoz/AIBuilderQuery
       - signoz/CompositeQuery
       - signoz/Formula
       - signoz/PromQLQuery
       - signoz/ClickHouseSQL
       - signoz/TraceOperator
       type: string
-    DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpec:
-      properties:
-        kind:
-          enum:
-          - signoz/AIBuilderQuery
-          type: string
-        spec:
-          $ref: '#/components/schemas/DashboardtypesAIBuilderQuerySpec'
-      required:
-      - kind
-      - spec
-      type: object
     DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpec:
       properties:
         kind:
@@ -4856,104 +4532,6 @@ components:
       required:
       - queryValue
       type: object
-    DashboardtypesScatterPlotAxes:
-      properties:
-        x:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotAxis'
-        "y":
-          $ref: '#/components/schemas/DashboardtypesScatterPlotAxis'
-      type: object
-    DashboardtypesScatterPlotAxis:
-      properties:
-        label:
-          description: Axis title. Empty draws none.
-          type: string
-        scale:
-          $ref: '#/components/schemas/DashboardtypesAxisScale'
-        softMax:
-          nullable: true
-          type: number
-        softMin:
-          nullable: true
-          type: number
-      type: object
-    DashboardtypesScatterPlotChartAppearance:
-      properties:
-        points:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotPoints'
-      type: object
-    DashboardtypesScatterPlotDimensions:
-      properties:
-        colorBy:
-          description: Group-by label names (e.g. k8s.namespace.name) whose combined
-            values colour dots and drive the legend. Empty colours by every group-by
-            label.
-          items:
-            type: string
-          nullable: true
-          type: array
-        sizeBy:
-          description: Value column key that scales dot size. Empty draws every dot
-            at the default size.
-          type: string
-        x:
-          description: Value column key (queryName, or queryName.expression for a
-            multi-aggregation query) plotted on the x axis. Empty uses the first value
-            column.
-          type: string
-        "y":
-          description: Value column key plotted on the y axis. Empty uses the second
-            value column.
-          type: string
-      type: object
-    DashboardtypesScatterPlotPanelSpec:
-      properties:
-        axes:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotAxes'
-        chartAppearance:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotChartAppearance'
-        dimensions:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotDimensions'
-        formatting:
-          $ref: '#/components/schemas/DashboardtypesTableFormatting'
-        legend:
-          $ref: '#/components/schemas/DashboardtypesLegend'
-        thresholds:
-          items:
-            $ref: '#/components/schemas/DashboardtypesScatterPlotThreshold'
-          nullable: true
-          type: array
-        visualization:
-          $ref: '#/components/schemas/DashboardtypesBasicVisualization'
-      type: object
-    DashboardtypesScatterPlotPoints:
-      properties:
-        maxSize:
-          $ref: '#/components/schemas/DashboardtypesPointDiameter'
-        minSize:
-          $ref: '#/components/schemas/DashboardtypesPointDiameter'
-        opacity:
-          $ref: '#/components/schemas/DashboardtypesPointOpacity'
-        size:
-          $ref: '#/components/schemas/DashboardtypesPointDiameter'
-      type: object
-    DashboardtypesScatterPlotThreshold:
-      properties:
-        axis:
-          $ref: '#/components/schemas/DashboardtypesThresholdAxis'
-        color:
-          type: string
-        label:
-          type: string
-        unit:
-          type: string
-        value:
-          format: double
-          type: number
-      required:
-      - value
-      - color
-      type: object
     DashboardtypesSource:
       enum:
       - user
@@ -5067,11 +4645,6 @@ components:
       - value
       - name
       type: object
-    DashboardtypesThresholdAxis:
-      enum:
-      - x
-      - "y"
-      type: string
     DashboardtypesThresholdFormat:
       enum:
       - text
@@ -10652,16 +10225,6 @@ components:
           items:
             $ref: '#/components/schemas/SpantypesEvent'
           type: array
-        formatted_input:
-          $ref: '#/components/schemas/AiobservabilitytypesInputMessages'
-        formatted_output:
-          $ref: '#/components/schemas/AiobservabilitytypesOutputMessages'
-        formatter:
-          type: string
-        formatter_warnings:
-          items:
-            type: string
-          type: array
         has_error:
           type: boolean
         kind_string:
@@ -10704,10 +10267,6 @@ components:
       - attributes
       - events
       - references
-      - formatted_input
-      - formatted_output
-      - formatter
-      - formatter_warnings
       type: object
     SpantypesTraceAISummary:
       properties:
@@ -16575,12 +16134,9 @@ paths:
   /api/v1/traces/{traceID}/thread:
     get:
       deprecated: false
-      description: Returns the spans carrying gen_ai input or output messages, or
-        a tool execution, in timestamp order. Messages already in the OTel GenAI shape
-        are decoded into formatted_input and formatted_output, with formatter naming
-        the converter and formatter_warnings what it could not resolve. Pass nextCursor
-        as after or prevCursor as before to page, or spanId to open the page around
-        a span.
+      description: Returns the spans carrying gen_ai input or output messages in timestamp
+        order. Pass nextCursor as after or prevCursor as before to page, or spanId
+        to open the page around a span.
       operationId: GetTraceThread
       parameters:
       - description: Page size, at most 100. 0 means 20.

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -4,264 +4,6 @@
  * * regenerate with 'pnpm generate:api'
  * SigNoz
  */
-export enum AiobservabilitytypesBlobPartDTOType {
-	blob = 'blob',
-}
-export interface AiobservabilitytypesBlobPartDTO {
-	/**
-	 * @type string
-	 */
-	content: string;
-	/**
-	 * @type string,null
-	 */
-	mime_type?: string | null;
-	/**
-	 * @type string
-	 */
-	modality: string;
-	/**
-	 * @type string
-	 * @enum blob
-	 */
-	type: AiobservabilitytypesBlobPartDTOType;
-}
-
-export enum AiobservabilitytypesTextPartDTOType {
-	text = 'text',
-}
-export interface AiobservabilitytypesTextPartDTO {
-	/**
-	 * @type string
-	 */
-	content: string;
-	/**
-	 * @type string
-	 * @enum text
-	 */
-	type: AiobservabilitytypesTextPartDTOType;
-}
-
-export enum AiobservabilitytypesToolCallRequestPartDTOType {
-	tool_call = 'tool_call',
-}
-export interface AiobservabilitytypesToolCallRequestPartDTO {
-	arguments?: unknown;
-	/**
-	 * @type string,null
-	 */
-	id?: string | null;
-	/**
-	 * @type string
-	 */
-	name: string;
-	/**
-	 * @type string
-	 * @enum tool_call
-	 */
-	type: AiobservabilitytypesToolCallRequestPartDTOType;
-}
-
-export enum AiobservabilitytypesToolCallResponsePartDTOType {
-	tool_call_response = 'tool_call_response',
-}
-export type AiobservabilitytypesToolCallResponsePartDTOResponse =
-	| unknown
-	| null;
-
-export interface AiobservabilitytypesToolCallResponsePartDTO {
-	/**
-	 * @type string,null
-	 */
-	id?: string | null;
-	/**
-	 * @nullable true
-	 */
-	response: AiobservabilitytypesToolCallResponsePartDTOResponse;
-	/**
-	 * @type string
-	 * @enum tool_call_response
-	 */
-	type: AiobservabilitytypesToolCallResponsePartDTOType;
-}
-
-export interface AiobservabilitytypesGenericServerToolCallDTO {
-	[key: string]: unknown;
-}
-
-export enum AiobservabilitytypesServerToolCallPartDTOType {
-	server_tool_call = 'server_tool_call',
-}
-export interface AiobservabilitytypesServerToolCallPartDTO {
-	/**
-	 * @type string,null
-	 */
-	id?: string | null;
-	/**
-	 * @type string
-	 */
-	name: string;
-	server_tool_call: AiobservabilitytypesGenericServerToolCallDTO;
-	/**
-	 * @type string
-	 * @enum server_tool_call
-	 */
-	type: AiobservabilitytypesServerToolCallPartDTOType;
-}
-
-export interface AiobservabilitytypesGenericServerToolCallResponseDTO {
-	[key: string]: unknown;
-}
-
-export enum AiobservabilitytypesServerToolCallResponsePartDTOType {
-	server_tool_call_response = 'server_tool_call_response',
-}
-export interface AiobservabilitytypesServerToolCallResponsePartDTO {
-	/**
-	 * @type string,null
-	 */
-	id?: string | null;
-	server_tool_call_response: AiobservabilitytypesGenericServerToolCallResponseDTO;
-	/**
-	 * @type string
-	 * @enum server_tool_call_response
-	 */
-	type: AiobservabilitytypesServerToolCallResponsePartDTOType;
-}
-
-export enum AiobservabilitytypesFilePartDTOType {
-	file = 'file',
-}
-export interface AiobservabilitytypesFilePartDTO {
-	/**
-	 * @type string
-	 */
-	file_id: string;
-	/**
-	 * @type string,null
-	 */
-	mime_type?: string | null;
-	/**
-	 * @type string
-	 */
-	modality: string;
-	/**
-	 * @type string
-	 * @enum file
-	 */
-	type: AiobservabilitytypesFilePartDTOType;
-}
-
-export enum AiobservabilitytypesUriPartDTOType {
-	uri = 'uri',
-}
-export interface AiobservabilitytypesUriPartDTO {
-	/**
-	 * @type string,null
-	 */
-	mime_type?: string | null;
-	/**
-	 * @type string
-	 */
-	modality: string;
-	/**
-	 * @type string
-	 * @enum uri
-	 */
-	type: AiobservabilitytypesUriPartDTOType;
-	/**
-	 * @type string
-	 */
-	uri: string;
-}
-
-export enum AiobservabilitytypesReasoningPartDTOType {
-	reasoning = 'reasoning',
-}
-export interface AiobservabilitytypesReasoningPartDTO {
-	/**
-	 * @type string
-	 */
-	content: string;
-	/**
-	 * @type string
-	 * @enum reasoning
-	 */
-	type: AiobservabilitytypesReasoningPartDTOType;
-}
-
-export enum AiobservabilitytypesCompactionPartDTOType {
-	compaction = 'compaction',
-}
-export interface AiobservabilitytypesCompactionPartDTO {
-	/**
-	 * @type string,null
-	 */
-	content?: string | null;
-	/**
-	 * @type string,null
-	 */
-	id?: string | null;
-	/**
-	 * @type string
-	 * @enum compaction
-	 */
-	type: AiobservabilitytypesCompactionPartDTOType;
-}
-
-export interface AiobservabilitytypesGenericPartDTO {
-	[key: string]: unknown;
-}
-
-export type AiobservabilitytypesPartDTO =
-	| AiobservabilitytypesTextPartDTO
-	| AiobservabilitytypesToolCallRequestPartDTO
-	| AiobservabilitytypesToolCallResponsePartDTO
-	| AiobservabilitytypesServerToolCallPartDTO
-	| AiobservabilitytypesServerToolCallResponsePartDTO
-	| AiobservabilitytypesBlobPartDTO
-	| AiobservabilitytypesFilePartDTO
-	| AiobservabilitytypesUriPartDTO
-	| AiobservabilitytypesReasoningPartDTO
-	| AiobservabilitytypesCompactionPartDTO
-	| AiobservabilitytypesGenericPartDTO;
-
-export type AiobservabilitytypesPartsDTO = AiobservabilitytypesPartDTO[];
-
-export interface AiobservabilitytypesChatMessageDTO {
-	/**
-	 * @type string,null
-	 */
-	name?: string | null;
-	parts: AiobservabilitytypesPartsDTO;
-	/**
-	 * @type string
-	 */
-	role: string;
-}
-
-export type AiobservabilitytypesInputMessagesDTO =
-	AiobservabilitytypesChatMessageDTO[];
-
-export interface AiobservabilitytypesOutputMessageDTO {
-	/**
-	 * @type string,null
-	 */
-	finish_reason?: string | null;
-	/**
-	 * @type string,null
-	 */
-	name?: string | null;
-	parts: AiobservabilitytypesPartsDTO;
-	/**
-	 * @type string
-	 */
-	role: string;
-}
-
-export type AiobservabilitytypesOutputMessagesDTO =
-	AiobservabilitytypesOutputMessageDTO[];
-
 export interface AlertmanagertypesChannelDTO {
 	/**
 	 * @type string
@@ -4469,10 +4211,195 @@ export interface DashboardGridLayoutSpecDTO {
 	repeatVariable?: string;
 }
 
-export enum DashboardtypesAIBuilderQuerySpecDTOSignal {
-	traces = 'traces',
+export enum DashboardtypesAreaFillModeDTO {
+	solid = 'solid',
+	gradient = 'gradient',
 }
-export interface Querybuildertypesv5TraceAggregationDTO {
+/**
+ * @minimum 0
+ * @maximum 1
+ * @nullable
+ */
+export type DashboardtypesFillOpacityDTO = number | null;
+
+export enum DashboardtypesLineInterpolationDTO {
+	linear = 'linear',
+	spline = 'spline',
+	step_after = 'step_after',
+	step_before = 'step_before',
+}
+export enum DashboardtypesLineStyleDTO {
+	solid = 'solid',
+	dashed = 'dashed',
+}
+export interface DashboardtypesSpanGapsDTO {
+	/**
+	 * @type string
+	 * @description The maximum gap size to connect when fillOnlyBelow is true. Gaps larger than this duration are left disconnected.
+	 */
+	fillLessThan?: string;
+	/**
+	 * @type boolean
+	 * @description Controls whether lines connect across null values. When false (default), all gaps are connected. When true, only gaps smaller than fillLessThan are connected.
+	 */
+	fillOnlyBelow?: boolean;
+}
+
+export interface DashboardtypesAreaChartAppearanceDTO {
+	fillMode?: DashboardtypesAreaFillModeDTO;
+	fillOpacity?: DashboardtypesFillOpacityDTO | null;
+	lineInterpolation?: DashboardtypesLineInterpolationDTO;
+	lineStyle?: DashboardtypesLineStyleDTO;
+	/**
+	 * @type boolean
+	 */
+	showPoints?: boolean;
+	spanGaps?: DashboardtypesSpanGapsDTO;
+}
+
+export interface DashboardtypesAxesDTO {
+	/**
+	 * @type boolean
+	 */
+	isLogScale?: boolean;
+	/**
+	 * @type number,null
+	 */
+	softMax?: number | null;
+	/**
+	 * @type number,null
+	 */
+	softMin?: number | null;
+}
+
+export enum DashboardtypesPrecisionOptionDTO {
+	NUMBER_0 = '0',
+	NUMBER_1 = '1',
+	NUMBER_2 = '2',
+	NUMBER_3 = '3',
+	NUMBER_4 = '4',
+	full = 'full',
+}
+export interface DashboardtypesPanelFormattingDTO {
+	decimalPrecision?: DashboardtypesPrecisionOptionDTO;
+	/**
+	 * @type string
+	 */
+	unit?: string;
+}
+
+export enum DashboardtypesLegendModeDTO {
+	list = 'list',
+}
+export enum DashboardtypesLegendPositionDTO {
+	bottom = 'bottom',
+	right = 'right',
+}
+export type DashboardtypesLegendDTOCustomColorsAnyOf = {
+	[key: string]: string;
+};
+
+/**
+ * @nullable
+ */
+export type DashboardtypesLegendDTOCustomColors =
+	DashboardtypesLegendDTOCustomColorsAnyOf | null;
+
+export interface DashboardtypesLegendDTO {
+	/**
+	 * @type object,null
+	 */
+	customColors?: DashboardtypesLegendDTOCustomColors;
+	mode?: DashboardtypesLegendModeDTO;
+	position?: DashboardtypesLegendPositionDTO;
+}
+
+export interface DashboardtypesThresholdWithLabelDTO {
+	/**
+	 * @type string
+	 */
+	color: string;
+	/**
+	 * @type string
+	 */
+	label?: string;
+	/**
+	 * @type string
+	 */
+	unit?: string;
+	/**
+	 * @type number
+	 * @format double
+	 */
+	value: number;
+}
+
+export enum DashboardtypesStackModeDTO {
+	none = 'none',
+	normal = 'normal',
+	percent = 'percent',
+}
+export enum DashboardtypesTimePreferenceDTO {
+	global_time = 'global_time',
+	last_5_min = 'last_5_min',
+	last_15_min = 'last_15_min',
+	last_30_min = 'last_30_min',
+	last_1_hr = 'last_1_hr',
+	last_6_hr = 'last_6_hr',
+	last_1_day = 'last_1_day',
+	last_3_days = 'last_3_days',
+	last_1_week = 'last_1_week',
+	last_1_month = 'last_1_month',
+}
+export interface DashboardtypesAreaChartVisualizationDTO {
+	/**
+	 * @type boolean
+	 */
+	fillSpans?: boolean;
+	stack?: DashboardtypesStackModeDTO;
+	timePreference?: DashboardtypesTimePreferenceDTO;
+}
+
+export interface DashboardtypesAreaChartPanelSpecDTO {
+	axes?: DashboardtypesAxesDTO;
+	chartAppearance?: DashboardtypesAreaChartAppearanceDTO;
+	formatting?: DashboardtypesPanelFormattingDTO;
+	legend?: DashboardtypesLegendDTO;
+	/**
+	 * @type array,null
+	 */
+	thresholds?: DashboardtypesThresholdWithLabelDTO[] | null;
+	visualization?: DashboardtypesAreaChartVisualizationDTO;
+}
+
+export interface DashboardtypesBarChartVisualizationDTO {
+	/**
+	 * @type boolean
+	 */
+	fillSpans?: boolean;
+	/**
+	 * @type boolean
+	 */
+	stackedBarChart?: boolean;
+	timePreference?: DashboardtypesTimePreferenceDTO;
+}
+
+export interface DashboardtypesBarChartPanelSpecDTO {
+	axes?: DashboardtypesAxesDTO;
+	formatting?: DashboardtypesPanelFormattingDTO;
+	legend?: DashboardtypesLegendDTO;
+	/**
+	 * @type array,null
+	 */
+	thresholds?: DashboardtypesThresholdWithLabelDTO[] | null;
+	visualization?: DashboardtypesBarChartVisualizationDTO;
+}
+
+export interface DashboardtypesBasicVisualizationDTO {
+	timePreference?: DashboardtypesTimePreferenceDTO;
+}
+
+export interface Querybuildertypesv5LogAggregationDTO {
 	/**
 	 * @type string
 	 */
@@ -4711,274 +4638,13 @@ export interface TelemetrytypesTelemetryFieldKeyDTO {
 	unit?: string;
 }
 
+export enum Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5LogAggregationDTOSignal {
+	logs = 'logs',
+}
 export enum TelemetrytypesSourceDTO {
 	meter = 'meter',
 	'' = '',
 }
-export interface DashboardtypesAIBuilderQuerySpecDTO {
-	/**
-	 * @type array,null
-	 */
-	aggregations?: Querybuildertypesv5TraceAggregationDTO[] | null;
-	bucketOptions?: Querybuildertypesv5BucketOptionsDTO;
-	/**
-	 * @type string
-	 */
-	cursor?: string;
-	/**
-	 * @type boolean
-	 */
-	disabled?: boolean;
-	filter?: Querybuildertypesv5FilterDTO;
-	/**
-	 * @type array,null
-	 */
-	functions?: Querybuildertypesv5FunctionDTO[] | null;
-	/**
-	 * @type array,null
-	 */
-	groupBy?: Querybuildertypesv5GroupByKeyDTO[] | null;
-	having?: Querybuildertypesv5HavingDTO;
-	/**
-	 * @type string
-	 */
-	legend?: string;
-	/**
-	 * @type integer
-	 */
-	limit?: number;
-	limitBy?: Querybuildertypesv5LimitByDTO;
-	/**
-	 * @type string
-	 */
-	name?: string;
-	/**
-	 * @type integer
-	 */
-	offset?: number;
-	/**
-	 * @type array,null
-	 */
-	order?: Querybuildertypesv5OrderByDTO[] | null;
-	/**
-	 * @type array,null
-	 */
-	secondaryAggregations?: Querybuildertypesv5SecondaryAggregationDTO[] | null;
-	/**
-	 * @type array,null
-	 */
-	selectFields?: TelemetrytypesTelemetryFieldKeyDTO[] | null;
-	/**
-	 * @enum traces
-	 * @type string
-	 */
-	signal: DashboardtypesAIBuilderQuerySpecDTOSignal;
-	source?: TelemetrytypesSourceDTO;
-	stepInterval?: Querybuildertypesv5StepDTO;
-}
-
-export enum DashboardtypesAreaFillModeDTO {
-	solid = 'solid',
-	gradient = 'gradient',
-}
-/**
- * @minimum 0
- * @maximum 1
- * @nullable
- */
-export type DashboardtypesFillOpacityDTO = number | null;
-
-export enum DashboardtypesLineInterpolationDTO {
-	linear = 'linear',
-	spline = 'spline',
-	step_after = 'step_after',
-	step_before = 'step_before',
-}
-export enum DashboardtypesLineStyleDTO {
-	solid = 'solid',
-	dashed = 'dashed',
-}
-export interface DashboardtypesSpanGapsDTO {
-	/**
-	 * @type string
-	 * @description The maximum gap size to connect when fillOnlyBelow is true. Gaps larger than this duration are left disconnected.
-	 */
-	fillLessThan?: string;
-	/**
-	 * @type boolean
-	 * @description Controls whether lines connect across null values. When false (default), all gaps are connected. When true, only gaps smaller than fillLessThan are connected.
-	 */
-	fillOnlyBelow?: boolean;
-}
-
-export interface DashboardtypesAreaChartAppearanceDTO {
-	fillMode?: DashboardtypesAreaFillModeDTO;
-	fillOpacity?: DashboardtypesFillOpacityDTO | null;
-	lineInterpolation?: DashboardtypesLineInterpolationDTO;
-	lineStyle?: DashboardtypesLineStyleDTO;
-	/**
-	 * @type boolean
-	 */
-	showPoints?: boolean;
-	spanGaps?: DashboardtypesSpanGapsDTO;
-}
-
-export interface DashboardtypesAxesDTO {
-	/**
-	 * @type boolean
-	 */
-	isLogScale?: boolean;
-	/**
-	 * @type number,null
-	 */
-	softMax?: number | null;
-	/**
-	 * @type number,null
-	 */
-	softMin?: number | null;
-}
-
-export enum DashboardtypesPrecisionOptionDTO {
-	NUMBER_0 = '0',
-	NUMBER_1 = '1',
-	NUMBER_2 = '2',
-	NUMBER_3 = '3',
-	NUMBER_4 = '4',
-	full = 'full',
-}
-export interface DashboardtypesPanelFormattingDTO {
-	decimalPrecision?: DashboardtypesPrecisionOptionDTO;
-	/**
-	 * @type string
-	 */
-	unit?: string;
-}
-
-export enum DashboardtypesLegendModeDTO {
-	list = 'list',
-}
-export enum DashboardtypesLegendPositionDTO {
-	bottom = 'bottom',
-	right = 'right',
-}
-export type DashboardtypesLegendDTOCustomColorsAnyOf = {
-	[key: string]: string;
-};
-
-/**
- * @nullable
- */
-export type DashboardtypesLegendDTOCustomColors =
-	DashboardtypesLegendDTOCustomColorsAnyOf | null;
-
-export interface DashboardtypesLegendDTO {
-	/**
-	 * @type object,null
-	 */
-	customColors?: DashboardtypesLegendDTOCustomColors;
-	mode?: DashboardtypesLegendModeDTO;
-	position?: DashboardtypesLegendPositionDTO;
-}
-
-export interface DashboardtypesThresholdWithLabelDTO {
-	/**
-	 * @type string
-	 */
-	color: string;
-	/**
-	 * @type string
-	 */
-	label?: string;
-	/**
-	 * @type string
-	 */
-	unit?: string;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	value: number;
-}
-
-export enum DashboardtypesStackModeDTO {
-	none = 'none',
-	normal = 'normal',
-	percent = 'percent',
-}
-export enum DashboardtypesTimePreferenceDTO {
-	global_time = 'global_time',
-	last_5_min = 'last_5_min',
-	last_15_min = 'last_15_min',
-	last_30_min = 'last_30_min',
-	last_1_hr = 'last_1_hr',
-	last_6_hr = 'last_6_hr',
-	last_1_day = 'last_1_day',
-	last_3_days = 'last_3_days',
-	last_1_week = 'last_1_week',
-	last_1_month = 'last_1_month',
-}
-export interface DashboardtypesAreaChartVisualizationDTO {
-	/**
-	 * @type boolean
-	 */
-	fillSpans?: boolean;
-	stack?: DashboardtypesStackModeDTO;
-	timePreference?: DashboardtypesTimePreferenceDTO;
-}
-
-export interface DashboardtypesAreaChartPanelSpecDTO {
-	axes?: DashboardtypesAxesDTO;
-	chartAppearance?: DashboardtypesAreaChartAppearanceDTO;
-	formatting?: DashboardtypesPanelFormattingDTO;
-	legend?: DashboardtypesLegendDTO;
-	/**
-	 * @type array,null
-	 */
-	thresholds?: DashboardtypesThresholdWithLabelDTO[] | null;
-	visualization?: DashboardtypesAreaChartVisualizationDTO;
-}
-
-export interface DashboardtypesBarChartVisualizationDTO {
-	/**
-	 * @type boolean
-	 */
-	fillSpans?: boolean;
-	/**
-	 * @type boolean
-	 */
-	stackedBarChart?: boolean;
-	timePreference?: DashboardtypesTimePreferenceDTO;
-}
-
-export interface DashboardtypesBarChartPanelSpecDTO {
-	axes?: DashboardtypesAxesDTO;
-	formatting?: DashboardtypesPanelFormattingDTO;
-	legend?: DashboardtypesLegendDTO;
-	/**
-	 * @type array,null
-	 */
-	thresholds?: DashboardtypesThresholdWithLabelDTO[] | null;
-	visualization?: DashboardtypesBarChartVisualizationDTO;
-}
-
-export interface DashboardtypesBasicVisualizationDTO {
-	timePreference?: DashboardtypesTimePreferenceDTO;
-}
-
-export interface Querybuildertypesv5LogAggregationDTO {
-	/**
-	 * @type string
-	 */
-	alias?: string;
-	/**
-	 * @type string
-	 */
-	expression?: string;
-}
-
-export enum Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5LogAggregationDTOSignal {
-	logs = 'logs',
-}
 export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5LogAggregationDTO {
 	/**
 	 * @type array,null
@@ -5169,6 +4835,17 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	stepInterval?: Querybuildertypesv5StepDTO;
 }
 
+export interface Querybuildertypesv5TraceAggregationDTO {
+	/**
+	 * @type string
+	 */
+	alias?: string;
+	/**
+	 * @type string
+	 */
+	expression?: string;
+}
+
 export enum Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5TraceAggregationDTOSignal {
 	traces = 'traces',
 }
@@ -5727,18 +5404,6 @@ export interface DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDa
 	spec: DashboardtypesBuilderQuerySpecDTO;
 }
 
-export enum DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpecDTOKind {
-	'signoz/AIBuilderQuery' = 'signoz/AIBuilderQuery',
-}
-export interface DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpecDTO {
-	/**
-	 * @enum signoz/AIBuilderQuery
-	 * @type string
-	 */
-	kind: DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpecDTOKind;
-	spec: DashboardtypesAIBuilderQuerySpecDTO;
-}
-
 export enum DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5CompositeQueryDTOKind {
 	'signoz/CompositeQuery' = 'signoz/CompositeQuery',
 }
@@ -6030,7 +5695,6 @@ export interface DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQu
 
 export type DashboardtypesQueryPluginDTO =
 	| DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpecDTO
-	| DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpecDTO
 	| DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5CompositeQueryDTO
 	| DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5QueryBuilderFormulaDTO
 	| DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5PromQueryDTO
@@ -6709,7 +6373,6 @@ export interface DashboardtypesPostablePublicDashboardDTO {
 
 export enum DashboardtypesQueryPluginKindDTO {
 	'signoz/BuilderQuery' = 'signoz/BuilderQuery',
-	'signoz/AIBuilderQuery' = 'signoz/AIBuilderQuery',
 	'signoz/CompositeQuery' = 'signoz/CompositeQuery',
 	'signoz/Formula' = 'signoz/Formula',
 	'signoz/PromQLQuery' = 'signoz/PromQLQuery',
@@ -11789,16 +11452,6 @@ export interface SpantypesThreadSpanDTO {
 	 * @type array
 	 */
 	events: SpantypesEventDTO[];
-	formatted_input: AiobservabilitytypesInputMessagesDTO;
-	formatted_output: AiobservabilitytypesOutputMessagesDTO;
-	/**
-	 * @type string
-	 */
-	formatter: string;
-	/**
-	 * @type array
-	 */
-	formatter_warnings: string[];
 	/**
 	 * @type boolean
 	 */

frontend/src/api/generated/services/tracedetail/index.ts

@@ -261,7 +261,7 @@ export const invalidateGetTraceSummary = async (
 };
 
 /**
- * Returns the spans carrying gen_ai input or output messages, or a tool execution, in timestamp order. Messages already in the OTel GenAI shape are decoded into formatted_input and formatted_output, with formatter naming the converter and formatter_warnings what it could not resolve. Pass nextCursor as after or prevCursor as before to page, or spanId to open the page around a span.
+ * Returns the spans carrying gen_ai input or output messages in timestamp order. Pass nextCursor as after or prevCursor as before to page, or spanId to open the page around a span.
  * @summary Get thread view for a trace
  */
 export const getTraceThread = (

frontend/src/components/OrderBy/ListViewOrderBy.tsx

@@ -104,6 +104,7 @@ function ListViewOrderBy({
 
 	return (
 		<Select
+			data-testid="list-view-order-by"
 			showSearch
 			value={value}
 			onChange={onChange}

frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx

@@ -4,11 +4,7 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
 import { Formula } from 'container/QueryBuilder/components/Formula';
 import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { getBuilderVariant } from 'lib/query/queryMode';
-import {
-	BuilderVariant,
-	IBuilderTraceOperator,
-} from 'types/api/queryBuilder/queryBuilderData';
+import { IBuilderTraceOperator } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 
 import { QueryBuilderField } from './queryBuilderFields.types';
@@ -64,16 +60,8 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 		[config],
 	);
 
-	const isAIQuery =
-		getBuilderVariant(currentQuery.builder) === BuilderVariant.AI;
-
 	useEffect(() => {
 		if (currentDataSource !== initialDataSource || newPanelType !== panelType) {
-			// AI queries are traces-only; BAR must not force metrics on them.
-			if (isAIQuery) {
-				handleSetConfig(newPanelType, DataSource.TRACES);
-				return;
-			}
 			if (newPanelType === PANEL_TYPES.BAR) {
 				handleSetConfig(PANEL_TYPES.BAR, DataSource.METRICS);
 				return;
@@ -86,20 +74,15 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 		initialDataSource,
 		currentDataSource,
 		newPanelType,
-		isAIQuery,
 	]);
 
 	useEffect(() => {
 		// always clear on mount and unmount to avoid stale data
-		// hosts opting into savePreviousQuery own the clear, as they may remount this builder mid-edit
-		if (savePreviousQuery) {
-			return undefined;
-		}
 		clearPreviousQuery();
 		return (): void => {
 			clearPreviousQuery();
 		};
-	}, [savePreviousQuery]);
+	}, []);
 
 	const resolvedConfig = useMemo(
 		() =>

frontend/src/container/LogsExplorerViews/tests/LogsExplorerViews.test.tsx

@@ -1,3 +1,4 @@
+import { useState } from 'react';
 import { VirtuosoMockContext } from 'react-virtuoso';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
@@ -8,7 +9,13 @@ import { server } from 'mocks-server/server';
 import { rest } from 'msw';
 import { PreferenceContextProvider } from 'providers/preferences/context/PreferenceContextProvider';
 import { QueryBuilderContext } from 'providers/QueryBuilder';
-import { fireEvent, render, RenderResult, waitFor } from 'tests/test-utils';
+import {
+	fireEvent,
+	render,
+	RenderResult,
+	screen,
+	waitFor,
+} from 'tests/test-utils';
 import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
 import { LogsAggregatorOperator } from 'types/common/queryBuilder';
 
@@ -396,5 +403,95 @@ describe('LogsExplorerViews -', () => {
 				}
 			});
 		});
+
+		it('rebuilds the List View query when the order changes', async () => {
+			(useCopyLogLink as jest.Mock).mockReturnValue({ activeLogId: undefined });
+			(useGetExplorerQueryRange as jest.Mock).mockReturnValue({
+				data: { payload: logsQueryRangeSuccessNewFormatResponse },
+			});
+
+			const stagedQueryOrderedBy = (
+				columnName: string,
+				id: string,
+			): Record<string, unknown> => ({
+				...mockQueryBuilderContextValue.stagedQuery,
+				id,
+				builder: {
+					...mockQueryBuilderContextValue.stagedQuery.builder,
+					queryData: mockQueryBuilderContextValue.stagedQuery.builder.queryData.map(
+						(item: Record<string, unknown>) => ({
+							...item,
+							orderBy: [{ columnName, order: 'desc' }],
+						}),
+					),
+				},
+			});
+
+			// `customRender` wraps a captured element, so `rerender` does not reach the
+			// tree. The order change is driven from state inside it instead.
+			function Harness(): JSX.Element {
+				const [ordered, setOrdered] = useState(false);
+				const stagedQuery = ordered
+					? stagedQueryOrderedBy('severity_text', 'query-2')
+					: stagedQueryOrderedBy('timestamp', 'query-1');
+
+				return (
+					<VirtuosoMockContext.Provider
+						value={{ viewportHeight: 300, itemHeight: 100 }}
+					>
+						<PreferenceContextProvider>
+							<QueryBuilderContext.Provider
+								value={
+									{
+										...mockQueryBuilderContextValue,
+										panelType: PANEL_TYPES.LIST,
+										stagedQuery,
+									} as any
+								}
+							>
+								<button
+									type="button"
+									data-testid="change-order"
+									onClick={(): void => setOrdered(true)}
+								/>
+								<LogsExplorerViews
+									setIsLoadingQueries={(): void => {}}
+									listQueryKeyRef={{ current: {} }}
+									chartQueryKeyRef={{ current: {} }}
+									setWarning={(): void => {}}
+									showLiveLogs={false}
+									handleChangeSelectedView={(): void => {}}
+								/>
+							</QueryBuilderContext.Provider>
+						</PreferenceContextProvider>
+					</VirtuosoMockContext.Provider>
+				);
+			}
+
+			const latestListOrderBy = (): unknown => {
+				const calls = (useGetExplorerQueryRange as jest.Mock).mock.calls.filter(
+					(call) => call[1] === PANEL_TYPES.LIST && call[0],
+				);
+				return calls[calls.length - 1]?.[0]?.builder?.queryData?.[0]?.orderBy;
+			};
+
+			render(<Harness />);
+
+			await waitFor(() => {
+				expect(latestListOrderBy()).toStrictEqual([
+					{ columnName: 'timestamp', order: 'desc' },
+					{ columnName: 'id', order: 'desc' },
+				]);
+			});
+
+			fireEvent.click(screen.getByTestId('change-order'));
+
+			await waitFor(() => {
+				expect(latestListOrderBy()).toStrictEqual([
+					{ columnName: 'severity_text', order: 'desc' },
+					{ columnName: 'id', order: 'desc' },
+				]);
+			});
+		});
 	});
 });

frontend/src/lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi.ts

@@ -30,10 +30,7 @@ const mapQueryFromV5 = (compositeQuery: ICompositeMetricQuery): Query => {
 	> = {};
 	const builderQueryTypes: Record<
 		string,
-		| 'builder_query'
-		| 'builder_ai_query'
-		| 'builder_formula'
-		| 'builder_trace_operator'
+		'builder_query' | 'builder_formula' | 'builder_trace_operator'
 	> = {};
 	const promQueries: IPromQLQuery[] = [];
 	const clickhouseQueries: IClickHouseQuery[] = [];
@@ -47,14 +44,6 @@ const mapQueryFromV5 = (compositeQuery: ICompositeMetricQuery): Query => {
 				);
 				builderQueryTypes[spec.name] = 'builder_query';
 			}
-		} else if (q.type === 'builder_ai_query') {
-			if (spec.name) {
-				builderQueries[spec.name] = {
-					...convertBuilderQueryToIBuilderQuery(spec as BuilderQuery),
-					builderQueryType: 'builder_ai_query',
-				};
-				builderQueryTypes[spec.name] = 'builder_ai_query';
-			}
 		} else if (q.type === 'builder_formula') {
 			if (spec.name) {
 				builderQueries[spec.name] = convertQueryBuilderFormulaToIBuilderFormula(

frontend/src/lib/newQueryBuilder/transformQueryBuilderDataModel.ts

@@ -15,10 +15,7 @@ export const transformQueryBuilderDataModel = (
 	data: BuilderQueryDataResourse,
 	queryTypes?: Record<
 		string,
-		| 'builder_query'
-		| 'builder_ai_query'
-		| 'builder_formula'
-		| 'builder_trace_operator'
+		'builder_query' | 'builder_formula' | 'builder_trace_operator'
 	>,
 ): QueryBuilderData => {
 	const queryData: QueryBuilderData['queryData'] = [];

frontend/src/lib/query/__tests__/builderEnvelope.test.ts

@@ -1,53 +0,0 @@
-import type { Querybuildertypesv5QueryEnvelopeDTO } from 'api/generated/services/sigNoz.schemas';
-
-import {
-	isAIBuilderEnvelope,
-	isBuilderEnvelope,
-	isBuilderPluginKind,
-} from '../builderEnvelope';
-
-const envelope = (type: string): Querybuildertypesv5QueryEnvelopeDTO =>
-	({ type, spec: {} }) as unknown as Querybuildertypesv5QueryEnvelopeDTO;
-
-describe('builder envelope predicates', () => {
-	describe('isBuilderEnvelope', () => {
-		it.each(['builder_query', 'builder_ai_query'])('accepts %s', (type) => {
-			expect(isBuilderEnvelope(envelope(type))).toBe(true);
-		});
-
-		it.each([
-			'builder_formula',
-			'builder_trace_operator',
-			'promql',
-			'clickhouse_sql',
-		])('rejects %s', (type) => {
-			expect(isBuilderEnvelope(envelope(type))).toBe(false);
-		});
-	});
-
-	describe('isAIBuilderEnvelope', () => {
-		it('accepts builder_ai_query', () => {
-			expect(isAIBuilderEnvelope(envelope('builder_ai_query'))).toBe(true);
-		});
-
-		it('rejects builder_query', () => {
-			expect(isAIBuilderEnvelope(envelope('builder_query'))).toBe(false);
-		});
-	});
-
-	describe('isBuilderPluginKind', () => {
-		it.each(['signoz/BuilderQuery', 'signoz/AIBuilderQuery'])(
-			'accepts %s',
-			(kind) => {
-				expect(isBuilderPluginKind(kind)).toBe(true);
-			},
-		);
-
-		it.each(['signoz/CompositeQuery', 'signoz/PromQLQuery'])(
-			'rejects %s',
-			(kind) => {
-				expect(isBuilderPluginKind(kind)).toBe(false);
-			},
-		);
-	});
-});

frontend/src/lib/query/__tests__/panelTypeDataSourceFormValuesMap.test.ts

@@ -61,16 +61,6 @@ describe('panelTypeDataSourceFormValuesMap', () => {
 		expect(uncovered).toStrictEqual([]);
 	});
 
-	// The AI tab is derived from this tag, so a panel that drops it on a switch falls
-	// back to plain Query Builder mid-edit.
-	it('carries the AI query tag into every panel type', () => {
-		Object.values(panelTypeDataSourceFormValuesMap).forEach((sources) => {
-			expect(sources[DataSource.TRACES].builder.queryData).toContain(
-				'builderQueryType',
-			);
-		});
-	});
-
 	it('shares one builder surface between logs and traces', () => {
 		Object.values(panelTypeDataSourceFormValuesMap).forEach((sources) => {
 			expect(sources[DataSource.LOGS].builder.queryData).toStrictEqual(

frontend/src/lib/query/builderEnvelope.ts

@@ -1,47 +0,0 @@
-import type {
-	Querybuildertypesv5QueryEnvelopeBuilderAIDTO,
-	Querybuildertypesv5QueryEnvelopeBuilderDTO,
-	Querybuildertypesv5QueryEnvelopeDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import {
-	DashboardtypesQueryPluginKindDTO,
-	Querybuildertypesv5QueryEnvelopeBuilderAIDTOType,
-	Querybuildertypesv5QueryEnvelopeBuilderDTOType,
-} from 'api/generated/services/sigNoz.schemas';
-
-const BUILDER_ENVELOPE_TYPES: string[] = [
-	Querybuildertypesv5QueryEnvelopeBuilderDTOType.builder_query,
-	Querybuildertypesv5QueryEnvelopeBuilderAIDTOType.builder_ai_query,
-];
-
-/** True for `builder_query` and `builder_ai_query`. Formulas and trace operators are excluded. */
-export function isBuilderEnvelope(
-	envelope: Querybuildertypesv5QueryEnvelopeDTO,
-): envelope is
-	| Querybuildertypesv5QueryEnvelopeBuilderDTO
-	| Querybuildertypesv5QueryEnvelopeBuilderAIDTO {
-	return BUILDER_ENVELOPE_TYPES.includes(envelope.type);
-}
-
-export function isAIBuilderEnvelope(
-	envelope: Querybuildertypesv5QueryEnvelopeDTO,
-): envelope is Querybuildertypesv5QueryEnvelopeBuilderAIDTO {
-	return (
-		envelope.type ===
-		Querybuildertypesv5QueryEnvelopeBuilderAIDTOType.builder_ai_query
-	);
-}
-
-const BUILDER_PLUGIN_KINDS: string[] = [
-	DashboardtypesQueryPluginKindDTO['signoz/BuilderQuery'],
-	DashboardtypesQueryPluginKindDTO['signoz/AIBuilderQuery'],
-];
-
-/**
- * True for a bare `signoz/BuilderQuery` or `signoz/AIBuilderQuery` plugin (the form List
- * panels use). Inside a CompositeQuery an AI query is a `builder_ai_query` envelope, matched
- * by `isBuilderEnvelope`.
- */
-export function isBuilderPluginKind(kind: string): boolean {
-	return BUILDER_PLUGIN_KINDS.includes(kind);
-}

frontend/src/lib/query/panelTypeDataSourceFormValuesMap.ts

@@ -44,8 +44,6 @@ const IS_CARRIED = {
 	orderBy: true,
 	reduceTo: true,
 	legend: true,
-	// Identifies an AI query, so the panel keeps authoring in AI mode after the switch.
-	builderQueryType: true,
 	// `dataSource` is appended by the provider; the rest drive surfaces this switch
 	// does not reach.
 	// Heatmap only; listed for it below.
@@ -56,6 +54,7 @@ const IS_CARRIED = {
 	offset: false,
 	selectColumns: false,
 	source: false,
+	builderQueryType: false,
 } satisfies Record<BuilderField, boolean>;
 
 function omit(

frontend/src/lib/query/queryMode.ts

@@ -1,51 +0,0 @@
-import {
-	BuilderVariant,
-	type Query,
-	QueryMode,
-} from 'types/api/queryBuilder/queryBuilderData';
-
-/** Which variant the `builder` slot holds, whatever query type is active. */
-export function getBuilderVariant(builder: Query['builder']): BuilderVariant {
-	return builder.queryData[0]?.builderQueryType === QueryMode.AI_QUERY_BUILDER
-		? BuilderVariant.AI
-		: BuilderVariant.MAIN;
-}
-
-/** The variant a tab authors; `undefined` for tabs that own their own slot. */
-export function toBuilderVariant(mode: QueryMode): BuilderVariant | undefined {
-	if (mode === QueryMode.AI_QUERY_BUILDER) {
-		return BuilderVariant.AI;
-	}
-	return mode === QueryMode.QUERY_BUILDER ? BuilderVariant.MAIN : undefined;
-}
-
-/** The tab a query belongs to: its query type, or AI when a builder query carries the tag. */
-export function getQueryMode(query: Query): QueryMode {
-	if (query.queryType !== QueryMode.QUERY_BUILDER) {
-		return query.queryType;
-	}
-	return getBuilderVariant(query.builder) === BuilderVariant.AI
-		? QueryMode.AI_QUERY_BUILDER
-		: QueryMode.QUERY_BUILDER;
-}
-
-/** Query Builder and AI both author `Query.builder`; the other modes own their own slot. */
-export function isBuilderMode(mode: QueryMode): boolean {
-	return toBuilderVariant(mode) !== undefined;
-}
-
-/** Drops the AI tag, leaving the same query readable as a plain builder query. */
-export function withoutAIQueryTag(query: Query): Query {
-	if (getBuilderVariant(query.builder) !== BuilderVariant.AI) {
-		return query;
-	}
-	return {
-		...query,
-		builder: {
-			...query.builder,
-			queryData: query.builder.queryData.map(
-				({ builderQueryType: _tag, ...queryData }) => queryData,
-			),
-		},
-	};
-}

frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/__tests__/applyVariableToPanelsPatch.test.ts

@@ -80,31 +80,4 @@ describe('getPanelIdsReferencingVariable', () => {
 		);
 		expect(ids.sort()).toStrictEqual(['p1', 'p3']);
 	});
-
-	it('includes an AI list panel and an AI composite panel', () => {
-		const aiList = listPanel('service.name IN $svc');
-		(
-			aiList as {
-				spec: { queries: { spec: { plugin: { kind: string } } }[] };
-			}
-		).spec.queries[0].spec.plugin.kind = 'signoz/AIBuilderQuery';
-
-		const aiComposite = compositePanel('service.name IN $svc');
-		(
-			aiComposite as {
-				spec: {
-					queries: {
-						spec: { plugin: { spec: { queries: { type: string }[] } } };
-					}[];
-				};
-			}
-		).spec.queries[0].spec.plugin.spec.queries[0].type = 'builder_ai_query';
-
-		const ids = getPanelIdsReferencingVariable(
-			panels({ aiList, aiComposite }),
-			'service.name',
-			'svc',
-		);
-		expect(ids.sort()).toStrictEqual(['aiComposite', 'aiList']);
-	});
 });

frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/utils/applyVariableToPanelsPatch.ts

@@ -6,11 +6,6 @@ import type {
 	Querybuildertypesv5QueryEnvelopeBuilderDTO,
 } from 'api/generated/services/sigNoz.schemas';
 
-import {
-	isBuilderEnvelope,
-	isBuilderPluginKind,
-} from 'lib/query/builderEnvelope';
-
 function clauseFor(attribute: string, variableName: string): string {
 	return `${attribute} IN $${variableName}`;
 }
@@ -25,13 +20,15 @@ function forEachBuilderSpec(
 	}
 	if (plugin.kind === 'signoz/CompositeQuery') {
 		const composite = plugin.spec as Querybuildertypesv5CompositeQueryDTO;
-		(composite.queries ?? []).filter(isBuilderEnvelope).forEach((envelope) => {
-			const { spec } = envelope as Querybuildertypesv5QueryEnvelopeBuilderDTO;
-			if (spec) {
-				fn(spec as Querybuildertypesv5BuilderQuerySpecDTO);
-			}
-		});
-	} else if (isBuilderPluginKind(plugin.kind)) {
+		(composite.queries ?? [])
+			.filter((envelope) => envelope.type === 'builder_query')
+			.forEach((envelope) => {
+				const { spec } = envelope as Querybuildertypesv5QueryEnvelopeBuilderDTO;
+				if (spec) {
+					fn(spec as Querybuildertypesv5BuilderQuerySpecDTO);
+				}
+			});
+	} else if (plugin.kind === 'signoz/BuilderQuery') {
 		fn(plugin.spec as Querybuildertypesv5BuilderQuerySpecDTO);
 	}
 }

frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/utils/variableUsages.ts

@@ -11,7 +11,6 @@ import {
 	textContainsVariableReference,
 } from 'lib/dashboardVariables/variableReference';
 
-import { isBuilderEnvelope } from 'lib/query/builderEnvelope';
 import { toQueryEnvelopes } from '../../../queryV5/buildQueryRangeRequest';
 import { getTextPanelBody } from './getTextPanelBody';
 import { dtoToFormModel } from '../variableAdapters';
@@ -55,7 +54,7 @@ function envelopeReferenceText(
 	const spec = envelope.spec as
 		| { query?: string; filter?: { expression?: string } }
 		| undefined;
-	if (isBuilderEnvelope(envelope)) {
+	if (envelope.type === 'builder_query') {
 		const text = spec?.filter?.expression;
 		return typeof text === 'string' ? { kind: 'builder', text } : null;
 	}
@@ -233,7 +232,7 @@ export function findApplyUsages(
 				});
 			};
 
-			if (isBuilderEnvelope(envelope)) {
+			if (envelope.type === 'builder_query') {
 				const spec = envelope.spec as
 					| { filter?: { expression?: string } }
 					| undefined;
@@ -295,7 +294,7 @@ export function isVariableAppliedToAllPanels(
 			return true;
 		}
 		return toQueryEnvelopes(queries).every((envelope) => {
-			if (isBuilderEnvelope(envelope)) {
+			if (envelope.type === 'builder_query') {
 				const spec = envelope.spec as
 					| { filter?: { expression?: string } }
 					| undefined;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigPane.tsx

@@ -15,10 +15,10 @@ import type { EQueryType } from 'types/common/dashboard';
 import type { LegendSeries } from 'pages/DashboardPage/DashboardContainer/Panels/utils/legendSeries';
 import type { TableColumnOption } from '../hooks/useTableColumns';
 import ConfigActions from './ConfigActions/ConfigActions';
-import PanelTitleInput from './PanelTitleInput/PanelTitleInput';
 import SectionSlot from './SectionSlot/SectionSlot';
 
 import styles from './ConfigPane.module.scss';
+import { DASHBOARD_NAME_MAX_LENGTH } from '../../constants';
 import { PanelKind } from '../../Panels/types/panelKind';
 
 interface ConfigPaneProps {
@@ -106,9 +106,12 @@ function ConfigPane({
 			<div className={styles.group}>
 				<div className={styles.field}>
 					<Typography.Text>Title</Typography.Text>
-					<PanelTitleInput
+					<Input
+						data-testid="panel-editor-v2-title"
 						value={spec.display.name}
-						onChange={(value): void => setDisplayField('name', value)}
+						placeholder="Panel title"
+						maxLength={DASHBOARD_NAME_MAX_LENGTH}
+						onChange={(e): void => setDisplayField('name', e.target.value)}
 					/>
 				</div>
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTitleInput/PanelTitleInput.module.scss

@@ -1,3 +0,0 @@
-.autoComplete {
-	width: 100%;
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTitleInput/PanelTitleInput.tsx

@@ -1,107 +0,0 @@
-import { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import type { KeyboardEvent } from 'react';
-import { Input } from '@signozhq/ui/input';
-import { AutoComplete } from 'antd';
-import { useDashboardVariableNames } from 'pages/DashboardPage/DashboardContainer/hooks/useDashboardVariableNames';
-
-import { DASHBOARD_NAME_MAX_LENGTH } from '../../../constants';
-import { findVariableToken, insertVariable } from './variableToken';
-
-import styles from './PanelTitleInput.module.scss';
-
-interface PanelTitleInputProps {
-	value: string;
-	onChange: (value: string) => void;
-}
-
-interface VariableOption {
-	/** Whole title after insertion, so antd's change event carries it. */
-	value: string;
-	label: string;
-	cursor: number;
-}
-
-function PanelTitleInput({
-	value,
-	onChange,
-}: PanelTitleInputProps): JSX.Element {
-	const variableNames = useDashboardVariableNames();
-	const inputRef = useRef<HTMLInputElement>(null);
-	const pendingCursor = useRef<number | null>(null);
-	const [cursor, setCursor] = useState(0);
-	const [focused, setFocused] = useState(false);
-	const [dismissed, setDismissed] = useState(false);
-
-	const options = useMemo<VariableOption[]>(() => {
-		const token = findVariableToken(value, cursor);
-		if (!token) {
-			return [];
-		}
-		const query = token.query.toLowerCase();
-		return variableNames
-			.filter((name) => name.toLowerCase().startsWith(query))
-			.map((name) => {
-				const next = insertVariable(value, token, name);
-				return { value: next.text, label: name, cursor: next.cursor };
-			});
-	}, [value, cursor, variableNames]);
-
-	useLayoutEffect(() => {
-		if (pendingCursor.current === null) {
-			return;
-		}
-		inputRef.current?.setSelectionRange(
-			pendingCursor.current,
-			pendingCursor.current,
-		);
-		setCursor(pendingCursor.current);
-		pendingCursor.current = null;
-	}, [value]);
-
-	const syncCursor = (): void => {
-		setCursor(inputRef.current?.selectionStart ?? 0);
-	};
-
-	const handleChange = (next: string): void => {
-		const picked = options.find((option) => option.value === next);
-		if (picked) {
-			pendingCursor.current = picked.cursor;
-			setDismissed(true);
-		} else {
-			setDismissed(false);
-			syncCursor();
-		}
-		onChange(next);
-	};
-
-	const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>): void => {
-		if (event.key === 'Escape') {
-			setDismissed(true);
-		}
-	};
-
-	return (
-		<AutoComplete
-			className={styles.autoComplete}
-			value={value}
-			maxLength={DASHBOARD_NAME_MAX_LENGTH}
-			options={options}
-			open={focused && !dismissed && options.length > 0}
-			filterOption={false}
-			onChange={handleChange}
-		>
-			<Input
-				ref={inputRef}
-				testId="panel-editor-v2-title"
-				placeholder="Panel title"
-				onKeyDown={handleKeyDown}
-				onKeyUp={syncCursor}
-				onClick={syncCursor}
-				onFocus={(): void => setFocused(true)}
-				onBlur={(): void => setFocused(false)}
-			/>
-		</AutoComplete>
-	);
-}
-
-export default PanelTitleInput;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTitleInput/__tests__/PanelTitleInput.test.tsx

@@ -1,51 +0,0 @@
-import { useState } from 'react';
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import PanelTitleInput from '../PanelTitleInput';
-
-jest.mock(
-	'pages/DashboardPage/DashboardContainer/hooks/useDashboardVariableNames',
-	() => ({
-		useDashboardVariableNames: (): string[] => ['service.name', 'env'],
-	}),
-);
-
-function Harness({ initial = '' }: { initial?: string }): JSX.Element {
-	const [value, setValue] = useState(initial);
-	return <PanelTitleInput value={value} onChange={setValue} />;
-}
-
-describe('PanelTitleInput', () => {
-	it('suggests no variables until a `$` is typed', async () => {
-		const user = userEvent.setup();
-		render(<Harness />);
-
-		await user.type(screen.getByTestId('panel-editor-v2-title'), 'Latency');
-
-		expect(screen.queryByText('env')).not.toBeInTheDocument();
-	});
-
-	it('suggests variables matching the text after `$`', async () => {
-		const user = userEvent.setup();
-		render(<Harness />);
-
-		await user.type(
-			screen.getByTestId('panel-editor-v2-title'),
-			'Latency of $se',
-		);
-
-		await expect(screen.findByText('service.name')).resolves.toBeInTheDocument();
-		expect(screen.queryByText('env')).not.toBeInTheDocument();
-	});
-
-	it('inserts the picked variable into the title', async () => {
-		const user = userEvent.setup();
-		render(<Harness />);
-		const input = screen.getByTestId('panel-editor-v2-title');
-
-		await user.type(input, 'Latency of $se');
-		await user.click(await screen.findByText('service.name'));
-
-		expect(input).toHaveValue('Latency of $service.name');
-	});
-});

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTitleInput/__tests__/variableToken.test.ts

@@ -1,30 +0,0 @@
-import { findVariableToken, insertVariable } from '../variableToken';
-
-describe('findVariableToken', () => {
-	it('finds the token being typed before the cursor', () => {
-		expect(findVariableToken('Latency of $ser', 15)).toStrictEqual({
-			start: 11,
-			query: 'ser',
-		});
-	});
-
-	it('matches a bare `$`', () => {
-		expect(findVariableToken('by $', 4)).toStrictEqual({ start: 3, query: '' });
-	});
-
-	it('ignores a token the cursor has moved past', () => {
-		expect(findVariableToken('$env in prod', 12)).toBeNull();
-	});
-});
-
-describe('insertVariable', () => {
-	it('replaces the whole token, including text after the cursor', () => {
-		const token = { start: 4, query: 'ser' };
-		expect(
-			insertVariable('p99 $service_x for', token, 'service.name'),
-		).toStrictEqual({
-			text: 'p99 $service.name for',
-			cursor: 17,
-		});
-	});
-});

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTitleInput/variableToken.ts

@@ -1,30 +0,0 @@
-const TOKEN_BEFORE_CURSOR = /\$([\w.]*)$/;
-const IDENTIFIER_PREFIX = /^[\w.]*/;
-
-export interface VariableToken {
-	start: number;
-	query: string;
-}
-
-export function findVariableToken(
-	text: string,
-	cursor: number,
-): VariableToken | null {
-	const match = TOKEN_BEFORE_CURSOR.exec(text.slice(0, cursor));
-	if (!match) {
-		return null;
-	}
-	return { start: match.index, query: match[1] };
-}
-
-/** Also replaces identifier chars after the cursor: `$ser|vice` leaves no `vice`. */
-export function insertVariable(
-	text: string,
-	token: VariableToken,
-	name: string,
-): { text: string; cursor: number } {
-	const before = text.slice(0, token.start);
-	const after = text.slice(token.start + 1).replace(IDENTIFIER_PREFIX, '');
-	const inserted = `${before}$${name}`;
-	return { text: `${inserted}${after}`, cursor: inserted.length };
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.tsx

@@ -8,7 +8,6 @@ import type { EQueryType } from 'types/common/dashboard';
 import PanelTypeBrowser from '../../../PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/PanelTypeBrowser';
 import { getPanelDefinition } from '../../../Panels/registry';
 import type { PanelKind } from '../../../Panels/types/panelKind';
-import { JS_DRIVEN_SLIDE } from '../../../utils/drawerSlide';
 import ConfigField from '../controls/ConfigField/ConfigField';
 
 import styles from './PanelTypeSwitcher.module.scss';
@@ -103,7 +102,6 @@ function PanelTypeSwitcher({
 				direction="right"
 				width="wide"
 				testId="panel-type-switcher-drawer"
-				drawerContentProps={JS_DRIVEN_SLIDE}
 				drawerDescriptionProps={{ className: styles.drawerBody }}
 			>
 				<PanelTypeBrowser

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/__tests__/PanelTypeSwitcher.test.tsx

@@ -71,29 +71,19 @@ describe('PanelTypeSwitcher', () => {
 		jest.clearAllMocks();
 		// List supports only logs/traces; every other kind also supports metrics.
 		// Query-type support comes from SUPPORTED_QUERY_TYPES (all three by default).
-		mockGetPanelDefinition.mockImplementation((kind: string) => {
-			const signals =
+		mockGetPanelDefinition.mockImplementation((kind: string) => ({
+			...OPTIONS.find((option) => option.kind === kind),
+			mode: kind === 'signoz/TextPanel' ? 'static' : 'query',
+			supportedSignals:
 				kind === 'signoz/ListPanel'
 					? ['logs', 'traces']
-					: ['metrics', 'logs', 'traces'];
-			const queryTypes = SUPPORTED_QUERY_TYPES[kind] ?? [
+					: ['metrics', 'logs', 'traces'],
+			supportedQueryTypes: SUPPORTED_QUERY_TYPES[kind] ?? [
 				EQueryType.QUERY_BUILDER,
 				EQueryType.CLICKHOUSE,
 				EQueryType.PROM,
-			];
-			return {
-				...OPTIONS.find((option) => option.kind === kind),
-				mode: kind === 'signoz/TextPanel' ? 'static' : 'query',
-				supportedQueryModesKindMap: Object.fromEntries(
-					queryTypes.map((queryType) => [
-						queryType,
-						queryType === EQueryType.QUERY_BUILDER
-							? { kind: 'signal', signals }
-							: { kind: 'signal-less' },
-					]),
-				),
-			};
-		});
+			],
+		}));
 	});
 
 	it('shows the current type and switches to the chosen one', async () => {

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/__tests__/ConfigPane.test.tsx

@@ -23,11 +23,6 @@ jest.mock(
 	}),
 );
 
-jest.mock(
-	'pages/DashboardPage/DashboardContainer/hooks/useDashboardVariableNames',
-	() => ({ useDashboardVariableNames: (): string[] => [] }),
-);
-
 function textSpec(): DashboardtypesPanelSpecDTO {
 	return {
 		display: { name: 'Runbook', description: 'steps' },

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/useContextLinkVariables.ts

@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useDashboardVariableNames } from 'pages/DashboardPage/DashboardContainer/hooks/useDashboardVariableNames';
+import { dtoToFormModel } from 'pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/variableAdapters';
+import { useDashboardFetchRequired } from 'pages/DashboardPage/DashboardContainer/hooks/useDashboardFetchRequired';
 
 import type { VariableItem } from './types';
 
@@ -21,7 +22,15 @@ const GLOBAL_TIMESTAMP_VARIABLES: VariableItem[] = [
 export function useContextLinkVariables(): VariableItem[] {
 	const { currentQuery } = useQueryBuilder();
 
-	const dashboardVariableNames = useDashboardVariableNames();
+	const { variables: variableDtos } = useDashboardFetchRequired();
+
+	const dashboardVariableNames = useMemo(
+		() =>
+			variableDtos
+				.map((dto) => dtoToFormModel(dto).name)
+				.filter((name): name is string => !!name),
+		[variableDtos],
+	);
 
 	// `_`-prefixed to match V1 and avoid colliding with dashboard-variable names.
 	const fieldVariableNames = useMemo(() => {

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/VisualizationSection/__tests__/VisualizationSection.test.tsx

@@ -14,11 +14,8 @@ jest.mock('pages/DashboardPage/DashboardContainer/Panels/registry', () => ({
 		displayName: 'Time Series',
 		icon: (): null => null,
 		mode: 'query',
-		supportedQueryModesKindMap: {
-			builder: { kind: 'signal', signals: ['metrics', 'logs', 'traces'] },
-			clickhouse_sql: { kind: 'signal-less' },
-			promql: { kind: 'signal-less' },
-		},
+		supportedSignals: ['metrics', 'logs', 'traces'],
+		supportedQueryTypes: ['builder', 'clickhouse_sql', 'promql'],
 	})),
 	PANEL_OPTIONS: [
 		{ kind: 'signoz/TimeSeriesPanel', displayName: 'Time Series' },

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx

@@ -2,33 +2,26 @@ import {
 	type KeyboardEvent,
 	type ReactNode,
 	useCallback,
-	useEffect,
 	useMemo,
 } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Atom, Brain, Terminal } from '@signozhq/icons';
+import { Atom, Terminal } from '@signozhq/icons';
 import { Tabs } from 'antd';
 import cx from 'classnames';
 import { Typography } from '@signozhq/ui/typography';
 import PromQLIcon from 'assets/Dashboard/PromQl';
 import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
-import { clearPreviousQuery } from 'components/QueryBuilderV2/QueryV2/previousQuery.utils';
 import TextToolTip from 'components/TextToolTip';
 import ClickHouseQueryContainer from 'container/QueryBuilder/rawQueryEditors/ClickHouse';
 import PromQLQueryContainer from 'container/QueryBuilder/rawQueryEditors/PromQL';
 import RunQueryBtn from 'container/QueryBuilder/components/RunQueryBtn/RunQueryBtn';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useIsDarkMode } from 'hooks/useDarkMode';
-import { DataSource } from 'types/common/queryBuilder';
+import { EQueryType } from 'types/common/dashboard';
 
-import {
-	getQueryModeSignals,
-	isRawRequest,
-} from '../../Panels/types/panelCapabilities';
+import { isRawRequest } from '../../Panels/types/panelCapabilities';
 import type { RenderableQueryPanelDefinition } from '../../Panels/types/panelDefinition';
 import { toPanelType } from '../../Panels/types/panelKind';
-import { getQueryMode, isBuilderMode } from 'lib/query/queryMode';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
 
 import styles from './PanelEditorQueryBuilder.module.scss';
 
@@ -36,8 +29,6 @@ interface PanelEditorQueryBuilderProps {
 	/** The edited kind's definition — drives supported query types, the signals the
 	 *  builder may be pointed at, and how it narrows the builder's fields. */
 	panelDefinition: RenderableQueryPanelDefinition;
-	/** Switch authoring tab; owned by the host, which remembers the Query Builder query. */
-	onChangeQueryMode: (key: string) => void;
 	/** Preview fetch in flight — drives the Stage & Run button's loading/cancel state. */
 	isLoadingQueries: boolean;
 	/** Run the current query (Stage & Run button / ⌘↵). Always re-runs. */
@@ -57,7 +48,6 @@ interface PanelEditorQueryBuilderProps {
  */
 function PanelEditorQueryBuilder({
 	panelDefinition,
-	onChangeQueryMode,
 	isLoadingQueries,
 	onStageRunQuery,
 	onCancelQuery,
@@ -70,16 +60,18 @@ function PanelEditorQueryBuilder({
 	// Raw rows: the builder drops its aggregation controls, and with them the trace
 	// operator that combines aggregated trace queries (V1 parity).
 	const isRawQuery = isRawRequest(panelDefinition.queryCapabilities);
-	const { currentQuery } = useQueryBuilder();
+	const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
 	const isDarkMode = useIsDarkMode();
 
-	// Cleared here, not in QueryBuilderV2: builder panes unmount on every tab switch.
-	useEffect(() => {
-		clearPreviousQuery();
-		return (): void => {
-			clearPreviousQuery();
-		};
-	}, []);
+	const handleQueryCategoryChange = useCallback(
+		(queryType: string): void => {
+			redirectWithQueryBuilderData({
+				...currentQuery,
+				queryType: queryType as EQueryType,
+			});
+		},
+		[currentQuery, redirectWithQueryBuilderData],
+	);
 
 	// ⌘↵ / Ctrl+↵ stages and runs the query. Handled locally because the global
 	// hotkeys provider ignores keydowns from inputs / the query editor, and on the
@@ -96,11 +88,10 @@ function PanelEditorQueryBuilder({
 	);
 
 	const items = useMemo(() => {
-		const queryTypeComponents: Record<
-			QueryMode,
-			{ icon: ReactNode; label: string; component: ReactNode }
-		> = {
-			[QueryMode.QUERY_BUILDER]: {
+		const { supportedQueryTypes } = panelDefinition;
+
+		const queryTypeComponents = {
+			[EQueryType.QUERY_BUILDER]: {
 				icon: <Atom size={14} />,
 				label: 'Query Builder',
 				component: (
@@ -108,10 +99,7 @@ function PanelEditorQueryBuilder({
 						<QueryBuilderV2
 							panelType={panelType}
 							fieldsConfig={panelDefinition.queryBuilderFields}
-							allowedDataSources={getQueryModeSignals(
-								panelDefinition.supportedQueryModesKindMap,
-								QueryMode.QUERY_BUILDER,
-							)}
+							allowedDataSources={panelDefinition.supportedSignals}
 							showTraceOperator={!isRawQuery}
 							version="v3"
 							isRawQuery={isRawQuery}
@@ -121,12 +109,12 @@ function PanelEditorQueryBuilder({
 					</div>
 				),
 			},
-			[QueryMode.CLICKHOUSE]: {
+			[EQueryType.CLICKHOUSE]: {
 				icon: <Terminal size={14} />,
 				label: 'ClickHouse Query',
 				component: <ClickHouseQueryContainer />,
 			},
-			[QueryMode.PROM]: {
+			[EQueryType.PROM]: {
 				icon: (
 					<PromQLIcon
 						fillColor={isDarkMode ? Color.BG_VANILLA_200 : Color.BG_INK_300}
@@ -135,33 +123,9 @@ function PanelEditorQueryBuilder({
 				label: 'PromQL',
 				component: <PromQLQueryContainer />,
 			},
-			[QueryMode.AI_QUERY_BUILDER]: {
-				icon: <Brain size={14} />,
-				label: 'AI Query Builder',
-				component: (
-					<div className="query-builder-v2-container">
-						<QueryBuilderV2
-							panelType={panelType}
-							fieldsConfig={panelDefinition.queryBuilderFields}
-							showTraceOperator={false}
-							version="v3"
-							isRawQuery={isRawQuery}
-							config={{
-								initialDataSource: DataSource.TRACES,
-								queryVariant: 'static',
-							}}
-							savePreviousQuery
-						/>
-					</div>
-				),
-			},
 		};
 
-		const modes = Object.keys(
-			panelDefinition.supportedQueryModesKindMap,
-		) as QueryMode[];
-
-		return modes.map((queryType) => ({
+		return supportedQueryTypes.map((queryType) => ({
 			key: queryType,
 			label: (
 				<div className={styles.queryTypeTab}>
@@ -170,8 +134,6 @@ function PanelEditorQueryBuilder({
 				</div>
 			),
 			children: queryTypeComponents[queryType].component,
-			// QB wants a null data source and AI pins traces: both mounted, they overwrite each other's provider config in a loop.
-			destroyInactiveTabPane: isBuilderMode(queryType),
 		}));
 	}, [panelDefinition, panelType, isDarkMode, isRawQuery]);
 
@@ -188,8 +150,8 @@ function PanelEditorQueryBuilder({
 					className={cx(styles.tabsContainer, {
 						[styles.stickyNav]: stickyHeader,
 					})}
-					activeKey={getQueryMode(currentQuery)}
-					onChange={onChangeQueryMode}
+					activeKey={currentQuery.queryType}
+					onChange={handleQueryCategoryChange}
 					tabBarExtraContent={
 						<span className={styles.runQueryBtnContainer}>
 							<TextToolTip text="This will temporarily save the current query and graph state. This will persist across tab change" />

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane.tsx

@@ -8,7 +8,6 @@ import PanelEditorQueryBuilder from './PanelEditorQueryBuilder';
 function QueryBuilderEditorPane({
 	panelDefinition,
 	isLoadingQueries,
-	onChangeQueryMode,
 	onStageRunQuery,
 	onCancelQuery,
 	stickyHeader,
@@ -17,7 +16,6 @@ function QueryBuilderEditorPane({
 		<PanelEditorQueryBuilder
 			panelDefinition={panelDefinition}
 			isLoadingQueries={isLoadingQueries}
-			onChangeQueryMode={onChangeQueryMode}
 			onStageRunQuery={onStageRunQuery}
 			onCancelQuery={onCancelQuery}
 			stickyHeader={stickyHeader}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/__tests__/PanelEditorQueryBuilder.test.tsx

@@ -1,17 +1,11 @@
-import { useRef } from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { EQueryType } from 'types/common/dashboard';
 
 import { requireQueryPanelDefinition } from 'pages/DashboardPage/DashboardContainer/Panels/capabilities';
-import {
-	toPanelType,
-	type PanelKind,
-} from 'pages/DashboardPage/DashboardContainer/Panels/types/panelKind';
-import type { BuildersByVariant } from 'types/api/queryBuilder/queryBuilderData';
+import type { PanelKind } from 'pages/DashboardPage/DashboardContainer/Panels/types/panelKind';
 
 import PanelEditorQueryBuilder from '../PanelEditorQueryBuilder';
-import { useQueryModeChange } from '../../hooks/useQueryModeChange';
 
 // Capture the props the (real-guard-fed) QueryBuilderV2 receives without rendering it.
 const mockQueryBuilderV2 = jest.fn();
@@ -49,41 +43,17 @@ jest.mock('assets/Dashboard/PromQl', () => ({
 
 const mockUseQueryBuilder = useQueryBuilder as unknown as jest.Mock;
 
-const BUILDER_QUERY = {
-	queryType: EQueryType.QUERY_BUILDER,
-	builder: { queryData: [{ dataSource: 'traces' }] },
-};
-const AI_QUERY = {
-	queryType: EQueryType.QUERY_BUILDER,
-	builder: {
-		queryData: [{ dataSource: 'traces', builderQueryType: 'builder_ai_query' }],
-	},
-};
-
-/** Stands in for the editor shell: owns the tab switch and its parked Query Builder query. */
-function BuilderHost({ panelKind }: { panelKind: PanelKind }): JSX.Element {
-	const panelDefinition = requireQueryPanelDefinition(panelKind);
-	const parkedBuilders = useRef<BuildersByVariant>({});
-	const onChangeQueryMode = useQueryModeChange({
-		panelType: toPanelType(panelKind),
-		supportedQueryModesKindMap: panelDefinition.supportedQueryModesKindMap,
-		parkedBuilders,
-	});
-	return (
+function renderBuilder(panelKind: string): void {
+	render(
 		<PanelEditorQueryBuilder
-			panelDefinition={panelDefinition}
-			onChangeQueryMode={onChangeQueryMode}
+			panelDefinition={requireQueryPanelDefinition(panelKind as PanelKind)}
 			isLoadingQueries={false}
 			onStageRunQuery={jest.fn()}
 			onCancelQuery={jest.fn()}
-		/>
+		/>,
 	);
 }
 
-function renderBuilder(panelKind: string): void {
-	render(<BuilderHost panelKind={panelKind as PanelKind} />);
-}
-
 function lastQueryBuilderProps(): {
 	panelType: string;
 	isRawQuery: boolean;
@@ -99,12 +69,12 @@ describe('PanelEditorQueryBuilder query-type tabs (driven by the capabilities gu
 	beforeEach(() => {
 		jest.clearAllMocks();
 		mockUseQueryBuilder.mockReturnValue({
-			currentQuery: BUILDER_QUERY,
+			currentQuery: { queryType: EQueryType.QUERY_BUILDER },
 			redirectWithQueryBuilderData: jest.fn(),
 		});
 	});
 
-	it('shows no ClickHouse or PromQL tab for the List kind', () => {
+	it('shows only the Query Builder tab for the List kind', () => {
 		renderBuilder('signoz/ListPanel');
 
 		expect(screen.getByText('Query Builder')).toBeInTheDocument();
@@ -120,126 +90,12 @@ describe('PanelEditorQueryBuilder query-type tabs (driven by the capabilities gu
 		expect(screen.queryByText('PromQL')).not.toBeInTheDocument();
 	});
 
-	it('shows all four tabs for the Time Series kind', () => {
+	it('shows all three tabs for the Time Series kind', () => {
 		renderBuilder('signoz/TimeSeriesPanel');
 
 		expect(screen.getByText('Query Builder')).toBeInTheDocument();
 		expect(screen.getByText('ClickHouse Query')).toBeInTheDocument();
 		expect(screen.getByText('PromQL')).toBeInTheDocument();
-		expect(screen.getByText('AI Query Builder')).toBeInTheDocument();
-	});
-
-	it('shows the AI tab for the Table kind', () => {
-		renderBuilder('signoz/TablePanel');
-		expect(screen.getByText('AI Query Builder')).toBeInTheDocument();
-	});
-
-	it('shows the AI tab for the List kind', () => {
-		renderBuilder('signoz/ListPanel');
-		expect(screen.getByText('AI Query Builder')).toBeInTheDocument();
-	});
-});
-
-describe('PanelEditorQueryBuilder AI tab', () => {
-	const redirectWithQueryBuilderData = jest.fn();
-	const updateAllQueriesOperators = jest.fn((query: unknown) => query);
-
-	function mockBuilder(currentQuery: unknown): void {
-		mockUseQueryBuilder.mockReturnValue({
-			currentQuery,
-			redirectWithQueryBuilderData,
-			updateAllQueriesOperators,
-		});
-	}
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-	});
-
-	it('activates the AI tab for an AI query and pins the builder to traces', () => {
-		mockBuilder(AI_QUERY);
-		renderBuilder('signoz/TimeSeriesPanel');
-
-		expect(
-			screen.getByRole('tab', { name: 'AI Query Builder', selected: true }),
-		).toBeInTheDocument();
-		expect(lastQueryBuilderProps()).toMatchObject({
-			config: { initialDataSource: 'traces', queryVariant: 'static' },
-			showTraceOperator: false,
-		});
-	});
-
-	it('seeds an AI traces query when switching to the AI tab', () => {
-		mockBuilder(BUILDER_QUERY);
-		renderBuilder('signoz/TimeSeriesPanel');
-
-		fireEvent.click(screen.getByText('AI Query Builder'));
-
-		expect(updateAllQueriesOperators).toHaveBeenCalledWith(
-			expect.anything(),
-			'graph',
-			'traces',
-		);
-		const [seeded] = redirectWithQueryBuilderData.mock.calls[0];
-		expect(seeded.queryType).toBe(EQueryType.QUERY_BUILDER);
-		expect(seeded.builder.queryData[0].builderQueryType).toBe('builder_ai_query');
-	});
-
-	it('keeps the builder query when returning from ClickHouse', () => {
-		const logsQuery = {
-			queryType: EQueryType.QUERY_BUILDER,
-			builder: { queryData: [{ dataSource: 'logs', legend: 'kept' }] },
-		};
-		mockBuilder(logsQuery);
-		renderBuilder('signoz/TimeSeriesPanel');
-
-		fireEvent.click(screen.getByText('ClickHouse Query'));
-		const [onClickHouse] = redirectWithQueryBuilderData.mock.calls[0];
-		expect(onClickHouse.queryType).toBe(EQueryType.CLICKHOUSE);
-		// The builder slot already holds the Query Builder query — nothing to swap.
-		expect(onClickHouse.builder).toBe(logsQuery.builder);
-	});
-
-	it('shows a fresh default query when leaving AI', () => {
-		mockBuilder(AI_QUERY);
-		renderBuilder('signoz/TimeSeriesPanel');
-
-		fireEvent.click(screen.getByText('Query Builder'));
-
-		const [next] = redirectWithQueryBuilderData.mock.calls[0];
-		expect(next.queryType).toBe(EQueryType.QUERY_BUILDER);
-		expect(next.builder.queryData[0].builderQueryType).toBeUndefined();
-		expect(next.builder.queryData[0].dataSource).toBe('metrics');
-	});
-
-	it("keeps each tab's own query across Query Builder ↔ AI round trips", () => {
-		const logsQuery = {
-			queryType: EQueryType.QUERY_BUILDER,
-			builder: { queryData: [{ dataSource: 'logs' }] },
-		};
-		const host = (): JSX.Element => (
-			<BuilderHost panelKind="signoz/TimeSeriesPanel" />
-		);
-		mockBuilder(logsQuery);
-		const { rerender } = render(host());
-
-		fireEvent.click(screen.getByText('AI Query Builder'));
-		const [aiQuery] = redirectWithQueryBuilderData.mock.calls[0];
-		// The user writes an AI query, then goes back to Query Builder.
-		const editedAIBuilder = {
-			queryData: [{ dataSource: 'traces', builderQueryType: 'builder_ai_query' }],
-		};
-		mockBuilder({ ...aiQuery, builder: editedAIBuilder });
-		rerender(host());
-		fireEvent.click(screen.getByText('Query Builder'));
-		const [backToQB] = redirectWithQueryBuilderData.mock.calls[1];
-		expect(backToQB.builder).toBe(logsQuery.builder);
-
-		mockBuilder(backToQB);
-		rerender(host());
-		fireEvent.click(screen.getByText('AI Query Builder'));
-		const [backToAI] = redirectWithQueryBuilderData.mock.calls[2];
-		expect(backToAI.builder).toBe(editedAIBuilder);
 	});
 });
 
@@ -247,7 +103,7 @@ describe('PanelEditorQueryBuilder field visibility (driven by the capabilities g
 	beforeEach(() => {
 		jest.clearAllMocks();
 		mockUseQueryBuilder.mockReturnValue({
-			currentQuery: BUILDER_QUERY,
+			currentQuery: { queryType: EQueryType.QUERY_BUILDER },
 			redirectWithQueryBuilderData: jest.fn(),
 		});
 	});
@@ -288,7 +144,7 @@ describe('PanelEditorQueryBuilder signal dropdown (driven by the capabilities gu
 	beforeEach(() => {
 		jest.clearAllMocks();
 		mockUseQueryBuilder.mockReturnValue({
-			currentQuery: BUILDER_QUERY,
+			currentQuery: { queryType: EQueryType.QUERY_BUILDER },
 			redirectWithQueryBuilderData: jest.fn(),
 		});
 	});

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/QueryEditorBody.tsx

@@ -71,8 +71,6 @@ interface QueryEditorBodyProps {
 	/** Kind switch, owned by the shell (its cache must survive the fork swap). */
 	onChangePanelKind: (kind: PanelKind) => void;
 	originalPanelKind?: PanelKind;
-	/** Tab switch, owned by the shell alongside the kind switch it shares memory with. */
-	onChangeQueryMode: (key: string) => void;
 }
 
 /**
@@ -94,7 +92,6 @@ function QueryEditorBody({
 	panelDefinition,
 	onChangePanelKind,
 	originalPanelKind,
-	onChangeQueryMode,
 }: QueryEditorBodyProps): JSX.Element {
 	// Read here rather than taken as props: this renders inside a loaded dashboard
 	// subtree, so it resolves the same context every other consumer does.
@@ -310,7 +307,6 @@ function QueryEditorBody({
 						panelDefinition={panelDefinition}
 						signal={listSignal}
 						isLoadingQueries={isFetching}
-						onChangeQueryMode={onChangeQueryMode}
 						onStageRunQuery={runQuery}
 						onCancelQuery={cancelQuery}
 						spec={spec}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/PanelEditorContainer.test.tsx

@@ -60,9 +60,8 @@ jest.mock('../hooks/usePanelEditorQuerySync', () => ({
 }));
 
 const mockUseTypeSwitch = jest.fn();
-jest.mock('../hooks/usePanelKindAndQueryModeSwitch', () => ({
-	usePanelKindAndQueryModeSwitch: (args: unknown): unknown =>
-		mockUseTypeSwitch(args),
+jest.mock('../hooks/usePanelTypeSwitch', () => ({
+	usePanelTypeSwitch: (args: unknown): unknown => mockUseTypeSwitch(args),
 }));
 
 jest.mock('../hooks/usePanelEditorSave', () => ({

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx

@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { useRef, useState } from 'react';
+import { useState } from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { Provider as ReduxProvider } from 'react-redux';
@@ -21,8 +21,6 @@ import { usePanelEditorQuerySync } from '../hooks/usePanelEditorQuerySync';
 import { requireQueryPanelDefinition } from 'pages/DashboardPage/DashboardContainer/Panels/capabilities';
 
 import PanelEditorQueryBuilder from '../PanelEditorQueryBuilder/PanelEditorQueryBuilder';
-import { useQueryModeChange } from '../hooks/useQueryModeChange';
-import type { BuildersByVariant } from 'types/api/queryBuilder/queryBuilderData';
 
 // jest.config maps the real hook to a no-op mock; this suite needs real navigation.
 jest.mock('hooks/useSafeNavigate', () => {
@@ -84,18 +82,10 @@ function EditorRoute(): JSX.Element {
 		signal: TelemetrytypesSignalDTO.metrics,
 		savedQueries: panel.spec.queries,
 	});
-	const panelDefinition = requireQueryPanelDefinition('signoz/TimeSeriesPanel');
-	const parkedBuilders = useRef<BuildersByVariant>({});
-	const onChangeQueryMode = useQueryModeChange({
-		panelType: PANEL_TYPES.TIME_SERIES,
-		supportedQueryModesKindMap: panelDefinition.supportedQueryModesKindMap,
-		parkedBuilders,
-	});
 
 	return (
 		<PanelEditorQueryBuilder
-			panelDefinition={panelDefinition}
-			onChangeQueryMode={onChangeQueryMode}
+			panelDefinition={requireQueryPanelDefinition('signoz/TimeSeriesPanel')}
 			isLoadingQueries={false}
 			onStageRunQuery={noop}
 			onCancelQuery={noop}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/hooks/__tests__/usePanelEditorQuerySync.test.ts

@@ -45,16 +45,8 @@ const SAVED_QUERIES = [{ id: 'saved' }] as unknown as NonNullable<
 const CONVERTED_QUERIES = [{ id: 'converted' }] as unknown as NonNullable<
 	DashboardtypesPanelSpecDTO['queries']
 >;
-const SEED_V1 = {
-	id: 'seed',
-	queryType: 'builder',
-	builder: { queryData: [] },
-} as unknown as Query;
-const STAGED_V1 = {
-	id: 'staged',
-	queryType: 'builder',
-	builder: { queryData: [] },
-} as unknown as Query;
+const SEED_V1 = { id: 'seed', queryType: 'builder' } as unknown as Query;
+const STAGED_V1 = { id: 'staged', queryType: 'builder' } as unknown as Query;
 
 function makeDraft(
 	queries = SAVED_QUERIES,
@@ -82,11 +74,7 @@ function builderState(
 	handleRunQuery: jest.Mock;
 } {
 	return {
-		currentQuery: {
-			id: 'current',
-			queryType: 'builder',
-			builder: { queryData: [] },
-		} as unknown as Query,
+		currentQuery: { id: 'current', queryType: 'builder' } as unknown as Query,
 		stagedQuery: STAGED_V1,
 		handleRunQuery: jest.fn(),
 		...overrides,
@@ -408,16 +396,8 @@ describe('usePanelEditorQuerySync', () => {
 		const EDITED_ENVELOPES = [
 			{ id: 'edited-envelopes' },
 		] as unknown as NonNullable<DashboardtypesPanelSpecDTO['queries']>;
-		const editedQuery = {
-			id: 'edited',
-			queryType: 'builder',
-			builder: { queryData: [] },
-		} as unknown as Query;
-		const unchangedQuery = {
-			id: 'unchanged',
-			queryType: 'builder',
-			builder: { queryData: [] },
-		} as unknown as Query;
+		const editedQuery = { id: 'edited', queryType: 'builder' } as Query;
+		const unchangedQuery = { id: 'unchanged', queryType: 'builder' } as Query;
 
 		beforeEach(() => {
 			mockToPerses.mockImplementation((query: Query) =>
@@ -488,66 +468,4 @@ describe('usePanelEditorQuerySync', () => {
 			expect(result.current.isQueryDirty).toBe(false);
 		});
 	});
-
-	describe('AI queries are saved like any builder query', () => {
-		const aiQuery = {
-			id: 'ai',
-			queryType: 'builder',
-			builder: { queryData: [{ builderQueryType: 'builder_ai_query' }] },
-		} as unknown as Query;
-
-		it('keeps the AI tag when seeding, so a saved AI panel reopens on the AI tab', () => {
-			const savedAiQuery = {
-				id: 'saved-ai',
-				queryType: 'builder',
-				builder: {
-					queryData: [
-						{ dataSource: 'traces', builderQueryType: 'builder_ai_query' },
-					],
-				},
-			} as unknown as Query;
-			mockFromPerses.mockReturnValue(savedAiQuery);
-			setup({ savedQueries: SAVED_QUERIES });
-
-			const [seeded] = mockUseShareBuilderUrl.mock.calls[0];
-			expect(seeded.defaultValue).toBe(savedAiQuery);
-		});
-
-		it('serializes the live AI query, not the seed', () => {
-			// Input-sensitive so the envelope compare reads dirty and names what was serialized.
-			mockToPerses.mockImplementation((query: Query) =>
-				query?.id === 'ai' ? CONVERTED_QUERIES : SAVED_QUERIES,
-			);
-			mockUseQueryBuilder.mockReturnValue(builderState({ currentQuery: aiQuery }));
-			const { result } = setup({ savedQueries: SAVED_QUERIES });
-			const { spec } = makeDraft();
-
-			expect(result.current.buildSaveSpec(spec)).toStrictEqual({
-				...spec,
-				queries: CONVERTED_QUERIES,
-			});
-		});
-
-		it('still saves a ClickHouse query while an AI query sits in the builder slot', () => {
-			const clickHouseQuery = {
-				...aiQuery,
-				id: 'ch',
-				queryType: 'clickhouse_sql',
-			} as unknown as Query;
-			// Input-sensitive so the envelope compare reads dirty and the normal path runs.
-			mockToPerses.mockImplementation((query: Query) =>
-				query?.id === 'ch' ? CONVERTED_QUERIES : SAVED_QUERIES,
-			);
-			mockUseQueryBuilder.mockReturnValue(
-				builderState({ currentQuery: clickHouseQuery }),
-			);
-			const { result } = setup({ savedQueries: SAVED_QUERIES });
-			const { spec } = makeDraft();
-
-			expect(result.current.buildSaveSpec(spec)).toStrictEqual({
-				...spec,
-				queries: CONVERTED_QUERIES,
-			});
-		});
-	});
 });

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/hooks/__tests__/usePanelTypeSwitch.test.ts

@@ -5,11 +5,11 @@ import { handleQueryChange } from 'lib/query/panelQuery';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import type { Query } from 'types/api/queryBuilder/queryBuilderData';
 
-import { resolveQueryMode } from 'pages/DashboardPage/DashboardContainer/Panels/capabilities';
+import { resolveQueryType } from '../../../Panels/capabilities';
 import { getBuilderQueries } from '../../../Panels/utils/getBuilderQueries';
 import { toPerses } from '../../../queryV5/persesQueryAdapters';
 import { getSwitchedPluginSpec } from '../../getSwitchedPluginSpec';
-import { usePanelKindAndQueryModeSwitch } from '../usePanelKindAndQueryModeSwitch';
+import { usePanelTypeSwitch } from '../usePanelTypeSwitch';
 
 jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
 	useQueryBuilder: jest.fn(),
@@ -18,10 +18,7 @@ jest.mock('lib/query/panelQuery', () => ({
 	handleQueryChange: jest.fn(),
 }));
 jest.mock('../../../Panels/capabilities', () => ({
-	resolveQueryMode: jest.fn(),
-	getSupportedSignals: jest.fn(() => ['metrics']),
-	getQueryPanelDefinition: jest.requireActual('../../../Panels/capabilities')
-		.getQueryPanelDefinition,
+	resolveQueryType: jest.fn(),
 	// Real predicate: these specs use real (query) kinds and the static path is
 	// exercised through its own cases below.
 	isStaticPanelKind: jest.requireActual('../../../Panels/capabilities')
@@ -39,7 +36,7 @@ jest.mock('../../../Panels/utils/getBuilderQueries', () => ({
 
 const mockUseQueryBuilder = useQueryBuilder as unknown as jest.Mock;
 const mockHandleQueryChange = handleQueryChange as unknown as jest.Mock;
-const mockResolveQueryMode = resolveQueryMode as unknown as jest.Mock;
+const mockResolveQueryType = resolveQueryType as unknown as jest.Mock;
 const mockToPerses = toPerses as unknown as jest.Mock;
 const mockGetSwitchedPluginSpec = getSwitchedPluginSpec as unknown as jest.Mock;
 const mockGetBuilderQueries = getBuilderQueries as unknown as jest.Mock;
@@ -82,27 +79,14 @@ const tableSpec = makeSpec(
 );
 const listSpec = makeSpec('signoz/ListPanel', LIST_PLUGIN_SPEC, LIST_QUERIES);
 
-function fakeQuery(
-	id: string,
-	queryType: string,
-	queryData: Record<string, unknown>[] = [],
-): Query {
-	return { id, queryType, builder: { queryData } } as unknown as Query;
-}
-
 function builderState(currentQuery: Query): {
 	currentQuery: Query;
 	redirectWithQueryBuilderData: jest.Mock;
-	updateAllQueriesOperators: jest.Mock;
 } {
-	return {
-		currentQuery,
-		redirectWithQueryBuilderData: jest.fn(),
-		updateAllQueriesOperators: jest.fn((query: Query) => query),
-	};
+	return { currentQuery, redirectWithQueryBuilderData: jest.fn() };
 }
 
-describe('usePanelKindAndQueryModeSwitch', () => {
+describe('usePanelTypeSwitch', () => {
 	beforeEach(() => {
 		jest.clearAllMocks();
 		mockHandleQueryChange.mockReturnValue(TRANSFORMED);
@@ -111,16 +95,16 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 		mockGetBuilderQueries.mockReturnValue([{ signal: 'logs' }]);
 		// The guard owns coercion (tested in capabilities.test.ts); here it always
 		// resolves to Query Builder so the coerced type flows into handleQueryChange.
-		mockResolveQueryMode.mockReturnValue('builder');
+		mockResolveQueryType.mockReturnValue('builder');
 	});
 
 	it('does nothing when switching to the current kind', () => {
 		const setSpec = jest.fn();
-		const state = builderState(fakeQuery('q', 'builder'));
+		const state = builderState({ id: 'q', queryType: 'builder' } as Query);
 		mockUseQueryBuilder.mockReturnValue(state);
 
 		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
+			usePanelTypeSwitch({
 				spec: tableSpec,
 				panelType: PANEL_TYPES.TABLE,
 				setSpec,
@@ -134,12 +118,12 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 
 	it('on first visit: transforms the query and resets the spec to the new kind', () => {
 		const setSpec = jest.fn();
-		const tableQuery = fakeQuery('table-current', 'builder');
+		const tableQuery = { id: 'table-current', queryType: 'builder' } as Query;
 		const state = builderState(tableQuery);
 		mockUseQueryBuilder.mockReturnValue(state);
 
 		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
+			usePanelTypeSwitch({
 				spec: tableSpec,
 				panelType: PANEL_TYPES.TABLE,
 				setSpec,
@@ -162,7 +146,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 	it('seeds timestamp-desc Order By on every query when switching to a List panel', () => {
 		const setSpec = jest.fn();
 		mockUseQueryBuilder.mockReturnValue(
-			builderState(fakeQuery('ts-current', 'builder')),
+			builderState({ id: 'ts-current', queryType: 'builder' } as Query),
 		);
 		mockHandleQueryChange.mockReturnValue({
 			id: 'transformed',
@@ -171,7 +155,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 		} as unknown as Query);
 
 		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
+			usePanelTypeSwitch({
 				spec: makeSpec('signoz/TimeSeriesPanel', {}, TABLE_QUERIES),
 				panelType: PANEL_TYPES.TIME_SERIES,
 				setSpec,
@@ -190,7 +174,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 	it('keeps one query and drops the formulas when switching to a Heatmap panel', () => {
 		const setSpec = jest.fn();
 		mockUseQueryBuilder.mockReturnValue(
-			builderState(fakeQuery('ts-current', 'builder')),
+			builderState({ id: 'ts-current', queryType: 'builder' } as Query),
 		);
 		mockHandleQueryChange.mockReturnValue({
 			id: 'transformed',
@@ -202,7 +186,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 		} as unknown as Query);
 
 		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
+			usePanelTypeSwitch({
 				spec: makeSpec('signoz/TimeSeriesPanel', {}, TABLE_QUERIES),
 				panelType: PANEL_TYPES.TIME_SERIES,
 				setSpec,
@@ -220,7 +204,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 	it('swaps a percentile spatial aggregation for count when switching to a Heatmap panel', () => {
 		const setSpec = jest.fn();
 		mockUseQueryBuilder.mockReturnValue(
-			builderState(fakeQuery('ts-current', 'builder')),
+			builderState({ id: 'ts-current', queryType: 'builder' } as Query),
 		);
 		mockHandleQueryChange.mockReturnValue({
 			id: 'transformed',
@@ -238,7 +222,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 		} as unknown as Query);
 
 		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
+			usePanelTypeSwitch({
 				spec: makeSpec('signoz/TimeSeriesPanel', {}, TABLE_QUERIES),
 				panelType: PANEL_TYPES.TIME_SERIES,
 				setSpec,
@@ -258,7 +242,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 	it('swaps count back for a percentile when a histogram leaves a Heatmap panel', () => {
 		const setSpec = jest.fn();
 		mockUseQueryBuilder.mockReturnValue(
-			builderState(fakeQuery('heatmap-current', 'builder')),
+			builderState({ id: 'heatmap-current', queryType: 'builder' } as Query),
 		);
 		mockHandleQueryChange.mockReturnValue({
 			id: 'transformed',
@@ -279,7 +263,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 		} as unknown as Query);
 
 		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
+			usePanelTypeSwitch({
 				spec: makeSpec('signoz/HeatmapPanel', {}, TABLE_QUERIES),
 				panelType: PANEL_TYPES.HEATMAP,
 				setSpec,
@@ -299,7 +283,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 	it('leaves a non-histogram metric on sum when it leaves a Heatmap panel', () => {
 		const setSpec = jest.fn();
 		mockUseQueryBuilder.mockReturnValue(
-			builderState(fakeQuery('heatmap-current', 'builder')),
+			builderState({ id: 'heatmap-current', queryType: 'builder' } as Query),
 		);
 		mockHandleQueryChange.mockReturnValue({
 			id: 'transformed',
@@ -320,7 +304,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 		} as unknown as Query);
 
 		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
+			usePanelTypeSwitch({
 				spec: makeSpec('signoz/HeatmapPanel', {}, TABLE_QUERIES),
 				panelType: PANEL_TYPES.HEATMAP,
 				setSpec,
@@ -334,11 +318,11 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 
 	it('coerces the query type when the new kind disallows it (promql → List)', () => {
 		const setSpec = jest.fn();
-		const promQuery = fakeQuery('prom', 'promql');
+		const promQuery = { id: 'prom', queryType: 'promql' } as Query;
 		mockUseQueryBuilder.mockReturnValue(builderState(promQuery));
 
 		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
+			usePanelTypeSwitch({
 				spec: makeSpec('signoz/TimeSeriesPanel', {}, TABLE_QUERIES),
 				panelType: PANEL_TYPES.TIME_SERIES,
 				setSpec,
@@ -347,7 +331,7 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 		act(() => result.current.onChangePanelKind('signoz/ListPanel'));
 
 		// The hook asks the guard to resolve the active query type against the new kind…
-		expect(mockResolveQueryMode).toHaveBeenCalledWith(
+		expect(mockResolveQueryType).toHaveBeenCalledWith(
 			'signoz/ListPanel',
 			'promql',
 		);
@@ -356,224 +340,16 @@ describe('usePanelKindAndQueryModeSwitch', () => {
 		expect((queryArg as Query).queryType).toBe('builder');
 	});
 
-	it('keeps the AI tag when the new kind supports AI', () => {
-		const setSpec = jest.fn();
-		const aiQuery = fakeQuery('ai', 'builder', [
-			{ builderQueryType: 'builder_ai_query' },
-		]);
-		mockUseQueryBuilder.mockReturnValue(builderState(aiQuery));
-		mockResolveQueryMode.mockReturnValue('builder_ai_query');
-
-		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
-				spec: tableSpec,
-				panelType: PANEL_TYPES.TABLE,
-				setSpec,
-			}),
-		);
-		act(() => result.current.onChangePanelKind('signoz/TimeSeriesPanel'));
-
-		const [, queryArg] = mockHandleQueryChange.mock.calls[0];
-		expect((queryArg as Query).builder).toBe(aiQuery.builder);
-		expect((queryArg as Query).builder.queryData[0].builderQueryType).toBe(
-			'builder_ai_query',
-		);
-	});
-
-	it('drops the AI tag when the new kind does not support AI', () => {
-		const setSpec = jest.fn();
-		const aiQuery = fakeQuery('ai', 'builder', [
-			{ dataSource: 'traces', builderQueryType: 'builder_ai_query' },
-		]);
-		const state = builderState(aiQuery);
-		mockUseQueryBuilder.mockReturnValue(state);
-		mockHandleQueryChange.mockImplementation((_type, query) => query);
-		// The guard coerces to Query Builder; the tag must not survive it.
-		mockResolveQueryMode.mockReturnValue('builder');
-
-		const { result } = renderHook(() =>
-			usePanelKindAndQueryModeSwitch({
-				spec: tableSpec,
-				panelType: PANEL_TYPES.TABLE,
-				setSpec,
-			}),
-		);
-		act(() => result.current.onChangePanelKind('signoz/TimeSeriesPanel'));
-
-		const redirected = state.redirectWithQueryBuilderData.mock
-			.calls[0][0] as Query;
-		expect(redirected.builder.queryData[0].builderQueryType).toBeUndefined();
-		expect(redirected.builder.queryData[0].dataSource).toBe('traces');
-	});
-
-	it('stays on the AI tab when returning to a kind last left on Query Builder', () => {
-		const setSpec = jest.fn();
-		const qbQuery = fakeQuery('qb', 'builder', [{ dataSource: 'logs' }]);
-		const aiQuery = fakeQuery('ai', 'builder', [
-			{ dataSource: 'traces', builderQueryType: 'builder_ai_query' },
-		]);
-		let state = builderState(qbQuery);
-		mockUseQueryBuilder.mockImplementation(() => state);
-		mockHandleQueryChange.mockImplementation((_type, query) => query);
-
-		const { result, rerender } = renderHook(
-			(props: { spec: DashboardtypesPanelSpecDTO; panelType: PANEL_TYPES }) =>
-				usePanelKindAndQueryModeSwitch({ ...props, setSpec }),
-			{ initialProps: { spec: tableSpec, panelType: PANEL_TYPES.TABLE } },
-		);
-
-		// Leave Table on Query Builder — its stash holds the QB query.
-		act(() => result.current.onChangePanelKind('signoz/ListPanel'));
-
-		// On List the user moves to the AI tab, then returns to Table.
-		state = builderState(aiQuery);
-		mockResolveQueryMode.mockReturnValue('builder_ai_query');
-		rerender({ spec: listSpec, panelType: PANEL_TYPES.LIST });
-		act(() => result.current.onChangePanelKind('signoz/TablePanel'));
-
-		const redirected = state.redirectWithQueryBuilderData.mock
-			.calls[0][0] as Query;
-		expect(redirected.builder.queryData[0].builderQueryType).toBe(
-			'builder_ai_query',
-		);
-		const restored = setSpec.mock.calls[
-			setSpec.mock.calls.length - 1
-		][0] as DashboardtypesPanelSpecDTO;
-		// The kind's own display spec still comes back; only the query follows the tab.
-		expect(restored.plugin.spec).toBe(TABLE_PLUGIN_SPEC);
-		expect(restored.queries).toBe(CONVERTED);
-
-		// Table's Query Builder query waited behind the AI tab — the tab switch gives it back.
-		act(() => result.current.onChangeQueryMode('builder'));
-		const backToQB = state.redirectWithQueryBuilderData.mock.calls[1][0] as Query;
-		expect(backToQB.builder).toBe(qbQuery.builder);
-	});
-
-	describe('both builder tabs, per kind', () => {
-		const qbQuery = fakeQuery('qb', 'builder', [{ dataSource: 'logs' }]);
-		const aiQuery = fakeQuery('ai', 'builder', [
-			{ dataSource: 'traces', builderQueryType: 'builder_ai_query' },
-		]);
-
-		// Table gets a Query Builder query and an AI one; the user leaves it on AI for List.
-		function leaveTableOnAI(): {
-			result: { current: ReturnType<typeof usePanelKindAndQueryModeSwitch> };
-			rerender: (props: {
-				spec: DashboardtypesPanelSpecDTO;
-				panelType: PANEL_TYPES;
-			}) => void;
-			setSpec: jest.Mock;
-			setState: (query: Query) => ReturnType<typeof builderState>;
-		} {
-			const setSpec = jest.fn();
-			let state = builderState(qbQuery);
-			mockUseQueryBuilder.mockImplementation(() => state);
-			mockHandleQueryChange.mockImplementation((_type, query) => query);
-			const { result, rerender } = renderHook(
-				(props: { spec: DashboardtypesPanelSpecDTO; panelType: PANEL_TYPES }) =>
-					usePanelKindAndQueryModeSwitch({ ...props, setSpec }),
-				{ initialProps: { spec: tableSpec, panelType: PANEL_TYPES.TABLE } },
-			);
-			const setState = (query: Query): ReturnType<typeof builderState> => {
-				state = builderState(query);
-				return state;
-			};
-
-			act(() => result.current.onChangeQueryMode('builder_ai_query'));
-			setState(aiQuery);
-			rerender({ spec: tableSpec, panelType: PANEL_TYPES.TABLE });
-			mockResolveQueryMode.mockReturnValue('builder_ai_query');
-			act(() => result.current.onChangePanelKind('signoz/ListPanel'));
-			return { result, rerender, setSpec, setState };
-		}
-
-		it('rebuilds the parked query for the new kind on a first visit', () => {
-			const { result } = leaveTableOnAI();
-
-			// Table's Query Builder query was rebuilt for List, and is one tab away there.
-			expect(mockHandleQueryChange).toHaveBeenCalledWith(
-				'list',
-				expect.objectContaining({ builder: qbQuery.builder }),
-				PANEL_TYPES.TABLE,
-			);
-			act(() => result.current.onChangeQueryMode('builder'));
-			const { redirectWithQueryBuilderData } =
-				mockUseQueryBuilder.mock.results[
-					mockUseQueryBuilder.mock.results.length - 1
-				].value;
-			const backToQB = redirectWithQueryBuilderData.mock.calls[
-				redirectWithQueryBuilderData.mock.calls.length - 1
-			][0] as Query;
-			expect(backToQB.builder.queryData[0].dataSource).toBe('logs');
-			expect(backToQB.builder.queryData[0].builderQueryType).toBeUndefined();
-		});
-
-		it("brings back both tabs' queries when revisiting a kind", () => {
-			const { result, rerender, setSpec, setState } = leaveTableOnAI();
-
-			// Back to Table from List, still on the AI tab.
-			const state = setState(
-				fakeQuery('list-ai', 'builder', [
-					{ dataSource: 'traces', builderQueryType: 'builder_ai_query' },
-				]),
-			);
-			rerender({ spec: listSpec, panelType: PANEL_TYPES.LIST });
-			act(() => result.current.onChangePanelKind('signoz/TablePanel'));
-
-			const restored = state.redirectWithQueryBuilderData.mock
-				.calls[0][0] as Query;
-			expect(restored.builder).toBe(aiQuery.builder);
-			const restoredSpec = setSpec.mock.calls[
-				setSpec.mock.calls.length - 1
-			][0] as DashboardtypesPanelSpecDTO;
-			expect(restoredSpec.plugin.spec).toBe(TABLE_PLUGIN_SPEC);
-			expect(restoredSpec.queries).toBe(TABLE_QUERIES);
-
-			// Table's Query Builder query is one tab away.
-			act(() => result.current.onChangeQueryMode('builder'));
-			const backToQB = state.redirectWithQueryBuilderData.mock
-				.calls[1][0] as Query;
-			expect(backToQB.builder).toBe(qbQuery.builder);
-		});
-
-		it('swaps in the Query Builder query when revisiting a kind left on AI', () => {
-			const { result, rerender, setSpec, setState } = leaveTableOnAI();
-
-			// On List the user is back on Query Builder, then returns to Table.
-			const state = setState(
-				fakeQuery('list-qb', 'builder', [{ dataSource: 'logs' }]),
-			);
-			mockResolveQueryMode.mockReturnValue('builder');
-			rerender({ spec: listSpec, panelType: PANEL_TYPES.LIST });
-			act(() => result.current.onChangePanelKind('signoz/TablePanel'));
-
-			const restored = state.redirectWithQueryBuilderData.mock
-				.calls[0][0] as Query;
-			expect(restored.builder).toBe(qbQuery.builder);
-			// The stashed preview queries were the AI query's; they're rebuilt for the swap.
-			const restoredSpec = setSpec.mock.calls[
-				setSpec.mock.calls.length - 1
-			][0] as DashboardtypesPanelSpecDTO;
-			expect(restoredSpec.queries).toBe(CONVERTED);
-
-			// Table's AI query is one tab away.
-			act(() => result.current.onChangeQueryMode('builder_ai_query'));
-			const backToAI = state.redirectWithQueryBuilderData.mock
-				.calls[1][0] as Query;
-			expect(backToAI.builder).toBe(aiQuery.builder);
-		});
-	});
-
 	it('restores the original kind verbatim on switch-back (reversibility)', () => {
 		const setSpec = jest.fn();
-		const tableQuery = fakeQuery('table-current', 'builder');
-		const listQuery = fakeQuery('list-current', 'builder');
+		const tableQuery = { id: 'table-current', queryType: 'builder' } as Query;
+		const listQuery = { id: 'list-current', queryType: 'builder' } as Query;
 		let state = builderState(tableQuery);
 		mockUseQueryBuilder.mockImplementation(() => state);
 
 		const { result, rerender } = renderHook(
 			(props: { spec: DashboardtypesPanelSpecDTO; panelType: PANEL_TYPES }) =>
-				usePanelKindAndQueryModeSwitch({ ...props, setSpec }),
+				usePanelTypeSwitch({ ...props, setSpec }),
 			{ initialProps: { spec: tableSpec, panelType: PANEL_TYPES.TABLE } },
 		);
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelEditSession.ts

@@ -4,10 +4,7 @@ import type {
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import type { PANEL_TYPES } from 'constants/queryBuilder';
-import {
-	getSupportedSignals,
-	requireQueryPanelDefinition,
-} from 'pages/DashboardPage/DashboardContainer/Panels/capabilities';
+import { requireQueryPanelDefinition } from 'pages/DashboardPage/DashboardContainer/Panels/capabilities';
 import { isPanelKindSupported } from 'pages/DashboardPage/DashboardContainer/Panels/registry';
 import type { RenderableQueryPanelDefinition } from 'pages/DashboardPage/DashboardContainer/Panels/types/panelDefinition';
 import { toPanelType } from 'pages/DashboardPage/DashboardContainer/Panels/types/panelKind';
@@ -94,7 +91,7 @@ export function usePanelEditSession({
 	// View modal shells) — asserted rather than assumed.
 	const panelDefinition = requireQueryPanelDefinition(panelKind);
 	const panelType = toPanelType(panelKind);
-	const defaultSignal = getSupportedSignals(panelKind)[0];
+	const defaultSignal = panelDefinition.supportedSignals[0];
 
 	const query = usePanelQuery({
 		panel: draft,

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelKindAndQueryModeSwitch.ts

@@ -1,289 +0,0 @@
-import { useCallback, useRef } from 'react';
-import logEvent from 'api/common/logEvent';
-import type {
-	DashboardtypesPanelPluginDTO,
-	DashboardtypesPanelSpecDTO,
-	DashboardtypesQueryDTO,
-	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 { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { DashboardDetailEvents } from 'pages/DashboardPage/constants/events';
-import {
-	type BuilderVariant,
-	type BuildersByVariant,
-	type OrderByPayload,
-	type Query,
-	QueryMode,
-} from 'types/api/queryBuilder/queryBuilderData';
-
-import {
-	getQueryPanelDefinition,
-	isStaticPanelKind,
-	resolveQueryMode,
-} from 'pages/DashboardPage/DashboardContainer/Panels/capabilities';
-import { getQueryModeSignals } from 'pages/DashboardPage/DashboardContainer/Panels/types/panelCapabilities';
-import {
-	getBuilderVariant,
-	getQueryMode,
-	toBuilderVariant,
-	withoutAIQueryTag,
-} from 'lib/query/queryMode';
-import { seedBuilderForMode } from 'pages/DashboardPage/DashboardContainer/Panels/utils/seedBuilderForMode';
-import { toPanelType, type PanelKind } from '../../Panels/types/panelKind';
-import { getBuilderQueries } from '../../Panels/utils/getBuilderQueries';
-import { toPerses } from '../../queryV5/persesQueryAdapters';
-import {
-	getSwitchedPluginSpec,
-	type SwitchedPluginSpec,
-} from '../getSwitchedPluginSpec';
-import {
-	withPercentileHistogramAggregation,
-	withSingleHeatmapQuery,
-} from '../utils/heatmapQuery';
-import { useQueryModeChange } from './useQueryModeChange';
-
-// V1's handleQueryChange clears orderBy for lists; re-seed the fresh-list default (timestamp desc).
-const DEFAULT_LIST_ORDER_BY: OrderByPayload[] = [
-	{ columnName: 'timestamp', order: 'desc' },
-];
-
-function withDefaultListOrder(query: Query): Query {
-	return {
-		...query,
-		builder: {
-			...query.builder,
-			queryData: query.builder.queryData.map((qd) =>
-				qd.orderBy && qd.orderBy.length > 0
-					? qd
-					: { ...qd, orderBy: DEFAULT_LIST_ORDER_BY },
-			),
-		},
-	};
-}
-
-/** What a kind looks like when you leave it; restored verbatim if you return. */
-interface KindState {
-	pluginSpec: DashboardtypesPanelPluginDTO['spec'];
-	queries: DashboardtypesQueryDTO[];
-	query: Query;
-	/** Both builder variants' queries as the kind was left. */
-	builders: BuildersByVariant;
-}
-
-interface UsePanelKindAndQueryModeSwitchArgs {
-	spec: DashboardtypesPanelSpecDTO;
-	panelType: PANEL_TYPES;
-	setSpec: (next: DashboardtypesPanelSpecDTO) => void;
-}
-
-interface UsePanelKindAndQueryModeSwitchApi {
-	/** Switch the panel to `newKind`, transforming/restoring its query + spec. */
-	onChangePanelKind: (newKind: PanelKind) => void;
-	/** Switch authoring tab; shares the off-screen builder stash with the kind switch. */
-	onChangeQueryMode: (key: string) => void;
-}
-
-/**
- * Switches the edited panel's visualization kind. Mutating `plugin.kind` re-derives the
- * renderer, config sections, query-builder tabs and request type for free; this hook adds
- * the two things that don't: a per-kind session cache that makes switching reversible
- * (`Table → List → Table` restores the original query + spec), and, on first visit to a
- * kind, a query rebuild (`handleQueryChange`) + spec reset (`getSwitchedPluginSpec`).
- * It also owns the tab switch, stashing the off-screen builder variant per kind.
- */
-export function usePanelKindAndQueryModeSwitch({
-	spec,
-	panelType,
-	setSpec,
-}: UsePanelKindAndQueryModeSwitchArgs): UsePanelKindAndQueryModeSwitchApi {
-	const {
-		currentQuery,
-		redirectWithQueryBuilderData,
-		updateAllQueriesOperators,
-	} = useQueryBuilder();
-
-	const cacheRef = useRef<Map<PanelKind, KindState>>(new Map());
-	// Builder queries for the tabs not on screen; the live one is `currentQuery.builder`.
-	const parkedBuilders = useRef<BuildersByVariant>({});
-
-	// Latest spec/query/type, read inside the stable callback without re-subscribing.
-	const specRef = useRef(spec);
-	specRef.current = spec;
-	const queryRef = useRef(currentQuery);
-	queryRef.current = currentQuery;
-	const panelTypeRef = useRef(panelType);
-	panelTypeRef.current = panelType;
-
-	const onChangeQueryMode = useQueryModeChange({
-		panelType,
-		supportedQueryModesKindMap:
-			getQueryPanelDefinition(spec.plugin.kind as PanelKind)
-				?.supportedQueryModesKindMap ?? {},
-		parkedBuilders,
-	});
-
-	const onChangePanelKind = useCallback(
-		(newKind: PanelKind): void => {
-			const currentSpec = specRef.current;
-			const oldKind = currentSpec.plugin.kind as PanelKind;
-			if (newKind === oldKind) {
-				return;
-			}
-			void logEvent(DashboardDetailEvents.PanelTypeChanged, {
-				from: oldKind,
-				to: newKind,
-			});
-			const query = queryRef.current;
-
-			cacheRef.current.set(oldKind, {
-				pluginSpec: currentSpec.plugin.spec,
-				queries: currentSpec.queries,
-				query,
-				builders: {
-					...parkedBuilders.current,
-					[getBuilderVariant(query.builder)]: query.builder,
-				},
-			});
-
-			const newPanelType = toPanelType(newKind);
-			const targetMode = resolveQueryMode(newKind, getQueryMode(query));
-			const targetVariant = toBuilderVariant(targetMode);
-			// An AI query is a builder query carrying the tag, so it rides on `builder`.
-			const targetQueryType =
-				targetMode === QueryMode.AI_QUERY_BUILDER
-					? QueryMode.QUERY_BUILDER
-					: targetMode;
-
-			// Only `plugin` needs a cast: it's a discriminated union over `kind`, and a
-			// dynamically-chosen kind can't be correlated with its spec statically (as in
-			// `createDefaultPanel`). The surrounding spec stays fully typed.
-			const buildSpec = (
-				pluginSpec: DashboardtypesPanelPluginDTO['spec'] | SwitchedPluginSpec,
-				queries: DashboardtypesQueryDTO[],
-			): DashboardtypesPanelSpecDTO => ({
-				...currentSpec,
-				plugin: {
-					...currentSpec.plugin,
-					kind: newKind,
-					spec: pluginSpec,
-				} as DashboardtypesPanelPluginDTO,
-				queries,
-			});
-			const rebuildForNewKind = (source: Query): Query => {
-				const transformed = handleQueryChange(
-					newPanelType as keyof PartialPanelTypes,
-					{ ...source, queryType: targetQueryType },
-					panelTypeRef.current,
-				);
-				// Match a fresh list panel's default order so the builder's Order By isn't empty.
-				const ordered =
-					newKind === 'signoz/ListPanel'
-						? withDefaultListOrder(transformed)
-						: transformed;
-				return newKind === 'signoz/HeatmapPanel'
-					? withSingleHeatmapQuery(ordered)
-					: withPercentileHistogramAggregation(ordered);
-			};
-			// Tab unused on this kind: AI gets a fresh seed, Query Builder reuses `source` untagged.
-			const seedTargetTab = (source: Query): Query =>
-				targetMode === QueryMode.AI_QUERY_BUILDER
-					? {
-							...source,
-							builder: seedBuilderForMode({
-								mode: targetMode,
-								defaultSignal: getQueryModeSignals(
-									getQueryPanelDefinition(newKind)?.supportedQueryModesKindMap,
-									QueryMode.QUERY_BUILDER,
-								)[0],
-								panelType: newPanelType,
-								updateAllQueriesOperators,
-							}),
-						}
-					: withoutAIQueryTag(source);
-			// Target tab's query comes from the stash; the rest stay parked.
-			const unparkTargetTab = (
-				source: Query,
-				builders: BuildersByVariant,
-			): { query: Query; parked: BuildersByVariant } => {
-				const stored = targetVariant ? builders[targetVariant] : source.builder;
-				const next = stored
-					? { ...source, builder: stored }
-					: seedTargetTab(source);
-				const parked: BuildersByVariant = { ...builders };
-				delete parked[getBuilderVariant(next.builder)];
-				return { query: next, parked };
-			};
-
-			// Revisit → restore the stash in the active mode; a static kind has no builder to re-seed.
-			const cached = cacheRef.current.get(newKind);
-			if (cached) {
-				if (isStaticPanelKind(newKind)) {
-					setSpec(buildSpec(cached.pluginSpec, cached.queries));
-					return;
-				}
-				const restored = unparkTargetTab(cached.query, cached.builders);
-				parkedBuilders.current = restored.parked;
-				// The stashed preview queries belong to the stashed query, not a swapped-in one.
-				setSpec(
-					buildSpec(
-						cached.pluginSpec,
-						restored.query.builder === cached.query.builder
-							? cached.queries
-							: toPerses(restored.query, newPanelType),
-					),
-				);
-				redirectWithQueryBuilderData({
-					...restored.query,
-					queryType: targetQueryType,
-				});
-				return;
-			}
-
-			// First visit to a static kind → fresh spec from its sections, queries
-			// emptied (the API accepts nothing else), and the query builder left as-is:
-			// the stash above keeps the old kind's query for the return trip.
-			if (isStaticPanelKind(newKind)) {
-				const signal = getBuilderQueries(currentSpec.queries)[0]
-					?.signal as TelemetrytypesSignalDTO;
-				setSpec(buildSpec(getSwitchedPluginSpec(currentSpec, newKind, signal), []));
-				return;
-			}
-
-			// First visit → rebuild both builder tabs' queries for the new panel type.
-			const transformed = rebuildForNewKind(query);
-			const rebuiltBuilders: BuildersByVariant = {};
-			(Object.keys(parkedBuilders.current) as BuilderVariant[]).forEach(
-				(variant) => {
-					const parked = parkedBuilders.current[variant];
-					if (parked) {
-						rebuiltBuilders[variant] = rebuildForNewKind({
-							...query,
-							builder: parked,
-						}).builder;
-					}
-				},
-			);
-			rebuiltBuilders[getBuilderVariant(transformed.builder)] =
-				transformed.builder;
-			const picked = unparkTargetTab(transformed, rebuiltBuilders);
-			parkedBuilders.current = picked.parked;
-			const nextQuery = picked.query;
-			const signal = getBuilderQueries(currentSpec.queries)[0]
-				?.signal as TelemetrytypesSignalDTO;
-
-			setSpec(
-				buildSpec(
-					getSwitchedPluginSpec(currentSpec, newKind, signal),
-					toPerses(nextQuery, newPanelType),
-				),
-			);
-			redirectWithQueryBuilderData(nextQuery);
-		},
-		[setSpec, redirectWithQueryBuilderData, updateAllQueriesOperators],
-	);
-
-	return { onChangePanelKind, onChangeQueryMode };
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelTypeSwitch.ts

@@ -0,0 +1,290 @@
+import { useCallback, useRef } from 'react';
+import logEvent from 'api/common/logEvent';
+import type {
+	DashboardtypesPanelPluginDTO,
+	DashboardtypesPanelSpecDTO,
+	DashboardtypesQueryDTO,
+	TelemetrytypesSignalDTO,
+} from 'api/generated/services/sigNoz.schemas';
+import { ATTRIBUTE_TYPES, type PANEL_TYPES } from 'constants/queryBuilder';
+import { handleQueryChange } from 'lib/query/panelQuery';
+import type { PartialPanelTypes } from 'lib/query/panelTypeDataSourceFormValuesMap';
+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { DashboardDetailEvents } from 'pages/DashboardPage/constants/events';
+import type {
+	IBuilderQuery,
+	OrderByPayload,
+	Query,
+} from 'types/api/queryBuilder/queryBuilderData';
+import type {
+	MetricAggregation,
+	SpaceAggregation,
+} from 'types/api/v5/queryRange';
+
+import { isStaticPanelKind, resolveQueryType } from '../../Panels/capabilities';
+import { toPanelType, type PanelKind } from '../../Panels/types/panelKind';
+import { getBuilderQueries } from '../../Panels/utils/getBuilderQueries';
+import { toPerses } from '../../queryV5/persesQueryAdapters';
+import {
+	getSwitchedPluginSpec,
+	type SwitchedPluginSpec,
+} from '../getSwitchedPluginSpec';
+
+// V1's handleQueryChange clears orderBy for lists; re-seed the fresh-list default (timestamp desc).
+const DEFAULT_LIST_ORDER_BY: OrderByPayload[] = [
+	{ columnName: 'timestamp', order: 'desc' },
+];
+
+const PERCENTILE_SPACE_AGGREGATIONS = new Set<SpaceAggregation>([
+	'p50',
+	'p75',
+	'p90',
+	'p95',
+	'p99',
+]);
+
+const HISTOGRAM_ATTRIBUTE_TYPES = new Set<string>([
+	ATTRIBUTE_TYPES.HISTOGRAM,
+	ATTRIBUTE_TYPES.EXPONENTIAL_HISTOGRAM,
+]);
+
+const DEFAULT_HISTOGRAM_SPACE_AGGREGATION = 'p90';
+
+/** What a heatmap cell holds, and the one space aggregation the kind offers. */
+const HEATMAP_HISTOGRAM_SPACE_AGGREGATION = 'count';
+
+function withDefaultListOrder(query: Query): Query {
+	return {
+		...query,
+		builder: {
+			...query.builder,
+			queryData: query.builder.queryData.map((qd) =>
+				qd.orderBy && qd.orderBy.length > 0
+					? qd
+					: { ...qd, orderBy: DEFAULT_LIST_ORDER_BY },
+			),
+		},
+	};
+}
+
+/**
+ * A heatmap draws against one bucket axis, so the request takes exactly one enabled
+ * query and refuses a formula over the cells. The per-kind cache restores whatever is
+ * dropped here if the panel switches back.
+ *
+ * Percentiles go the same way: a histogram heatmap takes its axis from the `le` labels,
+ * so a percentile draws the grid a count already draws, and the statement builder sums
+ * the `le` counts either way.
+ */
+function withSingleHeatmapQuery(query: Query): Query {
+	const [first] = query.builder.queryData;
+	if (!first) {
+		return query;
+	}
+
+	return {
+		...query,
+		builder: {
+			...query.builder,
+			queryData: [
+				{
+					...first,
+					spaceAggregation: withoutPercentile(first.spaceAggregation),
+					aggregations: first.aggregations?.map((aggregation) => ({
+						...aggregation,
+						spaceAggregation: withoutPercentile(
+							(aggregation as MetricAggregation).spaceAggregation,
+						),
+					})) as IBuilderQuery['aggregations'],
+				},
+			],
+			queryFormulas: [],
+		},
+	};
+}
+
+/** Cast because the substitute is a `SpaceAggregation` whichever of its callers `T` came from. */
+function withoutPercentile<T extends string | undefined>(
+	spaceAggregation: T,
+): T {
+	return (
+		PERCENTILE_SPACE_AGGREGATIONS.has(spaceAggregation as SpaceAggregation)
+			? HEATMAP_HISTOGRAM_SPACE_AGGREGATION
+			: spaceAggregation
+	) as T;
+}
+
+/**
+ * Undoes the count above: every other kind offers a histogram metric percentiles alone,
+ * so a count carried out of a heatmap would sit in the selector with no option behind
+ * it. Other metric types are left alone — count is a real choice for a sum or a gauge.
+ */
+function withPercentileHistogramAggregation(query: Query): Query {
+	return {
+		...query,
+		builder: {
+			...query.builder,
+			queryData: query.builder.queryData.map((queryData) => {
+				if (
+					!HISTOGRAM_ATTRIBUTE_TYPES.has(queryData.aggregateAttribute?.type ?? '')
+				) {
+					return queryData;
+				}
+
+				return {
+					...queryData,
+					spaceAggregation: withoutCount(queryData.spaceAggregation),
+					aggregations: queryData.aggregations?.map((aggregation) => ({
+						...aggregation,
+						spaceAggregation: withoutCount(
+							(aggregation as MetricAggregation).spaceAggregation,
+						),
+					})) as IBuilderQuery['aggregations'],
+				};
+			}),
+		},
+	};
+}
+
+function withoutCount<T extends string | undefined>(spaceAggregation: T): T {
+	return (
+		spaceAggregation === HEATMAP_HISTOGRAM_SPACE_AGGREGATION
+			? DEFAULT_HISTOGRAM_SPACE_AGGREGATION
+			: spaceAggregation
+	) as T;
+}
+
+/** What a kind looks like when you leave it; restored verbatim if you return. */
+interface KindState {
+	pluginSpec: DashboardtypesPanelPluginDTO['spec'];
+	queries: DashboardtypesQueryDTO[];
+	builderQuery: Query;
+}
+
+interface UsePanelTypeSwitchArgs {
+	spec: DashboardtypesPanelSpecDTO;
+	panelType: PANEL_TYPES;
+	setSpec: (next: DashboardtypesPanelSpecDTO) => void;
+}
+
+interface UsePanelTypeSwitchApi {
+	/** Switch the panel to `newKind`, transforming/restoring its query + spec. */
+	onChangePanelKind: (newKind: PanelKind) => void;
+}
+
+/**
+ * Switches the edited panel's visualization kind. Mutating `plugin.kind` re-derives the
+ * renderer, config sections, query-builder tabs and request type for free; this hook adds
+ * the two things that don't: a per-kind session cache that makes switching reversible
+ * (`Table → List → Table` restores the original query + spec), and, on first visit to a
+ * kind, a query rebuild (`handleQueryChange`) + spec reset (`getSwitchedPluginSpec`).
+ */
+export function usePanelTypeSwitch({
+	spec,
+	panelType,
+	setSpec,
+}: UsePanelTypeSwitchArgs): UsePanelTypeSwitchApi {
+	const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
+
+	const cacheRef = useRef<Map<PanelKind, KindState>>(new Map());
+
+	// Latest spec/query/type, read inside the stable callback without re-subscribing.
+	const specRef = useRef(spec);
+	specRef.current = spec;
+	const queryRef = useRef(currentQuery);
+	queryRef.current = currentQuery;
+	const panelTypeRef = useRef(panelType);
+	panelTypeRef.current = panelType;
+
+	const onChangePanelKind = useCallback(
+		(newKind: PanelKind): void => {
+			const currentSpec = specRef.current;
+			const oldKind = currentSpec.plugin.kind as PanelKind;
+			if (newKind === oldKind) {
+				return;
+			}
+			void logEvent(DashboardDetailEvents.PanelTypeChanged, {
+				from: oldKind,
+				to: newKind,
+			});
+			const query = queryRef.current;
+
+			cacheRef.current.set(oldKind, {
+				pluginSpec: currentSpec.plugin.spec,
+				queries: currentSpec.queries,
+				builderQuery: query,
+			});
+
+			const newPanelType = toPanelType(newKind);
+
+			// Only `plugin` needs a cast: it's a discriminated union over `kind`, and a
+			// dynamically-chosen kind can't be correlated with its spec statically (as in
+			// `createDefaultPanel`). The surrounding spec stays fully typed.
+			const buildSpec = (
+				pluginSpec: DashboardtypesPanelPluginDTO['spec'] | SwitchedPluginSpec,
+				queries: DashboardtypesQueryDTO[],
+			): DashboardtypesPanelSpecDTO => ({
+				...currentSpec,
+				plugin: {
+					...currentSpec.plugin,
+					kind: newKind,
+					spec: pluginSpec,
+				} as DashboardtypesPanelPluginDTO,
+				queries,
+			});
+
+			// Revisit → restore the stash verbatim (the reversibility path). A static
+			// kind's stash carries `queries: []` and its builder query is untouched —
+			// there is no builder to re-seed for it.
+			const cached = cacheRef.current.get(newKind);
+			if (cached) {
+				setSpec(buildSpec(cached.pluginSpec, cached.queries));
+				if (!isStaticPanelKind(newKind)) {
+					redirectWithQueryBuilderData(cached.builderQuery);
+				}
+				return;
+			}
+
+			// First visit to a static kind → fresh spec from its sections, queries
+			// emptied (the API accepts nothing else), and the query builder left as-is:
+			// the stash above keeps the old kind's query for the return trip.
+			if (isStaticPanelKind(newKind)) {
+				const signal = getBuilderQueries(currentSpec.queries)[0]
+					?.signal as TelemetrytypesSignalDTO;
+				setSpec(buildSpec(getSwitchedPluginSpec(currentSpec, newKind, signal), []));
+				return;
+			}
+
+			// First visit → coerce the query type if the new kind disallows it, then
+			// rebuild the builder query for the new type.
+			const queryType = resolveQueryType(newKind, query.queryType);
+			const transformed = handleQueryChange(
+				newPanelType as keyof PartialPanelTypes,
+				{ ...query, queryType },
+				panelTypeRef.current,
+			);
+			// Match a fresh list panel's default order so the builder's Order By isn't empty.
+			let nextQuery =
+				newKind === 'signoz/ListPanel'
+					? withDefaultListOrder(transformed)
+					: transformed;
+			nextQuery =
+				newKind === 'signoz/HeatmapPanel'
+					? withSingleHeatmapQuery(nextQuery)
+					: withPercentileHistogramAggregation(nextQuery);
+			const signal = getBuilderQueries(currentSpec.queries)[0]
+				?.signal as TelemetrytypesSignalDTO;
+
+			setSpec(
+				buildSpec(
+					getSwitchedPluginSpec(currentSpec, newKind, signal),
+					toPerses(nextQuery, newPanelType),
+				),
+			);
+			redirectWithQueryBuilderData(nextQuery);
+		},
+		[setSpec, redirectWithQueryBuilderData],
+	);
+
+	return { onChangePanelKind };
+}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/hooks/useQueryModeChange.ts

@@ -1,83 +0,0 @@
-import { type MutableRefObject, useCallback } from 'react';
-import type { PANEL_TYPES } from 'constants/queryBuilder';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-
-import {
-	getQueryModeSignals,
-	type SupportedQueryModesKindMap,
-} from 'pages/DashboardPage/DashboardContainer/Panels/types/panelCapabilities';
-import {
-	type BuildersByVariant,
-	type Query,
-	QueryMode,
-} from 'types/api/queryBuilder/queryBuilderData';
-import { getBuilderVariant, toBuilderVariant } from 'lib/query/queryMode';
-import { seedBuilderForMode } from 'pages/DashboardPage/DashboardContainer/Panels/utils/seedBuilderForMode';
-
-interface UseQueryModeChangeArgs {
-	panelType: PANEL_TYPES;
-	supportedQueryModesKindMap: SupportedQueryModesKindMap;
-	/** Builder queries for the variant not on screen. */
-	parkedBuilders: MutableRefObject<BuildersByVariant>;
-}
-
-/**
- * Tab switching. Query Builder and AI share `currentQuery.builder`, so crossing between
- * them swaps in the parked query, seeding a first visit; ClickHouse and PromQL pass through.
- */
-export function useQueryModeChange({
-	panelType,
-	supportedQueryModesKindMap,
-	parkedBuilders,
-}: UseQueryModeChangeArgs): (key: string) => void {
-	const {
-		currentQuery,
-		redirectWithQueryBuilderData,
-		updateAllQueriesOperators,
-	} = useQueryBuilder();
-
-	return useCallback(
-		(key: string): void => {
-			const targetMode = key as QueryMode;
-			const targetVariant = toBuilderVariant(targetMode);
-			const heldVariant = getBuilderVariant(currentQuery.builder);
-
-			const seedFor = (mode: QueryMode): Query['builder'] =>
-				seedBuilderForMode({
-					mode,
-					defaultSignal: getQueryModeSignals(
-						supportedQueryModesKindMap,
-						QueryMode.QUERY_BUILDER,
-					)[0],
-					panelType,
-					updateAllQueriesOperators,
-				});
-
-			// Keyed on what `builder` holds, not the active tab: ClickHouse → QB must not reseed.
-			let { builder } = currentQuery;
-			if (targetVariant && targetVariant !== heldVariant) {
-				parkedBuilders.current[heldVariant] = currentQuery.builder;
-				builder = parkedBuilders.current[targetVariant] ?? seedFor(targetMode);
-				delete parkedBuilders.current[targetVariant];
-			}
-
-			redirectWithQueryBuilderData({
-				...currentQuery,
-				// An AI query is a builder query carrying the AI tag; its query type stays `builder`.
-				queryType:
-					targetMode === QueryMode.AI_QUERY_BUILDER
-						? QueryMode.QUERY_BUILDER
-						: targetMode,
-				builder,
-			});
-		},
-		[
-			currentQuery,
-			panelType,
-			parkedBuilders,
-			redirectWithQueryBuilderData,
-			supportedQueryModesKindMap,
-			updateAllQueriesOperators,
-		],
-	);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/index.tsx

@@ -6,7 +6,7 @@ import type { NewPanelTarget } from '../patchOps';
 import QueryEditorBody from './QueryEditorBody';
 import StaticEditorBody from './StaticEditorBody';
 import { usePanelEditorDraft } from './hooks/usePanelEditorDraft';
-import { usePanelKindAndQueryModeSwitch } from './hooks/usePanelKindAndQueryModeSwitch';
+import { usePanelTypeSwitch } from './hooks/usePanelTypeSwitch';
 
 export interface PanelEditorContainerProps {
 	dashboardId: string;
@@ -40,12 +40,11 @@ function PanelEditorContainer(props: PanelEditorContainerProps): JSX.Element {
 	const panelDefinition = getPanelDefinition(panelKind);
 	const originalPanelKind = (savedPanel ?? panel).spec.plugin.kind;
 
-	const { onChangePanelKind, onChangeQueryMode } =
-		usePanelKindAndQueryModeSwitch({
-			spec: draftApi.draft.spec,
-			panelType: toPanelType(panelKind),
-			setSpec: draftApi.setSpec,
-		});
+	const { onChangePanelKind } = usePanelTypeSwitch({
+		spec: draftApi.draft.spec,
+		panelType: toPanelType(panelKind),
+		setSpec: draftApi.setSpec,
+	});
 
 	if (panelDefinition.mode === 'static') {
 		return (
@@ -66,7 +65,6 @@ function PanelEditorContainer(props: PanelEditorContainerProps): JSX.Element {
 			panelDefinition={panelDefinition}
 			onChangePanelKind={onChangePanelKind}
 			originalPanelKind={originalPanelKind}
-			onChangeQueryMode={onChangeQueryMode}
 		/>
 	);
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/utils/heatmapQuery.ts

@@ -1,114 +0,0 @@
-import { ATTRIBUTE_TYPES } from 'constants/queryBuilder';
-import type {
-	IBuilderQuery,
-	Query,
-} from 'types/api/queryBuilder/queryBuilderData';
-import type {
-	MetricAggregation,
-	SpaceAggregation,
-} from 'types/api/v5/queryRange';
-
-const PERCENTILE_SPACE_AGGREGATIONS = new Set<SpaceAggregation>([
-	'p50',
-	'p75',
-	'p90',
-	'p95',
-	'p99',
-]);
-
-const HISTOGRAM_ATTRIBUTE_TYPES = new Set<string>([
-	ATTRIBUTE_TYPES.HISTOGRAM,
-	ATTRIBUTE_TYPES.EXPONENTIAL_HISTOGRAM,
-]);
-
-const DEFAULT_HISTOGRAM_SPACE_AGGREGATION = 'p90';
-
-/** What a heatmap cell holds, and the one space aggregation the kind offers. */
-const HEATMAP_HISTOGRAM_SPACE_AGGREGATION = 'count';
-
-/**
- * A heatmap draws against one bucket axis, so the request takes exactly one enabled
- * query and refuses a formula over the cells. The per-kind cache restores whatever is
- * dropped here if the panel switches back.
- *
- * Percentiles go the same way: a histogram heatmap takes its axis from the `le` labels,
- * so a percentile draws the grid a count already draws, and the statement builder sums
- * the `le` counts either way.
- */
-export function withSingleHeatmapQuery(query: Query): Query {
-	const [first] = query.builder.queryData;
-	if (!first) {
-		return query;
-	}
-
-	return {
-		...query,
-		builder: {
-			...query.builder,
-			queryData: [
-				{
-					...first,
-					spaceAggregation: withoutPercentile(first.spaceAggregation),
-					aggregations: first.aggregations?.map((aggregation) => ({
-						...aggregation,
-						spaceAggregation: withoutPercentile(
-							(aggregation as MetricAggregation).spaceAggregation,
-						),
-					})) as IBuilderQuery['aggregations'],
-				},
-			],
-			queryFormulas: [],
-		},
-	};
-}
-
-/** Cast because the substitute is a `SpaceAggregation` whichever of its callers `T` came from. */
-function withoutPercentile<T extends string | undefined>(
-	spaceAggregation: T,
-): T {
-	return (
-		PERCENTILE_SPACE_AGGREGATIONS.has(spaceAggregation as SpaceAggregation)
-			? HEATMAP_HISTOGRAM_SPACE_AGGREGATION
-			: spaceAggregation
-	) as T;
-}
-
-/**
- * Undoes the count above: every other kind offers a histogram metric percentiles alone,
- * so a count carried out of a heatmap would sit in the selector with no option behind
- * it. Other metric types are left alone — count is a real choice for a sum or a gauge.
- */
-export function withPercentileHistogramAggregation(query: Query): Query {
-	return {
-		...query,
-		builder: {
-			...query.builder,
-			queryData: query.builder.queryData.map((queryData) => {
-				if (
-					!HISTOGRAM_ATTRIBUTE_TYPES.has(queryData.aggregateAttribute?.type ?? '')
-				) {
-					return queryData;
-				}
-
-				return {
-					...queryData,
-					spaceAggregation: withoutCount(queryData.spaceAggregation),
-					aggregations: queryData.aggregations?.map((aggregation) => ({
-						...aggregation,
-						spaceAggregation: withoutCount(
-							(aggregation as MetricAggregation).spaceAggregation,
-						),
-					})) as IBuilderQuery['aggregations'],
-				};
-			}),
-		},
-	};
-}
-
-function withoutCount<T extends string | undefined>(spaceAggregation: T): T {
-	return (
-		spaceAggregation === HEATMAP_HISTOGRAM_SPACE_AGGREGATION
-			? DEFAULT_HISTOGRAM_SPACE_AGGREGATION
-			: spaceAggregation
-	) as T;
-}

frontend/src/pages/DashboardPage/DashboardContainer/Panels/__tests__/capabilities.test.ts

@@ -3,7 +3,6 @@ import {
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { EQueryType } from 'types/common/dashboard';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
 
 import { UNSUPPORTED_PANEL } from '../kinds/UnsupportedPanel/definition';
 import { getPanelDefinition, isPanelKindSupported } from '../registry';
@@ -12,13 +11,12 @@ import { NO_PANEL_ACTIONS } from '../types/panelDefinition';
 import {
 	getQueryPanelDefinition,
 	requireQueryPanelDefinition,
-	getSupportedQueryModes,
 	getSupportedQueryTypes,
 	getSupportedSignals,
 	isPanelCombinationValid,
 	isQueryTypeSupportedByPanelKind,
 	isSignalSupported,
-	resolveQueryMode,
+	resolveQueryType,
 } from '../capabilities';
 import type { PanelKind } from '../types/panelKind';
 
@@ -40,48 +38,6 @@ const EXPECTED_QUERY_TYPES: Record<PanelKind, EQueryType[]> = {
 	'signoz/TextPanel': [],
 };
 
-const EXPECTED_QUERY_MODES: Record<PanelKind, QueryMode[]> = {
-	'signoz/TimeSeriesPanel': [
-		QUERY_BUILDER,
-		CLICKHOUSE,
-		PROM,
-		QueryMode.AI_QUERY_BUILDER,
-	],
-	'signoz/BarChartPanel': [
-		QUERY_BUILDER,
-		CLICKHOUSE,
-		PROM,
-		QueryMode.AI_QUERY_BUILDER,
-	],
-	'signoz/AreaChartPanel': [
-		QUERY_BUILDER,
-		CLICKHOUSE,
-		PROM,
-		QueryMode.AI_QUERY_BUILDER,
-	],
-	'signoz/NumberPanel': [
-		QUERY_BUILDER,
-		CLICKHOUSE,
-		PROM,
-		QueryMode.AI_QUERY_BUILDER,
-	],
-	'signoz/HistogramPanel': [
-		QUERY_BUILDER,
-		CLICKHOUSE,
-		PROM,
-		QueryMode.AI_QUERY_BUILDER,
-	],
-	'signoz/HeatmapPanel': [QUERY_BUILDER, CLICKHOUSE, PROM],
-	'signoz/PieChartPanel': [
-		QUERY_BUILDER,
-		CLICKHOUSE,
-		QueryMode.AI_QUERY_BUILDER,
-	],
-	'signoz/TablePanel': [QUERY_BUILDER, CLICKHOUSE, QueryMode.AI_QUERY_BUILDER],
-	'signoz/ListPanel': [QUERY_BUILDER, QueryMode.AI_QUERY_BUILDER],
-	'signoz/TextPanel': [],
-};
-
 const EXPECTED_SIGNALS: Record<PanelKind, TelemetrytypesSignalDTO[]> = {
 	'signoz/TimeSeriesPanel': [metrics, logs, traces],
 	'signoz/BarChartPanel': [metrics, logs, traces],
@@ -267,15 +223,6 @@ describe('panel capabilities guard', () => {
 			expect(isSignalSupported('signoz/ListPanel', logs)).toBe(true);
 			expect(isSignalSupported('signoz/ListPanel', traces)).toBe(true);
 		});
-
-		it('reads a specific mode when one is given', () => {
-			expect(
-				getSupportedSignals('signoz/TablePanel', QueryMode.AI_QUERY_BUILDER),
-			).toStrictEqual([traces]);
-			expect(
-				getSupportedSignals('signoz/TablePanel', QueryMode.CLICKHOUSE),
-			).toStrictEqual([]);
-		});
 	});
 
 	describe('isPanelCombinationValid', () => {
@@ -324,36 +271,18 @@ describe('panel capabilities guard', () => {
 		});
 	});
 
-	describe('getSupportedQueryModes', () => {
-		it.each(Object.entries(EXPECTED_QUERY_MODES))(
-			'%s supports %j',
-			(kind, modes) => {
-				expect(getSupportedQueryModes(kind as PanelKind)).toStrictEqual(modes);
-			},
-		);
-
-		it('keeps AI out of the query types', () => {
-			expect(getSupportedQueryTypes('signoz/TimeSeriesPanel')).not.toContain(
-				QueryMode.AI_QUERY_BUILDER,
+	describe('resolveQueryType', () => {
+		it('keeps a supported query type', () => {
+			expect(resolveQueryType('signoz/TimeSeriesPanel', PROM)).toBe(PROM);
+			expect(resolveQueryType('signoz/ListPanel', QUERY_BUILDER)).toBe(
+				QUERY_BUILDER,
 			);
 		});
-	});
 
-	describe('resolveQueryMode', () => {
-		it('keeps a supported mode', () => {
-			expect(resolveQueryMode('signoz/TimeSeriesPanel', PROM)).toBe(PROM);
-			expect(
-				resolveQueryMode('signoz/TablePanel', QueryMode.AI_QUERY_BUILDER),
-			).toBe(QueryMode.AI_QUERY_BUILDER);
-			expect(
-				resolveQueryMode('signoz/ListPanel', QueryMode.AI_QUERY_BUILDER),
-			).toBe(QueryMode.AI_QUERY_BUILDER);
-		});
-
-		it('coerces an unsupported mode to the first supported one', () => {
+		it('coerces an unsupported query type to the first supported one', () => {
 			// PromQL → List has no PromQL, falls back to its first (and only) type.
-			expect(resolveQueryMode('signoz/ListPanel', PROM)).toBe(QUERY_BUILDER);
-			expect(resolveQueryMode('signoz/TablePanel', PROM)).toBe(QUERY_BUILDER);
+			expect(resolveQueryType('signoz/ListPanel', PROM)).toBe(QUERY_BUILDER);
+			expect(resolveQueryType('signoz/TablePanel', PROM)).toBe(QUERY_BUILDER);
 		});
 	});
 });

frontend/src/pages/DashboardPage/DashboardContainer/Panels/capabilities.ts

@@ -1,9 +1,7 @@
 import { type TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
 import { EQueryType } from 'types/common/dashboard';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
 
 import { getPanelDefinition } from './registry';
-import { getQueryModeSignals } from './types/panelCapabilities';
 import type { RenderableQueryPanelDefinition } from './types/panelDefinition';
 import type { PanelKind } from './types/panelKind';
 
@@ -50,17 +48,11 @@ export function requireQueryPanelDefinition(
 	return definition;
 }
 
-const DEFAULT_QUERY_MODE = QueryMode.QUERY_BUILDER;
-
-/** Signals a kind can visualize in `mode`. */
+/** Signals a kind can visualize. */
 export function getSupportedSignals(
 	kind: PanelKind,
-	mode: QueryMode = DEFAULT_QUERY_MODE,
 ): TelemetrytypesSignalDTO[] {
-	return getQueryModeSignals(
-		getQueryPanelDefinition(kind)?.supportedQueryModesKindMap,
-		mode,
-	);
+	return getQueryPanelDefinition(kind)?.supportedSignals ?? [];
 }
 
 export function isSignalSupported(
@@ -70,16 +62,9 @@ export function isSignalSupported(
 	return getSupportedSignals(kind).includes(signal);
 }
 
-/** Authoring modes a kind supports, in tab order. */
-export function getSupportedQueryModes(kind: PanelKind): QueryMode[] {
-	const modes = getQueryPanelDefinition(kind)?.supportedQueryModesKindMap ?? {};
-	return Object.keys(modes) as QueryMode[];
-}
 /** Query languages a kind supports (Query Builder / ClickHouse / PromQL). */
 export function getSupportedQueryTypes(kind: PanelKind): EQueryType[] {
-	return getSupportedQueryModes(kind).filter(
-		(mode): mode is EQueryType => mode !== QueryMode.AI_QUERY_BUILDER,
-	);
+	return getQueryPanelDefinition(kind)?.supportedQueryTypes ?? [];
 }
 
 export function isQueryTypeSupportedByPanelKind(
@@ -116,15 +101,20 @@ export function isPanelCombinationValid({
 	return true;
 }
 
-/** `preferred` if the kind supports it, else its first supported mode (e.g. PromQL → List gives Query Builder). */
-export function resolveQueryMode(
+/**
+ * The query type to use for a kind given a `preferred` one: keep it if the kind
+ * supports it, otherwise fall back to the kind's first supported type. Used when
+ * switching panel kinds to coerce an unsupported active query type (e.g. PromQL → a
+ * List panel coerces to Query Builder).
+ */
+export function resolveQueryType(
 	kind: PanelKind,
-	preferred: QueryMode,
-): QueryMode {
-	const supported = getSupportedQueryModes(kind);
+	preferred: EQueryType,
+): EQueryType {
+	const supported = getSupportedQueryTypes(kind);
 	if (supported.includes(preferred)) {
 		return preferred;
 	}
-	// A query-less kind has no supported modes; the builder is the neutral answer.
-	return supported[0] ?? DEFAULT_QUERY_MODE;
+	// A query-less kind has no supported types; the builder is the neutral answer.
+	return supported[0] ?? EQueryType.QUERY_BUILDER;
 }

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/AreaChartPanel/definition.ts

@@ -1,7 +1,6 @@
 import { ChartArea } from '@signozhq/icons';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import QueryBuilderEditorPane from 'pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -9,7 +8,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/AreaChartPanel'> = {
 	kind: 'signoz/AreaChartPanel',
@@ -19,22 +18,16 @@ export const definition: PanelDefinition<'signoz/AreaChartPanel'> = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections,
-	supportedQueryModesKindMap: {
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [
-				TelemetrytypesSignalDTO.metrics,
-				TelemetrytypesSignalDTO.logs,
-				TelemetrytypesSignalDTO.traces,
-			],
-		},
-		[QueryMode.CLICKHOUSE]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.PROM]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.AI_QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.traces],
-		},
-	},
+	supportedSignals: [
+		TelemetrytypesSignalDTO.metrics,
+		TelemetrytypesSignalDTO.logs,
+		TelemetrytypesSignalDTO.traces,
+	],
+	supportedQueryTypes: [
+		EQueryType.QUERY_BUILDER,
+		EQueryType.CLICKHOUSE,
+		EQueryType.PROM,
+	],
 	queryBuilderFields: {},
 	queryCapabilities: {
 		requestType: Querybuildertypesv5RequestTypeDTO.time_series,

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/BarChartPanel/definition.ts

@@ -1,7 +1,6 @@
 import { BarChart } from '@signozhq/icons';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import QueryBuilderEditorPane from 'pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -9,7 +8,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/BarChartPanel'> = {
 	kind: 'signoz/BarChartPanel',
@@ -19,22 +18,16 @@ export const definition: PanelDefinition<'signoz/BarChartPanel'> = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections,
-	supportedQueryModesKindMap: {
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [
-				TelemetrytypesSignalDTO.metrics,
-				TelemetrytypesSignalDTO.logs,
-				TelemetrytypesSignalDTO.traces,
-			],
-		},
-		[QueryMode.CLICKHOUSE]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.PROM]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.AI_QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.traces],
-		},
-	},
+	supportedSignals: [
+		TelemetrytypesSignalDTO.metrics,
+		TelemetrytypesSignalDTO.logs,
+		TelemetrytypesSignalDTO.traces,
+	],
+	supportedQueryTypes: [
+		EQueryType.QUERY_BUILDER,
+		EQueryType.CLICKHOUSE,
+		EQueryType.PROM,
+	],
 	queryBuilderFields: {},
 	// Bars are binned client-side from a raw time series, so the request asks for a
 	// step interval wide enough to keep the bar count readable (V1 parity).

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/HeatmapPanel/definition.ts

@@ -3,7 +3,6 @@ import { LayoutGrid } from '@signozhq/icons';
 import { QueryBuilderField } from 'components/QueryBuilderV2/queryBuilderFields.types';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import QueryBuilderEditorPane from 'pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -11,7 +10,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/HeatmapPanel'> = {
 	kind: 'signoz/HeatmapPanel',
@@ -21,15 +20,13 @@ export const definition: PanelDefinition<'signoz/HeatmapPanel'> = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections,
-	supportedQueryModesKindMap: {
-		// Only metrics carry a bucket axis; the request rejects the other signals.
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.metrics],
-		},
-		[QueryMode.CLICKHOUSE]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.PROM]: { kind: QueryModeKind.SIGNAL_LESS },
-	},
+	// Only metrics carry a bucket axis; the request rejects the other signals.
+	supportedSignals: [TelemetrytypesSignalDTO.metrics],
+	supportedQueryTypes: [
+		EQueryType.QUERY_BUILDER,
+		EQueryType.CLICKHOUSE,
+		EQueryType.PROM,
+	],
 	// The request rejects both: a point is a count per bucket, not a single value.
 	queryBuilderFields: {
 		[QueryBuilderField.Functions]: { state: 'hidden' },

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/HistogramPanel/definition.ts

@@ -1,7 +1,6 @@
 import { BarChart } from '@signozhq/icons';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import QueryBuilderEditorPane from 'pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -9,7 +8,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/HistogramPanel'> = {
 	kind: 'signoz/HistogramPanel',
@@ -19,22 +18,16 @@ export const definition: PanelDefinition<'signoz/HistogramPanel'> = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections,
-	supportedQueryModesKindMap: {
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [
-				TelemetrytypesSignalDTO.metrics,
-				TelemetrytypesSignalDTO.logs,
-				TelemetrytypesSignalDTO.traces,
-			],
-		},
-		[QueryMode.CLICKHOUSE]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.PROM]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.AI_QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.traces],
-		},
-	},
+	supportedSignals: [
+		TelemetrytypesSignalDTO.metrics,
+		TelemetrytypesSignalDTO.logs,
+		TelemetrytypesSignalDTO.traces,
+	],
+	supportedQueryTypes: [
+		EQueryType.QUERY_BUILDER,
+		EQueryType.CLICKHOUSE,
+		EQueryType.PROM,
+	],
 	queryBuilderFields: {},
 	// Buckets are computed client-side from the raw series, so the request is a plain
 	// time series — the bucket count is a display concern, not a query one.

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/ListEditorPane.tsx

@@ -10,7 +10,6 @@ function ListEditorPane({
 	panelDefinition,
 	signal,
 	isLoadingQueries,
-	onChangeQueryMode,
 	onStageRunQuery,
 	onCancelQuery,
 	stickyHeader,
@@ -21,7 +20,6 @@ function ListEditorPane({
 		<PanelEditorQueryBuilder
 			panelDefinition={panelDefinition}
 			isLoadingQueries={isLoadingQueries}
-			onChangeQueryMode={onChangeQueryMode}
 			onStageRunQuery={onStageRunQuery}
 			onCancelQuery={onCancelQuery}
 			stickyHeader={stickyHeader}

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/definition.ts

@@ -1,7 +1,6 @@
 import { List } from '@signozhq/icons';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import ListEditorPane from './ListEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -9,7 +8,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/ListPanel'> = {
 	kind: 'signoz/ListPanel',
@@ -19,16 +18,11 @@ export const definition: PanelDefinition<'signoz/ListPanel'> = {
 	Renderer,
 	EditorPane: ListEditorPane,
 	// Raw records come from logs and traces; metrics don't produce row data.
-	supportedQueryModesKindMap: {
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.logs, TelemetrytypesSignalDTO.traces],
-		},
-		[QueryMode.AI_QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.traces],
-		},
-	},
+	supportedSignals: [
+		TelemetrytypesSignalDTO.logs,
+		TelemetrytypesSignalDTO.traces,
+	],
+	supportedQueryTypes: [EQueryType.QUERY_BUILDER],
 	// No deviation from the baseline the raw request type below already implies.
 	queryBuilderFields: {},
 	sections,

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/NumberPanel/definition.ts

@@ -1,7 +1,6 @@
 import { Hash } from '@signozhq/icons';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import QueryBuilderEditorPane from 'pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -9,7 +8,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/NumberPanel'> = {
 	kind: 'signoz/NumberPanel',
@@ -19,22 +18,16 @@ export const definition: PanelDefinition<'signoz/NumberPanel'> = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections,
-	supportedQueryModesKindMap: {
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [
-				TelemetrytypesSignalDTO.metrics,
-				TelemetrytypesSignalDTO.logs,
-				TelemetrytypesSignalDTO.traces,
-			],
-		},
-		[QueryMode.CLICKHOUSE]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.PROM]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.AI_QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.traces],
-		},
-	},
+	supportedSignals: [
+		TelemetrytypesSignalDTO.metrics,
+		TelemetrytypesSignalDTO.logs,
+		TelemetrytypesSignalDTO.traces,
+	],
+	supportedQueryTypes: [
+		EQueryType.QUERY_BUILDER,
+		EQueryType.CLICKHOUSE,
+		EQueryType.PROM,
+	],
 	queryBuilderFields: {},
 	queryCapabilities: {
 		requestType: Querybuildertypesv5RequestTypeDTO.scalar,

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/PieChartPanel/definition.ts

@@ -1,7 +1,6 @@
 import { ChartPie } from '@signozhq/icons';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import QueryBuilderEditorPane from 'pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -9,7 +8,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/PieChartPanel'> = {
 	kind: 'signoz/PieChartPanel',
@@ -19,21 +18,12 @@ export const definition: PanelDefinition<'signoz/PieChartPanel'> = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections,
-	supportedQueryModesKindMap: {
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [
-				TelemetrytypesSignalDTO.metrics,
-				TelemetrytypesSignalDTO.logs,
-				TelemetrytypesSignalDTO.traces,
-			],
-		},
-		[QueryMode.CLICKHOUSE]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.AI_QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.traces],
-		},
-	},
+	supportedSignals: [
+		TelemetrytypesSignalDTO.metrics,
+		TelemetrytypesSignalDTO.logs,
+		TelemetrytypesSignalDTO.traces,
+	],
+	supportedQueryTypes: [EQueryType.QUERY_BUILDER, EQueryType.CLICKHOUSE],
 	queryBuilderFields: {},
 	queryCapabilities: {
 		requestType: Querybuildertypesv5RequestTypeDTO.scalar,

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TablePanel/definition.ts

@@ -1,7 +1,6 @@
 import { Table } from '@signozhq/icons';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import QueryBuilderEditorPane from 'pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -9,7 +8,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/TablePanel'> = {
 	kind: 'signoz/TablePanel',
@@ -19,21 +18,12 @@ export const definition: PanelDefinition<'signoz/TablePanel'> = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections,
-	supportedQueryModesKindMap: {
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [
-				TelemetrytypesSignalDTO.metrics,
-				TelemetrytypesSignalDTO.logs,
-				TelemetrytypesSignalDTO.traces,
-			],
-		},
-		[QueryMode.CLICKHOUSE]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.AI_QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.traces],
-		},
-	},
+	supportedSignals: [
+		TelemetrytypesSignalDTO.metrics,
+		TelemetrytypesSignalDTO.logs,
+		TelemetrytypesSignalDTO.traces,
+	],
+	supportedQueryTypes: [EQueryType.QUERY_BUILDER, EQueryType.CLICKHOUSE],
 	queryBuilderFields: {},
 	// The only kind that asks the server to transpose its scalar result into UI rows.
 	queryCapabilities: {

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TimeSeriesPanel/definition.ts

@@ -1,7 +1,6 @@
 import { ChartLine } from '@signozhq/icons';
 
 import type { PanelDefinition } from '../../types/panelDefinition';
-import { QueryModeKind } from '../../types/panelCapabilities';
 import QueryBuilderEditorPane from 'pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane';
 import Renderer from './Renderer';
 import { sections } from './sections';
@@ -9,7 +8,7 @@ import {
 	Querybuildertypesv5RequestTypeDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 
 export const definition: PanelDefinition<'signoz/TimeSeriesPanel'> = {
 	kind: 'signoz/TimeSeriesPanel',
@@ -19,22 +18,16 @@ export const definition: PanelDefinition<'signoz/TimeSeriesPanel'> = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections,
-	supportedQueryModesKindMap: {
-		[QueryMode.QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [
-				TelemetrytypesSignalDTO.metrics,
-				TelemetrytypesSignalDTO.logs,
-				TelemetrytypesSignalDTO.traces,
-			],
-		},
-		[QueryMode.CLICKHOUSE]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.PROM]: { kind: QueryModeKind.SIGNAL_LESS },
-		[QueryMode.AI_QUERY_BUILDER]: {
-			kind: QueryModeKind.SIGNAL,
-			signals: [TelemetrytypesSignalDTO.traces],
-		},
-	},
+	supportedSignals: [
+		TelemetrytypesSignalDTO.metrics,
+		TelemetrytypesSignalDTO.logs,
+		TelemetrytypesSignalDTO.traces,
+	],
+	supportedQueryTypes: [
+		EQueryType.QUERY_BUILDER,
+		EQueryType.CLICKHOUSE,
+		EQueryType.PROM,
+	],
 	queryBuilderFields: {},
 	queryCapabilities: {
 		requestType: Querybuildertypesv5RequestTypeDTO.time_series,

frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/UnsupportedPanel/definition.ts

@@ -25,7 +25,8 @@ export const UNSUPPORTED_PANEL: RenderablePanelDefinition = {
 	Renderer,
 	EditorPane: QueryBuilderEditorPane,
 	sections: [],
-	supportedQueryModesKindMap: {},
+	supportedSignals: [],
+	supportedQueryTypes: [],
 	queryBuilderFields: {},
 	queryCapabilities: {
 		requestType: Querybuildertypesv5RequestTypeDTO.time_series,

frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelCapabilities.ts

@@ -1,8 +1,4 @@
-import {
-	Querybuildertypesv5RequestTypeDTO,
-	type TelemetrytypesSignalDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import type { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
+import { Querybuildertypesv5RequestTypeDTO } from 'api/generated/services/sigNoz.schemas';
 
 export type { QueryBuilderFieldsConfig } from 'components/QueryBuilderV2/queryBuilderFields.types';
 
@@ -38,25 +34,3 @@ export interface PanelQueryCapabilities {
 export function isRawRequest(capabilities: PanelQueryCapabilities): boolean {
 	return capabilities.requestType === Querybuildertypesv5RequestTypeDTO.raw;
 }
-
-export enum QueryModeKind {
-	SIGNAL = 'signal',
-	SIGNAL_LESS = 'signal-less',
-}
-
-export type QueryModeCapability =
-	| { kind: QueryModeKind.SIGNAL; signals: TelemetrytypesSignalDTO[] }
-	| { kind: QueryModeKind.SIGNAL_LESS };
-
-export type SupportedQueryModesKindMap = Partial<
-	Record<QueryMode, QueryModeCapability>
->;
-
-/** Signals `mode` accepts; empty for a signal-less or undeclared mode. */
-export function getQueryModeSignals(
-	modes: SupportedQueryModesKindMap | undefined,
-	mode: QueryMode,
-): TelemetrytypesSignalDTO[] {
-	const capability = modes?.[mode];
-	return capability?.kind === QueryModeKind.SIGNAL ? capability.signals : [];
-}

frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelDefinition.ts

@@ -4,6 +4,7 @@ import {
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import type { ChartLine } from '@signozhq/icons';
+import type { EQueryType } from 'types/common/dashboard';
 
 import type { SectionConfig } from './sections';
 import type { AnyPanelInteractionProps } from './interactions';
@@ -11,7 +12,6 @@ import type { PanelKind } from './panelKind';
 import type {
 	PanelQueryCapabilities,
 	QueryBuilderFieldsConfig,
-	SupportedQueryModesKindMap,
 } from './panelCapabilities';
 import type {
 	BaseRendererProps,
@@ -94,8 +94,6 @@ export interface QueryEditorPaneProps {
 	panelDefinition: RenderableQueryPanelDefinition;
 	signal: TelemetrytypesSignalDTO;
 	isLoadingQueries: boolean;
-	/** Switch authoring tab (Query Builder / AI / ClickHouse / PromQL), owned by the host. */
-	onChangeQueryMode: (key: string) => void;
 	onStageRunQuery: () => void;
 	onCancelQuery: () => void;
 	/** Pin the tabs row to the pane top; the View modal opts out. */
@@ -116,8 +114,10 @@ export interface QueryPanelDefinition<
 	Renderer: ComponentType<PanelRendererProps<K>>;
 	/** Lower editor pane — the shared query-builder pane, or a kind wrapper of it. */
 	EditorPane: ComponentType<QueryEditorPaneProps>;
-	/** Authoring modes (Query Builder / ClickHouse / PromQL / AI) and the signals each accepts. */
-	supportedQueryModesKindMap: SupportedQueryModesKindMap;
+	/** Signals this kind can visualize. */
+	supportedSignals: TelemetrytypesSignalDTO[];
+	/** Query languages this kind supports (Query Builder / ClickHouse / PromQL). */
+	supportedQueryTypes: EQueryType[];
 	queryBuilderFields: QueryBuilderFieldsConfig;
 	/** How this kind's query-range request is shaped (request type, paging, result formatting). */
 	queryCapabilities: PanelQueryCapabilities;

frontend/src/pages/DashboardPage/DashboardContainer/Panels/utils/getBuilderQueries.ts

@@ -4,11 +4,6 @@ import type {
 } from 'api/generated/services/sigNoz.schemas';
 import type { BuilderQuery } from 'types/api/v5/queryRange';
 
-import {
-	isBuilderEnvelope,
-	isBuilderPluginKind,
-} from 'lib/query/builderEnvelope';
-
 /**
  * Flattens a panel's queries into its builder queries, unwrapping
  * `CompositeQuery` envelopes. Non-builder kinds (PromQL, ClickHouseSQL, Formula,
@@ -21,13 +16,13 @@ export function getBuilderQueries(
 	const flattened: BuilderQuery[] = [];
 	queries.forEach((envelope) => {
 		const plugin = envelope.spec.plugin;
-		if (isBuilderPluginKind(plugin.kind)) {
+		if (plugin.kind === 'signoz/BuilderQuery') {
 			flattened.push(plugin.spec as BuilderQuery);
 			return;
 		}
 		if (plugin.kind === 'signoz/CompositeQuery') {
 			(plugin.spec.queries || []).forEach((sub) => {
-				if (isBuilderEnvelope(sub)) {
+				if (sub.type === 'builder_query') {
 					flattened.push(sub.spec as BuilderQuery);
 				}
 			});

frontend/src/pages/DashboardPage/DashboardContainer/Panels/utils/getPanelBuilderQuery.ts

@@ -2,7 +2,7 @@ import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schem
 import { initialQueriesMap } from 'constants/queryBuilder';
 import type { Query } from 'types/api/queryBuilder/queryBuilderData';
 
-import { getQueryPanelDefinition, getSupportedSignals } from '../capabilities';
+import { getQueryPanelDefinition } from '../capabilities';
 import { toPanelType } from '../types/panelKind';
 import { fromPerses } from '../../queryV5/persesQueryAdapters';
 
@@ -22,7 +22,7 @@ export function getPanelBuilderQuery(
 	if (!definition) {
 		return null;
 	}
-	const [defaultSignal] = getSupportedSignals(kind);
+	const [defaultSignal] = definition.supportedSignals;
 	// A query-less panel seeds from the kind's first supported signal — `fromPerses`'s
 	// metrics default isn't authorable in every kind (e.g. List).
 	if (panel.spec.queries.length === 0 && defaultSignal) {

frontend/src/pages/DashboardPage/DashboardContainer/Panels/utils/seedBuilderForMode.ts

@@ -1,43 +0,0 @@
-import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
-import {
-	initialQueriesMap,
-	initialQueryAIWithType,
-	type PANEL_TYPES,
-} from 'constants/queryBuilder';
-import type { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { QueryMode } from 'types/api/queryBuilder/queryBuilderData';
-import {
-	DataSource,
-	type QueryBuilderContextType,
-} from 'types/common/queryBuilder';
-
-interface SeedBuilderForModeArgs {
-	mode: QueryMode;
-	/** The kind's first Query Builder signal; what a fresh panel of this kind starts on. */
-	defaultSignal?: TelemetrytypesSignalDTO;
-	panelType: PANEL_TYPES;
-	updateAllQueriesOperators: QueryBuilderContextType['updateAllQueriesOperators'];
-}
-
-/** A fresh builder query for `mode`: AI is traces-only, everything else follows the kind. */
-export function seedBuilderForMode({
-	mode,
-	defaultSignal,
-	panelType,
-	updateAllQueriesOperators,
-}: SeedBuilderForModeArgs): Query['builder'] {
-	if (mode === QueryMode.AI_QUERY_BUILDER) {
-		return updateAllQueriesOperators(
-			initialQueryAIWithType,
-			panelType,
-			DataSource.TRACES,
-		).builder;
-	}
-	const dataSource = (defaultSignal ??
-		TelemetrytypesSignalDTO.metrics) as unknown as DataSource;
-	return updateAllQueriesOperators(
-		initialQueriesMap[dataSource],
-		panelType,
-		dataSource,
-	).builder;
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/__tests__/usePanelActionItems.test.tsx

@@ -416,42 +416,6 @@ describe('usePanelActionItems', () => {
 		expect(mockOpenView).toHaveBeenCalledWith('panel-1', baseArgs.panel);
 	});
 
-	it('disables only Create Alerts on an AI query panel', () => {
-		const aiPanel = {
-			...mockPanel,
-			spec: {
-				...mockPanel.spec,
-				queries: [
-					{
-						kind: 'time_series',
-						spec: {
-							plugin: {
-								kind: 'signoz/CompositeQuery',
-								spec: {
-									queries: [
-										{
-											type: 'builder_ai_query',
-											spec: { name: 'A', signal: 'traces' },
-										},
-									],
-								},
-							},
-						},
-					},
-				],
-			},
-		} as unknown as DashboardtypesPanelDTO;
-
-		const { result } = renderHook(() =>
-			usePanelActionItems({ ...baseArgs, panel: aiPanel }),
-		);
-
-		const disabled = disabledKeys(result.current);
-		expect(disabled).toContain('create-alert');
-		expect(disabled).not.toContain('view-panel');
-		expect(disabled).not.toContain('edit-panel');
-	});
-
 	it('create-alert seeds an alert from this panel', () => {
 		const { result } = renderHook(() => usePanelActionItems(baseArgs));
 		const createAlert = result.current.items.find(

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/usePanelActionItems.tsx

@@ -28,7 +28,6 @@ import { useViewPanel } from '../hooks/useViewPanel';
 import { buildMoveItems } from '../utils/buildMoveItems';
 import MenuActionItem from '../../../components/MenuActionItem/MenuActionItem';
 import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
-import { getBlockedPanelActions } from '../utils/getBlockedPanelActions';
 import { useDashboardEditContext } from '../../../hooks/useDashboardEditContext';
 
 // Stable fallback so renders without layout context don't churn the mutation
@@ -64,7 +63,6 @@ export function usePanelActionItems({
 	panelActions,
 }: UsePanelActionItemsArgs): PanelActionItems {
 	const panelKind = panel.spec.plugin.kind;
-	const blocked = useMemo(() => getBlockedPanelActions(panel), [panel]);
 	const { isEditable, editChecks, editDisabledTooltip } =
 		useDashboardEditContext();
 	const openPanelEditor = useOpenPanelEditor();
@@ -105,17 +103,13 @@ export function usePanelActionItems({
 		const row = (
 			text: string,
 			icon: ReactElement,
-			opts: {
-				checks?: BrandedPermission[];
-				destructive?: boolean;
-				disabledTooltip?: string;
-			} = {},
+			opts: { checks?: BrandedPermission[]; destructive?: boolean } = {},
 		): ReactNode => (
 			<MenuActionItem
 				label={text}
 				icon={icon}
 				checks={opts.checks ?? editChecks}
-				disabledTooltip={opts.disabledTooltip ?? editDisabledTooltip}
+				disabledTooltip={editDisabledTooltip}
 				destructive={opts.destructive}
 			/>
 		);
@@ -163,11 +157,7 @@ export function usePanelActionItems({
 		if (panelCapabilities.createAlert) {
 			dataGroup.push({
 				key: 'create-alert',
-				label: row('Create Alerts', <Bell size={14} />, {
-					checks: [],
-					disabledTooltip: blocked.createAlert,
-				}),
-				disabled: !!blocked.createAlert,
+				label: row('Create Alerts', <Bell size={14} />, { checks: [] }),
 				onClick: (): void => createAlert(panel, panelId),
 			});
 		}
@@ -207,7 +197,6 @@ export function usePanelActionItems({
 		editChecks,
 		editDisabledTooltip,
 		panelCapabilities,
-		blocked,
 		panel,
 		panelActions,
 		sections,

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.tsx

@@ -12,7 +12,6 @@ import type { PanelQueryData } from 'pages/DashboardPage/DashboardContainer/quer
 import type { PanelActionsConfig } from '../Panel';
 import PanelActionsMenu from '../PanelActionsMenu/PanelActionsMenu';
 import { EMPTY_PANEL_QUERY_DATA } from '../utils/emptyPanelQueryData';
-import { usePanelTitle } from '../hooks/usePanelTitle';
 import PanelHeaderSearch from './PanelHeaderSearch';
 import PanelStatusPopover from '../PanelStatus/PanelStatusPopover';
 import {
@@ -68,7 +67,7 @@ function PanelHeader(props: PanelHeaderProps): JSX.Element {
 	const { panelId, panel, panelActions, hideActions } = props;
 	const query = props.mode === 'query' ? props : null;
 
-	const name = usePanelTitle(panel);
+	const name = panel.spec.display.name;
 	const description = panel.spec.display.description;
 	const errorDetail = useMemo(
 		() => panelStatusFromError(query?.error),

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/PanelTypeSelectionModal.tsx

@@ -6,7 +6,6 @@ import { useDashboardSections } from '../../../hooks/useDashboardSections';
 import { releasePanelPickerTarget } from '../../../store/usePanelPickerTargetStore';
 import type { NewPanelTarget } from '../../../patchOps';
 import type { PanelKind } from '../../../Panels/types/panelKind';
-import { JS_DRIVEN_SLIDE } from '../../../utils/drawerSlide';
 import AddPanelSplitButton from './AddPanelSplitButton';
 import NewSectionNameInput from './NewSectionNameInput';
 import PanelTypeBrowser from './PanelTypeBrowser';
@@ -107,7 +106,6 @@ function PanelTypeSelectionModal({
 			direction="right"
 			width="wide"
 			testId="panel-type-drawer"
-			drawerContentProps={JS_DRIVEN_SLIDE}
 			drawerDescriptionProps={{ className: styles.body }}
 			footer={
 				<div className={styles.footer}>

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/QueryViewModalBody.tsx

@@ -31,8 +31,6 @@ interface QueryViewModalBodyProps {
 	draftApi: PanelEditorDraftApi;
 	/** Kind switch, owned by the shell (its cache must survive the fork swap). */
 	onChangePanelKind: (kind: PanelKind) => void;
-	/** Tab switch, owned by the shell alongside the kind switch it shares memory with. */
-	onChangeQueryMode: (key: string) => void;
 }
 
 /**
@@ -47,7 +45,6 @@ function QueryViewModalBody({
 	onClose,
 	draftApi,
 	onChangePanelKind,
-	onChangeQueryMode,
 }: QueryViewModalBodyProps): JSX.Element | null {
 	const {
 		timeOverride,
@@ -165,7 +162,6 @@ function QueryViewModalBody({
 					panelDefinition={panelDefinition}
 					signal={signal}
 					isLoadingQueries={isFetching}
-					onChangeQueryMode={onChangeQueryMode}
 					onStageRunQuery={runQuery}
 					onCancelQuery={cancelQuery}
 					stickyHeader={false}

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModal.tsx

@@ -5,13 +5,13 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from '@signozhq/ui/dialog';
+import { TooltipSimple } from '@signozhq/ui/tooltip';
 import { Typography } from '@signozhq/ui/typography';
 import { ConfigProvider } from 'antd';
 import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
 import { useRef } from 'react';
 
 import ViewPanelModalContent from './ViewPanelModalContent';
-import ViewPanelModalTitle from './ViewPanelModalTitle';
 import styles from './ViewPanelModal.module.scss';
 
 interface ViewPanelModalProps {
@@ -31,6 +31,8 @@ function ViewPanelModal({
 	open,
 	onClose,
 }: ViewPanelModalProps): JSX.Element {
+	const name = panel?.spec.display.name ?? '';
+
 	// Render antd popups into the dialog (not document.body) so they stay inside the
 	// modal's interactive, focus-trapped layer instead of being blocked by Radix.
 	const contentRef = useRef<HTMLDivElement>(null);
@@ -52,11 +54,11 @@ function ViewPanelModal({
 			>
 				<DialogHeader>
 					<DialogTitle>
-						{panel ? (
-							<ViewPanelModalTitle panel={panel} />
-						) : (
-							<Typography.Text className={styles.title}>View mode</Typography.Text>
-						)}
+						<TooltipSimple title={name} arrow>
+							<Typography.Text className={styles.title}>
+								{name ? `${name} - (View mode)` : 'View mode'}
+							</Typography.Text>
+						</TooltipSimple>
 					</DialogTitle>
 				</DialogHeader>
 				<DialogCloseButton />

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalContent.tsx

@@ -8,7 +8,7 @@ import { QueryParams } from 'constants/query';
 import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { usePanelEditorDraft } from 'pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelEditorDraft';
-import { usePanelKindAndQueryModeSwitch } from 'pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelKindAndQueryModeSwitch';
+import { usePanelTypeSwitch } from 'pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelTypeSwitch';
 import { getPanelDefinition } from 'pages/DashboardPage/DashboardContainer/Panels/registry';
 import { toPanelType } from 'pages/DashboardPage/DashboardContainer/Panels/types/panelKind';
 import { buildViewPanelSpec } from 'pages/DashboardPage/DashboardContainer/Panels/utils/drilldown/buildViewPanelSpec';
@@ -73,12 +73,11 @@ function ViewPanelModalContent({
 	const draftKind = draftApi.draft.spec.plugin.kind;
 	const panelDefinition = getPanelDefinition(draftKind);
 
-	const { onChangePanelKind, onChangeQueryMode } =
-		usePanelKindAndQueryModeSwitch({
-			spec: draftApi.draft.spec,
-			panelType: toPanelType(draftKind),
-			setSpec: draftApi.setSpec,
-		});
+	const { onChangePanelKind } = usePanelTypeSwitch({
+		spec: draftApi.draft.spec,
+		panelType: toPanelType(draftKind),
+		setSpec: draftApi.setSpec,
+	});
 
 	if (panelDefinition.mode === 'static') {
 		return (
@@ -98,7 +97,6 @@ function ViewPanelModalContent({
 			onClose={onClose}
 			draftApi={draftApi}
 			onChangePanelKind={onChangePanelKind}
-			onChangeQueryMode={onChangeQueryMode}
 		/>
 	);
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalTitle.tsx

@@ -1,24 +0,0 @@
-import { TooltipSimple } from '@signozhq/ui/tooltip';
-import { Typography } from '@signozhq/ui/typography';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-
-import { usePanelTitle } from '../hooks/usePanelTitle';
-import styles from './ViewPanelModal.module.scss';
-
-interface ViewPanelModalTitleProps {
-	panel: DashboardtypesPanelDTO;
-}
-
-function ViewPanelModalTitle({ panel }: ViewPanelModalTitleProps): JSX.Element {
-	const name = usePanelTitle(panel);
-
-	return (
-		<TooltipSimple title={name} arrow>
-			<Typography.Text className={styles.title}>
-				{name ? `${name} - (View mode)` : 'View mode'}
-			</Typography.Text>
-		</TooltipSimple>
-	);
-}
-
-export default ViewPanelModalTitle;

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/PanelHeader.test.tsx

@@ -1,12 +1,8 @@
 import { TooltipProvider } from '@signozhq/ui/tooltip';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import {
-	type DashboardtypesPanelDTO,
-	Querybuildertypesv5VariableTypeDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
 import type { PanelQueryData } from 'pages/DashboardPage/DashboardContainer/queryV5/types';
-import { useDashboardStore } from 'pages/DashboardPage/DashboardContainer/store/useDashboardStore';
 import type { ReactElement } from 'react';
 import type { Warning } from 'types/api';
 
@@ -104,30 +100,6 @@ describe('PanelHeader title and description', () => {
 		expect(screen.getByText('My panel')).toBeInTheDocument();
 	});
 
-	it('substitutes dashboard variables into the panel name', () => {
-		useDashboardStore.setState({
-			dashboardId: 'dash-1',
-			resolvedVariables: {
-				'dash-1': {
-					service: {
-						type: Querybuildertypesv5VariableTypeDTO.query,
-						value: ['cart', 'api'],
-					},
-				},
-			},
-		});
-		renderWithProvider(
-			<PanelHeader
-				{...baseProps}
-				panel={makePanel({ name: 'Latency of $service ({{missing}})' })}
-			/>,
-		);
-		expect(
-			screen.getByText('Latency of cart, api ({{missing}})'),
-		).toBeInTheDocument();
-		useDashboardStore.setState({ dashboardId: '', resolvedVariables: {} });
-	});
-
 	it('shows the description info icon when a description is provided', () => {
 		renderWithProvider(
 			<PanelHeader

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/ViewPanelModal.test.tsx

@@ -40,11 +40,9 @@ jest.mock('hooks/useUrlQuery', () => ({
 	default: (): URLSearchParams => new URLSearchParams(),
 }));
 jest.mock(
-	'pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelKindAndQueryModeSwitch',
+	'pages/DashboardPage/DashboardContainer/PanelEditor/hooks/usePanelTypeSwitch',
 	() => ({
-		usePanelKindAndQueryModeSwitch: (): unknown => ({
-			onChangePanelKind: jest.fn(),
-		}),
+		usePanelTypeSwitch: (): unknown => ({ onChangePanelKind: jest.fn() }),
 	}),
 );
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.addons.test.tsx

@@ -89,7 +89,7 @@ jest.mock(
 	'pages/DashboardPage/DashboardContainer/store/useDashboardStore',
 	() => ({
 		useDashboardStore: (selector: (s: unknown) => unknown): unknown =>
-			selector({ dashboardId: 'dash-1', resolvedVariables: {} }),
+			selector({ dashboardId: 'dash-1' }),
 	}),
 );
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.promql.test.tsx

@@ -38,7 +38,7 @@ jest.mock(
 	'pages/DashboardPage/DashboardContainer/store/useDashboardStore',
 	() => ({
 		useDashboardStore: (selector: (s: unknown) => unknown): unknown =>
-			selector({ dashboardId: 'dash-1', resolvedVariables: {} }),
+			selector({ dashboardId: 'dash-1' }),
 	}),
 );
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useDownloadPanelCsv.ts

@@ -8,8 +8,6 @@ import type { PanelOfKind } from 'pages/DashboardPage/DashboardContainer/Panels/
 import { downloadCsv } from 'pages/DashboardPage/DashboardContainer/Panels/utils/downloadCsv';
 import type { PanelQueryData } from 'pages/DashboardPage/DashboardContainer/queryV5/types';
 
-import { usePanelTitle } from './usePanelTitle';
-
 interface UseDownloadPanelCsvArgs {
 	panel: DashboardtypesPanelDTO;
 	data: PanelQueryData;
@@ -31,7 +29,7 @@ export function useDownloadPanelCsv({
 	data,
 	canDownloadCsv,
 }: UseDownloadPanelCsvArgs): () => void {
-	const fileName = usePanelTitle(panel);
+	const fileName = panel.spec.display.name;
 
 	return useCallback((): void => {
 		if (!canDownloadCsv) {

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useDownloadPanelMenuItem.tsx

@@ -10,7 +10,6 @@ import type { PanelQueryData } from 'pages/DashboardPage/DashboardContainer/quer
 import { buildDownloadMenuItem } from '../utils/buildDownloadMenuItem';
 import { useDownloadPanelCsv } from './useDownloadPanelCsv';
 import { useDownloadPanelImage } from './useDownloadPanelImage';
-import { usePanelTitle } from './usePanelTitle';
 
 interface UseDownloadPanelMenuItemArgs {
 	panelId: string;
@@ -29,7 +28,7 @@ export function useDownloadPanelMenuItem({
 	data,
 	actions,
 }: UseDownloadPanelMenuItemArgs): MenuItem | null {
-	const panelName = usePanelTitle(panel);
+	const panelName = panel.spec.display.name;
 	const downloadPanelCsv = useDownloadPanelCsv({
 		panel,
 		data,

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/usePanelTitle.ts

@@ -1,13 +0,0 @@
-import { useMemo } from 'react';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-import { interpolateVariables } from 'pages/DashboardPage/DashboardContainer/Panels/utils/interpolateVariables';
-import { selectResolvedVariables } from 'pages/DashboardPage/DashboardContainer/store/slices/variableSelectionSlice';
-import { useDashboardStore } from 'pages/DashboardPage/DashboardContainer/store/useDashboardStore';
-
-export function usePanelTitle(panel: DashboardtypesPanelDTO): string {
-	const dashboardId = useDashboardStore((s) => s.dashboardId);
-	const variables = useDashboardStore(selectResolvedVariables(dashboardId));
-	const name = panel.spec.display.name;
-
-	return useMemo(() => interpolateVariables(name, variables), [name, variables]);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/getBlockedPanelActions.ts

@@ -1,21 +0,0 @@
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-
-import { isAIBuilderEnvelope } from 'lib/query/builderEnvelope';
-import { toQueryEnvelopes } from '../../../queryV5/buildQueryRangeRequest';
-import type { PanelActionId } from '../PanelActionsMenu/panelActionMeta';
-
-//TODO: @tewarig will enable these actions for AI Observability Panels
-const AI_PANEL_REASON = 'Coming Soon For AI Observability Panels';
-
-export type BlockedPanelActions = Partial<Record<PanelActionId, string>>;
-
-/** Actions the panel's queries don't support yet, mapped to the disabled reason. */
-export function getBlockedPanelActions(
-	panel: DashboardtypesPanelDTO,
-): BlockedPanelActions {
-	// The alert builder has no AI query mode. View in Logs/Traces stays on.
-	if (toQueryEnvelopes(panel.spec.queries).some(isAIBuilderEnvelope)) {
-		return { createAlert: AI_PANEL_REASON };
-	}
-	return {};
-}

frontend/src/pages/DashboardPage/DashboardContainer/hooks/useDashboardVariableNames.ts

@@ -1,16 +0,0 @@
-import { useMemo } from 'react';
-import { dtoToFormModel } from 'pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/variableAdapters';
-
-import { useDashboardFetchRequired } from './useDashboardFetchRequired';
-
-export function useDashboardVariableNames(): string[] {
-	const { variables } = useDashboardFetchRequired();
-
-	return useMemo(
-		() =>
-			variables
-				.map((dto) => dtoToFormModel(dto).name)
-				.filter((name): name is string => !!name),
-		[variables],
-	);
-}

frontend/src/pages/DashboardPage/DashboardContainer/queryV5/__tests__/buildQueryRangeRequest.test.ts

@@ -99,23 +99,6 @@ describe('toQueryEnvelopes', () => {
 		]);
 	});
 
-	it('wraps a bare AI builder plugin as a builder_ai_query envelope', () => {
-		const ai = [
-			{
-				kind: 'TimeSeriesQuery',
-				spec: {
-					plugin: {
-						kind: 'signoz/AIBuilderQuery',
-						spec: { name: 'A', signal: 'traces' },
-					},
-				},
-			},
-		] as unknown as DashboardtypesQueryDTO[];
-		expect(toQueryEnvelopes(ai)).toStrictEqual([
-			{ type: 'builder_ai_query', spec: { name: 'A', signal: 'traces' } },
-		]);
-	});
-
 	it('passes a CompositeQuery envelope list through verbatim', () => {
 		const subqueries = [
 			{ type: 'builder_query', spec: { name: 'A' } },
@@ -224,30 +207,6 @@ describe('buildQueryRangeRequest', () => {
 		expect(request.formatOptions?.fillGaps).toBe(true);
 	});
 
-	it('stamps offset/limit onto an AI builder query when pagination is given', () => {
-		const request = buildQueryRangeRequest({
-			queries: [
-				{
-					kind: 'raw',
-					spec: {
-						plugin: {
-							kind: 'signoz/AIBuilderQuery',
-							spec: { name: 'A', signal: 'traces' },
-						},
-					},
-				},
-			] as unknown as DashboardtypesQueryDTO[],
-			queryCapabilities: LIST_PANEL_CAPABILITIES,
-			startMs: START_MS,
-			endMs: START_MS + HOUR_MS,
-			pagination: { offset: 25, limit: 10 },
-		});
-		expect(request.compositeQuery?.queries?.[0]).toMatchObject({
-			type: 'builder_ai_query',
-			spec: { name: 'A', signal: 'traces', offset: 25, limit: 10 },
-		});
-	});
-
 	it('stamps offset/limit onto builder queries when pagination is given', () => {
 		const request = buildQueryRangeRequest({
 			queries: bareBuilderQuery({ name: 'A', signal: 'logs' }),

frontend/src/pages/DashboardPage/DashboardContainer/queryV5/__tests__/persesQueryAdapters.test.ts

@@ -4,11 +4,7 @@ import type {
 	Querybuildertypesv5QueryEnvelopeDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { Querybuildertypesv5BucketOptionsLogDTOKind } from 'api/generated/services/sigNoz.schemas';
-import {
-	initialQueriesMap,
-	initialQueryAIWithType,
-	PANEL_TYPES,
-} from 'constants/queryBuilder';
+import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import type { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { EQueryType } from 'types/common/dashboard';
 import { DataSource } from 'types/common/queryBuilder';
@@ -225,38 +221,6 @@ describe('persesQueryAdapters', () => {
 			expect(result[0].kind).toBe('scalar');
 		});
 
-		it('emits a bare signoz/AIBuilderQuery for an AI List panel', () => {
-			const result = toPerses(initialQueryAIWithType, PANEL_TYPES.LIST);
-
-			expect(result).toHaveLength(1);
-			expect(result[0].spec.plugin.kind).toBe('signoz/AIBuilderQuery');
-		});
-
-		it('preserves an AI List query through toPerses → fromPerses', () => {
-			const restored = fromPerses(
-				toPerses(initialQueryAIWithType, PANEL_TYPES.LIST),
-				PANEL_TYPES.LIST,
-			);
-
-			expect(restored.builder.queryData[0].builderQueryType).toBe(
-				'builder_ai_query',
-			);
-		});
-
-		it('preserves an AI time-series query through fromPerses → toPerses', () => {
-			const perses = toPerses(initialQueryAIWithType, PANEL_TYPES.TIME_SERIES);
-			const restored = fromPerses(perses, PANEL_TYPES.TIME_SERIES);
-			const savedAgain = toPerses(restored, PANEL_TYPES.TIME_SERIES);
-			const envelopes = (
-				savedAgain[0].spec.plugin.spec as { queries?: { type?: string }[] }
-			).queries;
-
-			expect(restored.builder.queryData[0].builderQueryType).toBe(
-				'builder_ai_query',
-			);
-			expect(envelopes?.[0]?.type).toBe('builder_ai_query');
-		});
-
 		it('emits a bare signoz/BuilderQuery for a List panel (not a CompositeQuery)', () => {
 			const result = toPerses(
 				initialQueriesMap[DataSource.LOGS],

frontend/src/pages/DashboardPage/DashboardContainer/queryV5/buildQueryRangeRequest.ts

@@ -5,21 +5,18 @@ import type {
 	Querybuildertypesv5CompositeQueryDTO,
 	Querybuildertypesv5OrderByDTO,
 	Querybuildertypesv5PromQueryDTO,
-	Querybuildertypesv5QueryEnvelopeBuilderAIDTO,
 	Querybuildertypesv5QueryEnvelopeDTO,
 	Querybuildertypesv5QueryRangeRequestDTO,
 	Querybuildertypesv5QueryRangeRequestDTOVariables,
 } from 'api/generated/services/sigNoz.schemas';
 import {
 	Querybuildertypesv5OrderDirectionDTO,
-	Querybuildertypesv5QueryEnvelopeBuilderAIDTOType,
 	Querybuildertypesv5QueryEnvelopeBuilderDTOType,
 	Querybuildertypesv5QueryEnvelopeClickHouseSQLDTOType,
 	Querybuildertypesv5QueryEnvelopePromQLDTOType,
 } from 'api/generated/services/sigNoz.schemas';
 
 import type { PanelQueryCapabilities } from '../Panels/types/panelCapabilities';
-import { isBuilderEnvelope } from 'lib/query/builderEnvelope';
 
 // Narrow view over the envelope spec variants. Orval erases envelope `spec` to `unknown`, so
 // shared fields are read through this view with a localized cast at the envelope boundary.
@@ -61,15 +58,6 @@ export function toQueryEnvelopes(
 					spec: plugin.spec as Querybuildertypesv5BuilderQuerySpecDTO,
 				},
 			];
-		case 'signoz/AIBuilderQuery':
-			// Same spec shape as a traces builder query. The envelope type is what
-			// tells the querier to run the AI statement builder.
-			return [
-				{
-					type: Querybuildertypesv5QueryEnvelopeBuilderAIDTOType.builder_ai_query,
-					spec: plugin.spec,
-				} as unknown as Querybuildertypesv5QueryEnvelopeBuilderAIDTO,
-			];
 		case 'signoz/PromQLQuery':
 			return [
 				{
@@ -139,10 +127,13 @@ function withBucketedStepInterval(
 ): Querybuildertypesv5QueryEnvelopeDTO[] {
 	const stepInterval = getBucketedStepIntervalSeconds(startMs, endMs);
 	return envelopes.map((envelope) => {
-		if (!isBuilderEnvelope(envelope)) {
+		if (
+			envelope.type !==
+			Querybuildertypesv5QueryEnvelopeBuilderDTOType.builder_query
+		) {
 			return envelope;
 		}
-		if ((envelope.spec as QuerySpecView)?.stepInterval) {
+		if (envelope.spec?.stepInterval) {
 			return envelope;
 		}
 		return {
@@ -150,8 +141,8 @@ function withBucketedStepInterval(
 			spec: {
 				...envelope.spec,
 				stepInterval,
-			},
-		} as Querybuildertypesv5QueryEnvelopeDTO;
+			} as Querybuildertypesv5BuilderQuerySpecDTO,
+		};
 	});
 }
 
@@ -164,7 +155,10 @@ function withListOrderTiebreaker(
 	envelopes: Querybuildertypesv5QueryEnvelopeDTO[],
 ): Querybuildertypesv5QueryEnvelopeDTO[] {
 	return envelopes.map((envelope) => {
-		if (!isBuilderEnvelope(envelope)) {
+		if (
+			envelope.type !==
+			Querybuildertypesv5QueryEnvelopeBuilderDTOType.builder_query
+		) {
 			return envelope;
 		}
 		const spec = envelope.spec as QuerySpecView;
@@ -189,8 +183,8 @@ function withListOrderTiebreaker(
 					...primary,
 					{ key: { name: 'id' }, direction: primary[0].direction },
 				],
-			},
-		} as Querybuildertypesv5QueryEnvelopeDTO;
+			} as Querybuildertypesv5BuilderQuerySpecDTO,
+		};
 	});
 }
 
@@ -203,7 +197,10 @@ function withPagination(
 	{ offset, limit }: { offset: number; limit: number },
 ): Querybuildertypesv5QueryEnvelopeDTO[] {
 	return envelopes.map((envelope) => {
-		if (!isBuilderEnvelope(envelope)) {
+		if (
+			envelope.type !==
+			Querybuildertypesv5QueryEnvelopeBuilderDTOType.builder_query
+		) {
 			return envelope;
 		}
 		return {
@@ -212,8 +209,8 @@ function withPagination(
 				...envelope.spec,
 				offset,
 				limit,
-			},
-		} as Querybuildertypesv5QueryEnvelopeDTO;
+			} as Querybuildertypesv5BuilderQuerySpecDTO,
+		};
 	});
 }
 
@@ -306,7 +303,11 @@ export function hasRunnableQueries(queries: DashboardtypesQueryDTO[]): boolean {
 	}
 
 	const metricsSpecs = envelopes
-		.filter(isBuilderEnvelope)
+		.filter(
+			(envelope) =>
+				envelope.type ===
+				Querybuildertypesv5QueryEnvelopeBuilderDTOType.builder_query,
+		)
 		.map((envelope) => envelope.spec as QuerySpecView)
 		.filter((spec) => spec.signal === 'metrics');
 

frontend/src/pages/DashboardPage/DashboardContainer/queryV5/persesQueryAdapters.ts

@@ -1,14 +1,13 @@
 import type {
-	DashboardtypesAIBuilderQuerySpecDTO,
 	DashboardtypesBuilderQuerySpecDTO,
 	DashboardtypesQueryDTO,
 	Querybuildertypesv5CompositeQueryDTO,
 	Querybuildertypesv5QueryEnvelopeDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import {
-	DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpecDTOKind as AIBuilderQueryPluginKind,
 	DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpecDTOKind as BuilderQueryPluginKind,
 	DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5CompositeQueryDTOKind as CompositeQueryPluginKind,
+	Querybuildertypesv5QueryEnvelopeBuilderDTOType,
 	Querybuildertypesv5QueryEnvelopeClickHouseSQLDTOType,
 	Querybuildertypesv5QueryEnvelopePromQLDTOType,
 	Querybuildertypesv5RequestTypeDTO,
@@ -22,10 +21,6 @@ import type { QueryEnvelope } from 'types/api/v5/queryRange';
 import { EQueryType } from 'types/common/dashboard';
 import { DataSource } from 'types/common/queryBuilder';
 
-import {
-	isAIBuilderEnvelope,
-	isBuilderEnvelope,
-} from 'lib/query/builderEnvelope';
 import { toQueryEnvelopes } from './buildQueryRangeRequest';
 
 /**
@@ -49,6 +44,11 @@ const toGeneratedEnvelopes = (
 ): Querybuildertypesv5QueryEnvelopeDTO[] =>
 	envelopes as unknown as Querybuildertypesv5QueryEnvelopeDTO[];
 
+const isBuilderQueryEnvelope = (
+	envelope: Querybuildertypesv5QueryEnvelopeDTO,
+): boolean =>
+	envelope.type === Querybuildertypesv5QueryEnvelopeBuilderDTOType.builder_query;
+
 /**
  * Clears the V1 explorer's `pageSize`/`offset` before conversion — the shared mapper folds
  * `pageSize` into the V5 `limit`, which usePanelQuery would read as a user cap and hide the
@@ -158,9 +158,8 @@ export function fromPerses(
 /**
  * V1 `Query` → perses panel queries (to write the builder result back to the editor
  * draft). Wrapped in a single `signoz/CompositeQuery` to satisfy the
- * `panel.queries.length === 1` invariant. Exception: List rejects `signoz/CompositeQuery`
- * backend-side, so it emits its one builder query as the bare plugin matching the query —
- * a bare plugin carries no envelope `type`, so the kind is what keeps an AI list AI.
+ * `panel.queries.length === 1` invariant. Exception: List emits its one builder query
+ * as a bare `signoz/BuilderQuery` because the backend rejects a `signoz/CompositeQuery`.
  */
 export function toPerses(
 	query: Query,
@@ -174,23 +173,21 @@ export function toPerses(
 	const envelopes = toGeneratedEnvelopes(composite.queries ?? []);
 
 	if (panelType === PANEL_TYPES.LIST) {
-		const builder = envelopes.find(isBuilderEnvelope);
+		const builder = envelopes.find(isBuilderQueryEnvelope);
 		if (!builder) {
 			return [];
 		}
-		const plugin = isAIBuilderEnvelope(builder)
-			? {
-					kind: AIBuilderQueryPluginKind['signoz/AIBuilderQuery'],
-					spec: builder.spec as unknown as DashboardtypesAIBuilderQuerySpecDTO,
-				}
-			: {
-					kind: BuilderQueryPluginKind['signoz/BuilderQuery'],
-					spec: builder.spec as DashboardtypesBuilderQuerySpecDTO,
-				};
 		return [
 			{
 				kind: panelTypeToRequestType(panelType),
-				spec: { plugin },
+				spec: {
+					plugin: {
+						kind: BuilderQueryPluginKind['signoz/BuilderQuery'],
+						// The generated envelope union doesn't discriminate `spec` by `type`, so
+						// narrow the filtered builder query to the dashboard builder spec.
+						spec: builder.spec as DashboardtypesBuilderQuerySpecDTO,
+					},
+				},
 			},
 		];
 	}

frontend/src/pages/DashboardPage/DashboardContainer/queryV5/prepareScalarTables.ts

@@ -3,9 +3,10 @@ import type {
 	Querybuildertypesv5QueryRangeRequestDTO,
 	Querybuildertypesv5ScalarDataDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { Querybuildertypesv5QueryEnvelopeClickHouseSQLDTOType } from 'api/generated/services/sigNoz.schemas';
-
-import { isBuilderEnvelope } from 'lib/query/builderEnvelope';
+import {
+	Querybuildertypesv5QueryEnvelopeBuilderDTOType,
+	Querybuildertypesv5QueryEnvelopeClickHouseSQLDTOType,
+} from 'api/generated/services/sigNoz.schemas';
 
 import type { PanelTable, PanelTableColumn } from './types';
 
@@ -27,7 +28,10 @@ export function extractAggregationsPerQuery(
 ): AggregationsPerQuery {
 	const perQuery: AggregationsPerQuery = {};
 	(requestPayload?.compositeQuery?.queries ?? []).forEach((envelope) => {
-		if (!isBuilderEnvelope(envelope)) {
+		if (
+			envelope.type !==
+			Querybuildertypesv5QueryEnvelopeBuilderDTOType.builder_query
+		) {
 			return;
 		}
 		const spec = envelope.spec;

frontend/src/pages/DashboardPage/DashboardContainer/utils/drawerSlide.ts

@@ -1,10 +0,0 @@
-import type { DrawerWrapperProps } from '@signozhq/ui/drawer';
-import { noop } from 'lodash-es';
-
-/**
- * `DrawerWrapper`'s motion@11 runs its slide on WAAPI and paints one stale frame
- * when it finishes; an `onUpdate` (untyped, forwarded to motion) keeps it JS-driven.
- */
-export const JS_DRIVEN_SLIDE = {
-	onUpdate: noop,
-} as DrawerWrapperProps['drawerContentProps'];

frontend/src/tests/mapQueryDataFromApi.test.ts

@@ -209,29 +209,4 @@ describe('mapQueryDataFromApi', (): void => {
 			id: 'b5f4b7db-799c-47d2-bf32-090340995e20',
 		});
 	});
-
-	it('keeps builder_ai_query on the mapped builder query', () => {
-		const compositeQuery: ICompositeMetricQuery = {
-			queryType: EQueryType.QUERY_BUILDER,
-			panelType: PANEL_TYPES.TIME_SERIES,
-			unit: undefined,
-			queries: [
-				{
-					type: 'builder_ai_query',
-					spec: {
-						name: 'A',
-						signal: 'traces',
-						filter: { expression: "service.name = 'adservice'" },
-						aggregations: [{ expression: 'count()' }],
-					},
-				} as QueryEnvelope,
-			],
-		};
-
-		const result = mapQueryDataFromApi(compositeQuery);
-
-		expect(result.builder.queryData[0].builderQueryType).toBe('builder_ai_query');
-		expect(result.builder.queryData[0].queryName).toBe('A');
-		expect(result.builder.queryData[0].dataSource).toBe(DataSource.TRACES);
-	});
 });

frontend/src/types/api/queryBuilder/queryBuilderData.ts

@@ -1,7 +1,4 @@
-import {
-	Querybuildertypesv5BucketOptionsDTO,
-	Querybuildertypesv5QueryTypeDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import { Querybuildertypesv5BucketOptionsDTO } from 'api/generated/services/sigNoz.schemas';
 import { TelemetryFieldKey } from 'api/v5/v5';
 import { Format } from 'constants/formats/types';
 import { EQueryType } from 'types/common/dashboard';
@@ -22,14 +19,6 @@ import {
 } from '../v5/queryRange';
 import { BaseAutocompleteData } from './queryAutocompleteResponse';
 
-export const QueryMode = {
-	...EQueryType,
-	/** Not an `EQueryType`: AI queries are builder queries tagged `builderQueryType: builder_ai_query`. */
-	AI_QUERY_BUILDER: Querybuildertypesv5QueryTypeDTO.builder_ai_query,
-} as const;
-
-export type QueryMode = (typeof QueryMode)[keyof typeof QueryMode];
-
 // Type for Formula
 export interface IBuilderFormula {
 	expression: string;
@@ -152,17 +141,3 @@ export type MapQueryDataToApiResult<T> = {
 	data: T;
 	newLegendMap: Record<string, string>;
 };
-
-/** Query Builder and AI share `Query.builder`; the variant says which one it holds. */
-export const BuilderVariant = {
-	MAIN: 'main',
-	AI: 'ai',
-} as const;
-
-export type BuilderVariant =
-	(typeof BuilderVariant)[keyof typeof BuilderVariant];
-
-/** Builder queries per variant; `Query` has one `builder` slot, so the off-screen variant lives here. */
-export type BuildersByVariant = Partial<
-	Record<BuilderVariant, Query['builder']>
->;

pkg/apiserver/signozapiserver/tracedetail.go

@@ -90,7 +90,7 @@ func (provider *provider) addTraceDetailRoutes(router *mux.Router) error {
 			ID:                  "GetTraceThread",
 			Tags:                []string{"tracedetail"},
 			Summary:             "Get thread view for a trace",
-			Description:         "Returns the spans carrying gen_ai input or output messages, or a tool execution, in timestamp order. Messages already in the OTel GenAI shape are decoded into formatted_input and formatted_output, with formatter naming the converter and formatter_warnings what it could not resolve. Pass nextCursor as after or prevCursor as before to page, or spanId to open the page around a span.",
+			Description:         "Returns the spans carrying gen_ai input or output messages in timestamp order. Pass nextCursor as after or prevCursor as before to page, or spanId to open the page around a span.",
 			RequestQuery:        new(spantypes.GetTraceThreadParams),
 			Response:            new(spantypes.GettableTraceThread),
 			ResponseContentType: "application/json",

pkg/modules/tracedetail/impltracedetail/store.go

@@ -158,6 +158,10 @@ func (s *traceStore) GetTraceStats(ctx context.Context, orgID valuer.UUID, trace
 
 // genAISpanColumns returns the gen_ai columns aggregated per span, resolved across attribute evolutions.
 func (s *traceStore) genAISpanColumns(ctx context.Context, orgID valuer.UUID, bounds *spantypes.TraceBounds, sb *sqlbuilder.SelectBuilder) ([]string, error) {
+	attributeKey := func(name string, dataType telemetrytypes.FieldDataType) *telemetrytypes.TelemetryFieldKey {
+		return &telemetrytypes.TelemetryFieldKey{Name: name, Signal: telemetrytypes.SignalTraces, FieldContext: telemetrytypes.FieldContextAttribute, FieldDataType: dataType}
+	}
+
 	values := []struct{ key, alias string }{
 		{aiobservabilitytypes.GenAIUsageInputTokens, "input_tokens_value"},
 		{aiobservabilitytypes.GenAIUsageOutputTokens, "output_tokens_value"},
@@ -171,17 +175,26 @@ func (s *traceStore) genAISpanColumns(ctx context.Context, orgID valuer.UUID, bo
 	for _, value := range values {
 		names = append(names, value.key)
 	}
-	keys, err := s.genAIFieldKeys(ctx, orgID, names)
+	selectors := make([]*telemetrytypes.FieldKeySelector, 0, len(names))
+	for _, name := range names {
+		selectors = append(selectors, &telemetrytypes.FieldKeySelector{Name: name, Signal: telemetrytypes.SignalTraces, FieldContext: telemetrytypes.FieldContextAttribute, SelectorMatchType: telemetrytypes.FieldSelectorMatchTypeExact})
+	}
+	keys, _, err := s.metadataStore.GetKeysMulti(ctx, orgID, querybuilder.ExpandKeySelectorsForFamilies(ctx, orgID, s.flagger, selectors))
 	if err != nil {
 		return nil, err
 	}
 
 	q := querybuilder.NewQueryInfo(ctx, orgID, s.flagger, telemetrytypes.SignalTraces, nil, uint64(bounds.Start.UnixNano()), uint64(bounds.End.UnixNano()))
-	isGenAI, err := s.anyExistsCondition(ctx, q, aiobservabilitytypes.GenAISpanGateKeys, keys, sb)
-	if err != nil {
-		return nil, err
+
+	gate := make([]string, 0, len(aiobservabilitytypes.GenAISpanGateKeys))
+	for _, name := range aiobservabilitytypes.GenAISpanGateKeys {
+		conds, _, err := querybuilder.Conditions(ctx, q, s.storage, attributeKey(name, telemetrytypes.FieldDataTypeString), qbtypes.FilterOperatorExists, nil, keys, false, sb)
+		if err != nil {
+			return nil, err
+		}
+		gate = append(gate, conds...)
 	}
-	columns := []string{isGenAI + " AS is_gen_ai"}
+	columns := []string{sb.Or(gate...) + " AS is_gen_ai"}
 
 	for _, value := range values {
 		// lookup by number, the type metadata stores numeric attributes under; float64 is only the output cast
@@ -297,11 +310,7 @@ func (s *traceStore) GetThreadSpans(ctx context.Context, orgID valuer.UUID, trac
 		sb.SelectMore("attributes")
 	}
 	sb.From(fmt.Sprintf("%s.%s", spantypes.TraceDB, spantypes.TraceTable))
-	keys, err := s.genAIFieldKeys(ctx, orgID, aiobservabilitytypes.GenAIThreadKeys)
-	if err != nil {
-		return nil, err
-	}
-	isThreadSpan, err := s.anyExistsCondition(ctx, q, aiobservabilitytypes.GenAIThreadKeys, keys, sb)
+	hasMessages, err := s.messagesExistCondition(ctx, q, orgID, bounds, sb)
 	if err != nil {
 		return nil, err
 	}
@@ -309,7 +318,7 @@ func (s *traceStore) GetThreadSpans(ctx context.Context, orgID valuer.UUID, trac
 		sb.E("trace_id", traceID),
 		sb.GE("ts_bucket_start", bounds.Start.Unix()-1800),
 		sb.LE("ts_bucket_start", bounds.End.Unix()),
-		isThreadSpan,
+		hasMessages,
 	)
 	if cursor := page.Cursor; cursor != nil {
 		// ClickHouse can't use an index for a tuple comparison, so the separate timestamp and
@@ -346,6 +355,38 @@ func (s *traceStore) GetThreadSpans(ctx context.Context, orgID valuer.UUID, trac
 	return spans, nil
 }
 
+// messagesExistCondition resolves the gen_ai message keys through the attribute evolution metadata
+// and the use_trace_attributes_json flag, so the filter reads the same columns the query builder does.
+func (s *traceStore) messagesExistCondition(ctx context.Context, q qbtypes.QueryInfo, orgID valuer.UUID, bounds *spantypes.TraceBounds, sb *sqlbuilder.SelectBuilder) (string, error) {
+	names := []string{aiobservabilitytypes.GenAIInputMessages, aiobservabilitytypes.GenAIOutputMessages}
+	selectors := make([]*telemetrytypes.FieldKeySelector, len(names))
+	for i, name := range names {
+		selectors[i] = &telemetrytypes.FieldKeySelector{
+			StartUnixMilli:    bounds.Start.UnixMilli(),
+			EndUnixMilli:      bounds.End.UnixMilli(),
+			Signal:            telemetrytypes.SignalTraces,
+			FieldContext:      telemetrytypes.FieldContextAttribute,
+			Name:              name,
+			SelectorMatchType: telemetrytypes.FieldSelectorMatchTypeExact,
+		}
+	}
+	fieldKeys, _, err := s.metadataStore.GetKeysMulti(ctx, orgID, selectors)
+	if err != nil {
+		return "", errors.WrapInternalf(err, errors.CodeInternal, "error fetching thread field keys")
+	}
+
+	conds := make([]string, 0, len(names))
+	for _, name := range names {
+		key := &telemetrytypes.TelemetryFieldKey{Name: name, Signal: telemetrytypes.SignalTraces, FieldContext: telemetrytypes.FieldContextAttribute}
+		keyConds, _, err := querybuilder.Conditions(ctx, q, s.storage, key, qbtypes.FilterOperatorExists, nil, fieldKeys, false, sb)
+		if err != nil {
+			return "", err
+		}
+		conds = append(conds, keyConds...)
+	}
+	return sb.Or(conds...), nil
+}
+
 func (s *traceStore) GetThreadCursor(ctx context.Context, traceID string, bounds *spantypes.TraceBounds, spanID string) (*spantypes.ThreadCursor, error) {
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("toUnixTimestamp64Nano(timestamp)")
@@ -491,34 +532,3 @@ func (s *traceStore) GetSpanDurationByField(ctx context.Context, traceID string,
 	}
 	return result, nil
 }
-
-func attributeKey(name string, dataType telemetrytypes.FieldDataType) *telemetrytypes.TelemetryFieldKey {
-	return &telemetrytypes.TelemetryFieldKey{Name: name, Signal: telemetrytypes.SignalTraces, FieldContext: telemetrytypes.FieldContextAttribute, FieldDataType: dataType}
-}
-
-// genAIFieldKeys fetches the metadata keys for the attribute names, expanded across semconv families.
-func (s *traceStore) genAIFieldKeys(ctx context.Context, orgID valuer.UUID, names []string) (map[string][]*telemetrytypes.TelemetryFieldKey, error) {
-	selectors := make([]*telemetrytypes.FieldKeySelector, 0, len(names))
-	for _, name := range names {
-		selectors = append(selectors, &telemetrytypes.FieldKeySelector{Name: name, Signal: telemetrytypes.SignalTraces, FieldContext: telemetrytypes.FieldContextAttribute, SelectorMatchType: telemetrytypes.FieldSelectorMatchTypeExact})
-	}
-	keys, _, err := s.metadataStore.GetKeysMulti(ctx, orgID, querybuilder.ExpandKeySelectorsForFamilies(ctx, orgID, s.flagger, selectors))
-	if err != nil {
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "error fetching gen_ai field keys")
-	}
-	return keys, nil
-}
-
-// anyExistsCondition ORs an EXISTS test per attribute name, resolved across attribute evolutions
-// and the use_trace_attributes_json flag so the filter reads the same columns the query builder does.
-func (s *traceStore) anyExistsCondition(ctx context.Context, q qbtypes.QueryInfo, names []string, keys map[string][]*telemetrytypes.TelemetryFieldKey, sb *sqlbuilder.SelectBuilder) (string, error) {
-	conds := make([]string, 0, len(names))
-	for _, name := range names {
-		keyConds, _, err := querybuilder.Conditions(ctx, q, s.storage, attributeKey(name, telemetrytypes.FieldDataTypeString), qbtypes.FilterOperatorExists, nil, keys, false, sb)
-		if err != nil {
-			return "", err
-		}
-		conds = append(conds, keyConds...)
-	}
-	return sb.Or(conds...), nil
-}

pkg/modules/tracedetail/impltracedetail/store_test.go

@@ -220,14 +220,14 @@ func TestGetThreadSpans(t *testing.T) {
 			name:        "FlagOff_ReadsAndFiltersLegacyMaps",
 			jsonRelease: &jsonInsideTrace,
 			selectSQL:   selectSQL,
-			whereSQL:    "(mapContains(attributes_string, 'gen_ai.input.messages') OR mapContains(attributes_string, 'gen_ai.output.messages') OR mapContains(attributes_string, 'gen_ai.tool.name'))",
+			whereSQL:    "(mapContains(attributes_string, 'gen_ai.input.messages') OR mapContains(attributes_string, 'gen_ai.output.messages'))",
 		},
 		{
 			name:        "FlagOn_ReleasedDuringTrace_ReadsJSONFiltersJSONThenMaps",
 			jsonOn:      true,
 			jsonRelease: &jsonInsideTrace,
 			selectSQL:   selectSQL + ", attributes",
-			whereSQL:    "(multiIf(attributes.`gen_ai.input.messages` IS NOT NULL, attributes.`gen_ai.input.messages`::String, mapContains(attributes_string, 'gen_ai.input.messages'), attributes_string['gen_ai.input.messages'], NULL) IS NOT NULL OR multiIf(attributes.`gen_ai.output.messages` IS NOT NULL, attributes.`gen_ai.output.messages`::String, mapContains(attributes_string, 'gen_ai.output.messages'), attributes_string['gen_ai.output.messages'], NULL) IS NOT NULL OR multiIf(attributes.`gen_ai.tool.name` IS NOT NULL, attributes.`gen_ai.tool.name`::String, mapContains(attributes_string, 'gen_ai.tool.name'), attributes_string['gen_ai.tool.name'], NULL) IS NOT NULL)",
+			whereSQL:    "(multiIf(attributes.`gen_ai.input.messages` IS NOT NULL, attributes.`gen_ai.input.messages`::String, mapContains(attributes_string, 'gen_ai.input.messages'), attributes_string['gen_ai.input.messages'], NULL) IS NOT NULL OR multiIf(attributes.`gen_ai.output.messages` IS NOT NULL, attributes.`gen_ai.output.messages`::String, mapContains(attributes_string, 'gen_ai.output.messages'), attributes_string['gen_ai.output.messages'], NULL) IS NOT NULL)",
 		},
 	}
 

pkg/signoz/provider.go

@@ -261,7 +261,6 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewAddUserTuplesFactory(sqlstore),
 		sqlmigration.NewAddRuleViewFactory(sqlstore, sqlschema),
 		sqlmigration.NewAddFieldTuplesFactory(sqlstore),
-		sqlmigration.NewKeepRelevantLLMPricingRulesFactory(),
 	)
 }
 

pkg/sqlmigration/135_keep_relevant_llm_pricing_rules.go

@@ -1,116 +0,0 @@
-package sqlmigration
-
-import (
-	"context"
-	"encoding/json"
-	"log/slog"
-	"regexp"
-	"strings"
-
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/migrate"
-
-	"github.com/SigNoz/signoz/pkg/factory"
-)
-
-// Mirrors the zeus LLMPriceFilter and its default model authors.
-// https://github.com/SigNoz/zeus/pull/591/changes
-var (
-	llmPricingRuleProviders = map[string]struct{}{
-		"openai": {}, "anthropic": {}, "google": {}, "mistralai": {}, "deepseek": {},
-		"qwen": {}, "x-ai": {}, "meta-llama": {}, "cohere": {}, "amazon": {},
-	}
-	qwenHostedModelPattern = regexp.MustCompile(`max|plus|flash|turbo`)
-)
-
-type llmPricingRuleSyncedRow struct {
-	bun.BaseModel `bun:"table:llm_pricing_rule"`
-
-	ID       string `bun:"id,pk"`
-	Provider string `bun:"provider"`
-	Model    string `bun:"model"`
-	Pricing  string `bun:"pricing"`
-}
-
-type llmPricingRulePrices struct {
-	Input  float64 `json:"input"`
-	Output float64 `json:"output"`
-}
-
-type keepRelevantLLMPricingRules struct {
-	settings factory.ProviderSettings
-}
-
-func NewKeepRelevantLLMPricingRulesFactory() factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(factory.MustNewName("keep_relevant_llm_pricing_rules"), func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-		return &keepRelevantLLMPricingRules{settings: ps}, nil
-	})
-}
-
-func (migration *keepRelevantLLMPricingRules) Register(migrations *migrate.Migrations) error {
-	return migrations.Register(migration.Up, migration.Down)
-}
-
-func (migration *keepRelevantLLMPricingRules) Up(ctx context.Context, db *bun.DB) error {
-	tx, err := db.BeginTx(ctx, nil)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = tx.Rollback() }()
-
-	var rows []*llmPricingRuleSyncedRow
-	if err := tx.NewSelect().
-		Model(&rows).
-		Where("source_id IS NOT NULL").
-		Where("NOT is_override").
-		Scan(ctx); err != nil {
-		return err
-	}
-
-	ids := make([]string, 0)
-	for _, row := range rows {
-		var prices llmPricingRulePrices
-		if err := json.Unmarshal([]byte(row.Pricing), &prices); err != nil {
-			migration.settings.Logger.WarnContext(ctx, "llm pricing rule has unparseable pricing, leaving it untouched", slog.String("rule_id", row.ID), slog.String("raw_pricing", row.Pricing))
-			continue
-		}
-		if !llmPricingRuleRelevant(row.Provider, row.Model, prices) {
-			ids = append(ids, row.ID)
-		}
-	}
-
-	if len(ids) > 0 {
-		if _, err := tx.NewDelete().
-			Model((*llmPricingRuleSyncedRow)(nil)).
-			Where("id IN (?)", bun.In(ids)).
-			Exec(ctx); err != nil {
-			return err
-		}
-	}
-
-	migration.settings.Logger.InfoContext(ctx, "deleted irrelevant llm pricing rules", slog.Int("total", len(rows)), slog.Int("deleted", len(ids)))
-
-	return tx.Commit()
-}
-
-func (migration *keepRelevantLLMPricingRules) Down(context.Context, *bun.DB) error {
-	return nil
-}
-
-// The provider allowlist also rejects "~" alias ids, whose provider segment
-// starts with "~", and ids without a "/" that were stored as "unknown".
-func llmPricingRuleRelevant(provider, model string, prices llmPricingRulePrices) bool {
-	if _, ok := llmPricingRuleProviders[provider]; !ok {
-		return false
-	}
-	if strings.Contains(model, ":") {
-		return false
-	}
-	if prices.Input <= 0 || prices.Output <= 0 {
-		return false
-	}
-	if provider == "qwen" && !qwenHostedModelPattern.MatchString(model) {
-		return false
-	}
-	return true
-}

pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder.go

@@ -918,10 +918,6 @@ func (b *traceOperatorCTEBuilder) buildScalarQuery(ctx context.Context, selectFr
 		sb.OrderBy("__result_0 DESC")
 	}
 
-	if b.operator.Limit > 0 {
-		sb.Limit(b.operator.Limit)
-	}
-
 	combinedArgs := allAggChArgs
 
 	// Add HAVING clause if specified

pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder_test.go

@@ -343,8 +343,8 @@ func TestTraceOperatorStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH toDateTime64(1747947419000000000, 9) AS t_from, toDateTime64(1747983448000000000, 9) AS t_to, 1747945619 AS bucket_from, 1747983448 AS bucket_to, all_spans AS (SELECT *, resource_string_service$$name AS `service.name` FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __resource_filter_A AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), A AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter_A) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), B AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND toFloat64(response_status_code) < ?), A_AND_B AS (SELECT l.* FROM A AS l INNER JOIN B AS r ON l.trace_id = r.trace_id) SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `service.name`, avg(toFloat64(duration_nano)) AS __result_0 FROM A_AND_B GROUP BY `service.name` ORDER BY __result_0 desc LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
-				Args:  []any{"1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "frontend", "%service.name%", "%service.name\":\"frontend%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), float64(400), 10},
+				Query: "WITH toDateTime64(1747947419000000000, 9) AS t_from, toDateTime64(1747983448000000000, 9) AS t_to, 1747945619 AS bucket_from, 1747983448 AS bucket_to, all_spans AS (SELECT *, resource_string_service$$name AS `service.name` FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __resource_filter_A AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), A AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter_A) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), B AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND toFloat64(response_status_code) < ?), A_AND_B AS (SELECT l.* FROM A AS l INNER JOIN B AS r ON l.trace_id = r.trace_id) SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `service.name`, avg(toFloat64(duration_nano)) AS __result_0 FROM A_AND_B GROUP BY `service.name` ORDER BY __result_0 desc SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
+				Args:  []any{"1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "frontend", "%service.name%", "%service.name\":\"frontend%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), float64(400)},
 			},
 			expectedErr: nil,
 		},

pkg/types/aiobservabilitytypes/keys.go

@@ -35,9 +35,6 @@ const (
 // agent span. A trace belongs to the AI explorer when any span carries one.
 var GenAISpanGateKeys = []string{GenAIRequestModel, GenAIToolName, GenAIAgentName}
 
-// GenAIThreadKeys mark a span as a thread row: a model call with its messages, or a tool execution.
-var GenAIThreadKeys = []string{GenAIInputMessages, GenAIOutputMessages, GenAIToolName}
-
 // GenAISpanFilterExpression renders the gate as a query-builder filter
 // expression: each gate key ORed on EXISTS.
 func GenAISpanFilterExpression() string {

pkg/types/aiobservabilitytypes/message.go

@@ -1,58 +0,0 @@
-// The message types mirror the OpenTelemetry GenAI message schemas, one type per schema definition:
-// open-telemetry/semantic-conventions-genai@06ec68e, model/gen-ai/gen-ai-{input,output}-messages.json.
-// Keys the schema does not name are dropped; the raw attribute on the span still has them.
-
-package aiobservabilitytypes
-
-import "github.com/SigNoz/signoz/pkg/valuer"
-
-var (
-	RoleSystem    = Role{valuer.NewString("system")}
-	RoleUser      = Role{valuer.NewString("user")}
-	RoleAssistant = Role{valuer.NewString("assistant")}
-	RoleTool      = Role{valuer.NewString("tool")}
-)
-
-var (
-	FinishReasonStop          = FinishReason{valuer.NewString("stop")}
-	FinishReasonLength        = FinishReason{valuer.NewString("length")}
-	FinishReasonContentFilter = FinishReason{valuer.NewString("content_filter")}
-	FinishReasonToolCall      = FinishReason{valuer.NewString("tool_call")}
-	FinishReasonCompaction    = FinishReason{valuer.NewString("compaction")}
-	FinishReasonError         = FinishReason{valuer.NewString("error")}
-)
-
-var (
-	ModalityImage    = Modality{valuer.NewString("image")}
-	ModalityVideo    = Modality{valuer.NewString("video")}
-	ModalityAudio    = Modality{valuer.NewString("audio")}
-	ModalityDocument = Modality{valuer.NewString("document")}
-)
-
-// Role, FinishReason and Modality are open enums: the variables are the values the schema
-// names, any other string is kept as sent, so none of them lists an Enum for the spec.
-type Role struct{ valuer.String }
-
-type FinishReason struct{ valuer.String }
-
-type Modality struct{ valuer.String }
-
-type InputMessages []ChatMessage
-
-// OutputMessages holds one message per choice.
-type OutputMessages []OutputMessage
-
-type ChatMessage struct {
-	Role  Role    `json:"role" required:"true"`
-	Parts Parts   `json:"parts" required:"true" nullable:"false"`
-	Name  *string `json:"name,omitempty"`
-}
-
-// OutputMessage is one choice. The schema deprecates FinishReason in favour of
-// gen_ai.response.finish_reasons; it stays so each choice carries its own.
-type OutputMessage struct {
-	Role         Role          `json:"role" required:"true"`
-	Parts        Parts         `json:"parts" required:"true" nullable:"false"`
-	Name         *string       `json:"name,omitempty"`
-	FinishReason *FinishReason `json:"finish_reason,omitempty"`
-}

pkg/types/aiobservabilitytypes/message_format.go

@@ -1,239 +0,0 @@
-package aiobservabilitytypes
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-const (
-	FormatterSemconv    = "semconv"
-	FormatterOpenAIChat = "openai.chat"
-	FormatterText       = "text"
-	FormatterGeneric    = "generic"
-)
-
-var dataURL = regexp.MustCompile(`^data:([^;,]+);base64,(.+)$`)
-
-// Provider spellings of the finish reasons; the enum values themselves pass through.
-var finishReasonAliases = map[string]FinishReason{
-	"tool_calls": FinishReasonToolCall, "function_call": FinishReasonToolCall,
-	"end_turn": FinishReasonStop, "stop_sequence": FinishReasonStop,
-	"max_tokens": FinishReasonLength,
-}
-
-// FormattedMessages is the OTel GenAI view of one span's messages. Formatter names the converter that
-// produced it, Warnings what the converter could not resolve. The lists are never nil.
-type FormattedMessages struct {
-	Input     InputMessages
-	Output    OutputMessages
-	Formatter string
-	Warnings  []string
-}
-
-// FormatMessages builds the OTel GenAI view of gen_ai.input.messages and gen_ai.output.messages from the
-// formats SDKs write. Each value is a JSON string or a structured value; nil means absent.
-func FormatMessages(input, output any) FormattedMessages {
-	f := &formatting{out: FormattedMessages{Input: InputMessages{}, Output: OutputMessages{}, Warnings: []string{}}}
-	var inputLabel, outputLabel string
-	if input != nil {
-		var msgs OutputMessages
-		msgs, inputLabel = f.side(decode(input), RoleUser)
-		for _, m := range msgs {
-			f.out.Input = append(f.out.Input, ChatMessage{Role: m.Role, Parts: m.Parts, Name: m.Name})
-		}
-	}
-	if output != nil {
-		f.out.Output, outputLabel = f.side(decode(output), RoleAssistant)
-	}
-	f.out.Formatter = inputLabel
-	if inputLabel == "" {
-		f.out.Formatter = outputLabel
-	} else if outputLabel != "" && outputLabel != inputLabel {
-		f.warn("output formatted as %s, input as %s", outputLabel, inputLabel)
-	}
-	return f.out
-}
-
-type formatting struct {
-	out FormattedMessages
-}
-
-func (f *formatting) warn(format string, args ...any) {
-	f.out.Warnings = append(f.out.Warnings, fmt.Sprintf(format, args...))
-}
-
-// side converts one attribute value by its shape; role is what a bare string on this side is
-// spoken as.
-func (f *formatting) side(value any, role Role) (OutputMessages, string) {
-	switch v := value.(type) {
-	case []any:
-		if first, ok := firstObject(v); ok {
-			if _, ok := first["parts"]; ok {
-				return f.semconv(v), FormatterSemconv
-			}
-			if _, ok := first["role"]; ok {
-				return f.openAIChatMessages(v), FormatterOpenAIChat
-			}
-		}
-	case map[string]any:
-		if choices, ok := v["choices"].([]any); ok {
-			return f.openAIChatResponse(choices), FormatterOpenAIChat
-		}
-		if messages, ok := v["messages"].([]any); ok {
-			return f.openAIChatMessages(messages), FormatterOpenAIChat
-		}
-	case string:
-		if v == "" {
-			return OutputMessages{}, FormatterText
-		}
-		f.warn("bare %s text, role assumed", role.StringValue())
-		return OutputMessages{{Role: role, Parts: Parts{part(textPart(v))}}}, FormatterText
-	}
-	f.warn("message format not recognised, kept as generic")
-	return OutputMessages{genericMessage(value)}, FormatterGeneric
-}
-
-func firstObject(list []any) (map[string]any, bool) {
-	if len(list) == 0 {
-		return nil, false
-	}
-	first, ok := list[0].(map[string]any)
-	return first, ok
-}
-
-func genericMessage(value any) OutputMessage {
-	return OutputMessage{Parts: Parts{part(GenericPart{"type": FormatterGeneric, "content": stringOf(value)})}}
-}
-
-// decode parses a JSON-encoded attribute value, twice when an SDK encoded the string again.
-// Anything that is not JSON is returned as is.
-func decode(value any) any {
-	s, ok := value.(string)
-	if !ok {
-		return value
-	}
-	trimmed := strings.TrimSpace(s)
-	if trimmed == "" || !strings.ContainsAny(trimmed[:1], `[{"`) {
-		return s
-	}
-	var decoded any
-	if err := json.Unmarshal([]byte(trimmed), &decoded); err != nil {
-		return s
-	}
-	if inner, ok := decoded.(string); ok {
-		return decode(inner)
-	}
-	return decoded
-}
-
-func role(value string) Role {
-	lower := strings.ToLower(strings.TrimSpace(value))
-	switch lower {
-	case "human":
-		return RoleUser
-	case "ai", "model":
-		return RoleAssistant
-	case "function":
-		return RoleTool
-	}
-	return Role{String: valuer.NewString(lower)}
-}
-
-func finishReason(value string) *FinishReason {
-	lower := strings.ToLower(strings.TrimSpace(value))
-	if lower == "" {
-		return nil
-	}
-	fr, ok := finishReasonAliases[lower]
-	if !ok {
-		fr = FinishReason{String: valuer.NewString(lower)}
-	}
-	return &fr
-}
-
-func optionalString(value any) *string {
-	s := stringOf(value)
-	if s == "" {
-		return nil
-	}
-	return &s
-}
-
-func part(value any) Part {
-	return Part{Value: value}
-}
-
-func textPart(content string) TextPart {
-	return TextPart{Type: PartTypeText, Content: content}
-}
-
-// contentPart converts one OpenAI content block, which semconv parts may also carry; a block of
-// any other type is kept as sent.
-func contentPart(item any) Part {
-	p, ok := item.(map[string]any)
-	if !ok {
-		if s, ok := item.(string); ok {
-			return part(textPart(s))
-		}
-		return part(GenericPart{"type": FormatterGeneric, "content": stringOf(item)})
-	}
-	switch stringOf(p["type"]) {
-	case "text":
-		return part(textPart(stringOf(p["text"])))
-	case "refusal":
-		return part(textPart(stringOf(p["refusal"])))
-	case "image_url":
-		url := stringOf(p["image_url"])
-		if ref, ok := p["image_url"].(map[string]any); ok {
-			url = stringOf(ref["url"])
-		}
-		if url != "" {
-			return part(mediaPart(url, ModalityImage))
-		}
-	case "file":
-		if f, ok := filePart(p); ok {
-			return f
-		}
-	}
-	return part(GenericPart(p))
-}
-
-// filePart reads {file: {file_id}} or {file: {file_data, filename}}; Chat Completions accepts only PDF here.
-func filePart(block map[string]any) (Part, bool) {
-	f, _ := block["file"].(map[string]any)
-	if id := stringOf(f["file_id"]); id != "" {
-		mime := "application/pdf"
-		return part(FilePart{Type: PartTypeFile, Modality: ModalityDocument, FileID: id, MimeType: &mime}), true
-	}
-	if data := stringOf(f["file_data"]); data != "" {
-		return part(mediaPart(data, ModalityDocument)), true
-	}
-	return Part{}, false
-}
-
-// mediaPart places a data URL in a BlobPart, any other URL in a UriPart.
-func mediaPart(url string, modality Modality) any {
-	if m := dataURL.FindStringSubmatch(url); m != nil {
-		return BlobPart{Type: PartTypeBlob, Modality: modality, MimeType: &m[1], Content: m[2]}
-	}
-	return UriPart{Type: PartTypeURI, Modality: modality, URI: url}
-}
-
-// stringOf renders nil as "" and non-strings as compact JSON.
-func stringOf(value any) string {
-	switch v := value.(type) {
-	case nil:
-		return ""
-	case string:
-		return v
-	}
-	data, err := json.Marshal(value)
-	if err != nil {
-		return ""
-	}
-	return string(data)
-}

pkg/types/aiobservabilitytypes/message_format_openai_chat.go

@@ -1,125 +0,0 @@
-package aiobservabilitytypes
-
-import (
-	"strings"
-)
-
-// Format: OpenAI Chat Completions, a request {messages}, a response {choices}, or a bare message list.
-// Written by: bifrost, openrouter requests, the raw OpenAI calls OpenInference records.
-// Handled: string and block content, tool_calls nested or flattened, tool messages, refusal,
-// reasoning_content, finish reasons.
-// Not yet: streaming delta chunks, legacy completions choices[].text, audio output.
-
-func (f *formatting) openAIChatMessages(list []any) OutputMessages {
-	out := make(OutputMessages, 0, len(list))
-	for _, item := range list {
-		m, ok := item.(map[string]any)
-		if !ok {
-			out = append(out, genericMessage(item))
-			continue
-		}
-		out = append(out, f.openAIChatMessage(m))
-	}
-	return out
-}
-
-// openAIChatResponse converts the choices of an OpenAI chat response, one message each with its
-// finish reason.
-func (f *formatting) openAIChatResponse(choices []any) OutputMessages {
-	out := make(OutputMessages, 0, len(choices))
-	for _, item := range choices {
-		choice, ok := item.(map[string]any)
-		if !ok {
-			out = append(out, genericMessage(item))
-			continue
-		}
-		inner, _ := choice["message"].(map[string]any)
-		msg := f.openAIChatMessage(inner)
-		if msg.Role.IsZero() {
-			msg.Role = RoleAssistant
-		}
-		if fr := finishReason(stringOf(choice["finish_reason"])); fr != nil {
-			msg.FinishReason = fr
-		}
-		out = append(out, msg)
-	}
-	return out
-}
-
-// openAIChatMessage converts one {role, content, tool_calls, ...} message in the OpenAI chat shape.
-func (f *formatting) openAIChatMessage(m map[string]any) OutputMessage {
-	msg := OutputMessage{Role: role(stringOf(m["role"])), Parts: Parts{}, Name: optionalString(m["name"]), FinishReason: finishReason(stringOf(m["finish_reason"]))}
-
-	if id := stringOf(m["tool_call_id"]); msg.Role == RoleTool && id != "" {
-		msg.Parts = Parts{part(ToolCallResponsePart{Type: PartTypeToolCallResponse, ID: &id, Response: toolResponse(m["content"])})}
-		return msg
-	}
-
-	switch content := m["content"].(type) {
-	case string:
-		if content != "" {
-			msg.Parts = append(msg.Parts, part(textPart(content)))
-		}
-	case []any:
-		for _, item := range content {
-			msg.Parts = append(msg.Parts, contentPart(item))
-		}
-	}
-	if refusal := stringOf(m["refusal"]); refusal != "" {
-		msg.Parts = append(msg.Parts, part(textPart(refusal)))
-	}
-	reasoning, _ := m["reasoning_content"].(string)
-	if reasoning == "" {
-		reasoning, _ = m["reasoning"].(string)
-	}
-	if reasoning != "" {
-		msg.Parts = append(msg.Parts, part(ReasoningPart{Type: PartTypeReasoning, Content: reasoning}))
-	}
-	if calls, ok := m["tool_calls"].([]any); ok {
-		for _, call := range calls {
-			if c, ok := call.(map[string]any); ok {
-				msg.Parts = append(msg.Parts, toolCallPart(c))
-			}
-		}
-	}
-	if call, ok := m["function_call"].(map[string]any); ok {
-		msg.Parts = append(msg.Parts, part(ToolCallRequestPart{Type: PartTypeToolCall, Name: stringOf(call["name"]), Arguments: decode(call["arguments"])}))
-	}
-	return msg
-}
-
-// toolCallPart reads {id, function: {name, arguments}}; a gateway may flatten it to {id, name, arguments|args}.
-func toolCallPart(c map[string]any) Part {
-	call := ToolCallRequestPart{Type: PartTypeToolCall, ID: optionalString(c["id"]), Name: stringOf(c["name"])}
-	args := c["arguments"]
-	if args == nil {
-		args = c["args"]
-	}
-	if fn, ok := c["function"].(map[string]any); ok {
-		call.Name = stringOf(fn["name"])
-		args = fn["arguments"]
-	}
-	if args != nil {
-		call.Arguments = decode(args)
-	}
-	return part(call)
-}
-
-// toolResponse parses a JSON string and joins text blocks; anything else stays as sent.
-func toolResponse(value any) any {
-	switch v := value.(type) {
-	case string:
-		return decode(v)
-	case []any:
-		texts := make([]string, 0, len(v))
-		for _, item := range v {
-			block, ok := item.(map[string]any)
-			if !ok || stringOf(block["type"]) != "text" {
-				return v
-			}
-			texts = append(texts, stringOf(block["text"]))
-		}
-		return strings.Join(texts, "\n")
-	}
-	return value
-}

pkg/types/aiobservabilitytypes/message_format_openai_chat_test.go

@@ -1,222 +0,0 @@
-package aiobservabilitytypes
-
-import "testing"
-
-// Captured cases are gen_ai.input.messages and gen_ai.output.messages as the collector stored
-// them for the SigNoz/scripts static-telemetry-generator captures.
-func TestFormat_OpenAIChat(t *testing.T) {
-	runFormatCases(t, []formatCase{
-		{
-			// openinference capture, ChatCompletion span: the raw OpenAI request and response
-			name:      "ResponseWithToolCalls_ToolCallParts_FinishReasonToolCall",
-			input:     `{"messages": [{"role": "user", "content": "What's the weather in Paris and in London? Use the tool for each."}], "model": "gpt-4o-mini", "max_tokens": 120, "tool_choice": "auto", "tools": [{"type": "function", "function": {"name": "get_current_weather", "description": "Get the current weather for a city.", "parameters": {"type": "object", "properties": {"city": {"type": "string"}, "unit": {"type": "string", "enum": ["c", "f"]}}, "required": ["city"]}}}]}`,
-			output:    `{"id":"chatcmpl-DksBDptnQ3aTu18YrqSdYQgiPOuRV","choices":[{"finish_reason":"tool_calls","index":0,"logprobs":null,"message":{"content":null,"refusal":null,"role":"assistant","annotations":[],"tool_calls":[{"id":"call_SW4hst7nzysgvWSAz4OdyK9D","function":{"arguments":"{\"city\": \"Paris\"}","name":"get_current_weather"},"type":"function"},{"id":"call_si8wiETYGpooMB7gMXSgMQpk","function":{"arguments":"{\"city\": \"London\"}","name":"get_current_weather"},"type":"function"}]}}],"created":1780063727,"model":"gpt-4o-mini-2024-07-18","object":"chat.completion","service_tier":"default","system_fingerprint":"fp_6e71a9f378","usage":{"completion_tokens":46,"prompt_tokens":71,"total_tokens":117,"completion_tokens_details":{"accepted_prediction_tokens":0,"audio_tokens":0,"reasoning_tokens":0,"rejected_prediction_tokens":0},"prompt_tokens_details":{"audio_tokens":0,"cached_tokens":0}}}`,
-			formatter: FormatterOpenAIChat,
-			wantInput: `[
-			  {
-			    "role": "user",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "What's the weather in Paris and in London? Use the tool for each."
-			      }
-			    ]
-			  }
-			]`,
-			wantOutput: `[
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "tool_call",
-			        "name": "get_current_weather",
-			        "id": "call_SW4hst7nzysgvWSAz4OdyK9D",
-			        "arguments": {
-			          "city": "Paris"
-			        }
-			      },
-			      {
-			        "type": "tool_call",
-			        "name": "get_current_weather",
-			        "id": "call_si8wiETYGpooMB7gMXSgMQpk",
-			        "arguments": {
-			          "city": "London"
-			        }
-			      }
-			    ],
-			    "finish_reason": "tool_call"
-			  }
-			]`,
-		},
-		{
-			// openinference capture, the follow-up ChatCompletion span
-			name:      "ToolRoleMessages_BecomeToolCallResponseParts",
-			input:     `{"messages": [{"role": "user", "content": "What's the weather in Paris and in London? Use the tool for each."}, {"content": null, "refusal": null, "role": "assistant", "annotations": [], "audio": null, "function_call": null, "tool_calls": [{"id": "call_SW4hst7nzysgvWSAz4OdyK9D", "function": {"arguments": "{\"city\": \"Paris\"}", "name": "get_current_weather"}, "type": "function"}, {"id": "call_si8wiETYGpooMB7gMXSgMQpk", "function": {"arguments": "{\"city\": \"London\"}", "name": "get_current_weather"}, "type": "function"}]}, {"role": "tool", "tool_call_id": "call_SW4hst7nzysgvWSAz4OdyK9D", "content": "{\"city\": \"Paris\", \"temp_c\": 18, \"summary\": \"Clear\"}"}, {"role": "tool", "tool_call_id": "call_si8wiETYGpooMB7gMXSgMQpk", "content": "{\"city\": \"London\", \"temp_c\": 18, \"summary\": \"Clear\"}"}], "model": "gpt-4o-mini", "max_tokens": 80}`,
-			output:    `{"id":"chatcmpl-DksBF2QuaoMMMFg9UAXX9Rc28XVJT","choices":[{"finish_reason":"stop","index":0,"logprobs":null,"message":{"content":"The current weather is as follows:\n\n- **Paris**: 18°C, Clear\n- **London**: 18°C, Clear\n\nBoth cities are enjoying clear skies with the same temperature.","refusal":null,"role":"assistant","annotations":[]}}],"created":1780063729,"model":"gpt-4o-mini-2024-07-18","object":"chat.completion","service_tier":"default","system_fingerprint":"fp_e2d886d409","usage":{"completion_tokens":40,"prompt_tokens":118,"total_tokens":158,"completion_tokens_details":{"accepted_prediction_tokens":0,"audio_tokens":0,"reasoning_tokens":0,"rejected_prediction_tokens":0},"prompt_tokens_details":{"audio_tokens":0,"cached_tokens":0}}}`,
-			formatter: FormatterOpenAIChat,
-			wantInput: `[
-			  {
-			    "role": "user",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "What's the weather in Paris and in London? Use the tool for each."
-			      }
-			    ]
-			  },
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "tool_call",
-			        "name": "get_current_weather",
-			        "id": "call_SW4hst7nzysgvWSAz4OdyK9D",
-			        "arguments": {
-			          "city": "Paris"
-			        }
-			      },
-			      {
-			        "type": "tool_call",
-			        "name": "get_current_weather",
-			        "id": "call_si8wiETYGpooMB7gMXSgMQpk",
-			        "arguments": {
-			          "city": "London"
-			        }
-			      }
-			    ]
-			  },
-			  {
-			    "role": "tool",
-			    "parts": [
-			      {
-			        "type": "tool_call_response",
-			        "response": {
-			          "city": "Paris",
-			          "summary": "Clear",
-			          "temp_c": 18
-			        },
-			        "id": "call_SW4hst7nzysgvWSAz4OdyK9D"
-			      }
-			    ]
-			  },
-			  {
-			    "role": "tool",
-			    "parts": [
-			      {
-			        "type": "tool_call_response",
-			        "response": {
-			          "city": "London",
-			          "summary": "Clear",
-			          "temp_c": 18
-			        },
-			        "id": "call_si8wiETYGpooMB7gMXSgMQpk"
-			      }
-			    ]
-			  }
-			]`,
-			wantOutput: `[
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "The current weather is as follows:\n\n- **Paris**: 18°C, Clear\n- **London**: 18°C, Clear\n\nBoth cities are enjoying clear skies with the same temperature."
-			      }
-			    ],
-			    "finish_reason": "stop"
-			  }
-			]`,
-		},
-		{
-			// bifrost-gateway capture, HTTP span
-			name:      "GatewayFlattenedToolCalls_ToolCallParts_BareInputWarns",
-			input:     `What's the weather in Paris and in London? Use the tool for each.`,
-			output:    `[{"role":"assistant","content":"","tool_calls":[{"id":"call_xP33RT5exgBrNsvsWQZwiY9D","type":"function","name":"get_current_weather","args":"{\"city\": \"Paris\"}"},{"id":"call_lC6GgT8JW2ygJqWEM2wcohIz","type":"function","name":"get_current_weather","args":"{\"city\": \"London\"}"}]}]`,
-			formatter: FormatterText,
-			warnings:  []string{"bare user text, role assumed", "output formatted as openai.chat, input as text"},
-			wantInput: `[
-			  {
-			    "role": "user",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "What's the weather in Paris and in London? Use the tool for each."
-			      }
-			    ]
-			  }
-			]`,
-			wantOutput: `[
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "tool_call",
-			        "name": "get_current_weather",
-			        "id": "call_xP33RT5exgBrNsvsWQZwiY9D",
-			        "arguments": {
-			          "city": "Paris"
-			        }
-			      },
-			      {
-			        "type": "tool_call",
-			        "name": "get_current_weather",
-			        "id": "call_lC6GgT8JW2ygJqWEM2wcohIz",
-			        "arguments": {
-			          "city": "London"
-			        }
-			      }
-			    ]
-			  }
-			]`,
-		},
-		{
-			// openinference capture, input.value of the ChatCompletion span
-			name:      "FileByID_FilePart",
-			input:     `{"model": "gpt-4o-mini", "messages": [{"role": "user", "content": [{"type": "text", "text": "Summarise this document in one sentence."}, {"type": "file", "file": {"file_id": "file-6F2ksmvXxt4VdoqmHRw6kL"}}]}], "max_tokens": 60}`,
-			output:    `{"id":"chatcmpl-DktFileCapture0001","object":"chat.completion","model":"gpt-4o-mini-2024-07-18","choices":[{"index":0,"finish_reason":"stop","logprobs":null,"message":{"role":"assistant","content":"The document is a short PDF about dragons.","refusal":null,"annotations":[]}}]}`,
-			formatter: FormatterOpenAIChat,
-			wantInput: `[
-			  {
-			    "role": "user",
-			    "parts": [
-			      {"type": "text", "content": "Summarise this document in one sentence."},
-			      {"type": "file", "modality": "document", "file_id": "file-6F2ksmvXxt4VdoqmHRw6kL", "mime_type": "application/pdf"}
-			    ]
-			  }
-			]`,
-			wantOutput: `[
-			  {
-			    "role": "assistant",
-			    "parts": [{"type": "text", "content": "The document is a short PDF about dragons."}],
-			    "finish_reason": "stop"
-			  }
-			]`,
-		},
-		{
-			// openinference capture, input.value of the ChatCompletion span
-			name:      "FileInline_BlobPart",
-			input:     `{"model": "gpt-4o-mini", "messages": [{"role": "user", "content": [{"type": "text", "text": "Summarise this document in one sentence."}, {"type": "file", "file": {"filename": "draconomicon.pdf", "file_data": "data:application/pdf;base64,JVBERi0xLjQKMSAwIG9iajw8L1R5cGUvQ2F0YWxvZy9QYWdlcyAyIDAgUj4+ZW5kb2JqCjIgMCBvYmo8PC9UeXBlL1BhZ2VzL0tpZHNbXS9Db3VudCAwPj5lbmRvYmoKdHJhaWxlcjw8L1Jvb3QgMSAwIFI+PgolJUVPRgo="}}]}], "max_tokens": 60}`,
-			formatter: FormatterOpenAIChat,
-			wantInput: `[
-			  {
-			    "role": "user",
-			    "parts": [
-			      {"type": "text", "content": "Summarise this document in one sentence."},
-			      {"type": "blob", "modality": "document", "mime_type": "application/pdf", "content": "JVBERi0xLjQKMSAwIG9iajw8L1R5cGUvQ2F0YWxvZy9QYWdlcyAyIDAgUj4+ZW5kb2JqCjIgMCBvYmo8PC9UeXBlL1BhZ2VzL0tpZHNbXS9Db3VudCAwPj5lbmRvYmoKdHJhaWxlcjw8L1Jvb3QgMSAwIFI+PgolJUVPRgo="}
-			    ]
-			  }
-			]`,
-			wantOutput: `[]`,
-		},
-		{
-			name:      "ResponseWithScalarChoice_KeptAsGeneric",
-			output:    `{"choices":["oops",{"finish_reason":"stop","index":1,"message":{"role":"assistant","content":"hi"}}]}`,
-			formatter: FormatterOpenAIChat,
-			wantInput: `[]`,
-			wantOutput: `[
-			  {"role": "", "parts": [{"type": "generic", "content": "oops"}]},
-			  {"role": "assistant", "parts": [{"type": "text", "content": "hi"}], "finish_reason": "stop"}
-			]`,
-		},
-	})
-}

pkg/types/aiobservabilitytypes/message_format_semconv.go

@@ -1,68 +0,0 @@
-package aiobservabilitytypes
-
-import (
-	"encoding/json"
-	"maps"
-)
-
-// Format: the OTel shape itself, [{role, parts}].
-// Written by: litellm, langchain, openllmetry, portkey, traceloop LLM spans.
-// Decoding is the genai types. Repairs: "text" used for "content" on text parts; OpenAI content
-// blocks left inside parts.
-// Not yet: "thinking" for "reasoning"; "result" or "output" for "response" on tool call responses.
-
-// semconv decodes messages that already follow the schema through the genai types. A part of a
-// type the schema does not name is a provider content block, which contentPart converts.
-func (f *formatting) semconv(list []any) OutputMessages {
-	data, err := json.Marshal(semconvTextKey(list))
-	if err != nil {
-		f.warn("messages could not be encoded: %s", err)
-		return OutputMessages{genericMessage(list)}
-	}
-	var msgs OutputMessages
-	if err := json.Unmarshal(data, &msgs); err != nil {
-		f.warn("messages do not follow the schema: %s", err)
-		return OutputMessages{genericMessage(list)}
-	}
-	for i := range msgs {
-		if msgs[i].Parts == nil {
-			msgs[i].Parts = Parts{}
-		}
-		for j, p := range msgs[i].Parts {
-			if block, ok := p.Value.(GenericPart); ok {
-				msgs[i].Parts[j] = contentPart(map[string]any(block))
-			}
-		}
-	}
-	return msgs
-}
-
-// semconvTextKey copies the text and reasoning parts some SDKs write with "text" in place of the
-// schema's "content". The input is left untouched, it is also the span's raw attribute.
-func semconvTextKey(list []any) []any {
-	out := make([]any, 0, len(list))
-	for _, item := range list {
-		m, ok := item.(map[string]any)
-		parts, hasParts := m["parts"].([]any)
-		if !ok || !hasParts {
-			out = append(out, item)
-			continue
-		}
-		fixedParts := make([]any, 0, len(parts))
-		for _, p := range parts {
-			part, ok := p.(map[string]any)
-			typ := stringOf(part["type"])
-			if ok && (typ == "text" || typ == "reasoning") && part["content"] == nil && part["text"] != nil {
-				fixed := maps.Clone(part)
-				fixed["content"] = fixed["text"]
-				delete(fixed, "text")
-				p = fixed
-			}
-			fixedParts = append(fixedParts, p)
-		}
-		msg := maps.Clone(m)
-		msg["parts"] = fixedParts
-		out = append(out, msg)
-	}
-	return out
-}

pkg/types/aiobservabilitytypes/message_format_semconv_test.go

@@ -1,163 +0,0 @@
-package aiobservabilitytypes
-
-import "testing"
-
-// Captured cases are gen_ai.input.messages and gen_ai.output.messages as the collector stored
-// them for the SigNoz/scripts static-telemetry-generator captures.
-func TestFormat_Semconv(t *testing.T) {
-	runFormatCases(t, []formatCase{
-		{
-			// litellm capture, litellm_request span
-			name:      "SemconvMessages_DecodedUnchanged",
-			input:     `[{"role": "system", "parts": [{"type": "text", "content": "You are a concise assistant."}]}, {"role": "user", "parts": [{"type": "text", "content": "Give me a one-line definition of observability."}]}]`,
-			output:    `[{"role": "assistant", "parts": [{"type": "text", "content": "Observability is the ability to understand the internal state of a system based on external outputs, enabling effective monitoring and troubleshooting."}], "finish_reason": "stop"}]`,
-			formatter: FormatterSemconv,
-			wantInput: `[
-			  {
-			    "role": "system",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "You are a concise assistant."
-			      }
-			    ]
-			  },
-			  {
-			    "role": "user",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "Give me a one-line definition of observability."
-			      }
-			    ]
-			  }
-			]`,
-			wantOutput: `[
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "Observability is the ability to understand the internal state of a system based on external outputs, enabling effective monitoring and troubleshooting."
-			      }
-			    ],
-			    "finish_reason": "stop"
-			  }
-			]`,
-		},
-		{
-			// litellm capture, vision call; base64 trimmed
-			name:      "SemconvTextSpelledAsTextKey_ContentFilled_ImageBlockBecomesBlob",
-			input:     `[{"role": "user", "parts": [{"type": "text", "text": "What animal is in this image? One sentence."}, {"type": "image_url", "image_url": {"url": "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBD"}}]}]`,
-			output:    `[{"role": "assistant", "parts": [{"type": "text", "content": "The animal in the image is a cartoon duck."}], "finish_reason": "stop"}]`,
-			formatter: FormatterSemconv,
-			wantInput: `[
-			  {
-			    "role": "user",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "What animal is in this image? One sentence."
-			      },
-			      {
-			        "type": "blob",
-			        "modality": "image",
-			        "content": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBD",
-			        "mime_type": "image/jpeg"
-			      }
-			    ]
-			  }
-			]`,
-			wantOutput: `[
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "The animal in the image is a cartoon duck."
-			      }
-			    ],
-			    "finish_reason": "stop"
-			  }
-			]`,
-		},
-		{
-			// langchain capture, ChatOpenAI.chat span
-			name:      "SemconvToolCallTurn_DecodedUnchanged",
-			input:     `[{"role": "user", "parts": [{"type": "text", "content": "Search for SigNoz AI observability docs, then tell me the weather in Bengaluru."}]}, {"role": "assistant", "parts": [{"type": "tool_call", "id": "call_jL9UhSdUC9wWn2qfWwOjpzFd", "name": "search_web", "arguments": {"query": "SigNoz AI observability documentation"}}, {"type": "tool_call", "id": "call_nkVdZ8xX8d17HtmVddbUgJUc", "name": "get_weather", "arguments": {"city": "Bengaluru"}}]}, {"role": "tool", "parts": [{"type": "tool_call_response", "id": "call_jL9UhSdUC9wWn2qfWwOjpzFd", "response": "{\"query\": \"SigNoz AI observability documentation\", \"results\": [{\"title\": \"SigNoz docs: AI observability\", \"snippet\": \"...\"}, {\"title\": \"OpenTelemetry GenAI conventions\", \"snippet\": \"...\"}]}"}]}, {"role": "tool", "parts": [{"type": "tool_call_response", "id": "call_nkVdZ8xX8d17HtmVddbUgJUc", "response": "{\"city\": \"Bengaluru\", \"temp_c\": 18, \"summary\": \"Clear\"}"}]}]`,
-			output:    `[{"role": "assistant", "parts": [{"type": "text", "content": "I found some results for the SigNoz AI observability documentation. Here's one of the titles you might be interested in:\n\n- **SigNoz docs: AI observability**\n\nUnfortunately, a snippet was not provided, but you can look it up directly for more details.\n\nAs for the weather in Bengaluru, it's currently 18\u00b0C and clear."}], "finish_reason": "stop"}]`,
-			formatter: FormatterSemconv,
-			wantInput: `[
-			  {
-			    "role": "user",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "Search for SigNoz AI observability docs, then tell me the weather in Bengaluru."
-			      }
-			    ]
-			  },
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "tool_call",
-			        "name": "search_web",
-			        "id": "call_jL9UhSdUC9wWn2qfWwOjpzFd",
-			        "arguments": {
-			          "query": "SigNoz AI observability documentation"
-			        }
-			      },
-			      {
-			        "type": "tool_call",
-			        "name": "get_weather",
-			        "id": "call_nkVdZ8xX8d17HtmVddbUgJUc",
-			        "arguments": {
-			          "city": "Bengaluru"
-			        }
-			      }
-			    ]
-			  },
-			  {
-			    "role": "tool",
-			    "parts": [
-			      {
-			        "type": "tool_call_response",
-			        "response": "{\"query\": \"SigNoz AI observability documentation\", \"results\": [{\"title\": \"SigNoz docs: AI observability\", \"snippet\": \"...\"}, {\"title\": \"OpenTelemetry GenAI conventions\", \"snippet\": \"...\"}]}",
-			        "id": "call_jL9UhSdUC9wWn2qfWwOjpzFd"
-			      }
-			    ]
-			  },
-			  {
-			    "role": "tool",
-			    "parts": [
-			      {
-			        "type": "tool_call_response",
-			        "response": "{\"city\": \"Bengaluru\", \"temp_c\": 18, \"summary\": \"Clear\"}",
-			        "id": "call_nkVdZ8xX8d17HtmVddbUgJUc"
-			      }
-			    ]
-			  }
-			]`,
-			wantOutput: `[
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "I found some results for the SigNoz AI observability documentation. Here's one of the titles you might be interested in:\n\n- **SigNoz docs: AI observability**\n\nUnfortunately, a snippet was not provided, but you can look it up directly for more details.\n\nAs for the weather in Bengaluru, it's currently 18°C and clear."
-			      }
-			    ],
-			    "finish_reason": "stop"
-			  }
-			]`,
-		},
-		{
-			name:       "StructuredSemconvValue_DecodedWithoutJSONString",
-			input:      []any{map[string]any{"role": "user", "parts": []any{map[string]any{"type": "text", "content": "hi"}}}},
-			formatter:  FormatterSemconv,
-			wantInput:  `[{"role": "user", "parts": [{"type": "text", "content": "hi"}]}]`,
-			wantOutput: `[]`,
-		},
-	})
-}

pkg/types/aiobservabilitytypes/message_format_test.go

@@ -1,101 +0,0 @@
-package aiobservabilitytypes
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-type formatCase struct {
-	name       string
-	input      any
-	output     any
-	formatter  string
-	warnings   []string
-	wantInput  string
-	wantOutput string
-}
-
-func runFormatCases(t *testing.T, testCases []formatCase) {
-	t.Helper()
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			formatted := FormatMessages(testCase.input, testCase.output)
-			assert.Equal(t, testCase.formatter, formatted.Formatter)
-			assert.Equal(t, append([]string{}, testCase.warnings...), formatted.Warnings)
-
-			input, err := json.Marshal(formatted.Input)
-			require.NoError(t, err)
-			assert.JSONEq(t, testCase.wantInput, string(input))
-			output, err := json.Marshal(formatted.Output)
-			require.NoError(t, err)
-			assert.JSONEq(t, testCase.wantOutput, string(output))
-		})
-	}
-}
-
-func TestFormat(t *testing.T) {
-	runFormatCases(t, []formatCase{
-		{
-			// bifrost-gateway capture, HTTP span
-			name:  "BareStrings_RolesAssumed_WarnsPerSide",
-			input: `A bat and a ball cost $1.10. The bat costs $1 more than the ball. How much is the ball?`,
-			output: `Let the cost of the ball be x dollars. Then the bat costs x + $1.00. According to the problem:
-
-  x + (x + 1.00) = 1.10
-
-Combine like terms:
-
-  2x + 1.00 = 1.10
-
-Subtract 1.00 from both sides:
-
-  2x = 0.10
-
-Divide by 2:
-
-  x = 0.05
-
-So, the ball costs 5 cents.`,
-			formatter: FormatterText,
-			warnings:  []string{"bare user text, role assumed", "bare assistant text, role assumed"},
-			wantInput: `[
-			  {
-			    "role": "user",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "A bat and a ball cost $1.10. The bat costs $1 more than the ball. How much is the ball?"
-			      }
-			    ]
-			  }
-			]`,
-			wantOutput: `[
-			  {
-			    "role": "assistant",
-			    "parts": [
-			      {
-			        "type": "text",
-			        "content": "Let the cost of the ball be x dollars. Then the bat costs x + $1.00. According to the problem:\n\n  x + (x + 1.00) = 1.10\n\nCombine like terms:\n\n  2x + 1.00 = 1.10\n\nSubtract 1.00 from both sides:\n\n  2x = 0.10\n\nDivide by 2:\n\n  x = 0.05\n\nSo, the ball costs 5 cents."
-			      }
-			    ]
-			  }
-			]`,
-		},
-		{
-			name:       "UnrecognisedObject_GenericPart_Warns",
-			input:      `{"city": "Paris", "temp_c": 21}`,
-			formatter:  FormatterGeneric,
-			warnings:   []string{"message format not recognised, kept as generic"},
-			wantInput:  `[{"role": "", "parts": [{"type": "generic", "content": "{\"city\":\"Paris\",\"temp_c\":21}"}]}]`,
-			wantOutput: `[]`,
-		},
-		{
-			name:       "NoAttributes_EmptyListsNoFormatter",
-			wantInput:  `[]`,
-			wantOutput: `[]`,
-		},
-	})
-}

pkg/types/aiobservabilitytypes/message_part.go

@@ -1,194 +0,0 @@
-package aiobservabilitytypes
-
-import (
-	"encoding/json"
-
-	"github.com/swaggest/jsonschema-go"
-
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-var (
-	PartTypeText                   = PartType{valuer.NewString("text")}
-	PartTypeToolCall               = PartType{valuer.NewString("tool_call")}
-	PartTypeToolCallResponse       = PartType{valuer.NewString("tool_call_response")}
-	PartTypeServerToolCall         = PartType{valuer.NewString("server_tool_call")}
-	PartTypeServerToolCallResponse = PartType{valuer.NewString("server_tool_call_response")}
-	PartTypeBlob                   = PartType{valuer.NewString("blob")}
-	PartTypeFile                   = PartType{valuer.NewString("file")}
-	PartTypeURI                    = PartType{valuer.NewString("uri")}
-	PartTypeReasoning              = PartType{valuer.NewString("reasoning")}
-	PartTypeCompaction             = PartType{valuer.NewString("compaction")}
-)
-
-var (
-	_ jsonschema.OneOfExposer = Part{}
-	_ jsonschema.Preparer     = Part{}
-)
-
-// partVariants are the part types the schema names; any other type decodes as GenericPart.
-// schemaRef is the component in the generated OpenAPI spec, for the discriminator mapping.
-var partVariants = []partVariant{
-	{typ: PartTypeText, decode: decodePart[TextPart], schema: TextPart{}, schemaRef: "#/components/schemas/AiobservabilitytypesTextPart"},
-	{typ: PartTypeToolCall, decode: decodePart[ToolCallRequestPart], schema: ToolCallRequestPart{}, schemaRef: "#/components/schemas/AiobservabilitytypesToolCallRequestPart"},
-	{typ: PartTypeToolCallResponse, decode: decodePart[ToolCallResponsePart], schema: ToolCallResponsePart{}, schemaRef: "#/components/schemas/AiobservabilitytypesToolCallResponsePart"},
-	{typ: PartTypeServerToolCall, decode: decodePart[ServerToolCallPart], schema: ServerToolCallPart{}, schemaRef: "#/components/schemas/AiobservabilitytypesServerToolCallPart"},
-	{typ: PartTypeServerToolCallResponse, decode: decodePart[ServerToolCallResponsePart], schema: ServerToolCallResponsePart{}, schemaRef: "#/components/schemas/AiobservabilitytypesServerToolCallResponsePart"},
-	{typ: PartTypeBlob, decode: decodePart[BlobPart], schema: BlobPart{}, schemaRef: "#/components/schemas/AiobservabilitytypesBlobPart"},
-	{typ: PartTypeFile, decode: decodePart[FilePart], schema: FilePart{}, schemaRef: "#/components/schemas/AiobservabilitytypesFilePart"},
-	{typ: PartTypeURI, decode: decodePart[UriPart], schema: UriPart{}, schemaRef: "#/components/schemas/AiobservabilitytypesUriPart"},
-	{typ: PartTypeReasoning, decode: decodePart[ReasoningPart], schema: ReasoningPart{}, schemaRef: "#/components/schemas/AiobservabilitytypesReasoningPart"},
-	{typ: PartTypeCompaction, decode: decodePart[CompactionPart], schema: CompactionPart{}, schemaRef: "#/components/schemas/AiobservabilitytypesCompactionPart"},
-}
-
-type PartType struct{ valuer.String }
-
-// Part is one message part, the schema's anyOf discriminated on "type". Value holds the part
-// struct for that type and is encoded as the part itself.
-type Part struct {
-	Value any `json:"-"`
-}
-
-type Parts []Part
-
-type TextPart struct {
-	Type    PartType `json:"type" required:"true"`
-	Content string   `json:"content" required:"true"`
-}
-
-type ToolCallRequestPart struct {
-	Type      PartType `json:"type" required:"true"`
-	Name      string   `json:"name" required:"true"`
-	ID        *string  `json:"id,omitempty"`
-	Arguments any      `json:"arguments,omitempty"`
-}
-
-// ToolCallResponsePart carries a client tool result, or a built-in tool outcome.
-type ToolCallResponsePart struct {
-	Type     PartType `json:"type" required:"true"`
-	Response any      `json:"response" required:"true" nullable:"true"`
-	ID       *string  `json:"id,omitempty"`
-}
-
-// ServerToolCallPart is a tool the provider ran itself, such as code_interpreter or web_search.
-type ServerToolCallPart struct {
-	Type           PartType              `json:"type" required:"true"`
-	Name           string                `json:"name" required:"true"`
-	ID             *string               `json:"id,omitempty"`
-	ServerToolCall GenericServerToolCall `json:"server_tool_call" required:"true" nullable:"false"`
-}
-
-// GenericServerToolCall is the provider's own call object, {type, ...} with any other keys.
-type GenericServerToolCall map[string]any
-
-type ServerToolCallResponsePart struct {
-	Type                   PartType                      `json:"type" required:"true"`
-	ID                     *string                       `json:"id,omitempty"`
-	ServerToolCallResponse GenericServerToolCallResponse `json:"server_tool_call_response" required:"true" nullable:"false"`
-}
-
-// GenericServerToolCallResponse is the provider's own response object, {type, ...} with any other keys.
-type GenericServerToolCallResponse map[string]any
-
-// BlobPart is inline data; Content is base64.
-type BlobPart struct {
-	Type     PartType `json:"type" required:"true"`
-	Modality Modality `json:"modality" required:"true"`
-	Content  string   `json:"content" required:"true"`
-	MimeType *string  `json:"mime_type,omitempty"`
-}
-
-// FilePart references a file uploaded to the provider.
-type FilePart struct {
-	Type     PartType `json:"type" required:"true"`
-	Modality Modality `json:"modality" required:"true"`
-	FileID   string   `json:"file_id" required:"true"`
-	MimeType *string  `json:"mime_type,omitempty"`
-}
-
-// UriPart references external data; a data: URL belongs in BlobPart instead.
-type UriPart struct {
-	Type     PartType `json:"type" required:"true"`
-	Modality Modality `json:"modality" required:"true"`
-	URI      string   `json:"uri" required:"true"`
-	MimeType *string  `json:"mime_type,omitempty"`
-}
-
-type ReasoningPart struct {
-	Type    PartType `json:"type" required:"true"`
-	Content string   `json:"content" required:"true"`
-}
-
-// CompactionPart is compacted conversation state; Content is the summary when it is not encrypted.
-type CompactionPart struct {
-	Type    PartType `json:"type" required:"true"`
-	ID      *string  `json:"id,omitempty"`
-	Content *string  `json:"content,omitempty"`
-}
-
-// GenericPart keeps a part of any other type as sent.
-type GenericPart map[string]any
-
-func (Part) JSONSchemaOneOf() []any {
-	oneOf := make([]any, 0, len(partVariants)+1)
-	for _, variant := range partVariants {
-		oneOf = append(oneOf, variant.schema)
-	}
-	return append(oneOf, GenericPart{})
-}
-
-func (Part) PrepareJSONSchema(schema *jsonschema.Schema) error {
-	if schema.ExtraProperties == nil {
-		schema.ExtraProperties = map[string]any{}
-	}
-	mapping := make(map[string]string, len(partVariants))
-	for _, variant := range partVariants {
-		mapping[variant.typ.StringValue()] = variant.schemaRef
-	}
-	schema.ExtraProperties["x-signoz-discriminator"] = map[string]any{
-		"propertyName": "type",
-		"mapping":      mapping,
-	}
-	return nil
-}
-
-func (p Part) MarshalJSON() ([]byte, error) {
-	return json.Marshal(p.Value)
-}
-
-func (p *Part) UnmarshalJSON(data []byte) error {
-	var head struct {
-		Type PartType `json:"type"`
-	}
-	if err := json.Unmarshal(data, &head); err != nil {
-		return err
-	}
-	decode := decodePart[GenericPart]
-	for _, variant := range partVariants {
-		if variant.typ == head.Type {
-			decode = variant.decode
-			break
-		}
-	}
-	value, err := decode(data)
-	if err != nil {
-		return err
-	}
-	p.Value = value
-	return nil
-}
-
-type partVariant struct {
-	typ       PartType
-	decode    func(data []byte) (any, error)
-	schema    any
-	schemaRef string
-}
-
-func decodePart[T any](data []byte) (any, error) {
-	var value T
-	if err := json.Unmarshal(data, &value); err != nil {
-		return nil, err
-	}
-	return value, nil
-}