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.
164 lines
5.8 KiB
TypeScript
164 lines
5.8 KiB
TypeScript
/**
|
|
* Consumer-facing type surface compile gate (v0.12.0+): this file exercises
|
|
* EVERY public type and descriptor field exactly the way an external plugin
|
|
* would, so `pnpm typecheck` fails the moment the shipped declaration
|
|
* surface (service.ts re-exports / descriptor fields / service methods)
|
|
* drifts from what consumers can name. Type-only — erased at runtime, never
|
|
* executed by vitest (no `*.spec` suffix).
|
|
*
|
|
* Mirrors the "external consumer" fixture: what is importable here from
|
|
* `../src/client/service.ts` must also be importable from
|
|
* `dsh-apes-sidebar/client/service` in the built package.
|
|
*/
|
|
import type {} from '../src/client/service.ts'
|
|
import {
|
|
FOLDER_EXT,
|
|
FOLDER_OPEN_EXT,
|
|
SIDEBAR_FEATURES,
|
|
SIDEBAR_SERVICE_VERSION,
|
|
} from '../src/client/service.ts'
|
|
import type {
|
|
BetterSidebarService,
|
|
FileFetchStrategy,
|
|
FileIconDescriptor,
|
|
FileViewerDescriptor,
|
|
FileViewerProps,
|
|
OpenTabSeed,
|
|
SidebarSettingsDeclaration,
|
|
SidebarSettingsRenderProps,
|
|
SidebarSettingToggle,
|
|
SidebarSettingToggleType,
|
|
TabComponentProps,
|
|
TabDescriptor,
|
|
} from '../src/client/service.ts'
|
|
import type {
|
|
SessionScope,
|
|
SidebarDiffRef,
|
|
SidebarPrefs,
|
|
SidebarSnapshot,
|
|
SidebarState,
|
|
SidebarStore,
|
|
SidebarTab,
|
|
TabType,
|
|
} from '../src/client/service.ts'
|
|
|
|
/** A full-featured external tab descriptor using every v0.12.0 field. */
|
|
const tab: TabDescriptor = {
|
|
id: 'my-plugin:db',
|
|
title: () => 'Database',
|
|
icon: (_size: number) => null,
|
|
order: 50,
|
|
hidden: false,
|
|
available: (ctx, scope, state) => scope.sessionId !== '' && state.bottomOpen && ctx !== null,
|
|
single: false,
|
|
dedupeKey: (t: SidebarTab) => t.id,
|
|
createTab: (state: SidebarState) => ({
|
|
tab: { id: `my-plugin:db:${state.nextTerminal}`, type: 'my-plugin:db', title: 'DB', meta: { n: state.nextTerminal } },
|
|
patch: { nextTerminal: state.nextTerminal + 1 },
|
|
}),
|
|
badge: (ctx, scope, state) => (state.expanded.length > 0 ? state.expanded.length : null),
|
|
onOpen: (tab: SidebarTab, scope: SessionScope) => { void tab; void scope },
|
|
onActivate: (tab: SidebarTab, scope: SessionScope) => { void tab; void scope },
|
|
onClose: (tab: SidebarTab, scope: SessionScope) => { void tab; void scope },
|
|
settings: {
|
|
toggles: [{ key: 'autoOpenSubagent', title: 'Auto-open', type: 'switch' }],
|
|
pluginToggles: [{
|
|
key: 'pageSize',
|
|
title: 'Page size',
|
|
type: 'number',
|
|
min: 1,
|
|
max: 100,
|
|
unit: 'rows',
|
|
}],
|
|
render: (props: SidebarSettingsRenderProps) => {
|
|
props.updatePluginSetting('refresh', true)
|
|
props.close()
|
|
return null
|
|
},
|
|
},
|
|
component: (props: TabComponentProps) => {
|
|
const { ctx, store, scope, tab, visible } = props
|
|
void ctx; void store; void scope; void tab; void visible
|
|
return null
|
|
},
|
|
}
|
|
|
|
/** A full-featured external viewer using the v0.12.0 load signal. */
|
|
const viewer: FileViewerDescriptor = {
|
|
id: 'my-plugin:csv',
|
|
title: 'CSV',
|
|
exts: ['csv'],
|
|
priority: 10,
|
|
fetchStrategy: 'custom',
|
|
detect: (_path, head: Uint8Array) => head.length > 0,
|
|
load: async (path: string, scope: SessionScope, signal?: AbortSignal) => {
|
|
void path; void scope; void signal
|
|
return { rows: [] }
|
|
},
|
|
settings: { pluginToggles: [{ key: 'delimiter', title: 'Delimiter', type: 'text', placeholder: ',' }] },
|
|
component: (props: FileViewerProps) => {
|
|
const { customData, content, truncated, mediaUrl, viewerId, path, title } = props
|
|
void customData; void content; void truncated; void mediaUrl; void viewerId; void path; void title
|
|
return null
|
|
},
|
|
}
|
|
|
|
/** The full service surface, exercised exactly as consumers call it. */
|
|
declare const ctx: { betterSidebar: BetterSidebarService }
|
|
const service: BetterSidebarService = ctx.betterSidebar
|
|
service.registerTab(tab)
|
|
service.registerFileViewer(viewer)
|
|
service.getTabs()
|
|
service.getFileViewers()
|
|
service.getTab('my-plugin:db')
|
|
service.isTabEnabled('my-plugin:db')
|
|
service.isViewerEnabled('my-plugin:csv')
|
|
service.matchFileViewer('a.csv', new Uint8Array([1]))
|
|
service.closeTab('tab:1')
|
|
service.subscribe(() => {})
|
|
const seed: OpenTabSeed = { type: 'my-plugin:db', title: 'DB', path: '/p', id: 'x', meta: { a: 1 } }
|
|
service.openTab(seed)
|
|
service.openTab(seed, { sessionId: 's1', cwd: '/p' })
|
|
const _version: string = service.version
|
|
service.features.includes('badge')
|
|
const snapshot: SidebarSnapshot | undefined = service.getSnapshot()
|
|
void snapshot
|
|
service.subscribeState(() => {})
|
|
service.updateTab('tab:1', { title: 'T', path: '/p', meta: 1 })
|
|
service.activateTab('tab:1')
|
|
service.openFile({ sessionId: 's1', cwd: '/p' }, '/p/a.csv', 'Data')
|
|
|
|
/** File-icon registration surface (feature `fileIcons`). */
|
|
const icon: FileIconDescriptor = {
|
|
id: 'my-plugin:icons',
|
|
exts: ['csv', FOLDER_EXT, FOLDER_OPEN_EXT],
|
|
names: ['package.json'],
|
|
folderNames: ['node_modules'],
|
|
priority: 5,
|
|
icon: (path: string, size: number, open?: boolean) => {
|
|
void path; void size; void open
|
|
return null
|
|
},
|
|
}
|
|
service.registerFileIcon(icon)
|
|
service.getFileIcons()
|
|
service.matchFileIcon('/p/a.csv')
|
|
service.matchFolderIcon(true)
|
|
service.matchFolderIcon(true, 'node_modules')
|
|
service.fileIcon('/p/a.csv', 14)
|
|
service.folderIcon('/p', true, 14)
|
|
|
|
/** Named state vocabulary stays importable (the pre-0.12 gap). */
|
|
const diff: SidebarDiffRef = { kind: 'worktree', path: '/p/a.ts', staged: false }
|
|
const prefs: SidebarPrefs = { ...({} as SidebarPrefs) }
|
|
const store: SidebarStore = null as unknown as SidebarStore
|
|
const toggleType: SidebarSettingToggleType = 'number'
|
|
const toggle: SidebarSettingToggle = { key: 'k', title: 'K', type: toggleType }
|
|
const declaration: SidebarSettingsDeclaration = { toggles: [toggle], pluginToggles: [toggle] }
|
|
const typeName: TabType = 'my-plugin:db'
|
|
const version: string = SIDEBAR_SERVICE_VERSION
|
|
const features: readonly string[] = SIDEBAR_FEATURES
|
|
void version; void features
|
|
const strategy: FileFetchStrategy = 'mediaUrl'
|
|
void diff; void prefs; void store; void declaration; void typeName; void strategy
|