@stofone/dsh-agent-roster 0.10.2 → 0.10.4

package/CHANGELOG.md

@@ -4,6 +4,34 @@
 
 ## [Unreleased]
 
+## [0.10.4] - 2026-11-03
+
+### Fixed
+
+- **`compile --repo` was accepted and ignored.** The flag was parsed, then the artifact recorded `ownRepo()`
+  — the coordinates of whichever checkout ran the compiler. A repository that committed `dist/` therefore
+  disagreed with its own CI on every run: the drift check recompiled, got a different `source.repo`, and
+  failed. `migrate` had the same fault one layer down: it passed `source: {}` to the compiler instead of
+  the repository it was told to record. Both now write the coordinates they were given, and a test pins it.
+
+## [0.10.3] - 2026-11-03
+
+### Added
+
+- `migrate --from <dir>` and `--repo <owner/repo>`: a repository that publishes a collection keeps its
+  v1 rosters in `rosters/<id>/`, so the library root and the old files are not the same directory. The
+  migration now rewrites that file in place, adds `roles/` and `dist/` at the root, removes the stale
+  `roster.json`/`roster.yml` beside it (two spellings of one roster are two sources of truth), and does
+  **not** delete `rosters/<id>/` — that is where the new assembly lives.
+- A collection's `path` may be empty, meaning the repository root *is* the library. The three example
+  repositories (`agent-teams`, `metagpt-company`, `openmanus`) now use that shape: `roles/`, `rosters/`,
+  `dist/` at the root, `files` pointing at the compiled artifact.
+
+### Fixed
+
+- The `agent-teams`, `metagpt-company` and `openmanus` collections were still published as v1, so their
+  `roster.yaml` was fetched while a v2 world had already moved on; every entry now names its artifact.
+
 ## [0.10.2] - 2026-11-03
 
 ### Fixed
@@ -472,7 +500,9 @@
 - 工具返回值含 `undefined` 键，运行时按 `value is not lossless JSON` 整次拒绝；缺失值统一写 `null`，
   且所有返回值先过 `lib/json.js#lossless`。
 
-[Unreleased]: https://github.com/dsh-agent-roster/dsh-agent-roster/compare/v0.10.2...main
+[Unreleased]: https://github.com/dsh-agent-roster/dsh-agent-roster/compare/v0.10.4...main
+[0.10.4]: https://github.com/dsh-agent-roster/dsh-agent-roster/compare/v0.10.3...v0.10.4
+[0.10.3]: https://github.com/dsh-agent-roster/dsh-agent-roster/compare/v0.10.2...v0.10.3
 [0.10.2]: https://github.com/dsh-agent-roster/dsh-agent-roster/compare/v0.10.1...v0.10.2
 [0.10.1]: https://github.com/dsh-agent-roster/dsh-agent-roster/compare/v0.10.0...v0.10.1
 [0.10.0]: https://github.com/dsh-agent-roster/dsh-agent-roster/releases/tag/v0.10.0

package/README.md

@@ -276,6 +276,18 @@ Migration keeps personas verbatim: a member's `systemPrompt` becomes the body of
 loose field and becomes a role file of its own — `<roster>-<captain>-captain` when its name collides
 with a member, because those are two different personas and silently merging them would lose one.
 
+If the v1 rosters live in a subdirectory (the usual case for a repository that publishes a
+collection), point the migration at the library root and tell it where the old files are:
+
+```bash
+node bin/cli.mjs migrate --dir . --from rosters --repo owner/repo --write
+```
+
+That layout rewrites `rosters/<id>/roster.yaml` in place, adds `roles/` and `dist/` at the repository
+root, and drops the stale `roster.json`/`roster.yml` next to it — two spellings of one roster are two
+sources of truth. The collection then uses `path: ""` (the repository root *is* the library) and a
+`files` map pointing at `dist/`, because an assembly only references roles and cannot be pulled alone.
+
 Role names carry the roster id prefix because v2 requires role names to be **unique per library**,
 and a library whose 21 rosters all call their captain `lead` cannot have 21 files with the same name.
 
