@auto-ai/agent 2.1.220 → 2.1.222

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

@@ -167,6 +167,63 @@
       const mcpPackageImportInput = $('mcpPackageImportInput')
       const sessionListEl = $('sessionList')
       const sessionListMetaEl = $('sessionListMeta')
+      /** 侧栏会话来源：ws / tuitui / geelib / team / legacy */
+      var SESSION_KIND_LABELS = {
+        ws: '网页',
+        tuitui: '推推',
+        geelib: 'GeeLib',
+        team: '群聊',
+        legacy: '会话',
+      }
+      function resolveSessionKindForItem(s) {
+        if (!s || typeof s !== 'object') return 'ws'
+        var kind = s.sessionKind
+        if (kind && SESSION_KIND_LABELS[kind]) return kind
+        if (kind === 'user') return 'ws'
+        var sid = typeof s.sessionId === 'string' ? s.sessionId : ''
+        if (sid.indexOf('team-') === 0) return 'team'
+        if (sid.indexOf('tuitui-') === 0) return 'tuitui'
+        if (sid.indexOf('geelib-') === 0) return 'geelib'
+        if (sid.indexOf('ws-') === 0) return 'ws'
+        return 'legacy'
+      }
+      var SESSION_KIND_ICON_SVG = {
+        ws:
+          '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+          '<rect x="3" y="4" width="18" height="14" rx="2"/>' +
+          '<path d="M8 20h8"/>' +
+          '</svg>',
+        tuitui:
+          '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+          '<path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"/>' +
+          '<path d="M13.73 21a2 2 0 0 1-3.46 0"/>' +
+          '</svg>',
+        geelib:
+          '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+          '<path d="M4 4h16v16H4z"/>' +
+          '<path d="M4 9h16M9 4v16"/>' +
+          '</svg>',
+        team:
+          '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+          '<circle cx="8" cy="8" r="2.8"/>' +
+          '<circle cx="16.2" cy="9.2" r="2.4"/>' +
+          '<path d="M3.2 18c.8-2.7 2.8-4.2 4.8-4.2s4 1.5 4.8 4.2"/>' +
+          '<path d="M13.2 18c.6-2 2.2-3.2 4-3.2 1.6 0 3.1 1 3.8 2.7"/>' +
+          '</svg>',
+        legacy:
+          '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+          '<path d="M21 11.5a8.4 8.4 0 0 1-9 8.4 8.4 8.4 0 0 1-3.8-.9L3 20l1.9-5.2A8.4 8.4 0 1 1 21 11.5z"/>' +
+          '</svg>',
+      }
+      function createSessionKindIcon(kind) {
+        var resolved = SESSION_KIND_LABELS[kind] ? kind : 'ws'
+        var icon = document.createElement('span')
+        icon.className = 'sidebar-session-kind-icon sidebar-session-kind-icon--' + resolved
+        icon.setAttribute('aria-hidden', 'true')
+        icon.title = SESSION_KIND_LABELS[resolved]
+        icon.innerHTML = SESSION_KIND_ICON_SVG[resolved]
+        return icon
+      }
       /** 侧栏会话列表运行时状态轮询定时器 */
       let sessionRuntimePollTimer = null
       /** 当前附着 session 的 turn 是否进行中（由 query.progress 驱动） */
@@ -280,18 +337,21 @@
       const composerToolAskSelect = $('composerToolAskSelect')
       const btnSaveAgentConfig = $('btnSaveAgentConfig')
       const pickerManageView = $('pickerManageView')
-      const pickerNavPanel = $('pickerNavPanel')
-      const pickerNavList = $('pickerNavList')
       const pickerSearch = $('pickerSearch')
       const btnPickerMcpJson = $('btnPickerMcpJson')
       const btnPickerImport = $('btnPickerImport')
+      const btnPickerSkillStore = $('btnPickerSkillStore')
       const btnPickerCancel = $('btnPickerCancel')
       const btnPickerSave = $('btnPickerSave')
       const pickerEntriesTable = $('pickerEntriesTable')
       const pickerTableHeadRow = $('pickerTableHeadRow')
       const pickerEntriesBody = $('pickerEntriesBody')
-      const pickerCloudPanel = $('pickerCloudPanel')
       const pickerContentState = $('pickerContentState')
