@electerm/electerm-react 3.9.5 → 3.10.0

package/client/common/default-setting.js

@@ -64,7 +64,7 @@ export default {
   ],
   hideIP: false,
   dataSyncSelected: 'all',
-  baseURLAI: 'https://api.deepseek.com',
+  baseURLAI: 'https://api.atlascloud.ai/v1',
   modelAI: 'deepseek-chat',
   roleAI: '终端专家,提供不同系统下命令,简要解释用法,用markdown格式',
   apiPathAI: '/chat/completions',
@@ -75,5 +75,6 @@ export default {
   autoReconnectTerminal: false,
   startDirectoryLocal: '',
   allowMultiInstance: false,
-  disableDeveloperTool: false
+  disableDeveloperTool: false,
+  dragDropBehavior: 'ask'
 }

package/client/components/ai/ai-config.jsx

@@ -36,6 +36,7 @@ const proxyOptions = [
 
 export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig }) {
   const [form] = Form.useForm()
+  const baseURLAI = Form.useWatch('baseURLAI', form)
 
   useEffect(() => {
     if (initialValues) {
@@ -67,6 +68,13 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
     return { label, title }
   }
 
+  function renderApiUrlLabel () {
+    if (baseURLAI === 'https://api.atlascloud.ai/v1') {
+      return <span>API URL (<Link to='https://atlascloud.ai'>AtlasCloud</Link>)</span>
+    }
+    return 'API URL'
+  }
+
   if (!showAIConfig) {
     return null
   }
@@ -90,7 +98,7 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         layout='vertical'
         className='ai-config-form'
       >
-        <Form.Item label='API URL' required>
+        <Form.Item label={renderApiUrlLabel()} required>
           <Space.Compact className='width-100'>
             <Form.Item
               label='API URL'

package/client/components/batch-op/batch-op-runner.jsx

@@ -1,5 +1,5 @@
 import { Component } from 'react'
-import { refsStatic } from '../common/ref'
+import { refsStatic, refs } from '../common/ref'
 import { statusMap } from '../../common/constants'
 import { autoRun } from 'manate'
 import uid from '../../common/uid'
@@ -237,7 +237,6 @@ export default class BatchOpRunner extends Component {
       throw new Error('No active tab. Please connect first.')
     }
 
-    const { refs } = await import('../common/ref')
     const term = refs.get('term-' + tabId)
     if (!term || !term.term) {
       throw new Error('Terminal not found')

package/client/components/bookmark-form/common/bookmark-group-tree-format.js

@@ -21,7 +21,7 @@ export default (bookmarkGroups = [], disabledId = '', returnMap = false, current
     }
     return y
   }
-  const level1 = bookmarkGroups.filter(d => d.level !== 2)
+  const level1 = bookmarkGroups.filter(d => d.level === 1 || !d.level)
     .map(d => {
       const r = {
         title: d.title,

package/client/components/bookmark-form/common/bookmark-select.jsx

@@ -38,7 +38,7 @@ function buildTreeData (bookmarkGroups, tree) {
     if (!x) return ''
     return { value: x.id, key: x.id, title: createTitle(x) }
   }
-  const level1 = cats.filter(d => d.level !== 2)
+  const level1 = cats.filter(d => d.level === 1 || !d.level)
     .map(d => {
       const r = {
         title: d.title,

package/client/components/bookmark-form/tree-select.jsx

@@ -79,7 +79,7 @@ function buildData (bookmarks, bookmarkGroups, searchText = '') {
       title: createTitleWithTag(x)
     }
   }
-  const level1 = cats.filter(d => d.level !== 2)
+  const level1 = cats.filter(d => d.level === 1 || !d.level)
     .map(d => {
       const children = [
         ...(d.bookmarkGroupIds || []).map(buildSubCats),

package/client/components/setting-panel/setting-terminal.jsx

@@ -84,6 +84,7 @@ export default class SettingTerminal extends Component {
 
   handleChangeDelMode = v => this.onChangeValue(v, 'backspaceMode')
   handleChangeRenderType = v => this.onChangeValue(v, 'rendererType')
+  handleChangeDragDropBehavior = v => this.onChangeValue(v, 'dragDropBehavior')
 
   handleChangeFont = (values) => {
     this.onChangeValue(
@@ -471,6 +472,7 @@ export default class SettingTerminal extends Component {
     const {
       rendererType,
       backspaceMode = '^?',
+      dragDropBehavior = 'ask',
       keywords = [{ color: 'red' }]
     } = this.props.config
     const {
@@ -593,6 +595,16 @@ export default class SettingTerminal extends Component {
             'autoReconnectTerminal'
           ].map(d => this.renderToggle(d))
         }
+        <div className='pd1b'>{e('dragDropBehavior')}</div>
+        <Select
+          onChange={this.handleChangeDragDropBehavior}
+          value={dragDropBehavior}
+          popupMatchSelectWidth={false}
+        >
+          {['ask', 'trz', 'rz', 'inputOnly'].map(id => (
+            <Option key={id} value={id}>{e(id)}</Option>
+          ))}
+        </Select>
         <div className='pd1b'>{e('terminalBackSpaceMode')}</div>
         <Select
           onChange={this.handleChangeDelMode}

package/client/components/setting-panel/start-session-select.jsx

@@ -65,7 +65,7 @@ function BookmarkSelect (props) {
         title: createTitleWithTag(x)
       }
     }
-    const level1 = cats.filter(d => d.level !== 2)
+    const level1 = cats.filter(d => d.level === 1 || !d.level)
       .map(d => {
         const r = {
           title: d.title,

package/client/components/sftp/list-table-ui.jsx

@@ -28,7 +28,11 @@ export default class FileListTable extends Component {
   containerRef = createRef()
 
   componentDidUpdate (prevProps) {
-    if (prevProps.fileList !== this.props.fileList) {
+    const prevList = prevProps.fileList
+    const nextList = this.props.fileList
+    const contentChanged = prevList.length !== nextList.length ||
+      prevList.some((f, i) => f.id !== nextList[i].id)
+    if (contentChanged) {
       if (this.containerRef.current) {
         this.containerRef.current.scrollTop = 0
       }

package/client/components/tabs/tab.jsx

@@ -8,7 +8,8 @@ import { refsTabs } from '../common/ref'
 import {
   CloseOutlined,
   Loading3QuartersOutlined,
-  BorderlessTableOutlined
+  BorderlessTableOutlined,
+  LockOutlined
 } from '@ant-design/icons'
 import {
   Tooltip,
@@ -33,7 +34,7 @@ class Tab extends Component {
   constructor (props) {
     super(props)
     this.state = {
-      terminalOnData: false
+      terminalOnData: ''
     }
     this.id = 'tab-' + this.props.tab.id
     refsTabs.add(this.id, this)
@@ -48,19 +49,38 @@ class Tab extends Component {
   }
 
   notifyOnData = () => {
+    if (this.state.terminalOnData === 'password') {
+      return
+    }
     if (this.timer) {
       clearTimeout(this.timer)
       this.timer = null
     }
     this.setState({
-      terminalOnData: true
+      terminalOnData: 'feed'
     })
     this.timer = setTimeout(this.clearTerminalOnData, 4000)
   }
 
   clearTerminalOnData = () => {
     this.setState({
-      terminalOnData: false
+      terminalOnData: ''
+    })
+  }
+
+  notifyPasswordPrompt = () => {
+    if (this.timer) {
+      clearTimeout(this.timer)
+      this.timer = null
+    }
+    this.setState({
+      terminalOnData: 'password'
+    })
+  }
+
+  clearPasswordPrompt = () => {
+    this.setState({
+      terminalOnData: ''
     })
   }
 
@@ -424,13 +444,7 @@ class Tab extends Component {
       {
         'tab-last': isLast
       },
-      status,
-      {
-        'is-terminal-active': terminalOnData
-      },
-      {
-        'is-transporting': isTransporting
-      }
+      status
     )
     const title = createName(tab)
     let tooltipTitle = title
@@ -477,15 +491,19 @@ class Tab extends Component {
         >
           <Dropdown {...dropdownProps}>
             <div
-              className='tab-title elli pd1x'
+              className='tab-title elli'
               onClick={this.handleClick}
               onDoubleClick={this.handleDup}
             >
-              <Loading3QuartersOutlined
-                className='pointer tab-reload mg1r'
-                onClick={this.handleReloadTab}
-                title={e('reload')}
-              />
+              {
+                status === 'error' && (
+                  <Loading3QuartersOutlined
+                    className='pointer tab-reload mg1r'
+                    onClick={this.handleReloadTab}
+                    title={e('reload')}
+                  />
+                )
+              }
               <span className='tab-title'>
                 <span className='iblock mg1r tab-count' style={styleTag}>{tabCount}</span>
                 <span className='mg1r'>{title}</span>
@@ -493,8 +511,9 @@ class Tab extends Component {
             </div>
           </Dropdown>
           <div className={'tab-status ' + status} />
-          <div className='tab-traffic' />
-          <BorderlessTableOutlined className='tab-terminal-feed' />
+          {isTransporting && <div className='tab-traffic' />}
+          {terminalOnData === 'feed' && <BorderlessTableOutlined className='tab-terminal-feed' />}
+          {terminalOnData === 'password' && <LockOutlined className='tab-terminal-feed password' />}
           {
             this.renderCloseIcon()
           }

package/client/components/tabs/tabs.styl

@@ -36,6 +36,7 @@
   vertical-align middle
   cursor pointer
   position relative
+  padding 0 14px
   min-width 100px
   max-width 200px
   line-height 36px
@@ -46,7 +47,6 @@
   color var(--text-dark)
   &.tab-last
     margin-right 5px
-  .tab-reload
   .tab-close
     display none
   &.active
@@ -68,10 +68,6 @@
     width 1px
     border 1px dashed var(--text-dark)
     height 36px
-  &.error
-    .tab-reload
-      display inline-block
-      color var(--text-light)
 @keyframes blink
   0%
     background-color #e0e0e0
@@ -96,30 +92,25 @@
     background-color var(--error)
   &.processing
     background-color var(--primary)
-.is-transporting .tab-traffic
-  display block
-  animation blink 2s infinite
-  /* Remove opacity animation, use background-color */
 .tab-traffic
-  display none
   left 10px
   width 5px
   border-radius 0
   background-color var(--success)
-.is-terminal-active .tab-terminal-feed
-  display block
   animation blink 2s infinite
-  background-color transparent !important
-  /* Remove opacity animation, use background-color */
 .tab-terminal-feed
-  display none
-  left 20px
+  width 12px
+  height 12px
   border-radius 0
   color var(--success)
-  font-size 8px
+  font-size 12px
   left 2px
   top 24px
   background none
+  background-color transparent !important
+  animation blink 2s infinite
+  &.password
+    color var(--warn)
 .tab-close
   position absolute
   right 5px

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

@@ -223,6 +223,7 @@ export default class AttachAddonCustom {
     }
 
     if (typeof data === 'string') {
+      term?.parent?.notifyOnData()
       return term.write(data)
     }
     data = new Uint8Array(data)
@@ -242,13 +243,16 @@ export default class AttachAddonCustom {
   sendToServer = (data) => {
     this._lastInputTime = Date.now()
     // Start echo detection when password prompt is suspected
-    if (this._passwordPromptDetected && !this._pendingEchoCheck && data !== '\r' && data !== '\n') {
+    if (this._passwordPromptDetected && !this._pendingEchoCheck && data !== '\r' && data !== '\n' && data !== '\x03') {
       this._pendingEchoCheck = { char: data, time: Date.now() }
       clearTimeout(this._echoCheckTimer)
       this._echoCheckTimer = setTimeout(this._onEchoCheckTimeout, 200)
     }
-    // Reset password state on Enter
-    if (data === '\r' || data === '\n') {
+    // Reset password state on Enter or Ctrl+C
+    if (data === '\r' || data === '\n' || data === '\x03') {
+      if (this._passwordPromptDetected) {
+        this.term?.parent?.onPasswordPromptCancelled?.()
+      }
       this._passwordPromptDetected = false
       this._lastOutputLine = ''
       this._pendingEchoCheck = null

package/client/components/terminal/drop-file-modal.jsx

@@ -26,21 +26,21 @@ export class DropFileModal extends Component {
             <button
               type='button'
               className='custom-modal-ok-btn'
-              onClick={() => onSelect('trzUpload')}
+              onClick={() => onSelect('trz')}
             >
               trz
             </button>
             <button
               type='button'
               className='custom-modal-cancel-btn'
-              onClick={() => onSelect('rzUpload')}
+              onClick={() => onSelect('rz')}
             >
               rz
             </button>
             <button
               type='button'
               className='custom-modal-cancel-btn'
-              onClick={() => onSelect('inputPath')}
+              onClick={() => onSelect('inputOnly')}
             >
               {e('inputOnly')}
             </button>

package/client/components/terminal/terminal-apis.js

@@ -41,3 +41,11 @@ export function toggleTerminalLogTimestamp (pid) {
     action: 'toggle-terminal-log-timestamp'
   })
 }
+
+export function setTerminalLogPath (pid, logPath) {
+  return fetch({
+    pid,
+    logPath,
+    action: 'set-terminal-log-path'
+  })
+}

package/client/components/terminal/terminal-command-dropdown.jsx

@@ -278,7 +278,7 @@ export default class TerminalCmdSuggestions extends Component {
           id: uid(),
           command: b.password,
           type: 'PW',
-          hint: [b.username, b.host].filter(Boolean).join('@')
+          hint: [b.username, [b.host, b.port].filter(Boolean).join(':')].filter(Boolean).join('@')
         })
       }
     }

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

@@ -48,6 +48,13 @@ export default function TermInteractive () {
   function onOk () {
     form.submit()
   }
+  function onConfirm () {
+    window.et.commonWs.s({
+      id: opts.id,
+      results: [opts.options.confirmResult || 'yes']
+    })
+    clear()
+  }
   function onIgnore () {
     window.et.commonWs.s({
       id: opts.id,
@@ -91,6 +98,32 @@ export default function TermInteractive () {
       </FormItem>
     )
   }
+  function renderConfirmBody () {
+    const instructions = opts.options.instructions || []
+    return (
+      <div>
+        {
+          instructions.map((note, index) => {
+            return <pre key={note + index}>{note}</pre>
+          })
+        }
+        <FormItem>
+          <Button
+            type='primary'
+            onClick={onConfirm}
+          >
+            {opts.options.submitText || e('submit')}
+          </Button>
+          <Button
+            className='mg1l'
+            onClick={onCancel}
+          >
+            {opts.options.cancelText || e('cancel')}
+          </Button>
+        </FormItem>
+      </div>
+    )
+  }
   async function initWatch () {
     let done = false
     while (!done) {
@@ -125,36 +158,42 @@ export default function TermInteractive () {
     <Modal
       {...props}
     >
-      <Form
-        form={form}
-        layout='vertical'
-        onFinish={onFinish}
-      >
-        {
-          opts.options.prompts.map(renderFormItem)
-        }
-        <FormItem>
-          <Button
-            type='primary'
-            htmlType='submit'
-          >
-            {e('submit')}
-          </Button>
-          <Button
-            type='dashed'
-            className='mg1l'
-            onClick={onIgnore}
-          >
-            {e('ignore')}
-          </Button>
-          <Button
-            className='mg1l'
-            onClick={onCancel}
-          >
-            {e('cancel')}
-          </Button>
-        </FormItem>
-      </Form>
+      {
+        opts.options?.mode === 'confirm'
+          ? renderConfirmBody()
+          : (
+            <Form
+              form={form}
+              layout='vertical'
+              onFinish={onFinish}
+            >
+              {
+                opts.options.prompts.map(renderFormItem)
+              }
+              <FormItem>
+                <Button
+                  type='primary'
+                  htmlType='submit'
+                >
+                  {e('submit')}
+                </Button>
+                <Button
+                  type='dashed'
+                  className='mg1l'
+                  onClick={onIgnore}
+                >
+                  {e('ignore')}
+                </Button>
+                <Button
+                  className='mg1l'
+                  onClick={onCancel}
+                >
+                  {e('cancel')}
+                </Button>
+              </FormItem>
+            </Form>
+            )
+      }
     </Modal>
   )
 }

package/client/components/terminal/terminal.jsx

@@ -70,6 +70,7 @@ class Term extends Component {
       hasSelection: false,
       saveTerminalLogToFile: !!this.props.config.saveTerminalLogToFile,
       addTimeStampToTermLog: !!this.props.config.addTimeStampToTermLog,
+      logPath: this.props.config.sessionLogPath || createDefaultLogPath(),
       passType: 'password',
       lines: [],
       searchResults: [],
@@ -400,10 +401,15 @@ class Term extends Component {
           return
         }
         if (isSshTerminal) {
-          this.setState({
-            dropFileModalVisible: true,
-            droppedFiles: [{ path: filePath, isRemote: true }]
-          })
+          const behavior = this.props.config.dragDropBehavior || 'ask'
+          if (behavior === 'ask') {
+            this.setState({
+              dropFileModalVisible: true,
+              droppedFiles: [{ path: filePath, isRemote: true }]
+            })
+          } else {
+            this.handleDropFileAction(behavior, [{ path: filePath, isRemote: true }])
+          }
           return
         }
         this.attachAddon._sendData(`"${filePath}" `)
@@ -425,10 +431,15 @@ class Term extends Component {
       }
 
       if (isSshTerminal) {
-        this.setState({
-          dropFileModalVisible: true,
-          droppedFiles: filePaths.map(path => ({ path, isRemote: false }))
-        })
+        const behavior = this.props.config.dragDropBehavior || 'ask'
+        if (behavior === 'ask') {
+          this.setState({
+            dropFileModalVisible: true,
+            droppedFiles: filePaths.map(path => ({ path, isRemote: false }))
+          })
+        } else {
+          this.handleDropFileAction(behavior, filePaths.map(path => ({ path, isRemote: false })))
+        }
         return
       }
 
@@ -444,8 +455,8 @@ class Term extends Component {
     })
   }
 
-  handleDropFileAction = (action) => {
-    const { droppedFiles } = this.state
+  handleDropFileAction = (action, filesOverride) => {
+    const droppedFiles = filesOverride || this.state.droppedFiles
     if (!droppedFiles || !droppedFiles.length) {
       this.handleDropFileModalCancel()
       return
@@ -454,7 +465,7 @@ class Term extends Component {
     const filePaths = droppedFiles.map(f => f.path)
 
     switch (action) {
-      case 'trzUpload': {
+      case 'trz': {
         if (this.trzszClient && this.trzszClient.isActive) {
           message.warning('A transfer is already in progress')
           this.handleDropFileModalCancel()
@@ -464,7 +475,7 @@ class Term extends Component {
         this.attachAddon._sendData('trz\r')
         break
       }
-      case 'rzUpload': {
+      case 'rz':{
         if (this.zmodemClient && this.zmodemClient.isActive) {
           message.warning('A transfer is already in progress')
           this.handleDropFileModalCancel()
@@ -474,7 +485,7 @@ class Term extends Component {
         this.attachAddon._sendData('rz\r')
         break
       }
-      case 'inputPath':
+      case 'inputOnly':
       default: {
         const filesAll = filePaths.map(path => `"${path}"`).join(' ')
         this.attachAddon._sendData(filesAll)
@@ -825,11 +836,15 @@ class Term extends Component {
       if (currentCmd && currentCmd.trim() && this.shouldUseManualHistory()) {
         window.store.addCmdHistory(currentCmd.trim())
       }
+      if (currentCmd && currentCmd.trim() === 'exit') {
+        this.userTypeExit = true
+      }
       this.closeSuggestions()
     }
   }
 
   onPasswordPromptDetected = () => {
+    window.store.notifyTabPasswordPrompt(this.props.tab.id)
     if (!this.props.config.showCmdSuggestions) {
       return
     }
@@ -842,6 +857,7 @@ class Term extends Component {
   }
 
   onPasswordPromptCancelled = () => {
+    window.store.clearTabPasswordPrompt(this.props.tab.id)
     const suggestions = refsStatic.get('terminal-suggestions')
     if (suggestions?.state?.passwordMode) {
       suggestions.closeSuggestions()
@@ -1221,7 +1237,7 @@ class Term extends Component {
       ...extra,
       ...execOpts,
       logName,
-      sessionLogPath: config.sessionLogPath || createDefaultLogPath(),
+      sessionLogPath: this.state.logPath,
       ...pick(config, [
         'addTimeStampToTermLog',
         'keepaliveCountMax',

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

@@ -2,15 +2,13 @@
  * show base terminal info, id sessionID
  */
 import { Component } from 'react'
-import { osResolve } from '../../common/resolve'
 import {
   Switch,
   Space,
   Button
 } from 'antd'
-import ShowItem from '../common/show-item'
 import defaults from '../../common/default-setting'
-import { toggleTerminalLog, toggleTerminalLogTimestamp } from '../terminal/terminal-apis'
+import { toggleTerminalLog, toggleTerminalLogTimestamp, setTerminalLogPath } from '../terminal/terminal-apis'
 import {
   ClockCircleOutlined,
   BorderlessTableOutlined,
@@ -19,8 +17,8 @@ import {
   ApiOutlined,
   PartitionOutlined
 } from '@ant-design/icons'
-import createDefaultSessionLogPath from '../../common/default-log-path'
 import { refs } from '../common/ref'
+import LogPathEdit from './log-path-edit'
 
 const e = window.translate
 
@@ -36,7 +34,8 @@ const mapper = {
 export default class TerminalInfoBase extends Component {
   state = {
     saveTerminalLogToFile: false,
-    addTimeStampToTermLog: false
+    addTimeStampToTermLog: false,
+    logPath: ''
   }
 
   componentDidMount () {
@@ -75,6 +74,17 @@ export default class TerminalInfoBase extends Component {
     })
   }
 
+  onLogPathChange = (v) => {
+    const { pid } = this.props
+    setTerminalLogPath(pid, v)
+    refs.get('term-' + pid)?.setState({
+      logPath: v
+    })
+    this.setState({
+      logPath: v
+    })
+  }
+
   handleToggle = () => {
     const { saveTerminalLogToFile, addTimeStampToTermLog } = this.state
     const {
@@ -101,7 +111,8 @@ export default class TerminalInfoBase extends Component {
     if (term) {
       this.setState({
         saveTerminalLogToFile: term.state.saveTerminalLogToFile,
-        addTimeStampToTermLog: term.state.addTimeStampToTermLog
+        addTimeStampToTermLog: term.state.addTimeStampToTermLog,
+        logPath: term.state.logPath
       })
     } else {
       this.timer = setTimeout(this.getState, 100)
@@ -156,15 +167,10 @@ export default class TerminalInfoBase extends Component {
     const {
       id,
       logName,
-      sessionLogPath
+      pid
     } = this.props
-    const { saveTerminalLogToFile } = this.state
-    const base = sessionLogPath || createDefaultSessionLogPath()
-    const path = osResolve(base, logName + '.log')
+    const { saveTerminalLogToFile, logPath } = this.state
     const name = e('saveTerminalLogToFile')
-    const to = saveTerminalLogToFile
-      ? <ShowItem disabled={!saveTerminalLogToFile} to={path}>{path}</ShowItem>
-      : path
     return (
       <div className='terminal-info-section terminal-info-base'>
         <div className='fix'>
@@ -187,7 +193,12 @@ export default class TerminalInfoBase extends Component {
             this.renderInfoSelection()
           }
         </div>
-        <p><b>log:</b> {to}</p>
+        <LogPathEdit
+          pid={pid}
+          logPath={logPath}
+          logName={logName}
+          setLogPath={this.onLogPathChange}
+        />
       </div>
     )
   }

package/client/components/terminal-info/log-path-edit.jsx

@@ -0,0 +1,86 @@
+/**
+ * Per-terminal log path editor
+ * Reads/writes logPath on the terminal's own state via refs
+ */
+import { Button } from 'antd'
+import message from '../common/message'
+import InputConfirm from '../common/input-confirm'
+import ShowItem from '../common/show-item'
+import { chooseSaveDirectory } from '../../common/choose-save-folder'
+import createDefaultLogPath from '../../common/default-log-path'
+import { osResolve } from '../../common/resolve'
+
+const e = window.translate
+
+export default function LogPathEdit ({ pid, logPath, logName, setLogPath }) {
+  const defaultPath = createDefaultLogPath()
+  const base = logPath || defaultPath
+  const fullPath = osResolve(base, logName + '.log')
+
+  const testAndSet = async (v) => {
+    if (v) {
+      try {
+        const { fs } = window
+        const uid = 'test-' + Date.now()
+        const testFile = osResolve(v, uid + '.test.log')
+        await fs.touch(testFile)
+        await fs.unlink(testFile)
+      } catch (err) {
+        console.log('log path test failed', err)
+        message.error('invalid log folder')
+        return
+      }
+    }
+    setLogPath(v)
+  }
+
+  const handleChange = (v) => {
+    testAndSet(v)
+  }
+
+  const handleChooseFolder = async () => {
+    const path = await chooseSaveDirectory()
+    if (path) {
+      handleChange(path)
+    }
+  }
+
+  const handleReset = () => {
+    setLogPath('')
+  }
+
+  const inputProps = {
+    value: logPath,
+    placeholder: defaultPath,
+    onChange: handleChange,
+    addonAfter: (
+      <>
+        <Button
+          onClick={handleChooseFolder}
+          className='mg1r'
+          type='text'
+          size='small'
+        >
+          {e('chooseFolder')}
+        </Button>
+        <Button
+          size='small'
+          type='text'
+          onClick={handleReset}
+        >
+          {e('reset')}
+        </Button>
+      </>
+    ),
+    prefix: e('terminalLogPath') + ': '
+  }
+
+  return (
+    <div className='pd1b'>
+      <InputConfirm {...inputProps} />
+      <div className='pd1t font-xs color-grey'>
+        {fullPath} <ShowItem to={fullPath} />
+      </div>
+    </div>
+  )
+}

package/client/components/text-editor/edit-with-custom-editor.jsx

@@ -6,18 +6,30 @@ import { useState } from 'react'
 import { Button, Input, Space } from 'antd'
 import { safeGetItem, safeSetItem } from '../../common/safe-local-storage.js'
 
-const LS_KEY = 'customEditorCommand'
+export const CUSTOM_EDITOR_COMMAND_LS_KEY = 'customEditorCommand'
+export const CUSTOM_EDITOR_AUTO_OPEN_LS_KEY = 'customEditorAutoOpen'
 const e = window.translate
 
 export default function EditWithCustomEditor ({ loading, editWithCustom }) {
   const [editorCommand, setEditorCommand] = useState(
-    () => safeGetItem(LS_KEY) || ''
+    () => safeGetItem(CUSTOM_EDITOR_COMMAND_LS_KEY) || ''
   )
+  const [autoOpen, setAutoOpen] = useState(
+    () => safeGetItem(CUSTOM_EDITOR_AUTO_OPEN_LS_KEY) === 'true'
+  )
+
+  const autoOpenLabel = e('autoOpen')
 
   function handleChange (ev) {
     const val = ev.target.value
     setEditorCommand(val)
-    safeSetItem(LS_KEY, val)
+    safeSetItem(CUSTOM_EDITOR_COMMAND_LS_KEY, val)
+  }
+
+  function handleToggleAutoOpen () {
+    const next = !autoOpen
+    setAutoOpen(next)
+    safeSetItem(CUSTOM_EDITOR_AUTO_OPEN_LS_KEY, String(next))
   }
 
   function handleClick () {
@@ -45,6 +57,13 @@ export default function EditWithCustomEditor ({ loading, editWithCustom }) {
         onChange={handleChange}
         disabled={loading}
       />
+      <Button
+        type={autoOpen ? 'primary' : 'default'}
+        disabled={loading}
+        onClick={handleToggleAutoOpen}
+      >
+        {autoOpenLabel}: {autoOpen ? 'On' : 'Off'}
+      </Button>
     </Space.Compact>
   )
 }

package/client/components/text-editor/text-editor.jsx

@@ -4,9 +4,14 @@
 
 import { PureComponent } from 'react'
 import TextEditorForm from './text-editor-form'
+import {
+  CUSTOM_EDITOR_AUTO_OPEN_LS_KEY,
+  CUSTOM_EDITOR_COMMAND_LS_KEY
+} from './edit-with-custom-editor'
 import { Spin } from 'antd'
 import Modal from '../common/modal'
 import resolve from '../../common/resolve'
+import { safeGetItem } from '../../common/safe-local-storage.js'
 import { refsStatic, refs } from '../common/ref'
 
 const e = window.translate
@@ -69,12 +74,28 @@ export default class TextEditor extends PureComponent {
       return
     }
     const text = await fileRef.fetchEditorText(p, type)
+    const editorCommand = this.getAutoOpenCustomEditorCommand()
     this.setStateProxy({
       text,
       loading: false
+    }, () => {
+      if (editorCommand) {
+        this.editWithCustom(editorCommand)
+      }
     })
   }
 
+  getAutoOpenCustomEditorCommand = () => {
+    if (window.et.isWebApp) {
+      return ''
+    }
+    const autoOpen = safeGetItem(CUSTOM_EDITOR_AUTO_OPEN_LS_KEY) === 'true'
+    if (!autoOpen) {
+      return ''
+    }
+    return safeGetItem(CUSTOM_EDITOR_COMMAND_LS_KEY).trim()
+  }
+
   doSubmit = () => {
     this.handleSubmit({
       text: this.state.text

package/client/components/tree-list/tree-list-item.jsx

@@ -3,17 +3,11 @@
  */
 
 import { memo } from 'react'
-import createName, { createTitleTag } from '../../common/create-title'
+import { createTitleTag } from '../../common/create-title'
 import classnames from 'classnames'
 import highlight from '../common/highlight'
 import uid from '../../common/uid'
 
-function getItemLabel (item, isGroup) {
-  return isGroup
-    ? item?.title || ''
-    : createName(item)
-}
-
 function areEqual (prevProps, nextProps) {
   const prevSelected = prevProps.selectedItemId === prevProps.item.id
   const nextSelected = nextProps.selectedItemId === nextProps.item.id
@@ -27,10 +21,10 @@ function areEqual (prevProps, nextProps) {
     prevSelected === nextSelected &&
     prevSearchSelected === nextSearchSelected &&
     prevProps.item.id === nextProps.item.id &&
-    prevProps.item.level === nextProps.item.level &&
-    prevProps.item.color === nextProps.item.color &&
-    prevProps.item.description === nextProps.item.description &&
-    getItemLabel(prevProps.item, prevProps.isGroup) === getItemLabel(nextProps.item, nextProps.isGroup)
+    prevProps.itemLevel === nextProps.itemLevel &&
+    prevProps.itemColor === nextProps.itemColor &&
+    prevProps.itemDescription === nextProps.itemDescription &&
+    prevProps.itemLabel === nextProps.itemLabel
 }
 
 function TreeListItem (props) {
@@ -87,7 +81,7 @@ function TreeListItem (props) {
     : null
   const title = isGroup
     ? item.title
-    : createName(item)
+    : props.itemLabel
   const titleAll = title + (item.description ? ' - ' + item.description : '')
   const titleHighlight = isGroup
     ? item.title || 'no title'

package/client/components/tree-list/tree-list-row.jsx

@@ -2,6 +2,7 @@ import TreeExpander from './tree-expander'
 import TreeListItem from './tree-list-item'
 import TreeItemOp from './tree-item-op'
 import { treeLevelIndent } from './tree-list-layout'
+import createName from '../../common/create-title'
 
 export default function TreeListRow (props) {
   const {
@@ -38,6 +39,10 @@ export default function TreeListRow (props) {
     item,
     isGroup,
     parentId,
+    itemLabel: isGroup ? (item?.title || '') : createName(item),
+    itemColor: item?.color,
+    itemDescription: item?.description,
+    itemLevel: item?.level,
     leftSidebarWidth,
     staticList,
     selectedItemId: activeItemId,

package/client/components/tree-list/tree-list-rows.js

@@ -26,7 +26,9 @@ export function buildVisibleTreeRows ({
     const item = bookmarksMap.get(bookmarkId)
     const matched = Boolean(
       item &&
-      (!lowerKeyword || createName(item).toLowerCase().includes(lowerKeyword))
+      (!lowerKeyword ||
+        createName(item).toLowerCase().includes(lowerKeyword) ||
+        (item.description || '').toLowerCase().includes(lowerKeyword))
     )
     bookmarkMatchCache.set(bookmarkId, matched)
     return matched

package/client/components/widgets/widget-form.jsx

@@ -50,6 +50,9 @@ export default function WidgetForm ({ widget, onSubmit, loading, hasRunningInsta
       case 'string':
         control = <Input placeholder={description} />
         break
+      case 'textarea':
+        control = <Input.TextArea autoSize={{ minRows: 3 }} placeholder={description} />
+        break
       case 'number':
         control = <InputNumber style={{ width: '100%' }} placeholder={description} />
         break

package/client/store/mcp-handler.js

@@ -5,7 +5,7 @@
 
 import uid from '../common/uid'
 import { settingMap } from '../common/constants'
-import { refs } from '../components/common/ref'
+import { refs, refsTabs } from '../components/common/ref'
 import deepCopy from 'json-deep-copy'
 import {
   getLocalFileInfo,
@@ -107,6 +107,9 @@ export default Store => {
         case 'get_terminal_output':
           result = store.mcpGetTerminalOutput(args)
           break
+        case 'wait_for_terminal_idle':
+          result = await store.mcpWaitForTerminalIdle(args)
+          break
 
         // SFTP operations
         case 'sftp_list':
@@ -331,15 +334,18 @@ export default Store => {
 
   Store.prototype.mcpListTabs = function () {
     const { store } = window
-    return store.tabs.map(t => ({
-      id: t.id,
-      title: t.title,
-      host: t.host,
-      type: t.type || 'local',
-      status: t.status,
-      isTransporting: t.isTransporting,
-      batch: t.batch
-    }))
+    return store.tabs.map(t => {
+      return {
+        id: t.id,
+        title: t.title,
+        host: t.host,
+        type: t.type || 'local',
+        status: t.status,
+        isTransporting: t.isTransporting,
+        onData: refsTabs.get('tab-' + t.id)?.state.terminalOnData,
+        batch: t.batch
+      }
+    })
   }
 
   Store.prototype.mcpGetActiveTab = function () {
@@ -527,6 +533,73 @@ export default Store => {
     }
   }
 
+  Store.prototype.mcpWaitForTerminalIdle = async function (args) {
+    const { store } = window
+    const tabId = args.tabId || store.activeTabId
+    const timeout = Math.min(args.timeout || 30000, 120000)
+    const pollInterval = 500
+    const minWait = args.minWait !== undefined ? args.minWait : 1000
+    const lineCountToFetch = args.lines || 50
+
+    if (!tabId) {
+      throw new Error('No active terminal')
+    }
+
+    const start = Date.now()
+
+    // Brief initial wait so the command has time to start producing output
+    if (minWait > 0) {
+      await new Promise(resolve => setTimeout(resolve, minWait))
+    }
+
+    const collectOutput = () => {
+      const term = refs.get('term-' + tabId)
+      if (!term || !term.term) return { output: '', lineCount: 0 }
+      const buffer = term.term.buffer.active
+      if (!buffer) return { output: '', lineCount: 0 }
+      const cursorY = buffer.cursorY || 0
+      const baseY = buffer.baseY || 0
+      const totalLines = buffer.length || 0
+      const actualContentEnd = baseY + cursorY + 1
+      const startLine = Math.max(0, actualContentEnd - lineCountToFetch)
+      const endLine = Math.min(totalLines, actualContentEnd)
+      const lines = []
+      for (let i = startLine; i < endLine; i++) {
+        const line = buffer.getLine(i)
+        if (line) lines.push(line.translateToString(true))
+      }
+      return { output: lines.join('\n'), lineCount: lines.length }
+    }
+
+    // Poll until onData becomes false (4s idle debounce in tab.jsx)
+    while (Date.now() - start < timeout) {
+      const tabRef = refsTabs.get('tab-' + tabId)
+      const onData = tabRef?.state.terminalOnData
+      if (!onData) {
+        const { output, lineCount } = collectOutput()
+        return {
+          tabId,
+          elapsed: Date.now() - start,
+          timedOut: false,
+          output,
+          lineCount
+        }
+      }
+      await new Promise(resolve => setTimeout(resolve, pollInterval))
+    }
+
+    // Timeout reached — return whatever is currently in the buffer
+    const { output, lineCount } = collectOutput()
+    return {
+      tabId,
+      elapsed: Date.now() - start,
+      timedOut: true,
+      message: `Terminal still active after ${timeout}ms`,
+      output,
+      lineCount
+    }
+  }
+
   // ==================== Settings APIs ====================
 
   Store.prototype.mcpGetSettings = function () {

package/client/store/tab.js

@@ -622,6 +622,20 @@ export default Store => {
     }
   }
 
+  Store.prototype.notifyTabPasswordPrompt = function (tabId) {
+    const tab = refsTabs.get('tab-' + tabId)
+    if (tab) {
+      tab.notifyPasswordPrompt()
+    }
+  }
+
+  Store.prototype.clearTabPasswordPrompt = function (tabId) {
+    const tab = refsTabs.get('tab-' + tabId)
+    if (tab) {
+      tab.clearPasswordPrompt()
+    }
+  }
+
   Store.prototype.remoteList = function (tabId) {
     const sftp = refs.get('sftp-' + tabId)
     if (sftp) {

package/package.json

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