diff --git a/react/src/components/AgentSelect.tsx b/react/src/components/AgentSelect.tsx
new file mode 100644
index 0000000000..1975cb42b6
--- /dev/null
+++ b/react/src/components/AgentSelect.tsx
@@ -0,0 +1,129 @@
+import { useBAIPaginationOptionState } from '../hooks/reactPaginationQueryOptions';
+import Flex from './Flex';
+import ResourceNumber from './ResourceNumber';
+import { AgentSelectQuery } from './__generated__/AgentSelectQuery.graphql';
+import { useControllableValue } from 'ahooks';
+import { Select, SelectProps } from 'antd';
+import graphql from 'babel-plugin-relay/macro';
+import _ from 'lodash';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useLazyLoadQuery } from 'react-relay';
+
+interface Props extends SelectProps {
+  autoSelectDefault?: boolean;
+  fetchKey?: string;
+  resourceGroup?: string | null;
+}
+
+const AgentSelect: React.FC<Props> = ({
+  fetchKey,
+  resourceGroup,
+  ...selectProps
+}) => {
+  const { t } = useTranslation();
+  const [value, setValue] = useControllableValue(selectProps);
+
+  const { baiPaginationOption } = useBAIPaginationOptionState({
+    current: 1,
+    pageSize: 20,
+  });
+
+  const { agent_summary_list } = useLazyLoadQuery<AgentSelectQuery>(
+    graphql`
+      query AgentSelectQuery(
+        $limit: Int!
+        $offset: Int!
+        $status: String
+        $filter: String
+        $scaling_group: String
+      ) {
+        agent_summary_list(
+          limit: $limit
+          offset: $offset
+          status: $status
+          filter: $filter
+          scaling_group: $scaling_group
+        ) {
+          items {
+            id
+            status
+            schedulable
+            available_slots
+            occupied_slots
+            architecture
+          }
+          total_count
+        }
+      }
+    `,
+    {
+      limit: baiPaginationOption.limit,
+      offset: baiPaginationOption.offset,
+      status: 'ALIVE',
+      filter: 'schedulable is true', // true, false, null
+      scaling_group: resourceGroup,
+    },
+    {
+      fetchPolicy: 'network-only',
+      fetchKey,
+    },
+  );
+
+  const agentOptions = _.map(agent_summary_list?.items, (agent) => {
+    const availableSlotsInfo: {
+      [key in string]: string;
+    } = JSON.parse(agent?.available_slots ?? '{}');
+    const occupiedSlotsInfo: {
+      [key in string]: string;
+    } = JSON.parse(agent?.occupied_slots ?? '{}');
+    const remainingSlotsInfo: {
+      [key in string]: number;
+    } = _.chain(availableSlotsInfo)
+      .mapValues((value, key) => {
+        if (key.endsWith('.shares')) {
+          return parseFloat(value) - parseFloat(occupiedSlotsInfo[key] ?? 0);
+        } else {
+          return parseInt(value) - parseInt(occupiedSlotsInfo[key] ?? 0);
+        }
+      })
+      .value();
+    return {
+      label: (
+        <Flex direction="row" justify="between">
+          {agent?.id}
+          <Flex direction="row" gap={'xxs'}>
+            {_.map(remainingSlotsInfo, (slot, key) => {
+              return (
+                <ResourceNumber
+                  key={key}
+                  // @ts-ignore
+                  type={key}
+                  value={slot.toString()}
+                  hideTooltip
+                />
+              );
+            })}
+          </Flex>
+        </Flex>
+      ),
+      value: agent?.id,
+    };
+  });
+
+  return (
+    <Select
+      onChange={(value, option) => {
+        setValue(value, option);
+      }}
+      {...selectProps}
+      value={value}
+      options={[
+        { label: t('session.launcher.autoSelect'), value: 'auto' },
+        ...agentOptions,
+      ]}
+    />
+  );
+};
+
+export default AgentSelect;
diff --git a/react/src/components/ResourceAllocationFormItems.tsx b/react/src/components/ResourceAllocationFormItems.tsx
index 4f126b7c66..56c953d383 100644
--- a/react/src/components/ResourceAllocationFormItems.tsx
+++ b/react/src/components/ResourceAllocationFormItems.tsx
@@ -3,7 +3,7 @@ import {
   compareNumberWithUnits,
   iSizeToSize,
 } from '../helper';
