@electerm/electerm-react 5.2.0 → 5.3.5

package/client/common/constants.js

@@ -212,6 +212,16 @@ export const syncTypes = buildConst([
   'cloud',
   'webdav'
 ])
+export const allowedSyncTypes = () => {
+  const custom = window.et.syncTypes
+  if (!Array.isArray(custom)) {
+    return Object.keys(syncTypes)
+  }
+  const list = custom.filter(type => syncTypes[type])
+  return list.length
+    ? list
+    : Object.keys(syncTypes)
+}
 export const syncTokenCreateUrls = {
   gitee: 'https://gitee.com/github-zxdong262/electerm/wikis/Create%20personal%20access%20token?sort_id=3028409',
   github: 'https://github.com/electerm/electerm/wiki/Create-personal-access-token',
@@ -253,7 +263,6 @@ export const resolutionsLsKey = 'custom-resolution-key'
 export const checkedKeysLsKey = 'checked-keys'
 export const quickCommandLabelsLsKey = 'quick-command-label'
 export const localAddrBookmarkLsKey = 'local-addr-bookmark-keys'
-export const dismissDelKeyTipLsKey = 'dismiss-del-key-tip'
 export const treeSortLsKey = 'tree-sort'
 export const sshTunnelHelpLink = 'https://github.com/electerm/electerm/wiki/How-to-use-ssh-tunnel'
 export const proxyHelpLink = 'https://github.com/electerm/electerm/wiki/proxy-format'
@@ -262,6 +271,8 @@ export const connectionHoppingWikiLink = 'https://github.com/electerm/electerm/w
 export const aiConfigWikiLink = 'https://github.com/electerm/electerm/wiki/AI-model-config-guide'
 export const aiChatModeLsKey = 'ai-chat-mode'
 export const lastAiChatSessionIdKey = 'last-ai-chat-session-id'
+export const aiTermOfUseConfirmedLsKey = 'ai-term-of-use-confirmed'
+export const syncTermOfUseConfirmedLsKey = 'sync-term-of-use-confirmed'
 export const modals = {
   hide: 0,
   setting: 1

package/client/common/term-of-use.jsx

@@ -0,0 +1,69 @@
+/**
+ * Term of use confirmation gate for the AI config / data sync pages.
+ *
+ * Define `window.et.AITermOfUse` / `window.et.SyncTermOfUse` (injected the
+ * same way as `defaultAIPreset` into the built index.html `_global` data)
+ * to require users to confirm the term before entering those pages.
+ * Confirmation is saved to localStorage, so it is only asked once.
+ */
+
+import Modal from '../components/common/modal'
+import {
+  aiTermOfUseConfirmedLsKey,
+  syncTermOfUseConfirmedLsKey
+} from './constants'
+import * as ls from './safe-local-storage'
+
+const e = window.translate
+
+const termOfUseTypes = {
+  ai: {
+    etKey: 'AITermOfUse',
+    lsKey: aiTermOfUseConfirmedLsKey
+  },
+  sync: {
+    etKey: 'SyncTermOfUse',
+    lsKey: syncTermOfUseConfirmedLsKey
+  }
+}
+
+function isConfirmed (type) {
+  return ls.getItem(termOfUseTypes[type].lsKey) === 'yes'
+}
+
+/**
+ * Run `onConfirmed` after the term of use of `type` is confirmed.
+ * When no term is defined, or it was confirmed before, `onConfirmed`
+ * runs synchronously; otherwise a confirmation modal is shown and
+ * `onConfirmed` only runs when the user confirms it.
+ */
+export function requireTermOfUse (type, onConfirmed) {
+  const { etKey, lsKey } = termOfUseTypes[type]
+  const content = window.et?.[etKey]
+  const text = typeof content === 'string' ? content.trim() : ''
+  if (!text || isConfirmed(type)) {
+    return onConfirmed()
+  }
+  Modal.confirm({
+    title: 'Terms of use',
+    width: 600,
+    maskClosable: false,
+    content: (
+      <div
+        style={{
+          maxHeight: '50vh',
+          overflow: 'auto',
+          whiteSpace: 'pre-wrap'
+        }}
+      >
+        {text}
+      </div>
+    ),
+    okText: e('haveRead'),
+    cancelText: e('cancel'),
+    onOk: () => {
+      ls.setItem(lsKey, 'yes')
+      onConfirmed()
+    }
+  })
+}

package/client/components/ai/ai-config-props.js

@@ -27,6 +27,14 @@ export const defaultAIPresets = [
     modelAI: 'DEEPSEEK_V4_FLASH',
     authHeaderNameAI: 'Authorization: Bearer'
   },
+  {
+    id: 'apimart',
+    nameAI: 'ApiMart',
+    baseURLAI: 'https://api.apimart.ai/v1',
+    apiPathAI: '/chat/completions',
+    modelAI: 'deepseek-v4-flash',
+    authHeaderNameAI: 'Authorization: Bearer'
+  },
   {
     id: 'deepseek',
     nameAI: 'DeepSeek',

package/client/components/bookmark-form/bookmark-schema.js

@@ -26,6 +26,7 @@ const bookmarkSchema = {
     runScripts: 'array - run scripts after connected ({delay,script})',
     quickCommands: 'array - quick commands ({name,command})',
     proxy: 'string - proxy address (socks5://...)',
+    proxyCommand: 'string - ssh proxy command, supports %h (host) %p (port) %r (username) placeholders, e.g. `netbird ssh proxy %h %p` or `cloudflared access ssh --hostname %h`',
     x11: 'boolean - enable x11 forwarding, default is false',
     term: 'string - terminal type, default is xterm-256color, required',
     displayRaw: 'boolean - display raw output, default is false',

package/client/components/bookmark-form/config/common-fields.js

@@ -210,6 +210,16 @@ export const commonFields = {
     label: () => e('proxy')
   },
 
+  proxyCommand: {
+    type: 'input',
+    name: 'proxyCommand',
+    label: () => `${e('proxy')} command`,
+    props: {
+      placeholder: 'netbird ssh proxy %h %p',
+      maxLength: 1024
+    }
+  },
+
   x11: {
     type: 'x11',
     name: '__x11__',
@@ -281,6 +291,7 @@ export const sshSettings = [
   },
   commonFields.enableTerminalImage,
   ...terminalSettings.slice(0, -1), // All except terminalBackground
+  commonFields.proxyCommand,
   commonFields.x11,
   commonFields.terminalBackground
 ]

package/client/components/footer/footer-entry.jsx

@@ -151,7 +151,7 @@ export default auto(function FooterEntry (props) {
       <div className='terminal-footer-unit terminal-footer-info'>
         <InfoCircleOutlined
           onClick={handleInfoPanel}
-          className='pointer font18 terminal-info-icon'
+          className='pointer font14 terminal-info-icon'
         />
       </div>
     )

package/client/components/layout/layout.jsx

@@ -119,7 +119,6 @@ export default auto(function Layout (props) {
           'isMaximized',
           'config',
           'resolutions',
-          'hideDelKeyTip',
           'fileOperation',
           'pinnedQuickCommandBar',
           'tabsHeight',
@@ -181,7 +180,6 @@ export default auto(function Layout (props) {
       'activeTabId3',
       'batch',
       'resolutions',
-      'hideDelKeyTip',
       'fileOperation',
       'file',
       'pinnedQuickCommandBar',

package/client/components/rdp/rdp-session.jsx

@@ -137,7 +137,7 @@ export default class RdpSession extends PureComponent {
     }
     // keep resolved credentials for the connect-time prompt
     this.tab = tab
-    if (!tab.username || !tab.password) {
+    if (!tab.username) {
       this.setState({
         loading: false,
         showCredPrompt: true

package/client/components/session/session-control.jsx

@@ -6,7 +6,6 @@ import {
   SearchOutlined,
   FullscreenOutlined,
   PaperClipOutlined,
-  CloseOutlined,
   ApartmentOutlined,
   MoreOutlined,
   ColumnWidthOutlined,
@@ -37,8 +36,6 @@ export default function SessionControl (props) {
     keepaliveEnabled,
     broadcastInput,
     wrapDisabled,
-    delKeyPressed,
-    hideDelKeyTip,
     onChangePane,
     toggleCheckSftpPathFollowSsh,
     onSshSftpSplitView,
@@ -47,7 +44,6 @@ export default function SessionControl (props) {
     toggleWrap,
     onFullscreen,
     onOpenSearch,
-    onDismissDelKeyTip,
     onExitGracefully
   } = props
 
@@ -108,26 +104,11 @@ export default function SessionControl (props) {
     )
   }
 
-  function renderDelTip (isS) {
-    if (!isS || hideDelKeyTip || !delKeyPressed) {
-      return null
-    }
-    return (
-      <div className='type-tab'>
-        <span className='mg1r'>Try <b>Shift + Backspace</b>?</span>
-        <CloseOutlined
-          onClick={onDismissDelKeyTip}
-          className='pointer'
-        />
-      </div>
-    )
-  }
-
   function renderSftpPathFollowControl () {
     if (isDisabled) {
       return null
     }
-    const { pane, enableSsh, sshSftpSplitView } = tab
+    const { enableSsh } = tab
     const checkTxt = e('sftpPathFollowSsh')
     const checkProps = {
       onClick: toggleCheckSftpPathFollowSsh,
@@ -138,8 +119,6 @@ export default function SessionControl (props) {
         }
       )
     }
-    const isS = pane === paneMap.terminal ||
-      sshSftpSplitView
     return (
       <>
         {
@@ -153,7 +132,6 @@ export default function SessionControl (props) {
               )
             : null
         }
-        {renderDelTip(isS)}
       </>
     )
   }

package/client/components/session/session.jsx

@@ -46,7 +46,6 @@ export default class SessionWrapper extends Component {
       key: Math.random(),
       splitSize: [50, 50],
       sessionOptions: null,
-      delKeyPressed: false,
       broadcastInput: false,
       keepaliveEnabled: false,
       wrapDisabled: false
@@ -59,10 +58,6 @@ export default class SessionWrapper extends Component {
   minWithForSplit = 640
   minHeightForSplit = 400
 
-  componentWillUnmount () {
-    clearTimeout(this.backspaceKeyPressedTimer)
-  }
-
   getDom = () => {
     return this.domRef.current
   }
@@ -178,27 +173,6 @@ export default class SessionWrapper extends Component {
     e && e.dataTransfer && e.dataTransfer.clearData()
   }
 
-  onDelKeyPressed = () => {
-    this.setState({
-      delKeyPressed: true
-    })
-    this.backspaceKeyPressedTimer = setTimeout(() => {
-      this.setState({
-        delKeyPressed: false
-      })
-    }, 5000)
-  }
-
-  handleChangeDelMode = (backspaceMode) => {
-    this.setState({
-      backspaceMode
-    })
-  }
-
-  handleDismissDelKeyTip = () => {
-    window.store.dismissDelKeyTip()
-  }
-
   setCwd = (cwd) => {
     this.setState({
       cwd
@@ -351,8 +325,7 @@ export default class SessionWrapper extends Component {
         this,
         [
           'onChangePane',
-          'setCwd',
-          'onDelKeyPressed'
+          'setCwd'
         ]),
       ...this.computePosition(),
       width,
@@ -633,8 +606,6 @@ export default class SessionWrapper extends Component {
           keepaliveEnabled={this.state.keepaliveEnabled}
           broadcastInput={this.state.broadcastInput}
           wrapDisabled={this.state.wrapDisabled}
-          delKeyPressed={this.state.delKeyPressed}
-          hideDelKeyTip={this.props.hideDelKeyTip}
           onChangePane={(pane) => this.onChangePane(pane)}
           toggleCheckSftpPathFollowSsh={this.toggleCheckSftpPathFollowSsh}
           onSshSftpSplitView={this.handleSshSftpSplitView}
@@ -643,7 +614,6 @@ export default class SessionWrapper extends Component {
           toggleWrap={this.toggleWrap}
           onFullscreen={this.handleFullscreen}
           onOpenSearch={this.handleOpenSearch}
-          onDismissDelKeyTip={this.handleDismissDelKeyTip}
           onExitGracefully={this.handleExitGracefully}
         />
         {this.renderViews()}

package/client/components/session/sessions.jsx

@@ -69,7 +69,6 @@ export default class Sessions extends Component {
         height,
         ...pick(this.props, [
           'resolutions',
-          'hideDelKeyTip',
           'fileOperation',
           'pinnedQuickCommandBar',
           'tabsHeight',

package/client/components/setting-sync/setting-sync.jsx

@@ -3,8 +3,9 @@
  */
 
 import { Tabs, Spin } from 'antd'
+import { useEffect } from 'react'
 import SyncForm from './setting-sync-form'
-import { syncTypes, syncDataMaps } from '../../common/constants'
+import { allowedSyncTypes, syncDataMaps } from '../../common/constants'
 import DataTransport from './data-import'
 import DataSelect from './data-select'
 import { pick } from 'lodash-es'
@@ -24,6 +25,15 @@ export default auto(function SyncSettingEntry (props) {
   const {
     store
   } = window
+  const types = allowedSyncTypes()
+  const type = types.includes(props.syncType)
+    ? props.syncType
+    : types[0]
+  useEffect(() => {
+    if (store.syncType !== type) {
+      store.syncType = type
+    }
+  }, [type])
   function renderForm () {
     const syncProps = {
       ...syncSetting,
@@ -31,12 +41,11 @@ export default auto(function SyncSettingEntry (props) {
         'isSyncingSetting',
         'isSyncDownload',
         'isSyncUpload',
-        'syncType',
         'serverStatus'
       ]),
-      serverStatus: deepCopy(store.syncServerStatus[props.syncType])
+      syncType: type,
+      serverStatus: deepCopy(store.syncServerStatus[type])
     }
-    const type = props.syncType
     const formData = {
       gistId: syncSetting[type + 'GistId'],
       token: syncSetting[type + 'AccessToken'],
@@ -59,8 +68,7 @@ export default auto(function SyncSettingEntry (props) {
       />
     )
   }
-
-  const syncItems = Object.keys(syncTypes).map(type => {
+  const syncItems = types.map(type => {
     return {
       key: type,
       label: type,
@@ -84,7 +92,7 @@ export default auto(function SyncSettingEntry (props) {
       <DataTransport {...dataImportProps} />
       <Spin spinning={store.isSyncingSetting}>
         <Tabs
-          activeKey={store.syncType}
+          activeKey={type}
           onChange={handleChange}
           items={syncItems}
         />

package/client/components/shortcuts/shortcut-handler.js

@@ -187,7 +187,6 @@ export function shortcutExtend (Cls) {
       !altKey &&
       !ctrlKey
     ) {
-      this.props.onDelKeyPressed()
       const delKey = this.props.config.backspaceMode === '^?' ? 8 : 127
       const altDelDelKey = delKey === 8 ? 127 : 8
       const char = String.fromCharCode(shiftKey ? delKey : altDelDelKey)

package/client/components/sidebar/info-modal.jsx

@@ -127,6 +127,7 @@ export default auto(function InfoModal (props) {
     devDependencies,
     dependencies,
     languageRepo,
+    privacyNoticeLink,
     author: {
       name: authorName,
       email,
@@ -203,6 +204,12 @@ export default auto(function InfoModal (props) {
               {bugReportLink}
             </Link>
           </p>
+          <p className='mg1b'>
+            <InfoCircleOutlined /> <b className='mg1r'>{e('privacyNotice')} ➾</b>
+            <Link to={privacyNoticeLink} className='mg1l'>
+              {privacyNoticeLink}
+            </Link>
+          </p>
           <p className='mg1b'>
             <HighlightOutlined /> <b className='mg1r'>{e('changeLog')} ➾</b>
             <Link to={releaseLink} className='mg1l'>

package/client/components/terminal/attach-addon-custom.js

@@ -98,12 +98,6 @@ export default class AttachAddonCustom {
     }
   }
 
-  onShellIntegrationDetected = () => {
-    if (this.outputSuppressed) {
-      this.stopOutputSuppression(true)
-    }
-  }
-
   activate = async (terminal = this.term) => {
     await this._initBase()
     this.addSocketListener(this._socket, 'message', this.onMsg)
@@ -177,9 +171,10 @@ export default class AttachAddonCustom {
     }
   }
 
-  checkForShellIntegration = (str) => {
+  // Index of the first OSC 633 sequence in the chunk, or -1.
+  indexOfShellIntegration = (str) => {
     const ESC = String.fromCharCode(27)
-    return str.includes(ESC + ']633;')
+    return str.indexOf(ESC + ']633;')
   }
 
   writeToTerminalDirect = (data) => {
@@ -232,8 +227,15 @@ export default class AttachAddonCustom {
     }
 
     if (this.outputSuppressed) {
-      if (this.checkForShellIntegration(str)) {
-        this.onShellIntegrationDetected()
+      const oscIdx = this.indexOfShellIntegration(str)
+      if (oscIdx !== -1) {
+        // Shell integration is confirmed active. The pty often coalesces the
+        // tail of the echoed injection command and the first OSC 633 output
+        // into one chunk, so write only from the first OSC sequence on —
+        // everything before it is echo and stays hidden. A leading newline
+        // keeps the fresh prompt off the injection-time prompt line.
+        this.stopOutputSuppression(true)
+        this._enqueueWrite('\r\n' + str.slice(oscIdx))
         return
       }
       this.suppressedData.push(data)

package/client/components/terminal/shell.js

@@ -27,7 +27,7 @@ function getBashInlineIntegration () {
     'if [[ $- == *i* ]] && [[ -z "${ELECTERM_SHELL_INTEGRATION:-}" ]]',
     'then export ELECTERM_SHELL_INTEGRATION=1',
     '__e_esc() { local v="$1"; v="${v//\\\\/\\\\\\\\}"; v="${v//;/\\\\x3b}"; printf \'%s\' "$v"; }',
-    '__e_pre() { [[ "$BASH_COMMAND" == "$PROMPT_COMMAND" ]] && return; [[ "$BASH_COMMAND" == "__e_"* ]] && return; [[ "${__e_in:-0}" == "0" ]] && { __e_in=1; printf \'\\e]633;E;%s\\a\\e]633;C\\a\' "$(__e_esc "$BASH_COMMAND")"; }; }',
+    '__e_pre() { local p; [[ "$BASH_COMMAND" == __e_* || "$BASH_COMMAND" == PROMPT_COMMAND=* ]] && return; [[ "$BASH_COMMAND" == "$PROMPT_COMMAND" ]] && return; if [[ -n "${PROMPT_COMMAND:-}" ]]; then local IFS=\';\'; for p in $PROMPT_COMMAND; do p="${p#"${p%%[! ]*}"}"; [[ "$BASH_COMMAND" == "$p" ]] && return; done; fi; [[ "${__e_in:-0}" == "0" ]] && { __e_in=1; printf \'\\e]633;E;%s\\a\\e]633;C\\a\' "$(__e_esc "$BASH_COMMAND")"; }; }',
     '__e_cmd() { local c="$?"; [[ "${__e_in:-0}" == "1" ]] && { printf \'\\e]633;D;%s\\a\' "$c"; __e_in=0; }; printf \'\\e]633;P;Cwd=%s\\a\\e]633;A\\a\' "$(__e_esc "$PWD")"; return "$c"; }',
     'trap \'__e_pre\' DEBUG',
     'PROMPT_COMMAND="__e_cmd${PROMPT_COMMAND:+; $PROMPT_COMMAND}"',
@@ -40,17 +40,19 @@ function getBashInlineIntegration () {
  * Properly formatted for semicolon joining
  */
 function getZshInlineIntegration () {
-  // Each statement is complete and can be joined with semicolons
-  // Note: 'then' must have a space/newline before the next command, not semicolon
+  // Register hooks by appending to the precmd/preexec hook arrays directly.
+  // add-zsh-hook is an autoloadable shell function: on systems like NixOS
+  // fpath may not include the standard functions directory, the autoload
+  // fails silently (stderr is suppressed) and the hooks never run, breaking
+  // path following. Appending to the arrays works on every zsh.
   return [
     'if [[ -o interactive ]] && [[ -z "${ELECTERM_SHELL_INTEGRATION:-}" ]]',
     'then export ELECTERM_SHELL_INTEGRATION=1',
     '__e_esc() { local v="$1"; v="${v//\\\\/\\\\\\\\}"; v="${v//;/\\\\x3b}"; builtin printf \'%s\' "$v"; }',
     '__e_preexec() { __e_cmd="$1"; builtin printf \'\\e]633;E;%s\\a\\e]633;C\\a\' "$(__e_esc "$1")"; }',
     '__e_precmd() { local c="$?"; [[ -n "$__e_cmd" ]] && builtin printf \'\\e]633;D;%s\\a\' "$c"; __e_cmd=""; builtin printf \'\\e]633;P;Cwd=%s\\a\\e]633;A\\a\' "$(__e_esc "$PWD")"; }',
-    'autoload -Uz add-zsh-hook',
-    'add-zsh-hook precmd __e_precmd',
-    'add-zsh-hook preexec __e_preexec',
+    'precmd_functions+=(__e_precmd)',
+    'preexec_functions+=(__e_preexec)',
     'fi'
   ].join('; ')
 }
@@ -78,11 +80,13 @@ function getShInlineIntegration () {
   return [
     'if [ -z "$ELECTERM_SHELL_INTEGRATION" ]',
     'then export ELECTERM_SHELL_INTEGRATION=1',
-    '__e_esc() { printf "%s" "$1" | sed "s/\\\\/\\\\\\\\/g; s/;/\\\\x3b/g"; }',
-    // We wrap the current PS1 with OSC 633 sequences.
-    // \033]633;P;Cwd=... \007 marks the directory
-    // \033]633;A \007 marks the start of the prompt
-    'export PS1="\\e]633;P;Cwd=$(__e_esc "$PWD")\\a\\e]633;A\\a${PS1:-# }"',
+    '__e_esc() { printf \'%s\' "$1" | sed \'s/\\\\/\\\\\\\\/g; s/;/\\\\x3b/g\'; }',
+    // sh/dash/ash re-evaluate $(...) inside PS1 every time the prompt is
+    // shown, but only if the $() stays literal — so PS1 must be assigned
+    // single-quoted. printf interprets \033/\a, unlike PS1 backslash
+    // escapes which dash does not expand.
+    '__e_ps1() { printf \'\\033]633;P;Cwd=%s\\a\\033]633;A\\a\' "$(__e_esc "$PWD")"; }',
+    'PS1=\'$(__e_ps1)\'"${PS1:-# }"',
     'fi'
   ].join('; ')
 }
@@ -139,6 +143,13 @@ export function wrapSilent (cmd, shellType) {
  * @returns {string} Complete command to send to terminal
  */
 export function getShellIntegrationCommand (shellType = 'bash') {
+  if (shellType === 'fish') {
+    // fish is not a Bourne shell: the eval '\''...'\'' wrapper of wrapSilent
+    // is a parse error in fish (nested single quotes stay unbalanced), so
+    // the whole injection silently fails. Send the script raw instead —
+    // it is already valid fish syntax as-is.
+    return ' ' + getInlineShellIntegration(shellType) + '\r'
+  }
   const cmd = getInlineShellIntegration(shellType)
   return wrapSilent(cmd, shellType)
 }

package/client/components/terminal/shortcut-bar-entry.jsx

@@ -22,6 +22,18 @@
  *     visualViewport.height against a baseline captured at the moment the
  *     terminal input is focused (i.e. before the keyboard opens), which holds
  *     the full pre-keyboard height on both platforms.
+ *
+ * Telling a keyboard from a desktop window resize (pure size heuristics
+ * fail — dragging a window's top/bottom edge is also a height-only shrink)
+ * needs one of two extra signals, checked in onResize:
+ *   - an overlay-style keyboard (iOS / HarmonyOS) shrinks the visual
+ *     viewport but keeps the layout viewport (window.innerHeight) full —
+ *     a window resize shrinks both.
+ *   - an Android-style keyboard resizes both viewports, but a soft keyboard
+ *     only ever opens in response to a *touch* into the terminal — a window
+ *     resized with a mouse never shows one.
+ * Tablets running the desktop program still get the bar; mouse-driven
+ * desktops never do.
  */
 
 import { lazy, Suspense, useEffect, useState } from 'react'
@@ -35,6 +47,11 @@ const ShortcutBar = lazy(() => import('./shortcut-bar'))
 // bar above a keyboard that overlays the page (iOS / HarmonyOS).
 export const KEYBOARD_MIN = 120
 
+// how long (ms) after an in-page touch an Android-style (layout-resizing)
+// keyboard is expected to be up. Bounds the touch signal used to tell that
+// keyboard from a mouse-driven window resize on touch-capable desktops.
+const TOUCH_GRACE_MS = 3000
+
 // kept as a coarse capability fallback for engines without visualViewport.
 // Modern Chromium (Electron) always exposes window.visualViewport, so this is
 // effectively only reached on very old runtimes — where remote-control
@@ -77,6 +94,12 @@ export default function ShortcutBarEntry (props) {
     // the pre-keyboard (full) size, and the subsequent resize lets us measure
     // exactly how much the keyboard took — on both iOS and Android.
     let baseline = { height: vv.height, width: vv.width }
+    // when the last in-page touch happened (0 = never). An Android-style
+    // keyboard resizes the layout viewport exactly like a window resize does,
+    // so size alone can't separate them there — but a keyboard only ever
+    // opens right after a *touch*, while a window drag doesn't fire in-page
+    // pointer events at all, so an old touch must not count forever.
+    let lastTouchAt = 0
 
     function onFocusIn (ev) {
       const el = ev.target
@@ -85,11 +108,25 @@ export default function ShortcutBarEntry (props) {
       }
     }
 
+    function onPointerDown (ev) {
+      // touch or stylus — both tap like a finger and can raise the keyboard
+      if (ev.pointerType === 'touch' || ev.pointerType === 'pen') {
+        lastTouchAt = Date.now()
+      }
+    }
+
     function onResize () {
       // ignore viewport changes that also changed width (rotation / split) —
       // a keyboard changes height only.
       const sameWidth = Math.abs(vv.width - baseline.width) < 20
-      if (sameWidth && baseline.height - vv.height > KEYBOARD_MIN) {
+      if (!sameWidth || baseline.height - vv.height <= KEYBOARD_MIN) {
+        return
+      }
+      // overlay keyboard (iOS / HarmonyOS): the layout viewport stays full
+      // while the visual one shrinks. A window resize shrinks both — this is
+      // what rules out mouse window-dragging on those platforms.
+      const layoutShrunk = window.innerHeight < baseline.height - KEYBOARD_MIN
+      if (!layoutShrunk) {
         setKeyboardSeen(true)
         // The user is focused in a terminal with the keyboard up — they need
         // the bar right now. Set visibility here rather than waiting for the
@@ -100,13 +137,27 @@ export default function ShortcutBarEntry (props) {
         if (store && store.inActiveTerminal) {
           store.shortcutBarVisible = true
         }
+        return
+      }
+      // Android-style resize keyboard: both viewports shrink, so require a
+      // recent touch — a keyboard opens within moments of the tap, while a
+      // window drag fires no in-page pointerdown at all, so any touch old
+      // enough to have expired can't have been the cause.
+      if (Date.now() - lastTouchAt < TOUCH_GRACE_MS) {
+        setKeyboardSeen(true)
+        const { store } = window
+        if (store && store.inActiveTerminal) {
+          store.shortcutBarVisible = true
+        }
       }
     }
 
     document.addEventListener('focusin', onFocusIn)
+    document.addEventListener('pointerdown', onPointerDown)
     vv.addEventListener('resize', onResize)
     return () => {
       document.removeEventListener('focusin', onFocusIn)
+      document.removeEventListener('pointerdown', onPointerDown)
       vv.removeEventListener('resize', onResize)
     }
   }, [])

package/client/components/terminal/terminal-interactive.jsx

@@ -5,6 +5,8 @@
 import { useEffect, useState, useRef, useCallback } from 'react'
 import wait from '../../common/wait'
 import TermInteractiveUI from './terminal-interactive-ui'
+import ExternalLink from '../common/external-link.jsx'
+import { notification } from '../common/notification'
 
 export default function TermInteractive () {
   const [current, setCurrent] = useState(null)
@@ -15,6 +17,32 @@ export default function TermInteractive () {
     window.store.updateTab(data.tabId, data.update)
   }
 
+  function notifyProxyCommandMessage (data) {
+    const lines = (data.message || '').split('\n')
+    const title = lines[0] || 'ssh proxy command'
+    const body = lines.slice(1).join('\n').trim()
+    // make any http(s) link in the message clickable (SSO login url)
+    const renderBody = (text) => {
+      const parts = text.split(/(https?:\/\/\S+)/)
+      return (
+        <pre className='pd0 mg0 overflow-auto'>
+          {
+            parts.map((part, i) => /^https?:\/\//.test(part)
+              ? <ExternalLink key={i} to={part}>{part}</ExternalLink>
+              : part)
+          }
+        </pre>
+      )
+    }
+    notification.info({
+      message: title,
+      description: body
+        ? renderBody(body)
+        : undefined,
+      duration: 30
+    })
+  }
+
   function processNext () {
     const next = queueRef.current.shift()
     if (next) {
@@ -47,6 +75,13 @@ export default function TermInteractive () {
       e.data.includes('ssh-tunnel-result')
     ) {
       updateTab(JSON.parse(e.data))
+    } else if (
+      e &&
+      e.data &&
+      typeof e.data === 'string' &&
+      e.data.includes('ssh-proxy-command-message')
+    ) {
+      notifyProxyCommandMessage(JSON.parse(e.data))
     }
   }
 

package/client/components/terminal/terminal.jsx

@@ -1723,12 +1723,6 @@ class Term extends Component {
     }
 
     this.shellType = shellType
-    if (shellType === 'fish') {
-      if (this.props.sftpPathFollowSsh) {
-        this.warnSftpFollowUnsupported()
-      }
-      return Promise.resolve()
-    }
 
     // Don't inject for sh type shells unless sftpPathFollowSsh is true
     if (shellType === 'sh' && !this.props.sftpPathFollowSsh) {
@@ -1946,6 +1940,17 @@ class Term extends Component {
     if (this.isElementVisible()) {
       this.fitAddon.fit()
     }
+    // Force-send the current size now that `this.pid` is finally valid.
+    // A resize may already have fired earlier (e.g. from the tab-becomes-
+    // visible fit in componentDidUpdate, which can run before createTerm()
+    // resolves) while this.pid was still undefined - the backend silently
+    // drops resize calls for an unknown pid. If that earlier call already
+    // updated term.cols/rows locally, xterm's resize() no-ops on the next
+    // fit() (dims unchanged) and never fires onResize again, so the
+    // backend pty would otherwise be stuck at its initial (possibly wrong)
+    // size forever. Sending explicitly here, keyed off the real pid,
+    // guarantees the remote pty/ssh channel is told the true current size.
+    resizeTerm(this.pid, term.cols, term.rows)
     term.displayRaw = displayRaw
     term.loadAddon(
       new KeywordHighlighterAddon(keywords)

package/client/components/terminal-info/activity.jsx

@@ -42,7 +42,11 @@ export default function TerminalInfoActivities (props) {
     bordered: true,
     columns: col,
     size: 'small',
-    pagination: false
+    pagination: false,
+    scroll: {
+      y: 180,
+      x: 'max-content'
+    }
   }
   return (
     <div className='terminal-info-section terminal-info-act'>

package/client/components/terminal-info/base.jsx

@@ -3,8 +3,8 @@
  */
 import { Component } from 'react'
 import {
-  Space,
-  Button
+  Button,
+  Dropdown
 } from 'antd'
 import SwitchLabel from '../common/switch'
 import defaults from '../../common/default-setting'
@@ -15,7 +15,9 @@ import {
   DatabaseOutlined,
   BarsOutlined,
   ApiOutlined,
-  PartitionOutlined
+  PartitionOutlined,
+  FilterOutlined,
+  CheckOutlined
 } from '@ant-design/icons'
 import { refs } from '../common/ref'
 import ShowItem from '../common/show-item'
@@ -136,26 +138,39 @@ export default class TerminalInfoBase extends Component {
     const {
       terminalInfos
     } = this.props
+    const items = defaults.terminalInfos.map(f => {
+      const checked = terminalInfos.includes(f)
+      return {
+        key: f,
+        label: (
+          <span
+            className='term-info-filter-label'
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: '6px'
+            }}
+          >
+            <span style={{ width: '14px' }}>{checked ? <CheckOutlined /> : null}</span>
+            {mapper[f]} {f}
+          </span>
+        ),
+        onClick: () => this.toggleTerminalLogInfo(f)
+      }
+    })
     return (
-      <Space.Compact className='width-100'>
-        {
-          defaults.terminalInfos.map(f => {
-            const type = terminalInfos.includes(f) ? 'primary' : 'default'
-            return (
-              <Button
-                key={f + 'term-info-sel'}
-                type={type}
-                size='small'
-                onClick={() => this.toggleTerminalLogInfo(f)}
-                className='cap'
-                icon={mapper[f]}
-              >
-                {f}
-              </Button>
-            )
-          })
-        }
-      </Space.Compact>
+      <Dropdown
+        menu={{ items }}
+        trigger={['click']}
+        placement='bottomRight'
+      >
+        <Button
+          size='small'
+          icon={<FilterOutlined />}
+        >
+          {e('filter')}({terminalInfos.length}/{defaults.terminalInfos.length})
+        </Button>
+      </Dropdown>
     )
   }
 

package/client/components/terminal-info/disk.jsx

@@ -30,7 +30,11 @@ export default function TerminalInfoDisk (props) {
     bordered: true,
     columns: col,
     size: 'small',
-    pagination: false
+    pagination: false,
+    scroll: {
+      y: 180,
+      x: 'max-content'
+    }
   }
   return (
     <div className='terminal-info-section terminal-info-disk'>

package/client/components/terminal-info/local-info-resolver.js

@@ -0,0 +1,89 @@
+/**
+ * resolve local terminal info: os / hostname / kernel / arch / shell + version
+ * uses the electron os module via window.pre.osInfo() (sync) and probes the
+ * configured shell binary for its version through the local fs run bridge
+ */
+
+import { isMac, isWin } from '../../common/constants'
+import fs from '../../common/fs'
+
+function parseOsInfo (list) {
+  const map = {}
+  for (const { k, v } of list || []) {
+    let val
+    try {
+      val = JSON.parse(v)
+    } catch (e) {
+      val = v
+    }
+    map[k] = Array.isArray(val) ? val.join(' ') : String(val)
+  }
+  return map
+}
+
+const shellNameReg = /(\w+)$/
+
+function formatOsName (map) {
+  const ver = map.release || ''
+  if (isWin) {
+    const main = parseInt(ver.split('.')[0], 10)
+    if (main >= 10) {
+      const build = parseInt(ver.split('.')[2], 10)
+      return build >= 22000 ? `Windows 11 (${ver})` : `Windows 10 (${ver})`
+    }
+    return `Windows (${ver})`
+  }
+  if (isMac) {
+    return `macOS ${map.version || ''}`.trim()
+  }
+  return `Linux ${ver}`.trim()
+}
+
+async function probeShellVersion (shellPath) {
+  if (!shellPath) {
+    return ''
+  }
+  try {
+    let out = ''
+    if (isWin) {
+      // runWinCmd wraps the given script with powershell.exe -Command
+      const res = await fs.runWinCmd(
+        '$PSVersionTable.PSVersion.ToString()'
+      ).catch(() => null)
+      out = res?.stdout || ''
+    } else {
+      out = await fs.run(`'${shellPath.replace(/'/g, "'\\''")}' --version`).catch(() => '')
+    }
+    return (out || '').split('\n')[0].trim()
+  } catch (e) {
+    return ''
+  }
+}
+
+export default async function resolveLocalInfo (pid) {
+  const store = window.store
+  if (!window.pre?.osInfo) {
+    // web app build: no local os bridge available
+    return null
+  }
+  const tab = store?.getTabs?.().find(t => t.id === pid)
+  const config = store?.config || {}
+  const execProp = isWin ? 'execWindows' : isMac ? 'execMac' : 'execLinux'
+  // tab settings (bookmark) win over global config, same as terminal spawn logic
+  const shellPath = tab?.[execProp] || config[execProp] || ''
+  const shellBase = isWin
+    ? (shellPath.split(/[\\/]/).pop() || '')
+    : shellPath.split('/').pop() || ''
+  const nameMatch = shellBase.match(shellNameReg)
+  const shellName = nameMatch ? nameMatch[1] : shellBase
+  const map = parseOsInfo(window.pre.osInfo())
+  const shellVersion = await probeShellVersion(shellPath)
+  return {
+    os: formatOsName(map),
+    hostname: map.hostname || '',
+    kernel: isWin ? `Windows NT ${map.release || ''}`.trim() : (map.release || ''),
+    arch: map.arch || '',
+    shell: shellName,
+    shellVersion
+  }
+}

package/client/components/terminal-info/network.jsx

@@ -106,7 +106,11 @@ export default function TerminalInfoDisk (props) {
     bordered: true,
     size: 'small',
     columns: col,
-    pagination: false
+    pagination: false,
+    scroll: {
+      y: 180,
+      x: 'max-content'
+    }
   }
   return (
     <div className='terminal-info-section terminal-info-network'>

package/client/components/terminal-info/run-cmd.jsx

@@ -32,6 +32,33 @@ function formatActivities (str) {
   }
 }
 
+function formatSysInfo (unameStr, prettyName) {
+  if (!unameStr) {
+    return {}
+  }
+  const parts = unameStr.trim().split(/\s+/)
+  if (parts.length < 4) {
+    return {}
+  }
+  const [sysname, hostname, kernel, arch] = parts
+  let os = sysname
+  const m = (prettyName || '').match(/PRETTY_NAME="?([^"\r\n]+)"?/)
+  if (m) {
+    os = m[1].trim()
+  } else if (sysname === 'Darwin') {
+    os = 'macOS'
+  }
+  return {
+    sysInfo: {
+      os,
+      sysname,
+      hostname,
+      kernel,
+      arch
+    }
+  }
+}
+
 function formatCpu (str) {
   if (!str) {
     return {
@@ -153,9 +180,11 @@ function InfoGetter (props) {
       props.setState(update)
     }
     run()
-    const ref = setInterval(run, interval)
-    return () => {
-      clearInterval(ref)
+    if (interval > 0) {
+      const ref = setInterval(run, interval)
+      return () => {
+        clearInterval(ref)
+      }
     }
   }, [pid])
   return null
@@ -166,6 +195,16 @@ export default (props) => {
     return null
   }
   const cmds = [
+    {
+      name: 'sysinfo',
+      cmds: [
+        'uname -s -n -r -m',
+        'grep PRETTY_NAME= /etc/os-release 2>/dev/null || echo'
+      ],
+      interval: 0,
+      delay: 0,
+      formatter: formatSysInfo
+    },
     {
       name: 'uptime',
       cmd: 'uptime -p',

package/client/components/terminal-info/sys-info.jsx

@@ -0,0 +1,56 @@
+/**
+ * system info: os / hostname / kernel / arch (+ shell for local terminals)
+ * remote info comes from uname via the session runCmd bridge,
+ * local info from the os module + a shell version probe
+ */
+
+import { useEffect, useState } from 'react'
+import { DesktopOutlined } from '@ant-design/icons'
+import resolveLocalInfo from './local-info-resolver'
+
+export default function TerminalInfoSys (props) {
+  const { sysInfo, isRemote, pid } = props
+  const [localInfo, setLocalInfo] = useState(null)
+
+  useEffect(() => {
+    if (isRemote) {
+      return
+    }
+    resolveLocalInfo(pid).then(setLocalInfo)
+  }, [isRemote, pid])
+
+  const info = isRemote ? sysInfo : localInfo
+  if (!info || !info.os) {
+    return null
+  }
+  const rows = [
+    ['os', info.os],
+    ['hostname', info.hostname],
+    ['kernel', info.kernel],
+    ['arch', info.arch]
+  ]
+  if (info.shell) {
+    rows.push(['shell', info.shellVersion ? `${info.shell} ${info.shellVersion}` : info.shell])
+  }
+  const final = rows.filter(d => d[1])
+  if (!final.length) {
+    return null
+  }
+  return (
+    <div className='terminal-info-section terminal-info-sys'>
+      <div className='pd1y bold'><DesktopOutlined /> System</div>
+      <div className='terminal-info-sys-rows'>
+        {
+          final.map(([k, v]) => {
+            return (
+              <div className='terminal-info-sys-row' key={k}>
+                <span className='terminal-info-sys-key'>{k}</span>
+                <span className='terminal-info-sys-val' title={v}>{v}</span>
+              </div>
+            )
+          })
+        }
+      </div>
+    </div>
+  )
+}

package/client/components/terminal-info/terminal-info.jsx

@@ -9,6 +9,7 @@ import TerminalInfoNetwork from './network'
 import TerminalInfoResource from './resource'
 import TerminalInfoActivities from './activity'
 import TerminalInfoDisk from './disk'
+import TerminalInfoSys from './sys-info'
 import RunCmd from './run-cmd'
 import { runCmd } from '../terminal/terminal-apis'
 import './terminal-info.styl'
@@ -21,7 +22,8 @@ export default class TerminalInfoContent extends PureComponent {
     swap: {},
     activities: [],
     disks: [],
-    network: {}
+    network: {},
+    sysInfo: null
   }
 
   setStateRef = (...args) => {
@@ -44,6 +46,7 @@ export default class TerminalInfoContent extends PureComponent {
     return (
       <>
         <TerminalInfoBase {...props} {...state} />
+        <TerminalInfoSys {...props} {...state} />
         <TerminalInfoUp {...props} {...state} />
         <TerminalInfoResource
           {...props} {...state}

package/client/components/terminal-info/terminal-info.styl

@@ -1,4 +1,3 @@
-
 .terminal-info-icon
   color var(--text-dark)
   &:hover
@@ -23,11 +22,27 @@
     display block
 .terminal-info-section
   padding 10px 0
-.terminal-info-act
-.terminal-info-disk
-.terminal-info-network
-  max-height 260px
-  overflow-y scroll
+.terminal-info-sys
+  border-bottom 1px solid var(--main-darker)
+  .terminal-info-sys-rows
+    display flex
+    flex-direction column
+    gap 4px
+  .terminal-info-sys-row
+    display flex
+    gap 8px
+    align-items baseline
+    font-size 12px
+  .terminal-info-sys-key
+    flex none
+    width 80px
+    color var(--text-dark)
+    text-transform capitalize
+  .terminal-info-sys-val
+    flex 1
+    overflow hidden
+    text-overflow ellipsis
+    white-space nowrap
 .activity-item
   max-height 1.6em
   line-height 1.6
@@ -36,4 +51,4 @@
     max-height none
 .info-panel-wrap-pin
   .toggle-info-panel-wrap
-    color var(--success)
+    color var(--success)

package/client/store/common.js

@@ -11,14 +11,16 @@ import {
   leftSideBarOpenKey,
   rightSidebarWidthKey,
   addPanelWidthLsKey,
-  dismissDelKeyTipLsKey,
   connectionMap,
   lastAiChatSessionIdKey,
   mobileBreakpoint,
-  splitMap
+  splitMap,
+  settingAiId,
+  settingSyncId
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 import { refs, refsStatic } from '../components/common/ref'
+import { requireTermOfUse } from '../common/term-of-use'
 import { action } from 'manate'
 import uid from '../common/uid'
 import deepCopy from 'json-deep-copy'
@@ -56,7 +58,9 @@ export default Store => {
   }
 
   Store.prototype.toggleAIConfig = function () {
-    window.store.showAIConfigModal = true
+    requireTermOfUse('ai', () => {
+      window.store.showAIConfigModal = true
+    })
   }
 
   Store.prototype.onResize = debounce(async function () {
@@ -99,6 +103,18 @@ export default Store => {
   }
 
   Store.prototype.setSettingItem = function (v) {
+    // entering the AI / sync setting page requires the term of use
+    // confirmation first (when the term is defined)
+    if (
+      v && (
+        v.id === settingAiId || v.id === settingSyncId
+      )
+    ) {
+      const type = v.id === settingAiId ? 'ai' : 'sync'
+      return requireTermOfUse(type, () => {
+        window.store.settingItem = v
+      })
+    }
     window.store.settingItem = v
   }
 
@@ -131,10 +147,6 @@ export default Store => {
     ls.setItem(rightSidebarWidthKey, v)
     window.store._rightPanelWidth = v
   }
-  Store.prototype.dismissDelKeyTip = function (v) {
-    ls.setItem(dismissDelKeyTipLsKey, 'y')
-    window.store.hideDelKeyTip = true
-  }
   Store.prototype.beforeExit = function (evt) {
     const { confirmBeforeExit } = window.store.config
     if (

package/client/store/init-state.js

@@ -19,7 +19,6 @@ import {
   leftSidePanelWidthKey,
   rightSidebarWidthKey,
   addPanelWidthLsKey,
-  dismissDelKeyTipLsKey,
   qmSortByFrequencyKey,
   resolutionsLsKey,
   syncServerDataKey,
@@ -216,7 +215,6 @@ export default () => {
     hasNodePty: window.pre.runSync('nodePtyCheck'),
     isMobile: window.innerWidth <= mobileBreakpoint,
     fullscreen: false,
-    hideDelKeyTip: ls.getItem(dismissDelKeyTipLsKey) === 'y',
     tabsHeight: 36,
 
     // widgets

package/client/store/mcp-handler.js

@@ -810,7 +810,9 @@ export default Store => {
     const { command, tabId, timeoutMs } = args
     const marker = `__ET_EXEC_${uid()}__`
     const startLine = `${marker}S`
-    const wrapped = `echo "${startLine}"; ${command}; echo "${marker}E$?"`
+    // Run in a subshell so commands like `exit`/`exec` cannot kill the outer
+    // shell before the end sentinel is emitted; $? holds the subshell's code.
+    const wrapped = `echo "${startLine}"; ( ${command} ); echo "${marker}E$?"`
 
     store.runQuickCommand(wrapped, false, tabId)
 

package/client/store/setting.js

@@ -14,6 +14,7 @@ import { buildNewTheme } from '../common/terminal-theme'
 import getInitItem from '../common/init-setting-item'
 import newTerm from '../common/new-terminal'
 import settingList from '../common/setting-list'
+import { requireTermOfUse } from '../common/term-of-use'
 
 const e = window.translate
 
@@ -103,11 +104,13 @@ export default Store => {
     ) {
       return store.hideSettingModal()
     }
-    store.storeAssign({
-      settingTab: settingMap.setting
+    requireTermOfUse('sync', () => {
+      store.storeAssign({
+        settingTab: settingMap.setting
+      })
+      store.setSettingItem(settingList().find(d => d.id === settingSyncId))
+      store.openSettingModal()
     })
-    store.setSettingItem(settingList().find(d => d.id === settingSyncId))
-    store.openSettingModal()
   }
 
   Store.prototype.openTerminalThemes = function () {

package/client/store/tab.js

@@ -111,17 +111,22 @@ export default Store => {
     // Remove old tab
     tabs.splice(index, 1)
 
-    setTimeout(() => {
-      if (store.activeTabId === tabId) {
-        store.activeTabId = newTab.id
-      }
-
-      // Update batch current tab ID if needed
-      const batchProp = `activeTabId${oldBatch}`
-      if (store[batchProp] === tabId) {
-        store[batchProp] = newTab.id
-      }
-    }, 0)
+    // Update active tab id synchronously (same as addTab) so the new tab's
+    // container is already visible (display:block) by the time its Terminal
+    // mounts. Deferring this via setTimeout(0) left the container hidden at
+    // mount time, causing the initial fit()/createTerm() to use xterm's
+    // default 80x24 size instead of the real fitted size - which then got
+    // baked into the remote pty and only partially corrected later, leaving
+    // full-screen apps like tmux/vim rendering at the wrong size.
+    if (store.activeTabId === tabId) {
+      store.activeTabId = newTab.id
+    }
+
+    // Update batch current tab ID if needed
+    const batchProp = `activeTabId${oldBatch}`
+    if (store[batchProp] === tabId) {
+      store[batchProp] = newTab.id
+    }
   }
 
   Store.prototype.reloadAllTabs = function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "5.2.0",
+  "version": "5.3.5",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",