fix: wrong agentid

- Add get_user_info() to WecomClient to fetch user name via /user/get API
- Update WecomEventConverter.target2yiri to accept bot param and fetch real user name
- Update register_listener call to pass self.bot for user name lookup
- URL-encode userid parameter for safety

Co-authored-by: RockChinQ <45992437+RockChinQ@users.noreply.github.com>

src/langbot/libs/wecom_api/api.py

@@ -4,6 +4,7 @@ import base64
 import binascii
 import httpx
 import traceback
+from urllib.parse import quote
 from quart import Quart
 import xml.etree.ElementTree as ET
 from typing import Callable, Dict, Any
@@ -67,6 +68,31 @@ class WecomClient:
                 await self.logger.error(f'获取accesstoken失败:{response.json()}')
                 raise Exception(f'未获取access token: {data}')
 
+    async def get_user_info(self, userid: str) -> dict:
+        """
+        Get user information by user ID using the application secret.
+
+        Args:
+            userid: The user ID to look up.
+
+        Returns:
+            dict: User information including 'name' field.
+        """
+        if not await self.check_access_token():
+            self.access_token = await self.get_access_token(self.secret)
+
+        url = self.base_url + '/user/get?access_token=' + self.access_token + '&userid=' + quote(userid)
+        async with httpx.AsyncClient() as client:
+            response = await client.get(url)
+            data = response.json()
+            if data.get('errcode') == 40014 or data.get('errcode') == 42001:
+                self.access_token = await self.get_access_token(self.secret)
+                return await self.get_user_info(userid)
+            if data.get('errcode', 0) != 0:
+                await self.logger.error(f'获取用户信息失败:{data}')
+                return {}
+            return data
+
     async def get_users(self):
         if not self.check_access_token_for_contacts():
             self.access_token_for_contacts = await self.get_access_token(self.secret_for_contacts)

src/langbot/pkg/core/app.py

@@ -9,7 +9,6 @@ from ..platform import botmgr as im_mgr
 from ..platform.webhook_pusher import WebhookPusher
 from ..provider.session import sessionmgr as llm_session_mgr
 from ..provider.modelmgr import modelmgr as llm_model_mgr
-
 from langbot.pkg.provider.tools import toolmgr as llm_tool_mgr
 from ..config import manager as config_mgr
 from ..command import cmdmgr
@@ -31,7 +30,6 @@ from ..api.http.service import mcp as mcp_service
 from ..api.http.service import apikey as apikey_service
 from ..api.http.service import webhook as webhook_service
 from ..api.http.service import monitoring as monitoring_service
-
 from ..discover import engine as discover_engine
 from ..storage import mgr as storagemgr
 from ..utils import logcache

src/langbot/pkg/persistence/migrations/dbm023_model_fallback_config.py

@@ -1,102 +0,0 @@
-from .. import migration
-
-import sqlalchemy
-import json
-
-
-@migration.migration_class(23)
-class DBMigrateModelFallbackConfig(migration.DBMigration):
-    """Convert model field from plain UUID string to object with primary/fallbacks"""
-
-    async def upgrade(self):
-        """Upgrade"""
-        result = await self.ap.persistence_mgr.execute_async(
-            sqlalchemy.text('SELECT uuid, config FROM legacy_pipelines')
-        )
-        pipelines = result.fetchall()
-
-        current_version = self.ap.ver_mgr.get_current_version()
-
-        for pipeline_row in pipelines:
-            uuid = pipeline_row[0]
-            config = json.loads(pipeline_row[1]) if isinstance(pipeline_row[1], str) else pipeline_row[1]
-
-            if 'ai' not in config or 'local-agent' not in config['ai']:
-                continue
-
-            local_agent = config['ai']['local-agent']
-            changed = False
-
-            # Convert model from string to object
-            model_value = local_agent.get('model', '')
-            if isinstance(model_value, str):
-                local_agent['model'] = {
-                    'primary': model_value,
-                    'fallbacks': [],
-                }
-                changed = True
-
-            # Remove leftover fallback-models field if present
-            if 'fallback-models' in local_agent:
-                del local_agent['fallback-models']
-                changed = True
-
-            if not changed:
-                continue
-
-            # Update using raw SQL with compatibility for both SQLite and PostgreSQL
-            if self.ap.persistence_mgr.db.name == 'postgresql':
-                await self.ap.persistence_mgr.execute_async(
-                    sqlalchemy.text(
-                        'UPDATE legacy_pipelines SET config = :config::jsonb, for_version = :for_version WHERE uuid = :uuid'
-                    ),
-                    {'config': json.dumps(config), 'for_version': current_version, 'uuid': uuid},
-                )
-            else:
-                await self.ap.persistence_mgr.execute_async(
-                    sqlalchemy.text(
-                        'UPDATE legacy_pipelines SET config = :config, for_version = :for_version WHERE uuid = :uuid'
-                    ),
-                    {'config': json.dumps(config), 'for_version': current_version, 'uuid': uuid},
-                )
-
-    async def downgrade(self):
-        """Downgrade"""
-        result = await self.ap.persistence_mgr.execute_async(
-            sqlalchemy.text('SELECT uuid, config FROM legacy_pipelines')
-        )
-        pipelines = result.fetchall()
-
-        current_version = self.ap.ver_mgr.get_current_version()
-
-        for pipeline_row in pipelines:
-            uuid = pipeline_row[0]
-            config = json.loads(pipeline_row[1]) if isinstance(pipeline_row[1], str) else pipeline_row[1]
-
-            if 'ai' not in config or 'local-agent' not in config['ai']:
-                continue
-
-            local_agent = config['ai']['local-agent']
-
-            # Convert model from object back to string
-            model_value = local_agent.get('model', '')
-            if isinstance(model_value, dict):
-                local_agent['model'] = model_value.get('primary', '')
-            else:
-                continue
-
-            # Update using raw SQL with compatibility for both SQLite and PostgreSQL
-            if self.ap.persistence_mgr.db.name == 'postgresql':
-                await self.ap.persistence_mgr.execute_async(
-                    sqlalchemy.text(
-                        'UPDATE legacy_pipelines SET config = :config::jsonb, for_version = :for_version WHERE uuid = :uuid'
-                    ),
-                    {'config': json.dumps(config), 'for_version': current_version, 'uuid': uuid},
-                )
-            else:
-                await self.ap.persistence_mgr.execute_async(
-                    sqlalchemy.text(
-                        'UPDATE legacy_pipelines SET config = :config, for_version = :for_version WHERE uuid = :uuid'
-                    ),
-                    {'config': json.dumps(config), 'for_version': current_version, 'uuid': uuid},
-                )

src/langbot/pkg/pipeline/preproc/preproc.py

@@ -36,36 +36,17 @@ class PreProcessor(stage.PipelineStage):
         session = await self.ap.sess_mgr.get_session(query)
 
         # When not local-agent, llm_model is None