-import { useSuspendedBackendaiClient } from '../hooks';
+import { useSuspendedBackendaiClient, useUpdatableState } from '../hooks';
 import { useResourceSlotsDetails } from '../hooks/backendai';
 import { useCurrentKeyPairResourcePolicyLazyLoadQuery } from '../hooks/hooksUsingRelay';
 import {
@@ -16,6 +16,7 @@ import {
   ResourcePreset,
   useResourceLimitAndRemaining,
 } from '../hooks/useResourceLimitAndRemaining';
+import AgentSelect from './AgentSelect';
 import DynamicUnitInputNumberWithSlider from './DynamicUnitInputNumberWithSlider';
 import Flex from './Flex';
 import {
@@ -25,8 +26,9 @@ import {
 import InputNumberWithSlider from './InputNumberWithSlider';
 import ResourceGroupSelect from './ResourceGroupSelect';
 import ResourcePresetSelect from './ResourcePresetSelect';
-import { CaretDownOutlined } from '@ant-design/icons';
+import { CaretDownOutlined, ReloadOutlined } from '@ant-design/icons';
 import {
+  Button,
   Card,
   Col,
   Divider,
@@ -38,7 +40,7 @@ import {
   theme,
 } from 'antd';
 import _ from 'lodash';
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useTransition } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
 export const AUTOMATIC_DEFAULT_SHMEM = '64m';
@@ -54,6 +56,7 @@ export const RESOURCE_ALLOCATION_INITIAL_FORM_VALUES: DeepPartial<ResourceAlloca
     cluster_mode: 'single-node',
     cluster_size: 1,
     enabledAutomaticShmem: true,
+    agent: 'auto',
   };
 
 export const isMinOversMaxValue = (min: number, max: number) => {
@@ -74,6 +77,7 @@ export interface ResourceAllocationFormValue {
   cluster_size: number;
   enabledAutomaticShmem: boolean;
   allocationPreset?: string;
+  agent?: string;
 }
 
 type MergedResourceAllocationFormValue = ResourceAllocationFormValue &
@@ -103,6 +107,9 @@ const ResourceAllocationFormItems: React.FC<
   const [{ keypairResourcePolicy, sessionLimitAndRemaining }] =
     useCurrentKeyPairResourcePolicyLazyLoadQuery();
 
+  const [agentFetchKey, updateAgentFetchKey] = useUpdatableState('first');
+  const [isPendingAgentList, startAgentListTransition] = useTransition();
+
   const currentProject = useCurrentProjectValue();
   const currentResourceGroup = useCurrentResourceGroupValue(); // use global state
 
@@ -1192,6 +1199,42 @@ const ResourceAllocationFormItems: React.FC<
         </Card>
       ) : null}
       {/* TODO: Support cluster mode */}
+      {!baiClient._config.hideAgents && (
+        <Form.Item
+          label={t('session.launcher.SelectAgent')}
+          required
+          tooltip={<Trans i18nKey={'session.launcher.DescSelectAgent'} />}
+        >
+          <Flex gap={'xs'}>
+            <Form.Item required noStyle style={{ flex: 1 }} name="agent">
+              {baiClient.supports('agent-select') && (
+                <AgentSelect
+                  resourceGroup={currentResourceGroup}
+                  fetchKey={agentFetchKey}
+                  onChange={(value, option) => {
+                    if (value !== 'auto') {
+                      form.setFieldsValue({
+                        cluster_mode: 'single-node',
+                        cluster_size: 1,
+                      });
+                    }
+                    // TODO: set cluster mode to single node and cluster size to 1 when agent value is not "auto"
+                  }}
+                ></AgentSelect>
+              )}
+            </Form.Item>
+            <Form.Item noStyle>
+              <Button
+                loading={isPendingAgentList}
+                onClick={() => {
+                  startAgentListTransition(() => updateAgentFetchKey());
+                }}
+                icon={<ReloadOutlined />}
+              ></Button>
+            </Form.Item>
+          </Flex>
+        </Form.Item>
+      )}
       {baiClient.supports('multi-container') && (
         // {false && (
         <Form.Item
@@ -1206,123 +1249,132 @@ const ResourceAllocationFormItems: React.FC<
             </Flex>
           }
           required
+          dependencies={['agent']}
         >
-          <Card
-            style={{
-              marginBottom: token.margin,
-            }}
-          >
-            <Row gutter={token.marginMD}>
-              <Col xs={24}>
-                {/* <Col xs={24} lg={12}> */}
-                <Form.Item name={'cluster_mode'} required>
-                  <Radio.Group
-                    onChange={(e) => {
-                      form.validateFields().catch(() => {});
-                    }}
-                  >
-                    <Radio.Button value="single-node">
-                      {t('session.launcher.SingleNode')}
-                    </Radio.Button>
-                    <Radio.Button value="multi-node">
-                      {t('session.launcher.MultiNode')}
-                    </Radio.Button>
-                  </Radio.Group>
-                </Form.Item>
-              </Col>
-              <Col xs={24}>
-                <Form.Item
-                  noStyle
-                  shouldUpdate={(prev, next) =>
-                    prev.cluster_mode !== next.cluster_mode
-                  }
-                >
-                  {() => {
-                    const derivedClusterSizeMaxLimit = _.min([
-                      resourceLimits.cpu?.max,
-                      keypairResourcePolicy.max_containers_per_session,
-                    ]);
-                    const clusterUnit =
-                      form.getFieldValue('cluster_mode') === 'single-node'
-                        ? t('session.launcher.Container')
-                        : t('session.launcher.Node');
-                    return (
-                      <Form.Item
-                        name={'cluster_size'}
-                        label={t('session.launcher.ClusterSize')}
-                        required
-                        rules={[
-                          {
-                            warningOnly: true,
-                            validator: async (rule, value: number) => {
-                              if (showRemainingWarning) {
-                                const minCPU = _.min([
-                                  remaining.cpu,
-                                  keypairResourcePolicy.max_containers_per_session,
-                                ]);
-                                if (_.isNumber(minCPU) && value > minCPU) {
-                                  return Promise.reject(
-                                    t(
-                                      'session.launcher.EnqueueComputeSessionWarning',
-                                    ),
-                                  );
-                                }
-                              }
-                              return Promise.resolve();
-                            },
-                          },
-                        ]}
+          {({ getFieldValue }) => {
+            return (
+              <Card
+                style={{
+                  marginBottom: token.margin,
+                }}
+              >
+                <Row gutter={token.marginMD}>
+                  <Col xs={24}>
+                    {/* <Col xs={24} lg={12}> */}
+                    <Form.Item name={'cluster_mode'} required>
+                      <Radio.Group
+                        onChange={(e) => {
+                          form.validateFields().catch(() => {});
+                        }}
+                        disabled={getFieldValue('agent') !== 'auto'}
                       >
-                        <InputNumberWithSlider
-                          min={1}
-                          step={1}
-                          // TODO: max cluster size
-                          max={
-                            _.isNumber(derivedClusterSizeMaxLimit)
-                              ? derivedClusterSizeMaxLimit
-                              : undefined
-                          }
-                          disabled={derivedClusterSizeMaxLimit === 1}
-                          sliderProps={{
-                            marks: {
-                              1: '1',
-                              // remaining mark code should be located before max mark code to prevent overlapping when it is same value
-                              ...(remaining.cpu
-                                ? {
-                                    [remaining.cpu]: {
-                                      label: <RemainingMark />,
-                                    },
-                                  }
-                                : {}),
-                              ...(_.isNumber(derivedClusterSizeMaxLimit)
-                                ? {
-                                    [derivedClusterSizeMaxLimit]:
-                                      derivedClusterSizeMaxLimit,
+                        <Radio.Button value="single-node">
+                          {t('session.launcher.SingleNode')}
+                        </Radio.Button>
+                        <Radio.Button value="multi-node">
+                          {t('session.launcher.MultiNode')}
+                        </Radio.Button>
+                      </Radio.Group>
+                    </Form.Item>
+                  </Col>
+                  <Col xs={24}>
+                    <Form.Item
+                      noStyle
+                      shouldUpdate={(prev, next) =>
+                        prev.cluster_mode !== next.cluster_mode
+                      }
+                    >
+                      {() => {
+                        const derivedClusterSizeMaxLimit = _.min([
+                          resourceLimits.cpu?.max,
+                          keypairResourcePolicy.max_containers_per_session,
+                        ]);
+                        const clusterUnit =
+                          form.getFieldValue('cluster_mode') === 'single-node'
+                            ? t('session.launcher.Container')
+                            : t('session.launcher.Node');
+                        return (
+                          <Form.Item
+                            name={'cluster_size'}
+                            label={t('session.launcher.ClusterSize')}
+                            required
+                            rules={[
+                              {
+                                warningOnly: true,
+                                validator: async (rule, value: number) => {
+                                  if (showRemainingWarning) {
+                                    const minCPU = _.min([
+                                      remaining.cpu,
+                                      keypairResourcePolicy.max_containers_per_session,
+                                    ]);
+                                    if (_.isNumber(minCPU) && value > minCPU) {
+                                      return Promise.reject(
+                                        t(
+                                          'session.launcher.EnqueueComputeSessionWarning',
+                                        ),
+                                      );
+                                    }
                                   }
-                                : {}),
-                            },
-                            tooltip: {
-                              formatter: (value = 0) => {
-                                return `${value} ${clusterUnit}`;
+                                  return Promise.resolve();
+                                },
                               },
-                            },
-                          }}
-                          inputNumberProps={{
-                            addonAfter: clusterUnit,
-                          }}
-                          onChange={(value) => {
-                            if (value > 1) {
-                              form.setFieldValue('num_of_sessions', 1);
-                            }
-                          }}
-                        />
-                      </Form.Item>
-                    );
-                  }}
-                </Form.Item>
-              </Col>
-            </Row>
-          </Card>
+                            ]}
+                          >
+                            <InputNumberWithSlider
+                              min={1}
+                              step={1}
+                              // TODO: max cluster size
+                              max={
+                                _.isNumber(derivedClusterSizeMaxLimit)
+                                  ? derivedClusterSizeMaxLimit
+                                  : undefined
+                              }
+                              disabled={
+                                derivedClusterSizeMaxLimit === 1 ||
+                                getFieldValue('agent') !== 'auto'
+                              }
+                              sliderProps={{
+                                marks: {
+                                  1: '1',
+                                  // remaining mark code should be located before max mark code to prevent overlapping when it is same value
+                                  ...(remaining.cpu
+                                    ? {
+                                        [remaining.cpu]: {
+                                          label: <RemainingMark />,
+                                        },
+                                      }
+                                    : {}),
+                                  ...(_.isNumber(derivedClusterSizeMaxLimit)
+                                    ? {
+                                        [derivedClusterSizeMaxLimit]:
+                                          derivedClusterSizeMaxLimit,
+                                      }
+                                    : {}),
+                                },
+                                tooltip: {
+                                  formatter: (value = 0) => {
+                                    return `${value} ${clusterUnit}`;
+                                  },
+                                },
+                              }}
+                              inputNumberProps={{
+                                addonAfter: clusterUnit,
+                              }}
+                              onChange={(value) => {
+                                if (value > 1) {
+                                  form.setFieldValue('num_of_sessions', 1);
+                                }
+                              }}
+                            />
+                          </Form.Item>
+                        );
+                      }}
+                    </Form.Item>
+                  </Col>
+                </Row>
+              </Card>
+            );
+          }}
         </Form.Item>
       )}
     </>
diff --git a/react/src/pages/SessionLauncherPage.tsx b/react/src/pages/SessionLauncherPage.tsx
index 752218f400..f2b4658593 100644
--- a/react/src/pages/SessionLauncherPage.tsx
+++ b/react/src/pages/SessionLauncherPage.tsx
@@ -132,6 +132,7 @@ interface SessionConfig {
   startsAt?: string;
   startupCommand?: string;
   bootstrap_script?: string;
+  agent_list?: string[];
 }
 
 interface CreateSessionInfo {
@@ -443,6 +444,15 @@ const SessionLauncherPage = () => {
           architecture,
           sessionName: sessionName,
           config: {
+            ...(baiClient.supports('agent-select') &&
+            !baiClient?._config?.hideAgents &&
+            values.agent !== 'auto'
+              ? {
+                  agent_list: [values.agent].filter(
+                    (agent): agent is string => !!agent,
+                  ),
+                } // Filter out undefined values
+              : undefined),
             type: values.sessionType,
             ...(_.isEmpty(values.bootstrap_script)
               ? {}
@@ -471,8 +481,6 @@ const SessionLauncherPage = () => {
                   domain: baiClient._config.domainName,
                   scaling_group: values.resourceGroup,
                 }),
-            ///////////////////////////
-
             cluster_mode: values.cluster_mode,
             cluster_size: values.cluster_size,
             maxWaitSeconds: 15,
@@ -498,9 +506,17 @@ const SessionLauncherPage = () => {
               ..._.omit(values.hpcOptimization, 'autoEnabled'),
             },
             preopen_ports: transformPortValuesToNumbers(values.ports),
+            ...(baiClient.supports('agent-select') &&
+            !baiClient?._config?.hideAgents &&
+            values.agent !== 'auto'
+              ? {
+                  agent_list: [values.agent].filter(
+                    (agent): agent is string => !!agent,
+                  ),
+                } // Filter out undefined values
+              : undefined),
           },
         };
-
         const sessionPromises = _.map(
           _.range(values.num_of_sessions || 1),
           (i) => {
@@ -1638,6 +1654,15 @@ const SessionLauncherPage = () => {
                               .value()} */}
                             </Flex>
                           </Descriptions.Item>
+                          {baiClient.supports('agent-select') &&
+                            !baiClient?._config?.hideAgents && (
+                              <Descriptions.Item
+                                label={t('session.launcher.AgentNode')}
+                              >
+                                {form.getFieldValue('agent') ||
+                                  t('session.launcher.AutoSelect')}
+                              </Descriptions.Item>
+                            )}
                           <Descriptions.Item
                             label={t('session.launcher.NumberOfContainer')}
                           >
@@ -1954,6 +1979,7 @@ const SessionLauncherPage = () => {
                   command: undefined,
                   scheduleDate: undefined,
                 },
+                agent: 'auto', // Add the missing 'agent' property
               } as Omit<
                 Required<OptionalFieldsOnly<SessionLauncherFormValue>>,
                 'autoMountedFolderNames'
diff --git a/resources/i18n/de.json b/resources/i18n/de.json
index cc715e2f44..55ce08d636 100644
--- a/resources/i18n/de.json
+++ b/resources/i18n/de.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Die zuweisbaren Ressourcen liegen unter der im ausgewählten Bild erforderlichen Mindestressource.",
       "RecentHistory": "Jüngere Geschichte",
       "CreatedAt": "Erstellt am",
-      "Tags": "Schlagworte"
+      "Tags": "Schlagworte",
+      "SelectAgent": "Wählen Sie Agent aus",
+      "autoSelect": "Automatische Auswahl",
+      "DescSelectAgent": "Die auf der rechten Seite des Agenten angezeigten Ressourcen stellen die tatsächliche Menge der verfügbaren Ressourcen dar. \nDerzeit ist die Agentenauswahl nur in einer Single-Node-Single-Container-Umgebung verfügbar. \nDie Standardeinstellung ist die Agentenzuteilung durch den Scheduler.",
+      "AgentNode": "Agent",
+      "AutoSelect": "automatisch auswählen"
     },
     "Preparing": "Vorbereitung...",
     "PreparingSession": "Sitzung vorbereiten...",
diff --git a/resources/i18n/el.json b/resources/i18n/el.json
index bbd6786afa..83b7b1fb8e 100644
--- a/resources/i18n/el.json
+++ b/resources/i18n/el.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Οι κατανεμητέοι πόροι πέφτουν κάτω από τον ελάχιστο απαιτούμενο πόρο στην επιλεγμένη εικόνα.",
       "RecentHistory": "Πρόσφατη ιστορία",
       "CreatedAt": "Δημιουργήθηκε στο",
-      "Tags": "Ετικέτες"
+      "Tags": "Ετικέτες",
+      "SelectAgent": "Επιλέξτε Πράκτορας",
+      "autoSelect": "Αυτόματη επιλογή",
+      "DescSelectAgent": "Οι πόροι που εμφανίζονται στη δεξιά πλευρά του πράκτορα αντιπροσωπεύουν την πραγματική ποσότητα των διαθέσιμων πόρων. \nΠρος το παρόν, η επιλογή πράκτορα είναι διαθέσιμη μόνο σε περιβάλλον ενός κοντέινερ ενός κόμβου. \nΗ προεπιλεγμένη ρύθμιση είναι η κατανομή πράκτορα από τον προγραμματιστή.",
+      "AgentNode": "Μέσο",
+      "AutoSelect": "αυτόματη επιλογή"
     },
     "Preparing": "Προετοιμασία ...",
     "PreparingSession": "Προετοιμασία συνεδρίας ...",
diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index e6ecc5ceec..c5d744c1f0 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -298,7 +298,12 @@
       "InsufficientAllocationOfResourcesWarning": "Allocatable resources falls below the minimum resource required in the selected image.",
       "RecentHistory": "Recent History",
       "CreatedAt": "CreatedAt",
-      "Tags": "Tags"
+      "Tags": "Tags",
+      "SelectAgent": "Select Agent",
+      "autoSelect": "Auto Select",
+      "DescSelectAgent": "The resources displayed on the right side of the agent represent the actual amount of available resources. Currently, agent selection is only available in a single-node single-container environment. The default setting is agent allocation by the scheduler.",
+      "AgentNode": "Agent ",
+      "AutoSelect": "auto-select"
     },
     "Preparing": "Preparing...",
     "PreparingSession": "Preparing session...",
