* fix(bundle): 聚合双挂载自动退让 —— 已有同包名启用挂载时不再挂自己
@linxin666/dsh-web-ui-all 等聚合包以独立条目 id(web-ui-better-sidebar)
挂载 dsh-better-sidebar 时,插件自身 bundle patch 的 better-sidebar 行会
与之双挂载:两个实例都注册 /sidebar/api,第二个抛 duplicate prefix route,
整个插件树启动失败。
better-sidebar 行的 disabled 改为 !!js 表达式:loader 按 entry-list 顺序
处理本行时,若已存在其他启用中的同包名挂载(排除自身 id),本行自动
disabled,由聚合行接管 sidebar。顺序假设(聚合 bundle 先于本包)写入注释。
- cordis.patch.yml:守卫表达式 + 说明注释
- README:常见问题「两个侧边栏」更新为自动退让说明
- scripts/e2e-aggregate-mount.sh:聚合双挂载真实挂载回归(scratch profile
聚合先行 + 插件后到 → boot 无 duplicate、/sidebar/api 存活)
- tests/fixtures/aggregate-better-sidebar:最小聚合 fixture
* ci(plugin-mount): 增加聚合双挂载回归 step
复用已装好的钉住版 DSH CLI 与已 pack 的 tarball,跑
scripts/e2e-aggregate-mount.sh(fixture 聚合先行 → 插件 bundle 行必须
自动退让,boot 无 duplicate prefix route)。
* fix(review): 双轴审查反馈——双语 README、注释补全、脚本健壮性
- README_EN.md:FAQ「两个侧边栏」行同步自动退让说明(双语惯例)
- cordis.patch.yml:注释补上计划要求的「反向顺序为已知限制,
不引入运行时单例守卫」一句
- scripts/e2e-aggregate-mount.sh:TMP_DIR 纳入 trap 清理;FIXTURE_TGZ
glob 加 2>/dev/null || true 让 die 路径生效; 花括号显式化
(LANG=UTF-8 下 bash 会把紧跟的全角字符吞进变量名,实测复现)
- tests/fixtures/aggregate-better-sidebar/package.json:补 "type": "module"
与 lib/index.js 的 ESM 一致
* fix(e2e): 保护调用方提供的 DSH_HOME_BASE——只删除本调用拥有的子目录
chatgpt-codex-connector P2:当 DSH_HOME_BASE 指向已存在的目录(如开发者
真实 ~/.dsh)时,脚本会把 scratch profile 写进去并在退出时 rm -rf 整个
根目录。现在脚本始终在根目录下新建本调用拥有的独立子目录
(DSH_HOME_BASE/dsh-e2e-*.XXXXXX),只写入/删除该子目录;调用方提供的
目录本身绝不触碰。缺省路径仍用系统临时目录。
- scripts/e2e-aggregate-mount.sh:SCRATCH 子目录化 + 清理逻辑
- scripts/e2e-mount.sh:同款存量问题一并修复(bot 只审了 diff 内脚本)
* test(e2e): 用真实 API 方法探活——terminal.deps 需返回 ok:true
chatgpt-codex-connector P2:generic missing-route 404 无法证明 sidebar
路由真的注册了。新增对插件自身 handler /sidebar/api/terminal.deps 的
POST 探活,要求 HTTP 200 + {"ok":true};未知方法 404 保留为次要断言。
115 lines
4.0 KiB
YAML
115 lines
4.0 KiB
YAML
name: CI
|
|
|
|
on:
|
|
push:
|
|
branches: [main]
|
|
pull_request:
|
|
workflow_dispatch:
|
|
|
|
# Cancel a superseded PR run (it is on a stale commit); never cancel a
|
|
# push run — it is already producing the post-merge signal. The mount job
|
|
# boots a real DSH + Chromium, so the savings matter there most.
|
|
concurrency:
|
|
group: ${{ github.workflow }}-${{ github.ref }}
|
|
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
|
|
|
|
jobs:
|
|
ci:
|
|
runs-on: ubuntu-latest
|
|
timeout-minutes: 20
|
|
steps:
|
|
- uses: actions/checkout@v7
|
|
with:
|
|
# Tests run git log against this repository and need the full history.
|
|
fetch-depth: 0
|
|
- uses: pnpm/action-setup@v6
|
|
with:
|
|
version: 11
|
|
- uses: actions/setup-node@v7
|
|
with:
|
|
node-version: 22
|
|
cache: pnpm
|
|
# The plugin's git revert/cherry-pick spawn git without setting an
|
|
# identity (deliberate, see tests/smoke.spec.ts) and rely on ambient
|
|
# config; the runner has none by default.
|
|
- name: Configure git identity for tests
|
|
run: |
|
|
git config --global user.name "dsh-better-sidebar-ci"
|
|
git config --global user.email "ci@dsh.invalid"
|
|
- name: Install dependencies
|
|
run: pnpm install --frozen-lockfile
|
|
- name: Typecheck
|
|
run: pnpm typecheck
|
|
- name: Test
|
|
run: pnpm test
|
|
- name: Build
|
|
run: pnpm build
|
|
# The consumer-facing declaration surface guard: a browser-only plugin
|
|
# (no @types/node, skipLibCheck: false) must type-check against the
|
|
# shipped lib/types. Runs AFTER build (it reads the built output).
|
|
- name: Check consumer type surface
|
|
run: pnpm check:consumer-types
|
|
|
|
# Pack the plugin as an npm tarball, mount it into a REAL DSH instance
|
|
# through the official `dsh plugin --profile web add` channel, and render
|
|
# the DSH web UI headlessly (Playwright Chromium) to prove the plugin
|
|
# mounts without crashing the shell. Drives `pnpm test:mount`, which boots
|
|
# a keyless `dsh web` against a scratch profile and sweeps every built-in
|
|
# sidebar tab. No API key needed — the whole lane is deterministic.
|
|
plugin-mount:
|
|
runs-on: ubuntu-latest
|
|
timeout-minutes: 30
|
|
# CI runs must never report to the production telemetry endpoint baked
|
|
# into the DSH composition (same guard DSH's own CI uses).
|
|
env:
|
|
DSH_TELEMETRY_DISABLED: '1'
|
|
steps:
|
|
- uses: actions/checkout@v7
|
|
|
|
- uses: pnpm/action-setup@v6
|
|
with:
|
|
version: 11
|
|
|
|
- uses: actions/setup-node@v7
|
|
with:
|
|
node-version: 22
|
|
cache: pnpm
|
|
|
|
- name: Install dependencies
|
|
run: pnpm install --frozen-lockfile
|
|
|
|
# Pin the DSH CLI the lane mounts into; the profile's bundle stack
|
|
# (dsh-base / dsh-web-app) resolves from this installation. Keep in
|
|
# step with the plugin's @deepseek-ai/* peer range when bumping.
|
|
- name: Install dsh CLI (pinned)
|
|
run: npm install -g @deepseek-ai/dsh@0.1.0-rc.6
|
|
|
|
# lib/ is gitignored; the tarball is produced from this build.
|
|
- name: Build and pack the npm tarball
|
|
run: pnpm build && pnpm pack
|
|
|
|
- name: Install Playwright Chromium
|
|
run: pnpm exec playwright install --with-deps chromium
|
|
|
|
- name: Mount + headless-render smoke
|
|
run: pnpm test:mount
|
|
|
|
# Aggregate double-mount regression: a fixture aggregate bundle mounts
|
|
# dsh-better-sidebar under its own entry id BEFORE the plugin's bundle
|
|
# row; the plugin must back off (no duplicate /sidebar/api, boot OK).
|
|
# Uses the pinned DSH CLI installed above.
|
|
- name: Aggregate double-mount regression
|
|
env:
|
|
DSH_CMD: dsh
|
|
run: bash scripts/e2e-aggregate-mount.sh
|
|
|
|
- name: Upload Playwright report on failure
|
|
if: failure()
|
|
uses: actions/upload-artifact@v4
|
|
with:
|
|
name: playwright-report
|
|
path: |
|
|
playwright-report/
|
|
test-results/
|
|
if-no-files-found: ignore
|