diff --git a/webapp/packages/chat-sdk/src/common/type.ts b/webapp/packages/chat-sdk/src/common/type.ts
index b513f1f68..924d6a6d0 100644
--- a/webapp/packages/chat-sdk/src/common/type.ts
+++ b/webapp/packages/chat-sdk/src/common/type.ts
@@ -91,6 +91,7 @@ export type ChatContextType = {
   elementMatches: any[];
   nativeQuery: boolean;
   queryMode: string;
+  queryType: 'METRIC' | 'TAG' | 'OTHER'; 
   dimensionFilters: FilterItemType[];
   properties: any;
   sqlInfo: SqlInfoType;
diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx
index b4cc47f66..de1e2a896 100644
--- a/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx
+++ b/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx
@@ -94,6 +94,7 @@ const ParseTip: React.FC<Props> = ({
     metrics,
     aggType,
     queryMode,
+    queryType,
     properties,
     entity,
     elementMatches,
@@ -151,6 +152,14 @@ const ParseTip: React.FC<Props> = ({
                 <div className={itemValueClass}>{modelName}</div>
               </div>
             )}
+            {(queryType === 'METRIC' || queryType === 'TAG') && (
+              <div className={`${prefixCls}-tip-item`}>
+                <div className={`${prefixCls}-tip-item-name`}>查询模式：</div>
+                <div className={itemValueClass}>
+                  {queryType === 'METRIC' ? '指标模式' : '标签模式'}
+                </div>
+              </div>
+            )}
             {!queryMode?.includes('ENTITY') &&
               metrics &&
               metrics.length > 0 &&
diff --git a/webapp/packages/chat-sdk/src/components/DrillDownDimensions/DimensionSection.tsx b/webapp/packages/chat-sdk/src/components/DrillDownDimensions/DimensionSection.tsx
index 2f71f0f5e..6a9303758 100644
--- a/webapp/packages/chat-sdk/src/components/DrillDownDimensions/DimensionSection.tsx
+++ b/webapp/packages/chat-sdk/src/components/DrillDownDimensions/DimensionSection.tsx
@@ -25,6 +25,10 @@ const DimensionSection: React.FC<Props> = ({
 
   const defaultDimensions = dimensions.slice(0, DEFAULT_DIMENSION_COUNT);
 
+  if (defaultDimensions.length === 0) {
+    return null;
+  }
+
   return (
     <div className={`${prefixCls}-section`}>
       <div className={`${prefixCls}-title`}>{isSecondDrillDown ? '二级' : '推荐'}下钻维度：</div>
diff --git a/webapp/packages/supersonic-fe/src/app.tsx b/webapp/packages/supersonic-fe/src/app.tsx
index 76775a606..1d42b6325 100644
--- a/webapp/packages/supersonic-fe/src/app.tsx
+++ b/webapp/packages/supersonic-fe/src/app.tsx
@@ -126,10 +126,10 @@ export const layout: RunTimeLayoutConfig = (params) => {
     rightContentRender: () => <RightContent />,
     disableContentMargin: true,
     menuHeaderRender: undefined,
-    childrenRender: (dom) => {
+    childrenRender: (dom: any) => {
       return (
         <div
-          style={{ height: location.pathname.includes('chat') ? 'calc(100vh - 48px)' : undefined }}
+          style={{ height: location.pathname.includes('chat') ? 'calc(100vh - 56px)' : undefined }}
         >
           {dom}
           {history.location.pathname !== '/chat' && !isMobile && (
diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx
index 9872713c3..c415b548b 100644
--- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx
@@ -241,7 +241,7 @@ const ToolModal: React.FC<Props> = ({ editTool, onSaveTool, onCancel }) => {
           </FormItem>
         )}
         {toolType === AgentToolTypeEnum.RULE && (
-          <FormItem name="queryModes" label="查询模式">
+          <FormItem name="queryTypes" label="查询模式">
             <Select
               placeholder="请选择查询模式"
               options={QUERY_MODE_LIST}
diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/style.less b/webapp/packages/supersonic-fe/src/pages/Agent/style.less
index 41013c9de..b4ac144e0 100644
--- a/webapp/packages/supersonic-fe/src/pages/Agent/style.less
+++ b/webapp/packages/supersonic-fe/src/pages/Agent/style.less
@@ -1,11 +1,11 @@
 .agent {
-  height: calc(100vh - 48px);
+  height: calc(100vh - 56px);
 }
 
 .agentsSection {
   padding: 20px 40px;
   background: #fff;
-  height: calc(100vh - 48px);
+  height: calc(100vh - 56px);
 
   .sectionTitle {
     font-size: 24px;
diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts
index 7da10cd56..9c47831a3 100644
--- a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts
+++ b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts
@@ -11,17 +11,6 @@ export enum AgentToolTypeEnum {
   INTERPRET = 'INTERPRET'
 }
 
-export enum QueryModeEnum {
-  ENTITY_DETAIL = 'ENTITY_DETAIL',
-  ENTITY_LIST_FILTER = 'ENTITY_LIST_FILTER',
-  ENTITY_ID = 'ENTITY_ID',
-  METRIC_ENTITY = 'METRIC_ENTITY',
-  METRIC_FILTER = 'METRIC_FILTER',
-  METRIC_GROUPBY = 'METRIC_GROUPBY',
-  METRIC_MODEL = 'METRIC_MODEL',
-  METRIC_ORDERBY = 'METRIC_ORDERBY'
-}
-
 export const AGENT_TOOL_TYPE_LIST = [
   {
     label: '规则语义解析',
@@ -41,38 +30,19 @@ export const AGENT_TOOL_TYPE_LIST = [
   },
 ]
 
+export enum QueryModeEnum {
+  METRIC = 'METRIC',
+  TAG = 'TAG'
+}
+
 export const QUERY_MODE_LIST = [
   {
-    label: '实体明细(查询维度信息)',
-    value: QueryModeEnum.ENTITY_DETAIL
+    label: '指标模式',
+    value: QueryModeEnum.METRIC
   },
   {
-    label: '实体圈选',
-    value: QueryModeEnum.ENTITY_LIST_FILTER
-  },
-  {
-    label: '实体查询(按ID查询)',
-    value: QueryModeEnum.ENTITY_ID
-  },
-  {
-    label: '指标查询(带实体)',
-    value: QueryModeEnum.METRIC_ENTITY
-  },
-  {
-    label: '指标查询(带条件)',
-    value: QueryModeEnum.METRIC_FILTER
-  },
-  {
-    label: '指标查询(按维度分组)',
-    value: QueryModeEnum.METRIC_GROUPBY
-  },
-  {
-    label: '指标查询(不带条件)',
-    value: QueryModeEnum.METRIC_MODEL
-  },
-  {
-    label: '按指标排序',
-    value: QueryModeEnum.METRIC_ORDERBY
+    label: '标签模式',
+    value: QueryModeEnum.TAG
   }
 ];