+      const skillStoreModal = $('skillStoreModal')
+      const skillStoreModalBackdrop = $('skillStoreModalBackdrop')
+      const skillStoreModalBody = $('skillStoreModalBody')
+      const btnSkillStoreModalClose = $('btnSkillStoreModalClose')
+      const btnSkillStoreClose = $('btnSkillStoreClose')
       const pickerImportInput = $('pickerImportInput')
       const mcpJsonInputModal = $('mcpJsonInputModal')
       const mcpJsonInputModalBackdrop = $('mcpJsonInputModalBackdrop')
@@ -362,6 +422,7 @@
       let refreshToolPickerRows = null
       let refreshMcpPickerRows = null
       let refreshSkillPickerRows = null
+      let openSkillStoreModalFn = null
       let pickerRenderContent = null
       let remoteMcpServers = []
       const WS_PERMISSION_MODE_KEY = 'WS_PERMISSION_MODE'
@@ -720,6 +781,8 @@
       let renderScheduled = false
       /** HTTP 历史回放进行中：暂存实时 conversation.delta，避免与回放竞态写乱 transcript 下标 */
       let sessionReplayInProgress = false
+      /** 递增以作废进行中的 HTTP 历史回放，避免快速切换 session 时旧内容回填 */
+      let hydrateSessionGeneration = 0
       const pendingConversationDeltaEnvelopes = []
       /**
        * 用户点击发送后、服务端 conversation.delta 到达前的本地回显。
@@ -767,6 +830,7 @@
           source: source,
           runId: runId,
           correlationId: correlationId,
+          turnId: typeof item.turnId === 'string' ? item.turnId : '',
           text: body,
           status: status,
           scheduledTrigger: item.scheduledTrigger === true,
@@ -1500,6 +1564,84 @@
         bodyEl.insertAdjacentElement('afterend', btn)
       }
 
+      /**
+       * 业务语义：HTTP 回放/初始化 turnId 为 replay|init，需按 user 消息再切分；
+       * 实时 turn 每轮 prompt 有独立 UUID turnId，直接按 turnId 分组。
+       */
+      function shouldSplitTurnOnUserMessage(turnId) {
+        const tid = typeof turnId === 'string' ? turnId.trim() : ''
+        return !tid || tid === 'replay' || tid === 'init'
+      }
+
+      function isRealUserPromptMessage(m) {
+        if (!m || m.type !== 'user') return false
+        if (!shouldShowWsUserMessage(m)) return false
+        const blocks = getMessageContentBlocks(m)
+        const nonToolBlocks = blocks.filter(function (b) {
+          return b && b.type !== 'tool_result'
+        })
+        if (nonToolBlocks.length === 0) return false
+        const rawBody = contentToPlainText(nonToolBlocks).trim()
+        return !!unwrapChannelWrappedText(rawBody).body.trim()
+      }
+
+      function isTimelineUserTurnStart(ev) {
+        if (!ev || ev.kind !== 'conversation') return false
+        const item = ev.payload
+        const m = item && item.message
+        return isRealUserPromptMessage(m)
+      }
+
+      function isToolResultOnlyEvent(ev) {
+        if (!ev || ev.kind !== 'conversation') return false
+        const m = ev.payload && ev.payload.message
+        if (!m || m.type !== 'user') return false
+        const blocks = getMessageContentBlocks(m)
+        if (!blocks.length) return false
+        return blocks.every(function (b) {
+          return b && b.type === 'tool_result'
+        })
+      }
+
+      function coalesceToolResultTurns(turns) {
+        for (let i = 1; i < turns.length; i++) {
+          const turn = turns[i]
+          if (turn.items.length > 0 && turn.items.every(isToolResultOnlyEvent)) {
+            turns[i - 1].items.push.apply(turns[i - 1].items, turn.items)
+            turns.splice(i, 1)
+            i -= 1
+          }
+        }
+        return turns
+      }
+
+      function groupItemsByTurn(blockItems) {
+        const turns = []
+        for (let i = 0; i < blockItems.length; i++) {
+          const ev = blockItems[i]
+          const turnId = typeof ev.turnId === 'string' ? ev.turnId.trim() : ''
+          const splitOnUser = shouldSplitTurnOnUserMessage(turnId)
+          const isUserStart = splitOnUser && isTimelineUserTurnStart(ev)
+          let targetTurn = turns.length > 0 ? turns[turns.length - 1] : null
+
+          if (splitOnUser) {
+            if (isUserStart || !targetTurn) {
+              targetTurn = { turnId: turnId || 'unknown', items: [] }
+              turns.push(targetTurn)
+            }
+            targetTurn.items.push(ev)
+            continue
+          }
+
+          if (!targetTurn || targetTurn.turnId !== turnId) {
+            targetTurn = { turnId: turnId, items: [] }
+            turns.push(targetTurn)
+          }
+          targetTurn.items.push(ev)
+        }
+        return coalesceToolResultTurns(turns)
+      }
+
       function renderChat() {
         /**
          * 业务语义：run 折叠头需要展示“最后一条消息前三行”预览。
@@ -1714,6 +1856,7 @@
                 Number.isInteger(item.arrivalSeq) ? item.arrivalSeq : Number.MAX_SAFE_INTEGER,
               fallbackOrder: timelineFallbackOrder++,
               runId: runId,
+              turnId: typeof item.turnId === 'string' ? item.turnId : '',
               sourceAgent: resolveRunDisplayAgent(runId, item.sourceAgent),
               scheduledTrigger: item.scheduledTrigger === true,
               kind: 'conversation',
@@ -1734,6 +1877,7 @@
               Number.isInteger(item.arrivalSeq) ? item.arrivalSeq : Number.MAX_SAFE_INTEGER,
             fallbackOrder: timelineFallbackOrder++,
             runId: rid,
+            turnId: typeof item.turnId === 'string' ? item.turnId : '',
             sourceAgent: resolveRunDisplayAgent(rid, item.source),
             scheduledTrigger: item.scheduledTrigger === true,
             kind: 'source',
@@ -1822,16 +1966,24 @@
           const groupContainer = document.createElement('div')
           groupContainer.className = 'chat-run-group' + (blockAllScheduled ? ' chat-run-group--scheduled' : '')
           if (runId === 'main') {
-            const fixedHeader = document.createElement('div')
-            fixedHeader.className = 'chat-msg-label'
-            fixedHeader.textContent = blockAllScheduled
-              ? '⏱ 定时任务 · ' + summaryText
-              : summaryText
-            groupContainer.appendChild(fixedHeader)
-            const groupBody = document.createElement('div')
-            groupBody.className = 'chat-run-group-body'
-            appendRunItemsToContainer(groupBody, blockItems, runId, defaultSourceAgent)
-            groupContainer.appendChild(groupBody)
+            groupContainer.classList.add('chat-run-group--main')
+            const turnGroups = groupItemsByTurn(blockItems)
+            for (let t = 0; t < turnGroups.length; t++) {
+              const turn = turnGroups[t]
+              if (!turn.items.length) continue
+              const isLastTurn = t === turnGroups.length - 1
+              const isActiveTurn = isLastTurn && sessionTurnActive
+              const turnSection = document.createElement('section')
+              turnSection.className =
+                'chat-turn' +
+                (isActiveTurn ? ' chat-turn--active' : '') +
+                (blockAllScheduled ? ' chat-turn--scheduled' : '')
+              const turnBody = document.createElement('div')
+              turnBody.className = 'chat-turn-body'
+              appendRunItemsToContainer(turnBody, turn.items, runId, defaultSourceAgent)
+              turnSection.appendChild(turnBody)
+              groupContainer.appendChild(turnSection)
+            }
           } else {
             const summaryCard = document.createElement('div')
             summaryCard.className =
@@ -1865,9 +2017,12 @@
           chatThreadEl.appendChild(groupContainer)
         }
         if (pendingUserEcho) {
-          const echoWrap = document.createElement('div')
-          echoWrap.className = 'chat-run-group chat-run-group--pending-echo'
-          appendPendingUserEchoToContainer(echoWrap)
+          const echoWrap = document.createElement('section')
+          echoWrap.className = 'chat-turn chat-turn--active chat-turn--pending-echo'
+          const echoBody = document.createElement('div')
+          echoBody.className = 'chat-turn-body'
+          appendPendingUserEchoToContainer(echoBody)
+          echoWrap.appendChild(echoBody)
           chatThreadEl.appendChild(echoWrap)
         }
         if (streamEntries.length > 0) {
@@ -2163,6 +2318,7 @@
           const runMessage = {
             message: msg,
             sourceAgent: sourceAgent,
+            turnId: typeof data.turnId === 'string' ? data.turnId : '',
             scheduledTrigger: payload.scheduledTrigger === true,
             ts:
               typeof data.ts === 'string' && data.ts
@@ -2205,6 +2361,7 @@
             source: source,
             runId: runId,
             correlationId: corr,
+            turnId: typeof data.turnId === 'string' ? data.turnId : '',
             status: payload.status === 'resolved' ? 'resolved' : 'failed',
             text: text,
             scheduledTrigger: payload.scheduledTrigger === true,
@@ -2286,6 +2443,7 @@
               source: source,
               runId: runId,
               correlationId: '',
+              turnId: typeof data.turnId === 'string' ? data.turnId : '',
               status: type === 'session.error' ? 'failed' : 'resolved',
               text: payloadText,
               key: typeof data.eventId === 'string' ? data.eventId : '',
@@ -2307,6 +2465,17 @@
           if (payload.agent) updateBrandAgent(payload.agent)
           setStatus('已就绪', 'ready')
           void loadPendingPrompts()
+          const mc =
+            typeof payload.messageCount === 'number' ? payload.messageCount : 0
+          const sid =
+            typeof payload.sessionId === 'string' && payload.sessionId.trim()
+              ? payload.sessionId.trim()
+              : sessionIdInput.value.trim()
+          if (mc === 0) {
+            resetChatUi()
+          } else if (sid) {
+            void hydrateSessionHistoryFromHttp(sid)
+          }
           return true
         }
         if (type === 'session.meta') {
@@ -2356,6 +2525,7 @@
             }
             void loadSessions({ silent: true })
           }
+          requestRenderChat()
           return true
         }
         if (type === 'session.error') {
@@ -2626,6 +2796,60 @@
         return u.toString()
       }
 
+      /**
+       * HTTP replay 信封中需跳过的类型：replay.start 会把 serverReady 置 false 并重新打开全屏 loading。
+       */
+      function shouldSkipHttpReplayEnvelope(ev) {
+        if (!ev || typeof ev !== 'object') return true
+        const replayType = typeof ev.type === 'string' ? ev.type : ''
+        if (replayType === 'history.replay') return true
+        if (replayType !== 'run.lifecycle') return false
+        const payload = ev.data && typeof ev.data === 'object' ? ev.data : {}
+        const state = typeof payload.state === 'string' ? payload.state : ''
+        return state === 'replay.start' || state === 'replay.end'
+      }
+
+      /**
+       * meta-only snapshot 后异步拉 HTTP replay 补全聊天区，不阻塞 session.ready 与 prompt 发送。
+       */
+      async function hydrateSessionHistoryFromHttp(sessionId) {
+        const sid = typeof sessionId === 'string' ? sessionId.trim() : ''
+        if (!sid) return
+        const generation = hydrateSessionGeneration
+        const wasReady = serverReady
+        try {
+          resetChatUi()
+          sessionReplayInProgress = true
+          pendingConversationDeltaEnvelopes.length = 0
+          const r = await fetch(buildSessionReplayUrl(sid))
+          if (generation !== hydrateSessionGeneration) return
+          if (!r.ok) {
+            logLine('error', 'hydrateSessionHistoryFromHttp: HTTP ' + r.status)
+            return
+          }
+          const data = await r.json()
+          const envelopes = Array.isArray(data.envelopes) ? data.envelopes : []
+          for (let i = 0; i < envelopes.length; i++) {
+            if (generation !== hydrateSessionGeneration) return
+            const ev = envelopes[i]
+            if (shouldSkipHttpReplayEnvelope(ev)) continue
+            applyWsEnvelopeV3(ev)
+          }
+        } catch (e) {
+          logLine('error', 'hydrateSessionHistoryFromHttp: ' + String(e))
+        } finally {
+          if (generation !== hydrateSessionGeneration) return
+          sessionReplayInProgress = false
+          flushPendingConversationDeltas()
+          requestRenderChat()
+          if (wasReady || serverReady) {
+            serverReady = true
+            setStatus('已就绪', 'ready')
+            updateButtons()
+          }
+        }
+      }
+
       /** UI 不展示 resume 合成 assistant 占位（与 messages.SYNTHETIC_MESSAGES 对齐） */
       const WS_SYNTHETIC_ASSISTANT_TEXTS = new Set(['No response requested.'])
 
@@ -3277,12 +3501,10 @@
         return (pickerSearch && pickerSearch.value.trim().toLowerCase()) || ''
       }
 
