From 05c247c060f2ab0369b2e47d233032a357134055 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Tue, 9 Dec 2025 20:10:39 +0300
Subject: [PATCH 01/26] feat: specify resource pools when launching a query

---
 .../QuerySettingsDialog.tsx                   | 49 ++++++++++++++
 .../Query/QuerySettingsDialog/constants.ts    |  3 +
 .../Query/QuerySettingsDialog/i18n/en.json    |  1 +
 .../Query/QuerySettingsDialog/i18n/ru.json    |  1 +
 .../__test__/prepareQueryWithPragmas.test.ts  | 30 ++++++++-
 src/store/reducers/query/query.ts             | 64 +++++++++++++++++--
 src/store/reducers/query/utils.ts             | 20 ++++++
 src/utils/query.ts                            |  2 +
 8 files changed, 164 insertions(+), 6 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index c8ab3737e1..362fbbf43a 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -5,6 +5,7 @@ import {zodResolver} from '@hookform/resolvers/zod';
 import {Controller, useForm} from 'react-hook-form';
 
 import {useTracingLevelOptionAvailable} from '../../../../store/reducers/capabilities/hooks';
+import {queryApi} from '../../../../store/reducers/query/query';
 import {
     selectQueryAction,
     setQueryAction,
@@ -20,6 +21,7 @@ import {
     useTypedSelector,
 } from '../../../../utils/hooks';
 import {QUERY_MODES, querySettingsValidationSchema} from '../../../../utils/query';
+import {useCurrentSchema} from '../../TenantContext';
 
 import {QuerySettingsSelect} from './QuerySettingsSelect';
 import {QuerySettingsTimeout} from './QuerySettingsTimeout';
@@ -86,6 +88,14 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
     const [useShowPlanToSvg] = useSetting<boolean>(SETTING_KEYS.USE_SHOW_PLAN_SVG);
     const enableTracingLevel = useTracingLevelOptionAvailable();
     const [isQueryStreamingEnabled] = useQueryStreamingSetting();
+    const {database} = useCurrentSchema();
+    const {data: resourcePools = [], isLoading: isResourcePoolsLoading} =
+        queryApi.useGetResourcePoolsQuery(
+            {database},
+            {
+                skip: !database,
+            },
+        );
 
     const timeout = watch('timeout');
     const queryMode = watch('queryMode');
@@ -120,6 +130,45 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                         />
                     </div>
                 </Flex>
+                <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
+                    <label htmlFor="resourcePool" className={b('field-title')}>
+                        {QUERY_SETTINGS_FIELD_SETTINGS.resourcePool.title}
+                    </label>
+                    <div className={b('control-wrapper')}>
+                        <Controller
+                            name="resourcePool"
+                            control={control}
+                            render={({field}) => (
+                                <QuerySettingsSelect
+                                    id="resourcePool"
+                                    setting={(field.value || '') as never}
+                                    disabled={
+                                        isResourcePoolsLoading ||
+                                        !resourcePools.length ||
+                                        queryMode === QUERY_MODES.pg
+                                    }
+                                    onUpdateSetting={(value) => field.onChange(value || undefined)}
+                                    settingOptions={[
+                                        {
+                                            value: '' as never,
+                                            content: `${QUERY_SETTINGS_FIELD_SETTINGS.resourcePool.title}${i18n('description.default')}`,
+                                            text: '',
+                                            isDefault: true,
+                                        },
+                                        ...(resourcePools.map(
+                                            (name) =>
+                                                ({
+                                                    value: name,
+                                                    content: name,
+                                                    text: name,
+                                                }) as never,
+                                        ) as never[]),
+                                    ]}
+                                />
+                            )}
+                        />
+                    </div>
+                </Flex>
                 {enableTracingLevel && (
                     <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
                         <label htmlFor="tracingLevel" className={b('field-title')}>
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts b/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts
index ef71db017b..93cdeffe27 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts
@@ -157,4 +157,7 @@ export const QUERY_SETTINGS_FIELD_SETTINGS = {
     pragmas: {
         title: formI18n('form.pragmas'),
     },
+    resourcePool: {
+        title: formI18n('form.resource-pool'),
+    },
 } as const;
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
index 1cc858cf0c..ab838c4e65 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
@@ -9,6 +9,7 @@
   "form.output.chunk.max.size": "Output chunk max size",
   "form.output.chunk.max.size.bytes": "bytes",
   "form.pragmas": "Pragmas",
+  "form.resource-pool": "Resource pool",
   "button-done": "Save",
   "tooltip_plan-to-svg-statistics": "Statistics option is set to \"Full\" due to the enabled \"Execution plan\" experiment.\n To disable it, go to the \"Experiments\" section in the user settings.",
   "button-cancel": "Cancel",
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
index 302db60ba8..054e9e65db 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
@@ -9,6 +9,7 @@
   "form.output.chunk.max.size": "Максимальный размер чанка",
   "form.output.chunk.max.size.bytes": "байт",
   "form.pragmas": "Прагмы",
+  "form.resource-pool": "Пул ресурсов",
   "tooltip_plan-to-svg-statistics": "Опция статистики установлена в значение \"Full\" из-за включенного эксперимента \"Execution plan\".\n Чтобы отключить его, перейдите в раздел \"Experiments\" в настройках пользователя.",
   "button-done": "Готово",
   "button-cancel": "Отменить",
diff --git a/src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts b/src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts
index 1a46491ce3..02f34a9d1b 100644
--- a/src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts
+++ b/src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts
@@ -1,4 +1,4 @@
-import {prepareQueryWithPragmas} from '../utils';
+import {applyResourcePoolPragma, prepareQueryWithPragmas} from '../utils';
 
 describe('prepareQueryWithPragmas', () => {
     test('Should prepend pragmas correctly', () => {
@@ -27,4 +27,32 @@ describe('prepareQueryWithPragmas', () => {
 
         expect(expectedResult).toBe('PRAGMA OrderedColumns;\n\nSELECT * FROM table;');
     });
+
+    test('applyResourcePoolPragma should prepend pragma for yql syntax', () => {
+        const query = 'SELECT * FROM table;';
+        const result = applyResourcePoolPragma(query, 'olap', 'yql_v1');
+
+        expect(result).toBe('PRAGMA ResourcePool = "olap";\n\nSELECT * FROM table;');
+    });
+
+    test('applyResourcePoolPragma should not change query when no resource pool is set', () => {
+        const query = 'SELECT * FROM table;';
+        const result = applyResourcePoolPragma(query, undefined, 'yql_v1');
+
+        expect(result).toBe(query);
+    });
+
+    test('applyResourcePoolPragma should not change query for pg syntax', () => {
+        const query = 'SELECT * FROM table;';
+        const result = applyResourcePoolPragma(query, 'olap', 'pg');
+
+        expect(result).toBe(query);
+    });
+
+    test('applyResourcePoolPragma should not duplicate existing ResourcePool pragma', () => {
+        const query = 'PRAGMA ResourcePool = "analytics";\n\nSELECT * FROM table;';
+        const result = applyResourcePoolPragma(query, 'olap', 'yql_v1');
+
+        expect(result).toBe(query);
+    });
 });
diff --git a/src/store/reducers/query/query.ts b/src/store/reducers/query/query.ts
index bae3f22575..51b9e49363 100644
--- a/src/store/reducers/query/query.ts
+++ b/src/store/reducers/query/query.ts
@@ -5,8 +5,12 @@ import {TracingLevelNumber} from '../../../types/api/query';
 import type {QueryAction, QueryRequestParams, QuerySettings} from '../../../types/store/query';
 import type {StreamDataChunk} from '../../../types/store/streaming';
 import {loadFromSessionStorage, saveToSessionStorage} from '../../../utils';
-import {QUERY_EDITOR_CURRENT_QUERY_KEY, QUERY_EDITOR_DIRTY_KEY} from '../../../utils/constants';
-import {isQueryErrorResponse} from '../../../utils/query';
+import {
+    QUERY_EDITOR_CURRENT_QUERY_KEY,
+    QUERY_EDITOR_DIRTY_KEY,
+    QUERY_TECHNICAL_MARK,
+} from '../../../utils/constants';
+import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../utils/query';
 import {isNumeric} from '../../../utils/utils';
 import type {RootState} from '../../defaultStore';
 import {api} from '../api';
@@ -18,7 +22,11 @@ import {
     setStreamSession as setStreamSessionReducer,
 } from './streamingReducers';
 import type {QueryResult, QueryState, QueryStats} from './types';
-import {getActionAndSyntaxFromQueryMode, prepareQueryWithPragmas} from './utils';
+import {
+    applyResourcePoolPragma,
+    getActionAndSyntaxFromQueryMode,
+    prepareQueryWithPragmas,
+} from './utils';
 
 const rawQuery = loadFromSessionStorage(QUERY_EDITOR_CURRENT_QUERY_KEY);
 const input = typeof rawQuery === 'string' ? rawQuery : '';
@@ -119,6 +127,15 @@ export const {
     selectResultTab,
 } = slice.selectors;
 
+const getResourcePoolsQueryText = () => {
+    return `${QUERY_TECHNICAL_MARK}
+SELECT
+    Name
+FROM \`.sys/resource_pools\`
+ORDER BY Name
+`;
+};
+
 interface SendQueryParams extends QueryRequestParams {
     actionType?: QueryAction;
     queryId: string;
@@ -156,7 +173,11 @@ export const queryApi = api.injectEndpoints({
                     querySettings?.queryMode,
                 );
 
-                const finalQuery = prepareQueryWithPragmas(query, querySettings.pragmas);
+                const finalQuery = applyResourcePoolPragma(
+                    prepareQueryWithPragmas(query, querySettings.pragmas),
+                    querySettings.resourcePool,
+                    syntax,
+                );
 
                 try {
                     let streamDataChunkBatch: StreamDataChunk[] = [];
@@ -273,7 +294,11 @@ export const queryApi = api.injectEndpoints({
                     querySettings?.queryMode,
                 );
 
-                const finalQuery = prepareQueryWithPragmas(query, querySettings.pragmas);
+                const finalQuery = applyResourcePoolPragma(
+                    prepareQueryWithPragmas(query, querySettings.pragmas),
+                    querySettings.resourcePool,
+                    syntax,
+                );
 
                 try {
                     const timeStart = Date.now();
@@ -366,6 +391,35 @@ export const queryApi = api.injectEndpoints({
                 }
             },
         }),
+        getResourcePools: build.query<string[], {database: string}>({
+            queryFn: async ({database}, {signal}) => {
+                try {
+                    const response = await window.api.viewer.sendQuery(
+                        {
+                            query: getResourcePoolsQueryText(),
+                            database,
+                            action: 'execute-query',
+                            internal_call: true,
+                        },
+                        {signal, withRetries: true},
+                    );
+
+                    if (isQueryErrorResponse(response)) {
+                        return {error: response};
+                    }
+
+                    const data = parseQueryAPIResponse(response);
+                    const rows = data.resultSets?.[0]?.result || [];
+                    const pools = rows
+                        .map((row) => row && row.Name)
+                        .filter((name): name is string => Boolean(name));
+
+                    return {data: pools};
+                } catch (error) {
+                    return {error: error || 'Unauthorized'};
+                }
+            },
+        }),
     }),
     overrideExisting: 'throw',
 });
diff --git a/src/store/reducers/query/utils.ts b/src/store/reducers/query/utils.ts
index e034286f2c..69bf059c2a 100644
--- a/src/store/reducers/query/utils.ts
+++ b/src/store/reducers/query/utils.ts
@@ -78,3 +78,23 @@ export const prepareQueryWithPragmas = (query: string, pragmas?: string): string
 
     return `${trimmedPragmas}${separator}${query}`;
 };
+
+const RESOURCE_POOL_PRAGMA_REGEXP = /PRAGMA\s+ResourcePool\b/i;
+
+export const applyResourcePoolPragma = (
+    query: string,
+    resourcePool: string | undefined,
+    syntax: QuerySyntax,
+): string => {
+    if (!resourcePool || syntax !== 'yql_v1') {
+        return query;
+    }
+
+    if (RESOURCE_POOL_PRAGMA_REGEXP.test(query)) {
+        return query;
+    }
+
+    const pragmaLine = `PRAGMA ResourcePool = "${resourcePool}";`;
+
+    return `${pragmaLine}\n\n${query}`;
+};
diff --git a/src/utils/query.ts b/src/utils/query.ts
index 3b41801c98..089a325882 100644
--- a/src/utils/query.ts
+++ b/src/utils/query.ts
@@ -339,6 +339,7 @@ export const querySettingsValidationSchema = z.object({
     statisticsMode: statisticsModeSchema,
     tracingLevel: tracingLevelSchema,
     pragmas: z.string(),
+    resourcePool: z.string().optional(),
 });
 
 export const querySettingsRestoreSchema = z
@@ -360,5 +361,6 @@ export const querySettingsRestoreSchema = z
         statisticsMode: statisticsModeSchema.catch(DEFAULT_QUERY_SETTINGS.statisticsMode),
         tracingLevel: tracingLevelSchema.catch(DEFAULT_QUERY_SETTINGS.tracingLevel),
         pragmas: z.string().catch(DEFAULT_QUERY_SETTINGS.pragmas),
+        resourcePool: z.string().optional(),
     })
     .catch(DEFAULT_QUERY_SETTINGS);

From c78b9459e6d0a0ef5e5dd33aeb46923d98857f76 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Tue, 9 Dec 2025 23:06:03 +0300
Subject: [PATCH 02/26] fix: pass resouce_pool in params

---
 src/store/reducers/query/query.ts | 20 +++++---------------
 src/types/api/query.ts            |  1 +
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/store/reducers/query/query.ts b/src/store/reducers/query/query.ts
index 51b9e49363..a9086b89db 100644
--- a/src/store/reducers/query/query.ts
+++ b/src/store/reducers/query/query.ts
@@ -22,11 +22,7 @@ import {
     setStreamSession as setStreamSessionReducer,
 } from './streamingReducers';
 import type {QueryResult, QueryState, QueryStats} from './types';
-import {
-    applyResourcePoolPragma,
-    getActionAndSyntaxFromQueryMode,
-    prepareQueryWithPragmas,
-} from './utils';
+import {getActionAndSyntaxFromQueryMode, prepareQueryWithPragmas} from './utils';
 
 const rawQuery = loadFromSessionStorage(QUERY_EDITOR_CURRENT_QUERY_KEY);
 const input = typeof rawQuery === 'string' ? rawQuery : '';
@@ -173,11 +169,7 @@ export const queryApi = api.injectEndpoints({
                     querySettings?.queryMode,
                 );
 
-                const finalQuery = applyResourcePoolPragma(
-                    prepareQueryWithPragmas(query, querySettings.pragmas),
-                    querySettings.resourcePool,
-                    syntax,
-                );
+                const finalQuery = prepareQueryWithPragmas(query, querySettings.pragmas);
 
                 try {
                     let streamDataChunkBatch: StreamDataChunk[] = [];
@@ -217,6 +209,7 @@ export const queryApi = api.injectEndpoints({
                                 : undefined,
                             concurrent_results: DEFAULT_CONCURRENT_RESULTS || undefined,
                             base64,
+                            resource_pool: querySettings.resourcePool,
                         },
                         {
                             signal,
@@ -294,11 +287,7 @@ export const queryApi = api.injectEndpoints({
                     querySettings?.queryMode,
                 );
 
-                const finalQuery = applyResourcePoolPragma(
-                    prepareQueryWithPragmas(query, querySettings.pragmas),
-                    querySettings.resourcePool,
-                    syntax,
-                );
+                const finalQuery = prepareQueryWithPragmas(query, querySettings.pragmas);
 
                 try {
                     const timeStart = Date.now();
@@ -325,6 +314,7 @@ export const queryApi = api.injectEndpoints({
                                 : undefined,
                             query_id: queryId,
                             base64,
+                            resource_pool: querySettings.resourcePool,
                         },
                         {signal},
                     );
diff --git a/src/types/api/query.ts b/src/types/api/query.ts
index 14aa5185d3..25ef0d4419 100644
--- a/src/types/api/query.ts
+++ b/src/types/api/query.ts
@@ -328,6 +328,7 @@ export interface SendQueryParams<Action extends Actions> {
     limit_rows?: number;
     internal_call?: boolean;
     base64?: boolean;
+    resource_pool?: string;
 }
 
 export interface StreamQueryParams<Action extends Actions> extends SendQueryParams<Action> {

From 9c149439fc5d753ff83da50074a8f25d0f91dd45 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Tue, 9 Dec 2025 23:08:50 +0300
Subject: [PATCH 03/26] fix: nothing by default

---
 src/store/reducers/query/query.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/reducers/query/query.ts b/src/store/reducers/query/query.ts
index a9086b89db..385a331a92 100644
--- a/src/store/reducers/query/query.ts
+++ b/src/store/reducers/query/query.ts
@@ -209,7 +209,7 @@ export const queryApi = api.injectEndpoints({
                                 : undefined,
                             concurrent_results: DEFAULT_CONCURRENT_RESULTS || undefined,
                             base64,
-                            resource_pool: querySettings.resourcePool,
+                            resource_pool: querySettings.resourcePool || undefined,
                         },
                         {
                             signal,
@@ -314,7 +314,7 @@ export const queryApi = api.injectEndpoints({
                                 : undefined,
                             query_id: queryId,
                             base64,
-                            resource_pool: querySettings.resourcePool,
+                            resource_pool: querySettings.resourcePool || undefined,
                         },
                         {signal},
                     );

From 3016085367e07fa288df4023c29e097f3122e24e Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Tue, 9 Dec 2025 23:44:09 +0300
Subject: [PATCH 04/26] fix: default pool

---
 .../Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx  | 4 ++--
 src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json  | 1 +
 src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index 362fbbf43a..028bdc65c8 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -151,8 +151,8 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                     settingOptions={[
                                         {
                                             value: '' as never,
-                                            content: `${QUERY_SETTINGS_FIELD_SETTINGS.resourcePool.title}${i18n('description.default')}`,
-                                            text: '',
+                                            content: i18n('form.resource-pool.no-override'),
+                                            text: i18n('form.resource-pool.no-override'),
                                             isDefault: true,
                                         },
                                         ...(resourcePools.map(
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
index ab838c4e65..2b640dc8f6 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
@@ -10,6 +10,7 @@
   "form.output.chunk.max.size.bytes": "bytes",
   "form.pragmas": "Pragmas",
   "form.resource-pool": "Resource pool",
+  "form.resource-pool.no-override": "No pool override",
   "button-done": "Save",
   "tooltip_plan-to-svg-statistics": "Statistics option is set to \"Full\" due to the enabled \"Execution plan\" experiment.\n To disable it, go to the \"Experiments\" section in the user settings.",
   "button-cancel": "Cancel",
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
index 054e9e65db..f2a07f3710 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
@@ -10,6 +10,7 @@
   "form.output.chunk.max.size.bytes": "байт",
   "form.pragmas": "Прагмы",
   "form.resource-pool": "Пул ресурсов",
+  "form.resource-pool.no-override": "Без переопределения пула",
   "tooltip_plan-to-svg-statistics": "Опция статистики установлена в значение \"Full\" из-за включенного эксперимента \"Execution plan\".\n Чтобы отключить его, перейдите в раздел \"Experiments\" в настройках пользователя.",
   "button-done": "Готово",
   "button-cancel": "Отменить",

From 267da63d028488e58ce638da75b4e28d51960388 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Tue, 9 Dec 2025 23:54:01 +0300
Subject: [PATCH 05/26] fix: default value

---
 .../QuerySettingsDialog/QuerySettingsDialog.tsx  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index 028bdc65c8..d37046ef50 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -32,6 +32,8 @@ import './QuerySettingsDialog.scss';
 
 const b = cn('ydb-query-settings-dialog');
 
+const RESOURCE_POOL_NO_OVERRIDE_VALUE = '__no_pool_override__';
+
 export function QuerySettingsDialog() {
     const dispatch = useTypedDispatch();
     const queryAction = useTypedSelector(selectQueryAction);
@@ -141,16 +143,24 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                             render={({field}) => (
                                 <QuerySettingsSelect
                                     id="resourcePool"
-                                    setting={(field.value || '') as never}
+                                    setting={
+                                        (field.value || RESOURCE_POOL_NO_OVERRIDE_VALUE) as never
+                                    }
                                     disabled={
                                         isResourcePoolsLoading ||
                                         !resourcePools.length ||
                                         queryMode === QUERY_MODES.pg
                                     }
-                                    onUpdateSetting={(value) => field.onChange(value || undefined)}
+                                    onUpdateSetting={(value) =>
+                                        field.onChange(
+                                            value === RESOURCE_POOL_NO_OVERRIDE_VALUE
+                                                ? undefined
+                                                : value,
+                                        )
+                                    }
                                     settingOptions={[
                                         {
-                                            value: '' as never,
+                                            value: RESOURCE_POOL_NO_OVERRIDE_VALUE,
                                             content: i18n('form.resource-pool.no-override'),
                                             text: i18n('form.resource-pool.no-override'),
                                             isDefault: true,

From 0c0a12c19e00479be4b5e0fc0522cf1abf025667 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Tue, 9 Dec 2025 23:59:27 +0300
Subject: [PATCH 06/26] fix: default

---
 .../QuerySettingsDialog.tsx                   | 19 +++++++------------
 .../QuerySettingsSelect.tsx                   |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index d37046ef50..70584fb38a 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -141,11 +141,9 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                             name="resourcePool"
                             control={control}
                             render={({field}) => (
-                                <QuerySettingsSelect
+                                <QuerySettingsSelect<string>
                                     id="resourcePool"
-                                    setting={
-                                        (field.value || RESOURCE_POOL_NO_OVERRIDE_VALUE) as never
-                                    }
+                                    setting={field.value ?? RESOURCE_POOL_NO_OVERRIDE_VALUE}
                                     disabled={
                                         isResourcePoolsLoading ||
                                         !resourcePools.length ||
@@ -165,14 +163,11 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                             text: i18n('form.resource-pool.no-override'),
                                             isDefault: true,
                                         },
-                                        ...(resourcePools.map(
-                                            (name) =>
-                                                ({
-                                                    value: name,
-                                                    content: name,
-                                                    text: name,
-                                                }) as never,
-                                        ) as never[]),
+                                        ...resourcePools.map((name) => ({
+                                            value: name,
+                                            content: name,
+                                            text: name,
+                                        })),
                                     ]}
                                 />
                             )}
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx
index 8d2ca705e5..3799afe87d 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx
@@ -19,7 +19,7 @@ export const getOptionHeight = () => -1;
 
 const b = cn('ydb-query-settings-select');
 
-type SelectType = QueryMode | TransactionMode | StatisticsMode | TracingLevel;
+type SelectType = QueryMode | TransactionMode | StatisticsMode | TracingLevel | string;
 type QuerySettingSelectOption<T> = SelectOption<T> & {isDefault?: boolean};
 
 interface QuerySettingsSelectProps<T extends SelectType> {

From f0b1976f738e3de7be79184641776addfcf07e65 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 00:02:49 +0300
Subject: [PATCH 07/26] fix: default

---
 .../Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index 70584fb38a..a599e8b432 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -161,7 +161,6 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                             value: RESOURCE_POOL_NO_OVERRIDE_VALUE,
                                             content: i18n('form.resource-pool.no-override'),
                                             text: i18n('form.resource-pool.no-override'),
-                                            isDefault: true,
                                         },
                                         ...resourcePools.map((name) => ({
                                             value: name,

From a301a766ad5d97afbf8eb3bf7103a06467d3f8d8 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 00:19:58 +0300
Subject: [PATCH 08/26] fix: default

---
 .../QuerySettingsDialog/QuerySettingsDialog.tsx  | 16 ++++++----------
 src/store/reducers/query/query.ts                | 16 +++++++++++++---
 src/utils/query.ts                               |  3 +++
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index a599e8b432..d218c7ed5b 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -20,7 +20,11 @@ import {
     useTypedDispatch,
     useTypedSelector,
 } from '../../../../utils/hooks';
-import {QUERY_MODES, querySettingsValidationSchema} from '../../../../utils/query';
+import {
+    QUERY_MODES,
+    RESOURCE_POOL_NO_OVERRIDE_VALUE,
+    querySettingsValidationSchema,
+} from '../../../../utils/query';
 import {useCurrentSchema} from '../../TenantContext';
 
 import {QuerySettingsSelect} from './QuerySettingsSelect';
@@ -32,8 +36,6 @@ import './QuerySettingsDialog.scss';
 
 const b = cn('ydb-query-settings-dialog');
 
-const RESOURCE_POOL_NO_OVERRIDE_VALUE = '__no_pool_override__';
-
 export function QuerySettingsDialog() {
     const dispatch = useTypedDispatch();
     const queryAction = useTypedSelector(selectQueryAction);
@@ -149,13 +151,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                         !resourcePools.length ||
                                         queryMode === QUERY_MODES.pg
                                     }
-                                    onUpdateSetting={(value) =>
-                                        field.onChange(
-                                            value === RESOURCE_POOL_NO_OVERRIDE_VALUE
-                                                ? undefined
-                                                : value,
-                                        )
-                                    }
+                                    onUpdateSetting={(value) => field.onChange(value)}
                                     settingOptions={[
                                         {
                                             value: RESOURCE_POOL_NO_OVERRIDE_VALUE,
diff --git a/src/store/reducers/query/query.ts b/src/store/reducers/query/query.ts
index 385a331a92..8f40003adf 100644
--- a/src/store/reducers/query/query.ts
+++ b/src/store/reducers/query/query.ts
@@ -10,7 +10,11 @@ import {
     QUERY_EDITOR_DIRTY_KEY,
     QUERY_TECHNICAL_MARK,
 } from '../../../utils/constants';
-import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../utils/query';
+import {
+    RESOURCE_POOL_NO_OVERRIDE_VALUE,
+    isQueryErrorResponse,
+    parseQueryAPIResponse,
+} from '../../../utils/query';
 import {isNumeric} from '../../../utils/utils';
 import type {RootState} from '../../defaultStore';
 import {api} from '../api';
@@ -209,7 +213,10 @@ export const queryApi = api.injectEndpoints({
                                 : undefined,
                             concurrent_results: DEFAULT_CONCURRENT_RESULTS || undefined,
                             base64,
-                            resource_pool: querySettings.resourcePool || undefined,
+                            resource_pool:
+                                querySettings.resourcePool === RESOURCE_POOL_NO_OVERRIDE_VALUE
+                                    ? undefined
+                                    : querySettings.resourcePool,
                         },
                         {
                             signal,
@@ -314,7 +321,10 @@ export const queryApi = api.injectEndpoints({
                                 : undefined,
                             query_id: queryId,
                             base64,
-                            resource_pool: querySettings.resourcePool || undefined,
+                            resource_pool:
+                                querySettings.resourcePool === RESOURCE_POOL_NO_OVERRIDE_VALUE
+                                    ? undefined
+                                    : querySettings.resourcePool,
                         },
                         {signal},
                     );
diff --git a/src/utils/query.ts b/src/utils/query.ts
index 089a325882..23cb1fa17b 100644
--- a/src/utils/query.ts
+++ b/src/utils/query.ts
@@ -303,6 +303,9 @@ export const parseQueryErrorToString = (error: unknown) => {
 
 export const defaultPragma = 'PRAGMA OrderedColumns;';
 
+// Special marker meaning "do not override resource pool in request params"
+export const RESOURCE_POOL_NO_OVERRIDE_VALUE = '__no_pool_override__';
+
 export const DEFAULT_QUERY_SETTINGS = {
     queryMode: QUERY_MODES.query,
     transactionMode: TRANSACTION_MODES.implicit,

From 0dde76b1d11580049c7b51ac843672bda13c065c Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 00:46:59 +0300
Subject: [PATCH 09/26] fix: review fixes

---
 .../QuerySettingsDialog.tsx                   | 36 ++++++++++++-------
 .../__test__/prepareQueryWithPragmas.test.ts  | 30 +---------------
 src/store/reducers/query/utils.ts             | 20 -----------
 3 files changed, 25 insertions(+), 61 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index d218c7ed5b..a255ffed23 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -101,6 +101,22 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
             },
         );
 
+    const resourcePoolOptions = React.useMemo(
+        () => [
+            {
+                value: RESOURCE_POOL_NO_OVERRIDE_VALUE,
+                content: i18n('form.resource-pool.no-override'),
+                text: i18n('form.resource-pool.no-override'),
+            },
+            ...resourcePools.map((name) => ({
+                value: name,
+                content: name,
+                text: name,
+            })),
+        ],
+        [resourcePools],
+    );
+
     const timeout = watch('timeout');
     const queryMode = watch('queryMode');
 
@@ -127,6 +143,13 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                         } else if (mode === 'query') {
                                             setValue('timeout', null);
                                         }
+
+                                        if (mode === QUERY_MODES.pg) {
+                                            setValue(
+                                                'resourcePool',
+                                                RESOURCE_POOL_NO_OVERRIDE_VALUE,
+                                            );
+                                        }
                                     }}
                                     settingOptions={QUERY_SETTINGS_FIELD_SETTINGS.queryMode.options}
                                 />
@@ -152,18 +175,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                         queryMode === QUERY_MODES.pg
                                     }
                                     onUpdateSetting={(value) => field.onChange(value)}
-                                    settingOptions={[
-                                        {
-                                            value: RESOURCE_POOL_NO_OVERRIDE_VALUE,
-                                            content: i18n('form.resource-pool.no-override'),
-                                            text: i18n('form.resource-pool.no-override'),
-                                        },
-                                        ...resourcePools.map((name) => ({
-                                            value: name,
-                                            content: name,
-                                            text: name,
-                                        })),
-                                    ]}
+                                    settingOptions={resourcePoolOptions}
                                 />
                             )}
                         />
diff --git a/src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts b/src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts
index 02f34a9d1b..1a46491ce3 100644
--- a/src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts
+++ b/src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts
@@ -1,4 +1,4 @@
-import {applyResourcePoolPragma, prepareQueryWithPragmas} from '../utils';
+import {prepareQueryWithPragmas} from '../utils';
 
 describe('prepareQueryWithPragmas', () => {
     test('Should prepend pragmas correctly', () => {
@@ -27,32 +27,4 @@ describe('prepareQueryWithPragmas', () => {
 
         expect(expectedResult).toBe('PRAGMA OrderedColumns;\n\nSELECT * FROM table;');
     });
-
-    test('applyResourcePoolPragma should prepend pragma for yql syntax', () => {
-        const query = 'SELECT * FROM table;';
-        const result = applyResourcePoolPragma(query, 'olap', 'yql_v1');
-
-        expect(result).toBe('PRAGMA ResourcePool = "olap";\n\nSELECT * FROM table;');
-    });
-
-    test('applyResourcePoolPragma should not change query when no resource pool is set', () => {
-        const query = 'SELECT * FROM table;';
-        const result = applyResourcePoolPragma(query, undefined, 'yql_v1');
-
-        expect(result).toBe(query);
-    });
-
-    test('applyResourcePoolPragma should not change query for pg syntax', () => {
-        const query = 'SELECT * FROM table;';
-        const result = applyResourcePoolPragma(query, 'olap', 'pg');
-
-        expect(result).toBe(query);
-    });
-
-    test('applyResourcePoolPragma should not duplicate existing ResourcePool pragma', () => {
-        const query = 'PRAGMA ResourcePool = "analytics";\n\nSELECT * FROM table;';
-        const result = applyResourcePoolPragma(query, 'olap', 'yql_v1');
-
-        expect(result).toBe(query);
-    });
 });
diff --git a/src/store/reducers/query/utils.ts b/src/store/reducers/query/utils.ts
index 69bf059c2a..e034286f2c 100644
--- a/src/store/reducers/query/utils.ts
+++ b/src/store/reducers/query/utils.ts
@@ -78,23 +78,3 @@ export const prepareQueryWithPragmas = (query: string, pragmas?: string): string
 
     return `${trimmedPragmas}${separator}${query}`;
 };
-
-const RESOURCE_POOL_PRAGMA_REGEXP = /PRAGMA\s+ResourcePool\b/i;
-
-export const applyResourcePoolPragma = (
-    query: string,
-    resourcePool: string | undefined,
-    syntax: QuerySyntax,
-): string => {
-    if (!resourcePool || syntax !== 'yql_v1') {
-        return query;
-    }
-
-    if (RESOURCE_POOL_PRAGMA_REGEXP.test(query)) {
-        return query;
-    }
-
-    const pragmaLine = `PRAGMA ResourcePool = "${resourcePool}";`;
-
-    return `${pragmaLine}\n\n${query}`;
-};

From 835e61ea68a9273e33aef33a5a2dd3ad55ddd970 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:02:02 +0300
Subject: [PATCH 10/26] fix: add tests

---
 .../QuerySettingsDialog.tsx                   |   2 +-
 .../queryEditor/models/SettingsDialog.ts      |  44 +++++
 .../tenant/queryEditor/querySettings.test.ts  | 154 +++++++++++++++++-
 3 files changed, 198 insertions(+), 2 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index a255ffed23..5f0fcea6ae 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -161,7 +161,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                     <label htmlFor="resourcePool" className={b('field-title')}>
                         {QUERY_SETTINGS_FIELD_SETTINGS.resourcePool.title}
                     </label>
-                    <div className={b('control-wrapper')}>
+                    <div className={b('control-wrapper', {resourcePool: true})}>
                         <Controller
                             name="resourcePool"
                             control={control}
diff --git a/tests/suites/tenant/queryEditor/models/SettingsDialog.ts b/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
index 335e8a6829..64c99c40ff 100644
--- a/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
+++ b/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
@@ -23,6 +23,7 @@ export class SettingsDialog {
     private timeoutLabel: Locator;
 
     private queryModeSelect: Locator;
+    private resourcePoolSelect: Locator;
     private transactionModeSelect: Locator;
     private statisticsModeSelect: Locator;
     private statisticsModeTooltip: Locator;
@@ -47,6 +48,9 @@ export class SettingsDialog {
         this.queryModeSelect = this.dialog.locator(
             '.ydb-query-settings-dialog__control-wrapper_queryMode',
         );
+        this.resourcePoolSelect = this.dialog.locator(
+            '.ydb-query-settings-dialog__control-wrapper_resourcePool',
+        );
         this.transactionModeSelect = this.dialog.locator(
             '.ydb-query-settings-dialog__control-wrapper_transactionMode',
         );
@@ -66,6 +70,46 @@ export class SettingsDialog {
         await this.page.waitForTimeout(1000);
     }
 
+    async getResourcePoolOptions() {
+        await this.resourcePoolSelect.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
+        await this.resourcePoolSelect.click();
+        await this.selectPopup.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
+
+        const items = this.selectPopup.locator('.ydb-query-settings-select__item-title');
+        const count = await items.count();
+        const options: string[] = [];
+
+        for (let index = 0; index < count; index += 1) {
+            const text = await items.nth(index).textContent();
+            if (text) {
+                options.push(text.trim());
+            }
+        }
+
+        return options;
+    }
+
+    async changeResourcePool(value: string) {
+        await this.resourcePoolSelect.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
+        await this.resourcePoolSelect.click();
+        await this.selectPopup.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
+        await this.page.locator(`.ydb-query-settings-select__item_type_${value}`).click();
+        await this.page.waitForTimeout(1000);
+    }
+
+    async getResourcePoolValue() {
+        await this.resourcePoolSelect.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
+        const selectedText = await this.resourcePoolSelect
+            .locator('.g-select-control__option-text')
+            .textContent();
+        return selectedText?.trim() || '';
+    }
+
+    async isResourcePoolDisabled() {
+        await this.resourcePoolSelect.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
+        return this.resourcePoolSelect.locator('.g-select-control_disabled').isVisible();
+    }
+
     async changeTransactionMode(level: (typeof TRANSACTION_MODES)[keyof typeof TRANSACTION_MODES]) {
         await this.transactionModeSelect.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
         await this.transactionModeSelect.click();
diff --git a/tests/suites/tenant/queryEditor/querySettings.test.ts b/tests/suites/tenant/queryEditor/querySettings.test.ts
index aac385c7ce..9ce70578f4 100644
--- a/tests/suites/tenant/queryEditor/querySettings.test.ts
+++ b/tests/suites/tenant/queryEditor/querySettings.test.ts
@@ -1,13 +1,39 @@
 import {expect, test} from '@playwright/test';
+import type {Page, Route} from '@playwright/test';
 
 import {QUERY_MODES, TRANSACTION_MODES} from '../../../../src/utils/query';
-import {database} from '../../../utils/constants';
+import {backend, database} from '../../../utils/constants';
 import {toggleExperiment} from '../../../utils/toggleExperiment';
 import {TenantPage, VISIBILITY_TIMEOUT} from '../TenantPage';
 import {longRunningQuery} from '../constants';
 
 import {ButtonNames, QueryEditor} from './models/QueryEditor';
 
+async function setupResourcePoolMock(page: Page, pools: string[] = ['default', 'olap']) {
+    await page.route(`${backend}/viewer/json/query?*`, async (route: Route) => {
+        const request = route.request();
+        const postData = request.postData();
+
+        if (postData && postData.includes('.sys/resource_pools')) {
+            await route.fulfill({
+                status: 200,
+                contentType: 'application/json',
+                body: JSON.stringify({
+                    version: 8,
+                    result: [
+                        {
+                            rows: pools.map((name) => [name]),
+                            columns: [{name: 'Name', type: 'Utf8?'}],
+                        },
+                    ],
+                }),
+            });
+        } else {
+            await route.continue();
+        }
+    });
+}
+
 test.describe('Test Query Settings', async () => {
     const testQuery = 'SELECT 1, 2, 3, 4, 5;';
 
@@ -252,4 +278,130 @@ test.describe('Test Query Settings', async () => {
         // Restore Query Streaming experiment
         await toggleExperiment(page, 'on', 'Query Streaming');
     });
+
+    test('Resource pool dropdown is populated from system view', async ({page}) => {
+        await setupResourcePoolMock(page, ['default', 'olap']);
+
+        const queryEditor = new QueryEditor(page);
+        await queryEditor.clickGearButton();
+
+        const options = await queryEditor.settingsDialog.getResourcePoolOptions();
+
+        expect(options).toContain('No pool override');
+        expect(options).toContain('default');
+        expect(options).toContain('olap');
+    });
+
+    test('Resource pool selection is persisted between dialog opens', async ({page}) => {
+        await setupResourcePoolMock(page, ['default', 'olap']);
+
+        const queryEditor = new QueryEditor(page);
+        await queryEditor.clickGearButton();
+
+        await queryEditor.settingsDialog.changeResourcePool('olap');
+        await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
+        await expect(queryEditor.settingsDialog.isHidden()).resolves.toBe(true);
+
+        await queryEditor.clickGearButton();
+        const value = await queryEditor.settingsDialog.getResourcePoolValue();
+
+        expect(value).toBe('olap');
+    });
+
+    test('Resource pool is disabled for PG query mode', async ({page}) => {
+        await setupResourcePoolMock(page, ['default', 'olap']);
+
+        const queryEditor = new QueryEditor(page);
+        await queryEditor.clickGearButton();
+
+        await queryEditor.settingsDialog.changeQueryMode(QUERY_MODES.pg);
+
+        await expect(queryEditor.settingsDialog.isResourcePoolDisabled()).resolves.toBe(true);
+    });
+
+    test('Selected resource pool is sent in API requests and no override omits parameter', async ({
+        page,
+    }) => {
+        const capturedBodies: Array<Record<string, unknown>> = [];
+
+        await page.route(`${backend}/viewer/json/query?*`, async (route: Route) => {
+            const request = route.request();
+            const postData = request.postData();
+
+            if (!postData) {
+                await route.continue();
+                return;
+            }
+
+            if (postData.includes('.sys/resource_pools')) {
+                await route.fulfill({
+                    status: 200,
+                    contentType: 'application/json',
+                    body: JSON.stringify({
+                        version: 8,
+                        result: [
+                            {
+                                rows: [['default'], ['olap']],
+                                columns: [{name: 'Name', type: 'Utf8?'}],
+                            },
+                        ],
+                    }),
+                });
+                return;
+            }
+
+            const body = JSON.parse(postData) as Record<string, unknown>;
+            capturedBodies.push(body);
+
+            await route.fulfill({
+                status: 200,
+                contentType: 'application/json',
+                body: JSON.stringify({
+                    version: 8,
+                    result: [
+                        {
+                            rows: [],
+                            columns: [],
+                        },
+                    ],
+                }),
+            });
+        });
+
+        const queryEditor = new QueryEditor(page);
+
+        // Select a concrete resource pool and run a query
+        await queryEditor.clickGearButton();
+        await queryEditor.settingsDialog.changeResourcePool('olap');
+        await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
+        await queryEditor.setQuery('SELECT 1;');
+        await queryEditor.clickRunButton();
+
+        await expect(async () => {
+            const lastBody = capturedBodies[capturedBodies.length - 1] as {
+                query?: string;
+                resource_pool?: string;
+            };
+
+            expect(lastBody.query).toContain('SELECT 1;');
+            expect(lastBody.resource_pool).toBe('olap');
+        }).toPass({timeout: VISIBILITY_TIMEOUT});
+
+        // Now switch to "No pool override" and ensure resource_pool is omitted
+        await queryEditor.clickGearButton();
+        await queryEditor.settingsDialog.changeResourcePool('No pool override');
+        await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
+        await queryEditor.setQuery('SELECT 2;');
+        await queryEditor.clickRunButton();
+
+        await expect(async () => {
+            const lastBody = capturedBodies[capturedBodies.length - 1] as {
+                query?: string;
+                resource_pool?: string;
+            };
+
+            expect(lastBody.query).toContain('SELECT 2;');
+            expect(lastBody.resource_pool).toBeUndefined();
+        }).toPass({timeout: VISIBILITY_TIMEOUT});
+    });
 });

From c1567a2de030e49d2198abedc606022e122e214d Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:11:03 +0300
Subject: [PATCH 11/26] fix: default value

---
 src/utils/query.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/query.ts b/src/utils/query.ts
index 23cb1fa17b..3bbaa58379 100644
--- a/src/utils/query.ts
+++ b/src/utils/query.ts
@@ -314,6 +314,7 @@ export const DEFAULT_QUERY_SETTINGS = {
     statisticsMode: STATISTICS_MODES.none,
     tracingLevel: TRACING_LEVELS.off,
     pragmas: defaultPragma,
+    resourcePool: RESOURCE_POOL_NO_OVERRIDE_VALUE,
 };
 
 export const queryModeSchema = z.nativeEnum(QUERY_MODES);

From 7be0b29e65c3bf0826b75562a90c300ba5230c74 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:12:44 +0300
Subject: [PATCH 12/26] fix: review

---
 src/store/reducers/query/query.ts | 2 +-
 src/utils/query.ts                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/reducers/query/query.ts b/src/store/reducers/query/query.ts
index 8f40003adf..93b82e183d 100644
--- a/src/store/reducers/query/query.ts
+++ b/src/store/reducers/query/query.ts
@@ -416,7 +416,7 @@ export const queryApi = api.injectEndpoints({
 
                     return {data: pools};
                 } catch (error) {
-                    return {error: error || 'Unauthorized'};
+                    return {error};
                 }
             },
         }),
diff --git a/src/utils/query.ts b/src/utils/query.ts
index 3bbaa58379..3444badf6c 100644
--- a/src/utils/query.ts
+++ b/src/utils/query.ts
@@ -365,6 +365,6 @@ export const querySettingsRestoreSchema = z
         statisticsMode: statisticsModeSchema.catch(DEFAULT_QUERY_SETTINGS.statisticsMode),
         tracingLevel: tracingLevelSchema.catch(DEFAULT_QUERY_SETTINGS.tracingLevel),
         pragmas: z.string().catch(DEFAULT_QUERY_SETTINGS.pragmas),
-        resourcePool: z.string().optional(),
+        resourcePool: z.string().optional().catch(DEFAULT_QUERY_SETTINGS.resourcePool),
     })
     .catch(DEFAULT_QUERY_SETTINGS);

From 6fa8ae28308d5530184dc13a7951c2e5b523c962 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:20:53 +0300
Subject: [PATCH 13/26] fix: review

---
 .../Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx  | 3 ++-
 .../Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx  | 3 ++-
 src/utils/query.ts                                            | 2 ++
 tests/suites/tenant/queryEditor/models/SettingsDialog.ts      | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index 5f0fcea6ae..a1f6c932a4 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -20,6 +20,7 @@ import {
     useTypedDispatch,
     useTypedSelector,
 } from '../../../../utils/hooks';
+import type {ResourcePoolValue} from '../../../../utils/query';
 import {
     QUERY_MODES,
     RESOURCE_POOL_NO_OVERRIDE_VALUE,
@@ -166,7 +167,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                             name="resourcePool"
                             control={control}
                             render={({field}) => (
-                                <QuerySettingsSelect<string>
+                                <QuerySettingsSelect<ResourcePoolValue>
                                     id="resourcePool"
                                     setting={field.value ?? RESOURCE_POOL_NO_OVERRIDE_VALUE}
                                     disabled={
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx
index 3799afe87d..5edbe23b0f 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx
@@ -8,6 +8,7 @@ import type {
     TransactionMode,
 } from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
+import type {ResourcePoolValue} from '../../../../utils/query';
 
 import i18n from './i18n';
 
@@ -19,7 +20,7 @@ export const getOptionHeight = () => -1;
 
 const b = cn('ydb-query-settings-select');
 
-type SelectType = QueryMode | TransactionMode | StatisticsMode | TracingLevel | string;
+type SelectType = QueryMode | TransactionMode | StatisticsMode | TracingLevel | ResourcePoolValue;
 type QuerySettingSelectOption<T> = SelectOption<T> & {isDefault?: boolean};
 
 interface QuerySettingsSelectProps<T extends SelectType> {
diff --git a/src/utils/query.ts b/src/utils/query.ts
index 3444badf6c..9673891800 100644
--- a/src/utils/query.ts
+++ b/src/utils/query.ts
@@ -306,6 +306,8 @@ export const defaultPragma = 'PRAGMA OrderedColumns;';
 // Special marker meaning "do not override resource pool in request params"
 export const RESOURCE_POOL_NO_OVERRIDE_VALUE = '__no_pool_override__';
 
+export type ResourcePoolValue = typeof RESOURCE_POOL_NO_OVERRIDE_VALUE | string;
+
 export const DEFAULT_QUERY_SETTINGS = {
     queryMode: QUERY_MODES.query,
     transactionMode: TRANSACTION_MODES.implicit,
diff --git a/tests/suites/tenant/queryEditor/models/SettingsDialog.ts b/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
index 64c99c40ff..42c122325f 100644
--- a/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
+++ b/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
@@ -89,11 +89,11 @@ export class SettingsDialog {
         return options;
     }
 
-    async changeResourcePool(value: string) {
+    async changeResourcePool(label: string) {
         await this.resourcePoolSelect.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
         await this.resourcePoolSelect.click();
         await this.selectPopup.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
-        await this.page.locator(`.ydb-query-settings-select__item_type_${value}`).click();
+        await this.selectPopup.getByText(label, {exact: true}).click();
         await this.page.waitForTimeout(1000);
     }
 

From a610eca1067719485b47d12c8fdb4f45204238a1 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:35:03 +0300
Subject: [PATCH 14/26] fix: review

---
 src/store/reducers/query/query.ts | 6 ++++--
 src/utils/query.ts                | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/store/reducers/query/query.ts b/src/store/reducers/query/query.ts
index 93b82e183d..f01fb2a93f 100644
--- a/src/store/reducers/query/query.ts
+++ b/src/store/reducers/query/query.ts
@@ -214,7 +214,8 @@ export const queryApi = api.injectEndpoints({
                             concurrent_results: DEFAULT_CONCURRENT_RESULTS || undefined,
                             base64,
                             resource_pool:
-                                querySettings.resourcePool === RESOURCE_POOL_NO_OVERRIDE_VALUE
+                                querySettings.resourcePool === RESOURCE_POOL_NO_OVERRIDE_VALUE ||
+                                !querySettings.resourcePool
                                     ? undefined
                                     : querySettings.resourcePool,
                         },
@@ -322,7 +323,8 @@ export const queryApi = api.injectEndpoints({
                             query_id: queryId,
                             base64,
                             resource_pool:
-                                querySettings.resourcePool === RESOURCE_POOL_NO_OVERRIDE_VALUE
+                                querySettings.resourcePool === RESOURCE_POOL_NO_OVERRIDE_VALUE ||
+                                !querySettings.resourcePool
                                     ? undefined
                                     : querySettings.resourcePool,
                         },
diff --git a/src/utils/query.ts b/src/utils/query.ts
index 9673891800..6bd1a73266 100644
--- a/src/utils/query.ts
+++ b/src/utils/query.ts
@@ -345,7 +345,7 @@ export const querySettingsValidationSchema = z.object({
     statisticsMode: statisticsModeSchema,
     tracingLevel: tracingLevelSchema,
     pragmas: z.string(),
-    resourcePool: z.string().optional(),
+    resourcePool: z.string(),
 });
 
 export const querySettingsRestoreSchema = z
@@ -367,6 +367,6 @@ export const querySettingsRestoreSchema = z
         statisticsMode: statisticsModeSchema.catch(DEFAULT_QUERY_SETTINGS.statisticsMode),
         tracingLevel: tracingLevelSchema.catch(DEFAULT_QUERY_SETTINGS.tracingLevel),
         pragmas: z.string().catch(DEFAULT_QUERY_SETTINGS.pragmas),
-        resourcePool: z.string().optional().catch(DEFAULT_QUERY_SETTINGS.resourcePool),
+        resourcePool: z.string().catch(DEFAULT_QUERY_SETTINGS.resourcePool),
     })
     .catch(DEFAULT_QUERY_SETTINGS);

From f1e08db959bedde97d3d3c0ad19a75444d974446 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:39:08 +0300
Subject: [PATCH 15/26] fix: tests

---
 .../getChangedQueryExecutionSettings.test.ts  |  1 +
 ...dQueryExecutionSettingsDescription.test.ts |  1 +
 .../tenant/queryEditor/querySettings.test.ts  | 31 +++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings.test.ts b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings.test.ts
index 688cb6246f..b2bcff5173 100644
--- a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings.test.ts
+++ b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings.test.ts
@@ -36,6 +36,7 @@ describe('getChangedQueryExecutionSettings', () => {
             statisticsMode: STATISTICS_MODES.basic,
             tracingLevel: TRACING_LEVELS.basic,
             pragmas: 'PRAGMA TestPragma;',
+            resourcePool: DEFAULT_QUERY_SETTINGS.resourcePool,
         };
         const result = getChangedQueryExecutionSettings(currentSettings, DEFAULT_QUERY_SETTINGS);
         expect(result).toEqual([
diff --git a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.test.ts b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.test.ts
index e600cfcea9..bd506a8d7a 100644
--- a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.test.ts
+++ b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.test.ts
@@ -58,6 +58,7 @@ describe('getChangedQueryExecutionSettingsDescription', () => {
             statisticsMode: STATISTICS_MODES.profile,
             tracingLevel: TRACING_LEVELS.diagnostic,
             pragmas: 'PRAGMA TestPragma;',
+            resourcePool: DEFAULT_QUERY_SETTINGS.resourcePool,
         };
 
         const result = getChangedQueryExecutionSettingsDescription({
diff --git a/tests/suites/tenant/queryEditor/querySettings.test.ts b/tests/suites/tenant/queryEditor/querySettings.test.ts
index 9ce70578f4..e2321f6c08 100644
--- a/tests/suites/tenant/queryEditor/querySettings.test.ts
+++ b/tests/suites/tenant/queryEditor/querySettings.test.ts
@@ -368,6 +368,33 @@ test.describe('Test Query Settings', async () => {
             });
         });
 
+        await page.route(`${backend}/viewer/query?*`, async (route: Route) => {
+            const request = route.request();
+            const postData = request.postData();
+
+            if (!postData) {
+                await route.continue();
+                return;
+            }
+
+            const body = JSON.parse(postData) as Record<string, unknown>;
+            capturedBodies.push(body);
+
+            await route.fulfill({
+                status: 200,
+                contentType: 'application/json',
+                body: JSON.stringify({
+                    version: 8,
+                    result: [
+                        {
+                            rows: [],
+                            columns: [],
+                        },
+                    ],
+                }),
+            });
+        });
+
         const queryEditor = new QueryEditor(page);
 
         // Select a concrete resource pool and run a query
@@ -378,6 +405,8 @@ test.describe('Test Query Settings', async () => {
         await queryEditor.clickRunButton();
 
         await expect(async () => {
+            expect(capturedBodies.length).toBeGreaterThan(0);
+
             const lastBody = capturedBodies[capturedBodies.length - 1] as {
                 query?: string;
                 resource_pool?: string;
@@ -395,6 +424,8 @@ test.describe('Test Query Settings', async () => {
         await queryEditor.clickRunButton();
 
         await expect(async () => {
+            expect(capturedBodies.length).toBeGreaterThan(0);
+
             const lastBody = capturedBodies[capturedBodies.length - 1] as {
                 query?: string;
                 resource_pool?: string;

From ccf18b7f6503cfb3fa71850d8129185010d10a0e Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:43:21 +0300
Subject: [PATCH 16/26] fix: corner case

---
 .../QuerySettingsDialog/QuerySettingsDialog.tsx   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index a1f6c932a4..ab1afd5a9b 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -119,8 +119,23 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
     );
 
     const timeout = watch('timeout');
+    const resourcePool = watch('resourcePool');
     const queryMode = watch('queryMode');
 
+    React.useEffect(() => {
+        if (isResourcePoolsLoading || !resourcePools.length) {
+            return;
+        }
+
+        if (!resourcePool || resourcePool === RESOURCE_POOL_NO_OVERRIDE_VALUE) {
+            return;
+        }
+
+        if (!resourcePools.includes(resourcePool)) {
+            setValue('resourcePool', RESOURCE_POOL_NO_OVERRIDE_VALUE);
+        }
+    }, [isResourcePoolsLoading, resourcePools, resourcePool, setValue]);
+
     return (
         <form onSubmit={handleSubmit(onSubmit)}>
             <Dialog.Body className={b('dialog-body')}>

From 121fcd7c1c21288973c22076dae1ee1ad60312cc Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:45:38 +0300
Subject: [PATCH 17/26] fix: corner case

---
 .../utils/getChangedQueryExecutionSettingsDescription.ts  | 8 +++++++-
 .../Query/QuerySettingsDialog/QuerySettingsDialog.tsx     | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts
index 7ed4f987a1..c1e9bc02d6 100644
--- a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts
+++ b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts
@@ -1,5 +1,7 @@
 import type {QuerySettings} from '../../../../../types/store/query';
+import {RESOURCE_POOL_NO_OVERRIDE_VALUE} from '../../../../../utils/query';
 import {QUERY_SETTINGS_FIELD_SETTINGS} from '../../QuerySettingsDialog/constants';
+import formI18n from '../../QuerySettingsDialog/i18n';
 
 import getChangedQueryExecutionSettings from './getChangedQueryExecutionSettings';
 
@@ -26,7 +28,11 @@ export default function getChangedQueryExecutionSettingsDescription({
                 result[settings.title] = content;
             }
         } else if (currentValue) {
-            result[settings.title] = String(currentValue);
+            if (key === 'resourcePool' && currentValue === RESOURCE_POOL_NO_OVERRIDE_VALUE) {
+                result[settings.title] = formI18n('form.resource-pool.no-override');
+            } else {
+                result[settings.title] = String(currentValue);
+            }
         }
     });
 
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index ab1afd5a9b..f5832aba81 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -123,7 +123,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
     const queryMode = watch('queryMode');
 
     React.useEffect(() => {
-        if (isResourcePoolsLoading || !resourcePools.length) {
+        if (isResourcePoolsLoading) {
             return;
         }
 
@@ -131,7 +131,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
             return;
         }
 
-        if (!resourcePools.includes(resourcePool)) {
+        if (!resourcePools.length || !resourcePools.includes(resourcePool)) {
             setValue('resourcePool', RESOURCE_POOL_NO_OVERRIDE_VALUE);
         }
     }, [isResourcePoolsLoading, resourcePools, resourcePool, setValue]);

From 2bc04f586bb2eb7037200f7b5d8c23acaee9691f Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 01:51:52 +0300
Subject: [PATCH 18/26] fix: reset invalid pool

---
 .../QuerySettingsDialog.tsx                    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index f5832aba81..63efcfbc31 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -54,6 +54,13 @@ export function QuerySettingsDialog() {
         [onClose, setQuerySettings],
     );
 
+    const handleResetInvalidResourcePool = React.useCallback(() => {
+        setQuerySettings({
+            ...querySettings,
+            resourcePool: RESOURCE_POOL_NO_OVERRIDE_VALUE,
+        });
+    }, [querySettings, setQuerySettings]);
+
     return (
         <Dialog
             open={queryAction === 'settings'}
@@ -67,6 +74,7 @@ export function QuerySettingsDialog() {
                 initialValues={querySettings}
                 onSubmit={onSubmit}
                 onClose={onClose}
+                onResetInvalidResourcePool={handleResetInvalidResourcePool}
             />
         </Dialog>
     );
@@ -78,7 +86,12 @@ interface QuerySettingsFormProps {
     onClose: () => void;
 }
 
-function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsFormProps) {
+function QuerySettingsForm({
+    initialValues,
+    onSubmit,
+    onClose,
+    onResetInvalidResourcePool,
+}: QuerySettingsFormProps & {onResetInvalidResourcePool: () => void}) {
     const {
         control,
         handleSubmit,
@@ -133,8 +146,9 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
 
         if (!resourcePools.length || !resourcePools.includes(resourcePool)) {
             setValue('resourcePool', RESOURCE_POOL_NO_OVERRIDE_VALUE);
+            onResetInvalidResourcePool();
         }
-    }, [isResourcePoolsLoading, resourcePools, resourcePool, setValue]);
+    }, [isResourcePoolsLoading, resourcePools, resourcePool, onResetInvalidResourcePool, setValue]);
 
     return (
         <form onSubmit={handleSubmit(onSubmit)}>

From 99ee40bddbeca5ed4a467e7f0cc15bed13056954 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 10:26:47 +0300
Subject: [PATCH 19/26] fix: get pools on editor open

---
 .../Tenant/Query/QueryEditor/QueryEditor.tsx  | 31 +++++++++++-
 .../QuerySettingsDialog.tsx                   | 31 +++---------
 src/utils/hooks/index.ts                      |  1 +
 src/utils/hooks/useResourcePools.ts           | 47 +++++++++++++++++++
 4 files changed, 85 insertions(+), 25 deletions(-)
 create mode 100644 src/utils/hooks/useResourcePools.ts

diff --git a/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx b/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
index 10a1bebb92..1cc61c0931 100644
--- a/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
+++ b/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
@@ -32,6 +32,7 @@ import {
     useEventHandler,
     useQueryExecutionSettings,
     useQueryStreamingSetting,
+    useResourcePools,
     useSetting,
     useTypedDispatch,
     useTypedSelector,
@@ -88,7 +89,7 @@ export default function QueryEditor({theme, changeUserInput, queriesHistory}: Qu
 
     const isResultLoaded = Boolean(result);
 
-    const [querySettings] = useQueryExecutionSettings();
+    const [querySettings, setQuerySettings] = useQueryExecutionSettings();
     const enableTracingLevel = useTracingLevelOptionAvailable();
     const [lastQueryExecutionSettings, setLastQueryExecutionSettings] =
         useLastQueryExecutionSettings();
@@ -104,6 +105,12 @@ export default function QueryEditor({theme, changeUserInput, queriesHistory}: Qu
         SETTING_KEYS.BINARY_DATA_IN_PLAIN_TEXT_DISPLAY,
     );
 
+    const {
+        resourcePools,
+        normalizedResourcePool,
+        isLoading: isResourcePoolsLoading,
+    } = useResourcePools(database, querySettings.resourcePool);
+
     const encodeTextWithBase64 = !binaryDataInPlainTextDisplay;
 
     const isStreamingEnabled =
@@ -114,6 +121,28 @@ export default function QueryEditor({theme, changeUserInput, queriesHistory}: Qu
     const [sendQuery] = queryApi.useUseSendQueryMutation();
     const [streamQuery] = queryApi.useUseStreamQueryMutation();
 
+    // Normalize stored resourcePool if it's not available for current database
+    React.useEffect(() => {
+        if (isResourcePoolsLoading) {
+            return;
+        }
+
+        if (querySettings.resourcePool === normalizedResourcePool) {
+            return;
+        }
+
+        setQuerySettings({
+            ...querySettings,
+            resourcePool: normalizedResourcePool,
+        });
+    }, [
+        isResourcePoolsLoading,
+        normalizedResourcePool,
+        querySettings,
+        resourcePools.length,
+        setQuerySettings,
+    ]);
+
     const tableSettings = React.useMemo(() => {
         return isStreamingEnabled
             ? {
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index 63efcfbc31..97c77b6723 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -5,7 +5,6 @@ import {zodResolver} from '@hookform/resolvers/zod';
 import {Controller, useForm} from 'react-hook-form';
 
 import {useTracingLevelOptionAvailable} from '../../../../store/reducers/capabilities/hooks';
-import {queryApi} from '../../../../store/reducers/query/query';
 import {
     selectQueryAction,
     setQueryAction,
@@ -16,6 +15,7 @@ import {cn} from '../../../../utils/cn';
 import {
     useQueryExecutionSettings,
     useQueryStreamingSetting,
+    useResourcePools,
     useSetting,
     useTypedDispatch,
     useTypedSelector,
@@ -54,13 +54,6 @@ export function QuerySettingsDialog() {
         [onClose, setQuerySettings],
     );
 
-    const handleResetInvalidResourcePool = React.useCallback(() => {
-        setQuerySettings({
-            ...querySettings,
-            resourcePool: RESOURCE_POOL_NO_OVERRIDE_VALUE,
-        });
-    }, [querySettings, setQuerySettings]);
-
     return (
         <Dialog
             open={queryAction === 'settings'}
@@ -74,7 +67,6 @@ export function QuerySettingsDialog() {
                 initialValues={querySettings}
                 onSubmit={onSubmit}
                 onClose={onClose}
-                onResetInvalidResourcePool={handleResetInvalidResourcePool}
             />
         </Dialog>
     );
@@ -86,12 +78,7 @@ interface QuerySettingsFormProps {
     onClose: () => void;
 }
 
-function QuerySettingsForm({
-    initialValues,
-    onSubmit,
-    onClose,
-    onResetInvalidResourcePool,
-}: QuerySettingsFormProps & {onResetInvalidResourcePool: () => void}) {
+function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsFormProps) {
     const {
         control,
         handleSubmit,
@@ -107,13 +94,10 @@ function QuerySettingsForm({
     const enableTracingLevel = useTracingLevelOptionAvailable();
     const [isQueryStreamingEnabled] = useQueryStreamingSetting();
     const {database} = useCurrentSchema();
-    const {data: resourcePools = [], isLoading: isResourcePoolsLoading} =
-        queryApi.useGetResourcePoolsQuery(
-            {database},
-            {
-                skip: !database,
-            },
-        );
+    const {resourcePools, isLoading: isResourcePoolsLoading} = useResourcePools(
+        database,
+        initialValues.resourcePool,
+    );
 
     const resourcePoolOptions = React.useMemo(
         () => [
@@ -146,9 +130,8 @@ function QuerySettingsForm({
 
         if (!resourcePools.length || !resourcePools.includes(resourcePool)) {
             setValue('resourcePool', RESOURCE_POOL_NO_OVERRIDE_VALUE);
-            onResetInvalidResourcePool();
         }
-    }, [isResourcePoolsLoading, resourcePools, resourcePool, onResetInvalidResourcePool, setValue]);
+    }, [isResourcePoolsLoading, resourcePools, resourcePool, setValue]);
 
     return (
         <form onSubmit={handleSubmit(onSubmit)}>
diff --git a/src/utils/hooks/index.ts b/src/utils/hooks/index.ts
index 5b4a4f572b..7abba54e60 100644
--- a/src/utils/hooks/index.ts
+++ b/src/utils/hooks/index.ts
@@ -10,3 +10,4 @@ export * from './useEventHandler';
 export * from './useDelayed';
 export * from './useAclSyntax';
 export * from './useScrollPosition';
+export * from './useResourcePools';
diff --git a/src/utils/hooks/useResourcePools.ts b/src/utils/hooks/useResourcePools.ts
new file mode 100644
index 0000000000..553988b333
--- /dev/null
+++ b/src/utils/hooks/useResourcePools.ts
@@ -0,0 +1,47 @@
+import React from 'react';
+
+import {queryApi} from '../../store/reducers/query/query';
+import {RESOURCE_POOL_NO_OVERRIDE_VALUE} from '../query';
+import type {ResourcePoolValue} from '../query';
+
+type UseResourcePoolsResult = {
+    resourcePools: string[];
+    normalizedResourcePool: ResourcePoolValue;
+    isLoading: boolean;
+    isFetching: boolean;
+    error?: unknown;
+};
+
+export const useResourcePools = (
+    database: string | undefined,
+    resourcePool: ResourcePoolValue | undefined,
+): UseResourcePoolsResult => {
+    const {
+        data: resourcePools = [],
+        isLoading,
+        isFetching,
+        error,
+    } = queryApi.useGetResourcePoolsQuery(
+        {database: database || ''},
+        {
+            skip: !database,
+        },
+    );
+
+    const normalizedResourcePool = React.useMemo<ResourcePoolValue>(() => {
+        if (!resourcePool || resourcePool === RESOURCE_POOL_NO_OVERRIDE_VALUE) {
+            return RESOURCE_POOL_NO_OVERRIDE_VALUE;
+        }
+
+        if (!resourcePools.length) {
+            // If we couldn't get pools for any reason, fall back to no override
+            return RESOURCE_POOL_NO_OVERRIDE_VALUE;
+        }
+
+        return resourcePools.includes(resourcePool)
+            ? resourcePool
+            : RESOURCE_POOL_NO_OVERRIDE_VALUE;
+    }, [resourcePool, resourcePools]);
+
+    return {resourcePools, normalizedResourcePool, isLoading, isFetching, error};
+};

From 35d50bd30febd1f6b3fcb449ebc1bcd7ed6f6b49 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 10:40:58 +0300
Subject: [PATCH 20/26] fix: tests

---
 tests/suites/tenant/queryEditor/models/SettingsDialog.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/suites/tenant/queryEditor/models/SettingsDialog.ts b/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
index 42c122325f..74f4aa9d9b 100644
--- a/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
+++ b/tests/suites/tenant/queryEditor/models/SettingsDialog.ts
@@ -93,7 +93,10 @@ export class SettingsDialog {
         await this.resourcePoolSelect.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
         await this.resourcePoolSelect.click();
         await this.selectPopup.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
-        await this.selectPopup.getByText(label, {exact: true}).click();
+        const optionTitle = this.selectPopup.locator('.ydb-query-settings-select__item-title', {
+            hasText: label,
+        });
+        await optionTitle.first().click();
         await this.page.waitForTimeout(1000);
     }
 

From 6775ce4a74a1ca34adf1cd459f55aba1b86c3b33 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 10:44:30 +0300
Subject: [PATCH 21/26] fix: leave only title

---
 .../Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index 97c77b6723..260d4c1240 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -104,12 +104,10 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
             {
                 value: RESOURCE_POOL_NO_OVERRIDE_VALUE,
                 content: i18n('form.resource-pool.no-override'),
-                text: i18n('form.resource-pool.no-override'),
             },
             ...resourcePools.map((name) => ({
                 value: name,
                 content: name,
-                text: name,
             })),
         ],
         [resourcePools],

From 35d10a29008b510f491de3d3524c8c6022d96dca Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 10 Dec 2025 14:15:19 +0300
Subject: [PATCH 22/26] fix: move controller to bottom

---
 .../QuerySettingsDialog.tsx                   | 51 ++++++++-----------
 .../tenant/queryEditor/querySettings.test.ts  | 11 ----
 2 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index 260d4c1240..8299f93808 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -154,13 +154,6 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                         } else if (mode === 'query') {
                                             setValue('timeout', null);
                                         }
-
-                                        if (mode === QUERY_MODES.pg) {
-                                            setValue(
-                                                'resourcePool',
-                                                RESOURCE_POOL_NO_OVERRIDE_VALUE,
-                                            );
-                                        }
                                     }}
                                     settingOptions={QUERY_SETTINGS_FIELD_SETTINGS.queryMode.options}
                                 />
@@ -168,30 +161,6 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                         />
                     </div>
                 </Flex>
-                <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
-                    <label htmlFor="resourcePool" className={b('field-title')}>
-                        {QUERY_SETTINGS_FIELD_SETTINGS.resourcePool.title}
-                    </label>
-                    <div className={b('control-wrapper', {resourcePool: true})}>
-                        <Controller
-                            name="resourcePool"
-                            control={control}
-                            render={({field}) => (
-                                <QuerySettingsSelect<ResourcePoolValue>
-                                    id="resourcePool"
-                                    setting={field.value ?? RESOURCE_POOL_NO_OVERRIDE_VALUE}
-                                    disabled={
-                                        isResourcePoolsLoading ||
-                                        !resourcePools.length ||
-                                        queryMode === QUERY_MODES.pg
-                                    }
-                                    onUpdateSetting={(value) => field.onChange(value)}
-                                    settingOptions={resourcePoolOptions}
-                                />
-                            )}
-                        />
-                    </div>
-                </Flex>
                 {enableTracingLevel && (
                     <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
                         <label htmlFor="tracingLevel" className={b('field-title')}>
@@ -327,6 +296,26 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                         </div>
                     </Flex>
                 )}
+                <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
+                    <label htmlFor="resourcePool" className={b('field-title')}>
+                        {QUERY_SETTINGS_FIELD_SETTINGS.resourcePool.title}
+                    </label>
+                    <div className={b('control-wrapper', {resourcePool: true})}>
+                        <Controller
+                            name="resourcePool"
+                            control={control}
+                            render={({field}) => (
+                                <QuerySettingsSelect<ResourcePoolValue>
+                                    id="resourcePool"
+                                    setting={field.value ?? RESOURCE_POOL_NO_OVERRIDE_VALUE}
+                                    disabled={isResourcePoolsLoading || !resourcePools.length}
+                                    onUpdateSetting={(value) => field.onChange(value)}
+                                    settingOptions={resourcePoolOptions}
+                                />
+                            )}
+                        />
+                    </div>
+                </Flex>
                 <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
                     <label htmlFor="pragmas" className={b('field-title')}>
                         {QUERY_SETTINGS_FIELD_SETTINGS.pragmas.title}
diff --git a/tests/suites/tenant/queryEditor/querySettings.test.ts b/tests/suites/tenant/queryEditor/querySettings.test.ts
index e2321f6c08..4bf5f2d3b2 100644
--- a/tests/suites/tenant/queryEditor/querySettings.test.ts
+++ b/tests/suites/tenant/queryEditor/querySettings.test.ts
@@ -308,17 +308,6 @@ test.describe('Test Query Settings', async () => {
         expect(value).toBe('olap');
     });
 
-    test('Resource pool is disabled for PG query mode', async ({page}) => {
-        await setupResourcePoolMock(page, ['default', 'olap']);
-
-        const queryEditor = new QueryEditor(page);
-        await queryEditor.clickGearButton();
-
-        await queryEditor.settingsDialog.changeQueryMode(QUERY_MODES.pg);
-
-        await expect(queryEditor.settingsDialog.isResourcePoolDisabled()).resolves.toBe(true);
-    });
-
     test('Selected resource pool is sent in API requests and no override omits parameter', async ({
         page,
     }) => {

From 9974482ca4c5767a07b2c21ae0132d6ab7f742d5 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Thu, 11 Dec 2025 14:55:12 +0300
Subject: [PATCH 23/26] fix: review

---
 .../tenant/queryEditor/querySettings.test.ts  | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/tests/suites/tenant/queryEditor/querySettings.test.ts b/tests/suites/tenant/queryEditor/querySettings.test.ts
index 4bf5f2d3b2..953afc7697 100644
--- a/tests/suites/tenant/queryEditor/querySettings.test.ts
+++ b/tests/suites/tenant/queryEditor/querySettings.test.ts
@@ -9,32 +9,36 @@ import {longRunningQuery} from '../constants';
 
 import {ButtonNames, QueryEditor} from './models/QueryEditor';
 
+async function fulfillResourcePools(route: Route, pools: string[]) {
+    await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({
+            version: 8,
+            result: [
+                {
+                    rows: pools.map((name) => [name]),
+                    columns: [{name: 'Name', type: 'Utf8?'}],
+                },
+            ],
+        }),
+    });
+}
+
 async function setupResourcePoolMock(page: Page, pools: string[] = ['default', 'olap']) {
     await page.route(`${backend}/viewer/json/query?*`, async (route: Route) => {
         const request = route.request();
         const postData = request.postData();
 
         if (postData && postData.includes('.sys/resource_pools')) {
-            await route.fulfill({
-                status: 200,
-                contentType: 'application/json',
-                body: JSON.stringify({
-                    version: 8,
-                    result: [
-                        {
-                            rows: pools.map((name) => [name]),
-                            columns: [{name: 'Name', type: 'Utf8?'}],
-                        },
-                    ],
-                }),
-            });
+            await fulfillResourcePools(route, pools);
         } else {
             await route.continue();
         }
     });
 }
 
-test.describe('Test Query Settings', async () => {
+test.describe.only('Test Query Settings', async () => {
     const testQuery = 'SELECT 1, 2, 3, 4, 5;';
 
     test.beforeEach(async ({page}) => {
@@ -323,19 +327,7 @@ test.describe('Test Query Settings', async () => {
             }
 
             if (postData.includes('.sys/resource_pools')) {
-                await route.fulfill({
-                    status: 200,
-                    contentType: 'application/json',
-                    body: JSON.stringify({
-                        version: 8,
-                        result: [
-                            {
-                                rows: [['default'], ['olap']],
-                                columns: [{name: 'Name', type: 'Utf8?'}],
-                            },
-                        ],
-                    }),
-                });
+                await fulfillResourcePools(route, ['default', 'olap']);
                 return;
             }
 

From 45e686932deaab7ebde2ba491c51922d2edfb4ac Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Thu, 11 Dec 2025 14:56:41 +0300
Subject: [PATCH 24/26] fix: remove only

---
 tests/suites/tenant/queryEditor/querySettings.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/suites/tenant/queryEditor/querySettings.test.ts b/tests/suites/tenant/queryEditor/querySettings.test.ts
index 953afc7697..dca5ba95fe 100644
--- a/tests/suites/tenant/queryEditor/querySettings.test.ts
+++ b/tests/suites/tenant/queryEditor/querySettings.test.ts
@@ -38,7 +38,7 @@ async function setupResourcePoolMock(page: Page, pools: string[] = ['default', '
     });
 }
 
-test.describe.only('Test Query Settings', async () => {
+test.describe('Test Query Settings', async () => {
     const testQuery = 'SELECT 1, 2, 3, 4, 5;';
 
     test.beforeEach(async ({page}) => {

From 62e8dd83e1fc8b1bef73d42fdf414247bb847cf0 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Thu, 11 Dec 2025 15:10:40 +0300
Subject: [PATCH 25/26] fix: review

---
 .../utils/getChangedQueryExecutionSettingsDescription.ts  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts
index c1e9bc02d6..7ed4f987a1 100644
--- a/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts
+++ b/src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts
@@ -1,7 +1,5 @@
 import type {QuerySettings} from '../../../../../types/store/query';
-import {RESOURCE_POOL_NO_OVERRIDE_VALUE} from '../../../../../utils/query';
 import {QUERY_SETTINGS_FIELD_SETTINGS} from '../../QuerySettingsDialog/constants';
-import formI18n from '../../QuerySettingsDialog/i18n';
 
 import getChangedQueryExecutionSettings from './getChangedQueryExecutionSettings';
 
@@ -28,11 +26,7 @@ export default function getChangedQueryExecutionSettingsDescription({
                 result[settings.title] = content;
             }
         } else if (currentValue) {
-            if (key === 'resourcePool' && currentValue === RESOURCE_POOL_NO_OVERRIDE_VALUE) {
-                result[settings.title] = formI18n('form.resource-pool.no-override');
-            } else {
-                result[settings.title] = String(currentValue);
-            }
+            result[settings.title] = String(currentValue);
         }
     });
 

From 59e83ae5c18a3362791bd70cf2792d6f0238ade3 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Thu, 11 Dec 2025 15:24:39 +0300
Subject: [PATCH 26/26] fix: review

---
 src/containers/Heatmap/Heatmap.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/Heatmap/Heatmap.tsx b/src/containers/Heatmap/Heatmap.tsx
index 4e988d2215..0b77023f9b 100644
--- a/src/containers/Heatmap/Heatmap.tsx
+++ b/src/containers/Heatmap/Heatmap.tsx
@@ -30,7 +30,7 @@ interface HeatmapProps {
 export const Heatmap = ({path, database, databaseFullPath}: HeatmapProps) => {
     const dispatch = useTypedDispatch();
 
-    const itemsContainer = React.createRef<HTMLDivElement>();
+    const itemsContainer = React.useRef<HTMLDivElement | null>(null);
 
     const [autoRefreshInterval] = useAutoRefreshInterval();