update README.id-ID.md [skip ci]

Co-authored-by: gh-log <>

.github/workflows/build.yml

@@ -258,7 +258,7 @@ jobs:
         repo: 'eugeny/tabby'
         dir: 'dist'
         rpmvers: 'el/9 el/8 ol/6 ol/7'
-        debvers: 'ubuntu/bionic ubuntu/focal ubuntu/hirsute ubuntu/impish ubuntu/jammy ubuntu/kinetic ubuntu/noble ubuntu/oracular debian/jessie debian/stretch debian/buster'
+        debvers: 'ubuntu/bionic ubuntu/focal ubuntu/hirsute ubuntu/impish ubuntu/jammy ubuntu/kinetic ubuntu/noble ubuntu/oracular debian/jessie debian/stretch debian/buster debian/bullseye debian/bookworm debian/trixie'
 
     - uses: actions/upload-artifact@master
       name: Upload AppImage (${{matrix.arch}})

README.de-DE.md

@@ -347,6 +347,7 @@ Dank geht an diese wunderbaren Menschen ([emoji key](https://allcontributors.org
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gh-log"><img src="https://avatars.githubusercontent.com/u/16019542?v=4?s=100" width="100px;" alt="gh-log"/><br /><sub><b>gh-log</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=gh-log" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.id-ID.md

@@ -346,6 +346,7 @@ Terima kasih kepada mereka yang telah membantu ([emoji key](https://allcontribut
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gh-log"><img src="https://avatars.githubusercontent.com/u/16019542?v=4?s=100" width="100px;" alt="gh-log"/><br /><sub><b>gh-log</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=gh-log" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.it-IT.md

@@ -342,6 +342,7 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gh-log"><img src="https://avatars.githubusercontent.com/u/16019542?v=4?s=100" width="100px;" alt="gh-log"/><br /><sub><b>gh-log</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=gh-log" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.ko-KR.md

@@ -341,6 +341,7 @@ Pull requests and plugins are welcome!
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gh-log"><img src="https://avatars.githubusercontent.com/u/16019542?v=4?s=100" width="100px;" alt="gh-log"/><br /><sub><b>gh-log</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=gh-log" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.md

@@ -365,6 +365,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gh-log"><img src="https://avatars.githubusercontent.com/u/16019542?v=4?s=100" width="100px;" alt="gh-log"/><br /><sub><b>gh-log</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=gh-log" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.ru-RU.md

@@ -31,7 +31,7 @@
 * Встроенный SSH- и Telnet-клиент и менеджер подключений;
 * Встроенный последовательный терминал;
 * Темы и цветовые схемы;
-* Полностью настраеваемые сочетания клавиш;
+* Полностью настраиваемые сочетания клавиш;
 * Панели;
 * Запоминание вкладок;
 * Поддержка PowerShell (and PS Core), WSL, Git-Bash, Cygwin, MSYS2, Cmder и CMD;
@@ -342,6 +342,7 @@ Pull-запросы и плагины приветствуются!
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gh-log"><img src="https://avatars.githubusercontent.com/u/16019542?v=4?s=100" width="100px;" alt="gh-log"/><br /><sub><b>gh-log</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=gh-log" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.zh-CN.md

@@ -341,6 +341,7 @@
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gh-log"><img src="https://avatars.githubusercontent.com/u/16019542?v=4?s=100" width="100px;" alt="gh-log"/><br /><sub><b>gh-log</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=gh-log" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

app/package.json

@@ -30,7 +30,7 @@
     "native-process-working-directory": "^1.0.2",
     "npm": "6",
     "rxjs": "^7.5.7",
-    "russh": "0.1.15",
+    "russh": "0.1.24",
     "source-map-support": "^0.5.20",
     "v8-compile-cache": "^2.3.0",
     "yargs": "^17.7.2"

app/yarn.lock

@@ -3628,10 +3628,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-russh@0.1.15:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/russh/-/russh-0.1.15.tgz#121c0be876c6b70c43910a56fadefffe78588a35"
-  integrity sha512-md/72roZn8nmgq+U8rVrfqHS82aPancQM5VqrYh7wEMcnK/ll8vNJJcKH/YJv5/8n8Ovxrl8SMwDE5DlfXSL6Q==
+russh@0.1.24:
+  version "0.1.24"
+  resolved "https://registry.yarnpkg.com/russh/-/russh-0.1.24.tgz#dce27a3bc63eb78024db60e6767bc80cbf523b9a"
+  integrity sha512-lLMtXHJKL5uwRxwoFNDx71T7+qCXiL80qyGCRgQjYMV10gaW2AlI6mqcz3FVH8dXvdgK2ZE8DuSwlhCBK7schA==
   dependencies:
     "@napi-rs/cli" "^2.18.3"
 

tabby-community-color-schemes/schemes/TokyoNight

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xreources.py
+!
+*.foreground:  #c0caf5
+*.background:  #1a1b26
+*.cursorColor: #c0caf5
+!
+! Black
+*.color0:      #15161e
+*.color8:      #414868
+!
+! Red
+*.color1:      #f7768e
+*.color9:      #f7768e
+!
+! Green
+*.color2:      #9ece6a
+*.color10:     #9ece6a
+!
+! Yellow
+*.color3:      #e0af68
+*.color11:     #e0af68
+!
+! Blue
+*.color4:      #7aa2f7
+*.color12:     #7aa2f7
+!
+! Magenta
+*.color5:      #bb9af7
+*.color13:     #bb9af7
+!
+! Cyan
+*.color6:      #7dcfff
+*.color14:     #7dcfff
+!
+! White
+*.color7:      #a9b1d6
+*.color15:     #c0caf5
+!
+! Bold, Italic, Underline
+*.colorBD:     #eeeeee
+!*.colorIT:
+!*.colorUL:

tabby-community-color-schemes/schemes/TokyoNight Day

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xreources.py
+!
+*.foreground:  #3760bf
+*.background:  #e1e2e7
+*.cursorColor: #3760bf
+!
+! Black
+*.color0:      #e9e9ed
+*.color8:      #a1a6c5
+!
+! Red
+*.color1:      #f52a65
+*.color9:      #f52a65
+!
+! Green
+*.color2:      #587539
+*.color10:     #587539
+!
+! Yellow
+*.color3:      #8c6c3e
+*.color11:     #8c6c3e
+!
+! Blue
+*.color4:      #2e7de9
+*.color12:     #2e7de9
+!
+! Magenta
+*.color5:      #9854f1
+*.color13:     #9854f1
+!
+! Cyan
+*.color6:      #007197
+*.color14:     #007197
+!
+! White
+*.color7:      #6172b0
+*.color15:     #3760bf
+!
+! Bold, Italic, Underline
+*.colorBD:     #eeeeee
+!*.colorIT:
+!*.colorUL:

tabby-community-color-schemes/schemes/TokyoNight Storm

@@ -0,0 +1,44 @@
+!
+! Generated with :
+! XRDB2Xreources.py
+!
+*.foreground:  #c0caf5
+*.background:  #24283b
+*.cursorColor: #c0caf5
+!
+! Black
+*.color0:      #1d202f
+*.color8:      #414868
+!
+! Red
+*.color1:      #f7768e
+*.color9:      #f7768e
+!
+! Green
+*.color2:      #9ece6a
+*.color10:     #9ece6a
+!
+! Yellow
+*.color3:      #e0af68
+*.color11:     #e0af68
+!
+! Blue
+*.color4:      #7aa2f7
+*.color12:     #7aa2f7
+!
+! Magenta
+*.color5:      #bb9af7
+*.color13:     #bb9af7
+!
+! Cyan
+*.color6:      #7dcfff
+*.color14:     #7dcfff
+!
+! White
+*.color7:      #a9b1d6
+*.color15:     #c0caf5
+!
+! Bold, Italic, Underline
+*.colorBD:     #eeeeee
+!*.colorIT:
+!*.colorUL:

tabby-core/src/services/vault.service.ts

@@ -195,7 +195,13 @@ export class VaultService {
         if (!vault) {
             return null
         }
-        return vault.secrets.find(s => s.type === type && this.keyMatches(key, s)) ?? null
+        let vaultSecret = vault.secrets.find(s => s.type === type && this.keyMatches(key, s))
+        if (!vaultSecret) {
+            // search for secret without host in vault (like a default user/password used in multiple servers)
+            key['host'] = null
+            vaultSecret = vault.secrets.find(s => s.type === type && this.keyMatches(key, s))
+        }
+        return vaultSecret ?? null
     }
 
     async addSecret (secret: VaultSecret): Promise<void> {

tabby-ssh/src/services/ssh.service.ts

@@ -1,7 +1,8 @@
-// import * as fs from 'fs/promises'
+import * as fs from 'fs/promises'
+import * as crypto from 'crypto'
 import * as tmp from 'tmp-promise'
 import { Injectable } from '@angular/core'
-import { ConfigService, HostAppService, Platform, PlatformService } from 'tabby-core'
+import { ConfigService, FileProvidersService, HostAppService, Platform, PlatformService } from 'tabby-core'
 import { SSHSession } from '../session/ssh'
 import { SSHProfile } from '../api'
 import { PasswordStorageService } from './passwordStorage.service'
@@ -15,6 +16,7 @@ export class SSHService {
         private config: ConfigService,
         hostApp: HostAppService,
         private platform: PlatformService,
+        private fileProviders: FileProvidersService,
     ) {
         if (hostApp.platform === Platform.Windows) {
             this.detectedWinSCPPath = platform.getWinSCPPath()
@@ -47,14 +49,35 @@ export class SSHService {
         const args = [await this.getWinSCPURI(session.profile, undefined, session.authUsername ?? undefined)]
 
         let tmpFile: tmp.FileResult|null = null
-        if (session.activePrivateKey) {
-            tmpFile = await tmp.file()
-            // await fs.writeFile(tmpFile.path, session.activePrivateKey)
-            const winSCPcom = path.slice(0, -3) + 'com'
-            await this.platform.exec(winSCPcom, ['/keygen', tmpFile.path, `/output=${tmpFile.path}`])
-            args.push(`/privatekey=${tmpFile.path}`)
+        try {
+            if (session.activePrivateKey && session.profile.options.privateKeys && session.profile.options.privateKeys.length > 0) {
+                tmpFile = await tmp.file()
+                let passphrase: string|null = null
+                for (const pk of session.profile.options.privateKeys) {
+                    let privateKeyContent: string|null = null
+                    const buffer = await this.fileProviders.retrieveFile(pk)
+                    privateKeyContent = buffer.toString()
+                    await fs.writeFile(tmpFile.path, privateKeyContent)
+                    const keyHash = crypto.createHash('sha512').update(privateKeyContent).digest('hex')
+                    // need to pass an default passphrase, otherwise it might get stuck at the passphrase input
+                    passphrase = await this.passwordStorage.loadPrivateKeyPassword(keyHash) ?? 'tabby'
+                    const winSCPcom = path.slice(0, -3) + 'com'
+                    try {
+                        await this.platform.exec(winSCPcom, ['/keygen', tmpFile.path, '-o', tmpFile.path, '--old-passphrase', passphrase])
+                    } catch (error) {
+                        console.warn('Could not convert private key ', error)
+                        continue
+                    }
+                    break
+                }
+                args.push(`/privatekey=${tmpFile.path}`)
+                if (passphrase != null) {
+                    args.push(`/passphrase=${passphrase}`)
+                }
+            }
+            await this.platform.exec(path, args)
+        } finally {
+            tmpFile?.cleanup()
         }
-        await this.platform.exec(path, args)
-        tmpFile?.cleanup()
     }
 }

tabby-ssh/src/session/ssh.ts

@@ -111,7 +111,7 @@ export class SSHSession {
 
     private logger: Logger
     private refCount = 0
-    private remainingAuthMethods: AuthMethod[] = []
+    private allAuthMethods: AuthMethod[] = []
     private serviceMessage = new Subject<string>()
     private keyboardInteractivePrompt = new Subject<KeyboardInteractivePrompt>()
     private willDestroy = new Subject<void>()
@@ -125,6 +125,7 @@ export class SSHSession {
     private translate: TranslateService
     private knownHosts: SSHKnownHostsService
     private privateKeyImporters: AutoPrivateKeyLocator[]
+    private previouslyDisconnected = false
 
     constructor (
         private injector: Injector,
@@ -150,7 +151,7 @@ export class SSHSession {
     }
 
     private addPublicKeyAuthMethod (name: string, contents: Buffer) {
-        this.remainingAuthMethods.push({
+        this.allAuthMethods.push({
             type: 'publickey',
             name,
             contents,
@@ -158,12 +159,14 @@ export class SSHSession {
     }
 
     async init (): Promise<void> {
-        this.remainingAuthMethods = [{ type: 'none' }]
+        this.allAuthMethods = [{ type: 'none' }]
         if (!this.profile.options.auth || this.profile.options.auth === 'publicKey') {
             if (this.profile.options.privateKeys?.length) {
-                for (const pk of this.profile.options.privateKeys) {
+                for (let pk of this.profile.options.privateKeys) {
                     // eslint-disable-next-line @typescript-eslint/init-declarations
                     let contents: Buffer
+                    pk = pk.replace('%h', this.profile.options.host)
+                    pk = pk.replace('%r', this.profile.options.user)
                     try {
                         contents = await this.fileProviders.retrieveFile(pk)
                     } catch (error) {
@@ -187,30 +190,32 @@ export class SSHSession {
             if (!spec) {
                 this.emitServiceMessage(colors.bgYellow.yellow.black(' ! ') + ` Agent auth selected, but no running Agent process is found`)
             } else {
-                this.remainingAuthMethods.push({
+                this.allAuthMethods.push({
                     type: 'agent',
                     ...spec,
                 })
             }
         }
-        if (!this.profile.options.auth || this.profile.options.auth === 'keyboardInteractive') {
-            const savedPassword = this.profile.options.password ?? await this.passwordStorage.loadPassword(this.profile)
-            if (savedPassword) {
-                this.remainingAuthMethods.push({ type: 'keyboard-interactive', savedPassword })
-            }
-            this.remainingAuthMethods.push({ type: 'keyboard-interactive' })
-        }
         if (!this.profile.options.auth || this.profile.options.auth === 'password') {
             if (this.profile.options.password) {
-                this.remainingAuthMethods.push({ type: 'saved-password', password: this.profile.options.password })
+                this.allAuthMethods.push({ type: 'saved-password', password: this.profile.options.password })
             }
             const password = await this.passwordStorage.loadPassword(this.profile)
             if (password) {
-                this.remainingAuthMethods.push({ type: 'saved-password', password })
+                this.allAuthMethods.push({ type: 'saved-password', password })
             }
-            this.remainingAuthMethods.push({ type: 'prompt-password' })
         }
-        this.remainingAuthMethods.push({ type: 'hostbased' })
+        if (!this.profile.options.auth || this.profile.options.auth === 'keyboardInteractive') {
+            const savedPassword = this.profile.options.password ?? await this.passwordStorage.loadPassword(this.profile)
+            if (savedPassword) {
+                this.allAuthMethods.push({ type: 'keyboard-interactive', savedPassword })
+            }
+            this.allAuthMethods.push({ type: 'keyboard-interactive' })
+        }
+        if (!this.profile.options.auth || this.profile.options.auth === 'password') {
+            this.allAuthMethods.push({ type: 'prompt-password' })
+        }
+        this.allAuthMethods.push({ type: 'hostbased' })
     }
 
     private async getAgentConnectionSpec (): Promise<russh.AgentConnectionSpec|null> {
@@ -323,9 +328,14 @@ export class SSHSession {
             }
         })
 
+        this.previouslyDisconnected = false
         this.ssh.disconnect$.subscribe(() => {
-            if (this.open) {
-                this.destroy()
+            if (!this.previouslyDisconnected) {
+                this.previouslyDisconnected = true
+                // Let service messages drain
+                setTimeout(() => {
+                    this.destroy()
+                })
             }
         })
 
@@ -508,6 +518,22 @@ export class SSHSession {
     }
 
     async handleAuth (): Promise<russh.AuthenticatedSSHClient|null> {
+        const subscription = this.ssh.disconnect$.subscribe(() => {
+            // Auto auth and >=3 keys found
+            if (!this.profile.options.auth && this.allAuthMethods.filter(x => x.type === 'publickey').length >= 3) {
+                this.emitServiceMessage('The server has disconnected during authentication.')
+                this.emitServiceMessage('This may happen if too many private key authentication attemps are made.')
+                this.emitServiceMessage('You can set the specific private key for authentication in the profile settings.')
+            }
+        })
+        try {
+            return await this._handleAuth()
+        } finally {
+            subscription.unsubscribe()
+        }
+    }
+
+    private async _handleAuth (): Promise<russh.AuthenticatedSSHClient|null> {
         this.activePrivateKey = null
 
         if (!(this.ssh instanceof russh.SSHClient)) {
@@ -523,6 +549,7 @@ export class SSHSession {
             return noneResult
         }
 
+        let remainingMethods = [...this.allAuthMethods]
         let methodsLeft = noneResult.remainingMethods
 
         function maybeSetRemainingMethods (r: russh.AuthFailure) {
@@ -533,13 +560,13 @@ export class SSHSession {
 
         while (true) {
             const m = methodsLeft
-            const method = this.remainingAuthMethods.find(x => m.length === 0 || m.includes(sshAuthTypeForMethod(x)))
+            const method = remainingMethods.find(x => m.length === 0 || m.includes(sshAuthTypeForMethod(x)))
 
-            if (!method) {
+            if (this.previouslyDisconnected || !method) {
                 return null
             }
 
-            this.remainingAuthMethods = this.remainingAuthMethods.filter(x => x !== method)
+            remainingMethods = remainingMethods.filter(x => x !== method)
 
             if (method.type === 'saved-password') {
                 this.emitServiceMessage(this.translate.instant('Using saved password'))
@@ -576,15 +603,12 @@ export class SSHSession {
             if (method.type === 'publickey') {
                 try {
                     const key = await this.loadPrivateKey(method.name, method.contents)
-                    const possibleHashAlgs = ['ssh-rsa', 'rsa-sha2-256', 'rsa-sha2-512'].includes(key.algorithm) ? ['sha256', 'sha512', 'sha1'] as const : [null] as const
                     this.emitServiceMessage(`Trying private key: ${method.name}`)
-                    for (const alg of possibleHashAlgs) {
-                        const result = await this.ssh.authenticateWithKeyPair(this.authUsername, key, alg)
-                        if (result instanceof russh.AuthenticatedSSHClient) {
-                            return result
-                        }
-                        maybeSetRemainingMethods(result)
+                    const result = await this.ssh.authenticateWithKeyPair(this.authUsername, key, null)
+                    if (result instanceof russh.AuthenticatedSSHClient) {
+                        return result
                     }
+                    maybeSetRemainingMethods(result)
                 } catch (e) {
                     this.emitServiceMessage(colors.bgYellow.yellow.black(' ! ') + ` Failed to load private key ${method.name}: ${e}`)
                     continue

tabby-terminal/src/api/baseTerminalTab.component.ts

@@ -309,10 +309,16 @@ export class BaseTerminalTabComponent<P extends BaseTerminalProfile> extends Bas
                 case 'scroll-to-top':
                     this.frontend?.scrollToTop()
                     break
-                case 'scroll-up':
+                case 'scroll-page-up':
                     this.frontend?.scrollPages(-1)
                     break
+                case 'scroll-up':
+                    this.frontend?.scrollLines(-1)
+                    break
                 case 'scroll-down':
+                    this.frontend?.scrollLines(1)
+                    break
+                case 'scroll-page-down':
                     this.frontend?.scrollPages(1)
                     break
                 case 'scroll-to-bottom':

tabby-terminal/src/config.ts

@@ -101,8 +101,10 @@ export class TerminalConfigProvider extends ConfigProvider {
                     '⌘-⌥-Shift-I',
                 ],
                 'scroll-to-top': ['Shift-PageUp'],
-                'scroll-up': ['⌥-PageUp'],
-                'scroll-down': ['⌥-PageDown'],
+                'scroll-page-up': ['⌥-PageUp'],
+                'scroll-up': ['Ctrl-Shift-Up'],
+                'scroll-down': ['Ctrl-Shift-Down'],
+                'scroll-page-down': ['⌥-PageDown'],
                 'scroll-to-bottom': ['Shift-PageDown'],
             },
         },
@@ -152,8 +154,10 @@ export class TerminalConfigProvider extends ConfigProvider {
                     'Ctrl-Alt-Shift-I',
                 ],
                 'scroll-to-top': ['Ctrl-PageUp'],
-                'scroll-up': ['Alt-PageUp'],
-                'scroll-down': ['Alt-PageDown'],
+                'scroll-page-up': ['Alt-PageUp'],
+                'scroll-up': ['Ctrl-Shift-Up'],
+                'scroll-down': ['Ctrl-Shift-Down'],
+                'scroll-page-down': ['Alt-PageDown'],
                 'scroll-to-bottom': ['Ctrl-PageDown'],
             },
         },
@@ -201,8 +205,10 @@ export class TerminalConfigProvider extends ConfigProvider {
                     'Ctrl-Alt-Shift-I',
                 ],
                 'scroll-to-top': ['Ctrl-PageUp'],
-                'scroll-up': ['Alt-PageUp'],
-                'scroll-down': ['Alt-PageDown'],
+                'scroll-page-up': ['Alt-PageUp'],
+                'scroll-up': ['Ctrl-Shift-Up'],
+                'scroll-down': ['Ctrl-Shift-Down'],
+                'scroll-page-down': ['Alt-PageDown'],
                 'scroll-to-bottom': ['Ctrl-PageDown'],
             },
         },

tabby-terminal/src/frontends/frontend.ts

@@ -77,6 +77,7 @@ export abstract class Frontend {
     abstract visualBell (): void
 
     abstract scrollToTop (): void
+    abstract scrollLines (amount: number): void
     abstract scrollPages (pages: number): void
     abstract scrollToBottom (): void
 

tabby-terminal/src/frontends/xtermFrontend.ts

@@ -357,6 +357,10 @@ export class XTermFrontend extends Frontend {
         this.xterm.scrollPages(pages)
     }
 
+    scrollLines (amount: number): void {
+        this.xterm.scrollLines(amount)
+    }
+
     scrollToBottom (): void {
         this.xtermCore._scrollToBottom()
     }

tabby-terminal/src/hotkeys.ts

@@ -86,11 +86,19 @@ export class TerminalHotkeyProvider extends HotkeyProvider {
             name: this.translate.instant('Scroll terminal to top'),
         },
         {
-            id: 'scroll-up',
+            id: 'scroll-page-up',
             name: this.translate.instant('Scroll terminal one page up'),
         },
+        {
+            id: 'scroll-up',
+            name: this.translate.instant('Scroll terminal one line up'),
+        },
         {
             id: 'scroll-down',
+            name: this.translate.instant('Scroll terminal one line down'),
+        },
+        {
+            id: 'scroll-page-down',
             name: this.translate.instant('Scroll terminal one page down'),
         },
         {
@@ -113,3 +121,4 @@ export class TerminalHotkeyProvider extends HotkeyProvider {
         return this.hotkeys
     }
 }
+

tabby-terminal/src/middleware/oscProcessing.ts

@@ -3,7 +3,7 @@ import { Subject, Observable } from 'rxjs'
 import { SessionMiddleware } from '../api/middleware'
 
 const OSCPrefix = Buffer.from('\x1b]')
-const OSCSuffix = Buffer.from('\x07')
+const OSCSuffixes = [Buffer.from('\x07'), Buffer.from('\x1b\\')]
 
 export class OSCProcessor extends SessionMiddleware {
     get cwdReported$ (): Observable<string> { return this.cwdReported }
@@ -14,11 +14,22 @@ export class OSCProcessor extends SessionMiddleware {
 
     feedFromSession (data: Buffer): void {
         let startIndex = 0
-        while (data.includes(OSCPrefix, startIndex) && data.includes(OSCSuffix, startIndex)) {
-            const params = data.subarray(data.indexOf(OSCPrefix, startIndex) + OSCPrefix.length)
-            const oscString = params.subarray(0, params.indexOf(OSCSuffix)).toString()
+        while (data.includes(OSCPrefix, startIndex)) {
+            const si = startIndex
+            if (!OSCSuffixes.some(s => data.includes(s, si))) {
+                break
+            }
 
-            startIndex = data.indexOf(OSCSuffix, startIndex) + OSCSuffix.length
+            const params = data.subarray(data.indexOf(OSCPrefix, startIndex) + OSCPrefix.length)
+
+            const [closesSuffix, closestSuffixIndex] = OSCSuffixes
+                .map((suffix): [Buffer, number] => [suffix, params.indexOf(suffix)])
+                .filter(([_, index]) => index !== -1)
+                .sort(([_, a], [__, b]) => a - b)[0]
+
+            const oscString = params.subarray(0, closestSuffixIndex).toString()
+
+            startIndex = data.indexOf(closesSuffix, startIndex) + closesSuffix.length
 
             const [oscCodeString, ...oscParams] = oscString.split(';')
             const oscCode = parseInt(oscCodeString)