@electerm/electerm-react 5.5.35 → 5.5.56

package/client/store/common.js

@@ -6,6 +6,7 @@ import handleError from '../common/error-handler'
 import Modal from '../components/common/modal'
 import { appendMandatoryGuardrails } from '../components/ai/ai-guardrails'
 import { buildSessionMessages } from '../components/ai/ai-context'
+import { COMPRESS_SUMMARY_PROMPT } from '../components/ai/ai-auto-compress'
 import { debounce, some, get, pickBy } from 'lodash-es'
 import {
   leftSidePanelWidthKey,
@@ -17,6 +18,7 @@ import {
   addPanelWidthLsKey,
   connectionMap,
   lastAiChatSessionIdKey,
+  aiAutoCompressLsKey,
   mobileBreakpoint,
   splitMap,
   settingAiId,
@@ -444,6 +446,23 @@ export default Store => {
     })
   }
 
+  // Update one entry immutably. Both halves matter:
+  // - the store only notifies subscribers on a property write, so mutating the
+  //   entry in place leaves the panel rendering what it already had;
+  // - the transcript is memo()'d per entry, and a memo() comparison of an entry
+  //   that was mutated in place compares the object with itself, so React can
+  //   never see the change and the entry stops updating.
+  Store.prototype.updateAiHistoryEntry = function (id, updates) {
+    const { aiChatHistory } = window.store
+    const index = aiChatHistory.findIndex(d => d.id === id)
+    if (index === -1) {
+      return
+    }
+    const next = [...aiChatHistory]
+    next[index] = { ...next[index], ...updates }
+    window.store.aiChatHistory = next
+  }
+
   Store.prototype.removeAiHistory = function (id) {
     const { store } = window
     const index = store.aiChatHistory.findIndex(d => d.id === id)
@@ -486,9 +505,15 @@ export default Store => {
     store.startNewChat()
   })
 
