@auto-ai/agent 2.1.207 → 2.1.209

package/dist/ws-test/ws-test.js

@@ -84,6 +84,11 @@
       const permissionDialogTitle = $('permissionDialogTitle')
       const permissionDialogDesc = $('permissionDialogDesc')
       const permissionDialogInput = $('permissionDialogInput')
+      const apiErrorDialog = $('apiErrorDialog')
+      const apiErrorDialogBackdrop = $('apiErrorDialogBackdrop')
+      const apiErrorDialogDesc = $('apiErrorDialogDesc')
+      const btnApiErrorOk = $('btnApiErrorOk')
+      const btnApiErrorDialogClose = $('btnApiErrorDialogClose')
       const btnPermissionDialogClose = $('btnPermissionDialogClose')
       const btnPermissionDeny = $('btnPermissionDeny')
       const btnPermissionAllow = $('btnPermissionAllow')
@@ -111,6 +116,7 @@
       const scheduleTasksWrap = $('scheduleTasksWrap')
       const scheduleRunsWrap = $('scheduleRunsWrap')
       const scheduleTaskTableBody = $('scheduleTaskTableBody')
+      const scheduleTasksPager = $('scheduleTasksPager')
       const scheduleManageEmpty = $('scheduleManageEmpty')
       const btnScheduleRunsBack = $('btnScheduleRunsBack')
       const scheduleRunsTitle = $('scheduleRunsTitle')
@@ -161,6 +167,12 @@
       let sessionRuntimePollTimer = null
       /** 当前附着 session 的 turn 是否进行中（由 query.progress 驱动） */
       let sessionTurnActive = false
+      /** 当前 turn 是否已处理过 api_error 终态，避免重复弹窗与 abort */
+      let apiErrorHandledForTurn = false
+      /** 当前 turn 是否处于 api_error 重试中 */
+      let apiErrorRetryingForTurn = false
+      /** 最近一次 api_error 的可读文案，供重试耗尽后弹窗展示 */
+      let lastApiErrorText = ''
       const pendingPromptsBarEl = $('pendingPromptsBar')
       const pendingPromptsListEl = $('pendingPromptsList')
       let pendingPromptsCache = []
@@ -352,8 +364,6 @@
       const LLM_MODEL_KEY = 'LLM_MODEL'
       const LLM_PROVIDER_ID_KEY = 'LLM_PROVIDER_ID'
       const WS_ALLOW_TOOL_ASK_KEY = 'WS_ALLOW_TOOL_ASK'
