updated cwd settings UI

upgraded xterm.js
cache dscl output
2025-07-29 05:34:36 +00:00 · 2021-02-07 13:44:17 +01:00 · 2021-02-07 13:44:08 +01:00 · 2021-02-07 13:43:58 +01:00 · 2021-02-07 13:15:24 +01:00 · 2021-02-07 12:49:34 +01:00
46 changed files with 1427 additions and 919 deletions
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,6 +1,8 @@
 parser: '@typescript-eslint/parser'
 parserOptions:
-  project: tsconfig.json
+  project:
+  - tsconfig.json
+  - '*/tsconfig.typings.json'
 extends:
  - 'plugin:@typescript-eslint/all'
 plugins:
@@ -37,6 +39,7 @@ rules:
  '@typescript-eslint/no-misused-promises': off
  '@typescript-eslint/typedef': off
  '@typescript-eslint/consistent-type-imports': off
+  '@typescript-eslint/sort-type-union-intersection-members': off
  '@typescript-eslint/no-use-before-define':
  - error
  - classes: false
@@ -81,7 +84,8 @@ rules:
      argsIgnorePattern: ^_
  no-undef: error
  no-var: error
-  object-curly-spacing:
+  object-curly-spacing: off
+  '@typescript-eslint/object-curly-spacing':
  - error
  - always
  quote-props:
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -7,9 +7,7 @@ jobs:
      matrix:
        include:
          - arch: x86_64
-            electron_setup_cmd: 'true'
          - arch: arm64
-            electron_setup_cmd: 'yarn add -D electron@11.1.1'

    steps:
    - name: Checkout
@@ -28,9 +26,10 @@ jobs:
        cd ..
        rm app/node_modules/.yarn-integrity
        yarn
-
-    - name: Upgrade Electron for ARM builds
-      run: ${{ matrix.electron_setup_cmd }}
+        ./node_modules/.bin/patch-package
+        cd app
+        ../node_modules/.bin/patch-package
+        cd ..

    - name: Build native deps
      run: scripts/build-native.js