diff --git a/resources/i18n/es.json b/resources/i18n/es.json
index 4048d54e5c..c86b731746 100644
--- a/resources/i18n/es.json
+++ b/resources/i18n/es.json
@@ -1320,7 +1320,12 @@
       "InsufficientAllocationOfResourcesWarning": "Los recursos asignables están por debajo del recurso mínimo requerido en la imagen seleccionada.",
       "RecentHistory": "Historia reciente",
       "CreatedAt": "Creado en",
-      "Tags": "Etiquetas"
+      "Tags": "Etiquetas",
+      "SelectAgent": "Seleccionar Agente",
+      "autoSelect": "Selección automática",
+      "DescSelectAgent": "Los recursos que se muestran en el lado derecho del agente representan la cantidad real de recursos disponibles. \nActualmente, la selección de agentes solo está disponible en un entorno de un solo nodo y un solo contenedor. \nLa configuración predeterminada es la asignación de agentes por parte del programador.",
+      "AgentNode": "Agente",
+      "AutoSelect": "selección automática"
     },
     "ExpiresAfter": "Tiempo restante",
     "CPU": "CPU",
diff --git a/resources/i18n/fi.json b/resources/i18n/fi.json
index aad32389ef..d23145686d 100644
--- a/resources/i18n/fi.json
+++ b/resources/i18n/fi.json
@@ -1317,7 +1317,12 @@
       "InsufficientAllocationOfResourcesWarning": "Allokoitavat resurssit jäävät alle valitussa kuvassa vaaditun vähimmäisresurssin.",
       "RecentHistory": "Lähihistoria",
       "CreatedAt": "LuotuAt",
