diff --git a/cli/README.md b/cli/README.md index 9d4db4f0a..700503a28 100644 --- a/cli/README.md +++ b/cli/README.md @@ -37,6 +37,20 @@ skillhub publish ./my-skill --namespace myspace skillhub sync pull --namespace myspace ``` +## Presentation metadata for published packages + +Add optional `metadata.short-description` (up to 200 characters) and `metadata.overview` (Markdown, up to 20,000 characters) to `SKILL.md` frontmatter. The former is the card/search summary; the latter is the detail-page overview. Neither changes the original required `description`, slug, or archive contents. If absent, summary uses `description` and the detail view uses README.md then SKILL.md. CLI publication reads these package keys directly; it does not need web-only multipart fields. Custom web values belong to version snapshots, not the package. + +```yaml +--- +name: my-skill +description: When to use this skill +metadata: + short-description: Brief card text + overview: "# Detailed overview" +--- +``` + ## 🌐 Registry Configuration The active registry is resolved in the following priority order: diff --git a/docs/04-search-architecture.md b/docs/04-search-architecture.md index 0090be0b8..06163f802 100644 --- a/docs/04-search-architecture.md +++ b/docs/04-search-architecture.md @@ -69,7 +69,7 @@ WHERE (visibility = 'PUBLIC') | title | varchar(256) | | | summary | varchar(512) | | | keywords | varchar(512) | | -| search_text | text | `displayName`、`slug`、`summary`,以及 frontmatter 中除 `name` / `description` / `version` 外的字段展开结果 | +| search_text | text | `displayName`、`slug`、有效简短描述、原始包 `description`,以及 frontmatter 中除 `name` / `description` / `version` 与仅用于详情的 `metadata.overview` 外的字段展开结果 | | visibility | enum | 冗余,避免搜索时 join | | status | enum | | | updated_at | datetime | | diff --git a/docs/07-skill-protocol.md b/docs/07-skill-protocol.md index ef2a17f9a..1f989213d 100644 --- a/docs/07-skill-protocol.md +++ b/docs/07-skill-protocol.md @@ -44,8 +44,9 @@ description: When to use # 必需,1-2 句话 - 网页发布 multipart 可选字段 `displayName` 在 trim 后非空时优先于包内展示名,最长 200 字符;空白回退包内字段。该覆盖值保存在版本元数据快照,原始 frontmatter 和文件内容不改写;下载 ZIP 沿用现有重新打包机制,压缩包二进制可能不同。CLI 不填写此字段时继续使用包内规则。 - 网页上传后通过鉴权只读 `POST /api/web/skills/package-preview`(也提供 `/api/v1/skills/package-preview`)读取 `name/displayName/description/version`;此步骤不保存包、不创建技能或启动扫描,正式提交仍执行完整校验。 - 上述类型和长度限制在新上传解析时检查。读取历史版本快照时,非字符串或超长的旧 `display-name` 回退到该版本的 `name`,原始 frontmatter 保留,避免阻塞审核、提升或版本撤回。 -- `description` 映射为 `skill.summary` -- frontmatter 完整解析结果存入 `skill_version.parsed_metadata_json` +- `metadata.short-description` 可选,作为卡片、列表和搜索摘要,去除首尾空白后最多 200 个字符;缺失时回退到原始 `description`。`metadata.overview` 可选,为详情页 Markdown 概览,最多 20,000 个字符;缺失时详情页按 README.md → SKILL.md 回退。 +- 网页发布 multipart 可选字段 `shortDescription`、`overview` 和 `resetPresentation`;网页显式值优先于包内元数据,`resetPresentation=true` 清除自定义覆盖并禁止本次继承。两边均未提供展示值时,仅继承提交时当前已发布版本的自定义覆盖,并在快照记录 `presentationInheritedFrom`;不继承旧版包内默认值。值随版本快照保存,原始包文件不变。待审核版本不更新公开摘要,审核通过后才生效。 +- 有效 short description 映射为 `skill.summary`;原始 `description` 仍加入搜索文本。frontmatter 完整解析结果存入 `skill_version.parsed_metadata_json`。 平台扩展字段(可选,`x-astron-` 前缀): diff --git a/docs/14-skill-lifecycle.md b/docs/14-skill-lifecycle.md index cddef3d9c..79e7b572b 100644 --- a/docs/14-skill-lifecycle.md +++ b/docs/14-skill-lifecycle.md @@ -91,7 +91,7 @@ Status: contract reference with documented implementation exception - `PENDING_REVIEW -> PUBLISHED` - review task 标记为 `APPROVED` - `Skill.latestVersionId` 指向该版本 -- skill 展示元数据从发布版本刷新 +- skill 展示元数据从发布版本刷新,摘要采用该版本有效 `short-description`(自定义覆盖优先,其次包内值,再退回 `description`);`overview` 仅在选中版本详情展示。提交时的自定义继承冻结在版本快照,审核期间不随其他版本发布而变化。 ### 4.3 审核拒绝 diff --git a/docs/frontend-analytics-manifest.json b/docs/frontend-analytics-manifest.json index 3b230fb59..58dba106a 100644 --- a/docs/frontend-analytics-manifest.json +++ b/docs/frontend-analytics-manifest.json @@ -20,7 +20,7 @@ {"name":"skillVersionCompareRoute","path":"/space/$namespace/$slug/compare","declaration":{"file":"web/src/app/router.tsx","line":374},"implementation":{"file":"web/src/pages/skill-version-compare.tsx","line":22,"export":"SkillVersionComparePage"},"guarded":false,"roleProtected":false}, {"name":"dashboardRoute","path":"dashboard","declaration":{"file":"web/src/app/router.tsx","line":384},"implementation":{"file":"web/src/pages/dashboard.tsx","line":98,"export":"DashboardPage"},"guarded":true,"roleProtected":false}, {"name":"dashboardSkillsRoute","path":"dashboard/skills","declaration":{"file":"web/src/app/router.tsx","line":391},"implementation":{"file":"web/src/pages/dashboard/my-skills.tsx","line":46,"export":"MySkillsPage"},"guarded":true,"roleProtected":false}, - {"name":"dashboardPublishRoute","path":"dashboard/publish","declaration":{"file":"web/src/app/router.tsx","line":404},"implementation":{"file":"web/src/pages/dashboard/publish.tsx","line":41,"export":"PublishPage"},"guarded":true,"roleProtected":false}, + {"name":"dashboardPublishRoute","path":"dashboard/publish","declaration":{"file":"web/src/app/router.tsx","line":404},"implementation":{"file":"web/src/pages/dashboard/publish.tsx","line":42,"export":"PublishPage"},"guarded":true,"roleProtected":false}, {"name":"dashboardSuiteCreateRoute","path":"dashboard/suites/new","declaration":{"file":"web/src/app/router.tsx","line":430},"implementation":{"file":"web/src/pages/dashboard/suite-editor.tsx","line":716,"export":"SuiteCreatePage"},"guarded":true,"roleProtected":false}, {"name":"dashboardSuitesRoute","path":"dashboard/suites","declaration":{"file":"web/src/app/router.tsx","line":437},"implementation":{"file":"web/src/pages/dashboard/my-suites.tsx","line":21,"export":"MySuitesPage"},"guarded":true,"roleProtected":false}, {"name":"dashboardSuiteManagementRoute","path":"dashboard/suites/$namespace/$slug","declaration":{"file":"web/src/app/router.tsx","line":447},"implementation":{"file":"web/src/pages/dashboard/suite-management.tsx","line":31,"export":"SuiteManagementPage"},"guarded":true,"roleProtected":false}, @@ -645,21 +645,21 @@ {"file":"web/src/pages/dashboard/promotions.tsx","line":439,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["promotion.revocation.history"]}, {"file":"web/src/pages/dashboard/promotions.tsx","line":440,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["promotion.approved.tab"]}, {"file":"web/src/pages/dashboard/promotions.tsx","line":441,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["promotion.rejected.tab"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":265,"host":"SelectTrigger","prop":"data-analytics-id","event":"click+keydown-intent","ids":["skill.publish.namespace.interact"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":269,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.namespace.clear"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":271,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.namespace.select"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":283,"host":"SelectTrigger","prop":"data-analytics-id","event":"click+keydown-intent","ids":["skill.publish.visibility.interact"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":287,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.visibility.public"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":288,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.visibility.namespace"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":289,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.visibility.private"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":297,"host":"UploadZone","prop":"analyticsId","event":"click+keydown+change+drop","ids":["skill.package.select"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":297,"host":"UploadZone","prop":"folderAnalyticsId","event":"change","ids":["skill.package.folder.select"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":297,"host":"UploadZone","prop":"pickerAnalyticsId","event":"click","ids":["skill.package.folder.open"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":312,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.package.remove"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":343,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.package.preview.retry"]}, - {"file":"web/src/pages/dashboard/publish.tsx","line":355,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.avatar.save","skill.publish.request"],"conditional":true}, - {"file":"web/src/pages/dashboard/publish.tsx","line":365,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.publish.confirm"],"conditional":true}, - {"file":"web/src/pages/dashboard/publish.tsx","line":365,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.publish.cancel"],"conditional":true}, + {"file":"web/src/pages/dashboard/publish.tsx","line":285,"host":"SelectTrigger","prop":"data-analytics-id","event":"click+keydown-intent","ids":["skill.publish.namespace.interact"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":289,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.namespace.clear"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":291,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.namespace.select"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":303,"host":"SelectTrigger","prop":"data-analytics-id","event":"click+keydown-intent","ids":["skill.publish.visibility.interact"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":307,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.visibility.public"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":308,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.visibility.namespace"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":309,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.publish.visibility.private"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":317,"host":"UploadZone","prop":"analyticsId","event":"click+keydown+change+drop","ids":["skill.package.select"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":317,"host":"UploadZone","prop":"folderAnalyticsId","event":"change","ids":["skill.package.folder.select"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":317,"host":"UploadZone","prop":"pickerAnalyticsId","event":"click","ids":["skill.package.folder.open"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":332,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.package.remove"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":363,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.package.preview.retry"]}, + {"file":"web/src/pages/dashboard/publish.tsx","line":393,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.avatar.save","skill.publish.request"],"conditional":true}, + {"file":"web/src/pages/dashboard/publish.tsx","line":403,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.publish.confirm"],"conditional":true}, + {"file":"web/src/pages/dashboard/publish.tsx","line":403,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.publish.cancel"],"conditional":true}, {"file":"web/src/pages/dashboard/reports.tsx","line":131,"host":"button","prop":"data-analytics-id","event":"click","ids":["skill.detail.open"]}, {"file":"web/src/pages/dashboard/reports.tsx","line":151,"host":"Button","prop":"data-analytics-id","event":"click","ids":["report.dismiss.request"]}, {"file":"web/src/pages/dashboard/reports.tsx","line":159,"host":"Button","prop":"data-analytics-id","event":"click","ids":["report.resolve.request"]}, @@ -821,79 +821,79 @@ {"file":"web/src/pages/settings/profile.tsx","line":215,"host":"form","prop":"data-analytics-id","event":"submit","ids":["account.profile.save"]}, {"file":"web/src/pages/settings/profile.tsx","line":261,"host":"Button","prop":"data-analytics-id","event":"click","ids":["account.profile.cancel"]}, {"file":"web/src/pages/settings/security.tsx","line":96,"host":"form","prop":"data-analytics-id","event":"submit","ids":["account.password.save"]}, - {"file":"web/src/pages/skill-detail.tsx","line":831,"host":"Button","prop":"data-analytics-id","event":"click","ids":["auth.login.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":867,"host":"div","prop":"data-analytics-id","event":"structural","ids":["skill.detail.render"]}, - {"file":"web/src/pages/skill-detail.tsx","line":872,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.detail.back"]}, - {"file":"web/src/pages/skill-detail.tsx","line":923,"host":"CopyButton","prop":"analyticsId","event":"click","ids":["skill.coordinate.copy"]}, - {"file":"web/src/pages/skill-detail.tsx","line":945,"host":"Link","prop":"data-analytics-id","event":"click","ids":["search.label.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":985,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["skill.overview.tab"]}, - {"file":"web/src/pages/skill-detail.tsx","line":986,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["skill.files.tab"]}, - {"file":"web/src/pages/skill-detail.tsx","line":987,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["skill.versions.tab"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1015,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.overview.toggle"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1058,"host":"FileTree","prop":"analyticsId","event":"click","ids":["skill.file.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1097,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.comparison.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1104,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.rerelease.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1114,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.version.delete"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1123,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.review.withdraw"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1132,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.version.publish"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1141,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.review.submit"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1178,"host":"button","prop":"data-analytics-id","event":"click","ids":["skill.browser.toggle"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1200,"host":"FileTree","prop":"analyticsId","event":"click","ids":["skill.file.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1253,"host":"Button","prop":"data-analytics-id","event":"click","ids":["report.create.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1291,"host":"Link","prop":"data-analytics-id","event":"click","ids":["suite.detail.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1318,"host":"Link","prop":"data-analytics-id","event":"click","ids":["skill.related.open"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1373,"host":"InstallCommand","prop":"analyticsId","event":"click","ids":["skill.command.copy"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1373,"host":"InstallCommand","prop":"skillhubAnalyticsId","event":"click","ids":["skill.command.skillhub.select"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1373,"host":"InstallCommand","prop":"clawhubAnalyticsId","event":"click","ids":["skill.command.clawhub.select"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1413,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.review.withdraw"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1423,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.download.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1442,"host":"InstallForAgentButton","prop":"analyticsId","event":"click","ids":["skill.prompt.copy"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1514,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.unarchive.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1518,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.archive.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1523,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.delete.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1555,"host":"SelectTrigger","prop":"data-analytics-id","event":"click+keydown-intent","ids":["skill.promotion.version.interact"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1560,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.promotion.version"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1569,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.promotion.create.request","skill.promotion.update.request"],"conditional":true}, - {"file":"web/src/pages/skill-detail.tsx","line":1582,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.revocation.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1586,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.revocation.direct"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1621,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.hide.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1625,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.unhide.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1631,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.version.yank"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1641,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["report.create.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1661,"host":"Button","prop":"data-analytics-id","event":"click","ids":["report.create.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1664,"host":"Button","prop":"data-analytics-id","event":"click","ids":["report.create.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1671,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.promotion.create.confirm","skill.promotion.update.confirm"],"conditional":true}, - {"file":"web/src/pages/skill-detail.tsx","line":1671,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.promotion.create.cancel","skill.promotion.update.cancel"],"conditional":true}, - {"file":"web/src/pages/skill-detail.tsx","line":1690,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["skill.revocation.direct.cancel","skill.revocation.request.cancel"],"conditional":true}, - {"file":"web/src/pages/skill-detail.tsx","line":1703,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.revocation.direct.cancel","skill.revocation.request.cancel"],"conditional":true}, - {"file":"web/src/pages/skill-detail.tsx","line":1704,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.revocation.direct.submit","skill.revocation.request.submit"],"conditional":true}, - {"file":"web/src/pages/skill-detail.tsx","line":1711,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.archive.confirm"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1711,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.archive.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1720,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.unarchive.confirm"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1720,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.unarchive.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1729,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.delete.continue"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1729,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.delete.continue.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1748,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["skill.delete.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1764,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.delete.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1767,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.delete.confirm"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1778,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.version.delete.confirm"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1778,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.version.delete.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1792,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.review.withdraw.confirm"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1792,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.review.withdraw.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1816,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["skill.rerelease.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1836,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.rerelease.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1839,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.rerelease.request"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1846,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.rerelease.confirm"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1846,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.rerelease.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1867,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.version.publish.confirm"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1867,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.version.publish.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1880,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.review.submit.confirm"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1880,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.review.submit.cancel"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1902,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["skill.comparison.close"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1967,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.comparison.close"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1981,"host":"FilePreviewDialog","prop":"closeAnalyticsId","event":"click","ids":["skill.file.close"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1981,"host":"FilePreviewDialog","prop":"downloadAnalyticsId","event":"click","ids":["skill.file.download"]}, - {"file":"web/src/pages/skill-detail.tsx","line":1981,"host":"FilePreviewDialog","prop":"copyAnalyticsId","event":"click","ids":["skill.file.copy"]}, + {"file":"web/src/pages/skill-detail.tsx","line":832,"host":"Button","prop":"data-analytics-id","event":"click","ids":["auth.login.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":868,"host":"div","prop":"data-analytics-id","event":"structural","ids":["skill.detail.render"]}, + {"file":"web/src/pages/skill-detail.tsx","line":873,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.detail.back"]}, + {"file":"web/src/pages/skill-detail.tsx","line":924,"host":"CopyButton","prop":"analyticsId","event":"click","ids":["skill.coordinate.copy"]}, + {"file":"web/src/pages/skill-detail.tsx","line":946,"host":"Link","prop":"data-analytics-id","event":"click","ids":["search.label.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":986,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["skill.overview.tab"]}, + {"file":"web/src/pages/skill-detail.tsx","line":987,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["skill.files.tab"]}, + {"file":"web/src/pages/skill-detail.tsx","line":988,"host":"TabsTrigger","prop":"data-analytics-id","event":"click","ids":["skill.versions.tab"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1022,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.overview.toggle"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1065,"host":"FileTree","prop":"analyticsId","event":"click","ids":["skill.file.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1104,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.comparison.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1111,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.rerelease.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1121,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.version.delete"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1130,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.review.withdraw"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1139,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.version.publish"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1148,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.review.submit"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1185,"host":"button","prop":"data-analytics-id","event":"click","ids":["skill.browser.toggle"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1207,"host":"FileTree","prop":"analyticsId","event":"click","ids":["skill.file.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1260,"host":"Button","prop":"data-analytics-id","event":"click","ids":["report.create.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1298,"host":"Link","prop":"data-analytics-id","event":"click","ids":["suite.detail.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1325,"host":"Link","prop":"data-analytics-id","event":"click","ids":["skill.related.open"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1380,"host":"InstallCommand","prop":"analyticsId","event":"click","ids":["skill.command.copy"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1380,"host":"InstallCommand","prop":"skillhubAnalyticsId","event":"click","ids":["skill.command.skillhub.select"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1380,"host":"InstallCommand","prop":"clawhubAnalyticsId","event":"click","ids":["skill.command.clawhub.select"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1420,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.review.withdraw"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1430,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.download.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1449,"host":"InstallForAgentButton","prop":"analyticsId","event":"click","ids":["skill.prompt.copy"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1521,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.unarchive.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1525,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.archive.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1530,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.delete.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1562,"host":"SelectTrigger","prop":"data-analytics-id","event":"click+keydown-intent","ids":["skill.promotion.version.interact"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1567,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.promotion.version"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1576,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.promotion.create.request","skill.promotion.update.request"],"conditional":true}, + {"file":"web/src/pages/skill-detail.tsx","line":1589,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.revocation.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1593,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.revocation.direct"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1628,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.hide.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1632,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.unhide.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1638,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.version.yank"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1648,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["report.create.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1668,"host":"Button","prop":"data-analytics-id","event":"click","ids":["report.create.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1671,"host":"Button","prop":"data-analytics-id","event":"click","ids":["report.create.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1678,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.promotion.create.confirm","skill.promotion.update.confirm"],"conditional":true}, + {"file":"web/src/pages/skill-detail.tsx","line":1678,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.promotion.create.cancel","skill.promotion.update.cancel"],"conditional":true}, + {"file":"web/src/pages/skill-detail.tsx","line":1697,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["skill.revocation.direct.cancel","skill.revocation.request.cancel"],"conditional":true}, + {"file":"web/src/pages/skill-detail.tsx","line":1710,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.revocation.direct.cancel","skill.revocation.request.cancel"],"conditional":true}, + {"file":"web/src/pages/skill-detail.tsx","line":1711,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.revocation.direct.submit","skill.revocation.request.submit"],"conditional":true}, + {"file":"web/src/pages/skill-detail.tsx","line":1718,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.archive.confirm"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1718,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.archive.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1727,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.unarchive.confirm"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1727,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.unarchive.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1736,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.delete.continue"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1736,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.delete.continue.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1755,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["skill.delete.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1771,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.delete.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1774,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.delete.confirm"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1785,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.version.delete.confirm"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1785,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.version.delete.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1799,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.review.withdraw.confirm"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1799,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.review.withdraw.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1823,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["skill.rerelease.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1843,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.rerelease.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1846,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.rerelease.request"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1853,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.rerelease.confirm"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1853,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.rerelease.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1874,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.version.publish.confirm"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1874,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.version.publish.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1887,"host":"ConfirmDialog","prop":"confirmAnalyticsId","event":"click","ids":["skill.review.submit.confirm"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1887,"host":"ConfirmDialog","prop":"cancelAnalyticsId","event":"click","ids":["skill.review.submit.cancel"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1909,"host":"DialogContent","prop":"closeAnalyticsId","event":"click","ids":["skill.comparison.close"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1974,"host":"Button","prop":"data-analytics-id","event":"click","ids":["skill.comparison.close"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1988,"host":"FilePreviewDialog","prop":"closeAnalyticsId","event":"click","ids":["skill.file.close"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1988,"host":"FilePreviewDialog","prop":"downloadAnalyticsId","event":"click","ids":["skill.file.download"]}, + {"file":"web/src/pages/skill-detail.tsx","line":1988,"host":"FilePreviewDialog","prop":"copyAnalyticsId","event":"click","ids":["skill.file.copy"]}, {"file":"web/src/pages/skill-version-compare.tsx","line":160,"host":"SelectTrigger","prop":"data-analytics-id","event":"click+keydown-intent","ids":["skill.comparison.base.interact"]}, {"file":"web/src/pages/skill-version-compare.tsx","line":165,"host":"SelectItem","prop":"data-analytics-id","event":"radix-item-intent","ids":["skill.comparison.base"]}, {"file":"web/src/pages/skill-version-compare.tsx","line":187,"host":"SelectTrigger","prop":"data-analytics-id","event":"click+keydown-intent","ids":["skill.comparison.head.interact"]}, diff --git a/openspec/changes/add-skill-presentation-fields/design.md b/openspec/changes/add-skill-presentation-fields/design.md new file mode 100644 index 000000000..7c5ca64ba --- /dev/null +++ b/openspec/changes/add-skill-presentation-fields/design.md @@ -0,0 +1,7 @@ +# Design + +- Parse `metadata.short-description` and `metadata.overview` from SKILL.md, with limits of 200 and 20,000 characters. +- Accept multipart `shortDescription`, `overview`, and `resetPresentation`; web values override package metadata and are stored in `parsedMetadataJson` as `shortDescriptionOverride`, `overviewOverride`, and `presentationInheritedFrom`. +- Keep the existing display-name/version snapshot model and publish/review/rollback lifecycle. Pending versions never update the Skill container summary. +- The effective short description feeds `skill.summary`; search also retains the original package description in `search_text`. Overview is detail-only and falls back to README then SKILL.md in the existing documentation reader. +- Web package preview supplies defaults without editing the uploaded archive. Generated API types remain authoritative. diff --git a/openspec/changes/add-skill-presentation-fields/proposal.md b/openspec/changes/add-skill-presentation-fields/proposal.md new file mode 100644 index 000000000..594ac348d --- /dev/null +++ b/openspec/changes/add-skill-presentation-fields/proposal.md @@ -0,0 +1,10 @@ +# Add skill presentation fields + +## Why +Skill packages currently expose only one description and cannot provide a concise card summary plus a richer detail overview without modifying package files. + +## Scope +Add optional short description and Markdown overview to web and CLI-compatible publish metadata. Values are version snapshots, preserve package files, and use package metadata/default documentation when omitted. Public content changes only when the version publishes. + +## Non-goals +No upload-free editing, database migration, i18n variants, or dedicated presentation file. diff --git a/openspec/changes/add-skill-presentation-fields/specs/skill-presentation/spec.md b/openspec/changes/add-skill-presentation-fields/specs/skill-presentation/spec.md new file mode 100644 index 000000000..bbf6fec84 --- /dev/null +++ b/openspec/changes/add-skill-presentation-fields/specs/skill-presentation/spec.md @@ -0,0 +1,23 @@ +# Requirements + +## Presentation metadata + +The system MUST accept optional `metadata.short-description` and `metadata.overview` in SKILL.md. The short description MUST be at most 200 characters and the overview at most 20,000 characters. + +## Web publish precedence + +A web-provided value MUST override the package value for that submitted version. The archive MUST remain unchanged. Reset MUST remove the custom override so the package/default resolution applies. + +## Lifecycle isolation + +A pending version MUST NOT replace the currently published title, summary, or overview. Published metadata MUST be restored by rollback/yank using the selected published version snapshot. + +## Search and detail + +The effective short description MUST be used as the public summary. The original package description MUST remain searchable. The detailed overview MUST NOT be indexed and MUST fall back to README.md then SKILL.md when no explicit/package overview exists. + +## Scenarios + +- Given package metadata and web values, when previewing, the form is prefilled from package defaults and explicit edits win. +- Given a pending update, when it is submitted, public summary remains unchanged until publication. +- Given reset, when the version publishes, it uses package defaults and later default versions read their own package defaults. diff --git a/openspec/changes/add-skill-presentation-fields/tasks.md b/openspec/changes/add-skill-presentation-fields/tasks.md new file mode 100644 index 000000000..b67fbb4f8 --- /dev/null +++ b/openspec/changes/add-skill-presentation-fields/tasks.md @@ -0,0 +1,10 @@ +# Tasks + +- [x] Add SKILL.md metadata parsing and validation. +- [x] Add multipart publish fields and package-preview defaults. +- [x] Snapshot presentation fields in parsed metadata and update effective published summary. +- [x] Preserve original description in search text and keep pending updates isolated. +- [x] Add web short-description and Markdown-overview inputs. +- [x] Add full inheritance/restore-default/rollback acceptance coverage (published-only frozen inheritance, reset/default-not-copied, yank rollback, approval, promotion, and rerelease). +- [x] Regenerate OpenAPI types and update CLI usage documentation. +- [x] Add detail-page overview projection and View SKILL.md entry. diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/controller/portal/SkillPublishController.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/controller/portal/SkillPublishController.java index 7e2141310..7579bd803 100644 --- a/server/skillhub-app/src/main/java/com/iflytek/skillhub/controller/portal/SkillPublishController.java +++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/controller/portal/SkillPublishController.java @@ -83,6 +83,9 @@ public class SkillPublishController extends BaseApiController { @RequestParam(value = "avatarUploadId", required = false) String avatarUploadId, @RequestParam(value = "expectedSlug", required = false) String expectedSlug, @RequestParam(value = "displayName", required = false) String displayName, + @RequestParam(value = "shortDescription", required = false) String shortDescription, + @RequestParam(value = "overview", required = false) String overview, + @RequestParam(value = "resetPresentation", defaultValue = "false") boolean resetPresentation, @AuthenticationPrincipal PlatformPrincipal principal, HttpServletRequest request) throws IOException { SkillVisibility skillVisibility = SkillVisibility.valueOf(visibility.toUpperCase()); @@ -110,7 +113,8 @@ public class SkillPublishController extends BaseApiController { principal.userId(), skillVisibility, principal.platformRoles(), - confirmWarnings, avatarAction, avatarUploadId, expectedSlug, displayName, AuditRequestContext.from(request) + confirmWarnings, avatarAction, avatarUploadId, expectedSlug, displayName, + shortDescription, overview, resetPresentation, AuditRequestContext.from(request) ); PublishResponse response = new PublishResponse( diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/dto/SkillPackagePreviewResponse.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/dto/SkillPackagePreviewResponse.java index e0867b2b5..fe48923f0 100644 --- a/server/skillhub-app/src/main/java/com/iflytek/skillhub/dto/SkillPackagePreviewResponse.java +++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/dto/SkillPackagePreviewResponse.java @@ -4,10 +4,16 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.iflytek.skillhub.domain.skill.validation.SkillExamplesSummary.Status; /** Package defaults only: preview never creates a skill or changes its files. */ -public record SkillPackagePreviewResponse(String name, String displayName, String description, String version, +public record SkillPackagePreviewResponse(String name, String displayName, String description, String shortDescription, + String overview, String version, @JsonInclude(JsonInclude.Include.NON_NULL) Status examplesStatus, @JsonInclude(JsonInclude.Include.NON_NULL) Integer examplesCount) { + public SkillPackagePreviewResponse(String name, String displayName, String description, String version, + Status examplesStatus, Integer examplesCount) { + this(name, displayName, description, description, null, version, examplesStatus, examplesCount); + } + public SkillPackagePreviewResponse(String name, String displayName, String description, String version) { - this(name, displayName, description, version, null, null); + this(name, displayName, description, description, null, version, null, null); } } diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/SkillPackagePreviewService.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/SkillPackagePreviewService.java index 8ca0db72b..252c176bb 100644 --- a/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/SkillPackagePreviewService.java +++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/SkillPackagePreviewService.java @@ -31,7 +31,8 @@ public class SkillPackagePreviewService { .orElseThrow(() -> new DomainBadRequestException("error.skill.publish.skillMd.notFound")); SkillMetadata metadata = parser.parse(new String(skillMd.content(), StandardCharsets.UTF_8)); SkillExamplesSummary examples = SkillExamplesSummary.recognize(entries); - return new SkillPackagePreviewResponse(metadata.name(), metadata.displayName(), metadata.description(), metadata.version(), + return new SkillPackagePreviewResponse(metadata.name(), metadata.displayName(), metadata.description(), + metadata.shortDescription(), metadata.overview(), metadata.version(), examples.status(), examples.count()); } } diff --git a/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/SkillPublishAppService.java b/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/SkillPublishAppService.java index ad49260fc..cec607a29 100644 --- a/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/SkillPublishAppService.java +++ b/server/skillhub-app/src/main/java/com/iflytek/skillhub/service/SkillPublishAppService.java @@ -42,13 +42,14 @@ public class SkillPublishAppService { SkillVisibility visibility, Set roles, boolean confirmWarnings, AvatarAction action, String uploadId, String expectedSlug, AuditRequestContext context) { return publish(namespace, entries, actor, visibility, roles, confirmWarnings, action, - uploadId, expectedSlug, null, context); + uploadId, expectedSlug, null, null, null, false, context); } @Transactional public SkillPublishService.PublishResult publish(String namespace, List entries, String actor, SkillVisibility visibility, Set roles, boolean confirmWarnings, AvatarAction action, - String uploadId, String expectedSlug, String displayName, AuditRequestContext context) { + String uploadId, String expectedSlug, String displayName, String shortDescription, + String overview, boolean resetPresentation, AuditRequestContext context) { if (action == AvatarAction.REPLACE && (uploadId == null || uploadId.isBlank()) || action != AvatarAction.REPLACE && uploadId != null && !uploadId.isBlank()) { throw new DomainBadRequestException("error.skill.avatar.invalidUpload"); @@ -64,9 +65,13 @@ public class SkillPublishAppService { uploads.validateReference(namespace, targetSlug, actor, uploadId); } } - SkillPublishService.PublishResult result = displayName == null || displayName.isBlank() - ? publications.publishFromEntries(namespace, entries, actor, visibility, roles, confirmWarnings) - : publications.publishFromEntries(namespace, entries, actor, visibility, roles, confirmWarnings, displayName); + SkillPublishService.PublishResult result = (shortDescription == null || shortDescription.isBlank()) + && (overview == null || overview.isBlank()) && !resetPresentation + ? (displayName == null || displayName.isBlank() + ? publications.publishFromEntries(namespace, entries, actor, visibility, roles, confirmWarnings) + : publications.publishFromEntries(namespace, entries, actor, visibility, roles, confirmWarnings, displayName)) + : publications.publishFromEntries(namespace, entries, actor, visibility, roles, confirmWarnings, displayName, + shortDescription, overview, resetPresentation); var review = reviews.findBySkillVersionIdAndStatus( result.version().getId(), ReviewTaskStatus.PENDING).orElse(null); if (action == AvatarAction.REPLACE) { diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/review/PromotionService.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/review/PromotionService.java index 67ae04aba..d73224045 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/review/PromotionService.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/review/PromotionService.java @@ -320,7 +320,7 @@ public class PromotionService { try { SkillMetadata metadata = objectMapper.readValue(metadataJson, SkillMetadata.class); target.setDisplayName(metadata.displayName()); - target.setSummary(metadata.description()); + target.setSummary(metadata.shortDescription()); } catch (Exception e) { throw new IllegalStateException("Failed to deserialize skill metadata", e); } diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/review/ReviewService.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/review/ReviewService.java index c18159ff2..1341dcdaa 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/review/ReviewService.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/review/ReviewService.java @@ -467,7 +467,7 @@ public class ReviewService { try { SkillMetadata metadata = objectMapper.readValue(metadataJson, SkillMetadata.class); skill.setDisplayName(metadata.displayName()); - skill.setSummary(metadata.description()); + skill.setSummary(metadata.shortDescription()); } catch (Exception e) { throw new IllegalStateException("Failed to deserialize skill metadata", e); } diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadata.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadata.java index 1c1a65e4a..c4a546e06 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadata.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadata.java @@ -9,10 +9,35 @@ public record SkillMetadata( String version, String body, Map frontmatter, - String displayNameOverride + String displayNameOverride, + String shortDescriptionOverride, + String overviewOverride, + String presentationInheritedFrom ) { public SkillMetadata(String name, String description, String version, String body, Map frontmatter) { - this(name, description, version, body, frontmatter, null); + this(name, description, version, body, frontmatter, null, null, null, null); + } + + public SkillMetadata(String name, String description, String version, String body, Map frontmatter, + String displayNameOverride) { + this(name, description, version, body, frontmatter, displayNameOverride, null, null, null); + } + + public SkillMetadata withPresentation(String shortDescription, String overview, String inheritedFrom) { + String shortValue = normalize(shortDescription); + String overviewValue = normalize(overview); + if (shortValue != null && shortValue.length() > 200) { + throw new DomainBadRequestException("error.skill.shortDescription.tooLong", 200); + } + if (overviewValue != null && overviewValue.length() > 20000) { + throw new DomainBadRequestException("error.skill.overview.tooLong", 20000); + } + return new SkillMetadata(name, description, version, body, frontmatter, displayNameOverride, + shortValue, overviewValue, inheritedFrom); + } + + private static String normalize(String value) { + return value == null || value.strip().isEmpty() ? null : value.strip(); } /** Explicit portal input is validated before it becomes part of the version snapshot. */ @@ -26,6 +51,24 @@ public record SkillMetadata( override == null || override.isEmpty() ? null : override); } + public String shortDescription() { + return shortDescriptionOverride != null ? shortDescriptionOverride + : nestedText(frontmatter, "short-description", description); + } + + public String overview() { + String packageOverview = nestedText(frontmatter, "overview", null); + return overviewOverride != null ? overviewOverride : (packageOverview != null ? packageOverview : body); + } + + private static String nestedText(Map values, String key, String fallback) { + if (values != null && values.get("metadata") instanceof Map metadata + && metadata.get(key) instanceof String text && !text.strip().isEmpty()) { + return text.strip(); + } + return fallback; + } + /** Human-readable label; unsupported legacy snapshot values fall back to the package name. */ public String displayName() { if (displayNameOverride != null && !displayNameOverride.isBlank() diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParser.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParser.java index af7959dbe..5315c020d 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParser.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParser.java @@ -60,6 +60,14 @@ public class SkillMetadataParser { } validateDisplayName(frontmatter); + String shortDescription = extractNestedOptionalField(frontmatter, "metadata", "short-description"); + String overview = extractNestedOptionalField(frontmatter, "metadata", "overview"); + if (shortDescription != null && shortDescription.length() > 200) { + throw new DomainBadRequestException("error.skill.metadata.shortDescription.tooLong", 200); + } + if (overview != null && overview.length() > 20000) { + throw new DomainBadRequestException("error.skill.metadata.overview.tooLong", 20000); + } return new SkillMetadata(name, description, version, body, frontmatter); } diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillGovernanceService.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillGovernanceService.java index 82536db4c..78e222c3d 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillGovernanceService.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillGovernanceService.java @@ -388,7 +388,7 @@ public class SkillGovernanceService { try { SkillMetadata metadata = objectMapper.readValue(metadataJson, SkillMetadata.class); skill.setDisplayName(metadata.displayName()); - skill.setSummary(metadata.description()); + skill.setSummary(metadata.shortDescription()); } catch (Exception e) { throw new IllegalStateException("Failed to deserialize skill metadata", e); } diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillLifecycleProjectionService.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillLifecycleProjectionService.java index 359a2f94e..efc107734 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillLifecycleProjectionService.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillLifecycleProjectionService.java @@ -192,7 +192,7 @@ public class SkillLifecycleProjectionService { version.getStatus().name(), version.getParsedMetadataJson(), metadata == null ? null : metadata.displayName(), - metadata == null ? null : metadata.description(), + metadata == null ? null : metadata.shortDescription(), version.getGithubSyncRevision() ); } diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillPublishService.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillPublishService.java index d6043acf0..b32cc56c5 100644 --- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillPublishService.java +++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/service/SkillPublishService.java @@ -336,8 +336,17 @@ public class SkillPublishService { String namespaceSlug, List entries, String publisherId, SkillVisibility visibility, Set platformRoles, boolean confirmWarnings, String displayName) { + return publishFromEntries(namespaceSlug, entries, publisherId, visibility, platformRoles, confirmWarnings, + displayName, null, null, false); + } + + @Transactional + public PublishResult publishFromEntries( + String namespaceSlug, List entries, String publisherId, + SkillVisibility visibility, Set platformRoles, boolean confirmWarnings, + String displayName, String shortDescription, String overview, boolean resetPresentation) { return publishFromEntriesInternal(namespaceSlug, entries, publisherId, visibility, platformRoles, - confirmWarnings, false, false, null, null, displayName); + confirmWarnings, false, false, null, null, displayName, shortDescription, overview, resetPresentation); } /** Publishes a validated GitHub package into the dedicated sync review queue. */ @@ -450,10 +459,31 @@ public class SkillPublishService { true, null, null, - displayNameOverrideForRerelease(publishedVersion) + displayNameOverrideForRerelease(publishedVersion), + presentationOverrideForRerelease(publishedVersion, "shortDescriptionOverride"), + presentationOverrideForRerelease(publishedVersion, "overviewOverride"), + presentationOverrideForRerelease(publishedVersion, "shortDescriptionOverride") == null + && presentationOverrideForRerelease(publishedVersion, "overviewOverride") == null ); } + private boolean hasPackagePresentation(SkillMetadata metadata) { + if (metadata.frontmatter() == null || !(metadata.frontmatter().get("metadata") instanceof Map values)) { + return false; + } + return values.get("short-description") instanceof String shortText && !shortText.isBlank() + || values.get("overview") instanceof String overviewText && !overviewText.isBlank(); + } + + private String presentationOverrideForRerelease(SkillVersion source, String field) { + if (source.getParsedMetadataJson() == null) return null; + try { + return objectMapper.readTree(source.getParsedMetadataJson()).path(field).textValue(); + } catch (java.io.IOException ignored) { + return null; + } + } + private String displayNameOverrideForRerelease(SkillVersion source) { if (source.getParsedMetadataJson() == null) { return null; @@ -499,6 +529,17 @@ public class SkillPublishService { SkillVisibility visibility, Set platformRoles, boolean confirmWarnings, boolean forceAutoPublish, boolean bypassMembershipCheck, BundlePublicationTarget bundleTarget, GithubSyncPublicationTarget syncTarget, String displayName) { + return publishFromEntriesInternal(namespaceSlug, entries, publisherId, visibility, platformRoles, + confirmWarnings, forceAutoPublish, bypassMembershipCheck, bundleTarget, syncTarget, displayName, + null, null, false); + } + + private PublishResult publishFromEntriesInternal( + String namespaceSlug, List entries, String publisherId, + SkillVisibility visibility, Set platformRoles, boolean confirmWarnings, + boolean forceAutoPublish, boolean bypassMembershipCheck, + BundlePublicationTarget bundleTarget, GithubSyncPublicationTarget syncTarget, String displayName, + String shortDescription, String overview, boolean resetPresentation) { // 1. Find namespace by slug Namespace namespace = namespaceRepository.findBySlug(namespaceSlug) @@ -538,6 +579,8 @@ public class SkillPublishService { String skillMdContent = new String(skillMd.content()); SkillMetadata metadata = skillMetadataParser.parse(skillMdContent).withDisplayNameOverride(displayName); + metadata = metadata.withPresentation(resetPresentation ? null : shortDescription, + resetPresentation ? null : overview, null); String upstreamVersion = syncTarget == null ? null : metadata.version(); if (syncTarget != null) { // A reverted upstream package is a new review target after an intervening update. @@ -545,10 +588,13 @@ public class SkillPublishService { String syncVersion = "0.0.0-g" + syncTarget.contentSha256().substring(0, 40) + "-" + syncTarget.ingestionId().toString().replace("-", "").substring(0, 16); metadata = new SkillMetadata(metadata.name(), metadata.description(), syncVersion, - metadata.body(), metadata.frontmatter()); + metadata.body(), metadata.frontmatter(), metadata.displayNameOverride(), + metadata.shortDescriptionOverride(), metadata.overviewOverride(), null); } else if (metadata.version() == null || metadata.version().isBlank()) { String autoVersion = AUTO_VERSION_FORMATTER.format(currentTime()); - metadata = new SkillMetadata(metadata.name(), metadata.description(), autoVersion, metadata.body(), metadata.frontmatter(), metadata.displayNameOverride()); + metadata = new SkillMetadata(metadata.name(), metadata.description(), autoVersion, + metadata.body(), metadata.frontmatter(), metadata.displayNameOverride(), + metadata.shortDescriptionOverride(), metadata.overviewOverride(), null); } String skillSlug = SlugValidator.slugify(metadata.name()); if (bundleTarget != null @@ -646,6 +692,32 @@ public class SkillPublishService { newSkill = bundleTarget.expectedSkillId() == null; } + if (!newSkill && skill.getLatestVersionId() != null && !resetPresentation + && shortDescription == null && overview == null && !hasPackagePresentation(metadata)) { + SkillVersion published = skillVersionRepository.findBySkillIdAndStatus( + skill.getId(), SkillVersionStatus.PUBLISHED).stream() + .max(java.util.Comparator.comparing(SkillVersion::getPublishedAt, + java.util.Comparator.nullsLast(java.util.Comparator.naturalOrder())) + .thenComparing(SkillVersion::getCreatedAt, + java.util.Comparator.nullsLast(java.util.Comparator.naturalOrder())) + .thenComparing(SkillVersion::getId, + java.util.Comparator.nullsLast(java.util.Comparator.naturalOrder()))) + .orElse(null); + if (published != null && published.getParsedMetadataJson() != null) { + try { + SkillMetadata previous = objectMapper.readerFor(SkillMetadata.class) + .without(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .readValue(published.getParsedMetadataJson()); + if (previous.shortDescriptionOverride() != null || previous.overviewOverride() != null) { + metadata = metadata.withPresentation(previous.shortDescriptionOverride(), + previous.overviewOverride(), published.getVersion()); + } + } catch (java.io.IOException e) { + throw new IllegalStateException("Failed to deserialize published skill metadata", e); + } + } + } + if (visibilityService != null) { visibilityService.lockedSkill(skill.getId()); visibilityService.assertNoPendingVisibility(skill.getId()); @@ -886,7 +958,7 @@ public class SkillPublishService { // A pending update must not replace the currently published title or summary. if (autoPublish || visibility == SkillVisibility.PRIVATE || skill.getLatestVersionId() == null) { skill.setDisplayName(metadata.displayName()); - skill.setSummary(metadata.description()); + skill.setSummary(metadata.shortDescription()); } if (syncTarget != null) { skill.assignGithubSyncOwnership(publisherId); @@ -1150,6 +1222,9 @@ public class SkillPublishService { parsedMetadata.put("body", metadata.body()); parsedMetadata.put("frontmatter", metadata.frontmatter()); parsedMetadata.put("displayNameOverride", metadata.displayNameOverride()); + parsedMetadata.put("shortDescriptionOverride", metadata.shortDescriptionOverride()); + parsedMetadata.put("overviewOverride", metadata.overviewOverride()); + parsedMetadata.put("presentationInheritedFrom", metadata.presentationInheritedFrom()); if (syncTarget != null) { parsedMetadata.put("upstreamVersion", upstreamVersion); parsedMetadata.put("githubContentSha256", syncTarget.contentSha256()); diff --git a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/review/PromotionServiceTest.java b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/review/PromotionServiceTest.java index 79c5dc6f2..ce9dfd1be 100644 --- a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/review/PromotionServiceTest.java +++ b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/review/PromotionServiceTest.java @@ -672,7 +672,9 @@ class PromotionServiceTest { Skill sourceSkill = createSourceSkill(); SkillVersion sourceVersion = createPublishedVersion(); sourceSkill.setLatestVersionId(999L); - sourceVersion.setParsedMetadataJson(selectedVersionMetadata(hasDisplayName)); + sourceVersion.setParsedMetadataJson(selectedVersionMetadata(hasDisplayName) + .replace("\"description\":\"Old version summary\"", + "\"description\":\"Old version summary\",\"shortDescriptionOverride\":\"Selected custom summary\",\"overviewOverride\":\"# Selected overview\"")); when(promotionRequestRepository.findById(PROMOTION_ID)) .thenReturn(Optional.of(pr), Optional.of(approvedRequest)); @@ -699,7 +701,10 @@ class PromotionServiceTest { verify(skillRepository, times(2)).save(skillCaptor.capture()); Skill newSkill = skillCaptor.getAllValues().get(0); assertEquals(hasDisplayName ? "旧版标题" : "包内标题", newSkill.getDisplayName()); - assertEquals("Old version summary", newSkill.getSummary()); + assertEquals("Selected custom summary", newSkill.getSummary()); + ArgumentCaptor versionCaptor = ArgumentCaptor.forClass(SkillVersion.class); + verify(skillVersionRepository).save(versionCaptor.capture()); + assertEquals(sourceVersion.getParsedMetadataJson(), versionCaptor.getValue().getParsedMetadataJson()); assertEquals(NEW_VERSION_ID, newSkill.getLatestVersionId()); } diff --git a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/review/ReviewServiceTest.java b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/review/ReviewServiceTest.java index bf7721578..8406410b5 100644 --- a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/review/ReviewServiceTest.java +++ b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/review/ReviewServiceTest.java @@ -304,7 +304,8 @@ class ReviewServiceTest { assertDoesNotThrow(() -> sv.setParsedMetadataJson(objectMapper.writeValueAsString( new SkillMetadata("Approved Name", "Approved Summary", "1.0.0", "Body", hasDisplayName ? Map.of("metadata", Map.of("display-name", "包内标题")) : Map.of(), - hasDisplayName ? "已审核的中文标题" : null) + hasDisplayName ? "已审核的中文标题" : null, + "Approved custom summary", "# Approved overview", null) ))); when(reviewTaskRepository.findById(REVIEW_TASK_ID)).thenReturn(Optional.of(task)); @@ -333,7 +334,9 @@ class ReviewServiceTest { assertEquals(SKILL_VERSION_ID, skill.getLatestVersionId()); assertEquals(hasDisplayName ? "已审核的中文标题" : "Approved Name", skill.getDisplayName()); assertEquals("my-skill", skill.getSlug()); - assertEquals("Approved Summary", skill.getSummary()); + assertEquals("Approved custom summary", skill.getSummary()); + assertEquals("# Approved overview", assertDoesNotThrow(() -> + objectMapper.readTree(sv.getParsedMetadataJson())).path("overviewOverride").asText()); assertEquals(REVIEWER_ID, skill.getUpdatedBy()); verify(eventPublisher).publishEvent(any(SkillPublishedEvent.class)); verify(governanceNotificationService).notifyUser(eq(USER_ID), eq("REVIEW"), eq("REVIEW_TASK"), eq(REVIEW_TASK_ID), eq("Review approved"), any()); diff --git a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParserTest.java b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParserTest.java index 5b03de325..5cf3e2aa6 100644 --- a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParserTest.java +++ b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParserTest.java @@ -11,6 +11,31 @@ class SkillMetadataParserTest { private final SkillMetadataParser parser = new SkillMetadataParser(); + @Test + void presentationOverridesAndPackageDefaultsRemainDistinct() { + SkillMetadata source = parser.parse("---\nname: my-skill\ndescription: Original\nmetadata:\n short-description: Package short\n overview: Package overview\n---\nBody"); + assertEquals("Package short", source.shortDescription()); + assertEquals("Package overview", source.overview()); + assertNull(source.shortDescriptionOverride()); + assertNull(source.overviewOverride()); + assertEquals("Original", source.withPresentation(null, null, null).description()); + SkillMetadata reset = source.withPresentation("Web short", "Web overview", null) + .withPresentation(null, null, null); + assertNull(reset.shortDescriptionOverride()); + assertNull(reset.overviewOverride()); + assertEquals("Package short", reset.shortDescription()); + assertEquals("Package overview", reset.overview()); + SkillMetadata custom = source.withPresentation(" Web short ", " # Web overview ", null); + assertEquals("Web short", custom.shortDescription()); + assertEquals("# Web overview", custom.overview()); + assertEquals(source.frontmatter(), custom.frontmatter()); + assertThrows(DomainBadRequestException.class, + () -> source.withPresentation("x".repeat(201), null, null)); + assertThrows(DomainBadRequestException.class, + () -> source.withPresentation(null, "x".repeat(20001), null)); + } + + @Test void platformOverrideIsVersionedWithoutChangingFrontmatter() throws Exception { SkillMetadata source = parser.parse("---\nname: my-skill\ndescription: Test\nmetadata:\n display-name: 包内标题\n---\nBody"); diff --git a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/service/SkillGovernanceServiceTest.java b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/service/SkillGovernanceServiceTest.java index 7af64be84..390006c4b 100644 --- a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/service/SkillGovernanceServiceTest.java +++ b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/service/SkillGovernanceServiceTest.java @@ -297,6 +297,8 @@ class SkillGovernanceServiceTest { fallback.setParsedMetadataJson(new ObjectMapper().writeValueAsString(Map.of( "name", "example-skill", "description", "Published summary from v1", + "shortDescriptionOverride", "Restored custom summary", + "overviewOverride", "# Restored overview", "displayNameOverride", displayNameCase.equals("override") ? "网页旧版标题" : "", "frontmatter", switch (displayNameCase) { case "custom" -> Map.of("metadata", Map.of("display-name", "示例技能一")); @@ -321,7 +323,9 @@ class SkillGovernanceServiceTest { assertThat(skill.getLatestVersionId()).isEqualTo(11L); assertThat(skill.getDisplayName()).isEqualTo(displayNameCase.equals("override") ? "网页旧版标题" : displayNameCase.equals("custom") ? "示例技能一" : "example-skill"); - assertThat(skill.getSummary()).isEqualTo("Published summary from v1"); + assertThat(skill.getSummary()).isEqualTo("Restored custom summary"); + assertThat(new ObjectMapper().readTree(fallback.getParsedMetadataJson()).path("overviewOverride").asText()) + .isEqualTo("# Restored overview"); verify(skillRepository).save(skill); } diff --git a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/service/SkillPublishServiceTest.java b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/service/SkillPublishServiceTest.java index a47a48824..1f25a2c37 100644 --- a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/service/SkillPublishServiceTest.java +++ b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/service/SkillPublishServiceTest.java @@ -118,6 +118,80 @@ class SkillPublishServiceTest { } } + @Test + void inheritsOnlyPublishedCustomPresentationAndFreezesSnapshot() throws Exception { + String content = "---\nname: test-skill\ndescription: New default\nversion: 2.0.0\n---\nBody"; + PackageEntry entry = new PackageEntry("SKILL.md", content.getBytes(StandardCharsets.UTF_8), + content.length(), "text/markdown"); + List entries = List.of(entry); + Namespace namespace = new Namespace("test-ns", "Test NS", "owner"); + setId(namespace, 1L); + Skill skill = new Skill(1L, "test-skill", "owner", SkillVisibility.PUBLIC); + setId(skill, 1L); + skill.setSummary("Published custom"); + skill.setLatestVersionId(11L); + SkillVersion previous = new SkillVersion(1L, "1.0.0", "owner"); + setId(previous, 11L); + previous.setStatus(SkillVersionStatus.PUBLISHED); + previous.setParsedMetadataJson(objectMapper.writeValueAsString(Map.of( + "name", "test-skill", "description", "Old default", "version", "1.0.0", + "body", "Body", "frontmatter", Map.of(), + "shortDescriptionOverride", "Published custom", "overviewOverride", "# Custom overview", + "complianceSnapshot", Map.of("status", "PASS")))); + when(namespaceRepository.findBySlug("test-ns")).thenReturn(Optional.of(namespace)); + when(namespaceMemberRepository.findByNamespaceIdAndUserId(1L, "owner")) + .thenReturn(Optional.of(mock(NamespaceMember.class))); + when(skillPackageValidator.validate(entries)).thenReturn(ValidationResult.pass()); + when(skillMetadataParser.parse(content)).thenReturn(new SkillMetadata("test-skill", "New default", "2.0.0", "Body", Map.of())); + when(prePublishValidator.validate(any())).thenReturn(ValidationResult.pass()); + when(skillRepository.findByNamespaceIdAndSlug(1L, "test-skill")).thenReturn(List.of(skill)); + when(skillRepository.findByNamespaceIdAndSlugAndOwnerId(1L, "test-skill", "owner")).thenReturn(Optional.of(skill)); + when(skillVersionRepository.findBySkillIdAndStatus(1L, SkillVersionStatus.PUBLISHED)).thenReturn(List.of(previous)); + when(skillVersionRepository.save(any(SkillVersion.class))).thenAnswer(call -> { + SkillVersion version = call.getArgument(0); + if (version.getId() == null) setId(version, 12L); + return version; + }); + SkillVersion pending = service.publishFromEntries("test-ns", entries, "owner", SkillVisibility.PUBLIC, + Set.of(), true, null, null, null, false).version(); + assertEquals("Published custom", skill.getSummary()); + assertEquals(SkillVersionStatus.PENDING_REVIEW, pending.getStatus()); + JsonNode snapshot = objectMapper.readTree(pending.getParsedMetadataJson()); + assertEquals("1.0.0", snapshot.path("presentationInheritedFrom").asText()); + assertEquals("Published custom", snapshot.path("shortDescriptionOverride").asText()); + assertEquals("# Custom overview", snapshot.path("overviewOverride").asText()); + assertEquals("New default", snapshot.path("description").asText()); + + SkillVersion reset = service.publishFromEntries("test-ns", entries, "owner", SkillVisibility.PUBLIC, + Set.of(), true, null, null, null, true).version(); + JsonNode resetSnapshot = objectMapper.readTree(reset.getParsedMetadataJson()); + assertTrue(resetSnapshot.path("shortDescriptionOverride").isNull()); + assertTrue(resetSnapshot.path("overviewOverride").isNull()); + assertTrue(resetSnapshot.path("presentationInheritedFrom").isNull()); + SkillMetadata restored = objectMapper.readerFor(SkillMetadata.class) + .without(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .readValue(reset.getParsedMetadataJson()); + assertEquals("New default", restored.shortDescription()); + assertEquals("Body", restored.overview()); + assertEquals("Published custom", skill.getSummary()); + + previous.setParsedMetadataJson(objectMapper.writeValueAsString( + new SkillMetadata("test-skill", "Old default", "1.0.0", "Body", Map.of()))); + SkillVersion defaults = service.publishFromEntries("test-ns", entries, "owner", SkillVisibility.PUBLIC, + Set.of(), true, null, null, null, false).version(); + JsonNode defaultSnapshot = objectMapper.readTree(defaults.getParsedMetadataJson()); + assertTrue(defaultSnapshot.path("shortDescriptionOverride").isNull()); + assertTrue(defaultSnapshot.path("presentationInheritedFrom").isNull()); + + SkillVersion publishedReset = service.publishFromEntries("test-ns", entries, "owner", SkillVisibility.PUBLIC, + Set.of("SUPER_ADMIN"), true, null, null, null, true).version(); + assertEquals(SkillVersionStatus.PUBLISHED, publishedReset.getStatus()); + assertEquals("New default", skill.getSummary()); + assertEquals("Body", objectMapper.readerFor(SkillMetadata.class) + .without(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .readValue(publishedReset.getParsedMetadataJson()).overview()); + } + @Test void testPublishFromEntries_Success() throws Exception { // Arrange @@ -1025,13 +1099,14 @@ class SkillPublishServiceTest { setId(skill, 11L); skill.setDisplayName("Demo Skill"); skill.setSummary("Original summary"); + skill.setLatestVersionId(21L); Namespace namespace = new Namespace("global", "Global", "owner"); setId(namespace, 1L); SkillVersion sourceVersion = new SkillVersion(skill.getId(), "1.2.3", publisherId); setId(sourceVersion, 21L); sourceVersion.setStatus(SkillVersionStatus.PUBLISHED); - sourceVersion.setParsedMetadataJson("{\"displayNameOverride\":\"原网页标题\"}"); + sourceVersion.setParsedMetadataJson("{\"displayNameOverride\":\"原网页标题\",\"shortDescriptionOverride\":\"Custom summary\",\"overviewOverride\":\"# Custom overview\"}"); sourceVersion.setPublishedAt(Instant.parse("2026-03-15T10:00:00Z")); String sourceSkillMd = """ @@ -1062,6 +1137,8 @@ class SkillPublishServiceTest { when(skillFileRepository.findByVersionId(sourceVersion.getId())).thenReturn(List.of(skillMdFile, readmeFile)); when(objectStorageService.getObject(skillMdFile.getStorageKey())).thenReturn(new java.io.ByteArrayInputStream(sourceSkillMd.getBytes(StandardCharsets.UTF_8))); when(objectStorageService.getObject(readmeFile.getStorageKey())).thenReturn(new java.io.ByteArrayInputStream(readmeBytes)); + when(skillRepository.findByNamespaceIdAndSlugAndOwnerId(1L, "demo-skill", publisherId)) + .thenReturn(Optional.of(skill)); when(skillPackageValidator.validate(anyList())).thenReturn(ValidationResult.pass()); when(skillMetadataParser.parse(anyString())).thenReturn(rereleaseMetadata); when(prePublishValidator.validate(any())).thenReturn(ValidationResult.pass()); @@ -1085,6 +1162,9 @@ class SkillPublishServiceTest { assertEquals("1.2.4", result.version().getVersion()); assertEquals("原网页标题", objectMapper.readTree(result.version().getParsedMetadataJson()).path("displayNameOverride").asText()); + assertEquals("Custom summary", objectMapper.readTree(result.version().getParsedMetadataJson()).path("shortDescriptionOverride").asText()); + assertEquals("# Custom overview", objectMapper.readTree(result.version().getParsedMetadataJson()).path("overviewOverride").asText()); + assertEquals("Original summary", skill.getSummary(), "Pending rerelease must not change the public summary"); // Rerelease for PUBLIC skill should go to PENDING_REVIEW (respecting visibility rules) assertEquals(SkillVersionStatus.PENDING_REVIEW, result.version().getStatus()); // Review task should be created for PUBLIC skill diff --git a/server/skillhub-search/src/main/java/com/iflytek/skillhub/search/postgres/PostgresSearchRebuildService.java b/server/skillhub-search/src/main/java/com/iflytek/skillhub/search/postgres/PostgresSearchRebuildService.java index 20d1ecf9c..c6d22d631 100644 --- a/server/skillhub-search/src/main/java/com/iflytek/skillhub/search/postgres/PostgresSearchRebuildService.java +++ b/server/skillhub-search/src/main/java/com/iflytek/skillhub/search/postgres/PostgresSearchRebuildService.java @@ -123,13 +123,19 @@ public class PostgresSearchRebuildService implements SearchRebuildService { private SearchIndexPayload buildSearchPayload(Skill skill) { List searchParts = new ArrayList<>(); addPart(searchParts, skill.getSlug()); + addPart(searchParts, skill.getDisplayName()); addPart(searchParts, skill.getSummary()); Set keywords = new TreeSet<>(); resolveLatestVersion(skill) .map(this::extractParsedMetadata) .ifPresent(metadata -> { - appendFrontmatter(asMap(metadata.get("frontmatter")), keywords, searchParts); + addPart(searchParts, String.valueOf(metadata.get("description"))); + Map frontmatter = new LinkedHashMap<>(asMap(metadata.get("frontmatter"))); + Map packageMetadata = new LinkedHashMap<>(asMap(frontmatter.get("metadata"))); + packageMetadata.remove("overview"); + frontmatter.put("metadata", packageMetadata); + appendFrontmatter(frontmatter, keywords, searchParts); appendComplianceSnapshot( asMap(metadata.get(ComplianceMetadataService.SNAPSHOT_FIELD_NAME)), keywords, diff --git a/server/skillhub-search/src/test/java/com/iflytek/skillhub/search/postgres/PostgresSearchRebuildServiceTest.java b/server/skillhub-search/src/test/java/com/iflytek/skillhub/search/postgres/PostgresSearchRebuildServiceTest.java index e8fcd88a8..a1bdf45a3 100644 --- a/server/skillhub-search/src/test/java/com/iflytek/skillhub/search/postgres/PostgresSearchRebuildServiceTest.java +++ b/server/skillhub-search/src/test/java/com/iflytek/skillhub/search/postgres/PostgresSearchRebuildServiceTest.java @@ -31,6 +31,31 @@ import static org.mockito.Mockito.when; class PostgresSearchRebuildServiceTest { + @Test + void rebuildBySkill_indexesEffectiveSummaryAndOriginalDescriptionButNotOverview() { + SkillRepository skills = mock(SkillRepository.class); + NamespaceRepository namespaces = mock(NamespaceRepository.class); + SkillVersionRepository versions = mock(SkillVersionRepository.class); + SearchIndexService index = mock(SearchIndexService.class); + Skill skill = new Skill(7L, "slug", "owner", SkillVisibility.PUBLIC); + skill.setDisplayName("Custom title"); + skill.setSummary("Custom short"); + skill.setLatestVersionId(99L); + SkillVersion version = new SkillVersion(1L, "1.0.0", "owner"); + version.setParsedMetadataJson(""" + {"description":"Original package description","frontmatter": + {"metadata":{"overview":"Private detail-only text"}}} + """); + when(skills.findById(7L)).thenReturn(Optional.of(skill)); + when(namespaces.findById(7L)).thenReturn(Optional.of(new Namespace("team", "Team", "owner"))); + when(versions.findById(99L)).thenReturn(Optional.of(version)); + newService(skills, namespaces, versions, index).rebuildBySkill(7L); + ArgumentCaptor captor = ArgumentCaptor.forClass(SkillSearchDocument.class); + verify(index).index(captor.capture()); + assertThat(captor.getValue().searchText()).contains("Custom title", "Custom short", "Original package description") + .doesNotContain("Private detail-only text"); + } + @Test void rebuildBySkill_shouldIndexFrontmatterFieldsAndKeywordsWithoutBody() { SkillRepository skillRepository = mock(SkillRepository.class); diff --git a/web/src/api/generated/schema.d.ts b/web/src/api/generated/schema.d.ts index c1b21995c..b5ce994e2 100644 --- a/web/src/api/generated/schema.d.ts +++ b/web/src/api/generated/schema.d.ts @@ -8187,6 +8187,8 @@ export interface components { name?: string; displayName?: string; description?: string; + shortDescription?: string; + overview?: string; version?: string; /** @enum {string} */ examplesStatus?: "ready" | "none" | "invalid"; @@ -15503,6 +15505,9 @@ export interface operations { avatarUploadId?: string; expectedSlug?: string; displayName?: string; + shortDescription?: string; + overview?: string; + resetPresentation?: boolean; }; header?: never; path: { @@ -15539,6 +15544,9 @@ export interface operations { avatarUploadId?: string; expectedSlug?: string; displayName?: string; + shortDescription?: string; + overview?: string; + resetPresentation?: boolean; }; header?: never; path: { diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json index 550f8db9f..ac4e64661 100644 --- a/web/src/i18n/locales/en.json +++ b/web/src/i18n/locales/en.json @@ -1450,6 +1450,7 @@ "accessDeniedDesc": "You don't have permission to view this skill", "tabReadme": "README", "tabOverview": "Overview", + "viewSkillMd": "View SKILL.md", "tabFiles": "Files", "tabVersions": "Versions", "noReadme": "No README", @@ -2235,6 +2236,10 @@ "displayName": "Display name", "displayNamePlaceholder": "For example: Meeting notes assistant", "displayNameHelp": "Up to 200 characters. Defaults to the package title. Changes follow this version’s review and do not alter the identifier or package files. Leave blank to use the package title.", + "shortDescription": "Short description", + "overview": "Detailed overview (Markdown)", + "presentationInheritance": "Without web or package presentation values, custom values from published version {{version}} are inherited when submitted.", + "resetPresentation": "Restore package defaults (do not inherit)", "readingPackage": "Reading package metadata…", "examplesReady": "Recognized {{count}} task examples across all languages.", "examplesNone": "No task examples provided. Publishing and use remain available.", diff --git a/web/src/i18n/locales/ko.json b/web/src/i18n/locales/ko.json index 089fafec1..7b0e69b84 100644 --- a/web/src/i18n/locales/ko.json +++ b/web/src/i18n/locales/ko.json @@ -1728,6 +1728,7 @@ "accessDeniedDesc": "이 스킬을 볼 권한이 없습니다", "tabReadme": "README", "tabOverview": "개요", + "viewSkillMd": "SKILL.md 보기", "tabFiles": "파일", "tabVersions": "버전", "noReadme": "README 없음", @@ -2516,6 +2517,10 @@ "displayName": "표시 이름", "displayNamePlaceholder": "예: 회의록 도우미", "displayNameHelp": "최대 200자이며 기본값은 패키지 제목입니다. 변경 사항은 이 버전의 검토를 따르며 식별자나 패키지 파일을 변경하지 않습니다. 비워 두면 패키지 제목을 사용합니다.", + "shortDescription": "짧은 설명", + "overview": "상세 개요 (Markdown)", + "presentationInheritance": "웹과 패키지에 값이 없으면 제출 시 게시된 버전 {{version}}의 사용자 지정 값을 상속합니다.", + "resetPresentation": "패키지 기본값으로 복원 (상속 안 함)", "readingPackage": "패키지 메타데이터를 읽는 중…", "examplesReady": "전체 언어에서 작업 예제 {{count}}개를 인식했습니다.", "examplesNone": "제공된 작업 예제가 없습니다. 게시와 사용은 계속 가능합니다.", diff --git a/web/src/i18n/locales/ru.json b/web/src/i18n/locales/ru.json index 52f4b7d1b..00001bd39 100644 --- a/web/src/i18n/locales/ru.json +++ b/web/src/i18n/locales/ru.json @@ -1515,6 +1515,7 @@ "accessDeniedDesc": "У вас нет прав на просмотр этого скилла", "tabReadme": "README", "tabOverview": "Обзор", + "viewSkillMd": "Открыть SKILL.md", "tabFiles": "Файлы", "tabVersions": "Версии", "noReadme": "Нет README", @@ -2224,6 +2225,10 @@ "displayName": "Отображаемое имя", "displayNamePlaceholder": "Например: Помощник для протоколов встреч", "displayNameHelp": "До 200 символов. По умолчанию — имя из пакета. Изменения проходят проверку версии и не меняют идентификатор или файлы пакета. Пустое поле означает имя из пакета.", + "shortDescription": "Краткое описание", + "overview": "Подробный обзор (Markdown)", + "presentationInheritance": "Если значения не указаны на сайте и в пакете, при отправке наследуются пользовательские значения опубликованной версии {{version}}.", + "resetPresentation": "Вернуть значения пакета (без наследования)", "readingPackage": "Чтение метаданных пакета…", "examplesReady": "Распознано примеров задач на всех языках: {{count}}.", "examplesNone": "Примеры задач не предоставлены. Публикация и использование доступны.", diff --git a/web/src/i18n/locales/zh.json b/web/src/i18n/locales/zh.json index cfda81fe1..ddcca6031 100644 --- a/web/src/i18n/locales/zh.json +++ b/web/src/i18n/locales/zh.json @@ -1450,6 +1450,7 @@ "accessDeniedDesc": "您没有权限查看该技能", "tabReadme": "README", "tabOverview": "概览", + "viewSkillMd": "查看 SKILL.md", "tabFiles": "文件", "tabVersions": "版本", "noReadme": "暂无 README", @@ -2234,6 +2235,10 @@ "displayName": "显示名称", "displayNamePlaceholder": "例如:会议纪要助手", "displayNameHelp": "支持中文,最多 200 个字符。默认读取包内名称;修改后随本次版本审核,不改变技能标识或包内文件。留空则使用包内名称。", + "shortDescription": "简短描述", + "overview": "详细概览(Markdown)", + "presentationInheritance": "本次未填写网页或包内展示值时,将在提交时继承已发布版本 {{version}} 的自定义值。", + "resetPresentation": "恢复包内默认值(不继承)", "readingPackage": "正在读取技能包信息…", "examplesReady": "已识别 {{count}} 条使用案例(包含全部语种)。", "examplesNone": "未提供使用案例,可正常发布和使用。", diff --git a/web/src/pages/dashboard/publish-display-name.test.tsx b/web/src/pages/dashboard/publish-display-name.test.tsx index cb243493d..da36e23cd 100644 --- a/web/src/pages/dashboard/publish-display-name.test.tsx +++ b/web/src/pages/dashboard/publish-display-name.test.tsx @@ -5,13 +5,15 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' const preview = vi.hoisted(() => vi.fn()) const publish = vi.hoisted(() => vi.fn()) -vi.mock('@tanstack/react-router', () => ({ useNavigate: () => vi.fn(), useSearch: () => ({ namespace: 'team-ai' }) })) +const searchParams = vi.hoisted(() => ({ value: { namespace: 'team-ai', updateSkill: undefined as string | undefined } })) +vi.mock('@tanstack/react-router', () => ({ useNavigate: () => vi.fn(), useSearch: () => searchParams.value })) vi.mock('react-i18next', async () => ({ ...await vi.importActual('react-i18next'), useTranslation: () => ({ t: (key: string) => key }) })) vi.mock('@/shared/hooks/use-skill-queries', () => ({ useSkillDetail: () => ({ data: undefined }), previewSkillPackage: preview, usePublishSkill: () => ({ mutateAsync: publish, isPending: false }) })) vi.mock('@/shared/hooks/use-namespace-queries', () => ({ useMyNamespaces: () => ({ data: [{ id: 1, slug: 'team-ai', displayName: 'Team' }], isLoading: false }) })) vi.mock('@/features/publish/upload-zone', () => ({ UploadZone: ({ onFileSelect }: { onFileSelect: (file: File) => void }) => { if (e.target.files?.[0]) onFileSelect(e.target.files[0]) }} /> })) vi.mock('@/features/skill/skill-avatar-editor', () => ({ KEEP_AVATAR: { action: 'KEEP', ready: true }, SkillAvatarEditor: () => null })) vi.mock('@/features/skill/skill-avatar-manager', () => ({ SkillAvatarManager: () => null })) +vi.mock('@/api/client', async (importOriginal) => ({ ...await importOriginal(), skillAvatarApi: { status: vi.fn().mockResolvedValue({ action: 'KEEP' }) } })) vi.mock('@/shared/lib/navigate-after-overlays', () => ({ navigateAfterOverlays: (action: () => void) => action() })) vi.mock('@/shared/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn() } })) import { PublishPage } from './publish' @@ -27,7 +29,44 @@ function select(name: string) { const metadata = (name: string) => ({ name: 'stable-slug', displayName: name, version: '1.0.0', description: 'summary' }) afterEach(cleanup) -beforeEach(() => { preview.mockReset(); publish.mockReset(); publish.mockResolvedValue({ namespace: 'team-ai', slug: 'stable-slug', version: '1.0.0', status: 'PENDING_REVIEW' }) }) +beforeEach(() => { searchParams.value.updateSkill = undefined; preview.mockReset(); publish.mockReset(); publish.mockResolvedValue({ namespace: 'team-ai', slug: 'stable-slug', version: '1.0.0', status: 'PENDING_REVIEW' }) }) + +describe('web presentation publishing', () => { + it('prefills package presentation without sending unedited defaults', async () => { + preview.mockResolvedValue({ ...metadata('Package title'), shortDescription: 'Package short', overview: '# Package overview' }) + mount(); select('presentation.zip') + await waitFor(() => expect((screen.getByLabelText('publish.shortDescription') as HTMLInputElement).value).toBe('Package short')) + expect((screen.getByLabelText('publish.overview') as HTMLTextAreaElement).value).toBe('# Package overview') + fireEvent.click(screen.getByRole('button', { name: 'publish.confirm' })) + await waitFor(() => expect(publish).toHaveBeenCalledWith(expect.objectContaining({ + shortDescription: undefined, overview: undefined, resetPresentation: false, + }))) + }) + + it('sends edited presentation and reset intent independently of form defaults', async () => { + preview.mockResolvedValue({ ...metadata('Package title'), shortDescription: 'Package short', overview: '# Package overview' }) + mount(); select('presentation.zip') + await waitFor(() => expect((screen.getByLabelText('publish.shortDescription') as HTMLInputElement).value).toBe('Package short')) + fireEvent.change(screen.getByLabelText('publish.shortDescription'), { target: { value: 'Web short' } }) + fireEvent.change(screen.getByLabelText('publish.overview'), { target: { value: '# Web overview' } }) + fireEvent.click(screen.getByRole('button', { name: 'publish.confirm' })) + await waitFor(() => expect(publish).toHaveBeenCalledWith(expect.objectContaining({ + shortDescription: 'Web short', overview: '# Web overview', resetPresentation: false, + }))) + }) + it('sends reset without re-sending edited fields', async () => { + searchParams.value.updateSkill = 'stable-slug' + preview.mockResolvedValue({ ...metadata('Package title'), shortDescription: 'Package short', overview: '# Package overview' }) + mount(); select('presentation.zip') + await waitFor(() => expect((screen.getByLabelText('publish.shortDescription') as HTMLInputElement).value).toBe('Package short')) + fireEvent.change(screen.getByLabelText('publish.shortDescription'), { target: { value: 'Discard me' } }) + fireEvent.click(screen.getByRole('checkbox', { name: 'publish.resetPresentation' })) + fireEvent.click(screen.getByRole('button', { name: 'publish.confirm' })) + await waitFor(() => expect(publish).toHaveBeenCalledWith(expect.objectContaining({ + shortDescription: undefined, overview: undefined, resetPresentation: true, + }))) + }) +}) describe('web display name publishing', () => { it('prefills from the package and sends the explicit edited name with the original file', async () => { diff --git a/web/src/pages/dashboard/publish.tsx b/web/src/pages/dashboard/publish.tsx index 98686f228..0602579d6 100644 --- a/web/src/pages/dashboard/publish.tsx +++ b/web/src/pages/dashboard/publish.tsx @@ -22,6 +22,7 @@ import { normalizeSelectValue, } from '@/shared/ui/select' import { Input } from '@/shared/ui/input' +import { Textarea } from '@/shared/ui/textarea' import { Label } from '@/shared/ui/label' import { Card } from '@/shared/ui/card' import { SkillAvatarEditor, KEEP_AVATAR, type AvatarEdit } from '@/features/skill/skill-avatar-editor' @@ -52,7 +53,12 @@ export function PublishPage() { const previewId = useId() const [fileRevision, setFileRevision] = useState(0) const [displayName, setDisplayName] = useState('') + const [shortDescription, setShortDescription] = useState('') + const [overview, setOverview] = useState('') + const [resetPresentation, setResetPresentation] = useState(false) const displayNameEdited = useRef(false) + const shortDescriptionEdited = useRef(false) + const overviewEdited = useRef(false) const [selectedFile, setSelectedFile] = useState(null) const [namespaceSlug, setNamespaceSlug] = useState(prefill.namespace) const [visibility, setVisibility] = useState(prefill.visibility) @@ -75,6 +81,12 @@ export function PublishPage() { if (packagePreview.data && !displayNameEdited.current) { setDisplayName(packagePreview.data.displayName ?? packagePreview.data.name ?? '') } + if (packagePreview.data && !shortDescriptionEdited.current) { + setShortDescription(packagePreview.data.shortDescription ?? packagePreview.data.description ?? '') + } + if (packagePreview.data && !overviewEdited.current) { + setOverview(packagePreview.data.overview ?? '') + } }, [packagePreview.data]) const avatarTarget = useQuery({ queryKey: ['skill-avatar', namespaceSlug, updateSlug], queryFn: () => skillAvatarApi.status(namespaceSlug, updateSlug), enabled: !!namespaceSlug && !!updateSlug }) const avatarUnavailable = !!updateSlug && (avatarTarget.isLoading || avatarTarget.isError) @@ -100,6 +112,11 @@ export function PublishPage() { const handleFileSelect = (file: File | null) => { setSelectedFile(file) + shortDescriptionEdited.current = false + overviewEdited.current = false + setShortDescription('') + setOverview('') + setResetPresentation(false) setFileRevision(value => value + 1) setPrecheckWarnings([]) setWarningDialogOpen(false) @@ -148,6 +165,9 @@ export function PublishPage() { avatarUploadId: avatarEdit.uploadId, expectedSlug: updateSlug || undefined, displayName, + shortDescription: resetPresentation ? undefined : shortDescriptionEdited.current ? shortDescription : undefined, + overview: resetPresentation ? undefined : overviewEdited.current ? overview : undefined, + resetPresentation, }) setPrecheckWarnings([]) setWarningDialogOpen(false) @@ -348,6 +368,24 @@ export function PublishPage() { {selectedFile && packagePreview.data?.examplesStatus === 'invalid' &&

{t('publish.examplesInvalid')}

} +
+ + {isUpdate && updateTarget?.publishedVersion?.version && !resetPresentation && ( +

{t('publish.presentationInheritance', { version: updateTarget.publishedVersion.version })}

+ )} + {isUpdate && } + { shortDescriptionEdited.current = true; setShortDescription(event.target.value) }} /> +
+
+ +