@dsh-workbench/shared 1.1.6 → 1.1.8

package/src/host/__tests__/opencli-runner.test.ts

@@ -0,0 +1,120 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { DataRequest, DataResult } from '../../contract/data.js';
+import { opencliRunnerOf } from '../opencli-runner.js';
+
+type Read = (request: DataRequest) => Promise<DataResult<unknown>>;
+
+function readerOf(result: DataResult<unknown>): {
+  readonly read: Read;
+  readonly spy: ReturnType<typeof vi.fn>;
+} {
+  const spy = vi.fn(async (_request: DataRequest) => result);
+  return { read: spy as unknown as Read, spy };
+}
+
+describe('opencliRunnerOf', () => {
+  it('把 argv 原样交给读缝，解析后的值序列化回 stdout', async () => {
+    const { read, spy } = readerOf({ ok: true, data: [{ name: 'lsznh' }] });
+    const runner = opencliRunnerOf(read);
+
+    await expect(
+      runner(['argocd', 'application-resource-tree', '--name', 'lsznh']),
+    ).resolves.toEqual({ stdout: JSON.stringify([{ name: 'lsznh' }]) });
+    expect(spy).toHaveBeenCalledWith({
+      kind: 'command',
+      adapter: 'opencli',
+      argv: ['argocd', 'application-resource-tree', '--name', 'lsznh'],
+    });
+  });
+
+  it('timeoutMs 透传给读缝；不传就不出现这一格', async () => {
+    const withTimeout = readerOf({ ok: true, data: [] });
+    await opencliRunnerOf(withTimeout.read, { timeoutMs: 1_800_000 })([
+      'coding',
+      'ci-status',
+    ]);
+    expect(withTimeout.spy).toHaveBeenCalledWith(
+      expect.objectContaining({ timeoutMs: 1_800_000 }),
+    );
+
+    const withoutTimeout = readerOf({ ok: true, data: [] });
+    await opencliRunnerOf(withoutTimeout.read)(['coding', 'ci-status']);
+    expect(withoutTimeout.spy).toHaveBeenCalledWith(
+      expect.not.objectContaining({ timeoutMs: expect.anything() }),
+    );
+  });
+
+  it('未登录还原成 opencli 的约定：退出码 77 + AUTH_REQUIRED + 登录地址', async () => {
+    const { read } = readerOf({
+      ok: false,
+      error: {
+        code: 'auth',
+        pageCode: 'auth-required',
+        message: 'Coding 未登录',
+        helpUrl: 'https://baiguokeji.coding.net/login',
+      },
+    });
+
+    const failure = await opencliRunnerOf(read)(['coding', 'ci-status']).then(
+      () => null,
+      (error: unknown) => error as Error & { code?: number },
+    );
+
+    expect(failure).toBeInstanceOf(Error);
+    expect(failure?.code).toBe(77);
+    expect(failure?.message).toBe(
+      [
+        'Command failed: opencli coding ci-status',
+        'code: AUTH_REQUIRED',
+        'message: Coding 未登录',
+        'help: Please open Chrome or Chromium and log in to https://baiguokeji.coding.net/login',
+      ].join('\n'),
+    );
+  });
+
+  it('其它失败保留 Command failed 外壳与原因 / 细节 / 下一步', async () => {
+    const { read } = readerOf({
+      ok: false,
+      error: {
+        code: 'command',
+        pageCode: 'cli-command-failed',
+        message: 'UNKNOWN：插件里没有这条命令',
+        detail: 'error: unknown command',
+        hint: '升级插件后重试',
+      },
+    });
+
+    const failure = await opencliRunnerOf(read)([
+      'argocd',
+      'application-resource-tree',
+    ]).then(
+      () => null,
+      (error: unknown) => error as Error,
+    );
+
+    expect(failure?.message).toBe(
+      [
+        'Command failed: opencli argocd application-resource-tree',
+        'UNKNOWN：插件里没有这条命令',
+        'error: unknown command',
+        '升级插件后重试',
+      ].join('\n'),
+    );
+  });
+
+  it('没有原因时也有一句能看懂的兜底', async () => {
+    const { read } = readerOf({
+      ok: false,
+      error: { code: 'command', message: '' },
+    });
+
+    const failure = await opencliRunnerOf(read)(['cmdb', 'publish']).then(
+      () => null,
+      (error: unknown) => error as Error,
+    );
+
+    expect(failure?.message).toBe(
+      'Command failed: opencli cmdb publish\nopencli 这条命令没跑通',
+    );
+  });
+});

package/src/host/lib-runners.ts

@@ -0,0 +1,70 @@
+import type { LibNeed } from '../contract/needs.js';
+import type { LibReader } from '../contract/lib.js';
+import type { OpencliRunner } from './opencli-runner.js';
+
+export interface LibRuntimes {
+  readonly opencli?: OpencliRunner | undefined;
+}
+
+interface Logger {
+  warn?(message: string): void;
+}
+
+function runnerOf(runtimes: LibRuntimes, runtime: string): OpencliRunner | undefined {
+  return runtime === 'opencli' ? runtimes.opencli : undefined;
+}
+
+function setterNameOf(runtime: string): string {
+  return `set${runtime.charAt(0).toUpperCase()}${runtime.slice(1)}Runner`;
+}
+
+/**
+ * 给声明了 `runs` 的 lib 注入「跑这个运行时」的执行器：库侧按约定暴露 `setOpencliRunner`
+ * （运行时名字首字母大写 + `Runner`），外壳在每次 `load` 之后把执行器交给它。
+ *
+ * 没暴露的（版本旧）就保持它自己的行为（按 PATH 找），只记一条 warn；不熟悉的运行时同样只 warn。
+ * @param libs 原来的读库口。
+ * @param runtimes 外壳手上有的执行器，按运行时名字给。
+ * @param logger 记 warn 的地方（默认不记）。
+ * @returns 包好的读库口；`load` 的签名与返回不变。
+ */
+export function withLibRunners(
+  libs: LibReader,
+  runtimes: LibRuntimes,
+  logger?: Logger,
+): LibReader {
+  const warned = new Set<string>();
+  const warnOnce = (key: string, message: string): void => {
+    if (warned.has(key)) return;
+    warned.add(key);
+    logger?.warn?.(message);
+  };
+  return {
+    async load<T = unknown>(need: LibNeed, entry: string): Promise<T> {
+      const module = await libs.load<T>(need, entry);
+      for (const runtime of need.runs ?? []) {
+        const runner = runnerOf(runtimes, runtime);
+        if (runner === undefined) {
+          warnOnce(
+            `${need.name}:${runtime}:unsupported`,
+            `[dsh-workbench] ${need.name} 声明了自己会跑 ${runtime}，但工作台没有这个执行器 —— 它会按自己的方式找`,
+          );
+          continue;
+        }
+        const setter =
+          typeof module === 'object' && module !== null
+            ? (module as Record<string, unknown>)[setterNameOf(runtime)]
+            : undefined;
+        if (typeof setter !== 'function') {
+          warnOnce(
+            `${need.name}:${entry}:${runtime}:missing`,
+            `[dsh-workbench] ${need.name} 声明了自己会跑 ${runtime}，但这一版没有 ${setterNameOf(runtime)} —— 它会按 PATH 找`,
+          );
+          continue;
+        }
+        (setter as (runner: OpencliRunner) => void).call(module, runner);
+      }
+      return module;
+    },
+  };
+}

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[] {