-      "Tags": "Tunnisteet"
+      "Tags": "Tunnisteet",
+      "SelectAgent": "Valitse Agentti",
+      "autoSelect": "Automaattinen valinta",
+      "DescSelectAgent": "Agentin oikealla puolella näkyvät resurssit edustavat käytettävissä olevien resurssien todellista määrää. \nTällä hetkellä agentin valinta on käytettävissä vain yhden solmun yhden säilön ympäristössä. \nOletusasetus on ajastimen suorittama agentin allokointi.",
+      "AgentNode": "Agentti",
+      "AutoSelect": "automaattinen valinta"
     },
     "ExpiresAfter": "Jäljellä oleva aika",
     "CPU": "CPU",
diff --git a/resources/i18n/fr.json b/resources/i18n/fr.json
index 9bfd6cf2fa..634387d222 100644
--- a/resources/i18n/fr.json
+++ b/resources/i18n/fr.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Les ressources allouables sont inférieures à la ressource minimale requise dans l'image sélectionnée.",
       "RecentHistory": "Histoire récente",
       "CreatedAt": "Créé à",
-      "Tags": "Balises"
+      "Tags": "Balises",
+      "SelectAgent": "Sélectionnez un agent",
+      "autoSelect": "Sélection automatique",
+      "DescSelectAgent": "Les ressources affichées sur le côté droit de l'agent représentent la quantité réelle de ressources disponibles. \nActuellement, la sélection d'agents n'est disponible que dans un environnement à nœud unique et à conteneur unique. \nLe paramètre par défaut est l'allocation des agents par le planificateur.",
+      "AgentNode": "Agent",
+      "AutoSelect": "sélection automatique"
     },
     "Preparing": "En train de préparer...",
     "PreparingSession": "Séance de préparation...",
