@dsh-workbench/shared 1.1.6 → 1.1.8

package/dist/contract/needs.d.ts

@@ -76,12 +76,15 @@ export interface ExtensionNeed extends NeedCommon {
 }
 /**
  * 要在隔离运行时里有一个共用依赖包。
+ * `runs` 写它自己会起哪些运行时的命令（如 `["opencli"]`）—— 写了外壳就把那份执行器注入进去
+ * （库侧约定 `setOpencliRunner`）；不写就按它自己在 PATH 上找。
  */
 export interface LibNeed extends NeedCommon {
     readonly kind: 'lib';
     readonly name: string;
     readonly version?: string;
     readonly sources?: readonly SupplySource[];
+    readonly runs?: readonly string[] | undefined;
 }
 /**
  * 跑起来时要有这个环境变量；`secret` 为真时任何地方都不回显它的值。

package/dist/contract/needs.js

@@ -22,6 +22,7 @@ export const NEED_KEYS = [
     'secret',
     'install',
     'docs',
+    'runs',
 ];
 const SOURCE_KEYS = ['kind', 'package', 'registryEnv', 'registryDefault', 'url', 'ref', 'path', 'env'];
 const REGISTRY_PATTERN = /^(?:https?|file):\/\//;
@@ -149,6 +150,20 @@ export function binInstallProblemsOf(raw, at) {
     }
     return errors;
 }
+function libRunsProblemsOf(raw, at) {
+    if (raw === undefined)
+        return [];
+    if (!Array.isArray(raw))
+        return [`${at}.runs 要是数组`];
+    if (raw.length === 0)
+        return [`${at}.runs 是空数组 —— 不自己跑命令就整条删掉`];
+    const names = raw.map((one) => text(one));
+    if (names.some((one) => one === ''))
+        return [`${at}.runs 里有空字符串`];
+    if (new Set(names).size !== names.length)
+        return [`${at}.runs 里有重复的运行时`];
+    return [];
+}
 function perKindProblemsOf(kind, raw, at) {
     const errors = [];
     if (kind === 'bin' || kind === 'lib' || kind === 'env') {
@@ -159,6 +174,8 @@ function perKindProblemsOf(kind, raw, at) {
         errors.push(...binInstallProblemsOf(raw['install'], at));
     if (raw['docs'] !== undefined && text(raw['docs']) === '')
         errors.push(`${at}.docs 是空串`);
+    if (kind === 'lib')
+        errors.push(...libRunsProblemsOf(raw['runs'], at));
     if (kind === 'extension') {
         if (text(raw['runtime']) === '')
             errors.push(`${at}.runtime 没写 —— 扩展属于哪个运行时（如 opencli）`);

package/dist/contract/protocol/market-index.d.ts

@@ -208,6 +208,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/dist/host/lib-runners.d.ts

@@ -0,0 +1,20 @@
+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;
+}
+/**
+ * 给声明了 `runs` 的 lib 注入「跑这个运行时」的执行器：库侧按约定暴露 `setOpencliRunner`
+ * （运行时名字首字母大写 + `Runner`），外壳在每次 `load` 之后把执行器交给它。
+ *
+ * 没暴露的（版本旧）就保持它自己的行为（按 PATH 找），只记一条 warn；不熟悉的运行时同样只 warn。
+ * @param libs 原来的读库口。
+ * @param runtimes 外壳手上有的执行器，按运行时名字给。
+ * @param logger 记 warn 的地方（默认不记）。
+ * @returns 包好的读库口；`load` 的签名与返回不变。
+ */
+export declare function withLibRunners(libs: LibReader, runtimes: LibRuntimes, logger?: Logger): LibReader;
+export {};

package/dist/host/lib-runners.js