-        llm_model = None
-        if selected_runner == 'local-agent':
-            # Read model config — new format is { primary: str, fallbacks: [str] },
-            # but handle legacy plain string for backward compatibility
-            model_config = query.pipeline_config['ai']['local-agent'].get('model', {})
-            if isinstance(model_config, str):
-                # Legacy format: plain UUID string
-                primary_uuid = model_config
-                fallback_uuids = []
-            else:
-                primary_uuid = model_config.get('primary', '')
-                fallback_uuids = model_config.get('fallbacks', [])
-
-            if primary_uuid:
-                try:
-                    llm_model = await self.ap.model_mgr.get_model_by_uuid(primary_uuid)
-                except ValueError:
-                    self.ap.logger.warning(f'LLM model {primary_uuid} not found or not configured')
-
-            # Resolve fallback model UUIDs
-            if fallback_uuids:
-                valid_fallbacks = []
-                for fb_uuid in fallback_uuids:
-                    try:
-                        await self.ap.model_mgr.get_model_by_uuid(fb_uuid)
-                        valid_fallbacks.append(fb_uuid)
-                    except ValueError:
-                        self.ap.logger.warning(f'Fallback model {fb_uuid} not found, skipping')
-                if valid_fallbacks:
-                    query.variables['_fallback_model_uuids'] = valid_fallbacks
+        try:
+            llm_model = (
+                await self.ap.model_mgr.get_model_by_uuid(query.pipeline_config['ai']['local-agent']['model'])
+                if selected_runner == 'local-agent'
+                else None
+            )
+        except ValueError:
+            self.ap.logger.warning(
+                f'LLM model {query.pipeline_config["ai"]["local-agent"]["model"] + " "}not found or not configured'
+            )
+            llm_model = None
 
         conversation = await self.ap.sess_mgr.get_conversation(
             query,
@@ -80,28 +61,20 @@ class PreProcessor(stage.PipelineStage):
         query.prompt = conversation.prompt.copy()
         query.messages = conversation.messages.copy()
 
-        if selected_runner == 'local-agent':
+        if selected_runner == 'local-agent' and llm_model:
             query.use_funcs = []
-            if llm_model:
-                query.use_llm_model_uuid = llm_model.model_entity.uuid
+            query.use_llm_model_uuid = llm_model.model_entity.uuid
 
-                if llm_model.model_entity.abilities.__contains__('func_call'):
-                    # Get bound plugins and MCP servers for filtering tools
-                    bound_plugins = query.variables.get('_pipeline_bound_plugins', None)
-                    bound_mcp_servers = query.variables.get('_pipeline_bound_mcp_servers', None)
-                    query.use_funcs = await self.ap.tool_mgr.get_all_tools(bound_plugins, bound_mcp_servers)
-
-                    self.ap.logger.debug(f'Bound plugins: {bound_plugins}')
-                    self.ap.logger.debug(f'Bound MCP servers: {bound_mcp_servers}')
-                    self.ap.logger.debug(f'Use funcs: {query.use_funcs}')
-
-            # If primary model doesn't support func_call but fallback models exist,
-            # load tools anyway since fallback models may support them
-            if not query.use_funcs and query.variables.get('_fallback_model_uuids'):
+            if llm_model.model_entity.abilities.__contains__('func_call'):
+                # Get bound plugins and MCP servers for filtering tools
                 bound_plugins = query.variables.get('_pipeline_bound_plugins', None)
                 bound_mcp_servers = query.variables.get('_pipeline_bound_mcp_servers', None)
                 query.use_funcs = await self.ap.tool_mgr.get_all_tools(bound_plugins, bound_mcp_servers)
 
+                self.ap.logger.debug(f'Bound plugins: {bound_plugins}')
+                self.ap.logger.debug(f'Bound MCP servers: {bound_mcp_servers}')
+                self.ap.logger.debug(f'Use funcs: {query.use_funcs}')
+
         sender_name = ''
 
         if isinstance(query.message_event, platform_events.GroupMessage):

src/langbot/pkg/platform/sources/wecom.py

@@ -148,51 +148,54 @@ class WecomEventConverter(abstract_platform_adapter.AbstractEventConverter):
             pass
 
         if type(event) is platform_events.FriendMessage:
-            payload = {
-                'MsgType': 'text',
-                'Content': '',
-                'FromUserName': event.sender.id,
-                'ToUserName': bot_account_id,
-                'CreateTime': int(datetime.datetime.now().timestamp()),
-                'AgentID': event.sender.nickname,
-            }
-            wecom_event = WecomEvent.from_payload(payload=payload)
-            if not wecom_event:
-                raise ValueError('无法从 message_data 构造 WecomEvent 对象')
-
-            return wecom_event
+            return event.source_platform_object
 
     @staticmethod
-    async def target2yiri(event: WecomEvent):
+    async def target2yiri(event: WecomEvent, bot: WecomClient = None):
         """
         将 WecomEvent 转换为平台的 FriendMessage 对象。
 
         Args:
             event (WecomEvent): 企业微信事件。
+            bot (WecomClient): 企业微信客户端，用于获取用户信息。
 
         Returns:
             platform_events.FriendMessage: 转换后的 FriendMessage 对象。
         """
+        # Try to get the user's real name from the WeCom API
+        nickname = str(event.user_id)
+        if bot and event.user_id:
+            try:
+                user_info = await bot.get_user_info(event.user_id)
+                if user_info and user_info.get('name'):
+                    nickname = user_info.get('name')
+            except Exception:
+                pass  # Fall back to user_id as nickname
+
         # 转换消息链
         if event.type == 'text':
             yiri_chain = await WecomMessageConverter.target2yiri(event.message, event.message_id)
             friend = platform_entities.Friend(
                 id=f'u{event.user_id}',
-                nickname=str(event.agent_id),
+                nickname=nickname,
                 remark='',
             )
 
-            return platform_events.FriendMessage(sender=friend, message_chain=yiri_chain, time=event.timestamp)
+            return platform_events.FriendMessage(
+                sender=friend, message_chain=yiri_chain, time=event.timestamp, source_platform_object=event
+            )
         elif event.type == 'image':
             friend = platform_entities.Friend(
                 id=f'u{event.user_id}',
-                nickname=str(event.agent_id),
+                nickname=nickname,
                 remark='',
             )
 
             yiri_chain = await WecomMessageConverter.target2yiri_image(picurl=event.picurl, message_id=event.message_id)
 
-            return platform_events.FriendMessage(sender=friend, message_chain=yiri_chain, time=event.timestamp)
+            return platform_events.FriendMessage(
+                sender=friend, message_chain=yiri_chain, time=event.timestamp, source_platform_object=event
+            )
 
 
 class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
@@ -210,7 +213,6 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
             'secret',
             'token',
             'EncodingAESKey',
-            'contacts_secret',
         ]
 
         missing_keys = [key for key in required_keys if key not in config]
