linux build fix

Bump @types/electron-config from 0.2.1 to 3.2.2

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: eugeny
+open_collective: terminus
+ko_fi: eugeny

.github/stale.yml

@@ -5,7 +5,7 @@ daysUntilClose: 14
 # Issues with these labels will never be considered stale
 exemptLabels:
   - "T: Enhancement"
-  - "S: Triaged"
+  - "S: Confirmed"
 # Label to use when marking an issue as stale
 staleLabel: "S: Stale"
 # Comment to post when marking an issue as stale. Set to `false` to disable

.gitignore

@@ -5,6 +5,7 @@ node_modules
 
 build/files.wxs
 dist
+*/dist
 
 *.xcworkspacedata
 *.xcuserstate
@@ -17,3 +18,6 @@ npm-debug.log
 builtin-plugins
 package-lock.json
 yarn-error.log
+
+docs/api
+.travis.ssh.key

.travis.ssh.key.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDFM4nHSbET5V7EYNgjA8NeVfOxV0wVMdZ2YvsDzD+qPJ4+MYbvsL7ZPaSxQSn7n6ATkLHjKje5RpF/Rl9K3kucGs0P6cqJVeE0qryEteQ3Q+fYAk+bD2J9ZQ/hv/0NtLl8T+7lJUZ3WUxFH73sgph77Sw0z+kMpPaK7U2vqMBQD/7+6iJgya31wP0qW0XKDz1BjKeXgwTg10Pm4vcGsR4c2q7YIzSzBHffcyo0vJyFvOX/ZKHlZRcq/wnQMeOl/hPgf1xCENjQZmFVReQlYSw5cNNDT9HZPKekOAZFFez7/AbPiTIo/bnBYIv0mdUjr3nw8nXF505q8LiD3z/ksaaWDqe9CCLM4W0Bh7/dhP7IGPdfX0fVHLhOnYIOsG21D8rWJjMPkVRSLyEvWNAnVuObJNHoQu8VATnOxfPNnMun72IHyyFWVoADk5JcsMbzcP7gZB+5oJO7U1qpcdndtBOA3ZlF0Uz2jVZnqavoEBWT39tl3vs69hAA3aTPGclg7HMuAJOl4HsKmaUgDxqV2wCX/S4pDqmKMbmumDLX+MM0xl0gXj/zpVJp9BzdnrArkC40ivmC6TSA4wrdN0tNBlqApkH5/jxGWrcu2AXVn9PGF3+QrjW0iu+QMZCaKWDhLIQC835uFwzhnNGlx41B7uxMLuNFxKXdQ3f/cC9QMG8ew== TravisCIDeployKey

.travis.yml

@@ -1,29 +1,48 @@
-matrix:
-  include:
-  - os: linux
-    env: BUILD_FOR=linux
-  - os: osx
-    env: BUILD_FOR=macos
-
 language: node_js
-node_js: 8
+node_js: 11
 
-cache:
+stages:
-  directories:
+  - Build
-    - node_modules
+  - name: Docs
-    - app/node_modules
+    if: branch = master
 
-before_install:
+jobs:
-    - yarn install
+  include:
-    - scripts/install-deps.js
+    - stage: 'Build'
+      os: linux
+      before_install:
+        - yarn
+        - rm app/node_modules/.yarn-integrity || true
+        - scripts/install-deps.js
+      script:
+        - scripts/build-native.js
+        - yarn run build
+        - scripts/prepackage-plugins.js
+        - scripts/build-linux.js
 
-script:
+    - stage: 'Build'
-    - scripts/build-native.js
+      os: osx
-    - yarn run build
+      before_install:
-    - scripts/prepackage-plugins.js
+        - rm app/node_modules/.yarn-integrity || true
-    - scripts/build-$BUILD_FOR.js
+        - yarn
+      script:
+        - scripts/build-native.js
+        - yarn run build
+        - scripts/prepackage-plugins.js
+        - scripts/build-macos.js
 
-dist: trusty
+    - stage: 'Docs'
+      os: linux
+      script:
+        - openssl aes-256-cbc -K $encrypted_4e2fb4889ef8_key -iv $encrypted_4e2fb4889ef8_iv -in .travis.ssh.key.enc -out .travis.ssh.key -d
+        - eval "$(ssh-agent -s)"
+        - chmod 600 .travis.ssh.key
+        - ssh-add .travis.ssh.key
+        - yarn
+        - yarn run docs
+        - rsync -e "ssh -o StrictHostKeyChecking=no" -arv docs/api/ root@ajenti.org:/srv/terminus-docs/
+
+dist: xenial
 sudo: false
 
 addons:
@@ -31,6 +50,7 @@ addons:
     packages:
     - rpm
     - yarn
+    - libsecret-1-dev
     sources:
     - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
       key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'

README.md