@@ -468,7 +480,7 @@ test/             unit tests
 
 Verified on this machine:
 
-- `npm test` — 286/286 passing (format, parse, validate, registry, paths, bridge, verify buckets, digests and provenance, roster diff, capability requirements and the capability gate, library organization, registry schema, lossless JSON, write plan/apply, all routes, panel snapshot and hints, dictionary consistency, tool contracts, client loader contract, library snapshot, config view, package manifest, declared fields and captain block, schema/constant alignment, the v2 role/roster/compiled layers and their schema alignment, v1→v2 migration, run records feeding the plan, remote registry and one-click install).
+- `npm test` — 293/293 passing (format, parse, validate, registry, paths, bridge, verify buckets, digests and provenance, roster diff, capability requirements and the capability gate, library organization, registry schema, lossless JSON, write plan/apply, all routes, panel snapshot and hints, dictionary consistency, tool contracts, client loader contract, library snapshot, config view, package manifest, declared fields and captain block, schema/constant alignment, the v2 role/roster/compiled layers and their schema alignment, v1→v2 migration, run records feeding the plan, remote registry and one-click install).
 - `npm run smoke` — `apply()` registers all six tools through a real `defineTool` from a DSH bundle; `roster_list` / `roster_show` / `roster_create` / `roster_verify` / `roster_diff` execute, every output survives `lossless` checks, `path` overrides are honored, effect disposal runs cleanly. The same command then loads `client.js` against a stubbed module table and asserts the three slot registrations, style injection and effect disposal.
 - CLI: `validate --dir examples` returns exit 0 over both example libraries.
 - Installed into a real profile with the plugin manager (`plugin_manager install_bundle` against this directory → `link:` dependency + bundle entry); the profile re-reads the linked files on restart.

package/README.zh.md

@@ -269,6 +269,16 @@ node bin/cli.mjs migrate --dir examples --write    # 原地重写：roles/ + ros
 
 迁移逐字保留人设：成员的 `systemPrompt` 原文成为 `roles/<档案>-<成员>/AGENT.md` 的正文，成员本身变成引用。队长不再是一个散字段，而是自己的角色文件——与成员同名时得到 `-captain` 后缀，因为那是两份人设，悄悄合并会丢掉一份。
 
+如果 v1 的档案在子目录里（把仓库当 collection 发布的常见形态），把 `--dir` 指到库根、用 `--from` 指旧目录：
+
+```bash
+node bin/cli.mjs migrate --dir . --from rosters --repo owner/repo --write
+```
+
+这种布局会就地重写 `rosters/<id>/roster.yaml`，在仓库根上补 `roles/` 与 `dist/`，并删掉并排的旧
+`roster.json`/`roster.yml`——同一份档案两种写法就是两个真源。之后 collection 用 `path: ""`（仓库根就是库），
+再用 `files` 指向 `dist/`：组装只引用角色，单独拉一个文件拉不到角色目录。
+
 角色名带档案 id 前缀，是因为 v2 要求同库角色名唯一：一座库里 21 套组装都叫自己的队长 `lead`，不可能有 21 个同名文件。
 
 ### 把失败的一轮喂回施工图
@@ -444,7 +454,7 @@ test/             单测
 
 本机已验证：
 
