@electerm/electerm-react 5.5.25 → 5.5.35

package/README.md

@@ -5,7 +5,6 @@
 </h1>
 
 [![GitHub version](https://badgers.space/github/release/electerm/electerm?corner_radius=m)](https://github.com/electerm/electerm/releases)
-[![Build Status](https://github.com/electerm/electerm/actions/workflows/mac-test-1.yml/badge.svg)](https://github.com/electerm/electerm/actions)
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/electerm/electerm/blob/master/LICENSE)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/electerm?label=Sponsors)](https://github.com/sponsors/electerm)
 [![star](https://atomgit.com/electerm/electerm/star/badge.svg)](https://atomgit.com/electerm/electerm)
@@ -41,7 +40,7 @@ Besides mainstream Windows/macOS/Linux/Android, electerm also supports HarmonyOS
 
 <div align="center">
   <a href="https://www.atlascloud.ai/?ref=PCAEL2&utm_source=github&utm_medium=link&utm_campaign=electerm">
-    <img src="https://github.com/electerm/electerm-resource/blob/master/static/images/atlas-cloud.png?raw=true" alt="Atlas Cloud" height="200" />
+    <img src="https://github.com/electerm/electerm-resource/blob/master/static/images/atlas-cloud.png?raw=true" alt="Atlas Cloud" width="260" />
   </a>
 </div>
 
@@ -50,12 +49,13 @@ Besides mainstream Windows/macOS/Linux/Android, electerm also supports HarmonyOS
 ----
 
 <div align="center">
-  <a href="https://fluxionai.world/register?aff=7H7DERHU3GFF&utm_source=github&utm_medium=link&utm_campaign=electerm">
-    <img src="https://github.com/electerm/electerm-resource/blob/master/static/images/fluxionai.png?raw=true" alt="FluxionAI" height="180" />
+  <a href="https://fluxionai.world/register?source=github&campaign=electerm-20260923&promo=ELECTERM&aff=7H7DERHU3GFF">
+    <img src="https://github.com/electerm/electerm-resource/blob/master/static/images/fluxionai.png?raw=true" alt="FluxionAI" width="210" />
   </a>
 </div>
 
-[Fluxion AI](https://fluxionai.world/register?aff=7H7DERHU3GFF&utm_source=github&utm_medium=link&utm_campaign=electerm) — One gateway to the world's leading AI models. [Sign up here to get started](https://fluxionai.world/register?aff=7H7DERHU3GFF&utm_source=github&utm_medium=link&utm_campaign=electerm).
+[Fluxion AI](https://fluxionai.world/register?source=github&campaign=electerm-20260923&promo=ELECTERM&aff=7H7DERHU3GFF) — One gateway to the world's leading AI models, One API, multi-route delivery, transparent usage and pricing, Chinese Models — 60% OFF, Claude & OpenAI — 70% OFF [Register through the partner link
+Get $3 in API credit](https://fluxionai.world/register?source=github&campaign=electerm-20260923&promo=ELECTERM&aff=7H7DERHU3GFF).
 
 ----
 

package/client/common/bookmark-schemas.js

@@ -152,6 +152,9 @@ export const spiceBookmarkSchema = {
   ...commonNetworkBookmarkProps,
   host: z.string().describe('Spice host address'),
   port: z.number().optional().describe('Spice port (default 5900)'),
+  tls: z.boolean().optional().describe('Connect over TLS, default false'),
+  ca: z.string().optional().describe('CA certificate in PEM format, used to verify the TLS peer'),
+  hostSubject: z.string().optional().describe('Expected TLS certificate subject, like CN=pve1,O=Example'),
   viewOnly: z.boolean().optional().describe('View only mode'),
   scaleViewport: z.boolean().optional().describe('Scale viewport to window, default is true')
 }

package/client/common/constants.js

@@ -158,6 +158,8 @@ export const pinnedQuickCommandBarKey = 'pinned-quick-command-bar'
 export const leftSidePanelWidthKey = 'left-sidebar-width'
 export const rightSidebarWidthKey = 'right-sidebar-width'
 export const rightPanelPinnedKey = 'right-panel-pinned'
+export const cmdHistoryInRightPanelKey = 'cmd-history-in-right-panel'
+export const quickCommandsInRightPanelKey = 'quick-commands-in-right-panel'
 export const addPanelWidthLsKey = 'addPanelWidth'
 export const sftpDefaultSortSettingKey = 'sftp-default-sort'
 export const qmSortByFrequencyKey = 'qm-sort-by-frequency'

package/client/common/create-title.jsx

@@ -28,8 +28,12 @@ export default function createTitle (res, hide = true) {
   const h = hide && window.store.config.hideIP ? maskHost(host) : host
   const fixTitle = `${username || ''}@${h}:${port}`
   const extra = host || path ? (path || fixTitle) : (url || '')
+  // onlyShowTitleInTab: a session that was given its own title shows just that
+  // title. One without a title is left alone and keeps the host/user fallback,
+  // otherwise the tab would read as empty.
+  const onlyTitle = title && window.store.config.onlyShowTitleInTab
   let f = title
-    ? `${title}` + (extra ? ` - ${extra}` : '')
+    ? `${title}` + (extra && !onlyTitle ? ` - ${extra}` : '')
     : extra
   if (connectionHoppings && connectionHoppings.length) {
     f = `[⋙]${f}`

package/client/common/default-setting.js

@@ -94,8 +94,10 @@ export default {
   dragDropBehavior: 'ask',
   switchTabOnHover: false,
   disableTabIndex: false,
+  onlyShowTitleInTab: false,
   disableShortcutBar: false,
   disableConfirmForLargeClipboardContent: false,
+  doubleClickToOpenBookmark: false,
   leftSideBarIcons: [
     'newBookmark',
     'quickConnect',

package/client/common/parse-vv.js

@@ -8,6 +8,7 @@
  *
  * Behaviour is deliberately matched against:
  *   - src/virt-viewer-file.c  (gitlab.com/virt-viewer/virt-viewer)
+ *   - src/virt-viewer-session-spice.c, for which port wins over tls-port
  *   - remote-viewer(1), "CONNECTION FILE" section
  *
  * Rejection rules copied from virt_viewer_file_new():
@@ -16,8 +17,9 @@
  *   unknown keys/groups     -> kept, never an error (the format is
  *                              extensible; the convention is an `x-` prefix)
  *
- * Keep in sync with src/client/common/parse-vv.js -- the two differ only in
- * the export statement (see sanitize-filename.js for the same pattern).
+ * This is the only copy. .vv loading happens in the renderer only, so there
+ * is no src/app/common twin -- unlike sanitize-filename.js, which the main
+ * process and the renderer both need.
  */
 
 const MAIN_GROUP = 'virt-viewer'
@@ -26,24 +28,37 @@ const OVIRT_GROUP = 'ovirt'
 /**
  * .vv key -> bookmark field understood by
  * src/client/components/bookmark-form/config/spice.js
+ *
+ * `port` and `tls-port` are NOT here: which one wins depends on whether the
+ * other is present, so they are resolved in parseVv().
  */
 const FIELD_MAP = {
   host: 'host',
-  port: 'port',
   password: 'password',
   title: 'title',
-  proxy: 'proxy'
+  proxy: 'proxy',
+  ca: 'ca',
+  'host-subject': 'hostSubject'
 }
 
+/**
+ * Keys parseVv() consumes itself, so the "not supported" pass must not report
+ * them again.
+ */
+const HANDLED = new Set([
+  'type',
+  'delete-this-file',
+  'port',
+  'tls-port',
+  ...Object.keys(FIELD_MAP)
+])
+
 /**
  * Keys the .vv format defines but electerm cannot honour for a spice session.
  * Each becomes a user-visible note instead of being dropped silently.
  */
 const UNSUPPORTED = {
-  'tls-port': 'TLS is not supported (electerm makes a plain TCP connection)',
-  'tls-ciphers': 'TLS is not supported',
-  ca: 'TLS certificate verification is not supported',
-  'host-subject': 'TLS certificate verification is not supported',
+  'tls-ciphers': 'TLS is used, but the cipher list is not configurable',
   'unix-path': 'Unix-socket transport is not supported',
   username: 'spice sessions authenticate with the password only',
   'disable-channels': 'spice channel selection is not supported',
@@ -70,6 +85,14 @@ const UNSUPPORTED = {
   'usb-device-reset': 'hotkey rebinding is not supported'
 }
 
+/**
+ * Proxmox writes the SPICE proxy ticket into `host` (see
+ * PVE::AccessControl::remote_viewer_config) and puts the real node name inside
+ * it. PVE::Ticket::verify_spice_connect_url() only accepts a ticket younger
+ * than 40 seconds, so a .vv from the Proxmox UI is strictly single-use.
+ */
+const PROXMOX_TICKET = /^pvespiceproxy:/i
+
 const BOOL_TRUE = new Set(['1', 'true', 'yes', 'on'])
 
 function stripBom (text) {
@@ -80,6 +103,49 @@ function isComment (line) {
   return line.startsWith('#') || line.startsWith(';')
 }
 
+/**
+ * GKeyFile escapes \\n, \\t, \\r, \\s and \\\\ inside values, and
+ * g_key_file_get_string() expands them on read. parseIni keeps values
+ * verbatim (a trailing space in a password is significant), so the one value
+ * that is handed to a parser rather than used as-is is expanded here.
+ *
+ * Proxmox relies on this: it writes the whole CA on a single line with literal
+ * "\\n" separators (`$cacert =~ s/\n/\\n/g`), which no PEM parser accepts
+ * unexpanded.
+ *
+ * @param {string} value
+ * @returns {string}
+ */
+function unescapeValue (value) {
+  return value.replace(/\\(.)/g, (match, char) => {
+    switch (char) {
+      case 'n': return '\n'
+      case 't': return '\t'
+      case 'r': return '\r'
+      case 's': return ' '
+      case '\\': return '\\'
+      default: return match
+    }
+  })
+}
+
+/**
+ * Read and range-check one of the two port keys.
+ * @returns {number|null}
+ */
+function readPort (main, key, result) {
+  if (!(key in main)) {
+    return null
+  }
+  const raw = main[key].trim()
+  const port = parseInt(raw, 10)
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    result.warnings.push('ignoring invalid ' + key + ' "' + raw + '"')
+    return null
+  }
+  return port
+}
+
 /**
  * Parse INI text into { groupName: { key: value } }.
  *
@@ -192,6 +258,30 @@ function parseVv (text) {
     return result
   }
 
+  // spice-gtk dials the plain port and only falls back to TLS when the file
+  // offers no plain port at all (spice-channel.c: "trying with TLS port"), so
+  // a file that sets both keeps its plain port here too.
+  //
+  // Which port key the file used also decides the transport, so `tls` is set
+  // on both branches: the form only overwrites the keys it is handed, and a
+  // switch left over from a previous file would silently break the connection.
+  const plainPort = readPort(main, 'port', result)
+  const tlsPort = readPort(main, 'tls-port', result)
+
+  if (plainPort) {
+    result.fields.port = plainPort
+    result.fields.tls = false
+    result.applied.push({ key: 'port', value: main.port, field: 'port' })
+  } else if (tlsPort) {
+    result.fields.port = tlsPort
+    result.fields.tls = true
+    result.applied.push({
+      key: 'tls-port',
+      value: main['tls-port'],
+      field: 'port'
+    })
+  }
+
   Object.keys(FIELD_MAP).forEach(key => {
     if (!(key in main)) {
       return
@@ -199,14 +289,7 @@ function parseVv (text) {
     const raw = main[key]
     const field = FIELD_MAP[key]
 
-    if (key === 'port') {
-      const port = parseInt(raw.trim(), 10)
-      if (!Number.isInteger(port) || port < 1 || port > 65535) {
-        result.warnings.push('ignoring invalid port "' + raw.trim() + '"')
-        return
-      }
-      result.fields.port = port
-    } else if (key === 'password') {
+    if (key === 'password') {
       result.fields.password = raw
     } else {
       const value = raw.trim()
@@ -214,7 +297,7 @@ function parseVv (text) {
         result.warnings.push('ignoring empty "' + key + '"')
         return
       }
-      result.fields[field] = value
+      result.fields[field] = key === 'ca' ? unescapeValue(value) : value
     }
     result.applied.push({ key, value: raw, field })
   })
@@ -224,12 +307,12 @@ function parseVv (text) {
     return result
   }
 
-  // A file that only offers a TLS port has nothing we can dial, because the
-  // spice transport here is plain TCP (see src/app/server/spice-proxy.js).
-  if (main['tls-port'] && !('port' in main)) {
+  // The Proxmox ticket in `host` is signed and time limited: the proxy rejects
+  // anything older than 40 seconds, so a saved bookmark can never work.
+  if (PROXMOX_TICKET.test(result.fields.host)) {
     result.warnings.push(
-      'this file defines only tls-port, and TLS is not supported here, ' +
-        'so there is no plain port to connect to'
+      'this is a Proxmox SPICE proxy ticket: it is only valid for about 40 ' +
+        'seconds, so connect right away -- saving it as a bookmark will not work'
     )
   }
 
@@ -248,7 +331,7 @@ function parseVv (text) {
   }
 
   Object.keys(main).forEach(key => {
-    if (key === 'type' || key === 'delete-this-file' || key in FIELD_MAP) {
+    if (HANDLED.has(key)) {
       return
     }
     const value = main[key]
@@ -259,6 +342,17 @@ function parseVv (text) {
     }
   })
 
+  // Both ports offered: the plain one wins (see above), but say so instead of
+  // dropping the TLS port in silence.
+  if (plainPort && tlsPort) {
+    result.ignored.push({
+      key: 'tls-port',
+      value: main['tls-port'],
+      reason:
+        'this file also offers a plain port, which is the one remote-viewer uses'
+    })
+  }
+
   if (groups[OVIRT_GROUP]) {
     result.ignored.push({
       key: '[' + OVIRT_GROUP + ']',
@@ -288,8 +382,8 @@ function describeVv (parsed) {
   if (!parsed || !parsed.ok) {
     return (parsed && parsed.error) || 'invalid .vv file'
   }
-  const { host, port, title, proxy } = parsed.fields
-  const bits = ['spice://' + host + (port ? ':' + port : '')]
+  const { host, port, title, proxy, tls } = parsed.fields
+  const bits = ['spice' + (tls ? '+tls' : '') + '://' + host + (port ? ':' + port : '')]
   if (title) {
     bits.push('"' + title + '"')
   }

package/client/common/vv-to-tab.js

@@ -0,0 +1,120 @@
+/**
+ * .vv connection file -> electerm Spice tab options
+ *
+ * Kept apart from parse-vv.js on purpose: parse-vv.js knows the file format
+ * and nothing about electerm, this module knows electerm's Spice tab shape and
+ * nothing about the format. Staying free of window/api access is what makes it
+ * unit-testable, and it is shared by both entry points for a .vv file --
+ * the bookmark form's "Load .vv file" button and a file handed to electerm
+ * from outside (`electerm /path/to/console.vv`).
+ *
+ * Deliberately imports nothing: constants.js pulls in the logo .png files and
+ * `window`, which would make this unimportable under `node --test`.
+ * parse-quick-connect.js spells the type out for the same reason.
+ */
+
+/**
+ * The `spice` value of terminalSpiceType (src/client/common/constants.js).
+ * A .vv file is a virt-viewer file, and the only type this client implements
+ * is spice -- parse-vv.js rejects every other `type=` already.
+ */
+const SPICE_TYPE = 'spice'
+
+/**
+ * Mirrors the Spice defaults in components/bookmark-form/config/spice.js
+ * initValues(), so a .vv that omits them behaves exactly like a Spice bookmark
+ * added by hand.
+ */
+const SPICE_DEFAULTS = {
+  viewOnly: false,
+  scaleViewport: true
+}
+
+/**
+ * Port used when the file names a host but no port at all. Matches
+ * DEFAULT_PORTS.spice in parse-quick-connect.js.
+ */
+const DEFAULT_SPICE_PORT = 5900
+
+const VV_EXT = /\.vv$/i
+const URL_LIKE = /:\/\//
+
+/**
+ * Does this look like a .vv file path?
+ *
+ * A suffix test rather than an exists()/stat() call on purpose: this is asked
+ * synchronously while scanning a command line, and the read that follows
+ * reports a missing file far better than a bare boolean could.
+ *
+ * `://` is excluded so a deep link that happens to end in .vv
+ * (spice://host/console.vv) is not mistaken for a path -- deep links have their
+ * own parser and would otherwise be read off the disk.
+ *
+ * @param {string} value
+ * @returns {boolean}
+ */
+function isVvFile (value) {
+  if (typeof value !== 'string') {
+    return false
+  }
+  const text = value.trim()
+  return VV_EXT.test(text) && !URL_LIKE.test(text)
+}
+
+/**
+ * Last path segment, for a tab title when the file carries no `title` key.
+ * Done by hand because the renderer has no path module.
+ *
+ * @param {string} filePath
+ * @returns {string}
+ */
+function basename (filePath) {
+  return String(filePath).split(/[/\\]/).pop() || String(filePath)
+}
+
+/**
+ * Build tab options from a parse result.
+ *
+ * Only keys the file actually provided are set. An absent `ca` or `hostSubject`
+ * must stay absent rather than become an empty string, because the session code
+ * reads "no ca" as "do not verify against a pinned CA" -- an empty string there
+ * would mean "pin nothing", which fails every handshake.
+ *
+ * @param {Object} parsed - result of parseVv()
+ * @param {Object} [options] - { filePath } plus any tab overrides
+ * @returns {Object} options for store.addTab()
+ */
+function vvToTab (parsed, options = {}) {
+  const { filePath, ...extra } = options
+  const f = parsed.fields
+  const tab = {
+    type: SPICE_TYPE,
+    host: f.host,
+    port: f.port || DEFAULT_SPICE_PORT,
+    tls: !!f.tls,
+    ...SPICE_DEFAULTS
+  }
+  const optional = {
+    ca: f.ca,
+    hostSubject: f.hostSubject,
+    password: f.password,
+    proxy: f.proxy,
+    title: f.title || (filePath ? basename(filePath) : '')
+  }
+  Object.keys(optional).forEach(key => {
+    if (optional[key]) {
+      tab[key] = optional[key]
+    }
+  })
+  return { ...tab, ...extra }
+}
+
+export {
+  isVvFile,
+  SPICE_TYPE,
+  vvToTab,
+  basename,
+  VV_EXT,
+  DEFAULT_SPICE_PORT,
+  SPICE_DEFAULTS
+}

package/client/components/ai/agent-tool-call-card.jsx

@@ -9,6 +9,7 @@ import {
   CodeOutlined,
   DatabaseOutlined
 } from '@ant-design/icons'
+import CopyIcon from './copy-icon'
 
 const toolIcons = {
   send_terminal_command: CodeOutlined,
@@ -65,6 +66,20 @@ export default function AgentToolCallCard ({ toolCall, autoCollapse }) {
     )
   }
 
+  function renderPre (text) {
+    return (
+      <div className='agent-tool-pre-wrap'>
+        <CopyIcon text={text} className='agent-tool-copy' />
+        <pre className='agent-tool-pre'>{text}</pre>
+      </div>
+    )
+  }
+
+  const argsText = args && Object.keys(args).length > 0
+    ? JSON.stringify(args, null, 2)
+    : ''
+  const resultText = formatResult(result)
+
   return (
     <div className={`agent-tool-call-card agent-tool-${status}`}>
       <div
@@ -79,16 +94,16 @@ export default function AgentToolCallCard ({ toolCall, autoCollapse }) {
       </div>
       {expanded && (
         <div className='agent-tool-detail'>
-          {args && Object.keys(args).length > 0 && (
+          {argsText && (
             <div className='agent-tool-args'>
               <div className='agent-tool-label'>Arguments:</div>
-              <pre className='agent-tool-pre'>{JSON.stringify(args, null, 2)}</pre>
+              {renderPre(argsText)}
             </div>
           )}
-          {result && (
+          {resultText && (
             <div className='agent-tool-result'>
               <div className='agent-tool-label'>Result:</div>
-              <pre className='agent-tool-pre'>{formatResult(result)}</pre>
+              {renderPre(resultText)}
             </div>
           )}
         </div>

package/client/components/ai/agent.js

@@ -1,5 +1,6 @@
 import { agentTools, executeToolCall } from './agent-tools'
 import { appendMandatoryGuardrails } from './ai-guardrails'
+import { buildAgentMessages, summarizeContext } from './ai-context'
 
 const MAX_ITERATIONS = 150
 
@@ -47,27 +48,35 @@ async function callBackendAIchatWithTools (messages, config) {
   )
 }
 
+// Publish the size of the context the agent is carrying so the panel can show
+// it. An agent request is not just the conversation: it also carries every
+// tool schema, and each iteration appends the tool results, which is what
+// actually fills the window. `usage` is the provider's own count for the
+// previous request and is kept for comparison -- the estimate is what the
+// *next* request will cost, so that is the number on display.
+function publishContext (messages, config, usage) {
+  const info = summarizeContext(messages, {
+    model: config.modelAI,
+    contextLength: window.store.config.contextLengthAI,
+    tools: agentTools
+  })
+  if (usage && usage.promptTokens) {
+    info.measuredTokens = usage.promptTokens
+  }
+  window.store.aiContextInfo = info
+}
+
 export async function runAgentLoop (chatEntry, config, abortRef, setIsStreaming, conversationMessages = null) {
   window.store.agentRunning = true
   try {
-    let messages
-    if (conversationMessages && conversationMessages.length > 1) {
-      // Replace system message with agent system prompt, keep conversation history
-      messages = [
-        { role: 'system', content: buildAgentSystemPrompt(config) },
-        ...conversationMessages.filter(m => m.role !== 'system')
-      ]
-    } else {
-      messages = [
-        { role: 'system', content: buildAgentSystemPrompt(config) },
-        {
-          role: 'user',
-          content: chatEntry.promptWithAttachments || chatEntry.prompt
-        }
-      ]
-    }
+    const messages = buildAgentMessages({
+      systemPrompt: buildAgentSystemPrompt(config),
+      conversationMessages,
+      prompt: chatEntry.promptWithAttachments || chatEntry.prompt
+    })
     const toolCallsLog = []
     let accumulatedContent = ''
+    let lastUsage = null
 
     setIsStreaming(true)
     updateChatEntry(chatEntry, {
@@ -84,7 +93,11 @@ export async function runAgentLoop (chatEntry, config, abortRef, setIsStreaming,
         return
       }
 
+      publishContext(messages, config, lastUsage)
       const result = await callBackendAIchatWithTools(messages, config)
+      if (result.usage) {
+        lastUsage = result.usage
+      }
 
       if (result.error) {
         setIsStreaming(false)
@@ -104,6 +117,7 @@ export async function runAgentLoop (chatEntry, config, abortRef, setIsStreaming,
       }
 
       messages.push(assistantMessage)
+      publishContext(messages, config, lastUsage)
 
       if (assistantMessage.content) {
         accumulatedContent += (accumulatedContent ? '\n\n' : '') + assistantMessage.content
@@ -176,5 +190,8 @@ export async function runAgentLoop (chatEntry, config, abortRef, setIsStreaming,
     })
   } finally {
     window.store.agentRunning = false
+    // hand the panel back to the session based estimate: tool results are not
+    // carried into the next turn, so the agent figure stops being meaningful
+    window.store.aiContextInfo = null
   }
 }

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

@@ -4,6 +4,7 @@ import AIStopIcon from './ai-stop-icon'
 import AgentToolCallCard from './agent-tool-call-card'
 import { runAgentLoop } from './agent'
 import { appendMandatoryGuardrails } from './ai-guardrails'
+import { buildSessionMessages } from './ai-context'
 import {
   Alert,
   Tooltip,
@@ -49,54 +50,17 @@ export default function AIChatHistoryItem ({ item }) {
     return appendMandatoryGuardrails(roleAI + `;用[${lang}]回复`)
   }
 
-  const conversationMessages = useMemo(() => {
-    if (!chatSessionId) {
-      return null
-    }
-    const sessionEntries = window.store.aiChatHistory
-      .filter(h => h.chatSessionId === chatSessionId && h.timestamp <= item.timestamp)
-      .sort((a, b) => a.timestamp - b.timestamp)
-
-    // Find the last compress entry
-    let lastCompressIndex = -1
-    for (let i = sessionEntries.length - 1; i >= 0; i--) {
-      if (sessionEntries[i].compressed) {
-        lastCompressIndex = i
-        break
-      }
-    }
-
-    const messages = [
-      { role: 'system', content: buildRole() }
-    ]
-
-    // Start from the last compress entry (if any), skip older history
-    const startIndex = lastCompressIndex >= 0 ? lastCompressIndex : 0
-    for (let i = startIndex; i < sessionEntries.length; i++) {
-      const entry = sessionEntries[i]
-      if (entry.compressed) {
-        messages.push({
-          role: 'user',
-          content: `Here is a summary of our previous conversation for context:\n\n${entry.response}`
-        })
-        messages.push({
-          role: 'assistant',
-          content: 'Understood. I will use this context as we continue.'
-        })
-      } else {
-        messages.push({
-          role: 'user',
-          // promptWithAttachments carries the inlined file blocks;
-          // falls back to the plain prompt for legacy entries
-          content: entry.promptWithAttachments || entry.prompt
-        })
-        if (entry.response && entry.id !== item.id) {
-          messages.push({ role: 'assistant', content: entry.response })
-        }
-      }
-    }
-    return messages
-  }, [chatSessionId, item.id, item.timestamp])
+  // The context this turn sends: the session history up to and including the
+  // previous turns, but not this turn's own (still streaming) response.
+  // Shared with the context size indicator in ai-chat.jsx so the number shown
+  // is built from the same message list that goes out.
+  const conversationMessages = useMemo(() => buildSessionMessages({
+    history: window.store.aiChatHistory,
+    chatSessionId,
+    upto: item.timestamp,
+    role: buildRole(),
+    excludeId: item.id
+  }), [chatSessionId, item.id, item.timestamp])
 
   const pollStreamContent = useCallback(async (sid) => {
     try {