figmar
5a7e2139a0
The fork was pinned at upstream v0.18.0. That is the entire reason the window
ran TWO sidebars and TWO near-identical panel toggles: DSH 2.0.10 ships its own
right sidebar (@deepseek-ai/dsh-client-ui-sidebar-right), and upstream only
adopted it in v0.19.0-alpha.1 — which arrived after our fork point. v0.19.1 is
also the one upstream line whose support range actually matches our host
(engines.dsh >=0.1.5-rc.1, 14 DSH peers ^0.1.5-rc.1, host = 0.1.5-rc.2), so it
is the only tag the host's startup precheck accepts.
What upstream v0.18.0 → v0.19.1 brings
- src/client/native/{index,surface,tab-adapter}.tsx: every tab the plugin can
draw becomes an OFFICIAL native tab type + body, and an external plugin's
descriptor registered later gets its native type too. This is what retires
the fork's own right panel — and with it the duplicate toggle cluster
(`toggleCluster` is gone from v0.19.1).
- native tab-chip icons via the `sidebar.right.pane.tab.title` seat, coloured
built-in tab icons, file/folder glyphs from DSH's own `FileTypeIcon`.
- guide descriptions (DSH renders them while the guide lists <= 4 entries),
tab bodies that fill the panel, and the 0.1.5-rc.2 adaptation work we were
carrying by hand (peer/devDep pinning, primitives' transitive devDeps).
How the sync was done
Rebuilt the tree from the v0.19.1 tag rather than resolving 53 conflicted
files: our v0.18.0 delta was measured first and is only (a) one mechanical
rename `dsh-better-sidebar` -> `dsh-apes-sidebar` and (b) ten real edits. So:
tag tree + rename (scoped: code/config/scripts/tests/README, while the 46
historical docs/plans records and switch.sh's upstream package name stay
untouched) + re-applied deltas + our apes module.
Fork deltas re-applied on the new base
- src/client/apes/ (icons / locales / tabs): the three apes:* information-layer
tabs (agents / apps / profile), registered through the same BetterSidebarService
as the builtins — which is exactly why they now ride upstream's native adapter
into the official sidebar for free.
- identity: package.json (name/version 1.2.0/description/forkedFrom), dsh.plugin.json
(id/version), SIDEBAR_SERVICE_VERSION 1.2.0, README fork notice,
docs/external-plugin-guide.md.
- scripts/switch.sh + the pnpm switch* scripts (apes <-> upstream two-line switch).
- tests/apes-tabs.spec.ts (unescaped: it starts from the v0.19.1 base).
Dropped
- the Phase A native-registration spike (`apes/native-tabs.tsx` + its spec): it
re-derived by hand exactly what upstream's native layer already does — the
hand-written bridge is dead weight now, and v0.19.1's own e2e/jsdom lanes
cover the same seat contract far better.
- the unused apesProfileGuideDesc key and the two package.json.bak.* backups.
Verified on the new base: typecheck clean; build clean; 1351 passed / 9 skipped
(128 files), up from 1255 on the old base.
45 lines
1.7 KiB
Makefile
45 lines
1.7 KiB
Makefile
# dsh-apes-sidebar 命令面薄封装：目标仅转发 package.json scripts（唯一事实源），
|
||
# 新增/改名 script 不需要动这里；本文件只补目标发现（help）与 CI 门禁聚合
|
||
# （check / mount / mount-aggregate / registry）。
|
||
|
||
.DEFAULT_GOAL := help
|
||
|
||
help: ## 列出所有可用目标
|
||
@awk -F':.*## ' '/^[a-zA-Z0-9_-]+:.*## / {printf " \033[36m%-18s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
|
||
|
||
install: ## 安装依赖（pnpm install）
|
||
pnpm install
|
||
|
||
build: ## 构建（清 lib/ → tsc → tsdown）
|
||
pnpm build
|
||
|
||
typecheck: ## 类型检查（tsc --noEmit）
|
||
pnpm typecheck
|
||
|
||
lint: ## 代码检查（eslint .，flat config 最小规则集）
|
||
pnpm lint
|
||
|
||
test: ## 单元测试（vitest run）
|
||
pnpm test
|
||
|
||
check: ## 聚合校验门禁：typecheck → lint → build → test → check:consumer-types（对齐 CI）
|
||
pnpm typecheck && pnpm lint && pnpm build && pnpm test && pnpm check:consumer-types
|
||
|
||
clean: ## 清理构建产物与测试报告（lib/、*.tgz、playwright-report/、test-results/）
|
||
rm -rf lib playwright-report test-results
|
||
rm -f *.tgz
|
||
|
||
pack: ## 打 npm tarball（pnpm pack）
|
||
pnpm pack
|
||
|
||
mount: ## 真机挂载冒烟：build + pack → Playwright Chromium → pnpm test:mount
|
||
pnpm build && pnpm pack && pnpm exec playwright install chromium && pnpm test:mount
|
||
|
||
mount-aggregate: ## 聚合双挂载回归：build + pack → pnpm test:mount:aggregate
|
||
pnpm build && pnpm pack && pnpm test:mount:aggregate
|
||
|
||
registry: ## 组装 plugin-registry 暂存（registry/，不入库）：build → node scripts/package-registry.mjs
|
||
pnpm build && node scripts/package-registry.mjs
|
||
|
||
.PHONY: help install build typecheck lint test check clean pack mount mount-aggregate registry
|