bumped xterm, check bracketedPaste state via terminal modes

Bump ssh2 from 1.3.0 to 1.4.0

.all-contributorsrc

@@ -442,6 +442,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "BoYeonJang",
+      "name": "장보연",
+      "avatar_url": "https://avatars.githubusercontent.com/u/59506394?v=4",
+      "profile": "https://www.notion.so/3d45c6bd2cbd4f938873a4bd12e23375",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.yml

@@ -121,3 +121,8 @@ rules:
   '@typescript-eslint/no-unsafe-argument': off
   '@typescript-eslint/restrict-plus-operands': off
   '@typescript-eslint/space-infix-ops': off
+  '@typescript-eslint/no-type-alias':
+  - error
+  - allowAliases: in-unions-and-intersections
+    allowLiterals: always
+    allowCallbacks: always

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
         fetch-depth: 0
 
     - name: Installing Node
-      uses: actions/setup-node@v2.2.0
+      uses: actions/setup-node@v2.4.0
       with:
         node-version: 14
 
@@ -46,7 +46,7 @@ jobs:
         fetch-depth: 0
 
     - name: Installing Node
-      uses: actions/setup-node@v2.2.0
+      uses: actions/setup-node@v2.4.0
       with:
         node-version: 14
 
@@ -139,7 +139,7 @@ jobs:
         fetch-depth: 0
 
     - name: Install Node
-      uses: actions/setup-node@v2.2.0
+      uses: actions/setup-node@v2.4.0
       with:
         node-version: 14
 
@@ -183,6 +183,15 @@ jobs:
         SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
         SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
 
+    - name: Upload packages to packagecloud.io
+      uses: TykTechnologies/packagecloud-action@main
+      if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+      env:
+        PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+      with:
+        repo: 'eugeny/tabby'
+        dir: 'dist'
+
     - name: Package artifacts
       run: |
         mkdir artifact-deb
@@ -245,7 +254,7 @@ jobs:
         fetch-depth: 0
 
     - name: Installing Node
-      uses: actions/setup-node@v2.2.0
+      uses: actions/setup-node@v2.4.0
       with:
         node-version: 14
 

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
         fetch-depth: 0
 
     - name: Installing Node
-      uses: actions/setup-node@v2.2.0
+      uses: actions/setup-node@v2.4.0
       with:
         node-version: 14
 

HACKING.md

@@ -145,4 +145,6 @@ export default class MyModule { }
 
 See `tabby-core/src/api.ts`, `tabby-settings/src/api.ts`, `tabby-local/src/api.ts` and `tabby-terminal/src/api.ts` for the available extension points.
 