@@ -0,0 +1,46 @@
+function runnerOf(runtimes, runtime) {
+    return runtime === 'opencli' ? runtimes.opencli : undefined;
+}
+function setterNameOf(runtime) {
+    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, runtimes, logger) {
+    const warned = new Set();
+    const warnOnce = (key, message) => {
+        if (warned.has(key))
+            return;
+        warned.add(key);
+        logger?.warn?.(message);
+    };
+    return {
+        async load(need, entry) {
+            const module = await libs.load(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[setterNameOf(runtime)]
+                    : undefined;
+                if (typeof setter !== 'function') {
+                    warnOnce(`${need.name}:${entry}:${runtime}:missing`, `[dsh-workbench] ${need.name} 声明了自己会跑 ${runtime}，但这一版没有 ${setterNameOf(runtime)} —— 它会按 PATH 找`);
+                    continue;
+                }
+                setter.call(module, runner);
+            }
+            return module;
+        },
+    };
+}

package/dist/host/market-index-claim.d.ts

@@ -15,6 +15,5 @@ export interface MarketClaimInput {
 }
 export declare function marketArtifactPath(name: string): string;
 export declare function marketArtifactRoot(name: string): string;
-export declare function marketArtifactPathFor(name: string, version: string): string;
 export declare function entryUnitOf(entry: MarketIndexEntry): string | undefined;
 export declare function claimOf(index: MarketIndex, input: MarketClaimInput): MarketClaim;

package/dist/host/market-index-claim.js

@@ -45,9 +45,6 @@ export function marketArtifactPath(name) {
 export function marketArtifactRoot(name) {
     return `${MARKET_ARTIFACTS_DIR}/${name}`;
 }
-export function marketArtifactPathFor(name, version) {
-    return `${MARKET_ARTIFACTS_DIR}/${name}/${version}`;
-}
 export function entryUnitOf(entry) {
     const unit = entry.metadata?.unit?.trim();
     if (unit !== undefined && unit !== '')

package/dist/host/market-index-doc.d.ts

@@ -1,38 +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;
     readonly text: string;
@@ -44,13 +10,3 @@ export type MarketIndexAssemble = {
     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/dist/host/market-index-parse.d.ts

@@ -1,5 +1,4 @@
 import type { DiscoverFilter, IndexSourceSpec, MarketIndex, MarketIndexEntry, MarketIndexParse, MarketIndexProblem, MarketIndexVersion, MarketSourceConfig } from '../contract/protocol/market-index.js';
-import type { MarketEntryDocParse } from './market-index-doc.js';
 export declare function compareSemver(left: string, right: string): number | undefined;
 export declare function httpUrlProblem(url: string): string | undefined;
 export declare function gitUrlOk(url: string): boolean;
@@ -18,6 +17,12 @@ export type SourceConfigParse = {
     readonly problem: MarketIndexProblem;
 };
 export declare function parseSourceConfig(raw: unknown): SourceConfigParse;
-export declare function parseMarketEntryDoc(raw: unknown): MarketEntryDocParse;
-export declare function marketEntryPath(dir: string, name: string, version: string): string;
-export declare function marketMetaPath(dir: string, name: string, epoch: number, suffix: string): string;
+export declare function marketEntryPath(dir: string, name: string): string;
+export type MarketEntryParse = {
+    readonly ok: true;
+    readonly entry: MarketIndexEntry;
+} | {
+    readonly ok: false;
+    readonly problems: readonly MarketIndexProblem[];
+};
+export declare function parseMarketEntryJson(text: string): MarketEntryParse;

package/dist/host/market-index-parse.js

@@ -384,102 +384,27 @@ export function parseSourceConfig(raw) {
         },
     };
 }
-function docFieldsOf(record, at) {
-    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) {
-    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 < 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 < 0)) {
-            return { ok: false, problems: [problem('timestamp', 'epoch 必须是非负整数', 'entry')] };
-        }
-        return {
-            ok: true,
-            doc: { ...fields, publishTimestamp: timestamp, ...(epoch === undefined ? {} : { epoch: epoch }) },
-        };
-    }
-    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 }),
-            ...(dsh === '' ? {} : { engines: { dsh } }),
-        },
-    };
-}
 function indexPathBase(dir) {
     return dir.replace(/^\/+|\/+$/g, '') || MARKET_INDEX_DIR;
 }
