feat(jetbrains): add Rules settings page; pin CLI to v7.4.13

.changeset/jetbrains-rules-settings.md

@@ -0,0 +1,5 @@
+---
+"@kilocode/kilo-jetbrains": minor
+---
+
+Add Rules settings for instruction files and Claude Code compatibility. Fix cloud session history import failing with an HTTP 400 error.

packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/app/KiloAppService.kt

@@ -58,6 +58,12 @@ class KiloAppService internal constructor(
 
     val version: String? get() = info?.version
 
+    /**
+     * App-lifetime scope for fire-and-forget work that must outlive transient UIs such as the
+     * settings dialog (whose own scope is cancelled the moment it closes on OK).
+     */
+    internal val scope: CoroutineScope get() = cs
+
     internal val _state = MutableStateFlow(init)
     val state: StateFlow<KiloAppStateDto> = _state.asStateFlow()
     private val _models = MutableStateFlow(ModelStateDto())

packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/AgentBehaviorConfigurable.kt

@@ -1,6 +1,7 @@
 package ai.kilocode.client.settings.agents
 
 import ai.kilocode.client.plugin.KiloBundle
+import ai.kilocode.client.settings.rules.RulesConfigurable
 import ai.kilocode.client.ui.UiStyle
 import ai.kilocode.client.ui.layout.Stack
 import com.intellij.ide.DataManager
@@ -26,6 +27,7 @@ class AgentBehaviorConfigurable : SearchableConfigurable {
             KiloBundle.message("settings.agentBehavior.agents.displayName") to AgentsConfigurable.ID,
             KiloBundle.message("settings.agentBehavior.mcp.displayName") to McpConfigurable.ID,
             KiloBundle.message("settings.agentBehavior.skills.displayName") to SkillsConfigurable.ID,
+            KiloBundle.message("settings.agentBehavior.rules.displayName") to RulesConfigurable.ID,
         ).forEach { (label, id) ->
             panel.next(ActionLink(label) { e ->
                 val src = e.source as? JComponent ?: return@ActionLink

packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/agents/SkillsConfigurable.kt

@@ -5,7 +5,6 @@ import ai.kilocode.client.app.KiloAppService
 import ai.kilocode.client.app.KiloWorkspaceService
 import ai.kilocode.client.KiloNotifications
 import ai.kilocode.client.plugin.KiloBundle
-import ai.kilocode.client.session.ui.style.SessionUiStyle
 import ai.kilocode.client.settings.base.SettingsBadge
 import ai.kilocode.client.settings.base.SettingsDraftPage
 import ai.kilocode.client.settings.base.SettingsDraftState
@@ -15,7 +14,13 @@ import ai.kilocode.client.settings.base.SettingsListItem
 import ai.kilocode.client.settings.base.SettingsListPanel
 import ai.kilocode.client.settings.base.SettingsListSelection
 import ai.kilocode.client.settings.base.SettingsListView
+import ai.kilocode.client.settings.base.SettingsContentField
 import ai.kilocode.client.settings.base.SettingsMessageException
+import ai.kilocode.client.settings.base.SettingsPathDialog
+import ai.kilocode.client.settings.base.SettingsPathDialogHandle
+import ai.kilocode.client.settings.base.settingsChoosePath
+import ai.kilocode.client.settings.base.settingsContentScroll
+import ai.kilocode.client.settings.base.settingsEditorFileType
 import ai.kilocode.client.ui.UiStyle
 import ai.kilocode.client.ui.layout.Stack
 import ai.kilocode.log.KiloLog
@@ -34,25 +39,15 @@ import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.asContextElement
 import com.intellij.openapi.components.service
-import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.editor.event.DocumentEvent
 import com.intellij.openapi.editor.event.DocumentListener
-import com.intellij.openapi.fileChooser.FileChooser
 import com.intellij.openapi.fileChooser.FileChooserDescriptor
 import com.intellij.openapi.fileTypes.FileType
-import com.intellij.openapi.fileTypes.FileTypeManager
-import com.intellij.openapi.fileTypes.PlainTextFileType
-import com.intellij.openapi.fileTypes.UnknownFileType
 import com.intellij.openapi.project.DumbAwareAction
-import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.Messages
-import com.intellij.openapi.ui.TextFieldWithBrowseButton
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.ui.EditorTextField
 import com.intellij.ui.TitledSeparator
 import com.intellij.ui.components.JBScrollPane
-import com.intellij.ui.components.JBTextField
 import com.intellij.util.ui.JBUI
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -83,7 +78,9 @@ internal class SkillsSettingsUi(
     scope: CoroutineScope,
     dir: String,
     private val choose: (JComponent) -> String? = ::chooseSkillPath,
-    private val input: (String, String) -> String? = ::inputSkillUrl,
+    private val source: (Boolean, Boolean, String) -> SettingsPathDialogHandle = { adding, path, value ->
+        SettingsPathDialog(sourceDialogTitle(adding, path), value, if (path) choose else null)
+    },
     private val edit: (SkillDto, Boolean) -> SkillEditDialogHandle = ::SkillEditDialog,
 ) : SettingsListPanel(scope, SettingsListConfig.Equal.copy(tooltip = false)), SettingsDraftPage {
     private val cs = scope
@@ -96,7 +93,7 @@ internal class SkillsSettingsUi(
         set(value) {
             state.draft = value
         }
-    internal val sources = SkillSourcesView(this, choose, input)
+    internal val sources = SkillSourcesView(this, source)
 
     init {
         start()
@@ -323,7 +320,7 @@ private fun saved(base: SkillsDraft, draft: SkillsDraft): Boolean = base == draf
 
 internal class SkillEditDialog(private val skill: SkillDto, private val savable: Boolean) : DialogWrapper(true), SkillEditDialogHandle {
     private val base = initial()
-    private val editor = SkillEditor(base, skill.location, savable)
+    private val editor = SettingsContentField(base, skillFileType(skill.location, base), savable)
 
     init {
         title = skill.name
@@ -338,12 +335,7 @@ internal class SkillEditDialog(private val skill: SkillDto, private val savable:
         })
     }
 
-    override fun createCenterPanel(): JComponent = JBScrollPane(editor).apply {
-        viewportBorder = editorPad()
-        horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
-        verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
-        preferredSize = JBUI.size(720, 520)
-    }
+    override fun createCenterPanel(): JComponent = settingsContentScroll(editor)
 
     override fun createActions() = if (savable) arrayOf(okAction, cancelAction) else arrayOf(cancelAction)
 
@@ -352,35 +344,11 @@ internal class SkillEditDialog(private val skill: SkillDto, private val savable:
     private fun initial() = skill.content?.takeIf { it.isNotBlank() }
         ?: skill.description?.takeIf { it.isNotBlank() }
         ?: KiloBundle.message("settings.agentBehavior.skills.content.empty")
-
-    private class SkillEditor(value: String, location: String, editable: Boolean) : EditorTextField(
-        EditorFactory.getInstance().createDocument(value),
-        ProjectManager.getInstance().defaultProject,
-        skillFileType(location, value),
-        false,
-        !editable,
-    ) {
-        init {
-            border = JBUI.Borders.empty()
-            setOneLineMode(false)
-            addSettingsProvider { ed ->
-                ed.setBorder(JBUI.Borders.empty())
-                ed.scrollPane.border = JBUI.Borders.empty()
-                ed.scrollPane.viewportBorder = JBUI.Borders.empty()
-                ed.settings.isUseSoftWraps = true
-                ed.settings.isPaintSoftWraps = false
-                ed.settings.isAdditionalPageAtBottom = false
-                ed.scrollPane.horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
-                ed.scrollPane.verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
-            }
-        }
-    }
 }
 
 internal class SkillSourcesView(
     private val parent: SkillsSettingsUi,
-    private val choose: (JComponent) -> String?,
-    private val input: (String, String) -> String?,
+    private val source: (Boolean, Boolean, String) -> SettingsPathDialogHandle,
 ) : Stack(ai.kilocode.client.ui.layout.StackAxis.VERTICAL, UiStyle.Gap.sm()) {
     private val view = SettingsListView(
         KiloBundle.message("settings.agentBehavior.skills.sources.empty"),
@@ -423,16 +391,17 @@ internal class SkillSourcesView(
     }
 
     internal fun addPath() {
-        val path = choose(parent)?.trim()?.takeIf { it.isNotBlank() } ?: return
+        val dialog = source(true, true, "")
+        if (!dialog.showAndGet()) return
+        val path = dialog.value().trim().takeIf { it.isNotBlank() } ?: return
         if (path in cfg.paths) return
         parent.updateSources(cfg.paths + path, cfg.urls)
     }
 
     internal fun addUrl() {
-        val url = input(
-            KiloBundle.message("settings.agentBehavior.skills.sources.addUrl.title"),
-            KiloBundle.message("settings.agentBehavior.skills.sources.addUrl.prompt"),
-        )?.trim()?.takeIf { it.isNotBlank() } ?: return
+        val dialog = source(true, false, "")
+        if (!dialog.showAndGet()) return
+        val url = dialog.value().trim().takeIf { it.isNotBlank() } ?: return
         if (url in cfg.urls) return
         parent.updateSources(cfg.paths, cfg.urls + url)
     }
@@ -460,7 +429,7 @@ internal class SkillSourcesView(
     private fun edit(key: String) {
         val path = key.startsWith(PATH_PREFIX)
         val old = key.removePrefix(if (path) PATH_PREFIX else URL_PREFIX)
-        val dialog = SkillSourceDialog(old, path, choose)
+        val dialog = source(false, path, old)
         if (!dialog.showAndGet()) return
         val next = dialog.value().trim().takeIf { it.isNotBlank() } ?: return
         if (path) {
@@ -507,77 +476,26 @@ internal class SkillSourcesView(
     }
 }
 
-private class SkillSourceDialog(
-    value: String,
-    private val path: Boolean,
-    private val choose: (JComponent) -> String?,
-) : DialogWrapper(true) {
-    private val field = JBTextField(value)
-
-    init {
-        title = if (path) KiloBundle.message("settings.agentBehavior.skills.sources.editPath.title")
-        else KiloBundle.message("settings.agentBehavior.skills.sources.editUrl.title")
-        setOKButtonText(KiloBundle.message("common.save"))
-        init()
-    }
-
-    override fun createCenterPanel(): JComponent {
-        if (!path) return field.apply { columns = SOURCE_COLUMNS }
-        val component = TextFieldWithBrowseButton(field.apply { columns = SOURCE_COLUMNS })
-        component.addActionListener {
-            choose(component)?.let { field.text = it }
-        }
-        return component
-    }
-
-    fun value() = field.text
-}
+private fun sourceDialogTitle(adding: Boolean, path: Boolean): String = KiloBundle.message(
+    when {
+        adding && path -> "settings.agentBehavior.skills.sources.addPath.title"
+        adding -> "settings.agentBehavior.skills.sources.addUrl.title"
+        path -> "settings.agentBehavior.skills.sources.editPath.title"
+        else -> "settings.agentBehavior.skills.sources.editUrl.title"
+    },
+)
 
 private fun chooseSkillPath(parent: JComponent): String? {
-    return FileChooser.chooseFile(skillPathDescriptor(), parent, null, null as VirtualFile?)?.path
+    return settingsChoosePath(parent, skillPathDescriptor())
 }
 
 internal fun skillPathDescriptor() = FileChooserDescriptor(false, true, false, false, false, false).apply {
     title = KiloBundle.message("settings.agentBehavior.skills.sources.addPath.title")
     description = KiloBundle.message("settings.agentBehavior.skills.sources.addPath.prompt")
 }
 
-internal fun skillFileType(location: String, content: String? = null): FileType {
-    val syntax = content?.syntaxName()
-    val name = syntax ?: location.substringAfterLast('/').substringAfterLast('\\').ifBlank { SKILL_FILE }
-    val type = FileTypeManager.getInstance().getFileTypeByFileName(name)
-    if (type == UnknownFileType.INSTANCE) return PlainTextFileType.INSTANCE
-    return type
-}
-
-private fun String.syntaxName(): String? {
-    val text = trimStart()
-    if (text.isBlank()) return null
-    if (text.looksHtml()) return "index.html"
-    if (text.looksMarkdown()) return SKILL_FILE
-    return null
-}
-
-private fun String.looksHtml() = contains(Regex("^\\s*(<!doctype\\s+html|<html\\b|<body\\b|</?(h[1-6]|p|pre|code|ul|ol|li|blockquote|br)\\b)", RegexOption.IGNORE_CASE))
-
-private fun String.looksMarkdown() = lineSequence().any { line ->
-    line.matches(Regex("\\s{0,3}(#{1,6}\\s+.+|[-*+]\\s+.+|\\d+\\.\\s+.+|```.*|>\\s+.+)")) ||
-        line.contains(Regex("(`[^`]+`|\\[[^]]+][(][^)]+[)])"))
-}
-
-private fun inputSkillUrl(title: String, prompt: String): String? = Messages.showInputDialog(
-    prompt,
-    title,
-    Messages.getQuestionIcon(),
-)
-
-private fun editorPad() = JBUI.Borders.empty(
-    JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
-    JBUI.scale(SessionUiStyle.View.Prompt.SHELL_HORIZONTAL_PADDING),
-    JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
-    JBUI.scale(SessionUiStyle.View.Prompt.SHELL_HORIZONTAL_PADDING),
-)
+internal fun skillFileType(location: String, content: String? = null): FileType =
+    settingsEditorFileType(location.ifBlank { SKILL_FILE }, content)
 
-private const val SOURCE_COLUMNS = 60
 private const val SKILL_FILE = "SKILL.md"
 private const val SKILL_LOAD_TIMEOUT_MS = 10_000L

packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsContentEditor.kt

@@ -0,0 +1,85 @@
+package ai.kilocode.client.settings.base
+
+import ai.kilocode.client.session.ui.style.SessionUiStyle
+import com.intellij.openapi.editor.EditorFactory
+import com.intellij.openapi.fileTypes.FileType
+import com.intellij.openapi.fileTypes.FileTypeManager
+import com.intellij.openapi.fileTypes.PlainTextFileType
+import com.intellij.openapi.fileTypes.UnknownFileType
+import com.intellij.openapi.project.ProjectManager
+import com.intellij.ui.EditorTextField
+import com.intellij.ui.components.JBScrollPane
+import com.intellij.util.ui.JBUI
+import javax.swing.ScrollPaneConstants
+
+/**
+ * Shared code-editor primitives for settings dialogs (skill content, instruction files).
+ *
+ * Keeps the tuned [EditorTextField] configuration, scroll chrome, and content-aware file-type
+ * detection in one place so pages don't each hand-roll their own editor.
+ */
+internal class SettingsContentField(
+    content: String,
+    fileType: FileType,
+    editable: Boolean,
+) : EditorTextField(
+    EditorFactory.getInstance().createDocument(content),
+    ProjectManager.getInstance().defaultProject,
+    fileType,
+    !editable,
+    false,
+) {
+    init {
+        border = JBUI.Borders.empty()
+        setOneLineMode(false)
+        addSettingsProvider { ed ->
+            ed.setBorder(JBUI.Borders.empty())
+            ed.scrollPane.border = JBUI.Borders.empty()
+            ed.scrollPane.viewportBorder = JBUI.Borders.empty()
+            ed.settings.isUseSoftWraps = true
+            ed.settings.isPaintSoftWraps = false
+            ed.settings.isAdditionalPageAtBottom = false
+            ed.scrollPane.horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+            ed.scrollPane.verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
+        }
+    }
+}
+
+internal fun settingsContentScroll(field: SettingsContentField) = JBScrollPane(field).apply {
+    viewportBorder = JBUI.Borders.empty(
+        JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
+        JBUI.scale(SessionUiStyle.View.Prompt.SHELL_HORIZONTAL_PADDING),
+        JBUI.scale(SessionUiStyle.View.Prompt.SHELL_VERTICAL_PADDING),
+        JBUI.scale(SessionUiStyle.View.Prompt.SHELL_HORIZONTAL_PADDING),
+    )
+    horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
+    verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
+    preferredSize = JBUI.size(720, 520)
+}
+
+/**
+ * Resolve a [FileType] for editor highlighting. Content syntax wins over the file name so
+ * extension-less locations still highlight correctly; unknown types fall back to plain text.
+ */
+internal fun settingsEditorFileType(name: String, content: String? = null): FileType {
+    val syntax = content?.syntaxName()
+    val fileName = syntax ?: name.substringAfterLast('/').substringAfterLast('\\').ifBlank { "file.txt" }
+    val type = FileTypeManager.getInstance().getFileTypeByFileName(fileName)
+    if (type == UnknownFileType.INSTANCE) return PlainTextFileType.INSTANCE
+    return type
+}
+
+private fun String.syntaxName(): String? {
+    val text = trimStart()
+    if (text.isBlank()) return null
+    if (text.looksHtml()) return "index.html"
+    if (text.looksMarkdown()) return "content.md"
+    return null
+}
+
+private fun String.looksHtml() = contains(Regex("^\\s*(<!doctype\\s+html|<html\\b|<body\\b|</?(h[1-6]|p|pre|code|ul|ol|li|blockquote|br)\\b)", RegexOption.IGNORE_CASE))
+
+private fun String.looksMarkdown() = lineSequence().any { line ->
+    line.matches(Regex("\\s{0,3}(#{1,6}\\s+.+|[-*+]\\s+.+|\\d+\\.\\s+.+|```.*|>\\s+.+)")) ||
+        line.contains(Regex("(`[^`]+`|\\[[^]]+][(][^)]+[)])"))
+}

packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/SettingsListModel.kt

@@ -85,7 +85,10 @@ internal fun settingsListCellBounds(
     @Suppress("UNCHECKED_CAST")
     val renderer = list.cellRenderer as? ListCellRenderer<Any?> ?: return emptyMap()
     val cell = list.getCellBounds(index, index) ?: return emptyMap()
-    val comp = renderer.getListCellRendererComponent(list, model.getElementAt(index), index, selected, list.hasFocus())
+    // Render as focused so the action-cell geometry is available for hit-testing even when the
+    // list is not the focus owner. Painting still hides the cells on an unfocused list; this only
+    // resolves click targets and keeps them stable regardless of focus.
+    val comp = renderer.getListCellRendererComponent(list, model.getElementAt(index), index, selected, true)
     comp.setBounds(0, 0, cell.width, cell.height)
     settingsListLayout(comp)
     val out = linkedMapOf<String, Rectangle>()