-- `npm test` —— 286/286 通过（格式、解析、校验、扫描、路径、桥接、核对四桶、摘要与溯源、档案差异、能力要求与能力闸门、档案库组织、索引 schema、无损 JSON、写入计划与执行、六条路由、快照与提示、两本词典一致、工具契约、客户端加载器契约、包清单、配置视图、样式 token 约束、声明层字段与队长段、schema 与常量对齐、v2 角色/组装/编译三层及其 schema 对齐、v1→v2 迁移、执行回执并入施工图）。
+- `npm test` —— 293/293 通过（格式、解析、校验、扫描、路径、桥接、核对四桶、摘要与溯源、档案差异、能力要求与能力闸门、档案库组织、索引 schema、无损 JSON、写入计划与执行、六条路由、快照与提示、两本词典一致、工具契约、客户端加载器契约、包清单、配置视图、样式 token 约束、声明层字段与队长段、schema 与常量对齐、v2 角色/组装/编译三层及其 schema 对齐、v1→v2 迁移、执行回执并入施工图）。
 - `npm run smoke` —— 用真实 DSH bundle 的 `defineTool` 注册六个工具，逐个调用：输出全部通过无损校验、`path` 覆盖生效、释放干净；同一条命令随后用桩模块表加载 `client.js`，断言三处槽位注册、样式只注入一次、effect 可回收。
 - CLI：`validate --dir examples` 对两座示例库退出码 0。
 - 用插件管理器真的装进了本机 profile（`plugin_manager install_bundle` 指向本仓库 → `link:` 依赖 + bundle 条目），重启后按链接读取本仓库文件。

package/bin/cli.mjs

@@ -13,6 +13,7 @@
  *   dsh-agent-roster registry sync     --file index/registry.json [--write]
  *   dsh-agent-roster compile --roster rosters/money-lab [--roles roles] [--run run.json] [--write] [--json]
  *   dsh-agent-roster migrate --dir examples [--write] [--json]
+ *   dsh-agent-roster migrate --dir . --from rosters --repo owner/repo --write
  */
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import nodePath from "node:path";
@@ -37,7 +38,8 @@ const USAGE = `用法：
   dsh-agent-roster registry fetch --file <路径>      逐条确认 collection 真的能取到
   dsh-agent-roster registry sync --file <路径>       按仓库实际内容重算 roster 列表
   dsh-agent-roster compile --roster <目录>            把 v2 组装编译成自包含产物（不写盘）
-  dsh-agent-roster migrate --dir <目录>               把 v1 档案原地迁成 v2（roles/ + rosters/ + dist/）
+  dsh-agent-roster migrate --dir <目录> [--from <子目录>] [--repo <owner/repo>] [--write]
+                                                      把 v1 档案原地迁成 v2（roles/ + rosters/ + dist/）
   dsh-agent-roster --version         输出版本号
 
 选项：
@@ -47,6 +49,8 @@ const USAGE = `用法：
   --local-only              fetch 只验本仓库登记的 collection（CI 里用，不依赖外网）
   --write                   sync 把重算结果写回文件
   --roster <path>           v2 组装目录（compile 用）
+  --from <path>             v1 档案所在目录（migrate 用；缺省与 --dir 相同，用于仓库根 + rosters/ 布局）
+  --repo <owner/repo>       写进 dist 产物的仓库坐标（migrate 用；缺省取本仓 remote）
   --run <path>              执行回执（compile 用；把上一轮失败并入重试卡）
   --roles <path>            角色库目录（compile 用；缺省按 rosters/<id> 推同级的 roles/）
   --json                    以 JSON 输出（validate / list / compile 都支持）