-      const TUITUI_CHANNEL_SESSION_KEY = 'TUITUI_CHANNEL_SESSION'
-      const TUITUI_CHANNEL_SESSION_ALLOWED = new Set(['0', '1'])
       const WS_PERMISSION_MODE_ALLOWED = new Set([
         'acceptEdits',
         'plan',
@@ -577,50 +587,19 @@
             label.setAttribute('for', 'agentEnvField_' + field.key)
             label.textContent = field.label
             const inputId = 'agentEnvField_' + field.key
-            let input
-            if (field.key === TUITUI_CHANNEL_SESSION_KEY) {
-              /**
-               * 业务逻辑：推推常驻会话开关仅允许 0/1，与主进程 reconcileChannelPairSessions 读取一致。
-               */
-              const select = document.createElement('select')
-              select.id = inputId
-              select.className = 'agent-env-kv-input'
-              const channelSessionOptions = [
-                { value: '0', label: '禁用' },
-                { value: '1', label: '启用' },
-              ]
-              for (let k = 0; k < channelSessionOptions.length; k++) {
-                const option = document.createElement('option')
-                option.value = channelSessionOptions[k].value
-                option.textContent = channelSessionOptions[k].label
-                select.appendChild(option)
-              }
-              const currentChannelSession =
-                typeof agentEnvFieldValues[field.key] === 'string'
-                  ? agentEnvFieldValues[field.key].trim()
-                  : ''
-              select.value = TUITUI_CHANNEL_SESSION_ALLOWED.has(currentChannelSession)
-                ? currentChannelSession
-                : '0'
-              select.addEventListener('change', function () {
-                agentEnvFieldValues[field.key] = select.value
-              })
-              input = select
-            } else {
-              const textInput = document.createElement('input')
-              textInput.id = inputId
-              textInput.type = 'text'
-              textInput.spellcheck = false
-              textInput.className = 'agent-env-kv-input'
-              textInput.placeholder = field.placeholder || ''
-              textInput.value = typeof agentEnvFieldValues[field.key] === 'string'
-                ? agentEnvFieldValues[field.key]
-                : ''
-              textInput.addEventListener('input', function () {
-                agentEnvFieldValues[field.key] = textInput.value
-              })
-              input = textInput
-            }
+            const textInput = document.createElement('input')
+            textInput.id = inputId
+            textInput.type = 'text'
+            textInput.spellcheck = false
+            textInput.className = 'agent-env-kv-input'
+            textInput.placeholder = field.placeholder || ''
+            textInput.value = typeof agentEnvFieldValues[field.key] === 'string'
+              ? agentEnvFieldValues[field.key]
+              : ''
+            textInput.addEventListener('input', function () {
+              agentEnvFieldValues[field.key] = textInput.value
+            })
+            const input = textInput
             row.appendChild(label)
             row.appendChild(input)
             section.appendChild(row)
@@ -1554,6 +1533,10 @@
             return extractMessageBody(m).trim()
           }
           if (m.type === 'system') {
+            if (m.subtype === 'api_error') {
+              const apiText = extractApiErrorText(m)
+              if (apiText) return apiText
+            }
             if (typeof m.content === 'string') return m.content.trim()
             try {
               return JSON.stringify(m).slice(0, 800).trim()
@@ -1651,10 +1634,14 @@
               div.appendChild(md)
               container.appendChild(div)
             } else if (t === 'system') {
-              const raw =
+              let raw =
                 typeof m.content === 'string'
                   ? m.content
                   : JSON.stringify(m).slice(0, 800)
+              if (m.subtype === 'api_error') {
+                const apiText = extractApiErrorText(m)
+                if (apiText) raw = apiText
+              }
               if (!raw.trim()) continue
               const div = document.createElement('div')
               div.className = 'chat-msg chat-msg-system'
@@ -1998,6 +1985,151 @@
         permissionDialogBackdrop.addEventListener('click', () => respondToPermission('deny'))
       }
 
+      /**
+       * 从 system api_error 消息中提取可读错误文案。
+       * 上游 APIError 常嵌套多层 error 字段，需逐层下探并尝试解析 JSON 内 message。
+       */
+      function extractApiErrorText(msg) {
+        if (!msg || msg.type !== 'system' || msg.subtype !== 'api_error') return ''
+        const root = msg.error
+        if (!root || typeof root !== 'object') return 'LLM API 请求失败'
+
+        let text = ''
+        const candidates = [
+          root.message,
+          root.error && root.error.message,
+          root.error && root.error.error && root.error.error.message,
+          root.error && root.error.error && root.error.error.error && root.error.error.error.message,
+        ]
+        for (let i = 0; i < candidates.length; i++) {
+          if (typeof candidates[i] === 'string' && candidates[i].trim()) {
+            text = candidates[i].trim()
+            break
+          }
+        }
+        if (!text) text = 'LLM API 请求失败'
+
+        const jsonMatch = text.match(/\{[\s\S]*\}$/)
+        if (jsonMatch) {
+          try {
+            const parsed = JSON.parse(jsonMatch[0])
+            const inner = parsed.error || parsed
+            if (inner && typeof inner.message === 'string' && inner.message.trim()) {
+              const code = inner.code != null ? '（' + inner.code + '）' : ''
+              text = inner.message.trim() + code
+            }
+          } catch (_err) {
+            /* 非 JSON 后缀则保留原始 message */
+          }
+        }
+
+        const attempt = Number.isFinite(msg.retryAttempt) ? msg.retryAttempt : null
+        const max = Number.isFinite(msg.maxRetries) ? msg.maxRetries : null
+        if (attempt != null && max != null) {
+          text += ' [重试 ' + attempt + '/' + max + ']'
+        }
+        if (typeof root.status === 'number') {
+          text = 'HTTP ' + root.status + ': ' + text
+        }
+        return text
+      }
+
+      function hideApiErrorDialog() {
+        if (!apiErrorDialog) return
+        apiErrorDialog.classList.remove('is-open')
+        apiErrorDialog.setAttribute('aria-hidden', 'true')
+      }
+
+      function showApiErrorDialog(message) {
+        if (!apiErrorDialog || !apiErrorDialogDesc) return
+        apiErrorDialogDesc.textContent =
+          typeof message === 'string' && message.trim() ? message.trim() : 'LLM API 请求失败'
+        apiErrorDialog.classList.add('is-open')
+        apiErrorDialog.setAttribute('aria-hidden', 'false')
+      }
+
+      /** 向服务端发送 abort，终止当前 query 与子进程 turn */
+      function abortCurrentSessionTurn() {
+        if (!socket || socket.readyState !== WebSocket.OPEN) return
+        const payload = { type: 'abort' }
+        socket.send(JSON.stringify(payload))
+        logLine('→', payload)
+      }
+
+      function resetApiErrorTurnState() {
+        apiErrorHandledForTurn = false
+        apiErrorRetryingForTurn = false
+        lastApiErrorText = ''
+      }
+
+      /**
+       * api 重试全部耗尽：弹窗、abort、清除 calling。
+       * 由 session.error 或 turn.terminal failed 触发，不在首次 api_error 时 fail-fast。
+       */
+      function finalizeApiErrorTurn(errText) {
+        if (apiErrorHandledForTurn) return
+        apiErrorHandledForTurn = true
+        apiErrorRetryingForTurn = false
+        sessionTurnActive = false
+        showApiErrorDialog(errText || 'LLM API 请求失败')
+        abortCurrentSessionTurn()
+        setStatus('API 错误', 'err')
+        kickSessionRuntimePoll()
+        if (window.__lastSessions) {
+          renderSessionList(window.__lastSessions)
+        }
+        void loadSessions({ silent: true })
+      }
+
+      /**
+       * 主 run 收到 api_error：重试期间仅更新状态栏，全部重试耗尽后再弹窗终止。
+       */
+      function handleApiErrorFromSystemMessage(msg, runId) {
+        if (runId !== 'main') return
+        if (apiErrorHandledForTurn) return
+        if (!msg || msg.type !== 'system' || msg.subtype !== 'api_error') return
+
+        const retryAttempt = Number.isFinite(msg.retryAttempt) ? msg.retryAttempt : 0
+        const maxRetries = Number.isFinite(msg.maxRetries) ? msg.maxRetries : 10
+        lastApiErrorText = extractApiErrorText(msg)
+        apiErrorRetryingForTurn = true
+        setStatus('API 错误，重试 ' + retryAttempt + '/' + maxRetries + '…', 'err')
+        kickSessionRuntimePoll()
+        if (window.__lastSessions) {
+          renderSessionList(window.__lastSessions)
+        }
+        void loadSessions({ silent: true })
+      }
+
+      /**
+       * session.error：若处于 api 重试链，表示重试已耗尽，走终态弹窗；否则仅更新状态。
+       */
+      function handleSessionErrorPayload(payload) {
+        if (apiErrorHandledForTurn) return
+        if (apiErrorRetryingForTurn) {
+          const errMsg =
+            lastApiErrorText ||
+            (payload && typeof payload.message === 'string' ? payload.message.trim() : '')
+          finalizeApiErrorTurn(errMsg || 'LLM API 请求失败')
+          return
+        }
+        const errMsg =
+          payload && typeof payload.message === 'string' && payload.message.trim()
+            ? payload.message.trim()
+            : 'unknown'
+        setStatus('错误: ' + errMsg, 'err')
+      }
+
+      if (btnApiErrorOk) {
+        btnApiErrorOk.addEventListener('click', hideApiErrorDialog)
+      }
+      if (btnApiErrorDialogClose) {
+        btnApiErrorDialogClose.addEventListener('click', hideApiErrorDialog)
+      }
+      if (apiErrorDialogBackdrop) {
+        apiErrorDialogBackdrop.addEventListener('click', hideApiErrorDialog)
+      }
+
       /** 解析并应用 WS v3 下行信封（protocolVersion === 3）；旧名 applyEnvelopeV2 易误解，保留行为不变。 */
       function applyWsEnvelopeV3(data) {
         if (!data || typeof data !== 'object') return false
@@ -2016,6 +2148,11 @@
         if (type === 'conversation.delta') {
           const action = typeof payload.action === 'string' ? payload.action : ''
           const index = Number.isInteger(payload.index) ? payload.index : -1
+          const deltaContextPct = parseContextUsagePercent(payload.contextUsage)
+          if (typeof deltaContextPct === 'number') {
+            currentSessionContextPercent = deltaContextPct
+            updatePromptSessionInfo()
+          }
           const msg = payload.message
           const sourceAgent = resolveEnvelopeSourceAgent(runId, payload, data.agent_name)
           const runBuffer = ensureRunBuffer(runId)
@@ -2039,6 +2176,9 @@
             refreshSessionTitleFromChat(sessionIdInput.value.trim())
           }
           requestRenderChat()
+          if (msg && msg.type === 'system' && msg.subtype === 'api_error') {
+            handleApiErrorFromSystemMessage(msg, runId)
+          }
           return true
         }
         if (type === 'turn.terminal') {
@@ -2067,8 +2207,19 @@
             key: typeof data.eventId === 'string' ? data.eventId : '',
           })
           /** 主 run 一轮结束：清除「查询阶段: calling_model」等进行中状态 */
-          if (runId === 'main' && serverReady) {
-            setStatus('已就绪', 'ready')
+          if (runId === 'main') {
+            if (
+              payload.status !== 'resolved' &&
+              apiErrorRetryingForTurn &&
+              !apiErrorHandledForTurn
+            ) {
+              finalizeApiErrorTurn(lastApiErrorText)
+            } else if (serverReady && !apiErrorHandledForTurn) {
+              setStatus('已就绪', 'ready')
+            }
+            if (!apiErrorHandledForTurn) {
+              resetApiErrorTurnState()
+            }
           }
           requestRenderChat()
           return true
@@ -2130,6 +2281,9 @@
             })
             requestRenderChat()
           }