+Also check out [the example plugin](https://github.com/Eugeny/tabby-clippy).
+
 Publish your plugin on NPM with a `tabby-plugin` keyword to make it appear in the Plugin Manager.

README.ko-KR.md

@@ -0,0 +1,215 @@
+[![](docs/readme.png)](https://tabby.sh)
+
+
+<p align="center">
+  <a href="https://github.com/Eugeny/tabby/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/tabby/total.svg?label=DOWNLOADS&logo=github&style=for-the-badge"></a> &nbsp; <a href="https://nightly.link/Eugeny/tabby/workflows/build/master"><img src="https://shields.io/badge/-Nightly%20Builds-orange?logo=hackthebox&logoColor=fff&style=for-the-badge"/></a> &nbsp; <a href="https://matrix.to/#/#tabby-general:matrix.org"><img alt="Matrix" src="https://img.shields.io/matrix/tabby-general:matrix.org?logo=matrix&style=for-the-badge&color=magenta"></a>
+</p>
+
+<p align="center">
+  <a href="https://ko-fi.com/J3J8KWTF">
+    <img src="https://cdn.ko-fi.com/cdn/kofi3.png?v=2" width="150">
+  </a>
+</p>
+
+----
+
+### 다운로드:
+
+* [Latest release](https://github.com/Eugeny/tabby/releases/latest)
+* [Repositories](https://packagecloud.io/eugeny/tabby): [Debian/Ubuntu-based](https://packagecloud.io/eugeny/tabby/install#bash-deb), [RPM-based](https://packagecloud.io/eugeny/tabby/install#bash-rpm)
+* [Latest nightly build](https://nightly.link/Eugeny/tabby/workflows/build/master)
+
+----
+
+**Tabby** (구 **Terminus**)는 Windows, macOS 및 Linux용으로 뛰어난 구성의 터미널 에뮬레이터, SSH 및 시리얼 클라이언트입니다.
+
+* 통합 SSH 클라이언트 및 연결 관리자
+* 통합 시리얼 터미널
+* 테마 및 색 구성표
+* 전체 구성이 가능한 단축키 및 다중 코드 단축키
+* 창 분할
+* 이전 탭 사용을 기억
+* PowerShell (및 PS Core), WSL, Git-Bash, Cygwin, Cmder 및 CMD 지원
+* Zmodem을 통한 SSH 세션 간의 직접 파일 전송
+* 2바이트 문자를 포함한 전체 유니코드 지원
+* 빠르게 출력되는 것에 대해 휩쓸리지 않음
+* 탭 완성을 포함한 Windows에서의 적절한 셸 환경 (Clink을 통해)
+* SSH 시크릿 및 구성을 위한 통합 암호화 컨테이너
+
+# 목차 <!-- omit in toc -->
+
+- [Tabby는 무엇인가](#about)
+- [터미널 기능](#terminal)
+- [SSH 클라이언트](#ssh)
+- [시리얼 터미널](#serial)
+- [포터블](#portable)
+- [플러그인](#plugins)
+- [테마](#themes)
+- [기여](#contributing)
+
+<a name="about"></a>
+
+# Tabby는 무엇인가
+
+* **Tabby는** Windows의 표준 터미널 (conhost), PowerShell ISE, PuTTY 또는 iTerm의 대안 프로그램입니다.
+
+* **Tabby는** 새로운 셸이나 MinGW 또는 Cygwin을 대체하지 **않습니다**. 가볍지도 않습니다. - RAM 사용량이 중요한 경우, [Conemu](https://conemu.github.io) 또는 [Alacritty](https://github.com/jwilm/alacritty)를 고려하십시오.
+
+<a name="terminal"></a>
+
+# 터미널 기능
+
+![](docs/readme-terminal.png)
+
+* A V220 터미널 + 다양한 확장
+* 여러 개의 분할 창 중첩
+* 모든 측면에 탭이 위치함
+* 전역 스폰 단축키가 있는 도킹 가능한 윈도우 ("Quake console")
+* 진행률 탐지
+* 프로세스 완료 시 알림
+* 괄호 붙여넣기, 여러 줄 붙여넣기 경고
+* 폰트 합자(ligatures)
+* 커스텀 셸 프로필
+* RMB 붙여넣기 및 복사 선택 옵션 (PuTTY 스타일)
+
+<a name="ssh"></a>
+# SSH 클라이언트
+
+![](docs/readme-ssh.png)
+
+* 연결 관리자가 있는 SSH2 클라이언트
+* X11 및 포트 포워딩
+* 자동 jump 호스트 관리
+* 에이전트 전달 (Pageant 및 Windows 기본 OpenSSH 에이전트 포함)
+* 로그인 스크립트
+
+<a name="serial"></a>
+# 시리얼 터미널
+
+* 연결 저장
+* Readline 입력 지원
+* 선택적 hex byte별 입력 및 hexdump 출력
+* 개행 변환
+* 자동 재접속
+
+<a name="portable"></a>
+# 포터블
+
+`Tabby.exe`가 있는 동일한 위치에 `data` 폴더를 생성하면 Windows에서 Tabby가 포터블 앱으로 실행됩니다.
+
+<a name="plugins"></a>
+# 플러그인
+
+플러그인과 테마는 Tabby 내부의 설정에서 직접 설치할 수 있습니다.
+
+* [clickable-links](https://github.com/Eugeny/tabby-clickable-links) - m터미널의 경로 및 URL을 클릭 가능하게
+* [docker](https://github.com/Eugeny/tabby-docker) - Docker 컨테이너에 연결
+* [title-control](https://github.com/kbjr/terminus-title-control) - 접두사, 접미사 및/또는 문자열 제거를 제공하여 터미널 탭의 제목을 수정
+* [quick-cmds](https://github.com/Domain/terminus-quick-cmds) - 하나 또는 모든 터미널 탭에 신속한 명령 전송
+* [save-output](https://github.com/Eugeny/tabby-save-output) - 터미널 출력을 파일에 기록
+* [sync-config](https://github.com/starxg/terminus-sync-config) - 구성을 Gist 또는 Gitee에 동기화
+* [clippy](https://github.com/Eugeny/tabby-clippy) - 항상 당신을 귀찮게 하는 예제 플러그인
+
+<a name="themes"></a>
+# 테마
+
+* [hype](https://github.com/Eugeny/tabby-theme-hype) - Hyper에서 영감을 받은 테마
+* [relaxed](https://github.com/Relaxed-Theme/relaxed-terminal-themes#terminus) - Tabby를 위해 여유로움을 제공하는 테마
+* [gruvbox](https://github.com/porkloin/terminus-theme-gruvbox)
+* [windows10](https://www.npmjs.com/package/terminus-theme-windows10)
+* [altair](https://github.com/yxuko/terminus-altair)
+
+# 스폰서 <!-- omit in toc -->
+
+[![](https://assets-production.packagecloud.io/assets/packagecloud-logo-light-scaled-26ce8e96060fddf74afbd4445e63ba35590d4aaa56edc98495bb390ef3cae0ae.png)](https://packagecloud.io)
+
+[**packagecloud**](https://packagecloud.io)가 무료 Debian/RPM 저장소 호스팅을 제공하였습니다.
+
+<a name="contributing"></a>
+# 기여
+
+Pull requests and plugins are welcome!
+
+프로젝트 배치 방법에 대한 자세한 내용과 매우 간단한 플러그인 개발 튜토리얼은 [HACKING.md](https://github.com/Eugeny/tabby/blob/master/HACKING.md) 및 [API docs](http://ajenti.org/terminus-docs/)를 참조하십시오.
+
+---
+<a name="contributors"></a>
+
+여기있는 멋진 사람들에게 진심으로 감사합니다. ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="http://www.russellmyers.com"><img src="https://avatars2.githubusercontent.com/u/184085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Russell Myers</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=mezner" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.morwire.com"><img src="https://avatars1.githubusercontent.com/u/3991658?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Austin Warren</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=ehwarren" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Drachenkaetzchen"><img src="https://avatars1.githubusercontent.com/u/162974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Felicia Hummel</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Drachenkaetzchen" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/mikemaccana"><img src="https://avatars2.githubusercontent.com/u/172594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike MacCana</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=mikemaccana" title="Tests">⚠️</a> <a href="#design-mikemaccana" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/yxuko"><img src="https://avatars1.githubusercontent.com/u/1786317?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yacine Kanzari</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=yxuko" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/BBJip"><img src="https://avatars2.githubusercontent.com/u/32908927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>BBJip</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=BBJip" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Futagirl"><img src="https://avatars2.githubusercontent.com/u/33533958?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Futagirl</b></sub></a><br /><a href="#design-Futagirl" title="Design">🎨</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://www.levrik.io"><img src="https://avatars3.githubusercontent.com/u/9491603?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Levin Rickert</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=levrik" title="Code">💻</a></td>
+    <td align="center"><a href="https://kwonoj.github.io"><img src="https://avatars2.githubusercontent.com/u/1210596?v=4?s=100" width="100px;" alt=""/><br /><sub><b>OJ Kwon</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=kwonoj" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Domain"><img src="https://avatars2.githubusercontent.com/u/903197?v=4?s=100" width="100px;" alt=""/><br /><sub><b>domain</b></sub></a><br /><a href="#plugin-Domain" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/tabby/commits?author=Domain" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.jbrumond.me"><img src="https://avatars1.githubusercontent.com/u/195127?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Brumond</b></sub></a><br /><a href="#plugin-kbjr" title="Plugin/utility libraries">🔌</a></td>
+    <td align="center"><a href="http://www.growingwiththeweb.com"><img src="https://avatars0.githubusercontent.com/u/2193314?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Imms</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Tyriar" title="Code">💻</a> <a href="#plugin-Tyriar" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/tabby/commits?author=Tyriar" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/baflo"><img src="https://avatars2.githubusercontent.com/u/834350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Florian Bachmann</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=baflo" title="Code">💻</a></td>
+    <td align="center"><a href="http://michael-kuehnel.de"><img src="https://avatars2.githubusercontent.com/u/441011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Kühnel</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=mischah" title="Code">💻</a> <a href="#design-mischah" title="Design">🎨</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/NieLeben"><img src="https://avatars3.githubusercontent.com/u/47182955?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tilmann Meyer</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=NieLeben" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.jubeat.net"><img src="https://avatars3.githubusercontent.com/u/11289158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PM Extra</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/issues?q=author%3APMExtra" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://jjuhas.keybase.pub//"><img src="https://avatars1.githubusercontent.com/u/6438760?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonathan</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=IgnusG" title="Code">💻</a></td>
+    <td align="center"><a href="https://hans-koch.me"><img src="https://avatars0.githubusercontent.com/u/1093709?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hans Koch</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=hammster" title="Code">💻</a></td>
+    <td align="center"><a href="http://thepuzzlemaker.info"><img src="https://avatars3.githubusercontent.com/u/12666617?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dak Smyth</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=ThePuzzlemaker" title="Code">💻</a></td>
+    <td align="center"><a href="http://yfwz100.github.io"><img src="https://avatars2.githubusercontent.com/u/983211?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wang Zhi</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=yfwz100" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jack1142"><img src="https://avatars0.githubusercontent.com/u/6032823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jack1142</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=jack1142" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/hdougie"><img src="https://avatars1.githubusercontent.com/u/450799?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Howie Douglas</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=hdougie" title="Code">💻</a></td>
+    <td align="center"><a href="https://chriskaczor.com"><img src="https://avatars2.githubusercontent.com/u/180906?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chris Kaczor</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=ckaczor" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.boxmein.net"><img src="https://avatars1.githubusercontent.com/u/358714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johannes Kadak</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=boxmein" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/LeSeulArtichaut"><img src="https://avatars1.githubusercontent.com/u/38361244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>LeSeulArtichaut</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=LeSeulArtichaut" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/CyrilTaylor"><img src="https://avatars0.githubusercontent.com/u/12631466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cyril Taylor</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=CyrilTaylor" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/nstefanou"><img src="https://avatars3.githubusercontent.com/u/51129173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nstefanou</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=nstefanou" title="Code">💻</a> <a href="#plugin-nstefanou" title="Plugin/utility libraries">🔌</a></td>
+    <td align="center"><a href="https://github.com/orin220444"><img src="https://avatars3.githubusercontent.com/u/30747229?v=4?s=100" width="100px;" alt=""/><br /><sub><b>orin220444</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=orin220444" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Goobles"><img src="https://avatars3.githubusercontent.com/u/8776771?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gobius Dolhain</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Goobles" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/3l0w"><img src="https://avatars2.githubusercontent.com/u/37798980?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gwilherm Folliot</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=3l0w" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Dimitory"><img src="https://avatars0.githubusercontent.com/u/475955?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dmitry Pronin</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=dimitory" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/JonathanBeverley"><img src="https://avatars1.githubusercontent.com/u/20328966?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonathan Beverley</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=JonathanBeverley" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/zend"><img src="https://avatars1.githubusercontent.com/u/25160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zenghai Liang</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=zend" title="Code">💻</a></td>
+    <td align="center"><a href="https://about.me/matishadow"><img src="https://avatars0.githubusercontent.com/u/9083085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mateusz Tracz</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=matishadow" title="Code">💻</a></td>
+    <td align="center"><a href="https://zergpool.com"><img src="https://avatars3.githubusercontent.com/u/36234677?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pinpin</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=pinpins" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/TakuroOnoda"><img src="https://avatars0.githubusercontent.com/u/1407926?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Takuro Onoda</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=TakuroOnoda" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/frauhottelmann"><img src="https://avatars2.githubusercontent.com/u/902705?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frauhottelmann</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=frauhottelmann" title="Code">💻</a></td>
+    <td align="center"><a href="http://patalong.pl"><img src="https://avatars.githubusercontent.com/u/29167842?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotr Patalong</b></sub></a><br /><a href="#design-VectorKappa" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/clarkwang"><img src="https://avatars.githubusercontent.com/u/157076?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Clark Wang</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=clarkwang" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/iamchating"><img src="https://avatars.githubusercontent.com/u/7088153?v=4?s=100" width="100px;" alt=""/><br /><sub><b>iamchating</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=iamchating" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/starxg"><img src="https://avatars.githubusercontent.com/u/34997494?v=4?s=100" width="100px;" alt=""/><br /><sub><b>starxg</b></sub></a><br /><a href="#plugin-starxg" title="Plugin/utility libraries">🔌</a></td>
+    <td align="center"><a href="http://hashnote.net/"><img src="https://avatars.githubusercontent.com/u/546312?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alisue</b></sub></a><br /><a href="#design-lambdalisue" title="Design">🎨</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/ydcool"><img src="https://avatars.githubusercontent.com/u/5668295?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dominic Yin</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=ydcool" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/bdr99"><img src="https://avatars.githubusercontent.com/u/2292715?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Brandon Rothweiler</b></sub></a><br /><a href="#design-bdr99" title="Design">🎨</a></td>
+    <td align="center"><a href="https://git.io/JnP49"><img src="https://avatars.githubusercontent.com/u/63876444?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Logic Machine</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=logicmachine123" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/cypherbits"><img src="https://avatars.githubusercontent.com/u/10424900?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cypherbits</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=cypherbits" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://modulolotus.net"><img src="https://avatars.githubusercontent.com/u/946421?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Davidson</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=KingMob" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/al-wi"><img src="https://avatars.githubusercontent.com/u/11092199?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexander Wiedemann</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=al-wi" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+이 프로젝트는 [모든 기여자](https://github.com/all-contributors/all-contributors)의 규격을 따릅니다. 어떠한 종류의 기여도 모두 환영합니다!
+
+<img src="https://ga-beacon.appspot.com/UA-3278102-18/github/readme" width="1"/>

README.md

@@ -1,8 +1,8 @@
-![](docs/readme.png)
+[![](docs/readme.png)](https://tabby.sh)
 
 
 <p align="center">
-  <a href="https://github.com/Eugeny/tabby/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/tabby/total.svg?label=RELEASE&logo=github&style=for-the-badge"></a> &nbsp; <a href="https://nightly.link/Eugeny/tabby/workflows/build/master"><img src="https://shields.io/badge/-Nightly%20Builds-orange?logo=hackthebox&logoColor=fff&style=for-the-badge"/></a> &nbsp; <a href="https://matrix.to/#/#tabby-general:matrix.org"><img alt="Matrix" src="https://img.shields.io/matrix/tabby-general:matrix.org?logo=matrix&style=for-the-badge&color=magenta"></a>
+  <a href="https://github.com/Eugeny/tabby/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/tabby/total.svg?label=DOWNLOADS&logo=github&style=for-the-badge"></a> &nbsp; <a href="https://nightly.link/Eugeny/tabby/workflows/build/master"><img src="https://shields.io/badge/-Nightly%20Builds-orange?logo=hackthebox&logoColor=fff&style=for-the-badge"/></a> &nbsp; <a href="https://matrix.to/#/#tabby-general:matrix.org"><img alt="Matrix" src="https://img.shields.io/matrix/tabby-general:matrix.org?logo=matrix&style=for-the-badge&color=magenta"></a>
 </p>
 
 <p align="center">
@@ -16,30 +16,33 @@
 ### Downloads:
 
 * [Latest release](https://github.com/Eugeny/tabby/releases/latest)
-* [Nightly build](https://nightly.link/Eugeny/tabby/workflows/build/master)
+* [Repositories](https://packagecloud.io/eugeny/tabby): [Debian/Ubuntu-based](https://packagecloud.io/eugeny/tabby/install#bash-deb), [RPM-based](https://packagecloud.io/eugeny/tabby/install#bash-rpm)
+* [Latest nightly build](https://nightly.link/Eugeny/tabby/workflows/build/master)
+
+<br/>
+<p align="center">
+This README is also available in: <a href="./README.ko-KR.md">Korean</a>
+</p>
 
 ----
 
-**Tabby** (formerly **Terminus**) is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux
+[**Tabby**](https://tabby.sh) (formerly **Terminus**) is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux
 
-* Integrated SSH client and connection manager
+* Integrated SSH and Telnet client and connection manager
 * Integrated serial terminal
 * Theming and color schemes
 * Fully configurable shortcuts and multi-chord shortcuts
 * Split panes
 * Remembers your tabs
-* PowerShell (and PS Core), WSL, Git-Bash, Cygwin, Cmder and CMD support
+* PowerShell (and PS Core), WSL, Git-Bash, Cygwin, MSYS2, Cmder and CMD support
 * Direct file transfer from/to SSH sessions via Zmodem
 * Full Unicode support including double-width characters
 * Doesn't choke on fast-flowing outputs
 * Proper shell experience on Windows including tab completion (via Clink)
 * Integrated encrypted container for SSH secrets and configuration
 
----
+# Contents <!-- omit in toc -->
 
-# Contents
-
-- [Contents](#contents)
 - [What Tabby is and isn't](#what-tabby-is-and-isnt)
 - [Terminal features](#terminal-features)
 - [SSH Client](#ssh-client)
@@ -50,13 +53,15 @@
 - [Contributing](#contributing)
 
 <a name="about"></a>
+
 # What Tabby is and isn't
 
-* **Tabby is** an alternative to Windows' standard terminal (conhost), PowerShell ISE, PuTTY or iTerm
+* **Tabby is** an alternative to Windows' standard terminal (conhost), PowerShell ISE, PuTTY, macOS Terminal.app and iTerm
 
 * **Tabby is not** a new shell or a MinGW or Cygwin replacement. Neither is it lightweight - if RAM usage is of importance, consider [Conemu](https://conemu.github.io) or [Alacritty](https://github.com/jwilm/alacritty)
 
 <a name="terminal"></a>
+
 # Terminal features
 
 ![](docs/readme-terminal.png)
@@ -102,21 +107,28 @@ Tabby will run as a portable app on Windows, if you create a `data` folder in th
 
 Plugins and themes can be installed directly from the Settings view inside Tabby.
 
-  * [clickable-links](https://github.com/Eugeny/tabby-clickable-links) - makes paths and URLs in the terminal clickable
-  * [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed
-  * [quick-cmds](https://github.com/Domain/terminus-quick-cmds) - quickly send commands to one or all terminal tabs
-  * [save-output](https://github.com/Eugeny/tabby-save-output) - record terminal output into a file
-  * [scrollbar](https://github.com/kbjr/terminus-scrollbar) - adds a scrollbar to hterm tabs
-  * [sync-config](https://github.com/starxg/terminus-sync-config) - sync the config to Gist or Gitee
+* [clickable-links](https://github.com/Eugeny/tabby-clickable-links) - makes paths and URLs in the terminal clickable
+* [docker](https://github.com/Eugeny/tabby-docker) - connect to Docker containers
+* [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed
+* [quick-cmds](https://github.com/Domain/terminus-quick-cmds) - quickly send commands to one or all terminal tabs
+* [save-output](https://github.com/Eugeny/tabby-save-output) - record terminal output into a file
+* [sync-config](https://github.com/starxg/terminus-sync-config) - sync the config to Gist or Gitee
+* [clippy](https://github.com/Eugeny/tabby-clippy) - an example plugin which annoys you all the time
 
 <a name="themes"></a>
 # Themes
 
-  * [hype](https://github.com/Eugeny/tabby-theme-hype) - a Hyper inspired theme
-  * [relaxed](https://github.com/Relaxed-Theme/relaxed-terminal-themes#terminus) - the Relaxed theme for Tabby
-  * [gruvbox](https://github.com/porkloin/terminus-theme-gruvbox)
-  * [windows10](https://www.npmjs.com/package/terminus-theme-windows10)
-  * [altair](https://github.com/yxuko/terminus-altair)
+* [hype](https://github.com/Eugeny/tabby-theme-hype) - a Hyper inspired theme
+* [relaxed](https://github.com/Relaxed-Theme/relaxed-terminal-themes#terminus) - the Relaxed theme for Tabby
+* [gruvbox](https://github.com/porkloin/terminus-theme-gruvbox)
+* [windows10](https://www.npmjs.com/package/terminus-theme-windows10)
+* [altair](https://github.com/yxuko/terminus-altair)
+
+# Sponsors <!-- omit in toc -->
+
+[![](https://assets-production.packagecloud.io/assets/packagecloud-logo-light-scaled-26ce8e96060fddf74afbd4445e63ba35590d4aaa56edc98495bb390ef3cae0ae.png)](https://packagecloud.io)
+
+[**packagecloud**](https://packagecloud.io) has provided free Debian/RPM repository hosting
 
 <a name="contributing"></a>
 # Contributing
@@ -195,6 +207,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/cypherbits"><img src="https://avatars.githubusercontent.com/u/10424900?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cypherbits</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=cypherbits" title="Documentation">📖</a></td>
     <td align="center"><a href="https://modulolotus.net"><img src="https://avatars.githubusercontent.com/u/946421?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Davidson</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=KingMob" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/al-wi"><img src="https://avatars.githubusercontent.com/u/11092199?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexander Wiedemann</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=al-wi" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.notion.so/3d45c6bd2cbd4f938873a4bd12e23375"><img src="https://avatars.githubusercontent.com/u/59506394?v=4?s=100" width="100px;" alt=""/><br /><sub><b>장보연</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=BoYeonJang" title="Documentation">📖</a></td>
   </tr>
 </table>
 

app/lib/app.ts

@@ -1,8 +1,10 @@
 import { app, ipcMain, Menu, Tray, shell, screen, globalShortcut, MenuItemConstructorOptions } from 'electron'
 import * as promiseIpc from 'electron-promise-ipc'
 import * as remote from '@electron/remote/main'
+import { exec } from 'mz/child_process'
 import * as path from 'path'
 import * as fs from 'fs'
+import { Subject, throttleTime } from 'rxjs'
 
 import { loadConfig } from './config'
 import { Window, WindowOptions } from './window'
@@ -19,6 +21,8 @@ export class Application {
     private tray?: Tray
     private ptyManager = new PTYManager()
     private windows: Window[] = []
+    private globalHotkey$ = new Subject<void>()
+    private quitRequested = false
     userPluginsPath: string
 
     constructor () {
@@ -33,12 +37,14 @@ export class Application {
         ipcMain.on('app:register-global-hotkey', (_event, specs) => {
             globalShortcut.unregisterAll()
             for (const spec of specs) {
-                globalShortcut.register(spec, () => {
-                    this.onGlobalHotkey()
-                })
+                globalShortcut.register(spec, () => this.globalHotkey$.next())
             }
         })
 
+        this.globalHotkey$.pipe(throttleTime(100)).subscribe(() => {
+            this.onGlobalHotkey()
+        })
+
         ;(promiseIpc as any).on('plugin-manager:install', (name, version) => {
             return pluginManager.install(this.userPluginsPath, name, version)
         })
@@ -47,6 +53,10 @@ export class Application {
             return pluginManager.uninstall(this.userPluginsPath, name)
         })
 
+        ;(promiseIpc as any).on('get-default-mac-shell', async () => {
+            return (await exec(`/usr/bin/dscl . -read /Users/${process.env.LOGNAME} UserShell`))[0].toString().split(' ')[1].trim()
+        })
+
         const configData = loadConfig()
         if (process.platform === 'linux') {
             app.commandLine.appendSwitch('no-sandbox')
@@ -73,6 +83,12 @@ export class Application {
         for (const flag of configData.flags || [['force_discrete_gpu', '0']]) {
             app.commandLine.appendSwitch(flag[0], flag[1])
         }
+
+        app.on('window-all-closed', () => {
+            if (this.quitRequested || process.platform !== 'darwin') {
+                app.quit()
+            }
+        })
     }
 
     init (): void {
@@ -217,7 +233,8 @@ export class Application {
                     {
                         label: 'Quit',
                         accelerator: 'Cmd+Q',
-                        click () {
+                        click: () => {
+                            this.quitRequested = true
                             app.quit()
                         },
                     },

app/lib/index.ts

@@ -26,10 +26,6 @@ app.on('activate', () => {
     }
 })
 
-app.on('window-all-closed', () => {
-    app.quit()
-})
-
 process.on('uncaughtException' as any, err => {
     console.log(err)
     application.broadcast('uncaughtException', err)

app/lib/pty.ts

@@ -1,18 +1,27 @@
-import * as nodePTY from 'node-pty'
-import { StringDecoder } from './stringDecoder'
+import * as nodePTY from '@tabby-gang/node-pty'
 import { v4 as uuidv4 } from 'uuid'
 import { ipcMain } from 'electron'
 import { Application } from './app'
+import { UTF8Splitter } from './utfSplitter'
+import { Subject, debounceTime } from 'rxjs'
 
 class PTYDataQueue {
     private buffers: Buffer[] = []
     private delta = 0
-    private maxChunk = 1024
-    private maxDelta = 1024 * 50
+    private maxChunk = 1024 * 100
+    private maxDelta = this.maxChunk * 5
     private flowPaused = false
-    private decoder = new StringDecoder()
+    private decoder = new UTF8Splitter()
+    private output$ = new Subject<Buffer>()
 
-    constructor (private pty: nodePTY.IPty, private onData: (data: Buffer) => void) { }
+    constructor (private pty: nodePTY.IPty, private onData: (data: Buffer) => void) {
+        this.output$.pipe(debounceTime(500)).subscribe(() => {
+            const remainder = this.decoder.flush()
+            if (remainder.length) {
+                this.onData(remainder)
+            }
+        })
+    }
 
     push (data: Buffer) {
         this.buffers.push(data)
@@ -61,7 +70,9 @@ class PTYDataQueue {
     }
 
     private emitData (data: Buffer) {
-        this.onData(this.decoder.write(data))
+        const validChunk = this.decoder.write(data)
+        this.onData(validChunk)
+        this.output$.next(validChunk)
     }
 
     private pause () {

app/lib/utfSplitter.ts

@@ -0,0 +1,32 @@
+const partials = [
+    [0b110, 5, 0],
+    [0b1110, 4, 1],
+    [0b11110, 3, 2],
+]
+
+export class UTF8Splitter {
+    private internal = Buffer.alloc(0)
+
+    write (data: Buffer): Buffer {
+        this.internal = Buffer.concat([this.internal, data])
+
+        let keep = 0
+        for (const [pattern, shift, maxOffset] of partials) {
+            for (let offset = 0; offset < maxOffset + 1; offset++) {
+                if (this.internal[this.internal.length - offset - 1] >> shift === pattern) {
+                    keep = Math.max(keep, offset + 1)
+                }
+            }
+        }
+
+        const result = this.internal.slice(0, this.internal.length - keep)
+        this.internal = this.internal.slice(this.internal.length - keep)
+        return result
+    }
+
+    flush (): Buffer {
+        const result = this.internal
+        this.internal = Buffer.alloc(0)
+        return result
+    }
+}

app/lib/window.ts

@@ -1,7 +1,7 @@
 import * as glasstron from 'glasstron'
 
 import { Subject, Observable, debounceTime } from 'rxjs'
-import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions } from 'electron'
+import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions, TouchBar, nativeImage } from 'electron'
 import ElectronConfig = require('electron-config')
 import * as os from 'os'
 import * as path from 'path'
@@ -28,6 +28,8 @@ abstract class GlasstronWindow extends BrowserWindow {
 
 const macOSVibrancyType = process.platform === 'darwin' ? compareVersions.compare(macOSRelease().version, '10.14', '>=') ? 'fullscreen-ui' : 'dark' : null
 
+const activityIcon = nativeImage.createFromPath(`${app.getAppPath()}/assets/activity.png`)
+
 export class Window {
     ready: Promise<void>
     private visible = new Subject<boolean>()
@@ -39,6 +41,7 @@ export class Window {
     private lastVibrancy: { enabled: boolean, type?: string } | null = null
     private disableVibrancyWhileDragging = false
     private configStore: any
+    private touchBarControl: any
 
     get visible$ (): Observable<boolean> { return this.visible }
     get closed$ (): Observable<void> { return this.closed }
@@ -127,7 +130,15 @@ export class Window {
         this.window.webContents.setVisualZoomLevelLimits(1, 1)
         this.window.webContents.setZoomFactor(1)
 
-        if (process.platform !== 'darwin') {
+        if (process.platform === 'darwin') {
+            this.touchBarControl = new TouchBar.TouchBarSegmentedControl({
+                segments: [],
+                change: index => this.send('touchbar-selection', index),
+            })
+            this.window.setTouchBar(new TouchBar({
+                items: [this.touchBarControl],
+            }))
+        } else {
             this.window.setMenu(null)
         }
 
@@ -357,6 +368,14 @@ export class Window {
             this.window.close()
         })
 
+        ipcMain.on('window-set-touch-bar', (_event, segments, selectedIndex) => {
+            this.touchBarControl.segments = segments.map(s => ({
+                label: s.label,
+                icon: s.hasActivity ? activityIcon : undefined,
+            }))
+            this.touchBarControl.selectedIndex = selectedIndex
+        })
+
         this.window.webContents.on('new-window', event => event.preventDefault())
 
         ipcMain.on('window-set-disable-vibrancy-while-dragging', (_event, value) => {

app/package.json

@@ -14,24 +14,25 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/cdk": "^12.1.2",
+    "@angular/cdk": "^12.2.0",
     "@electron/remote": "1.2.0",
+    "@tabby-gang/node-pty": "^0.11.0-beta.200",
     "any-promise": "^1.3.0",
     "electron-config": "2.0.0",
     "electron-debug": "^3.2.0",
     "electron-promise-ipc": "^2.2.4",
+    "electron-updater": "^4.3.9",
     "fontmanager-redux": "1.1.0",
     "glasstron": "0.0.7",
     "js-yaml": "4.1.0",
     "keytar": "^7.7.0",
     "mz": "^2.7.0",
     "native-process-working-directory": "^1.0.2",
-    "node-pty": "^0.10.1",
     "npm": "6",
     "rxjs": "^7.2.0",
     "source-map-support": "^0.5.19",
     "v8-compile-cache": "^2.3.0",
-    "yargs": "^17.0.1"
+    "yargs": "^17.1.0"
   },
   "optionalDependencies": {
     "macos-native-processlist": "^2.0.0",
@@ -44,7 +45,7 @@
     "@types/mz": "2.7.4",
     "@types/node": "16.0.1",
     "ngx-filesize": "^2.0.16",
-    "node-abi": "^2.30.0"
+    "node-abi": "^3.0.0"
   },
   "peerDependencies": {
     "tabby-community-color-schemes": "*",

app/src/plugins.ts

@@ -58,7 +58,7 @@ nodeModule.prototype.require = function (query: string) {
     return originalModuleRequire.call(this, query)
 }
 
-export type ProgressCallback = (current: number, total: number) => void // eslint-disable-line @typescript-eslint/no-type-alias
+export type ProgressCallback = (current: number, total: number) => void
 
 export function initModuleLookup (userPluginsPath: string): void {
     global['module'].paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x)))

app/webpack.main.config.js

@@ -44,7 +44,8 @@ module.exports = {
         glasstron: 'commonjs glasstron',
         mz: 'commonjs mz',
         npm: 'commonjs npm',
-        'node-pty': 'commonjs node-pty',
+        'node:os': 'commonjs os',
+        '@tabby-gang/node-pty': 'commonjs @tabby-gang/node-pty',
         path: 'commonjs path',
         util: 'commonjs util',
         'source-map-support': 'commonjs source-map-support',

app/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/cdk@^12.1.2":
-  version "12.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.1.2.tgz#5c2407324d860737374d873bd4381bf7f90f8a61"
-  integrity sha512-ALupZejZDsVYcbNZcEH1cV8SDgVBL40FAwDnlSZxCgd0HOBHH0ZqQV+8z0uCQeMatoNM+SwmJ8Y1JXYh9Bqfiw==
+"@angular/cdk@^12.2.0":
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.2.0.tgz#7c6de53522ef7cf911d86e187f3df2a90e8fee49"
+  integrity sha512-Dts+KIMz6EdzQxaWBFcNwgWAHVPkI5pnOGMidKKVOmjezSUN6mhfBKq8emgsddJMRAqz/1VHMAEaRkp0VoBKiA==
   dependencies:
     tslib "^2.2.0"
   optionalDependencies:
@@ -96,6 +96,13 @@
   dependencies:
     debug "^4.3.1"
 
+"@tabby-gang/node-pty@^0.11.0-beta.200":
+  version "0.11.0-beta.200"
+  resolved "https://registry.yarnpkg.com/@tabby-gang/node-pty/-/node-pty-0.11.0-beta.200.tgz#485cd6d85a04f4b272b81a9862578d7fc38cdfb5"
+  integrity sha512-32ANParjnd38SzvICaLYvEBlTZAE2sqsgEZPK6ITgd38FcCsS/yvvsDZcjkclbxApnMM2rJDaYjsZMa0lr9Iyg==
+  dependencies:
+    nan "^2.14.0"
+
 "@types/mz@2.7.4":
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/@types/mz/-/mz-2.7.4.tgz#f9d1535cb5171199b28ae6abd6ec29e856551401"
@@ -108,6 +115,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.1.tgz#70cedfda26af7a2ca073fdcc9beb2fff4aa693f8"
   integrity sha512-hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug==
 
+"@types/semver@^7.3.5":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59"
+  integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==
+
 JSONStream@^1.3.4, JSONStream@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -352,6 +364,14 @@ buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+builder-util-runtime@8.7.5:
+  version "8.7.5"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.5.tgz#fbe59e274818885e0d2e358d5b7017c34ae6b0f5"
+  integrity sha512-fgUFHKtMNjdvH6PDRFntdIGUPgwZ69sXsAqEulCtoiqgWes5agrMq/Ud274zjJRTbckYh2PHh8/1CpFc6dpsbQ==
+  dependencies:
+    debug "^4.3.2"
+    sax "^1.2.4"
+
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz"
@@ -686,6 +706,13 @@ debug@^4.0.1, debug@^4.3.1:
   dependencies:
     ms "2.1.2"
 
+debug@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz"
@@ -845,6 +872,20 @@ electron-promise-ipc@^2.2.4:
     serialize-error "^5.0.0"
     uuid "^3.0.1"
 
+electron-updater@^4.3.9:
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.9.tgz#247c660bafad7c07935e1b81acd3e9a5fd733154"
+  integrity sha512-LCNfedSwZfS4Hza+pDyPR05LqHtGorCStaBgVpRnfKxOlZcvpYEX0AbMeH5XUtbtGRoH2V8osbbf2qKPNb7AsA==
+  dependencies:
+    "@types/semver" "^7.3.5"
+    builder-util-runtime "8.7.5"
+    fs-extra "^10.0.0"
+    js-yaml "^4.1.0"
+    lazy-val "^1.0.4"
+    lodash.escaperegexp "^4.1.2"
+    lodash.isequal "^4.5.0"
+    semver "^7.3.5"
+
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -1069,6 +1110,15 @@ fs-constants@^1.0.0:
   resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-extra@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
+  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-minipass@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -1233,6 +1283,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.2
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"
@@ -1543,7 +1598,7 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-js-yaml@4.1.0:
+js-yaml@4.1.0, js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
@@ -1580,6 +1635,15 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -1625,6 +1689,11 @@ lazy-property@~1.0.0:
   resolved "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz#84ddc4b370679ba8bd4cdcfa4c06b43d57111147"
   integrity sha1-hN3Es3Bnm6i9TNz6TAa0PVcREUc=
 
+lazy-val@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"
+  integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -1831,6 +1900,16 @@ lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.escaperegexp@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
+  integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
 lodash.union@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
@@ -1866,6 +1945,13 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 macos-native-processlist@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/macos-native-processlist/-/macos-native-processlist-2.0.0.tgz"
@@ -2052,13 +2138,20 @@ ngx-filesize@^2.0.16:
     filesize ">= 4.0.0"
     tslib "^2.0.0"
 
-node-abi@^2.20.0, node-abi@^2.30.0, node-abi@^2.7.0:
+node-abi@^2.20.0, node-abi@^2.7.0:
   version "2.30.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b"
   integrity sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==
   dependencies:
     semver "^5.4.1"
 
+node-abi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.0.0.tgz#aaeec41ffa8dd436de7a97345ff6f5c99eeafeec"
+  integrity sha512-bAfE5Pp+qqHiz4GkpH64HqHUgK2DippKB3QuYbsOp8QoR8c7S646jJMfsOj+WHZO5dPssO3j+54LwG3w3HeYWg==
+  dependencies:
+    semver "^7.3.5"
+
 node-addon-api@3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz"
@@ -2095,13 +2188,6 @@ node-gyp@^5.0.2, node-gyp@^5.1.0:
     tar "^4.4.12"
     which "^1.3.1"
 
-node-pty@^0.10.1:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.1.tgz#cd05d03a2710315ec40221232ec04186f6ac2c6d"
-  integrity sha512-JTdtUS0Im/yRsWJSx7yiW9rtpfmxqxolrtnyKwPLI+6XqTAPW/O2MjS8FYL4I5TsMbH2lVgDb2VMjp+9LoQGNg==
-  dependencies:
-    nan "^2.14.0"
-
 noop-logger@^0.1.1:
   version "0.1.1"
   resolved "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"
@@ -2593,9 +2679,9 @@ path-key@^2.0.0:
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^2.0.0:
   version "2.0.0"
@@ -2989,6 +3075,11 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -3001,6 +3092,13 @@ semver-diff@^2.0.0:
   resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
+semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 serialize-error@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-5.0.0.tgz#a7ebbcdb03a5d71a6ed8461ffe0fc1a1afed62ac"
@@ -3408,12 +3506,7 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tslib@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
-  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
-
-tslib@^2.2.0:
+tslib@^2.0.0, tslib@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
   integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
@@ -3476,6 +3569,11 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -3713,6 +3811,11 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yargs-parser@^15.0.1:
   version "15.0.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
@@ -3750,10 +3853,10 @@ yargs@^14.2.3:
     y18n "^4.0.0"
     yargs-parser "^15.0.1"
 
-yargs@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
-  integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
+yargs@^17.1.0:
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.0.tgz#0cd9827a0572c9a1795361c4d1530e53ada168cf"
+  integrity sha512-SQr7qqmQ2sNijjJGHL4u7t8vyDZdZ3Ahkmo4sc1w5xI9TBX0QDdG/g4SFnxtWOsGLjwHQue57eFALfwFCnixgg==
   dependencies:
     cliui "^7.0.2"
     escalade "^3.1.1"

electron-builder.yml

@@ -85,7 +85,6 @@ deb:
   - gnome-keyring
   - libnotify4
   - libsecret-1-0
-  - libappindicator1
   - libxtst6
   - libnss3
   afterInstall: build/linux/after-install.tpl

package.json

@@ -7,19 +7,21 @@
     "@angular/forms": "^12.0.0",
     "@angular/platform-browser": "^12.0.0",
     "@angular/platform-browser-dynamic": "^12.0.0",
-    "@fortawesome/fontawesome-free": "^5.15.3",
+    "@fortawesome/fontawesome-free": "^5.15.4",
     "@ng-bootstrap/ng-bootstrap": "^10.0.0",
     "@sentry/cli": "^1.67.2",
-    "@sentry/electron": "^2.5.1",
+    "@sentry/electron": "^2.5.2",
     "@tabby-gang/to-string-loader": "^1.1.7-beta.2",
     "@types/electron-config": "^3.2.2",
+    "@types/deep-equal": "1.0.1",
+    "deep-equal": "2.0.5",
     "@types/electron-debug": "^2.1.0",
     "@types/fs-extra": "^9.0.12",
     "@types/js-yaml": "^4.0.2",
     "@types/node": "16.0.1",
     "@types/sortablejs": "^1.10.7",
     "@types/webpack-env": "^1.16.2",
-    "@typescript-eslint/eslint-plugin": "^4.28.3",
+    "@typescript-eslint/eslint-plugin": "^4.29.0",
     "@typescript-eslint/parser": "^4.28.5",
     "apply-loader": "2.0.0",
     "axios": "^0.21.1",
@@ -28,23 +30,22 @@
     "core-js": "^3.15.2",
     "cross-env": "7.0.3",
     "css-loader": "^6.2.0",
-    "electron": "13.1.8",
+    "electron": "13.2.2",
     "electron-builder": "22.10.5",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",
     "electron-notarize": "^1.0.1",
-    "electron-rebuild": "^2.3.5",
+    "electron-rebuild": "^3.2.3",
     "eslint": "^7.32.0",
-    "eslint-plugin-import": "^2.23.4",
     "file-loader": "^6.2.0",
-    "graceful-fs": "^4.2.6",
+    "graceful-fs": "^4.2.8",
     "html-loader": "2.1.2",
     "json-loader": "0.5.7",
     "lru-cache": "^6.0.0",
-    "macos-release": "^2.5.0",
+    "macos-release": "^3.0.1",
     "ngx-sortablejs": "^11.1.0",
     "ngx-toastr": "^14.0.0",
-    "node-abi": "^2.30.0",
+    "node-abi": "^3.0.0",
     "node-sass": "^6.0.1",
     "npmlog": "5.0.0",
     "npx": "^10.2.2",
@@ -63,17 +64,17 @@
     "source-code-pro": "^2.38.0",
     "source-map-loader": "^3.0.0",
     "source-sans-pro": "3.6.0",
-    "ssh2": "^1.2.0",
+    "ssh2": "^1.4.0",
     "style-loader": "^3.2.1",
     "svg-inline-loader": "^0.8.2",
     "ts-loader": "^9.2.3",
-    "tslib": "^2.3.0",
-    "typedoc": "^0.21.5",
+    "tslib": "^2.3.1",
+    "typedoc": "^0.21.6",
     "typescript": "^4.3.5",
     "val-loader": "4.0.0",
-    "webpack": "^5.48.0",
+    "webpack": "^5.51.1",
     "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-cli": "^4.7.0",
+    "webpack-cli": "^4.8.0",
     "yaml-loader": "0.6.0",
     "zone.js": "^0.11.4"
   },

scripts/build-modules.js

@@ -13,6 +13,10 @@ const configs = [
 ;(async () => {
     for (const c of configs) {
         log.info('build', c)
-        await promisify(webpack)(require(c))
+        const stats = await promisify(webpack)(require(c))
+        console.log(stats.toString({ colors: true }))
+        if (stats.hasErrors()) {
+            process.exit(1)
+        }
     }
 })()

scripts/install-deps.js

@@ -20,7 +20,7 @@ sh.cd('web')
 sh.exec(`${npx} yarn install --force`)
 sh.cd('..')
 
-vars.builtinPlugins.forEach(plugin => {
+vars.allPackages.forEach(plugin => {
     log.info('deps', plugin)
     sh.cd(plugin)
     sh.exec(`${npx} yarn install --force`)

scripts/sentry-upload.js

@@ -9,7 +9,7 @@ sh.exec(`${sentryCli} releases new ${vars.version}`)
 if (process.platform === 'darwin') {
     for (const path of [
         'app/node_modules/@serialport/bindings/build/Release/bindings.node',
-        'app/node_modules/node-pty/build/Release/pty.node',
+        'app/node_modules/@tabby-gang/node-pty/build/Release/pty.node',
         'app/node_modules/fontmanager-redux/build/Release/fontmanager.node',
         'app/node_modules/macos-native-processlist/build/Release/native.node',
     ]) {

tabby-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-community-color-schemes",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Community color schemes for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-core",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Tabby core",
   "keywords": [
     "tabby-builtin-plugin"
@@ -19,8 +19,6 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.0",
     "bootstrap": "^4.1.3",
-    "core-js": "^3.1.2",
-    "deep-equal": "^2.0.5",
     "deepmerge": "^4.1.1",
     "electron-updater": "^4.0.6",
     "js-yaml": "^4.0.0",

tabby-core/src/api/selector.ts

@@ -1,8 +1,10 @@
 export interface SelectorOption<T> {
     name: string
     description?: string
+    group?: string
     result?: T
     icon?: string
     freeInputPattern?: string
+    color?: string
     callback?: (string?) => void
 }

tabby-core/src/buttonProvider.ts

@@ -35,7 +35,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
     async launchProfile (profile: PartialProfile<Profile>) {
         await this.profilesService.openNewTabForProfile(profile)
 
-        let recentProfiles = this.config.store.recentProfiles
+        let recentProfiles: PartialProfile<Profile>[] = JSON.parse(window.localStorage['recentProfiles'] ?? '[]')
         if (this.config.store.terminal.showRecentProfiles > 0) {
             recentProfiles = recentProfiles.filter(x => x.group !== profile.group || x.name !== profile.name)
             recentProfiles.unshift(profile)
@@ -43,8 +43,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
         } else {
             recentProfiles = []
         }
-        this.config.store.recentProfiles = recentProfiles
-        this.config.save()
+        window.localStorage['recentProfiles'] = JSON.stringify(recentProfiles)
     }
 
     provide (): ToolbarButton[] {

tabby-core/src/components/appRoot.component.pug

@@ -1,6 +1,6 @@
 title-bar(
-  *ngIf='ready && !hostWindow.isFullScreen && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
-  [class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullScreen'
+  *ngIf='ready && !hostWindow.isFullscreen && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
+  [class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullscreen'
 )
 
 .content(
@@ -10,7 +10,7 @@ title-bar(
 )
     .tab-bar
         .inset.background(*ngIf='hostApp.platform == Platform.macOS \
-        && !hostWindow.isFullScreen \
+        && !hostWindow.isFullscreen \
         && config.store.appearance.frame == "thin" \
         && (config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left")')
         .tabs(

tabby-core/src/components/baseTab.component.ts

@@ -1,4 +1,4 @@
-import { Observable, Subject } from 'rxjs'
+import { Observable, Subject, distinctUntilChanged, debounceTime } from 'rxjs'
 import { EmbeddedViewRef, ViewContainerRef, ViewRef } from '@angular/core'
 import { RecoveryToken } from '../api/tabRecovery'
 import { BaseComponent } from './base.component'
@@ -69,9 +69,9 @@ export abstract class BaseTabComponent extends BaseComponent {
 
     get focused$ (): Observable<void> { return this.focused }
     get blurred$ (): Observable<void> { return this.blurred }
-    get titleChange$ (): Observable<string> { return this.titleChange }
-    get progress$ (): Observable<number|null> { return this.progress }
-    get activity$ (): Observable<boolean> { return this.activity }
+    get titleChange$ (): Observable<string> { return this.titleChange.pipe(distinctUntilChanged()) }
+    get progress$ (): Observable<number|null> { return this.progress.pipe(distinctUntilChanged()) }
+    get activity$ (): Observable<boolean> { return this.activity.pipe(debounceTime(500)) }
     get destroyed$ (): Observable<void> { return this.destroyed }
     get recoveryStateChangedHint$ (): Observable<void> { return this.recoveryStateChangedHint }
 

tabby-core/src/components/selectorModal.component.pug

@@ -7,20 +7,25 @@
         (ngModelChange)='onFilterChange()'
     )
 
-    .list-group(*ngIf='filteredOptions.length')
-        a.list-group-item.list-group-item-action.d-flex.align-items-center(
-            #item,
-            (click)='selectOption(option)',
-            [class.active]='selectedIndex == i',
-            *ngFor='let option of filteredOptions; let i = index'
-        )
-            i.icon(
-                class='fa-fw {{option.icon}}',
-                *ngIf='!iconIsSVG(option.icon)'
+    .list-group.list-group-light(*ngIf='filteredOptions.length')
+        ng-container(*ngFor='let option of filteredOptions; let i = index')
+            label.group-header(
+                *ngIf='hasGroups && option.group !== filteredOptions[i - 1]?.group'
+            ) {{option.group}}
+            a.list-group-item.list-group-item-action.d-flex.align-items-center(
+                #item,
+                (click)='selectOption(option)',
+                [class.active]='selectedIndex == i'
             )
-            .icon(
-                [fastHtmlBind]='option.icon',
-                *ngIf='iconIsSVG(option.icon)'
-            )
-            .mr-2.title {{getOptionText(option)}}
-            .text-muted {{option.description}}
+                i.icon(
+                    class='fa-fw {{option.icon}}',
+                    style='color: {{option.color}}',
+                    *ngIf='!iconIsSVG(option.icon)'
+                )
+                .icon(
+                    [fastHtmlBind]='option.icon',
+                    style='color: {{option.color}}',
+                    *ngIf='iconIsSVG(option.icon)'
+                )
+                .title.mr-2 {{getOptionText(option)}}
+                .description.no-wrap.text-muted {{option.description}}

tabby-core/src/components/selectorModal.component.scss

@@ -9,6 +9,11 @@
     border-top-right-radius: 0;
 }
 
+.group-header {
+    padding: 0 1rem;
+    margin: 20px 0 10px;
+}
+
 .icon {
     width: 1.25rem;
     margin-right: 0.25rem;
@@ -16,6 +21,11 @@
 
 .title {
     margin-left: 10px;
+    flex: none;
+}
+
+.description {
+    flex: 1 1 0;
 }
 
 input {

tabby-core/src/components/selectorModal.component.ts

@@ -14,6 +14,7 @@ export class SelectorModalComponent<T> {
     @Input() filter = ''
     @Input() name: string
     @Input() selectedIndex = 0
+    hasGroups = false
     @ViewChildren('item') itemChildren: QueryList<ElementRef>
 
     constructor (
@@ -22,6 +23,7 @@ export class SelectorModalComponent<T> {
 
     ngOnInit (): void {
         this.onFilterChange()
+        this.hasGroups = this.options.some(x => x.group)
     }
 
     @HostListener('keyup', ['$event']) onKeyUp (event: KeyboardEvent): void {
@@ -48,16 +50,23 @@ export class SelectorModalComponent<T> {
     onFilterChange (): void {
         const f = this.filter.trim().toLowerCase()
         if (!f) {
-            this.filteredOptions = this.options.filter(x => !x.freeInputPattern)
+            this.filteredOptions = this.options.slice()
+                .sort((a, b) => a.group?.localeCompare(b.group ?? '') ?? 0)
+                .filter(x => !x.freeInputPattern)
         } else {
             const terms = f.split(' ')
             // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
-            this.filteredOptions = this.options.filter(x => x.freeInputPattern ?? terms.every(term => (x.name + (x.description ?? '')).toLowerCase().includes(term)))
+            this.filteredOptions = this.options.filter(x => x.freeInputPattern ?? this.filterMatches(x, terms))
         }
         this.selectedIndex = Math.max(0, this.selectedIndex)
         this.selectedIndex = Math.min(this.filteredOptions.length - 1, this.selectedIndex)
     }
 
+    filterMatches (option: SelectorOption<T>, terms: string[]): boolean {
+        const content = (option.group ?? '') + option.name + (option.description ?? '')
+        return terms.every(term => content.toLowerCase().includes(term))
+    }
+
     getOptionText (option: SelectorOption<T>): string {
         if (option.freeInputPattern) {
             return option.freeInputPattern.replace('%s', this.filter)

tabby-core/src/components/splitTab.component.ts

@@ -6,8 +6,8 @@ import { TabsService, NewTabParameters } from '../services/tabs.service'
 import { HotkeysService } from '../services/hotkeys.service'
 import { TabRecoveryService } from '../services/tabRecovery.service'
 
-export type SplitOrientation = 'v' | 'h' // eslint-disable-line @typescript-eslint/no-type-alias
-export type SplitDirection = 'r' | 't' | 'b' | 'l' // eslint-disable-line @typescript-eslint/no-type-alias
+export type SplitOrientation = 'v' | 'h'
+export type SplitDirection = 'r' | 't' | 'b' | 'l'
 
 /**
  * Describes a horizontal or vertical split row or column
@@ -126,16 +126,21 @@ export interface SplitSpannerInfo {
 /**
  * Represents a tab drop zone
  */
-export interface SplitDropZoneInfo {
-    container?: SplitContainer
-    position?: number
-    relativeTo?: BaseTabComponent|SplitContainer
-    side?: SplitDirection
+export type SplitDropZoneInfo = {
     x: number
     y: number
     w: number
     h: number
-}
+} & ({
+    type: 'absolute'
+    container: SplitContainer
+    position: number
+} | {
+    type: 'relative'
+    relativeTo?: BaseTabComponent|SplitContainer
+    side: SplitDirection
+})
+
 
 /**
  * Split tab is a tab that contains other tabs and allows further splitting them
@@ -585,10 +590,10 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
             return
         }
 
-        if (zone.container) {
-            this.add(tab, zone.container.children[zone.position!], zone.container.orientation === 'h' ? 'r' : 'b')
+        if (zone.type === 'relative') {
+            this.add(tab, zone.relativeTo ?? null, zone.side)
         } else {
-            this.add(tab, null, zone.side!)
+            this.add(tab, zone.container.children[zone.position], zone.container.orientation === 'h' ? 'r' : 'b')
         }
         this.tabAdopted.next(tab)
     }
@@ -649,6 +654,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                 y: y + thickness,
                 w: thickness,
                 h: h - thickness * 2,
+                type: 'relative',
                 side: 'l',
             })
             this._dropZones.push({
@@ -656,6 +662,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                 y: y - thickness / 2,
                 w,
                 h: thickness,
+                type: 'relative',
                 side: 't',
             })
             this._dropZones.push({
@@ -663,6 +670,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                 y: y + thickness,
                 w: thickness,
                 h: h - thickness * 2,
+                type: 'relative',
                 side: 'r',
             })
             this._dropZones.push({
@@ -670,6 +678,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                 y: y + h - thickness / 2,
                 w,
                 h: thickness,
+                type: 'relative',
                 side: 'b',
             })
         }
@@ -714,6 +723,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
             if (i !== root.ratios.length - 1) {
                 // Spanner area
                 this._dropZones.push({
+                    type: 'relative',
                     relativeTo: root.children[i],
                     side: root.orientation === 'v' ? 'b': 'r',
                     x: root.orientation === 'v' ? childX + thickness : childX + offset - thickness / 2,
@@ -730,6 +740,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                     y: childY + thickness,
                     w: thickness,
                     h: childH - thickness * 2,
+                    type: 'relative',
                     relativeTo: child,
                     side: 'l',
                 })
@@ -738,6 +749,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                     y: childY + thickness,
                     w: thickness,
                     h: childH - thickness * 2,
+                    type: 'relative',
                     relativeTo: child,
                     side: 'r',
                 })
@@ -747,6 +759,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                     y: childY,
                     w: childW - thickness * 2,
                     h: thickness,
+                    type: 'relative',
                     relativeTo: child,
                     side: 't',
                 })
@@ -755,6 +768,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                     y: childY + childH - thickness,
                     w: childW - thickness * 2,
                     h: thickness,
+                    type: 'relative',
                     relativeTo: child,
                     side: 'b',
                 })

tabby-core/src/components/splitTabDropZone.component.ts

@@ -34,7 +34,7 @@ export class SplitTabDropZoneComponent extends SelfPositioningComponent {
     ) {
         super(element)
         this.subscribeUntilDestroyed(app.tabDragActive$, tab => {
-            this.isActive = !!tab && tab !== this.parent && tab !== this.dropZone.container?.children[this.dropZone.position!]
+            this.isActive = !!tab && tab !== this.parent && (this.dropZone.type === 'relative' || tab !== this.dropZone.container.children[this.dropZone.position])
             this.layout()
         })
     }

tabby-core/src/components/startPage.component.pug

@@ -3,7 +3,7 @@ div
     h1.tabby-title Tabby
         sup α
 
-    .list-group
+    .list-group.list-group-light
         a.list-group-item.list-group-item-action.d-flex(
             *ngFor='let button of getButtons(); trackBy: buttonsTrackBy',
             (click)='button.click()',
@@ -13,10 +13,10 @@ div
 
 footer.d-flex.align-items-center
     .btn-group.mr-auto
-        button.btn.btn-secondary((click)='homeBase.openGitHub()')
+        button.btn.btn-dark((click)='homeBase.openGitHub()')
             i.fab.fa-github
             span GitHub
-        button.btn.btn-secondary((click)='homeBase.reportBug()')
+        button.btn.btn-dark((click)='homeBase.reportBug()')
             i.fas.fa-bug
             span Report a problem
 

tabby-core/src/components/tabHeader.component.ts

@@ -60,6 +60,7 @@ export class TabHeaderComponent extends BaseComponent {
         modal.result.then(result => {
             this.tab.setTitle(result)
             this.tab.customTitle = result
+            this.app.emitTabsChanged()
         }).catch(() => null)
     }
 

tabby-core/src/components/transfersMenu.component.scss

@@ -1,5 +1,7 @@
 :host {
     min-width: 300px;
+    max-height: 80vh;
+    overflow-y: auto;
 }
 
 .transfer {

tabby-core/src/configDefaults.yaml

@@ -20,8 +20,11 @@ terminal:
 hotkeys:
   profile:
     __nonStructural: true
+  profile-selectors:
+    __nonStructural: true
 profiles: []
-recentProfiles: []
+profileDefaults:
+  __nonStructural: true
 recoverTabs: true
 enableAnalytics: true
 enableWelcomeTab: true

tabby-core/src/hotkeys.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core'
 import { ProfilesService } from './services/profiles.service'
 import { HotkeyDescription, HotkeyProvider } from './api/hotkeyProvider'
+import { PartialProfile, Profile } from './api'
 
 /** @hidden */
 @Injectable()
@@ -193,9 +194,17 @@ export class AppHotkeyProvider extends HotkeyProvider {
         return [
             ...this.hotkeys,
             ...profiles.map(profile => ({
-                id: `profile.${profile.id}`,
+                id: `profile.${AppHotkeyProvider.getProfileHotkeyName(profile)}`,
                 name: `New tab: ${profile.name}`,
             })),
+            ...this.profilesService.getProviders().map(provider => ({
+                id: `profile-selectors.${provider.id}`,
+                name: `Show ${provider.name} profile selector`,
+            })),
         ]
     }
+
+    static getProfileHotkeyName (profile: PartialProfile<Profile>): string {
+        return profile.id!.replace(/\./g, '-')
+    }
 }

tabby-core/src/index.ts

@@ -34,7 +34,7 @@ import { FastHtmlBindDirective } from './directives/fastHtmlBind.directive'
 import { DropZoneDirective } from './directives/dropZone.directive'
 import { CdkAutoDropGroup } from './directives/cdkAutoDropGroup.directive'
 
-import { Theme, CLIHandler, TabContextMenuItemProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider, PlatformService, FileProvider, ToolbarButtonProvider, ProfilesService, ProfileProvider } from './api'
+import { Theme, CLIHandler, TabContextMenuItemProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider, PlatformService, FileProvider, ToolbarButtonProvider, ProfilesService, ProfileProvider, SelectorOption, Profile, SelectorService } from './api'
 
 import { AppService } from './services/app.service'
 import { ConfigService } from './services/config.service'
@@ -135,7 +135,8 @@ export default class AppModule { // eslint-disable-line @typescript-eslint/no-ex
         config: ConfigService,
         platform: PlatformService,
         hotkeys: HotkeysService,
-        profilesService: ProfilesService,
+        private profilesService: ProfilesService,
+        private selector: SelectorService,
     ) {
         app.ready$.subscribe(() => {
             config.ready$.toPromise().then(() => {
@@ -151,15 +152,51 @@ export default class AppModule { // eslint-disable-line @typescript-eslint/no-ex
 
         hotkeys.hotkey$.subscribe(async (hotkey) => {
             if (hotkey.startsWith('profile.')) {
-                const id = hotkey.split('.')[1]
-                const profile = (await profilesService.getProfiles()).find(x => x.id === id)
+                const id = hotkey.substring(hotkey.indexOf('.') + 1)
+                const profiles = await profilesService.getProfiles()
+                const profile = profiles.find(x => AppHotkeyProvider.getProfileHotkeyName(x) === id)
                 if (profile) {
                     profilesService.openNewTabForProfile(profile)
                 }
             }
+            if (hotkey.startsWith('profile-selectors.')) {
+                const id = hotkey.substring(hotkey.indexOf('.') + 1)
+                const provider = profilesService.getProviders().find(x => x.id === id)
+                if (!provider) {
+                    return
+                }
+                this.showSelector(provider)
+            }
         })
     }
 
+    async showSelector (provider: ProfileProvider<Profile>): Promise<void> {
+        let profiles = await this.profilesService.getProfiles()
+
+        profiles = profiles.filter(x => !x.isTemplate && x.type === provider.id)
+
+        const options: SelectorOption<void>[] = profiles.map(p => ({
+            ...this.profilesService.selectorOptionForProfile(p),
+            callback: () => this.profilesService.openNewTabForProfile(p),
+        }))
+
+        if (provider.supportsQuickConnect) {
+            options.push({
+                name: 'Quick connect',
+                freeInputPattern: 'Connect to "%s"...',
+                icon: 'fas fa-arrow-right',
+                callback: query => {
+                    const p = provider.quickConnect(query)
+                    if (p) {
+                        this.profilesService.openNewTabForProfile(p)
+                    }
+                },
+            })
+        }
+
+        await this.selector.show('Select profile', options)
+    }
+
     static forRoot (): ModuleWithProviders<AppModule> {
         return {
             ngModule: AppModule,

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

@@ -174,6 +174,9 @@ export class AppService {
      * @param inputs  Properties to be assigned on the new tab component instance
      */
     openNewTab <T extends BaseTabComponent> (params: NewTabParameters<T>): T {
+        if (params.type as any === SplitTabComponent) {
+            return this.openNewTabRaw(params)
+        }
         const splitTab = this.tabsService.create({ type: SplitTabComponent })
         const tab = this.tabsService.create(params)
         splitTab.addTab(tab, null, 'r')

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

@@ -2,7 +2,7 @@ import { Injectable, Inject } from '@angular/core'
 import * as mixpanel from 'mixpanel'
 import { v4 as uuidv4 } from 'uuid'
 import { ConfigService } from './config.service'
-import { PlatformService, BOOTSTRAP_DATA, BootstrapData } from '../api'
+import { PlatformService, BOOTSTRAP_DATA, BootstrapData, HostAppService } from '../api'
 
 @Injectable({ providedIn: 'root' })
 export class HomeBaseService {
@@ -13,6 +13,7 @@ export class HomeBaseService {
     private constructor (
         private config: ConfigService,
         private platform: PlatformService,
+        private hostApp: HostAppService,
         @Inject(BOOTSTRAP_DATA) private bootstrapData: BootstrapData,
     ) {
         this.appVersion = platform.getAppVersion()
@@ -28,20 +29,11 @@ export class HomeBaseService {
 
     reportBug (): void {
         let body = `Version: ${this.appVersion}\n`
-        body += `Platform: ${process.platform} ${this.platform.getOSRelease()}\n`
-        const label = {
-            aix: 'OS: IBM AIX',
-            android: 'OS: Android',
-            darwin: 'OS: macOS',
-            freebsd: 'OS: FreeBSD',
-            linux: 'OS: Linux',
-            openbsd: 'OS: OpenBSD',
-            sunos: 'OS: Solaris',
-            win32: 'OS: Windows',
-        }[process.platform]
+        body += `Platform: ${this.hostApp.platform} ${process.arch} ${this.platform.getOSRelease()}\n`
         const plugins = this.bootstrapData.installedPlugins.filter(x => !x.isBuiltin).map(x => x.name)
-        body += `Plugins: ${plugins.join(', ') || 'none'}\n\n`
-        this.platform.openExternal(`https://github.com/Eugeny/tabby/issues/new?body=${encodeURIComponent(body)}&labels=${label}`)
+        body += `Plugins: ${plugins.join(', ') || 'none'}\n`
+        body += `Frontend: ${this.config.store.terminal?.frontend}\n\n`
+        this.platform.openExternal(`https://github.com/Eugeny/tabby/issues/new?body=${encodeURIComponent(body)}`)
     }
 
     enableAnalytics (): void {

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

@@ -63,7 +63,7 @@ export class HotkeysService {
     private pressedHotkey: string|null = null
     private pressedKeystroke: Keystroke|null = null
     private lastKeystrokes: PastKeystroke[] = []
-    private shouldSaveNextKeystroke = true
+    private recognitionPhase = true
     private lastEventTimestamp = 0
 
     private constructor (
@@ -72,20 +72,21 @@ export class HotkeysService {
         @Inject(HotkeyProvider) private hotkeyProviders: HotkeyProvider[],
         hostApp: HostAppService,
     ) {
-        const events = ['keydown', 'keyup']
-        events.forEach(eventType => {
-            document.addEventListener(eventType, (nativeEvent: KeyboardEvent) => {
-                this._keyEvent.next(nativeEvent)
-                this.pushKeyEvent(eventType, nativeEvent)
-                if (hostApp.platform === Platform.Web && this.matchActiveHotkey(true) !== null) {
-                    nativeEvent.preventDefault()
-                    nativeEvent.stopPropagation()
-                }
-            })
-        })
         this.config.ready$.toPromise().then(async () => {
             const hotkeys = await this.getHotkeyDescriptions()
             this.hotkeyDescriptions = hotkeys
+            const events = ['keydown', 'keyup']
+
+            events.forEach(eventType => {
+                document.addEventListener(eventType, (nativeEvent: KeyboardEvent) => {
+                    this._keyEvent.next(nativeEvent)
+                    this.pushKeyEvent(eventType, nativeEvent)
+                    if (hostApp.platform === Platform.Web && this.matchActiveHotkey(true) !== null) {
+                        nativeEvent.preventDefault()
+                        nativeEvent.stopPropagation()
+                    }
+                })
+            })
         })
 
         // deprecated
@@ -121,7 +122,7 @@ export class HotkeysService {
         }
 
         for (const [key, time] of this.pressedKeyTimestamps.entries()) {
-            if (time < performance.now() - 5000) {
+            if (time < performance.now() - 2000) {
                 this.removePressedKey(key)
             }
         }
@@ -129,18 +130,20 @@ export class HotkeysService {
         const keyName = getKeyName(eventData)
         if (eventName === 'keydown') {
             this.addPressedKey(keyName, eventData)
-            this.shouldSaveNextKeystroke = true
+            if (!nativeEvent.repeat) {
+                this.recognitionPhase = true
+            }
             this.updateModifiers(eventData)
         }
         if (eventName === 'keyup') {
             const keystroke = getKeystrokeName([...this.pressedKeys])
-            if (this.shouldSaveNextKeystroke) {
+            if (this.recognitionPhase) {
                 this._keystroke.next(keystroke)
                 this.lastKeystrokes.push({
                     keystroke,
                     time: performance.now(),
                 })
-                this.shouldSaveNextKeystroke = false
+                this.recognitionPhase = false
             }
             this.removePressedKey(keyName)
         }
@@ -153,7 +156,7 @@ export class HotkeysService {
 
         const matched = this.matchActiveHotkey()
         this.zone.run(() => {
-            if (matched) {
+            if (matched && this.recognitionPhase) {
                 this.emitHotkeyOn(matched)
             } else if (this.pressedHotkey) {
                 this.emitHotkeyOff(this.pressedHotkey)

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

@@ -84,8 +84,7 @@ export class ProfilesService {
     selectorOptionForProfile <P extends Profile, T> (profile: PartialProfile<P>): SelectorOption<T> {
         const fullProfile = this.getConfigProxyForProfile(profile)
         return {
-            icon: profile.icon,
-            name: profile.group ? `${fullProfile.group} / ${fullProfile.name}` : fullProfile.name,
+            ...profile,
             description: this.providerForProfile(fullProfile)?.getDescription(fullProfile),
         }
     }
@@ -93,12 +92,14 @@ export class ProfilesService {
     showProfileSelector (): Promise<PartialProfile<Profile>|null> {
         return new Promise<PartialProfile<Profile>|null>(async (resolve, reject) => {
             try {
-                let recentProfiles: PartialProfile<Profile>[] = this.config.store.recentProfiles
+                let recentProfiles: PartialProfile<Profile>[] = JSON.parse(window.localStorage['recentProfiles'] ?? '[]')
                 recentProfiles = recentProfiles.slice(0, this.config.store.terminal.showRecentProfiles)
 
                 let options: SelectorOption<void>[] = recentProfiles.map(p => ({
                     ...this.selectorOptionForProfile(p),
+                    group: 'Recent',
                     icon: 'fas fa-history',
+                    color: p.color,
                     callback: async () => {
                         if (p.id) {
                             p = (await this.getProfiles()).find(x => x.id === p.id) ?? p
@@ -108,10 +109,11 @@ export class ProfilesService {
                 }))
                 if (recentProfiles.length) {
                     options.push({
-                        name: 'Clear recent connections',
+                        name: 'Clear recent profiles',
+                        group: 'Recent',
                         icon: 'fas fa-eraser',
                         callback: async () => {
-                            this.config.store.recentProfiles = []
+                            window.localStorage.removeItem('recentProfiles')
                             this.config.save()
                             resolve(null)
                         },
@@ -177,9 +179,13 @@ export class ProfilesService {
         return null
     }
 
-    getConfigProxyForProfile <T extends Profile> (profile: PartialProfile<T>): T {
+    getConfigProxyForProfile <T extends Profile> (profile: PartialProfile<T>, skipUserDefaults = false): T {
         const provider = this.providerForProfile(profile)
-        const defaults = configMerge(this.profileDefaults, provider?.configDefaults ?? {})
+        const defaults = [
+            this.profileDefaults,
+            provider?.configDefaults ?? {},
+            !provider || skipUserDefaults ? {} : this.config.store.profileDefaults[provider.id] ?? {},
+        ].reduce(configMerge, {})
         return new ConfigProxy(profile, defaults) as unknown as T
     }
 }

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

@@ -34,6 +34,7 @@ export class TabRecoveryService {
         const token = await tab.getRecoveryToken()
         if (token) {
             token.tabTitle = tab.title
+            token.tabCustomTitle = tab.customTitle
             if (tab.color) {
                 token.tabColor = tab.color
             }
@@ -55,6 +56,7 @@ export class TabRecoveryService {
                 tab.inputs = tab.inputs ?? {}
                 tab.inputs.color = token.tabColor ?? null
                 tab.inputs.title = token.tabTitle || ''
+                tab.inputs.customTitle = token.tabCustomTitle || ''
                 tab.inputs.disableDynamicTitle = token.disableDynamicTitle
                 return tab
             } catch (error) {

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

@@ -2,7 +2,6 @@ import { Injectable, ComponentFactoryResolver, Injector } from '@angular/core'
 import { BaseTabComponent } from '../components/baseTab.component'
 import { TabRecoveryService } from './tabRecovery.service'
 
-// eslint-disable-next-line @typescript-eslint/no-type-alias
 export interface TabComponentType<T extends BaseTabComponent> {
     // eslint-disable-next-line @typescript-eslint/prefer-function-type
     new (...args: any[]): T

tabby-core/src/tabContextMenu.ts

@@ -13,6 +13,7 @@ import { TabsService } from './services/tabs.service'
 import { HotkeysService } from './services/hotkeys.service'
 import { PromptModalComponent } from './components/promptModal.component'
 import { SplitLayoutProfilesService } from './profiles'
+import { TAB_COLORS } from './utils'
 
 /** @hidden */
 @Injectable()
@@ -89,16 +90,6 @@ export class TabManagementContextMenu extends TabContextMenuItemProvider {
     }
 }
 
-const COLORS = [
-    { name: 'No color', value: null },
-    { name: 'Blue', value: '#0275d8' },
-    { name: 'Green', value: '#5cb85c' },
-    { name: 'Orange', value: '#f0ad4e' },
-    { name: 'Purple', value: '#613d7c' },
-    { name: 'Red', value: '#d9534f' },
-    { name: 'Yellow', value: '#ffd500' },
-]
-
 /** @hidden */
 @Injectable()
 export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
@@ -127,8 +118,8 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
                 },
                 {
                     label: 'Color',
-                    sublabel: COLORS.find(x => x.value === tab.color)?.name,
-                    submenu: COLORS.map(color => ({
+                    sublabel: TAB_COLORS.find(x => x.value === tab.color)?.name,
+                    submenu: TAB_COLORS.map(color => ({
                         label: color.name,
                         type: 'radio',
                         checked: tab.color === color.value,

tabby-core/src/theme.scss

@@ -230,26 +230,25 @@ hotkey-input-modal {
     }
 }
 
-.list-group.list-group-flush .list-group-item:not(.list-group-item-action) {
+.list-group.list-group-flush .list-group-item {
     background: transparent;
     border-color: rgba(0, 0, 0, 0.2);
 
     &:not(:last-child) {
         border-bottom: none;
     }
+
+    &.list-group-item-action {
+        &:hover, &.active {
+            background: $list-group-hover-bg;
+        }
+    }
 }
 
 .list-group-light {
     .list-group-item {
-        background: transparent;
         border: none;
 
-        border-top: 1px solid rgba(0, 21, 43, .4);
-
-        &:first-child {
-            border-top: none;
-        }
-
         &.list-group-item-action {
             &:hover, &.active {
                 background: $list-group-hover-bg;

tabby-core/src/theme.vars.scss

@@ -26,8 +26,8 @@ $purple: #613d7c !default;
 $content-bg: rgba(39, 49, 60, 0.65); //#1D272D;
 $content-bg-solid: #1D272D;
 
-$table-bg: rgba(255,255,255,.05);
-$table-bg-hover: rgba(255,255,255,.1);
+$table-bg: rgba(255,255,255,.025);
+$table-bg-hover: rgba(255,255,255,.05);
 $table-border-color: rgba(255,255,255,.1);
 
 $theme-colors: (
@@ -88,7 +88,7 @@ $list-group-item-padding-y: 0.8rem;
 $list-group-item-padding-x: 1rem;
 
 $list-group-hover-bg: $table-bg-hover;
-$list-group-active-bg: rgba(255,255,255,.2);
+$list-group-active-bg: rgba(255,255,255,.05);
 $list-group-active-color: $component-active-color;
 $list-group-active-border-color: translate;
 

tabby-core/src/utils.ts

@@ -54,3 +54,13 @@ export class ResettableTimeout {
         }
     }
 }
+
+export const TAB_COLORS = [
+    { name: 'No color', value: null },
+    { name: 'Blue', value: '#0275d8' },
+    { name: 'Green', value: '#5cb85c' },
+    { name: 'Orange', value: '#f0ad4e' },
+    { name: 'Purple', value: '#613d7c' },
+    { name: 'Red', value: '#d9534f' },
+    { name: 'Yellow', value: '#ffd500' },
+]

tabby-core/yarn.lock

@@ -24,11 +24,6 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-available-typed-arrays@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9"
-  integrity sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==
-
 bootstrap@^4.1.3:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6"
@@ -42,19 +37,6 @@ builder-util-runtime@8.7.5:
     debug "^4.3.2"
     sax "^1.2.4"
 
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-core-js@^3.1.2:
-  version "3.15.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
-  integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==
-
 debug@4:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
@@ -69,39 +51,11 @@ debug@^4.3.2:
   dependencies:
     ms "2.1.2"
 
-deep-equal@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9"
-  integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==
-  dependencies:
-    call-bind "^1.0.0"
-    es-get-iterator "^1.1.1"
-    get-intrinsic "^1.0.1"
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.2"
-    is-regex "^1.1.1"
-    isarray "^2.0.5"
-    object-is "^1.1.4"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.3"
-    which-boxed-primitive "^1.0.1"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.2"
-
 deepmerge@^4.1.1:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
 electron-updater@^4.0.6:
   version "4.3.9"
   resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.9.tgz#247c660bafad7c07935e1b81acd3e9a5fd733154"
@@ -116,61 +70,11 @@ electron-updater@^4.0.6:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
-  version "1.18.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0"
-  integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    is-callable "^1.2.3"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.3"
-    is-string "^1.0.6"
-    object-inspect "^1.10.3"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
-
-es-get-iterator@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7"
-  integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.0"
-    has-symbols "^1.0.1"
-    is-arguments "^1.1.0"
-    is-map "^2.0.2"
-    is-set "^2.0.2"
-    is-string "^1.0.5"
-    isarray "^2.0.5"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 "filesize@>= 4.0.0":
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.3.0.tgz#dff53cfb3f104c9e422f346d53be8dbcc971bf11"
   integrity sha512-ytx0ruGpDHKWVoiui6+BY/QMNngtDQ/pJaFwfBpQif0J63+E8DLdFyqS3NkKQn7vIruUEpoGD9JUJSg7Kp+I0g==
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
-
 fs-extra@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
@@ -180,42 +84,11 @@ fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
-
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
 https-proxy-agent@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
@@ -229,101 +102,6 @@ inherits@^2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-is-arguments@^1.0.4, is-arguments@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
-  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
-  dependencies:
-    call-bind "^1.0.0"
-
-is-bigint@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
-  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
-
-is-boolean-object@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
-  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-callable@^1.1.4, is-callable@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
-  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
-
-is-date-object@^1.0.1, is-date-object@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
-  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
-
-is-map@^2.0.1, is-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
-  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
-
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-number-object@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
-  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
-
-is-regex@^1.1.1, is-regex@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
-  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
-  dependencies:
-    call-bind "^1.0.2"
-    has-symbols "^1.0.2"
-
-is-set@^2.0.1, is-set@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
-  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
-
-is-string@^1.0.5, is-string@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
-  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-typed-array@^1.1.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e"
-  integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==
-  dependencies:
-    available-typed-arrays "^1.0.2"
-    call-bind "^1.0.2"
-    es-abstract "^1.18.0-next.2"
-    foreach "^2.0.5"
-    has-symbols "^1.0.1"
-
-is-weakmap@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
-  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
-
-is-weakset@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
-  integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
 js-yaml@^4.0.0, js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -391,34 +169,6 @@ ngx-perfect-scrollbar@^10.1.0:
     resize-observer-polyfill "^1.5.0"
     tslib "^2.0.0"
 
-object-inspect@^1.10.3, object-inspect@^1.9.0:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
-  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
-
-object-is@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
 perfect-scrollbar@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz#821d224ed8ff61990c23f26db63048cdc75b6b83"
@@ -433,14 +183,6 @@ readable-stream@3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-regexp.prototype.flags@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
 resize-observer-polyfill@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
@@ -463,31 +205,6 @@ semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-side-channel@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
-  dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
-
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -500,16 +217,6 @@ tslib@^2.0.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
   integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -525,40 +232,6 @@ uuid@^8.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-collection@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
-  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
-  dependencies:
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-weakmap "^2.0.1"
-    is-weakset "^2.0.1"
-
-which-typed-array@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
-  integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==
-  dependencies:
-    available-typed-arrays "^1.0.2"
-    call-bind "^1.0.0"
-    es-abstract "^1.18.0-next.1"
-    foreach "^2.0.5"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.1"
-    is-typed-array "^1.1.3"
-
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

tabby-electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-electron",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Electron-specific bindings",
   "keywords": [
     "tabby-builtin-plugin"

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { App, IpcRenderer, Shell, Dialog, Clipboard, GlobalShortcut, Screen, Remote, AutoUpdater, TouchBar, BrowserWindow, Menu, MenuItem, NativeImage, PowerSaveBlocker } from 'electron'
+import { App, IpcRenderer, Shell, Dialog, Clipboard, GlobalShortcut, Screen, AutoUpdater, TouchBar, BrowserWindow, Menu, MenuItem, PowerSaveBlocker } from 'electron'
 import * as remote from '@electron/remote'
 
 export interface MessageBoxResponse {
@@ -15,9 +15,8 @@ export class ElectronService {
     dialog: Dialog
     clipboard: Clipboard
     globalShortcut: GlobalShortcut
-    nativeImage: typeof NativeImage
     screen: Screen
-    remote: Remote
+    remote = remote
     process: any
     autoUpdater: AutoUpdater
     powerSaveBlocker: PowerSaveBlocker
@@ -38,7 +37,6 @@ export class ElectronService {
         this.screen = remote.screen
         this.dialog = remote.dialog
         this.globalShortcut = remote.globalShortcut
-        this.nativeImage = remote.nativeImage
         this.autoUpdater = remote.autoUpdater
         this.powerSaveBlocker = remote.powerSaveBlocker
         this.TouchBar = remote.TouchBar

tabby-electron/src/services/hostWindow.service.ts

@@ -12,9 +12,9 @@ export interface Bounds {
 
 @Injectable({ providedIn: 'root' })
 export class ElectronHostWindow extends HostWindowService {
-    get isFullscreen (): boolean { return this._isFullScreen}
+    get isFullscreen (): boolean { return this._isFullscreen }
 
-    private _isFullScreen = false
+    private _isFullscreen = false
 
     constructor (
         zone: NgZone,
@@ -23,28 +23,26 @@ export class ElectronHostWindow extends HostWindowService {
     ) {
         super()
         electron.ipcRenderer.on('host:window-enter-full-screen', () => zone.run(() => {
-            this._isFullScreen = true
+            this._isFullscreen = true
         }))
 
         electron.ipcRenderer.on('host:window-leave-full-screen', () => zone.run(() => {
-            this._isFullScreen = false
+            this._isFullscreen = false
         }))
 
-        electron.ipcRenderer.on('host:window-shown', () => {
-            zone.run(() => this.windowShown.next())
-        })
+        electron.ipcRenderer.on('host:window-shown', () => zone.run(() => this.windowShown.next()))
 
-        electron.ipcRenderer.on('host:window-close-request', () => {
-            zone.run(() => this.windowCloseRequest.next())
-        })
+        electron.ipcRenderer.on('host:window-close-request', () => zone.run(() => {
+            this.windowCloseRequest.next()
+        }))
 
-        electron.ipcRenderer.on('host:window-moved', () => {
-            zone.run(() => this.windowMoved.next())
-        })
+        electron.ipcRenderer.on('host:window-moved', () => zone.run(() => {
+            this.windowMoved.next()
+        }))
 
-        electron.ipcRenderer.on('host:window-focused', () => {
-            zone.run(() => this.windowFocused.next())
-        })
+        electron.ipcRenderer.on('host:window-focused', () => zone.run(() => {
+            this.windowFocused.next()
+        }))
     }
 
     getWindow (): BrowserWindow {
@@ -64,7 +62,7 @@ export class ElectronHostWindow extends HostWindowService {
     }
 
     toggleFullscreen (): void {
-        this.getWindow().setFullScreen(!this._isFullScreen)
+        this.getWindow().setFullScreen(!this._isFullscreen)
     }
 
     minimize (): void {

tabby-electron/src/services/platform.service.ts

@@ -120,6 +120,7 @@ export class ElectronPlatformService extends PlatformService {
     async _saveConfigInternal (content: string): Promise<void> {
         const tempPath = this.configPath + '.new'
         await fs.writeFile(tempPath, content, 'utf8')
+        await fs.writeFile(this.configPath + '.backup', content, 'utf8')
         await promisify(gracefulFS.rename)(tempPath, this.configPath)
     }
 

tabby-electron/src/services/touchbar.service.ts

@@ -1,56 +1,37 @@
-import { SegmentedControlSegment, TouchBarSegmentedControl } from 'electron'
+import deepEqual from 'deep-equal'
+import { Subject, distinctUntilChanged } from 'rxjs'
+import { ipcRenderer } from 'electron'
 import { Injectable, NgZone } from '@angular/core'
 import { AppService, HostAppService, Platform } from 'tabby-core'
-import { ElectronService } from '../services/electron.service'
-import { ElectronHostWindow } from './hostWindow.service'
 
 /** @hidden */
 @Injectable({ providedIn: 'root' })
 export class TouchbarService {
-    private tabsSegmentedControl: TouchBarSegmentedControl
-    private tabSegments: SegmentedControlSegment[] = []
+    private touchbarState$ = new Subject<any>()
 
     private constructor (
         private app: AppService,
         private hostApp: HostAppService,
-        private hostWindow: ElectronHostWindow,
-        private electron: ElectronService,
         private zone: NgZone,
     ) {
         if (this.hostApp.platform !== Platform.macOS) {
             return
         }
-        app.tabsChanged$.subscribe(() => this.updateTabs())
-        app.activeTabChange$.subscribe(() => this.updateTabs())
+        app.tabsChanged$.subscribe(() => this.update())
+        app.activeTabChange$.subscribe(() => this.update())
 
-        const activityIconPath = `${electron.app.getAppPath()}/assets/activity.png`
-        const activityIcon = this.electron.nativeImage.createFromPath(activityIconPath)
         app.tabOpened$.subscribe(tab => {
-            tab.titleChange$.subscribe(title => {
-                const segment = this.tabSegments[app.tabs.indexOf(tab)]
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                if (segment) {
-                    segment.label = this.shortenTitle(title)
-                    this.tabsSegmentedControl.segments = this.tabSegments
-                }
-            })
-            tab.activity$.subscribe(hasActivity => {
-                const showIcon = this.app.activeTab !== tab && hasActivity
-                const segment = this.tabSegments[app.tabs.indexOf(tab)]
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                if (segment) {
-                    segment.icon = showIcon ? activityIcon : undefined
-                }
-            })
+            tab.titleChange$.subscribe(() => this.update())
+            tab.activity$.subscribe(() => this.update())
         })
-    }
 
-    updateTabs (): void {
-        this.tabSegments = this.app.tabs.map(tab => ({
-            label: this.shortenTitle(tab.title),
+        ipcRenderer.on('touchbar-selection', (_event, index) => this.zone.run(() => {
+            this.app.selectTab(this.app.tabs[index])
         }))
-        this.tabsSegmentedControl.segments = this.tabSegments
-        this.tabsSegmentedControl.selectedIndex = this.app.activeTab ? this.app.tabs.indexOf(this.app.activeTab) : 0
+
+        this.touchbarState$.pipe(distinctUntilChanged(deepEqual)).subscribe(state => {
+            ipcRenderer.send('window-set-touch-bar', ...state)
+        })
     }
 
     update (): void {
@@ -58,20 +39,12 @@ export class TouchbarService {
             return
         }
 
-        this.tabsSegmentedControl = new this.electron.TouchBar.TouchBarSegmentedControl({
-            segments: this.tabSegments,
-            selectedIndex: this.app.activeTab ? this.app.tabs.indexOf(this.app.activeTab) : undefined,
-            change: (selectedIndex) => this.zone.run(() => {
-                this.app.selectTab(this.app.tabs[selectedIndex])
-            }),
-        })
+        const tabSegments = this.app.tabs.map(tab => ({
+            label: this.shortenTitle(tab.title),
+            hasActivity: this.app.activeTab !== tab && tab.hasActivity,
+        }))
 
-        const touchBar = new this.electron.TouchBar({
-            items: [
-                this.tabsSegmentedControl,
-            ],
-        })
-        this.hostWindow.setTouchBar(touchBar)
+        this.touchbarState$.next([tabSegments, this.app.activeTab ? this.app.tabs.indexOf(this.app.activeTab) : undefined])
     }
 
     private shortenTitle (title: string): string {

tabby-electron/src/services/updater.service.ts

@@ -1,3 +1,4 @@
+import type { AppUpdater } from 'electron-updater'
 import { Injectable } from '@angular/core'
 import axios from 'axios'
 
@@ -12,6 +13,7 @@ export class ElectronUpdaterService extends UpdaterService {
     private downloaded: Promise<boolean>
     private electronUpdaterAvailable = true
     private updateURL: string
+    private autoUpdater: AppUpdater
 
     constructor (
         log: LogService,
@@ -27,32 +29,35 @@ export class ElectronUpdaterService extends UpdaterService {
             return
         }
 
-        electron.autoUpdater.on('update-available', () => {
+        this.autoUpdater = electron.remote.require('electron-updater').autoUpdater
+
+        this.autoUpdater.on('update-available', () => {
             this.logger.info('Update available')
         })
 
-        electron.autoUpdater.on('update-not-available', () => {
+        this.autoUpdater.on('update-not-available', () => {
             this.logger.info('No updates')
         })
 
-        electron.autoUpdater.on('error', err => {
+        this.autoUpdater.on('error', err => {
             this.logger.error(err)
             this.electronUpdaterAvailable = false
         })
 
         this.downloaded = new Promise<boolean>(resolve => {
-            electron.autoUpdater.once('update-downloaded', () => resolve(true))
+            this.autoUpdater.once('update-downloaded', () => resolve(true))
         })
 
-
         config.ready$.toPromise().then(() => {
             if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TABBY_DEV) {
                 this.logger.debug('Checking for updates')
                 try {
-                    electron.autoUpdater.setFeedURL({
-                        url: `https://update.electronjs.org/eugeny/tabby/${process.platform}-${process.arch}/${electron.app.getVersion()}`,
+                    this.autoUpdater.setFeedURL({
+                        provider: 'github',
+                        repo: 'tabby',
+                        owner: 'eugeny',
                     })
-                    electron.autoUpdater.checkForUpdates()
+                    this.autoUpdater.checkForUpdates()
                 } catch (e) {
                     this.electronUpdaterAvailable = false
                     this.logger.info('Electron updater unavailable, falling back', e)
@@ -79,26 +84,26 @@ export class ElectronUpdaterService extends UpdaterService {
                     reject(err)
                 }
                 cancel = () => {
-                    this.electron.autoUpdater.off('error', onError)
-                    this.electron.autoUpdater.off('update-not-available', onNoUpdate)
-                    this.electron.autoUpdater.off('update-available', onUpdate)
+                    this.autoUpdater.off('error', onError)
+                    this.autoUpdater.off('update-not-available', onNoUpdate)
+                    this.autoUpdater.off('update-available', onUpdate)
                 }
-                this.electron.autoUpdater.on('error', onError)
-                this.electron.autoUpdater.on('update-not-available', onNoUpdate)
-                this.electron.autoUpdater.on('update-available', onUpdate)
+                this.autoUpdater.on('error', onError)
+                this.autoUpdater.on('update-not-available', onNoUpdate)
+                this.autoUpdater.on('update-available', onUpdate)
                 try {
-                    this.electron.autoUpdater.checkForUpdates()
+                    this.autoUpdater.checkForUpdates()
                 } catch (e) {
                     this.electronUpdaterAvailable = false
                     this.logger.info('Electron updater unavailable, falling back', e)
                 }
             })
 
-            this.electron.autoUpdater.on('update-available', () => {
+            this.autoUpdater.on('update-available', () => {
                 this.logger.info('Update available')
             })
 
-            this.electron.autoUpdater.once('update-not-available', () => {
+            this.autoUpdater.once('update-not-available', () => {
                 this.logger.info('No updates')
             })
 
@@ -132,7 +137,7 @@ export class ElectronUpdaterService extends UpdaterService {
                 }
             )).response === 0) {
                 await this.downloaded
-                this.electron.autoUpdater.quitAndInstall()
+                this.autoUpdater.quitAndInstall()
             }
         }
     }

tabby-local/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-local",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Tabby's local shell plugin",
   "keywords": [
     "tabby-builtin-plugin"
@@ -17,14 +17,12 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "dependencies": {
-    "hterm-umdjs": "1.4.1",
     "opentype.js": "^1.3.3"
   },
   "devDependencies": {
-    "@types/deep-equal": "^1.0.0",
     "ansi-colors": "^4.1.1",
     "dataurl": "0.1.0",
-    "deep-equal": "2.0.5",
+    "hasbin": "^1.2.3",
     "ps-node": "^0.1.6",
     "runes": "^0.4.2",
     "utils-decorators": "^1.8.3"

tabby-local/src/icons/msys2.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36.777mm" height="36.777mm" version="1.1" viewBox="0 0 36.777 36.777" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-122.71 -169.49)">
+<g transform="translate(36.844 36.777)" fill="#999">
+<path d="m118.48 154.39c-0.21263-0.77937-0.60053-0.53763-3.7786-0.53763-4.2381 0-4.51 0.21718-2.6541-2.4472 2.457-3.5274 3.4906-5.924 2.8085-6.965-0.4719-0.72022-1.0125-0.62449-1.9271 0.34127-0.84859 0.89603-1.8689 0.41779-1.8689-0.95587 0-2.012 2.8056-3.9999 5.3894-3.9922 1.614 5e-3 2.4364 0.4039 3.2158 1.5604 1.1203 1.6624 0.73145 3.8557-1.134 6.397-1.5438 2.1031-0.73385 3.6126 0.95572 1.7811 1.4629-1.6879 1.5595 0.86073 1.491 1.7028-0.2309 2.6962-2.077 4.6571-2.4976 3.1153z" fill="#999" stroke-width=".26458"/>
+</g>
+<g stroke-width=".50508">
+<path transform="matrix(.26458 0 0 .26458 122.71 169.49)" d="m9.2551 97.323c-1.1562-0.7536-0.31598-3.2576 3.2531-9.6944 5.9813-10.787 19.737-40.139 25.544-54.507 3.4471-8.5282 3.725-10.717 1.5808-12.448-1.1414-0.92159-1.2907-1.285-0.8373-2.0393 1.6696-2.7778 11.294-3.9702 15.358-1.9029 4.5286 2.3035 6.6098 7.8684 9.3407 24.976 2.1781 13.645 3.7862 22.817 4.0853 23.301 0.80633 1.3047 2.407-1.8854 8.4838-16.908 8.5152-21.05 12.267-27.812 16.696-30.091 1.962-1.0097 3.3986-1.3036 7.1792-1.469 6.0598-0.26504 6.2396-0.12365 6.2324 4.9003-9e-3 6.5148-0.30491 7.4305-2.886 8.9432-4.8227 2.8263-8.1944 7.5856-8.2016 11.577-0.0099 5.4798 4.0769 7.1796 7.8338 3.2583 0.7854-0.81978 1.6128-1.4905 1.8386-1.4905s0.4119 2.1024 0.4135 4.672c2e-3 2.5696 0.21897 5.9911 0.48302 7.6033 0.54393 3.3211 0.62062 3.1596-6.937 14.613-4.1978 6.362-4.5659 7.2622-3.4332 8.3967 0.6867 0.6878 2.275 0.85452 9.4046 0.9872l8.5784 0.15964 2.1125 2.798c2.5812 3.4188 2.7454 5.2892 0.6996 7.9714-1.8668 2.4475-5.6125 5.1245-8.1753 5.8427-3.7415 1.0486-8.4103-1.013-12.47-5.5062-5.2081-5.7647-7.5396-14.899-8.239-32.278-0.24251-6.0259-0.52471-8.6733-0.91083-8.5446-0.30771 0.10257-3.7635 7.5753-7.6796 16.606-12.423 28.649-13.924 31.318-17.16 30.506-2.025-0.50825-5.0993-4.014-7.2197-8.2328-4.1934-8.3436-6.5579-19.088-7.6998-34.988-0.32917-4.5836-0.78831-8.5453-1.0203-8.8039-0.51357-0.57238-2.2088 3.1103-7.8764 17.11-7.6151 18.811-10.569 24.729-14.439 28.927-3.2899 3.5691-11.857 7.1072-13.933 5.7541z" fill="#f9f9f9"/>
+<g fill="#d35e64">
+<path transform="matrix(.26458 0 0 .26458 122.71 169.49)" d="m75.664 122.46c-1.2249-0.96348-1.34-1.3378-1.2045-3.9143l0.14983-2.849h1.7351c1.6821 0 1.7361 0.0617 1.7678 2.0203l0.03266 2.0203 2.6573 0.15286c2.0366 0.11715 2.7277-0.0306 2.9587-0.63248 0.60362-1.573-0.4054-3.3932-3.728-6.7251-1.8658-1.871-3.9062-4.071-4.5342-4.8889-1.4589-1.8999-1.5437-5.2283-0.17634-6.917 0.88504-1.093 1.3438-1.1924 5.5028-1.1924 5.1756 0 6.3427 0.6042 6.8174 3.5294 0.4355 2.6837-0.25445 4.5518-1.6811 4.5518-1.0066 0-1.2918-0.36987-1.7526-2.2728-0.50287-2.0764-0.69656-2.287-2.2406-2.4363-0.92959-0.0899-2.2269-0.0288-2.883 0.13589-2.2502 0.56476-1.4227 2.1852 3.6054 7.0604l4.7982 4.6523v3.4083c0 5.2086-0.1649 5.3622-5.758 5.3622-4.0289 0-4.9088-0.1545-6.0667-1.0653z"/>
+<path transform="matrix(.26458 0 0 .26458 122.71 169.49)" d="m95.774 130.77c0.17811-1.0634 0.45153-3.9789 0.60759-6.479 0.26576-4.2574 0.13359-5.1223-2.0838-13.637-1.3021-5.0002-2.4843-9.6028-2.6269-10.228-0.22442-0.98323-0.05554-1.1364 1.2529-1.1364 0.83175 0 1.7665 0.30628 2.0771 0.68062 0.31067 0.37434 1.1434 3.2722 1.8506 6.4397 1.5777 7.0668 1.7138 7.5269 2.2267 7.5269 0.6014 0 1.3464-2.1279 2.8279-8.0775 1.4724-5.913 1.8338-6.5697 3.6148-6.5697 1.4844 0 1.7436-1.6442-2.6503 16.81-1.7714 7.44-3.5154 14.145-3.8755 14.9-0.44524 0.93333-1.1172 1.4255-2.0998 1.5381-1.4138 0.162-1.4381 0.1237-1.1212-1.7678z"/>
+<path transform="matrix(.26458 0 0 .26458 122.71 169.49)" d="m123.48 114.84-5e-3 3.943s0.15696 3.7633-0.40862 4.2971c-0.57517 0.54286-2.7589 0.44883-5.7918 0.44883-5.2692 0-5.5498-0.0541-6.3116-1.2168-0.5398-0.82384-0.74743-2.0878-0.64299-3.9143 0.15002-2.6234 0.19573-2.6976 1.6626-2.6976 1.1206 0 1.5476 0.25963 1.6612 1.0102 0.49591 3.2773 0.50129 3.283 3.0918 3.283 5.0292 0 4.4851-2.8078-1.5873-8.1914-3.7309-3.3076-4.9304-5.0912-4.9196-7.3146 0.0189-3.8712 1.6713-5.2021 6.4586-5.2021 5.461 0 7.1715 1.3886 7.1715 5.8219 0 3.2126-3.0514 3.8315-3.5569 0.7215-0.42706-2.6273-0.8307-3.0079-3.1904-3.0079-2.2332 0-3.3512 0.66414-3.3585 1.995-2e-3 0.43058 2.2137 2.8835 4.9245 5.4509"/>
+</g>
+</g>
+</g>
+</svg>

tabby-local/src/index.ts

@@ -32,6 +32,7 @@ import { Cygwin64ShellProvider } from './shells/cygwin64'
 import { GitBashShellProvider } from './shells/gitBash'
 import { LinuxDefaultShellProvider } from './shells/linuxDefault'
 import { MacOSDefaultShellProvider } from './shells/macDefault'
+import { MSYS2ShellProvider } from './shells/msys2'
 import { POSIXShellsProvider } from './shells/posix'
 import { PowerShellCoreShellProvider } from './shells/powershellCore'
 import { WindowsDefaultShellProvider } from './shells/winDefault'
@@ -71,6 +72,7 @@ import { LocalProfilesService } from './profiles'
         { provide: ShellProvider, useClass: Cygwin64ShellProvider, multi: true },
         { provide: ShellProvider, useClass: GitBashShellProvider, multi: true },
         { provide: ShellProvider, useClass: POSIXShellsProvider, multi: true },
+        { provide: ShellProvider, useClass: MSYS2ShellProvider, multi: true },
         { provide: ShellProvider, useClass: WSLShellProvider, multi: true },
         { provide: ShellProvider, useClass: VSDevToolsProvider, multi: true },
 

tabby-local/src/shells/macDefault.ts

@@ -1,5 +1,5 @@
-import { exec } from 'mz/child_process'
 import { Injectable } from '@angular/core'
+import promiseIpc, { RendererProcessType } from 'electron-promise-ipc'
 import { HostAppService, Platform } from 'tabby-core'
 
 import { ShellProvider, Shell } from '../api'
@@ -33,11 +33,11 @@ export class MacOSDefaultShellProvider extends ShellProvider {
         if (!this.cachedShell) {
             this.cachedShell = await this.getDefaultShell()
         }
-        return this.cachedShell!
+        return this.cachedShell
     }
 
-    private async getDefaultShell () {
-        const shellEntry = (await exec(`/usr/bin/dscl . -read /Users/${process.env.LOGNAME} UserShell`))[0].toString()
-        return shellEntry.split(' ')[1].trim()
+    private async getDefaultShell (): Promise<string> {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+        return (promiseIpc as RendererProcessType).send('get-default-mac-shell') as Promise<string>
     }
 }

tabby-local/src/shells/msys2.ts

@@ -0,0 +1,40 @@
+import * as fs from 'fs/promises'
+import * as path from 'path'
+import { Injectable } from '@angular/core'
+import { HostAppService, Platform } from 'tabby-core'
+
+import { ShellProvider, Shell } from '../api'
+
+/** @hidden */
+@Injectable()
+export class MSYS2ShellProvider extends ShellProvider {
+    constructor (
+        private hostApp: HostAppService,
+    ) {
+        super()
+    }
+
+    async provide (): Promise<Shell[]> {
+        if (this.hostApp.platform !== Platform.Windows) {
+            return []
+        }
+
+        const msys2Path = path.resolve(process.env.SystemRoot ?? 'C:\\Windows', '../msys64')
+        try {
+            await fs.access(msys2Path)
+        } catch {
+            return []
+        }
+
+        const environments = ['msys', 'mingw64', 'clang64', 'ucrt64']
+
+        return environments.map(e => ({
+            id: `msys2-${e}`,
+            name: `MSYS2 (${e.toUpperCase()})`,
+            command: path.join(msys2Path, 'msys2_shell.cmd'),
+            args: ['-defterm', '-here', '-no-start', '-' + e],
+            icon: require('../icons/msys2.svg'),
+            env: {},
+        }))
+    }
+}

tabby-local/src/shells/windowsStock.ts

@@ -1,4 +1,7 @@
 import * as path from 'path'
+import * as fs from 'fs/promises'
+import hasbin from 'hasbin'
+import { promisify } from 'util'
 import { Injectable } from '@angular/core'
 import { HostAppService, Platform } from 'tabby-core'
 import { ElectronService } from 'tabby-electron'
@@ -59,7 +62,7 @@ export class WindowsStockShellsProvider extends ShellProvider {
             {
                 id: 'powershell',
                 name: 'PowerShell',
-                command: 'powershell.exe',
+                command: await this.getPowerShellPath(),
                 args: ['-nologo'],
                 icon: require('../icons/powershell.svg'),
                 env: {
@@ -68,4 +71,23 @@ export class WindowsStockShellsProvider extends ShellProvider {
             },
         ]
     }
+
+    private async getPowerShellPath () {
+        const ps = 'powershell.exe'
+
+        if (!await promisify(hasbin)(ps)) {
+            for (const searchPath of [
+                `${process.env.SystemRoot}\\System32\\WindowsPowerShell\\v1.0`,
+                `${process.env.SystemRoot}\\System32`,
+                process.env.SystemRoot ?? 'C:\\Windows',
+            ]) {
+                const newPath = path.join(searchPath, ps)
+                try {
+                    await fs.stat(newPath)
+                    return newPath
+                } catch { }
+            }
+        }
+        return ps
+    }
 }

tabby-local/yarn.lock

@@ -2,35 +2,15 @@
 # yarn lockfile v1
 
 
-"@types/deep-equal@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03"
-  integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==
-
 ansi-colors@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
-array-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
-  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
-
-available-typed-arrays@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
-  integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
-  dependencies:
-    array-filter "^1.0.0"
-
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+async@~1.5:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 connected-domain@^1.0.0:
   version "1.0.0"
@@ -42,287 +22,12 @@ dataurl@0.1.0:
   resolved "https://registry.yarnpkg.com/dataurl/-/dataurl-0.1.0.tgz#1f4734feddec05ffe445747978d86759c4b33199"
   integrity sha1-H0c0/t3sBf/kRXR5eNhnWcSzMZk=
 
-deep-equal@2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9"
-  integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==
-  dependencies:
-    call-bind "^1.0.0"
-    es-get-iterator "^1.1.1"
-    get-intrinsic "^1.0.1"
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.2"
-    is-regex "^1.1.1"
-    isarray "^2.0.5"
-    object-is "^1.1.4"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.3"
-    which-boxed-primitive "^1.0.1"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.2"
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.18.0-next.2:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
-  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    is-callable "^1.2.3"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.2"
-    is-string "^1.0.5"
-    object-inspect "^1.9.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.0"
-
-es-get-iterator@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7"
-  integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.0"
-    has-symbols "^1.0.1"
-    is-arguments "^1.1.0"
-    is-map "^2.0.2"
-    is-set "^2.0.2"
-    is-string "^1.0.5"
-    isarray "^2.0.5"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
-
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hterm-umdjs@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/hterm-umdjs/-/hterm-umdjs-1.4.1.tgz#0cd5352eaf927c70b83c36146cf2c2a281dba957"
-  integrity sha512-r5JOmdDK1bZCmp3cKcuGRLVeum33H+pzD119ZxmQou+QUVe6SAVSz03HvKWVhM2Ao1Biv+fkhFDmnsaRPq0tFg==
-
-is-arguments@^1.0.4, is-arguments@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
-  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
-  dependencies:
-    call-bind "^1.0.0"
-
-is-bigint@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
-  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
-
-is-boolean-object@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
-  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
-
-is-callable@^1.2.3:
+hasbin@^1.2.3:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
-  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
-
-is-date-object@^1.0.1, is-date-object@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
-  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
-
-is-map@^2.0.1, is-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
-  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
-
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
-
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-number-object@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
-  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
-
-is-regex@^1.1.1, is-regex@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
-  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
+  resolved "https://registry.yarnpkg.com/hasbin/-/hasbin-1.2.3.tgz#78c5926893c80215c2b568ae1fd3fcab7a2696b0"
+  integrity sha1-eMWSaJPIAhXCtWiuH9P8q3omlrA=
   dependencies:
-    call-bind "^1.0.2"
-    has-symbols "^1.0.2"
-
-is-set@^2.0.1, is-set@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
-  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
-
-is-string@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
-  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-typed-array@^1.1.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e"
-  integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==
-  dependencies:
-    available-typed-arrays "^1.0.2"
-    call-bind "^1.0.2"
-    es-abstract "^1.18.0-next.2"
-    foreach "^2.0.5"
-    has-symbols "^1.0.1"
-
-is-weakmap@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
-  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
-
-is-weakset@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
-  integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
-object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
-
-object-inspect@^1.9.0:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
-  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
-
-object-is@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.1, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
+    async "~1.5"
 
 opentype.js@^1.3.3:
   version "1.3.3"
@@ -339,65 +44,16 @@ ps-node@^0.1.6:
   dependencies:
     table-parser "^0.1.3"
 
-regexp.prototype.flags@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
 runes@^0.4.2:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/runes/-/runes-0.4.3.tgz#32f7738844bc767b65cc68171528e3373c7bb355"
   integrity sha512-K6p9y4ZyL9wPzA+PMDloNQPfoDGTiFYDvdlXznyGKgD10BJpcAosvATKrExRKOrNLgD8E7Um7WGW0lxsnOuNLg==
 
-side-channel@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
-  dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
-
 string.prototype.codepointat@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc"
   integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==
 
-string.prototype.trimend@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
-  integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
-  integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
 table-parser@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/table-parser/-/table-parser-0.1.3.tgz#0441cfce16a59481684c27d1b5a67ff15a43c7b0"
@@ -415,53 +71,9 @@ tinyqueue@^2.0.3:
   resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08"
   integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==
 
-unbox-primitive@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
 utils-decorators@^1.8.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/utils-decorators/-/utils-decorators-1.10.0.tgz#eb9208ccbb7fbb7488d5d04b2611df62c2fcaf4d"
   integrity sha512-wlNRoPCFdxSReLfmhNqkZsg8FqsKu9d5trdSELxBZCtmK4KPtSidxRg24+bpZQjEBBF0hUIQEFz2uM7sBDVG2Q==
   dependencies:
     tinyqueue "^2.0.3"
-
-which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-collection@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
-  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
-  dependencies:
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-weakmap "^2.0.1"
-    is-weakset "^2.0.1"
-
-which-typed-array@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
-  integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==
-  dependencies:
-    available-typed-arrays "^1.0.2"
-    call-bind "^1.0.0"
-    es-abstract "^1.18.0-next.1"
-    foreach "^2.0.5"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.1"
-    is-typed-array "^1.1.3"

tabby-plugin-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-plugin-manager",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Tabby's plugin manager",
   "keywords": [
     "tabby-builtin-plugin"

tabby-serial/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-serial",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Serial connections for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-settings",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Tabby terminal settings page",
   "keywords": [
     "tabby-builtin-plugin"
@@ -17,8 +17,7 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@types/deep-equal": "1.0.1",
-    "marked": "^2.1.3",
+    "marked": "^3.0.2",
     "ngx-infinite-scroll": "^10.0.1",
     "utils-decorators": "^1.8.0"
   },

tabby-settings/src/components/configSyncSettingsTab.component.pug

@@ -15,7 +15,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
                         (ngModelChange)='config.save()',
                     )
                     .input-group-append(*ngIf='config.store.configSync.host')
-                        button.btn.btn-secondary((click)='platform.openExternal("http://" + config.store.configSync.host)')
+                        button.btn.btn-secondary((click)='openSyncHost()')
                             i.fas.fa-external-link-alt
 
             .form-line
@@ -55,11 +55,11 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
                             *ngFor='let cfg of configs',
                             [class.active]='isActiveConfig(cfg)',
                         )
+                            i.fas.fa-fw.text-success([class.fa-check]='isActiveConfig(cfg)')
                             i.fas.fa-fw.fa-file
                             .ml-2.d-flex.flex-column.align-items-start
                                 div {{cfg.name}}
                                 small.text-muted Modified on {{cfg.modified_at|date:'medium'}}
-                                .badge.badge-info(*ngIf='isActiveConfig(cfg)') ACTIVE
                             .mr-auto
                             button.btn.btn-link.ml-1(
                                 (click)='uploadAndSync(cfg)',
@@ -78,6 +78,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
                             href='#',
                             (click)='uploadAsNew()'
                         )
+                            i.fas.fa-fw
                             i.fas.fa-fw.fa-cloud-upload-alt
                             .ml-2 Upload as a new config
 

tabby-settings/src/components/configSyncSettingsTab.component.ts

@@ -106,4 +106,12 @@ export class ConfigSyncSettingsTabComponent extends BaseComponent {
     isActiveConfig (c: Config) {
         return c.id === this.config.store.configSync.configID
     }
+
+    openSyncHost () {
+        if (this.config.store.configSync.host === 'https://api.tabby.sh') {
+            this.platform.openExternal('https://tabby.sh/app')
+        } else {
+            this.platform.openExternal(this.config.store.configSync.host)
+        }
+    }
 }

tabby-settings/src/components/editProfileModal.component.pug

@@ -1,10 +1,13 @@
-.modal-header
+.modal-header(*ngIf='!defaultsMode')
     h3.m-0 {{profile.name}}
 
+.modal-header(*ngIf='defaultsMode')
+    h3.m-0 Defaults for {{profileProvider.name}}
+
 .modal-body
     .row
         .col-12.col-lg-4
-            .form-group
+            .form-group(*ngIf='!defaultsMode')
                 label Name
                 input.form-control(
                     type='text',
@@ -12,7 +15,7 @@
                     [(ngModel)]='profile.name',
                 )
 
-            .form-group
+            .form-group(*ngIf='!defaultsMode')
                 label Group
                 input.form-control(
                     type='text',
@@ -22,7 +25,7 @@
                     [ngbTypeahead]='groupTypeahead',
                 )
 
-            .form-group
+            .form-group(*ngIf='!defaultsMode')
                 label Icon
                 .input-group
                     input.form-control(
@@ -46,7 +49,9 @@
                 input.form-control.w-50(
                     type='text',
                     [(ngModel)]='profile.color',
-                    placeholder='#000000'
+                    placeholder='#000000',
+                    [ngbTypeahead]='colorsAutocomplete',
+                    [resultFormatter]='colorsFormatter'
                 )
 
             .form-line

tabby-settings/src/components/editProfileModal.component.ts

@@ -2,7 +2,7 @@
 import { Observable, OperatorFunction, debounceTime, map, distinctUntilChanged } from 'rxjs'
 import { Component, Input, ViewChild, ViewContainerRef, ComponentFactoryResolver, Injector } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { ConfigProxy, ConfigService, Profile, ProfileProvider, ProfileSettingsComponent, ProfilesService } from 'tabby-core'
+import { ConfigProxy, ConfigService, Profile, ProfileProvider, ProfileSettingsComponent, ProfilesService, TAB_COLORS } from 'tabby-core'
 
 const iconsData = require('../../../tabby-core/src/icons.json')
 const iconsClassList = Object.keys(iconsData).map(
@@ -19,6 +19,7 @@ export class EditProfileModalComponent<P extends Profile> {
     @Input() profile: P & ConfigProxy
     @Input() profileProvider: ProfileProvider<P>
     @Input() settingsComponent: new () => ProfileSettingsComponent<P>
+    @Input() defaultsMode = false
     groupNames: string[]
     @ViewChild('placeholder', { read: ViewContainerRef }) placeholder: ViewContainerRef
 
@@ -39,9 +40,23 @@ export class EditProfileModalComponent<P extends Profile> {
         )].sort() as string[]
     }
 
+    colorsAutocomplete = text$ => text$.pipe(
+        debounceTime(200),
+        distinctUntilChanged(),
+        map((q: string) =>
+            TAB_COLORS
+                .filter(x => !q || x.name.toLowerCase().startsWith(q.toLowerCase()))
+                .map(x => x.value)
+        )
+    )
+
+    colorsFormatter = value => {
+        return TAB_COLORS.find(x => x.value === value)?.name ?? value
+    }
+
     ngOnInit () {
         this._profile = this.profile
-        this.profile = this.profilesService.getConfigProxyForProfile(this.profile)
+        this.profile = this.profilesService.getConfigProxyForProfile(this.profile, this.defaultsMode)
     }
 
     ngAfterViewInit () {

tabby-settings/src/components/profilesSettingsTab.component.pug

@@ -1,108 +1,127 @@
 h3.mb-3 Profiles
 
-.form-line
-    .header
-        .title Default profile for new tabs
+ul.nav-tabs(ngbNav, #nav='ngbNav')
+    li(ngbNavItem)
+        a(ngbNavLink) Profiles
+        ng-template(ngbNavContent)
+            .form-line
+                .header
+                    .title Default profile for new tabs
 
-    select.form-control(
-        [(ngModel)]='config.store.terminal.profile',
-        (ngModelChange)='config.save()',
-    )
-        option(
-            *ngFor='let profile of profiles',
-            [ngValue]='profile.id'
-        ) {{profile.name}}
-        option(
-            *ngFor='let profile of builtinProfiles',
-            [ngValue]='profile.id'
-        ) {{profile.name}}
-
-.form-line(*ngIf='config.store.profiles.length > 0')
-    .header
-        .title Show recent profiles in selector
-        .description Set to 0 to disable recent profiles
-
-    input.form-control(
-        type='number',
-        min='0',
-        step='1',
-        [(ngModel)]='config.store.terminal.showRecentProfiles',
-        (ngModelChange)='config.save()'
-    )
-
-.form-line(*ngIf='config.store.profiles.length > 0')
-    .header
-        .title Show built-in profiles in selector
-        .description If disabled, only custom profiles will show up in the profile selector
-
-    toggle(
-        [(ngModel)]='config.store.terminal.showBuiltinProfiles',
-        (ngModelChange)='config.save()'
-    )
-
-
-.d-flex.mb-3.mt-4
-    .input-group
-        .input-group-prepend
-            .input-group-text
-                i.fas.fa-fw.fa-search
-        input.form-control(type='search', placeholder='Filter', [(ngModel)]='filter')
-
-    button.btn.btn-primary.flex-shrink-0.ml-3((click)='newProfile()')
-        i.fas.fa-fw.fa-plus
-        | New profile
-
-.list-group.list-group-light.mt-3.mb-3
-    ng-container(*ngFor='let group of profileGroups')
-        ng-container(*ngIf='isGroupVisible(group)')
-            .list-group-item.list-group-item-action.d-flex.align-items-center(
-                (click)='group.collapsed = !group.collapsed'
-            )
-                .fa.fa-fw.fa-chevron-right(*ngIf='group.collapsed')
-                .fa.fa-fw.fa-chevron-down(*ngIf='!group.collapsed')
-                span.ml-3.mr-auto {{group.name || "Ungrouped"}}
-                button.btn.btn-sm.btn-link.hover-reveal.ml-2(
-                    *ngIf='group.editable && group.name',
-                    (click)='$event.stopPropagation(); editGroup(group)'
+                select.form-control(
+                    [(ngModel)]='config.store.terminal.profile',
+                    (ngModelChange)='config.save()',
                 )
-                    i.fas.fa-pencil-alt
-                button.btn.btn-sm.btn-link.hover-reveal.ml-2(
-                    *ngIf='group.editable && group.name',
-                    (click)='$event.stopPropagation(); deleteGroup(group)'
+                    option(
+                        *ngFor='let profile of profiles',
+                        [ngValue]='profile.id'
+                    ) {{profile.name}}
+                    option(
+                        *ngFor='let profile of builtinProfiles',
+                        [ngValue]='profile.id'
+                    ) {{profile.name}}
+
+            .d-flex.mb-3.mt-4
+                .input-group
+                    .input-group-prepend
+                        .input-group-text
+                            i.fas.fa-fw.fa-search
+                    input.form-control(type='search', placeholder='Filter', [(ngModel)]='filter')
+
+                button.btn.btn-primary.flex-shrink-0.ml-3((click)='newProfile()')
+                    i.fas.fa-fw.fa-plus
+                    | New profile
+
+            .list-group.list-group-light.mt-3.mb-3
+                ng-container(*ngFor='let group of profileGroups')
+                    ng-container(*ngIf='isGroupVisible(group)')
+                        .list-group-item.list-group-item-action.d-flex.align-items-center(
+                            (click)='group.collapsed = !group.collapsed'
+                        )
+                            .fa.fa-fw.fa-chevron-right(*ngIf='group.collapsed')
+                            .fa.fa-fw.fa-chevron-down(*ngIf='!group.collapsed')
+                            span.ml-3.mr-auto {{group.name || "Ungrouped"}}
+                            button.btn.btn-sm.btn-link.hover-reveal.ml-2(
+                                *ngIf='group.editable && group.name',
+                                (click)='$event.stopPropagation(); editGroup(group)'
+                            )
+                                i.fas.fa-pencil-alt
+                            button.btn.btn-sm.btn-link.hover-reveal.ml-2(
+                                *ngIf='group.editable && group.name',
+                                (click)='$event.stopPropagation(); deleteGroup(group)'
+                            )
+                                i.fas.fa-trash-alt
+                        ng-container(*ngIf='!group.collapsed')
+                            ng-container(*ngFor='let profile of group.profiles')
+                                .list-group-item.pl-5.d-flex.align-items-center(
+                                    *ngIf='isProfileVisible(profile)',
+                                    [class.list-group-item-action]='!profile.isBuiltin',
+                                    (click)='profile.isBuiltin ? null : editProfile(profile)'
+                                )
+                                    i.icon(
+                                        class='fa-fw {{profile.icon}}',
+                                        [style.color]='profile.color',
+                                        *ngIf='!iconIsSVG(profile.icon)'
+                                    )
+                                    .icon(
+                                        [fastHtmlBind]='profile.icon',
+                                        *ngIf='iconIsSVG(profile.icon)'
+                                    )
+
+                                    div {{profile.name}}
+                                    .text-muted.ml-2 {{getDescription(profile)}}
+
+                                    .mr-auto
+
+                                    button.btn.btn-link.hover-reveal.ml-1((click)='$event.stopPropagation(); launchProfile(profile)')
+                                        i.fas.fa-play
+
+                                    button.btn.btn-link.hover-reveal.ml-1((click)='$event.stopPropagation(); newProfile(profile)')
+                                        i.fas.fa-copy
+
+                                    button.btn.btn-link.hover-reveal.ml-1(
+                                        *ngIf='!profile.isBuiltin',
+                                        (click)='$event.stopPropagation(); deleteProfile(profile)'
+                                    )
+                                        i.fas.fa-trash-alt
+
+                                    .ml-1(class='badge badge-{{getTypeColorClass(profile)}}') {{getTypeLabel(profile)}}
+
+    li(ngbNavItem)
+        a(ngbNavLink) Advanced
+        ng-template(ngbNavContent)
+            .form-line(*ngIf='config.store.profiles.length > 0')
+                .header
+                    .title Show recent profiles in selector
+                    .description Set to 0 to disable recent profiles
+
+                input.form-control(
+                    type='number',
+                    min='0',
+                    step='1',
+                    [(ngModel)]='config.store.terminal.showRecentProfiles',
+                    (ngModelChange)='config.save()'
                 )
-                    i.fas.fa-trash-alt
-            ng-container(*ngIf='!group.collapsed')
-                ng-container(*ngFor='let profile of group.profiles')
-                    .list-group-item.pl-5.d-flex.align-items-center(
-                        *ngIf='isProfileVisible(profile)',
-                        [class.list-group-item-action]='!profile.isBuiltin',
-                        (click)='profile.isBuiltin ? null : editProfile(profile)'
-                    )
-                        i.icon(
-                            class='fa-fw {{profile.icon}}',
-                            [style.color]='profile.color',
-                            *ngIf='!iconIsSVG(profile.icon)'
-                        )
-                        .icon(
-                            [fastHtmlBind]='profile.icon',
-                            *ngIf='iconIsSVG(profile.icon)'
-                        )
 
-                        div {{profile.name}}
-                        .text-muted.ml-2 {{getDescription(profile)}}
+            .form-line(*ngIf='config.store.profiles.length > 0')
+                .header
+                    .title Show built-in profiles in selector
+                    .description If disabled, only custom profiles will show up in the profile selector
 
-                        .mr-auto
+                toggle(
+                    [(ngModel)]='config.store.terminal.showBuiltinProfiles',
+                    (ngModelChange)='config.save()'
+                )
 
-                        button.btn.btn-link.hover-reveal.ml-1((click)='$event.stopPropagation(); launchProfile(profile)')
-                            i.fas.fa-play
+            .form-line
+                .header
+                    .title Default profile settings
+                    .description These apply to all profiles of a given type
 
-                        button.btn.btn-link.hover-reveal.ml-1((click)='$event.stopPropagation(); newProfile(profile)')
-                            i.fas.fa-copy
+            .list-group.list-group-light.mt-3.mb-3
+                a.list-group-item.list-group-item-action(
+                    (click)='editDefaults(provider)',
+                    *ngFor='let provider of profileProviders'
+                ) {{provider.name}}
 
-                        button.btn.btn-link.hover-reveal.ml-1(
-                            *ngIf='!profile.isBuiltin',
-                            (click)='$event.stopPropagation(); deleteProfile(profile)'
-                        )
-                            i.fas.fa-trash-alt
-
-                        .ml-1(class='badge badge-{{getTypeColorClass(profile)}}') {{getTypeLabel(profile)}}
+div([ngbNavOutlet]='nav')

tabby-settings/src/components/profilesSettingsTab.component.ts

@@ -1,9 +1,9 @@
 import { v4 as uuidv4 } from 'uuid'
 import slugify from 'slugify'
 import deepClone from 'clone-deep'
-import { Component } from '@angular/core'
+import { Component, Inject } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { ConfigService, HostAppService, Profile, SelectorService, ProfilesService, PromptModalComponent, PlatformService, BaseComponent, PartialProfile } from 'tabby-core'
+import { ConfigService, HostAppService, Profile, SelectorService, ProfilesService, PromptModalComponent, PlatformService, BaseComponent, PartialProfile, ProfileProvider } from 'tabby-core'
 import { EditProfileModalComponent } from './editProfileModal.component'
 
 interface ProfileGroup {
@@ -28,12 +28,14 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
     constructor (
         public config: ConfigService,
         public hostApp: HostAppService,
+        @Inject(ProfileProvider) public profileProviders: ProfileProvider<Profile>[],
         private profilesService: ProfilesService,
         private selector: SelectorService,
         private ngbModal: NgbModal,
         private platform: PlatformService,
     ) {
         super()
+        this.profileProviders.sort((a, b) => a.name.localeCompare(b.name))
     }
 
     async ngOnInit (): Promise<void> {
@@ -92,8 +94,12 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
             EditProfileModalComponent,
             { size: 'lg' },
         )
+        const provider = this.profilesService.providerForProfile(profile)
+        if (!provider) {
+            throw new Error('Cannot edit a profile without a provider')
+        }
         modal.componentInstance.profile = Object.assign({}, profile)
-        modal.componentInstance.profileProvider = this.profilesService.providerForProfile(profile)
+        modal.componentInstance.profileProvider = provider
         const result = await modal.result
 
         // Fully replace the config
@@ -102,6 +108,8 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
             delete profile[k]
         }
         Object.assign(profile, result)
+
+        profile.type = provider.id
     }
 
     async deleteProfile (profile: PartialProfile<Profile>): Promise<void> {
@@ -224,4 +232,26 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
             'split-layout': 'primary',
         }[this.profilesService.providerForProfile(profile)?.id ?? ''] ?? 'warning'
     }
+
+    async editDefaults (provider: ProfileProvider<Profile>): Promise<void> {
+        const modal = this.ngbModal.open(
+            EditProfileModalComponent,
+            { size: 'lg' },
+        )
+        const model = this.config.store.profileDefaults[provider.id] ?? {}
+        model.type = provider.id
+        modal.componentInstance.profile = Object.assign({}, model)
+        modal.componentInstance.profileProvider = provider
+        modal.componentInstance.defaultsMode = true
+        const result = await modal.result
+
+        // Fully replace the config
+        for (const k in model) {
+            // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+            delete model[k]
+        }
+        Object.assign(model, result)
+        this.config.store.profileDefaults[provider.id] = model
+        await this.config.save()
+    }
 }

tabby-settings/yarn.lock

@@ -7,15 +7,10 @@
   resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.1.1.tgz#d8b9f20037b3a37dbf8dcdc4b3b72f9285bfce35"
   integrity sha512-VGbKDbk1RFIaSmdVb0cNjjWJoRWRI/Weo23AjRCC2nryO0iAS8pzsToJfPVPtVs74WHw4L1UTADNdIYRLkirZQ==
 
-"@types/deep-equal@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03"
-  integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==
-
-marked@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753"
-  integrity sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==
+marked@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-3.0.2.tgz#60ce97d6aec34dd882ab4bb4df82494666854e17"
+  integrity sha512-TMJQQ79Z0e3rJYazY0tIoMsFzteUGw9fB3FD+gzuIT3zLuG9L9ckIvUfF51apdJkcqc208jJN2KbtPbOvXtbjA==
 
 ngx-infinite-scroll@^10.0.1:
   version "10.0.1"

tabby-ssh/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-ssh",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "SSH connections for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-ssh/src/components/keyboardInteractiveAuthPanel.component.pug

@@ -0,0 +1,26 @@
+.d-flex
+    strong Keyboard-interactive auth
+    .ml-2 {{prompt.name}}
+
+.prompt-text {{prompt.prompts[step]}}
+
+input.form-control.mt-2(
+    #input,
+    autofocus,
+    [type]='isPassword() ? "password": "text"',
+    placeholder='Response',
+    (keyup.enter)='next()',
+    [(ngModel)]='prompt.responses[step]'
+)
+
+.d-flex.mt-3
+    button.btn.btn-secondary(
+        *ngIf='step > 0',
+        (click)='previous()'
+    )
+    .ml-auto
+    button.btn.btn-primary(
+        (click)='next()'
+    )
+        span(*ngIf='step < prompt.prompts.length - 1') Next
+        span(*ngIf='step == prompt.prompts.length - 1') Finish

tabby-ssh/src/components/keyboardInteractiveAuthPanel.component.scss

@@ -0,0 +1,9 @@
+:host {
+    display: flex;
+    flex-direction: column;
+    padding: 15px 20px;
+}
+
+.prompt-text {
+    white-space: pre-wrap;
+}

tabby-ssh/src/components/keyboardInteractiveAuthPanel.component.ts

@@ -0,0 +1,37 @@
+import { Component, Input, Output, EventEmitter, ViewChild, ElementRef, ChangeDetectionStrategy } from '@angular/core'
+import { KeyboardInteractivePrompt } from '../session/ssh'
+
+
+@Component({
+    selector: 'keyboard-interactive-auth-panel',
+    template: require('./keyboardInteractiveAuthPanel.component.pug'),
+    styles: [require('./keyboardInteractiveAuthPanel.component.scss')],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class KeyboardInteractiveAuthComponent {
+    @Input() prompt: KeyboardInteractivePrompt
+    @Input() step = 0
+    @Output() done = new EventEmitter()
+    @ViewChild('input') input: ElementRef
+
+    isPassword (): boolean {
+        return this.prompt.prompts[this.step].toLowerCase().includes('password')
+    }
+
+    previous (): void {
+        if (this.step > 0) {
+            this.step--
+        }
+        this.input.nativeElement.focus()
+    }
+
+    next (): void {
+        if (this.step === this.prompt.prompts.length - 1) {
+            this.prompt.respond()
+            this.done.emit()
+            return
+        }
+        this.step++
+        this.input.nativeElement.focus()
+    }
+}

tabby-ssh/src/components/sftpPanel.component.pug

@@ -16,7 +16,7 @@
     div(*ngIf='!sftp') Connecting
     div(*ngIf='sftp')
         div(*ngIf='fileList === null') Loading
-        .list-group.list-group-light(*ngIf='fileList !== null')
+        .list-group.list-group-flush(*ngIf='fileList !== null')
             .list-group-item.list-group-item-action.d-flex.align-items-center(
                 *ngIf='path !== "/"',
                 (click)='goUp()'

tabby-ssh/src/components/sftpPanel.component.ts

@@ -34,7 +34,12 @@ export class SFTPPanelComponent {
 
     async ngOnInit (): Promise<void> {
         this.sftp = await this.session.openSFTP()
-        await this.navigate(this.path)
+        try {
+            await this.navigate(this.path)
+        } catch (error) {
+            console.warn('Could not navigate to', this.path, ':', error)
+            await this.navigate('/')
+        }
     }
 
     async navigate (newPath: string): Promise<void> {
@@ -96,7 +101,7 @@ export class SFTPPanelComponent {
     }
 
     async uploadOne (transfer: FileUpload): Promise<void> {
-        this.sftp.upload(path.join(this.path, transfer.getName()), transfer)
+        await this.sftp.upload(path.join(this.path, transfer.getName()), transfer)
         const savedPath = this.path
         if (this.path === savedPath) {
             await this.navigate(this.path)

tabby-ssh/src/components/sshProfileSettings.component.ts

@@ -2,7 +2,7 @@
 import { Component, ViewChild } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
-import { ConfigService, FileProvidersService, Platform, HostAppService, PromptModalComponent } from 'tabby-core'
+import { ConfigService, FileProvidersService, Platform, HostAppService, PromptModalComponent, PartialProfile } from 'tabby-core'
 import { LoginScriptsSettingsComponent } from 'tabby-terminal'
 import { PasswordStorageService } from '../services/passwordStorage.service'
 import { ForwardedPortConfig, SSHAlgorithmType, SSHProfile } from '../api'
@@ -20,7 +20,7 @@ export class SSHProfileSettingsComponent {
 
     supportedAlgorithms = supportedAlgorithms
     algorithms: Record<string, Record<string, boolean>> = {}
-    jumpHosts: SSHProfile[]
+    jumpHosts: PartialProfile<SSHProfile>[]
     @ViewChild('loginScriptsSettings') loginScriptsSettings: LoginScriptsSettingsComponent|null
 
     constructor (

tabby-ssh/src/components/sshTab.component.pug

@@ -45,3 +45,10 @@ sftp-panel.bg-dark(
     [session]='session',
     (closed)='sftpPanelVisible = false'
 )
+
+keyboard-interactive-auth-panel.bg-dark(
+    *ngIf='activeKIPrompt',
+    [prompt]='activeKIPrompt',
+    (click)='$event.stopPropagation()',
+    (done)='activeKIPrompt = null; frontend.focus()'
+)

tabby-ssh/src/components/sshTab.component.ts

@@ -2,10 +2,10 @@ import colors from 'ansi-colors'
 import { Component, Injector, HostListener } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { first } from 'rxjs'
-import { Platform, RecoveryToken } from 'tabby-core'
+import { PartialProfile, Platform, ProfilesService, RecoveryToken } from 'tabby-core'
 import { BaseTerminalTabComponent } from 'tabby-terminal'
 import { SSHService } from '../services/ssh.service'
-import { SSHSession } from '../session/ssh'
+import { KeyboardInteractivePrompt, SSHSession } from '../session/ssh'
 import { SSHPortForwardingModalComponent } from './sshPortForwardingModal.component'
 import { SSHProfile } from '../api'
 
@@ -24,6 +24,7 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
     sftpPanelVisible = false
     sftpPath = '/'
     enableToolbar = true
+    activeKIPrompt: KeyboardInteractivePrompt|null = null
     private sessionStack: SSHSession[] = []
     private recentInputs = ''
     private reconnectOffered = false
@@ -32,8 +33,12 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
         injector: Injector,
         public ssh: SSHService,
         private ngbModal: NgbModal,
+        private profilesService: ProfilesService,
     ) {
         super(injector)
+        this.sessionChanged$.subscribe(() => {
+            this.activeKIPrompt = null
+        })
     }
 
     ngOnInit (): void {
@@ -78,13 +83,16 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
 
     async setupOneSession (session: SSHSession): Promise<void> {
         if (session.profile.options.jumpHost) {
-            const jumpConnection: SSHProfile|null = this.config.store.profiles.find(x => x.id === session.profile.options.jumpHost)
+            const jumpConnection: PartialProfile<SSHProfile>|null = this.config.store.profiles.find(x => x.id === session.profile.options.jumpHost)
 
             if (!jumpConnection) {
                 throw new Error(`${session.profile.options.host}: jump host "${session.profile.options.jumpHost}" not found in your config`)
             }
 
-            const jumpSession = new SSHSession(this.injector, jumpConnection)
+            const jumpSession = new SSHSession(
+                this.injector,
+                this.profilesService.getConfigProxyForProfile(jumpConnection)
+            )
 
             await this.setupOneSession(jumpSession)
 
@@ -122,6 +130,17 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
             session.resize(this.size.columns, this.size.rows)
         })
 
+        this.attachSessionHandler(session.destroyed$, () => {
+            this.activeKIPrompt = null
+        })
+
+        this.attachSessionHandler(session.keyboardInteractivePrompt$, prompt => {
+            this.activeKIPrompt = prompt
+            setTimeout(() => {
+                this.frontend?.scrollToBottom()
+            })
+        })
+
         try {
             await this.ssh.connectSession(session)
             this.stopSpinner()

tabby-ssh/src/config.ts

@@ -10,7 +10,6 @@ export class SSHConfigProvider extends ConfigProvider {
             agentPath: null,
         },
         hotkeys: {
-            'ssh-profile-selector': [],
             'restart-ssh-session': [],
             'launch-winscp': [],
         },

tabby-ssh/src/hotkeys.ts

@@ -5,10 +5,6 @@ import { HotkeyDescription, HotkeyProvider } from 'tabby-core'
 @Injectable()
 export class SSHHotkeyProvider extends HotkeyProvider {
     hotkeys: HotkeyDescription[] = [
-        {
-            id: 'ssh-profile-selector',
-            name: 'Show SSH profile selector',
-        },
         {
             id: 'restart-ssh-session',
             name: 'Restart current SSH session',

tabby-ssh/src/index.ts

@@ -4,8 +4,8 @@ import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { ToastrModule } from 'ngx-toastr'
 import { NgxFilesizeModule } from 'ngx-filesize'
-import TabbyCoreModule, { ConfigProvider, TabRecoveryProvider, HotkeyProvider, TabContextMenuItemProvider, ProfileProvider, HotkeysService, ProfilesService, AppService, SelectorService, SelectorOption } from 'tabby-core'
-import { SettingsTabComponent, SettingsTabProvider } from 'tabby-settings'
+import TabbyCoreModule, { ConfigProvider, TabRecoveryProvider, HotkeyProvider, TabContextMenuItemProvider, ProfileProvider } from 'tabby-core'
+import { SettingsTabProvider } from 'tabby-settings'
 import TabbyTerminalModule from 'tabby-terminal'
 
 import { SSHProfileSettingsComponent } from './components/sshProfileSettings.component'
@@ -15,6 +15,7 @@ import { SSHSettingsTabComponent } from './components/sshSettingsTab.component'
 import { SSHTabComponent } from './components/sshTab.component'
 import { SFTPPanelComponent } from './components/sftpPanel.component'
 import { SFTPDeleteModalComponent } from './components/sftpDeleteModal.component'
+import { KeyboardInteractiveAuthComponent } from './components/keyboardInteractiveAuthPanel.component'
 
 import { SSHConfigProvider } from './config'
 import { SSHSettingsTabProvider } from './settings'
@@ -60,54 +61,11 @@ import { CommonSFTPContextMenu } from './sftpContextMenu'
         SSHSettingsTabComponent,
         SSHTabComponent,
         SFTPPanelComponent,
+        KeyboardInteractiveAuthComponent,
     ],
 })
-export default class SSHModule {
-    constructor (
-        hotkeys: HotkeysService,
-        private app: AppService,
-        private selector: SelectorService,
-        private profilesService: ProfilesService,
-        private sshProfiles: SSHProfilesService,
-    ) {
-        hotkeys.hotkey$.subscribe(hotkey => {
-            if (hotkey === 'ssh-profile-selector') {
-                this.showSelector()
-            }
-        })
-    }
-
-    async showSelector (): Promise<void> {
-        let profiles = await this.profilesService.getProfiles()
-
-        profiles = profiles.filter(x => !x.isTemplate && x.type === 'ssh')
-
-        const options: SelectorOption<void>[] = profiles.map(p => ({
-            ...this.profilesService.selectorOptionForProfile(p),
-            callback: () => this.profilesService.openNewTabForProfile(p),
-        }))
-
-        options.push({
-            name: 'Manage profiles',
-            icon: 'fas fa-window-restore',
-            callback: () => this.app.openNewTabRaw({
-                type: SettingsTabComponent,
-                inputs: { activeTab: 'profiles' },
-            }),
-        })
-
-        options.push({
-            name: 'Quick connect',
-            freeInputPattern: 'Connect to "%s"...',
-            icon: 'fas fa-arrow-right',
-            callback: query => this.profilesService.openNewTabForProfile(
-                this.sshProfiles.quickConnect(query)
-            ),
-        })
-
-        await this.selector.show('Select an SSH profile', options)
-    }
-}
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export default class SSHModule { }
 
 export * from './api'
 export { SFTPFile, SFTPSession } from './session/sftp'

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

@@ -1,13 +1,13 @@
 import colors from 'ansi-colors'
+import * as shellQuote from 'shell-quote'
 import { Duplex } from 'stream'
 import { Injectable, NgZone } from '@angular/core'
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { Client } from 'ssh2'
-import { exec } from 'child_process'
+import { spawn } from 'child_process'
 import { ChildProcess } from 'node:child_process'
 import { Subject, Observable } from 'rxjs'
-import { Logger, LogService, ConfigService, NotificationsService, HostAppService, Platform, PlatformService, PromptModalComponent } from 'tabby-core'
-import { SSHSession } from '../session/ssh'
+import { Logger, LogService, ConfigService, NotificationsService, HostAppService, Platform, PlatformService } from 'tabby-core'
+import { KeyboardInteractivePrompt, SSHSession } from '../session/ssh'
 import { ForwardedPort } from '../session/forwards'
 import { ALGORITHM_BLACKLIST, SSHAlgorithmType, SSHProfile } from '../api'
 import { PasswordStorageService } from './passwordStorage.service'
@@ -20,7 +20,6 @@ export class SSHService {
     private constructor (
         log: LogService,
         private zone: NgZone,
-        private ngbModal: NgbModal,
         private passwordStorage: PasswordStorageService,
         private notifications: NotificationsService,
         private config: ConfigService,
@@ -82,22 +81,12 @@ export class SSHService {
             })
 
             ssh.on('keyboard-interactive', (name, instructions, instructionsLang, prompts, finish) => this.zone.run(async () => {
-                log(colors.bgBlackBright(' ') + ` Keyboard-interactive auth requested: ${name}`)
-                this.logger.info('Keyboard-interactive auth:', name, instructions, instructionsLang)
-                const results: string[] = []
-                for (const prompt of prompts) {
-                    const modal = this.ngbModal.open(PromptModalComponent)
-                    modal.componentInstance.prompt = prompt.prompt
-                    modal.componentInstance.password = !prompt.echo
-
-                    try {
-                        const result = await modal.result
-                        results.push(result ? result.value : '')
-                    } catch {
-                        results.push('')
-                    }
-                }
-                finish(results)
+                session.emitKeyboardInteractivePrompt(new KeyboardInteractivePrompt(
+                    name,
+                    instructions,
+                    prompts.map(x => x.prompt),
+                    finish,
+                ))
             }))
 
             ssh.on('greeting', greeting => {
@@ -118,6 +107,11 @@ export class SSHService {
                 session.emitServiceMessage(colors.bgBlue.black(' Proxy command ') + ` Using ${session.profile.options.proxyCommand}`)
                 session.proxyCommandStream = new ProxyCommandStream(session.profile.options.proxyCommand)
 
+                session.proxyCommandStream.on('error', err => {
+                    session.emitServiceMessage(colors.bgRed.black(' X ') + ` ${err.message}`)
+                    session.destroy()
+                })
+
                 session.proxyCommandStream.output$.subscribe((message: string) => {
                     session.emitServiceMessage(colors.bgBlue.black(' Proxy command ') + ' ' + message.trim())
                 })
@@ -198,9 +192,13 @@ export class ProxyCommandStream extends Duplex {
     }
 
     async start (): Promise<void> {
-        this.process = exec(this.command, {
+        const argv = shellQuote.parse(this.command)
+        this.process = spawn(argv[0], argv.slice(1), {
             windowsHide: true,
-            encoding: 'buffer',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        })
+        this.process.on('error', error => {
+            this.destroy(new Error(`Proxy command has failed to start: ${error.message}`))
         })
         this.process.on('exit', code => {
             this.destroy(new Error(`Proxy command has exited with code ${code}`))
@@ -217,7 +215,7 @@ export class ProxyCommandStream extends Duplex {
     }
 
     _read (size: number): void {
-        process.stdout.read(size)
+        this.process.stdout?.read(size)
     }
 
     _write (chunk: Buffer, _encoding: string, callback: (error?: Error | null) => void): void {

tabby-ssh/src/session/sftp.ts

@@ -146,7 +146,9 @@ export class SFTPSession {
                 await handle.write(chunk)
             }
             handle.close()
-            await this.unlink(path)
+            try {
+                await this.unlink(path)
+            } catch { }
             await this.rename(tempPath, path)
             transfer.close()
         } catch (e) {

tabby-ssh/src/session/ssh.ts

@@ -27,6 +27,21 @@ interface AuthMethod {
     contents?: Buffer
 }
 
+export class KeyboardInteractivePrompt {
+    responses: string[] = []
+
+    constructor (
+        public name: string,
+        public instruction: string,
+        public prompts: string[],
+        private callback: (_: string[]) => void,
+    ) { }
+
+    respond (): void {
+        this.callback(this.responses)
+    }
+}
+
 export class SSHSession extends BaseSession {
     shell?: ClientChannel
     ssh: Client
@@ -36,12 +51,14 @@ export class SSHSession extends BaseSession {
     proxyCommandStream: ProxyCommandStream|null = null
     savedPassword?: string
     get serviceMessage$ (): Observable<string> { return this.serviceMessage }
+    get keyboardInteractivePrompt$ (): Observable<KeyboardInteractivePrompt> { return this.keyboardInteractivePrompt }
 
     agentPath?: string
     activePrivateKey: string|null = null
 
     private remainingAuthMethods: AuthMethod[] = []
     private serviceMessage = new Subject<string>()
+    private keyboardInteractivePrompt = new Subject<KeyboardInteractivePrompt>()
     private keychainPasswordUsed = false
 
     private passwordStorage: PasswordStorageService
@@ -143,11 +160,6 @@ export class SSHSession extends BaseSession {
     async start (): Promise<void> {
         this.open = true
 
-        this.proxyCommandStream?.on('error', err => {
-            this.emitServiceMessage(colors.bgRed.black(' X ') + ` ${err.message}`)
-            this.destroy()
-        })
-
         try {
             this.shell = await this.openShellChannel({ x11: this.profile.options.x11 })
         } catch (err) {
@@ -251,6 +263,17 @@ export class SSHSession extends BaseSession {
         this.logger.info(stripAnsi(msg))
     }
 
+    emitKeyboardInteractivePrompt (prompt: KeyboardInteractivePrompt): void {
+        this.logger.info('Keyboard-interactive auth:', prompt.name, prompt.instruction)
+        this.emitServiceMessage(colors.bgBlackBright(' ') + ` Keyboard-interactive auth requested: ${prompt.name}`)
+        if (prompt.instruction) {
+            for (const line of prompt.instruction.split('\n')) {
+                this.emitServiceMessage(line)
+            }
+        }
+        this.keyboardInteractivePrompt.next(prompt)
+    }
+
     async handleAuth (methodsLeft?: string[] | null): Promise<any> {
         this.activePrivateKey = null
 

tabby-ssh/yarn.lock

@@ -15,9 +15,9 @@
     "@types/node" "*"
 
 "@types/ssh2@^0.5.46":
-  version "0.5.47"
-  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.47.tgz#67a8b35a0527b2bb668f6dea4c84be6ff1abdc19"
-  integrity sha512-ZhqJg8BRV7OsCi0KVqPr27lUMMmLEeHYw1VXUNGGDlQEDq9HTsKx+wYvi8E6oNC6gRZ7PV99ZMZmMr5vztcYYA==
+  version "0.5.48"
+  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.48.tgz#0d9e8654a76eaaf4cfeaeb88d74c4489cfcf7aea"
+  integrity sha512-cmQu0gp/6RtDXe1r2xXGgi0V0TeCdueDSRMEvBX8cTRT/sSREkUpgCYZLyh+iI8Ql+VNV8Az9toQoYa/IdgHbQ==
   dependencies:
     "@types/node" "*"
     "@types/ssh2-streams" "*"

tabby-telnet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-telnet",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Telnet/socket connections for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-telnet/src/config.ts

@@ -4,7 +4,6 @@ import { ConfigProvider } from 'tabby-core'
 export class TelnetConfigProvider extends ConfigProvider {
     defaults = {
         hotkeys: {
-            'telnet-profile-selector': [],
             'restart-telnet-session': [],
         },
     }

tabby-telnet/src/hotkeys.ts

@@ -5,10 +5,6 @@ import { HotkeyDescription, HotkeyProvider } from 'tabby-core'
 @Injectable()
 export class TelnetHotkeyProvider extends HotkeyProvider {
     hotkeys: HotkeyDescription[] = [
-        {
-            id: 'telnet-profile-selector',
-            name: 'Show Telnet profile selector',
-        },
         {
             id: 'restart-telnet-session',
             name: 'Restart current Telnet session',

tabby-telnet/src/index.ts

@@ -4,9 +4,8 @@ import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { ToastrModule } from 'ngx-toastr'
 import { NgxFilesizeModule } from 'ngx-filesize'
-import TabbyCoreModule, { ConfigProvider, TabRecoveryProvider, HotkeyProvider, ProfileProvider, HotkeysService, AppService, SelectorService, ProfilesService, SelectorOption } from 'tabby-core'
+import TabbyCoreModule, { ConfigProvider, TabRecoveryProvider, HotkeyProvider, ProfileProvider } from 'tabby-core'
 import TabbyTerminalModule from 'tabby-terminal'
-import { SettingsTabComponent } from 'tabby-settings'
 
 import { TelnetProfileSettingsComponent } from './components/telnetProfileSettings.component'
 import { TelnetTabComponent } from './components/telnetTab.component'
@@ -42,49 +41,5 @@ import { TelnetProfilesService } from './profiles'
         TelnetTabComponent,
     ],
 })
-export default class TelnetModule {
-    constructor (
-        hotkeys: HotkeysService,
-        private app: AppService,
-        private selector: SelectorService,
-        private profilesService: ProfilesService,
-        private telnetProfiles: TelnetProfilesService,
-    ) {
-        hotkeys.hotkey$.subscribe(hotkey => {
-            if (hotkey === 'telnet-profile-selector') {
-                this.showSelector()
-            }
-        })
-    }
-
-    async showSelector (): Promise<void> {
-        let profiles = await this.profilesService.getProfiles()
-
-        profiles = profiles.filter(x => !x.isTemplate && x.type === 'telnet')
-
-        const options: SelectorOption<void>[] = profiles.map(p => ({
-            ...this.profilesService.selectorOptionForProfile(p),
-            callback: () => this.profilesService.openNewTabForProfile(p),
-        }))
-
-        options.push({
-            name: 'Manage profiles',
-            icon: 'fas fa-window-restore',
-            callback: () => this.app.openNewTabRaw({
-                type: SettingsTabComponent,
-                inputs: { activeTab: 'profiles' },
-            }),
-        })
-
-        options.push({
-            name: 'Quick connect',
-            freeInputPattern: 'Connect to "%s"...',
-            icon: 'fas fa-arrow-right',
-            callback: query => this.profilesService.openNewTabForProfile(
-                this.telnetProfiles.quickConnect(query)
-            ),
-        })
-
-        await this.selector.show('Select an Telnet profile', options)
-    }
-}
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export default class TelnetModule { }

tabby-telnet/src/session.ts

@@ -170,11 +170,13 @@ export class TelnetSession extends BaseSession {
                 }
                 if (command === TelnetCommands.DO) {
                     if (option === TelnetOptions.NEGO_WINDOW_SIZE) {
-                        this.resize(0, 0)
+                        this.emitSize()
+                        this.emitTelnet(TelnetCommands.WILL, option)
                     } else if (option === TelnetOptions.ECHO) {
                         this.echoEnabled = true
                         this.emitTelnet(TelnetCommands.WILL, option)
                     } else if (option === TelnetOptions.TERMINAL_TYPE) {
+                        this.emitTelnet(TelnetCommands.WILL, option)
                         this.emitTelnetSuboption(option, Buffer.from([0, ...Buffer.from('XTERM-256COLOR')]))
                     } else {
                         this.logger.debug('(!) Unhandled option')
@@ -210,10 +212,18 @@ export class TelnetSession extends BaseSession {
             this.lastHeight = h
         }
         if (this.lastWidth && this.lastHeight && this.telnetProtocol) {
+            this.emitSize()
+        }
+    }
+
+    private emitSize () {
+        if (this.lastWidth && this.lastHeight) {
             this.emitTelnetSuboption(TelnetOptions.NEGO_WINDOW_SIZE, Buffer.from([
                 this.lastWidth >> 8, this.lastWidth & 0xff,
                 this.lastHeight >> 8, this.lastHeight & 0xff,
             ]))
+        } else {
+            this.emitTelnet(TelnetCommands.WONT, TelnetOptions.NEGO_WINDOW_SIZE)
         }
     }
 

tabby-terminal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-terminal",
-  "version": "1.0.150",
+  "version": "1.0.156",
   "description": "Tabby's terminal emulation core",
   "keywords": [
     "tabby-builtin-plugin"
@@ -17,28 +17,25 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "dependencies": {
-    "hterm-umdjs": "1.4.1",
     "opentype.js": "^1.3.3"
   },
   "devDependencies": {
-    "@types/deep-equal": "^1.0.0",
     "ansi-colors": "^4.1.1",
     "binstring": "^0.2.1",
     "buffer-replace": "^1.0.0",
     "cli-spinner": "^0.2.10",
     "dataurl": "0.1.0",
-    "deep-equal": "2.0.5",
     "hexer": "^1.5.0",
     "ps-node": "^0.1.6",
     "runes": "^0.4.2",
     "utils-decorators": "^1.8.1",
-    "xterm": "^4.9.0-beta.7",
+    "xterm": "npm:@tabby-gang/xterm@4.14.0",
     "xterm-addon-fit": "^0.5.0",
     "xterm-addon-ligatures": "^0.5.0",
-    "xterm-addon-search": "^0.8.0",
-    "xterm-addon-serialize": "^0.5.0",
-    "xterm-addon-unicode11": "^0.2.0",
-    "xterm-addon-webgl": "^0.11.0",
+    "xterm-addon-search": "^0.8.1",
+    "xterm-addon-serialize": "^0.6.0",
+    "xterm-addon-unicode11": "^0.3.0",
+    "xterm-addon-webgl": "^0.11.2",
     "zmodem.js": "^0.1.9"
   },
   "peerDependencies": {

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

@@ -127,10 +127,15 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
     private termContainerSubscriptions = new SubscriptionContainer()
     private allFocusModeSubscription: Subscription|null = null
     private sessionHandlers = new SubscriptionContainer()
-    private sessionSupportsBracketedPaste = false
     private spinner = new Spinner({
         stream: {
-            write: x => this.writeRaw(x),
+            write: x => {
+                try {
+                    this.writeRaw(x)
+                } catch {
+                    this.spinner.stop()
+                }
+            },
         },
     })
     private spinnerActive = false
@@ -412,19 +417,12 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
             }
         }
 
-        if (data.includes('\x1b[?2004h')) {
-            this.sessionSupportsBracketedPaste = true
-        }
-        if (data.includes('\x1b[?2004l')) {
-            this.sessionSupportsBracketedPaste = false
-        }
-
         this.frontend.write(data)
     }
 
     async paste (): Promise<void> {
         let data = this.platform.readClipboard()
-        if (this.config.store.terminal.bracketedPaste && this.sessionSupportsBracketedPaste) {
+        if (this.config.store.terminal.bracketedPaste && this.frontend?.supportsBracketedPaste()) {
             data = `\x1b[200~${data}\x1b[201~`
         }
         if (this.hostApp.platform === Platform.Windows) {
@@ -594,7 +592,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
         this.termContainerSubscriptions.subscribe(this.focused$, () => this.frontend && (this.frontend.enableResizing = true))
         this.termContainerSubscriptions.subscribe(this.blurred$, () => this.frontend && (this.frontend.enableResizing = false))
 
-        this.termContainerSubscriptions.subscribe(this.frontend.mouseEvent$, async event => {
+        this.termContainerSubscriptions.subscribe(this.frontend.mouseEvent$, event => {
             if (event.type === 'mousedown') {
                 if (event.which === 1) {
                     this.cancelFocusAllPanes()
@@ -717,7 +715,9 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
             this.spinner.text = text
         }
         this.spinner.setSpinnerString(6)
-        this.spinner.start()
+        this.zone.runOutsideAngular(() => {
+            this.spinner.start()
+        })
         this.spinnerActive = true
     }
 

tabby-terminal/src/api/streamProcessing.ts

@@ -6,9 +6,9 @@ import { Subject, Observable, interval, debounce } from 'rxjs'
 import { PassThrough, Readable, Writable } from 'stream'
 import { ReadLine, createInterface as createReadline, clearLine } from 'readline'
 
-export type InputMode = null | 'local-echo' | 'readline' | 'readline-hex' // eslint-disable-line @typescript-eslint/no-type-alias
-export type OutputMode = null | 'hex' // eslint-disable-line @typescript-eslint/no-type-alias
-export type NewlineMode = null | 'cr' | 'lf' | 'crlf' // eslint-disable-line @typescript-eslint/no-type-alias
+export type InputMode = null | 'local-echo' | 'readline' | 'readline-hex'
+export type OutputMode = null | 'hex'
+export type NewlineMode = null | 'cr' | 'lf' | 'crlf'
 
 export interface StreamProcessingOptions {
     inputMode?: InputMode

tabby-terminal/src/components/baseTerminalTab.component.pug

@@ -1,3 +1,4 @@
+.terminal-toolbar-spacer
 .content(#content, [style.opacity]='frontendIsReady ? 1 : 0')
 search-panel(
     *ngIf='showSearchPanel',

tabby-terminal/src/components/baseTerminalTab.component.scss

@@ -67,9 +67,8 @@
         z-index: 4;
     }
 
-    &.toolbar-pinned {
-        .content {
-            margin-top: 15px + $toolbarHeight;
-        }
+    &.toolbar-pinned > .terminal-toolbar-spacer {
+        width: 100%;
+        height: $toolbarHeight;
     }
 }

tabby-terminal/src/components/terminalSettingsTab.component.pug

@@ -9,7 +9,6 @@ h3.mb-3 Terminal
         [(ngModel)]='config.store.terminal.frontend',
         (ngModelChange)='config.save()',
     )
-        option(value='hterm') hterm
         option(value='xterm') xterm
         option(value='xterm-webgl') xterm (WebGL)
 

tabby-terminal/src/config.ts

@@ -12,7 +12,7 @@ export class TerminalConfigProvider extends ConfigProvider {
             fallbackFont: null,
             linePadding: 0,
             bell: 'off',
-            bracketedPaste: false,
+            bracketedPaste: true,
             background: 'theme',
             ligatures: false,
             cursor: 'block',
@@ -120,6 +120,7 @@ export class TerminalConfigProvider extends ConfigProvider {
                 ],
                 paste: [
                     'Ctrl-Shift-V',
+                    'Shift-Insert',
                 ],
                 'select-all': ['Ctrl-Shift-A'],
                 clear: [],
@@ -159,6 +160,7 @@ export class TerminalConfigProvider extends ConfigProvider {
                 ],
                 paste: [
                     'Ctrl-Shift-V',
+                    'Shift-Insert',
                 ],
                 'select-all': ['Ctrl-Shift-A'],
                 clear: [],