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.
123 lines
4.6 KiB
TypeScript
123 lines
4.6 KiB
TypeScript
/**
|
|
* apes:* tab registration tests (Phase 1/1b, C6: 3 tabs). The fork registers
|
|
* its three information-layer tabs (agents / apps / profile) through the same
|
|
* BetterSidebarService the upstream builtins use (dogfood). `apes:tasks` was
|
|
* removed in C6 — it overlaps the official DSH session tree in the native
|
|
* sidebar. The spec pins the registration contract (id / single / order /
|
|
* component presence) and the isolated i18n contract (the apes namespace
|
|
* resolves zh vs en through the attached locale service, and every apesZh
|
|
* key has an apesEn entry).
|
|
*
|
|
* Runs in the node vitest environment like builtins.spec.ts — no DOM, no
|
|
* real DSH host (a live cordis scratch mount is Phase 2+).
|
|
*/
|
|
import { describe, expect, it } from 'vitest'
|
|
// Browser globals before the client graph loads (mirror of builtins.spec.ts).
|
|
import './browser-globals.ts'
|
|
|
|
import type { Context } from '../src/context-types.ts'
|
|
import { createBetterSidebarService } from '../src/client/service.ts'
|
|
import { createSidebarStore } from '../src/client/state.ts'
|
|
import { registerApesTabs } from '../src/client/apes/index.ts'
|
|
import { apesZh, apesEn, attachApesLocale, t, type ApesCopyKey } from '../src/client/apes/locales.ts'
|
|
|
|
function setup(): {
|
|
service: ReturnType<typeof createBetterSidebarService>
|
|
store: ReturnType<typeof createSidebarStore>
|
|
dispose: () => void
|
|
} {
|
|
const store = createSidebarStore()
|
|
const service = createBetterSidebarService(store)
|
|
const dispose = registerApesTabs({} as Context, service)
|
|
return { service, store, dispose }
|
|
}
|
|
|
|
describe('apes:* tab registrations', () => {
|
|
it('registers the 3 apes tabs with the apes: namespace', () => {
|
|
const { service, dispose } = setup()
|
|
try {
|
|
expect(service.getTabs().map(t => t.id).sort()).toEqual(
|
|
['apes:agents', 'apes:apps', 'apes:profile'],
|
|
)
|
|
} finally {
|
|
dispose()
|
|
}
|
|
})
|
|
|
|
it('every apes tab is single-instance, visible, and component-carrying', () => {
|
|
const { service, dispose } = setup()
|
|
try {
|
|
for (const id of ['apes:agents', 'apes:apps', 'apes:profile']) {
|
|
const tab = service.getTab(id)
|
|
expect(tab, `${id} registered`).toBeDefined()
|
|
expect(tab?.single, `${id} single`).toBe(true)
|
|
expect(tab?.hidden, `${id} hidden`).not.toBe(true)
|
|
expect(tab?.component, `${id} component`).toBeDefined()
|
|
expect(tab?.icon, `${id} icon`).toBeDefined()
|
|
}
|
|
} finally {
|
|
dispose()
|
|
}
|
|
})
|
|
|
|
it('apes tabs sort after the upstream builtins (order 40+)', () => {
|
|
const { service, dispose } = setup()
|
|
try {
|
|
const orders = {
|
|
agents: service.getTab('apes:agents')?.order,
|
|
apps: service.getTab('apes:apps')?.order,
|
|
profile: service.getTab('apes:profile')?.order,
|
|
}
|
|
// C8: order 40-50 places apes tabs immediately after the native builtins
|
|
// (10-35), not in a far-away 900+ band — visual unity in the tab strip.
|
|
expect(orders.agents).toBeGreaterThanOrEqual(40)
|
|
expect(orders.apps).toBeGreaterThanOrEqual(40)
|
|
expect(orders.profile).toBeGreaterThanOrEqual(40)
|
|
// Strictly ordered: agents < apps < profile.
|
|
expect(orders.agents!).toBeLessThan(orders.apps!)
|
|
expect(orders.apps!).toBeLessThan(orders.profile!)
|
|
} finally {
|
|
dispose()
|
|
}
|
|
})
|
|
|
|
it('the disposer unregisters all apes tabs (HMR-safe)', () => {
|
|
const store = createSidebarStore()
|
|
const service = createBetterSidebarService(store)
|
|
const dispose = registerApesTabs({} as Context, service)
|
|
expect(service.getTabs()).toHaveLength(3)
|
|
dispose()
|
|
expect(service.getTabs()).toHaveLength(0)
|
|
})
|
|
})
|
|
|
|
describe('apes i18n contract', () => {
|
|
it('every apesZh key has an apesEn entry (no missing translations)', () => {
|
|
const zhKeys = Object.keys(apesZh) as ApesCopyKey[]
|
|
for (const key of zhKeys) {
|
|
expect(apesEn[key], `en entry for ${key}`).toBeDefined()
|
|
expect(typeof apesEn[key]).toBe('string')
|
|
expect((apesEn[key] ?? '').length).toBeGreaterThan(0)
|
|
}
|
|
})
|
|
|
|
it('resolves zh when the DSH preference is zh', () => {
|
|
attachApesLocale({ getSnapshot: () => ({ active: 'zh-CN' }) })
|
|
expect(t('apesAgentsTitle')).toBe('智能体')
|
|
expect(t('apesAppsTitle')).toBe('应用')
|
|
expect(t('apesProfileTitle')).toBe('画像')
|
|
})
|
|
|
|
it('resolves en when the DSH preference is en', () => {
|
|
attachApesLocale({ getSnapshot: () => ({ active: 'en' }) })
|
|
expect(t('apesAgentsTitle')).toBe('Agents')
|
|
expect(t('apesAppsTitle')).toBe('Apps')
|
|
expect(t('apesProfileTitle')).toBe('Profile')
|
|
})
|
|
|
|
it('falls back to zh when no locale service is attached', () => {
|
|
attachApesLocale(undefined)
|
|
expect(t('apesAgentsTitle')).toBe('智能体')
|
|
})
|
|
})
|