@@ -223,7 +225,7 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
             secret=config['secret'],
             token=config['token'],
             EncodingAESKey=config['EncodingAESKey'],
-            contacts_secret=config['contacts_secret'],
+            contacts_secret=config.get('contacts_secret', ''),  # Optional, kept for backward compatibility
             logger=logger,
             unified_mode=True,
             api_base_url=config.get('api_base_url', 'https://qyapi.weixin.qq.com/cgi-bin'),
@@ -248,18 +250,17 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
     ):
         Wecom_event = await WecomEventConverter.yiri2target(message_source, self.bot_account_id, self.bot)
         content_list = await WecomMessageConverter.yiri2target(message, self.bot)
-        fixed_user_id = Wecom_event.user_id
-        # 删掉开头的u
-        fixed_user_id = fixed_user_id[1:]
+        # user_id is the original FromUserName from WecomEvent
+        user_id = Wecom_event.user_id
         for content in content_list:
             if content['type'] == 'text':
-                await self.bot.send_private_msg(fixed_user_id, Wecom_event.agent_id, content['content'])
+                await self.bot.send_private_msg(user_id, Wecom_event.agent_id, content['content'])
             elif content['type'] == 'image':
-                await self.bot.send_image(fixed_user_id, Wecom_event.agent_id, content['media_id'])
+                await self.bot.send_image(user_id, Wecom_event.agent_id, content['media_id'])
             elif content['type'] == 'voice':
-                await self.bot.send_voice(fixed_user_id, Wecom_event.agent_id, content['media_id'])
+                await self.bot.send_voice(user_id, Wecom_event.agent_id, content['media_id'])
             elif content['type'] == 'file':
-                await self.bot.send_file(fixed_user_id, Wecom_event.agent_id, content['media_id'])
+                await self.bot.send_file(user_id, Wecom_event.agent_id, content['media_id'])
 
     async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
         content_list = await WecomMessageConverter.yiri2target(message, self.bot)
@@ -287,7 +288,7 @@ class WecomAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
         async def on_message(event: WecomEvent):
             self.bot_account_id = event.receiver_id
             try:
-                return await callback(await self.event_converter.target2yiri(event), self)
+                return await callback(await self.event_converter.target2yiri(event, self.bot), self)
             except Exception:
                 await self.logger.error(f'Error in wecom callback: {traceback.format_exc()}')
 

src/langbot/pkg/platform/sources/wecom.yaml

@@ -39,13 +39,6 @@ spec:
       type: string
       required: true
       default: ""
-    - name: contacts_secret
-      label:
-        en_US: Contacts Secret
-        zh_Hans: 通讯录密钥
-      type: string
-      required: true
-      default: ""
     - name: api_base_url
       label:
         en_US: API Base URL

src/langbot/pkg/provider/runners/localagent.py

@@ -4,7 +4,6 @@ import json
 import copy
 import typing
 from .. import runner
-from ..modelmgr import requester as modelmgr_requester
 import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 import langbot_plugin.api.entities.builtin.provider.message as provider_message
 import langbot_plugin.api.entities.builtin.rag.context as rag_context
@@ -27,117 +26,21 @@ Respond in the same language as the user's input.
 
 @runner.runner_class('local-agent')
 class LocalAgentRunner(runner.RequestRunner):
-    """Local agent request runner"""
+    """本地Agent请求运行器"""
 
-    async def _get_model_candidates(
-        self,
-        query: pipeline_query.Query,
-    ) -> list[modelmgr_requester.RuntimeLLMModel]:
-        """Build ordered list of models to try: primary model + fallback models."""
-        candidates = []
+    class ToolCallTracker:
+        """工具调用追踪器"""
 
-        # Primary model
-        if query.use_llm_model_uuid:
-            try:
-                primary = await self.ap.model_mgr.get_model_by_uuid(query.use_llm_model_uuid)
-                candidates.append(primary)
-            except ValueError:
-                self.ap.logger.warning(f'Primary model {query.use_llm_model_uuid} not found')
-
-        # Fallback models
-        fallback_uuids = (query.variables or {}).get('_fallback_model_uuids', [])
-        for fb_uuid in fallback_uuids:
-            try:
-                fb_model = await self.ap.model_mgr.get_model_by_uuid(fb_uuid)
-                candidates.append(fb_model)
-            except ValueError:
-                self.ap.logger.warning(f'Fallback model {fb_uuid} not found, skipping')
-
-        return candidates
-
-    async def _invoke_with_fallback(
-        self,
-        query: pipeline_query.Query,
-        candidates: list[modelmgr_requester.RuntimeLLMModel],
-        messages: list,
-        funcs: list,
-        remove_think: bool,
-    ) -> tuple[provider_message.Message, modelmgr_requester.RuntimeLLMModel]:
-        """Try non-streaming invocation with sequential fallback. Returns (message, model_used)."""
-        last_error = None
-        for model in candidates:
-            try:
-                msg = await model.provider.invoke_llm(
-                    query,
-                    model,
-                    messages,
-                    funcs if model.model_entity.abilities.__contains__('func_call') else [],
-                    extra_args=model.model_entity.extra_args,
-                    remove_think=remove_think,
-                )
-                return msg, model
-            except Exception as e:
-                last_error = e
-                self.ap.logger.warning(f'Model {model.model_entity.name} failed: {e}, trying next fallback...')
-        raise last_error or RuntimeError('No model candidates available')
-
-    async def _invoke_stream_with_fallback(
-        self,
-        query: pipeline_query.Query,
-        candidates: list[modelmgr_requester.RuntimeLLMModel],
-        messages: list,
-        funcs: list,
-        remove_think: bool,
-    ) -> tuple[typing.AsyncGenerator, modelmgr_requester.RuntimeLLMModel]:
-        """Try streaming invocation with sequential fallback. Returns (stream_generator, model_used).
-
-        Fallback is only possible before any chunks have been yielded to the client.
-        Once streaming starts, the model is committed.
-        """
-        last_error = None
-        for model in candidates:
-            try:
-                stream = model.provider.invoke_llm_stream(
-                    query,
-                    model,
-                    messages,
-                    funcs if model.model_entity.abilities.__contains__('func_call') else [],
-                    extra_args=model.model_entity.extra_args,
-                    remove_think=remove_think,
-                )
-                # Attempt to get the first chunk to verify the stream works
-                first_chunk = await stream.__anext__()
-
-                async def _chain_stream(first, rest):
-                    yield first
-                    async for chunk in rest:
-                        yield chunk
-
-                return _chain_stream(first_chunk, stream), model
-            except StopAsyncIteration:
-                # Empty stream — treat as success (model returned nothing)
-                async def _empty_stream():
-                    return
-                    yield  # make it a generator
-
-                return _empty_stream(), model
-            except Exception as e:
-                last_error = e
-                self.ap.logger.warning(f'Model {model.model_entity.name} stream failed: {e}, trying next fallback...')
-        raise last_error or RuntimeError('No model candidates available')
+        def __init__(self):
+            self.active_calls: dict[str, dict] = {}
+            self.completed_calls: list[provider_message.ToolCall] = []
 
     async def run(
         self, query: pipeline_query.Query
     ) -> typing.AsyncGenerator[provider_message.Message | provider_message.MessageChunk, None]:
-        """Run request"""
+        """运行请求"""
         pending_tool_calls = []
 
-        # Agent loop protection config
-        agent_config = query.pipeline_config['ai']['local-agent']
-        max_tool_iterations = agent_config.get('max-tool-iterations', 16)
-        max_tool_result_chars = agent_config.get('max-tool-result-chars', 8000)
-        iteration_count = 0
-
         # Get knowledge bases list (new field)
         kb_uuids = query.pipeline_config['ai']['local-agent'].get('knowledge-bases', [])
 
@@ -216,51 +119,51 @@ class LocalAgentRunner(runner.RequestRunner):
 
         remove_think = query.pipeline_config['output'].get('misc', '').get('remove-think')
 
-        # Build ordered candidate list (primary + fallbacks)
-        candidates = await self._get_model_candidates(query)
-        if not candidates:
-            raise RuntimeError('No LLM model configured for local-agent runner')
+        use_llm_model = await self.ap.model_mgr.get_model_by_uuid(query.use_llm_model_uuid)
 
         self.ap.logger.debug(
-            f'localagent req: query={query.query_id} req_messages={req_messages} '
-            f'candidates={[m.model_entity.name for m in candidates]}'
+            f'localagent req: query={query.query_id} req_messages={req_messages} use_llm_model={query.use_llm_model_uuid}'
         )
 
         if not is_stream:
-            # Non-streaming: invoke with fallback
-            msg, use_llm_model = await self._invoke_with_fallback(
+            # 非流式输出，直接请求
+
+            msg = await use_llm_model.provider.invoke_llm(
                 query,
-                candidates,
+                use_llm_model,
                 req_messages,
                 query.use_funcs,
-                remove_think,
+                extra_args=use_llm_model.model_entity.extra_args,
+                remove_think=remove_think,
             )
             yield msg
             final_msg = msg
         else:
-            # Streaming: invoke with fallback
+            # 流式输出，需要处理工具调用
             tool_calls_map: dict[str, provider_message.ToolCall] = {}
             msg_idx = 0
-            accumulated_content = ''
+            accumulated_content = ''  # 从开始累积的所有内容
             last_role = 'assistant'
             msg_sequence = 1
-
-            stream_src, use_llm_model = await self._invoke_stream_with_fallback(
+            async for msg in use_llm_model.provider.invoke_llm_stream(
                 query,
-                candidates,
+                use_llm_model,
                 req_messages,
                 query.use_funcs,
-                remove_think,
-            )
-            async for msg in stream_src:
+                extra_args=use_llm_model.model_entity.extra_args,
+                remove_think=remove_think,
+            ):
                 msg_idx = msg_idx + 1
 
+                # 记录角色
                 if msg.role:
                     last_role = msg.role
 
+                # 累积内容
                 if msg.content:
                     accumulated_content += msg.content
 
+                # 处理工具调用
                 if msg.tool_calls:
                     for tool_call in msg.tool_calls:
                         if tool_call.id not in tool_calls_map:
@@ -272,18 +175,21 @@ class LocalAgentRunner(runner.RequestRunner):
                                 ),
                             )
                         if tool_call.function and tool_call.function.arguments:
+                            # 流式处理中，工具调用参数可能分多个chunk返回，需要追加而不是覆盖
                             tool_calls_map[tool_call.id].function.arguments += tool_call.function.arguments
-
+                # continue
+                # 每8个chunk或最后一个chunk时，输出所有累积的内容
                 if msg_idx % 8 == 0 or msg.is_final:
                     msg_sequence += 1
                     yield provider_message.MessageChunk(
                         role=last_role,
-                        content=accumulated_content,
+                        content=accumulated_content,  # 输出所有累积内容
                         tool_calls=list(tool_calls_map.values()) if (tool_calls_map and msg.is_final) else None,
                         is_final=msg.is_final,
                         msg_sequence=msg_sequence,
                     )
 
+            # 创建最终消息用于后续处理
             final_msg = provider_message.MessageChunk(
                 role=last_role,
                 content=accumulated_content,
@@ -298,17 +204,8 @@ class LocalAgentRunner(runner.RequestRunner):
 
         req_messages.append(final_msg)
 
-        # Once a model succeeds, commit to it for the tool call loop
-        # (no fallback mid-conversation — different models may interpret tool results differently)
+        # 持续请求，只要还有待处理的工具调用就继续处理调用
         while pending_tool_calls:
-            iteration_count += 1
-            if iteration_count > max_tool_iterations:
-                self.ap.logger.warning(
-                    f'localagent: query={query.query_id} agent loop exceeded max iterations ({max_tool_iterations}), '
-                    f'forcing termination'
-                )
-                break
-
             for tool_call in pending_tool_calls:
                 try:
                     func = tool_call.function
@@ -331,14 +228,6 @@ class LocalAgentRunner(runner.RequestRunner):
                     else:
                         tool_content = json.dumps(func_ret, ensure_ascii=False)
 
-                    # Truncate oversized tool results to prevent context overflow
-                    if isinstance(tool_content, str) and len(tool_content) > max_tool_result_chars:
-                        self.ap.logger.warning(
-                            f'localagent: tool {func.name} returned {len(tool_content)} chars, '
-                            f'truncating to {max_tool_result_chars}'
-                        )
-                        tool_content = tool_content[:max_tool_result_chars] + '\n...[result truncated]'
-
                     if is_stream:
                         msg = provider_message.MessageChunk(
                             role='tool',
@@ -356,6 +245,7 @@ class LocalAgentRunner(runner.RequestRunner):
 
                     req_messages.append(msg)
                 except Exception as e:
+                    # 工具调用出错，添加一个报错信息到 req_messages
                     err_msg = provider_message.Message(role='tool', content=f'err: {e}', tool_call_id=tool_call.id)
 
                     yield err_msg
@@ -363,38 +253,39 @@ class LocalAgentRunner(runner.RequestRunner):
                     req_messages.append(err_msg)
 
             self.ap.logger.debug(
-                f'localagent req: query={query.query_id} req_messages={req_messages} '
-                f'use_llm_model={use_llm_model.model_entity.name}'
+                f'localagent req: query={query.query_id} req_messages={req_messages} use_llm_model={query.use_llm_model_uuid}'
             )
 
             if is_stream:
                 tool_calls_map = {}
                 msg_idx = 0
-                accumulated_content = ''
+                accumulated_content = ''  # 从开始累积的所有内容
                 last_role = 'assistant'
                 msg_sequence = first_end_sequence
 
-                tool_stream_src = use_llm_model.provider.invoke_llm_stream(
+                async for msg in use_llm_model.provider.invoke_llm_stream(
                     query,
                     use_llm_model,
                     req_messages,
-                    query.use_funcs if use_llm_model.model_entity.abilities.__contains__('func_call') else [],
+                    query.use_funcs,
                     extra_args=use_llm_model.model_entity.extra_args,
                     remove_think=remove_think,
-                )
-                async for msg in tool_stream_src:
+                ):
                     msg_idx += 1
 
+                    # 记录角色
                     if msg.role:
                         last_role = msg.role
 
-                    # Prepend first-round content on first chunk of tool-call round
+                    # 第一次请求工具调用时的内容
                     if msg_idx == 1:
                         accumulated_content = first_content if first_content is not None else accumulated_content
 
+                    # 累积内容
                     if msg.content:
                         accumulated_content += msg.content
 
+                    # 处理工具调用
                     if msg.tool_calls:
                         for tool_call in msg.tool_calls:
                             if tool_call.id not in tool_calls_map:
@@ -406,13 +297,15 @@ class LocalAgentRunner(runner.RequestRunner):
                                     ),
                                 )
                             if tool_call.function and tool_call.function.arguments:
