detect store-installed powershell - fixes #5212

This reverts commit 8587cd31dd.

.all-contributorsrc

@@ -406,6 +406,96 @@
       "contributions": [
         "design"
       ]
+    },
+    {
+      "login": "logicmachine123",
+      "name": "Logic Machine",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63876444?v=4",
+      "profile": "https://git.io/JnP49",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "cypherbits",
+      "name": "cypherbits",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10424900?v=4",
+      "profile": "https://github.com/cypherbits",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "KingMob",
+      "name": "Matthew Davidson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/946421?v=4",
+      "profile": "https://modulolotus.net",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "al-wi",
+      "name": "Alexander Wiedemann",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11092199?v=4",
+      "profile": "https://github.com/al-wi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BoYeonJang",
+      "name": "장보연",
+      "avatar_url": "https://avatars.githubusercontent.com/u/59506394?v=4",
+      "profile": "https://www.notion.so/3d45c6bd2cbd4f938873a4bd12e23375",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Me1onRind",
+      "name": "zZ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19531270?v=4",
+      "profile": "https://github.com/Me1onRind",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tainoNZ",
+      "name": "Aaron Davison",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49261322?v=4",
+      "profile": "https://github.com/tainoNZ",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "composer404",
+      "name": "Przemyslaw Kozik",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58251560?v=4",
+      "profile": "https://github.com/composer404",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "highfredo",
+      "name": "Alfredo Arellano de la Fuente",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5951524?v=4",
+      "profile": "https://github.com/highfredo",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "NessunKim",
+      "name": "MH Kim",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12974079?v=4",
+      "profile": "https://github.com/NessunKim",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.yml

@@ -36,7 +36,9 @@ rules:
   '@typescript-eslint/prefer-readonly': off
   '@typescript-eslint/require-await': off
   '@typescript-eslint/strict-boolean-expressions': off
-  '@typescript-eslint/no-misused-promises': off
+  '@typescript-eslint/no-misused-promises':
+  - error
+  - checksVoidReturn: false
   '@typescript-eslint/typedef': off
   '@typescript-eslint/consistent-type-imports': off
   '@typescript-eslint/sort-type-union-intersection-members': off
@@ -95,7 +97,9 @@ rules:
   - error
   - single
   - allowTemplateLiterals: true
-  '@typescript-eslint/no-confusing-void-expression': off
+  '@typescript-eslint/no-confusing-void-expression':
+  - error
+  - ignoreArrowShorthand: true
   '@typescript-eslint/no-non-null-assertion': off
   '@typescript-eslint/no-unnecessary-condition':
   - error
@@ -116,3 +120,9 @@ rules:
   '@typescript-eslint/no-var-requires': off
   '@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/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/issue-report.md

@@ -0,0 +1,23 @@
+---
+name: Issue report
+about: Report a problem
+title: ''
+labels: 'T: Bug'
+assignees: ''
+
+---
+
+<!--
+Before submitting an issue, make sure that:
+* You're running the latest Tabby version: https://github.com/Eugeny/tabby/releases
+* You've searched the existing issues: https://github.com/Eugeny/tabby/issues
+* Your problem is not caused by third-party plugins (disable _third-party_ plugins, restart and try to reproduce the problem).
+
+*Reports are accepted in English ONLY.*
+-->
+
+**Describe the problem**:
+[A clear and concise description of what the bug is.]
+
+**To Reproduce**:
+[Steps to reproduce the behavior]

.github/workflows/build.yml

@@ -0,0 +1,313 @@
+name: Package-Build
+on: [push, pull_request]
+jobs:
+  Lint:
+    runs-on: macos-11.0
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.3.4
+      with:
+        fetch-depth: 0
+
+    - name: Installing Node
+      uses: actions/setup-node@v2.5.0
+      with:
+        node-version: 16
+
+    - name: Install deps
+      run: |
+        npm i -g yarn@1.19.1
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+
+    - name: Build typings
+      run: yarn run build:typings
+
+    - name: Lint
+      run: yarn run lint
+
+  macOS-Build:
+    runs-on: macos-11.0
+    needs: Lint
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+          - arch: arm64
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.3.4
+      with:
+        fetch-depth: 0
+
+    - name: Installing Node
+      uses: actions/setup-node@v2.5.0
+      with:
+        node-version: 16
+
+    - name: Install deps
+      run: |
+        sudo npm i -g yarn@1.22.1
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+
+    - name: Build native deps
+      run: scripts/build-native.js
+      env:
+        ARCH: ${{matrix.arch}}
+
+    - name: Build native deps
+      run: |
+        rm -rf app/node_modules/cpu-features
+        rm -rf app/node_modules/ssh2/crypto/build
+      if: ${{ matrix.arch == 'arm64' }}
+
+    - name: Webpack
+      run: yarn run build
+
+    - name: Prepackage plugins
+      run: scripts/prepackage-plugins.js
+      env:
+        ARCH: ${{matrix.arch}}
+
+    - run: sed -i '' 's/updateInfo = await/\/\/updateInfo = await/g' node_modules/app-builder-lib/out/targets/ArchiveTarget.js
+
+    - name: Build and sign packages
+      run: scripts/build-macos.js
+      if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
+      env:
+        ARCH: ${{matrix.arch}}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CSC_LINK: ${{ secrets.CSC_LINK }}
+        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+        APPSTORE_USERNAME: ${{ secrets.APPSTORE_USERNAME }}
+        APPSTORE_PASSWORD: ${{ secrets.APPSTORE_PASSWORD }}
+        USE_HARD_LINKS: false
+        # DEBUG: electron-builder,electron-builder:*
+
+    - name: Build packages without signing
+      run: scripts/build-macos.js
+      if: "! (github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
+      env:
+        ARCH: ${{matrix.arch}}
+        # DEBUG: electron-builder,electron-builder:*
+
+    - name: Upload symbols
+      run: |
+        sudo npm install -g @sentry/cli --unsafe-perm
+        ./scripts/sentry-upload.js
+      env:
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+        SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+
+    - name: Package artifacts
+      run: |
+        mkdir artifact-pkg
+        mv dist/*.pkg artifact-pkg/
+        mkdir artifact-zip
+        mv dist/*.zip artifact-zip/
+
+    - uses: actions/upload-artifact@master
+      name: Upload PKG
+      with:
+        name: macOS .pkg (${{matrix.arch}})
+        path: artifact-pkg
+
+    - uses: actions/upload-artifact@master
+      name: Upload ZIP
+      with:
+        name: macOS .zip (${{matrix.arch}})
+        path: artifact-zip
+
+  Linux-Build:
+    runs-on: ubuntu-18.04 # build against an older glibc for compatibility
+    needs: Lint
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.3.4
+      with:
+        fetch-depth: 0
+
+    - name: Install Node
+      uses: actions/setup-node@v2.5.0
+      with:
+        node-version: 16
+
+    - name: Install deps
+      run: |
+        sudo apt-get update
+        sudo apt-get install libarchive-tools zsh
+        npm i -g yarn@1.19.1
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+
+    - name: Build native deps
+      run: scripts/build-native.js
+
+    - name: Webpack
+      run: yarn run build
+
+    - name: Prepackage plugins
+      run: scripts/prepackage-plugins.js
+
+    - name: Build packages
+      run: scripts/build-linux.js
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        USE_HARD_LINKS: false
+        # DEBUG: electron-builder,electron-builder:*
+
+    - name: Build web resources
+      run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist'
+
+    - name: Upload symbols
+      run: |
+        sudo npm install -g @sentry/cli --unsafe-perm
+        ./scripts/sentry-upload.js
+      env:
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        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
+        mv dist/*.deb artifact-deb/ || true
+        mkdir artifact-rpm
+        mv dist/*.rpm artifact-rpm/ || true
+        mkdir artifact-pacman
+        mv dist/*.pacman artifact-pacman/ || true
+        mkdir artifact-snap
+        mv dist/*.snap artifact-snap/ || true
+        mkdir artifact-tar.gz
+        mv dist/*.tar.gz artifact-tar.gz/ || true
+        mkdir artifact-web
+        mv tabby-web.tar.gz artifact-web/ || true
+
+    - uses: actions/upload-artifact@master
+      name: Upload DEB
+      with:
+        name: Linux DEB
+        path: artifact-deb
+
+    - uses: actions/upload-artifact@master
+      name: Upload RPM
+      with:
+        name: Linux RPM
+        path: artifact-rpm
+
+    - uses: actions/upload-artifact@master
+      name: Upload Pacman Package
+      with:
+        name: Linux Pacman
+        path: artifact-pacman
+
+    - uses: actions/upload-artifact@master
+      name: Upload Snap
+      with:
+        name: Linux Snap
+        path: artifact-snap
+
+    - uses: actions/upload-artifact@master
+      name: Upload Linux tarball
+      with:
+        name: Linux tarball
+        path: artifact-tar.gz
+
+    - uses: actions/upload-artifact@master
+      name: Upload web tarball
+      with:
+        name: Web tarball
+        path: artifact-web
+
+  Windows-Build:
+    runs-on: windows-2022
+    needs: Lint
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.3.4
+      with:
+        fetch-depth: 0
+
+    - name: Installing Node
+      uses: actions/setup-node@v2.5.0
+      with:
+        node-version: 16
+
+    - name: Update node-gyp
+      run: |
+        npm install --global node-gyp@8.4.1
+        npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
+
+    - name: Build
+      shell: powershell
+      run: |
+        npm i -g yarn@1.19.1
+        yarn
+        node scripts/build-native.js
+        yarn run build
+        node scripts/prepackage-plugins.js
+
+    - name: Build and sign packages
+      run: node scripts/build-windows.js
+      if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
+        WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
+        DEBUG: electron-builder,electron-builder:*
+
+    - name: Build packages without signing
+      run: node scripts/build-windows.js
+      if: "!(github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
+
+    - name: Upload symbols
+      run: |
+        npm install @sentry/cli
+        node scripts/sentry-upload.js
+      env:
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+        SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+
+    - name: Package artifacts
+      run: |
+        mkdir artifact-setup
+        mv dist/*-setup.exe artifact-setup/
+        mkdir artifact-portable
+        mv dist/*-portable.zip artifact-portable/
+
+    - uses: actions/upload-artifact@master
+      name: Upload installer
+      with:
+        name: Windows installer
+        path: artifact-setup
+
+    - uses: actions/upload-artifact@master
+      name: Upload portable build
+      with:
+        name: Windows portable build
+        path: artifact-portable

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '26 7 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/docs.yml

@@ -2,7 +2,7 @@ name: Docs
 on: push
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
 
     steps:
@@ -12,14 +12,12 @@ jobs:
         fetch-depth: 0
 
     - name: Installing Node
-      uses: actions/setup-node@v2.1.5
+      uses: actions/setup-node@v2.5.0
       with:
         node-version: 14
 
     - name: Build
       run: |
-        eval $(ssh-agent -s)
-        ssh-add <(echo "$DOCS_PRIVATE_KEY")
         yarn cache clean
         cd app
         yarn
@@ -28,7 +26,13 @@ jobs:
         yarn
         yarn run build:typings
         yarn run docs
-        rsync -e "ssh -o StrictHostKeyChecking=no" -arv docs/api/ root@ajenti.org:/srv/terminus-docs/
 
       env:
         DOCS_PRIVATE_KEY: ${{ secrets.DOCS_PRIVATE_KEY }}
+
+    - uses: FirebaseExtended/action-hosting-deploy@v0
+      with:
+        repoToken: '${{ secrets.GITHUB_TOKEN }}'
+        firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TABBY_DOCS }}'
+        channelId: live
+        projectId: tabby-docs

.github/workflows/lint.yml

@@ -1,31 +0,0 @@
-name: Lint
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: macOS-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2.3.4
-      with:
-        fetch-depth: 0
-
-    - name: Installing Node
-      uses: actions/setup-node@v2.1.5
-      with:
-        node-version: 14
-
-    - name: Install deps
-      run: |
-        npm i -g yarn@1.19.1
-        cd app
-        yarn
-        cd ..
-        rm app/node_modules/.yarn-integrity
-        yarn
-
-    - name: Build typings
-      run: yarn run build:typings
-
-    - name: Lint
-      run: yarn run lint

.github/workflows/linux.yml

@@ -1,107 +0,0 @@
-name: Linux Build
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-18.04
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2.3.4
-      with:
-        fetch-depth: 0
-
-    - name: Install Node
-      uses: actions/setup-node@v2.1.5
-      with:
-        node-version: 14
-
-    - name: Install deps
-      run: |
-        sudo apt-get update
-        sudo apt-get install bsdtar zsh
-        npm i -g yarn@1.19.1
-        cd app
-        yarn
-        cd ..
-        rm app/node_modules/.yarn-integrity
-        yarn
-        npm run patch
-
-    - name: Build native deps
-      run: scripts/build-native.js
-
-    - name: Webpack
-      run: yarn run build
-
-    - name: Prepackage plugins
-      run: scripts/prepackage-plugins.js
-
-    - name: Build packages
-      run: scripts/build-linux.js
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        USE_HARD_LINKS: false
-        # DEBUG: electron-builder,electron-builder:*
-
-    - name: Build web resources
-      run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist'
-
-    - name: Upload symbols
-      run: |
-        sudo npm install -g @sentry/cli --unsafe-perm
-        ./scripts/sentry-upload.js
-      env:
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-        SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-
-    - name: Package artifacts
-      run: |
-        mkdir artifact-deb
-        mv dist/*.deb artifact-deb/ || true
-        mkdir artifact-rpm
-        mv dist/*.rpm artifact-rpm/ || true
-        mkdir artifact-pacman
-        mv dist/*.pacman artifact-pacman/ || true
-        mkdir artifact-snap
-        mv dist/*.snap artifact-snap/ || true
-        mkdir artifact-tar.gz
-        mv dist/*.tar.gz artifact-tar.gz/ || true
-        mkdir artifact-web
-        mv tabby-web.tar.gz artifact-web/ || true
-
-    - uses: actions/upload-artifact@master
-      name: Upload DEB
-      with:
-        name: Linux DEB
-        path: artifact-deb
-
-    - uses: actions/upload-artifact@master
-      name: Upload RPM
-      with:
-        name: Linux RPM
-        path: artifact-rpm
-
-    - uses: actions/upload-artifact@master
-      name: Upload Pacman Package
-      with:
-        name: Linux Pacman
-        path: artifact-pacman
-
-    - uses: actions/upload-artifact@master
-      name: Upload Snap
-      with:
-        name: Linux Snap
-        path: artifact-snap
-
-    - uses: actions/upload-artifact@master
-      name: Upload Linux tarball
-      with:
-        name: Linux tarball
-        path: artifact-tar.gz
-
-    - uses: actions/upload-artifact@master
-      name: Upload web tarball
-      with:
-        name: Web tarball
-        path: artifact-web

.github/workflows/macos.yml

@@ -1,99 +0,0 @@
-name: macOS Build
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: macos-11.0
-    strategy:
-      matrix:
-        include:
-          - arch: x86_64
-          - arch: arm64
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2.3.4
-      with:
-        fetch-depth: 0
-
-    - name: Installing Node
-      uses: actions/setup-node@v2.1.5
-      with:
-        node-version: 14
-
-    - name: Install deps
-      run: |
-        sudo npm i -g yarn@1.22.1
-        cd app
-        yarn
-        cd ..
-        rm app/node_modules/.yarn-integrity
-        yarn
-
-    - name: Build native deps
-      run: scripts/build-native.js
-      env:
-        ARCH: ${{matrix.arch}}
-
-    - name: Build native deps
-      run: |
-        rm -rf app/node_modules/cpu-features
-        rm -rf app/node_modules/ssh2/crypto/build
-      if: ${{ matrix.arch == 'arm64' }}
-
-    - name: Webpack
-      run: yarn run build
-
-    - name: Prepackage plugins
-      run: scripts/prepackage-plugins.js
-      env:
-        ARCH: ${{matrix.arch}}
-
-    - run: sed -i '' 's/updateInfo = await/\/\/updateInfo = await/g' node_modules/app-builder-lib/out/targets/ArchiveTarget.js
-
-    - name: Build and sign packages
-      run: scripts/build-macos.js
-      if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
-      env:
-        ARCH: ${{matrix.arch}}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        CSC_LINK: ${{ secrets.CSC_LINK }}
-        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-        APPSTORE_USERNAME: ${{ secrets.APPSTORE_USERNAME }}
-        APPSTORE_PASSWORD: ${{ secrets.APPSTORE_PASSWORD }}
-        USE_HARD_LINKS: false
-        # DEBUG: electron-builder,electron-builder:*
-
-    - name: Build packages without signing
-      run: scripts/build-macos.js
-      if: "! (github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
-      env:
-        ARCH: ${{matrix.arch}}
-        # DEBUG: electron-builder,electron-builder:*
-
-    - name: Upload symbols
-      run: |
-        sudo npm install -g @sentry/cli --unsafe-perm
-        ./scripts/sentry-upload.js
-      env:
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-        SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-
-    - name: Package artifacts
-      run: |
-        mkdir artifact-pkg
-        mv dist/*.pkg artifact-pkg/
-        mkdir artifact-zip
-        mv dist/*.zip artifact-zip/
-
-    - uses: actions/upload-artifact@master
-      name: Upload PKG
-      with:
-        name: macOS .pkg (${{matrix.arch}})
-        path: artifact-pkg
-
-    - uses: actions/upload-artifact@master
-      name: Upload ZIP
-      with:
-        name: macOS .zip (${{matrix.arch}})
-        path: artifact-zip

.github/workflows/release.yml

@@ -0,0 +1,19 @@
+---
+name: "tagged-release"
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  tagged-release:
+    name: "Tagged Release"
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+          draft: true

.github/workflows/windows.yml

@@ -1,66 +0,0 @@
-name: Windows Build
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: windows-2016
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2.3.4
-      with:
-        fetch-depth: 0
-
-    - name: Installing Node
-      uses: actions/setup-node@v2.1.5
-      with:
-        node-version: 14
-
-    - name: Build
-      shell: powershell
-      run: |
-        npm i -g yarn@1.19.1
-        yarn
-        node scripts/build-native.js
-        yarn run build
-        node scripts/prepackage-plugins.js
-
-    - name: Build and sign packages
-      run: node scripts/build-windows.js
-      if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
-        WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
-        # DEBUG: electron-builder,electron-builder:*
-
-    - name: Build packages without signing
-      run: node scripts/build-windows.js
-      if: "!(github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
-
-    - name: Upload symbols
-      run: |
-        npm install @sentry/cli
-        node scripts/sentry-upload.js
-      env:
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-        SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-
-    - name: Package artifacts
-      run: |
-        mkdir artifact-setup
-        mv dist/*-setup.exe artifact-setup/
-        mkdir artifact-portable
-        mv dist/*-portable.zip artifact-portable/
-
-    - uses: actions/upload-artifact@master
-      name: Upload installer
-      with:
-        name: Installer
-        path: artifact-setup
-
-    - uses: actions/upload-artifact@master
-      name: Upload portable build
-      with:
-        name: Portable build
-        path: artifact-portable

HACKING.md

@@ -15,8 +15,8 @@ yarn
 ```
 
 ```
-# Linux (Debian here as an example)
-sudo apt install libfontconfig-dev libsecret-1-dev bsdtar libnss3 libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 	libgtk-3-0 libgbm1
+# Linux (Debian/Ubuntu here as an example)
+sudo apt install libfontconfig-dev libsecret-1-dev libarchive-tools libnss3 libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 libgtk-3-0 libgbm1 cmake
 yarn
 ./scripts/build-native.js
 ```
@@ -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,217 @@
+[![](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는 무엇인가](#tabby는-무엇인가)
+- [터미널 기능](#터미널-기능)
+- [SSH 클라이언트](#ssh-클라이언트)
+- [시리얼 터미널](#시리얼-터미널)
+- [포터블](#포터블)
+- [플러그인](#플러그인)
+- [테마](#테마)
+- [기여](#기여)
+
+<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) - 항상 당신을 귀찮게 하는 예제 플러그인
+* [workspace-manager](https://github.com/composer404/tabby-workspace-manager) - 주어진 구성을 기반으로 사용자 정의 작업 공간 프로필을 생성할 수 있습니다
+* [search-in-browser](https://github.com/composer404/tabby-search-in-browser) - Tabby의 탭에서 선택한 텍스트로 기본 시스템 브라우저를 엽니다
+
+<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](https://docs.tabby.sh/)를 참조하십시오.
+
+---
+<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,38 +1,49 @@
-![](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> <a href="https://nightly.link/Eugeny/tabby/workflows/windows/master"><img src="https://shields.io/badge/-Nightly-blue?logo=windows&style=for-the-badge"/></a> <a href="https://nightly.link/Eugeny/tabby/workflows/macos/master"><img src="https://shields.io/badge/-Nightly-black?logo=apple&style=for-the-badge"/></a> <a href="https://nightly.link/Eugeny/tabby/workflows/linux/master"><img src="https://shields.io/badge/-Nightly-orange?logo=linux&style=for-the-badge"/></a> <a href="https://gitter.im/terminus-terminal/community"><img alt="Gitter" src="https://img.shields.io/gitter/room/terminus/community.svg?color=magenta&logo=gitter&style=for-the-badge"></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> &nbsp; <a href="https://twitter.com/eugeeeeny"><img alt="Twitter" src="https://shields.io/badge/Subscribe-News-blue?logo=twitter&style=for-the-badge&color=blue"></a>
 </p>
 
 <p align="center">
   <a href="https://ko-fi.com/J3J8KWTF">
-    <img src="https://ko-fi.com/img/githubbutton_sm.svg">
+    <img src="https://cdn.ko-fi.com/cdn/kofi3.png?v=2" width="150">
   </a>
 </p>
 
 ----
 
-**Tabby** (formerly **Terminus**) is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux
+### Downloads:
 
-* Integrated SSH client and connection manager
+* [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)
+
+<br/>
+<p align="center">
+This README is also available in: <a href="./README.ko-KR.md">Korean</a>
+</p>
+
+----
+
+[**Tabby**](https://tabby.sh) (formerly **Terminus**) is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux
+
+* 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
+* SSH, SFTP and Telnet client available as a [web app](https://tabby.sh/app) (also [self-hosted](https://github.com/Eugeny/tabby-web)).
 
----
+# 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)
@@ -43,13 +54,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)
@@ -95,28 +108,37 @@ 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/terminus-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/terminus-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
+* [workspace-manager](https://github.com/composer404/tabby-workspace-manager) - allows creating custom workspace profiles based on the given config
+* [search-in-browser](https://github.com/composer404/tabby-search-in-browser) - opens default system browser with a text selected from the Tabby's tab
 
 <a name="themes"></a>
 # Themes
 
-  * [hype](https://github.com/Eugeny/terminus-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
 
 Pull requests and plugins are welcome!
 
-See [HACKING.md](https://github.com/Eugeny/tabby/blob/master/HACKING.md) and [API docs](http://ajenti.org/terminus-docs/) for information of how the project is laid out, and a very brief plugin development tutorial.
+See [HACKING.md](https://github.com/Eugeny/tabby/blob/master/HACKING.md) and [API docs](https://docs.tabby.sh/) for information of how the project is laid out, and a very brief plugin development tutorial.
 
 ---
 <a name="contributors"></a>
@@ -184,6 +206,18 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <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>
+    <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>
+  <tr>
+    <td align="center"><a href="https://github.com/Me1onRind"><img src="https://avatars.githubusercontent.com/u/19531270?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zZ</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Me1onRind" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/tainoNZ"><img src="https://avatars.githubusercontent.com/u/49261322?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aaron Davison</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=tainoNZ" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/composer404"><img src="https://avatars.githubusercontent.com/u/58251560?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Przemyslaw Kozik</b></sub></a><br /><a href="#design-composer404" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/highfredo"><img src="https://avatars.githubusercontent.com/u/5951524?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alfredo Arellano de la Fuente</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=highfredo" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/NessunKim"><img src="https://avatars.githubusercontent.com/u/12974079?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MH Kim</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=NessunKim" title="Code">💻</a></td>
   </tr>
 </table>
 
@@ -193,3 +227,5 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+
+<img src="https://ga-beacon.appspot.com/UA-3278102-18/github/readme" width="1"/>

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 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,9 @@ export class Application {
     private tray?: Tray
     private ptyManager = new PTYManager()
     private windows: Window[] = []
+    private globalHotkey$ = new Subject<void>()
+    private quitRequested = false
+    private configStore: any
     userPluginsPath: string
 
     constructor () {
@@ -28,17 +33,20 @@ export class Application {
 
         ipcMain.on('app:config-change', (_event, config) => {
             this.broadcast('host:config-change', config)
+            this.configStore = config
         })
 
         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,13 +55,25 @@ export class Application {
             return pluginManager.uninstall(this.userPluginsPath, name)
         })
 
-        const configData = loadConfig()
+        ;(promiseIpc as any).on('get-default-mac-shell', async () => {
+            try {
+                return (await exec(`/usr/bin/dscl . -read /Users/${process.env.LOGNAME} UserShell`))[0].toString().split(' ')[1].trim()
+            } catch {
+                return '/bin/bash'
+            }
+        })
+
+        this.configStore = loadConfig()
         if (process.platform === 'linux') {
             app.commandLine.appendSwitch('no-sandbox')
-            if (((configData.appearance || {}).opacity || 1) !== 1) {
+            if (((this.configStore.appearance || {}).opacity || 1) !== 1) {
                 app.commandLine.appendSwitch('enable-transparent-visuals')
                 app.disableHardwareAcceleration()
             }
+            if (this.configStore.hacks?.disableGPU) {
+                app.commandLine.appendSwitch('disable-gpu')
+                app.disableHardwareAcceleration()
+            }
         }
 
         this.userPluginsPath = path.join(
@@ -68,11 +88,16 @@ export class Application {
         app.commandLine.appendSwitch('disable-http-cache')
         app.commandLine.appendSwitch('max-active-webgl-contexts', '9000')
         app.commandLine.appendSwitch('lang', 'EN')
-        app.allowRendererProcessReuse = false
 
-        for (const flag of configData.flags || [['force_discrete_gpu', '0']]) {
+        for (const flag of this.configStore.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 {
@@ -84,6 +109,9 @@ export class Application {
     async newWindow (options?: WindowOptions): Promise<Window> {
         const window = new Window(this, options)
         this.windows.push(window)
+        if (this.windows.length === 1){
+            window.makeMain()
+        }
         window.visible$.subscribe(visible => {
             if (visible) {
                 this.disableTray()
@@ -93,16 +121,28 @@ export class Application {
         })
         window.closed$.subscribe(() => {
             this.windows = this.windows.filter(x => x !== window)
+            if (!this.windows.some(x => x.isMainWindow)) {
+                this.windows[0]?.makeMain()
+                this.windows[0]?.present()
+            }
         })
         if (process.platform === 'darwin') {
             this.setupMenu()
         }
         await window.ready
+        window.present()
         return window
     }
 
     onGlobalHotkey (): void {
-        if (this.windows.some(x => x.isFocused() && x.isVisible())) {
+        let isPresent = this.windows.some(x => x.isFocused() && x.isVisible())
+        const isDockedOnTop = this.windows.some(x => x.isDockedOnTop())
+        if (isDockedOnTop) {
+            // if docked and on top, hide even if not focused right now
+            isPresent = this.windows.some(x => x.isVisible())
+        }
+
+        if (isPresent) {
             for (const window of this.windows) {
                 window.hide()
             }
@@ -171,7 +211,7 @@ export class Application {
 
     focus (): void {
         for (const window of this.windows) {
-            window.show()
+            window.present()
         }
     }
 
@@ -217,7 +257,8 @@ export class Application {
                     {
                         label: 'Quit',
                         accelerator: 'Cmd+Q',
-                        click () {
+                        click: () => {
+                            this.quitRequested = true
                             app.quit()
                         },
                     },
@@ -240,7 +281,6 @@ export class Application {
             {
                 label: 'View',
                 submenu: [
-                    { role: 'reload' },
                     { role: 'toggleDevTools' },
                     { type: 'separator' },
                     { role: 'togglefullscreen' },
@@ -268,6 +308,10 @@ export class Application {
             },
         ]
 
+        if (process.env.TABBY_DEV) {
+            template[2].submenu['unshift']({ role: 'reload' })
+        }
+
         Menu.setApplicationMenu(Menu.buildFromTemplate(template))
     }
 }

app/lib/cli.ts

@@ -16,12 +16,6 @@ export function parseArgs (argv: string[], cwd: string): any {
         .command('profile [profileName]', 'open a tab with specified profile', {
             profileName: { type: 'string' },
         })
-        .command('connect-ssh [connectionName]', 'open a tab for a saved SSH connection', {
-            connectionName: { type: 'string' },
-        })
-        .command('connect-serial [connectionName]', 'open a tab for a saved serial connection', {
-            connectionName: { type: 'string' },
-        })
         .command('paste [text]', 'paste stdin into the active tab', yargs => {
             return yargs.option('escape', {
                 alias: 'e',
@@ -31,7 +25,7 @@ export function parseArgs (argv: string[], cwd: string): any {
                 type: 'string',
             })
         })
-        .version('version', '', app.getVersion())
+        .version(app.getVersion())
         .option('debug', {
             alias: 'd',
             describe: 'Show DevTools on start',
@@ -41,11 +35,6 @@ export function parseArgs (argv: string[], cwd: string): any {
             describe: 'Start minimized',
             type: 'boolean',
         })
-        .option('version', {
-            alias: 'v',
-            describe: 'Show version and exit',
-            type: 'boolean',
-        })
         .help('help')
         .parse()
 }

app/lib/index.ts

@@ -1,3 +1,4 @@
+import 'v8-compile-cache'
 import './portable'
 import 'source-map-support/register'
 import './sentry'
@@ -25,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/lru.ts

@@ -1,4 +1,4 @@
-import * as LRU from 'lru-cache'
+import LRU from 'lru-cache'
 import * as fs from 'fs'
 const lru = new LRU({ max: 256, maxAge: 250 })
 const origLstat = fs.realpathSync.bind(fs)

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 () {
@@ -79,6 +90,7 @@ class PTYDataQueue {
 export class PTY {
     private pty: nodePTY.IPty
     private outputQueue: PTYDataQueue
+    exited = false
 
     constructor (private id: string, private app: Application, ...args: any[]) {
         this.pty = (nodePTY as any).spawn(...args)
@@ -90,7 +102,10 @@ export class PTY {
             setImmediate(() => this.emit('data', data))
         })
 
-        this.pty.on('data', data => this.outputQueue.push(Buffer.from(data)))
+        this.pty.onData(data => this.outputQueue.push(Buffer.from(data)))
+        this.pty.onExit(() => {
+            this.exited = true
+        })
     }
 
     getPID (): number {
@@ -133,7 +148,7 @@ export class PTYManager {
         })
 
         ipcMain.on('pty:exists', (event, id) => {
-            event.returnValue = !!this.ptys[id]
+            event.returnValue = this.ptys[id] && !this.ptys[id].exited
         })
 
         ipcMain.on('pty:get-pid', (event, id) => {

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,13 +1,13 @@
 import * as glasstron from 'glasstron'
 
-import { Subject, Observable } from 'rxjs'
-import { debounceTime } from 'rxjs/operators'
-import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions } from 'electron'
+import { Subject, Observable, debounceTime } from 'rxjs'
+import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions, TouchBar, nativeImage } from 'electron'
 import ElectronConfig = require('electron-config')
+import { enable as enableRemote } from '@electron/remote/main'
 import * as os from 'os'
 import * as path from 'path'
 import macOSRelease from 'macos-release'
-import * as compareVersions from 'compare-versions'
+import { compare as compareVersions } from 'compare-versions'
 
 import type { Application } from './app'
 import { parseArgs } from './cli'
@@ -15,7 +15,7 @@ import { loadConfig } from './config'
 
 let DwmEnableBlurBehindWindow: any = null
 if (process.platform === 'win32') {
-    DwmEnableBlurBehindWindow = require('windows-blurbehind').DwmEnableBlurBehindWindow
+    DwmEnableBlurBehindWindow = require('@tabby-gang/windows-blurbehind').DwmEnableBlurBehindWindow
 }
 
 export interface WindowOptions {
@@ -27,10 +27,13 @@ abstract class GlasstronWindow extends BrowserWindow {
     abstract setBlur (_: boolean)
 }
 
-const macOSVibrancyType = process.platform === 'darwin' ? compareVersions.compare(macOSRelease().version, '10.14', '>=') ? 'fullscreen-ui' : 'dark' : null
+const macOSVibrancyType = process.platform === 'darwin' ? compareVersions(macOSRelease().version, '10.14', '>=') ? 'fullscreen-ui' : 'dark' : null
+
+const activityIcon = nativeImage.createFromPath(`${app.getAppPath()}/assets/activity.png`)
 
 export class Window {
     ready: Promise<void>
+    isMainWindow = false
     private visible = new Subject<boolean>()
     private closed = new Subject<void>()
     private window?: GlasstronWindow
@@ -40,6 +43,9 @@ export class Window {
     private lastVibrancy: { enabled: boolean, type?: string } | null = null
     private disableVibrancyWhileDragging = false
     private configStore: any
+    private touchBarControl: any
+    private isFluentVibrancy = false
+    private dockHidden = false
 
     get visible$ (): Observable<boolean> { return this.visible }
     get closed$ (): Observable<void> { return this.closed }
@@ -63,7 +69,6 @@ export class Window {
                 nodeIntegration: true,
                 preload: path.join(__dirname, 'sentry.js'),
                 backgroundThrottling: false,
-                enableRemoteModule: true,
                 contextIsolation: false,
             },
             maximizable: true,
@@ -114,21 +119,32 @@ export class Window {
                 }
                 this.window.focus()
                 this.window.moveTop()
+                application.focus()
             }
         })
 
         this.window.on('blur', () => {
-            if (this.configStore.appearance?.dock !== 'off' && this.configStore.appearance?.dockHideOnBlur) {
+            if ((this.configStore.appearance?.dock ?? 'off') !== 'off' && this.configStore.appearance?.dockHideOnBlur) {
                 this.hide()
             }
         })
 
+        enableRemote(this.window.webContents)
+
         this.window.loadURL(`file://${app.getAppPath()}/dist/index.html`, { extraHeaders: 'pragma: no-cache\n' })
 
         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)
         }
 
@@ -145,6 +161,11 @@ export class Window {
         })
     }
 
+    makeMain (): void {
+        this.isMainWindow = true
+        this.window.webContents.send('host:became-main-window')
+    }
+
     setVibrancy (enabled: boolean, type?: string, userRequested?: boolean): void {
         if (userRequested ?? true) {
             this.lastVibrancy = { enabled, type }
@@ -154,6 +175,7 @@ export class Window {
                 this.window.blurType = enabled ? type === 'fluent' ? 'acrylic' : 'blurbehind' : null
                 try {
                     this.window.setBlur(enabled)
+                    this.isFluentVibrancy = enabled && type === 'fluent'
                 } catch (error) {
                     console.error('Failed to set window blur', error)
                 }
@@ -168,11 +190,6 @@ export class Window {
         }
     }
 
-    show (): void {
-        this.window.show()
-        this.window.moveTop()
-    }
-
     focus (): void {
         this.window.focus()
     }
@@ -184,6 +201,7 @@ export class Window {
         this.window.webContents.send(event, ...args)
         if (event === 'host:config-change') {
             this.configStore = args[0]
+            this.enableDockedWindowStyles(this.isDockedOnTop())
         }
     }
 
@@ -199,45 +217,69 @@ export class Window {
         return this.window.isVisible()
     }
 
-    hide (): void {
+    isDockedOnTop (): boolean {
+        return this.isMainWindow && this.configStore.appearance?.dock && this.configStore.appearance?.dock !== 'off' && (this.configStore.appearance?.dockAlwaysOnTop ?? true)
+    }
+
+    async hide (): Promise<void> {
         if (process.platform === 'darwin') {
             // Lose focus
             Menu.sendActionToFirstResponder('hide:')
-        }
-        this.window.blur()
-        if (process.platform !== 'darwin') {
-            this.window.hide()
-        }
-    }
-
-    present (): void {
-        if (!this.window.isVisible()) {
-            // unfocused, invisible
-            this.window.show()
-            this.window.focus()
-        } else {
-            if (!this.configStore.appearance?.dock || this.configStore.appearance?.dock === 'off') {
-                // not docked, visible
-                setTimeout(() => {
-                    this.window.show()
-                    this.window.focus()
-                })
-            } else {
-                if (this.configStore.appearance?.dockAlwaysOnTop) {
-                    // docked, visible, on top
-                    this.window.hide()
-                } else {
-                    // docked, visible, not on top
-                    this.window.focus()
-                }
+            if (this.isDockedOnTop()) {
+                await this.enableDockedWindowStyles(false)
             }
         }
+        this.window.blur()
+        this.window.hide()
+    }
+
+    async show (): Promise<void> {
+        await this.enableDockedWindowStyles(this.isDockedOnTop())
+        this.window.show()
+        this.window.focus()
+    }
+
+    async present (): Promise<void> {
+        await this.show()
+        this.window.moveTop()
     }
 
     passCliArguments (argv: string[], cwd: string, secondInstance: boolean): void {
         this.send('cli', parseArgs(argv, cwd), cwd, secondInstance)
     }
 
+    private async enableDockedWindowStyles (enabled: boolean) {
+        if (process.platform === 'darwin') {
+            if (enabled) {
+                if (!this.dockHidden) {
+                    app.dock.hide()
+                    this.dockHidden = true
+                }
+                this.window.setAlwaysOnTop(true, 'screen-saver', 1)
+                if (!this.window.isVisibleOnAllWorkspaces()) {
+                    this.window.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true })
+                }
+                if (this.window.fullScreenable) {
+                    this.window.setFullScreenable(false)
+                }
+            } else {
+                if (this.dockHidden) {
+                    await app.dock.show()
+                    this.dockHidden = false
+                }
+                if (this.window.isAlwaysOnTop()) {
+                    this.window.setAlwaysOnTop(false)
+                }
+                if (this.window.isVisibleOnAllWorkspaces()) {
+                    this.window.setVisibleOnAllWorkspaces(false)
+                }
+                if (!this.window.fullScreenable) {
+                    this.window.setFullScreenable(true)
+                }
+            }
+        }
+    }
+
     private setupWindowManagement () {
         this.window.on('show', () => {
             this.visible.next(true)
@@ -299,7 +341,7 @@ export class Window {
                 config: this.configStore,
                 executable: app.getPath('exe'),
                 windowID: this.window.id,
-                isFirstWindow: this.window.id === 1,
+                isMainWindow: this.isMainWindow,
                 userPluginsPath: this.application.userPluginsPath,
             })
         })
@@ -346,8 +388,7 @@ export class Window {
             if (this.window.isMinimized()) {
                 this.window.restore()
             }
-            this.window.show()
-            this.window.moveTop()
+            this.present()
         })
 
         ipcMain.on('window-close', event => {
@@ -358,15 +399,23 @@ 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) => {
             this.disableVibrancyWhileDragging = value
         })
 
-        let moveEndedTimeout: number|null = null
+        let moveEndedTimeout: any = null
         const onBoundsChange = () => {
-            if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
+            if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging || !this.isFluentVibrancy) {
                 return
             }
             this.setVibrancy(false, undefined, false)
@@ -379,6 +428,18 @@ export class Window {
         }
         this.window.on('move', onBoundsChange)
         this.window.on('resize', onBoundsChange)
+
+        ipcMain.on('window-set-traffic-light-position', (_event, x, y) => {
+            this.window.setTrafficLightPosition({ x, y })
+        })
+
+        ipcMain.on('window-set-opacity', (_event, opacity) => {
+            this.window.setOpacity(opacity)
+        })
+
+        ipcMain.on('window-set-progress-bar', (_event, value) => {
+            this.window.setProgressBar(value, { mode: value < 0 ? 'none' : 'normal' })
+        })
     }
 
     private destroy () {

app/package.json

@@ -10,49 +10,43 @@
   "main": "dist/main.js",
   "version": "1.0.0-alpha.1",
   "scripts": {
+    "postinstall": "patch-package",
     "build": "webpack --progress --color --display-modules",
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "^12.0.0",
-    "@angular/common": "^12.0.0",
-    "@angular/compiler": "^12.0.0",
-    "@angular/core": "^12.0.0",
-    "@angular/forms": "^12.0.0",
-    "@angular/platform-browser": "^12.0.0",
-    "@angular/platform-browser-dynamic": "^12.0.0",
-    "@electron/remote": "1.2.0",
-    "@ng-bootstrap/ng-bootstrap": "^9.1.1",
+    "@angular/cdk": "^12.2.9",
+    "@electron/remote": "2.0.1",
+    "@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.6.1",
     "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",
-    "ngx-toastr": "^14.0.0",
-    "node-pty": "^0.10.1",
     "npm": "6",
-    "rxjs": "^7.1.0",
-    "yargs": "^17.0.1",
-    "zone.js": "^0.11.4"
+    "rxjs": "^7.4.0",
+    "source-map-support": "^0.5.20",
+    "v8-compile-cache": "^2.3.0",
+    "yargs": "^17.2.1"
   },
   "optionalDependencies": {
+    "@tabby-gang/windows-blurbehind": "^3.0.0",
     "macos-native-processlist": "^2.0.0",
-    "serialport": "^9.2.0",
-    "windows-blurbehind": "^1.0.1",
-    "windows-native-registry": "^3.0.0",
-    "windows-process-tree": "^0.3.0"
+    "serialport": "^10.0.0",
+    "windows-native-registry": "^3.1.0",
+    "windows-process-tree": "^0.3.2"
   },
   "devDependencies": {
-    "@types/mz": "2.7.3",
-    "@types/node": "15.12.5",
+    "@types/mz": "2.7.4",
+    "@types/node": "16.0.1",
     "ngx-filesize": "^2.0.16",
-    "node-abi": "^2.30.0",
-    "source-map-support": "^0.5.19"
+    "patch-package": "^6.4.7"
   },
   "peerDependencies": {
     "tabby-community-color-schemes": "*",

app/patches/@serialport+bindings+10.0.0.patch

@@ -0,0 +1,14 @@
+diff --git a/node_modules/@serialport/bindings/src/serialport.cpp b/node_modules/@serialport/bindings/src/serialport.cpp
+index c48e150..00a5f5a 100644
+--- a/node_modules/@serialport/bindings/src/serialport.cpp
++++ b/node_modules/@serialport/bindings/src/serialport.cpp
+@@ -269,7 +269,8 @@ Napi::Value Drain(const Napi::CallbackInfo& info) {
+ }
+
+ inline SerialPortParity ToParityEnum(const Napi::String& napistr) {
+-  const char* str = napistr.Utf8Value().c_str();
++  auto tmp = napistr.Utf8Value();
++  const char* str = tmp.c_str();
+   size_t count = strlen(str);
+   SerialPortParity parity = SERIALPORT_PARITY_NONE;
+   if (!strncasecmp(str, "none", count)) {

app/src/entry.preload.ts

@@ -1,3 +1,4 @@
+import 'v8-compile-cache'
 import '../lib/lru'
 import 'source-sans-pro/source-sans-pro.css'
 import 'source-code-pro/source-code-pro.css'

app/src/entry.ts

@@ -5,13 +5,15 @@ import 'rxjs'
 import './global.scss'
 import './toastr.scss'
 
+// Importing before @angular/*
+import { findPlugins, initModuleLookup, loadPlugins } from './plugins'
+
 import { enableProdMode, NgModuleRef, ApplicationRef } from '@angular/core'
 import { enableDebugTools } from '@angular/platform-browser'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 import { ipcRenderer } from 'electron'
 
 import { getRootModule } from './app.module'
-import { findPlugins, initModuleLookup, loadPlugins } from './plugins'
 import { BootstrapData, BOOTSTRAP_DATA, PluginInfo } from '../../tabby-core/src/api/mainProcess'
 
 // Always land on the start view

app/src/global.scss

@@ -2,6 +2,7 @@ body {
     min-height: 100vh;
     overflow: hidden;
     background: #1D272D;
+    -webkit-font-smoothing: antialiased;
 }
 
 .modal-dialog, .modal-backdrop, .no-drag {
@@ -16,19 +17,22 @@ body {
     display: none;
 }
 
-.btn {
-    display: inline-flex;
-    align-items: center;
-    flex-wrap: nowrap;
+a, button {
+    &.btn {
+        display: inline-flex;
+        align-items: center;
+        flex-wrap: nowrap;
 
-    & > svg {
-        pointer-events: none;
+        & > svg {
+            pointer-events: none;
+            width: 16px;
+            height: 16px;
+        }
     }
 }
 
 .form-line {
     display: flex;
-    border-top: 1px solid rgba(0, 0, 0, 0.2);
     align-items: center;
     padding: 10px 0;
     margin: 0;
@@ -115,7 +119,8 @@ ngb-typeahead-window {
 
     .hover-reveal-parent:hover &,
     *:hover > &,
-    &:hover {
+    &:hover,
+    &.show {
       opacity: 1;
     }
 }
@@ -158,3 +163,35 @@ ngb-typeahead-window {
     text-overflow: ellipsis;
     overflow: hidden;
 }
+
+.list-group-item > button {
+    margin: -7px 0;
+}
+
+.content-box {
+    max-width: 600px;
+}
+
+
+// Windows high contrast mode
+@media screen and (forced-colors: active) {
+    .custom-switch .custom-control-label::before {
+        background: buttonface;
+    }
+
+    .custom-switch .custom-control-label::after {
+        background: buttontext;
+    }
+
+    .custom-switch .custom-control-input:checked ~ .custom-control-label::before {
+        background: activetext;
+    }
+
+    .custom-switch .custom-control-input:checked ~ .custom-control-label::after {
+        background: canvas;
+    }
+
+    color-scheme-preview, terminaltab > .content {
+        forced-color-adjust: none;
+    }
+}

app/src/pluginBlacklist.ts

@@ -0,0 +1,6 @@
+export const PLUGIN_BLACKLIST = [
+    'terminus-shell-selector', // superseded by profiles
+    'terminus-scrollbar', // now useless
+    'terminus-clickable-links', // now bundled with Tabby
+    'tabby-clickable-links', // now bundled with Tabby
+]

app/src/plugins.ts

@@ -2,6 +2,7 @@ import * as fs from 'mz/fs'
 import * as path from 'path'
 import * as remote from '@electron/remote'
 import { PluginInfo } from '../../tabby-core/src/api/mainProcess'
+import { PLUGIN_BLACKLIST } from './pluginBlacklist'
 
 const nodeModule = require('module') // eslint-disable-line @typescript-eslint/no-var-requires
 
@@ -18,28 +19,47 @@ function normalizePath (p: string): string {
 
 const builtinPluginsPath = process.env.TABBY_DEV ? path.dirname(remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
 
+const cachedBuiltinModules = {
+    '@angular/animations': require('@angular/animations'),
+    '@angular/common': require('@angular/common'),
+    '@angular/compiler': require('@angular/compiler'),
+    '@angular/core': require('@angular/core'),
+    '@angular/forms': require('@angular/forms'),
+    '@angular/platform-browser': require('@angular/platform-browser'),
+    '@angular/platform-browser/animations': require('@angular/platform-browser/animations'),
+    '@angular/platform-browser-dynamic': require('@angular/platform-browser-dynamic'),
+    '@ng-bootstrap/ng-bootstrap': require('@ng-bootstrap/ng-bootstrap'),
+    'ngx-toastr': require('ngx-toastr'),
+    rxjs: require('rxjs'),
+    'rxjs/operators': require('rxjs/operators'),
+    'zone.js/dist/zone.js': require('zone.js/dist/zone.js'),
+}
+
 const builtinModules = [
-    '@angular/animations',
-    '@angular/common',
-    '@angular/compiler',
-    '@angular/core',
-    '@angular/forms',
-    '@angular/platform-browser',
-    '@angular/platform-browser-dynamic',
-    '@ng-bootstrap/ng-bootstrap',
-    'ngx-toastr',
-    'rxjs',
-    'rxjs/operators',
+    ...Object.keys(cachedBuiltinModules),
     'tabby-core',
     'tabby-local',
     'tabby-settings',
     'tabby-terminal',
-    'zone.js/dist/zone.js',
 ]
 
-export type ProgressCallback = (current: number, total: number) => void // eslint-disable-line @typescript-eslint/no-type-alias
+const originalRequire = (global as any).require
+;(global as any).require = function (query: string) {
+    if (cachedBuiltinModules[query]) {
+        return cachedBuiltinModules[query]
+    }
+    return originalRequire.apply(this, [query])
+}
 
-const cachedBuiltinModules = {}
+const originalModuleRequire = nodeModule.prototype.require
+nodeModule.prototype.require = function (query: string) {
+    if (cachedBuiltinModules[query]) {
+        return cachedBuiltinModules[query]
+    }
+    return originalModuleRequire.call(this, query)
+}
+
+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)))
@@ -57,24 +77,10 @@ export function initModuleLookup (userPluginsPath: string): void {
     }
 
     builtinModules.forEach(m => {
-        cachedBuiltinModules[m] = nodeRequire(m)
+        if (!cachedBuiltinModules[m]) {
+            cachedBuiltinModules[m] = nodeRequire(m)
+        }
     })
-
-    const originalRequire = (global as any).require
-    ;(global as any).require = function (query: string) {
-        if (cachedBuiltinModules[query]) {
-            return cachedBuiltinModules[query]
-        }
-        return originalRequire.apply(this, [query])
-    }
-
-    const originalModuleRequire = nodeModule.prototype.require
-    nodeModule.prototype.require = function (query: string) {
-        if (cachedBuiltinModules[query]) {
-            return cachedBuiltinModules[query]
-        }
-        return originalModuleRequire.call(this, query)
-    }
 }
 
 export async function findPlugins (): Promise<PluginInfo[]> {
@@ -104,7 +110,7 @@ export async function findPlugins (): Promise<PluginInfo[]> {
             })
         }
         for (const packageName of pluginNames) {
-            if (packageName.startsWith(PREFIX) || packageName.startsWith(LEGACY_PREFIX)) {
+            if ((packageName.startsWith(PREFIX) || packageName.startsWith(LEGACY_PREFIX)) && !PLUGIN_BLACKLIST.includes(packageName)) {
                 candidateLocations.push({ pluginDir, packageName })
             }
         }

app/src/preload.scss

@@ -7,7 +7,8 @@
   height: 100vh;
   display: flex;
   animation: 0.5s ease-out fadeIn;
-  background: radial-gradient(#3a66820a 0%,  #000e17 30%, black 100%);
+  background-image: radial-gradient(#3a66820a 0%,  #000e17 30%, black 100%);
+  background-color: black;
 
   &>div {
     width: 200px;

app/tsconfig.json

@@ -6,6 +6,7 @@
         "declaration": false,
         "noImplicitAny": false,
         "removeComments": false,
+        "esModuleInterop": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "sourceMap": true,

app/tsconfig.main.json

@@ -3,11 +3,13 @@
         "baseUrl": "./lib",
         "module": "commonjs",
         "target": "es2017",
+        "moduleResolution": "node",
         "declaration": false,
         "noImplicitAny": false,
         "removeComments": false,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
+        "esModuleInterop": true,
         "sourceMap": true,
         "noUnusedParameters": true,
         "noImplicitReturns": true,

app/webpack.config.js

@@ -31,52 +31,29 @@ module.exports = {
             {
                 test: /\.ts$/,
                 use: {
-                    loader: 'awesome-typescript-loader',
+                    loader: 'ts-loader',
                     options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
+                        configFile: path.resolve(__dirname, 'tsconfig.json'),
                     },
                 },
             },
             { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
             { test: /\.css$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
             {
-                test: /\.(png|svg)$/,
-                use: {
-                    loader: 'url-loader',
-                    options: {
-                        limit: 999999,
-                    },
-                },
-            },
-            {
-                test: /\.(ttf|eot|otf|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-                use: {
-                    loader: 'file-loader',
-                    options: {
-                        name: 'fonts/[name].[ext]',
-                    },
-                },
+                test: /\.(png|svg|ttf|eot|otf|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+                type: 'asset',
             },
         ],
     },
     externals: {
-        '@angular/core': 'commonjs @angular/core',
-        '@angular/compiler': 'commonjs @angular/compiler',
-        '@angular/platform-browser': 'commonjs @angular/platform-browser',
-        '@angular/platform-browser-dynamic': 'commonjs @angular/platform-browser-dynamic',
-        '@angular/forms': 'commonjs @angular/forms',
-        '@angular/common': 'commonjs @angular/common',
-        '@ng-bootstrap/ng-bootstrap': 'commonjs @ng-bootstrap/ng-bootstrap',
         '@electron/remote': 'commonjs @electron/remote',
+        'v8-compile-cache': 'commonjs v8-compile-cache',
         child_process: 'commonjs child_process',
         electron: 'commonjs electron',
         fs: 'commonjs fs',
-        'ngx-toastr': 'commonjs ngx-toastr',
         module: 'commonjs module',
         mz: 'commonjs mz',
         path: 'commonjs path',
-        rxjs: 'commonjs rxjs',
-        'zone.js': 'commonjs zone.js/dist/zone.js',
     },
     plugins: [
         new webpack.optimize.ModuleConcatenationPlugin(),

app/webpack.main.config.js

@@ -25,34 +25,33 @@ module.exports = {
             {
                 test: /\.ts$/,
                 use: {
-                    loader: 'awesome-typescript-loader',
+                    loader: 'ts-loader',
                     options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.main.json'),
+                        configFile: path.resolve(__dirname, 'tsconfig.main.json'),
                     },
                 },
             },
         ],
     },
     externals: {
+        'v8-compile-cache': 'commonjs v8-compile-cache',
         'any-promise': 'commonjs any-promise',
         electron: 'commonjs electron',
         'electron-config': 'commonjs electron-config',
         'electron-debug': 'commonjs electron-debug',
         'electron-promise-ipc': 'commonjs electron-promise-ipc',
-        'electron-vibrancy': 'commonjs electron-vibrancy',
         fs: 'commonjs fs',
         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',
-        rxjs: 'commonjs rxjs',
-        'rxjs/operators': 'commonjs rxjs/operators',
         util: 'commonjs util',
         'source-map-support': 'commonjs source-map-support',
         'windows-swca': 'commonjs windows-swca',
         'windows-native-registry': 'commonjs windows-native-registry',
-        'windows-blurbehind': 'commonjs windows-blurbehind',
+        '@tabby-gang/windows-blurbehind': 'commonjs @tabby-gang/windows-blurbehind',
         'yargs/yargs': 'commonjs yargs/yargs',
     },
     plugins: [

electron-builder.yml

@@ -46,7 +46,7 @@ nsis:
   artifactName: tabby-${version}-setup.${ext}
   installerIcon: "./build/windows/icon.ico"
   allowToChangeInstallationDirectory: true
-
+  shortcutName: Tabby Terminal
 mac:
   category: public.app-category.video
   icon: "./build/mac/icon.icns"
@@ -85,7 +85,6 @@ deb:
   - gnome-keyring
   - libnotify4
   - libsecret-1-0
-  - libappindicator1
   - libxtst6
   - libnss3
   afterInstall: build/linux/after-install.tpl

firebase.json

@@ -0,0 +1,10 @@
+{
+  "hosting": {
+    "public": "docs/api",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ]
+  }
+}

package.json

@@ -1,40 +1,53 @@
 {
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.15.3",
-    "@sentry/cli": "^1.64.2",
-    "@sentry/electron": "^2.5.0",
-    "@terminus-term/to-string-loader": "1.1.7-beta.1",
+    "@angular/animations": "^12.0.0",
+    "@angular/common": "^12.0.0",
+    "@angular/compiler": "^12.0.0",
+    "@angular/core": "^12.0.0",
+    "@angular/forms": "^12.0.0",
+    "@angular/platform-browser": "^12.0.0",
+    "@angular/platform-browser-dynamic": "^12.0.0",
+    "@fortawesome/fontawesome-free": "^6.0.0-beta.2",
+    "@ng-bootstrap/ng-bootstrap": "^10.0.0",
+    "@sentry/cli": "^1.71.0",
+    "@sentry/electron": "^2.5.4",
+    "@tabby-gang/to-string-loader": "^1.1.7-beta.2",
+    "@types/deep-equal": "1.0.1",
     "@types/electron-config": "^3.2.2",
     "@types/electron-debug": "^2.1.0",
-    "@types/fs-extra": "^9.0.11",
-    "@types/js-yaml": "^4.0.1",
-    "@types/node": "15.12.5",
-    "@types/webpack-env": "^1.16.0",
-    "@typescript-eslint/eslint-plugin": "^4.25.0",
-    "@typescript-eslint/parser": "^4.28.0",
+    "@types/fs-extra": "^9.0.12",
+    "@types/js-yaml": "^4.0.4",
+    "@types/node": "16.0.1",
+    "@types/sortablejs": "^1.10.7",
+    "@types/webpack-env": "^1.16.2",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
     "apply-loader": "2.0.0",
-    "awesome-typescript-loader": "^5.2.1",
-    "compare-versions": "^3.6.0",
-    "core-js": "^3.14.0",
+    "axios": "^0.21.1",
+    "clone-deep": "^4.0.1",
+    "compare-versions": "^4",
+    "core-js": "^3.18.2",
     "cross-env": "7.0.3",
-    "css-loader": "5.2.6",
-    "electron": "13.1.4",
-    "electron-builder": "22.10.5",
+    "css-loader": "^6.5.1",
+    "deep-equal": "2.0.5",
+    "electron": "16.0.5",
+    "electron-builder": "^22.14.5",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",
-    "electron-notarize": "^1.0.0",
-    "electron-rebuild": "^2.3.5",
-    "eslint": "^7.29.0",
-    "eslint-plugin-import": "^2.23.4",
+    "electron-notarize": "^1.1.1",
+    "electron-rebuild": "^3.2.5",
+    "eslint": "^7.32.0",
     "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",
-    "node-abi": "^2.30.0",
-    "node-sass": "^6.0.1",
-    "npmlog": "4.1.2",
+    "macos-release": "^3.0.1",
+    "ngx-sortablejs": "^11.1.0",
+    "ngx-toastr": "^14.0.0",
+    "node-abi": "^3.2.0",
+    "node-sass": "^7.0.0",
+    "npmlog": "5.0.1",
     "npx": "^10.2.2",
     "patch-package": "^6.4.7",
     "pug": "^3.0.2",
@@ -43,37 +56,44 @@
     "pug-loader": "^2.4.0",
     "pug-static-loader": "2.0.0",
     "raw-loader": "4.0.2",
-    "sass-loader": "^12.1.0",
+    "sass-loader": "^12.3.0",
+    "shell-quote": "^1.7.3",
     "shelljs": "0.8.4",
+    "slugify": "^1.6.1",
+    "sortablejs": "^1.14.0",
     "source-code-pro": "^2.38.0",
+    "source-map-loader": "^3.0.0",
     "source-sans-pro": "3.6.0",
-    "style-loader": "^3.0.0",
+    "ssh2": "^1.5.0",
+    "style-loader": "^3.2.1",
     "svg-inline-loader": "^0.8.2",
-    "tslib": "^2.3.0",
-    "typedoc": "^0.21.2",
-    "typescript": "^4.2.4",
-    "url-loader": "^4.1.1",
+    "ts-loader": "^9.2.3",
+    "tslib": "^2.3.1",
+    "typedoc": "^0.22.10",
+    "typescript": "^4.3.5",
+    "utils-decorators": "^1.10.4",
     "val-loader": "4.0.0",
-    "webpack": "^5.41.0",
-    "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-cli": "^4.7.0",
-    "yaml-loader": "0.6.0"
+    "webpack": "^5.64.4",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-cli": "^4.9.1",
+    "yaml-loader": "0.6.0",
+    "zone.js": "^0.11.4"
   },
   "resolutions": {
-    "*/node-abi": "^2.30.0",
+    "lzma-native": "^8.0.0",
+    "*/node-abi": "^3.5.0",
     "**/graceful-fs": "^4.2.4"
   },
   "scripts": {
-    "build": "npm run build:typings && webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config tabby-core/webpack.config.js && webpack --color --config tabby-settings/webpack.config.js && webpack --color --config tabby-terminal/webpack.config.js && webpack --color --config tabby-local/webpack.config.js && webpack --color --config tabby-plugin-manager/webpack.config.js && webpack --color --config tabby-community-color-schemes/webpack.config.js && webpack --color --config tabby-ssh/webpack.config.js && webpack --color --config tabby-serial/webpack.config.js && webpack --color --config tabby-electron/webpack.config.js && webpack --color --config tabby-web/webpack.config.js && webpack --color --config web/webpack.config.js",
+    "build": "npm run build:typings && node scripts/build-modules.js",
     "build:typings": "node scripts/build-typings.js",
     "watch": "cross-env TABBY_DEV=1 webpack --progress --color --watch",
     "start": "cross-env TABBY_DEV=1 electron app --debug --inspect",
     "start:prod": "electron app --debug",
     "prod": "cross-env TABBY_DEV=1 electron app",
-    "docs": "typedoc --out docs/api --tsconfig tabby-core/src/tsconfig.typings.json tabby-core/src/index.ts && typedoc --out docs/api/terminal --tsconfig tabby-terminal/tsconfig.typings.json tabby-terminal/src/index.ts && typedoc --out docs/api/local --tsconfig tabby-local/tsconfig.typings.json tabby-local/src/index.ts && typedoc --out docs/api/settings --tsconfig tabby-settings/tsconfig.typings.json tabby-settings/src/index.ts",
+    "docs": "node scripts/build-docs.js",
     "lint": "eslint --ext ts */src */lib",
-    "postinstall": "node ./scripts/install-deps.js",
-    "patch": "patch-package; cd web; patch-package"
+    "postinstall": "patch-package && node ./scripts/install-deps.js"
   },
   "private": true
 }

