Atlas Zeng
b5e8665499
* 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 保留为次要断言。
50 lines
2.5 KiB
YAML
50 lines
2.5 KiB
YAML
# dsh-better-sidebar bundle patch
|
|
#
|
|
# This file is the `dsh.bundle.patch` layer of the published npm package: when
|
|
# the plugin is installed through the official CLI —
|
|
#
|
|
# dsh plugin --profile <name> add dsh-better-sidebar@<version>
|
|
#
|
|
# — the command reconciles `dsh.profile.bundles` against installed packages
|
|
# and, seeing this declaration, appends `dsh-better-sidebar` to the bundle
|
|
# stack. The profile boot then merges THIS patch (a single `insert` of the
|
|
# plugin row) exactly like the manual cordis.patch.yml mount line used
|
|
# before. No profile file edits needed — one command installs and mounts.
|
|
#
|
|
# If the profile still carries the old manual mount line in its own
|
|
# cordis.patch.yml, remove it before switching to the bundle channel to
|
|
# avoid double-mounting (two Node halves, two sidebars).
|
|
#
|
|
# To choose the terminal shell, add `config.shell` to the inserted plugin
|
|
# row (or to the profile's manual cordis.patch.yml mount line). When omitted,
|
|
# the host keeps resolving $SHELL / the login shell / powershell.exe.
|
|
# `config.shellArgs` optionally supplies explicit startup arguments; when
|
|
# non-empty they replace the automatic POSIX `-l` login flag:
|
|
#
|
|
# - insert:
|
|
# - id: better-sidebar
|
|
# name: 'dsh-better-sidebar'
|
|
# config:
|
|
# shell: /bin/zsh
|
|
# shellArgs:
|
|
# - --noprofile
|
|
# - --no-rc
|
|
#
|
|
# Aggregate double-mount guard: aggregate bundles (e.g. @linxin666/dsh-web-ui-all)
|
|
# may already mount this package under their own entry id (e.g.
|
|
# `web-ui-better-sidebar`). Two mounts register /sidebar/api twice and fail the
|
|
# whole plugin tree at boot ("duplicate prefix route"). The `!!js` disabled
|
|
# expression backs THIS row off when another *enabled* entry already mounts
|
|
# `dsh-better-sidebar`; the aggregate instance then owns the sidebar. The
|
|
# loader evaluates it when this row is processed (entry-list order, only rows
|
|
# before this one are visible), so the aggregate bundle must precede this one
|
|
# in `dsh.profile.bundles` — the standard install order, since `dsh plugin add`
|
|
# appends new bundles last. The reverse order (this bundle before the
|
|
# aggregate) is a known limitation: the guard cannot see rows that come after
|
|
# it, and no runtime singleton guard is added. Same-id manual duplicates still
|
|
# fail loudly at the loader as before.
|
|
- insert:
|
|
- id: better-sidebar
|
|
name: 'dsh-better-sidebar'
|
|
disabled: !!js "[...ctx.loader.entries()].some((e) => e.options.name === 'dsh-better-sidebar' && e.options.id !== 'better-sidebar' && !e.disabled)"
|