@dsh-workbench/module-tools 1.1.5 → 1.1.7

package/README.md

@@ -17,10 +17,10 @@ pnpm design check # 设计底稿有没有空格、README 有没有落后
 维护者确认要真发时跑 `pnpm exec dsh-wb-module release`：全门禁（build / check / design / typecheck / test / selfcheck）、
 验收必须全勾、预检（登录 / license / git 远端）、按 `--target` 发到团队源 / 公网 npm / 安装包 / git，
 最后从出口侧核包（`--dry-run` 只预览，`--verify` 只核已发布的包）。配了可写 git 索引源时，
-发完还会更新 `market.json`（`--index auto|none|<目录|git 地址>`，`artifacts-in-repo` 连产物一起入库，
+发完还会写索引条目（`--index auto|none|<目录|git 地址>`，`artifacts-in-repo` 连产物一起入库，
 `catalog-only` 只更索引）；索引没更上不影响包已发布这件事，结果里会如实写。
 发布可选 `--index-source <id>` 指定发到哪个索引源；不指定时用唯一可发布的源，有多个可发布源会要求指定。
-空仓库先跑 `dsh-wb-module market-init <git 地址>`：生成 `market.json` 与 README 并推首个 commit
+空仓库先跑 `dsh-wb-module market-init <git 地址>`：生成索引目录 `market/` 与 README 并推首个 commit
 （用仓库声明的默认分支，读不到时用 `--ref` 指定）。在工作台里配了可写索引源之后，
 `release` 默认出口就是 `market`：产物与索引一起进那个仓库。
 发布过程中每一步都写进 `~/.dsh/workbench/releases/<unit>.json`；中断后带 `--resume` 接着发
@@ -33,10 +33,11 @@ pnpm design check # 设计底稿有没有空格、README 有没有落后
 模块的 `package.json` 可用 `dsh.workbench.market` 声明 `category` 与 `labels`（字符串数组）；
 不写就不带分类和标签，索引里只留 `metadata.workbench: true` 这条身份标记。
 要换署名时带 `--author "姓名 <邮箱>"`（或只给姓名）：它写回 `package.json`，索引、产物与提交都用它，
-`--refresh` 时也一样。一个包名归第一次发布的人（`market.json` 里的 `owner`）：换署名发同名会被拒，
+`--refresh` 时也一样。**发布本身不改市集里的标题 / 署名 / 说明**：这些元数据只由 `--refresh`（或显式 `--author`）写，
+避免一台还没更新的机器发新版时把别人刚改的元数据盖回去。一个包名归第一次发布的人（条目文件里的 `owner`）：换署名发同名会被拒，
 `--refresh` 也一样 —— 真要换人，先改那一条的 `owner`。
 同一个市场里，一个模块 id（`dsh.workbench.unit`）只能被一个条目使用；产物目录按包名走
-（`packages/<包名>/`）：换一个包名沿用旧 unit、或两个条目撞同一个 id / 目录，都会被拒。
+（`artifacts/<包名>/`）：换一个包名沿用旧 unit、或两个条目撞同一个 id / 目录，都会被拒。
 
 骨架自带脚本，日常不用记长命令：`build` · `typecheck` · `test` · `selfcheck` · `check` · `lint` · `design`。
 
@@ -45,7 +46,7 @@ pnpm design check # 设计底稿有没有空格、README 有没有落后
 | 命令 | 作用 |
 |---|---|
 | `dsh-wb-module init <unit> [--dir <目录>] [--template minimal\|diy] [--description "一句话"]` | 建模块骨架 |
-| `dsh-wb-module market-init <git 地址\|目录> [--ref <分支>] [--path <索引路径>]` | 初始化市场索引仓库：写 `market.json` + README，推首个 commit |
+| `dsh-wb-module market-init <git 地址\|目录> [--ref <分支>] [--path <索引路径>]` | 初始化市场索引仓库：写 `market/` + README，推首个 commit |
 | `dsh-wb-module build` | 出 `dist/host.js`（单文件 ESM）与 `client.js`（套 loader 壳） |
 | `dsh-wb-module check [--only <判据>]` | 十三条判据；`--only` 单跑，也当查询口用；`--list [--json\|--markdown]` 只列判据元数据 |
 | `dsh-wb-module lint [--fix]` | 用模块自己那份 `eslint.config.mjs`；`--fix` 写回文件 |

package/bin/dsh-wb-module.mjs

@@ -73,7 +73,7 @@ const MARKET_INIT_HELP = `
   market-init <git 地址|目录> [--ref <分支>] [--path <索引路径>] [--no-readme] [--json]
 
 空仓库：用仓库自己声明的默认分支，读不到时用 --ref 指定（github.com 兜底 main）。
-已有 commit 的仓库：只补 market.json / README.md，不改已有文件。`;
+已有 commit 的仓库：只补索引目录 / README.md，不改已有文件。`;
 
 const CHANGELOG_HELP = `
 用法：