patches/app-builder-lib+22.10.5.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js
-index 25a159e..d8a0262 100644
---- a/node_modules/app-builder-lib/out/appInfo.js
-+++ b/node_modules/app-builder-lib/out/appInfo.js
-@@ -165,7 +165,7 @@ class AppInfo {
-   get linuxPackageName() {
-     const name = this.name; // https://github.com/electron-userland/electron-builder/issues/2963
-
--    return name.startsWith("@") ? this.sanitizedProductName : name;
-+    return 'tabby-terminal'
-   }
-
-   get sanitizedName() {

patches/app-builder-lib+22.14.5.patch

@@ -0,0 +1,15 @@
+diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js
+index 363f32c..a0434a9 100644
+--- a/node_modules/app-builder-lib/out/appInfo.js
++++ b/node_modules/app-builder-lib/out/appInfo.js
+@@ -100,9 +100,7 @@ class AppInfo {
+         return this.info.metadata.name;
+     }
+     get linuxPackageName() {
+-        const name = this.name;
+-        // https://github.com/electron-userland/electron-builder/issues/2963
+-        return name.startsWith("@") ? this.sanitizedProductName : name;
++        return 'tabby-terminal'
+     }
+     get sanitizedName() {
+         return filename_1.sanitizeFileName(this.name);

scripts/build-docs.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+const sh = require('shelljs')
+const vars = require('./vars')
+const log = require('npmlog')
+
+vars.packagesWithDocs.forEach(([dest, src]) => {
+    log.info('docs', src)
+    sh.exec(`yarn typedoc --out docs/api/${dest} --tsconfig ${src}/tsconfig.typings.json ${src}/src/index.ts`)
+})

scripts/build-modules.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+const vars = require('./vars')
+const log = require('npmlog')
+const webpack = require('webpack')
+const { promisify } = require('util')
+
+const configs = [
+    '../app/webpack.main.config.js',
+    '../app/webpack.config.js',
+    ...vars.allPackages.map(x => `../${x}/webpack.config.js`),
+]
+
+;(async () => {
+    for (const c of configs) {
+        log.info('build', c)
+        const stats = await promisify(webpack)(require(c))
+        console.log(stats.toString({ colors: true }))
+        if (stats.hasErrors()) {
+            process.exit(1)
+        }
+    }
+})()

scripts/generate-icon-metadata.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+const jsYaml = require('js-yaml')
+const fs = require('fs')
+const path = require('path')
+const metadata = jsYaml.load(fs.readFileSync(path.resolve(__dirname, '../node_modules/@fortawesome/fontawesome-free/metadata/icons.yml')))
+
+let result = {}
+for (let key in metadata) {
+    result[key] = metadata[key].styles.map(x => x[0])
+}
+
+fs.writeFileSync(path.resolve(__dirname, '../tabby-core/src/icons.json'), JSON.stringify(result))

scripts/install-deps.js

@@ -4,8 +4,11 @@ const path = require('path')
 const vars = require('./vars')
 const log = require('npmlog')
 
-const localBinPath = path.resolve(__dirname, '../node_modules/.bin');
-const npx = `${localBinPath}/npx`;
+const localBinPath = path.resolve(__dirname, '../node_modules/.bin')
+const npx = `${localBinPath}/npx`
+
+log.info('patch')
+sh.exec(`${npx} patch-package`)
 
 log.info('deps', 'app')
 
@@ -15,19 +18,20 @@ sh.cd('..')
 
 sh.cd('web')
 sh.exec(`${npx} yarn install --force`)
+sh.exec(`${npx} patch-package`)
 sh.cd('..')
 
-vars.builtinPlugins.forEach(plugin => {
-  log.info('deps', plugin)
-  sh.cd(plugin)
-  sh.exec(`${npx} yarn install --force`)
-  sh.cd('..')
+vars.allPackages.forEach(plugin => {
+    log.info('deps', plugin)
+    sh.cd(plugin)
+    sh.exec(`${npx} yarn install --force`)
+    sh.cd('..')
 })
 
 if (['darwin', 'linux'].includes(process.platform)) {
-  sh.cd('node_modules')
-  for (let x of vars.builtinPlugins) {
-    sh.ln('-fs', '../' + x, x)
-  }
-  sh.cd('..')
+    sh.cd('node_modules')
+    for (let x of vars.builtinPlugins) {
+        sh.ln('-fs', '../' + x, x)
+    }
+    sh.cd('..')
 }

scripts/publish-plugins.js

@@ -2,11 +2,12 @@
 const sh = require('shelljs')
 const vars = require('./vars')
 const log = require('npmlog')
+const { execSync } = require('child_process')
 
-vars.builtinPlugins.forEach(plugin => {
+vars.allPackages.forEach(plugin => {
     log.info('bump', plugin)
     sh.cd(plugin)
     sh.exec('npm --no-git-tag-version version ' + vars.version)
-    sh.exec('npm publish')
+    execSync('npm publish', { stdio: 'inherit' })
     sh.cd('..')
 })

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',
     ]) {

scripts/vars.js

@@ -5,28 +5,44 @@ const childProcess = require('child_process')
 
 const electronInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../node_modules/electron/package.json')))
 
-exports.version = childProcess.execSync('git describe --tags', {encoding:'utf-8'})
+exports.version = childProcess.execSync('git describe --tags', { encoding:'utf-8' })
 exports.version = exports.version.substring(1).trim()
 exports.version = exports.version.replace('-', '-c')
 
 if (exports.version.includes('-c')) {
-  exports.version = semver.inc(exports.version, 'prepatch').replace('-0', '-nightly.0')
+    exports.version = semver.inc(exports.version, 'prepatch').replace('-0', `-nightly.${process.env.REV ?? 0}`)
 }
 
 exports.builtinPlugins = [
-  'tabby-core',
-  'tabby-settings',
-  'tabby-terminal',
-  'tabby-electron',
-  'tabby-local',
-  'tabby-web',
-  'tabby-community-color-schemes',
-  'tabby-plugin-manager',
-  'tabby-ssh',
-  'tabby-serial',
+    'tabby-core',
+    'tabby-settings',
+    'tabby-terminal',
+    'tabby-web',
+    'tabby-community-color-schemes',
+    'tabby-ssh',
+    'tabby-serial',
+    'tabby-telnet',
+    'tabby-electron',
+    'tabby-local',
+    'tabby-plugin-manager',
+    'tabby-linkifier',
 ]
+
+exports.packagesWithDocs = [
+    ['.', 'tabby-core'],
+    ['terminal', 'tabby-terminal'],
+    ['local', 'tabby-local'],
+    ['settings', 'tabby-settings'],
+]
+
+exports.allPackages = [
+    ...exports.builtinPlugins,
+    'web',
+    'tabby-web-demo',
+]
+
 exports.bundledModules = [
-  '@angular',
-  '@ng-bootstrap',
+    '@angular',
+    '@ng-bootstrap',
 ]
 exports.electronVersion = electronInfo.version

tabby-community-color-schemes/.gitignore

@@ -1 +0,0 @@
-dist

tabby-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-community-color-schemes",
-  "version": "1.0.144",
+  "version": "1.0.165-nightly.0",
   "description": "Community color schemes for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-core/.gitignore

@@ -1 +0,0 @@
-dist

tabby-core/README.md

@@ -1,7 +1,13 @@
-Tabby Core Plugin
---------------------
+# Tabby Core Plugin
 
-See also: [Settings plugin API](./settings/), [Terminal plugin API](./terminal/), [Local terminal API](./local/)
+See also:
+
+* [Settings plugin API](./settings/)
+* [Terminal plugin API](./terminal/)
+* [Local terminal API](./local/)
+* [Linkifier plugin API](./linkifier/)
+
+This module provides:
 
 * tabbed interface services
 * toolbar UI

tabby-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-core",
-  "version": "1.0.144",
+  "version": "1.0.165-nightly.0",
   "description": "Tabby core",
   "keywords": [
     "tabby-builtin-plugin"
@@ -17,16 +17,10 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@types/js-yaml": "^4.0.0",
     "bootstrap": "^4.1.3",
-    "clone-deep": "^4.0.1",
-    "core-js": "^3.1.2",
-    "deep-equal": "^2.0.5",
     "deepmerge": "^4.1.1",
-    "electron-updater": "^4.0.6",
     "js-yaml": "^4.0.0",
     "mixpanel": "^0.13.0",
-    "ng2-dnd": "^5.0.2",
     "ngx-filesize": "^2.0.16",
     "ngx-perfect-scrollbar": "^10.1.0",
     "readable-stream": "3.6.0",

tabby-core/src/api/index.ts

@@ -1,8 +1,8 @@
 export { BaseComponent, SubscriptionContainer } from '../components/base.component'
 export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
 export { TabHeaderComponent } from '../components/tabHeader.component'
-export { SplitTabComponent, SplitContainer } from '../components/splitTab.component'
-export { TabRecoveryProvider, RecoveredTab, RecoveryToken } from './tabRecovery'
+export { SplitTabComponent, SplitContainer, SplitDirection, SplitOrientation } from '../components/splitTab.component'
+export { TabRecoveryProvider, RecoveryToken } from './tabRecovery'
 export { ToolbarButtonProvider, ToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
 export { HotkeyProvider, HotkeyDescription } from './hotkeyProvider'
@@ -16,18 +16,23 @@ export { BootstrapData, PluginInfo, BOOTSTRAP_DATA } from './mainProcess'
 export { HostWindowService } from './hostWindow'
 export { HostAppService, Platform } from './hostApp'
 export { FileProvider } from './fileProvider'
+export { ProfileProvider, Profile, PartialProfile, ProfileSettingsComponent } from './profileProvider'
+export { PromptModalComponent } from '../components/promptModal.component'
 
 export { AppService } from '../services/app.service'
-export { ConfigService } from '../services/config.service'
+export { ConfigService, configMerge, ConfigProxy } from '../services/config.service'
 export { DockingService, Screen } from '../services/docking.service'
 export { Logger, ConsoleLogger, LogService } from '../services/log.service'
 export { HomeBaseService } from '../services/homeBase.service'
 export { HotkeysService } from '../services/hotkeys.service'
+export { KeyEventData, KeyName, Keystroke, altKeyName, metaKeyName } from '../services/hotkeys.util'
 export { NotificationsService } from '../services/notifications.service'
 export { ThemesService } from '../services/themes.service'
+export { ProfilesService } from '../services/profiles.service'
 export { SelectorService } from '../services/selector.service'
-export { TabsService } from '../services/tabs.service'
+export { TabRecoveryService } from '../services/tabRecovery.service'
+export { TabsService, NewTabParameters, TabComponentType } from '../services/tabs.service'
 export { UpdaterService } from '../services/updater.service'
-export { VaultService, Vault, VaultSecret, VAULT_SECRET_TYPE_FILE } from '../services/vault.service'
+export { VaultService, Vault, VaultSecret, VaultFileSecret, VAULT_SECRET_TYPE_FILE, StoredVault, VaultSecretKey } from '../services/vault.service'
 export { FileProvidersService } from '../services/fileProviders.service'
 export * from '../utils'

tabby-core/src/api/mainProcess.ts

@@ -16,7 +16,7 @@ export interface PluginInfo {
 export interface BootstrapData {
     config: Record<string, any>
     executable: string
-    isFirstWindow: boolean
+    isMainWindow: boolean
     windowID: number
     installedPlugins: PluginInfo[]
     userPluginsPath: string

tabby-core/src/api/platform.ts

@@ -13,6 +13,7 @@ export interface MessageBoxOptions {
     detail?: string
     buttons: string[]
     defaultId?: number
+    cancelId?: number
 }
 
 export interface MessageBoxResult {
@@ -21,6 +22,7 @@ export interface MessageBoxResult {
 
 export abstract class FileTransfer {
     abstract getName (): string
+    abstract getMode (): number
     abstract getSize (): number
     abstract close (): void
 
@@ -46,6 +48,9 @@ export abstract class FileTransfer {
     }
 
     protected increaseProgress (bytes: number): void {
+        if (!bytes) {
+            return
+        }
         this.completedBytes += bytes
         this.lastChunkSpeed = bytes * 1000 / (Date.now() - this.lastChunkStartTime)
         this.lastChunkStartTime = Date.now()
@@ -95,7 +100,7 @@ export abstract class PlatformService {
     abstract loadConfig (): Promise<string>
     abstract saveConfig (content: string): Promise<void>
 
-    abstract startDownload (name: string, size: number): Promise<FileDownload|null>
+    abstract startDownload (name: string, mode: number, size: number): Promise<FileDownload|null>
     abstract startUpload (options?: FileUploadOptions): Promise<FileUpload[]>
 
     startUploadFromDragEvent (event: DragEvent, multiple = false): FileUpload[] {
@@ -188,6 +193,10 @@ export class HTMLFileUpload extends FileUpload {
         return this.file.name
     }
 
+    getMode (): number {
+        return 0o644
+    }
+
     getSize (): number {
         return this.file.size
     }

tabby-core/src/api/profileProvider.ts

@@ -0,0 +1,60 @@
+/* eslint-disable @typescript-eslint/no-type-alias */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-empty-function */
+import { BaseTabComponent } from '../components/baseTab.component'
+import { NewTabParameters } from '../services/tabs.service'
+
+export interface Profile {
+    id: string
+    type: string
+    name: string
+    group?: string
+    options: any
+
+    icon?: string
+    color?: string
+    disableDynamicTitle: boolean
+
+    weight: number
+    isBuiltin: boolean
+    isTemplate: boolean
+}
+
+export type PartialProfile<T extends Profile> = Omit<Omit<Omit<{
+    [K in keyof T]?: T[K]
+}, 'options'>, 'type'>, 'name'> & {
+    type: string
+    name: string
+    options?: {
+        [K in keyof T['options']]?: T['options'][K]
+    }
+}
+
+export interface ProfileSettingsComponent<P extends Profile> {
+    profile: P
+    save?: () => void
+}
+
+export abstract class ProfileProvider<P extends Profile> {
+    id: string
+    name: string
+    supportsQuickConnect = false
+    settingsComponent?: new (...args: any[]) => ProfileSettingsComponent<P>
+    configDefaults = {}
+
+    abstract getBuiltinProfiles (): Promise<PartialProfile<P>[]>
+
+    abstract getNewTabParameters (profile: P): Promise<NewTabParameters<BaseTabComponent>>
+
+    getSuggestedName (profile: PartialProfile<P>): string|null {
+        return null
+    }
+
+    abstract getDescription (profile: PartialProfile<P>): string
+
+    quickConnect (query: string): PartialProfile<P>|null {
+        return null
+    }
+
+    deleteProfile (profile: P): void { }
+}

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/api/tabRecovery.ts

@@ -1,17 +1,6 @@
 import deepClone from 'clone-deep'
-import { TabComponentType } from '../services/tabs.service'
-
-export interface RecoveredTab {
-    /**
-     * Component type to be instantiated
-     */
-    type: TabComponentType
-
-    /**
-     * Component instance inputs
-     */
-    options?: any
-}
+import { BaseTabComponent } from '../components/baseTab.component'
+import { NewTabParameters } from '../services/tabs.service'
 
 export interface RecoveryToken {
     [_: string]: any
@@ -35,19 +24,20 @@ export interface RecoveryToken {
  * }
  * ```
  */
-export abstract class TabRecoveryProvider {
+export abstract class TabRecoveryProvider <T extends BaseTabComponent> {
     /**
      * @param recoveryToken a recovery token found in the saved tabs list
      * @returns [[boolean]] whether this [[TabRecoveryProvider]] can recover a tab from this token
      */
 
     abstract applicableTo (recoveryToken: RecoveryToken): Promise<boolean>
+
     /**
      * @param recoveryToken a recovery token found in the saved tabs list
-     * @returns [[RecoveredTab]] descriptor containing tab type and component inputs
+     * @returns [[NewTabParameters]] descriptor containing tab type and component inputs
      *          or `null` if this token is from a different tab type or is not supported
      */
-    abstract recover (recoveryToken: RecoveryToken): Promise<RecoveredTab>
+    abstract recover (recoveryToken: RecoveryToken): Promise<NewTabParameters<T>>
 
     /**
      * @param recoveryToken a recovery token found in the saved tabs list

tabby-core/src/api/toolbarButtonProvider.ts

@@ -27,6 +27,10 @@ export interface ToolbarButton {
 
     /** @hidden */
     submenuItems?: ToolbarButton[]
+
+    showInToolbar?: boolean
+
+    showInStartPage?: boolean
 }
 
 /**

tabby-core/src/buttonProvider.ts

@@ -0,0 +1,53 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { Injectable } from '@angular/core'
+
+import { ToolbarButton, ToolbarButtonProvider } from './api/toolbarButtonProvider'
+import { HostAppService, Platform } from './api/hostApp'
+import { HotkeysService } from './services/hotkeys.service'
+import { ProfilesService } from './services/profiles.service'
+
+/** @hidden */
+@Injectable()
+export class ButtonProvider extends ToolbarButtonProvider {
+    constructor (
+        private hostApp: HostAppService,
+        private profilesService: ProfilesService,
+        hotkeys: HotkeysService,
+    ) {
+        super()
+        hotkeys.hotkey$.subscribe(hotkey => {
+            if (hotkey === 'profile-selector') {
+                this.activate()
+            }
+        })
+    }
+
+    async activate () {
+        const profile = await this.profilesService.showProfileSelector()
+        if (profile) {
+            this.profilesService.launchProfile(profile)
+        }
+    }
+
+    provide (): ToolbarButton[] {
+        return [
+            {
+                icon: this.hostApp.platform === Platform.Web
+                    ? require('./icons/plus.svg')
+                    : require('./icons/profiles.svg'),
+                title: 'Profiles and connections',
+                click: () => this.activate(),
+            },
+            ...this.profilesService.getRecentProfiles().map(profile => ({
+                icon: require('./icons/history.svg'),
+                title: profile.name,
+                showInToolbar: false,
+                showinStartPage: true,
+                click: async () => {
+                    const p = (await this.profilesService.getProfiles()).find(x => x.id === profile.id) ?? profile
+                    this.profilesService.launchProfile(p)
+                },
+            })),
+        ]
+    }
+}

tabby-core/src/cli.ts

@@ -1,6 +1,41 @@
 import { Injectable } from '@angular/core'
 import { HostAppService } from './api/hostApp'
 import { CLIHandler, CLIEvent } from './api/cli'
+import { HostWindowService } from './api/hostWindow'
+import { ProfilesService } from './services/profiles.service'
+
+@Injectable()
+export class ProfileCLIHandler extends CLIHandler {
+    firstMatchOnly = true
+    priority = 0
+
+    constructor (
+        private profiles: ProfilesService,
+        private hostWindow: HostWindowService,
+    ) {
+        super()
+    }
+
+    async handle (event: CLIEvent): Promise<boolean> {
+        const op = event.argv._[0]
+
+        if (op === 'profile') {
+            this.handleOpenProfile(event.argv.profileName)
+            return true
+        }
+        return false
+    }
+
+    private async handleOpenProfile (profileName: string) {
+        const profile = (await this.profiles.getProfiles()).find(x => x.name === profileName)
+        if (!profile) {
+            console.error('Requested profile', profileName, 'not found')
+            return
+        }
+        this.profiles.openNewTabForProfile(profile)
+        this.hostWindow.bringToFront()
+    }
+}
 
 @Injectable()
 export class LastCLIHandler extends CLIHandler {

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

@@ -1,6 +1,7 @@
 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"',
+  (dblclick)='hostWindow.toggleMaximize()',
+  [class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullscreen'
 )
 
 .content(
@@ -8,21 +9,19 @@ title-bar(
     [class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"',
     [class.tabs-on-side]='hasVerticalTabs()',
 )
-    .tab-bar
+    .tab-bar((dblclick)='hostWindow.toggleMaximize()')
         .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(
-            dnd-sortable-container,
-            [sortableData]='app.tabs',
+            cdkDropList,
+            [cdkDropListOrientation]='(config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "bottom") ? "horizontal" : "vertical"',
+            (cdkDropListDropped)='onTabsReordered($event)',
+            cdkAutoDropGroup='app-tabs'
         )
             tab-header(
                 *ngFor='let tab of app.tabs; let idx = index',
-                dnd-sortable,
-                [sortableIndex]='idx',
-                (onDragStart)='onTabDragStart()',
-                (onDragEnd)='onTabDragEnd()',
                 [index]='idx',
                 [tab]='tab',
                 [active]='tab == app.activeTab',
@@ -30,7 +29,7 @@ title-bar(
                 [@.disabled]='hasVerticalTabs()',
                 (click)='app.selectTab(tab)',
                 [class.fully-draggable]='hostApp.platform != Platform.macOS',
-                [class.drag-region]='hostApp.platform == Platform.macOS && !tabsDragging',
+                [class.drag-region]='hostApp.platform == Platform.macOS && !(app.tabDragActive$|async)',
             )
 
         .btn-group.background
@@ -58,15 +57,20 @@ title-bar(
                         div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
             .d-flex(
-                *ngIf='activeTransfers.length > 0',
                 ngbDropdown,
-                [(open)]='activeTransfersDropdownOpen'
+                container='body',
+                #activeTransfersDropdown='ngbDropdown'
             )
                 button.btn.btn-secondary.btn-tab-bar(
+                    *ngIf='activeTransfers.length > 0',
                     title='File transfers',
                     ngbDropdownToggle
-                ) !{require('../icons/download-solid.svg')}
-                transfers-menu(ngbDropdownMenu, [(transfers)]='activeTransfers')
+                ) !{require('../icons/transfers.svg')}
+                transfers-menu(
+                    ngbDropdownMenu,
+                    [(transfers)]='activeTransfers',
+                    (transfersChange)='onTransfersChange()'
+                )
 
         .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
 
@@ -109,6 +113,7 @@ title-bar(
         start-page.content-tab.content-tab-active(*ngIf='ready && app.tabs.length == 0')
 
         tab-body.content-tab(
+            #tabBodies,
             *ngFor='let tab of unsortedTabs',
             [class.content-tab-active]='tab == app.activeTab',
             [active]='tab == app.activeTab',

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

@@ -6,7 +6,6 @@
     overflow: hidden;
     user-select: none;
     -webkit-user-drag: none;
-    -webkit-font-smoothing: antialiased;
     will-change: transform;
     cursor: default;
     animation: 0.5s ease-out fadeIn;
@@ -132,6 +131,14 @@ $side-tab-width: 200px;
     window-controls {
         padding-left: 10px;
     }
+
+    .cdk-drag-animating {
+        transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+    }
+
+    .cdk-drop-list-dragging tab-header:not(.cdk-drag-placeholder) {
+        transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+    }
 }
 
 .content {

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

@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { Component, Inject, Input, HostListener, HostBinding } from '@angular/core'
+import { Component, Inject, Input, HostListener, HostBinding, ViewChildren, ViewChild } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'
 
 import { HostAppService, Platform } from '../api/hostApp'
 import { HotkeysService } from '../services/hotkeys.service'
@@ -12,6 +13,7 @@ import { UpdaterService } from '../services/updater.service'
 
 import { BaseTabComponent } from './baseTab.component'
 import { SafeModeModalComponent } from './safeModeModal.component'
+import { TabBodyComponent } from './tabBody.component'
 import { AppService, FileTransfer, HostWindowService, PlatformService, ToolbarButton, ToolbarButtonProvider } from '../api'
 
 /** @hidden */
@@ -57,14 +59,14 @@ export class AppRootComponent {
     @HostBinding('class.platform-darwin') platformClassMacOS = process.platform === 'darwin'
     @HostBinding('class.platform-linux') platformClassLinux = process.platform === 'linux'
     @HostBinding('class.no-tabs') noTabs = true
-    tabsDragging = false
+    @ViewChildren(TabBodyComponent) tabBodies: TabBodyComponent[]
+    @ViewChild('activeTransfersDropdown') activeTransfersDropdown: NgbDropdown
     unsortedTabs: BaseTabComponent[] = []
     updatesAvailable = false
     activeTransfers: FileTransfer[] = []
-    activeTransfersDropdownOpen = false
     private logger: Logger
 
-    private constructor (
+    constructor (
         private hotkeys: HotkeysService,
         private updater: UpdaterService,
         public hostWindow: HostWindowService,
@@ -80,7 +82,7 @@ export class AppRootComponent {
         this.logger = log.create('main')
         this.logger.info('v', platform.getAppVersion())
 
-        this.hotkeys.matchedHotkey.subscribe((hotkey: string) => {
+        this.hotkeys.hotkey$.subscribe((hotkey: string) => {
             if (hotkey.startsWith('tab-')) {
                 const index = parseInt(hotkey.split('-')[1])
                 if (index <= this.app.tabs.length) {
@@ -106,10 +108,13 @@ export class AppRootComponent {
                 if (hotkey === 'move-tab-right') {
                     this.app.moveSelectedTabRight()
                 }
-                if (hotkey === 'reopen-tab') {
-                    this.app.reopenLastTab()
+                if (hotkey === 'duplicate-tab') {
+                    this.app.duplicateTab(this.app.activeTab)
                 }
             }
+            if (hotkey === 'reopen-tab') {
+                this.app.reopenLastTab()
+            }
             if (hotkey === 'toggle-fullscreen') {
                 hostWindow.toggleFullscreen()
             }
@@ -126,16 +131,23 @@ export class AppRootComponent {
         this.app.tabOpened$.subscribe(tab => {
             this.unsortedTabs.push(tab)
             this.noTabs = false
+            this.app.emitTabDragEnded()
         })
 
-        this.app.tabClosed$.subscribe(tab => {
+        this.app.tabRemoved$.subscribe(tab => {
+            for (const tabBody of this.tabBodies) {
+                if (tabBody.tab === tab) {
+                    tabBody.detach()
+                }
+            }
             this.unsortedTabs = this.unsortedTabs.filter(x => x !== tab)
             this.noTabs = app.tabs.length === 0
+            this.app.emitTabDragEnded()
         })
 
         platform.fileTransferStarted$.subscribe(transfer => {
             this.activeTransfers.push(transfer)
-            this.activeTransfersDropdownOpen = true
+            this.activeTransfersDropdown.open()
         })
 
         config.ready$.toPromise().then(() => {
@@ -173,17 +185,6 @@ export class AppRootComponent {
         return this.config.store.appearance.tabsLocation === 'left' || this.config.store.appearance.tabsLocation === 'right'
     }
 
-    onTabDragStart () {
-        this.tabsDragging = true
-    }
-
-    onTabDragEnd () {
-        setTimeout(() => {
-            this.tabsDragging = false
-            this.app.emitTabsChanged()
-        })
-    }
-
     async generateButtonSubmenu (button: ToolbarButton) {
         if (button.submenu) {
             button.submenuItems = await button.submenu()
@@ -194,12 +195,24 @@ export class AppRootComponent {
         return submenuItems.some(x => !!x.icon)
     }
 
+    onTabsReordered (event: CdkDragDrop<BaseTabComponent[]>) {
+        moveItemInArray(this.app.tabs, event.previousIndex, event.currentIndex)
+        this.app.emitTabsChanged()
+    }
+
+    onTransfersChange () {
+        if (this.activeTransfers.length === 0) {
+            this.activeTransfersDropdown.close()
+        }
+    }
+
     private getToolbarButtons (aboveZero: boolean): ToolbarButton[] {
         let buttons: ToolbarButton[] = []
         this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
             buttons = buttons.concat(provider.provide())
         })
         return buttons
+            .filter(x => x.showInToolbar ?? true)
             .filter(button => (button.weight ?? 0) > 0 === aboveZero)
             .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight ?? 0) - (b.weight ?? 0))
     }

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

@@ -1,5 +1,5 @@
-import { Observable, Subject } from 'rxjs'
-import { ViewRef } from '@angular/core'
+import { Observable, Subject, distinctUntilChanged } from 'rxjs'
+import { EmbeddedViewRef, ViewContainerRef, ViewRef } from '@angular/core'
 import { RecoveryToken } from '../api/tabRecovery'
 import { BaseComponent } from './base.component'
 
@@ -52,6 +52,10 @@ export abstract class BaseTabComponent extends BaseComponent {
      * your tab state to be saved sooner
      */
     protected recoveryStateChangedHint = new Subject<void>()
+    protected viewContainer?: ViewContainerRef
+
+    /* @hidden */
+    viewContainerEmbeddedRef?: EmbeddedViewRef<any>
 
     private progressClearTimeout: number
     private titleChange = new Subject<string>()
@@ -61,10 +65,12 @@ export abstract class BaseTabComponent extends BaseComponent {
     private activity = new Subject<boolean>()
     private destroyed = new Subject<void>()
 
+    private _destroyCalled = false
+
     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 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 }
     get destroyed$ (): Observable<void> { return this.destroyed }
     get recoveryStateChangedHint$ (): Observable<void> { return this.recoveryStateChangedHint }
@@ -107,16 +113,20 @@ export abstract class BaseTabComponent extends BaseComponent {
      * Shows the acticity marker on the tab header
      */
     displayActivity (): void {
-        this.hasActivity = true
-        this.activity.next(true)
+        if (!this.hasActivity) {
+            this.hasActivity = true
+            this.activity.next(true)
+        }
     }
 
     /**
      * Removes the acticity marker from the tab header
      */
     clearActivity (): void {
-        this.hasActivity = false
-        this.activity.next(false)
+        if (this.hasActivity) {
+            this.hasActivity = false
+            this.activity.next(false)
+        }
     }
 
     /**
@@ -152,10 +162,29 @@ export abstract class BaseTabComponent extends BaseComponent {
         this.blurred.next()
     }
 
+    insertIntoContainer (container: ViewContainerRef): EmbeddedViewRef<any> {
+        this.viewContainerEmbeddedRef = container.insert(this.hostView) as EmbeddedViewRef<any>
+        this.viewContainer = container
+        return this.viewContainerEmbeddedRef
+    }
+
+    removeFromContainer (): void {
+        if (!this.viewContainer || !this.viewContainerEmbeddedRef) {
+            return
+        }
+        this.viewContainer.detach(this.viewContainer.indexOf(this.viewContainerEmbeddedRef))
+        this.viewContainerEmbeddedRef = undefined
+        this.viewContainer = undefined
+    }
+
     /**
      * Called before the tab is closed
      */
     destroy (skipDestroyedEvent = false): void {
+        if (this._destroyCalled) {
+            return
+        }
+        this._destroyCalled = true
         this.focused.complete()
         this.blurred.complete()
         this.titleChange.complete()
@@ -166,6 +195,7 @@ export abstract class BaseTabComponent extends BaseComponent {
             this.destroyed.next()
         }
         this.destroyed.complete()
+        this.hostView.destroy()
     }
 
     /** @hidden */

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

@@ -1,19 +1,19 @@
 .modal-body
     input.form-control(
-        [type]='password ? "password" : "text"', 
+        [type]='password ? "password" : "text"',
         autofocus,
-        [(ngModel)]='value', 
-        #input, 
-        [placeholder]='prompt', 
+        [(ngModel)]='value',
+        #input,
+        [placeholder]='prompt',
         (keyup.enter)='ok()',
         (keyup.esc)='cancel()',
     )
     .d-flex.align-items-start.mt-2
         checkbox(
             *ngIf='showRememberCheckbox',
-            [(ngModel)]='remember', 
+            [(ngModel)]='remember',
             text='Remember'
         )
         button.btn.btn-primary.ml-auto(
             (click)='ok()',
-        ) Enter
+        ) OK

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

@@ -2,5 +2,5 @@
     input.form-control(type='text', #input, [(ngModel)]='value', (keyup.enter)='save()', autofocus)
 
 .modal-footer
-    button.btn.btn-outline-primary((click)='save()') Save
-    button.btn.btn-outline-secondary((click)='close()') Cancel
+    button.btn.btn-primary((click)='save()') Save
+    button.btn.btn-secondary((click)='close()') Cancel

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

@@ -4,4 +4,4 @@
     pre {{error}}
 
 .modal-footer
-    button.btn.btn-outline-primary((click)='close()') Close
+    button.btn.btn-primary((click)='close()') Close

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

@@ -1,5 +1,5 @@
 .modal-body
-    input.form-control(
+    input.form-control.form-control-lg(
         type='text',
         [(ngModel)]='filter',
         autofocus,
@@ -7,20 +7,26 @@
         (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 fas fa-{{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}}
+                .no-wrap.badge.badge-secondary.text-muted.ml-auto(*ngIf='selectedIndex == i') Enter

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

@@ -7,6 +7,17 @@
     overflow: auto;
     border-top-left-radius: 0;
     border-top-right-radius: 0;
+    padding: 10px 15px;
+}
+
+.group-header {
+    padding: 0 1rem;
+    margin: 15px 0 10px;
+    font-weight: bold;
+
+    &:first-child {
+        margin-top: 5px;
+    }
 }
 
 .icon {
@@ -16,9 +27,14 @@
 
 .title {
     margin-left: 10px;
+    flex: none;
+}
+
+.description {
+    flex: 1 1 0;
 }
 
 input {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
+    border-radius: 0;
+    border: none;
 }

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,14 +23,17 @@ export class SelectorModalComponent<T> {
 
     ngOnInit (): void {
         this.onFilterChange()
+        this.hasGroups = this.options.some(x => x.group)
     }
 
     @HostListener('keyup', ['$event']) onKeyUp (event: KeyboardEvent): void {
         if (event.key === 'ArrowUp') {
             this.selectedIndex--
+            event.preventDefault()
         }
         if (event.key === 'ArrowDown') {
             this.selectedIndex++
+            event.preventDefault()
         }
         if (event.key === 'Enter') {
             this.selectOption(this.filteredOptions[this.selectedIndex])
@@ -48,15 +52,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 ?? (x.name + (x.description ?? '')).toLowerCase().includes(f))
+            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/selfPositioning.component.ts

@@ -0,0 +1,18 @@
+import { HostBinding, ElementRef } from '@angular/core'
+import { BaseComponent } from './base.component'
+
+export abstract class SelfPositioningComponent extends BaseComponent {
+    @HostBinding('style.left') cssLeft: string
+    @HostBinding('style.top') cssTop: string
+    @HostBinding('style.width') cssWidth: string | null
+    @HostBinding('style.height') cssHeight: string | null
+
+    constructor (protected element: ElementRef) { super() }
+
+    protected setDimensions (x: number, y: number, w: number, h: number, unit = '%'): void {
+        this.cssLeft = `${x}${unit}`
+        this.cssTop = `${y}${unit}`
+        this.cssWidth = w ? `${w}${unit}` : null
+        this.cssHeight = h ? `${h}${unit}` : null
+    }
+}

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

@@ -1,13 +1,13 @@
 import { Observable, Subject } from 'rxjs'
 import { Component, Injectable, ViewChild, ViewContainerRef, EmbeddedViewRef, AfterViewInit, OnDestroy } from '@angular/core'
 import { BaseTabComponent, BaseTabProcess } from './baseTab.component'
-import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from '../api/tabRecovery'
-import { TabsService } from '../services/tabs.service'
+import { TabRecoveryProvider, RecoveryToken } from '../api/tabRecovery'
+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
@@ -93,13 +93,13 @@ export class SplitContainer {
         return s
     }
 
-    async serialize (): Promise<RecoveryToken> {
+    async serialize (tabsRecovery: TabRecoveryService): Promise<RecoveryToken> {
         const children: any[] = []
         for (const child of this.children) {
             if (child instanceof SplitContainer) {
-                children.push(await child.serialize())
+                children.push(await child.serialize(tabsRecovery))
             } else {
-                children.push(await child.getRecoveryToken())
+                children.push(await tabsRecovery.getFullRecoveryToken(child))
             }
         }
         return {
@@ -123,6 +123,25 @@ export interface SplitSpannerInfo {
     index: number
 }
 
+/**
+ * Represents a tab drop zone
+ */
+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
  * You'll mainly encounter it inside [[AppService]].tabs
@@ -137,6 +156,21 @@ export interface SplitSpannerInfo {
             [index]='spanner.index'
             (change)='onSpannerAdjusted(spanner)'
         ></split-tab-spanner>
+        <split-tab-drop-zone
+            *ngFor='let dropZone of _dropZones'
+            [parent]='this'
+            [dropZone]='dropZone'
+            (tabDropped)='onTabDropped($event, dropZone)'
+        >
+        </split-tab-drop-zone>
+        <split-tab-pane-label
+            *ngFor='let tab of getAllTabs()'
+            cdkDropList
+            cdkAutoDropGroup='app-tabs'
+            [tab]='tab'
+            [parent]='this'
+        >
+        </split-tab-pane-label>
     `,
     styles: [require('./splitTab.component.scss')],
 })
@@ -157,6 +191,9 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
     /** @hidden */
     _spanners: SplitSpannerInfo[] = []
 
+    /** @hidden */
+    _dropZones: SplitDropZoneInfo[] = []
+
     /** @hidden */
     _allFocusMode = false
 
@@ -166,12 +203,19 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
     private viewRefs: Map<BaseTabComponent, EmbeddedViewRef<any>> = new Map()
 
     private tabAdded = new Subject<BaseTabComponent>()
+    private tabAdopted = new Subject<BaseTabComponent>()
     private tabRemoved = new Subject<BaseTabComponent>()
     private splitAdjusted = new Subject<SplitSpannerInfo>()
     private focusChanged = new Subject<BaseTabComponent>()
     private initialized = new Subject<void>()
 
     get tabAdded$ (): Observable<BaseTabComponent> { return this.tabAdded }
+
+    /**
+     * Fired when an existing top-level tab is dragged into this tab
+     */
+    get tabAdopted$ (): Observable<BaseTabComponent> { return this.tabAdopted }
+
     get tabRemoved$ (): Observable<BaseTabComponent> { return this.tabRemoved }
 
     /**
@@ -209,7 +253,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
         })
         this.blurred$.subscribe(() => this.getAllTabs().forEach(x => x.emitBlurred()))
 
-        this.subscribeUntilDestroyed(this.hotkeys.matchedHotkey, hotkey => {
+        this.subscribeUntilDestroyed(this.hotkeys.hotkey$, hotkey => {
             if (!this.hasFocus || !this.focusedTab) {
                 return
             }
@@ -262,6 +306,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
     async ngAfterViewInit (): Promise<void> {
         if (this._recoveredState) {
             await this.recoverContainer(this.root, this._recoveredState, this._recoveredState.duplicate)
+            this.updateTitle()
             this.layout()
             setTimeout(() => {
                 if (this.hasFocus) {
@@ -330,51 +375,77 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
         }
     }
 
+    addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection): Promise<void> {
+        return this.add(tab, relative, side)
+    }
+
     /**
      * Inserts a new `tab` to the `side` of the `relative` tab
      */
-    async addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection): Promise<void> {
-        tab.parent = this
+    async add (thing: BaseTabComponent|SplitContainer, relative: BaseTabComponent|SplitContainer|null, side: SplitDirection): Promise<void> {
+        if (thing instanceof SplitTabComponent) {
+            const tab = thing
+            thing = tab.root
+            tab.root = new SplitContainer()
+            for (const child of thing.getAllTabs()) {
+                child.removeFromContainer()
+            }
+            tab.destroy()
+        }
 
-        let target = (relative ? this.getParentOf(relative) : null) ?? this.root
-        let insertIndex = relative ? target.children.indexOf(relative) : -1
+        if (thing instanceof BaseTabComponent) {
+            if (thing.parent instanceof SplitTabComponent) {
+                thing.parent.removeTab(thing)
+            }
+            thing.removeFromContainer()
+            thing.parent = this
+        }
+
+        let target = relative ? this.getParentOf(relative) : null
+        if (!target) {
+            // Rewrap the root container just in case the orientation isn't compatibile
+            target = new SplitContainer()
+            target.orientation = ['l', 'r'].includes(side) ? 'h' : 'v'
+            target.children = [this.root]
+            target.ratios = [1]
+            this.root = target
+        }
+
+        let insertIndex = relative
+            ? target.children.indexOf(relative) + ('tl'.includes(side) ? 0 : 1)
+            : 'tl'.includes(side) ? 0 : -1
 
         if (
             target.orientation === 'v' && ['l', 'r'].includes(side) ||
             target.orientation === 'h' && ['t', 'b'].includes(side)
         ) {
+            // Inserting into a container but the orientation isn't compatible
             const newContainer = new SplitContainer()
-            newContainer.orientation = target.orientation === 'v' ? 'h' : 'v'
+            newContainer.orientation = ['l', 'r'].includes(side) ? 'h' : 'v'
             newContainer.children = relative ? [relative] : []
             newContainer.ratios = [1]
-            target.children[insertIndex] = newContainer
+            target.children.splice(relative ? target.children.indexOf(relative) : -1, 1, newContainer)
             target = newContainer
-            insertIndex = 0
-        }
-
-        if (insertIndex === -1) {
-            insertIndex = 0
-        } else {
-            insertIndex += side === 'l' || side === 't' ? 0 : 1
+            insertIndex = 'tl'.includes(side) ? 0 : 1
         }
 
         for (let i = 0; i < target.children.length; i++) {
             target.ratios[i] *= target.children.length / (target.children.length + 1)
         }
+        if (insertIndex === -1) {
+            insertIndex = target.ratios.length
+        }
         target.ratios.splice(insertIndex, 0, 1 / (target.children.length + 1))
-        target.children.splice(insertIndex, 0, tab)
+        target.children.splice(insertIndex, 0, thing)
 
         this.recoveryStateChangedHint.next()
 
         await this.initialized$.toPromise()
 
-        this.attachTabView(tab)
-
-        setImmediate(() => {
-            this.layout()
-            this.tabAdded.next(tab)
-            this.focus(tab)
-        })
+        for (const tab of thing instanceof SplitContainer ? thing.getAllTabs() : [thing]) {
+            this.attachTabView(tab)
+            this.onAfterTabAdded(tab)
+        }
     }
 
     removeTab (tab: BaseTabComponent): void {
@@ -386,8 +457,9 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
         parent.ratios.splice(index, 1)
         parent.children.splice(index, 1)
 
-        this.detachTabView(tab)
+        tab.removeFromContainer()
         tab.parent = null
+        this.viewRefs.delete(tab)
 
         this.layout()
 
@@ -399,6 +471,22 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
         }
     }
 
+    replaceTab (tab: BaseTabComponent, newTab: BaseTabComponent): void {
+        const parent = this.getParentOf(tab)
+        if (!parent) {
+            return
+        }
+        const position = parent.children.indexOf(tab)
+        parent.children[position] = newTab
+        tab.removeFromContainer()
+        this.attachTabView(newTab)
+        tab.parent = null
+        newTab.parent = this
+        this.recoveryStateChangedHint.next()
+        this.onAfterTabAdded(newTab)
+        this.updateTitle()
+    }
+
     /**
      * Moves focus in the given direction
      */
@@ -453,7 +541,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
     async splitTab (tab: BaseTabComponent, dir: SplitDirection): Promise<BaseTabComponent|null> {
         const newTab = await this.tabsService.duplicate(tab)
         if (newTab) {
-            this.addTab(newTab, tab, dir)
+            await this.addTab(newTab, tab, dir)
         }
         return newTab
     }
@@ -484,7 +572,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
 
     /** @hidden */
     async getRecoveryToken (): Promise<any> {
-        return this.root.serialize()
+        return this.root.serialize(this.tabRecovery)
     }
 
     /** @hidden */
@@ -498,6 +586,20 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
         this.splitAdjusted.next(spanner)
     }
 
+    /** @hidden */
+    onTabDropped (tab: BaseTabComponent, zone: SplitDropZoneInfo) { // eslint-disable-line @typescript-eslint/explicit-module-boundary-types
+        if (tab === this) {
+            return
+        }
+
+        if (zone.type === 'relative') {
+            this.add(tab, zone.relativeTo ?? null, zone.side)
+        } else {
+            this.add(tab, zone.container.children[zone.position], zone.container.orientation === 'h' ? 'r' : 'b')
+        }
+        this.tabAdopted.next(tab)
+    }
+
     destroy (): void {
         super.destroy()
         for (const x of this.getAllTabs()) {
@@ -508,20 +610,31 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
     layout (): void {
         this.root.normalize()
         this._spanners = []
+        this._dropZones = []
         this.layoutInternal(this.root, 0, 0, 100, 100)
     }
 
-    private attachTabView (tab: BaseTabComponent) {
-        const ref = this.viewContainer.insert(tab.hostView) as EmbeddedViewRef<any> // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
-        this.viewRefs.set(tab, ref)
+    clearActivity (): void {
+        for (const tab of this.getAllTabs()) {
+            tab.clearActivity()
+        }
+        super.clearActivity()
+    }
 
+    private updateTitle (): void {
+        this.setTitle(this.getAllTabs().map(x => x.title).join(' | '))
+    }
+
+    private attachTabView (tab: BaseTabComponent) {
+        const ref = tab.insertIntoContainer(this.viewContainer)
+        this.viewRefs.set(tab, ref)
         tab.addEventListenerUntilDestroyed(ref.rootNodes[0], 'click', () => this.focus(tab))
 
-        tab.subscribeUntilDestroyed(tab.titleChange$, t => this.setTitle(t))
+        tab.subscribeUntilDestroyed(tab.titleChange$, () => this.updateTitle())
         tab.subscribeUntilDestroyed(tab.activity$, a => a ? this.displayActivity() : this.clearActivity())
         tab.subscribeUntilDestroyed(tab.progress$, p => this.setProgress(p))
         if (tab.title) {
-            this.setTitle(tab.title)
+            this.updateTitle()
         }
         tab.subscribeUntilDestroyed(tab.recoveryStateChangedHint$, () => {
             this.recoveryStateChangedHint.next()
@@ -531,17 +644,53 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
         })
     }
 
-    private detachTabView (tab: BaseTabComponent) {
-        const ref = this.viewRefs.get(tab)
-        if (ref) {
-            this.viewRefs.delete(tab)
-            this.viewContainer.remove(this.viewContainer.indexOf(ref))
-        }
+    private onAfterTabAdded (tab: BaseTabComponent) {
+        setImmediate(() => {
+            this.layout()
+            this.tabAdded.next(tab)
+            this.focus(tab)
+        })
     }
 
     private layoutInternal (root: SplitContainer, x: number, y: number, w: number, h: number) {
         const size = root.orientation === 'v' ? h : w
         const sizes = root.ratios.map(ratio => ratio * size)
+        const thickness = 10
+
+        if (root === this.root) {
+            this._dropZones.push({
+                x: x - thickness / 2,
+                y: y + thickness,
+                w: thickness,
+                h: h - thickness * 2,
+                type: 'relative',
+                side: 'l',
+            })
+            this._dropZones.push({
+                x,
+                y: y - thickness / 2,
+                w,
+                h: thickness,
+                type: 'relative',
+                side: 't',
+            })
+            this._dropZones.push({
+                x: x + w - thickness / 2,
+                y: y + thickness,
+                w: thickness,
+                h: h - thickness * 2,
+                type: 'relative',
+                side: 'r',
+            })
+            this._dropZones.push({
+                x,
+                y: y + h - thickness / 2,
+                w,
+                h: thickness,
+                type: 'relative',
+                side: 'b',
+            })
+        }
 
         root.x = x
         root.y = y
@@ -577,8 +726,63 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
                     }
                 }
             }
+
             offset += sizes[i]
 
+            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,
+                    y: root.orientation === 'v' ? childY + offset - thickness / 2 : childY + thickness,
+                    w: root.orientation === 'v' ? childW - thickness * 2 : thickness,
+                    h: root.orientation === 'v' ? thickness : childH - thickness * 2,
+                })
+            }
+
+            // Sides
+            if (root.orientation === 'v') {
+                this._dropZones.push({
+                    x: childX,
+                    y: childY + thickness,
+                    w: thickness,
+                    h: childH - thickness * 2,
+                    type: 'relative',
+                    relativeTo: child,
+                    side: 'l',
+                })
+                this._dropZones.push({
+                    x: childX + w - thickness,
+                    y: childY + thickness,
+                    w: thickness,
+                    h: childH - thickness * 2,
+                    type: 'relative',
+                    relativeTo: child,
+                    side: 'r',
+                })
+            } else {
+                this._dropZones.push({
+                    x: childX + thickness,
+                    y: childY,
+                    w: childW - thickness * 2,
+                    h: thickness,
+                    type: 'relative',
+                    relativeTo: child,
+                    side: 't',
+                })
+                this._dropZones.push({
+                    x: childX + thickness,
+                    y: childY + childH - thickness,
+                    w: childW - thickness * 2,
+                    h: thickness,
+                    type: 'relative',
+                    relativeTo: child,
+                    side: 'b',
+                })
+            }
+
             if (i !== 0) {
                 this._spanners.push({
                     container: root,
@@ -594,6 +798,9 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
         root.ratios = state.ratios
         root.children = children
         for (const childState of state.children) {
+            if (!childState) {
+                continue
+            }
             if (childState.type === 'app:split-tab') {
                 const child = new SplitContainer()
                 await this.recoverContainer(child, childState, duplicate)
@@ -601,7 +808,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
             } else {
                 const recovered = await this.tabRecovery.recoverTab(childState, duplicate)
                 if (recovered) {
-                    const tab = this.tabsService.create(recovered.type, recovered.options)
+                    const tab = this.tabsService.create(recovered)
                     children.push(tab)
                     tab.parent = this
                     this.attachTabView(tab)
@@ -618,16 +825,16 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
 }
 
 /** @hidden */
-@Injectable()
-export class SplitTabRecoveryProvider extends TabRecoveryProvider {
+@Injectable({ providedIn: 'root' })
+export class SplitTabRecoveryProvider extends TabRecoveryProvider<SplitTabComponent> {
     async applicableTo (recoveryToken: RecoveryToken): Promise<boolean> {
         return recoveryToken.type === 'app:split-tab'
     }
 
-    async recover (recoveryToken: RecoveryToken): Promise<RecoveredTab> {
+    async recover (recoveryToken: RecoveryToken): Promise<NewTabParameters<SplitTabComponent>> {
         return {
             type: SplitTabComponent,
-            options: { _recoveredState: recoveryToken },
+            inputs: { _recoveredState: recoveryToken },
         }
     }
 

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

@@ -0,0 +1,39 @@
+:host {
+    position: absolute;
+    display: flex;
+    z-index: 5;
+    padding: 15px;
+    transition: all 125ms cubic-bezier(0, 0, 0.2, 1);
+
+    > div {
+        flex: 1 1 0;
+        width: 100%;
+        height: 100%;
+        opacity: 0;
+
+        background: rgba(255, 255, 255, .125);
+        border-radius: 5px;
+        border: 1px solid rgba(255, 255, 255, .25);
+        transition: all 125ms cubic-bezier(0, 0, 0.2, 1);
+    }
+
+    &.highlighted {
+        padding: 0px;
+        border-radius: 3px;
+
+        > div {
+            opacity: 1;
+            background: rgba(255, 255, 255, .5);
+        }
+    }
+
+    &:not(.active) {
+        pointer-events: none;
+        opacity: 0;
+    }
+
+    ::ng-deep tab-header {
+        // placeholders
+        opacity: 0;
+    }
+}

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

@@ -0,0 +1,54 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { Component, Input, HostBinding, ElementRef, Output, EventEmitter } from '@angular/core'
+import { AppService } from '../services/app.service'
+import { BaseTabComponent } from './baseTab.component'
+import { SelfPositioningComponent } from './selfPositioning.component'
+import { SplitDropZoneInfo } from './splitTab.component'
+
+/** @hidden */
+@Component({
+    selector: 'split-tab-drop-zone',
+    template: `
+    <div
+        cdkDropList
+        (cdkDropListDropped)="tabDropped.emit($event.item.data); isHighlighted = false"
+        (cdkDropListEntered)="isHighlighted = true"
+        (cdkDropListExited)="isHighlighted = false"
+        cdkAutoDropGroup='app-tabs'
+    >
+    </div>
+    `,
+    styles: [require('./splitTabDropZone.component.scss')],
+})
+export class SplitTabDropZoneComponent extends SelfPositioningComponent {
+    @Input() dropZone: SplitDropZoneInfo
+    @Input() parent: BaseTabComponent
+    @Output() tabDropped = new EventEmitter<BaseTabComponent>()
+    @HostBinding('class.active') isActive = false
+    @HostBinding('class.highlighted') isHighlighted = false
+
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+    constructor (
+        element: ElementRef,
+        app: AppService,
+    ) {
+        super(element)
+        this.subscribeUntilDestroyed(app.tabDragActive$, tab => {
+            this.isActive = !!tab && tab !== this.parent && (this.dropZone.type === 'relative' || tab !== this.dropZone.container.children[this.dropZone.position])
+            this.layout()
+        })
+    }
+
+    ngOnChanges () {
+        this.layout()
+    }
+
+    layout () {
+        this.setDimensions(
+            this.dropZone.x,
+            this.dropZone.y,
+            this.dropZone.w,
+            this.dropZone.h,
+        )
+    }
+}

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

@@ -0,0 +1,35 @@
+:host {
+    position: absolute;
+    background: rgba(255, 255, 255, .25);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    pointer-events: none;
+    z-index: 10;
+    opacity: 0;
+    transition: .125s opacity cubic-bezier(0.86, 0, 0.07, 1);
+}
+
+div {
+    background: rgba(0, 0, 0, .7);
+    padding: 20px 30px;
+    font-size: 18px;
+    color: #fff;
+    display: flex;
+    align-items: center;
+    border-radius: 5px;
+    cursor: move;
+}
+
+:host.active {
+    opacity: 1;
+
+    > div {
+        pointer-events: initial;
+    }
+}
+
+label {
+    margin: 0;
+    cursor: move;
+}

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

@@ -0,0 +1,80 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { Component, Input, HostBinding, ElementRef } from '@angular/core'
+import { HotkeysService } from '../services/hotkeys.service'
+import { AppService } from '../services/app.service'
+import { BaseTabComponent } from './baseTab.component'
+import { SelfPositioningComponent } from './selfPositioning.component'
+
+/** @hidden */
+@Component({
+    selector: 'split-tab-pane-label',
+    template: `
+    <div
+        cdkDrag
+        [cdkDragData]='tab'
+        (cdkDragStarted)='onTabDragStart(tab)'
+        (cdkDragEnded)='onTabDragEnd()'
+    >
+        <i class="fa fa-window-maximize mr-3"></i>
+        <label>{{tab.title}}</label>
+    </div>
+    `,
+    styles: [require('./splitTabPaneLabel.component.scss')],
+})
+export class SplitTabPaneLabelComponent extends SelfPositioningComponent {
+    @Input() tab: BaseTabComponent
+    @Input() parent: BaseTabComponent
+    @HostBinding('class.active') isActive = false
+
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+    constructor (
+        element: ElementRef,
+        hotkeys: HotkeysService,
+        private app: AppService,
+    ) {
+        super(element)
+        this.subscribeUntilDestroyed(hotkeys.hotkey$, hk => {
+            if (hk === 'rearrange-panes' && this.parent.hasFocus) {
+                this.isActive = true
+                this.layout()
+            }
+        })
+        this.subscribeUntilDestroyed(hotkeys.hotkeyOff$, hk => {
+            if (hk === 'rearrange-panes') {
+                this.isActive = false
+            }
+        })
+    }
+
+    ngOnChanges () {
+        this.layout()
+    }
+
+    onTabDragStart (tab: BaseTabComponent): void {
+        this.app.emitTabDragStarted(tab)
+    }
+
+    onTabDragEnd (): void {
+        setTimeout(() => {
+            this.app.emitTabDragEnded()
+            this.app.emitTabsChanged()
+        })
+    }
+
+    layout () {
+        const tabElement: HTMLElement|undefined = this.tab.viewContainerEmbeddedRef?.rootNodes[0]
+
+        if (!tabElement) {
+            // being destroyed
+            return
+        }
+
+        this.setDimensions(
+            tabElement.offsetLeft,
+            tabElement.offsetTop,
+            tabElement.clientWidth,
+            tabElement.clientHeight,
+            'px'
+        )
+    }
+}

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

@@ -3,6 +3,7 @@
     position: absolute;
     z-index: 5;
     transition: 0.125s background;
+    background: rgba(0, 0, 0, .2);
 
     &.v {
         cursor: ns-resize;

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

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { Component, Input, HostBinding, ElementRef, Output, EventEmitter } from '@angular/core'
+import { SelfPositioningComponent } from './selfPositioning.component'
 import { SplitContainer } from './splitTab.component'
 
 /** @hidden */
@@ -8,20 +9,19 @@ import { SplitContainer } from './splitTab.component'
     template: '',
     styles: [require('./splitTabSpanner.component.scss')],
 })
-export class SplitTabSpannerComponent {
+export class SplitTabSpannerComponent extends SelfPositioningComponent {
     @Input() container: SplitContainer
     @Input() index: number
     @Output() change = new EventEmitter<void>()
     @HostBinding('class.active') isActive = false
     @HostBinding('class.h') isHorizontal = false
     @HostBinding('class.v') isVertical = true
-    @HostBinding('style.left') cssLeft: string
-    @HostBinding('style.top') cssTop: string
-    @HostBinding('style.width') cssWidth: string | null
-    @HostBinding('style.height') cssHeight: string | null
     private marginOffset = -5
 
-    constructor (private element: ElementRef) { }
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+    constructor (element: ElementRef) {
+        super(element)
+    }
 
     ngAfterViewInit () {
         this.element.nativeElement.addEventListener('dblclick', () => {
@@ -92,11 +92,4 @@ export class SplitTabSpannerComponent {
         this.container.ratios[this.index] = ratio
         this.change.emit()
     }
-
-    private setDimensions (x: number, y: number, w: number, h: number) {
-        this.cssLeft = `${x}%`
-        this.cssTop = `${y}%`
-        this.cssWidth = w ? `${w}%` : null
-        this.cssHeight = h ? `${h}%` : null
-    }
 }

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

@@ -3,9 +3,9 @@ div
     h1.tabby-title Tabby
         sup α
 
-    .list-group
+    .list-group.mb-4
         a.list-group-item.list-group-item-action.d-flex(
-            *ngFor='let button of getButtons()',
+            *ngFor='let button of getButtons(); trackBy: buttonsTrackBy',
             (click)='button.click()',
         )
             .d-flex.align-self-center([innerHTML]='sanitizeIcon(button.icon)')
@@ -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/startPage.component.ts

@@ -13,7 +13,7 @@ import { ToolbarButton, ToolbarButtonProvider } from '../api'
 export class StartPageComponent {
     version: string
 
-    private constructor (
+    constructor (
         private config: ConfigService,
         private domSanitizer: DomSanitizer,
         public homeBase: HomeBaseService,
@@ -25,6 +25,7 @@ export class StartPageComponent {
         return this.config.enabledServices(this.toolbarButtonProviders)
             .map(provider => provider.provide())
             .reduce((a, b) => a.concat(b))
+            .filter(x => x.showInStartPage ?? true)
             .filter(x => !!x.click)
             .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight ?? 0) - (b.weight ?? 0))
     }
@@ -32,4 +33,8 @@ export class StartPageComponent {
     sanitizeIcon (icon?: string): any {
         return this.domSanitizer.bypassSecurityTrustHtml(icon ?? '')
     }
+
+    buttonsTrackBy (btn: ToolbarButton): any {
+        return btn.title + btn.icon
+    }
 }

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

@@ -6,9 +6,6 @@ import { BaseTabComponent } from '../components/baseTab.component'
 @Component({
     selector: 'tab-body',
     template: `
-        <!--perfect-scrollbar [config]="{ suppressScrollX: true }" *ngIf="scrollable">
-            <ng-template #scrollablePlaceholder></ng-template>
-        </perfect-scrollbar-->
         <ng-template #placeholder></ng-template>
     `,
     styles: [
@@ -19,20 +16,22 @@ import { BaseTabComponent } from '../components/baseTab.component'
 export class TabBodyComponent implements OnChanges {
     @Input() @HostBinding('class.active') active: boolean
     @Input() tab: BaseTabComponent
-    @ViewChild('placeholder', { read: ViewContainerRef }) placeholder: ViewContainerRef
+    @ViewChild('placeholder', { read: ViewContainerRef }) placeholder?: ViewContainerRef
 
     ngOnChanges (changes) {
         if (changes.tab) {
-            if (this.placeholder) {
-                this.placeholder.detach()
-            }
+            this.placeholder?.detach()
             setImmediate(() => {
-                this.placeholder.insert(this.tab.hostView)
+                this.placeholder?.insert(this.tab.hostView)
             })
         }
     }
 
+    detach () {
+        this.placeholder?.detach()
+    }
+
     ngOnDestroy () {
-        this.placeholder.detach()
+        this.placeholder?.detach()
     }
 }

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

@@ -2,9 +2,18 @@
 .progressbar([style.width]='progress + "%"', *ngIf='progress != null')
 .activity-indicator(*ngIf='tab.activity$|async')
 
-.index(*ngIf='!config.store.terminal.hideTabIndex', #handle) {{index + 1}}
+.index(*ngIf='!config.store.terminal.hideTabIndex && hostApp.platform === Platform.macOS', cdkDragHandle) {{index + 1}}
+.index(*ngIf='!config.store.terminal.hideTabIndex && hostApp.platform !== Platform.macOS') {{index + 1}}
+
 .name(
     [title]='tab.customTitle || tab.title',
     [class.no-hover]='config.store.terminal.hideCloseButton'
+    cdkDrag,
+    cdkDragRootElement='tab-header',
+    [cdkDragData]='tab',
+    (cdkDragStarted)='onTabDragStart(tab)',
+    (cdkDragEnded)='onTabDragEnd()',
 ) {{tab.customTitle || tab.title}}
 button(*ngIf='!config.store.terminal.hideCloseButton',(click)='app.closeTab(tab, true)') ×
+
+ng-content

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

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { Component, Input, Optional, Inject, HostBinding, HostListener, ViewChild, ElementRef, NgZone } from '@angular/core'
-import { SortableComponent } from 'ng2-dnd'
+import { Component, Input, Optional, Inject, HostBinding, HostListener, NgZone } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { TabContextMenuItemProvider } from '../api/tabContextMenuProvider'
 import { BaseTabComponent } from './baseTab.component'
@@ -13,11 +12,6 @@ import { BaseComponent } from './base.component'
 import { MenuItemOptions } from '../api/menu'
 import { PlatformService } from '../api/platform'
 
-/** @hidden */
-export interface SortableComponentProxy {
-    setDragHandle: (_: HTMLElement) => void
-}
-
 /** @hidden */
 @Component({
     selector: 'tab-header',
@@ -29,21 +23,20 @@ export class TabHeaderComponent extends BaseComponent {
     @Input() @HostBinding('class.active') active: boolean
     @Input() tab: BaseTabComponent
     @Input() progress: number|null
-    @ViewChild('handle') handle?: ElementRef
+    Platform = Platform
 
-    private constructor (
+    constructor (
         public app: AppService,
         public config: ConfigService,
-        private hostApp: HostAppService,
+        public hostApp: HostAppService,
         private ngbModal: NgbModal,
         private hotkeys: HotkeysService,
         private platform: PlatformService,
         private zone: NgZone,
-        @Inject(SortableComponent) private parentDraggable: SortableComponentProxy,
         @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
     ) {
         super()
-        this.subscribeUntilDestroyed(this.hotkeys.matchedHotkey, (hotkey) => {
+        this.subscribeUntilDestroyed(this.hotkeys.hotkey$, (hotkey) => {
             if (this.app.activeTab === this.tab) {
                 if (hotkey === 'rename-tab') {
                     this.showRenameTabModal()
@@ -61,18 +54,13 @@ export class TabHeaderComponent extends BaseComponent {
         })
     }
 
-    ngAfterViewInit () {
-        if (this.handle && this.hostApp.platform === Platform.macOS) {
-            this.parentDraggable.setDragHandle(this.handle.nativeElement)
-        }
-    }
-
     showRenameTabModal (): void {
         const modal = this.ngbModal.open(RenameTabModalComponent)
         modal.componentInstance.value = this.tab.customTitle || this.tab.title
         modal.result.then(result => {
             this.tab.setTitle(result)
             this.tab.customTitle = result
+            this.app.emitTabsChanged()
         }).catch(() => null)
     }
 
@@ -85,12 +73,24 @@ export class TabHeaderComponent extends BaseComponent {
         return items.slice(1)
     }
 
+    onTabDragStart (tab: BaseTabComponent) {
+        this.app.emitTabDragStarted(tab)
+    }
+
+    onTabDragEnd () {
+        setTimeout(() => {
+            this.app.emitTabDragEnded()
+            this.app.emitTabsChanged()
+        })
+    }
+
     @HostBinding('class.flex-width') get isFlexWidthEnabled (): boolean {
         return this.config.store.appearance.flexTabs
     }
 
-    @HostListener('dblclick') onDoubleClick (): void {
+    @HostListener('dblclick', ['$event']) onDoubleClick ($event: MouseEvent): void {
         this.showRenameTabModal()
+        $event.stopPropagation()
     }
 
     @HostListener('mousedown', ['$event']) async onMouseDown ($event: MouseEvent) {

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

@@ -5,7 +5,7 @@
     .icon(*ngIf='isDownload(transfer)') !{require('../icons/download.svg')}
     .icon(*ngIf='!isDownload(transfer)') !{require('../icons/upload.svg')}
     .main
-        label {{transfer.getName()}}
+        label.no-wrap([title]='transfer.getName()') {{transfer.getName()}}
         .status(*ngIf='transfer.isComplete()')
             ngb-progressbar(type='success', [value]='100')
         .status(*ngIf='transfer.isCancelled()')

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

@@ -1,11 +1,14 @@
 :host {
     min-width: 300px;
+    max-height: 80vh;
+    overflow-y: auto;
 }
 
 .transfer {
     display: flex;
     align-items: center;
     padding: 5px 0 5px 25px;
+    width: 100%;
 
     .icon {
         padding: 4px 7px;
@@ -16,12 +19,16 @@
     }
 
     .main {
-        width: 100%;
+        display: flex;
+        flex-direction: column;
+        min-width: 0;
         margin-right: auto;
         margin-bottom: 3px;
+        width: 100%;
 
         label {
             margin: 0;
+            max-width: 100%;
         }
     }
 
@@ -44,3 +51,7 @@
 button {
     flex: none;
 }
+
+svg {
+    height: 14px;
+}

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

@@ -43,6 +43,7 @@ export class TransfersMenuComponent {
                 message: 'There are active file transfers',
                 buttons: ['Abort all', 'Do not abort'],
                 defaultId: 1,
+                cancelId: 1,
             })).response === 1) {
                 return
             }

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

@@ -3,7 +3,7 @@
         h3.m-0 Vault is locked
         .ml-auto(ngbDropdown, placement='bottom-right')
             button.btn.btn-link(ngbDropdownToggle, (click)='$event.stopPropagation()')
-                span(*ngIf='rememberFor') Remember for {{rememberFor}} min
+                span(*ngIf='rememberFor') Remember for {{getRememberForDisplay(rememberFor)}}
                 span(*ngIf='!rememberFor') Do not remember
             div(ngbDropdownMenu)
                 button.dropdown-item(
@@ -12,7 +12,7 @@
                 button.dropdown-item(
                     *ngFor='let x of rememberOptions',
                     (click)='rememberFor = x',
-                ) {{x}} min
+                ) {{getRememberForDisplay(x)}}
 
     .input-group
         input.form-control.form-control-lg(

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

@@ -8,7 +8,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 export class UnlockVaultModalComponent {
     passphrase: string
     rememberFor = 1
-    rememberOptions = [1, 5, 15, 60]
+    rememberOptions = [1, 5, 15, 60, 1440, 10080]
     @ViewChild('input') input: ElementRef
 
     constructor (
@@ -33,4 +33,14 @@ export class UnlockVaultModalComponent {
     cancel (): void {
         this.modalInstance.close(null)
     }
+
+    getRememberForDisplay (rememberOption: number): string {
+        if (rememberOption >= 1440) {
+            return `${Math.round(rememberOption/1440*10)/10} day`
+        } else if (rememberOption >= 60) {
+            return `${Math.round(rememberOption/60*10)/10} hour`
+        } else {
+            return `${rememberOption} min`
+        }
+    }
 }

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

@@ -19,18 +19,6 @@
             .description Toggles the Tabby window visibility
         toggle([(ngModel)]='enableGlobalHotkey')
 
-    .form-line
-        .header
-            .title Enable #[strong SSH] plugin
-            .description Adds an SSH connection manager UI to Tabby
-        toggle([(ngModel)]='enableSSH')
-
-    .form-line
-        .header
-            .title Enable #[strong Serial] plugin
-            .description Allows attaching Tabby to serial ports
-        toggle([(ngModel)]='enableSerial')
-
 
     .text-center.mt-5
         button.btn.btn-primary((click)='closeAndDisable()') Close and never show again

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

@@ -11,8 +11,6 @@ import { HostWindowService } from '../api/hostWindow'
     styles: [require('./welcomeTab.component.scss')],
 })
 export class WelcomeTabComponent extends BaseTabComponent {
-    enableSSH = false
-    enableSerial = false
     enableGlobalHotkey = true
 
     constructor (
@@ -21,23 +19,15 @@ export class WelcomeTabComponent extends BaseTabComponent {
     ) {
         super()
         this.setTitle('Welcome')
-        this.enableSSH = !config.store.pluginBlacklist.includes('ssh')
-        this.enableSerial = !config.store.pluginBlacklist.includes('serial')
     }
 
-    closeAndDisable () {
+    async closeAndDisable () {
         this.config.store.enableWelcomeTab = false
         this.config.store.pluginBlacklist = []
-        if (!this.enableSSH) {
-            this.config.store.pluginBlacklist.push('ssh')
-        }
-        if (!this.enableSerial) {
-            this.config.store.pluginBlacklist.push('serial')
-        }
         if (!this.enableGlobalHotkey) {
             this.config.store.hotkeys['toggle-window'] = []
         }
-        this.config.save()
+        await this.config.save()
         this.hostWindow.reload()
     }
 }

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

@@ -13,6 +13,7 @@ button {
     line-height: 0;
     text-align: center;
     align-items: center;
+    justify-content: center;
     
     &:not(:hover):not(:active) {
         background: transparent;
@@ -21,4 +22,9 @@ button {
     &:focus {
         box-shadow: none;
     }
+
+    svg {
+        width: 10px;
+        height: 10px;
+    }
 }

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

@@ -10,7 +10,7 @@ import { AppService } from '../services/app.service'
     styles: [require('./windowControls.component.scss')],
 })
 export class WindowControlsComponent {
-    private constructor (public hostWindow: HostWindowService, public app: AppService) { }
+    constructor (public hostWindow: HostWindowService, public app: AppService) { }
 
     async closeWindow () {
         this.app.closeWindow()

tabby-core/src/configDefaults.linux.yaml

@@ -18,6 +18,9 @@ hotkeys:
     - 'Ctrl-Shift-PageUp'
   move-tab-right:
     - 'Ctrl-Shift-PageDown'
+  rearrange-panes:
+    - 'Ctrl-Shift'
+  duplicate-tab: []
   tab-1:
     - 'Alt-1'
   tab-2:
@@ -69,4 +72,7 @@ hotkeys:
   pane-maximize:
     - 'Ctrl-Alt-Enter'
   close-pane: []
-pluginBlacklist: ['ssh']
+  switch-profile:
+    - 'Ctrl-Alt-T'
+  profile-selector:
+    - 'Ctrl-Shift-T'

tabby-core/src/configDefaults.macos.yaml

@@ -16,6 +16,8 @@ hotkeys:
     - '⌘-Shift-Left'
   move-tab-right:
     - '⌘-Shift-Right'
+  rearrange-panes:
+    - '⌘-Shift'
   tab-1:
     - '⌘-1'
   tab-2:
@@ -36,6 +38,7 @@ hotkeys:
     - '⌘-9'
   tab-10:
     - '⌘-0'
+  duplicate-tab: []
   tab-11: []
   tab-12: []
   tab-13: []
@@ -68,4 +71,7 @@ hotkeys:
     - '⌘-⌥-Enter'
   close-pane:
     - '⌘-Shift-W'
-pluginBlacklist: ['ssh']
+  profile-selector:
+    - '⌘-E'
+  switch-profile:
+    - '⌘-Shift-E'

tabby-core/src/configDefaults.windows.yaml

@@ -19,6 +19,9 @@ hotkeys:
     - 'Ctrl-Shift-PageUp'
   move-tab-right:
     - 'Ctrl-Shift-PageDown'
+  rearrange-panes:
+    - 'Ctrl-Shift'
+  duplicate-tab: []
   tab-1:
     - 'Alt-1'
   tab-2:
@@ -70,4 +73,7 @@ hotkeys:
   pane-maximize:
     - 'Ctrl-Alt-Enter'
   close-pane: []
-pluginBlacklist: []
+  switch-profile:
+    - 'Ctrl-Alt-T'
+  profile-selector:
+    - 'Ctrl-Shift-T'

tabby-core/src/configDefaults.yaml

@@ -12,10 +12,20 @@ appearance:
   frame: thin
   css: '/* * { color: blue !important; } */'
   opacity: 1.0
-  vibrancy: true
+  vibrancy: false
   vibrancyType: 'blur'
 terminal:
-  recoverTabs: true
+  showBuiltinProfiles: true
+  showRecentProfiles: 3
+hotkeys:
+  profile:
+    __nonStructural: true
+  profile-selectors:
+    __nonStructural: true
+profiles: []
+profileDefaults:
+  __nonStructural: true
+recoverTabs: true
 enableAnalytics: true
 enableWelcomeTab: true
 electronFlags:
@@ -24,3 +34,7 @@ enableAutomaticUpdates: true
 version: 1
 vault: null
 encrypted: false
+enableExperimentalFeatures: false
+pluginBlacklist: []
+hacks:
+  disableGPU: false