@omdp/dsh-connector 0.2.1 → 0.2.3

package/client.js

@@ -57,7 +57,7 @@ window.__ModuleLoader__.load({
       '.pm_badge.err{color:var(--dsw-alias-state-error-primary,#f87171)}' +
       /* buttons */
       '.pm_actions{display:flex;gap:8px;align-items:center;flex-wrap:wrap}' +
-      '.pm_btn{cursor:pointer;font:inherit;font-size:12px;padding:5px 12px;border-radius:8px;border:1px solid var(--dsw-alias-border-l2,rgba(128,128,128,.4));background:transparent;color:inherit;transition:background .12s}' +
+      '.pm_btn{cursor:pointer;font:inherit;font-size:12px;padding:5px 12px;border-radius:8px;border:1px solid var(--dsw-alias-border-l2,rgba(128,128,128,.4));background:transparent;color:inherit;transition:background .12s;flex:none}' +
       '.pm_btn:hover:not(:disabled){background:var(--dsw-alias-bg-layer-2,rgba(128,128,128,.14))}' +
       '.pm_btn:disabled{opacity:.45;cursor:default}' +
       '.pm_btn.primary{border-color:transparent;background:var(--dsw-alias-brand-primary,#5b8cff);color:#fff}' +
@@ -86,7 +86,7 @@ window.__ModuleLoader__.load({
       '.pm_empty{font-size:12px;color:var(--dsw-alias-label-secondary,#888);padding:10px 2px}' +
       '.pm_btnrow{display:flex;gap:8px;align-items:center;flex-wrap:wrap}' +
       /* market grid & icons */
-      '.pm_grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;margin-top:2px}' +
+      '.pm_grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;margin-top:2px;align-items:start}' +
       '@media(max-width:760px){.pm_grid{grid-template-columns:1fr}}' +
       '.pm_mcard{background:var(--dsw-alias-bg-layer-1,rgba(255,255,255,.035));border:1px solid var(--dsw-alias-border-l1,rgba(128,128,128,.22));border-radius:12px;padding:12px 14px;display:flex;flex-direction:column;gap:8px;transition:background .15s,border-color .15s}' +
       '.pm_mcard:hover{background:var(--dsw-alias-bg-layer-2,rgba(255,255,255,.06));border-color:var(--dsw-alias-border-l2,rgba(128,128,128,.4))}' +
@@ -566,6 +566,48 @@ window.__ModuleLoader__.load({
       return createElement('div', { className: 'pm_avatar' }, (props.label || '?').charAt(0))
     }
 
+    // Chinese labels for the official ModelScope MCP plaza taxonomy (the
+    // dolphin API returns ~90 category ids with exact counts via FiledAgg;
+    // labels below are the sidebar names where they exist, sensible
+    // translations elsewhere, and the raw id as a fallback).
+    var MCP_CAT_LABEL = {
+      'developer-tools': '开发者工具', search: '搜索工具', 'calendar-management': '日程管理',
+      other: '其他', 'browser-automation': '浏览器自动化', 'knowledge-and-memory': '知识管理',
+      communication: '交流协作', 'research-and-data': '学术研究', databases: '数据库',
+      'app-automation': '应用自动化', finance: '金融', 'file-systems': '文件系统',
+      'entertainment-and-media': '娱乐与多媒体', 'cloud-platforms': '云平台', 'os-automation': '系统自动化',
+      'rag-systems': 'RAG 系统', 'image-and-video-processing': '图像视频', 'autonomous-agents': '自主智能体',
+      'note-taking': '笔记记录', 'version-control': '版本控制', 'location-services': '位置服务',
+      monitoring: '监控', 'agent-orchestration': 'Agent 编排', 'security-and-iam': '安全与身份',
+      'code-execution': '代码执行', 'web-scraping': '网页抓取', 'content-management-systems': '内容管理',
+      'documentation-access': '文档访问', 'art-and-culture': '文化与艺术', 'social-media': '社交媒体',
+      virtualization: '虚拟化', 'project-management': '项目管理', 'code-analysis': '代码分析',
+      'ecommerce-and-retail': '电商零售', 'multimedia-processing': '多媒体处理',
+      'travel-and-transportation': '出行交通', 'customer-data-platforms': '客户数据平台',
+      marketing: '营销', 'cloud-storage': '云存储', 'education-and-learning-tools': '教育学习',
+      'testing-and-qa-tools': '测试质检', 'home-automation-and-iot': '家居物联网', 'shell-access': 'Shell 访问',
+      'command-line': '命令行', 'api-testing': 'API 测试', 'ci-cd': 'CI/CD', 'vector-databases': '向量数据库',
+      'games-and-gamification': '游戏化', 'speech-processing': '语音处理', 'health-and-wellness': '健康',
+      'text-summarization': '文本摘要', 'customer-and-marketing': '客户营销', 'weather-services': '天气服务',
+      observability: '可观测性', 'data-platforms': '数据平台', 'customer-support': '客户支持',
+      'open-data': '开放数据', blockchain: '区块链', 'government-data': '政务数据',
+      'coding-agents': '编程智能体', 'audio-processing': '音频处理', 'penetration-testing': '渗透测试',
+      cryptocurrency: '加密货币', 'language-translation': '语言翻译', 'text-to-speech': '语音合成',
+      'erp-systems': '企业 ERP', 'fitness-tracking': '健身追踪', 'legal-and-compliance': '法律合规',
+      'biology-and-medicine': '生物医学', 'software-architecture': '软件架构', AIGC: 'AIGC',
+      bioinformatics: '生物信息', 'home-automation': '家居自动化', security: '安全', sports: '体育',
+      transportation: '交通运输', productivity: '生产力工具', 'feature-flags': '特性开关', education: '教育',
+      'weather-and-climate': '天气气候', 'health-and-fitness': '健康健身', 'real-estate': '房地产',
+      'fitness-and-sports': '健身运动', 'network-services': '网络服务', healthcare: '医疗保健',
+      'sports-and-recreation': '运动休闲', 'Knowledge&Memory': '知识管理', weather: '天气', travel: '出行',
+      DeveloperTools: '开发者工具', 'network-monitoring': '网络监控', fitness: '健身',
+      'Research&Data': '学术研究', 'travel-services': '出行服务', health: '健康',
+      'research-an-data': '学术研究', 'aerospace-and-astrodynamics': '航空航天', data: '数据',
+      'security-and-compliance': '安全合规', gaming: '游戏', 'workplace-and-productivity': '工作生产力',
+      web3: 'Web3',
+    }
+    var MCP_CAT_LABEL_OF = function (id) { return MCP_CAT_LABEL[id] || id }
+
     function MarketPane(props) {
       var _a = react.useState('')
       var mcpSearch = _a[0]
@@ -600,26 +642,44 @@ window.__ModuleLoader__.load({
       var _k = react.useState('mcp')
       var sub = _k[0]
       var setSub = _k[1]
-
-      function findMcp(term) {
+      var _l = react.useState('')
+      var mcpCat = _l[0]
+      var setMcpCat = _l[1]
+      var _m = react.useState(1)
+      var mcpPage = _m[0]
+      var setMcpPage = _m[1]
+      var _n = react.useState(1)
+      var skillPage = _n[0]
+      var setSkillPage = _n[1]
+      var _o = react.useState([])
+      var mcpCats = _o[0]
+      var setMcpCats = _o[1]
+
+      function findMcp(term, cat, page, append) {
         var q = (term !== undefined ? term : mcpSearch).trim()
+        var c = cat !== undefined ? cat : mcpCat
+        var p = page || 1
         setMcpBusy(true)
         setErr('')
-        api('/market/mcp?search=' + encodeURIComponent(q), { method: 'GET' }).then(function (r) {
+        api('/market/mcp?search=' + encodeURIComponent(q) + '&page=' + p + (c ? '&category=' + encodeURIComponent(c) : ''), { method: 'GET' }).then(function (r) {
           if (r && r.error) { setErr(r.error); setMcpResult(null); return }
-          setMcpResult(r)
+          if (!c) setMcpCats(r.categories || []) // unfiltered responses carry the global category table
+          setMcpResult(append && mcpResult ? Object.assign({}, r, { items: mcpResult.items.concat(r.items) }) : r)
+          setMcpPage(p)
         }).finally(function () { setMcpBusy(false) })
       }
-      function findSkills(term, cat) {
+      function findSkills(term, cat, page, append) {
         var q = (term !== undefined ? term : skillSearch).trim()
         var c = cat !== undefined ? cat : category
+        var p = page || 1
         setSkillBusy(true)
         setErr('')
-        var qs = '/market/skills?search=' + encodeURIComponent(q)
+        var qs = '/market/skills?search=' + encodeURIComponent(q) + '&page=' + p
         if (c) qs += '&category=' + encodeURIComponent(c)
         api(qs, { method: 'GET' }).then(function (r) {
           if (r && r.error) { setErr(r.error); setSkillResult(null); return }
-          setSkillResult(r)
+          setSkillResult(append && skillResult ? Object.assign({}, r, { items: skillResult.items.concat(r.items) }) : r)
+          setSkillPage(p)
         }).finally(function () { setSkillBusy(false) })
       }
       function openMcp(id) {
@@ -641,27 +701,46 @@ window.__ModuleLoader__.load({
 
       // Load the default (hot) lists right away so the tab never opens empty.
       react.useEffect(function () {
-        findMcp('')
-        findSkills('', '')
+        findMcp('', '', 1, false)
+        findSkills('', '', 1, false)
         // eslint-disable-next-line react-hooks/exhaustive-deps
       }, [])
 
-      var mcpRows = mcpResult && mcpResult.items
-        ? mcpResult.items.map(function (s) {
-            var d = mcpDetail[s.id]
-            return createElement(McpMarketItem, {
-              key: s.id, item: s, detail: d,
-              onOpen: function () { if (!d) openMcp(s.id) },
-            })
+      // Category filtering is server-side (dolphin Criterion); the response
+      // total already reflects the chosen category and the item list arrives
+      // pre-filtered with exact counts (FiledAgg) mirrored on the chips.
+      var loadedMcp = mcpResult && mcpResult.items ? mcpResult.items : []
+      var mcpRows = loadedMcp
+        .map(function (s) {
+          var d = mcpDetail[s.id]
+          return createElement(McpMarketItem, {
+            key: s.id, item: s, detail: d,
+            onOpen: function () {
+              if (d) {
+                var next = Object.assign({}, mcpDetail)
+                delete next[s.id]
+                setMcpDetail(next)
+              } else {
+                openMcp(s.id)
+              }
+            },
           })
-        : []
+        })
 
       var skillRows = skillResult && skillResult.items
         ? skillResult.items.map(function (s) {
             var d = skillDetail[s.id]
             return createElement(SkillMarketItem, {
               key: s.id, item: s, detail: d, skills: props.skills,
-              onOpen: function () { if (!d) openSkill(s.id) },
+              onOpen: function () {
+                if (d) {
+                  var next = Object.assign({}, skillDetail)
+                  delete next[s.id]
+                  setSkillDetail(next)
+                } else {
+                  openSkill(s.id)
+                }
+              },
               onChanged: props.onChanged,
             })
           })
@@ -685,14 +764,40 @@ window.__ModuleLoader__.load({
                   placeholder: '搜索 MCP 服务，如 map / github / fetch Search…',
                   value: mcpSearch,
                   onChange: function (e) { setMcpSearch(e.target.value) },
-                  onKeyDown: function (e) { if (e.key === 'Enter') findMcp() },
+                  onKeyDown: function (e) { if (e.key === 'Enter') findMcp(undefined, undefined, 1, false) },
+                }),
+                createElement('button', { className: 'pm_btn primary', disabled: mcpBusy, onClick: function () { findMcp(undefined, undefined, 1, false) } }, mcpBusy ? '搜索中…' : '搜索'),
+              ),
+              createElement('div', { className: 'pm_chips' },
+                createElement('button', {
+                  key: 'all',
+                  className: 'pm_chip' + (!mcpCat ? ' active' : ''),
+                  onClick: function () { setMcpCat(''); findMcp(undefined, '', 1, false) },
+                }, '全部 ' + (mcpResult && mcpResult.total ? mcpResult.total.toLocaleString() : '')),
+                mcpCats.map(function (c) {
+                  return createElement('button', {
+                    key: c.id,
+                    className: 'pm_chip' + (mcpCat === c.id ? ' active' : ''),
+                    onClick: function () { setMcpCat(c.id); findMcp(undefined, c.id, 1, false) },
+                  }, MCP_CAT_LABEL_OF(c.id) + ' ' + c.count.toLocaleString())
                 }),
-                createElement('button', { className: 'pm_btn primary', disabled: mcpBusy, onClick: function () { findMcp() } }, mcpBusy ? '搜索中…' : '搜索'),
               ),
+              mcpResult && mcpResult.total
+                ? createElement('div', { className: 'pm_meta' },
+                    (mcpCat
+                      ? '分类 ' + MCP_CAT_LABEL_OF(mcpCat) + '：共 ' + mcpResult.total.toLocaleString() + ' 个 MCP 服务'
+                      : '共 ' + mcpResult.total.toLocaleString() + ' 个 MCP 服务，已加载 ' + loadedMcp.length + ' 条'),
+                  )
+                : null,
               createElement('div', { className: 'pm_grid' }, mcpRows),
-              mcpResult && mcpResult.items && !mcpResult.items.length
+              mcpResult && mcpResult.items && !loadedMcp.length
                 ? createElement('div', { className: 'pm_empty' }, '没有匹配的 MCP 服务。No matching MCP servers.')
                 : null,
+              mcpResult && mcpResult.hasMore
+                ? createElement('div', { className: 'pm_actions', style: { justifyContent: 'center' } },
+                    createElement('button', { className: 'pm_btn', disabled: mcpBusy, onClick: function () { findMcp(mcpSearch, mcpCat, mcpPage + 1, true) } }, '加载更多 ' + mcpResult.total.toLocaleString() + ' 中已看 ' + loadedMcp.length),
+                  )
+                : null,
             )
           : createElement('div', { className: 'pm_section' },
               createElement('div', { className: 'pm_search' },
@@ -700,23 +805,33 @@ window.__ModuleLoader__.load({
                   placeholder: '搜索技能，如 code-review / deploy Search…',
                   value: skillSearch,
                   onChange: function (e) { setSkillSearch(e.target.value) },
-                  onKeyDown: function (e) { if (e.key === 'Enter') findSkills() },
+                  onKeyDown: function (e) { if (e.key === 'Enter') findSkills(undefined, undefined, 1, false) },
                 }),
-                createElement('button', { className: 'pm_btn primary', disabled: skillBusy, onClick: function () { findSkills() } }, skillBusy ? '搜索中…' : '搜索'),
+                createElement('button', { className: 'pm_btn primary', disabled: skillBusy, onClick: function () { findSkills(undefined, undefined, 1, false) } }, skillBusy ? '搜索中…' : '搜索'),
               ),
               createElement('div', { className: 'pm_chips' },
                 SKILL_CATEGORIES.map(function (c) {
                   return createElement('button', {
                     key: c.id || 'all',
                     className: 'pm_chip' + (category === c.id ? ' active' : ''),
-                    onClick: function () { setCategory(c.id); findSkills(skillSearch, c.id) },
+                    onClick: function () { setCategory(c.id); setSkillPage(1); findSkills(skillSearch, c.id, 1, false) },
                   }, c.label)
                 }),
               ),
+              skillResult && skillResult.total
+                ? createElement('div', { className: 'pm_meta' },
+                    '共 ' + skillResult.total.toLocaleString() + ' 个技能，已加载 ' + (skillResult.items ? skillResult.items.length : 0) + ' 条',
+                  )
+                : null,
               createElement('div', { className: 'pm_grid' }, skillRows),
               skillResult && skillResult.items && !skillResult.items.length
                 ? createElement('div', { className: 'pm_empty' }, '没有匹配的技能。No matching skills.')
                 : null,
+              skillResult && skillResult.hasMore
+                ? createElement('div', { className: 'pm_actions', style: { justifyContent: 'center' } },
+                    createElement('button', { className: 'pm_btn', disabled: skillBusy, onClick: function () { findSkills(skillSearch, category, skillPage + 1, true) } }, '加载更多 ' + skillResult.total.toLocaleString() + ' 中已看 ' + skillResult.items.length),
+                  )
+                : null,
             ),
       )
     }
@@ -761,14 +876,14 @@ window.__ModuleLoader__.load({
           createElement('button', { className: 'pm_btn', onClick: props.onOpen }, d ? '收起' : '详情'),
           d && configs.length
             ? createElement('button', { className: 'pm_btn primary', onClick: function () { copied.copy(cfgText) } },
-                copied.copied || '复制配置 Copy')
+                copied.copied || '复制配置')
             : null,
         ),
         d ? createElement('div', { className: 'pm_section', style: { marginTop: '4px' } },
           createElement('div', { className: 'pm_actions' },
             d.hosted ? badge('Hosted 官方托管', 'brand') : null,
             d.verified ? badge('已认证 Verified', 'brand') : null,
-            d.stars !== undefined && d.stars !== null ? badge('★ ' + fmtNum(d.stars), 'muted') : null,
+            d.stars > 0 ? badge('★ ' + fmtNum(d.stars), 'muted') : null,
           ),
           (d.envSchema && d.envSchema.length)
             ? createElement('div', { className: 'pm_meta' },

package/index.js

@@ -26,6 +26,7 @@ import { spawnSync } from 'node:child_process'
 import { homedir } from 'node:os'
 import { join, dirname } from 'node:path'
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'
+import { JSDOM, VirtualConsole } from 'jsdom'
 
 const API_PREFIX = '/connector/api'
 const SKILL_NAME = /^[a-z0-9]+(?:-[a-z0-9]+)*$/
@@ -444,6 +445,7 @@ async function removeUserSkill(home, name) {
  * ───────────────────────────────────────────────────────────────────────── */
 
 const MARKET_BASE = process.env.DSH_CONNECTOR_MARKET ?? 'https://modelscope.cn/openapi/v1'
+const MARKET_UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36'
 const MARKET_TTL = 30 * 60 * 1000 // 30 minutes in-process cache
 const marketCache = new Map()
 
@@ -465,6 +467,84 @@ function marketError(res, error) {
   return json(res, 502, { error: `market unavailable: ${String(error?.message ?? error)}` })
 }
 
+/* ── ModelScope dolphin MCP API (the engine behind modelscope.cn/mcp) ──────
+ *
+ * The official plaza is a SPA whose data endpoint is
+ *   PUT https://www.modelscope.cn/api/v1/dolphin/mcpServers
+ * with body { PageSize, PageNumber, Query, Criterion } where category
+ * filtering is  Criterion: [{ Category:'Category', Predicate:'contains',
+ * StringValues:[categoryId] }]. The response carries
+ *   Data.McpServer.{McpServers[], TotalCount}   — paged list + exact total
+ *   Data.FiledAgg.Category                      — every category + exact count
+ * (this is what the sidebar numbers on the official site are).
+ *
+ * The endpoint sits behind an Alibaba WAF JS challenge (acw_sc__v2). A plain
+ * server request gets a challenge page back; the cookie is produced by
+ * executing that page. We run it in jsdom (deterministic, no browser needed)
+ * and cache the cookie for 30 minutes (the WAF's own max-age is 3600s).
+ */
+const DOLPHIN_URL = 'https://www.modelscope.cn/api/v1/dolphin/mcpServers'
+const WAF_TTL = 30 * 60 * 1000
+const dolphinCache = new Map()
+let wafCookie = null // { value, at }
+
+// Solve the acw_sc__v2 cookie by executing the challenge page in jsdom. The
+// challenge HTML arrives as the body of the WAF-blocked request itself (the
+// SPA shell on /mcp is NOT a challenge page and yields no cookie).
+async function solveWafFromChallenge(html) {
+  if (wafCookie && Date.now() - wafCookie.at < WAF_TTL) return wafCookie.value
+  const vc = new VirtualConsole()
+  vc.on('jsdomError', () => {}) // jsdom navigation is not implemented — that is expected here
+  const dom = new JSDOM(html, {
+    runScripts: 'dangerously',
+    pretendToBeVisual: true,
+    virtualConsole: vc,
+    url: 'https://www.modelscope.cn/',
+    beforeParse(window) {
+      for (const k of ['reload', 'replace', 'assign']) {
+        try { Object.defineProperty(window.location, k, { configurable: true, writable: true, value: () => {} }) } catch { /* noop */ }
+      }
+      window.open = () => null
+    },
+  })
+  await new Promise((resolve) => setTimeout(resolve, 1500))
+  const cookie = dom.window.document.cookie.match(/acw_sc__v2=([^;]+)/)
+  dom.window.close()
+  if (!cookie) throw new Error('WAF challenge did not yield a cookie')
+  wafCookie = { value: cookie[1], at: Date.now() }
+  return wafCookie.value
+}
+
+async function dolphinPut(body) {
+  const key = 'dolphin?' + JSON.stringify(body)
+  const hit = dolphinCache.get(key)
+  if (hit !== undefined && Date.now() - hit.at < MARKET_TTL) return hit.value
+  const attempt = async (cookie) => {
+    const res = await fetch(DOLPHIN_URL, {
+      method: 'PUT',
+      headers: { 'content-type': 'application/json', 'user-agent': MARKET_UA, ...(cookie ? { cookie: `acw_sc__v2=${cookie}` } : {}) },
+      body: JSON.stringify(body),
+      signal: AbortSignal.timeout(15000),
+    })
+    const text = await res.text()
+    if (text.includes('acw_sc__v2') || text.includes('aliyunwaf')) return { challenge: text }
+    if (!res.ok) throw new Error(`dolphin returned HTTP ${res.status}`)
+    return JSON.parse(text)
+  }
+  // First try with the cached cookie; on a challenge page, solve from its HTML
+  // and retry exactly once with the fresh cookie.
+  let data = await attempt(wafCookie && Date.now() - wafCookie.at < WAF_TTL ? wafCookie.value : undefined)
+  if (data && data.challenge) {
+    wafCookie = null
+    const fresh = await solveWafFromChallenge(data.challenge)
+    data = await attempt(fresh)
+    if (data && data.challenge) throw new Error('WAF challenge loop (every attempt blocked)')
+  }
+  if (!data) throw new Error('dolphin request failed')
+  dolphinCache.set(key, { at: Date.now(), value: data })
+  return data
+}
+
 // Skill ids come back as `@author/name` and appear in URLs verbatim. Only
 // accept the safe alphabet so a crafted id can never escape the path.
 const MARKET_ID = /^@?[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+$/
@@ -474,7 +554,7 @@ async function marketSkillsList(req, res, params) {
   const search = params.get('search')?.trim()
   const category = params.get('category')?.trim()
   const page = Math.max(1, Number(params.get('page')) || 1)
-  const qs = new URLSearchParams({ page_number: String(page), page_size: '20' })
+  const qs = new URLSearchParams({ page_number: String(page), page_size: '50' })
   if (search) qs.set('search', search)
   if (category) qs.set('filter.category', category)
   let data
@@ -497,7 +577,8 @@ async function marketSkillsList(req, res, params) {
     logo: s.logo_url,
     installed: local.some((l) => l.source === s.id),
   }))
-  return json(res, 200, { ok: true, items })
+  const total = Number(data?.data?.total) || items.length
+  return json(res, 200, { ok: true, items, total, page, hasMore: page * 50 < total })
 }
 
 // GET /api/market/skills/:id  (id is `@author/name`, may contain a slash)
@@ -539,20 +620,20 @@ async function marketSkillDetail(res, id) {
   })
 }
 
-// GET /api/market/mcp?search=&page=
+// GET /api/market/mcp?search=&category=&page=
 async function marketMcpList(req, res, params) {
-  const search = params.get('search')?.trim()
+  const search = params.get('search')?.trim() ?? ''
+  const category = params.get('category')?.trim()
   const page = Math.max(1, Number(params.get('page')) || 1)
-  const body = { page_number: page, page_size: 20 }
-  if (search) body.search = search
-  const key = `mcp?${JSON.stringify(body)}`
+  const body = {
+    PageSize: 30,
+    PageNumber: page,
+    Query: search,
+    Criterion: category ? [{ Category: 'Category', Predicate: 'contains', StringValues: [category] }] : [],
+  }
   let data
   try {
-    data = await marketFetch(key, '/mcp/servers', {
-      method: 'PUT',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify(body),
-    })
+    data = await dolphinPut(body)
   } catch (error) {
     return marketError(res, error)
   }
@@ -569,18 +650,27 @@ async function marketMcpList(req, res, params) {
   } catch {
     // patch missing/unreadable: no configured markers, market still works
   }
-  const items = (data?.data?.mcp_server_list ?? []).map((s) => ({
-    id: s.id,
-    name: s.chinese_name || s.name,
-    description: s.description,
-    publisher: s.publisher,
-    tags: s.tags,
-    logo: s.logo_url,
-    views: s.view_count,
-    categories: s.categories,
-    configured: localMatches.some((local) => local.includes(s.id.toLowerCase())),
+  const servers = data?.Data?.McpServer?.McpServers ?? []
+  const items = servers.map((s) => ({
+    id: s.Publisher, // `@author/name` — same shape the detail endpoint expects
+    name: s.ChineseName || s.Name || s.Publisher,
+    description: s.AbstractCN || s.Abstract || '',
+    publisher: s.Publisher,
+    tags: Array.isArray(s.Tags) ? s.Tags : [],
+    logo: s.FromSiteIcon || '',
+    views: s.ViewCount,
+    stars: s.Stars,
+    license: s.License || '',
+    hosted: !!s.Hosted,
+    verified: !!s.Verifed,
+    categories: Array.isArray(s.Category) ? s.Category : [],
+    configured: localMatches.some((local) => typeof s.Publisher === 'string' && local.includes(s.Publisher.toLowerCase())),
   }))
-  return json(res, 200, { ok: true, items })
+  const total = Number(data?.Data?.McpServer?.TotalCount) || items.length
+  const categories = (data?.Data?.FiledAgg?.Category ?? [])
+    .map((c) => ({ id: String(c.Value), count: Number(c.Count) || 0 }))
+    .filter((c) => c.id)
+  return json(res, 200, { ok: true, items, total, page, pageSize: 30, hasMore: page * 30 < total, categories })
 }
 
 // Reduce a JSONSchema env block to its variable list (never ship the raw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omdp/dsh-connector",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Unified DeepSeek Harness connector: edit MCP servers (cordis.patch.yml), user skills (~/.dsh/skills) and browse the ModelScope MCP/Skills marketplaces from one Web UI settings page.",
   "type": "module",
   "main": "index.js",
@@ -42,6 +42,7 @@
     "directory": "dsh-connector"
   },
   "dependencies": {
-    "yaml": "^2.9.0"
+    "yaml": "^2.9.0",
+    "jsdom": "^24.1.3"
   }
 }