-export function marketEntryPath(dir, name, version) {
+export function marketEntryPath(dir, name) {
     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, name, epoch, suffix) {
-    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 function parseMarketEntryJson(text) {
+    let raw;
+    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/dist/host/market-index.d.ts

@@ -1,14 +1,13 @@
-import type { MarketIndex, MarketIndexEntry, MarketIndexVersion } from '../contract/protocol/market-index.js';
-import type { MarketEntryFile, MarketIndexAssemble, MarketMetaDoc, MarketVersionDoc } from './market-index-doc.js';
+import type { MarketIndex, MarketIndexEntry } from '../contract/protocol/market-index.js';
+import type { MarketEntryFile, MarketIndexAssemble } from './market-index-doc.js';
 export declare const MARKET_ENTRIES_README_LINES: readonly string[];
 export declare 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 { compareSemver, filterMarketIndex, gitUrlOk, httpUrlProblem, marketEntryLabels, marketEntryPath, marketMetaPath, marketSourceKey, parseMarketEntryDoc, parseMarketIndex, parseMarketIndexJson, parseSourceConfig, sortMarketVersions, upsertMarketEntry, } from './market-index-parse.js';
+export type { MarketEntryFile, MarketIndexAssemble } from './market-index-doc.js';
+export { compareSemver, filterMarketIndex, gitUrlOk, httpUrlProblem, marketEntryLabels, marketEntryPath, marketSourceKey, parseMarketEntryJson, parseMarketIndex, parseMarketIndexJson, parseSourceConfig, sortMarketVersions, upsertMarketEntry, } from './market-index-parse.js';
 export type { SourceConfigParse } from './market-index-parse.js';
-export declare function marketVersionDocOf(entry: MarketIndexEntry, version: MarketIndexVersion): MarketVersionDoc;
-export declare function marketMetaDocOf(entry: MarketIndexEntry, epoch: number, at: number): MarketMetaDoc;
 export declare function assembleMarketIndex(files: readonly MarketEntryFile[]): MarketIndexAssemble;
+export declare function marketEntryFileOf(entry: MarketIndexEntry, dir?: string): MarketEntryFile;
 export declare function marketEntryFilesOf(index: MarketIndex, dir?: string): readonly MarketEntryFile[];
 export declare function collectMarketEntryFiles(dir: string): readonly MarketEntryFile[];
 export declare function marketEntryFilesOfLegacy(text: string, dir?: string): readonly MarketEntryFile[] | undefined;

package/dist/host/market-index.js

@@ -1,18 +1,22 @@
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
 import { join, relative, sep } from 'node:path';
 import { MARKET_INDEX_DIR, MARKET_INDEX_FORMAT } from '../contract/protocol/market-index.js';
-import { marketEntryPath, parseMarketEntryDoc, parseMarketIndexJson, sortMarketVersions, } from './market-index-parse.js';
+import { entryUnitOf } from './market-index-claim.js';
+import { marketEntryPath, parseMarketEntryJson, parseMarketIndexJson, sortMarketVersions } from './market-index-parse.js';
 export const MARKET_ENTRIES_README_LINES = [
     '# 索引目录',
     '',
-    '一个包一个目录，一个版本一个文件：`market/<包名>/<版本>.json`；产物在 `artifacts/<包名>/<版本>/`。',
+    '一个包一个文件：`market/<包名>.json`，里面是这一个包的元数据与所有版本；',
     '',
-    '`meta-<epoch>-<随机后缀>.json` 是只改标题 / 署名 / 说明时追加的元数据快照，读取时按 epoch 取最新的一份。',
+    '产物在 `artifacts/<包名>/`（只放最新一版，老版本按条目里的 commit 取历史）。',
+    '',
+    '发布时只改自己包的文件；包与包之间不共享文件。',
 ];
 export const MARKET_INDEX_README_LINES = [
     '# 模块市场索引',
     '',
-    '这个仓库给 DeepSeek Harness 工作台当模块市场索引：条目在 `market/<包名>/<版本>.json`，产物在 `artifacts/<包名>/<版本>/`。',
+    '这个仓库给 DeepSeek Harness 工作台当模块市场索引：一个包一个文件 `market/<包名>.json`，',
+    '产物在 `artifacts/<包名>/`；老仓库的 `market.json` 会在第一次发布时自动拆开。',
     '',
     '## 发布模块',
     '',
@@ -22,8 +26,7 @@ export const MARKET_INDEX_README_LINES = [
     'dsh-wb-module release --index <本仓库地址> --index-policy artifacts-in-repo',
     '```',
     '',
-    '产物会提交到 `artifacts/<包名>/<版本>/`，条目提交到 `market/<包名>/<版本>.json`。',
-    '发布只新增文件、不改已有文件，两台机器同时发也不会冲突；老条目的 `packages/<包名>/` 路径继续可用。',
+    '发布只会改自己包的那一个文件；包与包之间不会碰同一个文件。',
     '',
     '一个包名归第一次发布的人（条目文件里的 `owner`）。换一个署名发同名会被拒；要换人，先把这一条的 `owner` 改成新的人。',
     '同一个市场里，一个模块 id（`metadata.unit`）只能被一个条目使用；另一个包名想用同一个 id / 产物目录也会被拒。',
@@ -34,107 +37,46 @@ export const MARKET_INDEX_README_LINES = [
     '',
 ];
 export { marketBranchOk, marketInstallTarget, marketText } from '../lib/market-index.js';
-export { compareSemver, filterMarketIndex, gitUrlOk, httpUrlProblem, marketEntryLabels, marketEntryPath, marketMetaPath, marketSourceKey, parseMarketEntryDoc, parseMarketIndex, parseMarketIndexJson, parseSourceConfig, sortMarketVersions, upsertMarketEntry, } from './market-index-parse.js';
+export { compareSemver, filterMarketIndex, gitUrlOk, httpUrlProblem, marketEntryLabels, marketEntryPath, marketSourceKey, parseMarketEntryJson, parseMarketIndex, parseMarketIndexJson, parseSourceConfig, sortMarketVersions, upsertMarketEntry, } from './market-index-parse.js';
 function problem(kind, detail, at) {
     return { kind, detail, ...(at === undefined ? {} : { at }) };
 }
-function docFieldsFromEntry(entry) {
-    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, version) {
-    return { ...docFieldsFromEntry(entry), ...version };
-}
-export function marketMetaDocOf(entry, epoch, at) {
-    return { ...docFieldsFromEntry(entry), epoch, publishTimestamp: at };
-}
 export function assembleMarketIndex(files) {
     const problems = [];
-    const groups = new Map();
+    const entries = new Map();
     const ordered = [...files].sort((left, right) => (left.path < right.path ? -1 : left.path > right.path ? 1 : 0));
     for (const file of ordered) {
-        let raw;
-        try {
-            raw = JSON.parse(file.text);
-        }
-        catch (error) {
-            problems.push(problem('not-json', `JSON 解析失败：${error instanceof Error ? error.message : String(error)}`, file.path));
+        if (!file.path.endsWith('.json'))
             continue;
-        }
-        const parsed = parseMarketEntryDoc(raw);
+        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(), 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 = [...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, dir = MARKET_INDEX_DIR) {
+    return { path: marketEntryPath(dir, entry.name), text: `${JSON.stringify(entry, null, 2)}\n` };
+}
 export function marketEntryFilesOf(index, dir = MARKET_INDEX_DIR) {
-    const files = [];
-    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) {
+    if (entry.metadata?.unit !== undefined)
+        return entry;
+    const unit = entryUnitOf(entry);
+    return unit === undefined ? entry : { ...entry, metadata: { ...entry.metadata, unit } };
 }
 export function collectMarketEntryFiles(dir) {
     if (!existsSync(dir))

package/dist/host/opencli-runner.d.ts

@@ -0,0 +1,25 @@
+import type { DataRequest, DataResult } from '../contract/data.js';
+/**
+ * 一条 opencli 命令的执行器：同一形状的 `execFile('opencli', args)`，结果只留 stdout。
+ */
+export type OpencliRunner = (args: readonly string[]) => Promise<{
+    readonly stdout: string;
+}>;
+/**
+ * 读缝（`DataReader.read`）的形状；模块直接把自己的 `data.read` 传进来即可。
+ */
+export type OpencliRead = (request: DataRequest) => Promise<DataResult<unknown>>;
+export interface OpencliRunnerOptions {
+    readonly timeoutMs?: number;
+}
+/**
+ * 把读缝包成一条 opencli 命令的执行器：给还按 `execFile('opencli', args)` 收结果的编排库用，
+ * 让它们跑在面板用的那份 opencli 上（同一套插件、同一份登录态）。
+ *
+ * 失败按 opencli 自己的约定还原：未登录是 `code: AUTH_REQUIRED` + 退出码 77，编排库的
+ * 「等登录再重试」才接得上；其它失败保留 `Command failed: opencli …` 那句外壳。
+ * @param read 模块手里的读缝（`data.read`）。
+ * @param options `timeoutMs` 透传给读缝；不传就用读缝自己的默认值。
+ * @returns 执行器；直接交给编排库的 `setOpencliRunner`。
+ */
+export declare function opencliRunnerOf(read: OpencliRead, options?: OpencliRunnerOptions): OpencliRunner;

package/dist/host/opencli-runner.js

@@ -0,0 +1,50 @@
+const AUTH_REQUIRED_EXIT_CODE = 77;
+function textOf(value) {
+    return typeof value === 'string' ? value : '';
+}
+function failedOf(args, error) {
+    const head = `Command failed: opencli ${args.join(' ')}`;
+    const auth = error?.pageCode === 'auth-required';
+    const helpUrl = textOf(error?.helpUrl);
+    const detail = textOf(error?.detail);
+    const hint = textOf(error?.hint);
+    const failed = new Error([
+        head,
+        ...(auth
+            ? ['code: AUTH_REQUIRED', `message: ${textOf(error?.message)}`]
+            : [textOf(error?.message) || 'opencli 这条命令没跑通']),
+        ...(detail === '' ? [] : [detail]),
+        ...(hint === '' ? [] : [hint]),
+        ...(auth && helpUrl !== ''
+            ? [`help: Please open Chrome or Chromium and log in to ${helpUrl}`]
+            : []),
+    ].join('\n'));
+    if (auth)
+        failed.code = AUTH_REQUIRED_EXIT_CODE;
+    return failed;
+}
+/**
+ * 把读缝包成一条 opencli 命令的执行器：给还按 `execFile('opencli', args)` 收结果的编排库用，
+ * 让它们跑在面板用的那份 opencli 上（同一套插件、同一份登录态）。
+ *
+ * 失败按 opencli 自己的约定还原：未登录是 `code: AUTH_REQUIRED` + 退出码 77，编排库的
+ * 「等登录再重试」才接得上；其它失败保留 `Command failed: opencli …` 那句外壳。
+ * @param read 模块手里的读缝（`data.read`）。
+ * @param options `timeoutMs` 透传给读缝；不传就用读缝自己的默认值。
+ * @returns 执行器；直接交给编排库的 `setOpencliRunner`。
+ */
+export function opencliRunnerOf(read, options = {}) {
+    return async (args) => {
+        const result = await read({
+            kind: 'command',
+            adapter: 'opencli',
+            argv: [...args],
+            ...(options.timeoutMs === undefined
+                ? {}
+                : { timeoutMs: options.timeoutMs }),
+        });
+        if (result.ok)
+            return { stdout: JSON.stringify(result.data) };
+        throw failedOf(args, result.error);
+    };
+}

package/dist/host.d.ts

@@ -34,6 +34,8 @@ export * from './host/tokens.js';
 export * from './host/tool-approval.js';
 export * from './host/tool-kit.js';
 export * from './host/unit-face.js';
+export * from './host/opencli-runner.js';
+export * from './host/lib-runners.js';
 export * from './host/value-handoff.js';
 export * from './host/workspace-store.js';
 export * from './host/write-result.js';

package/dist/host.js

@@ -34,6 +34,8 @@ export * from './host/tokens.js';
 export * from './host/tool-approval.js';
 export * from './host/tool-kit.js';
 export * from './host/unit-face.js';
+export * from './host/opencli-runner.js';
+export * from './host/lib-runners.js';
 export * from './host/value-handoff.js';
 export * from './host/workspace-store.js';
 export * from './host/write-result.js';

package/dist/i18n/en.js

@@ -372,7 +372,7 @@ export const en = {
     '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.',
@@ -703,6 +703,8 @@ export const en = {
     '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}',