From 749be0a77188ee92bfc8278deceb2a4ed369bd77 Mon Sep 17 00:00:00 2001
From: TianxingZhang-0129 <ztx.19951210@icloud.com>
Date: Thu, 25 Jun 2026 18:24:27 +0800
Subject: [PATCH 1/2] test(web-ui): restore OHOS E2E locators

---
 .../NavPanel/sections/sessions/SessionsSection.tsx        | 6 ++++++
 src/web-ui/src/app/scenes/skills/SkillsScene.tsx          | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/web-ui/src/app/components/NavPanel/sections/sessions/SessionsSection.tsx b/src/web-ui/src/app/components/NavPanel/sections/sessions/SessionsSection.tsx
index 842dc3ad04..0cfa183d1c 100644
--- a/src/web-ui/src/app/components/NavPanel/sections/sessions/SessionsSection.tsx
+++ b/src/web-ui/src/app/components/NavPanel/sections/sessions/SessionsSection.tsx
@@ -1166,6 +1166,8 @@ const SessionsSection: React.FC<SessionsSectionProps> = ({
                       ref={openMenuSessionId === session.sessionId ? sessionMenuAnchorRef : undefined}
                       className={`bitfun-nav-panel__inline-item-action-btn${openMenuSessionId === session.sessionId ? ' is-open' : ''}`}
                       onClick={e => handleMenuOpen(e, session.sessionId)}
+                      data-testid="nav-session-menu-btn"
+                      data-session-id={session.sessionId}
                     >
                       <MoreHorizontal size="var(--bitfun-nav-row-action-icon-size)" />
                     </button>
@@ -1176,11 +1178,14 @@ const SessionsSection: React.FC<SessionsSectionProps> = ({
                       className="bitfun-nav-panel__inline-item-menu-popover"
                       role="menu"
                       style={{ top: `${sessionMenuPosition.top}px`, left: `${sessionMenuPosition.left}px` }}
+                      data-testid="nav-session-menu"
+                      data-session-id={session.sessionId}
                     >
                       <button
                         type="button"
                         className="bitfun-nav-panel__inline-item-menu-item"
                         onClick={e => { setOpenMenuSessionId(null); handleStartEdit(e, session); }}
+                        data-testid="nav-session-menu-rename"
                       >
                         <Pencil size={13} />
                         <span>{t('nav.sessions.rename')}</span>
@@ -1210,6 +1215,7 @@ const SessionsSection: React.FC<SessionsSectionProps> = ({
                         type="button"
                         className="bitfun-nav-panel__inline-item-menu-item is-danger"
                         onClick={e => { setOpenMenuSessionId(null); void handleDelete(e, session.sessionId); }}
+                        data-testid="nav-session-menu-delete"
                       >
                         <Trash2 size={13} />
                         <span>{t('nav.sessions.delete')}</span>
diff --git a/src/web-ui/src/app/scenes/skills/SkillsScene.tsx b/src/web-ui/src/app/scenes/skills/SkillsScene.tsx
index bb13f81633..18fc577b2f 100644
--- a/src/web-ui/src/app/scenes/skills/SkillsScene.tsx
+++ b/src/web-ui/src/app/scenes/skills/SkillsScene.tsx
@@ -179,12 +179,16 @@ const SkillsScene: React.FC = () => {
             type="button"
             className={`skills-tabs-bar__tab ${activeTab === 'installed' ? 'is-active' : ''}`}
             onClick={() => setActiveTab('installed')}
+            data-testid="skills-tab-installed"
+            data-skills-tab-active={activeTab === 'installed' ? 'true' : 'false'}
           ><span>{t('installed.titleAll')}</span></button>
           <span className="skills-tabs-bar__divider" />
           <button
             type="button"
             className={`skills-tabs-bar__tab ${activeTab === 'discover' ? 'is-active' : ''}`}
             onClick={() => setActiveTab('discover')}
+            data-testid="skills-tab-discover"
+            data-skills-tab-active={activeTab === 'discover' ? 'true' : 'false'}
           ><span>{t('market.title')}</span></button>
         </div>
       </div>
@@ -192,7 +196,7 @@ const SkillsScene: React.FC = () => {
       <div className="skills-page">
 
         {activeTab === 'installed' && (
-          <div className="skills-installed">
+          <div className="skills-installed" data-testid="skills-installed-panel">
             <aside className="skills-sidebar">
               <div className="skills-sidebar__header">
                 <h2 className="skills-sidebar__title">{t('installed.titleAll')}</h2>
@@ -425,7 +429,7 @@ const SkillsScene: React.FC = () => {
         )}
 
         {activeTab === 'discover' && (
-          <div className="skills-discover">
+          <div className="skills-discover" data-testid="skills-discover-panel">
             <div className="skills-discover__hero">
               <div className="skills-discover__hero-content">
                 <h1 className="skills-discover__title">{t('market.title')}</h1>

From 99b025e615955983e129a2c71f08383d453f919f Mon Sep 17 00:00:00 2001
From: TianxingZhang-0129 <ztx.19951210@icloud.com>
Date: Thu, 25 Jun 2026 19:03:03 +0800
Subject: [PATCH 2/2] test(web-ui): strengthen model locator semantics

---
 docs/development/ui-testids-CN.md             | 17 +++++---
 docs/development/ui-testids.md                | 17 +++++---
 .../flow_chat/components/ModelSelector.tsx    | 39 +++++++++++++++++-
 .../config/components/AIModelConfig.tsx       | 41 ++++++++++++++++++-
 4 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/docs/development/ui-testids-CN.md b/docs/development/ui-testids-CN.md
index ab6058e286..7db672b04a 100644
--- a/docs/development/ui-testids-CN.md
+++ b/docs/development/ui-testids-CN.md
@@ -188,7 +188,7 @@
 
 | Chat 模型选择按钮 | `chat-model-selector-btn` | 打开当前会话的模型选择器。 |
 | Chat 模型选择菜单 | `chat-model-selector-menu` | 模型选择下拉菜单根节点。 |
-| Chat 模型选择项 | `chat-model-selector-option` | 重复项。配合 `data-model-id`、`data-model-name` 和 `data-selected` 使用。 |
+| Chat 模型选择项 | `chat-model-selector-option` | 重复项。配合 `data-option-kind`、`data-model-role`、`data-model-id`、`data-model-name`、`data-provider-id` 和 `data-selected` 使用。别名入口会继续保留 `data-model-id="auto" / "primary" / "fast"`；其中 `primary-alias` 和 `fast-alias` 还会额外提供 `data-resolved-model-id`、`data-resolved-model-name` 和 `data-resolved-provider-id`。 |
 | Chat 用户消息 | `chat-user-message` | 重复的用户消息。配合 `data-turn-id`、`data-status` 和 `data-failed` 使用。 |
 | Chat 用户消息内容 | `chat-user-message-content` | 用户消息文本内容。配合 `data-turn-id` 使用。 |
 | Chat assistant 消息 | `chat-assistant-message` | 重复的模型轮次容器。配合 `data-turn-id`、`data-round-id`、`data-status`、`data-model-id`、`data-model-alias` 和 `data-streaming` 使用。 |
@@ -241,16 +241,21 @@
 | 模型请求格式选择器 | `settings-model-request-format-select` | 请求格式选择器，例如 OpenAI-compatible 或 Anthropic。 |
 | 模型选择按钮 | `settings-model-select-btn` | 打开模型选择下拉框。 |
 | 模型选择菜单 | `settings-model-select-menu` | 模型选择下拉框根节点。 |
-| 模型选择项 | `settings-model-option` | 重复的下拉项。配合 `data-model-id`、`data-model-name` 和 `data-selected` 使用。 |
+| 模型选择项 | `settings-model-option` | 重复的下拉项。配合 `data-option-kind="model"`、`data-model-role="normal"`、`data-model-state="selectable"`、`data-model-source`、`data-model-id`、`data-model-name`、`data-provider-id` 和 `data-selected` 使用。 |
 | 手动模型名称输入框 | `settings-model-manual-name-input` | 手动/自定义模型名称输入字段。 |
 | 添加自定义模型按钮 | `settings-model-add-custom-btn` | 将手动模型名称加入已选模型列表。 |
 | 已选模型列表 | `settings-model-selected-list` | 已选模型草稿列表。包含 `data-selected-count`。 |
 | 已选模型空状态 | `settings-model-selected-list-empty` | 已选模型草稿为空时的状态。包含 `data-selected-count="0"`。 |
-| 已选模型行 | `settings-model-selected-row` | 重复的已选模型草稿。配合 `data-model-id`、`data-model-name`、`data-selected` 和 `data-expanded` 使用。 |
-| 已选模型移除按钮 | `settings-model-selected-remove-btn` | 移除已选模型草稿。配合 `data-model-id` 和 `data-model-name` 使用。 |
+| 已选模型行 | `settings-model-selected-row` | 重复的已选模型草稿。配合 `data-option-kind="selected-draft"`、`data-model-role="normal"`、`data-model-state="draft"`、`data-model-id`、`data-model-name`、`data-provider-id`、`data-config-id`、`data-selected` 和 `data-expanded` 使用。 |
+| 已选模型移除按钮 | `settings-model-selected-remove-btn` | 移除已选模型草稿。配合 `data-option-kind="selected-draft"`、`data-model-role="normal"`、`data-model-state="draft"`、`data-model-id`、`data-model-name`、`data-provider-id` 和 `data-config-id` 使用。 |
 | 模型保存按钮 | `settings-model-save-btn` | 保存模型提供商/模型配置表单。 |
-| 模型行 | `settings-model-row` | 重复的已保存模型行。配合 `data-model-id`、`data-model-name` 和 `data-config-id` 使用。 |
-| 模型测试状态 | `settings-model-test-status` | 重复的已保存模型测试状态。配合 `data-model-id`、`data-model-name`、`data-config-id` 和 `data-status` 使用，`data-status` 可为 `success` 或 `error`。 |
+| 模型行 | `settings-model-row` | 重复的已保存模型行。配合 `data-option-kind="saved-model"`、`data-model-role="normal"`、`data-model-state="saved"`、`data-model-id`、`data-model-name`、`data-provider-id` 和 `data-config-id` 使用。 |
+| 模型测试状态 | `settings-model-test-status` | 重复的已保存模型测试状态。配合 `data-option-kind="saved-model-status"`、`data-model-role="normal"`、`data-model-state="saved"`、`data-model-id`、`data-model-name`、`data-provider-id`、`data-config-id` 和 `data-status` 使用，`data-status` 可为 `success` 或 `error`。 |
+
+模型定位建议：
+- 在聊天页里，优先使用 `data-option-kind` 和 `data-model-role` 区分 `auto`、`primary-alias`、`fast-alias`、`acp-model` 与真实 `model`，不要只靠展示文案或 `data-model-name`。
+- `data-model-name` 更适合作为展示元数据，不应单独当作唯一键。需要唯一定位时，应与 `data-model-id`、`data-provider-id`，或别名入口专用的 `data-resolved-model-id` 组合使用。
+- 在设置页里，先用 `data-model-state` 区分“下拉可选项 / 草稿已选项 / 已保存项 / 已保存测试状态”，再按 `data-model-id` 或 `data-provider-id` 进一步过滤。
 
 ## Settings Appearance
 
diff --git a/docs/development/ui-testids.md b/docs/development/ui-testids.md
index 5adc253b02..b91d754832 100644
--- a/docs/development/ui-testids.md
+++ b/docs/development/ui-testids.md
@@ -187,7 +187,7 @@ Avoid adding IDs to these surfaces unless there is a clear automated workflow.
 | Chat input start BTW button | `chat-input-boost-start-btw` | Starts the BTW flow when present. |
 | Chat model selector button | `chat-model-selector-btn` | Opens the session model selector. |
 | Chat model selector menu | `chat-model-selector-menu` | Model selector dropdown root. |
-| Chat model selector option | `chat-model-selector-option` | Repeated item. Pair with `data-model-id`, `data-model-name`, and `data-selected`. |
+| Chat model selector option | `chat-model-selector-option` | Repeated item. Pair with `data-option-kind`, `data-model-role`, `data-model-id`, `data-model-name`, `data-provider-id`, and `data-selected`. Alias entries keep `data-model-id` as `auto` / `primary` / `fast`; `primary-alias` and `fast-alias` also expose `data-resolved-model-id`, `data-resolved-model-name`, and `data-resolved-provider-id`. |
 | Chat user message | `chat-user-message` | Repeated user message. Pair with `data-turn-id`, `data-status`, and `data-failed`. |
 | Chat user message content | `chat-user-message-content` | User message text content. Pair with `data-turn-id`. |
 | Chat assistant message | `chat-assistant-message` | Repeated model round container. Pair with `data-turn-id`, `data-round-id`, `data-status`, `data-model-id`, `data-model-alias`, and `data-streaming`. |
@@ -241,16 +241,21 @@ Avoid adding IDs to these surfaces unless there is a clear automated workflow.
 | Model request format select | `settings-model-request-format-select` | Request format selector, for example OpenAI-compatible vs Anthropic. |
 | Model select button | `settings-model-select-btn` | Opens the model selection dropdown. |
 | Model selection menu | `settings-model-select-menu` | Model selection dropdown root. |
-| Model selection option | `settings-model-option` | Repeated dropdown item. Pair with `data-model-id`, `data-model-name`, and `data-selected`. |
+| Model selection option | `settings-model-option` | Repeated dropdown item. Pair with `data-option-kind="model"`, `data-model-role="normal"`, `data-model-state="selectable"`, `data-model-source`, `data-model-id`, `data-model-name`, `data-provider-id`, and `data-selected`. |
 | Manual model name input | `settings-model-manual-name-input` | Manual/custom model name entry field. |
 | Add custom model button | `settings-model-add-custom-btn` | Adds the manual model name into the selected model list. |
 | Selected model list | `settings-model-selected-list` | Selected model draft list. Includes `data-selected-count`. |
 | Selected model empty state | `settings-model-selected-list-empty` | Empty selected model draft state. Includes `data-selected-count="0"`. |
-| Selected model row | `settings-model-selected-row` | Repeated selected model draft. Pair with `data-model-id`, `data-model-name`, `data-selected`, and `data-expanded`. |
-| Selected model remove button | `settings-model-selected-remove-btn` | Removes a selected model draft. Pair with `data-model-id` and `data-model-name`. |
+| Selected model row | `settings-model-selected-row` | Repeated selected model draft. Pair with `data-option-kind="selected-draft"`, `data-model-role="normal"`, `data-model-state="draft"`, `data-model-id`, `data-model-name`, `data-provider-id`, `data-config-id`, `data-selected`, and `data-expanded`. |
+| Selected model remove button | `settings-model-selected-remove-btn` | Removes a selected model draft. Pair with `data-option-kind="selected-draft"`, `data-model-role="normal"`, `data-model-state="draft"`, `data-model-id`, `data-model-name`, `data-provider-id`, and `data-config-id`. |
 | Model save button | `settings-model-save-btn` | Saves the model provider/configuration form. |
-| Model row | `settings-model-row` | Repeated saved model row. Pair with `data-model-id`, `data-model-name`, and `data-config-id`. |
-| Model test status | `settings-model-test-status` | Repeated saved model test status. Pair with `data-model-id`, `data-model-name`, `data-config-id`, and `data-status` (`success` or `error`). |
+| Model row | `settings-model-row` | Repeated saved model row. Pair with `data-option-kind="saved-model"`, `data-model-role="normal"`, `data-model-state="saved"`, `data-model-id`, `data-model-name`, `data-provider-id`, and `data-config-id`. |
+| Model test status | `settings-model-test-status` | Repeated saved model test status. Pair with `data-option-kind="saved-model-status"`, `data-model-role="normal"`, `data-model-state="saved"`, `data-model-id`, `data-model-name`, `data-provider-id`, `data-config-id`, and `data-status` (`success` or `error`). |
+
+Model locator guidance:
+- Prefer `data-option-kind` plus `data-model-role` to distinguish alias entries from real model entries. Use `auto`, `primary-alias`, `fast-alias`, `acp-model`, and `model` in chat instead of matching by visible text.
+- Treat `data-model-name` as display metadata, not as a unique key by itself. For unique targeting, combine it with `data-model-id`, `data-provider-id`, or the alias-only `data-resolved-model-id`.
+- In settings flows, use `data-model-state` to separate selectable dropdown options, selected drafts, saved configs, and saved test-status nodes before filtering by model id or provider.
 
 ## Settings Appearance
 
diff --git a/src/web-ui/src/flow_chat/components/ModelSelector.tsx b/src/web-ui/src/flow_chat/components/ModelSelector.tsx
index 6585a5860a..1d390ab894 100644
--- a/src/web-ui/src/flow_chat/components/ModelSelector.tsx
+++ b/src/web-ui/src/flow_chat/components/ModelSelector.tsx
@@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next';
 import { configManager } from '@/infrastructure/config/services/ConfigManager';
 import { agentAPI } from '@/infrastructure/api/service-api/AgentAPI';
 import { ACPClientAPI, type AcpSessionOptions } from '@/infrastructure/api/service-api/ACPClientAPI';
-import { getProviderDisplayName } from '@/infrastructure/config/services/modelConfigs';
+import { getProviderDisplayName, getProviderTemplateId } from '@/infrastructure/config/services/modelConfigs';
 import { getEffectiveReasoningMode, isReasoningVisiblyEnabled } from '@/infrastructure/config/utils/reasoning';
 import { globalEventBus } from '@/infrastructure/event-bus';
 import type { AIModelConfig, DefaultModelsConfig } from '@/infrastructure/config/types';
@@ -57,11 +57,22 @@ interface ModelInfo {
   modelName: string;
   providerName: string;
   provider: string;
+  providerId?: string;
   contextWindow?: number;
   enableThinking?: boolean;
   reasoningEffort?: string;
 }
 
+type ModelOptionKind = 'auto' | 'primary-alias' | 'fast-alias' | 'acp-model' | 'model';
+type ModelRole = 'auto' | 'primary' | 'fast' | 'normal';
+
+function getProviderLocatorId(
+  config: Partial<Pick<AIModelConfig, 'provider' | 'base_url'>> | null | undefined
+): string | undefined {
+  if (!config) return undefined;
+  return getProviderTemplateId(config) || config.provider || undefined;
+}
+
 // Helper: identify special model IDs.
 const isSpecialModel = (value: string): value is 'auto' | 'primary' | 'fast' => {
   return value === 'auto' || value === 'primary' || value === 'fast';
@@ -363,6 +374,7 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
       modelName: model.name,
       providerName: acpClientId ? `${acpClientId} ACP` : 'ACP',
       provider: 'acp',
+      providerId: acpClientId || 'acp',
     }));
   }, [acpClientId, acpOptions, isAcpSession]);
 
@@ -374,6 +386,7 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
       modelName: acpOptions.currentModelId,
       providerName: acpClientId ? `${acpClientId} ACP` : 'ACP',
       provider: 'acp',
+      providerId: acpClientId || 'acp',
     };
   }, [acpAvailableModels, acpClientId, acpOptions?.currentModelId, isAcpSession]);
   
@@ -424,6 +437,7 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
         modelName: model.model_name,
         providerName: getProviderDisplayName(model),
         provider: model.provider,
+        providerId: getProviderLocatorId(model),
         contextWindow: model.context_window,
         enableThinking: isReasoningVisiblyEnabled(getEffectiveReasoningMode(model)),
         reasoningEffort: model.reasoning_effort,
@@ -439,6 +453,7 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
       modelName: model.model_name,
       providerName: getProviderDisplayName(model),
       provider: model.provider,
+      providerId: getProviderLocatorId(model),
       contextWindow: model.context_window,
       enableThinking: isReasoningVisiblyEnabled(getEffectiveReasoningMode(model)),
       reasoningEffort: model.reasoning_effort,
@@ -459,6 +474,7 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
         modelName: m.model_name,
         providerName: getProviderDisplayName(m),
         provider: m.provider,
+        providerId: getProviderLocatorId(m),
         contextWindow: m.context_window,
         enableThinking: isReasoningVisiblyEnabled(getEffectiveReasoningMode(m)),
         reasoningEffort: m.reasoning_effort,
@@ -618,6 +634,9 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
                       data-model-id={model.id}
                       data-model-name={model.modelName}
                       data-selected={isSelected ? 'true' : 'false'}
+                      data-option-kind={'acp-model' satisfies ModelOptionKind}
+                      data-model-role={'normal' satisfies ModelRole}
+                      data-provider-id={model.providerId || model.provider || ''}
                       className={`bitfun-model-selector__option ${isSelected ? 'bitfun-model-selector__option--selected' : ''}`}
                       onClick={() => handleSelectModel(model.id)}
                     >
@@ -711,6 +730,9 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
               data-model-id="auto"
               data-model-name="auto"
               data-selected={currentModelId === 'auto' ? 'true' : 'false'}
+              data-option-kind={'auto' satisfies ModelOptionKind}
+              data-model-role={'auto' satisfies ModelRole}
+              data-provider-id="auto"
               className={`bitfun-model-selector__option bitfun-model-selector__option--special ${currentModelId === 'auto' ? 'bitfun-model-selector__option--selected' : ''}`}
               onClick={() => handleSelectModel('auto')}
             >
@@ -738,6 +760,12 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
                   data-model-id="primary"
                   data-model-name={primaryModel?.model_name || 'primary'}
                   data-selected={currentModelId === 'primary' ? 'true' : 'false'}
+                  data-option-kind={'primary-alias' satisfies ModelOptionKind}
+                  data-model-role={'primary' satisfies ModelRole}
+                  data-provider-id={getProviderLocatorId(primaryModel) || primaryModel?.provider || ''}
+                  data-resolved-model-id={primaryModel?.id || ''}
+                  data-resolved-model-name={primaryModel?.model_name || ''}
+                  data-resolved-provider-id={getProviderLocatorId(primaryModel) || primaryModel?.provider || ''}
                   className={`bitfun-model-selector__option bitfun-model-selector__option--special ${currentModelId === 'primary' ? 'bitfun-model-selector__option--selected' : ''}`}
                   onClick={() => handleSelectModel('primary')}
                 >
@@ -767,6 +795,12 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
                   data-model-id="fast"
                   data-model-name={fastModel?.model_name || 'fast'}
                   data-selected={currentModelId === 'fast' ? 'true' : 'false'}
+                  data-option-kind={'fast-alias' satisfies ModelOptionKind}
+                  data-model-role={'fast' satisfies ModelRole}
+                  data-provider-id={getProviderLocatorId(fastModel) || fastModel?.provider || ''}
+                  data-resolved-model-id={fastModel?.id || ''}
+                  data-resolved-model-name={fastModel?.model_name || ''}
+                  data-resolved-provider-id={getProviderLocatorId(fastModel) || fastModel?.provider || ''}
                   className={`bitfun-model-selector__option bitfun-model-selector__option--special ${currentModelId === 'fast' ? 'bitfun-model-selector__option--selected' : ''}`}
                   onClick={() => handleSelectModel('fast')}
                 >
@@ -794,6 +828,9 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
                     data-model-id={model.id}
                     data-model-name={model.modelName}
                     data-selected={isSelected ? 'true' : 'false'}
+                    data-option-kind={'model' satisfies ModelOptionKind}
+                    data-model-role={'normal' satisfies ModelRole}
+                    data-provider-id={model.providerId || model.provider || ''}
                     className={`bitfun-model-selector__option ${isSelected ? 'bitfun-model-selector__option--selected' : ''}`}
                     onClick={() => handleSelectModel(model.id)}
                   >
diff --git a/src/web-ui/src/infrastructure/config/components/AIModelConfig.tsx b/src/web-ui/src/infrastructure/config/components/AIModelConfig.tsx
index 727999311d..8d1d4bb66b 100644
--- a/src/web-ui/src/infrastructure/config/components/AIModelConfig.tsx
+++ b/src/web-ui/src/infrastructure/config/components/AIModelConfig.tsx
@@ -1463,6 +1463,12 @@ const AIModelConfig: React.FC = () => {
     if (!isEditing || !editingConfig) return null;
     const isFromTemplate = !editingConfig.id && !!currentTemplate;
     const isProviderScopedEditing = !editingConfig.id;
+    const editingProviderId =
+      currentTemplate?.id
+      || selectedProviderId
+      || getProviderTemplateId(editingConfig)
+      || editingConfig.provider
+      || '';
     const fetchedOrPresetModelOptions: SelectOption[] = remoteModelOptions.length > 0
       ? remoteModelOptions.map(model => ({
           label: model.display_name || model.id,
@@ -1471,7 +1477,12 @@ const AIModelConfig: React.FC = () => {
           testId: 'settings-model-option',
           testAttributes: {
             'data-model-id': model.id,
-            'data-model-name': model.id,
+            'data-model-name': model.display_name || model.id,
+            'data-option-kind': 'model',
+            'data-model-role': 'normal',
+            'data-model-state': 'selectable',
+            'data-model-source': 'remote-discovery',
+            'data-provider-id': editingProviderId,
           },
         }))
       : (currentTemplate?.models || []).map(model => ({
@@ -1481,6 +1492,11 @@ const AIModelConfig: React.FC = () => {
           testAttributes: {
             'data-model-id': model,
             'data-model-name': model,
+            'data-option-kind': 'model',
+            'data-model-role': 'normal',
+            'data-model-state': 'selectable',
+            'data-model-source': 'template-preset',
+            'data-provider-id': editingProviderId,
           },
         }));
     const selectedModelOptions: SelectOption[] = selectedModelDrafts.map(draft => ({
@@ -1490,6 +1506,11 @@ const AIModelConfig: React.FC = () => {
       testAttributes: {
         'data-model-id': draft.modelName,
         'data-model-name': draft.modelName,
+        'data-option-kind': 'model',
+        'data-model-role': 'normal',
+        'data-model-state': 'selectable',
+        'data-model-source': 'selected-draft',
+        'data-provider-id': editingProviderId,
       },
     }));
     const availableModelOptions: SelectOption[] = Array.from(
@@ -1637,6 +1658,11 @@ const AIModelConfig: React.FC = () => {
                 data-testid="settings-model-selected-row"
                 data-model-id={draft.modelName}
                 data-model-name={draft.modelName}
+                data-config-id={draft.configId || ''}
+                data-provider-id={editingProviderId}
+                data-option-kind="selected-draft"
+                data-model-role="normal"
+                data-model-state="draft"
                 data-selected="true"
                 data-expanded={isExpanded ? 'true' : 'false'}
               >
@@ -1673,6 +1699,11 @@ const AIModelConfig: React.FC = () => {
                         data-testid="settings-model-selected-remove-btn"
                         data-model-id={draft.modelName}
                         data-model-name={draft.modelName}
+                        data-config-id={draft.configId || ''}
+                        data-provider-id={editingProviderId}
+                        data-option-kind="selected-draft"
+                        data-model-role="normal"
+                        data-model-state="draft"
                         variant="ghost"
                         size="small"
                         className="bitfun-ai-model-config__selected-model-remove"
@@ -2329,6 +2360,10 @@ const AIModelConfig: React.FC = () => {
             data-config-id={config.id || ''}
             data-model-id={config.model_name}
             data-model-name={config.model_name}
+            data-provider-id={getProviderTemplateId(config) || config.provider || ''}
+            data-option-kind="saved-model-status"
+            data-model-role="normal"
+            data-model-state="saved"
             data-status={testResult.success ? 'success' : 'error'}
             className={`bitfun-ai-model-config__status-dot ${testResult.success ? 'is-success' : 'is-error'}`}
             title={testResult.message}
@@ -2442,6 +2477,10 @@ const AIModelConfig: React.FC = () => {
         data-config-id={config.id || ''}
         data-model-id={config.model_name}
         data-model-name={config.model_name}
+        data-provider-id={getProviderTemplateId(config) || config.provider || ''}
+        data-option-kind="saved-model"
+        data-model-role="normal"
+        data-model-state="saved"
       />
     );
   };