-      /** 切换表格与云端面板显示 */
-      function setPickerContentMode(mode) {
-        const isCloud = mode === 'cloud'
-        if (pickerEntriesTable) pickerEntriesTable.hidden = isCloud
-        if (pickerCloudPanel) pickerCloudPanel.hidden = !isCloud
-        if (!isCloud && pickerContentState) {
+      /** 切换 Picker 内容为表格模式 */
+      function setPickerContentMode() {
+        if (pickerEntriesTable) pickerEntriesTable.hidden = false
+        if (pickerContentState) {
           pickerContentState.hidden = true
           pickerContentState.textContent = ''
         }
@@ -3329,34 +3551,6 @@
         return td
       }
 
-      /** 控制 Picker 左侧分类栏显隐（仅 Skill 页保留分类，其余合并为单表） */
-      function setPickerNavPanelVisible(visible) {
-        if (!pickerNavPanel) return
-        pickerNavPanel.hidden = !visible
-        if (!visible && pickerNavList) pickerNavList.innerHTML = ''
-      }
-
-      /** 渲染 Picker 左侧分类导航 */
-      function renderPickerNavTabs(tabDefs, activeId, onChange) {
-        if (!pickerNavList) return
-        pickerNavList.innerHTML = ''
-        pickerManageState.activeTab = activeId
-        for (let i = 0; i < tabDefs.length; i++) {
-          const tab = tabDefs[i]
-          const btn = document.createElement('button')
-          btn.type = 'button'
-          btn.className = 'picker-nav-item' + (tab.id === activeId ? ' is-selected' : '')
-          btn.setAttribute('role', 'tab')
-          btn.setAttribute('aria-selected', tab.id === activeId ? 'true' : 'false')
-          btn.textContent = tab.label
-          btn.addEventListener('click', function () {
-            if (tab.id === activeId) return
-            onChange(tab.id)
-          })
-          pickerNavList.appendChild(btn)
-        }
-      }
-
       /** 设置 entries/history 面板加载或错误态 */
       function setRepoPanelState(el, message, isError) {
         if (!el) return
@@ -4914,6 +5108,13 @@
         skillPackageModal.setAttribute('aria-hidden', 'true')
         document.body.style.overflow = ''
       }
+
+      function closeSkillStoreModal() {
+        if (!skillStoreModal) return
+        skillStoreModal.classList.remove('is-open')
+        skillStoreModal.setAttribute('aria-hidden', 'true')
+        document.body.style.overflow = ''
+      }
       function closeRunGroupModal() {
         if (!runGroupModal) return
         runGroupModal.classList.remove('is-open')
@@ -5458,7 +5659,7 @@
         if (!list.length) {
           const empty = document.createElement('span')
           empty.className = 'session-tabs-empty'
-          empty.textContent = '暂无历史会话'
+          empty.textContent = '暂无会话'
           sessionListEl.appendChild(empty)
           return
         }
@@ -5484,6 +5685,7 @@
           const mainBtn = document.createElement('button')
           mainBtn.type = 'button'
           mainBtn.className = 'sidebar-session-main'
+          mainBtn.appendChild(createSessionKindIcon(resolveSessionKindForItem(s)))
           if (isRunning) {
             const runBadge = document.createElement('span')
             runBadge.className = 'sidebar-session-running-badge'
@@ -5572,7 +5774,7 @@
         return u.toString()
       }
 
-      /** 列表里是否存在运行中 session（子进程存活或当前页 turn 进行中） */
+      /** 列表里是否存在运行中 session（主 run query 进行中或当前页 turn 进行中） */
       function sessionListHasRunning(sessions) {
         if (!Array.isArray(sessions)) return false
         const current = sessionIdInput ? sessionIdInput.value.trim() : ''
@@ -5713,6 +5915,9 @@
         }
         sessionIdInput.value = nextSid
         currentSessionContextPercent = null
+        sessionTurnActive = false
+        hydrateSessionGeneration += 1
+        resetChatUi()
         void loadPendingPrompts()
         if (nextSid) {
           void loadSessionOverridesIntoComposer()
@@ -7420,15 +7625,18 @@
             kind === 'mcp' ? '导入 MCP' : kind === 'skills' ? '导入 Skill' : '导入 zip'
           btnPickerImport.disabled = false
         }
+        if (btnPickerSkillStore) {
+          btnPickerSkillStore.hidden = kind !== 'skills'
+          btnPickerSkillStore.disabled = false
+        }
         if (btnPickerMcpJson) {
           btnPickerMcpJson.hidden = kind !== 'mcp'
           btnPickerMcpJson.disabled = false
         }
         if (btnPickerCancel) btnPickerCancel.hidden = kind === 'skills' || kind === 'mcp'
         if (btnPickerSave) btnPickerSave.hidden = kind === 'skills' || kind === 'mcp'
-        setPickerNavPanelVisible(kind === 'skills')
         setPickerContentState('加载中…', false)
-        setPickerContentMode('table')
+        setPickerContentMode()
         clearPickerTableBody()
 
         if (kind === 'tools') {
@@ -7553,7 +7761,7 @@
             return tr
           }
           const renderToolsRows = function () {
-            setPickerContentMode('table')
+            setPickerContentMode()
             setPickerTableHead(['名称', '类型', '详细信息', '操作'])
             clearPickerTableBody()
             setPickerContentState('', false)
@@ -7727,7 +7935,7 @@
                 return tr
               }
               const renderMcpRows = function () {
-                setPickerContentMode('table')
+                setPickerContentMode()
                 setPickerTableHead(['名称', '来源', '操作'])
                 clearPickerTableBody()
                 setPickerContentState('', false)
@@ -7828,7 +8036,7 @@
             return (tags.length ? tags.join(' ') : '—') + (summary ? ' — ' + summary : '')
           }
           const renderAgentTeamsRows = function () {
-            setPickerContentMode('table')
+            setPickerContentMode()
             setPickerTableHead(['成员', '配置', '操作'])
             clearPickerTableBody()
             setPickerContentState('', false)
@@ -7881,7 +8089,6 @@
             })
         } else {
           const skillPickerState = {
-            activeTab: 'list',
             baseRows: [],
             installedRows: [],
             cloudRows: [],
@@ -7995,8 +8202,8 @@
                 return tr
               }
               const renderCloudSkillPanel = function () {
-                if (!pickerCloudPanel) return
-                pickerCloudPanel.innerHTML = ''
+                if (!skillStoreModalBody) return
+                skillStoreModalBody.innerHTML = ''
                 const cloudSearch = document.createElement('input')
                 cloudSearch.type = 'search'
                 cloudSearch.className = 'agent-picker-cloud-search'
@@ -8007,13 +8214,13 @@
                   skillPickerState.cloudPage = 1
                   void loadCloudSkillRows()
                 }
-                pickerCloudPanel.appendChild(cloudSearch)
+                skillStoreModalBody.appendChild(cloudSearch)
                 const meta = document.createElement('div')
                 meta.className = 'agent-picker-cloud-meta'
                 if (skillPickerState.cloudLoading) meta.textContent = '加载中…'
                 else if (skillPickerState.cloudError) meta.textContent = '加载失败：' + skillPickerState.cloudError
                 else meta.textContent = '展示前 ' + skillPickerState.cloudRows.length + ' 项'
-                pickerCloudPanel.appendChild(meta)
+                skillStoreModalBody.appendChild(meta)
                 if (!skillPickerState.cloudError && skillPickerState.cloudRows.length) {
                   for (let i = 0; i < skillPickerState.cloudRows.length; i++) {
                     const item = skillPickerState.cloudRows[i]
@@ -8031,7 +8238,7 @@
                       installing ? '处理中…' : installed ? '卸载' : '安装', '', function () {
                         if (installBtn.disabled) return
                         skillPickerState.installingMap[item.id] = true
-                        renderSkillRows()
+                        renderCloudSkillPanel()
                         const request = installed
                           ? fetch(buildRuntimeSkillDeleteUrl(item.packageId), { method: 'DELETE' })
                           : fetch(buildCloudSkillInstallUrl(), {
@@ -8049,21 +8256,23 @@
                             else pickerSelected.add(item.skillName || item.id)
                             setStatus('云端技能已' + (installed ? '卸载' : '安装') + '：' + item.title, serverReady ? 'ready' : '')
                             return persistSkillSelectionNow().then(function () {
-                              return refreshSkillPickerRows()
+                              return refreshSkillPickerRows().then(function () {
+                                return loadCloudSkillRows()
+                              })
                             })
                           })
                           .catch(function (e) { window.alert((installed ? '卸载' : '安装') + '失败: ' + e) })
                           .finally(function () {
                             delete skillPickerState.installingMap[item.id]
-                            renderSkillRows()
+                            renderCloudSkillPanel()
                           })
                       }, { disabled: installing },
                     )
                     actions.appendChild(installBtn)
                     row.appendChild(actions)
-                    pickerCloudPanel.appendChild(row)
+                    skillStoreModalBody.appendChild(row)
                   }
-                  pickerCloudPanel.appendChild(createCloudPager({
+                  skillStoreModalBody.appendChild(createCloudPager({
                     page: skillPickerState.cloudPage,
                     totalPages: skillPickerState.cloudTotalPages,
                     loading: skillPickerState.cloudLoading,
@@ -8075,24 +8284,11 @@
                   const empty = document.createElement('div')
                   empty.className = 'agent-picker-empty'
                   empty.textContent = skillPickerState.cloudLoading ? '（技能商店加载中）' : '（无匹配项）'
-                  pickerCloudPanel.appendChild(empty)
+                  skillStoreModalBody.appendChild(empty)
                 }
               }
               const renderSkillRows = function () {
-                renderPickerNavTabs(
-                  [
-                    { id: 'list', label: 'Skill' },
-                    { id: 'cloud', label: 'skill商店' },
-                  ],
-                  skillPickerState.activeTab,
-                  function (id) { skillPickerState.activeTab = id; renderSkillRows() },
-                )
-                if (skillPickerState.activeTab === 'cloud') {
-                  setPickerContentMode('cloud')
-                  renderCloudSkillPanel()
-                  return
-                }
-                setPickerContentMode('table')
+                setPickerContentMode()
                 setPickerTableHead(['名称', '描述', '操作'])
                 clearPickerTableBody()
                 setPickerContentState('', false)
@@ -8118,7 +8314,7 @@
                 skillPickerState.cloudSeq = seq
                 skillPickerState.cloudLoading = true
                 skillPickerState.cloudError = ''
-                renderSkillRows()
+                renderCloudSkillPanel()
                 return fetch(buildCloudSkillCatalogUrl(skillPickerState.cloudQuery, skillPickerState.cloudPage, skillPickerState.cloudPageSize))
                   .then(function (r) {
                     return r.json().then(function (b) {
@@ -8131,21 +8327,28 @@
                     skillPickerState.cloudRows = Array.isArray(x.b.items) ? x.b.items : []
                     skillPickerState.cloudTotalPages = Number(x.b.totalPages || 0)
                     skillPickerState.cloudLoading = false
-                    renderSkillRows()
+                    renderCloudSkillPanel()
                   })
                   .catch(function (e) {
                     if (seq !== skillPickerState.cloudSeq) return
                     skillPickerState.cloudRows = []
                     skillPickerState.cloudLoading = false
                     skillPickerState.cloudError = String(e)
-                    renderSkillRows()
+                    renderCloudSkillPanel()
                   })
               }
+              openSkillStoreModalFn = function () {
+                if (!skillStoreModal) return
+                skillStoreModal.classList.add('is-open')
+                skillStoreModal.setAttribute('aria-hidden', 'false')
+                document.body.style.overflow = 'hidden'
+                skillPickerState.cloudPage = 1
+                void loadCloudSkillRows()
+              }
               refreshSkillPickerRows = function () {
                 return Promise.all([
                   fetchSkillRows(buildSkillBaseListUrl),
                   fetchSkillRows(buildSkillInstalledListUrl),
-                  loadCloudSkillRows(),
                 ])
                   .then(function (allRows) {
                     skillPickerState.baseRows = allRows[0]
@@ -9100,6 +9303,20 @@
           openSkillPackageModal()
         })
       }
+      if (btnPickerSkillStore) {
+        btnPickerSkillStore.addEventListener('click', function () {
+          if (typeof openSkillStoreModalFn === 'function') openSkillStoreModalFn()
+        })
+      }
+      if (btnSkillStoreModalClose) {
+        btnSkillStoreModalClose.addEventListener('click', closeSkillStoreModal)
+      }
+      if (btnSkillStoreClose) {
+        btnSkillStoreClose.addEventListener('click', closeSkillStoreModal)
+      }
+      if (skillStoreModalBackdrop) {
+        skillStoreModalBackdrop.addEventListener('click', closeSkillStoreModal)
+      }
       if (btnSkillPackageModalClose) {
         btnSkillPackageModalClose.addEventListener('click', closeSkillPackageModal)
       }