diff --git a/resources/i18n/id.json b/resources/i18n/id.json
index 8254e660c8..8923b2fcf7 100644
--- a/resources/i18n/id.json
+++ b/resources/i18n/id.json
@@ -285,7 +285,12 @@
       "InsufficientAllocationOfResourcesWarning": "Sumber daya yang dapat dialokasikan berada di bawah sumber daya minimum yang diperlukan pada gambar yang dipilih.",
       "RecentHistory": "Riwayat Terbaru",
       "CreatedAt": "DibuatPada",
-      "Tags": "Tag"
+      "Tags": "Tag",
+      "SelectAgent": "Pilih Agen",
+      "autoSelect": "Pilih Otomatis",
+      "DescSelectAgent": "Sumber daya yang ditampilkan di sisi kanan agen mewakili jumlah sebenarnya sumber daya yang tersedia. \nSaat ini, pemilihan agen hanya tersedia di lingkungan kontainer tunggal node tunggal. \nPengaturan defaultnya adalah alokasi agen oleh penjadwal.",
+      "AgentNode": "Agen",
+      "AutoSelect": "pilih otomatis"
     },
     "Preparing": "Mempersiapkan...",
     "PreparingSession": "Mempersiapkan sesi...",
diff --git a/resources/i18n/it.json b/resources/i18n/it.json
index 73e1ba4743..723d6a632b 100644
--- a/resources/i18n/it.json
+++ b/resources/i18n/it.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Le risorse assegnabili sono inferiori alla risorsa minima richiesta nell'immagine selezionata.",
       "RecentHistory": "Storia recente",
       "CreatedAt": "CreatoAt",
-      "Tags": "Tag"
+      "Tags": "Tag",
+      "SelectAgent": "Seleziona Agente",
+      "autoSelect": "Auto selezione",
+      "DescSelectAgent": "Le risorse visualizzate sul lato destro dell'agente rappresentano la quantità effettiva di risorse disponibili. \nAttualmente, la selezione dell'agente è disponibile solo in un ambiente con contenitore singolo a nodo singolo. \nL'impostazione predefinita è l'allocazione dell'agente da parte dello scheduler.",
+      "AgentNode": "Agente",
+      "AutoSelect": "selezione automatica"
     },
     "Preparing": "Preparazione...",
     "PreparingSession": "Preparazione della sessione...",
