@ai-wendao/ant 0.3.17 → 0.3.18

package/client.js

@@ -382,7 +382,7 @@ window.__ModuleLoader__.load({
           if (generation !== refreshGeneration.current) return
           setSkills(result.skills)
           setLoadError(false)
-          setMessage(result.warning || (result.skills.length ? '' : '暂无团队或市场精选技能；下方仍可查看 DSH 官方技能。'))
+          setMessage(result.warning || (result.skills.length ? '' : '暂无已发布的全市场或本企业技能。候选技能需由管理员先导入、审核并发布；下方仍可查看 DSH 官方技能。'))
         } catch (error) {
           if (generation !== refreshGeneration.current) return
           setSkills([])
@@ -442,10 +442,11 @@ window.__ModuleLoader__.load({
         }
       }
       const visible = skills.filter((skill) => {
+        const canInstall = skill.scope !== 'market' || skill.team_enabled === true
         const matchesFilter = filter === 'all'
-          || filter === 'available' && ['not-installed', 'update-available'].includes(skill.local_status)
+          || filter === 'available' && canInstall && ['not-installed', 'update-available'].includes(skill.local_status)
           || filter === 'installed' && ['installed', 'update-available'].includes(skill.local_status)
-          || filter === 'updates' && skill.local_status === 'update-available'
+          || filter === 'updates' && canInstall && skill.local_status === 'update-available'
         const matchesQuery = !query.trim() || `${skill.title} ${skillIntroduction(skill)} ${skill.description} ${skill.dsh_name}`.toLowerCase().includes(query.trim().toLowerCase())
         return matchesFilter && matchesQuery
           && (scopeFilter === 'all' || (skill.scope || 'team') === scopeFilter)
@@ -518,24 +519,12 @@ window.__ModuleLoader__.load({
                 ...categories.map((category) => h('option', { key: category, value: category }, category))))),
         ),
         includePlugins ? h('h2', { style: { margin: 0, fontSize: 20 } }, loading ? '技能 · 读取中…' : `技能 · ${visible.length + visibleOfficial.length}`) : null,
-        message && (!includePlugins || loadError || skills.length) ? h('p', { role: loadError ? 'alert' : 'status', style: mutedTextStyle }, message) : null,
-        visibleOfficial.length ? h('section', { 'aria-label': 'DSH 官方 Office 技能', style: { display: 'grid', gap: 12 } },
-          h('div', null,
-            h('h2', { style: { margin: 0, fontSize: 20 } }, 'DSH 官方 Office'),
-            h('p', { style: { ...mutedTextStyle, marginTop: 4 } }, '这些能力随对应版本的 DSH 提供，ANT 无需重复安装。在新会话中直接描述任务即可；不计入 ANT 的本机安装筛选。'),
-            h('a', { href: officialOfficeGuide, target: '_blank', rel: 'noopener noreferrer', style: { color: 'var(--dsw-alias-link)', fontSize: 13 } }, '查看中文官方说明 ↗')),
-          h('div', { style: { display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(min(100%, 300px), 1fr))', gap: 14 } },
-            ...visibleOfficial.map((skill) => h('article', { key: skill.name, style: { ...panelStyle, gap: 10 } },
-              h('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'baseline', gap: 8 } },
-                h('h3', { style: { margin: 0, fontSize: 17 } }, skill.title),
-                h('span', { style: mutedTextStyle }, 'DSH 官方')),
-              h('p', { style: mutedTextStyle }, skill.description),
-              h('p', { style: mutedTextStyle }, `在新会话中说：“${skill.prompt}”。也可输入 /${skill.name}。`),
-              h('p', { style: mutedTextStyle }, `DSH ${skill.since} 起提供；旧版请使用 DSH 自带的检查更新。`),
-              h('a', { href: officialOfficeEnglish(skill), target: '_blank', rel: 'noopener noreferrer',
-                style: { ...secondaryButtonStyle, display: 'inline-flex', alignItems: 'center', width: 'fit-content', textDecoration: 'none' } }, '查看英文原文 ↗'))))) : null,
+        message && (!includePlugins || loadError || skills.length || (!loading && !query.trim()))
+          ? h('p', { role: loadError ? 'alert' : 'status', style: mutedTextStyle }, message) : null,
+        visible.length && !includePlugins ? h('h2', { style: { margin: 0, fontSize: 20 } }, '全市场与本企业技能') : null,
         visible.length ? h('div', { style: { display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(min(100%, 420px), 1fr))', gap: 16 } },
           ...visible.map((skill) => {
+            const marketPending = skill.scope === 'market' && skill.team_enabled !== true
             const description = skillIntroduction(skill)
             const originalEnglish = Boolean(curatedSkillIntroduction(skill)) || !hasChineseIntroduction(skill.description)
             const englishSource = skillEnglishSource(skill)
@@ -550,7 +539,9 @@ window.__ModuleLoader__.load({
                   h('h2', { style: { margin: 0, fontSize: 19 } }, skill.title),
                   h('span', { style: { ...mutedTextStyle, padding: '2px 7px', borderRadius: 6, backgroundColor: 'var(--dsw-alias-bg-layer-2)' } }, skill.scope === 'market' ? '全市场精选' : '本企业'),
                   h('span', { style: mutedTextStyle }, skillCategory(skill))),
-                h('span', { style: mutedTextStyle }, statusLabel[skill.local_status] || '状态未知')),
+                h('span', { style: mutedTextStyle }, marketPending
+                  ? skill.team_connected ? '待企业启用' : '连接企业后查看启用状态'
+                  : statusLabel[skill.local_status] || '状态未知')),
               h('p', { style: mutedTextStyle }, description.length > 180 ? `${description.slice(0, 180)}…` : description),
               englishSource ? h('a', { href: englishSource, target: '_blank', rel: 'noopener noreferrer',
                 style: { color: 'var(--dsw-alias-link)', fontSize: 13 } }, originalEnglish ? '查看英文原文 ↗' : '查看原始说明 ↗')
@@ -571,7 +562,20 @@ window.__ModuleLoader__.load({
                   /^https:\/\//u.test(skill.source_url || '')
                     ? h('a', { href: skill.source_url, target: '_blank', rel: 'noopener noreferrer', style: { fontSize: 13, color: 'var(--dsw-alias-link)' } }, '查看原始来源 ↗')
                     : h('p', { style: mutedTextStyle }, '来源：管理员上传并审核'))),
-              skill.local_status === 'conflict'
+              marketPending
+                ? h('div', { style: { display: 'grid', gap: 8, marginTop: 'auto' } },
+                  h('p', { role: 'status', style: mutedTextStyle }, skill.team_connected
+                    ? '本企业尚未启用这个固定版本。你可以先浏览介绍；需要使用时请联系企业管理员。'
+                    : '连接企业并验证工作邮箱后，才能查看本企业是否启用并安装这个技能。'),
+                  skill.local_status === 'conflict' && skill.conflict_reason === 'other-source'
+                    ? h('button', { type: 'button', disabled: Boolean(workingId),
+                      onClick: () => void changeInstall(skill, true), style: { ...secondaryButtonStyle, width: 'fit-content' } }, '卸载旧来源')
+                    : null,
+                  ['installed', 'update-available'].includes(skill.local_status)
+                    ? h('button', { type: 'button', disabled: Boolean(workingId),
+                      onClick: () => void changeInstall(skill, true), style: { ...secondaryButtonStyle, width: 'fit-content' } }, '卸载本机副本')
+                    : null)
+                : skill.local_status === 'conflict'
                 ? h('div', { style: { display: 'grid', gap: 8 } },
                   h('p', { role: 'status', style: mutedTextStyle }, skill.conflict_reason === 'other-source'
                     ? '本机已安装另一个来源的同名技能。可主动卸载本机旧来源，再安装此版本。'
@@ -587,6 +591,22 @@ window.__ModuleLoader__.load({
                     skill.local_status !== 'not-installed' ? h('button', { type: 'button', disabled: Boolean(workingId),
                       onClick: () => void changeInstall(skill, true), style: secondaryButtonStyle }, '卸载') : null))
           })) : !includePlugins && !loading && (skills.length || officialOfficeSkills.length) && !visibleOfficial.length ? h('p', { style: mutedTextStyle }, '没有符合筛选条件的技能。') : null,
+        visibleOfficial.length ? h('section', { 'aria-label': 'DSH 官方 Office 技能', style: { display: 'grid', gap: 12 } },
+          h('div', null,
+            h('h2', { style: { margin: 0, fontSize: 20 } }, 'DSH 官方 Office'),
+            h('p', { style: { ...mutedTextStyle, marginTop: 4 } }, '这些能力随对应版本的 DSH 提供，无需通过 ANT 安装。在新会话中直接描述任务即可；不计入 ANT 的本机安装筛选。'),
+            h('a', { href: officialOfficeGuide, target: '_blank', rel: 'noopener noreferrer', style: { color: 'var(--dsw-alias-link)', fontSize: 13 } }, '查看中文官方说明 ↗')),
+          h('div', { style: { display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(min(100%, 300px), 1fr))', gap: 14 } },
+            ...visibleOfficial.map((skill) => h('article', { key: skill.name, style: { ...panelStyle, gap: 10 } },
+              h('div', { style: { display: 'flex', flexWrap: 'wrap', justifyContent: 'space-between', alignItems: 'baseline', gap: 8 } },
+                h('h3', { style: { margin: 0, fontSize: 17 } }, skill.title),
+                h('span', { style: { ...mutedTextStyle, padding: '2px 8px', borderRadius: 6,
+                  backgroundColor: 'var(--dsw-alias-bg-layer-2)' } }, 'DSH 自带 · 无需在 ANT 安装')),
+              h('p', { style: mutedTextStyle }, skill.description),
+              h('p', { style: mutedTextStyle }, `在新会话中说：“${skill.prompt}”。也可输入 /${skill.name}。`),
+              h('p', { style: mutedTextStyle }, `DSH ${skill.since} 起提供；如果无法使用，请在 DSH 检查更新。`),
+              h('a', { href: officialOfficeEnglish(skill), target: '_blank', rel: 'noopener noreferrer',
+                style: { color: 'var(--dsw-alias-link)', fontSize: 13, lineHeight: 1.6, padding: '4px 0' } }, '英文原文 ↗'))))) : null,
         includePlugins ? h(PluginCenterPage, { remote, onBack, onAll, onSkills, openBundle,
           embedded: true, query, onQueryChange, externalFilter: filter,
           hasSkillMatches: visible.length + visibleOfficial.length > 0, skillCatalogReady: !loading && !loadError,

package/index.js

@@ -376,7 +376,9 @@ async function fetchMemberSkills(request, credentials, settings) {
       catch { return { status: 'rejected' } }
     }
     const team = await settle(connection ? listSkills(connection) : Promise.resolve([]))
-    const market = await settle(listSkills(marketSkillConnection(), 'market'))
+    const market = await settle(connection
+      ? listSkills({ ...connection, marketManaged: true }, 'market')
+      : listSkills(marketSkillConnection(), 'market'))
     if (market.status === 'rejected' && (team.status === 'rejected' || !connection)) {
       throw new Error('暂时无法读取公共技能市场；请稍后刷新。')
     }
@@ -406,10 +408,11 @@ async function fetchSkillOriginal(request, credentials, settings) {
     return jsonResponse(400, { message: '技能原文地址无效。' })
   }
   try {
-    const connection = scope === 'market' ? marketSkillConnection()
-      : await memberSkillConnection(credentials, settings)
+    const memberConnection = await memberSkillConnection(credentials, settings)
+    const connection = scope === 'market' ? memberConnection || marketSkillConnection() : memberConnection
     if (!connection) return jsonResponse(401, { message: '请先连接 ANT 团队。' })
-    const path = scope === 'market' ? `/api/market/skills/${skillId}/original`
+    const path = scope === 'market' ? memberConnection
+      ? `/api/me/market-skills/${skillId}/original` : `/api/market/skills/${skillId}/original`
       : `/api/me/skills/${skillId}/original`
     const upstream = await fetch(new URL(path, connection.serviceUrl), {
       headers: connection.token ? { authorization: `Bearer ${connection.token}`, accept: 'text/plain' }
@@ -443,10 +446,10 @@ async function installMemberSkill(request, credentials, settings) {
   }
   try {
     const scope = body?.scope || 'team'
-    const connection = scope === 'market' ? marketSkillConnection()
-      : await memberSkillConnection(credentials, settings)
+    const connection = await memberSkillConnection(credentials, settings)
     if (!connection) return jsonResponse(401, { message: '请先连接 ANT 团队，或重新验证工作邮箱。' })
-    return jsonResponse(200, await installSkill(connection, body?.skill_id, scope))
+    return jsonResponse(200, await installSkill(scope === 'market'
+      ? { ...connection, marketManaged: true } : connection, body?.skill_id, scope))
   } catch (error) {
     return jsonResponse(409, { message: error instanceof Error ? error.message : '技能安装失败。' })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-wendao/ant",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "description": "ANT (AI-native Teams) connects a DeepSeek Harness Desktop profile to team identity and approved models.",
   "type": "module",
   "scripts": {

package/skill-install.js

@@ -137,6 +137,7 @@ async function verifyManagedTree(root, name, marker) {
 
 async function boundedBytes(response, maxBytes) {
   if (response.status === 404) throw new Error('此技能可能已下架或不再可访问，请刷新目录后重试。')
+  if (response.status === 403) throw new Error('本企业尚未启用这个技能，或授权已撤销；请刷新目录。')
   if (!response.ok || !response.body) throw new Error(`技能来源无法提供文件（HTTP ${response.status}）。`)
   const chunks = []
   let total = 0
@@ -156,7 +157,9 @@ async function fetchJson(url, token, timeoutMs = 20_000) {
 }
 
 export async function listSkills(connection, scope = 'team') {
-  const path = scope === 'market' ? '/api/market/skills' : '/api/me/skills'
+  const path = scope === 'market'
+    ? connection.marketManaged ? '/api/me/market-skills' : '/api/market/skills'
+    : '/api/me/skills'
   const skills = await fetchJson(new URL(path, connection.serviceUrl), connection.token, scope === 'market' ? 8_000 : 20_000)
   if (!Array.isArray(skills)) throw new Error('技能目录格式无效。')
   const { root, conflicts } = await safeRoot()
@@ -165,7 +168,9 @@ export async function listSkills(connection, scope = 'team') {
     let local_status = conflicts.has(skill.dsh_name) ? 'conflict' : 'not-installed'
     let conflict_reason = ''
     const actualScope = skill.scope === 'market' ? 'market' : scope
-    if (local_status === 'conflict') return { ...skill, scope: actualScope, local_status }
+    const marketState = actualScope === 'market' ? { team_enabled: Boolean(connection.marketManaged && skill.team_enabled === true),
+      team_connected: Boolean(connection.marketManaged) } : {}
+    if (local_status === 'conflict') return { ...skill, scope: actualScope, local_status, ...marketState }
     try {
       const marker = await readManaged(root, skill.dsh_name)
       if (marker) {
@@ -178,7 +183,7 @@ export async function listSkills(connection, scope = 'team') {
         local_status = marker.content_sha256 === skill.content_sha256 ? 'installed' : 'update-available'
       }
     } catch { local_status = 'conflict' }
-    return { ...skill, scope: actualScope, local_status, conflict_reason }
+    return { ...skill, scope: actualScope, local_status, conflict_reason, ...marketState }
   }))
 }
 
@@ -217,7 +222,8 @@ function contentDigest(files) {
 export async function installSkill(connection, skillId, scope = 'team') {
   if (typeof skillId !== 'string' || !/^[0-9a-f-]{36}$/iu.test(skillId)) throw new Error('技能编号无效。')
   if (scope !== 'team' && scope !== 'market') throw new Error('技能来源无效。')
-  const basePath = scope === 'market' ? '/api/market/skills' : '/api/me/skills'
+  if (scope === 'market' && !connection.marketManaged) throw new Error('请先连接团队，再安装本企业已启用的全市场技能。')
+  const basePath = scope === 'market' ? '/api/me/market-skills' : '/api/me/skills'
   const manifest = await fetchJson(new URL(`${basePath}/${skillId}/files`, connection.serviceUrl), connection.token)
   validateManifest(manifest, skillId)
   const { root, conflicts } = await safeRoot()