+          if (type === 'session.error' && runId === 'main') {
+            handleSessionErrorPayload(payload)
+          }
           return true
         }
         if (type === 'schedule.pending') {
@@ -2175,11 +2329,20 @@
             renderSessionList(window.__lastSessions)
           }
           if (phase === 'idle') {
-            if (serverReady) setStatus('已就绪', 'ready')
+            sessionTurnActive = false
+            if (!apiErrorHandledForTurn && serverReady) {
+              setStatus('已就绪', 'ready')
+            }
+            if (!apiErrorHandledForTurn) {
+              apiErrorRetryingForTurn = false
+              lastApiErrorText = ''
+            }
             // 一轮 prompt 收尾后 transcript 已落盘，刷新列表以更新页签 firstPrompt/summary
             void loadSessions({ silent: true })
           } else if (phase) {
-            setStatus('查询阶段: ' + phase + '…', '')
+            if (!apiErrorHandledForTurn && !apiErrorRetryingForTurn) {
+              setStatus('查询阶段: ' + phase + '…', '')
+            }
             void loadSessions({ silent: true })
           }
           return true
@@ -2495,9 +2658,15 @@
         return u.toString()
       }
 
-      function buildSchedulesUrl() {
+      function buildSchedulesUrl(page, pageSize) {
         const u = new URL('/api/schedules', httpOriginForApi() + '/')
         u.searchParams.set('agent', currentAgentParam())
+        if (typeof page === 'number' && page >= 1) {
+          u.searchParams.set('page', String(page))
+        }
+        if (typeof pageSize === 'number' && pageSize >= 1) {
+          u.searchParams.set('pageSize', String(pageSize))
+        }
         return u.toString()
       }
 
@@ -2706,6 +2875,11 @@
       const scheduleManageState = {
         viewActive: false,
         contentView: 'list',
+        page: 1,
+        pageSize: 10,
+        total: 0,
+        totalPages: 0,
+        loading: false,
       }
 
       /** 切换定时任务列表与执行记录面板 */
@@ -3497,13 +3671,36 @@
         return formatScheduleFireAt(task.nextFireAt)
       }
 
