Merge pull request #506 from phodal/feat/add-new-model-config-support

feat: Add support for creating new model configs in ModelConfigDialog

Author: phodal

mpp-idea/src/main/kotlin/cc/unitmesh/devins/idea/editor/IdeaBottomToolbar.kt

@@ -39,6 +39,7 @@ fun IdeaBottomToolbar(
     currentConfigName: String? = null,
     onConfigSelect: (NamedModelConfig) -> Unit = {},
     onConfigureClick: () -> Unit = {},
+    onAddNewConfig: () -> Unit = {},
     modifier: Modifier = Modifier
 ) {
     Row(
@@ -59,7 +60,8 @@ fun IdeaBottomToolbar(
                 availableConfigs = availableConfigs,
                 currentConfigName = currentConfigName,
                 onConfigSelect = onConfigSelect,
-                onConfigureClick = onConfigureClick
+                onConfigureClick = onConfigureClick,
+                onAddNewConfig = onAddNewConfig
             )
 
             // Token usage indicator (subtle)

mpp-idea/src/main/kotlin/cc/unitmesh/devins/idea/editor/IdeaModelSelector.kt

@@ -35,6 +35,7 @@ fun IdeaModelSelector(
     currentConfigName: String?,
     onConfigSelect: (NamedModelConfig) -> Unit,
     onConfigureClick: () -> Unit,
+    onAddNewConfig: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     var expanded by remember { mutableStateOf(false) }
@@ -131,7 +132,32 @@ fun IdeaModelSelector(
                     separator()
                 }
 
-                // Configure button
+                // Add New Config button
+                selectableItem(
+                    selected = false,
+                    onClick = {
+                        onAddNewConfig()
+                        expanded = false
+                    }
+                ) {
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Icon(
+                            imageVector = IdeaComposeIcons.Add,
+                            contentDescription = null,
+                            tint = JewelTheme.globalColors.text.normal,
+                            modifier = Modifier.size(16.dp)
+                        )
+                        Text(
+                            text = "Add New Config",
+                            style = JewelTheme.defaultTextStyle.copy(fontSize = 13.sp)
+                        )
+                    }
+                }
+
+                // Configure button (edit current config)
                 selectableItem(
                     selected = false,
                     onClick = {

mpp-idea/src/main/kotlin/cc/unitmesh/devins/idea/editor/SwingBottomToolbar.kt

@@ -32,6 +32,7 @@ class SwingBottomToolbar(
     private var availableConfigs: List<NamedModelConfig> = emptyList()
     private var onConfigSelect: (NamedModelConfig) -> Unit = {}
     private var onConfigureClick: () -> Unit = {}
+    private var onAddNewConfig: () -> Unit = {}
     private var isProcessing = false
     private var isEnhancing = false
 
@@ -52,6 +53,16 @@ class SwingBottomToolbar(
             }
             add(modelComboBox)
 
+            // Add New Config button
+            val addConfigButton = JButton(AllIcons.General.Add).apply {
+                toolTipText = "Add New Config"
+                preferredSize = Dimension(28, 28)
+                isBorderPainted = false
+                isContentAreaFilled = false
+                addActionListener { onAddNewConfig() }
+            }
+            add(addConfigButton)
+
             tokenLabel.foreground = JBUI.CurrentTheme.Label.disabledForeground()
             add(tokenLabel)
         }
@@ -138,5 +149,9 @@ class SwingBottomToolbar(
     fun setOnConfigureClick(callback: () -> Unit) {
         onConfigureClick = callback
     }
+
+    fun setOnAddNewConfig(callback: () -> Unit) {
+        onAddNewConfig = callback
+    }
 }
 

mpp-idea/src/main/kotlin/cc/unitmesh/devins/idea/toolwindow/IdeaAgentApp.kt

@@ -65,6 +65,7 @@ fun IdeaAgentApp(
     var isExecuting by remember { mutableStateOf(false) }
     var currentPlan by remember { mutableStateOf<AgentPlan?>(null) }
     var showConfigDialog by remember { mutableStateOf(false) }
+    var isNewConfig by remember { mutableStateOf(false) }
     var mcpPreloadingMessage by remember { mutableStateOf("") }
     var configWrapper by remember { mutableStateOf<AutoDevConfigWrapper?>(null) }
     var currentModelConfig by remember { mutableStateOf<ModelConfig?>(null) }
@@ -89,6 +90,9 @@ fun IdeaAgentApp(
     IdeaLaunchedEffect(viewModel, project = project) {
         viewModel.showConfigDialog.collect { showConfigDialog = it }
     }
+    IdeaLaunchedEffect(viewModel, project = project) {
+        viewModel.isNewConfig.collect { isNewConfig = it }
+    }
     IdeaLaunchedEffect(viewModel, project = project) {
         viewModel.mcpPreloadingMessage.collect { mcpPreloadingMessage = it }
     }
@@ -217,7 +221,8 @@ fun IdeaAgentApp(
                                 viewModel.setActiveConfig(config.name)
                             },
                             currentPlan = currentPlan,
-                            onConfigureClick = { viewModel.setShowConfigDialog(true) }
+                            onConfigureClick = { viewModel.showEditConfigDialog() },
+                            onAddNewConfig = { viewModel.showAddNewConfigDialog() }
                         )
                     }
                 )
@@ -266,7 +271,8 @@ fun IdeaAgentApp(
                                 onConfigSelect = { config ->
                                     viewModel.setActiveConfig(config.name)
                                 },
-                                onConfigureClick = { viewModel.setShowConfigDialog(true) }
+                                onConfigureClick = { viewModel.showEditConfigDialog() },
+                                onAddNewConfig = { viewModel.showAddNewConfigDialog() }
                             )
                         }
                     )
@@ -304,12 +310,13 @@ fun IdeaAgentApp(
     // DialogWrapper must be created on EDT, so we use invokeLater
     DisposableEffect(showConfigDialog) {
         if (showConfigDialog) {
-            val dialogConfig = currentModelConfig ?: ModelConfig()
+            val dialogConfig = if (isNewConfig) ModelConfig() else (currentModelConfig ?: ModelConfig())
+            val dialogConfigName = if (isNewConfig) null else currentConfigName
             com.intellij.openapi.application.ApplicationManager.getApplication().invokeLater {
                 IdeaModelConfigDialogWrapper.show(
                     project = project,
                     currentConfig = dialogConfig,
-                    currentConfigName = currentConfigName,
+                    currentConfigName = dialogConfigName,
                     onSave = { configName, newModelConfig ->
                         // If creating a new config (not editing current), ensure unique name
                         val existingNames = availableConfigs.map { it.name }

mpp-idea/src/main/kotlin/cc/unitmesh/devins/idea/toolwindow/IdeaAgentViewModel.kt

@@ -81,6 +81,8 @@ class IdeaAgentViewModel(
     // Show config dialog
     private val _showConfigDialog = MutableStateFlow(false)
     val showConfigDialog: StateFlow<Boolean> = _showConfigDialog.asStateFlow()
+    private val _isNewConfig = MutableStateFlow(false)
+    val isNewConfig: StateFlow<Boolean> = _isNewConfig.asStateFlow()
 
     // Current execution job (for cancellation)
     private var currentJob: Job? = null
@@ -587,6 +589,22 @@ class IdeaAgentViewModel(
         _showConfigDialog.value = show
     }
 
+    /**
+     * Show config dialog for adding a new config.
+     */
+    fun showAddNewConfigDialog() {
+        _isNewConfig.value = true
+        _showConfigDialog.value = true
+    }
+
+    /**
+     * Show config dialog for editing current config.
+     */
+    fun showEditConfigDialog() {
+        _isNewConfig.value = false
+        _showConfigDialog.value = true
+    }
+
     /**
      * Set the active configuration by name
      */

mpp-idea/src/main/kotlin/cc/unitmesh/devins/idea/toolwindow/IdeaDevInInputArea.kt

@@ -80,6 +80,7 @@ fun IdeaDevInInputArea(
     currentConfigName: String? = null,
     onConfigSelect: (NamedModelConfig) -> Unit = {},
     onConfigureClick: () -> Unit = {},
+    onAddNewConfig: () -> Unit = {},
     currentPlan: AgentPlan? = null
 ) {
     val scope = rememberIdeaCoroutineScope(project)
@@ -116,6 +117,11 @@ fun IdeaDevInInputArea(
         onDispose { }
     }
 
+    DisposableEffect(onAddNewConfig) {
+        swingInputArea?.setOnAddNewConfig(onAddNewConfig)
+        onDispose { }
+    }
+
     DisposableEffect(currentPlan) {
         swingInputArea?.setCurrentPlan(currentPlan)
         onDispose { }
@@ -140,6 +146,7 @@ fun IdeaDevInInputArea(
                 it.setCurrentConfigName(currentConfigName)
                 it.setOnConfigSelect(onConfigSelect)
                 it.setOnConfigureClick(onConfigureClick)
+                it.setOnAddNewConfig(onAddNewConfig)
                 it.setCurrentPlan(currentPlan)
             }
         },
@@ -327,6 +334,10 @@ class SwingDevInInputArea(
         bottomToolbar.setOnConfigureClick(callback)
     }
 
+    fun setOnAddNewConfig(callback: () -> Unit) {
+        bottomToolbar.setOnAddNewConfig(callback)
+    }
+
     fun setCurrentPlan(plan: AgentPlan?) {
         currentPlan = plan
         // TODO: Add plan summary bar support

mpp-ui/src/commonMain/i18n/cc/unitmesh/devins/ui/i18n/AutoDevStrings_en.properties

@@ -7,6 +7,7 @@ common.back=Back
 common.confirm=Confirm
 common.configure=Configure
 common.loading=Loading
+common.add=Add
 
 # Chat UI
 chat.title=AutoDev
@@ -25,6 +26,7 @@ modelConfig.temperature=Temperature
 modelConfig.maxTokens=Max Tokens
 modelConfig.advancedParameters=Advanced Parameters
 modelConfig.configureModel=Configure Model
+modelConfig.addNewConfig=Add New Config
 modelConfig.noSavedConfigs=No saved configurations
 modelConfig.enterModel=Enter or select model name
 modelConfig.modelHint=Select from list or type custom model name

mpp-ui/src/commonMain/i18n/cc/unitmesh/devins/ui/i18n/AutoDevStrings_zh.properties

@@ -7,6 +7,7 @@ common.back=返回
 common.confirm=确认
 common.configure=配置
 common.loading=加载中
+common.add=添加
 
 # Chat UI
 chat.title=AutoDev
@@ -25,6 +26,7 @@ modelConfig.temperature=温度
 modelConfig.maxTokens=最大令牌数
 modelConfig.advancedParameters=高级参数
 modelConfig.configureModel=配置模型...
+modelConfig.addNewConfig=新增配置
 modelConfig.noSavedConfigs=没有保存的配置
 modelConfig.enterModel=输入或选择模型名称
 modelConfig.modelHint=从列表中选择或输入自定义模型名称

mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/compose/editor/ModelSelector.kt

@@ -27,6 +27,7 @@ import kotlinx.coroutines.launch
 fun ModelSelector(onConfigChange: (ModelConfig) -> Unit = {}) {
     var expanded by remember { mutableStateOf(false) }
     var showConfigDialog by remember { mutableStateOf(false) }
+    var isNewConfig by remember { mutableStateOf(false) }
 
     var availableConfigs by remember { mutableStateOf<List<NamedModelConfig>>(emptyList()) }
     var currentConfigName by remember { mutableStateOf<String?>(null) }
@@ -135,10 +136,28 @@ fun ModelSelector(onConfigChange: (ModelConfig) -> Unit = {}) {
             HorizontalDivider()
         }
 
-        // Configure button
+        // Add New Config button
+        DropdownMenuItem(
+            text = { Text(Strings.addNewConfig) },
+            onClick = {
+                isNewConfig = true
+                showConfigDialog = true
+                expanded = false
+            },
+            leadingIcon = {
+                Icon(
+                    imageVector = AutoDevComposeIcons.Add,
+                    contentDescription = Strings.add,
+                    modifier = Modifier.size(18.dp)
+                )
+            }
+        )
+
+        // Configure button (edit current config)
         DropdownMenuItem(
             text = { Text(Strings.configureModel) },
             onClick = {
+                isNewConfig = false
                 showConfigDialog = true
                 expanded = false
             },
@@ -154,9 +173,12 @@ fun ModelSelector(onConfigChange: (ModelConfig) -> Unit = {}) {
 
     if (showConfigDialog) {
         ModelConfigDialog(
-            currentConfig = currentConfig?.toModelConfig() ?: ModelConfig(),
-            currentConfigName = currentConfigName,
-            onDismiss = { showConfigDialog = false },
+            currentConfig = if (isNewConfig) ModelConfig() else (currentConfig?.toModelConfig() ?: ModelConfig()),
+            currentConfigName = if (isNewConfig) null else currentConfigName,
+            onDismiss = { 
+                showConfigDialog = false
+                isNewConfig = false
+            },
             onSave = { configName, newModelConfig ->
                 scope.launch {
                     try {

mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/i18n/I18n.kt

@@ -66,6 +66,7 @@ object Strings {
     val confirm: String get() = AutoDevStrings.common_confirm.toString()
     val configure: String get() = AutoDevStrings.common_configure.toString()
     val loading: String get() = AutoDevStrings.common_loading.toString()
+    val add: String get() = AutoDevStrings.common_add.toString()
 
     // Chat UI
     val chatTitle: String get() = AutoDevStrings.chat_title.toString()
@@ -85,6 +86,7 @@ object Strings {
     val maxTokens: String get() = AutoDevStrings.modelConfig_maxTokens.toString()
     val advancedParameters: String get() = AutoDevStrings.modelConfig_advancedParameters.toString()
     val configureModel: String get() = AutoDevStrings.modelConfig_configureModel.toString()
+    val addNewConfig: String get() = AutoDevStrings.modelConfig_addNewConfig.toString()
     val noSavedConfigs: String get() = AutoDevStrings.modelConfig_noSavedConfigs.toString()
     val enterModel: String get() = AutoDevStrings.modelConfig_enterModel.toString()
     val enterApiKey: String get() = AutoDevStrings.modelConfig_enterApiKey.toString()