@dsh-workbench/shared 1.1.7 → 1.1.8

package/dist/i18n/zh.js

@@ -372,7 +372,7 @@ export const zh = {
     'panels.discover.missingIndex': '仓库里还没有索引文件 {path}',
     'panels.discover.initTitle': '把这个仓库初始化成模块市场索引？',
     'panels.discover.initCta': '初始化成市场索引',
-    'panels.discover.initWhat': '会在 {branch} 分支写索引目录 market/ 与 README.md，提交一次并推上去；之后从这个工作台发布的模块会把打包好的文件提交到 artifacts/<包名>/<版本>/，条目写到 market/<包名>/<版本>.json。仓库的写权限归它的所有者。',
+    'panels.discover.initWhat': '会在 {branch} 分支写索引目录 market/ 与 README.md，提交一次并推上去；之后从这个工作台发布的模块会把打包好的文件提交到 artifacts/<包名>/，条目写到 market/<包名>.json。仓库的写权限归它的所有者。',
     'panels.discover.initBranch': '分支',
     'panels.discover.initBranchHint': '索引和打包文件都发到这个分支；空仓库会新建它。',
     'panels.discover.initBranchBad': '分支名只能用字母、数字、点、下划线、斜杠或短横线',
@@ -703,6 +703,8 @@ export const zh = {
     'approval.publish.version': '版本',
     'approval.publish.author': '作者',
     'approval.publish.authorMissing': '未署名',
+    'approval.publish.labels': '标签',
+    'approval.publish.labelsMissing': '还没有（发布到市场时补 1–2 个）',
     'approval.publish.owner': '认领人',
     'approval.publish.ownerUnowned': '原来没署名',
     'approval.publish.ownerTaken': '已有主人：{owner}',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/shared",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "工作台与模块共享的纯代码与契约类型：类型、纯逻辑、哑组件、平台解析。宿主侧的东西从 /host 进（不影响浏览器产物）。",
   "license": "MIT",
   "type": "module",

package/src/contract/protocol/market-index.ts

@@ -263,6 +263,7 @@ export interface PublishPreview {
   readonly name: string;
   readonly version: string;
   readonly author?: string;
+  readonly labels?: readonly string[];
   readonly registry?: string;
   readonly market?: MarketPublishDestination;
   readonly claim?: MarketClaim;

package/src/host/__tests__/market-index-assemble.test.ts

@@ -0,0 +1,26 @@
+import { describe, expect, it } from 'vitest';
+import type { MarketIndex } from '../../contract/protocol/market-index.js';
+import { assembleMarketIndex, marketEntryFilesOf } from '../market-index.js';
+
+describe('市场索引的迁移', () => {
+  it('迁移时把老产物路径里的 unit 补进元数据', () => {
+    const legacy: MarketIndex = {
+      format: 1,
+      plugins: [
+        {
+          name: '@scope/module-x',
+          versions: [
+            {
+              version: '0.1.0',
+              source: { type: 'git', url: 'https://git.example.com/m.git', commit: 'a'.repeat(40), path: 'packages/x' },
+            },
+          ],
+        },
+      ],
+    };
+    const files = marketEntryFilesOf(legacy, 'market');
+    const entry = JSON.parse(files[0]?.text ?? '{}');
+    expect(entry.metadata).toEqual({ unit: 'x' });
+    expect(assembleMarketIndex(files).ok).toBe(true);
+  });
+});

package/src/host/__tests__/market-index.test.ts

@@ -8,9 +8,8 @@ import {
   marketEntryFilesOf,
   marketEntryPath,
   marketInstallTarget,
-  marketMetaPath,
   marketSourceKey,
-  parseMarketEntryDoc,
+  parseMarketEntryJson,
   parseMarketIndex,
   parseMarketIndexJson,
   parseSourceConfig,
@@ -353,75 +352,69 @@ describe('索引源与安装目标', () => {
   });
 });
 
-describe('条目文件：一个版本一个文件', () => {
-  const versionDoc = (version: string, timestamp: number, title: string) => ({
+describe('条目文件：一个包一个文件', () => {
+  const entryOf = () => ({
     name: '@scope/module-x',
-    version,
-    source: { type: 'npm' },
-    publishTimestamp: timestamp,
-    title: { zh: title },
+    title: { zh: '探针' },
+    versions: [{ version: '0.1.0', source: { type: 'npm' as const }, publishTimestamp: 1_760_000_000 }],
   });
 
-  it('路径按包名分层，meta 文件带 epoch 与随机后缀', () => {
-    expect(marketEntryPath('market', '@scope/module-x', '0.1.0')).toBe('market/@scope/module-x/0.1.0.json');
-    expect(marketMetaPath('market', '@scope/module-x', 3, 'a1b2c3')).toBe(
-      'market/@scope/module-x/meta-3-a1b2c3.json',
-    );
-    expect(marketEntryPath('market', 'plain', '1.0.0')).toBe('market/plain/1.0.0.json');
+  it('路径是 market/<包名>.json', () => {
+    expect(marketEntryPath('market', '@scope/module-x')).toBe('market/@scope/module-x.json');
+    expect(marketEntryPath('market', 'plain')).toBe('market/plain.json');
   });
 
-  it('包名/版本号不合法就不给路径（防止写出目录外）', () => {
-    expect(() => marketEntryPath('market', '../escape', '1.0.0')).toThrow();
-    expect(() => marketEntryPath('market', 'ok', '../1.0.0')).toThrow();
+  it('包名不合法就不给路径（防止写出目录外）', () => {
+    expect(() => marketEntryPath('market', '../escape')).toThrow();
+    expect(() => marketEntryPath('market', 'Bad Name')).toThrow();
   });
 
   it('单条文档能解析，坏文档整条拒', () => {
-    const good = parseMarketEntryDoc(versionDoc('0.1.0', 1_760_000_000, '探针'));
+    const good = parseMarketEntryJson(JSON.stringify(entryOf()));
     expect(good.ok).toBe(true);
     if (!good.ok) return;
-    expect(good.doc.name).toBe('@scope/module-x');
-    const bad = parseMarketEntryDoc({ name: 'Bad Name', version: '0.1.0', source: { type: 'npm' } });
-    expect(bad.ok).toBe(false);
-    const noSource = parseMarketEntryDoc({ name: '@scope/x', version: '0.1.0' });
-    expect(noSource.ok).toBe(false);
-  });
-
-  it('组装：版本全收并按 SemVer 降序，元数据取最新那份', () => {
-    const files = [
-      { path: 'market/@scope/module-x/0.1.0.json', text: JSON.stringify(versionDoc('0.1.0', 1_760_000_000, '旧标题')) },
-      { path: 'market/@scope/module-x/0.2.0.json', text: JSON.stringify(versionDoc('0.2.0', 1_760_000_100, '新标题')) },
-      { path: 'market/@scope/module-x/meta-1760000200000.json', text: JSON.stringify({
-        name: '@scope/module-x',
-        publishTimestamp: 1_760_000_200,
-        title: { zh: '最新标题' },
-      }) },
-    ];
-    const assembled = assembleMarketIndex(files);
+    expect(good.entry.name).toBe('@scope/module-x');
+    expect(parseMarketEntryJson(JSON.stringify({ name: 'Bad Name', versions: [] })).ok).toBe(false);
+    expect(parseMarketEntryJson(JSON.stringify({ name: '@scope/x' })).ok).toBe(false);
+    expect(parseMarketEntryJson('{oops').ok).toBe(false);
+  });
+
+  it('组装：版本按 SemVer 降序，一个包一条', () => {
+    const assembled = assembleMarketIndex([
+      {
+        path: 'market/@scope/module-x.json',
+        text: JSON.stringify({
+          ...entryOf(),
+          versions: [
+            { version: '0.2.0', source: { type: 'npm' }, publishTimestamp: 1_760_000_100 },
+            { version: '0.1.0', source: { type: 'npm' }, publishTimestamp: 1_760_000_000 },
+          ],
+        }),
+      },
+    ]);
     expect(assembled.ok).toBe(true);
     if (!assembled.ok) return;
-    const entry = assembled.index.plugins[0];
-    expect(entry?.versions.map((one) => one.version)).toEqual(['0.2.0', '0.1.0']);
-    expect(entry?.title?.zh).toBe('最新标题');
+    expect(assembled.index.plugins[0]?.versions.map((one) => one.version)).toEqual(['0.2.0', '0.1.0']);
   });
 
-  it('组装：同一个版本出现两次就整份拒（那是真重复发布）', () => {
+  it('组装：同一个包出现两次就整份拒', () => {
     const assembled = assembleMarketIndex([
-      { path: 'a/0.1.0.json', text: JSON.stringify(versionDoc('0.1.0', 1_760_000_000, '甲')) },
-      { path: 'b/0.1.0.json', text: JSON.stringify(versionDoc('0.1.0', 1_760_000_100, '乙')) },
+      { path: 'a.json', text: JSON.stringify(entryOf()) },
+      { path: 'b.json', text: JSON.stringify(entryOf()) },
     ]);
     expect(assembled.ok).toBe(false);
     if (assembled.ok) return;
-    expect(assembled.problems.some((one) => one.kind === 'duplicate-version')).toBe(true);
+    expect(assembled.problems.some((one) => one.kind === 'duplicate-name')).toBe(true);
   });
 
   it('从目录读只收 .json，README 不当条目', () => {
     const dir = mkdtempSync(join(tmpdir(), 'wb-entry-'));
     try {
-      mkdirSync(join(dir, '@scope/module-x'), { recursive: true });
+      mkdirSync(dir, { recursive: true });
       writeFileSync(join(dir, 'README.md'), 'index');
-      writeFileSync(join(dir, '@scope/module-x', '0.1.0.json'), JSON.stringify(versionDoc('0.1.0', 1_760_000_000, '探针')));
+      writeFileSync(join(dir, '@scope-module-x.json'), JSON.stringify(entryOf()));
       const files = collectMarketEntryFiles(dir);
-      expect(files.map((one) => one.path)).toEqual(['@scope/module-x/0.1.0.json']);
+      expect(files.map((one) => one.path)).toEqual(['@scope-module-x.json']);
       const assembled = assembleMarketIndex(files);
       expect(assembled.ok).toBe(true);
       if (!assembled.ok) return;
@@ -431,7 +424,7 @@ describe('条目文件：一个版本一个文件', () => {
     }
   });
 
-  it('迁移：一份 format 1 能拆成条目文件，再组装回来一模一样', () => {
+  it('迁移：一份 format 1 拆成每包一个文件，再组装回来一模一样', () => {
     const legacy: MarketIndex = {
       format: 1,
       plugins: [
@@ -447,10 +440,7 @@ describe('条目文件：一个版本一个文件', () => {
       ],
     };
     const files = marketEntryFilesOf(legacy, 'market');
-    expect(files.map((one) => one.path)).toEqual([
-      'market/@scope/module-x/0.2.0.json',
-      'market/@scope/module-x/0.1.0.json',
-    ]);
+    expect(files.map((one) => one.path)).toEqual(['market/@scope/module-x.json']);
     const assembled = assembleMarketIndex(files);
     expect(assembled.ok).toBe(true);
     if (!assembled.ok) return;

package/src/host/market-index-claim.ts

@@ -58,10 +58,6 @@ export function marketArtifactRoot(name: string): string {
   return `${MARKET_ARTIFACTS_DIR}/${name}`;
 }
 
-export function marketArtifactPathFor(name: string, version: string): string {
-  return `${MARKET_ARTIFACTS_DIR}/${name}/${version}`;
-}
-
 export function entryUnitOf(entry: MarketIndexEntry): string | undefined {
   const unit = entry.metadata?.unit?.trim();
   if (unit !== undefined && unit !== '') return unit;

package/src/host/market-index-doc.ts

@@ -1,45 +1,4 @@
-import type {
-  MarketIndex,
-  MarketIndexEngines,
-  MarketIndexEntryMetadata,
-  MarketIndexProblem,
-  MarketIndexSource,
-  MarketLocalizedText,
-} from '../contract/protocol/market-index.js';
-
-export interface MarketVersionDoc {
-  readonly name: string;
-  readonly version: string;
-  readonly source: MarketIndexSource;
-  readonly publishTimestamp?: number;
-  readonly engines?: MarketIndexEngines;
-  readonly title?: MarketLocalizedText;
-  readonly description?: MarketLocalizedText;
-  readonly author?: string;
-  readonly owner?: string;
-  readonly homepage?: string;
-  readonly icon?: string;
-  readonly metadata?: MarketIndexEntryMetadata;
-}
-
-export interface MarketMetaDoc {
-  readonly name: string;
-  readonly epoch?: number;
-  readonly publishTimestamp: number;
-  readonly title?: MarketLocalizedText;
-  readonly description?: MarketLocalizedText;
-  readonly author?: string;
-  readonly owner?: string;
-  readonly homepage?: string;
-  readonly icon?: string;
-  readonly metadata?: MarketIndexEntryMetadata;
-}
-
-export type MarketEntryDoc = MarketVersionDoc | MarketMetaDoc;
-
-export type MarketEntryDocParse =
-  | { readonly ok: true; readonly doc: MarketEntryDoc }
-  | { readonly ok: false; readonly problems: readonly MarketIndexProblem[] };
+import type { MarketIndex, MarketIndexProblem } from '../contract/protocol/market-index.js';
 
 export interface MarketEntryFile {
   readonly path: string;
@@ -49,14 +8,3 @@ export interface MarketEntryFile {
 export type MarketIndexAssemble =
   | { readonly ok: true; readonly index: MarketIndex }
   | { readonly ok: false; readonly problems: readonly MarketIndexProblem[] };
-
-export interface MarketDocFields {
-  readonly name: string;
-  readonly title?: MarketLocalizedText;
-  readonly description?: MarketLocalizedText;
-  readonly author?: string;
-  readonly owner?: string;
-  readonly homepage?: string;
-  readonly icon?: string;
-  readonly metadata?: MarketIndexEntryMetadata;
-}

package/src/host/market-index-parse.ts

@@ -13,7 +13,6 @@ import type {
 } from '../contract/protocol/market-index.js';
 import { MARKET_INDEX_DIR, MARKET_INDEX_FORMAT } from '../contract/protocol/market-index.js';
 import { marketText } from '../lib/market-index.js';
-import type { MarketDocFields, MarketEntryDocParse } from './market-index-doc.js';
 import { compareVersions, isValidVersion } from './version.js';
 
 const NPM_NAME = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
@@ -388,95 +387,32 @@ export function parseSourceConfig(raw: unknown): SourceConfigParse {
 }
 
 
-function docFieldsOf(record: Readonly<Record<string, unknown>>, at: string): MarketDocFields | MarketIndexProblem {
-  const name = asText(record['name']);
-  if (name === '' || name.length > 214 || !NPM_NAME.test(name)) {
-    return problem('name', `不是合法 npm 包名：${JSON.stringify(name)}`, at);
-  }
-  const icon = asText(record['icon']);
-  if (icon !== '') {
-    const badIcon = iconProblem(icon);
-    if (badIcon !== undefined) return badIcon;
-  }
-  const owner = asText(record['owner']);
-  if (owner !== '') {
-    const badOwner = ownerProblem(owner);
-    if (badOwner !== undefined) return badOwner;
-  }
-  const metadata = metadataOf(record['metadata']);
-  if (metadata?.unit !== undefined && !UNIT_ID.test(metadata.unit)) {
-    return problem('unit', `metadata.unit 只能是小写字母开头的 a-z0-9-（现在是 ${JSON.stringify(metadata.unit)}）`, at);
-  }
-  const title = asLocalized(record['title']);
-  const description = asLocalized(record['description']);
-  const author = asText(record['author']);
-  const homepage = asText(record['homepage']);
-  return {
-    name,
-    ...(title === undefined ? {} : { title }),
-    ...(description === undefined ? {} : { description }),
-    ...(author === '' ? {} : { author }),
-    ...(owner === '' ? {} : { owner }),
-    ...(homepage === '' ? {} : { homepage }),
-    ...(icon === '' ? {} : { icon }),
-    ...(metadata === undefined ? {} : { metadata }),
-  };
-}
-
-export function parseMarketEntryDoc(raw: unknown): MarketEntryDocParse {
-  const record = asRecord(raw);
-  if (record === undefined) return { ok: false, problems: [problem('entry', '条目文件必须是一个 JSON 对象')] };
-  const fields = docFieldsOf(record, 'entry');
-  if ('kind' in fields) return { ok: false, problems: [fields] };
-  const version = asText(record['version']);
-  const timestamp = record['publishTimestamp'];
-  if (timestamp !== undefined && (!Number.isInteger(timestamp) || (timestamp as number) < 0)) {
-    return { ok: false, problems: [problem('timestamp', 'publishTimestamp 必须是 Unix 秒整数', 'entry')] };
-  }
-  if (version === '') {
-    if (timestamp === undefined) {
-      return { ok: false, problems: [problem('timestamp', '元数据文件要有 publishTimestamp', 'entry')] };
-    }
-    const epoch = record['epoch'];
-    if (epoch !== undefined && (!Number.isInteger(epoch) || (epoch as number) < 0)) {
-      return { ok: false, problems: [problem('timestamp', 'epoch 必须是非负整数', 'entry')] };
-    }
-    return {
-      ok: true,
-      doc: { ...fields, publishTimestamp: timestamp as number, ...(epoch === undefined ? {} : { epoch: epoch as number }) },
-    };
-  }
-  if (!isValidVersion(version)) {
-    return { ok: false, problems: [problem('version', `版本号不是合法 SemVer：${JSON.stringify(version)}`, 'entry')] };
-  }
-  const source = sourceOf(record['source'], 'entry.source');
-  if ('kind' in source) return { ok: false, problems: [source] };
-  const engines = asRecord(record['engines']);
-  const dsh = engines === undefined ? '' : asText(engines['dsh']);
-  return {
-    ok: true,
-    doc: {
-      ...fields,
-      version,
-      source,
-      ...(timestamp === undefined ? {} : { publishTimestamp: timestamp as number }),
-      ...(dsh === '' ? {} : { engines: { dsh } }),
-    },
-  };
-}
 function indexPathBase(dir: string): string {
   return dir.replace(/^\/+|\/+$/g, '') || MARKET_INDEX_DIR;
 }
 
-export function marketEntryPath(dir: string, name: string, version: string): string {
+export function marketEntryPath(dir: string, name: string): string {
   if (!NPM_NAME.test(name)) throw new Error(`不是合法包名：${JSON.stringify(name)}`);
-  if (!isValidVersion(version)) throw new Error(`不是合法版本号：${JSON.stringify(version)}`);
-  return `${indexPathBase(dir)}/${name}/${version}.json`;
+  return `${indexPathBase(dir)}/${name}.json`;
 }
 
-export function marketMetaPath(dir: string, name: string, epoch: number, suffix: string): string {
-  if (!NPM_NAME.test(name)) throw new Error(`不是合法包名：${JSON.stringify(name)}`);
-  if (!Number.isInteger(epoch) || epoch < 0) throw new Error(`epoch 不合法：${String(epoch)}`);
-  if (!/^[a-z0-9]{4,16}$/u.test(suffix)) throw new Error(`后缀不合法：${suffix}`);
-  return `${indexPathBase(dir)}/${name}/meta-${String(epoch)}-${suffix}.json`;
+export type MarketEntryParse =
+  | { readonly ok: true; readonly entry: MarketIndexEntry }
+  | { readonly ok: false; readonly problems: readonly MarketIndexProblem[] };
+
+export function parseMarketEntryJson(text: string): MarketEntryParse {
+  let raw: unknown;
+  try {
+    raw = JSON.parse(text);
+  } catch (error) {
+    return {
+      ok: false,
+      problems: [problem('not-json', `JSON 解析失败：${error instanceof Error ? error.message : String(error)}`, 'entry')],
+    };
+  }
+  const parsed = entryOf(raw, 'entry');
+  if ('kind' in parsed) return { ok: false, problems: [parsed] };
+  return { ok: true, entry: parsed };
 }
+
+

package/src/host/market-index.ts

@@ -1,40 +1,26 @@
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
 import { join, relative, sep } from 'node:path';
-import type {
-  MarketIndex,
-  MarketIndexEntry,
-  MarketIndexProblem,
-  MarketIndexVersion,
-} from '../contract/protocol/market-index.js';
+import type { MarketIndex, MarketIndexEntry, MarketIndexProblem } from '../contract/protocol/market-index.js';
 import { MARKET_INDEX_DIR, MARKET_INDEX_FORMAT } from '../contract/protocol/market-index.js';
-
-import type {
-  MarketDocFields,
-  MarketEntryDoc,
-  MarketEntryFile,
-  MarketIndexAssemble,
-  MarketMetaDoc,
-  MarketVersionDoc,
-} from './market-index-doc.js';
-import {
-  marketEntryPath,
-  parseMarketEntryDoc,
-  parseMarketIndexJson,
-  sortMarketVersions,
-} from './market-index-parse.js';
+import type { MarketEntryFile, MarketIndexAssemble } from './market-index-doc.js';
+import { entryUnitOf } from './market-index-claim.js';
+import { marketEntryPath, parseMarketEntryJson, parseMarketIndexJson, sortMarketVersions } from './market-index-parse.js';
 
 export const MARKET_ENTRIES_README_LINES: readonly string[] = [
   '# 索引目录',
   '',
-  '一个包一个目录，一个版本一个文件：`market/<包名>/<版本>.json`；产物在 `artifacts/<包名>/<版本>/`。',
+  '一个包一个文件：`market/<包名>.json`，里面是这一个包的元数据与所有版本；',
+  '',
+  '产物在 `artifacts/<包名>/`（只放最新一版，老版本按条目里的 commit 取历史）。',
   '',
-  '`meta-<epoch>-<随机后缀>.json` 是只改标题 / 署名 / 说明时追加的元数据快照，读取时按 epoch 取最新的一份。',
+  '发布时只改自己包的文件；包与包之间不共享文件。',
 ];
 
 export const MARKET_INDEX_README_LINES: readonly string[] = [
   '# 模块市场索引',
   '',
-  '这个仓库给 DeepSeek Harness 工作台当模块市场索引：条目在 `market/<包名>/<版本>.json`，产物在 `artifacts/<包名>/<版本>/`。',
+  '这个仓库给 DeepSeek Harness 工作台当模块市场索引：一个包一个文件 `market/<包名>.json`，',
+  '产物在 `artifacts/<包名>/`；老仓库的 `market.json` 会在第一次发布时自动拆开。',
   '',
   '## 发布模块',
   '',
@@ -44,8 +30,7 @@ export const MARKET_INDEX_README_LINES: readonly string[] = [
   'dsh-wb-module release --index <本仓库地址> --index-policy artifacts-in-repo',
   '```',
   '',
-  '产物会提交到 `artifacts/<包名>/<版本>/`，条目提交到 `market/<包名>/<版本>.json`。',
-  '发布只新增文件、不改已有文件，两台机器同时发也不会冲突；老条目的 `packages/<包名>/` 路径继续可用。',
+  '发布只会改自己包的那一个文件；包与包之间不会碰同一个文件。',
   '',
   '一个包名归第一次发布的人（条目文件里的 `owner`）。换一个署名发同名会被拒；要换人，先把这一条的 `owner` 改成新的人。',
   '同一个市场里，一个模块 id（`metadata.unit`）只能被一个条目使用；另一个包名想用同一个 id / 产物目录也会被拒。',
@@ -56,14 +41,7 @@ export const MARKET_INDEX_README_LINES: readonly string[] = [
   '',
 ];
 export { marketBranchOk, marketInstallTarget, marketText } from '../lib/market-index.js';
-export type {
-  MarketEntryDoc,
-  MarketEntryDocParse,
-  MarketEntryFile,
-  MarketIndexAssemble,
-  MarketMetaDoc,
-  MarketVersionDoc,
-} from './market-index-doc.js';
+export type { MarketEntryFile, MarketIndexAssemble } from './market-index-doc.js';
 export {
   compareSemver,
   filterMarketIndex,
@@ -71,9 +49,8 @@ export {
   httpUrlProblem,
   marketEntryLabels,
   marketEntryPath,
-  marketMetaPath,
   marketSourceKey,
-  parseMarketEntryDoc,
+  parseMarketEntryJson,
   parseMarketIndex,
   parseMarketIndexJson,
   parseSourceConfig,
@@ -82,116 +59,45 @@ export {
 } from './market-index-parse.js';
 export type { SourceConfigParse } from './market-index-parse.js';
 
-
 function problem(kind: MarketIndexProblem['kind'], detail: string, at?: string): MarketIndexProblem {
   return { kind, detail, ...(at === undefined ? {} : { at }) };
 }
 
-function docFieldsFromEntry(entry: MarketIndexEntry): MarketDocFields {
-  return {
-    name: entry.name,
-    ...(entry.title === undefined ? {} : { title: entry.title }),
-    ...(entry.description === undefined ? {} : { description: entry.description }),
-    ...(entry.author === undefined ? {} : { author: entry.author }),
-    ...(entry.owner === undefined ? {} : { owner: entry.owner }),
-    ...(entry.homepage === undefined ? {} : { homepage: entry.homepage }),
-    ...(entry.icon === undefined ? {} : { icon: entry.icon }),
-    ...(entry.metadata === undefined ? {} : { metadata: entry.metadata }),
-  };
-}
-
-export function marketVersionDocOf(entry: MarketIndexEntry, version: MarketIndexVersion): MarketVersionDoc {
-  return { ...docFieldsFromEntry(entry), ...version };
-}
-
-export function marketMetaDocOf(entry: MarketIndexEntry, epoch: number, at: number): MarketMetaDoc {
-  return { ...docFieldsFromEntry(entry), epoch, publishTimestamp: at };
-}
-
 export function assembleMarketIndex(files: readonly MarketEntryFile[]): MarketIndexAssemble {
   const problems: MarketIndexProblem[] = [];
-  interface Group {
-    versions: Map<string, MarketIndexVersion>;
-    meta: { epoch: number; at: number; path: string; doc: MarketEntryDoc } | undefined;
-    fallback: { at: number; path: string; doc: MarketEntryDoc } | undefined;
-  }
-  const groups = new Map<string, Group>();
+  const entries = new Map<string, MarketIndexEntry>();
   const ordered = [...files].sort((left, right) => (left.path < right.path ? -1 : left.path > right.path ? 1 : 0));
   for (const file of ordered) {
-    let raw: unknown;
-    try {
-      raw = JSON.parse(file.text) as unknown;
-    } catch (error) {
-      problems.push(
-        problem('not-json', `JSON 解析失败：${error instanceof Error ? error.message : String(error)}`, file.path),
-      );
-      continue;
-    }
-    const parsed = parseMarketEntryDoc(raw);
+    if (!file.path.endsWith('.json')) continue;
+    const parsed = parseMarketEntryJson(file.text);
     if (!parsed.ok) {
       for (const one of parsed.problems) problems.push({ ...one, at: file.path });
       continue;
     }
-    const doc = parsed.doc;
-    const group =
-      groups.get(doc.name) ?? { versions: new Map<string, MarketIndexVersion>(), meta: undefined, fallback: undefined };
-    const at = doc.publishTimestamp ?? 0;
-    if ('version' in doc) {
-      if (group.versions.has(doc.version)) {
-        problems.push(problem('duplicate-version', `版本重复：${doc.version}`, file.path));
-      }
-      group.versions.set(doc.version, {
-        version: doc.version,
-        source: doc.source,
-        ...(doc.publishTimestamp === undefined ? {} : { publishTimestamp: doc.publishTimestamp }),
-        ...(doc.engines === undefined ? {} : { engines: doc.engines }),
-      });
-      const newerFallback =
-        group.fallback === undefined ||
-        at > group.fallback.at ||
-        (at === group.fallback.at && file.path > group.fallback.path);
-      if (newerFallback) group.fallback = { at, path: file.path, doc };
-    } else {
-      const epoch = doc.epoch ?? 0;
-      const newer =
-        group.meta === undefined ||
-        epoch > group.meta.epoch ||
-        (epoch === group.meta.epoch && at > group.meta.at) ||
-        (epoch === group.meta.epoch && at === group.meta.at && file.path > group.meta.path);
-      if (newer) group.meta = { epoch, at, path: file.path, doc };
+    const entry = parsed.entry;
+    if (entries.has(entry.name)) {
+      problems.push(problem('duplicate-name', `插件名重复：${entry.name}`, file.path));
+      continue;
     }
-    groups.set(doc.name, group);
+    entries.set(entry.name, { ...entry, versions: sortMarketVersions(entry.versions) });
   }
   if (problems.length > 0) return { ok: false, problems };
-  const plugins: MarketIndexEntry[] = [...groups.entries()].map(([name, group]) => {
-    const meta = group.meta?.doc ?? group.fallback?.doc;
-    return {
-      name,
-      versions: sortMarketVersions([...group.versions.values()]),
-      ...(meta?.title === undefined ? {} : { title: meta.title }),
-      ...(meta?.description === undefined ? {} : { description: meta.description }),
-      ...(meta?.author === undefined ? {} : { author: meta.author }),
-      ...(meta?.owner === undefined ? {} : { owner: meta.owner }),
-      ...(meta?.homepage === undefined ? {} : { homepage: meta.homepage }),
-      ...(meta?.icon === undefined ? {} : { icon: meta.icon }),
-      ...(meta?.metadata === undefined ? {} : { metadata: meta.metadata }),
-    };
-  });
-  plugins.sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
+  const plugins = [...entries.values()].sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
   return { ok: true, index: { format: MARKET_INDEX_FORMAT, plugins } };
 }
 
+export function marketEntryFileOf(entry: MarketIndexEntry, dir: string = MARKET_INDEX_DIR): MarketEntryFile {
+  return { path: marketEntryPath(dir, entry.name), text: `${JSON.stringify(entry, null, 2)}\n` };
+}
+
 export function marketEntryFilesOf(index: MarketIndex, dir: string = MARKET_INDEX_DIR): readonly MarketEntryFile[] {
-  const files: MarketEntryFile[] = [];
-  for (const entry of index.plugins) {
-    for (const version of entry.versions) {
-      files.push({
-        path: marketEntryPath(dir, entry.name, version.version),
-        text: `${JSON.stringify(marketVersionDocOf(entry, version), null, 2)}\n`,
-      });
-    }
-  }
-  return files;
+  return index.plugins.map((entry) => marketEntryFileOf(healedUnit(entry), dir));
+}
+
+function healedUnit(entry: MarketIndexEntry): MarketIndexEntry {
+  if (entry.metadata?.unit !== undefined) return entry;
+  const unit = entryUnitOf(entry);
+  return unit === undefined ? entry : { ...entry, metadata: { ...entry.metadata, unit } };
 }
 
 export function collectMarketEntryFiles(dir: string): readonly MarketEntryFile[] {

package/src/i18n/en.ts

@@ -383,7 +383,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.discover.missingIndex': 'This repository has no {path} yet.',
   'panels.discover.initTitle': 'Initialize this repository as a module market index?',
   'panels.discover.initCta': 'Initialize market index',
-  'panels.discover.initWhat': 'It will write the index directory market/ and README.md on {branch}, commit once, and push. Modules you publish from this workbench will commit their build files under artifacts/<package-name>/<version>/ and their entry under market/<package-name>/<version>.json. The repository stays owned by its owner.',
+  'panels.discover.initWhat': 'It will write the index directory market/ and README.md on {branch}, commit once, and push. Modules you publish from this workbench will commit their build files under artifacts/<package-name>/ and their entry in market/<package-name>.json. The repository stays owned by its owner.',
   'panels.discover.initBranch': 'Branch',
   'panels.discover.initBranchHint': 'The index and build files go to this branch; an empty repository gets it created.',
   'panels.discover.initBranchBad': 'Use only letters, digits, dots, underscores, slashes, or dashes in a branch name.',
@@ -722,6 +722,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'approval.publish.version': 'Version',
   'approval.publish.author': 'Author',
   'approval.publish.authorMissing': 'unsigned',
+  'approval.publish.labels': 'Labels',
+  'approval.publish.labelsMissing': 'none yet (1–2 picked on publish)',
   'approval.publish.owner': 'Owner',
   'approval.publish.ownerUnowned': 'originally unattributed',
   'approval.publish.ownerTaken': 'Owned by {owner}',