diff --git a/resources/i18n/ja.json b/resources/i18n/ja.json
index 987e053f3f..f785f9c741 100644
--- a/resources/i18n/ja.json
+++ b/resources/i18n/ja.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "割り当て可能なリソースが、選択したイメージに必要な最小リソースを下回ります。",
       "RecentHistory": "最近の歴史",
       "CreatedAt": "作成日",
-      "Tags": "タグ"
+      "Tags": "タグ",
+      "SelectAgent": "エージェントの選択",
+      "autoSelect": "自動選択",
+      "DescSelectAgent": "エージェントの右側に表示されるリソースは、使用可能なリソースの実際の量を表します。\n現在、エージェントの選択は、単一ノード、単一コンテナー環境でのみ使用できます。\nデフォルト設定は、スケジューラによるエージェント割り当てです。",
+      "AgentNode": "エージェント",
+      "AutoSelect": "自動選択"
     },
     "Preparing": "準備...",
     "PreparingSession": "セッションの準備...",
diff --git a/resources/i18n/ko.json b/resources/i18n/ko.json
index 84370e33fd..0c4f412d72 100644
--- a/resources/i18n/ko.json
+++ b/resources/i18n/ko.json
@@ -285,7 +285,12 @@
       "InsufficientAllocationOfResourcesWarning": "할당 가능한 자원이 선택된 이미지에서 요구되는 최소 자원보다 부족합니다.",
       "RecentHistory": "최근 기록",
       "CreatedAt": "생성 시간",
-      "Tags": "태그"
+      "Tags": "태그",
+      "SelectAgent": "에이전트 선택",
+      "autoSelect": "자동 선택",
+      "DescSelectAgent": "에이전트 오른쪽에 표시되는 자원은 실제 사용 가능한 자원의 양을 나타냅니다. \n현재 에이전트 선택은 단일 노드 단일 컨테이너 환경에서만 사용할 수 있습니다. \n기본 설정은 스케줄러에 의한 에이전트 할당입니다.",
+      "AgentNode": "에이전트",
+      "AutoSelect": "자동 선택"
     },
     "Preparing": "준비중...",
     "PreparingSession": "세션 준비중...",
diff --git a/resources/i18n/mn.json b/resources/i18n/mn.json
index bb9d64bfe3..4cf77e72bd 100644
--- a/resources/i18n/mn.json
+++ b/resources/i18n/mn.json
@@ -285,7 +285,12 @@
       "InsufficientAllocationOfResourcesWarning": "Хуваарилах нөөц нь сонгосон зурагт шаардагдах хамгийн бага нөөцөөс доогуур байна.",
       "RecentHistory": "Сүүлийн үеийн түүх",
       "CreatedAt": "Үүсгэсэн",
-      "Tags": "Шошго"
+      "Tags": "Шошго",
+      "SelectAgent": "Агентийг сонгоно уу",
+      "autoSelect": "Автоматаар сонгох",
+      "DescSelectAgent": "Агентын баруун талд харуулсан нөөцүүд нь боломжтой нөөцийн бодит хэмжээг илэрхийлдэг. \nОдоогоор агент сонгох нь зөвхөн нэг зангилаатай нэг контейнер орчинд боломжтой. \nӨгөгдмөл тохиргоо нь хуваарь гаргагчийн агентын хуваарилалт юм.",
+      "AgentNode": "Агент",
+      "AutoSelect": "автоматаар сонгох"
     },
     "Preparing": "Бэлтгэж байна ...",
     "PreparingSession": "Session бэлтгэж байна ...",
diff --git a/resources/i18n/ms.json b/resources/i18n/ms.json
index cf48f2a33c..63a97f78fd 100644
--- a/resources/i18n/ms.json
+++ b/resources/i18n/ms.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Sumber yang boleh diperuntukkan berada di bawah sumber minimum yang diperlukan dalam imej yang dipilih.",
       "RecentHistory": "Sejarah Terkini",
       "CreatedAt": "Dicipta Pada",
-      "Tags": "Tag"
+      "Tags": "Tag",
+      "SelectAgent": "Pilih Ejen",
+      "autoSelect": "Pilih Auto",
+      "DescSelectAgent": "Sumber yang dipaparkan di sebelah kanan ejen mewakili jumlah sebenar sumber yang tersedia. \nPada masa ini, pemilihan ejen hanya tersedia dalam persekitaran bekas tunggal nod tunggal. \nTetapan lalai ialah peruntukan ejen oleh penjadual.",
+      "AgentNode": "ejen",
+      "AutoSelect": "auto-pilih"
     },
     "Preparing": "Menyiapkan ...",
     "PreparingSession": "Menyiapkan sesi ...",
diff --git a/resources/i18n/pl.json b/resources/i18n/pl.json
index f1250a198c..a6147da667 100644
--- a/resources/i18n/pl.json
+++ b/resources/i18n/pl.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Zasoby, które można przydzielić, są mniejsze niż minimalne zasoby wymagane w wybranym obrazie.",
       "RecentHistory": "Najnowsza historia",
       "CreatedAt": "Utworzono o godz",
