chore(deps): bump com.qcloud:cos_api from 5.6.259 to 5.6.260.1

Bumps [com.qcloud:cos_api](https://github.com/tencentyun/cos-java-sdk-v5) from 5.6.259 to 5.6.260.1.
- [Release notes](https://github.com/tencentyun/cos-java-sdk-v5/releases)
- [Changelog](https://github.com/tencentyun/cos-java-sdk-v5/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tencentyun/cos-java-sdk-v5/commits)

---
updated-dependencies:
- dependency-name: com.qcloud:cos_api
  dependency-version: 5.6.260.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/linux.yml

@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 env:
   JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1138.52
+  JBR_PATCH: b1163.69
 
 jobs:
   build:

.github/workflows/osx.yml

@@ -9,14 +9,14 @@ env:
   TERMORA_MAC_NOTARY: "${{ startsWith(github.event.head_commit.message, 'release: ') && github.repository == 'TermoraDev/termora' }}"
   TERMORA_MAC_NOTARY_KEYCHAIN_PROFILE: ${{ secrets.TERMORA_MAC_NOTARY_KEYCHAIN_PROFILE }}
   JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1138.52
+  JBR_PATCH: b1163.69
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-15, macos-13 ]
+        os: [ macos-15-intel, macos-latest ]
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/windows.yml

@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 env:
   JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1138.52
+  JBR_PATCH: b1163.69
 
 jobs:
   build:

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-kotlin = "2.2.21"
+kotlin = "2.3.0"
 slf4j = "2.0.17"
 pty4j = "0.13.10"
 tinylog = "2.7.0"
 kotlinx-coroutines = "1.10.2"
-flatlaf = "3.6.2"
+flatlaf = "3.7"
 kotlinx-serialization-json = "1.9.0"
-commons-codec = "1.19.0"
+commons-codec = "1.20.0"
-commons-lang3 = "3.19.0"
+commons-lang3 = "3.20.0"
 commons-csv = "1.14.1"
 commons-net = "3.12.0"
-commons-text = "1.14.0"
+commons-text = "1.15.0"
 commons-compress = "1.28.0"
 commons-vfs2 = "2.10.0"
 swingx = "1.6.5-1"
@@ -20,11 +20,11 @@ oshi = "6.9.1"
 versioncompare = "1.4.1"
 jna = "5.18.1"
 jSystemThemeDetector = "3.9.1"
-commons-io = "2.20.0"
+commons-io = "2.21.0"
 jbr-api = "17.1.10.1"
 hutool = "5.8.40"
 jsch = "2.27.3"
-okhttp = "5.2.1"
+okhttp = "5.3.0"
 sshj = "0.39.0"
 sshd-core = "2.15.0"
 jgit = "7.4.0.202509020913-r"
@@ -33,18 +33,18 @@ jnafilechooser = "1.1.2"
 xodus = "2.0.1"
 bip39 = "1.0.9"
 colorpicker = "2.0.1"
-rhino = "1.8.0"
+rhino = "1.9.0"
 delight-rhino-sandbox = "0.2.1"
-testcontainers = "2.0.1"
+testcontainers = "2.0.3"
-mixpanel = "1.5.4"
+mixpanel = "1.7.0"
-jSerialComm = "2.11.2"
+jSerialComm = "2.11.4"
 ini4j = "0.5.5-2"
 restart4j = "0.0.1"
 eddsa = "0.3.0"
-exposed = "1.0.0-rc-2"
+exposed = "1.0.0-rc-4"
 h2 = "2.3.232"
 sqlite = "3.50.3.0"
-jug = "5.1.1"
+jug = "5.2.0"
 semver4j = "6.0.0"
 jsvg = "2.0.0"
 dom4j = "2.2.0"

plugins/cos/build.gradle.kts

@@ -8,7 +8,7 @@ project.version = "0.0.4"
 
 dependencies {
     testImplementation(kotlin("test"))
-    implementation("com.qcloud:cos_api:5.6.257")
+    implementation("com.qcloud:cos_api:5.6.260.1")
     compileOnly(project(":"))
 }
 

plugins/editor/build.gradle.kts

@@ -10,7 +10,7 @@ project.version = "0.0.8"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("com.fifesoft:rsyntaxtextarea:3.6.0")
+    implementation("com.fifesoft:rsyntaxtextarea:3.6.1")
     implementation("com.fifesoft:languagesupport:3.4.0")
     implementation("com.fifesoft:autocomplete:3.3.2")
 }

plugins/ftp/build.gradle.kts

@@ -7,7 +7,7 @@ project.version = "0.0.2"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("org.apache.commons:commons-pool2:2.12.1")
+    implementation("org.apache.commons:commons-pool2:2.13.0")
     testImplementation(project(":"))
 }
 