--- a/app/lib/config.ts
+++ b/app/lib/config.ts
@@ -6,7 +6,7 @@ import { app } from 'electron'
 export function loadConfig (): any {
    const configPath = path.join(app.getPath('userData'), 'config.yaml')
    if (fs.existsSync(configPath)) {
-        return yaml.safeLoad(fs.readFileSync(configPath, 'utf8'))
+        return yaml.load(fs.readFileSync(configPath, 'utf8'))
    } else {
        return {}
    }
--- a/app/lib/window.ts
+++ b/app/lib/window.ts
@@ -36,7 +36,7 @@ export class Window {
    private windowConfig: ElectronConfig
    private windowBounds?: Rectangle
    private closing = false
-    private lastVibrancy: {enabled: boolean, type?: string} | null = null
+    private lastVibrancy: { enabled: boolean, type?: string } | null = null
    private disableVibrancyWhileDragging = false
    private configStore: any

--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,7 @@
 {
  "name": "terminus",
  "description": "A terminal for a modern age",
+  "private": true,
  "repository": "https://github.com/eugeny/terminus",
  "author": {
    "name": "Eugene Pankov",
@@ -13,24 +14,25 @@
    "watch": "webpack --progress --color --watch"
  },
  "dependencies": {
-    "@angular/animations": "^9.1.9",
-    "@angular/common": "^9.1.11",
-    "@angular/compiler": "^9.1.9",
-    "@angular/core": "^9.1.9",
-    "@angular/forms": "^9.1.11",
-    "@angular/platform-browser": "^9.1.9",
-    "@angular/platform-browser-dynamic": "^9.1.9",
+    "@angular/animations": "^11.1.1",
+    "@angular/common": "^11.1.1",
+    "@angular/compiler": "^11.1.1",
+    "@angular/core": "^11.1.1",
+    "@angular/forms": "^11.1.1",
+    "@angular/platform-browser": "^11.1.1",
+    "@angular/platform-browser-dynamic": "^11.1.1",
    "@ng-bootstrap/ng-bootstrap": "^6.1.0",
-    "@terminus-term/node-pty": "0.10.0-beta10",
+    "@terminus-term/node-pty": "0.10.0-terminus.2",
    "electron-config": "2.0.0",
-    "electron-debug": "^3.0.1",
-    "electron-is-dev": "1.1.0",
+    "electron-debug": "^3.2.0",
+    "electron-is-dev": "1.2.0",
    "electron-promise-ipc": "^2.2.4",
    "fontmanager-redux": "1.0.0",
    "glasstron": "0.0.6",
-    "js-yaml": "3.14.0",
+    "js-yaml": "4.0.0",
    "keytar": "^7.2.0",
    "mz": "^2.7.0",
+    "native-process-working-directory": "^1.0.2",
    "ngx-toastr": "^12.0.1",
    "npm": "6",
    "path": "0.12.7",
--- a/app/patches/node-abi+2.19.3.patch
+++ b/app/patches/node-abi+2.19.3.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/node-abi/abi_registry.json b/node_modules/node-abi/abi_registry.json
+index bc1436d..630c1b7 100644
+--- a/node_modules/node-abi/abi_registry.json
+++ b/node_modules/node-abi/abi_registry.json
+@@ -94,6 +94,6 @@
+     "future": true,
+     "lts": false,
+     "runtime": "electron",
+-    "target": "12.0.0-nightly.20201013"
+    "target": "12.0.0-beta.16"
+   }
+ ]
--- a/app/src/global.scss
+++ b/app/src/global.scss
@@ -95,3 +95,7 @@ input[type=range] {
    &::-moz-range-track { @include track(); }
    &::-ms-track { @include track(); }
 }
+
+a[ngbdropdownitem] {
+    cursor: pointer;
+}
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -2,40 +2,54 @@
 # yarn lockfile v1


-"@angular/animations@^9.1.9":
-  version "9.1.13"
-  resolved "https://registry.npmjs.org/@angular/animations/-/animations-9.1.13.tgz"
-  integrity sha512-ane1eeQmsP7fcAiLgRhle7YIDgE88WDMMvzqJYhSxwLzXNF/hwqNeskmNcjo8bLt9h/yTIjrCQbycLCHJfU8UQ==
+"@angular/animations@^11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.1.1.tgz#3ae6754e70ecf858322a432f6484a1bab1013315"
+  integrity sha512-okideoWvlTz6VqHXDWKlMGj1beWxq/ag4n/+7y8IENQFgrKQWu4m52Igr5sJUfT1W8rXqLPaSGEpp9h+1SCDcQ==
+  dependencies:
+    tslib "^2.0.0"

-"@angular/common@^9.1.11":
-  version "9.1.13"
-  resolved "https://registry.npmjs.org/@angular/common/-/common-9.1.13.tgz"
-  integrity sha512-QACUhJWlly/nfHUmjopVS1p6ayxxa/NqjyftdCeBJaoyM2YohqWixP/n/keu1K/srJ96aFpUNsZQgmgoRv5SOQ==
+"@angular/common@^11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.1.1.tgz#fcf16d3d35cdc64c40458a51f879ab61ed2ecdf2"
+  integrity sha512-YHAmbjmwqIv43CdzRJkXJiT7p6Xm6DpsGKLuCGPoomUk7Nf5U5LsSZm/uvyTu0O+OQp2RUFUdGqW5DzSZZnKtQ==
+  dependencies:
+    tslib "^2.0.0"

-"@angular/compiler@^9.1.9":
-  version "9.1.13"
-  resolved "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.13.tgz"
-  integrity sha512-9MLB1Xx7odKuxDoybVwiOB1ZEUZpL8FurYm4RVuW39ntsUt0IMC9Hb8UagZLTAWhaWSHydkD/KBQVVobGqd0lA==
+"@angular/compiler@^11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.1.1.tgz#cafe43b52fb69f0b9493e597baec14fcffd13d7d"
+  integrity sha512-kybGddMBL6E2BFBOHIX39VsKVxH3yD7NA1g2mQUE9KIqLAavH0KLBr8B03R9MKb6+BElGpk/5yCyCkzkwQES7w==
+  dependencies:
+    tslib "^2.0.0"

-"@angular/core@^9.1.9":
-  version "9.1.13"
-  resolved "https://registry.npmjs.org/@angular/core/-/core-9.1.13.tgz"
-  integrity sha512-mBm24Q9GjkAsxMAzqQ86U1078+yTEpr0+syMEruUtJ0HUH6Fzn3J+6xTLb+BVcGb9RkCkFaV9T5mcn6ZM0f++g==
+"@angular/core@^11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.1.1.tgz#62bf9ad93d5d88afacce3ea5b03803ec5790d20b"
+  integrity sha512-yBBLekXeDviZ+KW3DmGeOK0CK/yQ9gCy2uHY47KUDI4UTRRLz0NI5nS9NdKwk5bpCPId6ZPNsJtHPBFXRhAnNA==
+  dependencies:
+    tslib "^2.0.0"

-"@angular/forms@^9.1.11":
-  version "9.1.13"
-  resolved "https://registry.npmjs.org/@angular/forms/-/forms-9.1.13.tgz"
-  integrity sha512-soGVZmPq2bzkxvtTyeJB8p3ejzm4xxt+43hJw6Ag8NxpwUFPVa30oJge3JV+u8Y4yBtl5SbOZ4bBX3EkMxLcGQ==
+"@angular/forms@^11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.1.1.tgz#c8c468aba528f1f2764cf0bc7d9ab36636795473"
+  integrity sha512-MVysENcKonjMowdd2SxXQGcvNVpMTWVhwr5IZ2FBZKW/FNnSBq0R3nsr25zU0h8QWQHkROPtFF0+AEaENh/yAg==
+  dependencies:
+    tslib "^2.0.0"

-"@angular/platform-browser-dynamic@^9.1.9":
-  version "9.1.13"
-  resolved "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.13.tgz"
-  integrity sha512-jCeHyAZ4Nap1/FOqAlKEg9UxQaSkHrxnQr6hYtWwC4ZDVUn3zLWQf6J+mbeYNOXN5yQxEiIqqhORYeOCLLqf1w==
+"@angular/platform-browser-dynamic@^11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.1.1.tgz#2e05d719a1d134a9a22fb4e4a40234ac49ba122a"
+  integrity sha512-fI44VfQvwzNeZdSMGZEYqYZ6Q4Y1fSbyqh2hzbhVW4/Tq6s4qKdKn3TfAD6iK6te5ewZwbccfr4Y0zMbcwTSRA==
+  dependencies:
+    tslib "^2.0.0"

-"@angular/platform-browser@^9.1.9":
-  version "9.1.13"
-  resolved "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.13.tgz"
-  integrity sha512-F3iTz1zNbtrs7KFKUxbj8qmTsd/fiuTNcpBExjE5TtatRiE6J8vNvN1+Z/1FgPe0UXBSdTzSwZ8/RxWKw20RMw==
+"@angular/platform-browser@^11.1.1":
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.1.1.tgz#d9940e92664b06a3c6a10221f1b9438ba94b9b5f"
+  integrity sha512-z3OmXK9viTxNp2KpGdCiFkFCI69WVYyuMQerCwjuD2oymRpltc64uujIq3+j32UJ+sTGrjMSmgMo7ReAYMp7sg==
+  dependencies:
+    tslib "^2.0.0"

 "@iarna/cli@^1.2.0":
  version "1.2.0"
@@ -117,10 +131,10 @@
  dependencies:
    debug "^4.1.1"

-"@terminus-term/node-pty@0.10.0-beta10":
-  version "0.10.0-beta10"
-  resolved "https://registry.yarnpkg.com/@terminus-term/node-pty/-/node-pty-0.10.0-beta10.tgz#de9dade3d7549d44b0906ec0d0b9e1bb411f1f21"
-  integrity sha512-j9RJk7sD/es4vR6+AR5M/p3SicVxY6kZEeE0UQKhHNcaAla90/mcGeBNicAWPaAkjO1uQZVbYh5cJMMu5unQgA==
+"@terminus-term/node-pty@0.10.0-terminus.2":
+  version "0.10.0-terminus.2"
+  resolved "https://registry.yarnpkg.com/@terminus-term/node-pty/-/node-pty-0.10.0-terminus.2.tgz#028c7762d13150984bc800b8cd954ceb7dbcac68"
+  integrity sha512-vcscP3jldTMZeHv0XVxQjwEtnh0usUQgUWvsXtPRMy2rMjijwC1+8xFp/FKPpLpWYNTN8WWmRjSdiw+qGGU4CQ==
  dependencies:
    nan "^2.14.0"

@@ -259,12 +273,10 @@ are-we-there-yet@~1.1.2:
    delegates "^1.0.0"
    readable-stream "^2.0.6"

-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==

 asap@^2.0.0:
  version "2.0.6"
@@ -716,7 +728,7 @@ debug@^4.0.1, debug@^4.1.1, debug@^4.3.1:
  dependencies:
    ms "2.1.2"

-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz"
  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -837,10 +849,10 @@ electron-config@2.0.0:
  dependencies:
    conf "^1.0.0"

-electron-debug@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/electron-debug/-/electron-debug-3.1.0.tgz"
-  integrity sha512-SWEqLj4MgfV3tGuO5eBLQ5/Nr6M+KPxsnE0bUJZvQebGJus6RAcdmvd7L+l0Ji31h2mmrN23l2tHFtCa2FvurA==
+electron-debug@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.2.0.tgz#46a15b555c3b11872218c65ea01d058aa0814920"
+  integrity sha512-7xZh+LfUvJ52M9rn6N+tPuDw6oRAjxUj9SoxAZfJ0hVCXhZCsdkrSt7TgXOiWiEOBgEV8qwUIO/ScxllsPS7ow==
  dependencies:
    electron-is-dev "^1.1.0"
    electron-localshortcut "^3.1.0"
@@ -850,7 +862,12 @@ electron-is-accelerator@^0.1.0:
  resolved "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz"
  integrity sha1-UJ5RDCala1Xhf4Y6SwThEYRqsns=

-electron-is-dev@1.1.0, electron-is-dev@^1.1.0:
+electron-is-dev@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.2.0.tgz#2e5cea0a1b3ccf1c86f577cee77363ef55deb05e"
+  integrity sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw==
+
+electron-is-dev@^1.1.0:
  version "1.1.0"
  resolved "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.1.0.tgz"
  integrity sha512-Z1qA/1oHNowGtSBIcWk0pcLEqYT/j+13xUw/MYOrBUOL4X7VN0i0KCTf5SqyvMPmW5pSPKbo28wkxMxzZ20YnQ==
@@ -972,11 +989,6 @@ escape-string-regexp@^1.0.5:
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=

-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 execa@^0.7.0:
  version "0.7.0"
  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -1377,7 +1389,7 @@ import-lazy@^2.1.0:
  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=

-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"
  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -1581,13 +1593,12 @@ isstream@~0.1.2:
  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"
  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=

-js-yaml@3.14.0:
-  version "3.14.0"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+js-yaml@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
+  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
+    argparse "^2.0.1"

 jsbn@~0.1.0:
  version "0.1.1"
@@ -1854,11 +1865,6 @@ lockfile@^1.0.4:
  dependencies:
    signal-exit "^3.0.2"

-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
  version "4.6.0"
  resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -1867,33 +1873,11 @@ lodash._baseuniq@~4.6.0:
    lodash._createset "~4.0.0"
    lodash._root "~3.0.0"

-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
  integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=

-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
 lodash._root@~3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
@@ -1904,11 +1888,6 @@ lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0:
  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=

-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.union@~4.6.0:
  version "4.6.0"
  resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
@@ -2115,6 +2094,13 @@ napi-build-utils@^1.0.1:
  resolved "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"
  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==

+native-process-working-directory@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/native-process-working-directory/-/native-process-working-directory-1.0.2.tgz#7843e2fa1490f53cf8d2c7d1913de8b275e8b89a"
+  integrity sha512-3a67QQV8r3YMUTSOgvtMOCjPDgCpb/8xjv93L8Cqb8bv3hOKsWis4/+8HCu3bgj8ADQV75SCYFSsAGM5G0cXmQ==
+  dependencies:
+    node-addon-api "^3.1.0"
+
 ngx-toastr@^12.0.1:
  version "12.1.0"
  resolved "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-12.1.0.tgz"
@@ -2134,7 +2120,7 @@ node-addon-api@3.0.0:
  resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz"
  integrity sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==

-node-addon-api@^3.0.0, node-addon-api@^3.0.2:
+node-addon-api@^3.0.0, node-addon-api@^3.0.2, node-addon-api@^3.1.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz"
  integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
@@ -2324,7 +2310,6 @@ npm@6:
    cmd-shim "^3.0.3"
    columnify "~1.5.4"
    config-chain "^1.1.12"
-    debuglog "*"
    detect-indent "~5.0.0"
    detect-newline "^2.1.0"
    dezalgo "~1.0.3"
@@ -2339,7 +2324,6 @@ npm@6:
    has-unicode "~2.0.1"
    hosted-git-info "^2.8.8"
    iferr "^1.0.2"
-    imurmurhash "*"
    infer-owner "^1.0.4"
    inflight "~1.0.6"
    inherits "^2.0.4"
@@ -2358,14 +2342,8 @@ npm@6:
    libnpx "^10.2.4"
    lock-verify "^2.1.0"
    lockfile "^1.0.4"
-    lodash._baseindexof "*"
    lodash._baseuniq "~4.6.0"
-    lodash._bindcallback "*"
-    lodash._cacheindexof "*"
-    lodash._createcache "*"
-    lodash._getnative "*"
    lodash.clonedeep "~4.5.0"
-    lodash.restparam "*"
    lodash.union "~4.6.0"
    lodash.uniq "~4.5.0"
    lodash.without "~4.4.0"
@@ -3241,11 +3219,6 @@ split-on-first@^1.0.0:
  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==

-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 sshpk@^1.7.0:
  version "1.16.1"
  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -8,8 +8,9 @@ afterAllArtifactBuild: "./build/mac/afterBuildHook.js"
 files:
 - '**/*'
 - dist
+- '!lib'
 - '!src'
- '!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}'
+- '!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme,node.lib}'
 - '!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples,docs}'
 - '!**/node_modules/@angular/common/locales'
 - '!**/node_modules/@angular/compiler/src'
--- a/package.json
+++ b/package.json
@@ -2,32 +2,33 @@
  "devDependencies": {
    "@fortawesome/fontawesome-free": "^5.13.0",
    "@sentry/cli": "^1.61.0",
-    "@sentry/electron": "^2.0.4",
+    "@sentry/electron": "^2.2.0",
+    "@terminus-term/to-string-loader": "1.1.7-beta.1",
    "@types/electron-config": "^3.2.2",
    "@types/electron-debug": "^2.1.0",
    "@types/fs-extra": "^8.1.1",
    "@types/js-yaml": "^3.12.5",
    "@types/node": "14.14.14",
    "@types/webpack-env": "^1.16.0",
-    "@typescript-eslint/eslint-plugin": "^4.11.0",
-    "@typescript-eslint/parser": "^4.11.0",
+    "@typescript-eslint/eslint-plugin": "^4.14.1",
+    "@typescript-eslint/parser": "^4.14.1",
    "apply-loader": "2.0.0",
    "awesome-typescript-loader": "^5.2.1",
    "compare-versions": "^3.6.0",
-    "core-js": "^3.8.1",
-    "cross-env": "7.0.2",
-    "css-loader": "3.4.2",
-    "electron": "12.0.0-beta.16",
+    "core-js": "^3.8.3",
+    "cross-env": "7.0.3",
+    "css-loader": "5.0.1",
+    "electron": "12.0.0-beta.22",
    "electron-builder": "22.10.4",
    "electron-download": "^4.1.1",
    "electron-installer-snap": "^5.1.0",
    "electron-notarize": "^1.0.0",
    "electron-rebuild": "^2.3.4",
-    "eslint": "^7.6.0",
+    "eslint": "^7.18.0",
    "eslint-plugin-import": "^2.21.1",
-    "file-loader": "^5.1.0",
+    "file-loader": "^6.2.0",
    "graceful-fs": "^4.2.4",
-    "html-loader": "0.5.5",
+    "html-loader": "1.3.2",
    "json-loader": "0.5.7",
    "lru-cache": "^6.0.0",
    "macos-release": "^2.4.1",
@@ -36,27 +37,27 @@
    "node-sass": "^5.0.0",
    "npmlog": "4.1.2",
    "npx": "^10.2.2",
-    "pug": "^2.0.4",
+    "patch-package": "^6.2.2",
+    "pug": "^3.0.0",
    "pug-html-loader": "1.1.5",
    "pug-lint": "^2.6.0",
    "pug-loader": "^2.4.0",
    "pug-static-loader": "2.0.0",
-    "raw-loader": "4.0.1",
-    "sass-loader": "^10.1.0",
+    "raw-loader": "4.0.2",
+    "sass-loader": "^10.1.1",
    "shelljs": "0.8.4",
    "source-code-pro": "^2.30.2",
    "source-sans-pro": "3.6.0",
    "ssh2-streams": "^0.4.10",
    "style-loader": "^2.0.0",
    "svg-inline-loader": "^0.8.2",
-    "to-string-loader": "1.1.6",
    "tslib": "^2.0.3",
    "typedoc": "^0.18.0",
    "typescript": "^3.9.7",
-    "url-loader": "^3.0.0",
-    "val-loader": "2.1.1",
-    "webpack": "^5.11.0",
-    "webpack-cli": "^4.2.0",
+    "url-loader": "^4.1.1",
+    "val-loader": "3.0.0",
+    "webpack": "^5.18.0",
+    "webpack-cli": "^4.4.0",
    "yaml-loader": "0.6.0"
  },
  "resolutions": {
@@ -74,7 +75,5 @@
    "lint": "eslint --ext ts */src */lib",
    "postinstall": "node ./scripts/install-deps.js"
  },
-  "repository": "eugeny/terminus",
-  "author": "Eugene Pankov",
-  "license": "MIT"
+  "private": true
 }
--- a/patches/node-abi+2.19.3.patch
+++ b/patches/node-abi+2.19.3.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/node-abi/abi_registry.json b/node_modules/node-abi/abi_registry.json
+index bc1436d..630c1b7 100644
+--- a/node_modules/node-abi/abi_registry.json
+++ b/node_modules/node-abi/abi_registry.json
+@@ -94,6 +94,6 @@
+     "future": true,
+     "lts": false,
+     "runtime": "electron",
+-    "target": "12.0.0-nightly.20201013"
+    "target": "12.0.0-beta.16"
+   }
+ ]
--- a/scripts/build-macos.js
+++ b/scripts/build-macos.js
@@ -1,8 +1,6 @@
 #!/usr/bin/env node
 const builder = require('electron-builder').build
 const vars = require('./vars')
