fix:修复双模式bug

Author: roseforljh

app1/app/src/main/java/com/android/everytalk/statecontroller/SimpleModeManager.kt

@@ -428,6 +428,7 @@ class SimpleModeManager(
         // 5. 设置对话ID（必须在消息加载前设置）
         val stableId = conversationToLoad.firstOrNull()?.id ?: "image_history_${UUID.randomUUID()}"
         stateHolder._currentImageGenerationConversationId.value = stableId
+        stateHolder.applyCurrentImageConversationFunctionToggleState()
 
         // 🔧 修复：恢复会话使用的图像生成配置
         val savedConfigId = stateHolder.conversationApiConfigIds.value[stableId]

app1/app/src/main/java/com/android/everytalk/statecontroller/ViewModelStateHolder.kt

@@ -170,6 +170,11 @@ val _isStreamingPaused = MutableStateFlow(false)
         return conversationFunctionToggleStates.value[_currentConversationId.value] ?: ConversationFunctionToggleState()
     }
 
+    fun getCurrentImageConversationFunctionToggleState(): ConversationFunctionToggleState {
+        return conversationFunctionToggleStates.value[_currentImageGenerationConversationId.value]
+            ?: ConversationFunctionToggleState()
+    }
+
     fun updateCurrentConversationFunctionToggleState(
         update: (ConversationFunctionToggleState) -> ConversationFunctionToggleState
     ) {
@@ -253,6 +258,13 @@ val _isStreamingPaused = MutableStateFlow(false)
         _isMcpEnabledForNextRequest.value = toggleState.mcpEnabled
     }
 
+    fun applyCurrentImageConversationFunctionToggleState() {
+        val toggleState = getCurrentImageConversationFunctionToggleState()
+        _isWebSearchEnabled.value = toggleState.webSearchEnabled
+        _isCodeExecutionEnabled.value = toggleState.codeExecutionEnabled
+        _isMcpEnabledForNextRequest.value = toggleState.mcpEnabled
+    }
+
     fun updateOpenClawSessionId(sessionId: String?) {
         _currentOpenClawSessionId.value = sessionId?.takeIf { it.isNotBlank() } ?: "main"
     }
@@ -438,6 +450,7 @@ val _isStreamingPaused = MutableStateFlow(false)
             _apiHandler.clearImageChatResources()
         }
         isImageConversationDirty.value = false
+        applyCurrentImageConversationFunctionToggleState()
     }
 
     val selectedMediaItems: SnapshotStateList<SelectedMediaItem> =

app1/app/src/test/java/com/android/everytalk/statecontroller/AddMenuPreferenceStateTest.kt

@@ -1,6 +1,7 @@
 package com.android.everytalk.statecontroller
 
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Test
 
 class AddMenuPreferenceStateTest {
@@ -13,4 +14,32 @@ class AddMenuPreferenceStateTest {
         assertEquals(false, state.codeExecutionEnabled)
         assertEquals(false, state.mcpEnabled)
     }
+
+    @Test
+    fun `image conversation applies its own toggle state instead of text conversation state`() {
+        val holder = ViewModelStateHolder()
+        val textConversationId = holder._currentConversationId.value
+        val imageConversationId = "image_history_1"
+
+        holder.conversationFunctionToggleStates.value = mapOf(
+            textConversationId to ConversationFunctionToggleState(
+                webSearchEnabled = true,
+                codeExecutionEnabled = true,
+                mcpEnabled = true
+            ),
+            imageConversationId to ConversationFunctionToggleState(
+                webSearchEnabled = false,
+                codeExecutionEnabled = false,
+                mcpEnabled = false
+            )
+        )
+
+        holder._currentImageGenerationConversationId.value = imageConversationId
+        holder.applyCurrentImageConversationFunctionToggleState()
+
+        assertFalse(holder._isWebSearchEnabled.value)
+        assertFalse(holder._isCodeExecutionEnabled.value)
+        assertFalse(holder._isMcpEnabledForNextRequest.value)
+    }
+
 }