@auto-ai/agent 2.1.174 → 2.1.176

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

@@ -105,11 +105,14 @@
       const runGroupModalTitle = $('runGroupModalTitle')
       const runGroupModalBody = $('runGroupModalBody')
       const btnRunGroupModalClose = $('btnRunGroupModalClose')
-      const scheduleManageModal = $('scheduleManageModal')
-      const scheduleManageModalBackdrop = $('scheduleManageModalBackdrop')
+      const scheduleManageView = $('scheduleManageView')
       const scheduleManageMeta = $('scheduleManageMeta')
+      const scheduleTasksWrap = $('scheduleTasksWrap')
+      const scheduleRunsWrap = $('scheduleRunsWrap')
       const scheduleTaskTableBody = $('scheduleTaskTableBody')
       const scheduleManageEmpty = $('scheduleManageEmpty')
+      const btnScheduleRunsBack = $('btnScheduleRunsBack')
+      const scheduleRunsTitle = $('scheduleRunsTitle')
       const btnScheduleManageModalClose = $('btnScheduleManageModalClose')
       const btnScheduleRefresh = $('btnScheduleRefresh')
       const btnScheduleCreateToggle = $('btnScheduleCreateToggle')
@@ -121,9 +124,6 @@
       const scheduleRecurringInput = $('scheduleRecurringInput')
       const scheduleDelayRow = $('scheduleDelayRow')
       const scheduleCronRow = $('scheduleCronRow')
-      const scheduleRunsModal = $('scheduleRunsModal')
-      const scheduleRunsModalBackdrop = $('scheduleRunsModalBackdrop')
-      const scheduleRunsModalTitle = $('scheduleRunsModalTitle')
       const scheduleRunsMeta = $('scheduleRunsMeta')
       const scheduleRunsTableBody = $('scheduleRunsTableBody')
       const scheduleRunsEmpty = $('scheduleRunsEmpty')
@@ -132,7 +132,6 @@
       let scheduleRunsViewTaskName = ''
       const btnScheduleCreateCancel = $('btnScheduleCreateCancel')
       const btnScheduleCreateSubmit = $('btnScheduleCreateSubmit')
-      const btnManageAgents = $('btnManageAgents')
       const btnManageRepo = $('btnManageRepo')
       const repoManageView = $('repoManageView')
       const chatWorkspace = $('chatWorkspace')
@@ -166,9 +165,6 @@
       const brandAgentSwitchBtnEl = $('brandAgentSwitchBtn')
       /** agent id → 展示名（来自 /api/agents） */
       const agentDisplayNameById = Object.create(null)
-      const agentSwitchWrapEl = $('agentSwitchWrap')
-      const agentSwitchDropdownEl = $('agentSwitchDropdown')
-      let agentSwitchOpen = false
       const sidebarHoverTipEl = $('sidebarHoverTip')
       const sidebarAsideEl = document.querySelector('aside.sidebar')
       let sidebarHoverTipHideTimer = null
@@ -262,20 +258,20 @@
       const composerModeSelect = $('composerModeSelect')
       const composerToolAskSelect = $('composerToolAskSelect')
       const btnSaveAgentConfig = $('btnSaveAgentConfig')
-      const agentPickerModal = $('agentPickerModal')
-      const agentPickerModalBackdrop = $('agentPickerModalBackdrop')
-      const agentPickerModalCard = $('agentPickerModalCard')
-      const agentPickerModalTitle = $('agentPickerModalTitle')
-      const agentPickerSearch = $('agentPickerSearch')
-      const agentPickerSessionTabStrip = $('agentPickerSessionTabStrip')
-      const agentPickerSessionTabList = $('agentPickerSessionTabList')
-      const agentPickerList = $('agentPickerList')
-      const btnAgentPickerClose = $('btnAgentPickerClose')
-      const btnAgentPickerCancel = $('btnAgentPickerCancel')
-      const btnAgentPickerOk = $('btnAgentPickerOk')
-      const btnAgentPickerMcpJson = $('btnAgentPickerMcpJson')
-      const btnAgentPickerToolImport = $('btnAgentPickerToolImport')
-      const agentPickerToolImportInput = $('agentPickerToolImportInput')
+      const pickerManageView = $('pickerManageView')
+      const pickerNavPanel = $('pickerNavPanel')
+      const pickerNavList = $('pickerNavList')
+      const pickerSearch = $('pickerSearch')
+      const btnPickerMcpJson = $('btnPickerMcpJson')
+      const btnPickerImport = $('btnPickerImport')
+      const btnPickerCancel = $('btnPickerCancel')
+      const btnPickerSave = $('btnPickerSave')
+      const pickerEntriesTable = $('pickerEntriesTable')
+      const pickerTableHeadRow = $('pickerTableHeadRow')
+      const pickerEntriesBody = $('pickerEntriesBody')
+      const pickerCloudPanel = $('pickerCloudPanel')
+      const pickerContentState = $('pickerContentState')
+      const pickerImportInput = $('pickerImportInput')
       const mcpJsonInputModal = $('mcpJsonInputModal')
       const mcpJsonInputModalBackdrop = $('mcpJsonInputModalBackdrop')
       const mcpJsonInputEditor = $('mcpJsonInputEditor')
@@ -334,11 +330,18 @@
       let agentEnvFieldValues = {}
       let agentEnvActiveTab = 'settings'
       let agentEnvAgentMdLoadOk = false
+      const pickerManageState = {
+        viewActive: false,
+        kind: 'tools',
+        activeTab: '',
+        draftSelected: new Set(),
+      }
       let pickerKind = 'tools'
-      let pickerSelected = new Set()
+      let pickerSelected = pickerManageState.draftSelected
       let refreshToolPickerRows = null
       let refreshMcpPickerRows = null
       let refreshSkillPickerRows = null
+      let pickerRenderContent = null
       let remoteMcpServers = []
       const WS_PERMISSION_MODE_KEY = 'WS_PERMISSION_MODE'
       const LLM_MODEL_KEY = 'LLM_MODEL'
@@ -2187,11 +2190,24 @@
         const label = agentBrandLabel(id)
         if (brandAgentNameEl) brandAgentNameEl.textContent = label
         if (brandAgentSwitchBtnEl) {
-          brandAgentSwitchBtnEl.setAttribute('title', '切换 Agent：' + label)
-          brandAgentSwitchBtnEl.setAttribute(
-            'aria-label',
-            '当前 Agent ' + label + '，点击切换',
-          )
+          brandAgentSwitchBtnEl.setAttribute('title', '返回首页：' + label)
+          brandAgentSwitchBtnEl.setAttribute('aria-label', '返回首页：' + label)
+        }
+      }
+
+      /** 跳转 agent 办公室首页 */
+      function goToAgentHomePage() {
+        const cur = currentAgentParam()
+        window.location.href = cur ? '/?agent=' + encodeURIComponent(cur) : '/'
+      }
+
+      /** 清除侧栏管理导航选中态 */
+      function clearSidebarNavActive() {
+        const navEl = document.querySelector('.sidebar-nav')
+        if (!navEl) return
+        const items = navEl.querySelectorAll('.sidebar-nav-row')
+        for (let i = 0; i < items.length; i++) {
+          items[i].classList.remove('is-active')
         }
       }
 
@@ -2223,175 +2239,6 @@
         ).toString()
       }
 
-      /** 关闭 agent 切换下拉，恢复头像按钮状态 */
-      function closeAgentSwitchMenu() {
-        agentSwitchOpen = false
-        if (agentSwitchWrapEl) agentSwitchWrapEl.classList.remove('open')
-        if (agentSwitchDropdownEl) {
-          agentSwitchDropdownEl.classList.remove('is-open')
-          agentSwitchDropdownEl.hidden = true
-          agentSwitchDropdownEl.style.left = ''
-          agentSwitchDropdownEl.style.top = ''
-        }
-        if (brandAgentSwitchBtnEl) brandAgentSwitchBtnEl.setAttribute('aria-expanded', 'false')
-      }
-
-      /** 根据品牌按钮位置计算浮层坐标，显示在侧栏右侧避免被 overflow 裁剪 */
-      function positionAgentSwitchDropdown() {
-        if (!brandAgentSwitchBtnEl || !agentSwitchDropdownEl || !agentSwitchOpen) return
-        requestAnimationFrame(function () {
-          if (!agentSwitchOpen || !brandAgentSwitchBtnEl || !agentSwitchDropdownEl) return
-          const rect = brandAgentSwitchBtnEl.getBoundingClientRect()
-          const gap = 10
-          const menuW = agentSwitchDropdownEl.offsetWidth
-          const menuH = agentSwitchDropdownEl.offsetHeight
-          let left = rect.right + gap
-          let top = rect.top
-          if (left + menuW > window.innerWidth - 12) {
-            left = rect.left
-            top = rect.bottom + gap
-          }
-          left = Math.max(12, Math.min(left, window.innerWidth - menuW - 12))
-          top = Math.max(12, Math.min(top, window.innerHeight - menuH - 12))
-          agentSwitchDropdownEl.style.left = left + 'px'
-          agentSwitchDropdownEl.style.top = top + 'px'
-        })
-      }
-
-      /** 在 agent 切换下拉底部追加「管理 Agent」入口 */
-      function appendAgentSwitchManageFooter() {
-        if (!agentSwitchDropdownEl) return
-        const foot = document.createElement('div')
-        foot.className = 'agent-switch-dropdown-foot'
-        const manageBtn = document.createElement('button')
-        manageBtn.type = 'button'
-        manageBtn.className = 'agent-switch-manage-btn'
-        manageBtn.textContent = '管理 Agent…'
-        manageBtn.addEventListener('click', function (ev) {
-          ev.preventDefault()
-          ev.stopPropagation()
-          closeAgentSwitchMenu()
-          const cur = currentAgentParam()
-          window.location.href = cur ? '/?agent=' + encodeURIComponent(cur) : '/'
-        })
-        foot.appendChild(manageBtn)
-        agentSwitchDropdownEl.appendChild(foot)
-      }
-
-      /** 渲染 agent 列表项；当前 agent 高亮，点击后立即切换 workspace */
-      function renderAgentSwitchList(agents) {
-        if (!agentSwitchDropdownEl) return
-        agentSwitchDropdownEl.innerHTML = ''
-        const current = currentAgentParam()
-        const head = document.createElement('div')
-        head.className = 'agent-switch-dropdown-head'
-        head.textContent = '切换 Agent'
-        agentSwitchDropdownEl.appendChild(head)
-        if (!Array.isArray(agents) || !agents.length) {
-          const empty = document.createElement('div')
-          empty.className = 'agent-switch-empty'
-          empty.textContent = '暂无 agent'
-          agentSwitchDropdownEl.appendChild(empty)
-          appendAgentSwitchManageFooter()
-          positionAgentSwitchDropdown()
-          return
-        }
-        const list = document.createElement('div')
-        list.className = 'agent-switch-dropdown-list'
-        const frag = document.createDocumentFragment()
-        for (let i = 0; i < agents.length; i++) {
-          const row = agents[i]
-          const id = String(row && row.id != null ? row.id : '').trim()
-          if (!id) continue
-          const displayName =
-            row && typeof row.displayName === 'string' && row.displayName.trim()
-              ? row.displayName.trim()
-              : id
-          const btn = document.createElement('button')
-          btn.type = 'button'
-          btn.className = 'agent-switch-item' + (id === current ? ' is-current' : '')
-          btn.setAttribute('role', 'option')
-          btn.setAttribute('aria-selected', id === current ? 'true' : 'false')
-          const mainEl = document.createElement('span')
-          mainEl.className = 'agent-switch-item-main'
-          const nameEl = document.createElement('span')
-          nameEl.className = 'agent-switch-item-name'
-          nameEl.textContent = displayName
-          mainEl.appendChild(nameEl)
-          if (displayName !== id) {
-            const idEl = document.createElement('span')
-            idEl.className = 'agent-switch-item-id'
-            idEl.textContent = id
-            mainEl.appendChild(idEl)
-          }
-          btn.appendChild(mainEl)
-          const checkEl = document.createElement('span')
-          checkEl.className = 'agent-switch-item-check'
-          checkEl.setAttribute('aria-hidden', 'true')
-          checkEl.innerHTML =
-            '<svg viewBox="0 0 16 16" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M3.5 8.2 6.6 11.3 12.5 4.8"/></svg>'
-          btn.appendChild(checkEl)
-          btn.addEventListener('click', function (ev) {
-            ev.preventDefault()
-            ev.stopPropagation()
-            selectWorkspaceAgent(id)
-          })
-          frag.appendChild(btn)
-        }
-        list.appendChild(frag)
-        agentSwitchDropdownEl.appendChild(list)
-        appendAgentSwitchManageFooter()
-        cacheAgentDisplayNames(agents)
-        updateBrandAgent()
-        positionAgentSwitchDropdown()
-      }
-
-      /** 选中目标 agent：复用 onAgentChanged 完成 WS 切换、会话刷新与配置重载 */
-      function selectWorkspaceAgent(nextId) {
-        const id = String(nextId || '').trim()
-        if (!id || !agentIdInput) return
-        closeAgentSwitchMenu()
-        if (id === currentAgentParam()) return
-        agentIdInput.value = id
-        onAgentChanged()
-      }
-
-      /** 打开 agent 切换下拉，按需拉取 /api/agents 列表 */
-      async function openAgentSwitchMenu() {
-        if (!agentSwitchWrapEl || !agentSwitchDropdownEl || !brandAgentSwitchBtnEl) return
-        hideSidebarHoverTip()
-        agentSwitchOpen = true
-        agentSwitchWrapEl.classList.add('open')
-        agentSwitchDropdownEl.hidden = false
-        agentSwitchDropdownEl.classList.add('is-open')
-        brandAgentSwitchBtnEl.setAttribute('aria-expanded', 'true')
-        agentSwitchDropdownEl.innerHTML = '<div class="agent-switch-loading">加载中…</div>'
-        positionAgentSwitchDropdown()
-        try {
-          const r = await fetch(buildAgentsListUrl())
-          const body = await r.json().catch(function () {
-            return {}
-          })
-          if (!r.ok) {
-            throw new Error(body.message || body.error || r.statusText)
-          }
-          renderAgentSwitchList(body.agents)
-        } catch (e) {
-          agentSwitchDropdownEl.innerHTML =
-            '<div class="agent-switch-empty">加载失败: ' + escapeHtml(String(e)) + '</div>'
-          positionAgentSwitchDropdown()
-        }
-      }
-
-      /** 点击头像时切换下拉开关 */
-      async function toggleAgentSwitchMenu() {
-        if (agentSwitchOpen) {
-          closeAgentSwitchMenu()
-          return
-        }
-        await openAgentSwitchMenu()
-      }
-
       function rewriteSameOriginNavLinks() {
         const agent = currentAgentParam()
         const origin = window.location.origin
@@ -2683,9 +2530,66 @@
       }
 
       /** 显示/隐藏文件浏览主区域、聊天区；顶栏在文件视图下展示「文件」而非会话标题 */