-const fs = require('fs')
-const signHook = require('../build/mac/afterSignHook')

 const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')

@@ -16,6 +14,7 @@ builder({
        extraMetadata: {
            version: vars.version,
        },
+        npmRebuild: process.env.ARCH !== 'arm64',
    },
    publish: isTag ? 'always' : 'onTag',
 }).catch(e => {
--- a/terminus-core/src/components/appRoot.component.ts
+++ b/terminus-core/src/components/appRoot.component.ts
@@ -142,6 +142,8 @@ export class AppRootComponent {

        this.touchbar.update()

+        this.hostApp.useBuiltinGraphics()
+
        config.changed$.subscribe(() => this.updateVibrancy())
        this.updateVibrancy()

--- a/terminus-core/src/components/selectorModal.component.ts
+++ b/terminus-core/src/components/selectorModal.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, HostListener, ViewChildren, QueryList, ElementRef } from '@angular/core'
+import { Component, Input, HostListener, ViewChildren, QueryList, ElementRef } from '@angular/core' // eslint-disable-line @typescript-eslint/no-unused-vars
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { SelectorOption } from '../api/selector'

--- a/terminus-core/src/index.ts
+++ b/terminus-core/src/index.ts
@@ -110,7 +110,7 @@ export default class AppModule { // eslint-disable-line @typescript-eslint/no-ex
        })
    }