+                                # 流式处理中，工具调用参数可能分多个chunk返回，需要追加而不是覆盖
                                 tool_calls_map[tool_call.id].function.arguments += tool_call.function.arguments
 
+                    # 每8个chunk或最后一个chunk时，输出所有累积的内容
                     if msg_idx % 8 == 0 or msg.is_final:
                         msg_sequence += 1
                         yield provider_message.MessageChunk(
                             role=last_role,
-                            content=accumulated_content,
+                            content=accumulated_content,  # 输出所有累积内容
                             tool_calls=list(tool_calls_map.values()) if (tool_calls_map and msg.is_final) else None,
                             is_final=msg.is_final,
                             msg_sequence=msg_sequence,
@@ -425,12 +318,12 @@ class LocalAgentRunner(runner.RequestRunner):
                     msg_sequence=msg_sequence,
                 )
             else:
-                # Non-streaming: use committed model directly (no fallback in tool loop)
+                # 处理完所有调用，再次请求
                 msg = await use_llm_model.provider.invoke_llm(
                     query,
                     use_llm_model,
                     req_messages,
-                    query.use_funcs if use_llm_model.model_entity.abilities.__contains__('func_call') else [],
+                    query.use_funcs,
                     extra_args=use_llm_model.model_entity.extra_args,
                     remove_think=remove_think,
                 )

src/langbot/pkg/utils/constants.py

@@ -2,7 +2,7 @@ import langbot
 
 semantic_version = f'v{langbot.__version__}'
 
-required_database_version = 23
+required_database_version = 22
 """Tag the version of the database schema, used to check if the database needs to be migrated"""
 
 debug_mode = False

src/langbot/templates/metadata/pipeline/ai.yaml

@@ -59,11 +59,8 @@ stages:
         label:
           en_US: Model
           zh_Hans: 模型
-        type: model-fallback-selector
+        type: llm-model-selector
         required: true
-        default:
-          primary: ''
-          fallbacks: []
       - name: max-round
         label:
           en_US: Max Round
@@ -93,26 +90,6 @@ stages:
         type: knowledge-base-multi-selector
         required: false
         default: []
-      - name: max-tool-iterations
-        label:
-          en_US: Max Tool Iterations
-          zh_Hans: 最大工具调用轮次
-        description:
-          en_US: Maximum number of tool call iterations in a single agent loop to prevent runaway loops
-          zh_Hans: 单次 Agent 循环中工具调用的最大轮次，防止无限循环
-        type: integer
-        required: false
-        default: 16
-      - name: max-tool-result-chars
-        label:
-          en_US: Max Tool Result Length
-          zh_Hans: 工具返回最大字符数
-        description:
-          en_US: Maximum character length of a single tool call result, longer results will be truncated
-          zh_Hans: 单次工具调用返回结果的最大字符数，超出部分将被截断
-        type: integer
-        required: false
-        default: 8000
   - name: tbox-app-api
     label:
       en_US: Tbox App API

web/src/app/home/bots/components/bot-form/BotForm.tsx