plugins/geo/build.gradle.kts

@@ -7,9 +7,9 @@ project.version = "0.0.8"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("com.maxmind.geoip2:geoip2:4.4.0")
+    implementation("com.maxmind.geoip2:geoip2:5.0.0")
     // https://github.com/hstyi/geolite2
-    implementation("com.github.hstyi:geolite2:v1.0-202510200054")
+    implementation("com.github.hstyi:geolite2:v1.0-202510270056")
 }
 
 apply(from = "$rootDir/plugins/common.gradle.kts")

plugins/serial/build.gradle.kts

@@ -10,7 +10,7 @@ project.version = "0.0.5"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("com.fazecast:jSerialComm:2.11.2")
+    implementation("com.fazecast:jSerialComm:2.11.4")
 }
 
 apply(from = "$rootDir/plugins/common.gradle.kts")

src/main/kotlin/app/termora/ApplicationInitializr.kt

@@ -50,6 +50,17 @@ class ApplicationInitializr {
             }
         }
 
+        // https://github.com/TermoraDev/termora/issues/1254
+        if (System.getProperty(FlatSystemProperties.UI_SCALE).isNullOrBlank()) {
+            val scale = System.getenv("TERMORA_SCALE")
+            if (scale.isNullOrBlank().not()) {
+                if (NumberUtils.toDouble(scale, -1.0) > 0) {
+                    System.setProperty(FlatSystemProperties.UI_SCALE_ENABLED, "true")
+                    System.setProperty(FlatSystemProperties.UI_SCALE, scale)
+                }
+            }
+        }
+
         // 启动
         val runtime = measureTimeMillis { ApplicationRunner().run() }
         val log = LoggerFactory.getLogger(javaClass)

src/main/kotlin/app/termora/OpenHostActionEvent.kt

@@ -3,5 +3,5 @@ package app.termora
 import app.termora.actions.AnActionEvent
 import java.util.*
 
-class OpenHostActionEvent(source: Any, val host: Host, event: EventObject) :
+class OpenHostActionEvent(source: Any, val host: Host, event: EventObject, val tabIndex: Int = -1) :
     AnActionEvent(source, String(), event)

src/main/kotlin/app/termora/PtyHostTerminalTab.kt