-      "Tags": "Tagi"
+      "Tags": "Tagi",
+      "SelectAgent": "Wybierz Agenta",
+      "autoSelect": "Automatyczny wybór",
+      "DescSelectAgent": "Zasoby wyświetlane po prawej stronie agenta reprezentują rzeczywistą ilość dostępnych zasobów. \nObecnie wybór agenta jest dostępny tylko w środowisku z jednym węzłem i jednym kontenerem. \nUstawieniem domyślnym jest przydzielanie agentów przez program planujący.",
+      "AgentNode": "Agent",
+      "AutoSelect": "automatyczny wybór"
     },
     "Preparing": "Przygotowuję...",
     "PreparingSession": "Przygotowuję sesję...",
diff --git a/resources/i18n/pt-BR.json b/resources/i18n/pt-BR.json
index e3dd1bf3d8..ff67456094 100644
--- a/resources/i18n/pt-BR.json
+++ b/resources/i18n/pt-BR.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Os recursos alocáveis ​​ficam abaixo do recurso mínimo exigido na imagem selecionada.",
       "RecentHistory": "História recente",
       "CreatedAt": "Criado em",
-      "Tags": "Etiquetas"
+      "Tags": "Etiquetas",
+      "SelectAgent": "Selecione Agente",
+      "autoSelect": "Auto seleção",
+      "DescSelectAgent": "Os recursos exibidos no lado direito do agente representam a quantidade real de recursos disponíveis. \nAtualmente, a seleção de agentes está disponível apenas em um ambiente de nó único e contêiner único. \nA configuração padrão é a alocação de agentes pelo agendador.",
+      "AgentNode": "Agente",
+      "AutoSelect": "seleção automática"
     },
     "Preparing": "Preparando...",
     "PreparingSession": "Preparando sessão ...",
diff --git a/resources/i18n/pt.json b/resources/i18n/pt.json
index c1b0a84eeb..32225ea785 100644
--- a/resources/i18n/pt.json
+++ b/resources/i18n/pt.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Os recursos alocáveis ​​ficam abaixo do recurso mínimo exigido na imagem selecionada.",
       "RecentHistory": "História recente",
       "CreatedAt": "Criado em",
-      "Tags": "Etiquetas"
+      "Tags": "Etiquetas",
+      "SelectAgent": "Selecione Agente",
+      "autoSelect": "Auto seleção",
+      "DescSelectAgent": "Os recursos exibidos no lado direito do agente representam a quantidade real de recursos disponíveis. \nAtualmente, a seleção de agentes está disponível apenas em um ambiente de nó único e contêiner único. \nA configuração padrão é a alocação de agentes pelo agendador.",
+      "AgentNode": "Agente",
+      "AutoSelect": "seleção automática"
     },
     "Preparing": "Preparando...",
     "PreparingSession": "Preparando sessão ...",
diff --git a/resources/i18n/ru.json b/resources/i18n/ru.json
index 3570431abc..dbd743c4d1 100644
--- a/resources/i18n/ru.json
+++ b/resources/i18n/ru.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Выделяемые ресурсы ниже минимального ресурса, необходимого для выбранного изображения.",
       "RecentHistory": "Новейшая история",
       "CreatedAt": "Создано в",
-      "Tags": "Теги"
+      "Tags": "Теги",
+      "SelectAgent": "Выберите агента",
+      "autoSelect": "Авто Выбор",
+      "DescSelectAgent": "Ресурсы, отображаемые в правой части агента, представляют собой фактическое количество доступных ресурсов. \nВ настоящее время выбор агента доступен только в среде с одним узлом и одним контейнером. \nПо умолчанию установлено распределение агента планировщиком.",
+      "AgentNode": "Агент",
+      "AutoSelect": "автоматический выбор"
     },
     "Preparing": "Подготовка ...",
     "PreparingSession": "Подготовка сеанса ...",
diff --git a/resources/i18n/th.json b/resources/i18n/th.json
index 332530871d..3849c23358 100644
--- a/resources/i18n/th.json
+++ b/resources/i18n/th.json
@@ -298,7 +298,9 @@
       "InsufficientAllocationOfResourcesWarning": "ทรัพยากรที่จัดสรรได้อยู่ต่ำกว่าทรัพยากรขั้นต่ำที่จำเป็นในรูปภาพที่เลือก",
       "RecentHistory": "ประวัติศาสตร์ล่าสุด",
       "CreatedAt": "สร้างเมื่อ",
-      "Tags": "แท็ก"
+      "Tags": "แท็ก",
+      "AgentNode": "ตัวแทน",
+      "AutoSelect": "เลือกอัตโนมัติ"
     },
     "Preparing": "กำลังเตรียมการ...",
     "PreparingSession": "กำลังเตรียมเซสชัน...",
diff --git a/resources/i18n/tr.json b/resources/i18n/tr.json
index eb27ac0d79..5f026d8117 100644
--- a/resources/i18n/tr.json
+++ b/resources/i18n/tr.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Tahsis edilebilir kaynaklar, seçilen görüntüde gereken minimum kaynağın altına düşüyor.",
       "RecentHistory": "Yakın Tarih",
       "CreatedAt": "Oluşturulma Tarihi",
-      "Tags": "Etiketler"
+      "Tags": "Etiketler",
+      "SelectAgent": "Temsilci Seçin",
+      "autoSelect": "Otomatik seçim",
+      "DescSelectAgent": "Aracının sağ tarafında görüntülenen kaynaklar, mevcut kaynakların gerçek miktarını temsil eder. \nŞu anda aracı seçimi yalnızca tek düğümlü, tek kapsayıcılı bir ortamda mümkündür. \nVarsayılan ayar, ajanın zamanlayıcı tarafından tahsis edilmesidir.",
+      "AgentNode": "Ajan",
+      "AutoSelect": "otomatik seç"
     },
     "Preparing": "hazırlanıyor...",
     "PreparingSession": "Oturum hazırlanıyor...",