@@ -124,6 +124,12 @@ export default function BotForm({
   const currentAdapter = form.watch('adapter');
   const currentAdapterConfig = form.watch('adapter_config');
 
+  // Serialize adapter_config to a stable string so it can be used as a
+  // useEffect dependency without triggering on every render.  form.watch()
+  // returns a new object reference each time, which would otherwise cause
+  // the filtering effect below to loop indefinitely.
+  const adapterConfigJson = JSON.stringify(currentAdapterConfig);
+
   useEffect(() => {
     setBotFormValues();
   }, []);
@@ -147,7 +153,7 @@ export default function BotForm({
       // For non-Lark adapters, show all fields
       setFilteredDynamicFormConfigList(dynamicFormConfigList);
     }
-  }, [currentAdapter, currentAdapterConfig, dynamicFormConfigList]);
+  }, [currentAdapter, adapterConfigJson, dynamicFormConfigList]);
 
   // 复制到剪贴板的辅助函数 - 使用页面上的真实input元素
   const copyToClipboard = () => {

web/src/app/home/components/dynamic-form/DynamicFormComponent.tsx

@@ -11,7 +11,7 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import DynamicFormItemComponent from '@/app/home/components/dynamic-form/DynamicFormItemComponent';
-import { useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import { extractI18nObject } from '@/i18n/I18nProvider';
 import { useTranslation } from 'react-i18next';
 
@@ -73,12 +73,6 @@ export default function DynamicFormComponent({
           case 'bot-selector':
             fieldSchema = z.string();
             break;
-          case 'model-fallback-selector':
-            fieldSchema = z.object({
-              primary: z.string(),
-              fallbacks: z.array(z.string()),
-            });
-            break;
           case 'prompt-editor':
             fieldSchema = z.array(
               z.object({
@@ -166,34 +160,39 @@ export default function DynamicFormComponent({
   const onSubmitRef = useRef(onSubmit);
   onSubmitRef.current = onSubmit;
 
-  // 监听表单值变化
-  useEffect(() => {
-    // Emit initial form values immediately so the parent always has a valid snapshot,
-    // even if the user saves without modifying any field.
-    // form.watch(callback) only fires on subsequent changes, not on mount.
+  // Track the last emitted values to avoid emitting identical snapshots,
+  // which would cause the parent to call setValue with an equivalent object,
+  // triggering a re-render loop.
+  const lastEmittedRef = useRef<string>('');
+
+  const emitValues = useCallback(() => {
     const formValues = form.getValues();
-    const initialFinalValues = itemConfigList.reduce(
+    const finalValues = itemConfigList.reduce(
       (acc, item) => {
         acc[item.name] = formValues[item.name] ?? item.default;
         return acc;
       },
       {} as Record<string, object>,
     );
-    onSubmitRef.current?.(initialFinalValues);
+    const serialized = JSON.stringify(finalValues);
+    if (serialized !== lastEmittedRef.current) {
+      lastEmittedRef.current = serialized;
+      onSubmitRef.current?.(finalValues);
+    }
+  }, [form, itemConfigList]);
+
+  // 监听表单值变化
+  useEffect(() => {
+    // Emit initial form values immediately so the parent always has a valid snapshot,
+    // even if the user saves without modifying any field.
+    // form.watch(callback) only fires on subsequent changes, not on mount.
+    emitValues();
 
     const subscription = form.watch(() => {
-      const formValues = form.getValues();
-      const finalValues = itemConfigList.reduce(
-        (acc, item) => {
-          acc[item.name] = formValues[item.name] ?? item.default;
-          return acc;
-        },
-        {} as Record<string, object>,
-      );
-      onSubmitRef.current?.(finalValues);
+      emitValues();
     });
     return () => subscription.unsubscribe();
-  }, [form, itemConfigList]);
+  }, [form, itemConfigList, emitValues]);
 
   return (
     <Form {...form}>
@@ -232,7 +231,6 @@ export default function DynamicFormComponent({
 
           // All fields are disabled when editing (creation_settings are immutable)
           const isFieldDisabled = !!isEditing;
-
           return (
             <FormField
               key={config.id}

web/src/app/home/components/dynamic-form/DynamicFormItemComponent.tsx

@@ -124,28 +124,6 @@ export default function DynamicFormItemComponent({
     }
   }, [config.type]);
 
-  useEffect(() => {
-    if (config.type === DynamicFormItemType.MODEL_FALLBACK_SELECTOR) {
-      httpClient
-        .getProviderLLMModels()
-        .then((resp) => {
-          let models = resp.models;
-          if (
-            systemInfo.disable_models_service ||
-            userInfo?.account_type !== 'space'
-          ) {
-            models = models.filter(
-              (m) => m.provider?.requester !== 'space-chat-completions',
-            );
-          }
-          setLlmModels(models);
-        })
-        .catch((err) => {
-          toast.error('Failed to get LLM model list: ' + err.msg);
-        });
-    }
-  }, [config.type]);
-
   useEffect(() => {
     if (
       config.type === DynamicFormItemType.KNOWLEDGE_BASE_SELECTOR ||
@@ -193,7 +171,12 @@ export default function DynamicFormItemComponent({
       return <Textarea {...field} className="min-h-[120px]" />;
 
     case DynamicFormItemType.BOOLEAN:
-      return <Switch checked={field.value} onCheckedChange={field.onChange} />;
+      return (
+        <Switch
+          checked={field.value ?? false}
+          onCheckedChange={field.onChange}
+        />
+      );
 
     case DynamicFormItemType.STRING_ARRAY:
       return (
@@ -244,7 +227,7 @@ export default function DynamicFormItemComponent({
 
     case DynamicFormItemType.SELECT:
       return (
-        <Select value={field.value} onValueChange={field.onChange}>
+        <Select value={field.value ?? ''} onValueChange={field.onChange}>
           <SelectTrigger className="bg-[#ffffff] dark:bg-[#2a2a2e]">
             <SelectValue placeholder={t('common.select')} />
           </SelectTrigger>
@@ -335,172 +318,6 @@ export default function DynamicFormItemComponent({
         </Select>
       );
 
-    case DynamicFormItemType.MODEL_FALLBACK_SELECTOR: {
-      // Group models by provider
-      const groupedModelsForFallback = llmModels.reduce(
-        (acc, model) => {
-          const providerName =
-            model.provider?.name || model.provider?.requester || 'Unknown';
-          if (!acc[providerName]) acc[providerName] = [];
-          acc[providerName].push(model);
-          return acc;
-        },
-        {} as Record<string, LLMModel[]>,
-      );
-
-      const modelValue = field.value as {
-        primary: string;
-        fallbacks: string[];
-      };
-
-      const renderModelSelect = (
-        value: string,
-        onChange: (val: string) => void,
-        placeholder: string,
-      ) => (
-        <Select value={value} onValueChange={onChange}>
-          <SelectTrigger className="bg-[#ffffff] dark:bg-[#2a2a2e]">
-            <SelectValue placeholder={placeholder} />
-          </SelectTrigger>
-          <SelectContent>
-            {Object.entries(groupedModelsForFallback).map(
-              ([providerName, models]) => (
-                <SelectGroup key={providerName}>
-                  <SelectLabel>{providerName}</SelectLabel>
-                  {models.map((model) => (
-                    <SelectItem key={model.uuid} value={model.uuid}>
-                      <span className="inline-flex items-center gap-1">
-                        {model.name}
-                        {model.abilities?.includes('vision') && (
-                          <Eye className="h-3 w-3 text-muted-foreground" />
-                        )}
-                        {model.abilities?.includes('func_call') && (
-                          <Wrench className="h-3 w-3 text-muted-foreground" />
-                        )}
-                      </span>
-                    </SelectItem>
-                  ))}
-                </SelectGroup>
-              ),
-            )}
-          </SelectContent>
-        </Select>
-      );
-
-      const updateValue = (patch: Partial<typeof modelValue>) => {
-        field.onChange({ ...modelValue, ...patch });
-      };
-
-      const addFallbackModel = () => {
-        updateValue({ fallbacks: [...modelValue.fallbacks, ''] });
-      };
-
-      const updateFallbackModel = (index: number, value: string) => {
-        const updated = [...modelValue.fallbacks];
-        updated[index] = value;
-        updateValue({ fallbacks: updated });
-      };
-
-      const removeFallbackModel = (index: number) => {
-        const updated = [...modelValue.fallbacks];
-        updated.splice(index, 1);
-        updateValue({ fallbacks: updated });
-      };
-
-      const moveFallbackModel = (index: number, direction: 'up' | 'down') => {
-        const updated = [...modelValue.fallbacks];
-        const newIndex = direction === 'up' ? index - 1 : index + 1;
-        if (newIndex < 0 || newIndex >= updated.length) return;
-        [updated[index], updated[newIndex]] = [
-          updated[newIndex],
-          updated[index],
-        ];
-        updateValue({ fallbacks: updated });
-      };
-
-      return (
-        <div className="space-y-3">
-          {/* Primary model selector */}
-          <div>
-            <p className="text-xs text-muted-foreground mb-1">
-              {t('models.fallback.primary')}
-            </p>
-            {renderModelSelect(
-              modelValue.primary,
-              (val) => updateValue({ primary: val }),
-              t('models.selectModel'),
-            )}
-          </div>
-
-          {/* Fallback models */}
-          {modelValue.fallbacks.length > 0 && (
-            <div className="space-y-2">
-              <p className="text-xs text-muted-foreground">
-                {t('models.fallback.fallbackList')}
-              </p>
-              {modelValue.fallbacks.map((fbUuid: string, index: number) => (
-                <div key={index} className="flex items-center gap-2">
-                  <span className="text-xs text-muted-foreground w-4 shrink-0">
-                    {index + 1}.
-                  </span>
-                  <div className="flex-1">
-                    {renderModelSelect(
-                      fbUuid,
-                      (val) => updateFallbackModel(index, val),
-                      t('models.selectModel'),
-                    )}
-                  </div>
-                  <div className="flex gap-1 shrink-0">
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-8 w-8 p-0"
-                      onClick={() => moveFallbackModel(index, 'up')}
-                      disabled={index === 0}
-                    >
-                      ↑
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-8 w-8 p-0"
-                      onClick={() => moveFallbackModel(index, 'down')}
-                      disabled={index === modelValue.fallbacks.length - 1}
-                    >
-                      ↓
-                    </Button>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-8 w-8 p-0 text-destructive"
-                      onClick={() => removeFallbackModel(index)}
-                    >
-                      <X className="h-4 w-4" />
-                    </Button>
-                  </div>
-                </div>
-              ))}
-            </div>
-          )}
-
-          {/* Add fallback button */}
-          <Button
-            type="button"
-            variant="outline"
-            size="sm"
-            className="w-full"
-            onClick={addFallbackModel}
-          >
-            <Plus className="h-4 w-4 mr-1" />
-            {t('models.fallback.addFallback')}
-          </Button>
-        </div>
-      );
-    }
-
     case DynamicFormItemType.KNOWLEDGE_BASE_SELECTOR:
       // Group KBs by Knowledge Engine name
       const kbsByEngine = knowledgeBases.reduce(

web/src/app/home/components/models-dialog/ModelsDialog.tsx

@@ -463,16 +463,14 @@ export default function ModelsDialog({
                     )
                   : t('models.providerCount', { count: otherProviders.length })}
               </span>
-              <div className="flex gap-2">
-                <Button
-                  size="sm"
-                  variant="outline"
-                  onClick={handleCreateProvider}
-                >
-                  <Plus className="h-4 w-4 mr-1" />
-                  {t('models.addProvider')}
-                </Button>
-              </div>
+              <Button
+                size="sm"
+                variant="outline"
+                onClick={handleCreateProvider}
+              >
+                <Plus className="h-4 w-4 mr-1" />
+                {t('models.addProvider')}
+              </Button>
             </div>
 
             {/* Provider List */}

web/src/app/home/plugins/components/plugin-market/PluginMarketComponent.tsx

@@ -1,6 +1,13 @@
 'use client';
 
-import { useState, useEffect, useCallback, useRef, Suspense } from 'react';
+import {
+  useState,
+  useEffect,
+  useCallback,
+  useRef,
+  Suspense,
+  useMemo,
+} from 'react';
 import { Input } from '@/components/ui/input';
 import {
   Select,
@@ -63,7 +70,7 @@ function MarketPageContent({
     RecommendationList[]
   >([]);
 
-  const pageSize = 12; // 每页12个
+  const pageSize = 16; // 每页16个，4行x4列
   const searchTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const scrollContainerRef = useRef<HTMLDivElement | null>(null);
 
@@ -323,7 +330,38 @@ function MarketPageContent({
     };
   }, []);
 
-  const visiblePlugins = plugins;
+  // 计算所有推荐插件的 ID 集合
+  const recommendedPluginIds = useMemo(() => {
+    const ids = new Set<string>();
+    recommendationLists.forEach((list) => {
+      list.plugins.forEach((plugin) => {
+        ids.add(`${plugin.author} / ${plugin.name}`);
+      });
+    });
+    return ids;
+  }, [recommendationLists]);
+
+  // 过滤掉已在推荐列表中展示的插件
+  // 仅在显示推荐列表的条件下（无搜索、无筛选、第一页或后续页的累积数据中）进行过滤
+  // 注意：如果用户翻页，我们希望一直保持去重，否则推荐过的插件会在第二页出现
+  // 但是推荐列表只在第一页且无筛选时显示。
+  // 如果用户进行了筛选/搜索，推荐列表不显示，此时不需要去重。
+  const visiblePlugins = useMemo(() => {
+    const showRecommendations =
+      !searchQuery && componentFilter === 'all' && selectedTags.length === 0;
+
+    if (!showRecommendations) {
+      return plugins;
+    }
+
+    return plugins.filter((p) => !recommendedPluginIds.has(p.pluginId));
+  }, [
+    plugins,
+    recommendedPluginIds,
+    searchQuery,
+    componentFilter,
+    selectedTags,
+  ]);
 
   // 加载更多
   const loadMore = useCallback(() => {

web/src/app/home/plugins/components/plugin-market/RecommendationLists.tsx

@@ -47,12 +47,10 @@ function RecommendationListRow({
   list,
   tagNames,
   onInstall,
-  isLast,
 }: {
   list: RecommendationList;
   tagNames: Record<string, string>;
   onInstall: (author: string, pluginName: string) => void;
-  isLast: boolean;
 }) {
   const { t } = useTranslation();
   const [page, setPage] = useState(0);
@@ -145,9 +143,7 @@ function RecommendationListRow({
           />
         ))}
       </div>
-      {totalPages > 1 && !isLast && (
-        <div className="border-b border-border mt-6" />
-      )}
+      {totalPages > 1 && <div className="border-b border-border mt-6" />}
     </div>
   );
 }
@@ -165,13 +161,12 @@ export function RecommendationLists({
 
   return (
     <div className="mt-6">
-      {lists.map((list, index) => (
+      {lists.map((list) => (
         <RecommendationListRow
           key={list.uuid}
           list={list}
           tagNames={tagNames}
           onInstall={onInstall}
-          isLast={index === lists.length - 1}
         />
       ))}
       <div className="border-b border-border mb-6" />

web/src/app/home/plugins/components/plugin-market/plugin-market-card/PluginMarketCardComponent.tsx

@@ -17,7 +17,7 @@ import {
   FileText,
   Info,
 } from 'lucide-react';
-import { useState, useRef, useEffect } from 'react';
+import { useState } from 'react';
 import { Button } from '@/components/ui/button';
 
 export default function PluginMarketCardComponent({
@@ -31,43 +31,6 @@ export default function PluginMarketCardComponent({
 }) {
   const { t } = useTranslation();
   const [isHovered, setIsHovered] = useState(false);
-  const bottomRef = useRef<HTMLDivElement>(null);
-  const [visibleTags, setVisibleTags] = useState(2);
-
-  // Measure how many tags fit in the bottom row
-  useEffect(() => {
-    const tags = cardVO.tags;
-    if (!bottomRef.current || !tags || tags.length === 0) return;
-
-    const measure = () => {
-      const container = bottomRef.current;
-      if (!container) return;
-      const width = container.offsetWidth;
-      const availableForTags = width - 140 - 80;
-      if (availableForTags <= 0) {
-        setVisibleTags(0);
-        return;
-      }
-      const tagWidth = 80;
-      const plusBadgeWidth = 40;
-      const maxTags = Math.max(
-        0,
-        Math.floor((availableForTags - plusBadgeWidth) / tagWidth),
-      );
-      if (maxTags >= tags.length) {
-        setVisibleTags(tags.length);
-      } else {
-        setVisibleTags(Math.max(1, maxTags));
-      }
-    };
-
-    measure();
-    const observer = new ResizeObserver(measure);
-    observer.observe(bottomRef.current);
-    return () => observer.disconnect();
-  }, [cardVO.tags]);
-
-  const remainingTags = cardVO.tags ? cardVO.tags.length - visibleTags : 0;
 
   function handleInstallClick(e: React.MouseEvent) {
     e.stopPropagation();
@@ -172,13 +135,10 @@ export default function PluginMarketCardComponent({
         </div>
 
         {/* 下部分：下载量、标签和组件列表 */}
-        <div
-          ref={bottomRef}
-          className="w-full flex flex-row items-center justify-between gap-2 px-0 sm:px-[0.4rem] flex-shrink-0 overflow-hidden"
-        >
-          <div className="flex flex-row items-center justify-start gap-2 min-w-0 overflow-hidden">
+        <div className="w-full flex flex-row items-center justify-between gap-2 px-0 sm:px-[0.4rem] flex-shrink-0">
+          <div className="flex flex-row items-center justify-start gap-2 flex-wrap">
             {/* 下载数量 */}
-            <div className="flex flex-row items-center gap-[0.3rem] sm:gap-[0.4rem] flex-shrink-0">
+            <div className="flex flex-row items-center gap-[0.3rem] sm:gap-[0.4rem]">
               <svg
                 className="w-4 h-4 sm:w-[1.2rem] sm:h-[1.2rem] text-[#2563eb] dark:text-[#5b8def] flex-shrink-0"
                 xmlns="http://www.w3.org/2000/svg"
@@ -196,14 +156,14 @@ export default function PluginMarketCardComponent({
               </div>
             </div>
 
-            {/* Tags - adaptive */}
-            {cardVO.tags && cardVO.tags.length > 0 && visibleTags > 0 && (
-              <div className="flex flex-row items-center gap-1.5 overflow-hidden flex-shrink min-w-0">
-                {cardVO.tags.slice(0, visibleTags).map((tag) => (
+            {/* Tags */}
+            {cardVO.tags && cardVO.tags.length > 0 && (
+              <div className="flex flex-wrap gap-1.5">
+                {cardVO.tags.slice(0, 2).map((tag) => (
                   <Badge
                     key={tag}
                     variant="secondary"
-                    className="text-[0.65rem] sm:text-[0.7rem] px-2 py-0.5 h-5 flex items-center gap-1 flex-shrink-0 whitespace-nowrap"
+                    className="text-[0.65rem] sm:text-[0.7rem] px-2 py-0.5 h-5 flex items-center gap-1 flex-shrink-0"
                   >
                     <svg
                       className="w-2.5 h-2.5 flex-shrink-0"
@@ -218,17 +178,15 @@ export default function PluginMarketCardComponent({
                       <path d="M20.59 13.41l-7.17 7.17a2 2 0 0 1-2.83 0L2 12V2h10l8.59 8.59a2 2 0 0 1 0 2.82z" />
                       <line x1="7" y1="7" x2="7.01" y2="7" />
                     </svg>
-                    <span className="truncate max-w-[5rem]">
-                      {tagNames[tag] || tag}
-                    </span>
+                    <span className="truncate">{tagNames[tag] || tag}</span>
                   </Badge>
                 ))}
-                {remainingTags > 0 && (
+                {cardVO.tags.length > 2 && (
                   <Badge
                     variant="outline"
-                    className="text-[0.65rem] sm:text-[0.7rem] px-1.5 py-0.5 h-5 flex items-center flex-shrink-0 whitespace-nowrap"
+                    className="text-[0.65rem] sm:text-[0.7rem] px-2 py-0.5 h-5 flex items-center flex-shrink-0"
                   >
-                    +{remainingTags}
+                    +{cardVO.tags.length - 2}
                   </Badge>
                 )}
               </div>

web/src/app/infra/entities/form/dynamic.ts

@@ -35,7 +35,6 @@ export enum DynamicFormItemType {
   SELECT = 'select',
   LLM_MODEL_SELECTOR = 'llm-model-selector',
   EMBEDDING_MODEL_SELECTOR = 'embedding-model-selector',
-  MODEL_FALLBACK_SELECTOR = 'model-fallback-selector',
   PROMPT_EDITOR = 'prompt-editor',
   UNKNOWN = 'unknown',
   KNOWLEDGE_BASE_SELECTOR = 'knowledge-base-selector',

web/src/i18n/locales/en-US.ts

@@ -236,11 +236,6 @@ const enUS = {
     modelsCount: '{{count}} model(s)',
     expandModels: 'Expand',
     collapseModels: 'Collapse',
-    fallback: {
-      primary: 'Primary Model',
-      fallbackList: 'Fallback Models',
-      addFallback: 'Add Fallback Model',
-    },
   },
   bots: {
     title: 'Bots',

web/src/i18n/locales/ja-JP.ts

@@ -1,4 +1,4 @@
-const jaJP = {
+const jaJP = {
   common: {
     login: 'ログイン',
     logout: 'ログアウト',
@@ -241,11 +241,6 @@
     modelsCount: '{{count}} 個のモデル',
     expandModels: '展開',
     collapseModels: '折りたたむ',
-    fallback: {
-      primary: 'プライマリモデル',
-      fallbackList: 'フォールバックモデル',
-      addFallback: 'フォールバックモデルを追加',
-    },
   },
   bots: {
     title: 'ボット',

web/src/i18n/locales/zh-Hans.ts

@@ -227,11 +227,6 @@ const zhHans = {
     modelsCount: '{{count}} 个模型',
     expandModels: '展开',
     collapseModels: '收起',
-    fallback: {
-      primary: '主模型',
-      fallbackList: '备用模型',
-      addFallback: '添加备用模型',
-    },
   },
   bots: {
     title: '机器人',

web/src/i18n/locales/zh-Hant.ts

@@ -226,11 +226,6 @@ const zhHant = {
     modelsCount: '{{count}} 個模型',
     expandModels: '展開',
     collapseModels: '收起',
-    fallback: {
-      primary: '主模型',
-      fallbackList: '備用模型',
-      addFallback: '新增備用模型',
-    },
   },
   bots: {
     title: '機器人',