@@ -179,7 +179,7 @@ abstract class PtyHostTerminalTab(
 
         val tab = createReconnectTerminalTab()
         manager.addTerminalTab(index, tab, true)
-        manager.closeTerminalTab(this, true)
+        manager.closeTerminalTab(this, disposable = true, reconnect = true)
 
         if (tab is HostTerminalTab) {
             tab.start()

src/main/kotlin/app/termora/SettingsOptionsPane.kt

@@ -547,6 +547,7 @@ class SettingsOptionsPane : OptionsPane() {
 
             rightClickComboBox.addItem("Copy")
             rightClickComboBox.addItem("CopyAndPaste")
+            rightClickComboBox.addItem("Nothing")
 
             rightClickComboBox.selectedItem = terminalSetting.rightClick
 
@@ -576,6 +577,8 @@ class SettingsOptionsPane : OptionsPane() {
                         text = I18n.getString("termora.settings.terminal.right-click.copy")
                     } else if (value == "CopyAndPaste") {
                         text = I18n.getString("termora.settings.terminal.right-click.copy-and-paste")
+                    }else if (value == "Nothing") {
+                        text = I18n.getString("termora.settings.terminal.right-click.nothing")
                     }
                     return super.getListCellRendererComponent(list, text, index, isSelected, cellHasFocus)
                 }

src/main/kotlin/app/termora/TerminalTabbed.kt

@@ -141,25 +141,28 @@ class TerminalTabbed(
 
     }
 
-    private fun removeTabAt(index: Int, disposable: Boolean = true) {
+    private fun removeTabAt(index: Int, disposable: Boolean = true, reconnect: Boolean = false) {
         if (tabbedPane.isTabClosable(index)) {
             val tab = tabs[index]
 
             // 询问是否可以关闭
             if (disposable) {
-                // 如果开启了关闭确认，那么直接询问用户
+                // 如果是重连接，那么直接关闭不进行任何形式的询问
-                if (appearance.confirmTabClose) {
+                if (reconnect.not()) {
-                    if (OptionPane.showConfirmDialog(
+                    // 如果开启了关闭确认，那么直接询问用户
-                            windowScope.window,
+                    if (appearance.confirmTabClose) {
-                            I18n.getString("termora.tabbed.tab.close-prompt"),
+                        if (OptionPane.showConfirmDialog(
-                            messageType = JOptionPane.QUESTION_MESSAGE,
+                                windowScope.window,
-                            optionType = JOptionPane.OK_CANCEL_OPTION
+                                I18n.getString("termora.tabbed.tab.close-prompt"),
-                        ) != JOptionPane.OK_OPTION
+                                messageType = JOptionPane.QUESTION_MESSAGE,
-                    ) {
+                                optionType = JOptionPane.OK_CANCEL_OPTION
+                            ) != JOptionPane.OK_OPTION
+                        ) {
+                            return
+                        }
+                    } else if (!tab.willBeClose()) { // 如果没有开启则询问用户
                         return
                     }
-                } else if (!tab.willBeClose()) { // 如果没有开启则询问用户
-                    return
                 }
             }
 
@@ -233,7 +236,7 @@ class TerminalTabbed(
             if (tab is HostTerminalTab) {
                 actionManager
                     .getAction(OpenHostAction.OPEN_HOST)
-                    .actionPerformed(OpenHostActionEvent(this, tab.host, evt))
+                    .actionPerformed(OpenHostActionEvent(this, tab.host, evt, tabIndex + 1))
             }
         }
 
@@ -361,7 +364,7 @@ class TerminalTabbed(
         }
     }
 
-    override fun indexOfTerminalTab(tab: TerminalTab):Int {
+    override fun indexOfTerminalTab(tab: TerminalTab): Int {
         return tabbedPane.indexOfComponent(tab.getJComponent())
     }
 
@@ -451,10 +454,10 @@ class TerminalTabbed(
         }
     }
 
-    override fun closeTerminalTab(tab: TerminalTab, disposable: Boolean) {
+    override fun closeTerminalTab(tab: TerminalTab, disposable: Boolean, reconnect: Boolean) {
         for (i in 0 until tabs.size) {
             if (tabs[i] == tab) {
-                removeTabAt(i, disposable)
+                removeTabAt(i, disposable, reconnect)
                 break
             }
         }

src/main/kotlin/app/termora/TerminalTabbedManager.kt

@@ -6,7 +6,7 @@ interface TerminalTabbedManager {
     fun getSelectedTerminalTab(): TerminalTab?
     fun getTerminalTabs(): List<TerminalTab>
     fun setSelectedTerminalTab(tab: TerminalTab)
-    fun closeTerminalTab(tab: TerminalTab, disposable: Boolean = true)
+    fun closeTerminalTab(tab: TerminalTab, disposable: Boolean = true, reconnect: Boolean = false)
     fun refreshTerminalTabs()
     fun indexOfTerminalTab(tab: TerminalTab): Int
 }

src/main/kotlin/app/termora/account/PullService.kt

@@ -67,6 +67,11 @@ class PullService private constructor() : SyncService(), Disposable, Application
     private var lastChangeHash = StringUtils.EMPTY
 
     private fun pullChanges() {
+
+        if (accountManager.isLocally()) {
+            return
+        }
+
         val hash: String
 
         try {

src/main/kotlin/app/termora/actions/OpenHostAction.kt

@@ -56,7 +56,12 @@ class OpenHostAction : AnAction() {
 
         if (tab == null) return
 
-        terminalTabbedManager.addTerminalTab(tab)
+        if (evt.tabIndex >= 0) {
+            terminalTabbedManager.addTerminalTab(evt.tabIndex, tab)
+        } else {
+            terminalTabbedManager.addTerminalTab(tab)
+        }
+
         if (tab is PtyHostTerminalTab) {
             tab.start()
         }

src/main/kotlin/app/termora/actions/TerminalCopyAction.kt

@@ -20,6 +20,10 @@ class TerminalCopyAction : AnAction() {
 
     override fun actionPerformed(evt: AnActionEvent) {
         val terminalPanel = evt.getData(DataProviders.TerminalPanel) ?: return
+        val selectionModel = terminalPanel.terminal.getSelectionModel()
+        if (!selectionModel.hasSelection()) {
+            return
+        }
         val text = terminalPanel.copy()
         val systemClipboard = terminalPanel.toolkit.systemClipboard
 
@@ -53,4 +57,4 @@ class TerminalCopyAction : AnAction() {
 
     }
 
-}
+}

src/main/kotlin/app/termora/keyboardinteractive/KeyboardInteractiveDialog.kt

@@ -27,12 +27,14 @@ class KeyboardInteractiveDialog(
         isModal = true
         isResizable = true
         controlsVisible = false
-        title = I18n.getString("termora.new-host.title")
 
         init()
         pack()
         size = Dimension(max(300, size.width), size.height)
 
+        // fix https://github.com/TermoraDev/termora/issues/1311
+        pack()
+
         setLocationRelativeTo(null)
 
     }

src/main/kotlin/app/termora/keyboardinteractive/TerminalUserInteraction.kt

@@ -30,6 +30,7 @@ class TerminalUserInteraction(
                 )
                 dialog.setLocationRelativeTo(owner)
                 dialog.title = instruction ?: name ?: "OTP"
+                dialog.title = StringUtils.defaultIfBlank(dialog.title, "OTP")
                 passwords[i] = dialog.getText()
                 if (passwords[i].isBlank()) {
                     break

src/main/kotlin/app/termora/plugin/internal/rdp/RDPProtocolProvider.kt

@@ -10,6 +10,8 @@ import kotlinx.coroutines.launch
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
 import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.Strings
+import org.apache.commons.lang3.SystemUtils
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.StringSelection
 import java.net.URI
@@ -64,7 +66,15 @@ internal class RDPProtocolProvider private constructor() : GenericProtocolProvid
         }
 
         val sb = StringBuilder()
-        sb.append("full address:s:").append(host.host).append(':').append(host.port).appendLine()
+        sb.append("full address:s:")
+        if (SystemUtils.IS_OS_WINDOWS && Strings.CI.contains(host.host, ":")) {
+            var newHost = Strings.CI.removeStart(host.host, "[")
+            newHost = Strings.CI.removeEnd(newHost, "]")
+            sb.append('[').append(newHost).append(']')
+        } else {
+            sb.append(host.host)
+        }
+        sb.append(':').append(host.port).appendLine()
         sb.append("username:s:").append(host.username).appendLine()
         val desktop = host.options.extras["desktop"]
         if (desktop.isNullOrBlank().not()) {

src/main/kotlin/app/termora/plugin/internal/ssh/CloneSessionTerminalTabbedContextMenuExtension.kt

@@ -27,9 +27,14 @@ class CloneSessionTerminalTabbedContextMenuExtension private constructor() : Ter
                     cloneSession.addActionListener(object : AnAction() {
                         override fun actionPerformed(evt: AnActionEvent) {
                             val terminalTabbedManager = evt.getData(DataProviders.TerminalTabbedManager) ?: return
+                            val index = terminalTabbedManager.indexOfTerminalTab(tab)
                             val handler = c.copy(channel = null)
                             val newTab = SSHTerminalTab(windowScope, tab.host, handler)
-                            terminalTabbedManager.addTerminalTab(newTab)
+                            if (index >= 0) {
+                                terminalTabbedManager.addTerminalTab(index + 1, newTab)
+                            } else {
+                                terminalTabbedManager.addTerminalTab(newTab)
+                            }
                             newTab.start()
                         }
                     })

src/main/kotlin/app/termora/terminal/ControlSequenceIntroducerProcessor.kt

@@ -332,6 +332,12 @@ class ControlSequenceIntroducerProcessor(terminal: Terminal, reader: TerminalRea
                 var top = sr.getOrElse(0) { 1 }
                 var bottom = sr.getOrElse(1) { terminalModel.getRows() }
 
+                // ";r" https://vt100.net/docs/vt510-rm/DECSTBM.html
+                if (sr.size == 1 && args.startsWith(';')) {
+                    bottom = top
+                    top = 1
+                }
+
                 if (bottom <= top) {
                     if (log.isWarnEnabled) {
                         log.warn("Set Scrolling Region Error. top: $top , bottom: $bottom")

src/main/kotlin/app/termora/terminal/panel/TerminalPanelKeyAdapter.kt

@@ -1,5 +1,6 @@
 package app.termora.terminal.panel
 
+import app.termora.actions.TerminalCopyAction
 import app.termora.keymap.KeyShortcut
 import app.termora.keymap.KeymapManager
 import app.termora.plugin.internal.AltKeyModifier
@@ -71,6 +72,7 @@ class TerminalPanelKeyAdapter(
         }
 
         val keyStroke = KeyStroke.getKeyStrokeForEvent(e)
+        val keymapActions = activeKeymap.getActionIds(KeyShortcut(keyStroke))
         for (action in terminalPanel.getTerminalActions()) {
             if (action.test(keyStroke, e)) {
                 action.actionPerformed(e)
@@ -104,7 +106,9 @@ class TerminalPanelKeyAdapter(
         }
 
         // 如果命中了全局快捷键，那么不处理
-        if (keyStroke.modifiers != 0 && activeKeymap.getActionIds(KeyShortcut(keyStroke)).isNotEmpty()) {
+        val copyShortcutWithoutSelection =
+            keymapActions.contains(TerminalCopyAction.COPY) && terminal.getSelectionModel().hasSelection().not()
+        if (keyStroke.modifiers != 0 && keymapActions.isNotEmpty() && !copyShortcutWithoutSelection) {
             return
         }
 
@@ -159,4 +163,4 @@ class TerminalPanelKeyAdapter(
         return Character.toLowerCase(e.keyCode.toChar())
     }
 
-}
+}

src/main/kotlin/app/termora/terminal/panel/TerminalPanelMouseSelectionAdapter.kt

@@ -53,30 +53,31 @@ class TerminalPanelMouseSelectionAdapter(private val terminalPanel: TerminalPane
         if (SwingUtilities.isRightMouseButton(e)) {
             // 如果有选中并且开启了选中复制，那么右键直接是粘贴
             if (selectionModel.hasSelection() && isSelectCopy.not()) {
-                triggerCopyAction(
+                if (rightClickMode != "Nothing") {
-                    KeyEvent(
+                    triggerCopyAction(
-                        e.component,
-                        KeyEvent.KEY_PRESSED,
-                        e.`when`,
-                        e.modifiersEx,
-                        KeyEvent.VK_C,
-                        'C'
-                    )
-                )
-
-                if (rightClickMode == "CopyAndPaste") {
-                    triggerPasteAction(
                         KeyEvent(
                             e.component,
                             KeyEvent.KEY_PRESSED,
                             e.`when`,
                             e.modifiersEx,
-                            KeyEvent.VK_V,
+                            KeyEvent.VK_C,
-                            'V'
+                            'C'
                         )
                     )
-                }
 
+                    if (rightClickMode == "CopyAndPaste") {
+                        triggerPasteAction(
+                            KeyEvent(
+                                e.component,
+                                KeyEvent.KEY_PRESSED,
+                                e.`when`,
+                                e.modifiersEx,
+                                KeyEvent.VK_V,
+                                'V'
+                            )
+                        )
+                    }
+                }
             } else {
                 // paste
                 triggerPasteAction(

src/main/kotlin/app/termora/transfer/TransferAnAction.kt

@@ -46,6 +46,7 @@ class TransferAnAction : AnAction(I18n.getString("termora.transport.sftp"), Icon
                 val panel = tabbed.getTransportPanel(i) ?: continue
                 if (panel.host.id == host.id) {
                     tabbed.selectedIndex = i
+                    terminalTabbedManager.setSelectedTerminalTab(sftpTab)
                     return
                 }
             }

src/main/resources/i18n/messages.properties

@@ -59,6 +59,7 @@ termora.settings.terminal.hyperlink=Hyperlink
 termora.settings.terminal.select-copy=Select copy
 termora.settings.terminal.right-click=Right click
 termora.settings.terminal.right-click.copy-and-paste=Copy and Paste
+termora.settings.terminal.right-click.nothing=Nothing
 termora.settings.terminal.right-click.copy=${termora.copy}
 termora.settings.terminal.cursor-style=Cursor type
 termora.settings.terminal.cursor-blink=Cursor blink

src/main/resources/i18n/messages_ru_RU.properties

@@ -81,6 +81,7 @@ termora.settings.terminal.hyperlink=Ссылки
 termora.settings.terminal.select-copy=Копировать выделенное
 termora.settings.terminal.right-click=правой кнопкой мыши
 termora.settings.terminal.right-click.copy-and-paste=Копировать и вставить
+termora.settings.terminal.right-click.nothing=никто
 termora.settings.terminal.cursor-style=Вид курсора
 termora.settings.terminal.cursor-blink=Мигать курсором
 termora.settings.terminal.local-shell=Локальный терминал

src/main/resources/i18n/messages_zh_CN.properties

@@ -73,6 +73,7 @@ termora.settings.terminal.hyperlink=超链接
 termora.settings.terminal.select-copy=选中复制
 termora.settings.terminal.right-click=右键点击
 termora.settings.terminal.right-click.copy-and-paste=复制 & 粘贴
+termora.settings.terminal.right-click.nothing=无操作
 termora.settings.terminal.cursor-style=光标样式
 termora.settings.terminal.cursor-blink=光标闪烁
 termora.settings.terminal.local-shell=本地终端

src/main/resources/i18n/messages_zh_TW.properties

@@ -85,6 +85,7 @@ termora.settings.terminal.hyperlink=超連結
 termora.settings.terminal.select-copy=選取複製
 termora.settings.terminal.right-click=右鍵點擊
 termora.settings.terminal.right-click.copy-and-paste=複製 & 貼上
+termora.settings.terminal.right-click.nothing=無操作
 termora.settings.terminal.cursor-style=遊標風格
 termora.settings.terminal.cursor-blink=遊標閃爍
 termora.settings.terminal.local-shell=本地端