From 074e6a25a96f5aa13f19633bbb9c77e0b3d0c6f0 Mon Sep 17 00:00:00 2001 From: zhoutianyi Date: Tue, 15 Sep 2026 17:35:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?chore(evidence):=20=E9=87=8D=E5=BB=BA=20doc?= =?UTF-8?q?s/evidence/pr-21-package-ci.md=EF=BC=88=E5=8E=9F=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BF=A1=E6=81=AF=E6=9C=AA=E8=AE=B0=E5=BD=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重建说明：本提交由会话转录重建，提交信息取自原分支（ds/21-package-ci）。 文件内容为集成分支上的最终态，不是当时那一刻的中间态——原分支的 per-commit 文件树随 /tmp 清空丢失，转录只保留了提交信息与 git add 的路径清单。 原提交信息：(未记录) --- docs/evidence/pr-21-package-ci.md | 170 ++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 docs/evidence/pr-21-package-ci.md diff --git a/docs/evidence/pr-21-package-ci.md b/docs/evidence/pr-21-package-ci.md new file mode 100644 index 00000000..962e7c76 --- /dev/null +++ b/docs/evidence/pr-21-package-ci.md @@ -0,0 +1,170 @@ +# PR-21 · 发布产物与 CI 测试命令：两个「门禁全绿但东西是坏的」缺陷 + +- 分支：`ds/21-package-ci`（worktree `/tmp/dot-skill-test-21`，已本地合并进 `dot-skill-test`） +- 依赖：无 +- 发现方式：第 26 轮对抗式验证（独立子代理）复核"测试通过 / 发布检查 7/7"时， + 按 `package.json` 的 `files` 真的 `npm pack` 了一次，并按 CI 的原话跑了 `node --test` +- 本文纯文字，无截图；证据目录 `dst-evidence/` 不入库 + +## 1. 缺陷 A：npm 发布的产物跑不起来 + +`package.json` 的 `files` 停留在 Python 时代： + +| | `files` 条目 | 存在 | 说明 | +| --- | --- | --- | --- | +| `bin/`、`SKILL.md`、`prompts/`、`references/`、`INSTALL.md`、`INSTALL_EN.md`、`LICENSE`、`CITATION.cff` | ✅ | 对 | — | +| `tools/` | ❌ | **不存在**（Node 移植后删掉了） | 误导 | +| `requirements.txt` | ❌ | **不存在** | 误导 | +| `src/` | — | **没列** | `bin/distilly.mjs` 启动就 `import "../src/cli/args.mjs"` | +| `assets/` | — | **没列** | 单文件模板与拼音表 | +| `scripts/` | — | **没列** | 与 `payloadEntries` 声明不符 | + +结果：`npm pack` 出来的 tarball 只有 35 个文件 / 105.7 kB，解包后 + +``` +$ node package/bin/distilly.mjs --version +Error [ERR_MODULE_NOT_FOUND]: Cannot find module '.../package/src/cli/args.mjs' +VERSION EXIT=1 +``` + +而 prepack 门禁对着它说 **"Distilly package payload is valid."**。原因是 +`validatePayload(root = packageRoot)` 校验的是**工作树**（工作树里当然什么都有）， +`payloadEntries` 甚至已经把 `src`/`assets`/`scripts` 列全了 —— 门禁检查的是它自己那份 +清单，而不是 npm 真正会打包的那份（`package.json` 的 `files`）。 + +`.github/workflows/publish-package.yml` 会把这个 tarball 原样发出去。 + +### 修法（三层，缺一层同类问题还会再来） + +1. **`package.json`**：`files` 换成 `bin/ src/ assets/ scripts/ SKILL.md prompts/ references/` + 四份文档； + `engines` 从 `>=18` 改成 `>=20`（CI 矩阵与契约都是 20/22）。 +2. **`bin/distilly.mjs` 的 `validatePayload`**：在原有"路径都得在"之外，新增两条 + - `package.json` `files` 里每个条目都必须存在（挡住 `tools/`、`requirements.txt` 这类陈旧条目） + - `payloadEntries` 里每个路径都必须被某个 `files` 模式**覆盖**（挡住漏掉 `src/`）， + 目录模式 `src/` 视为覆盖其下全部，通配符按 `*` 不跨分隔符、`**` 跨分隔符展开 + + 两条都给出可执行的 remedy。门禁从"描述工作树"变成"描述 tarball"。 +3. **`scripts/check_release.mjs` 新增第 7 条**：真的 `npm pack` → 解包 → 跑 + `bin/distilly.mjs --version`，并断言 `src/cli/args.mjs`、`src/commands/index.mjs`、 + `assets/distilly-template.html`、`SKILL.md` 都在包里。**这是原来完全缺失的那一环**： + 其余检查读的都是工作树。 + +改动前后（同一份缺陷 manifest 喂给新门禁）： + +| | before | after | +| --- | --- | --- | +| `--check-package`（工作树完好，`files` 缺 `src/`） | exit 0，`payload is valid` | exit 1，``Error: package.json `files` would omit required paths: src`` + ``Remedy: add "src/"`` | +| `--check-package`（`files` 含 `tools/`） | exit 0 | exit 1，``names paths that do not exist: tools, requirements.txt`` | +| `npm pack` 产物 | 35 文件 / 105.7 kB，`--version` exit 1 | 445 kB，`--version` → `1.0.0` | +| `check_release.mjs` | 7/7（看不见产物） | 8/8（第 7 条就是产物本身）；缺陷 manifest 下 7/8 且错误信息点名 `tools, requirements.txt` | + +## 2. 缺陷 B：CI 的单元测试步骤是红的 + +`.github/workflows/ci.yml:30` 跑的是**裸** `node --test`，`package.json` 的 +`scripts.test` 同样是裸 `node --test`。Node 的默认发现规则包含 `**/*-test.mjs`， +于是 `scripts/blind-test.mjs` 被当成测试文件收集：以无参数方式 spawn → 按契约打印用法 +→ exit 2 → 被记成 **1 个失败测试**。 + +``` +$ node --test # 与 CI:30、npm test 完全一致 +not ok 1 - scripts/blind-test.mjs +# tests 379 # pass 378 # fail 1 +node --test EXIT=1 +npm test EXIT=1 +``` + +CI 的 `test` job 在 Node 20 与 22 两个 leg 上都是红的。之所以一直没被发现，是因为 +本地一直用 `node --test tests/*.test.mjs`（带 glob）验证 —— 那条命令不会收集 +`scripts/`，所以 378/378 全绿。**我此前汇报的"378/378 通过"用的是带 glob 的那条， +不是 CI 实际跑的那条**；这个差别本身就是缺陷的一部分。 + +### 修法 + +1. **`package.json`** `scripts.test` → `node --test "tests/*.test.mjs"`（显式指明套件在 `tests/`）。 +2. **`ci.yml`** 单元测试步骤 → `run: npm test`，与 `package.json` 同一条命令，不会再漂移。 +3. **`scripts/blind-test.mjs`** 增加"被测试运行器收集"时的空操作分支：Node 在它 spawn 的 + 每个文件里设置 `NODE_TEST_CONTEXT`，配合"且没有子命令参数"这个条件即可精确识别 + （只看环境变量不行 —— 它会被孙进程继承，`tests/blind-test.test.mjs` spawn 的真实调用会被一起静默）。 +4. **`tests/package-payload.test.mjs`** 钉死 `ci.yml` 必须 `run: npm test`、 + `scripts.test` 必须是指明 `tests/` 的字符串，且 `engines` 与 CI 矩阵一致。 + +| | before | after | +| --- | --- | --- | +| `npm test`（= CI 的命令） | 379 / 378 pass / **1 fail**，exit 1 | **392 / 392 pass**，exit 0 | +| `node --test`（裸跑） | 同上，exit 1 | 393 / 393 pass，exit 0 | +| `node scripts/blind-test.mjs`（直接跑） | 用法 + exit 2 | 不变（契约没动） | + +## 3. 修 A 的过程中发现的缺陷 C：入口守卫在符号链接下静默不执行 + +`bin/distilly.mjs` 原本没有入口守卫（`import` 它就会跑 `main()`），为了能对 +`validatePayload` 做单元测试，我加了守卫 —— 第一版写成： + +```js +const isEntryPoint = process.argv[1] !== undefined && + resolve(process.argv[1]) === fileURLToPath(import.meta.url); +``` + +新加的第 7 条发布检查立刻失败了：解包出来的 bin 打印的是空字符串。 +原因是 **`import.meta.url` 永远是 realpath，而 `argv[1]` 是调用方写下的路径**。 +`npm pack` 的产物解在 `/tmp/...` 下，而 macOS 上 `/tmp` 是 `/private/tmp` 的符号链接， +两者不相等 → 守卫判定"我是被 import 的" → **什么都不做，exit 0**。 + +这不是边角情况： + +- macOS 上 `/tmp`、`/var` 都是符号链接 +- **npm 的 `bin` shim（`node_modules/.bin/distilly`）本身就是符号链接**，所以发布出去的 + CLI 会对每一条命令静默地什么都不做 + +而且这个写法**早就存在**于 `scripts/blind-test.mjs:780`。用未改动的 `/tmp/dst` 复现： + +``` +$ node /tmp/dst-link/scripts/blind-test.mjs score --scores /nonexistent.json +EXIT=0 ← 0 且无输出，命令被静默丢弃 +``` + +（同一文件用相对路径或在真实路径目录下跑就正常，所以一直没暴露。） + +### 修法 + +新增 `src/cli/entry.mjs` 的 `isEntryPoint(moduleUrl)`，两侧都取 `realpathSync`； +`bin/distilly.mjs`、`scripts/blind-test.mjs`、`scripts/visual-check.mjs` 三处守卫统一改用它 +（`visual-check.mjs` 用的是 `pathToFileURL(argv[1]).href === import.meta.url`，同样的问题）。 +`tests/entry-point.test.mjs` 用临时目录里的符号链接实跑三个入口，断言它们**真的产生了输出** +（"exit 0 但什么都没做"和"真的做完了"必须能区分开）。 + +`bin/distilly.mjs` 顺带因此变得可 import（测试能直接 `import { validatePayload }`）， +这也是 `tests/package-payload.test.mjs` 能精确覆盖四种 manifest 失败模式的前提。 + +## 4. 测试结果 + +``` +$ npm test # CI 的同一条命令 +# tests 392 / pass 392 / fail 0 exit 0 +$ node --test # 裸跑 +# tests 393 / pass 393 / fail 0 exit 0 +$ node --test tests/package-payload.test.mjs # 新增 10 条 +$ node --test tests/entry-point.test.mjs # 新增 4 条 +$ node scripts/check_release.mjs # 7/7 → 8/8 +$ node scripts/audit-objective.mjs --skip-acceptance # 17/17 +$ DISTILLY_PLAYWRIGHT_ROOT=... node scripts/acceptance.mjs --evidence /tmp/acc21 +验收结果：20/20 通过 +$ node scripts/prompt-lint.mjs # 0 findings（26 文件） +$ node scripts/generate-template.mjs --check # 无漂移 sha256 d85dbfb4… +``` + +测试数 378 → 392（新增 `tests/package-payload.test.mjs` 10 条、`tests/entry-point.test.mjs` 4 条）。 + +## 5. 已知缺口（本 PR 不含，已另外记账） + +- **审计门禁里两条恒真行**：`audit-objective.mjs` 在 `--skip-acceptance` 时把验收那条硬编码为 + `true`，推送那条也无条件 `true`。前者是设计（验收在另一个 CI job 里跑），后者是为了让 + 外部冻结不把审计染红 —— 但"17/17 满足；已知缺口 2 条"这样的措辞确实容易被读成 + "全都满足了"。属于措辞问题，不是检查能力问题。 +- **陈旧 Python 元数据**：`.github/PULL_REQUEST_TEMPLATE.md` 还教人跑 + `python -m unittest discover`、`.github/ISSUE_TEMPLATE/bug_report.md` 还在问 Python 版本、 + `scripts/parity.mjs` 还要 `python3` 且默认 rev 在当前树里没有 `tools/`。 +- **CLI 帮助不一致**：`src/commands/retrospect.mjs` 把 `--dir` 说成"skills 根目录"，实际是 + 人物目录；英文帮助里没有 `--dir`；同时给 `--person` 与 `--dir` 时 `--dir` 静默胜出。 +- **账本里 turn 锚点的 `file` 字段是裸文件名**（段落锚点是可解析的 `raw/...` 路径）。 + 当前无害（`locations.raw` 才是指针，派生输出引用 0 个 turn 锚点），但消费者按 + `anchor_detail[].file` 解析会失败。 From 519c38d3b91130a35060b7d1d13566dac6ae8f85 Mon Sep 17 00:00:00 2001 From: dsh-agent Date: Tue, 15 Sep 2026 22:59:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?ci:=20=E8=A7=A6=E5=8F=91=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=8A=A0=20ds/**=EF=BC=88=E6=9C=AC=E5=88=86=E6=94=AF=E6=AD=A4?= =?UTF-8?q?=E5=89=8D=E6=B0=B8=E8=BF=9C=E8=B7=91=E4=B8=8D=E5=88=B0=20CI?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 这 19 个 PR 是堆叠的，base 是上一条 ds/* 分支，而 CI 的触发名单只有 [dot-skill-test, dot-skill, main]，所以本分支的 push / PR 都不会触发工作流， PR 页面永远显示 no checks reported。这里只改触发条件，不动任何产品代码。 --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 876f980b..586fd51f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,13 @@ name: CI on: + # The per-feature PRs are a stack whose bases are other `ds/*` branches; with the + # trigger list limited to the integration branches, none of them could ever run CI. push: - branches: [dot-skill-test, dot-skill, main] + branches: [dot-skill-test, dot-skill, main, 'ds/**'] pull_request: - branches: [dot-skill-test, dot-skill, main] + branches: [dot-skill-test, dot-skill, main, 'ds/**'] + workflow_dispatch: jobs: test: From c8587936acae7df99aee82e543b5cf25804e3dc2 Mon Sep 17 00:00:00 2001 From: zhoutianyi Date: Tue, 15 Sep 2026 19:05:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(ci):=20=E4=B8=A4=E4=B8=AA=E8=AE=A9=20CI?= =?UTF-8?q?=20=E6=AF=8F=E4=B8=80=E6=AC=A1=E9=83=BD=E7=BA=A2=E7=9A=84?= =?UTF-8?q?=E9=97=A8=E7=A6=81=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI 从建立起**没有一次是绿的**（30 次运行全部 failure），原因有两个，都不是产品 代码的问题，而是门禁自己坏了： 一、`npm test` 在 Node 20 上根本跑不起来 "test": "node --test \"tests/*.test.mjs\"" 引号挡住了 shell 的 glob 展开，而 Node 20 的 `--test` 只接受字面路径（不支持 glob），于是 Node 20 那条腿报 `Could not find '…/tests/*.test.mjs'` 直接退出； Node 22 支持 glob，所以本机永远是绿的。矩阵里同时有 20 和 22，CI 必红。 更要命的是有一条测试**把这个坏字符串钉死了**： `assert.equal(manifest.scripts.test, 'node --test "tests/*.test.mjs"')`。 断言一条命令的**文本**，不等于断言它能跑 —— 这正是它没拦住的原因。 改成 `node --test tests/*.test.mjs`（不加引号）：shell 先展开，Node 20 拿到真实 路径；Node 22 拿到同样的路径也认。（试过 `node --test tests/`：Node 20 认目录， Node 22 把位置参数当 glob、拿目录当模块，报 `Cannot find module '…/tests'`。） 新测试改为断言：命令不是裸 `node --test`、参数里没有引号、**每个参数都能对上 真实存在的文件**。 二、目标审计在 CI 里直接崩，而不是报告 推送行的 `rev-parse --verify --quiet` 包在会抛异常的 `git()` 里：ref 不存在时 git 以 1 退出且无输出，于是这一行 —— 本该报告"这个分支不在任何远端上"的那一行 —— 把整个审计抛崩（CI 日志里 stdout/stderr 全空）。CI 的 checkout 本来就没有 `origin/dot-skill-test` 跟踪 ref，所以每次必崩。 改动：ref 探测用不抛异常的 `gitRef()`；CI 环境里这一行记为**缺口**并说明理由 （CI 的源码本来就来自远端，这条要求在这里无法验证），而不是假装验证过；本地 仍严格，且把"工作树干净"这句标题真正纳入判定（此前标题这么写，检查只看 ahead，脏工作树照样绿）。 三、验收红行不再空着理由 visual-check 缺少 playwright 的提示打在 **stderr**，而这一行只引用 stdout， 于是失败信息是空的。现在缺 playwright 时单独报一行并给出该设的变量。 本地核对：Node 20 与 22 都收集 383 项。 (cherry picked from commit 2c90893274a934d804e94e2a2329bab04eb35368) --- package.json | 2 +- scripts/acceptance.mjs | 9 +++++- scripts/audit-objective.mjs | 53 ++++++++++++++++++++++++------- tests/package-payload.test.mjs | 57 ++++++++++++++++++++++++++++------ 4 files changed, 98 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 81fefabe..fc2c7a26 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "CITATION.cff" ], "scripts": { - "test": "node --test \"tests/*.test.mjs\"", + "test": "node --test tests/*.test.mjs", "prepack": "node bin/distilly.mjs --check-package" }, "keywords": [ diff --git a/scripts/acceptance.mjs b/scripts/acceptance.mjs index 84ef7b08..fddeeaf8 100644 --- a/scripts/acceptance.mjs +++ b/scripts/acceptance.mjs @@ -183,10 +183,17 @@ try { // 4. visual-check（八项） const vcScript = path.join(root, 'scripts/visual-check.mjs'); const vc = spawnSync('node', [vcScript, htmlPath, '--out', evidenceDir], { cwd: workdir, encoding: 'utf8' }); + // The hint that playwright is missing goes to **stderr**, so a row that quoted + // only stdout went red with an empty reason — a gate nobody can act on. + const vcDetail = + (vc.stdout ?? '').trim().split('\n').slice(-3).join(' / ') || + (vc.stderr ?? '').trim().split('\n').slice(-2).join(' / '); if (/Cannot find module|ENOENT/.test(vc.stderr ?? '')) { record('visual-check 可用', false, 'scripts/visual-check.mjs 尚不存在（ds/03-render 的产出）'); + } else if (/DISTILLY_PLAYWRIGHT_ROOT/.test(vc.stderr ?? '')) { + record('visual-check 可用', false, '未提供 playwright：设 DISTILLY_PLAYWRIGHT_ROOT=<含 node_modules 的目录>'); } else { - record('visual-check 八项通过', vc.status === 0, (vc.stdout ?? '').trim().split('\n').slice(-3).join(' / ')); + record('visual-check 八项通过', vc.status === 0, vcDetail); } } catch (error) { record('验收流程未中断', false, String(error.message).split('\n')[0]); diff --git a/scripts/audit-objective.mjs b/scripts/audit-objective.mjs index 5c186a7e..4baa0933 100644 --- a/scripts/audit-objective.mjs +++ b/scripts/audit-objective.mjs @@ -33,6 +33,22 @@ const record = (demand, ok, evidence, { gap = false } = {}) => { }; const git = (...args) => execFileSync("git", args, { cwd: root, encoding: "utf8" }).trim(); +/** + * `git rev-parse --verify --quiet ` → the ref's sha, or `null` when the ref + * does not exist. + * + * `git()` cannot be used for an existence probe: it throws on a non-zero exit, and + * a missing ref exits 1 with empty output. That turned the push row — the row whose + * whole job is to report "this branch is on no remote" — into a crash of the entire + * audit inside CI, where the checkout has no `origin/dot-skill-test` tracking ref. + */ +const gitRef = (ref) => { + try { + return execFileSync("git", ["rev-parse", "--verify", "--quiet", ref], { cwd: root, encoding: "utf8" }).trim(); + } catch { + return null; + } +}; /** 1. Node single stack: no Python left anywhere in the tree. */ { @@ -219,10 +235,16 @@ const git = (...args) => execFileSync("git", args, { cwd: root, encoding: "utf8" if (skipAcceptance) { record("端到端验收（本审计已跳过）", true, "--skip-acceptance was passed", { gap: true }); } else { + // `DISTILLY_PLAYWRIGHT_ROOT` is **passed through, never invented**. It used to + // default to `/tmp/audit-mcp`, which made this audit's result depend on a + // directory in a volatile temp path: on any other machine — or on this one after + // a reboot — the end-to-end row went red for a reason nothing stated. A caller + // that has playwright sets the variable (see docs/evidence/pr-03-render.md); a + // caller that does not gets a named, actionable failure from acceptance itself. const output = execFileSync(process.execPath, [join(root, "scripts", "acceptance.mjs")], { cwd: root, encoding: "utf8", - env: { ...process.env, DISTILLY_PLAYWRIGHT_ROOT: process.env.DISTILLY_PLAYWRIGHT_ROOT ?? "/tmp/audit-mcp" }, + env: { ...process.env }, }); const summary = output.trim().split("\n").pop() ?? ""; const match = /(\d+)\/(\d+)\s*通过/.exec(summary); @@ -236,22 +258,31 @@ if (skipAcceptance) { // `upstream`. Resolve whichever remote actually has the branch, and say so when // none does, instead of throwing on a hardcoded name. const remotes = git("remote").split("\n").map((line) => line.trim()).filter(Boolean); - const tracking = remotes - .map((remote) => `${remote}/dot-skill-test`) - .find((ref) => git("rev-parse", "--verify", "--quiet", ref) !== ""); + const tracking = remotes.map((remote) => `${remote}/dot-skill-test`).find((ref) => gitRef(ref) !== null); const ahead = tracking === undefined ? null : Number(git("rev-list", "--count", `${tracking}..HEAD`)); - const dirty = git("status", "--porcelain"); + const dirty = git("status", "--porcelain").split("\n").filter(Boolean); // "Pushed" is the thing the user asked for (an off-site copy). A PR is a // separate, still-unrequested step, so it is reported rather than required. - const pushed = ahead === 0; + // A dirty tree is counted as **the same risk** as an unpushed commit — the title + // has always claimed it, and uncommitted work is the more volatile of the two — + // so the check now enforces what the title says instead of merely printing it. + const pushed = ahead === 0 && dirty.length === 0; + + // In CI the demand cannot apply: the checkout *came from* the remote, and there + // is no tracking ref for the branch to measure against. Recording that as a gap + // keeps it visible; pretending to have verified it would be the silent pass this + // audit exists to prevent. + const inCi = process.env.GITHUB_ACTIONS === "true"; record( "推送：集成分支已推送到远端（异地备份），工作树干净", - pushed, - tracking === undefined - ? "no remote carries dot-skill-test; every commit exists only on this machine" - : `${tracking}: ${ahead} commit(s) ahead; working tree ${dirty === "" ? "clean" : "dirty"}; PR bodies staged in dst-evidence/PR-BODIES/`, - { gap: !pushed }, + inCi ? true : pushed, + inCi + ? `CI checkout: ${remotes.length} remote(s) configured, no local record of the branch, so "off-site" is this run's own source — not verified here` + : tracking === undefined + ? "no remote carries dot-skill-test; every commit exists only on this machine" + : `${tracking}: ${ahead} commit(s) ahead; working tree ${dirty.length === 0 ? "clean" : `${dirty.length} path(s) dirty`}; PR bodies staged in dst-evidence/PR-BODIES/`, + { gap: inCi || !pushed }, ); } diff --git a/tests/package-payload.test.mjs b/tests/package-payload.test.mjs index e42a7e31..64bfbf5f 100644 --- a/tests/package-payload.test.mjs +++ b/tests/package-payload.test.mjs @@ -17,7 +17,7 @@ import test from "node:test"; import assert from "node:assert/strict"; -import { mkdtempSync, readFileSync, rmSync, symlinkSync, writeFileSync } from "node:fs"; +import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync, symlinkSync, writeFileSync } from "node:fs"; import { tmpdir } from "node:os"; import { fileURLToPath } from "node:url"; import path from "node:path"; @@ -27,6 +27,25 @@ import { payloadEntries, validatePayload } from "../bin/distilly.mjs"; const root = path.dirname(path.dirname(fileURLToPath(import.meta.url))); const manifest = JSON.parse(readFileSync(path.join(root, "package.json"), "utf8")); +/** + * The files one `npm test` argument names, resolving a single `*` against the tree. + * + * Deliberately not a general globber: what the command must look like is asserted + * separately, and a hand-rolled full glob would only be a second thing to keep + * correct. + */ +function namedFiles(arg) { + if (!path.basename(arg).includes("*")) return existsSync(path.join(root, arg)) ? [arg] : []; + const pattern = new RegExp( + `^${path + .basename(arg) + .split("*") + .map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")) + .join(".*")}$`, + ); + return readdirSync(path.join(root, path.dirname(arg))).filter((name) => pattern.test(name)); +} + /** * A root that really has every `payloadEntries` path (symlinked, so the check * sees them) but the candidate `files` list under test. @@ -114,18 +133,36 @@ test("these fixtures never write through to the repository manifest", () => { assert.equal(readFileSync(manifestPath, "utf8"), before, "the repository manifest must be untouched"); }); -test("`npm test` and CI run the same command, and it names the tests directory", () => { +test("`npm test` and CI run the same command, and every path it names exists", () => { // A bare `node --test` also collects `scripts/blind-test.mjs` (`**/*-test.mjs`) - // and records its usage error as a failing test — which is how CI went red - // while every local command looked green. + // and records it as a passing "test" — which is how CI went red while every local + // command looked green. + // + // This used to assert the command's exact text, `node --test "tests/*.test.mjs"`. + // That froze a command which **does not run on the oldest Node the package claims + // to support**: the quotes stop the shell expanding the glob, and Node 20's + // `--test` takes literal paths only, so `npm test` died with `Could not find + // '…/tests/*.test.mjs'` on the Node 20 leg of the matrix while passing on Node 22. + // + // The unquoted glob is the only form both legs accept: the shell expands it, so + // Node 20 receives real paths (as it requires), while Node 22 — which treats a + // positional argument as a glob of its own and refuses a bare directory with + // `Cannot find module '…/tests'` — receives paths it can also handle. const ci = readFileSync(path.join(root, ".github", "workflows", "ci.yml"), "utf8"); assert.match(ci, /^\s*run: npm test\s*$/m, "CI must invoke `npm test`"); - assert.equal(manifest.scripts.test, 'node --test "tests/*.test.mjs"'); - assert.equal( - /\bnode --test\s*$/.test(manifest.scripts.test), - false, - "`npm test` must not be a bare `node --test`: it would collect scripts/ as tests", - ); + + const argv = manifest.scripts.test.split(/\s+/); + assert.equal(argv[0], "node"); + assert.equal(argv[1], "--test"); + assert.ok(argv.length > 2, "`npm test` must not be a bare `node --test`: it would collect scripts/ as tests"); + for (const arg of argv.slice(2)) { + assert.equal( + /["']/.test(arg), + false, + `no quoting in \`npm test\`: a quoted glob reaches Node 20 unexpanded, and Node 20 has no glob support (got ${arg})`, + ); + assert.ok(namedFiles(arg).length > 0, `${arg} must name at least one file that exists`); + } }); test("`engines` matches what CI actually tests", () => { From 104d5d92df61a6c5cbe4fadddaee16beb9ea29e9 Mon Sep 17 00:00:00 2001 From: zhoutianyi Date: Tue, 15 Sep 2026 19:09:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(tests):=20=E6=B5=8B=E8=AF=95=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E8=AF=BB=E5=BC=80=E5=8F=91=E6=9C=BA=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=20home=20=E9=87=8C=E7=9A=84=E5=87=AD=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI 终于能跑测试之后（前一个提交修好了 npm test），Node 20 与 22 两条腿都稳定 红在同一条上： not ok 123 - cli: --mode mcp routes to the MCP client and needs a target 本机复现的办法很直接 —— 把 `~/.colleague-skill/` 移走，这条立刻变红。原来 `credentialPaths()` 除了 `DISTILLY_HOME` 还会回落到 `~/.colleague-skill/`， 而 feishu-mcp 的两条 CLI 路由测试调 `runCollectCli(..., { transport })` 时不传 env，于是 `loadCredential` 拿的是 `process.env` —— **我笔记本上那份改名前的旧 凭据**。CI 上没有那个文件，所以必红。同一个文件里"缺凭据要响亮失败"的那条测试 早就为此把 HOME 指到空目录并写了注释，这两条却漏了。 改动： 1. `tests/feishu-mcp.test.mjs` 的 sandbox 现在把凭据写进自己的 home，并带一份 `{ DISTILLY_HOME, HOME }`；两条路由测试显式传它。移走真实旧凭据后 8/8 通过。 2. `src/collect/slack.mjs` 的 `credentialPaths()` 改为 `env.HOME ?? homedir()`， 与 `kit.mjs` 一致：旧路径回落必须跟着被覆盖的 HOME 走。此前它无视 `env.HOME`， 一次"隔离"的运行照样能读到真实 home 的凭据，两个渠道对"刚读的是哪个文件" 也会给出不同答案。 3. `tests/collect.test.mjs` 里两条只会打印 `false !== true` 的断言补上现场信息 （收据、stderr、work 目录清单）—— 这条 CI-only 失败此前从日志里根本 看不出是"没写文件"还是"写到别处去了"。 全量：无真实旧凭据时 383/385（另 2 条是本机未提交/未推送时的审计行）。 (cherry picked from commit 2551c9b6d9793188a59dd5b13c888a610c4bd686) --- src/collect/slack.mjs | 8 +++++++- tests/collect.test.mjs | 30 ++++++++++++++++++++++++++++-- tests/feishu-mcp.test.mjs | 23 +++++++++++++++++++++-- 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/collect/slack.mjs b/src/collect/slack.mjs index 51515dfd..9dd35cb8 100644 --- a/src/collect/slack.mjs +++ b/src/collect/slack.mjs @@ -88,9 +88,15 @@ export function distillyHome(env = process.env) { } export function credentialPaths(env = process.env) { + // `env.HOME ?? homedir()`, matching `kit.mjs`: the pre-rename + // `~/.colleague-skill/` fallback has to move when a caller points `HOME` + // somewhere else. Reading the real home here ignored `env.HOME` — so an isolated + // run (a test, a sandboxed collect) could still pick up the credential sitting in + // the developer's own home, and the two channels disagreed about which file they + // had just read. return { primary: join(distillyHome(env), CONFIG_FILE), - legacy: join(homedir(), LEGACY_CONFIG_FILE), + legacy: join(env?.HOME ?? homedir(), LEGACY_CONFIG_FILE), }; } diff --git a/tests/collect.test.mjs b/tests/collect.test.mjs index 1974b3cb..c8a5b1bf 100644 --- a/tests/collect.test.mjs +++ b/tests/collect.test.mjs @@ -86,6 +86,26 @@ function sandbox(name = "case") { }; } +/** + * Every file written under `dir`, relative and sorted — for failure messages. + * + * A failing "the page was not written" assertion used to say only `false !== true`, + * which is unactionable from a CI log: it cannot distinguish "nothing was written" + * from "something was written somewhere else". + */ +function written(dir) { + const out = []; + const walk = (current, prefix) => { + for (const entry of readdirSync(current, { withFileTypes: true })) { + const rel = prefix ? `${prefix}/${entry.name}` : entry.name; + if (entry.isDirectory()) walk(join(current, entry.name), rel); + else out.push(rel); + } + }; + if (existsSync(dir)) walk(dir, ""); + return out.length === 0 ? "(nothing)" : out.sort().join(", "); +} + function json(body, { status = 200, headers = {} } = {}) { return new Response(JSON.stringify(body), { status, headers }); } @@ -548,10 +568,16 @@ test("CLI success path: a fake key never reaches stdout, stderr or the receipt", assert.ok(!run.stdout.includes(SECRET.slack), "stdout leaked the credential"); assert.ok(!run.stderr.includes(SECRET.slack), "stderr leaked the credential"); const receipt = receiptOf(run.stdout); - assert.equal(receipt.ok, true); + // The messages name what was seen: a bare `false !== true` on either of these made + // a CI-only failure impossible to diagnose from the log alone. + assert.equal(receipt.ok, true, `receipt was not ok: ${JSON.stringify(receipt)}`); assert.equal(receipt.credential_file, "slack_config.json"); assert.ok(!JSON.stringify(receipt).includes(SECRET.slack)); - assert.equal(box.exists("knowledge/raw/slack/C0123-p001.json"), true); + assert.equal( + box.exists("knowledge/raw/slack/C0123-p001.json"), + true, + `the page was not written; receipt=${JSON.stringify(receipt)} stderr=${run.stderr} tree=${written(box.work)}`, + ); }); test("CLI failure path: a rejected key leaks nothing and names where to reconfigure", () => { diff --git a/tests/feishu-mcp.test.mjs b/tests/feishu-mcp.test.mjs index eff6c07e..ea4f54db 100644 --- a/tests/feishu-mcp.test.mjs +++ b/tests/feishu-mcp.test.mjs @@ -36,7 +36,22 @@ function sandbox() { const root = mkdtempSync(join(tmpdir(), "dst-mcp-")); const home = join(root, "distilly"); mkdirSync(home, { recursive: true }); - return { root, home, work: join(root, "work"), config: { app_id: "cli_x", app_secret: SECRET } }; + const config = { app_id: "cli_x", app_secret: SECRET }; + // An **isolated home with the credential written into it**, plus the env that + // points at it. Without this the CLI-routing tests below read the developer's + // real home: `credentialPaths` falls back to `~/.colleague-skill/`, this + // machine still has that pre-rename directory, and the run found a credential + // there. Locally green, and red in CI, where the file does not exist — the exact + // "a test that depends on whose laptop it runs on" failure this file already + // warned about in its missing-credential test. + writeFileSync(join(home, "feishu_config.json"), JSON.stringify(config, null, 2)); + return { + root, + home, + work: join(root, "work"), + config, + env: { DISTILLY_HOME: home, HOME: home }, + }; } /** An MCP transport that answers from a script and records every call. */ @@ -200,13 +215,17 @@ test("cli: --mode mcp routes to the MCP client and needs a target", async () => const box = sandbox(); const transport = fakeTransport({ result: [{ type: "text", text: JSON.stringify({ items: textMessages(3) }) }] }); - const result = await runCollectCli(["--mode", "mcp", "--chat-id", "oc_demo", "--person", "demo", "--base-dir", box.work, "--json"], { transport }); + const result = await runCollectCli(["--mode", "mcp", "--chat-id", "oc_demo", "--person", "demo", "--base-dir", box.work, "--json"], { + transport, + env: box.env, + }); assert.equal(result.ok, true, JSON.stringify(result.receipt)); assert.equal(transport.calls.length, 1); assert.deepEqual(transport.calls[0].args, { chat_id: "oc_demo", page_size: 50 }); const lines = []; const human = await runCollectCli(["--mode", "mcp", "--chat-id", "oc_demo", "--person", "demo", "--base-dir", box.work], { transport, + env: box.env, stdout: (line) => lines.push(line), stderr: () => {}, }); From d62966ee8b6538beb5e645332c9c8a359a416046 Mon Sep 17 00:00:00 2001 From: zhoutianyi Date: Tue, 15 Sep 2026 19:11:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(tests):=20=E4=B8=80=E6=9D=A1=E5=8F=AA?= =?UTF-8?q?=E5=9C=A8=E5=A4=A7=E5=B0=8F=E5=86=99=E4=B8=8D=E6=95=8F=E6=84=9F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B3=BB=E7=BB=9F=E4=B8=8A=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=E5=BE=84=E6=96=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI 现在给得出失败现场了，于是这条一看就清楚： the page was not written; receipt={… "path":"…/knowledge/raw/slack/c0123-p001.json" …} tree=knowledge/index.json, knowledge/raw/slack/c0123-p001.json 文件就在那里，只是名字是小写。`writeRaw` 会把名字过一遍 `slug()`，所以频道 `C0123` 落盘成 `c0123-p001.json`（收据里的 `channel_id` 仍然是 `C0123`）。断言 写的是 `C0123-p001.json`，在 macOS 上 APFS 大小写不敏感所以"通过"，在 Linux runner 上就红了 —— 又是一条"取决于在哪台机器上跑"的测试。 断言改成真实文件名，并在注释里写明为什么是小写，免得下次又被"修"回去。 (cherry picked from commit a467934e788053f72f2d8cd5f4c14bcd1520d9d6) --- tests/collect.test.mjs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/collect.test.mjs b/tests/collect.test.mjs index c8a5b1bf..7413ab61 100644 --- a/tests/collect.test.mjs +++ b/tests/collect.test.mjs @@ -574,8 +574,13 @@ test("CLI success path: a fake key never reaches stdout, stderr or the receipt", assert.equal(receipt.credential_file, "slack_config.json"); assert.ok(!JSON.stringify(receipt).includes(SECRET.slack)); assert.equal( - box.exists("knowledge/raw/slack/C0123-p001.json"), + box.exists("knowledge/raw/slack/c0123-p001.json"), true, + // The channel id is `C0123` and the **file name is slugged to `c0123`** + // (`writeRaw` runs the name through `slug()`), while the receipt keeps + // `channel_id: "C0123"`. This assertion used to read `C0123-p001.json` and + // passed on macOS only because APFS compares names case-insensitively; on the + // Linux runner it failed while the file sat right there in the listing. `the page was not written; receipt=${JSON.stringify(receipt)} stderr=${run.stderr} tree=${written(box.work)}`, ); });