@@ -86,7 +86,7 @@ const COMMANDS = {
   build: '出 dist/host.js（单文件 ESM）与 client.js（套 loader 壳）',
   check: '十三条判据；--only 单跑，也当查询口用；--list 只列判据元数据',
   init: '建模块骨架（--dir / --template minimal|diy / --description）',
-  'market-init': '初始化市场索引仓库（写 market.json + README，推首个 commit）',
+  'market-init': '初始化市场索引仓库（写 market/ 与 README，推首个 commit）',
   design: '设计底稿：init 填 / check 查空格 / render 生成 README / accept 打勾',
   publish: '发货前清单：门禁 + files + npm pack（只 dry run）',
   release: '真发布：全门禁 + 验收闸 + 预检接管 + 发到出口 + 发后核包 + 更新市场索引（中断可 --resume）',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/module-tools",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "模块包的构建与门禁工具：build（单文件 ESM 宿主侧 + 套 loader 壳的浏览器侧）、check（契约/产物边界/源码边界/卡片渲染）。模块包不再各带一份构建脚本。",
   "license": "MIT",
   "type": "module",
@@ -33,7 +33,7 @@
     "semver": "^7.8.5",
     "typescript": "5.9.3",
     "typescript-eslint": "^8.71.0",
-    "@dsh-workbench/shared": "1.1.5"
+    "@dsh-workbench/shared": "1.1.7"
   },
   "repository": {
     "type": "git",

package/src/market-index.mjs

@@ -1,19 +1,29 @@
-import { cpSync, copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { randomBytes } from 'node:crypto';
+import { cpSync, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { isDeepStrictEqual } from 'node:util';
 
 import {
+  MARKET_ENTRIES_README_LINES,
   MARKET_INDEX_README_LINES,
-  MARKET_INDEX_SEED,
+  assembleMarketIndex,
   claimOf,
+  collectMarketEntryFiles,
   gitUrlOk,
   marketArtifactPath,
+  marketArtifactPathFor,
+  marketArtifactRoot,
+  marketEntryFilesOfLegacy,
+  marketEntryPath,
+  marketMetaDocOf,
+  marketMetaPath,
   marketSourceKey,
+  marketVersionDocOf,
   parseMarketIndexJson,
-  upsertMarketEntry,
 } from '@dsh-workbench/shared/host';
 
-const MARKET_FILE = 'market.json';
+const MARKET_DIR = 'market';
+const LEGACY_FILE = 'market.json';
 const SAFE_PACKAGE_NAME = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
 const WORKSPACE_PREFIX = 'workspace:';
 const ARTIFACT_DIRS = ['dist'];
@@ -108,7 +118,7 @@ export function claimProblemText(name, claim, unit) {
   }
   if (claim.state === 'path-taken') {
     return (
-      `市场仓库里的 ${marketArtifactPath(name)} 已经被 ${claim.entry} 占了 —— 一个产物目录只能放一个包。` +
+      `市场仓库里的 ${marketArtifactRoot(name)} 已经被 ${claim.entry} 占了 —— 一个产物目录只能放一个包。` +
       '换一个包名再发；那个条目如果已经废弃，让索引维护者先处理掉。'
     );
   }
@@ -128,17 +138,180 @@ function unitOf(manifest) {
   return typeof unit === 'string' ? unit.trim() : '';
 }
 
-function claimOfIndexFile(workdir, indexPath, input) {
-  const file = join(workdir, indexPath);
-  if (!existsSync(file)) return { state: 'new' };
-  const parsed = parseMarketIndexJson(readFileSync(file, 'utf8'));
+function indexPathOf(plan) {
+  const asked = (plan.source.path ?? '').trim();
+  const base = asked === '' ? MARKET_DIR : asked.replace(/^\/+/, '');
+  return base.replace(/\/+$/, '') || MARKET_DIR;
+}
+
+function readWorktreeIndex(workdir, dir) {
+  const root = join(workdir, dir);
+  if (existsSync(root)) {
+    const assembled = assembleMarketIndex(collectMarketEntryFiles(root));
+    if (!assembled.ok) {
+      throw new MarketIndexError(
+        `${dir}/ 里有不合规的条目：${assembled.problems.map((one) => one.detail).join('；')}`,
+        'index-write',
+      );
+    }
+    return assembled.index;
+  }
+  const legacy = join(workdir, LEGACY_FILE);
+  if (!existsSync(legacy)) return { format: 1, plugins: [] };
+  const parsed = parseMarketIndexJson(readFileSync(legacy, 'utf8'));
   if (!parsed.ok) {
     throw new MarketIndexError(
-      `${indexPath} 不合 format 1：${parsed.problems.map((one) => one.detail).join('；')}`,
+      `${LEGACY_FILE} 不合 format 1：${parsed.problems.map((one) => one.detail).join('；')}`,
       'index-write',
     );
   }
-  return claimOf(parsed.index, input);
+  return parsed.index;
+}
+
+function ensureClaimFree(workdir, dir, input) {
+  const claim = claimOf(readWorktreeIndex(workdir, dir), input);
+  if (claim.state === 'conflict' || claim.state === 'unit-taken' || claim.state === 'path-taken') {
+    throw new MarketIndexError(claimProblemText(input.name, claim, input.unit), 'market-owner');
+  }
+}
+
+function ensureVersionFree(workdir, dir, input) {
+  const entry = readWorktreeIndex(workdir, dir).plugins.find((one) => one.name === input.name);
+  if (entry?.versions.some((one) => one.version === input.version) === true) {
+    throw new MarketIndexError(`索引里已经有 ${input.name}@${input.version} —— 换个版本号再发`, 'market-owner');
+  }
+}
+
+function writeEntryFile(workdir, dir, entry, version) {
+  const doc = marketVersionDocOf(entry, version);
+  const rel = marketEntryPath(dir, entry.name, version.version);
+  const file = join(workdir, ...rel.split('/'));
+  if (existsSync(file)) {
+    const current = JSON.parse(readFileSync(file, 'utf8'));
+    if (isDeepStrictEqual(current, doc)) return rel;
+    throw new MarketIndexError(
+      `索引里已经有 ${entry.name}@${version.version}（${rel}）—— 换个版本号再发`,
+      'market-owner',
+    );
+  }
+  mkdirSync(dirname(file), { recursive: true });
+  writeFileSync(file, `${JSON.stringify(doc, null, 2)}\n`);
+  return rel;
+}
+
+function metaEpochOf(workdir, dir, name) {
+  const root = join(workdir, dir, name);
+  if (!existsSync(root)) return 0;
+  let epoch = 0;
+  for (const item of readdirSync(root)) {
+    if (!item.startsWith('meta-') || !item.endsWith('.json')) continue;
+    try {
+      const doc = JSON.parse(readFileSync(join(root, item), 'utf8'));
+      if (typeof doc.epoch === 'number' && doc.epoch > epoch) epoch = doc.epoch;
+    } catch {
+      continue;
+    }
+  }
+  return epoch;
+}
+
+function writeMetaFile(workdir, dir, entry, at) {
+  const epoch = metaEpochOf(workdir, dir, entry.name) + 1;
+  const suffix = randomBytes(3).toString('hex');
+  const doc = marketMetaDocOf(entry, epoch, Math.floor(at / 1000));
+  const rel = marketMetaPath(dir, entry.name, epoch, suffix);
+  const file = join(workdir, ...rel.split('/'));
+  mkdirSync(dirname(file), { recursive: true });
+  writeFileSync(file, `${JSON.stringify(doc, null, 2)}\n`);
+  return rel;
+}
+
+function migrateLegacyIndex(workdir, dir) {
+  const legacy = join(workdir, LEGACY_FILE);
+  if (!existsSync(legacy)) return [];
+  const files = marketEntryFilesOfLegacy(readFileSync(legacy, 'utf8'), dir);
+  if (files === undefined) {
+    const parsed = parseMarketIndexJson(readFileSync(legacy, 'utf8'));
+    throw new MarketIndexError(
+      `${LEGACY_FILE} 不合 format 1：${parsed.ok ? '' : parsed.problems.map((one) => one.detail).join('；')}`,
+      'index-write',
+    );
+  }
+  const written = [];
+  for (const file of files) {
+    const target = join(workdir, ...file.path.split('/'));
+    if (existsSync(target)) continue;
+    mkdirSync(dirname(target), { recursive: true });
+    writeFileSync(target, file.text);
+    written.push(file.path);
+  }
+  const marker = join(workdir, dir, 'README.md');
+  if (!existsSync(marker)) {
+    mkdirSync(join(workdir, dir), { recursive: true });
+    writeFileSync(marker, MARKET_ENTRIES_README_LINES.join('\n'));
+    written.push(`${dir}/README.md`);
+  }
+  rmSync(legacy);
+  written.push(LEGACY_FILE);
+  return written;
+}
+
+function revOf(exec, workdir, ref) {
+  const result = runGit(exec, workdir, ['rev-parse', ref], { allowFailure: true });
+  return result.status === 0 ? result.stdout.trim() : '';
+}
+
+function syncWorktree(exec, workdir, branch) {
+  const fetched = runGit(exec, workdir, ['fetch', 'origin', branch], { allowFailure: true });
+  if (fetched.status !== 0) {
+    throw new MarketIndexError(
+      `拉不到索引仓库的远端 ${branch}：${tailOf(`${fetched.stdout}\n${fetched.stderr}`)}`,
+      'git-auth',
+      `git -C ${workdir} fetch origin ${branch}`,
+    );
+  }
+  const head = revOf(exec, workdir, 'HEAD');
+  const remote = revOf(exec, workdir, `origin/${branch}`);
+  if (head === '' || remote === '' || head === remote) return;
+  const behind = runGit(exec, workdir, ['merge-base', '--is-ancestor', head, `origin/${branch}`], {
+    allowFailure: true,
+  });
+  if (behind.status !== 0) return;
+  runGit(exec, workdir, ['reset', '--hard', `origin/${branch}`], { allowFailure: true });
+}
+
+function replicatePush(exec, workdir, branch, base, redo) {
+  let last = '';
+  for (let attempt = 0; attempt < 3; attempt += 1) {
+    const sha = redo();
+    const pushed = pushOf(exec, workdir, branch);
+    if (pushed.status === 0) return { ok: true, sha };
+    last = tailOf(`${pushed.stdout}\n${pushed.stderr}`);
+    const fetched = runGit(exec, workdir, ['fetch', 'origin', branch], { allowFailure: true });
+    if (fetched.status !== 0) return { ok: false, code: 'git-auth', reason: last };
+    const remote = revOf(exec, workdir, `origin/${branch}`);
+    const ancestor =
+      base === ''
+        ? true
+        : runGit(exec, workdir, ['merge-base', '--is-ancestor', base, `origin/${branch}`], {
+            allowFailure: true,
+          }).status === 0;
+    if (!ancestor) {
+      return {
+        ok: false,
+        code: 'git-market-rewritten',
+        reason: `远端 ${branch} 的历史被改写过（本地基点不在它的祖先里）—— 不自动合并：${last}`,
+      };
+    }
+    if (remote === '' || remote === base) {
+      return { ok: false, code: 'git-market-protected', reason: last };
+    }
+    const reset = runGit(exec, workdir, ['reset', '--hard', `origin/${branch}`], { allowFailure: true });
+    if (reset.status !== 0) {
+      return { ok: false, code: 'index-write', reason: `同步远端失败：${tailOf(reset.stderr)}` };
+    }
+  }
+  return { ok: false, code: 'index-write', reason: `远端一直在变，重试 3 次没挤进去（${last}）—— 过一会儿再发` };
 }
 
 export function identityOf(manifest) {
@@ -218,16 +391,6 @@ export function indexEntryOf(input) {
   };
 }
 
-export function mergeIndexText(text, entry) {
-  const raw = String(text ?? '').trim();
-  const parsed = raw === '' ? { ok: true, index: { format: 1, plugins: [] } } : parseMarketIndexJson(raw);
-  if (!parsed.ok) return { ok: false, problems: parsed.problems };
-  const merged = upsertMarketEntry(parsed.index, entry);
-  const checked = parseMarketIndexJson(JSON.stringify(merged));
-  if (!checked.ok) return { ok: false, problems: checked.problems };
-  return { ok: true, text: `${JSON.stringify(checked.index, null, 2)}\n` };
-}
-
 function readSources(file) {
   try {
     const parsed = JSON.parse(readFileSync(file, 'utf8'));
@@ -275,7 +438,7 @@ export function resolveIndexPlan({ args = [], home, exec }) {
   if (plan === undefined) {
     if (asked === 'auto' || asked === '') return undefined;
     throw new MarketIndexError(
-      `这个工坊还没配可写的 git 索引源。给我一个能推的 git 仓库（或它在本机的 clone 路径），我配成索引源并建一份 ${MARKET_FILE}。`,
+      `这个工坊还没配可写的 git 索引源。给我一个能推的 git 仓库（或它在本机的 clone 路径），我配成索引源并建一份 ${MARKET_DIR}/。`,
       'index-write',
     );
   }
@@ -427,11 +590,11 @@ function remoteHeadOf(exec, workdir, branch) {
   return line.split(/\s+/)[0] ?? '';
 }
 
-function copyArtifacts(root, workdir, name, manifest) {
+function copyArtifacts(root, workdir, name, version, manifest) {
   if (!SAFE_PACKAGE_NAME.test(name)) {
     throw new MarketIndexError(`包名不是合法 npm 名，没法当产物目录：${JSON.stringify(name)}`, 'index-write');
   }
-  const path = marketArtifactPath(name);
+  const path = marketArtifactPathFor(name, version);
   const dest = join(workdir, path);
   rmSync(dest, { recursive: true, force: true });
   mkdirSync(dest, { recursive: true });
@@ -447,37 +610,6 @@ function copyArtifacts(root, workdir, name, manifest) {
   return path;
 }
 
-function writeEntry(workdir, indexPath, entry, publisher, unit) {
-  const file = join(workdir, indexPath);
-  const current = existsSync(file) ? readFileSync(file, 'utf8') : '';
-  if (publisher === '') throw new MarketIndexError(missingPublisherText(), 'market-owner');
-  const claim = claimOfIndexFile(workdir, indexPath, {
-    name: entry.name,
-    publisher,
-    unit,
-    artifactPath: entry.versions[0]?.source?.type === 'git' ? entry.versions[0].source.path : undefined,
-  });
-  if (claim.state === 'conflict' || claim.state === 'unit-taken' || claim.state === 'path-taken') {
-    throw new MarketIndexError(claimProblemText(entry.name, claim, unit), 'market-owner');
-  }
-  const merged = mergeIndexText(current, entry);
-  if (!merged.ok) {
-    throw new MarketIndexError(
-      `${indexPath} 不合 format 1：${merged.problems.map((one) => one.detail).join('；')}`,
-      'index-write',
-    );
-  }
-  mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, merged.text);
-}
-
-function resetToRemote(exec, workdir, branch) {
-  const fetched = runGit(exec, workdir, ['fetch', 'origin', branch], { allowFailure: true });
-  if (fetched.status !== 0) return false;
-  const reset = runGit(exec, workdir, ['reset', '--hard', `origin/${branch}`], { allowFailure: true });
-  return reset.status === 0;
-}
-
 function publishSourceOf(publish) {
   if (publish.git !== undefined) {
     return {
@@ -497,14 +629,30 @@ function publishSourceOf(publish) {
 
 export function marketClaim({ plan, exec, home, name, unit, publisher }) {
   const workdir = worktreeOf(plan, exec, home);
-  return claimOfIndexFile(workdir, plan.source.path ?? MARKET_FILE, {
+  return claimOf(readWorktreeIndex(workdir, indexPathOf(plan)), {
     name,
     publisher,
     unit,
-    artifactPath: marketArtifactPath(name),
+    artifactPath: marketArtifactRoot(name),
   });
 }
 
+const META_KEYS = ['title', 'description', 'author', 'owner', 'homepage', 'icon', 'metadata'];
+
+function withCurrentMeta(entry, current, update) {
+  if (current === undefined) return entry;
+  const next = { ...entry };
+  if (!update) {
+    for (const key of META_KEYS) {
+      if (key === 'owner') continue;
+      if (current[key] === undefined) delete next[key];
+      else next[key] = current[key];
+    }
+  }
+  if (current.owner !== undefined) next.owner = current.owner;
+  return next;
+}
+
 export function updateMarketIndex(options) {
   const { plan, exec, home, root, manifest, version, publish, now, resume, onStep } = options;
   const unit = options.unit ?? unitOf(manifest);
@@ -522,17 +670,21 @@ export function updateMarketIndex(options) {
   };
   try {
     const workdir = worktreeOf(plan, exec, home);
-    const indexPath = plan.source.path ?? MARKET_FILE;
-    if (resume !== undefined && plan.source.localPath === undefined) {
-      runGit(exec, workdir, ['reset', '--hard', 'HEAD'], { allowFailure: true });
-      runGit(exec, workdir, ['clean', '-fd', '--', marketArtifactPath(manifest.name), indexPath], {
-        allowFailure: true,
-      });
+    const dir = indexPathOf(plan);
+    const branch = plan.source.ref ?? resume?.branch ?? currentBranch(exec, workdir);
+    base = { ...base, branch };
+    if (resume !== undefined) {
+      if (plan.source.localPath === undefined) {
+        const fetched = runGit(exec, workdir, ['fetch', 'origin', branch], { allowFailure: true });
+        if (fetched.status === 0) runGit(exec, workdir, ['reset', '--hard', `origin/${branch}`], { allowFailure: true });
+        runGit(exec, workdir, ['clean', '-fd', '--', marketArtifactPathFor(manifest.name, version), dir], {
+          allowFailure: true,
+        });
+      }
+      rmSync(join(workdir, dir, manifest.name, `${version}.json`), { force: true });
     } else {
       assertClean(exec, workdir);
     }
-    const branch = plan.source.ref ?? resume?.branch ?? currentBranch(exec, workdir);
-    base = { ...base, branch };
     if (typeof resume?.indexCommit === 'string' && resume.indexCommit !== '' && resume.indexPushed === true) {
       const remote = remoteHeadOf(exec, workdir, branch);
       if (remote === resume.indexCommit) {
@@ -547,34 +699,42 @@ export function updateMarketIndex(options) {
       }
     }
     if (publisher === '') throw new MarketIndexError(missingPublisherText(), 'market-owner');
-    const claim = claimOfIndexFile(workdir, indexPath, {
+    syncWorktree(exec, workdir, branch);
+    const baseSha = revOf(exec, workdir, 'HEAD');
+    const claimInput = {
       name: manifest.name,
       publisher,
       unit,
-      artifactPath: marketArtifactPath(manifest.name),
-    });
-    if (claim.state === 'conflict' || claim.state === 'unit-taken' || claim.state === 'path-taken') {
-      throw new MarketIndexError(claimProblemText(manifest.name, claim, unit), 'market-owner');
-    }
+      version,
+      artifactPath: marketArtifactRoot(manifest.name),
+    };
+    ensureClaimFree(workdir, dir, claimInput);
+    ensureVersionFree(workdir, dir, claimInput);
     let source;
     let artifactPath;
+    let artifactSha = '';
+    let indexSha = '';
     if (plan.policy === 'artifacts-in-repo') {
       report({ phase: 'artifacts' });
-      artifactPath = copyArtifacts(root, workdir, manifest.name, manifest);
-      report({ phase: 'artifacts-copied' });
-      const sha = commitOf(exec, workdir, `chore(release): ${entryName}`, identityOf(manifest));
-      report({ phase: 'artifacts-committed', artifactCommit: sha });
-      const pushed = pushOf(exec, workdir, branch);
-      if (pushed.status !== 0) {
+      const done = replicatePush(exec, workdir, branch, baseSha, () => {
+        ensureClaimFree(workdir, dir, claimInput);
+        migrateLegacyIndex(workdir, dir);
+        artifactPath = copyArtifacts(root, workdir, manifest.name, version, manifest);
+        report({ phase: 'artifacts-copied' });
+        artifactSha = commitOf(exec, workdir, `chore(release): ${entryName}`, identityOf(manifest));
+        report({ phase: 'artifacts-committed', artifactCommit: artifactSha });
+        return artifactSha;
+      });
+      if (!done.ok) {
         phase = 'artifacts';
         throw new MarketIndexError(
-          `产物提交推不上去（分支保护或权限）：本地 commit ${sha}；去合并/给权限后跟我说，我补索引。${tailOf(`${pushed.stdout}\n${pushed.stderr}`)}`,
-          'git-market-protected',
+          `产物提交推不上去（分支保护或权限）：本地 commit ${artifactSha}；去合并/给权限后跟我说，我补索引。${done.reason}`,
+          done.code,
           `git -C ${workdir} push origin HEAD:refs/heads/${branch}`,
         );
       }
-      report({ phase: 'artifacts-pushed', artifactCommit: sha, artifactPushed: true });
-      source = { type: 'git', url: plan.source.url, commit: sha, path: artifactPath };
+      report({ phase: 'artifacts-pushed', artifactCommit: artifactSha, artifactPushed: true });
+      source = { type: 'git', url: plan.source.url, commit: artifactSha, path: artifactPath };
     } else {
       source = publishSourceOf(publish ?? {});
       if (source === undefined) throw new MarketIndexError('这个出口没有可写进索引的 source（tarball 不进索引）', 'index-write');
@@ -582,30 +742,28 @@ export function updateMarketIndex(options) {
     }
     const entry = indexEntryOf({ manifest, version, source, at: now() });
     report({ phase: 'index' });
-    writeEntry(workdir, indexPath, entry, publisher, unit);
-    let indexSha = commitOf(exec, workdir, `chore(market): ${entryName}`, identityOf(manifest));
-    report({ phase: 'index-committed', indexCommit: indexSha });
-    const pushed = pushOf(exec, workdir, branch);
-    if (pushed.status !== 0) {
-      const replayed = resetToRemote(exec, workdir, branch);
-      if (!replayed) {
-        phase = 'index';
-        throw new MarketIndexError(
-          `模块已进仓库、索引没更新（本地 commit ${indexSha}）：${tailOf(`${pushed.stdout}\n${pushed.stderr}`)}`,
-        );
-      }
-      writeEntry(workdir, indexPath, entry, publisher, unit);
+    const indexed = replicatePush(exec, workdir, branch, baseSha, () => {
+      if (plan.policy !== 'artifacts-in-repo') migrateLegacyIndex(workdir, dir);
+      ensureClaimFree(workdir, dir, claimInput);
+      const current = readWorktreeIndex(workdir, dir).plugins.find((one) => one.name === manifest.name);
+      const written = withCurrentMeta(entry, current, options.metadata === true);
+      if (current === undefined || options.metadata === true) writeMetaFile(workdir, dir, written, now());
+      writeEntryFile(workdir, dir, written, written.versions[0]);
       indexSha = commitOf(exec, workdir, `chore(market): ${entryName}`, identityOf(manifest));
       report({ phase: 'index-committed', indexCommit: indexSha });
-      const retried = pushOf(exec, workdir, branch);
-      if (retried.status !== 0) {
-        phase = 'index';
-        throw new MarketIndexError(`模块已进仓库、索引没更新：${tailOf(`${retried.stdout}\n${retried.stderr}`)}`);
-      }
+      return indexSha;
+    });
+    if (!indexed.ok) {
+      phase = 'index';
+      throw new MarketIndexError(
+        indexed.code === 'git-market-protected' || indexed.code === 'git-auth'
+          ? `模块已进仓库、索引没更新（本地 commit ${indexSha}）：${indexed.reason}`
+          : indexed.reason,
+        indexed.code,
+      );
     }
     report({ phase: 'index-pushed', indexCommit: indexSha, indexPushed: true });
-    const local = runGit(exec, workdir, ['rev-parse', 'HEAD']);
-    const headSha = local.status === 0 ? local.stdout.trim() : '';
+    const headSha = revOf(exec, workdir, 'HEAD');
     const remoteHead = remoteHeadOf(exec, workdir, branch);
     if (headSha === '' || remoteHead !== headSha) {
       phase = 'remote-check';
@@ -642,24 +800,26 @@ export function refreshMarketEntry(options) {
   let phase = 'start';
   try {
     const workdir = worktreeOf(plan, exec, home);
-    const indexPath = plan.source.path ?? MARKET_FILE;
+    const dir = indexPathOf(plan);
     if (publisher === '') throw new MarketIndexError(missingPublisherText(), 'market-owner');
     assertClean(exec, workdir);
     const branch = plan.source.ref ?? currentBranch(exec, workdir);
     base = { ...base, branch };
-    const file = join(workdir, indexPath);
-    if (!existsSync(file)) throw new MarketIndexError(`索引里还没有 ${indexPath} —— 先正常发一版`, 'index-write');
-    const parsed = parseMarketIndexJson(readFileSync(file, 'utf8'));
-    if (!parsed.ok) {
-      throw new MarketIndexError(
-        `${indexPath} 不是 format 1：${parsed.problems.map((one) => one.detail).join('；')}`,
-        'index-write',
-      );
-    }
-    const existing = parsed.index.plugins.find((one) => one.name === manifest.name);
+    syncWorktree(exec, workdir, branch);
+    const index = readWorktreeIndex(workdir, dir);
+    const existing = index.plugins.find((one) => one.name === manifest.name);
     if (existing === undefined) {
       throw new MarketIndexError(`${manifest.name} 还不在索引里 —— 先正常发一版`, 'index-write');
     }
+    const claim = claimOf(index, {
+      name: manifest.name,
+      publisher,
+      unit,
+      artifactPath: marketArtifactRoot(manifest.name),
+    });
+    if (claim.state === 'conflict' || claim.state === 'unit-taken' || claim.state === 'path-taken') {
+      throw new MarketIndexError(claimProblemText(manifest.name, claim, unit), 'market-owner');
+    }
     const latest = existing.versions[0]?.version ?? '';
     const meta = entryMetaOf(manifest);
     const next = { ...existing };
@@ -670,23 +830,14 @@ export function refreshMarketEntry(options) {
     if (isDeepStrictEqual(next, existing)) {
       return { ...base, updated: false, unchanged: true, version: latest, phase: 'done' };
     }
-    writeEntry(workdir, indexPath, next, publisher, unit);
-    let indexSha = commitOf(exec, workdir, `chore(market): refresh ${manifest.name}`, identityOf(manifest));
-    const pushed = pushOf(exec, workdir, branch);
-    if (pushed.status !== 0) {
-      const replayed = resetToRemote(exec, workdir, branch);
-      if (!replayed) {
-        throw new MarketIndexError(`元数据没推上去（本地 commit ${indexSha}）：${tailOf(pushed.stderr)}`, 'index-write');
-      }
-      writeEntry(workdir, indexPath, next, publisher, unit);
-      indexSha = commitOf(exec, workdir, `chore(market): refresh ${manifest.name}`, identityOf(manifest));
-      const retried = pushOf(exec, workdir, branch);
-      if (retried.status !== 0) {
-        throw new MarketIndexError(`元数据没推上去：${tailOf(retried.stderr)}`, 'index-write');
-      }
-    }
-    const head = runGit(exec, workdir, ['rev-parse', 'HEAD']);
-    const headSha = head.status === 0 ? head.stdout.trim() : '';
+    const at = Date.now();
+    const baseSha = revOf(exec, workdir, 'HEAD');
+    const done = replicatePush(exec, workdir, branch, baseSha, () => {
+      writeMetaFile(workdir, dir, next, at);
+      return commitOf(exec, workdir, `chore(market): refresh ${manifest.name}`, identityOf(manifest));
+    });
+    if (!done.ok) throw new MarketIndexError(done.reason, done.code);
+    const headSha = revOf(exec, workdir, 'HEAD');
     const remoteHead = remoteHeadOf(exec, workdir, branch);
     if (headSha === '' || remoteHead !== headSha) {
       phase = 'remote-check';
@@ -695,7 +846,7 @@ export function refreshMarketEntry(options) {
         'git-market-pushed',
       );
     }
-    return { ...base, updated: true, version: latest, commit: indexSha, phase: 'done' };
+    return { ...base, updated: true, version: latest, commit: done.sha, phase: 'done' };
   } catch (error) {
     return {
       ...base,
@@ -733,7 +884,7 @@ function defaultBranchOf(exec, workdir, url, ref) {
 }
 
 export function initializeMarketRepo(options) {
-  const { exec, home, url, dir, ref, indexPath = MARKET_FILE, readme = true } = options;
+  const { exec, home, url, dir, ref, indexPath = MARKET_DIR, readme = true } = options;
   let workdir;
   let remote = String(url ?? '').trim();
   if (dir !== undefined) {
@@ -757,12 +908,13 @@ export function initializeMarketRepo(options) {
     const switched = runGit(exec, workdir, ['checkout', '-B', branch], { allowFailure: true });
     if (switched.status !== 0) throw new MarketIndexError(`建分支 ${branch} 没过：${tailOf(switched.stderr)}`, 'index-init');
   }
-  const created = [];
-  const file = join(workdir, indexPath);
-  if (!existsSync(file)) {
-    mkdirSync(dirname(file), { recursive: true });
-    writeFileSync(file, MARKET_INDEX_SEED);
-    created.push(indexPath);
+  const created = migrateLegacyIndex(workdir, indexPath);
+  const indexDir = join(workdir, indexPath);
+  const marker = join(indexDir, 'README.md');
+  if (!existsSync(marker)) {
+    mkdirSync(indexDir, { recursive: true });
+    writeFileSync(marker, MARKET_ENTRIES_README_LINES.join('\n'));
+    created.push(`${indexPath}/README.md`);
   }
   const readmeFile = join(workdir, 'README.md');
   if (readme && !existsSync(readmeFile)) {
@@ -792,11 +944,7 @@ export function initializeMarketRepo(options) {
 export function marketVersionExists({ plan, exec, home, name, version }) {
   try {
     const workdir = worktreeOf(plan, exec, home);
-    const file = join(workdir, plan.source.path ?? MARKET_FILE);
-    if (!existsSync(file)) return false;
-    const parsed = parseMarketIndexJson(readFileSync(file, 'utf8'));
-    if (!parsed.ok) return false;
-    const entry = parsed.index.plugins.find((one) => one.name === name);
+    const entry = readWorktreeIndex(workdir, indexPathOf(plan)).plugins.find((one) => one.name === name);
     return entry?.versions.some((one) => one.version === version) === true;
   } catch {
     return false;
@@ -823,4 +971,3 @@ export function verifyMarketArtifact({ plan, exec, home, name, path, commit }) {
   return { path: artifactPath, files };
 }
 
-export { MARKET_FILE };

package/src/release-report.mjs

@@ -71,7 +71,7 @@ export function human(out, summary) {
         `（${market.branch === undefined ? '默认分支' : market.branch}）`,
     );
     out(`  产物：${String(market.path ?? '').replace(/^\/*/, '')} · commit ${shortSha(market.commit)}`);
-    out('  提交：产物与 market.json 两个 commit 都已推上去');
+    out('  提交：产物与索引条目两个 commit 都已推上去');
     if (summary.changes.length > 0) out(`  改了：${summary.changes.join('；')}`);
     if (summary.files !== undefined) out(`  包内容：${summary.files.join(' · ')}`);
     out(`  安装：${summary.install}`);

package/src/release.mjs

@@ -480,6 +480,7 @@ export async function runRelease({
       version,
       publish,
       publisher: authorTextOf(manifestNow),
+      metadata: authorChange !== undefined,
       exec,
       home,
       now: () => Date.now(),
@@ -728,6 +729,7 @@ export async function runRelease({
       version,
       publish: {},
       publisher,
+      metadata: authorChange !== undefined,
       exec,
       home,
       now: () => Date.now(),