@electerm/electerm-react 3.12.0 → 3.15.28

package/client/common/default-setting.js

@@ -64,6 +64,7 @@ export default {
   ],
   hideIP: false,
   dataSyncSelected: 'all',
+  nameAI: '',
   baseURLAI: 'https://api.atlascloud.ai/v1',
   modelAI: 'deepseek-chat',
   roleAI: '终端专家,提供不同系统下命令,简要解释用法,用markdown格式',

package/client/common/is-absolute-path.js

@@ -1,3 +1,3 @@
 export default (path = '') => {
-  return path.startsWith('/')
+  return path.startsWith('/') || /^[a-zA-Z]:/.test(path) || path.startsWith('\\\\')
 }

package/client/common/normalize-remote-path.js

@@ -0,0 +1,20 @@
+/**
+ * Ensure remote path always starts with /
+ * Windows drive letters like c: become /c:
+ * Also fixes mixed separators like /c:\windows → /c:/windows
+ * This is needed because SFTP protocol expects paths with leading /
+ * @param {String} path
+ * @return {String}
+ */
+export default function normalizeRemotePath (path) {
+  if (!path) return path
+  // Fix mixed separators: /c:\windows → /c:/windows
+  if (/^\/[a-zA-Z]:\\/.test(path)) {
+    return path.replace(/\\/g, '/')
+  }
+  // Add leading / to bare drive letters: c: → /c:, c:\windows → /c:/windows
+  if (/^[a-zA-Z]:/.test(path)) {
+    return '/' + path.replace(/\\/g, '/')
+  }
+  return path
+}

package/client/common/resolve.js

@@ -5,6 +5,13 @@
  * @return {String}
  */
 