-    static forRoot (): ModuleWithProviders {
+    static forRoot (): ModuleWithProviders<AppModule> {
        return {
            ngModule: AppModule,
            providers: PROVIDERS,
--- a/terminus-core/src/services/config.service.ts
+++ b/terminus-core/src/services/config.service.ts
@@ -144,7 +144,7 @@ export class ConfigService {

    load (): void {
        if (fs.existsSync(this.path)) {
-            this._store = yaml.safeLoad(fs.readFileSync(this.path, 'utf8'))
+            this._store = yaml.load(fs.readFileSync(this.path, 'utf8'))
        } else {
            this._store = {}
        }
@@ -154,7 +154,7 @@ export class ConfigService {
    save (): void {
        // Scrub undefined values
        this._store = JSON.parse(JSON.stringify(this._store))
-        fs.writeFileSync(this.path, yaml.safeDump(this._store), 'utf8')
+        fs.writeFileSync(this.path, yaml.dump(this._store), 'utf8')
        this.emitChange()
        this.hostApp.broadcastConfigChange(JSON.parse(JSON.stringify(this.store)))
    }
@@ -163,14 +163,14 @@ export class ConfigService {
     * Reads config YAML as string
     */
    readRaw (): string {
-        return yaml.safeDump(this._store)
+        return yaml.dump(this._store)
    }

    /**
     * Writes config YAML as string
     */
    writeRaw (data: string): void {
-        this._store = yaml.safeLoad(data)
+        this._store = yaml.load(data)
        this.save()
        this.load()
        this.emitChange()
--- a/terminus-core/src/services/hostApp.service.ts
+++ b/terminus-core/src/services/hostApp.service.ts
@@ -8,6 +8,12 @@ import { ElectronService } from './electron.service'
 import { Logger, LogService } from './log.service'
 import { isWindowsBuild, WIN_BUILD_FLUENT_BG_SUPPORTED } from '../utils'

+/* eslint-disable block-scoped-var */
+
+try {
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
+} catch (_) { }
+
 export enum Platform {
    Linux = 'Linux',
    macOS = 'macOS',
@@ -154,7 +160,7 @@ export class HostAppService {
        electron.ipcRenderer.on('cli', (_$event, argv: any, cwd: string, secondInstance: boolean) => this.zone.run(async () => {
            this.logger.info('Second instance', argv)
            const op = argv._[0]
-            const opAsPath = path.resolve(cwd, op)
+            const opAsPath = op ? path.resolve(cwd, op) : null
            if (op === 'open') {
                this.cliOpenDirectory.next(path.resolve(cwd, argv.directory))
            } else if (op === 'run') {
@@ -167,9 +173,9 @@ export class HostAppService {
                this.cliPaste.next(text)
            } else if (op === 'profile') {
                this.cliOpenProfile.next(argv.profileName)
-            } else if (op === undefined) {
+            } else if (secondInstance && op === undefined) {
                this.newWindow()
-            } else if ((await fs.lstat(opAsPath)).isDirectory()) {
+            } else if (opAsPath && (await fs.lstat(opAsPath)).isDirectory()) {
                this.cliOpenDirectory.next(opAsPath)
            }

@@ -283,6 +289,16 @@ export class HostAppService {
        this.electron.ipcRenderer.send('app:register-global-hotkey', specs)
    }

+    useBuiltinGraphics (): void {
+        const keyPath = 'SOFTWARE\\Microsoft\\DirectX\\UserGpuPreferences'
+        const valueName = this.electron.app.getPath('exe')
+        if (this.platform === Platform.Windows) {
+            if (!wnr.getRegistryValue(wnr.HK.CU, keyPath, valueName)) {
+                wnr.setRegistryValue(wnr.HK.CU, keyPath, valueName, wnr.REG.SZ, 'GpuPreference=1;')
+            }
+        }
+    }
+
    relaunch (): void {
        if (this.isPortable) {
            this.electron.app.relaunch({ execPath: process.env.PORTABLE_EXECUTABLE_FILE })
--- a/terminus-core/webpack.config.js
+++ b/terminus-core/webpack.config.js
@@ -40,8 +40,8 @@ module.exports = {
                },
            },
            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
-            { test: /\.css$/, use: ['to-string-loader', 'css-loader'], include: /component\.css/ },
+            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.css$/, use: ['@terminus-term/to-string-loader', 'css-loader'], include: /component\.css/ },
            { test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: /component\.css/ },
            { test: /\.yaml$/, use: ['json-loader', 'yaml-loader'] },
            { test: /\.svg/, use: ['svg-inline-loader'] },
--- a/terminus-plugin-manager/webpack.config.js
+++ b/terminus-plugin-manager/webpack.config.js
@@ -40,7 +40,7 @@ module.exports = {
                },
            },
            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
        ],
    },
    externals: [
--- a/terminus-serial/package.json
+++ b/terminus-serial/package.json
@@ -20,6 +20,7 @@
    "@types/node": "14.14.14",
    "@types/ssh2": "^0.5.35",
    "ansi-colors": "^4.1.1",
+    "buffer-replace": "^1.0.0",
    "cli-spinner": "^0.2.10"
  },
  "peerDependencies": {
--- a/terminus-serial/src/api.ts
+++ b/terminus-serial/src/api.ts
@@ -1,7 +1,12 @@
+import stripAnsi from 'strip-ansi'
+import bufferReplace from 'buffer-replace'
 import { BaseSession } from 'terminus-terminal'
 import { SerialPort } from 'serialport'
 import { Logger } from 'terminus-core'
-import { Subject, Observable } from 'rxjs'
+import { Subject, Observable, interval } from 'rxjs'
+import { debounce } from 'rxjs/operators'
+import { ReadLine, createInterface as createReadline, clearLine } from 'readline'
+import { PassThrough, Readable, Writable } from 'stream'

 export interface LoginScript {
    expect: string
@@ -23,6 +28,9 @@ export interface SerialConnection {
    xany: boolean
    scripts?: LoginScript[]
    color?: string
+    inputMode?: InputMode
+    inputNewlines?: NewlineMode
+    outputNewlines?: NewlineMode
 }

 export const BAUD_RATES = [
@@ -34,6 +42,9 @@ export interface SerialPortInfo {
    description?: string
 }

+export type InputMode = null | 'readline' // eslint-disable-line @typescript-eslint/no-type-alias
+export type NewlineMode = null | 'cr' | 'lf' | 'crlf' // eslint-disable-line @typescript-eslint/no-type-alias
+
 export class SerialSession extends BaseSession {
    scripts?: LoginScript[]
    serial: SerialPort
@@ -41,58 +52,38 @@ export class SerialSession extends BaseSession {

    get serviceMessage$ (): Observable<string> { return this.serviceMessage }
    private serviceMessage = new Subject<string>()
+    private inputReadline: ReadLine
+    private inputPromptVisible = true
+    private inputReadlineInStream: Readable & Writable
+    private inputReadlineOutStream: Readable & Writable

    constructor (public connection: SerialConnection) {
        super()
        this.scripts = connection.scripts ?? []
+
+        this.inputReadlineInStream = new PassThrough()
+        this.inputReadlineOutStream = new PassThrough()
+        this.inputReadline = createReadline({
+            input: this.inputReadlineInStream,
+            output: this.inputReadlineOutStream,
+            terminal: true,
+        } as any)
+        this.inputReadlineOutStream.on('data', data => {
+            if (this.connection.inputMode === 'readline') {
+                this.emitOutput(data)
+            }
+        })
+        this.inputReadline.on('line', line => {
+            this.onInput(new Buffer(line + '\n'))
+        })
+        this.output$.pipe(debounce(() => interval(500))).subscribe(() => this.onOutputSettled())
    }

    async start (): Promise<void> {
        this.open = true

-        this.serial.on('data', data => {
-            const dataString = data.toString()
-            this.emitOutput(data)
-
-            if (this.scripts) {
-                let found = false
-                for (const script of this.scripts) {
-                    let match = false
-                    let cmd = ''
-                    if (script.isRegex) {
-                        const re = new RegExp(script.expect, 'g')
-                        if (dataString.match(re)) {
-                            cmd = dataString.replace(re, script.send)
-                            match = true
-                            found = true
-                        }
-                    } else {
-                        if (dataString.includes(script.expect)) {
-                            cmd = script.send
-                            match = true
-                            found = true
-                        }
-                    }
-
-                    if (match) {
-                        this.logger.info('Executing script: "' + cmd + '"')
-                        this.serial.write(cmd + '\n')
-                        this.scripts = this.scripts.filter(x => x !== script)
-                    } else {
-                        if (script.optional) {
-                            this.logger.debug('Skip optional script: ' + script.expect)
-                            found = true
-                            this.scripts = this.scripts.filter(x => x !== script)
-                        } else {
-                            break
-                        }
-                    }
-                }
-
-                if (found) {
-                    this.executeUnconditionalScripts()
-                }
-            }
+        this.serial.on('readable', () => {
+            this.onOutput(this.serial.read())
        })

        this.serial.on('end', () => {
@@ -106,23 +97,33 @@ export class SerialSession extends BaseSession {
    }

    write (data: Buffer): void {
-        if (this.serial) {
-            this.serial.write(data.toString())
+        if (this.connection.inputMode === 'readline') {
+            this.inputReadlineInStream.write(data)
+        } else {
+            this.onInput(data)
        }
    }

    async destroy (): Promise<void> {
        this.serviceMessage.complete()
+        this.inputReadline.close()
        await super.destroy()
    }

    // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-empty-function
-    resize (_, __) { }
+    resize (_, __) {
+        this.inputReadlineOutStream.emit('resize')
+    }

    kill (_?: string): void {
        this.serial.close()
    }

+    emitServiceMessage (msg: string): void {
+        this.serviceMessage.next(msg)
+        this.logger.info(stripAnsi(msg))
+    }
+
    async getChildProcesses (): Promise<any[]> {
        return []
    }
@@ -139,6 +140,94 @@ export class SerialSession extends BaseSession {
        return null
    }

+    private replaceNewlines (data: Buffer, mode?: NewlineMode): Buffer {
+        if (!mode) {
+            return data
+        }
+        data = bufferReplace(data, '\r\n', '\n')
+        data = bufferReplace(data, '\r', '\n')
+        const replacement = {
+            strip: '',
+            cr: '\r',
+            lf: '\n',
+            crlf: '\r\n',
+        }[mode]
+        return bufferReplace(data, '\n', replacement)
+    }
+
+    private onInput (data: Buffer) {
+        data = this.replaceNewlines(data, this.connection.inputNewlines)
+        if (this.serial) {
+            this.serial.write(data.toString())
+        }
+    }
+
+    private onOutputSettled () {
+        if (this.connection.inputMode === 'readline' && !this.inputPromptVisible) {
+            this.resetInputPrompt()
+        }
+    }
+
+    private resetInputPrompt () {
+        this.emitOutput(new Buffer('\r\n'))
+        this.inputReadline.prompt(true)
+        this.inputPromptVisible = true
+    }
+
+    private onOutput (data: Buffer) {
+        const dataString = data.toString()
+
+        if (this.connection.inputMode === 'readline') {
+            if (this.inputPromptVisible) {
+                clearLine(this.inputReadlineOutStream, 0)
+                this.inputPromptVisible = false
+            }
+        }
+
+        data = this.replaceNewlines(data, this.connection.outputNewlines)
+        this.emitOutput(data)
+
+        if (this.scripts) {
+            let found = false
+            for (const script of this.scripts) {
+                let match = false
+                let cmd = ''
+                if (script.isRegex) {
+                    const re = new RegExp(script.expect, 'g')
+                    if (re.test(dataString)) {
+                        cmd = dataString.replace(re, script.send)
+                        match = true
+                        found = true
+                    }
+                } else {
+                    if (dataString.includes(script.expect)) {
+                        cmd = script.send
+                        match = true
+                        found = true
+                    }
+                }
+
+                if (match) {
+                    this.logger.info('Executing script: "' + cmd + '"')
+                    this.serial.write(cmd + '\n')
+                    this.scripts = this.scripts.filter(x => x !== script)
+                } else {
+                    if (script.optional) {
+                        this.logger.debug('Skip optional script: ' + script.expect)
+                        found = true
+                        this.scripts = this.scripts.filter(x => x !== script)
+                    } else {
+                        break
+                    }
+                }
+            }
+
+            if (found) {
+                this.executeUnconditionalScripts()
+            }
+        }
+    }
+
    private executeUnconditionalScripts () {
        if (this.scripts) {
            for (const script of this.scripts) {
--- a/terminus-serial/src/components/editConnectionModal.component.pug
+++ b/terminus-serial/src/components/editConnectionModal.component.pug
@@ -11,23 +11,86 @@
                        [(ngModel)]='connection.name',
                    )

-                .form-group
-                    label Path
-                    input.form-control(
-                        type='text',
-                        [(ngModel)]='connection.port',
-                        [ngbTypeahead]='portsAutocomplete',
-                        [resultFormatter]='portsFormatter',
-                    )
+                .row
+                    .col-6
+                        .form-group
+                            label Path
+                            input.form-control(
+                                type='text',
+                                [(ngModel)]='connection.port',
+                                [ngbTypeahead]='portsAutocomplete',
+                                [resultFormatter]='portsFormatter',
+                            )

-                .form-group
-                    label Baud Rate
-                    select.form-control(
-                        [(ngModel)]='connection.baudrate',
-                    )
-                        option([value]='x', *ngFor='let x of baudRates') {{x}}
+                    .col-6
+                        .form-group
+                            label Baud Rate
+                            select.form-control(
+                                [(ngModel)]='connection.baudrate',
+                            )
+                                option([value]='x', *ngFor='let x of baudRates') {{x}}

-        ngb-tab(id='advanced')
+                .row
+                    .col-6
+                        .form-line
+                            .header
+                                .title Input mode
+
+                            .d-flex(ngbDropdown)
+                                button.btn.btn-secondary.btn-tab-bar(
+                                    ngbDropdownToggle,
+                                ) {{getInputModeName(connection.inputMode)}}
+
+                                div(ngbDropdownMenu)
+                                    a.d-flex.flex-column(
+                                        *ngFor='let mode of inputModes',
+                                        (click)='connection.inputMode = mode.key',
+                                        ngbDropdownItem
+                                    )
+                                        div {{mode.name}}
+                                        .text-muted {{mode.description}}
+
+                    .col-6
+                        .form-line
+                            .header
+                                .title Input newlines
+
+                            select.form-control(
+                                [(ngModel)]='connection.inputNewlines',
+                            )
+                                option([ngValue]='mode.key', *ngFor='let mode of newlineModes') {{mode.name}}
+
+                .row
+                    .col-6
+                        //- .form-line
+                            .header
+                                .title Output mode
+
+                            .d-flex(ngbDropdown)
+                                button.btn.btn-secondary.btn-tab-bar(
+                                    ngbDropdownToggle,
+                                ) {{getInputModeName(connection.inputMode)}}
+
+                                div(ngbDropdownMenu)
+                                    a.d-flex.flex-column(
+                                        *ngFor='let mode of inputModes',
+                                        (click)='connection.inputMode = mode.key',
+                                        ngbDropdownItem
+                                    )
+                                        div {{mode.name}}
+                                        .text-muted {{mode.description}}
+
+                    .col-6
+                        .form-line
+                            .header
+                                .title Output newlines
+
+                            select.form-control(
+                                [(ngModel)]='connection.outputNewlines',
+                            )
+                                option([ngValue]='mode.key', *ngFor='let mode of newlineModes') {{mode.name}}
+
+                ngb-tab(id='advanced')
            ng-template(ngbTabTitle) Advanced
            ng-template(ngbTabContent)
                .form-line
--- a/terminus-serial/src/components/editConnectionModal.component.ts
+++ b/terminus-serial/src/components/editConnectionModal.component.ts
@@ -15,6 +15,17 @@ export class EditConnectionModalComponent {
    connection: SerialConnection
    foundPorts: SerialPortInfo[]
    baudRates = BAUD_RATES
+    inputModes = [
+        { key: null, name: 'Normal', description: 'Input is sent as you type' },
+        { key: 'readline', name: 'Line by line', description: 'Line editor, input is sent after you press Enter' },
+    ]
+    newlineModes = [
+        { key: null, name: 'Keep' },
+        { key: 'strip', name: 'Strip' },
+        { key: 'cr', name: 'Force CR' },
+        { key: 'lf', name: 'Force LF' },
+        { key: 'crlf', name: 'Force CRLF' },
+    ]

    constructor (
        private modalInstance: NgbActiveModal,
@@ -24,6 +35,10 @@ export class EditConnectionModalComponent {
    ) {
    }

+    getInputModeName (key) {
+        return this.inputModes.find(x => x.key === key)?.name
+    }
+
    portsAutocomplete = text$ => text$.pipe(map(() => {
        return this.foundPorts.map(x => x.name)
    }))
--- a/terminus-serial/src/components/serialSettingsTab.component.ts
+++ b/terminus-serial/src/components/serialSettingsTab.component.ts
@@ -34,6 +34,9 @@ export class SerialSettingsTabComponent {
            xany: false,
            xoff: false,
            xon: false,
+            inputMode: null,
+            inputNewlines: null,
+            outputNewlines: null,
        }

        const modal = this.ngbModal.open(EditConnectionModalComponent)
--- a/terminus-serial/src/components/serialTab.component.pug
+++ b/terminus-serial/src/components/serialTab.component.pug
@@ -1,16 +1,16 @@
 .tab-toolbar
    .btn.btn-outline-secondary.reveal-button
        i.fas.fa-ellipsis-h
-    .toolbar(*ngIf='session', [class.show]='!session.open')
-        i.fas.fa-circle.text-success.mr-2(*ngIf='session.open')
-        i.fas.fa-circle.text-danger.mr-2(*ngIf='!session.open')
+    .toolbar([class.show]='!session || !session.open')
+        i.fas.fa-circle.text-success.mr-2(*ngIf='session && session.open')
+        i.fas.fa-circle.text-danger.mr-2(*ngIf='!session || !session.open')
        strong(*ngIf='session') {{session.connection.port}} ({{session.connection.baudrate}})

        .mr-auto

-        button.btn.btn-secondary.mr-3((click)='changeBaudRate()', *ngIf='session.open')
+        button.btn.btn-secondary.mr-3((click)='changeBaudRate()', *ngIf='session && session.open')
            span Change baud rate

-        button.btn.btn-info((click)='reconnect()', *ngIf='!session.open')
+        button.btn.btn-info((click)='reconnect()', *ngIf='!session || !session.open')
            i.fas.fa-reload
            span Reconnect
--- a/terminus-serial/src/components/serialTab.component.ts
+++ b/terminus-serial/src/components/serialTab.component.ts
@@ -11,14 +11,15 @@ import { Subscription } from 'rxjs'
 /** @hidden */
@Component({
    selector: 'serial-tab',
-    template: BaseTerminalTabComponent.template + (require('./serialTab.component.pug') as string),
+    template: `${BaseTerminalTabComponent.template} ${require('./serialTab.component.pug')}`,
    styles: [require('./serialTab.component.scss'), ...BaseTerminalTabComponent.styles],
    animations: BaseTerminalTabComponent.animations,
 })
 export class SerialTabComponent extends BaseTerminalTabComponent {
    connection?: SerialConnection
-    session?: SerialSession
+    session: SerialSession|null = null
    serialPort: any
+    private serialService: SerialService
    private homeEndSubscription: Subscription

    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
@@ -26,6 +27,7 @@ export class SerialTabComponent extends BaseTerminalTabComponent {
        injector: Injector,
    ) {
        super(injector)
+        this.serialService = injector.get(SerialService)
    }

    ngOnInit () {
@@ -62,12 +64,8 @@ export class SerialTabComponent extends BaseTerminalTabComponent {
            return
        }

-        this.session = this.injector.get(SerialService).createSession(this.connection)
-        this.session.serviceMessage$.subscribe(msg => {
-            this.write(`\r\n${colors.black.bgWhite(' serial ')} ${msg}\r\n`)
-            this.session?.resize(this.size.columns, this.size.rows)
-        })
-        this.attachSessionHandlers()
+        const session = this.serialService.createSession(this.connection)
+        this.setSession(session)
        this.write(`Connecting to `)

        const spinner = new Spinner({
@@ -80,15 +78,32 @@ export class SerialTabComponent extends BaseTerminalTabComponent {
        spinner.start()

        try {
-            this.serialPort = await this.injector.get(SerialService).connectSession(this.session)
+            this.serialPort = await this.serialService.connectSession(this.session!)
            spinner.stop(true)
+            session.emitServiceMessage('Port opened')
        } catch (e) {
            spinner.stop(true)
            this.write(colors.black.bgRed(' X ') + ' ' + colors.red(e.message) + '\r\n')
            return
        }
-        await this.session.start()
-        this.session.resize(this.size.columns, this.size.rows)
+        await this.session!.start()
+        this.session!.resize(this.size.columns, this.size.rows)
+    }
+
+    protected attachSessionHandlers () {
+        this.attachSessionHandler(this.session!.serviceMessage$.subscribe(msg => {
+            this.write(`\r\n${colors.black.bgWhite(' Serial ')} ${msg}\r\n`)
+            this.session?.resize(this.size.columns, this.size.rows)
+        }))
+        this.attachSessionHandler(this.session!.destroyed$.subscribe(() => {
+            this.write('Press any key to reconnect\r\n')
+            this.input$.pipe(first()).subscribe(() => {
+                if (!this.session?.open) {
+                    this.reconnect()
+                }
+            })
+        }))
+        super.attachSessionHandlers()
    }

    async getRecoveryToken (): Promise<any> {
@@ -99,8 +114,10 @@ export class SerialTabComponent extends BaseTerminalTabComponent {
        }
    }

-    reconnect () {
-        this.initializeSession()
+    async reconnect (): Promise<void> {
+        this.session?.destroy()
+        await this.initializeSession()
+        this.session?.releaseInitialDataBuffer()
    }

    async changeBaudRate () {
--- a/terminus-serial/src/services/serial.service.ts
+++ b/terminus-serial/src/services/serial.service.ts
@@ -30,10 +30,17 @@ export class SerialService {
    }

    async connectSession (session: SerialSession): Promise<SerialPort> {
-        const serial = new SerialPort(session.connection.port, { autoOpen: false, baudRate: session.connection.baudrate,
-            dataBits: session.connection.databits, stopBits: session.connection.stopbits, parity: session.connection.parity,
-            rtscts: session.connection.rtscts, xon: session.connection.xon, xoff: session.connection.xoff,
-            xany: session.connection.xany })
+        const serial = new SerialPort(session.connection.port, {
+            autoOpen: false,
+            baudRate: session.connection.baudrate,
+            dataBits: session.connection.databits,
+            stopBits: session.connection.stopbits,
+            parity: session.connection.parity,
+            rtscts: session.connection.rtscts,
+            xon: session.connection.xon,
+            xoff: session.connection.xoff,
+            xany: session.connection.xany,
+        })
        session.serial = serial
        let connected = false
        await new Promise(async (resolve, reject) => {
@@ -50,6 +57,10 @@ export class SerialService {
                    }
                })
            })
+            serial.on('close', () => {
+                session.emitServiceMessage('Port closed')
+                session.destroy()
+            })

            try {
                serial.open()
@@ -103,7 +114,7 @@ export class SerialService {
        options.push({
            name: 'Manage connections',
            icon: 'cog',
-            callback: () => this.app.openNewTab(SettingsTabComponent, { activeTab: 'serial' }),
+            callback: () => this.app.openNewTabRaw(SettingsTabComponent, { activeTab: 'serial' }),
        })

        options.push({
--- a/terminus-serial/webpack.config.js
+++ b/terminus-serial/webpack.config.js
@@ -40,7 +40,7 @@ module.exports = {
                },
            },
            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
            { test: /\.svg/, use: ['svg-inline-loader'] },
        ],
    },
@@ -50,6 +50,8 @@ module.exports = {
        'path',
        'ngx-toastr',
        'serialport',
+        'readline',
+        'stream',
        'windows-process-tree/build/Release/windows_process_tree.node',
        /^rxjs/,
        /^@angular/,
--- a/terminus-serial/yarn.lock
+++ b/terminus-serial/yarn.lock
@@ -32,6 +32,11 @@ ansi-colors@^4.1.1:
  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==

+buffer-replace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-replace/-/buffer-replace-1.0.0.tgz#bc427c40af4c1f06d6933dede57110acba8ade54"
+  integrity sha1-vEJ8QK9MHwbWkz3t5XEQrLqK3lQ=
+
 cli-spinner@^0.2.10:
  version "0.2.10"
  resolved "https://registry.yarnpkg.com/cli-spinner/-/cli-spinner-0.2.10.tgz#f7d617a36f5c47a7bc6353c697fc9338ff782a47"
--- a/terminus-settings/src/components/settingsTab.component.ts
+++ b/terminus-settings/src/components/settingsTab.component.ts
@@ -60,7 +60,7 @@ export class SettingsTabComponent extends BaseTabComponent {
        this.settingsProviders = config.enabledServices(this.settingsProviders)
        this.themes = config.enabledServices(this.themes)

-        this.configDefaults = yaml.safeDump(config.getDefaults())
+        this.configDefaults = yaml.dump(config.getDefaults())

        const onConfigChange = () => {
            this.configFile = config.readRaw()
@@ -116,7 +116,7 @@ export class SettingsTabComponent extends BaseTabComponent {

    isConfigFileValid () {
        try {
-            yaml.safeLoad(this.configFile)
+            yaml.load(this.configFile)
            return true
        } catch (_) {
            return false
--- a/terminus-settings/webpack.config.js
+++ b/terminus-settings/webpack.config.js
@@ -40,8 +40,8 @@ module.exports = {
                },
            },
            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
-            { test: /\.css$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.css$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
            { test: /\.svg/, use: ['svg-inline-loader'] },
        ],
    },
--- a/terminus-ssh/src/api.ts
+++ b/terminus-ssh/src/api.ts
@@ -140,6 +140,9 @@ export class SSHSession extends BaseSession {
            this.shell = await this.openShellChannel({ x11: this.connection.x11 })
        } catch (err) {
            this.emitServiceMessage(colors.bgRed.black(' X ') + ` Remote rejected opening a shell channel: ${err}`)
+            if (err.toString().includes('Unable to request X11')) {
+                this.emitServiceMessage('    Make sure `xauth` is installed on the remote side')
+            }
            return
        }

@@ -245,7 +248,13 @@ export class SSHSession extends BaseSession {
            }
            socket.on('error', e => {
                // eslint-disable-next-line @typescript-eslint/no-base-to-string
-                this.emitServiceMessage(colors.bgRed.black(' X ') + ` Could not connect to the X server ${xHost}:${xPort}: ${e}`)
+                this.emitServiceMessage(colors.bgRed.black(' X ') + ` Could not connect to the X server: ${e}`)
+                this.emitServiceMessage(`    Terminus tried to connect to ${xHost}:${xPort} based on the DISPLAY environment var (${displaySpec})`)
+                if (process.platform === 'win32') {
+                    this.emitServiceMessage('    To use X forwarding, you need a local X server, e.g.:')
+                    this.emitServiceMessage('    * VcXsrv: https://sourceforge.net/projects/vcxsrv/')
+                    this.emitServiceMessage('    * Xming: https://sourceforge.net/projects/xming/')
+                }
                reject()
            })
            socket.on('connect', () => {
--- a/terminus-ssh/src/components/sshTab.component.ts
+++ b/terminus-ssh/src/components/sshTab.component.ts
@@ -14,18 +14,17 @@ import { Subscription } from 'rxjs'
 /** @hidden */
@Component({
    selector: 'ssh-tab',
-    template: BaseTerminalTabComponent.template + (require('./sshTab.component.pug') as string),
+    template: `${BaseTerminalTabComponent.template} ${require('./sshTab.component.pug')}`,
    styles: [require('./sshTab.component.scss'), ...BaseTerminalTabComponent.styles],
    animations: BaseTerminalTabComponent.animations,
 })
 export class SSHTabComponent extends BaseTerminalTabComponent {
    connection?: SSHConnection
-    session?: SSHSession
+    session: SSHSession|null = null
    private sessionStack: SSHSession[] = []
    private homeEndSubscription: Subscription
    private recentInputs = ''
    private reconnectOffered = false
-    private sessionHandlers: Subscription[] = []

    constructor (
        injector: Injector,
@@ -85,8 +84,12 @@ export class SSHTabComponent extends BaseTerminalTabComponent {

            await this.setupOneSession(jumpSession)

-            this.sessionHandlers.push(
-                jumpSession.destroyed$.subscribe(() => session.destroy())
+            this.attachSessionHandler(
+                jumpSession.destroyed$.subscribe(() => {
+                    if (session.open) {
+                        session.destroy()
+                    }
+                })
            )

            session.jumpStream = await new Promise((resolve, reject) => jumpSession.ssh.forwardOut(
@@ -107,31 +110,11 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
            this.sessionStack.push(session)
        }

-        this.sessionHandlers.push(session.serviceMessage$.subscribe(msg => {
+        this.attachSessionHandler(session.serviceMessage$.subscribe(msg => {
            this.write(`\r\n${colors.black.bgWhite(' SSH ')} ${msg}\r\n`)
            session.resize(this.size.columns, this.size.rows)
        }))

-        this.sessionHandlers.push(session.destroyed$.subscribe(() => {
-            if (
-                // Ctrl-D
-                this.recentInputs.charCodeAt(this.recentInputs.length - 1) === 4 ||
-                this.recentInputs.endsWith('exit\r')
-            ) {
-                // User closed the session
-                this.destroy()
-            } else {
-                // Session was closed abruptly
-                this.write('\r\n' + colors.black.bgCyan(' SSH ') + ` ${session.connection.host}: session closed\r\n`)
-                if (!this.reconnectOffered) {
-                    this.reconnectOffered = true
-                    this.write('Press any key to reconnect\r\n')
-                    this.input$.pipe(first()).subscribe(() => {
-                        this.reconnect()
-                    })
-                }
-            }
-        }))

        this.write('\r\n' + colors.black.bgCyan(' SSH ') + ` Connecting to ${session.connection.host}\r\n`)

@@ -158,6 +141,31 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
        }
    }

+    protected attachSessionHandlers (): void {
+        const session = this.session!
+        super.attachSessionHandlers()
+        this.attachSessionHandler(session.destroyed$.subscribe(() => {
+            if (
+                // Ctrl-D
+                this.recentInputs.charCodeAt(this.recentInputs.length - 1) === 4 ||
+                this.recentInputs.endsWith('exit\r')
+            ) {
+                // User closed the session
+                this.destroy()
+            } else {
+                // Session was closed abruptly
+                this.write('\r\n' + colors.black.bgCyan(' SSH ') + ` ${session.connection.host}: session closed\r\n`)
+                if (!this.reconnectOffered) {
+                    this.reconnectOffered = true
+                    this.write('Press any key to reconnect\r\n')
+                    this.attachSessionHandler(this.input$.pipe(first()).subscribe(() => {
+                        this.reconnect()
+                    }))
+                }
+            }
+        }))
+    }
+
    async initializeSession (): Promise<void> {
        this.reconnectOffered = false
        if (!this.connection) {
@@ -165,18 +173,17 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
            return
        }

-        this.session = this.ssh.createSession(this.connection)
+        const session = this.ssh.createSession(this.connection)
+        this.setSession(session)

        try {
-            await this.setupOneSession(this.session)
+            await this.setupOneSession(session)
        } catch (e) {
            this.write(colors.black.bgRed(' X ') + ' ' + colors.red(e.message) + '\r\n')
        }

-        this.attachSessionHandlers()
-
-        await this.session.start()
-        this.session.resize(this.size.columns, this.size.rows)
+        await this.session!.start()
+        this.session!.resize(this.size.columns, this.size.rows)
    }

    async getRecoveryToken (): Promise<RecoveryToken> {
@@ -193,10 +200,6 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
    }

    async reconnect (): Promise<void> {
-        for (const s of this.sessionHandlers) {
-            s.unsubscribe()
-        }
-        this.sessionHandlers = []
        this.session?.destroy()
        await this.initializeSession()
        this.session?.releaseInitialDataBuffer()
--- a/terminus-ssh/src/services/ssh.service.ts
+++ b/terminus-ssh/src/services/ssh.service.ts
@@ -383,7 +383,7 @@ export class SSHService {
        options.push({
            name: 'Manage connections',
            icon: 'cog',
-            callback: () => this.app.openNewTab(SettingsTabComponent, { activeTab: 'ssh' }),
+            callback: () => this.app.openNewTabRaw(SettingsTabComponent, { activeTab: 'ssh' }),
        })

        options.push({
--- a/terminus-ssh/webpack.config.js
+++ b/terminus-ssh/webpack.config.js
@@ -40,7 +40,7 @@ module.exports = {
                },
            },
            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
            { test: /\.svg/, use: ['svg-inline-loader'] },
        ],
    },
--- a/terminus-terminal/package.json
+++ b/terminus-terminal/package.json
@@ -27,12 +27,12 @@
    "runes": "^0.4.2",
    "slugify": "^1.4.0",
    "xterm": "^4.9.0-beta.7",
-    "xterm-addon-fit": "^0.4.0-beta.8",
-    "xterm-addon-ligatures": "^0.4.0-beta.5",
-    "xterm-addon-search": "^0.7.0-beta.2",
-    "xterm-addon-serialize": "^0.3.0",
+    "xterm-addon-fit": "^0.5.0",
+    "xterm-addon-ligatures": "^0.4.0",
+    "xterm-addon-search": "^0.8.0",
+    "xterm-addon-serialize": "^0.4.0",
    "xterm-addon-unicode11": "^0.2.0",
-    "xterm-addon-webgl": "^0.8.0",
+    "xterm-addon-webgl": "^0.9.0",
    "zmodem.js": "^0.1.9"
  },
  "peerDependencies": {
--- a/terminus-terminal/src/api/baseTerminalTab.component.ts
+++ b/terminus-terminal/src/api/baseTerminalTab.component.ts
@@ -36,7 +36,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
        ]),
    ])]

-    session?: BaseSession
+    session: BaseSession|null = null
    savedState?: any

    @Input() zoom = 0
@@ -95,6 +95,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
    private bellPlayer: HTMLAudioElement
    private termContainerSubscriptions: Subscription[] = []
    private allFocusModeSubscription: Subscription|null = null
+    private sessionHandlers: Subscription[] = []

    get input$ (): Observable<Buffer> {
        if (!this.frontend) {
@@ -347,7 +348,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
    async paste (): Promise<void> {
        let data = this.electron.clipboard.readText()
        if (this.config.store.terminal.bracketedPaste) {
-            data = '\x1b[200~' + data + '\x1b[201~'
+            data = `\x1b[200~${data}\x1b[201~`
        }
        if (this.hostApp.platform === Platform.Windows) {
            data = data.replace(/\r\n/g, '\r')
@@ -418,10 +419,11 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
            return
        }
        if (this.parent instanceof SplitTabComponent) {
-            this.parent._allFocusMode = true
-            this.parent.layout()
+            const parent = this.parent
+            parent._allFocusMode = true
+            parent.layout()
            this.allFocusModeSubscription = this.frontend?.input$.subscribe(data => {
-                for (const tab of (this.parent as SplitTabComponent).getAllTabs()) {
+                for (const tab of parent.getAllTabs()) {
                    if (tab !== this && tab instanceof BaseTerminalTabComponent) {
                        tab.sendInput(data)
                    }
@@ -567,26 +569,55 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
        ]
    }

+    setSession (session: BaseSession|null, destroyOnSessionClose = false): void {
+        if (session) {
+            if (this.session) {
+                this.setSession(null)
+            }
+            this.detachSessionHandlers()
+            this.session = session
+            this.attachSessionHandlers(destroyOnSessionClose)
+        } else {
+            this.detachSessionHandlers()
+            this.session = null
+        }
+    }
+
+    protected attachSessionHandler (subscription: Subscription): void {
+        this.sessionHandlers.push(subscription)
+    }
+
    protected attachSessionHandlers (destroyOnSessionClose = false): void {
        if (!this.session) {
            throw new Error('Session not set')
        }

        // this.session.output$.bufferTime(10).subscribe((datas) => {
-        this.session.output$.subscribe(data => {
+        this.attachSessionHandler(this.session.output$.subscribe(data => {
            if (this.enablePassthrough) {
                this.zone.run(() => {
                    this.output.next(data)
                    this.write(data)
                })
            }
-        })
+        }))

        if (destroyOnSessionClose) {
-            this.sessionCloseSubscription = this.session.closed$.subscribe(() => {
+            this.attachSessionHandler(this.sessionCloseSubscription = this.session.closed$.subscribe(() => {
                this.frontend?.destroy()
                this.destroy()
-            })
+            }))
        }
+
+        this.attachSessionHandler(this.session.destroyed$.subscribe(() => {
+            this.setSession(null)
+        }))
+    }
+
+    protected detachSessionHandlers (): void {
+        for (const s of this.sessionHandlers) {
+            s.unsubscribe()
+        }
+        this.sessionHandlers = []
    }
 }
--- a/terminus-terminal/src/components/environmentEditor.component.ts
+++ b/terminus-terminal/src/components/environmentEditor.component.ts
@@ -10,7 +10,7 @@ import { Subject } from 'rxjs'
 })
 export class EnvironmentEditorComponent {
    @Output() modelChange = new Subject<any>()
-    vars: {key: string, value: string}[] = []
+    vars: { key: string, value: string }[] = []
    private cachedModel: any

    @Input() get model (): any {
--- a/terminus-terminal/src/components/shellSettingsTab.component.pug
+++ b/terminus-terminal/src/components/shellSettingsTab.component.pug
@@ -57,15 +57,14 @@ h3.mb-3 Shell

 .form-line
    .header
-        .title Always Use Working Directory
-        .description
-            div By default, new terminals will open where the previous terminal was working.
-            div Enabling this option will always launch new terminals in the working directory specified above.
+        .title Directory for new tabs

-    toggle(
+    select.form-control(
        [(ngModel)]='config.store.terminal.alwaysUseWorkingDirectory',
-        (ngModelChange)='config.save()'
+        (ngModelChange)='config.save()',
    )
+        option([ngValue]='false') Same as active tab's directory
+        option([ngValue]='true') The working directory from above

 .form-line.align-items-start
    .header
@@ -97,7 +96,7 @@ h3.mt-3 Saved Profiles
        button.btn.btn-outline-danger.ml-1((click)='$event.stopPropagation(); deleteProfile(profile)')
            i.fas.fa-trash

-div(ngbDropdown, placement='top-left')
+.pb-4(ngbDropdown, placement='top-left')
    button.btn.btn-primary(ngbDropdownToggle)
        i.fas.fa-fw.fa-plus
        | New profile
--- a/terminus-terminal/src/services/sessions.service.ts
+++ b/terminus-terminal/src/services/sessions.service.ts
@@ -2,12 +2,11 @@ import * as psNode from 'ps-node'
 import * as fs from 'mz/fs'
 import * as os from 'os'
 import * as nodePTY from '@terminus-term/node-pty'
-
+import { getWorkingDirectoryFromPID } from 'native-process-working-directory'
 import { Observable, Subject } from 'rxjs'
 import { first } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { Logger, LogService, ConfigService, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'terminus-core'
-import { exec } from 'mz/child_process'
 import { SessionOptions } from '../api/interfaces'

 /* eslint-disable block-scoped-var */
@@ -20,7 +19,6 @@ try {
    var windowsProcessTree = require('windows-process-tree')  // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }

-
 export interface ChildProcess {
    pid: number
    ppid: number
@@ -28,7 +26,6 @@ export interface ChildProcess {
 }

 const windowsDirectoryRegex = /([a-zA-Z]:[^\:\[\]\?\"\<\>\|]+)/mi
-const catalinaDataVolumePrefix = '/System/Volumes/Data'
 const OSC1337Prefix = Buffer.from('\x1b]1337;')
 const OSC1337Suffix = Buffer.from('\x07')

@@ -97,6 +94,7 @@ export class Session extends BaseSession {
    private pauseAfterExit = false
    private guessedCWD: string|null = null
    private reportedCWD: string
+    private initialCWD: string|null = null

    constructor (private config: ConfigService) {
        super()
@@ -154,6 +152,7 @@ export class Session extends BaseSession {
                this.truePID = processes[0].pid
                processes = await this.getChildProcesses()
            }
+            this.initialCWD = await this.getWorkingDirectory()
        }, 2000)

        this.open = true
@@ -261,13 +260,7 @@ export class Session extends BaseSession {
    }

    supportsWorkingDirectory (): boolean {
-        if (this.reportedCWD || this.guessedCWD) {
-            return true
-        }
-        if (!this.truePID) {
-            return false
-        }
-        return process.platform !== 'win32'
+        return !!(this.truePID || this.reportedCWD || this.guessedCWD)
    }

    async getWorkingDirectory (): Promise<string|null> {
@@ -277,40 +270,31 @@ export class Session extends BaseSession {
        if (!this.truePID) {
            return null
        }
-        if (process.platform === 'darwin') {
-            let lines: string[] = []
-            try {
-                lines = (await exec(`lsof -p ${this.truePID} -Fn`))[0].toString().split('\n')
-            } catch (e) {
-                return null
-            }
-            let cwd = lines[lines[1] === 'fcwd' ? 2 : 1].substring(1)
-            if (cwd.startsWith(catalinaDataVolumePrefix)) {
-                cwd = cwd.substring(catalinaDataVolumePrefix.length)
-            }
-            return cwd
+        let cwd: string|null = null
+        try {
+            cwd = getWorkingDirectoryFromPID(this.truePID)
+        } catch (exc) {
+            console.error(exc)
        }
-        if (process.platform === 'linux') {
-            try {
-                const cwd = await fs.readlink(`/proc/${this.truePID}/cwd`)
-                return cwd
-            } catch (exc) {
-                console.error(exc)
-                return null
-            }
+
+        try {
+            cwd = await fs.realpath(cwd)
+        } catch {}
+
+        if (process.platform === 'win32' && (cwd === this.initialCWD || cwd === process.env.WINDIR)) {
+            // shell doesn't truly change its process' CWD
+            cwd = null
        }
-        if (process.platform === 'win32') {
-            if (!this.guessedCWD) {
-                return null
-            }
-            try {
-                await fs.access(this.guessedCWD)
-            } catch (e) {
-                return null
-            }
-            return this.guessedCWD
+
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        cwd = cwd || this.guessedCWD
+
+        try {
+            await fs.access(cwd)
+        } catch {
+            return null
        }
-        return null
+        return cwd
    }

    private guessWindowsCWD (data: string) {
--- a/terminus-terminal/src/services/terminalFrontend.service.ts
+++ b/terminus-terminal/src/services/terminalFrontend.service.ts
@@ -16,7 +16,7 @@ export class TerminalFrontendService {
        private hotkeys: HotkeysService,
    ) { }

-    getFrontend (session?: BaseSession): Frontend {
+    getFrontend (session?: BaseSession|null): Frontend {
        if (!session) {
            const frontend: Frontend = new {
                xterm: XTermFrontend,
--- a/terminus-terminal/src/shells/macDefault.ts
+++ b/terminus-terminal/src/shells/macDefault.ts
@@ -8,6 +8,8 @@ import { Shell } from '../api/interfaces'
 /** @hidden */
@Injectable()
 export class MacOSDefaultShellProvider extends ShellProvider {
+    private cachedShell?: string
+
    constructor (
        private hostApp: HostAppService,
    ) {
@@ -18,14 +20,29 @@ export class MacOSDefaultShellProvider extends ShellProvider {
        if (this.hostApp.platform !== Platform.macOS) {
            return []
        }
-        const shellEntry = (await exec(`/usr/bin/dscl . -read /Users/${process.env.LOGNAME} UserShell`))[0].toString()
        return [{
            id: 'default',
            name: 'User default',
-            command: shellEntry.split(' ')[1].trim(),
+            command: await this.getDefaultShellCached(),
            args: ['--login'],
            hidden: true,
            env: {},
        }]
    }
+
+    private async getDefaultShellCached () {
+        if (!this.cachedShell) {
+            this.cachedShell = await this.getDefaultShell()
+        } else {
+            this.getDefaultShell().then(shell => {
+                this.cachedShell = shell
+            })
+        }
+        return this.cachedShell!
+    }
+
+    private async getDefaultShell () {
+        const shellEntry = (await exec(`/usr/bin/dscl . -read /Users/${process.env.LOGNAME} UserShell`))[0].toString()
+        return shellEntry.split(' ')[1].trim()
+    }
 }
--- a/terminus-terminal/webpack.config.js
+++ b/terminus-terminal/webpack.config.js
@@ -43,7 +43,7 @@ module.exports = {
                },
            },
            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.scss$/, use: ['@terminus-term/to-string-loader', 'css-loader', 'sass-loader'] },
            { test: /\.css$/, use: ['style-loader', 'css-loader'] },
            { test: /\.svg/, use: ['svg-inline-loader'] },
            {
@@ -67,6 +67,7 @@ module.exports = {
        'windows-native-registry',
        '@terminus-term/node-pty',
        'windows-process-tree',
+        'native-process-working-directory',
        'os',
        /^rxjs/,
        /^@angular/,
--- a/terminus-terminal/yarn.lock
+++ b/terminus-terminal/yarn.lock
@@ -111,10 +111,10 @@ exit-on-epipe@~1.0.1:
  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==

-font-finder@^1.0.3, font-finder@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/font-finder/-/font-finder-1.0.4.tgz#2ca944954dd8d0e1b5bdc4c596cc08607761d89b"
-  integrity sha512-naF16RpjWUTFLqzhmdivYpBCrqySN6PI+a4GPtoEsCdvOpbKYTGeTjO7mxh3Wwjz4xKU+Oqx9kwOcteLDeMFQA==
+font-finder@^1.0.3, font-finder@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/font-finder/-/font-finder-1.1.0.tgz#2bff2b2762acba720239c8bec898a96daae90858"
+  integrity sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==
  dependencies:
    get-system-fonts "^2.0.0"
    promise-stream-reader "^1.0.1"
@@ -337,43 +337,43 @@ tiny-inflate@^1.0.2:
  resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
  integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==

-xterm-addon-fit@^0.4.0-beta.8:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.4.0.tgz#06e0c5d0a6aaacfb009ef565efa1c81e93d90193"
-  integrity sha512-p4BESuV/g2L6pZzFHpeNLLnep9mp/DkF3qrPglMiucSFtD8iJxtMufEoEJbN8LZwB4i+8PFpFvVuFrGOSpW05w==
+xterm-addon-fit@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596"
+  integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ==

-xterm-addon-ligatures@^0.4.0-beta.5:
-  version "0.4.0-beta.7"
-  resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.4.0-beta.7.tgz#06dfafe0491a2e4744b1a6429958f261820baa00"
-  integrity sha512-GVZKbm7GRgs0LFtdKKmpu0Cs2jfC+sdRtl2E4vWEmhi8WNeW9iINbrsYgdtFPvs1X9OaKxEWqEXJkTcy5rmLHQ==
+xterm-addon-ligatures@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.4.0.tgz#23235d831988c5780ca1e28002b750ec0b1a78ca"
+  integrity sha512-on+2TgzioEL5Mz60WchsTiuR2SvYzG3xVro39HIpYFM641lpMuPM83Pdm3W/ogkaGrpGm29Ysq2S2LCl/h7rhw==
  dependencies:
-    font-finder "^1.0.4"
+    font-finder "^1.1.0"
    font-ligatures "^1.3.3"

-xterm-addon-search@^0.7.0-beta.2:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.7.0.tgz#c929d3e5cbb335e82bff72f158ea82936d9cd4ef"
-  integrity sha512-6060evmJJ+tZcjnx33FXaeEHLpuXEa7l9UzUsYfMlCKbu88AbE+5LJocTKCHYd71cwCwb9pjmv/G1o9Rf9Zbcg==
+xterm-addon-search@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0.tgz#e33eab918df7eac7e7baf95dd2b3d14133754881"
+  integrity sha512-MPJGPVPpHRUw9cLIuqQbrVepmENMOybVUSxIALz5h1ryyQBrVqVujq2hL5aroX5/dZJoHx9lGHQTVLQ07SKgKA==

-xterm-addon-serialize@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.3.0.tgz#b4f24089285801bcc5f601791a4cac416d528a6a"
-  integrity sha512-g+eGqgvQiON4CCEku0iG53obZxi353wig2XRR75DOoHlPMLrO63kvt2V+OahnJlxCpsWQ1BFu4Q5HquQnS6uvQ==
+xterm-addon-serialize@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.4.0.tgz#9854fd87afba6157b9016e9c93f0cf9e0efc2de5"
+  integrity sha512-xEdzCNa6ZzFplDlscYTSSUogy1C6y3G3nS68Qbe5zntFAqHOBeyggExQi0E8yZg/no8ewYH0GSKZnOheo/ZoKg==

 xterm-addon-unicode11@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0.tgz#9ed0c482b353908bba27778893ca80823382737c"
  integrity sha512-rjFDItPc/IDoSiEnoDFwKroNwLD/7t9vYKENjrcKVZg5tgJuuUj8D4rZtP6iVCjSB1LTLYmUs4L/EmCqIyLR/Q==

-xterm-addon-webgl@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.8.0.tgz#4bc6bb4dbfea5b0d2d7978d6c5cef922d584fb4f"
-  integrity sha512-dlpYPsv0C9S6v6+T/h/d/otSbdUTizMJdxvSoS34tUpMOHev6iW7Zqt5KRFqYxl4vCqpDk9Wmhb3fKL3kwX5fQ==
+xterm-addon-webgl@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.9.0.tgz#947ca94f9fd72462155c300dfb82bc471402d60a"
+  integrity sha512-JSRoe/MgPEKCpr7LbiC+sQUq0c9l/ZhsBXYugKx5BJsJEPsY+5EFcqAexuhsJVe/qV+CP3hsbYDe/411rw3ASA==

 xterm@^4.9.0-beta.7:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0.tgz#7a4c097a433d565339b5533b468bbc60c6c87969"
-  integrity sha512-wGfqufmioctKr8VkbRuZbVDfjlXWGZZ1PWHy1yqqpGT3Nm6yaJx8lxDbSEBANtgaiVPTcKSp97sxOy5IlpqYfw==
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0.tgz#fc4f554e3e718aff9b83622e858e64b0953067bb"
+  integrity sha512-Wn66I8YpSVkgP3R95GjABC6Eb21pFfnCSnyIqKIIoUI13ohvwd0KGVzUDfyEFfSAzKbPJfrT2+vt7SfUXBZQKQ==

 yallist@^2.1.2:
  version "2.1.2"
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,6 +24,9 @@
      "es7",
      "es2015",
      "es2017"
-    ]
+    ],
+    "paths": {
+      "terminus-*": ["../../terminus-*/src"]
+    }
  }
 }
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Eugene Pankov	b1752bd0b4	updated cwd settings UI	2021-02-07 13:44:17 +01:00
Eugene Pankov	1e697a952a	upgraded xterm.js	2021-02-07 13:44:08 +01:00
Eugene Pankov	6bad2a2167	cache dscl output	2021-02-07 13:43:58 +01:00
Eugene Pankov	61a46e3b4a	lint	2021-02-07 13:15:24 +01:00
Eugene Pankov	cba90cec0a	better error messages for X11 forwarding issues	2021-02-07 12:49:34 +01:00
Eugene Pankov	7583d92747	set terminus to use built-in graphics by default - fixes #657	2021-02-07 12:49:22 +01:00
Eugene Pankov	e2b99d71ad	lint	2021-02-06 17:47:17 +01:00
Eugene Pankov	aac38fa190	CWD detection on windows where possible	2021-02-06 16:45:38 +01:00
Eugene Pankov	7098622c8f	bumped electron	2021-02-06 11:20:34 +01:00
Eugene Pankov	8695003c74	lint	2021-02-01 11:40:49 +01:00
Eugene Pankov	43a27a7b7c	serial newline modes	2021-01-31 20:07:26 +01:00
Eugene Pankov	dd2d2ce20d	Update tsconfig.json	2021-01-31 19:33:33 +01:00
Eugene Pankov	73574374f0	readline input mode for serial terminals - #3099 , #2661	2021-01-31 19:33:30 +01:00
Eugene Pankov	5bd1bfd565	better editor ts support	2021-01-31 18:20:58 +01:00
Eugene Pankov	0611afa8b5	better session handlers behaviour, added serial auto-reconnection logic - #3099	2021-01-31 18:20:39 +01:00
Eugene Pankov	91c9e8affd	bumped angular	2021-01-28 22:01:42 +01:00
Eugene Pankov	322ffc5847	margin fix	2021-01-28 21:55:29 +01:00
Eugene Pankov	21084b5d24	bumped js-yaml	2021-01-28 21:52:11 +01:00
Eugene Pankov	e0efb4073a	bumped eslint	2021-01-28 21:46:31 +01:00
Eugene Pankov	c42b62afe6	bumped deps	2021-01-28 21:11:53 +01:00
Eugene Pankov	e2b11c83d5	fixed cli args handling	2021-01-28 21:11:47 +01:00
Eugene Pankov	891fa5770a	Update electron-builder.yml	2021-01-28 18:45:09 +01:00
Eugene Pankov	6b395cc2b3	fixed windows native module import	2021-01-28 18:20:45 +01:00
Eugene Pankov	448a1a094f	fixed macOS native module builds	2021-01-27 00:26:48 +01:00
Eugene Pankov	788dd61a13	exclude native modules from app.asar and sign them	2021-01-26 15:29:18 +01:00