+      /** 渲染定时任务列表分页控件 */
+      function renderScheduleTasksPager() {
+        if (!scheduleTasksPager) return
+        scheduleTasksPager.innerHTML = ''
+        const totalPages = scheduleManageState.totalPages || 0
+        scheduleTasksPager.hidden = totalPages <= 1
+        if (totalPages <= 1) return
+        const pager = createCloudPager(scheduleManageState, function (nextPage) {
+          void loadScheduleTasks(nextPage).catch(function (e) {
+            window.alert('加载失败: ' + e)
+          })
+        })
+        scheduleTasksPager.appendChild(pager)
+      }
+
       /** 渲染定时任务表格 */
-      function renderScheduleTaskTable(tasks, timezone) {
+      function renderScheduleTaskTable(tasks, timezone, total) {
         if (!scheduleTaskTableBody || !scheduleManageEmpty) return
         scheduleTaskTableBody.innerHTML = ''
         const list = Array.isArray(tasks) ? tasks : []
-        scheduleManageEmpty.hidden = list.length > 0
-        if (list.length > 0) scheduleManageEmpty.classList.remove('is-error')
+        const totalCount =
+          typeof total === 'number' && Number.isFinite(total) ? total : list.length
+        if (totalCount > 0) {
+          scheduleManageEmpty.hidden = true
+          scheduleManageEmpty.classList.remove('is-error')
+        } else {
+          scheduleManageEmpty.hidden = false
+          scheduleManageEmpty.textContent = '暂无定时任务'
+          scheduleManageEmpty.classList.remove('is-error')
+        }
         for (let i = 0; i < list.length; i++) {
           const task = list[i]
           if (!task || !task.id) continue
@@ -3559,18 +3756,42 @@
         }
         if (scheduleManageMeta) {
           scheduleManageMeta.textContent =
-            '时区: ' + (timezone || 'local') + ' · 共 ' + list.length + ' 个任务'
+            '时区: ' +
+            (timezone || 'local') +
+            ' · 共 ' +
+            totalCount +
+            ' 个任务' +
+            (scheduleManageState.totalPages > 1
+              ? ' · 第 ' +
+                scheduleManageState.page +
+                '/' +
+                scheduleManageState.totalPages +
+                ' 页'
+              : '')
         }
+        renderScheduleTasksPager()
       }
 
-      /** 拉取 agent 全部定时任务 */
-      async function loadScheduleTasks() {
-        const res = await fetch(buildSchedulesUrl())
+      /** 拉取 agent 定时任务（按创建时间倒序，分页） */
+      async function loadScheduleTasks(page) {
+        if (typeof page === 'number' && page >= 1) {
+          scheduleManageState.page = page
+        }
+        scheduleManageState.loading = true
+        renderScheduleTasksPager()
+        const res = await fetch(
+          buildSchedulesUrl(scheduleManageState.page, scheduleManageState.pageSize),
+        )
         const body = await res.json()
+        scheduleManageState.loading = false
         if (!res.ok) {
           throw new Error(body.message || body.error || res.statusText)
         }
-        renderScheduleTaskTable(body.tasks, body.timezone)
+        scheduleManageState.page = Number(body.page) || scheduleManageState.page
+        scheduleManageState.pageSize = Number(body.pageSize) || scheduleManageState.pageSize
+        scheduleManageState.total = Number(body.total) || 0
+        scheduleManageState.totalPages = Number(body.totalPages) || 0
+        renderScheduleTaskTable(body.tasks, body.timezone, scheduleManageState.total)
         return body
       }
 
@@ -3623,7 +3844,7 @@
         if (scheduleCreateForm) scheduleCreateForm.hidden = true
         if (scheduleTaskNameInput) scheduleTaskNameInput.value = ''
         if (schedulePromptInput) schedulePromptInput.value = ''
-        await loadScheduleTasks()
+        await loadScheduleTasks(1)
       }
 
       function buildScheduleRunUrl(id) {
@@ -3701,8 +3922,14 @@
         if (!scheduleRunsTableBody || !scheduleRunsEmpty) return
         scheduleRunsTableBody.innerHTML = ''
         const list = Array.isArray(runs) ? runs : []
-        scheduleRunsEmpty.hidden = list.length > 0
-        if (list.length > 0) scheduleRunsEmpty.classList.remove('is-error')
+        if (list.length > 0) {
+          scheduleRunsEmpty.hidden = true
+          scheduleRunsEmpty.classList.remove('is-error')
+        } else {
+          scheduleRunsEmpty.hidden = false
+          scheduleRunsEmpty.textContent = '暂无执行记录'
+          scheduleRunsEmpty.classList.remove('is-error')
+        }
         if (scheduleRunResultPre) {
           scheduleRunResultPre.hidden = true
           scheduleRunResultPre.textContent = ''
@@ -3865,14 +4092,19 @@
         if (!scheduleManageView) return
         setScheduleContentView('list')
         setScheduleManageVisible(true)
+        scheduleManageState.page = 1
         if (scheduleTaskTableBody) scheduleTaskTableBody.innerHTML = ''
+        if (scheduleTasksPager) {
+          scheduleTasksPager.innerHTML = ''
+          scheduleTasksPager.hidden = true
+        }
         if (scheduleManageEmpty) {
           scheduleManageEmpty.hidden = false
           scheduleManageEmpty.textContent = '加载中…'
           scheduleManageEmpty.classList.remove('is-error')
         }
         try {
-          await loadScheduleTasks()
+          await loadScheduleTasks(1)
         } catch (e) {
           if (scheduleManageEmpty) {
             scheduleManageEmpty.hidden = false
@@ -5379,6 +5611,7 @@
         const text = getPromptPlainText()
         const trimmed = text.trim()
         if (!trimmed) return
+        resetApiErrorTurnState()
         setPendingUserEcho(trimmed)
         const payload = { type: 'prompt', text: text }
         autoScrollState.mode = 'FORCE_ON_SEND'
@@ -8469,14 +8702,6 @@
             : ''
           const value = String(raw ?? '').trim()
           if (!value) continue
-          if (field.key === TUITUI_CHANNEL_SESSION_KEY) {
-            if (!TUITUI_CHANNEL_SESSION_ALLOWED.has(value)) {
-              return {
-                ok: false,
-                message: 'TUITUI_CHANNEL_SESSION 只允许 0（禁用）或 1（启用）',
-              }
-            }
-          }
           out[field.key] = value
         }
         return { ok: true, env: out }

package/mcps-runtime/claude-tuitui-channel/server/index.mjs

@@ -7,8 +7,6 @@ import {
   readFileSync,
   writeFileSync,
 } from "node:fs";
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import * as z from "zod";
@@ -36,10 +34,6 @@ const projectSettingsLocalFile = join(
   projectSettingsDir,
   "settings.local.json",
 );
-const execFileAsync = promisify(execFile);
-const CLAUDE_BIN = process.env.CLAUDE_BIN || "claude";
-const AUTO_REPLY_ENABLED =
-  String(process.env.TUITUI_AUTO_REPLY || "true").toLowerCase() !== "false";
 const account = {
   appId: process.env.TUITUI_APP_ID,
   appSecret: process.env.TUITUI_APP_SECRET,