+export const isWslPath = (path) => /^\\\\(?:wsl\$|wsl\.localhost)\\/.test(path)
+
+export const isWslDistroRoot = (path) => {
+  const trimmed = path.replace(/\\$/, '')
+  return /^\\\\(?:wsl\$|wsl\.localhost)\\[^\\]+$/.test(trimmed)
+}
+
 export default function resolve (basePath, nameOrDot) {
   const hasWinDrive = (path) => /^[a-zA-Z]:/.test(path)
   const isWin = basePath.includes('\\') || nameOrDot.includes('\\') || hasWinDrive(basePath) || hasWinDrive(nameOrDot)
@@ -15,7 +22,13 @@ export default function resolve (basePath, nameOrDot) {
   if (nameOrDot.startsWith('/')) {
     return nameOrDot.replace(/\\/g, sep)
   }
+  if (nameOrDot.startsWith('\\\\')) {
+    return nameOrDot
+  }
   if (nameOrDot === '..') {
+    if (isWslDistroRoot(basePath)) {
+      return '/'
+    }
     const baseEndsWithSep = basePath.endsWith(sep)
     const parts = basePath.split(sep)
     if (parts.length > 1) {
@@ -27,6 +40,9 @@ export default function resolve (basePath, nameOrDot) {
     }
     return '/'
   }
+  if (isWslDistroRoot(basePath) && !basePath.endsWith(sep)) {
+    return basePath + sep + nameOrDot
+  }
   const result = basePath.endsWith(sep) ? basePath + nameOrDot : basePath + sep + nameOrDot
   return isWin && result.length === 3 && result.endsWith(':\\') ? '/' : result
 }

package/client/components/ai/agent-tools.js

@@ -31,7 +31,7 @@ export const agentTools = [
     type: 'function',
     function: {
       name: 'send_terminal_command',
-      description: 'Send a command to a terminal tab and wait for it to finish. Returns the command output.',
+      description: 'Send a command to a terminal tab and wait for it to finish. Returns the command output. For long-running commands (builds, deployments, installations), use run_background_command instead to avoid timeouts.',
       parameters: {
         type: 'object',
         properties: {
@@ -334,6 +334,114 @@ export const agentTools = [
         properties: {}
       }
     }
+  },
+  {
+    type: 'function',
+    function: {
+      name: 'get_terminal_status',
+      description: 'Check terminal status: running (actively receiving data), idle, or password prompt. Returns last 20 lines of output. Lightweight, non-blocking.',
+      parameters: {
+        type: 'object',
+        properties: {
+          tabId: {
+            type: 'string',
+            description: 'Tab ID. Omit for active terminal.'
+          }
+        }
+      }
+    }
+  },
+  {
+    type: 'function',
+    function: {
+      name: 'cancel_terminal_command',
+      description: 'Cancel the running command in a terminal by sending Ctrl+C.',
+      parameters: {
+        type: 'object',
+        properties: {
+          tabId: {
+            type: 'string',
+            description: 'Tab ID. Omit for active terminal.'
+          }
+        }
+      }
+    }
+  },
+  {
+    type: 'function',
+    function: {
+      name: 'run_background_command',
+      description: 'Run a command in the background using nohup. The terminal is freed immediately. Returns a taskId for monitoring. Use get_background_task_status and get_background_task_log to check progress.',
+      parameters: {
+        type: 'object',
+        properties: {
+          command: {
+            type: 'string',
+            description: 'The shell command to run in the background.'
+          },
+          tabId: {
+            type: 'string',
+            description: 'Tab ID. Omit for active terminal.'
+          }
+        },
+        required: ['command']
+      }
+    }
+  },
+  {
+    type: 'function',
+    function: {
+      name: 'get_background_task_status',
+      description: 'Check if a background task is running, completed (with exit code), or unknown.',
+      parameters: {
+        type: 'object',
+        properties: {
+          taskId: {
+            type: 'string',
+            description: 'Task ID from run_background_command.'
+          }
+        },
+        required: ['taskId']
+      }
+    }
+  },
+  {
+    type: 'function',
+    function: {
+      name: 'get_background_task_log',
+      description: 'Read the output log of a background task. Returns the last N lines.',
+      parameters: {
+        type: 'object',
+        properties: {
+          taskId: {
+            type: 'string',
+            description: 'Task ID from run_background_command.'
+          },
+          lines: {
+            type: 'number',
+            description: 'Number of recent lines to read (default 100).'
+          }
+        },
+        required: ['taskId']
+      }
+    }
+  },
+  {
+    type: 'function',
+    function: {
+      name: 'cancel_background_task',
+      description: 'Cancel a running background task by killing its process.',
+      parameters: {
+        type: 'object',
+        properties: {
+          taskId: {
+            type: 'string',
+            description: 'Task ID from run_background_command.'
+          }
+        },
+        required: ['taskId']
+      }
+    }
   }
 ]
 
@@ -391,6 +499,18 @@ export async function executeToolCall (toolName, args) {
       return JSON.stringify(store.mcpSftpTransferList())
     case 'sftp_transfer_history':
       return JSON.stringify(store.mcpSftpTransferHistory())
+    case 'get_terminal_status':
+      return JSON.stringify(store.mcpGetTerminalStatus(args))
+    case 'cancel_terminal_command':
+      return JSON.stringify(store.mcpCancelTerminalCommand(args))
+    case 'run_background_command':
+      return JSON.stringify(store.mcpRunBackgroundCommand(args))
+    case 'get_background_task_status':
+      return JSON.stringify(await store.mcpGetBackgroundTaskStatus(args))
+    case 'get_background_task_log':
+      return JSON.stringify(await store.mcpGetBackgroundTaskLog(args))
+    case 'cancel_background_task':
+      return JSON.stringify(await store.mcpCancelBackgroundTask(args))
     default:
       throw new Error(`Unknown agent tool: ${toolName}`)
   }

package/client/components/ai/ai-chat-history-item.jsx

@@ -8,7 +8,6 @@ import {
   Tooltip
 } from 'antd'
 import {
-  UserOutlined,
   CopyOutlined,
   CloseOutlined,
   CaretDownOutlined,
@@ -23,6 +22,7 @@ export default function AIChatHistoryItem ({ item }) {
   const {
     prompt,
     sessionId,
+    nameAI,
     modelAI,
     roleAI,
     baseURLAI,
@@ -172,7 +172,7 @@ export default function AIChatHistoryItem ({ item }) {
         <span className='pointer mg1r' onClick={toggleOutput}>
           {showOutput ? <CaretDownOutlined /> : <CaretRightOutlined />}
         </span>
-        <UserOutlined />: {prompt}
+        <span>{prompt}</span>
         {renderStopButton()}
       </div>
     ),
@@ -191,6 +191,11 @@ export default function AIChatHistoryItem ({ item }) {
   function renderTitle () {
     return (
       <div>
+        {nameAI && (
+          <p>
+            <b>Name:</b> {nameAI}
+          </p>
+        )}
         <p>
           <b>Model:</b> {modelAI}
         </p>

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

@@ -52,6 +52,7 @@ export default function AIChat (props) {
       mode,
       toolCalls: [],
       ...pick(props.config, [
+        'nameAI',
         'modelAI',
         'roleAI',
         'baseURLAI',

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

@@ -1,4 +1,5 @@
 export const aiConfigsArr = [
+  'nameAI',
   'baseURLAI',
   'modelAI',
   'roleAI',

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

@@ -94,10 +94,13 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
 
   function renderHistoryItem (item) {
     if (!item || typeof item !== 'object') return { label: 'Unknown', title: 'Unknown' }
+    const name = item.nameAI || ''
     const model = item.modelAI || 'Default Model'
     const rolePrefix = item.roleAI ? item.roleAI.substring(0, 15) + '...' : ''
-    const label = `[${model}] ${rolePrefix}`
-    const title = `Model: ${item.modelAI}\nRole: ${item.roleAI}\nURL: ${item.baseURLAI}`
+    const label = name || `[${model}] ${rolePrefix}`
+    const title = name
+      ? `${name}\nModel: ${item.modelAI}\nURL: ${item.baseURLAI}`
+      : `Model: ${item.modelAI}\nRole: ${item.roleAI}\nURL: ${item.baseURLAI}`
     return { label, title }
   }
 
@@ -131,6 +134,14 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         layout='vertical'
         className='ai-config-form'
       >
+        <Form.Item
+          label='Name'
+          name='nameAI'
+        >
+          <Input
+            placeholder='e.g. DeepSeek Relay, Local Ollama (optional)'
+          />
+        </Form.Item>
         <Form.Item label={renderApiUrlLabel()} required>
           <Space.Compact className='width-100'>
             <Form.Item

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

@@ -10,7 +10,9 @@ const e = window.translate
 export default function AIOutput ({ item }) {
   const {
     response,
-    baseURLAI
+    baseURLAI,
+    nameAI,
+    modelAI
   } = item
   if (!response) {
     return null
@@ -82,10 +84,12 @@ export default function AIOutput ({ item }) {
     if (!brand) {
       return null
     }
+    const nameLabel = nameAI || modelAI
+    const label = nameLabel ? `${brand}:${nameLabel}` : brand
     return (
       <div className='pd1y'>
         <Link to={brandUrl}>
-          <Tag>{brand}</Tag>
+          <Tag>{label}</Tag>
         </Link>
       </div>
     )

package/client/components/main/main.jsx

@@ -282,7 +282,7 @@ export default auto(function Index (props) {
         <InfoModal {...infoModalProps} />
         <RightSidePanel {...rightPanelProps}>
           <AIChat {...aiChatProps} />
-          <TerminalInfo {...terminalInfoProps} />
+          <TerminalInfo key={store.activeTabId} {...terminalInfoProps} />
         </RightSidePanel>
         <SshConfigLoadNotify {...sshConfigProps} />
         <LoadSshConfigs

package/client/components/sftp/address-bar.jsx

@@ -6,7 +6,8 @@ import {
   ReloadOutlined,
   ArrowRightOutlined,
   LoadingOutlined,
-  HomeOutlined
+  HomeOutlined,
+  PlusOutlined
 } from '@ant-design/icons'
 import {
   Input,
@@ -74,7 +75,7 @@ function renderAddonBefore (props, realPath) {
   )
 }
 
-function renderAddonAfter (isLoadingRemote, onGoto, GoIcon, type) {
+function renderAddonAfter (isLoadingRemote, onGoto, GoIcon, type, handleUploadFromBrowser) {
   const handleClick = (e) => {
     e.stopPropagation()
     if (!isLoadingRemote) {
@@ -82,9 +83,24 @@ function renderAddonAfter (isLoadingRemote, onGoto, GoIcon, type) {
     }
   }
   return (
-    <GoIcon
-      onClick={handleClick}
-    />
+    <>
+      {
+        type === typeMap.local && window.et.isWebApp
+          ? (
+            <PlusOutlined
+              className='mg1r'
+              onClick={(e) => {
+                e.stopPropagation()
+                handleUploadFromBrowser()
+              }}
+            />
+            )
+          : null
+      }
+      <GoIcon
+        onClick={handleClick}
+      />
+    </>
   )
 }
 
@@ -160,7 +176,7 @@ export default function AddressBar (props) {
           onBlur={() => props.onInputBlur(type)}
           disabled={loadingSftp}
           suffix={
-            renderAddonAfter(isLoadingRemote, onGoto, GoIcon, type)
+            renderAddonAfter(isLoadingRemote, onGoto, GoIcon, type, props.handleUploadFromBrowser)
           }
         />
         {renderHistory(props, type)}

package/client/components/sftp/file-item.jsx

@@ -14,6 +14,7 @@ import copy from 'json-deep-copy'
 import { pick, some } from 'lodash-es'
 import Input from '../common/input-auto-focus'
 import resolve from '../../common/resolve'
+import normalizeRemotePath from '../../common/normalize-remote-path'
 import { addClass, removeClass } from '../../common/class'
 import {
   mode2permission,
@@ -604,7 +605,10 @@ export default class FileSection extends React.Component {
     const { type, name, isParent } = file
     const n = `${type}Path`
     const path = isParent ? file.path : this.props[n]
-    const np = resolve(path, name)
+    let np = resolve(path, name)
+    if (type === typeMap.remote) {
+      np = normalizeRemotePath(np)
+    }
     const op = this.props[type + 'Path']
     this.props.modifier({
       [n]: np,
@@ -693,11 +697,22 @@ export default class FileSection extends React.Component {
     const {
       path, name
     } = this.state.file
-    const rp = path ? resolve(path, name) : this.props[`${this.props.type}Path`]
+    let rp = path ? resolve(path, name) : this.props[`${this.props.type}Path`]
+    if (this.props.type === typeMap.remote) {
+      rp = this.convertSftpPathToTerminalPath(rp)
+    }
     this.props.tab.pane = paneMap.terminal
     refs.get('term-' + this.props.tab.id)?.cd(rp)
   }
 
+  convertSftpPathToTerminalPath = (p) => {
+    const m = p.match(/^\/([a-zA-Z]:)(.*)$/)
+    if (m) {
+      return m[1] + m[2].replace(/\//g, '\\')
+    }
+    return p
+  }
+
   fetchEditorText = async (path, type) => {
     // const sftp = sftpFunc()
     const text = typeMap.remote === type
@@ -882,6 +897,25 @@ export default class FileSection extends React.Component {
     window.pre.showItemInFolder(p)
   }
 
+  downloadFromBrowser = async () => {
+    const { path, name, isDirectory } = this.state.file
+    const p = resolve(path, name)
+    const url = '/api/download?path=' + encodeURIComponent(p)
+    const res = await window.fetch(url, {
+      headers: {
+        token: window.store?.config.tokenElecterm
+      }
+    })
+    const blob = await res.blob()
+    const a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = isDirectory ? name + '.tar.gz' : name
+    document.body.appendChild(a)
+    a.click()
+    document.body.removeChild(a)
+    URL.revokeObjectURL(a.href)
+  }
+
   newItem = (isDirectory) => {
     const { type } = this.state.file
     const list = copy(this.props[type])
@@ -1060,6 +1094,13 @@ export default class FileSection extends React.Component {
         text: e('showInDefaultFileMananger')
       })
     }
+    if (isLocal && isRealFile && window.et.isWebApp) {
+      res.push({
+        func: 'downloadFromBrowser',
+        icon: 'DownloadOutlined',
+        text: 'Download from browser'
+      })
+    }
     if (showEdit) {
       res.push({
         func: 'editFile',

package/client/components/sftp/file-read.js

@@ -7,6 +7,12 @@ import fs from '../../common/fs'
 import { isWin } from '../../common/constants'
 
 export const getFileExt = fileName => {
+  if (/^\\\\(?:wsl\$|wsl\.localhost)\\/.test(fileName)) {
+    return {
+      base: fileName,
+      ext: ''
+    }
+  }
   const sep = '.'
   const arr = fileName.split(sep)
   const len = arr.length
@@ -82,12 +88,15 @@ export const getFolderFromFilePath = (filePath, isRemote) => {
   const arr = filePath.split(sep)
   const len = arr.length
   const isWinDisk = isWin && filePath.endsWith(sep)
-  const path = isWinDisk
+  const isWslRoot = isWin && /^\\\\(?:wsl\$|wsl\.localhost)\\[^\\]+$/.test(filePath.replace(/\\$/, ''))
+  const path = (isWinDisk || isWslRoot)
     ? '/'
     : arr.slice(0, len - 1).join(sep)
   const name = isWinDisk
     ? filePath.replace(sep, '')
-    : arr[len - 1]
+    : isWslRoot
+      ? filePath
+      : arr[len - 1]
 
   return {
     path,

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

@@ -29,6 +29,7 @@ import fs from '../../common/fs'
 import ListTable from './list-table-ui'
 import deepCopy from 'json-deep-copy'
 import isValidPath from '../../common/is-valid-path'
+import normalizeRemotePath from '../../common/normalize-remote-path'
 import { LoadingOutlined, ReloadOutlined } from '@ant-design/icons'
 import * as owner from './owner-list'
 import AddressBar from './address-bar'
@@ -292,6 +293,7 @@ export default class Sftp extends Component {
       if (!path && this.sftp) {
         path = await this.getPwd(this.props.tab.username)
       }
+      path = normalizeRemotePath(path)
     } else {
       path = this.getLocalHome()
     }
@@ -762,7 +764,7 @@ export default class Sftp extends Component {
 
       if (!remotePath) {
         if (startDirectory) {
-          remotePath = startDirectory
+          remotePath = normalizeRemotePath(startDirectory)
         } else {
           remotePath = await this.getPwd(username)
         }
@@ -970,6 +972,31 @@ export default class Sftp extends Component {
     })
   }
 
+  handleUploadFromBrowser = () => {
+    const input = document.createElement('input')
+    input.type = 'file'
+    input.multiple = true
+    input.onchange = async () => {
+      const files = input.files
+      if (!files || !files.length) return
+      const { localPath } = this.state
+      for (const file of files) {
+        const formData = new FormData()
+        formData.append('file', file)
+        formData.append('path', localPath)
+        await window.fetch('/api/upload', {
+          method: 'POST',
+          body: formData,
+          headers: {
+            token: window.store?.config.tokenElecterm
+          }
+        })
+      }
+      this.localList()
+    }
+    input.click()
+  }
+
   parsePath = async (type, pth) => {
     const reg = /^%([^%]+)%/
     if (!reg.test(pth)) {
@@ -995,7 +1022,10 @@ export default class Sftp extends Component {
     const n = `${type}Path`
     const nt = n + 'Temp'
     const oldPath = this.state[type + 'Path']
-    const np = await this.parsePath(type, this.state[nt])
+    let np = await this.parsePath(type, this.state[nt])
+    if (type === typeMap.remote) {
+      np = normalizeRemotePath(np)
+    }
     if (!isValidPath(np)) {
       return notification.warning({
         message: 'path not valid'
@@ -1003,6 +1033,7 @@ export default class Sftp extends Component {
     }
     this.setState({
       [n]: np,
+      [nt]: np,
       [`${type}Keyword`]: ''
     }, () => this[`${type}List`](undefined, undefined, oldPath))
   }
@@ -1010,7 +1041,10 @@ export default class Sftp extends Component {
   goParent = (type) => {
     const n = `${type}Path`
     const p = this.state[n]
-    const np = resolve(p, '..')
+    let np = resolve(p, '..')
+    if (type === typeMap.remote) {
+      np = normalizeRemotePath(np)
+    }
     const op = this.state[n]
     if (np !== p) {
       this.setState({
@@ -1218,6 +1252,7 @@ export default class Sftp extends Component {
     const addrProps = {
       host,
       type,
+      handleUploadFromBrowser: this.handleUploadFromBrowser,
       ...pick(
         this,
         [

package/client/components/sys-menu/icons-map.jsx

@@ -24,7 +24,11 @@ import {
   LockOutlined,
   ReloadOutlined,
   FileZipOutlined,
-  AppstoreOutlined
+  AppstoreOutlined,
+  SaveOutlined,
+  PlayCircleFilled,
+  StopOutlined,
+  DownloadOutlined
 } from '@ant-design/icons'
 import IconHolder from './icon-holder'
 
@@ -52,5 +56,9 @@ export default {
   LockOutlined,
   ReloadOutlined,
   FileZipOutlined,
-  AppstoreOutlined
+  AppstoreOutlined,
+  SaveOutlined,
+  PlayCircleFilled,
+  StopOutlined,
+  DownloadOutlined
 }