diff --git a/resources/i18n/vi.json b/resources/i18n/vi.json
index 98dae5935e..0a91fc8b39 100644
--- a/resources/i18n/vi.json
+++ b/resources/i18n/vi.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "Tài nguyên có thể phân bổ giảm xuống dưới mức tài nguyên tối thiểu được yêu cầu trong hình ảnh đã chọn.",
       "RecentHistory": "Lịch sử gần đây",
       "CreatedAt": "Đã tạoTại",
-      "Tags": "Thẻ"
+      "Tags": "Thẻ",
+      "SelectAgent": "Chọn đại lý",
+      "autoSelect": "Tự động lựa chọn",
+      "DescSelectAgent": "Các tài nguyên được hiển thị ở phía bên phải của tác nhân thể hiện số lượng tài nguyên sẵn có thực tế. \nHiện tại, lựa chọn tác nhân chỉ khả dụng trong môi trường vùng chứa đơn một nút. \nCài đặt mặc định là phân bổ nhân viên theo lịch trình.",
+      "AgentNode": "Đại lý",
+      "AutoSelect": "tự động chọn"
     },
     "Preparing": "Đang chuẩn bị ...",
     "PreparingSession": "Đang chuẩn bị phiên ...",
diff --git a/resources/i18n/zh-CN.json b/resources/i18n/zh-CN.json
index 71c2e70ce0..874ceaa5a4 100644
--- a/resources/i18n/zh-CN.json
+++ b/resources/i18n/zh-CN.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "可分配资源低于所选映像所需的最低资源。",
       "RecentHistory": "近代历史",
       "CreatedAt": "创建时间",
-      "Tags": "标签"
+      "Tags": "标签",
+      "SelectAgent": "选择代理",
+      "autoSelect": "自动选择",
+      "DescSelectAgent": "代理右侧显示的资源代表实际可用资源量。\n目前，代理选择仅适用于单节点单容器环境。\n默认设置是由调度程序分配代理。",
+      "AgentNode": "代理人",
+      "AutoSelect": "自动选择"
     },
     "Preparing": "正在准备...",
     "PreparingSession": "正在准备会议...",
diff --git a/resources/i18n/zh-TW.json b/resources/i18n/zh-TW.json
index ba1c5183d3..b65e891add 100644
--- a/resources/i18n/zh-TW.json
+++ b/resources/i18n/zh-TW.json
@@ -284,7 +284,12 @@
       "InsufficientAllocationOfResourcesWarning": "可分配資源低於所選映像所需的最低資源。",
       "RecentHistory": "近代历史",
       "CreatedAt": "創建時間",
-      "Tags": "標籤"
+      "Tags": "標籤",
+      "SelectAgent": "選擇代理",
+      "autoSelect": "自動選擇",
+      "DescSelectAgent": "代理右側顯示的資源代表實際可用資源量。\n目前，代理選擇僅適用於單節點單容器環境。\n預設設定是由調度程序分配代理。",
+      "AgentNode": "代理人",
+      "AutoSelect": "自動選擇"
     },
     "Preparing": "正在準備...",
     "PreparingSession": "正在準備會議...",
diff --git a/src/components/backend-ai-session-list.ts b/src/components/backend-ai-session-list.ts
index 0c738b0a61..8a63a01058 100644
--- a/src/components/backend-ai-session-list.ts
+++ b/src/components/backend-ai-session-list.ts
@@ -1109,13 +1109,16 @@ export default class BackendAISessionList extends BackendAIPage {
                 sessions[objectKey].cpu_used_time =
                   this._automaticScaledTime(0);
               }
-              if (this.is_superadmin) {
+              if (
+                this.is_superadmin ||
+                !globalThis.backendaiclient._config.hideAgents
+              ) {
                 sessions[objectKey].agents_ids_with_container_ids = sessions[
                   objectKey
                 ].containers
                   ?.map((c) => {
-                    const agentID = c.agent;
-                    const containerID = c.container_id?.slice(0, 4);
+                    const agentID = c.agent ?? '-';
+                    const containerID = c.container_id?.slice(0, 4) ?? '-';
                     return `${agentID}(${containerID})`;
                   })
                   ?.join('\n');
@@ -4556,7 +4559,7 @@ ${rowData.item[this.sessionNameField]}</pre
     render(
       // language=HTML
       html`
-        <pre>${rowData.item.agents_ids_with_container_ids}</pre>
+        <pre>${rowData?.item?.agents_ids_with_container_ids ?? ''}</pre>
       `,
       root,
     );
diff --git a/src/lib/backend.ai-client-esm.ts b/src/lib/backend.ai-client-esm.ts
index f20d063da5..536da6ea57 100644
--- a/src/lib/backend.ai-client-esm.ts
+++ b/src/lib/backend.ai-client-esm.ts
@@ -718,6 +718,9 @@ class Client {
       this._features['extend-login-session'] = true;
       this._features['session-node'] = true;
     }
+    if (this.isManagerVersionCompatibleWith('24.09.1')) {
+      this._features['agent-select'] = true;
+    }
     if (this.isManagerVersionCompatibleWith('24.12.0')) {
       this._features['extended-image-info'] = true;
     }
@@ -1142,6 +1145,9 @@ class Client {
       if (resources['preopen_ports']) {
         params['config'].preopen_ports = resources['preopen_ports'];
       }
+      if (resources['agent_list']) {
+        params['config'].agent_list = resources['agent_list'];
+      }
     }
     let rqst;
     if (this._apiVersionMajor < 5) {