@electerm/electerm-react 3.1.6 → 3.1.16

package/client/common/constants.js

@@ -352,6 +352,4 @@ export const terminalTypes = [
 export const sshConfigLoadKey = 'ssh-config-loaded'
 export const sshConfigKey = 'ignore-ssh-config'
 export const connectionHoppingWarnKey = 'connectionHoppingWarnned'
-export const aiChatHistoryKey = 'ai-chat-history'
 export const syncServerDataKey = 'sync-server-data'
-export const cmdHistoryKey = 'cmd-history'

package/client/common/db.js

@@ -23,17 +23,27 @@ const dbAction = (...args) => {
 /**
  * standalone db names
  */
-export const dbNames = without(
-  Object.keys(settingMap),
-  settingMap.setting,
-  settingMap.widgets
-)
+export const dbNames = [
+  ...without(
+    Object.keys(settingMap),
+    settingMap.setting,
+    settingMap.widgets
+  ),
+  'history',
+  'terminalCommandHistory',
+  'aiChatHistory'
+]
 
-export const dbNamesForWatch = without(
-  Object.keys(settingMap),
-  settingMap.setting,
-  settingMap.widgets
-)
+export const dbNamesForWatch = [
+  ...without(
+    Object.keys(settingMap),
+    settingMap.setting,
+    settingMap.widgets
+  ),
+  'history',
+  'terminalCommandHistory',
+  'aiChatHistory'
+]
 
 /**
  * db insert

package/client/components/file-transfer/conflict-resolve.jsx

@@ -45,6 +45,14 @@ export default class ConfirmModalStore extends Component {
     if (this.activeTransferId === transferId || this.queuedTransferIds.has(transferId)) {
       return
     }
+    const globalPolicy = window._transferConflictPolicy
+    if (globalPolicy && Object.values(fileActions).includes(globalPolicy)) {
+      const { id, transferBatch } = transfer
+      const trid = `tr-${transferBatch}-${id}`
+      const currentTransfer = refsTransfers.get(trid)
+      currentTransfer?.onDecision(globalPolicy)
+      return
+    }
     this.queue.push(transfer)
     this.queuedTransferIds.add(transferId)
     if (!this.activeTransferId) {

package/client/components/footer/cmd-history.jsx

@@ -31,7 +31,7 @@ export default auto(function CmdHistory (props) {
 
   function handleDeleteCommand (cmd, ev) {
     ev.stopPropagation()
-    terminalCommandHistory.delete(cmd)
+    window.store.deleteCmdHistory(cmd)
   }
 
   function handleCopyCommand (cmd, ev) {
@@ -54,9 +54,7 @@ export default auto(function CmdHistory (props) {
     setKeyword(e.target.value)
   }
 
-  const historyArray = Array.from(terminalCommandHistory || [])
-    .map(([cmd, info]) => ({ cmd, ...info }))
-    .reverse()
+  const historyArray = (terminalCommandHistory || []).slice().reverse()
 
   let filtered = filterArray(historyArray, keyword)
 

package/client/components/quick-commands/qm.styl

@@ -25,6 +25,14 @@
 
 .item-list-unit.dragover
   border: 1px dashed var(--primary)
+.qm-item-dragover
+  border-left 2px solid var(--primary)
+.qm-drag-handle
+  cursor grab
+.qm-field-dragging
+  opacity 0.4
+.qm-field-dragover
+  border-top 2px solid var(--primary)
 .qm-label-select
   min-width 120px
 

package/client/components/quick-commands/quick-command-item.jsx

@@ -23,6 +23,8 @@ export default class QuickCommandsItem extends PureComponent {
       draggable,
       handleDragOver,
       handleDragStart,
+      handleDragEnter,
+      handleDragLeave,
       handleDrop
     } = this.props
     const cls = classNames('qm-item mg1r mg1b')
@@ -34,6 +36,8 @@ export default class QuickCommandsItem extends PureComponent {
       draggable,
       onDragOver: handleDragOver,
       onDragStart: handleDragStart,
+      onDragEnter: handleDragEnter,
+      onDragLeave: handleDragLeave,
       onDrop: handleDrop
     }
     return (

package/client/components/quick-commands/quick-commands-box.jsx

@@ -87,6 +87,14 @@ export default function QuickCommandsFooterBox (props) {
     e.dataTransfer.setData('idDragged', e.target.getAttribute('data-id'))
   }
 
+  function onDragEnter (e) {
+    e.target.closest('.qm-item')?.classList.add('qm-item-dragover')
+  }
+
+  function onDragLeave (e) {
+    e.target.closest('.qm-item')?.classList.remove('qm-item-dragover')
+  }
+
   function onDrop (e) {
     onDropFunc(e, '.qm-item')
   }
@@ -116,6 +124,8 @@ export default function QuickCommandsFooterBox (props) {
         draggable={!qmSortByFrequency}
         handleDragOver={onDragOver}
         handleDragStart={onDragStart}
+        handleDragEnter={onDragEnter}
+        handleDragLeave={onDragLeave}
         handleDrop={onDrop}
       />
     )

package/client/components/quick-commands/quick-commands-form-elem.jsx

@@ -127,7 +127,7 @@ export default function QuickCommandForm (props) {
         >
           <InputAutoFocus />
         </FormItem>
-        {renderQm()}
+        {renderQm(form)}
         <FormItem
           name='labels'
           label={e('label')}

package/client/components/quick-commands/quick-commands-list-form.jsx

@@ -5,7 +5,7 @@ import {
   Button,
   Input
 } from 'antd'
-import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons'
+import { MinusCircleOutlined, PlusOutlined, HolderOutlined } from '@ant-design/icons'
 import HelpIcon from '../common/help-icon'
 import { copy } from '../../common/clipboard'
 import { useRef } from 'react'
@@ -14,15 +14,70 @@ const FormItem = Form.Item
 const FormList = Form.List
 const e = window.translate
 
-export default function renderQm () {
+export default function renderQm (form) {
   const focused = useRef(0)
-  function renderItem (field, i, add, remove) {
+  const dragIndexRef = useRef(null)
+
+  function handleDragStart (e, index) {
+    dragIndexRef.current = index
+    e.target.closest('.ant-space-compact')?.classList.add('qm-field-dragging')
+    e.dataTransfer.effectAllowed = 'move'
+    e.dataTransfer.setData('text/plain', String(index))
+  }
+
+  function handleDragOver (e, index) {
+    e.preventDefault()
+    e.dataTransfer.dropEffect = 'move'
+    const el = e.target.closest('.ant-space-compact')
+    if (dragIndexRef.current !== index && el) {
+      el.classList.add('qm-field-dragover')
+    }
+  }
+
+  function handleDragLeave (e) {
+    e.target.closest('.ant-space-compact')?.classList.remove('qm-field-dragover')
+  }
+
+  function handleDrop (e, index, form) {
+    e.preventDefault()
+    const el = e.target.closest('.ant-space-compact')
+    el?.classList.remove('qm-field-dragover')
+    const dragIndex = dragIndexRef.current
+    if (dragIndex === null || dragIndex === index) {
+      dragIndexRef.current = null
+      return
+    }
+    const commands = form.getFieldValue('commands') || []
+    const item = commands[dragIndex]
+    const newCommands = [...commands]
+    newCommands.splice(dragIndex, 1)
+    newCommands.splice(index, 0, item)
+    form.setFieldValue('commands', newCommands)
+    dragIndexRef.current = null
+  }
+
+  function handleDragEnd (e) {
+    const el = e.target.closest('.ant-space-compact')
+    el?.classList.remove('qm-field-dragging')
+    el?.classList.remove('qm-field-dragover')
+    dragIndexRef.current = null
+  }
+
+  function renderItem (field, i, add, remove, form) {
     return (
       <Space.Compact
         align='center'
         className='width-100 mg2b'
         key={field.key}
+        draggable
+        onDragStart={(e) => handleDragStart(e, i)}
+        onDragOver={(e) => handleDragOver(e, i)}
+        onDragLeave={handleDragLeave}
+        onDrop={(e) => handleDrop(e, i, form)}
+        onDragEnd={handleDragEnd}
       >
+        <HolderOutlined className='mg1r qm-drag-handle' />
+
         <Space.Addon>{e('delay')}</Space.Addon>
         <FormItem
           label=''
@@ -119,7 +174,7 @@ export default function renderQm () {
               <>
                 {
                   fields.map((field, i) => {
-                    return renderItem(field, i, add, remove)
+                    return renderItem(field, i, add, remove, form)
                   })
                 }
                 <FormItem>

package/client/components/quick-commands/quick-commands-list.jsx

@@ -3,12 +3,14 @@
  */
 
 import List from '../setting-panel/list'
-import { PlusOutlined } from '@ant-design/icons'
+import { PlusOutlined, CopyOutlined } from '@ant-design/icons'
 import { Select } from 'antd'
 import classnames from 'classnames'
 import highlight from '../common/highlight'
 import QmTransport from './quick-command-transport'
 import onDrop from './on-drop'
+import copy from 'json-deep-copy'
+import uid from '../../common/uid'
 
 const { Option } = Select
 const e = window.translate
@@ -45,17 +47,44 @@ export default class QuickCommandsList extends List {
   }
 
   handleDragEnter = e => {
-    e.target.closest('.item-list-unit').classList.add('dragover')
+    e.target.closest('.item-list-unit').classList.add('qm-field-dragover')
   }
 
   handleDragLeave = e => {
-    e.target.closest('.item-list-unit').classList.remove('dragover')
+    e.target.closest('.item-list-unit').classList.remove('qm-field-dragover')
   }
 
   handleDrop = e => {
     onDrop(e, '.item-list-unit')
   }
 
+  duplicateItem = (e, item) => {
+    e.stopPropagation()
+    const { store } = window
+    const newCommand = copy(item)
+    newCommand.id = uid()
+    const baseName = item.name.replace(/\(\d+\)$/, '')
+    const sameNameCount = store.currentQuickCommands.filter(
+      cmd => cmd.name && cmd.name.replace(/\(\d+\)$/, '').includes(baseName)
+    ).length
+    const duplicateIndex = sameNameCount > 0 ? sameNameCount : 1
+    newCommand.name = baseName + '(' + duplicateIndex + ')'
+    store.addQuickCommand(newCommand)
+  }
+
+  renderDuplicateBtn = (item) => {
+    if (!item.id) {
+      return null
+    }
+    return (
+      <CopyOutlined
+        title={e('duplicate')}
+        className='pointer list-item-duplicate'
+        onClick={(e) => this.duplicateItem(e, item)}
+      />
+    )
+  }
+
   renderItem = (item, i) => {
     if (!item) {
       return null
@@ -94,6 +123,7 @@ export default class QuickCommandsList extends List {
           }
           {title}
         </div>
+        {this.renderDuplicateBtn(item)}
         {this.renderDelBtn(item)}
       </div>
     )

package/client/components/setting-panel/list.styl

@@ -7,6 +7,7 @@
 .list-item-apply
 .list-item-remove
 .list-item-bookmark
+.list-item-duplicate
   display none
   width 24px
   line-height 35px
@@ -35,6 +36,7 @@
     .list-item-edit
     .list-item-remove
     .list-item-bookmark
+    .list-item-duplicate
       display block
 .theme-item:hover
     .list-item-remove
@@ -49,4 +51,6 @@
 //     right 20px
 .item-list-unit
   .list-item-bookmark
-    right 18px
+    right 18px
+  .list-item-duplicate
+    right 24px

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

@@ -164,7 +164,7 @@ export default class TerminalCmdSuggestions extends Component {
   }
 
   handleDelete = (item) => {
-    window.store.terminalCommandHistory.delete(item.command)
+    window.store.deleteCmdHistory(item.command)
   }
 
   handleSelect = (item) => {

package/client/components/terminal/terminal.jsx

@@ -484,9 +484,22 @@ class Term extends Component {
   }
 
   onClear = () => {
+    const shouldClear = this.searchAddon &&
+      window.store.termSearchOpen &&
+      window.store.termSearch
+    if (
+      shouldClear
+    ) {
+      this.searchAddon.clearDecorations()
+    }
     this.term.clear()
     this.term.focus()
-    // this.notifyOnData('')
+    if (shouldClear) {
+      this.searchAddon._linesCache = undefined
+      this.timers.clearSearchTimer = setTimeout(() => {
+        refsStatic.get('term-search')?.next()
+      }, 100)
+    }
   }
 
   isRemote = () => {

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

@@ -171,6 +171,10 @@ export default function TreeListItem (props) {
     props.onDragStart(e)
   }
 
+  const onDragEnter = e => {
+    props.onDragEnter(e)
+  }
+
   const onDragLeave = e => {
     props.onDragLeave(e)
   }
@@ -224,6 +228,7 @@ export default function TreeListItem (props) {
     'data-is-group': isGroup ? 'true' : 'false',
     onDragOver,
     onDragStart,
+    onDragEnter,
     onDragLeave,
     onDrop
   }

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

@@ -381,6 +381,18 @@ export default class ItemListTree extends Component {
       )
   }
 
+  onDragEnter = e => {
+    e.preventDefault()
+    let {
+      target
+    } = e
+    const tar = findParentBySel(target, '.tree-item')
+    if (tar) {
+      target = tar
+    }
+    target.classList.add('item-dragover-top')
+  }
+
   onDragLeave = e => {
     e.preventDefault()
     let {
@@ -390,7 +402,7 @@ export default class ItemListTree extends Component {
     if (tar) {
       target = tar
     }
-    target.classList.remove('item-dragover')
+    target.classList.remove('item-dragover-top')
   }
 
   onDragOver = e => {
@@ -401,14 +413,14 @@ export default class ItemListTree extends Component {
     if (tar) {
       target = tar
     }
-    target.classList.add('item-dragover')
+    target.classList.add('item-dragover-top')
   }
 
   onDrop = action(e => {
     e.preventDefault()
-    const elems = document.querySelectorAll('.tree-item.item-dragover')
+    const elems = document.querySelectorAll('.tree-item.item-dragover-top')
     elems.forEach(elem => {
-      elem.classList.remove('item-dragover')
+      elem.classList.remove('item-dragover-top')
     })
     let {
       target
@@ -662,6 +674,7 @@ export default class ItemListTree extends Component {
           'duplicateItem',
           'onDragStart',
           'onDrop',
+          'onDragEnter',
           'onDragLeave',
           'onDragOver'
         ]

package/client/components/tree-list/tree-list.styl

@@ -30,7 +30,7 @@
       vertical-align middle
       line-height 26px
   &.item-dragover-top
-    border-top 1px solid #18d551
+    border 2px solid var(--primary)
 .tree-item-title
   flex-grow 1
   line-height 26px

package/client/store/common.js

@@ -18,6 +18,7 @@ import {
 import * as ls from '../common/safe-local-storage'
 import { refs, refsStatic } from '../components/common/ref'
 import { action } from 'manate'
+import uid from '../common/uid'
 import deepCopy from 'json-deep-copy'
 import { aiConfigsArr } from '../components/ai/ai-config-props'
 import settingList from '../common/setting-list'
@@ -345,36 +346,35 @@ export default Store => {
       return
     }
     const { terminalCommandHistory } = window.store
-    const existing = terminalCommandHistory.get(cmd)
+    const existing = terminalCommandHistory.find(item => item.cmd === cmd)
     if (existing) {
-      // Use set() to trigger reactivity
-      terminalCommandHistory.set(cmd, {
-        count: existing.count + 1,
-        lastUseTime: new Date().toISOString()
-      })
+      existing.count = existing.count + 1
+      existing.lastUseTime = new Date().toISOString()
     } else {
-      terminalCommandHistory.set(cmd, {
+      terminalCommandHistory.push({
+        id: uid(),
+        cmd,
         count: 1,
         lastUseTime: new Date().toISOString()
       })
     }
-    if (terminalCommandHistory.size > 100) {
+    if (terminalCommandHistory.length > 200) {
       // Delete oldest 20 items when history exceeds 100
-      const entries = Array.from(terminalCommandHistory.entries())
-      entries.sort((a, b) => new Date(a[1].lastUseTime).getTime() - new Date(b[1].lastUseTime).getTime())
-      for (let i = 0; i < 20 && i < entries.length; i++) {
-        terminalCommandHistory.delete(entries[i][0])
-      }
+      terminalCommandHistory.sort((a, b) => new Date(a.lastUseTime).getTime() - new Date(b.lastUseTime).getTime())
+      terminalCommandHistory.splice(0, 20)
     }
   })
 
   Store.prototype.deleteCmdHistory = function (cmd) {
     const { terminalCommandHistory } = window.store
-    terminalCommandHistory.delete(cmd)
+    const idx = terminalCommandHistory.findIndex(item => item.cmd === cmd)
+    if (idx !== -1) {
+      terminalCommandHistory.splice(idx, 1)
+    }
   }
 
   Store.prototype.clearAllCmdHistory = function () {
-    window.store.terminalCommandHistory = new Map()
+    window.store.terminalCommandHistory = []
   }
 
   Store.prototype.runCmdFromHistory = function (cmd) {

package/client/store/init-state.js

@@ -21,10 +21,8 @@ import {
   dismissDelKeyTipLsKey,
   qmSortByFrequencyKey,
   resolutionsLsKey,
-  aiChatHistoryKey,
   syncServerDataKey,
-  splitMap,
-  cmdHistoryKey
+  splitMap
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 import { exclude } from 'manate'
@@ -54,7 +52,7 @@ export default () => {
     lastDataUpdateTime: 0,
     tabs: [],
     activeTabId: '',
-    history: ls.safeGetItemJSON('history', []),
+    history: [],
     sshConfigs: [],
     bookmarks: [],
     bookmarksMap: new Map(),
@@ -74,32 +72,9 @@ export default () => {
     addressBookmarksLocal: ls.getItemJSON(localAddrBookmarkLsKey, []),
     openResolutionEdit: false,
     resolutions: ls.getItemJSON(resolutionsLsKey, []),
-    // terminalCommandHistory: Map<cmdString, {count: Number, lastUseTime: DateString}>
-    // Load from localStorage and migrate from old format (Set of strings) if needed
-    terminalCommandHistory: (() => {
-      const savedData = ls.safeGetItemJSON(cmdHistoryKey, [])
-      const map = new Map()
-      if (Array.isArray(savedData)) {
-        // Check if old format (array of strings) or new format (array of objects)
-        if (savedData.length > 0 && typeof savedData[0] === 'string') {
-          // Old format: migrate to new format
-          savedData.forEach(cmd => {
-            map.set(cmd, { count: 1, lastUseTime: new Date().toISOString() })
-          })
-        } else {
-          // New format: array of {cmd, count, lastUseTime}
-          savedData.forEach(item => {
-            if (item.cmd) {
-              map.set(item.cmd, {
-                count: item.count || 1,
-                lastUseTime: item.lastUseTime || new Date().toISOString()
-              })
-            }
-          })
-        }
-      }
-      return map
-    })(),
+    // terminalCommandHistory: [{ id, cmd, count, lastUseTime }]
+    // Loaded from DB in initData
+    terminalCommandHistory: [],
 
     // workspaces
     workspaces: [],
@@ -111,7 +86,7 @@ export default () => {
 
     // batch input selected tab ids
     _batchInputSelectedTabIds: new Set(),
-    aiChatHistory: ls.safeGetItemJSON(aiChatHistoryKey, []),
+    aiChatHistory: [],
 
     // sftp
     fileOperation: fileOperationsMap.cp, // cp or mv

package/client/store/mcp-handler.js

@@ -7,6 +7,10 @@ import uid from '../common/uid'
 import { settingMap } from '../common/constants'
 import { refs } from '../components/common/ref'
 import deepCopy from 'json-deep-copy'
+import {
+  getLocalFileInfo,
+  getRemoteFileInfo
+} from '../components/sftp/file-read'
 
 export default Store => {
   // Initialize MCP handler - called when MCP widget is started
@@ -56,8 +60,7 @@ export default Store => {
         case 'add_bookmark_group':
           result = await store.mcpAddBookmarkGroup(args)
           break
-
-        // Quick command operations
+        /*
         case 'list_quick_commands':
           result = store.mcpListQuickCommands()
           break
@@ -70,7 +73,7 @@ export default Store => {
         case 'delete_quick_command':
           result = store.mcpDeleteQuickCommand(args)
           break
-
+          */
         // Tab operations
         case 'list_tabs':
           result = store.mcpListTabs()
@@ -105,20 +108,34 @@ export default Store => {
           result = store.mcpGetTerminalOutput(args)
           break
 
-        // History operations
-        case 'list_history':
-          result = store.mcpListHistory(args)
+        // SFTP operations
+        case 'sftp_list':
+          result = await store.mcpSftpList(args)
+          break
+        case 'sftp_del':
+          result = await store.mcpSftpDel(args)
           break
-        case 'clear_history':
-          result = store.mcpClearHistory()
+        case 'sftp_stat':
+          result = await store.mcpSftpStat(args)
+          break
+        case 'sftp_read_file':
+          result = await store.mcpSftpReadFile(args)
           break
 
-        // Transfer operations
-        case 'list_transfers':
-          result = store.mcpListTransfers()
+        // File transfer operations
+        case 'sftp_upload':
+          result = await store.mcpSftpUpload(args)
           break
-        case 'list_transfer_history':
-          result = store.mcpListTransferHistory(args)
+        case 'sftp_download':
+          result = await store.mcpSftpDownload(args)
+          break
+
+        // Zmodem (trzsz/rzsz) operations
+        case 'zmodem_upload':
+          result = store.mcpZmodemUpload(args)
+          break
+        case 'zmodem_download':
+          result = store.mcpZmodemDownload(args)
           break
 
         // Settings operations
@@ -249,58 +266,58 @@ export default Store => {
 
   // ==================== Quick Command APIs ====================
 
-  Store.prototype.mcpListQuickCommands = function () {
-    return deepCopy(window.store.quickCommands)
-  }
-
-  Store.prototype.mcpAddQuickCommand = function (args) {
-    const { store } = window
-    const qm = {
-      id: uid(),
-      name: args.name,
-      commands: args.commands,
-      inputOnly: args.inputOnly || false,
-      labels: args.labels || []
-    }
-
-    store.addQuickCommand(qm)
-
-    return {
-      success: true,
-      id: qm.id,
-      message: `Quick command "${qm.name}" created`
-    }
-  }
-
-  Store.prototype.mcpRunQuickCommand = function (args) {
-    const { store } = window
-    const qm = store.quickCommands.find(q => q.id === args.id)
-    if (!qm) {
-      throw new Error(`Quick command not found: ${args.id}`)
-    }
-
-    store.runQuickCommandItem(args.id)
-
-    return {
-      success: true,
-      message: `Executed quick command "${qm.name}"`
-    }
-  }
-
-  Store.prototype.mcpDeleteQuickCommand = function (args) {
-    const { store } = window
-    const qm = store.quickCommands.find(q => q.id === args.id)
-    if (!qm) {
-      throw new Error(`Quick command not found: ${args.id}`)
-    }
-
-    store.delQuickCommand({ id: args.id })
-
-    return {
-      success: true,
-      message: `Deleted quick command "${qm.name}"`
-    }
-  }
+  // Store.prototype.mcpListQuickCommands = function () {
+  //   return deepCopy(window.store.quickCommands)
+  // }
+
+  // Store.prototype.mcpAddQuickCommand = function (args) {
+  //   const { store } = window
+  //   const qm = {
+  //     id: uid(),
+  //     name: args.name,
+  //     commands: args.commands,
+  //     inputOnly: args.inputOnly || false,
+  //     labels: args.labels || []
+  //   }
+
+  //   store.addQuickCommand(qm)
+
+  //   return {
+  //     success: true,
+  //     id: qm.id,
+  //     message: `Quick command "${qm.name}" created`
+  //   }
+  // }
+
+  // Store.prototype.mcpRunQuickCommand = function (args) {
+  //   const { store } = window
+  //   const qm = store.quickCommands.find(q => q.id === args.id)
+  //   if (!qm) {
+  //     throw new Error(`Quick command not found: ${args.id}`)
+  //   }
+
+  //   store.runQuickCommandItem(args.id)
+
+  //   return {
+  //     success: true,
+  //     message: `Executed quick command "${qm.name}"`
+  //   }
+  // }
+
+  // Store.prototype.mcpDeleteQuickCommand = function (args) {
+  //   const { store } = window
+  //   const qm = store.quickCommands.find(q => q.id === args.id)
+  //   if (!qm) {
+  //     throw new Error(`Quick command not found: ${args.id}`)
+  //   }
+
+  //   store.delQuickCommand({ id: args.id })
+
+  //   return {
+  //     success: true,
+  //     message: `Deleted quick command "${qm.name}"`
+  //   }
+  // }
 
   // ==================== Tab APIs ====================
 
@@ -502,92 +519,261 @@ export default Store => {
     }
   }
 
-  // ==================== History APIs ====================
+  // ==================== Settings APIs ====================
 
-  Store.prototype.mcpListHistory = function (args = {}) {
+  Store.prototype.mcpGetSettings = function () {
     const { store } = window
-    const limit = args.limit || 50
-    const history = store.history.slice(0, limit)
-
-    return history.map(h => ({
-      id: h.id,
-      title: h.title,
-      host: h.host,
-      type: h.type,
-      time: h.time
-    }))
+    // Return safe settings (no sensitive data)
+    const config = store.config
+    const excludeKeys = ['apiKeyAI', 'syncSetting']
+    const safeConfig = Object.fromEntries(
+      Object.entries(config).filter(([key]) => !excludeKeys.includes(key))
+    )
+    return safeConfig
   }
 
-  Store.prototype.mcpClearHistory = function () {
+  // ==================== SFTP APIs ====================
+
+  Store.prototype.mcpGetSshSftpRef = function (tabId) {
     const { store } = window
-    store.history = []
+    const resolvedTabId = tabId || store.activeTabId
+    if (!resolvedTabId) {
+      throw new Error('No active tab')
+    }
+    const tab = store.tabs.find(t => t.id === resolvedTabId)
+    if (!tab) {
+      throw new Error(`Tab not found: ${resolvedTabId}`)
+    }
+    if (tab.type !== 'ssh' && tab.type !== 'ftp') {
+      throw new Error(`Tab "${resolvedTabId}" is not an SSH/SFTP tab (type: ${tab.type || 'local'})`)
+    }
+    const sftpEntry = refs.get('sftp-' + resolvedTabId)
+    if (!sftpEntry || !sftpEntry.sftp) {
+      throw new Error(`SFTP not initialized for tab "${resolvedTabId}". Open the SFTP panel first.`)
+    }
+    return { sftp: sftpEntry.sftp, tab, tabId: resolvedTabId }
+  }
 
-    return {
-      success: true,
-      message: 'History cleared'
+  Store.prototype.mcpSftpList = async function (args) {
+    const { sftp, tab, tabId } = window.store.mcpGetSshSftpRef(args.tabId)
+    const remotePath = args.remotePath
+    if (!remotePath) {
+      throw new Error('remotePath is required')
     }
+    const list = await sftp.list(remotePath)
+    return { tabId, host: tab.host, path: remotePath, list }
   }
 
-  // ==================== Transfer APIs ====================
+  Store.prototype.mcpSftpStat = async function (args) {
+    const { sftp, tab, tabId } = window.store.mcpGetSshSftpRef(args.tabId)
+    const remotePath = args.remotePath
+    if (!remotePath) {
+      throw new Error('remotePath is required')
+    }
+    const stat = await sftp.stat(remotePath)
+    return { tabId, host: tab.host, path: remotePath, stat }
+  }
 
-  Store.prototype.mcpListTransfers = function () {
-    const { store } = window
-    return store.fileTransfers.map(t => ({
-      id: t.id,
-      localPath: t.localPath,
-      remotePath: t.remotePath,
-      type: t.type,
-      percent: t.percent,
-      status: t.status
-    }))
+  Store.prototype.mcpSftpReadFile = async function (args) {
+    const { sftp, tab, tabId } = window.store.mcpGetSshSftpRef(args.tabId)
+    const remotePath = args.remotePath
+    if (!remotePath) {
+      throw new Error('remotePath is required')
+    }
+    const content = await sftp.readFile(remotePath)
+    return { tabId, host: tab.host, path: remotePath, content }
   }
 
-  Store.prototype.mcpListTransferHistory = function (args = {}) {
-    const { store } = window
-    const limit = args.limit || 50
-    return store.transferHistory.slice(0, limit).map(t => ({
-      id: t.id,
-      localPath: t.localPath,
-      remotePath: t.remotePath,
-      type: t.type,
-      status: t.status,
-      time: t.time
-    }))
+  Store.prototype.mcpSftpDel = async function (args) {
+    const { sftp, tab, tabId } = window.store.mcpGetSshSftpRef(args.tabId)
+    const remotePath = args.remotePath
+    if (!remotePath) {
+      throw new Error('remotePath is required')
+    }
+    // Use stat to determine if it's a file or directory
+    const stat = await sftp.stat(remotePath)
+    const isDirectory = typeof stat.isDirectory === 'function'
+      ? stat.isDirectory()
+      : !!stat.isDirectory
+    if (isDirectory) {
+      await sftp.rmdir(remotePath)
+    } else {
+      await sftp.rm(remotePath)
+    }
+    return { success: true, tabId, host: tab.host, path: remotePath, type: isDirectory ? 'directory' : 'file' }
   }
 
-  // ==================== Settings APIs ====================
+  // ==================== File Transfer APIs ====================
 
-  Store.prototype.mcpGetSettings = function () {
+  Store.prototype.mcpSftpUpload = async function (args) {
     const { store } = window
-    // Return safe settings (no sensitive data)
-    const config = store.config
-    const safeConfig = {
-      theme: config.theme,
-      language: config.language,
-      fontSize: config.fontSize,
-      fontFamily: config.fontFamily,
-      terminalType: config.terminalType,
-      cursorStyle: config.cursorStyle,
-      cursorBlink: config.cursorBlink,
-      scrollback: config.scrollback
+    const { tab, tabId } = store.mcpGetSshSftpRef(args.tabId)
+    const localPath = args.localPath
+    const remotePath = args.remotePath
+    if (!localPath) {
+      throw new Error('localPath is required')
+    }
+    if (!remotePath) {
+      throw new Error('remotePath is required')
+    }
+
+    window._transferConflictPolicy = args.conflictPolicy || 'overwrite'
+
+    const fromFile = await getLocalFileInfo(localPath)
+    const transferItem = {
+      host: tab.host,
+      tabType: tab.type || 'ssh',
+      typeFrom: 'local',
+      typeTo: 'remote',
+      fromPath: localPath,
+      toPath: remotePath,
+      fromFile: {
+        ...fromFile,
+        host: tab.host,
+        tabType: tab.type || 'ssh',
+        tabId,
+        title: tab.title
+      },
+      id: uid(),
+      title: tab.title,
+      tabId,
+      operation: ''
+    }
+
+    store.addTransferList([transferItem])
+
+    return {
+      success: true,
+      message: `Upload started: ${localPath} → ${tab.host}:${remotePath}`,
+      transferId: transferItem.id,
+      tabId
     }
-    return safeConfig
   }
 
-  Store.prototype.mcpListTerminalThemes = function () {
+  Store.prototype.mcpSftpDownload = async function (args) {
     const { store } = window
-    return store.terminalThemes.map(t => ({
-      id: t.id,
-      name: t.name,
-      themeLight: t.themeLight
-    }))
+    const { sftp, tab, tabId } = store.mcpGetSshSftpRef(args.tabId) // sftp used for getRemoteFileInfo
+    const remotePath = args.remotePath
+    const localPath = args.localPath
+    if (!remotePath) {
+      throw new Error('remotePath is required')
+    }
+    if (!localPath) {
+      throw new Error('localPath is required')
+    }
+
+    window._transferConflictPolicy = args.conflictPolicy || 'overwrite'
+
+    const fromFile = await getRemoteFileInfo(sftp, remotePath)
+    const transferItem = {
+      host: tab.host,
+      tabType: tab.type || 'ssh',
+      typeFrom: 'remote',
+      typeTo: 'local',
+      fromPath: remotePath,
+      toPath: localPath,
+      fromFile: {
+        ...fromFile,
+        id: uid(),
+        isSymbolicLink: false
+      },
+      id: uid(),
+      title: tab.title,
+      tabId
+    }
+
+    store.addTransferList([transferItem])
+
+    return {
+      success: true,
+      message: `Download started: ${tab.host}:${remotePath} → ${localPath}`,
+      transferId: transferItem.id,
+      tabId
+    }
   }
 
-  Store.prototype.mcpListUiThemes = function () {
+  // ==================== Zmodem (trzsz/rzsz) APIs ====================
+
+  Store.prototype.mcpZmodemUpload = function (args) {
     const { store } = window
-    return (store.uiThemes || []).map(t => ({
-      id: t.id,
-      name: t.name
-    }))
+    const tabId = args.tabId || store.activeTabId
+    if (!tabId) {
+      throw new Error('No active tab')
+    }
+    const tab = store.tabs.find(t => t.id === tabId)
+    if (!tab) {
+      throw new Error(`Tab not found: ${tabId}`)
+    }
+
+    const files = args.files
+    if (!files || !Array.isArray(files) || files.length === 0) {
+      throw new Error('files array is required (list of local file paths to upload)')
+    }
+
+    const protocol = args.protocol || 'rzsz'
+    const uploadCmd = protocol === 'trzsz' ? 'trz' : 'rz'
+
+    // Set the control variable to bypass native file dialog
+    window._apiControlSelectFile = files
+
+    const term = refs.get('term-' + tabId)
+    if (!term) {
+      throw new Error(`Terminal not found for tab: ${tabId}`)
+    }
+    term.runQuickCommand(uploadCmd)
+
+    return {
+      success: true,
+      protocol,
+      command: uploadCmd,
+      message: `${uploadCmd} upload initiated for ${files.length} file(s)`,
+      files,
+      tabId
+    }
+  }
+
+  Store.prototype.mcpZmodemDownload = function (args) {
+    const { store } = window
+    const tabId = args.tabId || store.activeTabId
+    if (!tabId) {
+      throw new Error('No active tab')
+    }
+    const tab = store.tabs.find(t => t.id === tabId)
+    if (!tab) {
+      throw new Error(`Tab not found: ${tabId}`)
+    }
+
+    const saveFolder = args.saveFolder
+    if (!saveFolder) {
+      throw new Error('saveFolder is required (local folder to save downloaded files)')
+    }
+
+    const remoteFiles = args.remoteFiles
+    if (!remoteFiles || !Array.isArray(remoteFiles) || remoteFiles.length === 0) {
+      throw new Error('remoteFiles array is required (list of remote file paths to download)')
+    }
+
+    const protocol = args.protocol || 'rzsz'
+    const downloadCmd = protocol === 'trzsz' ? 'tsz' : 'sz'
+
+    // Set the control variable to bypass native folder dialog
+    window._apiControlSelectFolder = saveFolder
+
+    const term = refs.get('term-' + tabId)
+    if (!term) {
+      throw new Error(`Terminal not found for tab: ${tabId}`)
+    }
+    const quotedFiles = remoteFiles.map(f => `"${f}"`).join(' ')
+    term.runQuickCommand(`${downloadCmd} ${quotedFiles}`)
+
+    return {
+      success: true,
+      protocol,
+      command: downloadCmd,
+      message: `${downloadCmd} download initiated for ${remoteFiles.length} file(s) to ${saveFolder}`,
+      remoteFiles,
+      saveFolder,
+      tabId
+    }
   }
 }

package/client/store/store.js

@@ -176,7 +176,7 @@ class Store {
 
   get terminalCommandSuggestions () {
     const { store } = window
-    const historyCommands = Array.from(store.terminalCommandHistory.keys())
+    const historyCommands = store.terminalCommandHistory.map(item => item.cmd)
     const batchInputCommands = store.batchInputs || []
     const quickCommands = (store.quickCommands || []).reduce(
       (p, q) => {

package/client/store/transfer-list.js

@@ -21,6 +21,7 @@ export default Store => {
   }
 
   Store.prototype.addTransferList = function (items) {
+    // console.log('addTransferList', JSON.stringify(items, null, 2))
     const { fileTransfers } = window.store
     const transferBatch = uid()
     const nextItems = items.map(t => {

package/client/store/watch.js

@@ -11,9 +11,7 @@ import {
   expandedKeysLsKey,
   resolutionsLsKey,
   localAddrBookmarkLsKey,
-  syncServerDataKey,
-  aiChatHistoryKey,
-  cmdHistoryKey
+  syncServerDataKey
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 import { debounce, isEmpty } from 'lodash-es'
@@ -134,28 +132,6 @@ export default store => {
     return store.syncServerStatus
   }).start()
 
-  autoRun(() => {
-    ls.safeSetItemJSON('history', store.history)
-    return store.history
-  }).start()
-
-  autoRun(() => {
-    ls.safeSetItemJSON(aiChatHistoryKey, store.aiChatHistory)
-    return store.aiChatHistory
-  }).start()
-
-  autoRun(() => {
-    const history = store.terminalCommandHistory
-    // Save in new format: array of {cmd, count, lastUseTime}
-    const data = Array.from(history.entries()).map(([cmd, info]) => ({
-      cmd,
-      count: info.count,
-      lastUseTime: info.lastUseTime
-    }))
-    ls.safeSetItemJSON(cmdHistoryKey, data)
-    return store.terminalCommandHistory
-  }).start()
-
   autoRun(() => {
     store.updateBatchInputSelectedTabIds()
     const tabs = store.getTabs()

package/package.json

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