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.
50 lines
2.5 KiB
YAML
50 lines
2.5 KiB
YAML
# dsh-apes-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-apes-sidebar@<version>
|
|
#
|
|
# — the command reconciles `dsh.profile.bundles` against installed packages
|
|
# and, seeing this declaration, appends `dsh-apes-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-apes-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-apes-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-apes-sidebar'
|
|
disabled: !!js "[...ctx.loader.entries()].some((e) => e.options.name === 'dsh-apes-sidebar' && e.options.id !== 'better-sidebar' && !e.disabled)"
|