+  // One compression per session at a time. The placeholder entry is published
+  // before the summary arrives, so a second call (auto compress firing while a
+  // manual one is still waiting on the provider) would summarize the
+  // placeholder and append a second one.
+  const compressingSessions = new Set()
+
   Store.prototype.compressChatSession = async function (sessionId) {
     const { store } = window
-    if (!sessionId) {
+    if (!sessionId || compressingSessions.has(sessionId)) {
       return
     }
     const sessionEntries = store.aiChatHistory
@@ -523,32 +548,18 @@ export default Store => {
       role: appendMandatoryGuardrails(firstEntry.roleAI + `;用[${lang}]回复`)
     })
 
-    const summaryPrompt = 'Please summarize the above conversation concisely. Include key information, decisions, context, and any important details that would be needed to continue this conversation effectively.'
-    messages.push({ role: 'user', content: summaryPrompt })
-
-    const aiResponse = await window.pre.runGlobalAsync(
-      'AIchat',
-      summaryPrompt,
-      firstEntry.modelAI,
-      firstEntry.roleAI,
-      firstEntry.baseURLAI,
-      firstEntry.apiPathAI,
-      firstEntry.apiKeyAI,
-      firstEntry.proxyAI,
-      false,
-      firstEntry.authHeaderNameAI,
-      messages
-    )
-
-    if (aiResponse && aiResponse.error) {
-      return store.onError(new Error(aiResponse.error))
-    }
+    // The same closing request the agent loop's auto compression sends (see
+    // components/ai/ai-compress.js), so both paths summarize alike.
+    messages.push({ role: 'user', content: COMPRESS_SUMMARY_PROMPT })
 
-    const summary = aiResponse.response || ''
+    // Show the entry before asking for the summary, and fill it in when the
+    // answer arrives. The request takes as long as any other AI request (much
+    // longer for a nearly full session), and a click that changes nothing on
+    // screen for that long reads as "compress did not work".
     const compressedEntry = {
       id: uid(),
       prompt: '*Compressed session summary*',
-      response: summary,
+      response: '*Summarizing the session…*',
       isStreaming: false,
       pending: false,
       sessionId: null,
@@ -572,8 +583,55 @@ export default Store => {
     // push for the same reason as removeAiHistory -- the panel has to see the
     // new context size, which is the whole point of compressing.
     store.aiChatHistory = [...store.aiChatHistory, compressedEntry]
+    compressingSessions.add(sessionId)
+
+    // Anything short of a usable summary takes the placeholder away again: an
+    // empty summary must never replace the conversation, and a half finished
+    // one must not look like a result.
+    const fail = (msg) => {
+      store.removeAiHistory(compressedEntry.id)
+      return store.onError(new Error(msg))
+    }
+
+    try {
+      const aiResponse = await window.pre.runGlobalAsync(
+        'AIchat',
+        COMPRESS_SUMMARY_PROMPT,
+        firstEntry.modelAI,
+        firstEntry.roleAI,
+        firstEntry.baseURLAI,
+        firstEntry.apiPathAI,
+        firstEntry.apiKeyAI,
+        firstEntry.proxyAI,
+        false,
+        firstEntry.authHeaderNameAI,
+        messages
+      )
+
+      if (aiResponse && aiResponse.error) {
+        return fail(aiResponse.error)
+      }
+
+      const summary = (aiResponse && aiResponse.response) || ''
+      if (!summary.trim()) {
+        return fail('Compression failed: empty summary from AI')
+      }
+      store.updateAiHistoryEntry(compressedEntry.id, { response: summary })
+    } finally {
+      compressingSessions.delete(sessionId)
+    }
   }
 
+  // Auto compression, both modes: ask turns and the agent loop read this flag
+  // before every request (see components/ai/ai-compress.js), and the panel's
+  // auto compress popover writes it. Persisted so the choice survives a reload.
+  Store.prototype.setAiAutoCompress = action(function (val) {
+    const { store } = window
+    const on = !!val
+    store.aiAutoCompress = on
+    ls.setItem(aiAutoCompressLsKey, on ? 'true' : 'false')
+  })
+
   Store.prototype.toggleChatSessions = action(function () {
     const { store } = window
     store.showChatSessions = !store.showChatSessions

package/client/store/init-state.js

@@ -27,6 +27,7 @@ import {
   syncServerDataKey,
   splitMap,
   lastAiChatSessionIdKey,
+  aiAutoCompressLsKey,
   mobileBreakpoint
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
@@ -97,6 +98,10 @@ export default () => {
     _batchInputSelectedTabIds: new Set(),
     aiChatHistory: [],
     agentRunning: false,
+    // ask turns and the agent loop compact their conversation when the window
+    // gets full; persisted here so the toggle survives a reload
+    // (see components/ai/ai-compress.js)
+    aiAutoCompress: ls.getItem(aiAutoCompressLsKey) === 'true',
     // live context accounting while an agent loop is running: the agent
     // carries tool schemas and tool results that the session history does
     // not, so it publishes its own figure here (see components/ai/agent.js)
@@ -220,6 +225,8 @@ export default () => {
     exePath: '',
     isPortable: false,
     installSrc: '',
+    // where running widgets write their logs, from the main process
+    widgetLogPath: '',
     showSshConfigModal: false,
 
     // batch inputs

package/client/store/load-data.js

@@ -276,6 +276,7 @@ export default (Store) => {
     store.appPath = globs.appPath
     store.exePath = globs.exePath
     store.isPortable = globs.isPortable
+    store.widgetLogPath = globs.widgetLogPath || ''
     store._config = globs.config
     window.et.langs = globs.langs
     store.zoom(store.config.zoom, false, true)

package/client/store/widgets.js

@@ -4,7 +4,8 @@
 
 import message from '../components/common/message'
 import {
-  settingMap
+  settingMap,
+  settingPanelMobileBreakpoint
 } from '../common/constants'
 import getInitItem from '../common/init-setting-item'
 import deepCopy from 'json-deep-copy'
@@ -27,12 +28,28 @@ export default Store => {
     const {
       widgetInstances
     } = window.store
-    const index = widgetInstances.findIndex(w => w.id === instanceId)
-    if (index > -1) {
-      widgetInstances.splice(index, 1)
+    // assigned, not spliced: an in-place mutation fires no subscriber, and the
+    // instance list, the sidebar badge and the detail panel all read this array
+    window.store.widgetInstances = widgetInstances.filter(w => w.id !== instanceId)
+  }
+
+  // Selecting a running instance in the widgets list shows its detail + log in
+  // the right column, the same way selecting a widget shows its run form.
+  Store.prototype.selectWidgetInstance = (instance) => {
+    const { store } = window
+    store.setSettingItem(instance)
+    // narrow panels drill into the right col content after picking an instance
+    if (window.store.innerWidth <= settingPanelMobileBreakpoint) {
+      window.store.settingMobileView = 'content'
     }
   }
 
+  // back to the widget form — used when the instance being viewed is gone
+  Store.prototype.closeWidgetInstance = () => {
+    const { store } = window
+    store.setSettingItem(getInitItem([], settingMap.widgets))
+  }
+
   Store.prototype.stopWidget = async (instanceId) => {
     const {
       store
@@ -102,10 +119,11 @@ export default Store => {
             widgetId: result.widgetId,
             serverInfo: result.serverInfo,
             config: item.config,
+            startedAt: Date.now(),
             autoRun: true,
             autoRunId: item.id
           }
-          store.widgetInstances.push(instance)
+          store.widgetInstances = [...store.widgetInstances, instance]
         }
       } catch (err) {
         console.error(`Failed to autorun widget ${item.widgetId}:`, err)

package/package.json

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

package/client/components/file-transfer/zip.js

@@ -1,42 +0,0 @@
-/**
- * zip/unzip remote files
- * should only support linux server
- */
-
-import { runCmd } from '../terminal/terminal-apis'
-import { getFolderFromFilePath } from '../sftp/file-read'
-import resolve from '../../common/resolve'
-import generate from '../../common/uid'
-
-const isRemote = true
-const temp = '/tmp'
-
-export async function zipCmd (pid, filePath) {
-  // tar -czf bin.tar bin
-  const id = generate()
-  const { path, name } = getFolderFromFilePath(filePath, isRemote)
-  const np = resolve(temp, `electerm-${id}.tar`)
-  const cmd = `tar -C "${path}" -cf "${np}" "${name}"`
-  await runCmd(pid, cmd)
-  return np
-}
-
-export function unzipCmd (pid, from, to) {
-  const cmd = `tar -xf "${from}" -C "${to}"`
-  return runCmd(pid, cmd)
-}
-
-export async function rmCmd (pid, path) {
-  const cmd = `rm -rf "${path}"`
-  return runCmd(pid, cmd)
-}
-
-export async function mvCmd (pid, from, to) {
-  const cmd = `mv "${from}" "${to}"`
-  return runCmd(pid, cmd)
-}
-
-export async function mkdirCmd (pid, p) {
-  const cmd = `mkdir "${p}"`
-  return runCmd(pid, cmd)
-}