@@ -68,6 +72,8 @@ function parseArgs(argv) {
     roster: null,
     roles: null,
     run: null,
+    from: null,
+    repo: null,
   };
   for (let index = 0; index < argv.length; index += 1) {
     const arg = argv[index];
@@ -91,6 +97,16 @@ function parseArgs(argv) {
       if (value === undefined) throw new UsageError("--roster 需要一个路径");
       options.roster = value;
       index += 1;
+    } else if (arg === "--from") {
+      const value = argv[index + 1];
+      if (value === undefined) throw new UsageError("--from 需要一个路径");
+      options.from = value;
+      index += 1;
+    } else if (arg === "--repo") {
+      const value = argv[index + 1];
+      if (value === undefined) throw new UsageError("--repo 需要 owner/name");
+      options.repo = value;
+      index += 1;
     } else if (arg === "--run") {
       const value = argv[index + 1];
       if (value === undefined) throw new UsageError("--run 需要一个路径");
@@ -259,7 +275,7 @@ async function runCompile(options) {
   const result = compileRosterAt(rosterDir, {
     rolesDir,
     knownToolPolicies: options.knownPolicies.length > 0 ? options.knownPolicies : null,
-    source: { repo: ownRepo(), ref: "main" },
+    source: { repo: options.repo ?? ownRepo(), ref: "main" },
   });
 
   const diagnostics = [...(result.diagnostics ?? [])];
@@ -520,7 +536,13 @@ function runMigrate(options) {
   const reports = [];
   for (const dir of dirs) {
     const rootDir = resolveDirSpec(dir, process.cwd());
-    const report = migrateLibrary(rootDir, { write: options.write, knownToolPolicies, source: { repo: ownRepo(), ref: "main" } });
+    const fromDir = options.from === null ? rootDir : resolveDirSpec(options.from, process.cwd());
+    const report = migrateLibrary(rootDir, {
+      write: options.write,
+      knownToolPolicies,
+      source: { repo: options.repo ?? ownRepo(), ref: "main" },
+      fromDir,
+    });
     reports.push({ dir, rootDir, report });
     if (report.diagnostics.some((item) => item.severity === "error")) rc = 1;
     if (options.json) continue;

package/docs/roster-v2.md

@@ -197,6 +197,8 @@ gates:
 ## 8. 迁移
 
 - `roster migrate --dir <库> [--write]` 读 v1 档案，把 `systemPrompt` 拆成角色（`roles/<member>/AGENT.md`）+ 组装（成员改为引用），原地重写并生成 `dist/`。默认只出计划，`--write` 才落盘——这是唯一会删旧目录的命令。
+- `roster migrate --dir <库根> --from <旧目录> [--repo <owner/repo>] [--write]`：v1 档案放在子目录（`rosters/<id>/roster.yaml`，即"仓库本身就是库、只是档案隔了一层"）时用这条。它就地重写 `rosters/<id>/roster.yaml`、在库根补 `roles/` 与 `dist/`、删掉并排的 `roster.json`/`roster.yml`（同义文件=第二真源），**不删** `rosters/<id>/` —— 那个目录就是新档案的落脚处。`--repo` 写进产物的 `source.repo`，避免发布仓的产物署错名。
+- **collection 的 `path` 可以是空字符串**，表示仓库根就是库：`roles/`、`rosters/`、`dist/` 直接躺在根上。配合 `files` 映射指向 `dist/<id>-<ver>.json`。
 - **角色名带档案 id 前缀**（`core-review-reviewer`）：v2 要求同库角色名唯一，而真实档案库里几十套组装都可能叫 `lead`。队长与成员同名时，队长得到 `-captain` 后缀，不与人设合并。
 - `maintainers` 用 `handle` 模式（允许大写与点），不复用档案 id 的小写短横线规则——维护者是账号，不是标识符。
 - v1 冻结：新字段只进 v2，不再回填 v1。

package/index/registry.json

@@ -2,7 +2,7 @@
   "$schema": "../schema/registry.v1.schema.json",
   "kind": "dsh-agent-roster-registry/v1",
   "version": 1,
-  "generatedAt": "2026-11-03T05:50:01.540Z",
+  "generatedAt": "2026-11-03T06:14:00.000Z",
   "generator": "dsh-agent-roster/dsh-agent-roster (hand-maintained; verified by .github/workflows/registry.yml)",
   "source": "https://github.com/dsh-agent-roster/dsh-agent-roster",
   "collections": [
@@ -105,7 +105,7 @@
       "description": "把 wshobson/agents 的 agent-teams 插件（4.2 万星，MIT）迁成档案：队长、实现者、审查者、调试者，保留上游工具边界。",
       "repo": "github:dsh-agent-roster/agent-teams",
       "ref": "main",
-      "path": "rosters",
+      "path": "",
       "rosters": [
         "agent-teams"
       ],
@@ -119,7 +119,10 @@
       "maintainers": [
         "STofone"
       ],
-      "homepage": "https://github.com/dsh-agent-roster/agent-teams"
+      "homepage": "https://github.com/dsh-agent-roster/agent-teams",
+      "files": {
+        "agent-teams": "dist/agent-teams-1.0.0.json"
+      }
     },
     {
       "id": "metagpt-company",
@@ -127,7 +130,7 @@
       "description": "MetaGPT（5 万星+，MIT）的软件公司角色：产品经理、架构师、项目经理、工程师，字段取自上游 Role 的 profile/goal/constraints。",
       "repo": "github:dsh-agent-roster/metagpt-company",
       "ref": "main",
-      "path": "rosters",
+      "path": "",
       "rosters": [
         "metagpt-company"
       ],
@@ -140,7 +143,10 @@
       "maintainers": [
         "STofone"
       ],
-      "homepage": "https://github.com/dsh-agent-roster/metagpt-company"
+      "homepage": "https://github.com/dsh-agent-roster/metagpt-company",
+      "files": {
+        "metagpt-company": "dist/metagpt-company-1.0.0.json"
+      }
     },
     {
       "id": "openmanus",
@@ -148,7 +154,7 @@
       "description": "OpenManus（5.8 万星，MIT）的三个代理提示词：规划、编码、浏览器，systemPrompt 保留上游原文。",
       "repo": "github:dsh-agent-roster/openmanus",
       "ref": "main",
-      "path": "rosters",
+      "path": "",
       "rosters": [
         "openmanus"
       ],
@@ -162,7 +168,10 @@
       "maintainers": [
         "STofone"
       ],
-      "homepage": "https://github.com/dsh-agent-roster/openmanus"
+      "homepage": "https://github.com/dsh-agent-roster/openmanus",
+      "files": {
+        "openmanus": "dist/openmanus-1.0.0.json"
+      }
     }
   ]
 }

package/lib/migrate.js

@@ -206,11 +206,11 @@ function loadCapabilitiesOf(dir) {
  *
  * 不写盘时只返回计划；`write: true` 才落盘、编译、写出 `dist/`，并在最后删掉旧的 `<id>/` 目录。
  */
-export function migrateLibrary(rootDir, { write = false, knownToolPolicies = null, source = {} } = {}) {
+export function migrateLibrary(rootDir, { write = false, knownToolPolicies = null, source = {}, fromDir = rootDir } = {}) {
   const report = { rootDir, write, entries: [], diagnostics: [], written: [], removed: [], compiled: [] };
   let children = [];
   try {
-    children = readdirSync(rootDir, { withFileTypes: true });
+    children = readdirSync(fromDir, { withFileTypes: true });
   } catch (error) {
     report.diagnostics.push({ severity: "error", code: "unreadable-dir", path: "", file: null, reason: `档案库不可读：${error?.message ?? error}` });
     return report;
@@ -220,7 +220,7 @@ export function migrateLibrary(rootDir, { write = false, knownToolPolicies = nul
   for (const child of children) {
     if (!child.isDirectory() || child.isSymbolicLink()) continue;
     if (child.name.startsWith(".") || child.name === ROLES_DIR || child.name === ROSTERS_DIR || child.name === DIST_DIR) continue;
-    const dir = nodePath.join(rootDir, child.name);
+    const dir = nodePath.join(fromDir, child.name);
     // v1 的档案文件名可以是 yaml / yml / json——迁移只认内容，不认扩展名。
     if (!MEMBER_FILE_NAMES.some((name) => existsSync(nodePath.join(dir, name)))) continue;
     const loaded = loadRosterAt(dir, { knownToolPolicies });
@@ -269,7 +269,7 @@ export function migrateLibrary(rootDir, { write = false, knownToolPolicies = nul
       report.written.push(file.path);
     }
     for (const name of CAPABILITIES_FILE_NAMES) {
-      const source = nodePath.join(rootDir, entry.id, name);
+      const source = nodePath.join(fromDir, entry.id, name);
       if (!existsSync(source)) continue;
       const relative = nodePath.join(ROSTERS_DIR, entry.id, name);
       const target = nodePath.join(rootDir, relative);
@@ -278,6 +278,13 @@ export function migrateLibrary(rootDir, { write = false, knownToolPolicies = nul
       report.written.push(relative);
       break;
     }
+    // 就地迁移时旧的 roster.json / roster.yml 会和新的 roster.yaml 并排躺着：
+    // 两份同义文件就是两个真源，删掉非 .yaml 的旧件。
+    for (const name of MEMBER_FILE_NAMES) {
+      if (name === "roster.yaml") continue;
+      const stale = nodePath.join(rootDir, ROSTERS_DIR, entry.id, name);
+      if (existsSync(stale)) rmSync(stale, { force: true });
+    }
   }
 
   const scanned = scanRoles(nodePath.join(rootDir, ROLES_DIR), { knownToolPolicies });
@@ -288,7 +295,7 @@ export function migrateLibrary(rootDir, { write = false, knownToolPolicies = nul
       roles: scanned.roles,
       expectedId: entry.id,
       knownToolPolicies,
-      source: {},
+      source: { ...source },
     });
     if (!compiled.ok) {
       report.diagnostics.push({
@@ -316,7 +323,9 @@ export function migrateLibrary(rootDir, { write = false, knownToolPolicies = nul
   }
 
   for (const entry of report.entries) {
-    const legacy = nodePath.join(rootDir, entry.id);
+    const legacy = nodePath.join(fromDir, entry.id);
+    // 仓库根 + rosters/ 的布局里，v1 的 rosters/<id>/ 正是 v2 新档案落脚处 —— 不能删。
+    if (nodePath.resolve(legacy) === nodePath.resolve(nodePath.join(rootDir, ROSTERS_DIR, entry.id))) continue;
     if (!existsSync(legacy) || !statSync(legacy).isDirectory()) continue;
     // 只删「迁移前的那份目录」：v2 布局里档案在 rosters/ 下，root 上不该再有同名目录。
     rmSync(legacy, { recursive: true, force: true });

package/lib/remote.js

@@ -468,8 +468,9 @@ export function validateRegistry(value, meta = {}) {
       bad = true;
     }
     const path = entry.path === undefined ? "rosters" : String(entry.path);
-    if (!PATTERNS.relPath.test(path)) {
-      diagnostics.push(diagnostic("error", "collection-path", `${where}.path 必须是仓库内相对目录`, file));
+    // 空 path 表示「仓库根就是这座库」：v2 的 roles/ + rosters/ + dist/ 直接躺在仓库根上。
+    if (path !== "" && !PATTERNS.relPath.test(path)) {
+      diagnostics.push(diagnostic("error", "collection-path", `${where}.path 必须是仓库内相对目录（空字符串表示仓库根）`, file));
       bad = true;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stofone/dsh-agent-roster",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "多 Agent 团队的静态成员档案定义与校验层：档案库在面板里看得见、改得动，团队成员的人设、模型与工具边界固化成可校验、可版本化的文件，并在 dsh-agent-teams 创建成员时把档案桥接给运行时。",
   "type": "module",
   "main": "index.js",

package/schema/registry.v1.schema.json

@@ -71,7 +71,7 @@
             "type": "string",
             "pattern": "^(?:/)?(?:[A-Za-z0-9._-]+/)*[A-Za-z0-9._-]*$",
             "default": "rosters",
-            "description": "仓库内存放档案的目录。"
+            "description": "仓库内存放档案的目录；空字符串表示仓库根（v2 布局的 roles/ + rosters/ + dist/ 就在根上）。"
           },
           "rosters": {
             "type": "array",