diff --git a/frontend/src/components/Input-field.agent-switch.test.mjs b/frontend/src/components/Input-field.agent-switch.test.mjs new file mode 100644 index 00000000..5821ff5f --- /dev/null +++ b/frontend/src/components/Input-field.agent-switch.test.mjs @@ -0,0 +1,26 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import test from 'node:test' + +const inputField = readFileSync(new URL('./Input-field.vue', import.meta.url), 'utf8') +const settingsStore = readFileSync(new URL('../stores/settings.ts', import.meta.url), 'utf8') + +test('selecting an agent leaves web search off until the user enables it', () => { + const selectAgentStart = settingsStore.indexOf('selectAgent(agentId: string') + const getSelectedAgentStart = settingsStore.indexOf('getSelectedAgentId()', selectAgentStart) + const selectAgentAction = settingsStore.slice(selectAgentStart, getSelectedAgentStart) + + assert.notEqual(selectAgentStart, -1) + assert.notEqual(getSelectedAgentStart, -1) + assert.match(selectAgentAction, /this\.settings\.webSearchEnabled = false/) + + const handleSelectAgentStart = inputField.indexOf('const handleSelectAgent = async') + const handleSelectAgentEnd = inputField.indexOf('const clearvalue', handleSelectAgentStart) + const handleSelectAgent = inputField.slice(handleSelectAgentStart, handleSelectAgentEnd) + + assert.notEqual(handleSelectAgentStart, -1) + assert.notEqual(handleSelectAgentEnd, -1) + assert.match(handleSelectAgent, /settingsStore\.selectAgent\(agent\.id, sourceTenantId\)/) + assert.doesNotMatch(handleSelectAgent, /agentWebSearch/) + assert.doesNotMatch(handleSelectAgent, /settingsStore\.toggleWebSearch/) +}) diff --git a/frontend/src/components/Input-field.vue b/frontend/src/components/Input-field.vue index d3e14ed2..d08501a6 100644 --- a/frontend/src/components/Input-field.vue +++ b/frontend/src/components/Input-field.vue @@ -221,7 +221,7 @@ const agentKBSelectionMode = computed(() => { // 共享智能体下的知识库列表(来自 listKnowledgeBases(agent_id)),用于已选知识库展示与 org 角标 const sharedAgentKbList = ref>([]); -// 当智能体改变时,模型、网络搜索、可@知识库列表均跟随新智能体配置 +// 当智能体改变时,模型、可@知识库列表均跟随新智能体配置;网络搜索由用户主动开启 // 知识库:用新智能体配置的列表替换当前选中,使已选与可@列表一致(含共享智能体) watch([selectedAgentId, agentKnowledgeBases, agentKBSelectionMode], ([newAgentId, newAgentKbs, newKbMode], [oldAgentId]) => { if (settingsStore._isApplyingSessionState) return; @@ -2124,16 +2124,8 @@ const handleSelectAgent = async (agent: CustomAgent, sourceTenantId?: string) => settingsStore.selectAgent(agent.id, sourceTenantId); settingsStore.toggleAgent(!!isAgentType); - // 同步智能体的配置状态(含内置、自定义、共享智能体):模型、网络搜索、知识库由 watch 同步 - // 1. 同步网络搜索状态 - const agentWebSearch = agent.config?.web_search_enabled; - if (agentWebSearch !== undefined) { - settingsStore.toggleWebSearch(agentWebSearch); - } else if (agent.is_builtin) { - // 内置智能体未配置时保留当前用户设置 - } - - // 2. 同步模型(选中的对话模型随智能体切换,含共享智能体) + // 同步模型(选中的对话模型随智能体切换,含共享智能体)。 + // 网络搜索已由 selectAgent 重置为关闭,智能体配置只控制该开关是否可用。 const agentModel = agent.config?.model_id; if (agentModel && agentModel.trim() !== '') { selectedModelId.value = agentModel; diff --git a/frontend/src/stores/settings.ts b/frontend/src/stores/settings.ts index 407bbed0..9b82af93 100644 --- a/frontend/src/stores/settings.ts +++ b/frontend/src/stores/settings.ts @@ -485,6 +485,9 @@ export const useSettingsStore = defineStore("settings", { selectAgent(agentId: string, sourceTenantId?: string | null) { this.settings.selectedAgentId = agentId; this.settings.selectedAgentSourceTenantId = (sourceTenantId != null && sourceTenantId !== "") ? sourceTenantId : null; + // 智能体配置只决定是否具备网络搜索能力,不替用户决定是否在本轮使用。 + // 每次选择智能体都默认关闭,之后只能由用户从输入框主动开启。 + this.settings.webSearchEnabled = false; // 根据智能体类型自动切换 Agent 模式 if (agentId === BUILTIN_QUICK_ANSWER_ID) { this.settings.isAgentEnabled = false;