@@ -1,43 +1,57 @@
 ![](https://github.com/Eugeny/terminus/raw/master/docs/readme.png)
 
 <p align="center">
-  <a href="https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg"/></a> <a href="https://travis-ci.org/Eugeny/terminus"><img src="https://travis-ci.org/Eugeny/terminus.svg?branch=master"/></a>
+  <a href="https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/eugeny/terminus.svg?label=License&style=flat-square"></a> <a href="https://travis-ci.org/Eugeny/terminus"><img alt="Travis (.org)" src="https://img.shields.io/travis/Eugeny/terminus.svg?label=CI&logo=travis&logoColor=white&style=flat-square"></a>
-  <a href="https://ci.appveyor.com/project/Eugeny/terminus"><img src="https://ci.appveyor.com/api/projects/status/wnnq4hm5mbd9rgoy?svg=true"/></a>
+  <a href="https://ci.appveyor.com/project/Eugeny/terminus"><img alt="AppVeyor" src="https://img.shields.io/appveyor/ci/eugeny/terminus.svg?label=CI&logo=appveyor&logoColor=white&style=flat-square"></a>
 </p>
 
 <p align="center">
-  <a href="https://github.com/Eugeny/terminus/releases/latest">Downloads</a> | <a href="https://t.me/joinchat/AAAAAEZuCv2WKKYcfyQ3QA">Community</a>  | <a href="https://ci.appveyor.com/project/Eugeny/terminus/build/artifacts">Latest Windows nightly</a>
+  <a href="https://github.com/Eugeny/terminus/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/terminus/total.svg?label=DOWNLOAD&logo=github&style=for-the-badge"></a> <a href="https://ci.appveyor.com/project/Eugeny/terminus/build/artifacts"><img src="https://img.shields.io/badge/download-nightly%20build-magenta.svg?logo=appveyor&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=blue&logo=gitter&style=for-the-badge"></a> 
 </p>
 
 ----
 
-**Terminus** is a terminal heavily inspired by Hyper. It is, however, designed for people who need to get things done.
+**Terminus** is a highly configurable terminal emulator for Windows, macOS and Linux
 
-  * Runs on Windows, macOS and Linux
   * Theming and color schemes
   * Fully configurable shortcuts
+  * Split panes
+  * Remembers your tabs
+  * PowerShell (and PS Core), WSL, Git-Bash, Cygwin, Cmder and CMD support
+  * Integrated SSH client and connection manager
   * Full Unicode support including double-width characters
   * Doesn't choke on fast-flowing outputs
-  * Proper shell-like experience on Windows including tab completion (via Clink)
+  * Proper shell experience on Windows including tab completion (via Clink)
-  * PowerShell Core, WSL (Bash on Windows), PowerShell, Git-Bash, Cygwin, Cmder and CMD support
-  * Tab persistence on macOS and Linux
 
 
 [![Buy me a coffee](https://github.com/Eugeny/terminus/raw/master/docs/kofi.png)](https://ko-fi.com/eugeny)
 
+---
+
+* **Terminus is** an alternative to Windows' standard terminal (conhost), PowerShell ISE, PuTTY or iTerm
+
+* **Terminus 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) 
 
 ---
 
 # Plugins
 
-Plugins can be installed directly from the Settings view inside Terminus.
+Plugins and themes can be installed directly from the Settings view inside Terminus.
 
   * [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
-  * [theme-hype](https://github.com/Eugeny/terminus-theme-hype) - a Hyper inspired theme
   * [shell-selector](https://github.com/Eugeny/terminus-shell-selector) - a quick shell selector pane
   * [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
-  * [scrollbar](https://github.com/kbjr/terminus-scrollbar) - adds a scrollbar to terminal tabs
   * [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
+
+# 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 Terminus
+  * [gruvbox](https://github.com/porkloin/terminus-theme-gruvbox)
+  * [windows10](https://www.npmjs.com/package/terminus-theme-windows10)
+  * [altair](https://github.com/yxuko/terminus-altair)
   
 ---
 
@@ -45,8 +59,7 @@ Plugins can be installed directly from the Settings view inside Terminus.
 
 Pull requests and plugins are welcome!
 
-See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) for information of how the project is laid out, and a very brief plugin development tutorial.
+See [HACKING.md](https://github.com/Eugeny/terminus/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.
-
 
 ## License
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_large)

app/dev-app-update.yml

@@ -0,0 +1,4 @@
+owner: eugeny
+repo: terminus
+provider: github
+updaterCacheDirName: terminus-updater

app/lib/app.ts

@@ -1,4 +1,5 @@
 import { app, ipcMain, Menu, Tray, shell } from 'electron'
+import * as electron from 'electron'
 import { loadConfig } from './config'
 import { Window, WindowOptions } from './window'
 
@@ -18,6 +19,12 @@ export class Application {
         }
 
         app.commandLine.appendSwitch('disable-http-cache')
+        app.commandLine.appendSwitch('force_discrete_gpu', '0')
+        app.commandLine.appendSwitch('lang', 'EN')
+    }
+
+    init () {
+        electron.screen.on('display-metrics-changed', () => this.broadcast('host:display-metrics-changed'))        
     }
 
     async newWindow (options?: WindowOptions): Promise<Window> {
@@ -103,7 +110,7 @@ export class Application {
                     {
                         label: 'Preferences',
                         accelerator: 'Cmd+,',
-                        async click () {
+                        click: async () => {
                             if (!this.hasWindows()) {
                                 await this.newWindow()
                             }

app/lib/cli.ts

@@ -13,6 +13,9 @@ export function parseArgs (argv, cwd) {
         .command('run [command...]', 'run a command in the terminal', {
             command: { type: 'string' },
         })
+        .command('profile [profileName]', 'open a tab with specified profile', {
+            profileName: { type: 'string' },
+        })
         .command('paste [text]', 'paste stdin into the active tab', yargs => {
             return yargs.option('escape', {
                 alias: 'e',

app/lib/index.ts

@@ -1,9 +1,8 @@
 import './lru'
 import { app, ipcMain, Menu } from 'electron'
-import electronDebug = require('electron-debug')
 import { parseArgs } from './cli'
 import { Application } from './app'
-if (process.platform === 'win32' && require('electron-squirrel-startup')) process.exit(0)
+import electronDebug = require('electron-debug')
 
 if (!process.env.TERMINUS_PLUGINS) {
     process.env.TERMINUS_PLUGINS = ''
@@ -12,7 +11,6 @@ if (!process.env.TERMINUS_PLUGINS) {
 const application = new Application()
 
 ipcMain.on('app:new-window', () => {
-    console.log('new-window')
     application.newWindow()
 })
 
@@ -45,7 +43,11 @@ if (!app.requestSingleInstanceLock()) {
 }
 
 if (argv.d) {
-    electronDebug({ enabled: true, showDevTools: 'undocked' })
+    electronDebug({
+        isEnabled: true,
+        showDevTools: true,
+        devToolsMode: 'undocked'
+    })
 }
 
 app.on('ready', () => {
@@ -59,5 +61,6 @@ app.on('ready', () => {
             }
         ]))
     }
+    application.init()
     application.newWindow({ hidden: argv.hidden })
 })

app/lib/window.ts

@@ -1,4 +1,5 @@
 import { Subject, Observable } from 'rxjs'
+import { debounceTime } from 'rxjs/operators'
 import { BrowserWindow, app, ipcMain, Rectangle } from 'electron'
 import ElectronConfig = require('electron-config')
 import * as os from 'os'
@@ -10,7 +11,7 @@ let AccentState: any
 let DwmEnableBlurBehindWindow: any
 if (process.platform === 'win32') {
     SetWindowCompositionAttribute = require('windows-swca').SetWindowCompositionAttribute
-    AccentState = require('windows-swca').AccentState
+    AccentState = require('windows-swca').ACCENT_STATE
     DwmEnableBlurBehindWindow = require('windows-blurbehind').DwmEnableBlurBehindWindow
 }
 
@@ -43,7 +44,9 @@ export class Window {
             title: 'Terminus',
             minWidth: 400,
             minHeight: 300,
-            webPreferences: { webSecurity: false },
+            webPreferences: {
+                nodeIntegration: true,
+            },
             frame: false,
             show: false,
             backgroundColor: '#00000000'
@@ -102,16 +105,14 @@ export class Window {
         if (process.platform === 'win32') {
             if (parseFloat(os.release()) >= 10) {
                 let attribValue = AccentState.ACCENT_DISABLED
-                let color = 0x00000000
                 if (enabled) {
                     if (parseInt(os.release().split('.')[2]) >= 17063 && type === 'fluent') {
-                        attribValue = AccentState.ACCENT_ENABLE_FLUENT
+                        attribValue = AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND
-                        color = 0x01000000 // using a small alpha because acrylic bugs out at full transparency.
                     } else {
                         attribValue = AccentState.ACCENT_ENABLE_BLURBEHIND
                     }
                 }
-                SetWindowCompositionAttribute(this.window, attribValue, color)
+                SetWindowCompositionAttribute(this.window.getNativeWindowHandle(), attribValue, 0x00000000)
             } else {
                 DwmEnableBlurBehindWindow(this.window, enabled)
             }
@@ -143,6 +144,16 @@ export class Window {
             this.visible.next(false)
         })
 
+        let moveSubscription = new Observable<void>(observer => {
+            this.window.on('move', () => observer.next())
+        }).pipe(debounceTime(250)).subscribe(() => {
+            this.window.webContents.send('host:window-moved')
+        })
+
+        this.window.on('closed', () => {
+            moveSubscription.unsubscribe()
+        })
+
         this.window.on('enter-full-screen', () => this.window.webContents.send('host:window-enter-full-screen'))
         this.window.on('leave-full-screen', () => this.window.webContents.send('host:window-leave-full-screen'))
 
@@ -173,28 +184,28 @@ export class Window {
         })
 
         ipcMain.on('window-focus', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.focus()
         })
 
         ipcMain.on('window-maximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.maximize()
         })
 
         ipcMain.on('window-unmaximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.unmaximize()
         })
 
         ipcMain.on('window-toggle-maximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             if (this.window.isMaximized()) {
@@ -205,42 +216,42 @@ export class Window {
         })
 
         ipcMain.on('window-minimize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.minimize()
         })
 
         ipcMain.on('window-set-bounds', (event, bounds) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setBounds(bounds)
         })
 
         ipcMain.on('window-set-always-on-top', (event, flag) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setAlwaysOnTop(flag)
         })
 
         ipcMain.on('window-set-vibrancy', (event, enabled, type) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.setVibrancy(enabled, type)
         })
 
         ipcMain.on('window-set-title', (event, title) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setTitle(title)
         })
 
         ipcMain.on('window-bring-to-front', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             if (this.window.isMinimized()) {
@@ -250,7 +261,10 @@ export class Window {
             this.window.moveTop()
         })
 
-        ipcMain.on('window-close', () => {
+        ipcMain.on('window-close', event => {
+            if (!this.window || event.sender !== this.window.webContents) {
+                return
+            }
             this.closing = true
             this.window.close()
         })

app/package.json

@@ -13,32 +13,32 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "7.0.0",
+    "@angular/animations": "7.2.8",
-    "@angular/common": "7.0.0",
+    "@angular/common": "7.2.8",
-    "@angular/compiler": "7.0.0",
+    "@angular/compiler": "7.2.8",
-    "@angular/core": "7.0.0",
+    "@angular/core": "7.2.8",
-    "@angular/forms": "7.0.0",
+    "@angular/forms": "7.2.8",
-    "@angular/platform-browser": "7.0.0",
+    "@angular/platform-browser": "7.2.8",
-    "@angular/platform-browser-dynamic": "7.0.0",
+    "@angular/platform-browser-dynamic": "7.2.8",
-    "@ng-bootstrap/ng-bootstrap": "^3.3.1",
+    "@ng-bootstrap/ng-bootstrap": "^4.1.3",
     "devtron": "1.4.0",
-    "electron-config": "0.2.1",
+    "electron-config": "2.0.0",
-    "electron-debug": "^2.0.0",
+    "electron-debug": "^3.0.0",
-    "electron-is-dev": "0.1.2",
+    "electron-is-dev": "1.1.0",
-    "electron-squirrel-startup": "^1.0.0",
+    "electron-updater": "^4.0.6",
-    "js-yaml": "3.8.2",
+    "js-yaml": "3.13.1",
-    "mz": "^2.6.0",
+    "mz": "^2.7.0",
     "ngx-toastr": "^9.1.1",
     "path": "0.12.7",
-    "rxjs": "^6.3.3",
+    "rxjs": "^6.5.2",
-    "yargs": "^12.0.1",
+    "yargs": "^13.2.4",
-    "zone.js": "^0.8.26"
+    "zone.js": "^0.8.29"
   },
   "optionalDependencies": {
-    "windows-blurbehind": "^1.0.0",
+    "windows-blurbehind": "^1.0.1",
-    "windows-swca": "^1.1.1"
+    "windows-swca": "^2.0.2"
   },
   "devDependencies": {
-    "@types/mz": "0.0.31"
+    "@types/mz": "0.0.32"
   }
 }

app/src/entry.preload.ts

@@ -1,7 +1,9 @@
 import '../lib/lru'
-import 'source-sans-pro'
+import 'source-sans-pro/source-sans-pro.css'
 import 'source-code-pro/source-code-pro.css'
-import 'font-awesome/css/font-awesome.css'
+import '@fortawesome/fontawesome-free/css/solid.css'
+import '@fortawesome/fontawesome-free/css/brands.css'
+import '@fortawesome/fontawesome-free/css/fontawesome.css'
 import 'ngx-toastr/toastr.css'
 import './preload.scss'
 

app/src/entry.ts

@@ -1,8 +1,9 @@
 import 'zone.js'
-import 'core-js/es7/reflect'
+import 'core-js/proposals/reflect-metadata'
-import 'core-js/core/delay'
 import 'rxjs'
 
+import isDev = require('electron-is-dev')
+
 import './global.scss'
 import './toastr.scss'
 
@@ -15,11 +16,13 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 import { getRootModule } from './app.module'
 import { findPlugins, loadPlugins, IPluginInfo } from './plugins'
 
+;(process as any).enablePromiseAPI = true
+
 if (process.platform === 'win32') {
     process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
 }
 
-if (require('electron-is-dev')) {
+if (isDev) {
     console.warn('Running in debug mode')
 } else {
     enableProdMode()
@@ -34,7 +37,7 @@ async function bootstrap (plugins: IPluginInfo[], safeMode = false): Promise<NgM
     })
     let module = getRootModule(pluginsModules)
     window['rootModule'] = module
-    return await platformBrowserDynamic().bootstrapModule(module)
+    return platformBrowserDynamic().bootstrapModule(module)
 }
 
 findPlugins().then(async plugins => {

app/src/plugins.ts

@@ -3,8 +3,6 @@ import * as path from 'path'
 const nodeModule = require('module')
 const nodeRequire = (global as any).require
 
-declare function delay (ms: number): Promise<void>
-
 function normalizePath (path: string): string {
     const cygwinPrefix = '/cygdrive/'
     if (path.startsWith(cygwinPrefix)) {
@@ -16,11 +14,11 @@ function normalizePath (path: string): string {
 
 nodeRequire.main.paths.map(x => nodeModule.globalPaths.push(normalizePath(x)))
 
-if (process.env.DEV) {
+if (process.env.TERMINUS_DEV) {
     nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
 }
 
-const builtinPluginsPath = process.env.DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
+const builtinPluginsPath = process.env.TERMINUS_DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
 
 const userPluginsPath = path.join(
     require('electron').remote.app.getPath('appData'),
@@ -28,6 +26,10 @@ const userPluginsPath = path.join(
     'plugins',
 )
 
+if (!fs.existsSync(userPluginsPath)) {
+    fs.mkdir(userPluginsPath)
+}
+
 Object.assign(window, { builtinPluginsPath, userPluginsPath })
 nodeModule.globalPaths.unshift(builtinPluginsPath)
 nodeModule.globalPaths.unshift(path.join(userPluginsPath, 'node_modules'))
@@ -118,7 +120,7 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
         }
 
         try {
-            let info = JSON.parse(await fs.readFile(infoPath, {encoding: 'utf-8'}))
+            let info = JSON.parse(await fs.readFile(infoPath, { encoding: 'utf-8' }))
             if (!info.keywords || !(info.keywords.includes('terminus-plugin') || info.keywords.includes('terminus-builtin-plugin'))) {
                 continue
             }
@@ -159,7 +161,6 @@ export async function loadPlugins (foundPlugins: IPluginInfo[], progress: Progre
         } catch (error) {
             console.error(`Could not load ${foundPlugin.name}:`, error)
         }
-        await delay(1)
         index++
     }
     progress(1, 1)

app/tsconfig.json

@@ -9,7 +9,6 @@
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "sourceMap": true,
-        "noUnusedParameters": true,
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
         "noUnusedParameters": true,

app/webpack.config.js

@@ -5,16 +5,16 @@ module.exports = {
   name: 'terminus',
   target: 'node',
   entry: {
-    'index.ignore': 'file-loader?name=index.html!val-loader!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
+    'index.ignore': 'file-loader?name=index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
     preload: path.resolve(__dirname, 'src/entry.preload.ts'),
     bundle: path.resolve(__dirname, 'src/entry.ts'),
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },
   context: __dirname,
-  devtool: 'source-map',
+  devtool: 'eval-source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,

app/webpack.main.config.js

@@ -7,9 +7,9 @@ module.exports = {
   entry: {
     main: path.resolve(__dirname, 'lib/index.ts'),
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   context: __dirname,
-  devtool: 'source-map',
+  devtool: 'eval-source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,
@@ -36,7 +36,6 @@ module.exports = {
     electron: 'commonjs electron',
     'electron-config': 'commonjs electron-config',
     'electron-vibrancy': 'commonjs electron-vibrancy',
-    'electron-squirrel-startup': 'commonjs electron-squirrel-startup',
     fs: 'commonjs fs',
     mz: 'commonjs mz',
     path: 'commonjs path',

appveyor.yml

@@ -7,22 +7,20 @@ environment:
   nodejs_version: "10"
 
 cache:
-  - '%USERPROFILE%\.electron'
+  - "%USERPROFILE%\\.electron"
+  - "%LOCALAPPDATA%\\Yarn"
 
 version: "{build}"
 
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
-  - npm install
+  - yarn
-  - node scripts/install-deps.js
   - node scripts/build-native.js
 
 build_script:
-  - npm run build
+  - yarn run build
   - node scripts/prepackage-plugins.js
   - node scripts/build-windows.js
 
 artifacts:
-  - path: 'dist\win\*.exe'
-  - path: 'dist\squirrel-windows\*.exe'
   - path: 'dist\*.exe'

build/installer.nsh

@@ -0,0 +1,3 @@
+!macro customInit
+  nsExec::Exec '"$LOCALAPPDATA\terminus\Update.exe" --uninstall -s'
+!macroend

docs/index.html

@@ -1,9 +0,0 @@
-<!DOCTYPE html><html><head><base href="dist/"><meta name="viewport" content="initial-scale=1, minimal-ui, shrink-to-fit=no"><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400" rel="stylesheet"><script src="bundle.js"></script><title>Terminus</title></head><body><div class="mt-5 mb-5" id="header"><div class="text-center"><h1>Terminus</h1><div class="subtitle mb-3">A terminal for a more modern age</div><a class="btn btn-lg btn-outline-dark mt-4" href="https://github.com/Eugeny/terminus/releases/latest" target="_blank"><strong>DOWNLOAD</strong></a><a class="btn btn-lg btn-outline-secondary mt-4 ml-3" href="https://github.com/Eugeny/terminus" target="_blank"><strong>GITHUB</strong></a></div></div><div class="background-stripe"><div class="overlay overlay1"></div><div class="overlay overlay2"></div><div class="terminal"></div></div><div class="container mt-5 mb-5"><div class="d-flex flex-wrap flex-md-nowrap"><div class="w-100"><div class="feature">windows</div><div class="feature">linux</div><div class="feature">macos</div><br><div class="feature">powershell</div><div class="feature">wsl</div><div class="feature">cygwin</div><div class="feature">git-bash</div><div class="feature">cmder</div><div class="feature">clink</div></div><div class="w-100"><div class="feature">full unicode</div><div class="feature">global hotkey</div><div class="feature">plugins</div><div class="feature">tab recovery</div><div class="feature">custom css</div><div class="feature">themes</div><div class="feature">font ligatures</div><div class="feature">clickable paths</div><div class="feature">tabs on top/bottom</div><div class="feature">vibrancy</div><div class="feature">bracketed paste</div></div></div></div><div class="container mt-5 mb-5"><div class="text-center mt-5"><div class="mb-4 mt-5"><script type="text/javascript" src="https://ko-fi.com/widgets/widget_2.js"></script><script type="text/javascript">kofiwidget2.init('Buy me a coffee', '#46b798', 'J3J8KWTF')
-kofiwidget2.draw()
-</script></div><a class="btn btn-lg btn-outline-secondary mt-3" href="/terminus/#header"><strong>BEAM ME UP</strong></a></div></div><div class="background-stripe2"><div class="overlay overlay1"></div></div><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-ga('create', 'UA-3278102-18', 'auto');
-ga('send', 'pageview');</script></body></html>

docs/index.js

@@ -1 +0,0 @@
-import './styles.scss'

docs/index.pug

@@ -1,75 +0,0 @@
-doctype html
-html
-    head
-        base(href='dist/')
-        meta(name='viewport', content='initial-scale=1, minimal-ui, shrink-to-fit=no')
-        link(href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400", rel="stylesheet")
-        script(src='bundle.js')
-        title Terminus
-    body
-        .mt-5.mb-5#header
-            .text-center
-                h1 Terminus
-                .subtitle.mb-3 A terminal for a more modern age
-                
-                a.btn.btn-lg.btn-outline-dark.mt-4(href='https://github.com/Eugeny/terminus/releases/latest', target='_blank')
-                    strong DOWNLOAD
-
-                a.btn.btn-lg.btn-outline-secondary.mt-4.ml-3(href='https://github.com/Eugeny/terminus', target='_blank')
-                    strong GITHUB
-                    
-                
-        .background-stripe
-            .overlay.overlay1
-            .overlay.overlay2
-            .terminal
-
-        .container.mt-5.mb-5
-            .d-flex.flex-wrap.flex-md-nowrap
-                .w-100
-                    .feature windows
-                    .feature linux
-                    .feature macos
-                    br
-                    .feature powershell
-                    .feature wsl
-                    .feature cygwin
-                    .feature git-bash
-                    .feature cmder
-                    .feature clink
-                    
-                .w-100
-                    .feature full unicode
-                    .feature global hotkey
-                    .feature plugins
-                    .feature tab recovery
-                    .feature custom css
-                    .feature themes
-                    .feature font ligatures
-                    .feature clickable paths
-                    .feature tabs on top/bottom
-                    .feature vibrancy
-                    .feature bracketed paste
-                    
-        .container.mt-5.mb-5
-            .text-center.mt-5
-                .mb-4.mt-5
-                    script(type='text/javascript', src='https://ko-fi.com/widgets/widget_2.js')
-                    script(type='text/javascript').
-                        kofiwidget2.init('Buy me a coffee', '#46b798', 'J3J8KWTF')
-                        kofiwidget2.draw()
-                
-                a.btn.btn-lg.btn-outline-secondary.mt-3(href='/terminus/#header')
-                    strong BEAM ME UP
-
-        .background-stripe2
-            .overlay.overlay1
-                                        
-        script.
-          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-          })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-          ga('create', 'UA-3278102-18', 'auto');
-          ga('send', 'pageview');

docs/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "docs",
-  "version": "1.0.0",
-  "main": "index.js",
-  "scripts": {
-    "build": "webpack --progress",
-    "watch": "webpack --progress --watch"
-  },
-  "private": true,
-  "devDependencies": {
-    "bootstrap": "^4.1.3",
-    "css-loader": "^1.0.0",
-    "file-loader": "^1.1.11",
-    "node-sass": "^4.9.3",
-    "pug": "^2.0.3",
-    "pug-cli": "^1.0.0-alpha6",
-    "pug-html-loader": "^1.1.5",
-    "sass-loader": "^7.1.0",
-    "style-loader": "^0.22.1",
-    "val-loader": "^1.1.1",
-    "webpack": "^4.16.5",
-    "webpack-cli": "^3.1.0"
-  }
-}

docs/styles.scss

@@ -1,141 +0,0 @@
-$font-family-sans-serif: "Source Sans Pro";
-$border-radius-lg: 0;
-$btn-border-width: 3px;
-
-@import "node_modules/bootstrap/scss/bootstrap";
-
-
-h1 {
-    font-size: 10vw;
-    font-weight: 200;
-    margin: 0;
-}
-
-body {
-    overflow-x: hidden;
-}
-
-.subtitle {
-    font-style: italic;
-    color: #999;
-    font-size: 5vw;
-    font-weight: 300;
-}
-
-.background-stripe {
-    width: 100vw;
-    background-image: url('./background.jpeg');
-    background-size: cover;
-    height: 30vw;
-    margin: 200px 0 150px;
-    min-height: 1000px;
-    position: relative;
-
-    .overlay {
-        position: absolute;
-        width: 100vw;
-        width: 1px;
-        height: 1px;
-
-        &.overlay1 {
-            top: -1px;
-            left: 0;
-            border-top: 10vw solid white;
-            border-right: 100vw solid transparent;
-        }
-
-        &.overlay2 {
-            bottom: -1px;
-            right: 0;
-            border-bottom: 10vw solid white;
-            border-left: 100vw solid transparent;
-        }
-    }
-
-    .terminal {
-        position: absolute;
-        left: 50%;
-        top: 5vw;
-
-        width: 1304px;
-        margin-left: -652px;
-        height: 972px;
-        border-radius: 9px;
-
-        box-shadow: 0 0 100px black;
-        background: url('./terminal.png');
-        background-size: cover;
-
-        animation: slideIn ease-out 1s;
-        opacity: .95;
-    }
-
-    @media(max-width: 1500px) {
-        min-height: 500px;
-        margin: 200px 0 100px;
-
-        .terminal {
-            width: 652px;
-            top: -100px;
-            margin-left: -326px;
-            height: 486px;
-            border-radius: 5px;
-        }
-    }
-
-    @media(max-width: 750px) {
-        min-height: 250px;
-        margin: 100px 0 50px;
-
-        .terminal {
-            width: 326px;
-            top: -50px;
-            margin-left: -163px;
-            height: 243px;
-            border-radius: 3px;
-        }
-    }
-
-}
-
-.feature {
-    font-size: 45px;
-    line-height: 40px;
-    opacity: .5;
-    font-style: italic;
-}
-
-@keyframes slideIn {
-    from {
-        opacity: 0;
-        margin-top: 200px;
-    }
-    to {
-        opacity: .95;
-        margin-top: 0px;
-    }
-}
-
-
-.background-stripe2 {
-    width: 100vw;
-    background-image: url('./background.jpeg');
-    background-size: cover;
-    height: 30vw;
-    margin: 100px 0 0;
-    position: relative;
-
-    .overlay {
-        position: absolute;
-        width: 100vw;
-        width: 1px;
-        height: 1px;
-
-        &.overlay1 {
-            top: -1px;
-            right: 0;
-            border-top: 10vw solid white;
-            border-left: 100vw solid transparent;
-        }
-    }
-}

docs/webpack.config.js

@@ -1,27 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  entry: {
-    'index.ignore': 'file-loader?name=../index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
-    'bundle': path.resolve(__dirname, 'index.js'),
-  },
-  context: __dirname,
-  output: {
-    path: path.join(__dirname, 'dist'),
-    filename: '[name].js'
-  },
-  module: {
-    rules: [
-      { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
-      {
-        test: /\.(jpeg|png)?$/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: 'assets/[name].[ext]'
-          }
-        }
-      }
-    ]
-  },
-}

package.json

@@ -1,59 +1,59 @@
 {
   "name": "term",
   "devDependencies": {
-    "@types/electron-config": "^0.2.1",
+    "@fortawesome/fontawesome-free": "^5.8.2",
-    "@types/electron-debug": "^1.1.0",
+    "@types/electron-config": "^3.2.2",
-    "@types/fs-promise": "1.0.1",
+    "@types/electron-debug": "^2.1.0",
-    "@types/js-yaml": "^3.11.2",
+    "@types/fs-promise": "1.0.3",
-    "@types/node": "^10.11.5",
+    "@types/js-yaml": "^3.12.1",
-    "@types/webpack-env": "1.13.0",
+    "@types/node": "^12.0.2",
-    "app-builder-lib": "^20.28.4",
+    "@types/webpack-env": "1.13.9",
-    "apply-loader": "0.1.0",
+    "app-builder-lib": "^20.42.0",
+    "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
-    "core-js": "2.4.1",
+    "core-js": "^3.1.2",
-    "cross-env": "4.0.0",
+    "cross-env": "5.2.0",
-    "css-loader": "0.28.0",
+    "css-loader": "2.1.1",
-    "electron": "4.0.0-beta.8",
+    "electron": "^5.0.2",
-    "electron-builder": "^20.38.2",
+    "electron-builder": "^20.41.0",
-    "electron-builder-squirrel-windows": "^20.28.3",
+    "electron-installer-snap": "^3.2.0",
-    "electron-installer-snap": "^3.0.0",
+    "electron-rebuild": "^1.8.5",
-    "electron-rebuild": "^1.8.2",
+    "file-loader": "^3.0.1",
-    "file-loader": "^1.1.11",
+    "graceful-fs": "^4.1.15",
-    "font-awesome": "4.7.0",
+    "html-loader": "0.5.5",
-    "graceful-fs": "^4.1.11",
+    "json-loader": "0.5.7",
-    "html-loader": "0.4.4",
+    "node-abi": "^2.8.0",
-    "json-loader": "0.5.4",
+    "node-gyp": "^4.0.0",
-    "less": "2.7.1",
+    "node-sass": "^4.12.0",
-    "less-loader": "2.2.3",
+    "npmlog": "4.1.2",
-    "node-abi": "^2.4.4",
-    "node-gyp": "^3.6.2",
-    "node-sass": "^4.5.3",
-    "npmlog": "4.1.0",
     "npx": "^10.2.0",
     "pug": "^2.0.3",
-    "pug-html-loader": "1.0.9",
+    "pug-html-loader": "1.1.5",
     "pug-lint": "^2.5.0",
     "pug-loader": "^2.4.0",
-    "pug-static-loader": "0.0.1",
+    "pug-static-loader": "2.0.0",
-    "raven-js": "3.16.0",
+    "raven-js": "3.27.1",
-    "raw-loader": "0.5.1",
+    "raw-loader": "2.0.0",
     "sass-loader": "^7.0.1",
-    "shelljs": "0.7.7",
+    "shelljs": "0.8.3",
     "source-code-pro": "^2.30.1",
-    "source-sans-pro": "2.0.10",
+    "source-sans-pro": "2.45.0",
-    "style-loader": "0.13.1",
+    "style-loader": "^0.23.1",
     "svg-inline-loader": "^0.8.0",
     "to-string-loader": "1.1.5",
-    "tslint": "5.1.0",
+    "tslint": "^5.16.0",
-    "tslint-config-standard": "5.0.2",
+    "tslint-config-standard": "^8.0.1",
-    "tslint-eslint-rules": "4.0.0",
+    "tslint-eslint-rules": "^5.4.0",
-    "typescript": "^3.1.3",
+    "typedoc": "^0.14.2",
+    "typescript": "^3.4.5",
     "url-loader": "^1.1.1",
-    "val-loader": "0.5.0",
+    "val-loader": "1.1.1",
-    "webpack": "^4.22.0",
+    "webpack": "^4.32.2",
-    "webpack-cli": "^3.1.2",
+    "webpack-cli": "^3.3.2",
-    "yaml-loader": "0.4.0",
+    "yaml-loader": "0.5.0"
-    "yarn": "^1.10.1"
+  },
+  "resolutions": {
+    "*/node-abi": "^2.8.0"
   },
   "build": {
     "appId": "org.terminus",
@@ -69,24 +69,29 @@
     ],
     "win": {
       "icon": "./build/windows/icon.ico",
-      "publish": [
-        "github"
-      ],
       "artifactName": "terminus-${version}-setup.exe"
     },
-    "squirrelWindows": {
+    "nsis": {
-      "iconUrl": "https://github.com/Eugeny/terminus/raw/master/build/windows/icon.ico",
+      "oneClick": false,
-      "artifactName": "terminus-${version}-setup.exe"
+      "artifactName": "terminus-${version}-setup.${ext}",
+      "installerIcon": "./build/windows/icon.ico"
     },
+    "publish": [
+      {
+        "provider": "bintray",
+        "token": "d993c4faa708a4cba84fa3a8e822457e7298d75c"
+      },
+      {
+        "provider": "github"
+      }
+    ],
     "portable": {
       "artifactName": "terminus-${version}-portable.exe"
     },
     "mac": {
       "category": "public.app-category.video",
       "icon": "./build/mac/icon.icns",
-      "publish": [
+      "artifactName": "terminus-${version}-macos.${ext}",
-        "github"
-      ],
       "extendInfo": {
         "NSRequiresAquaSystemAppearance": false
       }
@@ -97,10 +102,7 @@
     "linux": {
       "category": "Utilities",
       "icon": "./build/icons",
-      "artifactName": "terminus-${version}-linux.${ext}",
+      "artifactName": "terminus-${version}-linux.${ext}"
-      "publish": [
-        "github"
-      ]
     },
     "deb": {
       "depends": [
@@ -108,6 +110,7 @@
         "gconf2",
         "gconf-service",
         "libnotify4",
+        "libsecret-1-0",
         "libappindicator1",
         "libxtst6",
         "libnss3",
@@ -124,11 +127,12 @@
   },
   "scripts": {
     "build": "webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
-    "watch": "cross-env DEV=1 webpack --progress --color --watch",
+    "watch": "cross-env TERMINUS_DEV=1 webpack --progress --color --watch",
-    "start": "cross-env DEV=1 electron app --debug",
+    "start": "cross-env TERMINUS_DEV=1 electron app --debug",
-    "prod": "cross-env DEV=1 electron app",
+    "prod": "cross-env TERMINUS_DEV=1 electron app",
+    "docs": "typedoc --out docs/api terminus-core/src && typedoc --out docs/api/terminal terminus-terminal/src && typedoc --out docs/api/settings terminus-settings/src",
     "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts",
-    "postinstall": "install-app-deps"
+    "postinstall": "node ./scripts/install-deps.js"
   },
   "repository": "eugeny/terminus"
 }

scripts/build-native.js

@@ -4,24 +4,18 @@ const path = require('path')
 const vars = require('./vars')
 
 lifecycles = []
-lifecycles.push(rebuild({
+for (let dir of ['app', 'terminus-core', 'terminus-ssh', 'terminus-terminal']) {
-  buildPath: path.resolve(__dirname, '../app'),
+  lifecycles.push([rebuild({
-  electronVersion: vars.electronVersion,
+    buildPath: path.resolve(__dirname, '../' + dir),
-  force: true,
+    electronVersion: vars.electronVersion,
-}).lifecycle)
+    force: true,
-lifecycles.push(rebuild({
+  }).lifecycle, dir])
-  buildPath: path.resolve(__dirname, '../terminus-ssh'),
+}
-  electronVersion: vars.electronVersion,
-  force: true,
-}).lifecycle)
-lifecycles.push(rebuild({
-  buildPath: path.resolve(__dirname, '../terminus-terminal'),
-  electronVersion: vars.electronVersion,
-  force: true,
-}).lifecycle)
 
-for (let lc of lifecycles) {
+console.info('Building against Electron', vars.electronVersion)
+
+for (let [lc, dir] of lifecycles) {
   lc.on('module-found', name => {
-    console.info('Rebuilding', name)
+    console.info('Rebuilding', dir + '/' + name)
   })
 }

scripts/build-windows.js

@@ -4,7 +4,7 @@ const vars = require('./vars')
 
 builder({
   dir: true,
-  win: ['squirrel', 'portable'],
+  win: ['nsis', 'portable'],
   config: {
     extraMetadata: {
       version: vars.version,

scripts/install-deps.js

@@ -8,7 +8,6 @@ const localBinPath = path.resolve(__dirname, '../node_modules/.bin');
 const npx = `${localBinPath}/npx`;
 
 log.info('deps', 'app')
-sh.exec(`${npx} yarn install`)
 
 sh.cd('app')
 sh.exec(`${npx} yarn install`)

scripts/vars.js

@@ -3,10 +3,11 @@ const fs = require('fs')
 const childProcess = require('child_process')
 
 const appInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../app/package.json')))
-const pkgInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json')))
+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 = exports.version.substring(1, exports.version.length - 1)
+exports.version = exports.version.substring(1).trim()
+exports.version = exports.version.replace('-', '-c')
 
 exports.builtinPlugins = [
   'terminus-core',
@@ -20,4 +21,4 @@ exports.bundledModules = [
   '@angular',
   '@ng-bootstrap',
 ]
-exports.electronVersion = pkgInfo.devDependencies.electron
+exports.electronVersion = electronInfo.version

snap/snapcraft.yaml

@@ -0,0 +1,26 @@
+name: terminus
+version: '1.0.0'
+summary: A terminal for a modern age
+description: |
+  Terminus is a terminal heavily inspired by Hyper. It is, however, designed for people who need to get things done.
+
+grade: devel 
+confinement: devmode
+
+apps:
+  terminus:
+    command: opt/terminus/terminus
+    
+parts:
+  app:
+    plugin: nodejs
+    source: .
+    build-packages: 
+      - libfontconfig-dev
+    override-build: |
+      yarn
+      ./scripts/build-native.js
+      yarn run build
+      ./scripts/build-linux.js
+      mkdir -p $SNAPCRAFT_PART_INSTALL/opt/terminus || true
+      cp -ar dist/linux-unpacked/* $SNAPCRAFT_PART_INSTALL/opt/terminus/

terminus-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.73-c4-ga7d62b0",
   "description": "Community color schemes for Terminus",
   "keywords": [
     "terminus-builtin-plugin"
@@ -22,7 +22,7 @@
     "terminus-terminal": "*"
   },
   "devDependencies": {
-    "@types/node": "7.0.12",
+    "@types/node": "12.0.2",
     "@types/webpack-env": "^1.13.0"
   },
   "false": {}

terminus-community-color-schemes/schemes/Relaxed

@@ -0,0 +1,36 @@
+! special
+*.foreground:   #d8d8d8
+*.background:   #343a43
+*.cursorColor:  #d8d8d8
+
+! black
+*.color0:       #2c3037
+*.color8:       #626262
+
+! red
+*.color1:       #bb5653
+*.color9:       #c35956
+
+! green
+*.color2:       #909d62
+*.color10:      #9fab76
+
+! yellow
+*.color3:       #eac179
+*.color11:      #ecc179
+
+! blue
+*.color4:       #698698
+*.color12:      #7da9c7
+
+! magenta
+*.color5:       #b06597
+*.color13:      #ba6ca0
+
+! cyan
+*.color6:       #c9dfff
+*.color14:      #abbacf
+
+! white
+*.color7:       #d8d8d8
+*.color15:      #f7f7f7

terminus-community-color-schemes/webpack.config.js

@@ -4,7 +4,7 @@ const webpack = require('webpack')
 module.exports = {
   target: 'node',
   entry: 'src/index.ts',
-  devtool: 'source-map',
+  devtool: 'eval-source-map',
   context: __dirname,
   output: {
     path: path.resolve(__dirname, 'dist'),
@@ -13,7 +13,7 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]',
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },

terminus-community-color-schemes/yarn.lock

@@ -2,12 +2,12 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.12":
+"@types/node@12.0.2":
-  version "7.0.12"
+  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
-  integrity sha1-rl9noZwV91IUgATbB8u7Ny5p78k=
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
 
 "@types/webpack-env@^1.13.0":
-  version "1.13.1"
+  version "1.13.9"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.1.tgz#b45c222e24301bd006e3edfc762cc6b51bda236a"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a"
-  integrity sha512-oHyg0NssP2RCpCvE35hhbSqMJRsc5lSW+GFe+Vc65JL+kHII1VMYM+0KeV/z4utFuUqPoQRmq8KMMp7ba0dj6Q==
+  integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg==

terminus-core/README.md

@@ -0,0 +1,31 @@
+Terminus Core Plugin
+--------------------
+
+See also: [Settings plugin API](./settings/), [Terminal plugin API](./settings/)
+
+* tabbed interface services
+* toolbar UI
+* config file management
+* hotkeys
+* tab recovery
+* logging
+* theming
+
+Using the API:
+
+```ts
+import { AppService, TabContextMenuItemProvider } from 'terminus-core'
+```
+
+Exporting your subclasses:
+
+```ts
+@NgModule({
+  ...
+  providers: [
+    ...
+    { provide: TabContextMenuItemProvider, useClass: MyContextMenu, multi: true },
+    ...
+  ]
+})
+```

terminus-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-core",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.73-c4-ga7d62b0",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -18,19 +18,21 @@
   "license": "MIT",
   "devDependencies": {
     "@types/js-yaml": "^3.9.0",
-    "@types/node": "^7.0.37",
+    "@types/node": "^12.0.2",
     "@types/webpack-env": "^1.13.0",
     "@types/winston": "^2.3.6",
     "axios": "^0.18.0",
     "bootstrap": "^4.1.3",
-    "core-js": "^2.4.1",
+    "core-js": "^3.1.2",
-    "electron-updater": "^2.8.9",
+    "electron-updater": "^4.0.6",
     "ng2-dnd": "^5.0.2",
     "ngx-perfect-scrollbar": "^6.0.0",
-    "rage-edit-tmp": "^1.1.0",
     "shell-escape": "^0.2.0",
     "universal-analytics": "^0.4.17"
   },
+  "optionalDependencies": {
+    "windows-native-registry": "^1.0.14"
+  },
   "peerDependencies": {
     "@angular/animations": "4.0.1",
     "@angular/common": "4.0.1",
@@ -42,8 +44,8 @@
     "zone.js": "0.8.4"
   },
   "dependencies": {
-    "deepmerge": "^1.5.0",
+    "deepmerge": "^3.2.0",
     "js-yaml": "^3.9.0",
-    "winston": "^2.4.0"
+    "winston": "^3.2.1"
   }
 }

terminus-core/src/api/configProvider.ts

@@ -1,4 +1,37 @@
+/**
+ * Extend to add your own config options
+ */
 export abstract class ConfigProvider {
+    /**
+     * Default values, e.g.
+     *
+     * ```ts
+     * defaults = {
+     *   myPlugin: {
+     *     foo: 1
+     *   }
+     * }
+     * ```
+     */
     defaults: any = {}
-    platformDefaults: any = {}
+
+    /**
+     * [[Platform]] specific defaults, e.g.
+     *
+     * ```ts
+     * platformDefaults = {
+     *   [Platform.Windows]: {
+     *     myPlugin: {
+     *       bar: true
+     *     }
+     *   },
+     *   [Platform.macOS]: {
+     *     myPlugin: {
+     *       bar: false
+     *     }
+     *   },
+     * }
+     * ```
+     */
+    platformDefaults: {[platform: string]: any} = {}
 }

terminus-core/src/api/hotkeyProvider.ts

@@ -1,8 +1,12 @@
 export interface IHotkeyDescription {
-    id: string,
+    id: string
-    name: string,
+    name: string
 }
 
+/**
+ * Extend to provide your own hotkeys. A corresponding [[ConfigProvider]]
+ * must also provide the `hotkeys.foo` config options with the default values
+ */
 export abstract class HotkeyProvider {
     hotkeys: IHotkeyDescription[] = []
 

terminus-core/src/api/index.ts

@@ -1,9 +1,11 @@
 export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
+export { SplitTabComponent, SplitContainer } from '../components/splitTab.component'
 export { TabRecoveryProvider, RecoveredTab } from './tabRecovery'
 export { ToolbarButtonProvider, IToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
 export { HotkeyProvider, IHotkeyDescription } from './hotkeyProvider'
 export { Theme } from './theme'
+export { TabContextMenuItemProvider } from './tabContextMenuProvider'
 
 export { AppService } from '../services/app.service'
 export { ConfigService } from '../services/config.service'
@@ -15,3 +17,4 @@ export { HotkeysService } from '../services/hotkeys.service'
 export { HostAppService, Platform } from '../services/hostApp.service'
 export { ShellIntegrationService } from '../services/shellIntegration.service'
 export { ThemesService } from '../services/themes.service'
+export { TabsService } from '../services/tabs.service'

terminus-core/src/api/tabContextMenuProvider.ts

@@ -0,0 +1,11 @@
+import { BaseTabComponent } from '../components/baseTab.component'
+import { TabHeaderComponent } from '../components/tabHeader.component'
+
+/**
+ * Extend to add items to the tab header's context menu
+ */
+export abstract class TabContextMenuItemProvider {
+    weight = 0
+
+    abstract async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]>
+}

terminus-core/src/api/tabRecovery.ts

@@ -1,10 +1,38 @@
-import { TabComponentType } from '../services/app.service'
+import { TabComponentType } from '../services/tabs.service'
 
 export interface RecoveredTab {
-    type: TabComponentType,
+    /**
-    options?: any,
+     * Component type to be instantiated
+     */
+    type: TabComponentType
+
+    /**
+     * Component instance inputs
+     */
+    options?: any
 }
 
+/**
+ * Extend to enable recovery for your custom tab.
+ * This works in conjunction with [[getRecoveryToken()]]
+ *
+ * Terminus will try to find any [[TabRecoveryProvider]] that is able to process
+ * the recovery token previously returned by [[getRecoveryToken]].
+ *
+ * Recommended token format:
+ *
+ * ```json
+ * {
+ *   type: 'my-tab-type',
+ *   foo: 'bar',
+ * }
+ * ```
+ */
 export abstract class TabRecoveryProvider {
-    abstract async recover (recoveryToken: any): Promise<RecoveredTab|null>
+    /**
+     * @param recoveryToken a recovery token found in the saved tabs list
+     * @returns [[RecoveredTab]] descriptor containing tab type and component inputs
+     *          or `null` if this token is from a different tab type or is not supported
+     */
+    abstract async recover (recoveryToken: any): Promise<RecoveredTab | null>
 }

terminus-core/src/api/theme.ts

@@ -1,5 +1,13 @@
+/**
+ * Extend to add a custom CSS theme
+ */
 export abstract class Theme {
     name: string
+
+    /**
+     * Complete CSS stylesheet
+     */
     css: string
+
     terminalBackground: string
 }

terminus-core/src/api/toolbarButtonProvider.ts

@@ -1,14 +1,39 @@
 import { SafeHtml } from '@angular/platform-browser'
 
+/**
+ * See [[ToolbarButtonProvider]]
+ */
 export interface IToolbarButton {
+    /**
+     * Raw SVG icon code
+     */
     icon: SafeHtml
-    touchBarNSImage?: string
+
     title: string
+
+    /**
+     * Optional Touch Bar icon ID
+     */
+    touchBarNSImage?: string
+
+    /**
+     * Optional Touch Bar button label
+     */
     touchBarTitle?: string
+
     weight?: number
-    click: () => void
+
+    click?: () => void
+
+    submenu?: () => Promise<IToolbarButton[]>
+
+    /** @hidden */
+    submenuItems?: IToolbarButton[]
 }
 
+/**
+ * Extend to add buttons to the toolbar
+ */
 export abstract class ToolbarButtonProvider {
     abstract provide (): IToolbarButton[]
 }

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

@@ -32,22 +32,48 @@ title-bar(
             )
 
         .btn-group.background
-            button.btn.btn-secondary.btn-tab-bar(
+            .d-flex(
                 *ngFor='let button of leftToolbarButtons', 
-                [title]='button.title',
+                ngbDropdown,
-                (click)='button.click()',
+                (openChange)='generateButtonSubmenu(button)',
-                [innerHTML]='button.icon',
             )
+                button.btn.btn-secondary.btn-tab-bar(
+                    [title]='button.title',
+                    (click)='button.click && button.click()',
+                    [innerHTML]='button.icon',
+                    ngbDropdownToggle,
+                )
+                div(*ngIf='button.submenu', ngbDropdownMenu)
+                    button.dropdown-item.d-flex.align-items-center(
+                        *ngFor='let item of button.submenuItems', 
+                        (click)='item.click()',
+                        ngbDropdownItem,
+                    ) 
+                        .icon-wrapper([innerHTML]='item.icon')
+                        .ml-3 {{item.title}}
 
         .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
 
         .btn-group.background
-            button.btn.btn-secondary.btn-tab-bar(
+            .d-flex(
                 *ngFor='let button of rightToolbarButtons', 
-                [title]='button.title',
+                ngbDropdown,
-                (click)='button.click()',
+                (openChange)='generateButtonSubmenu(button)',
-                [innerHTML]='button.icon',
             )
+                button.btn.btn-secondary.btn-tab-bar(
+                    [title]='button.title',
+                    (click)='button.click && button.click()',
+                    [innerHTML]='button.icon',
+                    ngbDropdownToggle,
+                )
+                div(*ngIf='button.submenu', ngbDropdownMenu)
+                    button.dropdown-item.d-flex.align-items-center(
+                        *ngFor='let item of button.submenuItems', 
+                        (click)='item.click()',
+                        ngbDropdownItem,
+                    ) 
+                        .icon-wrapper([innerHTML]='item.icon')
+                        .ml-3 {{item.title}}
 
             button.btn.btn-secondary.btn-tab-bar.btn-update(
                 *ngIf='updatesAvailable',

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

@@ -88,12 +88,20 @@ hotkey-hint {
     max-width: 300px;
 }
 
-::ng-deep .btn-tab-bar svg {
+::ng-deep .btn-tab-bar svg,
+::ng-deep .btn-tab-bar + .dropdown-menu svg {
+    width: 16px;
     height: 16px;
     fill: white;
     fill-opacity: 0.75;
 }
 
+.icon-wrapper {
+    display: flex;
+    width: 16px;
+    height: 17px;
+}
+
 ::ng-deep .btn-update svg {
     fill: cyan;
 }

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

@@ -9,7 +9,6 @@ import { HotkeysService } from '../services/hotkeys.service'
 import { Logger, LogService } from '../services/log.service'
 import { ConfigService } from '../services/config.service'
 import { DockingService } from '../services/docking.service'
-import { TabRecoveryService } from '../services/tabRecovery.service'
 import { ThemesService } from '../services/themes.service'
 import { UpdaterService } from '../services/updater.service'
 import { TouchbarService } from '../services/touchbar.service'
@@ -18,6 +17,7 @@ import { BaseTabComponent } from './baseTab.component'
 import { SafeModeModalComponent } from './safeModeModal.component'
 import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
 
+/** @hidden */
 @Component({
     selector: 'app-root',
     template: require('./appRoot.component.pug'),
@@ -69,7 +69,6 @@ export class AppRootComponent {
     constructor (
         private docking: DockingService,
         private electron: ElectronService,
-        private tabRecovery: TabRecoveryService,
         private hotkeys: HotkeysService,
         private updater: UpdaterService,
         private touchbar: TouchbarService,
@@ -128,6 +127,11 @@ export class AppRootComponent {
             this.onGlobalHotkey()
         })
 
+        this.hostApp.windowCloseRequest$.subscribe(async () => {
+            await this.app.closeAllTabs()
+            this.hostApp.closeWindow()
+        })
+
         if (window['safeModeReason']) {
             ngbModal.open(SafeModeModalComponent)
         }
@@ -199,9 +203,7 @@ export class AppRootComponent {
     }
 
     async ngOnInit () {
-        await this.tabRecovery.recoverTabs()
         this.ready = true
-        this.tabRecovery.saveTabs(this.app.tabs)
 
         this.app.emitReady()
     }
@@ -231,6 +233,12 @@ export class AppRootComponent {
         })
     }
 
+    async generateButtonSubmenu (button: IToolbarButton) {
+        if (button.submenu) {
+            button.submenuItems = await button.submenu()
+        }
+    }
+
     private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
         let buttons: IToolbarButton[] = []
         this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {

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

@@ -1,27 +1,58 @@
 import { Observable, Subject } from 'rxjs'
 import { ViewRef } from '@angular/core'
 
+/**
+ * Represents an active "process" inside a tab,
+ * for example, a user process running inside a terminal tab
+ */
 export interface BaseTabProcess {
     name: string
 }
 
+/**
+ * Abstract base class for custom tab components
+ */
 export abstract class BaseTabComponent {
-    private static lastTabID = 0
+    /**
-    id: number
+     * Current tab title
+     */
     title: string
+
+    /**
+     * User-defined title override
+     */
     customTitle: string
-    hasFocus = false
+
+    /**
+     * Last tab activity state
+     */
     hasActivity = false
+
+    /**
+     * ViewRef to the tab DOM element
+     */
     hostView: ViewRef
+
+    /**
+     * CSS color override for the tab's header
+     */
     color: string = null
-    protected titleChange = new Subject<string>()
+
-    protected focused = new Subject<void>()
+    protected hasFocus = false
-    protected blurred = new Subject<void>()
+
-    protected progress = new Subject<number>()
+    /**
-    protected activity = new Subject<boolean>()
+     * Ping this if your recovery state has been changed and you want
-    protected destroyed = new Subject<void>()
+     * your tab state to be saved sooner
+     */
+    protected recoveryStateChangedHint = new Subject<void>()
 
     private progressClearTimeout: number
+    private titleChange = new Subject<string>()
+    private focused = new Subject<void>()
+    private blurred = new Subject<void>()
+    private progress = new Subject<number>()
+    private activity = new Subject<boolean>()
+    private destroyed = new Subject<void>()
 
     get focused$ (): Observable<void> { return this.focused }
     get blurred$ (): Observable<void> { return this.blurred }
@@ -29,9 +60,9 @@ export abstract class BaseTabComponent {
     get progress$ (): Observable<number> { return this.progress }
     get activity$ (): Observable<boolean> { return this.activity }
     get destroyed$ (): Observable<void> { return this.destroyed }
+    get recoveryStateChangedHint$ (): Observable<void> { return this.recoveryStateChangedHint }
 
     constructor () {
-        this.id = BaseTabComponent.lastTabID++
         this.focused$.subscribe(() => {
             this.hasFocus = true
         })
@@ -47,6 +78,11 @@ export abstract class BaseTabComponent {
         }
     }
 
+    /**
+     * Sets visual progressbar on the tab
+     *
+     * @param  {type} progress: value between 0 and 1, or `null` to remove
+     */
     setProgress (progress: number) {
         this.progress.next(progress)
         if (progress) {
@@ -59,24 +95,43 @@ export abstract class BaseTabComponent {
         }
     }
 
+    /**
+     * Shows the acticity marker on the tab header
+     */
     displayActivity (): void {
         this.hasActivity = true
         this.activity.next(true)
     }
 
+    /**
+     * Removes the acticity marker from the tab header
+     */
     clearActivity (): void {
         this.hasActivity = false
         this.activity.next(false)
     }
 
-    getRecoveryToken (): any {
+    /**
+     * Override this and implement a [[TabRecoveryProvider]] to enable recovery
+     * for your custom tab
+     *
+     * @return JSON serializable tab state representation
+     *         for your [[TabRecoveryProvider]] to parse
+     */
+    async getRecoveryToken (): Promise<any> {
         return null
     }
 
+    /**
+     * Override this to enable task completion notifications for the tab
+     */
     async getCurrentProcess (): Promise<BaseTabProcess> {
         return null
     }
 
+    /**
+     * Return false to prevent the tab from being closed
+     */
     async canClose (): Promise<boolean> {
         return true
     }
@@ -89,11 +144,15 @@ export abstract class BaseTabComponent {
         this.blurred.next()
     }
 
+    /**
+     * Called before the tab is closed
+     */
     destroy (): void {
         this.focused.complete()
         this.blurred.complete()
         this.titleChange.complete()
         this.progress.complete()
+        this.recoveryStateChangedHint.complete()
         this.destroyed.next()
         this.destroyed.complete()
     }

terminus-core/src/components/checkbox.component.pug

@@ -1,4 +1,4 @@
 .icon(tabindex='0', [class.active]='model', (keyup.space)='click()')
-    i.fa.fa-square-o.off
+    i.fas.fa-square.off
-    i.fa.fa-check-square.on
+    i.fas.fa-check-square.on
 .text {{text}}

terminus-core/src/components/checkbox.component.scss

@@ -20,6 +20,10 @@
     flex-direction: row;
     align-items: center;
 
+    .off {
+        color: rgba(0, 0, 0, .5);
+    }
+
     .icon {
         position: relative;
         flex: none;

terminus-core/src/components/checkbox.component.ts

@@ -1,6 +1,7 @@
 import { NgZone, Component, Input, HostBinding, HostListener } from '@angular/core'
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
 
+/** @hidden */
 @Component({
     selector: 'checkbox',
     template: require('./checkbox.component.pug'),

terminus-core/src/components/renameTabModal.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input, ElementRef, ViewChild } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 
+/** @hidden */
 @Component({
     selector: 'rename-tab-modal',
     template: require('./renameTabModal.component.pug'),
@@ -16,6 +17,7 @@ export class RenameTabModalComponent {
     ngOnInit () {
         setTimeout(() => {
             this.input.nativeElement.focus()
+            this.input.nativeElement.select()
         }, 250)
     }
 

terminus-core/src/components/safeModeModal.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 
+/** @hidden */
 @Component({
     template: require('./safeModeModal.component.pug'),
 })

terminus-core/src/components/splitTab.component.scss

@@ -0,0 +1,5 @@
+:host {
+    display: block;
+    position: relative;
+    flex: auto;
+}

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

@@ -0,0 +1,524 @@
+import { Observable, Subject, Subscription } from 'rxjs'
+import { Component, Injectable, ViewChild, ViewContainerRef, EmbeddedViewRef, OnInit, OnDestroy } from '@angular/core'
+import { BaseTabComponent, BaseTabProcess } from './baseTab.component'
+import { TabRecoveryProvider, RecoveredTab } from '../api/tabRecovery'
+import { TabsService } from '../services/tabs.service'
+import { HotkeysService } from '../services/hotkeys.service'
+import { TabRecoveryService } from '../services/tabRecovery.service'
+
+export declare type SplitOrientation = 'v' | 'h'
+export declare type SplitDirection = 'r' | 't' | 'b' | 'l'
+
+/**
+ * Describes a horizontal or vertical split row or column
+ */
+export class SplitContainer {
+    orientation: SplitOrientation = 'h'
+
+    /**
+     * Children could be tabs or other containers
+     */
+    children: (BaseTabComponent | SplitContainer)[] = []
+
+    /**
+     * Relative sizes of children, between 0 and 1. Total sum is 1
+     */
+    ratios: number[] = []
+
+    x: number
+    y: number
+    w: number
+    h: number
+
+    /**
+     * @return Flat list of all tabs inside this container
+     */
+    getAllTabs () {
+        let r = []
+        for (let child of this.children) {
+            if (child instanceof SplitContainer) {
+                r = r.concat(child.getAllTabs())
+            } else {
+                r.push(child)
+            }
+        }
+        return r
+    }
+
+    /**
+     * Remove unnecessarily nested child containers and renormalizes [[ratios]]
+     */
+    normalize () {
+        for (let i = 0; i < this.children.length; i++) {
+            let child = this.children[i]
+
+            if (child instanceof SplitContainer) {
+                child.normalize()
+
+                if (child.children.length === 0) {
+                    this.children.splice(i, 1)
+                    this.ratios.splice(i, 1)
+                    i--
+                    continue
+                } else if (child.children.length === 1) {
+                    this.children[i] = child.children[0]
+                } else if (child.orientation === this.orientation) {
+                    let ratio = this.ratios[i]
+                    this.children.splice(i, 1)
+                    this.ratios.splice(i, 1)
+                    for (let j = 0; j < child.children.length; j++) {
+                        this.children.splice(i, 0, child.children[j])
+                        this.ratios.splice(i, 0, child.ratios[j] * ratio)
+                        i++
+                    }
+                }
+            }
+        }
+
+        let s = 0
+        for (let x of this.ratios) {
+            s += x
+        }
+        this.ratios = this.ratios.map(x => x / s)
+    }
+
+    /**
+     * Gets the left/top side offset for the given element index (between 0 and 1)
+     */
+    getOffsetRatio (index: number): number {
+        let s = 0
+        for (let i = 0; i < index; i++) {
+            s += this.ratios[i]
+        }
+        return s
+    }
+
+    async serialize () {
+        let children = []
+        for (let child of this.children) {
+            if (child instanceof SplitContainer) {
+                children.push(await child.serialize())
+            } else {
+                children.push(await child.getRecoveryToken())
+            }
+        }
+        return {
+            type: 'app:split-tab',
+            ratios: this.ratios,
+            orientation: this.orientation,
+            children,
+        }
+    }
+}
+
+/**
+ * Represents a spanner (draggable border between two split areas)
+ */
+export interface SplitSpannerInfo {
+    container: SplitContainer
+
+    /**
+     * Number of the right/bottom split in the container
+     */
+    index: number
+}
+
+/**
+ * Split tab is a tab that contains other tabs and allows further splitting them
+ * You'll mainly encounter it inside [[AppService]].tabs
+ */
+@Component({
+    selector: 'split-tab',
+    template: `
+        <ng-container #vc></ng-container>
+        <split-tab-spanner
+            *ngFor='let spanner of _spanners'
+            [container]='spanner.container'
+            [index]='spanner.index'
+            (change)='onSpannerAdjusted(spanner)'
+        ></split-tab-spanner>
+    `,
+    styles: [require('./splitTab.component.scss')],
+})
+export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDestroy {
+    /** @hidden */
+    @ViewChild('vc', { read: ViewContainerRef }) viewContainer: ViewContainerRef
+
+    /**
+     * Top-level split container
+     */
+    root: SplitContainer
+
+    /** @hidden */
+    _recoveredState: any
+
+    /** @hidden */
+    _spanners: SplitSpannerInfo[] = []
+
+    private focusedTab: BaseTabComponent
+    private hotkeysSubscription: Subscription
+    private viewRefs: Map<BaseTabComponent, EmbeddedViewRef<any>> = new Map()
+
+    private tabAdded = new Subject<BaseTabComponent>()
+    private tabRemoved = new Subject<BaseTabComponent>()
+    private splitAdjusted = new Subject<SplitSpannerInfo>()
+    private focusChanged = new Subject<BaseTabComponent>()
+
+    get tabAdded$ (): Observable<BaseTabComponent> { return this.tabAdded }
+    get tabRemoved$ (): Observable<BaseTabComponent> { return this.tabRemoved }
+
+    /**
+     * Fired when split ratio is changed for a given spanner
+     */
+    get splitAdjusted$ (): Observable<SplitSpannerInfo> { return this.splitAdjusted }
+
+    /**
+     * Fired when a different sub-tab gains focus
+     */
+    get focusChanged$ (): Observable<BaseTabComponent> { return this.focusChanged }
+
+    /** @hidden */
+    constructor (
+        private hotkeys: HotkeysService,
+        private tabsService: TabsService,
+        private tabRecovery: TabRecoveryService,
+    ) {
+        super()
+        this.root = new SplitContainer()
+        this.setTitle('')
+
+        this.focused$.subscribe(() => {
+            this.getAllTabs().forEach(x => x.emitFocused())
+            this.focus(this.focusedTab)
+        })
+        this.blurred$.subscribe(() => this.getAllTabs().forEach(x => x.emitBlurred()))
+
+        this.hotkeysSubscription = this.hotkeys.matchedHotkey.subscribe(hotkey => {
+            if (!this.hasFocus) {
+                return
+            }
+            switch (hotkey) {
+            case 'split-right':
+                this.splitTab(this.focusedTab, 'r')
+                break
+            case 'split-bottom':
+                this.splitTab(this.focusedTab, 'b')
+                break
+            case 'split-top':
+                this.splitTab(this.focusedTab, 't')
+                break
+            case 'split-left':
+                this.splitTab(this.focusedTab, 'l')
+                break
+            case 'pane-nav-left':
+                this.navigate('l')
+                break
+            case 'pane-nav-right':
+                this.navigate('r')
+                break
+            case 'pane-nav-up':
+                this.navigate('t')
+                break
+            case 'pane-nav-down':
+                this.navigate('b')
+                break
+            case 'close-pane':
+                this.removeTab(this.focusedTab)
+                break
+            }
+        })
+    }
+
+    /** @hidden */
+    async ngOnInit () {
+        if (this._recoveredState) {
+            await this.recoverContainer(this.root, this._recoveredState)
+            this.layout()
+            setImmediate(() => {
+                this.getAllTabs().forEach(x => x.emitFocused())
+                this.focusAnyIn(this.root)
+            })
+        }
+    }
+
+    /** @hidden */
+    ngOnDestroy () {
+        this.hotkeysSubscription.unsubscribe()
+    }
+
+    /** @returns Flat list of all sub-tabs */
+    getAllTabs () {
+        return this.root.getAllTabs()
+    }
+
+    getFocusedTab (): BaseTabComponent {
+        return this.focusedTab
+    }
+
+    focus (tab: BaseTabComponent) {
+        this.focusedTab = tab
+        for (let x of this.getAllTabs()) {
+            if (x !== tab) {
+                x.emitBlurred()
+            }
+        }
+        if (tab) {
+            tab.emitFocused()
+            this.focusChanged.next(tab)
+        }
+        this.layout()
+    }
+
+    /**
+     * Focuses the first available tab inside the given [[SplitContainer]]
+     */
+    focusAnyIn (parent: BaseTabComponent | SplitContainer) {
+        if (!parent) {
+            return
+        }
+        if (parent instanceof SplitContainer) {
+            this.focusAnyIn(parent.children[0])
+        } else {
+            this.focus(parent)
+        }
+    }
+
+    /**
+     * Inserts a new `tab` to the `side` of the `relative` tab
+     */
+    addTab (tab: BaseTabComponent, relative: BaseTabComponent, side: SplitDirection) {
+        let target = this.getParentOf(relative) || this.root
+        let insertIndex = target.children.indexOf(relative)
+
+        if (
+            (target.orientation === 'v' && ['l', 'r'].includes(side)) ||
+            (target.orientation === 'h' && ['t', 'b'].includes(side))
+        ) {
+            let newContainer = new SplitContainer()
+            newContainer.orientation = (target.orientation === 'v') ? 'h' : 'v'
+            newContainer.children = [relative]
+            newContainer.ratios = [1]
+            target.children[insertIndex] = newContainer
+            target = newContainer
+            insertIndex = 0
+        }
+
+        if (insertIndex === -1) {
+            insertIndex = 0
+        } else {
+            insertIndex += (side === 'l' || side === 't') ? 0 : 1
+        }
+
+        for (let i = 0; i < target.children.length; i++) {
+            target.ratios[i] *= target.children.length / (target.children.length + 1)
+        }
+        target.ratios.splice(insertIndex, 0, 1 / (target.children.length + 1))
+        target.children.splice(insertIndex, 0, tab)
+
+        this.recoveryStateChangedHint.next()
+        this.attachTabView(tab)
+
+        setImmediate(() => {
+            this.layout()
+            this.tabAdded.next(tab)
+            this.focus(tab)
+        })
+    }
+
+    removeTab (tab: BaseTabComponent) {
+        let parent = this.getParentOf(tab)
+        let index = parent.children.indexOf(tab)
+        parent.ratios.splice(index, 1)
+        parent.children.splice(index, 1)
+
+        this.detachTabView(tab)
+
+        this.layout()
+
+        this.tabRemoved.next(tab)
+
+        if (this.root.children.length === 0) {
+            this.destroy()
+        } else {
+            this.focusAnyIn(parent)
+        }
+    }
+
+    /**
+     * Moves focus in the given direction
+     */
+    navigate (dir: SplitDirection) {
+        let rel: BaseTabComponent | SplitContainer = this.focusedTab
+        let parent = this.getParentOf(rel)
+        let orientation = ['l', 'r'].includes(dir) ? 'h' : 'v'
+
+        while (parent !== this.root && parent.orientation !== orientation) {
+            rel = parent
+            parent = this.getParentOf(rel)
+        }
+
+        if (parent.orientation !== orientation) {
+            return
+        }
+
+        let index = parent.children.indexOf(rel)
+        if (['l', 't'].includes(dir)) {
+            if (index > 0) {
+                this.focusAnyIn(parent.children[index - 1])
+            }
+        } else {
+            if (index < parent.children.length - 1) {
+                this.focusAnyIn(parent.children[index + 1])
+            }
+        }
+    }
+
+    async splitTab (tab: BaseTabComponent, dir: SplitDirection) {
+        let newTab = await this.tabsService.duplicate(tab)
+        this.addTab(newTab, tab, dir)
+    }
+
+    /**
+     * @returns the immediate parent of `tab`
+     */
+    getParentOf (tab: BaseTabComponent | SplitContainer, root?: SplitContainer): SplitContainer {
+        root = root || this.root
+        for (let child of root.children) {
+            if (child instanceof SplitContainer) {
+                let r = this.getParentOf(tab, child)
+                if (r) {
+                    return r
+                }
+            }
+            if (child === tab) {
+                return root
+            }
+        }
+        return null
+    }
+
+    /** @hidden */
+    async canClose (): Promise<boolean> {
+        return !(await Promise.all(this.getAllTabs().map(x => x.canClose()))).some(x => !x)
+    }
+
+    /** @hidden */
+    async getRecoveryToken (): Promise<any> {
+        return this.root.serialize()
+    }
+
+    /** @hidden */
+    async getCurrentProcess (): Promise<BaseTabProcess> {
+        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x)
+    }
+
+    /** @hidden */
+    onSpannerAdjusted (spanner: SplitSpannerInfo) {
+        this.layout()
+        this.splitAdjusted.next(spanner)
+    }
+
+    private attachTabView (tab: BaseTabComponent) {
+        let ref = this.viewContainer.insert(tab.hostView) as EmbeddedViewRef<any>
+        this.viewRefs.set(tab, ref)
+
+        ref.rootNodes[0].addEventListener('click', () => this.focus(tab))
+
+        tab.titleChange$.subscribe(t => this.setTitle(t))
+        tab.activity$.subscribe(a => a ? this.displayActivity() : this.clearActivity())
+        tab.progress$.subscribe(p => this.setProgress(p))
+        if (tab.title) {
+            this.setTitle(tab.title)
+        }
+        tab.destroyed$.subscribe(() => {
+            this.removeTab(tab)
+        })
+    }
+
+    private detachTabView (tab: BaseTabComponent) {
+        let ref = this.viewRefs.get(tab)
+        this.viewRefs.delete(tab)
+        this.viewContainer.remove(this.viewContainer.indexOf(ref))
+    }
+
+    private layout () {
+        this.root.normalize()
+        this._spanners = []
+        this.layoutInternal(this.root, 0, 0, 100, 100)
+    }
+
+    private layoutInternal (root: SplitContainer, x: number, y: number, w: number, h: number) {
+        let size = (root.orientation === 'v') ? h : w
+        let sizes = root.ratios.map(x => x * size)
+
+        root.x = x
+        root.y = y
+        root.w = w
+        root.h = h
+
+        let offset = 0
+        root.children.forEach((child, i) => {
+            let childX = (root.orientation === 'v') ? x : (x + offset)
+            let childY = (root.orientation === 'v') ? (y + offset) : y
+            let childW = (root.orientation === 'v') ? w : sizes[i]
+            let childH = (root.orientation === 'v') ? sizes[i] : h
+            if (child instanceof SplitContainer) {
+                this.layoutInternal(child, childX, childY, childW, childH)
+            } else {
+                let element = this.viewRefs.get(child).rootNodes[0]
+                element.style.position = 'absolute'
+                element.style.left = `${childX}%`
+                element.style.top = `${childY}%`
+                element.style.width = `${childW}%`
+                element.style.height = `${childH}%`
+
+                element.style.opacity = (child === this.focusedTab) ? 1 : 0.75
+            }
+            offset += sizes[i]
+
+            if (i !== 0) {
+                this._spanners.push({
+                    container: root,
+                    index: i,
+                })
+            }
+        })
+    }
+
+    private async recoverContainer (root: SplitContainer, state: any) {
+        let children: (SplitContainer | BaseTabComponent)[] = []
+        root.orientation = state.orientation
+        root.ratios = state.ratios
+        root.children = children
+        for (let childState of state.children) {
+            if (childState.type === 'app:split-tab') {
+                let child = new SplitContainer()
+                await this.recoverContainer(child, childState)
+                children.push(child)
+            } else {
+                let recovered = await this.tabRecovery.recoverTab(childState)
+                if (recovered) {
+                    let tab = this.tabsService.create(recovered.type, recovered.options)
+                    children.push(tab)
+                    this.attachTabView(tab)
+                } else {
+                    state.ratios.splice(state.children.indexOf(childState), 0)
+                }
+            }
+        }
+    }
+}
+
+/** @hidden */
+@Injectable()
+export class SplitTabRecoveryProvider extends TabRecoveryProvider {
+    async recover (recoveryToken: any): Promise<RecoveredTab> {
+        if (recoveryToken && recoveryToken.type === 'app:split-tab') {
+            return {
+                type: SplitTabComponent,
+                options: { _recoveredState: recoveryToken },
+            }
+        }
+        return null
+    }
+}

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

@@ -0,0 +1,22 @@
+:host {
+    display: block;
+    position: absolute;
+    z-index: 5;
+    transition: 0.125s background;
+
+    &.v {
+        cursor: ns-resize;
+        height: 10px;
+        margin-top: -5px;
+    }
+
+    &.h {
+        cursor: ew-resize;
+        width: 10px;
+        margin-left: -5px;
+    }
+
+    &:hover, &.active {
+        background: rgba(255, 255, 255, .125);
+    }
+}

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

@@ -0,0 +1,88 @@
+import { Component, Input, HostBinding, ElementRef, Output, EventEmitter } from '@angular/core'
+import { SplitContainer } from './splitTab.component'
+
+/** @hidden */
+@Component({
+    selector: 'split-tab-spanner',
+    template: '',
+    styles: [require('./splitTabSpanner.component.scss')],
+})
+export class SplitTabSpannerComponent {
+    @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
+    @HostBinding('style.height') cssHeight: string
+    private marginOffset = -5
+
+    constructor (private element: ElementRef) { }
+
+    ngAfterViewInit () {
+        this.element.nativeElement.addEventListener('mousedown', e => {
+            this.isActive = true
+            let start = this.isVertical ? e.pageY : e.pageX
+            let current = start
+            let oldPosition = this.isVertical ? this.element.nativeElement.offsetTop : this.element.nativeElement.offsetLeft
+
+            const dragHandler = e => {
+                current = this.isVertical ? e.pageY : e.pageX
+                let newPosition = oldPosition + (current - start)
+                if (this.isVertical) {
+                    this.element.nativeElement.style.top = `${newPosition - this.marginOffset}px`
+                } else {
+                    this.element.nativeElement.style.left = `${newPosition - this.marginOffset}px`
+                }
+            }
+
+            const offHandler = () => {
+                this.isActive = false
+                document.removeEventListener('mouseup', offHandler)
+                this.element.nativeElement.parentElement.removeEventListener('mousemove', dragHandler)
+
+                let diff = (current - start) / (this.isVertical ? this.element.nativeElement.parentElement.clientHeight : this.element.nativeElement.parentElement.clientWidth)
+
+                diff = Math.max(diff, -this.container.ratios[this.index - 1] + 0.1)
+                diff = Math.min(diff, this.container.ratios[this.index] - 0.1)
+
+                this.container.ratios[this.index - 1] += diff
+                this.container.ratios[this.index] -= diff
+                this.change.emit()
+            }
+
+            document.addEventListener('mouseup', offHandler)
+            this.element.nativeElement.parentElement.addEventListener('mousemove', dragHandler)
+        })
+    }
+
+    ngOnChanges () {
+        this.isHorizontal = this.container.orientation === 'h'
+        this.isVertical = this.container.orientation === 'v'
+        if (this.isVertical) {
+            this.setDimensions(
+                this.container.x,
+                this.container.y + this.container.h * this.container.getOffsetRatio(this.index),
+                this.container.w,
+                null
+            )
+        } else {
+            this.setDimensions(
+                this.container.x + this.container.w * this.container.getOffsetRatio(this.index),
+                this.container.y,
+                null,
+                this.container.h
+            )
+        }
+    }
+
+    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
+    }
+}

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

@@ -14,10 +14,10 @@ div
 footer.d-flex.align-items-center
     .btn-group.mr-auto
         button.btn.btn-secondary((click)='homeBase.openGitHub()')
-            i.fa.fa-github
+            i.fab.fa-github
             span GitHub
         button.btn.btn-secondary((click)='homeBase.reportBug()')
-            i.fa.fa-bug
+            i.fas.fa-bug
             span Report a problem
 
     .form-control-static.selectable.no-drag Version: {{homeBase.appVersion}}

terminus-core/src/components/startPage.component.ts

@@ -3,6 +3,7 @@ import { ConfigService } from '../services/config.service'
 import { HomeBaseService } from '../services/homeBase.service'
 import { IToolbarButton, ToolbarButtonProvider } from '../api'
 
+/** @hidden */
 @Component({
     selector: 'start-page',
     template: require('./startPage.component.pug'),
@@ -22,6 +23,7 @@ export class StartPageComponent {
         return this.config.enabledServices(this.toolbarButtonProviders)
             .map(provider => provider.provide())
             .reduce((a, b) => a.concat(b))
+            .filter(x => !!x.click)
             .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
     }
 }

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

@@ -1,6 +1,7 @@
 import { Component, Input, ViewChild, HostBinding, ViewContainerRef, OnChanges } from '@angular/core'
 import { BaseTabComponent } from '../components/baseTab.component'
 
+/** @hidden */
 @Component({
     selector: 'tab-body',
     template: `
@@ -17,7 +18,7 @@ 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) {

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

@@ -1,22 +1,15 @@
-import { Component, Input, HostBinding, HostListener, NgZone, ViewChild, ElementRef } from '@angular/core'
+import { Component, Input, Optional, Inject, HostBinding, HostListener, ViewChild, ElementRef } from '@angular/core'
 import { SortableComponent } from 'ng2-dnd'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { TabContextMenuItemProvider } from '../api/tabContextMenuProvider'
 import { BaseTabComponent } from './baseTab.component'
 import { RenameTabModalComponent } from './renameTabModal.component'
+import { HotkeysService } from '../services/hotkeys.service'
 import { ElectronService } from '../services/electron.service'
 import { AppService } from '../services/app.service'
 import { HostAppService, Platform } from '../services/hostApp.service'
 
-const COLORS = [
+/** @hidden */
-    { name: 'No color', value: null },
-    { name: 'Blue', value: '#0275d8' },
-    { name: 'Green', value: '#5cb85c' },
-    { name: 'Orange', value: '#f0ad4e' },
-    { name: 'Purple', value: '#613d7c' },
-    { name: 'Red', value: '#d9534f' },
-    { name: 'Yellow', value: '#ffd500' },
-]
-
 @Component({
     selector: 'tab-header',
     template: require('./tabHeader.component.pug'),
@@ -30,16 +23,24 @@ export class TabHeaderComponent {
     @Input() progress: number
     @ViewChild('handle') handle: ElementRef
 
-    private completionNotificationEnabled = false
-
     constructor (
         public app: AppService,
         private electron: ElectronService,
-        private zone: NgZone,
         private hostApp: HostAppService,
         private ngbModal: NgbModal,
+        private hotkeys: HotkeysService,
         private parentDraggable: SortableComponent,
-    ) { }
+        @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
+    ) {
+        this.hotkeys.matchedHotkey.subscribe((hotkey) => {
+            if (this.app.activeTab === this.tab) {
+                if (hotkey === 'rename-tab') {
+                    this.showRenameTabModal()
+                }
+            }
+        })
+        this.contextMenuProviders.sort((a, b) => a.weight - b.weight)
+    }
 
     ngOnInit () {
         if (this.hostApp.platform === Platform.macOS) {
@@ -50,7 +51,7 @@ export class TabHeaderComponent {
         })
     }
 
-    @HostListener('dblclick') onDoubleClick (): void {
+    showRenameTabModal (): void {
         let modal = this.ngbModal.open(RenameTabModalComponent)
         modal.componentInstance.value = this.tab.customTitle || this.tab.title
         modal.result.then(result => {
@@ -59,6 +60,19 @@ export class TabHeaderComponent {
         }).catch(() => null)
     }
 
+    async buildContextMenu (): Promise<Electron.MenuItemConstructorOptions[]> {
+        let items: Electron.MenuItemConstructorOptions[] = []
+        for (let section of await Promise.all(this.contextMenuProviders.map(x => x.getItems(this.tab, this)))) {
+            items.push({ type: 'separator' })
+            items = items.concat(section)
+        }
+        return items.slice(1)
+    }
+
+    @HostListener('dblclick') onDoubleClick (): void {
+        this.showRenameTabModal()
+    }
+
     @HostListener('auxclick', ['$event']) async onAuxClick ($event: MouseEvent) {
         if ($event.which === 2) {
             this.app.closeTab(this.tab, true)
@@ -66,85 +80,7 @@ export class TabHeaderComponent {
         if ($event.which === 3) {
             event.preventDefault()
 
-            let contextMenu = this.electron.remote.Menu.buildFromTemplate([
+            const contextMenu = this.electron.remote.Menu.buildFromTemplate(await this.buildContextMenu())
-                {
-                    label: 'Close',
-                    click: () => this.zone.run(() => {
-                        this.app.closeTab(this.tab, true)
-                    })
-                },
-                {
-                    label: 'Close other tabs',
-                    click: () => this.zone.run(() => {
-                        for (let tab of this.app.tabs.filter(x => x !== this.tab)) {
-                            this.app.closeTab(tab, true)
-                        }
-                    })
-                },
-                {
-                    label: 'Close tabs to the right',
-                    click: () => this.zone.run(() => {
-                        for (let tab of this.app.tabs.slice(this.app.tabs.indexOf(this.tab) + 1)) {
-                            this.app.closeTab(tab, true)
-                        }
-                    })
-                },
-                {
-                    label: 'Close tabs to the left',
-                    click: () => this.zone.run(() => {
-                        for (let tab of this.app.tabs.slice(0, this.app.tabs.indexOf(this.tab))) {
-                            this.app.closeTab(tab, true)
-                        }
-                    })
-                },
-                {
-                    label: 'Color',
-                    sublabel: COLORS.find(x => x.value === this.tab.color).name,
-                    submenu: COLORS.map(color => ({
-                        label: color.name,
-                        type: 'radio',
-                        checked: this.tab.color === color.value,
-                        click: () => this.zone.run(() => {
-                            this.tab.color = color.value
-                        }),
-                    })),
-                }
-            ])
-
-            let process = await this.tab.getCurrentProcess()
-            if (process) {
-                contextMenu.append(new this.electron.MenuItem({
-                    id: 'sep',
-                    type: 'separator',
-                }))
-                contextMenu.append(new this.electron.MenuItem({
-                    id: 'process-name',
-                    enabled: false,
-                    label: 'Current process: ' + process.name,
-                }))
-                contextMenu.append(new this.electron.MenuItem({
-                    id: 'completion',
-                    label: 'Notify when done',
-                    type: 'checkbox',
-                    checked: this.completionNotificationEnabled,
-                    click: () => this.zone.run(() => {
-                        this.completionNotificationEnabled = !this.completionNotificationEnabled
-
-                        if (this.completionNotificationEnabled) {
-                            this.app.observeTabCompletion(this.tab).subscribe(() => {
-                                new Notification('Process completed', {
-                                    body: process.name,
-                                }).addEventListener('click', () => {
-                                    this.app.selectTab(this.tab)
-                                })
-                                this.completionNotificationEnabled = false
-                            })
-                        } else {
-                            this.app.stopObservingTabCompletion(this.tab)
-                        }
-                    })
-                }))
-            }
 
             contextMenu.popup({
                 x: $event.pageX,

terminus-core/src/components/titleBar.component.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core'
 
+/** @hidden */
 @Component({
     selector: 'title-bar',
     template: require('./titleBar.component.pug'),

terminus-core/src/components/toggle.component.ts

@@ -2,6 +2,7 @@ import { Component } from '@angular/core'
 import { NG_VALUE_ACCESSOR } from '@angular/forms'
 import { CheckboxComponent } from './checkbox.component'
 
+/** @hidden */
 @Component({
     selector: 'toggle',
     template: `

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

@@ -0,0 +1,19 @@
+.mb-4
+    .terminus-logo
+    h1.terminus-title Terminus
+        sup α 
+
+.container
+    .text-center.mb-5 Thank you for downloading Terminus!
+
+    .form-line
+        .header
+            .title Enable analytics
+            .description Help us track the number of Terminus installs across the world!
+        toggle(
+            [(ngModel)]='config.store.enableAnalytics',
+            (ngModelChange)='config.save(); config.requestRestart()',
+        )
+
+    .text-center.mt-5
+        button.btn.btn-primary((click)='closeAndDisable()') Close and never show again

terminus-core/src/components/welcomeTab.component.scss

@@ -0,0 +1,6 @@
+:host {
+    display: flex;
+    flex-direction: column;
+    margin: auto;
+    flex: 0 1 500px;
+}

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

@@ -0,0 +1,26 @@
+import { Component } from '@angular/core'
+import { BaseTabComponent } from './baseTab.component'
+import { ConfigService } from '../services/config.service'
+import { AppService } from '../services/app.service'
+
+/** @hidden */
+@Component({
+    selector: 'welcome-page',
+    template: require('./welcomeTab.component.pug'),
+    styles: [require('./welcomeTab.component.scss')],
+})
+export class WelcomeTabComponent extends BaseTabComponent {
+    constructor (
+        private app: AppService,
+        public config: ConfigService,
+    ) {
+        super()
+        this.setTitle('Welcome')
+    }
+
+    closeAndDisable () {
+        this.config.store.enableWelcomeTab = false
+        this.config.save()
+        this.app.closeTab(this)
+    }
+}

terminus-core/src/components/windowControls.component.pug

@@ -9,7 +9,7 @@ button.btn.btn-secondary.btn-maximize(
     svg(version='1.1', width='10', height='10')
         path(d='M 0,0 0,10 10,10 10,0 Z M 1,1 9,1 9,9 1,9 Z')
 button.btn.btn-secondary.btn-close(
-    (click)='app.closeWindow()'
+    (click)='closeWindow()'
 )
     svg(version='1.1', width='10', height='10')
         path(d='M 0,0 0,0.7 4.3,5 0,9.3 0,10 0.7,10 5,5.7 9.3,10 10,10 10,9.3 5.7,5 10,0.7 10,0 9.3,0 5,4.3 0.7,0 Z')

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

@@ -2,6 +2,7 @@ import { Component } from '@angular/core'
 import { HostAppService } from '../services/hostApp.service'
 import { AppService } from '../services/app.service'
 
+/** @hidden */
 @Component({
     selector: 'window-controls',
     template: require('./windowControls.component.pug'),
@@ -9,4 +10,9 @@ import { AppService } from '../services/app.service'
 })
 export class WindowControlsComponent {
     constructor (public hostApp: HostAppService, public app: AppService) { }
+
+    async closeWindow () {
+        await this.app.closeAllTabs()
+        this.hostApp.closeWindow()
+    }
 }

terminus-core/src/config.ts

@@ -1,6 +1,7 @@
 import { ConfigProvider } from './api/configProvider'
 import { Platform } from './services/hostApp.service'
 
+/** @hidden */
 export class CoreConfigProvider extends ConfigProvider {
     platformDefaults = {
         [Platform.macOS]: require('./configDefaults.macos.yaml'),

terminus-core/src/configDefaults.linux.yaml

@@ -7,46 +7,48 @@ hotkeys:
     - 'F11'
   close-tab:
     - 'Ctrl-Shift-W'
-    - ['Ctrl-A', 'K']
+  toggle-last-tab: []
-  toggle-last-tab:
+  rename-tab:
-    - ['Ctrl-A', 'A']
+    - 'Ctrl-Shift-R'
-    - ['Ctrl-A', 'Ctrl-A']
   next-tab:
     - 'Ctrl-Shift-ArrowRight'
-    - ['Ctrl-A', 'N']
     - 'Ctrl-Tab'
   previous-tab:
     - 'Ctrl-Shift-ArrowLeft'
-    - ['Ctrl-A', 'P']
     - 'Ctrl-Shift-Tab'
   tab-1:
     - 'Alt-1'
-    - ['Ctrl-A', '1']
   tab-2:
     - 'Alt-2'
-    - ['Ctrl-A', '2']
   tab-3:
     - 'Alt-3'
-    - ['Ctrl-A', '3']
   tab-4:
     - 'Alt-4'
-    - ['Ctrl-A', '4']
   tab-5:
     - 'Alt-5'
-    - ['Ctrl-A', '5']
   tab-6:
     - 'Alt-6'
-    - ['Ctrl-A', '6']
   tab-7:
     - 'Alt-7'
-    - ['Ctrl-A', '7']
   tab-8:
     - 'Alt-8'
-    - ['Ctrl-A', '8']
   tab-9:
     - 'Alt-9'
-    - ['Ctrl-A', '9']
   tab-10:
     - 'Alt-0'
-    - ['Ctrl-A', '0']
+  split-right:
+    - 'Ctrl-Shift-E'
+  split-bottom:
+    - 'Ctrl-Shift-D'
+  split-left: []
+  split-top: []
+  pane-nav-right:
+    - 'Ctrl-Alt-ArrowRight'
+  pane-nav-down:
+    - 'Ctrl-Alt-ArrowDown'
+  pane-nav-up:
+    - 'Ctrl-Alt-ArrowUp'
+  pane-nav-left:
+    - 'Ctrl-Alt-ArrowLeft'
+  close-pane: []
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.macos.yaml

@@ -8,6 +8,8 @@ hotkeys:
   close-tab:
     - '⌘-W'
   toggle-last-tab: []
+  rename-tab:
+    - '⌘-R'
   next-tab:
     - 'Ctrl-Tab'
   previous-tab:
@@ -32,4 +34,20 @@ hotkeys:
     - '⌘-9'
   tab-10:
     - '⌘-0'
+  split-right:
+    - '⌘-Shift-D'
+  split-bottom:
+    - '⌘-D'
+  split-left: []
+  split-top: []
+  pane-nav-right:
+    - '⌘-⌥-ArrowRight'
+  pane-nav-down:
+    - '⌘-⌥-ArrowDown'
+  pane-nav-up:
+    - '⌘-⌥-ArrowUp'
+  pane-nav-left:
+    - '⌘-⌥-ArrowLeft'
+  close-pane:
+    - '⌘-Shift-W'
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.windows.yaml

@@ -7,46 +7,48 @@ hotkeys:
     - 'F11'
   close-tab:
     - 'Ctrl-Shift-W'
-    - ['Ctrl-A', 'K']
+  toggle-last-tab: []
-  toggle-last-tab:
+  rename-tab:
-    - ['Ctrl-A', 'A']
+    - 'Ctrl-Shift-R'
-    - ['Ctrl-A', 'Ctrl-A']
   next-tab:
     - 'Ctrl-Shift-ArrowRight'
-    - ['Ctrl-A', 'N']
     - 'Ctrl-Tab'
   previous-tab:
     - 'Ctrl-Shift-ArrowLeft'
-    - ['Ctrl-A', 'P']
     - 'Ctrl-Shift-Tab'
   tab-1:
     - 'Alt-1'
-    - ['Ctrl-A', '1']
   tab-2:
     - 'Alt-2'
-    - ['Ctrl-A', '2']
   tab-3:
     - 'Alt-3'
-    - ['Ctrl-A', '3']
   tab-4:
     - 'Alt-4'
-    - ['Ctrl-A', '4']
   tab-5:
     - 'Alt-5'
-    - ['Ctrl-A', '5']
   tab-6:
     - 'Alt-6'
-    - ['Ctrl-A', '6']
   tab-7:
     - 'Alt-7'
-    - ['Ctrl-A', '7']
   tab-8:
     - 'Alt-8'
-    - ['Ctrl-A', '8']
   tab-9:
     - 'Alt-9'
-    - ['Ctrl-A', '9']
   tab-10:
     - 'Alt-0'
-    - ['Ctrl-A', '0']
+  split-right:
+    - 'Ctrl-Shift-E'
+  split-bottom:
+    - 'Ctrl-Shift-D'
+  split-left: []
+  split-top: []
+  pane-nav-right:
+    - 'Ctrl-Alt-ArrowRight'
+  pane-nav-down:
+    - 'Ctrl-Alt-ArrowDown'
+  pane-nav-up:
+    - 'Ctrl-Alt-ArrowUp'
+  pane-nav-left:
+    - 'Ctrl-Alt-ArrowLeft'
+  close-pane: []
 pluginBlacklist: []

terminus-core/src/configDefaults.yaml

@@ -11,3 +11,4 @@ appearance:
   vibrancy: false
   vibrancyType: 'blur'
 enableAnalytics: true
+enableWelcomeTab: true

terminus-core/src/directives/autofocus.directive.ts

@@ -1,5 +1,6 @@
 import { Directive, AfterViewInit, ElementRef } from '@angular/core'
 
+/** @hidden */
 @Directive({
     selector: '[autofocus]'
 })

terminus-core/src/hotkeys.ts

@@ -0,0 +1,121 @@
+import { Injectable } from '@angular/core'
+import { IHotkeyDescription, HotkeyProvider } from './api/hotkeyProvider'
+
+/** @hidden */
+@Injectable()
+export class AppHotkeyProvider extends HotkeyProvider {
+    hotkeys: IHotkeyDescription[] = [
+        {
+            id: 'new-window',
+            name: 'New window',
+        },
+        {
+            id: 'toggle-window',
+            name: 'Toggle terminal window',
+        },
+        {
+            id: 'toggle-fullscreen',
+            name: 'Toggle fullscreen mode',
+        },
+        {
+            id: 'rename-tab',
+            name: 'Rename Tab',
+        },
+        {
+            id: 'close-tab',
+            name: 'Close tab',
+        },
+        {
+            id: 'toggle-last-tab',
+            name: 'Toggle last tab',
+        },
+        {
+            id: 'next-tab',
+            name: 'Next tab',
+        },
+        {
+            id: 'previous-tab',
+            name: 'Previous tab',
+        },
+        {
+            id: 'tab-1',
+            name: 'Tab 1',
+        },
+        {
+            id: 'tab-2',
+            name: 'Tab 2',
+        },
+        {
+            id: 'tab-3',
+            name: 'Tab 3',
+        },
+        {
+            id: 'tab-4',
+            name: 'Tab 4',
+        },
+        {
+            id: 'tab-5',
+            name: 'Tab 5',
+        },
+        {
+            id: 'tab-6',
+            name: 'Tab 6',
+        },
+        {
+            id: 'tab-7',
+            name: 'Tab 7',
+        },
+        {
+            id: 'tab-8',
+            name: 'Tab 8',
+        },
+        {
+            id: 'tab-9',
+            name: 'Tab 9',
+        },
+        {
+            id: 'tab-10',
+            name: 'Tab 10',
+        },
+        {
+            id: 'split-right',
+            name: 'Split to the right',
+        },
+        {
+            id: 'split-bottom',
+            name: 'Split to the bottom',
+        },
+        {
+            id: 'split-left',
+            name: 'Split to the left',
+        },
+        {
+            id: 'split-top',
+            name: 'Split to the top',
+        },
+        {
+            id: 'pane-nav-up',
+            name: 'Focus the pane above',
+        },
+        {
+            id: 'pane-nav-down',
+            name: 'Focus the pane below',
+        },
+        {
+            id: 'pane-nav-left',
+            name: 'Focus the pane on the left',
+        },
+        {
+            id: 'pane-nav-right',
+            name: 'Focus the pane on the right',
+        },
+        {
+            id: 'close-pane',
+            name: 'Close focused pane',
+        },
+    ]
+
+    async provide (): Promise<IHotkeyDescription[]> {
+        return this.hotkeys
+    }
+}

terminus-core/src/index.ts

@@ -6,20 +6,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar'
 import { DndModule } from 'ng2-dnd'
 
-import { AppService } from './services/app.service'
-import { ConfigService } from './services/config.service'
-import { ElectronService } from './services/electron.service'
-import { HostAppService } from './services/hostApp.service'
-import { LogService } from './services/log.service'
-import { HomeBaseService } from './services/homeBase.service'
-import { HotkeysService, AppHotkeyProvider } from './services/hotkeys.service'
-import { DockingService } from './services/docking.service'
-import { ShellIntegrationService } from './services/shellIntegration.service'
-import { TabRecoveryService } from './services/tabRecovery.service'
-import { ThemesService } from './services/themes.service'
-import { TouchbarService } from './services/touchbar.service'
-import { UpdaterService } from './services/updater.service'
-
 import { AppRootComponent } from './components/appRoot.component'
 import { CheckboxComponent } from './components/checkbox.component'
 import { TabBodyComponent } from './components/tabBody.component'
@@ -30,41 +16,43 @@ import { TitleBarComponent } from './components/titleBar.component'
 import { ToggleComponent } from './components/toggle.component'
 import { WindowControlsComponent } from './components/windowControls.component'
 import { RenameTabModalComponent } from './components/renameTabModal.component'
+import { SplitTabComponent, SplitTabRecoveryProvider } from './components/splitTab.component'
+import { SplitTabSpannerComponent } from './components/splitTabSpanner.component'
+import { WelcomeTabComponent } from './components/welcomeTab.component'
 
 import { AutofocusDirective } from './directives/autofocus.directive'
 
 import { HotkeyProvider } from './api/hotkeyProvider'
 import { ConfigProvider } from './api/configProvider'
 import { Theme } from './api/theme'
+import { TabContextMenuItemProvider } from './api/tabContextMenuProvider'
+import { TabRecoveryProvider } from './api/tabRecovery'
+
+import { AppService } from './services/app.service'
+import { ConfigService } from './services/config.service'
 
 import { StandardTheme, StandardCompactTheme, PaperTheme } from './theme'
 import { CoreConfigProvider } from './config'
+import { AppHotkeyProvider } from './hotkeys'
+import { TaskCompletionContextMenu, CommonOptionsContextMenu, CloseContextMenu } from './tabContextMenu'
 
 import 'perfect-scrollbar/css/perfect-scrollbar.css'
 import 'ng2-dnd/bundles/style.css'
 
 const PROVIDERS = [
-    AppService,
-    ConfigService,
-    DockingService,
-    ElectronService,
-    HomeBaseService,
-    HostAppService,
-    HotkeysService,
-    LogService,
-    ShellIntegrationService,
-    TabRecoveryService,
-    ThemesService,
-    TouchbarService,
-    UpdaterService,
     { provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },
     { provide: Theme, useClass: StandardTheme, multi: true },
     { provide: Theme, useClass: StandardCompactTheme, multi: true },
     { provide: Theme, useClass: PaperTheme, multi: true },
     { provide: ConfigProvider, useClass: CoreConfigProvider, multi: true },
-    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true }}
+    { provide: TabContextMenuItemProvider, useClass: CommonOptionsContextMenu, multi: true },
+    { provide: TabContextMenuItemProvider, useClass: CloseContextMenu, multi: true },
+    { provide: TabContextMenuItemProvider, useClass: TaskCompletionContextMenu, multi: true },
+    { provide: TabRecoveryProvider, useClass: SplitTabRecoveryProvider, multi: true },
+    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } }
 ]
 
+/** @hidden */
 @NgModule({
     imports: [
         BrowserModule,
@@ -86,10 +74,15 @@ const PROVIDERS = [
         RenameTabModalComponent,
         SafeModeModalComponent,
         AutofocusDirective,
+        SplitTabComponent,
+        SplitTabSpannerComponent,
+        WelcomeTabComponent,
     ],
     entryComponents: [
         RenameTabModalComponent,
         SafeModeModalComponent,
+        SplitTabComponent,
+        WelcomeTabComponent,
     ],
     exports: [
         CheckboxComponent,
@@ -98,6 +91,14 @@ const PROVIDERS = [
     ]
 })
 export default class AppModule {
+    constructor (app: AppService, config: ConfigService) {
+        app.ready$.subscribe(() => {
+            if (config.store.enableWelcomeTab) {
+                app.openNewTabRaw(WelcomeTabComponent)
+            }
+        })
+    }
+
     static forRoot (): ModuleWithProviders {
         return {
             ngModule: AppModule,

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

@@ -1,12 +1,12 @@
 import { Observable, Subject, AsyncSubject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
-import { Injectable, ComponentFactoryResolver, Injector } from '@angular/core'
+import { Injectable } from '@angular/core'
 import { BaseTabComponent } from '../components/baseTab.component'
-import { Logger, LogService } from './log.service'
+import { SplitTabComponent } from '../components/splitTab.component'
 import { ConfigService } from './config.service'
 import { HostAppService } from './hostApp.service'
-
+import { TabRecoveryService } from './tabRecovery.service'
-export declare type TabComponentType = new (...args: any[]) => BaseTabComponent
+import { TabsService, TabComponentType } from './tabs.service'
 
 class CompletionObserver {
     get done$ (): Observable<void> { return this.done }
@@ -35,12 +35,14 @@ class CompletionObserver {
     }
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class AppService {
     tabs: BaseTabComponent[] = []
-    activeTab: BaseTabComponent
+
-    lastTabIndex = 0
+    get activeTab (): BaseTabComponent { return this._activeTab }
-    logger: Logger
+
+    private lastTabIndex = 0
+    private _activeTab: BaseTabComponent
 
     private activeTabChange = new Subject<BaseTabComponent>()
     private tabsChanged = new Subject<void>()
@@ -54,62 +56,105 @@ export class AppService {
     get tabOpened$ (): Observable<BaseTabComponent> { return this.tabOpened }
     get tabsChanged$ (): Observable<void> { return this.tabsChanged }
     get tabClosed$ (): Observable<BaseTabComponent> { return this.tabClosed }
+
+    /** Fires once when the app is ready */
     get ready$ (): Observable<void> { return this.ready }
 
+    /** @hidden */
     constructor (
-        private componentFactoryResolver: ComponentFactoryResolver,
         private config: ConfigService,
         private hostApp: HostAppService,
-        private injector: Injector,
+        private tabRecovery: TabRecoveryService,
-        log: LogService,
+        private tabsService: TabsService,
     ) {
-        this.logger = log.create('app')
+        this.tabRecovery.recoverTabs().then(tabs => {
+            for (let tab of tabs) {
+                this.openNewTabRaw(tab.type, tab.options)
+            }
 
-        this.hostApp.windowCloseRequest$.subscribe(() => this.closeWindow())
+            this.tabsChanged$.subscribe(() => {
+                tabRecovery.saveTabs(this.tabs)
+            })
+            setInterval(() => {
+                tabRecovery.saveTabs(this.tabs)
+            }, 30000)
+        })
     }
 
-    openNewTab (type: TabComponentType, inputs?: any): BaseTabComponent {
+    private addTabRaw (tab: BaseTabComponent) {
-        let componentFactory = this.componentFactoryResolver.resolveComponentFactory(type)
-        let componentRef = componentFactory.create(this.injector)
-        let tab = componentRef.instance
-        tab.hostView = componentRef.hostView
-        Object.assign(tab, inputs || {})
-
         this.tabs.push(tab)
         this.selectTab(tab)
         this.tabsChanged.next()
         this.tabOpened.next(tab)
 
+        tab.recoveryStateChangedHint$.subscribe(() => {
+            this.tabRecovery.saveTabs(this.tabs)
+        })
+
         tab.titleChange$.subscribe(title => {
-            if (tab === this.activeTab) {
+            if (tab === this._activeTab) {
                 this.hostApp.setTitle(title)
             }
         })
+
+        tab.destroyed$.subscribe(() => {
+            let newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
+            this.tabs = this.tabs.filter((x) => x !== tab)
+            if (tab === this._activeTab) {
+                this.selectTab(this.tabs[newIndex])
+            }
+            this.tabsChanged.next()
+            this.tabClosed.next(tab)
+        })
+    }
+
+    /**
+     * Adds a new tab **without** wrapping it in a SplitTabComponent
+     * @param inputs  Properties to be assigned on the new tab component instance
+     */
+    openNewTabRaw (type: TabComponentType, inputs?: any): BaseTabComponent {
+        let tab = this.tabsService.create(type, inputs)
+        this.addTabRaw(tab)
+        return tab
+    }
+
+    /**
+     * Adds a new tab while wrapping it in a SplitTabComponent
+     * @param inputs  Properties to be assigned on the new tab component instance
+     */
+    openNewTab (type: TabComponentType, inputs?: any): BaseTabComponent {
+        let splitTab = this.tabsService.create(SplitTabComponent) as SplitTabComponent
+        let tab = this.tabsService.create(type, inputs)
+        splitTab.addTab(tab, null, 'r')
+        this.addTabRaw(splitTab)
         return tab
     }
 
     selectTab (tab: BaseTabComponent) {
-        if (this.activeTab === tab) {
+        if (this._activeTab === tab) {
-            this.activeTab.emitFocused()
+            this._activeTab.emitFocused()
             return
         }
-        if (this.tabs.includes(this.activeTab)) {
+        if (this.tabs.includes(this._activeTab)) {
-            this.lastTabIndex = this.tabs.indexOf(this.activeTab)
+            this.lastTabIndex = this.tabs.indexOf(this._activeTab)
         } else {
             this.lastTabIndex = null
         }
-        if (this.activeTab) {
+        if (this._activeTab) {
-            this.activeTab.clearActivity()
+            this._activeTab.clearActivity()
-            this.activeTab.emitBlurred()
+            this._activeTab.emitBlurred()
         }
-        this.activeTab = tab
+        this._activeTab = tab
         this.activeTabChange.next(tab)
-        if (this.activeTab) {
+        if (this._activeTab) {
-            this.activeTab.emitFocused()
+            setImmediate(() => {
-            this.hostApp.setTitle(this.activeTab.title)
+                this._activeTab.emitFocused()
+            })
+            this.hostApp.setTitle(this._activeTab.title)
         }
     }
 
+    /** Switches between the current tab and the previously active one */
     toggleLastTab () {
         if (!this.lastTabIndex || this.lastTabIndex >= this.tabs.length) {
             this.lastTabIndex = 0
@@ -119,7 +164,7 @@ export class AppService {
 
     nextTab () {
         if (this.tabs.length > 1) {
-            let tabIndex = this.tabs.indexOf(this.activeTab)
+            let tabIndex = this.tabs.indexOf(this._activeTab)
             if (tabIndex < this.tabs.length - 1) {
                 this.selectTab(this.tabs[tabIndex + 1])
             } else if (this.config.store.appearance.cycleTabs) {
@@ -130,7 +175,7 @@ export class AppService {
 
     previousTab () {
         if (this.tabs.length > 1) {
-            let tabIndex = this.tabs.indexOf(this.activeTab)
+            let tabIndex = this.tabs.indexOf(this._activeTab)
             if (tabIndex > 0) {
                 this.selectTab(this.tabs[tabIndex - 1])
             } else if (this.config.store.appearance.cycleTabs) {
@@ -139,6 +184,7 @@ export class AppService {
         }
     }
 
+    /** @hidden */
     emitTabsChanged () {
         this.tabsChanged.next()
     }
@@ -150,17 +196,17 @@ export class AppService {
         if (checkCanClose && !await tab.canClose()) {
             return
         }
-        let newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
-        this.tabs = this.tabs.filter((x) => x !== tab)
         tab.destroy()
-        if (tab === this.activeTab) {
-            this.selectTab(this.tabs[newIndex])
-        }
-        this.tabsChanged.next()
-        this.tabClosed.next(tab)
     }
 
-    async closeWindow () {
+    async duplicateTab (tab: BaseTabComponent) {
+        let dup = await this.tabsService.duplicate(tab)
+        if (dup) {
+            this.addTabRaw(dup)
+        }
+    }
+
+    async closeAllTabs () {
         for (let tab of this.tabs) {
             if (!await tab.canClose()) {
                 return
@@ -169,15 +215,19 @@ export class AppService {
         for (let tab of this.tabs) {
             tab.destroy()
         }
-        this.hostApp.closeWindow()
     }
 
+    /** @hidden */
     emitReady () {
         this.ready.next(null)
         this.ready.complete()
         this.hostApp.emitReady()
     }
 
+    /**
+     * Returns an observable that fires once
+     * the tab's internal "process" (see [[BaseTabProcess]]) completes
+     */
     observeTabCompletion (tab: BaseTabComponent): Observable<void> {
         if (!this.completionObservers.has(tab)) {
             let observer = new CompletionObserver(tab)

terminus-core/src/services/config.service.ts

@@ -18,6 +18,7 @@ function isNonStructuralObjectMember (v) {
     return v instanceof Object && !(v instanceof Array) && v.__nonStructural
 }
 
+/** @hidden */
 export class ConfigProxy {
     constructor (real: any, defaults: any) {
         for (let key in defaults) {
@@ -56,7 +57,7 @@ export class ConfigProxy {
                 return real[key]
             } else {
                 if (isNonStructuralObjectMember(defaults[key])) {
-                    real[key] = {...defaults[key]}
+                    real[key] = { ...defaults[key] }
                     delete real[key].__nonStructural
                     return real[key]
                 } else {
@@ -74,18 +75,31 @@ export class ConfigProxy {
     setValue (key: string, value: any) { } // tslint:disable-line
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class ConfigService {
+    /**
+     * Contains the actual config values
+     */
     store: any
+
+    /**
+     * Whether an app restart is required due to recent changes
+     */
     restartRequested: boolean
+
+    /**
+     * Full config file path
+     */
+    path: string
+
     private changed = new Subject<void>()
     private _store: any
-    private path: string
     private defaults: any
     private servicesCache: { [id: string]: Function[] } = null
 
     get changed$ (): Observable<void> { return this.changed }
 
+    /** @hidden */
     constructor (
         electron: ElectronService,
         private hostApp: HostAppService,
@@ -129,10 +143,16 @@ export class ConfigService {
         this.hostApp.broadcastConfigChange()
     }
 
+    /**
+     * Reads config YAML as string
+     */
     readRaw (): string {
         return yaml.safeDump(this._store)
     }
 
+    /**
+     * Writes config YAML as string
+     */
     writeRaw (data: string): void {
         this._store = yaml.safeLoad(data)
         this.save()
@@ -140,7 +160,7 @@ export class ConfigService {
         this.emitChange()
     }
 
-    emitChange (): void {
+    private emitChange (): void {
         this.changed.next()
     }
 
@@ -148,6 +168,12 @@ export class ConfigService {
         this.restartRequested = true
     }
 
+    /**
+     * Filters a list of Angular services to only include those provided
+     * by plugins that are enabled
+     *
+     * @typeparam T Base provider type
+     */
     enabledServices<T> (services: T[]): T[] {
         if (!this.servicesCache) {
             this.servicesCache = {}

terminus-core/src/services/docking.service.ts

@@ -8,8 +8,9 @@ export interface IScreen {
     name: string
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class DockingService {
+    /** @hidden */
     constructor (
         private electron: ElectronService,
         private config: ConfigService,
@@ -20,21 +21,23 @@ export class DockingService {
     }
 
     dock () {
+        let dockSide = this.config.store.appearance.dock
+
+        if (dockSide === 'off') {
+            this.hostApp.setAlwaysOnTop(false)
+            return
+        }
+
         let display = this.electron.screen.getAllDisplays()
             .filter((x) => x.id === this.config.store.appearance.dockScreen)[0]
         if (!display) {
             display = this.getCurrentScreen()
         }
 
-        let dockSide = this.config.store.appearance.dock
         let newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 }
         let fill = this.config.store.appearance.dockFill
         let [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize()
 
-        if (dockSide === 'off') {
-            this.hostApp.setAlwaysOnTop(false)
-            return
-        }
         if (dockSide === 'left' || dockSide === 'right') {
             newBounds.width = Math.max(minWidth, Math.round(fill * display.bounds.width))
             newBounds.height = display.bounds.height
@@ -76,7 +79,7 @@ export class DockingService {
         })
     }
 
-    repositionWindow () {
+    private repositionWindow () {
         let [x, y] = this.hostApp.getWindow().getPosition()
         for (let screen of this.electron.screen.getAllDisplays()) {
             let bounds = screen.bounds

terminus-core/src/services/electron.service.ts

@@ -1,7 +1,12 @@
 import { Injectable } from '@angular/core'
 import { TouchBar, BrowserWindow, Menu, MenuItem } from 'electron'
 
-@Injectable()
+export interface MessageBoxResponse {
+    response: number
+    checkboxChecked?: boolean
+}
+
+@Injectable({ providedIn: 'root' })
 export class ElectronService {
     app: any
     ipcRenderer: any
@@ -19,6 +24,7 @@ export class ElectronService {
     MenuItem: typeof MenuItem
     private electron: any
 
+    /** @hidden */
     constructor () {
         this.electron = require('electron')
         this.remote = this.electron.remote
@@ -37,21 +43,23 @@ export class ElectronService {
         this.MenuItem = this.remote.MenuItem
     }
 
-    remoteRequire (name: string): any {
+    /**
-        return this.remote.require(name)
+     * Removes OS focus from Terminus' window
-    }
+     */
-
-    remoteRequirePluginModule (plugin: string, module: string, globals: any): any {
-        return this.remoteRequire(this.remoteResolvePluginModule(plugin, module, globals))
-    }
-
-    remoteResolvePluginModule (plugin: string, module: string, globals: any): any {
-        return globals.require.resolve(`${plugin}/node_modules/${module}`)
-    }
-
     loseFocus () {
         if (process.platform === 'darwin') {
             this.remote.Menu.sendActionToFirstResponder('hide:')
         }
     }
+
+    showMessageBox (
+        browserWindow: Electron.BrowserWindow,
+        options: Electron.MessageBoxOptions
+    ): Promise<MessageBoxResponse> {
+        return new Promise(resolve => {
+            this.dialog.showMessageBox(browserWindow, options, (response, checkboxChecked) => {
+                resolve({ response, checkboxChecked })
+            })
+        })
+    }
 }

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

@@ -5,17 +5,18 @@ import { ConfigService } from './config.service'
 import ua = require('universal-analytics')
 import uuidv4 = require('uuid/v4')
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class HomeBaseService {
     appVersion: string
 
+    /** @hidden */
     constructor (
         private electron: ElectronService,
         private config: ConfigService,
     ) {
         this.appVersion = electron.app.getVersion()
 
-        if (this.config.store.enableAnalytics) {
+        if (this.config.store.enableAnalytics && !this.config.store.enableWelcomeTab) {
             this.enableAnalytics()
         }
     }

terminus-core/src/services/hostApp.service.ts

@@ -16,42 +16,89 @@ export interface Bounds {
     height: number
 }
 
-@Injectable()
+/**
+ * Provides interaction with the main process
+ */
+@Injectable({ providedIn: 'root' })
 export class HostAppService {
     platform: Platform
-    nodePlatform: string
+
+    /**
+     * Fired once the window is visible
+     */
     shown = new EventEmitter<any>()
     isFullScreen = false
+    isPortable = !!process.env.PORTABLE_EXECUTABLE_FILE
+
     private preferencesMenu = new Subject<void>()
     private secondInstance = new Subject<void>()
     private cliOpenDirectory = new Subject<string>()
     private cliRunCommand = new Subject<string[]>()
     private cliPaste = new Subject<string>()
+    private cliOpenProfile = new Subject<string>()
     private configChangeBroadcast = new Subject<void>()
     private windowCloseRequest = new Subject<void>()
+    private windowMoved = new Subject<void>()
+    private displayMetricsChanged = new Subject<void>()
     private logger: Logger
     private windowId: number
 
+    /**
+     * Fired when Preferences is selected in the macOS menu
+     */
     get preferencesMenu$ (): Observable<void> { return this.preferencesMenu }
+
+    /**
+     * Fired when a second instance of Terminus is launched
+     */
     get secondInstance$ (): Observable<void> { return this.secondInstance }
+
+    /**
+     * Fired for the `terminus open` CLI command
+     */
     get cliOpenDirectory$ (): Observable<string> { return this.cliOpenDirectory }
+
+    /**
+     * Fired for the `terminus run` CLI command
+     */
     get cliRunCommand$ (): Observable<string[]> { return this.cliRunCommand }
+
+    /**
+     * Fired for the `terminus paste` CLI command
+     */
     get cliPaste$ (): Observable<string> { return this.cliPaste }
+
+    /**
+     * Fired for the `terminus profile` CLI command
+     */
+    get cliOpenProfile$ (): Observable<string> { return this.cliOpenProfile }
+
+    /**
+     * Fired when another window modified the config file
+     */
     get configChangeBroadcast$ (): Observable<void> { return this.configChangeBroadcast }
+
+    /**
+     * Fired when the window close button is pressed
+     */
     get windowCloseRequest$ (): Observable<void> { return this.windowCloseRequest }
 
+    get windowMoved$ (): Observable<void> { return this.windowMoved }
+
+    get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }
+
+    /** @hidden */
     constructor (
         private zone: NgZone,
         private electron: ElectronService,
         log: LogService,
     ) {
         this.logger = log.create('hostApp')
-        this.nodePlatform = require('os').platform()
         this.platform = {
             win32: Platform.Windows,
             darwin: Platform.macOS,
             linux: Platform.Linux
-        }[this.nodePlatform]
+        }[process.platform]
 
         this.windowId = parseInt(location.search.substring(1))
         this.logger.info('Window ID:', this.windowId)
@@ -78,6 +125,14 @@ export class HostAppService {
             this.zone.run(() => this.windowCloseRequest.next())
         })
 
+        electron.ipcRenderer.on('host:window-moved', () => {
+            this.zone.run(() => this.windowMoved.next())
+        })
+
+        electron.ipcRenderer.on('host:display-metrics-changed', () => {
+            this.zone.run(() => this.displayMetricsChanged.next())
+        })
+
         electron.ipcRenderer.on('host:second-instance', (_$event, argv: any, cwd: string) => this.zone.run(() => {
             this.logger.info('Second instance', argv)
             const op = argv._[0]
@@ -91,6 +146,8 @@ export class HostAppService {
                     text = shellEscape([text])
                 }
                 this.cliPaste.next(text)
+            } else if (op === 'profile') {
+                this.cliOpenProfile.next(argv.profileName)
             } else {
                 this.secondInstance.next()
             }
@@ -101,6 +158,9 @@ export class HostAppService {
         }))
     }
 
+    /**
+     * Returns the current remote [[BrowserWindow]]
+     */
     getWindow () {
         return this.electron.BrowserWindow.fromId(this.windowId)
     }
@@ -109,18 +169,6 @@ export class HostAppService {
         this.electron.ipcRenderer.send('app:new-window')
     }
 
-    getShell () {
-        return this.electron.shell
-    }
-
-    getAppPath () {
-        return this.electron.app.getAppPath()
-    }
-
-    getPath (type: string) {
-        return this.electron.app.getPath(type)
-    }
-
     toggleFullscreen () {
         let window = this.getWindow()
         window.setFullScreen(!this.isFullScreen)
@@ -158,6 +206,11 @@ export class HostAppService {
         this.electron.ipcRenderer.send('window-set-always-on-top', flag)
     }
 
+    /**
+     * Sets window vibrancy mode (Windows, macOS)
+     *
+     * @param type `null`, or `fluent` when supported (Windowd only)
+     */
     setVibrancy (enable: boolean, type: string) {
         document.body.classList.toggle('vibrant', enable)
         if (this.platform === Platform.macOS) {
@@ -180,6 +233,9 @@ export class HostAppService {
         this.electron.Menu.buildFromTemplate(menuDefinition).popup({})
     }
 
+    /**
+     * Notifies other windows of config file changes
+     */
     broadcastConfigChange () {
         this.electron.ipcRenderer.send('app:config-change')
     }
@@ -196,6 +252,15 @@ export class HostAppService {
         this.electron.ipcRenderer.send('window-close')
     }
 
+    relaunch () {
+        if (this.isPortable) {
+            this.electron.app.relaunch({ execPath: process.env.PORTABLE_EXECUTABLE_FILE })
+        } else {
+            this.electron.app.relaunch()
+        }
+        this.electron.app.exit()
+    }
+
     quit () {
         this.logger.info('Quitting')
         this.electron.app.quit()