+      const scheduleManageState = {
+        viewActive: false,
+        contentView: 'list',
+      }
+
+      /** 切换定时任务列表与执行记录面板 */
+      function setScheduleContentView(view) {
+        scheduleManageState.contentView = view === 'runs' ? 'runs' : 'list'
+        if (scheduleTasksWrap) scheduleTasksWrap.hidden = scheduleManageState.contentView !== 'list'
+        if (scheduleRunsWrap) scheduleRunsWrap.hidden = scheduleManageState.contentView !== 'runs'
+      }
+
+      /** 显示/隐藏定时任务主视图，与聊天区等互斥 */
+      function setScheduleManageVisible(visible) {
+        if (visible) {
+          closeAgentSettingsView()
+          closePickerManageView(false)
+          repoManageState.viewActive = false
+          if (repoManageView) repoManageView.hidden = true
+          if (btnManageRepo) btnManageRepo.classList.remove('is-active')
+        }
+        scheduleManageState.viewActive = visible
+        if (scheduleManageView) scheduleManageView.hidden = !visible
+        if (chatWorkspace) chatWorkspace.hidden = visible
+        if (chatComposer) chatComposer.hidden = visible
+        if (mainHeaderEl) mainHeaderEl.hidden = false
+        if (visible) {
+          if (mainTitleEl) mainTitleEl.textContent = '定时任务'
+          if (mainSubEl) {
+            mainSubEl.textContent = ''
+            mainSubEl.hidden = true
+          }
+        } else {
+          updateMainHeader()
+        }
+      }
+
+      /** 关闭定时任务主视图 */
+      function closeScheduleManageView(restoreOffice) {
+        if (!scheduleManageState.viewActive) return
+        setScheduleContentView('list')
+        scheduleRunsViewTaskId = null
+        scheduleRunsViewTaskName = ''
+        if (scheduleCreateForm) scheduleCreateForm.hidden = true
+        setScheduleManageVisible(false)
+        const navEl = document.querySelector('.sidebar-nav')
+        if (navEl) {
+          const items = navEl.querySelectorAll('.sidebar-nav-row[data-add]')
+          for (let i = 0; i < items.length; i++) {
+            items[i].classList.remove('is-active')
+          }
+        }
+        if (restoreOffice !== false) clearSidebarNavActive()
+      }
+
       function setRepoManageVisible(visible) {
         if (visible) {
           closeAgentSettingsView()
+          closePickerManageView(false)
+          closeScheduleManageView(false)
         }
         repoManageState.viewActive = visible
         if (repoManageView) repoManageView.hidden = !visible
@@ -2715,6 +2619,8 @@
        */
       function setAgentSettingsVisible(visible) {
         if (visible) {
+          closePickerManageView(false)
+          closeScheduleManageView(false)
           repoManageState.viewActive = false
           if (repoManageView) repoManageView.hidden = true
           if (btnManageRepo) btnManageRepo.classList.remove('is-active')
@@ -2744,6 +2650,154 @@
         if (agentEnvSessionTabList) agentEnvSessionTabList.innerHTML = ''
       }
 
+      const PICKER_KIND_TITLES = {
+        tools: '工具',
+        mcp: 'MCP',
+        skills: 'Skill',
+        agentTeams: 'Teams',
+      }
+
+      /** 设置 Picker 主视图与聊天区等互斥可见性 */
+      function setPickerManageVisible(visible) {
+        if (visible) {
+          closeAgentSettingsView()
+          closeScheduleManageView(false)
+          repoManageState.viewActive = false
+          if (repoManageView) repoManageView.hidden = true
+          if (btnManageRepo) btnManageRepo.classList.remove('is-active')
+        }
+        pickerManageState.viewActive = visible
+        if (pickerManageView) pickerManageView.hidden = !visible
+        if (chatWorkspace) chatWorkspace.hidden = visible
+        if (chatComposer) chatComposer.hidden = visible
+        if (mainHeaderEl) mainHeaderEl.hidden = false
+        if (visible) {
+          if (mainTitleEl) {
+            mainTitleEl.textContent = PICKER_KIND_TITLES[pickerManageState.kind] || '管理'
+          }
+          if (mainSubEl) {
+            mainSubEl.textContent = ''
+            mainSubEl.hidden = true
+          }
+        } else {
+          updateMainHeader()
+        }
+      }
+
+      /** 关闭 Picker 主视图；回到聊天时清除侧栏导航选中态 */
+      function closePickerManageView(restoreOffice) {
+        if (!pickerManageState.viewActive) return
+        pickerManageState.draftSelected.clear()
+        pickerKind = pickerManageState.kind
+        pickerSelected = pickerManageState.draftSelected
+        refreshToolPickerRows = null
+        refreshMcpPickerRows = null
+        refreshSkillPickerRows = null
+        pickerRenderContent = null
+        setPickerManageVisible(false)
+        const navEl = document.querySelector('.sidebar-nav')
+        if (navEl) {
+          const items = navEl.querySelectorAll('.sidebar-nav-row[data-add]')
+          for (let i = 0; i < items.length; i++) {
+            items[i].classList.remove('is-active')
+          }
+        }
+        if (restoreOffice !== false) clearSidebarNavActive()
+      }
+
+      /** Picker 内容区加载/错误态；有文案时隐藏表格 */
+      function setPickerContentState(message, isError) {
+        setRepoPanelState(pickerContentState, message, isError)
+        if (pickerEntriesTable) {
+          pickerEntriesTable.hidden = !!message
+        }
+      }
+
+      /** 获取 Picker 顶栏筛选关键词 */
+      function getPickerSearchQuery() {
+        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) {
+          pickerContentState.hidden = true
+          pickerContentState.textContent = ''
+        }
+      }
+
+      /** 设置 Picker 表格表头；最后一列标记为操作列并右对齐 */
+      function setPickerTableHead(cols) {
+        if (!pickerTableHeadRow) return
+        pickerTableHeadRow.innerHTML = ''
+        for (let i = 0; i < cols.length; i++) {
+          const th = document.createElement('th')
+          th.textContent = cols[i]
+          if (i === cols.length - 1) th.className = 'col-actions'
+          pickerTableHeadRow.appendChild(th)
+        }
+      }
+
+      /** 清空 Picker 表格内容 */
+      function clearPickerTableBody() {
+        if (pickerEntriesBody) pickerEntriesBody.innerHTML = ''
+      }
+
+      /** 创建主视图表格行操作按钮 */
+      function createManageRowBtn(text, className, onClick, opts) {
+        const options = opts || {}
+        const btn = document.createElement('button')
+        btn.type = 'button'
+        btn.className = 'btn-manage-row-action' + (className ? ' ' + className : '')
+        btn.textContent = text
+        if (options.disabled) btn.disabled = true
+        if (options.title) btn.title = options.title
+        btn.addEventListener('click', onClick)
+        return btn
+      }
+
+      /** 创建主视图表格操作列（按钮靠右） */
+      function createManageActionsTd(buttons) {
+        const td = document.createElement('td')
+        td.className = 'col-actions'
+        const wrap = document.createElement('div')
+        wrap.className = 'manage-row-actions'
+        for (let i = 0; i < buttons.length; i++) wrap.appendChild(buttons[i])
+        td.appendChild(wrap)
+        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
@@ -3276,6 +3330,7 @@
         scheduleTaskTableBody.innerHTML = ''
         const list = Array.isArray(tasks) ? tasks : []
         scheduleManageEmpty.hidden = list.length > 0
+        if (list.length > 0) scheduleManageEmpty.classList.remove('is-error')
         for (let i = 0; i < list.length; i++) {
           const task = list[i]
           if (!task || !task.id) continue
@@ -3289,7 +3344,7 @@
           sessionBtn.textContent = task.taskName || task.id || task.sessionId.slice(0, 8) + '…'
           sessionBtn.title = task.sessionId
           sessionBtn.addEventListener('click', function () {
-            closeScheduleManageModal()
+            closeScheduleManageView(false)
             switchToSession(task.sessionId)
           })
           tdSession.appendChild(sessionBtn)
@@ -3305,39 +3360,20 @@
           const tdEnabled = document.createElement('td')
           const isEnabled = task.enabled !== false
           tdEnabled.textContent = isEnabled ? '启用中' : '已禁用'
-          const tdAction = document.createElement('td')
-          const runsBtn = document.createElement('button')
-          runsBtn.type = 'button'
-          runsBtn.className = 'btn-system-settings'
-          runsBtn.textContent = '执行记录'
-          runsBtn.addEventListener('click', function () {
-            void openScheduleRunsModal(task.id, task.taskName || task.id)
-          })
-          const runBtn = document.createElement('button')
-          runBtn.type = 'button'
-          runBtn.className = 'btn-system-settings'
-          runBtn.textContent = '立即执行'
-          runBtn.addEventListener('click', function () {
-            void runScheduleTaskNow(task.id)
-          })
-          const toggleBtn = document.createElement('button')
-          toggleBtn.type = 'button'
-          toggleBtn.className = 'btn-system-settings'
-          toggleBtn.textContent = isEnabled ? '禁用' : '启用'
-          toggleBtn.addEventListener('click', function () {
-            void patchScheduleTaskEnabled(task.id, !isEnabled)
-          })
-          const delBtn = document.createElement('button')
-          delBtn.type = 'button'
-          delBtn.className = 'btn-system-settings'
-          delBtn.textContent = '删除'
-          delBtn.addEventListener('click', function () {
-            void deleteScheduleTask(task.id)
-          })
-          tdAction.appendChild(runsBtn)
-          tdAction.appendChild(runBtn)
-          tdAction.appendChild(toggleBtn)
-          tdAction.appendChild(delBtn)
+          const tdAction = createManageActionsTd([
+            createManageRowBtn('执行记录', '', function () {
+              void openScheduleRunsView(task.id, task.taskName || task.id)
+            }),
+            createManageRowBtn('立即执行', '', function () {
+              void runScheduleTaskNow(task.id)
+            }),
+            createManageRowBtn(isEnabled ? '禁用' : '启用', isEnabled ? 'is-on' : '', function () {
+              void patchScheduleTaskEnabled(task.id, !isEnabled)
+            }),
+            createManageRowBtn('删除', 'is-delete', function () {
+              void deleteScheduleTask(task.id)
+            }),
+          ])
           tr.appendChild(tdId)
           tr.appendChild(tdSession)
           tr.appendChild(tdCron)
@@ -3493,6 +3529,7 @@
         scheduleRunsTableBody.innerHTML = ''
         const list = Array.isArray(runs) ? runs : []
         scheduleRunsEmpty.hidden = list.length > 0
+        if (list.length > 0) scheduleRunsEmpty.classList.remove('is-error')
         if (scheduleRunResultPre) {
           scheduleRunResultPre.hidden = true
           scheduleRunResultPre.textContent = ''
@@ -3521,15 +3558,14 @@
           tdSummary.textContent = scheduleRunResultSummary(run)
           tdSummary.title = run.resultText || run.errorMessage || ''
           const tdAction = document.createElement('td')
+          tdAction.className = 'col-actions'
           if (run.resultText && String(run.resultText).trim()) {
-            const viewBtn = document.createElement('button')
-            viewBtn.type = 'button'
-            viewBtn.className = 'btn-system-settings'
-            viewBtn.textContent = '查看'
-            viewBtn.addEventListener('click', function () {
+            const wrap = document.createElement('div')
+            wrap.className = 'manage-row-actions'
+            wrap.appendChild(createManageRowBtn('查看', '', function () {
               showScheduleRunResultText(run.resultText)
-            })
-            tdAction.appendChild(viewBtn)
+            }))
+            tdAction.appendChild(wrap)
           }
           tr.appendChild(tdId)
           tr.appendChild(tdCreated)
@@ -3561,11 +3597,9 @@
         return body
       }
 
-      function closeScheduleRunsModal() {
-        if (!scheduleRunsModal) return
-        scheduleRunsModal.classList.remove('is-open')
-        scheduleRunsModal.setAttribute('aria-hidden', 'true')
-        document.body.style.overflow = ''
+      /** 返回定时任务列表 */
+      function closeScheduleRunsView() {
+        setScheduleContentView('list')
         scheduleRunsViewTaskId = null
         scheduleRunsViewTaskName = ''
         if (scheduleRunResultPre) {
@@ -3574,29 +3608,27 @@
         }
       }
 
-      /** 打开执行记录弹窗 */
-      async function openScheduleRunsModal(taskId, taskName) {
-        if (!scheduleRunsModal || !taskId) return
+      /** 在主视图内打开执行记录面板 */
+      async function openScheduleRunsView(taskId, taskName) {
+        if (!scheduleManageView || !taskId) return
         scheduleRunsViewTaskId = taskId
         scheduleRunsViewTaskName = taskName || taskId
-        if (scheduleRunsModalTitle) {
-          scheduleRunsModalTitle.textContent = '执行记录 · ' + scheduleRunsViewTaskName
+        if (scheduleRunsTitle) {
+          scheduleRunsTitle.textContent = '执行记录 · ' + scheduleRunsViewTaskName
         }
-        scheduleRunsModal.classList.add('is-open')
-        scheduleRunsModal.setAttribute('aria-hidden', 'false')
-        document.body.style.overflow = 'hidden'
-        if (scheduleRunsTableBody) {
-          scheduleRunsTableBody.innerHTML =
-            '<tr><td colspan="7" style="padding:1rem;text-align:center;color:#8892a8">加载中…</td></tr>'
+        setScheduleContentView('runs')
+        if (scheduleRunsTableBody) scheduleRunsTableBody.innerHTML = ''
+        if (scheduleRunsEmpty) {
+          scheduleRunsEmpty.hidden = false
+          scheduleRunsEmpty.textContent = '加载中…'
         }
         try {
           await loadScheduleRuns(taskId)
         } catch (e) {
-          if (scheduleRunsTableBody) {
-            scheduleRunsTableBody.innerHTML =
-              '<tr><td colspan="7" style="padding:1rem;color:#c0392b">加载失败: ' +
-              String(e) +
-              '</td></tr>'
+          if (scheduleRunsEmpty) {
+            scheduleRunsEmpty.hidden = false
+            scheduleRunsEmpty.textContent = '加载失败: ' + String(e)
+            scheduleRunsEmpty.classList.add('is-error')
           }
         }
       }
@@ -3619,7 +3651,7 @@
             ? '\n执行记录 ID: ' + run.id + '（状态: ' + scheduleRunStatusLabel(run.status) + '）'
             : ''
         window.alert('已加入执行队列' + runHint)
-        if (scheduleRunsViewTaskId === id && scheduleRunsModal && scheduleRunsModal.classList.contains('is-open')) {
+        if (scheduleRunsViewTaskId === id && scheduleManageState.viewActive && scheduleManageState.contentView === 'runs') {
           try {
             await loadScheduleRuns(id)
           } catch (e) {
@@ -3655,32 +3687,24 @@
         await loadScheduleTasks()
       }
 
-      function closeScheduleManageModal() {
-        if (!scheduleManageModal) return
-        scheduleManageModal.classList.remove('is-open')
-        scheduleManageModal.setAttribute('aria-hidden', 'true')
-        document.body.style.overflow = ''
-        if (scheduleCreateForm) scheduleCreateForm.hidden = true
-      }
-
-      /** 打开定时任务管理弹窗 */
-      async function openScheduleManageModal() {
-        if (!scheduleManageModal) return
-        scheduleManageModal.classList.add('is-open')
-        scheduleManageModal.setAttribute('aria-hidden', 'false')
-        document.body.style.overflow = 'hidden'
-        if (scheduleTaskTableBody) {
-          scheduleTaskTableBody.innerHTML =
-            '<tr><td colspan="8" style="padding:1rem;text-align:center;color:#8892a8">加载中…</td></tr>'
+      /** 打开定时任务主视图 */
+      async function openScheduleManageView() {
+        if (!scheduleManageView) return
+        setScheduleContentView('list')
+        setScheduleManageVisible(true)
+        if (scheduleTaskTableBody) scheduleTaskTableBody.innerHTML = ''
+        if (scheduleManageEmpty) {
+          scheduleManageEmpty.hidden = false
+          scheduleManageEmpty.textContent = '加载中…'
+          scheduleManageEmpty.classList.remove('is-error')
         }
         try {
           await loadScheduleTasks()
         } catch (e) {
-          if (scheduleTaskTableBody) {
-            scheduleTaskTableBody.innerHTML =
-              '<tr><td colspan="8" style="padding:1rem;color:#c0392b">加载失败: ' +
-              String(e) +
-              '</td></tr>'
+          if (scheduleManageEmpty) {
+            scheduleManageEmpty.hidden = false
+            scheduleManageEmpty.textContent = '加载失败: ' + String(e)
+            scheduleManageEmpty.classList.add('is-error')
           }
         }
       }
@@ -4733,6 +4757,8 @@
       function switchToSession(id) {
         closeRepoManageView()
         closeAgentSettingsView()
+        closePickerManageView()
+        closeScheduleManageView(false)
         const nextSid = typeof id === 'string' ? id : ''
         sessionIdInput.value = nextSid
         currentSessionContextPercent = null
@@ -6368,22 +6394,6 @@
         }
       }
 
-      function closeAgentPickerModal() {
-        if (!agentPickerModal) return
-        agentPickerModal.classList.remove('is-open')
-        agentPickerModal.setAttribute('aria-hidden', 'true')
-        document.body.style.overflow = ''
-        if (agentPickerModalCard) {
-          agentPickerModalCard.classList.remove('agent-picker--tabbed')
-          agentPickerModalCard.removeAttribute('aria-label')
-          agentPickerModalCard.setAttribute('aria-labelledby', 'agentPickerModalTitle')
-        }
-        if (agentPickerSessionTabStrip) agentPickerSessionTabStrip.setAttribute('hidden', '')
-        if (agentPickerSessionTabList) agentPickerSessionTabList.innerHTML = ''
-        refreshToolPickerRows = null
-        refreshMcpPickerRows = null
-        refreshSkillPickerRows = null
-      }
 
       function closeMcpJsonInputModal() {
         if (!mcpJsonInputModal) return
@@ -6413,62 +6423,12 @@
           })
       }
 
-      function createPickerTabs(activeTab, onChange, options) {
-        const wrap = document.createElement('div')
-        wrap.className = 'agent-picker-tabs'
-        const showCloud = !(options && options.hideCloud)
-        const L = (options && options.tabLabels) || {}
-        const tabs = [
-          { id: 'base', label: L.base || '基础工具列表' },
-          { id: 'installed', label: L.installed || '已安装工具列表' },
-        ]
-        if (showCloud) tabs.push({ id: 'cloud', label: L.cloud || '云端工具列表' })
-        for (let i = 0; i < tabs.length; i++) {
-          const tab = tabs[i]
-          const btn = document.createElement('button')
-          btn.type = 'button'
-          btn.className = 'btn-picker-tab' + (tab.id === activeTab ? ' is-on' : '')
-          btn.textContent = tab.label
-          btn.addEventListener('click', function () {
-            if (tab.id === activeTab) return
-            onChange(tab.id)
-          })
-          wrap.appendChild(btn)
-        }
-        return wrap
-      }
-
-      function renderHeaderTabsIn(listEl, tabDefs, activeId, onChange) {
-        if (!listEl) return
-        listEl.innerHTML = ''
-        for (let i = 0; i < tabDefs.length; i++) {
-          const tab = tabDefs[i]
-          const btn = document.createElement('button')
-          btn.type = 'button'
-          btn.className = 'session-tab' + (tab.id === activeId ? ' active' : '')
-          btn.setAttribute('role', 'tab')
-          btn.setAttribute('aria-selected', tab.id === activeId ? 'true' : 'false')
-          const span = document.createElement('span')
-          span.className = 'session-tab-label'
-          span.textContent = tab.label
-          btn.appendChild(span)
-          btn.addEventListener('click', function () {
-            if (tab.id === activeId) return
-            onChange(tab.id)
-          })
-          listEl.appendChild(btn)
-        }
-      }
-      function renderPickerHeaderTabs(tabDefs, activeId, onChange) {
-        renderHeaderTabsIn(agentPickerSessionTabList, tabDefs, activeId, onChange)
-      }
-
       function createCloudPager(state, onPageChange) {
         const pager = document.createElement('div')
         pager.className = 'agent-picker-cloud-pager'
         const prev = document.createElement('button')
         prev.type = 'button'
-        prev.className = 'btn-picker-action'
+        prev.className = 'btn-manage-row-action'
         prev.textContent = '上一页'
         prev.disabled = state.page <= 1 || state.loading
         prev.addEventListener('click', function () {
@@ -6477,7 +6437,7 @@
         })
         const next = document.createElement('button')
         next.type = 'button'
-        next.className = 'btn-picker-action'
+        next.className = 'btn-manage-row-action'
         next.textContent = '下一页'
         const totalPages = state.totalPages || 0
         next.disabled = state.loading || totalPages <= 0 || state.page >= totalPages
@@ -6494,176 +6454,49 @@
         return pager
       }
 
-      function openAgentPickerModal(kind) {
+      /** 打开 Picker 主视图：工具 / MCP / Skill / Teams */
+      function openPickerManageView(kind) {
+        if (!pickerManageView) return
+        pickerManageState.kind = kind
         pickerKind = kind
-        pickerSelected = new Set()
+        pickerManageState.draftSelected.clear()
         if (kind === 'tools') {
           for (let i = 0; i < agentConfigState.tools.length; i++) {
-            pickerSelected.add(agentConfigState.tools[i])
+            pickerManageState.draftSelected.add(agentConfigState.tools[i])
           }
         } else if (kind === 'mcp') {
           for (let i = 0; i < agentConfigState.mcpServers.length; i++) {
-            pickerSelected.add(agentConfigState.mcpServers[i])
+            pickerManageState.draftSelected.add(agentConfigState.mcpServers[i])
           }
         } else if (kind === 'agentTeams') {
           for (let i = 0; i < agentConfigState.agentTeams.length; i++) {
-            pickerSelected.add(agentConfigState.agentTeams[i])
+            pickerManageState.draftSelected.add(agentConfigState.agentTeams[i])
           }
         } else {
           for (let i = 0; i < agentConfigState.skills.length; i++) {
-            pickerSelected.add(agentConfigState.skills[i])
-          }
-        }
-        if (!agentPickerModal || !agentPickerModalTitle || !agentPickerList) return
-        if (agentPickerModalCard) {
-          if (kind === 'tools' || kind === 'skills' || kind === 'mcp' || kind === 'agentTeams') {
-            agentPickerModalCard.classList.add('agent-picker--tabbed')
-            if (kind === 'tools') {
-              agentPickerModalCard.setAttribute('aria-label', '工具')
-            } else if (kind === 'skills') {
-              agentPickerModalCard.setAttribute('aria-label', 'Skill')
-            } else if (kind === 'mcp') {
-              agentPickerModalCard.setAttribute('aria-label', 'MCP')
-            } else {
-              agentPickerModalCard.setAttribute('aria-label', 'Teams')
-            }
-            agentPickerModalCard.removeAttribute('aria-labelledby')
-            if (agentPickerSessionTabStrip) {
-              if (kind === 'tools') {
-                agentPickerSessionTabStrip.setAttribute('aria-label', '工具分类')
-              } else if (kind === 'skills') {
-                agentPickerSessionTabStrip.setAttribute('aria-label', 'Skill 分类')
-              } else if (kind === 'mcp') {
-                agentPickerSessionTabStrip.setAttribute('aria-label', 'MCP 分类')
-              } else {
-                agentPickerSessionTabStrip.setAttribute('aria-label', 'Teams 分类')
-              }
-              agentPickerSessionTabStrip.removeAttribute('hidden')
-            }
-          } else {
-            agentPickerModalCard.classList.remove('agent-picker--tabbed')
-            agentPickerModalCard.removeAttribute('aria-label')
-            agentPickerModalCard.setAttribute('aria-labelledby', 'agentPickerModalTitle')
-            if (agentPickerSessionTabStrip) agentPickerSessionTabStrip.setAttribute('hidden', '')
-            if (agentPickerSessionTabList) agentPickerSessionTabList.innerHTML = ''
-          }
-        }
-        agentPickerModal.classList.add('is-open')
-        agentPickerModal.setAttribute('aria-hidden', 'false')
-        document.body.style.overflow = 'hidden'
-        if (agentPickerSearch) agentPickerSearch.value = ''
-        const titles = {
-          tools: '工具',
-          mcp: 'MCP',
-          skills: 'Skill',
-          agentTeams: 'Teams',
-        }
-        agentPickerModalTitle.textContent = titles[kind] || '选择'
-        if (btnAgentPickerToolImport) {
-          btnAgentPickerToolImport.style.display =
-            kind === 'tools' || kind === 'mcp' || kind === 'skills' ? '' : 'none'
-          const importLabel =
-            kind === 'mcp' ? '导入MCP' : kind === 'skills' ? '导入Skill' : '导入zip'
-          btnAgentPickerToolImport.setAttribute('aria-label', importLabel)
-          btnAgentPickerToolImport.setAttribute('title', importLabel)
-          btnAgentPickerToolImport.disabled = false
-        }
-        if (btnAgentPickerMcpJson) {
-          btnAgentPickerMcpJson.style.display = kind === 'mcp' ? '' : 'none'
-          btnAgentPickerMcpJson.disabled = false
-        }
-        agentPickerList.innerHTML = '加载中…'
-
-        function renderList(rows, labelFn) {
-          if (!agentPickerList) return
-          agentPickerList.innerHTML = ''
-          const q = (agentPickerSearch && agentPickerSearch.value.trim().toLowerCase()) || ''
-          const frag = document.createDocumentFragment()
-          for (let i = 0; i < rows.length; i++) {
-            const row = rows[i]
-            const id = row.id
-            const lab = labelFn(row)
-            if (q && String(lab).toLowerCase().indexOf(q) < 0 && String(id).toLowerCase().indexOf(q) < 0) {
-              continue
-            }
-            const div = document.createElement('div')
-            div.className = 'agent-picker-item'
-            const labelEl = document.createElement('div')
-            labelEl.className = 'agent-picker-item-label'
-            labelEl.textContent = String(lab)
-            div.appendChild(labelEl)
-
-            const actions = document.createElement('div')
-            actions.className = 'agent-picker-actions'
-
-            const toggleBtn = document.createElement('button')
-            toggleBtn.type = 'button'
-            const selected = pickerSelected.has(id)
-            toggleBtn.className = 'btn-picker-action' + (selected ? ' is-on' : '')
-            toggleBtn.textContent = selected ? '禁用' : '启用'
-            toggleBtn.addEventListener('click', function () {
-              if (pickerSelected.has(id)) pickerSelected.delete(id)
-              else pickerSelected.add(id)
-              renderList(rows, labelFn)
-            })
-            actions.appendChild(toggleBtn)
-
-            if (pickerKind === 'tools') {
-              const delBtn = document.createElement('button')
-              delBtn.type = 'button'
-              delBtn.className = 'btn-picker-action is-delete'
-              delBtn.textContent = '删除'
-              const isSystemTool = !(row.t && row.t.isRuntime === true)
-              delBtn.disabled = isSystemTool
-              if (isSystemTool) {
-                delBtn.title = '系统工具不可删除'
-              }
-              delBtn.addEventListener('click', function () {
-                if (delBtn.disabled) return
-                const targetTool = id
-                const ok = window.confirm('确认删除工具包？\n工具名：' + targetTool)
-                if (!ok) return
-                delBtn.disabled = true
-                fetch(buildRuntimeToolDeleteUrl(targetTool), { method: 'DELETE' })
-                  .then(function (r) {
-                    return r.json().catch(function () {
-                      return {}
-                    }).then(function (b) {
-                      return { r: r, b: b }
-                    })
-                  })
-                  .then(function (x) {
-                    if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
-                    pickerSelected.delete(targetTool)
-                    const nextRows = rows.filter(function (item) {
-                      return item.id !== targetTool
-                    })
-                    rows.splice(0, rows.length)
-                    for (let j = 0; j < nextRows.length; j++) rows.push(nextRows[j])
-                    renderList(rows, labelFn)
-                    agentConfigState.tools = agentConfigState.tools.filter(function (name) {
-                      return name !== targetTool
-                    })
-                    renderBindChips()
-                    void persistAgentConfigAndRestartSession({ silent: true })
-                  })
-                  .catch(function (e) {
-                    window.alert('删除失败: ' + e)
-                    delBtn.disabled = false
-                  })
-              })
-              actions.appendChild(delBtn)
-            }
-
-            div.appendChild(actions)
-            frag.appendChild(div)
-          }
-          if (!frag.childNodes.length) {
-            agentPickerList.textContent = '（无匹配项）'
-            return
-          }
-          agentPickerList.appendChild(frag)
-        }
+            pickerManageState.draftSelected.add(agentConfigState.skills[i])
+          }
+        }
+        pickerSelected = pickerManageState.draftSelected
+        setPickerManageVisible(true)
+        if (mainTitleEl) mainTitleEl.textContent = PICKER_KIND_TITLES[kind] || '管理'
+        if (pickerSearch) pickerSearch.value = ''
+        if (btnPickerImport) {
+          btnPickerImport.hidden = !(kind === 'tools' || kind === 'mcp' || kind === 'skills')
+          btnPickerImport.textContent =
+            kind === 'mcp' ? '导入 MCP' : kind === 'skills' ? '导入 Skill' : '导入 zip'
+          btnPickerImport.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')
+        clearPickerTableBody()
 
         if (kind === 'tools') {
           const toolPickerState = {
@@ -6717,49 +6550,33 @@
                 })
               })
           }
-          const makeManageRow = function (row) {
+          const makeToolTableRow = function (row) {
             const id = row.id
             const canDelete = row.deletable === true
             const packageId = row.packageId || ''
-            const div = document.createElement('div')
-            div.className = 'agent-picker-item'
-            const labelEl = document.createElement('div')
-            labelEl.className = 'agent-picker-item-label'
-            labelEl.textContent = toolLabel(row) + (row.layerTag || '')
-            div.appendChild(labelEl)
-            const actions = document.createElement('div')
-            actions.className = 'agent-picker-actions'
-            const toggleBtn = document.createElement('button')
-            toggleBtn.type = 'button'
+            const tr = document.createElement('tr')
+            const nameTd = document.createElement('td')
+            nameTd.textContent = toolLabel(row)
+            tr.appendChild(nameTd)
+            const typeTd = document.createElement('td')
+            const layer = row.t && row.t.layer === 'system' ? '系统' : row.t && row.t.layer === 'agent' ? 'Agent' : '—'
+            typeTd.textContent = layer
+            tr.appendChild(typeTd)
             const selected = pickerSelected.has(id)
-            toggleBtn.className = 'btn-picker-action' + (selected ? ' is-on' : '')
-            toggleBtn.textContent = selected ? '禁用' : '启用'
-            toggleBtn.addEventListener('click', function () {
-              if (pickerSelected.has(id)) pickerSelected.delete(id)
-              else pickerSelected.add(id)
-              renderToolsRows()
-            })
-            actions.appendChild(toggleBtn)
+            const buttons = [
+              createManageRowBtn(selected ? '禁用' : '启用', selected ? 'is-on' : '', function () {
+                if (pickerSelected.has(id)) pickerSelected.delete(id)
+                else pickerSelected.add(id)
+                renderToolsRows()
+              }),
+            ]
             if (canDelete && packageId) {
-              const exportBtn = document.createElement('button')
-              exportBtn.type = 'button'
-              exportBtn.className = 'btn-picker-action'
-              exportBtn.textContent = '导出'
-              exportBtn.addEventListener('click', function () {
+              buttons.push(createManageRowBtn('导出', '', function () {
                 window.open(buildRuntimeToolExportUrl(packageId), '_blank', 'noopener')
-              })
-              actions.appendChild(exportBtn)
+              }))
             }
-            const delBtn = document.createElement('button')
-            delBtn.type = 'button'
-            delBtn.className = 'btn-picker-action is-delete'
-            delBtn.textContent = '删除'
-            delBtn.disabled = !canDelete || !packageId
-            if (!canDelete) {
-              delBtn.title = '系统内置工具不可删除'
-            }
-            delBtn.addEventListener('click', function () {
-              if (delBtn.disabled) return
+            buttons.push(createManageRowBtn('删除', 'is-delete', function () {
+              if (!canDelete || !packageId) return
               fetch(buildRuntimeToolDeleteUrl(packageId), { method: 'DELETE' })
                 .then(function (r) {
                   return r.json().catch(function () { return {} }).then(function (b) { return { r: r, b: b } })
@@ -6773,23 +6590,28 @@
                   return refreshToolPickerRows()
                 })
                 .catch(function (e) { window.alert('删除失败: ' + e) })
-            })
-            actions.appendChild(delBtn)
-            div.appendChild(actions)
-            return div
+            }, { disabled: !canDelete || !packageId, title: !canDelete ? '系统内置工具不可删除' : '' }))
+            tr.appendChild(createManageActionsTd(buttons))
+            return tr
           }
           const renderToolsRows = function () {
-            if (!agentPickerList) return
-            agentPickerList.innerHTML = ''
-            const rows = toolPickerState.installedRows
+            setPickerContentMode('table')
+            setPickerTableHead(['名称', '类型', '操作'])
+            clearPickerTableBody()
+            setPickerContentState('', false)
+            const q = getPickerSearchQuery()
+            const rows = toolPickerState.installedRows.filter(function (row) {
+              return toolMatches(row, q)
+            })
             if (!rows.length) {
-              agentPickerList.appendChild(document.createTextNode('（暂无已安装工具）'))
+              setPickerContentState(toolPickerState.installedRows.length ? '（无匹配项）' : '（暂无已安装工具）', false)
               return
             }
-            for (let i = 0; i < rows.length; i++) {
-              agentPickerList.appendChild(makeManageRow(rows[i]))
-            }
+            const frag = document.createDocumentFragment()
+            for (let i = 0; i < rows.length; i++) frag.appendChild(makeToolTableRow(rows[i]))
+            if (pickerEntriesBody) pickerEntriesBody.appendChild(frag)
           }
+          pickerRenderContent = renderToolsRows
           refreshToolPickerRows = function () {
             return fetchToolRows(buildToolInstalledListUrl).then(function (rows) {
               toolPickerState.installedRows = rows
@@ -6797,12 +6619,9 @@
             })
           }
           void refreshToolPickerRows().catch(function (e) {
-            if (agentPickerList) agentPickerList.textContent = '加载失败: ' + e
+            setPickerContentState('加载失败: ' + e, true)
           })
         } else if (kind === 'mcp') {
-          const mcpPickerState = {
-            activeTab: 'base',
-          }
           fetch(buildMcpServersListUrl())
             .then(function (r) {
               return r.json().then(function (b) {
@@ -6818,231 +6637,153 @@
               const mcpLabel = function (row) {
                 return row.s.name + (row.s.disabled ? '（已禁用）' : '')
               }
-              const createMcpSection = function (title, sectionRows, opts) {
+              /** 将 MCP 启用状态写入 agent 配置并立即持久化 */
+              const persistMcpSelectionNow = function () {
+                agentConfigState.mcpServers = [...pickerSelected].sort()
+                renderBindChips()
+                return persistAgentConfigAndRestartSession({ silent: true })
+              }
+              const mcpSourceLabel = function (source) {
+                if (source === 'runtime') return '本地'
+                if (source === 'remote') return '远程'
+                return source || '—'
+              }
+              const makeMcpTableRow = function (row, opts) {
                 const options = opts || {}
                 const showExport = !!options.showExport
                 const showDelete = !!options.showDelete
-                const sec = document.createElement('div')
-                sec.className = 'agent-picker-section'
-                const titleEl = document.createElement('div')
-                titleEl.className = 'agent-picker-section-title'
-                titleEl.textContent = title
-                sec.appendChild(titleEl)
-                if (!sectionRows.length) {
-                  const empty = document.createElement('div')
-                  empty.className = 'agent-picker-empty'
-                  empty.textContent = '（暂无）'
-                  sec.appendChild(empty)
-                  return sec
+                const id = row.id
+                const source = row.s && row.s.source ? String(row.s.source) : ''
+                const tr = document.createElement('tr')
+                const nameTd = document.createElement('td')
+                nameTd.textContent = mcpLabel(row)
+                tr.appendChild(nameTd)
+                const sourceTd = document.createElement('td')
+                sourceTd.textContent = mcpSourceLabel(source)
+                tr.appendChild(sourceTd)
+                const buttons = []
+                if (showExport) {
+                  const canExport = source === 'runtime'
+                  buttons.push(createManageRowBtn('导出', '', function () {
+                    if (!canExport) return
+                    const pkgId = row.s && row.s.packageId ? String(row.s.packageId) : id
+                    window.open(buildRuntimeMcpExportUrl(pkgId), '_blank', 'noopener')
+                  }, { disabled: !canExport, title: !canExport ? '仅 runtime MCP 支持导出' : '' }))
                 }
-                for (let i = 0; i < sectionRows.length; i++) {
-                  const row = sectionRows[i]
-                  const id = row.id
-                  const source = row.s && row.s.source ? String(row.s.source) : ''
-                  const div = document.createElement('div')
-                  div.className = 'agent-picker-item'
-                  const labelEl = document.createElement('div')
-                  labelEl.className = 'agent-picker-item-label'
-                  labelEl.textContent = mcpLabel(row)
-                  div.appendChild(labelEl)
-                  const actions = document.createElement('div')
-                  actions.className = 'agent-picker-actions'
-                  if (showExport) {
-                    const exportBtn = document.createElement('button')
-                    exportBtn.type = 'button'
-                    exportBtn.className = 'btn-picker-action'
-                    exportBtn.textContent = '导出'
-                    const canExport = source === 'runtime'
-                    exportBtn.disabled = !canExport
-                    if (!canExport) {
-                      exportBtn.title = '仅 runtime MCP 支持导出'
+                buttons.push(createManageRowBtn('编辑', '', function () {
+                  const src = source === 'remote' ? 'remote' : 'runtime'
+                  openMcpItemConfigEditor(id, src, function () {
+                    if (typeof refreshMcpPickerRows === 'function') {
+                      void refreshMcpPickerRows().then(function () { renderMcpRows() })
                     }
-                    exportBtn.addEventListener('click', function () {
-                      if (exportBtn.disabled) return
-                      const pkgId = row.s && row.s.packageId ? String(row.s.packageId) : id
-                      window.open(buildRuntimeMcpExportUrl(pkgId), '_blank', 'noopener')
+                  })
+                }))
+                const selected = pickerSelected.has(id)
+                const toggleBtn = createManageRowBtn(selected ? '禁用' : '启用', selected ? 'is-on' : '', function () {
+                  toggleBtn.disabled = true
+                  if (pickerSelected.has(id)) pickerSelected.delete(id)
+                  else pickerSelected.add(id)
+                  persistMcpSelectionNow()
+                    .then(function () {
+                      renderMcpRows()
                     })
-                    actions.appendChild(exportBtn)
-                  }
-                  const editBtn = document.createElement('button')
-                  editBtn.type = 'button'
-                  editBtn.className = 'btn-picker-action'
-                  editBtn.textContent = '编辑'
-                  editBtn.addEventListener('click', function () {
-                    const src = source === 'remote' ? 'remote' : 'runtime'
-                    openMcpItemConfigEditor(id, src, function () {
-                      if (typeof refreshMcpPickerRows === 'function') {
-                        void refreshMcpPickerRows().then(function () {
-                          renderMcpRows()
-                        })
-                      }
+                    .catch(function (e) {
+                      window.alert('切换启用状态失败: ' + e)
                     })
-                  })
-                  actions.appendChild(editBtn)
-                  const toggleBtn = document.createElement('button')
-                  toggleBtn.type = 'button'
-                  toggleBtn.className = 'btn-picker-action'
-                  const enabledNow = pickerSelected.has(id)
-                  toggleBtn.textContent = enabledNow ? '禁用' : '启用'
-                  toggleBtn.addEventListener('click', function () {
-                    toggleBtn.disabled = true
-                    if (enabledNow) {
-                      pickerSelected.delete(id)
-                      agentConfigState.mcpServers = agentConfigState.mcpServers.filter(function (name) {
-                        return name !== id
-                      })
-                    } else {
-                      pickerSelected.add(id)
-                      if (agentConfigState.mcpServers.indexOf(id) < 0) {
-                        agentConfigState.mcpServers.push(id)
-                      }
-                    }
-                    persistAgentConfigAndRestartSession({ silent: true })
-                      .then(function () {
-                        renderBindChips()
-                        renderMcpRows()
-                      })
-                      .catch(function (e) {
-                        window.alert('切换启用状态失败: ' + e)
+                    .finally(function () {
+                      toggleBtn.disabled = false
                     })
-                      .finally(function () {
-                        toggleBtn.disabled = false
-                      })
-                  })
-                  actions.appendChild(toggleBtn)
-                  if (showDelete) {
-                    const delBtn = document.createElement('button')
-                    delBtn.type = 'button'
-                    delBtn.className = 'btn-picker-action is-delete'
-                    delBtn.textContent = '删除'
-                    const canDelete = source === 'runtime' || source === 'remote'
-                    delBtn.disabled = !canDelete
-                    if (!canDelete) {
-                      delBtn.title = '基础MCP不可删除'
-                    }
-                    delBtn.addEventListener('click', function () {
-                      if (delBtn.disabled) return
-                      const ok = window.confirm('确认删除 MCP？\n服务器名：' + id)
-                      if (!ok) return
-                      delBtn.disabled = true
-                      if (source === 'remote') {
-                        fetch(buildRemoteMcpJsonUrl())
-                          .then(function (r) {
-                            return r.json().then(function (body) {
-                              return { r: r, body: body }
-                            })
-                          })
-                          .then(function (x) {
-                            if (!x.r.ok) throw new Error(x.body.message || x.body.error || x.r.statusText)
-                            let parsed
-                            try {
-                              parsed = JSON.parse(String(x.body.content || '{}'))
-                            } catch {
-                              parsed = { mcpServers: {} }
-                            }
-                            if (!parsed.mcpServers || typeof parsed.mcpServers !== 'object' || Array.isArray(parsed.mcpServers)) {
-                              parsed.mcpServers = {}
-                            }
-                            delete parsed.mcpServers[id]
-                            return fetch(buildRemoteMcpJsonUrl(), {
-                              method: 'POST',
-                              headers: { 'Content-Type': 'application/json; charset=utf-8' },
-                              body: JSON.stringify({ content: JSON.stringify(parsed, null, 2) }),
-                            })
-                          })
-                          .then(function (r) {
-                            return r.json().then(function (body) {
-                              return { r: r, body: body }
-                            })
-                          })
-                          .then(function (x) {
-                            if (!x.r.ok) throw new Error(x.body.message || x.body.error || x.r.statusText)
-                            remoteMcpServers = Array.isArray(x.body.servers)
-                              ? x.body.servers.map(String)
-                              : []
-                            pickerSelected.delete(id)
-                            agentConfigState.mcpServers = agentConfigState.mcpServers.filter(function (name) {
-                              return name !== id
-                            })
-                            renderBindChips()
-                            renderMcpRows()
-                          })
-                          .catch(function (e) {
-                            window.alert('删除失败: ' + e)
-                          })
-                          .finally(function () {
-                            delBtn.disabled = !canDelete
-                          })
-                        return
-                      }
-                      const pkgId = row.s && row.s.packageId ? String(row.s.packageId) : id
-                      fetch(buildRuntimeMcpDeleteUrl(pkgId), { method: 'DELETE' })
+                })
+                buttons.push(toggleBtn)
+                if (showDelete) {
+                  const canDelete = source === 'runtime' || source === 'remote'
+                  buttons.push(createManageRowBtn('删除', 'is-delete', function () {
+                    if (!canDelete) return
+                    const ok = window.confirm('确认删除 MCP？\n服务器名：' + id)
+                    if (!ok) return
+                    if (source === 'remote') {
+                      fetch(buildRemoteMcpJsonUrl())
                         .then(function (r) {
-                          return r.json().catch(function () {
-                            return {}
-                          }).then(function (b) {
-                            return { r: r, b: b }
+                          return r.json().then(function (body) { return { r: r, body: body } })
+                        })
+                        .then(function (x) {
+                          if (!x.r.ok) throw new Error(x.body.message || x.body.error || x.r.statusText)
+                          let parsed
+                          try { parsed = JSON.parse(String(x.body.content || '{}')) } catch { parsed = { mcpServers: {} } }
+                          if (!parsed.mcpServers || typeof parsed.mcpServers !== 'object' || Array.isArray(parsed.mcpServers)) {
+                            parsed.mcpServers = {}
+                          }
+                          delete parsed.mcpServers[id]
+                          return fetch(buildRemoteMcpJsonUrl(), {
+                            method: 'POST',
+                            headers: { 'Content-Type': 'application/json; charset=utf-8' },
+                            body: JSON.stringify({ content: JSON.stringify(parsed, null, 2) }),
                           })
                         })
+                        .then(function (r) {
+                          return r.json().then(function (body) { return { r: r, body: body } })
+                        })
                         .then(function (x) {
-                          if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
+                          if (!x.r.ok) throw new Error(x.body.message || x.body.error || x.r.statusText)
+                          remoteMcpServers = Array.isArray(x.body.servers) ? x.body.servers.map(String) : []
                           pickerSelected.delete(id)
-                          agentConfigState.mcpServers = agentConfigState.mcpServers.filter(function (name) {
-                            return name !== id
-                          })
+                          agentConfigState.mcpServers = agentConfigState.mcpServers.filter(function (name) { return name !== id })
                           renderBindChips()
                           return Promise.all([
                             persistAgentConfigAndRestartSession({ silent: true }),
-                            fetch(buildMcpServersListUrl())
-                              .then(function (r) {
-                                return r.json().then(function (b) {
-                                  return { r: r, b: b }
-                                })
-                              })
-                              .then(function (res) {
-                                if (!res.r.ok) throw new Error(res.b.message || res.r.statusText)
-                                const serv = res.b.servers || []
-                                rows.splice(0, rows.length)
-                                for (let i = 0; i < serv.length; i++) {
-                                  rows.push({ id: serv[i].name, s: serv[i] })
-                                }
-                              }),
-                          ]).then(function () {
-                            renderMcpRows()
-                          })
-                        })
-                        .catch(function (e) {
-                          window.alert('删除失败: ' + e)
+                            typeof refreshMcpPickerRows === 'function' ? refreshMcpPickerRows() : Promise.resolve(),
+                          ])
                         })
-                        .finally(function () {
-                          delBtn.disabled = !canDelete
+                        .then(function () {
                           renderMcpRows()
                         })
-                    })
-                    actions.appendChild(delBtn)
-                  }
-                  div.appendChild(actions)
-                  sec.appendChild(div)
+                        .catch(function (e) { window.alert('删除失败: ' + e) })
+                      return
+                    }
+                    const pkgId = row.s && row.s.packageId ? String(row.s.packageId) : id
+                    fetch(buildRuntimeMcpDeleteUrl(pkgId), { method: 'DELETE' })
+                      .then(function (r) {
+                        return r.json().catch(function () { return {} }).then(function (b) { return { r: r, b: b } })
+                      })
+                      .then(function (x) {
+                        if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
+                        pickerSelected.delete(id)
+                        agentConfigState.mcpServers = agentConfigState.mcpServers.filter(function (name) { return name !== id })
+                        renderBindChips()
+                        return Promise.all([
+                          persistAgentConfigAndRestartSession({ silent: true }),
+                          fetch(buildMcpServersListUrl())
+                            .then(function (r) { return r.json().then(function (b) { return { r: r, b: b } }) })
+                            .then(function (res) {
+                              if (!res.r.ok) throw new Error(res.b.message || res.r.statusText)
+                              const serv = res.b.servers || []
+                              rows.splice(0, rows.length)
+                              for (let i = 0; i < serv.length; i++) rows.push({ id: serv[i].name, s: serv[i] })
+                            }),
+                        ]).then(function () { renderMcpRows() })
+                      })
+                      .catch(function (e) { window.alert('删除失败: ' + e) })
+                  }, { disabled: !canDelete, title: !canDelete ? '基础MCP不可删除' : '' }))
                 }
-                return sec
+                tr.appendChild(createManageActionsTd(buttons))
+                return tr
               }
               const renderMcpRows = function () {
-                if (!agentPickerList) return
-                agentPickerList.innerHTML = ''
-                renderPickerHeaderTabs(
-                  [
-                    { id: 'base', label: '本地MCP' },
-                    { id: 'installed', label: '远程MCP' },
-                  ],
-                  mcpPickerState.activeTab,
-                  function (id) {
-                    mcpPickerState.activeTab = id
-                    renderMcpRows()
-                  },
-                )
-                const mergedRows = rows
+                setPickerContentMode('table')
+                setPickerTableHead(['名称', '来源', '操作'])
+                clearPickerTableBody()
+                setPickerContentState('', false)
+                const q = getPickerSearchQuery()
+                const sectionRows = rows
                   .filter(function (row) {
-                    return !(row && row.s && row.s.source === 'remote')
+                    if (!q) return true
+                    const src = row.s && row.s.source ? String(row.s.source) : ''
+                    const srcText = mcpSourceLabel(src)
+                    return (
+                      mcpLabel(row).toLowerCase().indexOf(q) >= 0 ||
+                      String(row.id).toLowerCase().indexOf(q) >= 0 ||
+                      srcText.toLowerCase().indexOf(q) >= 0
+                    )
                   })
                   .sort(function (a, b) {
                     const as = pickerSelected.has(a.id) ? 0 : 1
@@ -7050,28 +6791,21 @@
                     if (as !== bs) return as - bs
                     return a.id.localeCompare(b.id)
                   })
-                if (mcpPickerState.activeTab === 'base') {
-                  agentPickerList.appendChild(createMcpSection('本地MCP', mergedRows, {
-                    showExport: true,
-                    showDelete: true,
-                  }))
+                if (!sectionRows.length) {
+                  setPickerContentState(rows.length ? '（无匹配项）' : '（暂无）', false)
                   return
                 }
-                const remoteRows = rows
-                  .filter(function (row) {
-                    return !!(row && row.s && row.s.source === 'remote')
-                  })
-                  .sort(function (a, b) {
-                    const as = pickerSelected.has(a.id) ? 0 : 1
-                    const bs = pickerSelected.has(b.id) ? 0 : 1
-                    if (as !== bs) return as - bs
-                    return a.id.localeCompare(b.id)
-                  })
-                agentPickerList.appendChild(createMcpSection('远程MCP', remoteRows, {
-                  showExport: false,
-                  showDelete: false,
-                }))
+                const frag = document.createDocumentFragment()
+                for (let i = 0; i < sectionRows.length; i++) {
+                  const rowSource = sectionRows[i].s && sectionRows[i].s.source ? String(sectionRows[i].s.source) : ''
+                  frag.appendChild(makeMcpTableRow(sectionRows[i], {
+                    showExport: rowSource === 'runtime',
+                    showDelete: rowSource === 'runtime' || rowSource === 'remote',
+                  }))
+                }
+                if (pickerEntriesBody) pickerEntriesBody.appendChild(frag)
               }
+              pickerRenderContent = renderMcpRows
               const loadRemoteMcpRows = function () {
                 return fetch(buildRemoteMcpJsonUrl())
                   .then(function (r) {
@@ -7111,93 +6845,85 @@
               })
             })
             .catch(function (e) {
-              if (agentPickerList) agentPickerList.textContent = '加载失败: ' + e
+              setPickerContentState('加载失败: ' + e, true)
             })
         } else if (kind === 'agentTeams') {
-          const teamTabId = 'base'
-          const renderAgentTeamsRows = function (rows) {
-            if (!agentPickerList) return
-            agentPickerList.innerHTML = ''
-            renderPickerHeaderTabs(
-              [{ id: teamTabId, label: '成员' }],
-              teamTabId,
-              function () {},
-            )
-            const labelFn = function (row) {
-              const s = row.s || {}
-              const parts = [String(s.agentType || row.id || '')]
-              if (s.model) parts.push('model:' + s.model)
-              if (s.effort !== undefined && s.effort !== null && String(s.effort) !== '') {
-                parts.push('effort:' + String(s.effort))
-              }
-              if (s.background === true) parts.push('bg:true')
-              if (s.isolation) parts.push('iso:' + s.isolation)
-              const head = parts.join(' · ')
-              const tags = []
-              if (Array.isArray(s.tools) && s.tools.length > 0) {
-                tags.push('tools:' + s.tools.length)
-              }
-              if (Array.isArray(s.disallowedTools) && s.disallowedTools.length > 0) {
-                tags.push('deny:' + s.disallowedTools.length)
-              }
-              const summary = typeof s.whenToUse === 'string' && s.whenToUse.trim()
-                ? String(s.whenToUse).slice(0, 100)
-                : ''
-              return head + (tags.length ? ' · ' + tags.join(' ') : '') + (summary ? ' — ' + summary : '')
+          let teamRows = []
+          const teamLabelFn = function (row) {
+            const s = row.s || {}
+            const parts = [String(s.agentType || row.id || '')]
+            if (s.model) parts.push('model:' + s.model)
+            if (s.effort !== undefined && s.effort !== null && String(s.effort) !== '') {
+              parts.push('effort:' + String(s.effort))
+            }
+            if (s.background === true) parts.push('bg:true')
+            if (s.isolation) parts.push('iso:' + s.isolation)
+            return parts.join(' · ')
+          }
+          const teamConfigFn = function (row) {
+            const s = row.s || {}
+            const tags = []
+            if (Array.isArray(s.tools) && s.tools.length > 0) tags.push('tools:' + s.tools.length)
+            if (Array.isArray(s.disallowedTools) && s.disallowedTools.length > 0) tags.push('deny:' + s.disallowedTools.length)
+            const summary = typeof s.whenToUse === 'string' && s.whenToUse.trim()
+              ? String(s.whenToUse).slice(0, 100) : ''
+            return (tags.length ? tags.join(' ') : '—') + (summary ? ' — ' + summary : '')
+          }
+          const renderAgentTeamsRows = function () {
+            setPickerContentMode('table')
+            setPickerTableHead(['成员', '配置', '操作'])
+            clearPickerTableBody()
+            setPickerContentState('', false)
+            const q = getPickerSearchQuery()
+            const filtered = teamRows.filter(function (row) {
+              if (!q) return true
+              const lab = teamLabelFn(row) + ' ' + teamConfigFn(row)
+              return lab.toLowerCase().indexOf(q) >= 0 || String(row.id).toLowerCase().indexOf(q) >= 0
+            })
+            if (!filtered.length) {
+              setPickerContentState(teamRows.length ? '（无匹配项）' : '（暂无成员）', false)
+              return
             }
             const frag = document.createDocumentFragment()
-            for (let i = 0; i < rows.length; i++) {
-              const row = rows[i]
+            for (let i = 0; i < filtered.length; i++) {
+              const row = filtered[i]
               const id = row.id
-              const lab = labelFn(row)
-              const div = document.createElement('div')
-              div.className = 'agent-picker-item'
-              const labelEl = document.createElement('div')
-              labelEl.className = 'agent-picker-item-label'
-              labelEl.textContent = String(lab)
-              div.appendChild(labelEl)
-              const actions = document.createElement('div')
-              actions.className = 'agent-picker-actions'
-              const toggleBtn = document.createElement('button')
-              toggleBtn.type = 'button'
+              const tr = document.createElement('tr')
+              const memberTd = document.createElement('td')
+              memberTd.textContent = teamLabelFn(row)
+              tr.appendChild(memberTd)
+              const configTd = document.createElement('td')
+              configTd.textContent = teamConfigFn(row)
+              tr.appendChild(configTd)
               const selected = pickerSelected.has(id)
-              toggleBtn.className = 'btn-picker-action' + (selected ? ' is-on' : '')
-              toggleBtn.textContent = selected ? '禁用' : '启用'
-              toggleBtn.addEventListener('click', function () {
-                if (pickerSelected.has(id)) pickerSelected.delete(id)
-                else pickerSelected.add(id)
-                renderAgentTeamsRows(rows)
-              })
-              actions.appendChild(toggleBtn)
-              div.appendChild(actions)
-              frag.appendChild(div)
-            }
-            if (!frag.childNodes.length) {
-              agentPickerList.appendChild(document.createTextNode('（无匹配项）'))
-              return
+              tr.appendChild(createManageActionsTd([
+                createManageRowBtn(selected ? '禁用' : '启用', selected ? 'is-on' : '', function () {
+                  if (pickerSelected.has(id)) pickerSelected.delete(id)
+                  else pickerSelected.add(id)
+                  renderAgentTeamsRows()
+                }),
+              ]))
+              frag.appendChild(tr)
             }
-            agentPickerList.appendChild(frag)
+            if (pickerEntriesBody) pickerEntriesBody.appendChild(frag)
           }
+          pickerRenderContent = renderAgentTeamsRows
           fetch(buildAgentTeamsListUrl())
             .then(function (r) {
-              return r.json().then(function (b) {
-                return { r: r, b: b }
-              })
+              return r.json().then(function (b) { return { r: r, b: b } })
             })
             .then(function (x) {
               if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
               const list = x.b.teamAgentTypes || []
-              const rows = list.map(function (s) {
-                return { id: s.agentType, s: s }
-              })
-              renderAgentTeamsRows(rows)
+              teamRows = list.map(function (s) { return { id: s.agentType, s: s } })
+              renderAgentTeamsRows()
             })
             .catch(function (e) {
-              if (agentPickerList) agentPickerList.textContent = '加载失败: ' + e
+              setPickerContentState('加载失败: ' + e, true)
             })
         } else {
           const skillPickerState = {
-            activeTab: 'base',
+            activeTab: 'list',
             baseRows: [],
             installedRows: [],
             cloudRows: [],
@@ -7233,112 +6959,87 @@
                   (s.description ? ' — ' + String(s.description).slice(0, 100) : '')
                 )
               }
-              const makeSkillRow = function (row, canDelete) {
+              /** 将 Skill 启用状态写入 agent 配置并立即持久化 */
+              const persistSkillSelectionNow = function () {
+                agentConfigState.skills = [...pickerSelected].sort()
+                renderBindChips()
+                return persistAgentConfigAndRestartSession({ silent: true })
+              }
+              /** 系统 skill 不可删除；agent 层已安装 skill 可删除 */
+              const isSkillDeletable = function (row) {
+                const s = row.s || {}
+                return s.canManage === true || s.runtimeLayer === 'agent'
+              }
+              const mergeSkillListRows = function () {
+                const merged = skillPickerState.baseRows.concat(skillPickerState.installedRows)
+                merged.sort(function (a, b) {
+                  const as = a.s && a.s.runtimeLayer === 'system' ? 0 : 1
+                  const bs = b.s && b.s.runtimeLayer === 'system' ? 0 : 1
+                  if (as !== bs) return as - bs
+                  return String(a.id).localeCompare(String(b.id))
+                })
+                return merged
+              }
+              const makeSkillTableRow = function (row) {
                 const id = row.id
-                const div = document.createElement('div')
-                div.className = 'agent-picker-item'
-                const labelEl = document.createElement('div')
-                labelEl.className = 'agent-picker-item-label'
-                labelEl.textContent = skillLabel(row)
-                div.appendChild(labelEl)
-                const actions = document.createElement('div')
-                actions.className = 'agent-picker-actions'
-                const toggleBtn = document.createElement('button')
-                toggleBtn.type = 'button'
+                const canDelete = isSkillDeletable(row)
+                const tr = document.createElement('tr')
+                const nameTd = document.createElement('td')
+                nameTd.textContent = '/' + (row.s && row.s.name ? row.s.name : id)
+                tr.appendChild(nameTd)
+                const descTd = document.createElement('td')
+                const desc = row.s && row.s.description ? String(row.s.description).slice(0, 100) : '—'
+                descTd.textContent = desc
+                tr.appendChild(descTd)
                 const selected = pickerSelected.has(id)
-                toggleBtn.className = 'btn-picker-action' + (selected ? ' is-on' : '')
-                toggleBtn.textContent = selected ? '禁用' : '启用'
-                toggleBtn.addEventListener('click', function () {
+                const toggleBtn = createManageRowBtn(selected ? '禁用' : '启用', selected ? 'is-on' : '', function () {
+                  toggleBtn.disabled = true
                   if (pickerSelected.has(id)) pickerSelected.delete(id)
                   else pickerSelected.add(id)
-                  renderSkillRows()
+                  persistSkillSelectionNow()
+                    .then(function () {
+                      renderSkillRows()
+                    })
+                    .catch(function (e) {
+                      window.alert('切换启用状态失败: ' + e)
+                    })
+                    .finally(function () {
+                      toggleBtn.disabled = false
+                    })
                 })
-                actions.appendChild(toggleBtn)
+                const buttons = [toggleBtn]
                 if (!canDelete) {
-                  const editBtn = document.createElement('button')
-                  editBtn.type = 'button'
-                  editBtn.className = 'btn-picker-action'
-                  editBtn.textContent = '编辑'
-                  editBtn.addEventListener('click', function () {
-                    openSkillMdModal(id)
-                  })
-                  actions.appendChild(editBtn)
+                  buttons.push(createManageRowBtn('编辑', '', function () { openSkillMdModal(id) }))
                 }
                 if (canDelete) {
-                  const exportBtn = document.createElement('button')
-                  exportBtn.type = 'button'
-                  exportBtn.className = 'btn-picker-action'
-                  exportBtn.textContent = '导出'
-                  exportBtn.addEventListener('click', function () {
+                  buttons.push(createManageRowBtn('导出', '', function () {
                     window.open(buildRuntimeSkillExportUrl(id), '_blank', 'noopener')
-                  })
-                  actions.appendChild(exportBtn)
+                  }))
                 }
-                const delBtn = document.createElement('button')
-                delBtn.type = 'button'
-                delBtn.className = 'btn-picker-action is-delete'
-                delBtn.textContent = '删除'
-                delBtn.disabled = !canDelete
-                if (!canDelete) delBtn.title = '系统技能不可删除'
-                delBtn.addEventListener('click', function () {
-                  if (delBtn.disabled) return
-                  const targetSkill = id
-                  const ok = window.confirm('确认删除 Skill 包？\nSkill：' + targetSkill)
+                buttons.push(createManageRowBtn('删除', 'is-delete', function () {
+                  if (!canDelete) return
+                  const ok = window.confirm('确认删除 Skill 包？\nSkill：' + id)
                   if (!ok) return
-                  delBtn.disabled = true
-                  fetch(buildRuntimeSkillDeleteUrl(targetSkill), { method: 'DELETE' })
+                  fetch(buildRuntimeSkillDeleteUrl(id), { method: 'DELETE' })
                     .then(function (r) {
-                      return r.json().catch(function () {
-                        return {}
-                      }).then(function (b) {
-                        return { r: r, b: b }
-                      })
+                      return r.json().catch(function () { return {} }).then(function (b) { return { r: r, b: b } })
                     })
                     .then(function (x) {
                       if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
-                      pickerSelected.delete(targetSkill)
-                      agentConfigState.skills = agentConfigState.skills.filter(function (name) {
-                        return name !== targetSkill
-                      })
+                      pickerSelected.delete(id)
+                      agentConfigState.skills = agentConfigState.skills.filter(function (name) { return name !== id })
                       renderBindChips()
                       void persistAgentConfigAndRestartSession({ silent: true })
                       return refreshSkillPickerRows()
                     })
-                    .catch(function (e) {
-                      window.alert('删除失败: ' + e)
-                      delBtn.disabled = false
-                    })
-                })
-                actions.appendChild(delBtn)
-                div.appendChild(actions)
-                return div
+                    .catch(function (e) { window.alert('删除失败: ' + e) })
+                }, { disabled: !canDelete, title: !canDelete ? '系统技能不可删除' : '' }))
+                tr.appendChild(createManageActionsTd(buttons))
+                return tr
               }
-              const createSkillSection = function (title, rows, canDelete) {
-                const sec = document.createElement('div')
-                sec.className = 'agent-picker-section'
-                const titleEl = document.createElement('div')
-                titleEl.className = 'agent-picker-section-title'
-                titleEl.textContent = title
-                sec.appendChild(titleEl)
-                if (!rows.length) {
-                  const empty = document.createElement('div')
-                  empty.className = 'agent-picker-empty'
-                  empty.textContent = '（暂无）'
-                  sec.appendChild(empty)
-                  return sec
-                }
-                for (let i = 0; i < rows.length; i++) {
-                  sec.appendChild(makeSkillRow(rows[i], canDelete))
-                }
-                return sec
-              }
-              const renderCloudSkillSection = function () {
-                const sec = document.createElement('div')
-                sec.className = 'agent-picker-section'
-                const titleEl = document.createElement('div')
-                titleEl.className = 'agent-picker-section-title'
-                titleEl.textContent = 'skill商店'
-                sec.appendChild(titleEl)
+              const renderCloudSkillPanel = function () {
+                if (!pickerCloudPanel) return
+                pickerCloudPanel.innerHTML = ''
                 const cloudSearch = document.createElement('input')
                 cloudSearch.type = 'search'
                 cloudSearch.className = 'agent-picker-cloud-search'
@@ -7349,120 +7050,112 @@
                   skillPickerState.cloudPage = 1
                   void loadCloudSkillRows()
                 }
-                sec.appendChild(cloudSearch)
+                pickerCloudPanel.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 + ' 项'
-                }
-                sec.appendChild(meta)
-                if (skillPickerState.cloudError) return sec
-                if (!skillPickerState.cloudRows.length) {
+                if (skillPickerState.cloudLoading) meta.textContent = '加载中…'
+                else if (skillPickerState.cloudError) meta.textContent = '加载失败：' + skillPickerState.cloudError
+                else meta.textContent = '展示前 ' + skillPickerState.cloudRows.length + ' 项'
+                pickerCloudPanel.appendChild(meta)
+                if (!skillPickerState.cloudError && skillPickerState.cloudRows.length) {
+                  for (let i = 0; i < skillPickerState.cloudRows.length; i++) {
+                    const item = skillPickerState.cloudRows[i]
+                    const row = document.createElement('div')
+                    row.className = 'agent-picker-item'
+                    const label = document.createElement('div')
+                    label.className = 'agent-picker-item-label'
+                    label.textContent = item.title + ' · /' + item.skillName + (item.description ? ' — ' + item.description : '')
+                    row.appendChild(label)
+                    const actions = document.createElement('div')
+                    actions.className = 'agent-picker-actions'
+                    const installing = !!skillPickerState.installingMap[item.id]
+                    const installed = !!item.installed
+                    const installBtn = createManageRowBtn(
+                      installing ? '处理中…' : installed ? '卸载' : '安装', '', function () {
+                        if (installBtn.disabled) return
+                        skillPickerState.installingMap[item.id] = true
+                        renderSkillRows()
+                        const request = installed
+                          ? fetch(buildRuntimeSkillDeleteUrl(item.packageId), { method: 'DELETE' })
+                          : fetch(buildCloudSkillInstallUrl(), {
+                              method: 'POST',
+                              headers: { 'Content-Type': 'application/json; charset=utf-8' },
+                              body: JSON.stringify({ id: item.id }),
+                            })
+                        request
+                          .then(function (r) {
+                            return r.json().catch(function () { return {} }).then(function (b) { return { r: r, b: b } })
+                          })
+                          .then(function (x) {
+                            if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
+                            if (installed) pickerSelected.delete(item.skillName || item.id)
+                            else pickerSelected.add(item.skillName || item.id)
+                            setStatus('云端技能已' + (installed ? '卸载' : '安装') + '：' + item.title, serverReady ? 'ready' : '')
+                            return persistSkillSelectionNow().then(function () {
+                              return refreshSkillPickerRows()
+                            })
+                          })
+                          .catch(function (e) { window.alert((installed ? '卸载' : '安装') + '失败: ' + e) })
+                          .finally(function () {
+                            delete skillPickerState.installingMap[item.id]
+                            renderSkillRows()
+                          })
+                      }, { disabled: installing },
+                    )
+                    actions.appendChild(installBtn)
+                    row.appendChild(actions)
+                    pickerCloudPanel.appendChild(row)
+                  }
+                  pickerCloudPanel.appendChild(createCloudPager({
+                    page: skillPickerState.cloudPage,
+                    totalPages: skillPickerState.cloudTotalPages,
+                    loading: skillPickerState.cloudLoading,
+                  }, function (nextPage) {
+                    skillPickerState.cloudPage = nextPage
+                    void loadCloudSkillRows()
+                  }))
+                } else if (!skillPickerState.cloudError) {
                   const empty = document.createElement('div')
                   empty.className = 'agent-picker-empty'
                   empty.textContent = skillPickerState.cloudLoading ? '（技能商店加载中）' : '（无匹配项）'
-                  sec.appendChild(empty)
-                  return sec
-                }
-                for (let i = 0; i < skillPickerState.cloudRows.length; i++) {
-                  const item = skillPickerState.cloudRows[i]
-                  const row = document.createElement('div')
-                  row.className = 'agent-picker-item'
-                  const label = document.createElement('div')
-                  label.className = 'agent-picker-item-label'
-                  label.textContent = item.title + ' · /' + item.skillName + (item.description ? ' — ' + item.description : '')
-                  row.appendChild(label)
-                  const actions = document.createElement('div')
-                  actions.className = 'agent-picker-actions'
-                  const installBtn = document.createElement('button')
-                  installBtn.type = 'button'
-                  installBtn.className = 'btn-picker-action'
-                  const installing = !!skillPickerState.installingMap[item.id]
-                  const installed = !!item.installed
-                  installBtn.textContent = installing ? '处理中…' : installed ? '卸载' : '安装'
-                  installBtn.disabled = installing
-                  installBtn.addEventListener('click', function () {
-                    if (installBtn.disabled) return
-                    skillPickerState.installingMap[item.id] = true
-                    renderSkillRows()
-                    const request = installed
-                      ? fetch(buildRuntimeSkillDeleteUrl(item.packageId), { method: 'DELETE' })
-                      : fetch(buildCloudSkillInstallUrl(), {
-                          method: 'POST',
-                          headers: { 'Content-Type': 'application/json; charset=utf-8' },
-                          body: JSON.stringify({ id: item.id }),
-                        })
-                    request
-                      .then(function (r) {
-                        return r.json().catch(function () {
-                          return {}
-                        }).then(function (b) {
-                          return { r: r, b: b }
-                        })
-                      })
-                      .then(function (x) {
-                        if (!x.r.ok) throw new Error(x.b.message || x.r.statusText)
-                        if (installed) {
-                          pickerSelected.delete(item.skillName || item.id)
-                        } else {
-                          pickerSelected.add(item.skillName || item.id)
-                        }
-                        setStatus('云端技能已' + (installed ? '卸载' : '安装') + '：' + item.title, serverReady ? 'ready' : '')
-                        restartCurrentSessionSubprocessWithReason(installed ? 'cloud-skill-uninstall' : 'cloud-skill-install')
-                        return refreshSkillPickerRows()
-                      })
-                      .catch(function (e) {
-                        window.alert((installed ? '卸载' : '安装') + '失败: ' + e)
-                      })
-                      .finally(function () {
-                        delete skillPickerState.installingMap[item.id]
-                        renderSkillRows()
-                      })
-                  })
-                  actions.appendChild(installBtn)
-                  row.appendChild(actions)
-                  sec.appendChild(row)
+                  pickerCloudPanel.appendChild(empty)
                 }
-                return sec
               }
               const renderSkillRows = function () {
-                if (!agentPickerList) return
-                agentPickerList.innerHTML = ''
-                renderPickerHeaderTabs(
+                renderPickerNavTabs(
                   [
-                    { id: 'base', label: '系统skill' },
-                    { id: 'installed', label: '已安装skill' },
+                    { id: 'list', label: 'Skill' },
                     { id: 'cloud', label: 'skill商店' },
                   ],
                   skillPickerState.activeTab,
-                  function (id) {
-                    skillPickerState.activeTab = id
-                    renderSkillRows()
-                  },
+                  function (id) { skillPickerState.activeTab = id; renderSkillRows() },
                 )
-                if (skillPickerState.activeTab === 'installed') {
-                  agentPickerList.appendChild(createSkillSection('已安装skill', skillPickerState.installedRows, true))
+                if (skillPickerState.activeTab === 'cloud') {
+                  setPickerContentMode('cloud')
+                  renderCloudSkillPanel()
                   return
                 }
-                if (skillPickerState.activeTab === 'base') {
-                  agentPickerList.appendChild(createSkillSection('系统skill', skillPickerState.baseRows, false))
+                setPickerContentMode('table')
+                setPickerTableHead(['名称', '描述', '操作'])
+                clearPickerTableBody()
+                setPickerContentState('', false)
+                const q = getPickerSearchQuery()
+                const sourceRows = mergeSkillListRows()
+                const rows = sourceRows.filter(function (row) {
+                  if (!q) return true
+                  return skillLabel(row).toLowerCase().indexOf(q) >= 0 || String(row.id).toLowerCase().indexOf(q) >= 0
+                })
+                if (!rows.length) {
+                  setPickerContentState(sourceRows.length ? '（无匹配项）' : '（暂无 Skill）', false)
                   return
                 }
-                const cloud = renderCloudSkillSection()
-                cloud.appendChild(createCloudPager({
-                  page: skillPickerState.cloudPage,
-                  totalPages: skillPickerState.cloudTotalPages,
-                  loading: skillPickerState.cloudLoading,
-                }, function (nextPage) {
-                  skillPickerState.cloudPage = nextPage
-                  void loadCloudSkillRows()
-                }))
-                agentPickerList.appendChild(cloud)
+                const frag = document.createDocumentFragment()
+                for (let i = 0; i < rows.length; i++) {
+                  frag.appendChild(makeSkillTableRow(rows[i]))
+                }
+                if (pickerEntriesBody) pickerEntriesBody.appendChild(frag)
               }
+              pickerRenderContent = renderSkillRows
               const loadCloudSkillRows = function () {
                 const seq = skillPickerState.cloudSeq + 1
                 skillPickerState.cloudSeq = seq
@@ -7566,7 +7259,7 @@
         }
       }
 
-      function applyPickerSelection() {
+      function applyPickerSave() {
         const ids = [...pickerSelected].sort()
         if (pickerKind === 'tools') {
           agentConfigState.tools = ids
@@ -7578,7 +7271,7 @@
           agentConfigState.skills = ids
         }
         renderBindChips()
-        closeAgentPickerModal()
+        closePickerManageView(false)
         void persistAgentConfigAndRestartSession({ silent: true })
       }
 
@@ -7593,16 +7286,19 @@
             ev.stopPropagation()
             closeRepoManageView()
             closeAgentSettingsView()
+            closePickerManageView(false)
             const items = sidebarNavEl.querySelectorAll('.sidebar-nav-row')
             for (let i = 0; i < items.length; i++) {
               items[i].classList.toggle('is-active', items[i] === btn)
             }
-            void openScheduleManageModal()
+            void openScheduleManageView()
             return
           }
           if (k === 'repo') {
             ev.preventDefault()
             ev.stopPropagation()
+            closeScheduleManageView(false)
+            closePickerManageView(false)
             const items = sidebarNavEl.querySelectorAll('.sidebar-nav-row')
             for (let i = 0; i < items.length; i++) {
               items[i].classList.toggle('is-active', items[i] === btn)
@@ -7615,30 +7311,36 @@
             ev.stopPropagation()
             closeRepoManageView()
             closeAgentSettingsView()
+            closeScheduleManageView(false)
             const items = sidebarNavEl.querySelectorAll('.sidebar-nav-row')
             for (let i = 0; i < items.length; i++) {
               items[i].classList.toggle('is-active', items[i] === btn)
             }
-            openAgentPickerModal(k)
+            openPickerManageView(k)
           }
         })
       }
-      if (btnAgentPickerClose) btnAgentPickerClose.addEventListener('click', closeAgentPickerModal)
-      if (btnAgentPickerCancel) btnAgentPickerCancel.addEventListener('click', closeAgentPickerModal)
-      if (agentPickerModalBackdrop) {
-        agentPickerModalBackdrop.addEventListener('click', closeAgentPickerModal)
+      if (btnPickerCancel) {
+        btnPickerCancel.addEventListener('click', function () {
+          closePickerManageView(true)
+        })
       }
-      if (btnAgentPickerOk) {
-        btnAgentPickerOk.addEventListener('click', function () {
-          applyPickerSelection()
+      if (btnPickerSave) {
+        btnPickerSave.addEventListener('click', function () {
+          applyPickerSave()
         })
       }
-      if (btnAgentPickerMcpJson) {
-        btnAgentPickerMcpJson.addEventListener('click', function () {
+      if (btnPickerMcpJson) {
+        btnPickerMcpJson.addEventListener('click', function () {
           if (pickerKind !== 'mcp') return
           openMcpJsonInputModal()
         })
       }
+      if (pickerSearch) {
+        pickerSearch.addEventListener('input', function () {
+          if (typeof pickerRenderContent === 'function') pickerRenderContent()
+        })
+      }
       if (btnMcpJsonInputModalClose) {
         btnMcpJsonInputModalClose.addEventListener('click', closeMcpJsonInputModal)
       }
@@ -7768,7 +7470,7 @@
               setStatus('remote mcp.json 已保存', serverReady ? 'ready' : '')
               if (pickerKind === 'mcp' && typeof refreshMcpPickerRows === 'function') {
                 void refreshMcpPickerRows().catch(function (e) {
-                  if (agentPickerList) agentPickerList.textContent = '加载失败: ' + e
+                  setPickerContentState('加载失败: ' + e, true)
                 })
               }
             })
@@ -7783,19 +7485,9 @@
         })
       }
 
-      if (btnScheduleManageModalClose) {
-        btnScheduleManageModalClose.addEventListener('click', closeScheduleManageModal)
-      }
-      if (scheduleManageModalBackdrop) {
-        scheduleManageModalBackdrop.addEventListener('click', closeScheduleManageModal)
-      }
-      const btnScheduleRunsModalClose = $('btnScheduleRunsModalClose')
       const btnScheduleRunsRefresh = $('btnScheduleRunsRefresh')
-      if (btnScheduleRunsModalClose) {
-        btnScheduleRunsModalClose.addEventListener('click', closeScheduleRunsModal)
-      }
-      if (scheduleRunsModalBackdrop) {
-        scheduleRunsModalBackdrop.addEventListener('click', closeScheduleRunsModal)
+      if (btnScheduleRunsBack) {
+        btnScheduleRunsBack.addEventListener('click', closeScheduleRunsView)
       }
       if (btnScheduleRunsRefresh) {
         btnScheduleRunsRefresh.addEventListener('click', function () {
@@ -7838,21 +7530,6 @@
         })
       })
 
-      if (btnManageAgents) {
-        btnManageAgents.addEventListener('click', function (ev) {
-          ev.preventDefault()
-          ev.stopPropagation()
-          closeRepoManageView()
-          closeAgentSettingsView()
-          if (sidebarNavEl) {
-            const items = sidebarNavEl.querySelectorAll('.sidebar-nav-row')
-            for (let i = 0; i < items.length; i++) {
-              items[i].classList.toggle('is-active', items[i] === btnManageAgents)
-            }
-          }
-        })
-      }
-
       function closeAgentMdModal() {
         if (!agentMdModal) return
         agentMdModal.classList.remove('is-open')
@@ -8019,6 +7696,8 @@
       function openAgentSettingsView(initialTab) {
         if (!agentSettingsView) return
         closeRepoManageView()
+        closePickerManageView(false)
+        closeScheduleManageView(false)
         if (initialTab === 'agentMd' || initialTab === 'settings') {
           agentEnvActiveTab = initialTab
         } else {
@@ -8581,18 +8260,18 @@
             })
         })
       }
-      if (btnAgentPickerToolImport && agentPickerToolImportInput) {
-        btnAgentPickerToolImport.addEventListener('click', function () {
+      if (btnPickerImport && pickerImportInput) {
+        btnPickerImport.addEventListener('click', function () {
           if (pickerKind !== 'tools' && pickerKind !== 'mcp' && pickerKind !== 'skills') return
-          agentPickerToolImportInput.value = ''
-          agentPickerToolImportInput.click()
+          pickerImportInput.value = ''
+          pickerImportInput.click()
         })
-        agentPickerToolImportInput.addEventListener('change', function () {
-          const f = agentPickerToolImportInput.files && agentPickerToolImportInput.files[0]
+        pickerImportInput.addEventListener('change', function () {
+          const f = pickerImportInput.files && pickerImportInput.files[0]
           if (!f) return
           const fd = new FormData()
           fd.append('file', f)
-          btnAgentPickerToolImport.disabled = true
+          btnPickerImport.disabled = true
           const importUrl = pickerKind === 'mcp'
             ? buildRuntimeMcpImportUrl()
             : pickerKind === 'skills'
@@ -8608,7 +8287,7 @@
               })
             })
             .then(function (x) {
-              btnAgentPickerToolImport.disabled = false
+              btnPickerImport.disabled = false
               if (!x.r.ok) {
                 window.alert('导入失败：' + (x.body.message || x.body.error || x.r.statusText))
                 return
@@ -8634,20 +8313,20 @@
               )
               if (pickerKind === 'tools' && typeof refreshToolPickerRows === 'function') {
                 void refreshToolPickerRows().catch(function (e) {
-                  if (agentPickerList) agentPickerList.textContent = '加载失败: ' + e
+                  setPickerContentState('加载失败: ' + e, true)
                 })
               } else if (pickerKind === 'mcp' && typeof refreshMcpPickerRows === 'function') {
                 void refreshMcpPickerRows().catch(function (e) {
-                  if (agentPickerList) agentPickerList.textContent = '加载失败: ' + e
+                  setPickerContentState('加载失败: ' + e, true)
                 })
               } else if (pickerKind === 'skills' && typeof refreshSkillPickerRows === 'function') {
                 void refreshSkillPickerRows().catch(function (e) {
-                  if (agentPickerList) agentPickerList.textContent = '加载失败: ' + e
+                  setPickerContentState('加载失败: ' + e, true)
                 })
               }
             })
             .catch(function (e) {
-              btnAgentPickerToolImport.disabled = false
+              btnPickerImport.disabled = false
               window.alert('导入失败: ' + e)
             })
         })
@@ -8722,12 +8401,8 @@
       }
       document.addEventListener('keydown', function (ev) {
         if (ev.key !== 'Escape') return
-        if (agentSwitchOpen) {
-          closeAgentSwitchMenu()
-          return
-        }
-        if (agentPickerModal && agentPickerModal.classList.contains('is-open')) {
-          closeAgentPickerModal()
+        if (pickerManageState.viewActive) {
+          closePickerManageView(true)
           return
         }
         if (mcpJsonInputModal && mcpJsonInputModal.classList.contains('is-open')) {
@@ -8742,12 +8417,12 @@
           closeSkillMdModal()
           return
         }
-        if (scheduleRunsModal && scheduleRunsModal.classList.contains('is-open')) {
-          closeScheduleRunsModal()
+        if (scheduleManageState.viewActive && scheduleManageState.contentView === 'runs') {
+          closeScheduleRunsView()
           return
         }
-        if (scheduleManageModal && scheduleManageModal.classList.contains('is-open')) {
-          closeScheduleManageModal()
+        if (scheduleManageState.viewActive) {
+          closeScheduleManageView(true)
           return
         }
         if (toolFilesModal && toolFilesModal.classList.contains('is-open')) {
@@ -8807,33 +8482,9 @@
         brandAgentSwitchBtnEl.addEventListener('click', function (ev) {
           ev.preventDefault()
           ev.stopPropagation()
-          void toggleAgentSwitchMenu()
+          goToAgentHomePage()
         })
       }
-      if (agentSwitchDropdownEl) {
-        agentSwitchDropdownEl.addEventListener('click', function (ev) {
-          ev.stopPropagation()
-        })
-      }
-      document.addEventListener('click', function (ev) {
-        if (!agentSwitchOpen) return
-        const t = ev.target
-        if (t instanceof Node) {
-          if (agentSwitchWrapEl && agentSwitchWrapEl.contains(t)) return
-          if (agentSwitchDropdownEl && agentSwitchDropdownEl.contains(t)) return
-        }
-        closeAgentSwitchMenu()
-      })
-      window.addEventListener('resize', function () {
-        if (agentSwitchOpen) positionAgentSwitchDropdown()
-      })
-      window.addEventListener(
-        'scroll',
-        function () {
-          if (agentSwitchOpen) positionAgentSwitchDropdown()
-        },
-        true
-      )
 
       updateBrandAgent()
       void syncAgentDisplayNameCatalog()