Revert "resolves Eugeny/tabby#7751, Eugeny/tabby#8062, Eugeny/tabby#6617 add configurable behavior when session ends"

This reverts commit 268af8806cefc8dba071ead3a03870acdcf39a8e.

tabby-core/src/configDefaults.yaml

@@ -25,7 +25,6 @@ terminal:
   paneResizeStep: 0.1
   focusFollowsMouse: false
   identification: null
-  behaviorOnSessionEnds: 'keep-open'
 hotkeys:
   profile:
     __nonStructural: true

tabby-local/src/components/terminalTab.component.ts

@@ -28,6 +28,7 @@ export class TerminalTabComponent extends BaseTerminalTabComponent<LocalProfile>
         this.sessionOptions = this.profile.options
 
         this.logger = this.log.create('terminalTab')
+        this.session = new Session(this.injector)
 
         const isConPTY = isWindowsBuild(WIN_BUILD_CONPTY_SUPPORTED) && this.config.store.terminal.useConPTY
 
@@ -55,9 +56,6 @@ export class TerminalTabComponent extends BaseTerminalTabComponent<LocalProfile>
     }
 
     initializeSession (columns: number, rows: number): void {
-
-        const session = new Session(this.injector)
-
         if (this.profile.options.runAsAdministrator && this.uac?.isAvailable) {
             this.profile = {
                 ...this.profile,
@@ -65,13 +63,13 @@ export class TerminalTabComponent extends BaseTerminalTabComponent<LocalProfile>
             }
         }
 
-        session.start({
+        this.session!.start({
             ...this.profile.options,
             width: columns,
             height: rows,
         })
 
-        this.setSession(session, this.config.store.terminal.behaviorOnSessionEnds.endsWith('close'))
+        this.attachSessionHandlers(true)
         this.recoveryStateChangedHint.next()
     }
 

tabby-serial/src/components/serialTab.component.ts

@@ -82,25 +82,12 @@ export class SerialTabComponent extends BaseTerminalTabComponent<SerialProfile>
             this.session?.resize(this.size.columns, this.size.rows)
         })
         this.attachSessionHandler(this.session!.destroyed$, () => {
-            if (this.frontend) {
+            this.write(this.translate.instant(_('Press any key to reconnect')) + '\r\n')
-                // Session was closed abruptly
+            this.input$.pipe(first()).subscribe(() => {
-                if (this.config.store.terminal.behaviorOnSessionEnds == 'close') {
+                if (!this.session?.open) {
-                    // Close the tab
-                    this.destroy()
-                } else if (this.config.store.terminal.behaviorOnSessionEnds.startsWith('reconnect-or-')) {
-                    // Automatically reconnect the session
                     this.reconnect()
-                } else {
-                    // Reconnect Offer
-                    this.write(this.translate.instant(_('Press any key to reconnect')) + '\r\n')
-                    this.input$.pipe(first()).subscribe(() => {
-                        if (!this.session?.open) {
-                            this.reconnect()
-                        }
-                    })
                 }
-            }
+            })
-
         })
         super.attachSessionHandlers()
     }

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

@@ -157,27 +157,24 @@ export class SSHTabComponent extends BaseTerminalTabComponent<SSHProfile> implem
     protected attachSessionHandlers (): void {
         const session = this.session!
         this.attachSessionHandler(session.destroyed$, () => {
-            if (this.frontend) {
+            if (
-                
+                // Ctrl-D
+                this.recentInputs.charCodeAt(this.recentInputs.length - 1) === 4 ||
+                this.recentInputs.endsWith('exit\r')
+            ) {
+                // User closed the session
+                this.destroy()
+            } else if (this.frontend) {
+                // Session was closed abruptly
                 this.write('\r\n' + colors.black.bgWhite(' SSH ') + ` ${this.sshSession?.profile.options.host}: session closed\r\n`)
-
+                if (!this.reconnectOffered) {
-                if (this.config.store.terminal.behaviorOnSessionEnds == 'close') {
+                    this.reconnectOffered = true
-                    // Close the tab
+                    this.write(this.translate.instant(_('Press any key to reconnect')) + '\r\n')
-                    this.destroy()
+                    this.input$.pipe(first()).subscribe(() => {
-                } else if (this.config.store.terminal.behaviorOnSessionEnds.startsWith('reconnect-or-')) {
+                        if (!this.session?.open && this.reconnectOffered) {
-                    // Automatically reconnect the session
+                            this.reconnect()
-                    this.reconnect()
+                        }
-                } else {
+                    })
-                    // Reconnect Offer
-                    if (!this.reconnectOffered) {
-                        this.reconnectOffered = true
-                        this.write(this.translate.instant(_('Press any key to reconnect')) + '\r\n')
-                        this.input$.pipe(first()).subscribe(() => {
-                            if (!this.session?.open && this.reconnectOffered) {
-                                this.reconnect()
-                            }
-                        })
-                    }
                 }
             }
         })

tabby-telnet/src/components/telnetTab.component.ts

@@ -48,23 +48,14 @@ export class TelnetTabComponent extends BaseTerminalTabComponent<TelnetProfile>
         this.attachSessionHandler(session.destroyed$, () => {
             if (this.frontend) {
                 // Session was closed abruptly
-                if (this.config.store.terminal.behaviorOnSessionEnds == 'close') {
+                if (!this.reconnectOffered) {
-                    // Close the tab
+                    this.reconnectOffered = true
-                    this.destroy()
+                    this.write(this.translate.instant(_('Press any key to reconnect')) + '\r\n')
-                } else if (this.config.store.terminal.behaviorOnSessionEnds.startsWith('reconnect-or-')) {
+                    this.input$.pipe(first()).subscribe(() => {
-                    // Automatically reconnect the session
+                        if (!this.session?.open && this.reconnectOffered) {
-                    this.reconnect()
+                            this.reconnect()
-                } else {
+                        }
-                    // Reconnect Offer
+                    })
-                    if (!this.reconnectOffered) {
-                        this.reconnectOffered = true
-                        this.write(this.translate.instant(_('Press any key to reconnect')) + '\r\n')
-                        this.input$.pipe(first()).subscribe(() => {
-                            if (!this.session?.open && this.reconnectOffered) {
-                                this.reconnect()
-                            }
-                        })
-                    }
                 }
             }
         })

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

@@ -225,24 +225,6 @@ div.mt-4
             (ngModelChange)='config.save()',
         )
 
-.mt-4
-    h3(translate) Closing
-
-    .form-line
-        .header
-            .title(translate) Tab's behavior when session ends
-            .description(*ngIf='config.store.terminal.behaviorOnSessionEnds.startsWith("reconnect-or")', translate) Automatically reconnect the Serial, Telnet or SSH session
-
-        select.form-control(
-            [(ngModel)]='config.store.terminal.behaviorOnSessionEnds',
-            (ngModelChange)='config.save()'
-        )
-            option(ngValue='keep-open', translate) Keep open
-            option(ngValue='reconnect-or-keep-open', translate) Reconnect, otherwise keep open
-            option(ngValue='reconnect-or-close', translate) Reconnect, otherwise close
-            option(ngValue='close', translate) Close
-
-
 div.mt-4(*ngIf='hostApp.platform === Platform.Windows')
     h3(translate) Windows
 

tabby-terminal/src/config.ts

@@ -24,7 +24,6 @@ export class TerminalConfigProvider extends ConfigProvider {
             hideCloseButton: false,
             hideTabOptionsButton: false,
             rightClick: 'menu',
-            behaviorOnSessionEnds: 'keep-open',
             pasteOnMiddleClick: true,
             copyOnSelect: false,
             copyAsHTML: true,