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.
142 lines
7.1 KiB
CSS
142 lines
7.1 KiB
CSS
/**
|
|
* Layout push: the bottom workbench occupies layout instead of floating over
|
|
* the conversation. The right column belongs to DSH's native Sidebar, so this
|
|
* stylesheet pushes no width — only the workbench's height.
|
|
*
|
|
* The workbench squeezes only the conversation column. The anchor is the
|
|
* [data-dsh-center-col] tag the Sidebar shell's locator writes on the
|
|
* frame's measured center grid item (Sidebar.tsx locate — not a positional
|
|
* path: the frame also contains an overlay layer and drag handles). A
|
|
* stretched grid item shrinks by its bottom margin, so the conversation
|
|
* output and composer lift without touching either sidebar.
|
|
*
|
|
* The size rides a CSS variable updated by the Sidebar shell (0 while
|
|
* collapsed). Expand/collapse uses the host theme duration; drags disable
|
|
* transitions so the reserved edge tracks the pointer.
|
|
*/
|
|
/* The AppFrame's center column. The Sidebar shell's locator (Sidebar.tsx
|
|
locate/measureCenter, resolving via center-column.ts) tags the measured
|
|
column node with [data-dsh-center-col] — one attribute write per node
|
|
lifetime. The locator anchors on the conversation slot host
|
|
(`main.conversation` on DSH 0.1.5-alpha.2+, `conversation` on alpha.1)
|
|
and skips the transparent display:contents slot hosts above it. The rule
|
|
used to anchor on a structural has()-selector over the conversation slot
|
|
wrapper, whose match cache invalidates on every #root subtree mutation
|
|
(the streaming chat mutates it constantly), re-evaluating the selector
|
|
against the whole document; the tag is evaluated once per node instead.
|
|
A stretched grid item shrinks by its margins, so the conversation
|
|
content (output + input bar) lifts without touching the sidebars. */
|
|
#root [data-dsh-center-col] {
|
|
margin-bottom: var(--dsh-sidebar-height, 0px);
|
|
/* Grid/flex items default to min-height:auto. A long unbreakable token
|
|
(OAuth URL) then grows this column past the viewport and clips the
|
|
composer + left-rail Settings row. min-height:0 lets the cell shrink;
|
|
overflow-wrap lets the token wrap instead of forcing its intrinsic
|
|
size. The host's own descendants remain responsible for scrolling. */
|
|
min-height: 0;
|
|
overflow-wrap: anywhere;
|
|
transition: margin-bottom var(--ds-transition-duration-slow) var(--ds-ease-in-out);
|
|
}
|
|
|
|
/* When the sidebar is collapsed, the toggle cluster reclaims the top-right
|
|
corner. Push the DSH session header's right padding out so its right-aligned
|
|
utilities (the "Session log" download capsule) yield the corner instead of
|
|
hiding under the cluster. The header default right-pads 28px; the 2-button
|
|
cluster spans right 10→70px, so 78px clears it with an 8px gap. Anchor on
|
|
the header's slot host wrapper ([data-slot="conversation.session.header"])
|
|
rather than a positional path: DSH 0.1.x nests the header several levels
|
|
under the center column. The Sidebar shell toggles the body attribute with
|
|
the panel open state. */
|
|
body[data-dsh-sidebar-collapsed] [data-slot="conversation.session.header"] > header {
|
|
padding-right: 78px;
|
|
}
|
|
|
|
body[data-dsh-sidebar-dragging] #root [data-dsh-center-col] {
|
|
transition: none;
|
|
}
|
|
|
|
/* DSH 0.1.x gives external settings sections a generic gear and exposes no
|
|
icon field in the settings.section contract. settings-nav-icon.ts marks
|
|
only this plugin's localized row; render the requested Lucide
|
|
gallery-horizontal-end SVG as a currentColor mask so it follows the native
|
|
nav hover/active colors without changing the shell's 16px icon rhythm. */
|
|
[data-dsh-apes-sidebar-settings-nav] > svg:first-child {
|
|
display: none;
|
|
}
|
|
|
|
[data-dsh-apes-sidebar-settings-nav]::before {
|
|
content: '';
|
|
flex: none;
|
|
width: 16px;
|
|
height: 16px;
|
|
background: currentColor;
|
|
-webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2 7v10'/%3E%3Cpath d='M6 5v14'/%3E%3Crect width='12' height='18' x='10' y='3' rx='2'/%3E%3C/svg%3E") center / contain no-repeat;
|
|
mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2 7v10'/%3E%3Cpath d='M6 5v14'/%3E%3Crect width='12' height='18' x='10' y='3' rx='2'/%3E%3C/svg%3E") center / contain no-repeat;
|
|
}
|
|
|
|
@media (prefers-reduced-motion: reduce) {
|
|
#root [data-dsh-center-col] {
|
|
transition: none;
|
|
}
|
|
}
|
|
|
|
/* Context-menu submenu flip (viewport clamping for the portaled menus).
|
|
*
|
|
* The ui-primitives Menu clamps its main portal list into the viewport but
|
|
* positions nested submenus with static CSS only — anchored at the parent
|
|
* row's bottom, growing UP and to the RIGHT — with no clamp whatsoever.
|
|
* Both defaults are the worst case for our menus: a tall "open with" submenu
|
|
* escapes past the viewport top when the row menu opens near the top, and
|
|
* past the right edge in a narrow workbench pane (a pane can be far narrower
|
|
* than the card 218 + gap + submenu 165 a submenu needs).
|
|
*
|
|
* menu-flip.ts publishes `data-dsh-sidebar-submenu` on <body> — with the
|
|
* words "down" and/or "left" — for exactly the lifetime of one of OUR
|
|
* submenu-bearing menus (FileTree row menu, TabBar tab menu). The tokens
|
|
* flip the growth direction; the attribute's absence restores the
|
|
* primitive's own geometry untouched, and host-owned menus are never
|
|
* affected because they never open while the attribute exists (each side
|
|
* closes on the other's outside pointerdown).
|
|
*
|
|
* No max-height/overflow scroll cap here on purpose: overflow clipping
|
|
* would cut the submenu's ::before hover bridge (the corridor that keeps
|
|
* itemWrap's mouseleave from closing the card mid-crossing). */
|
|
|
|
/* Visual tether, part 1 — the parent row stays lit while its submenu is
|
|
* open. The primitive only styles :hover, so once the pointer crossed into
|
|
* the side card the parent row's fill cleared and the floating card read as
|
|
* unrelated. The Menu marks the open parent row with aria-expanded="true"
|
|
* (host-rendered, stable), so the same hover token re-applies for the
|
|
* submenu's whole lifetime. */
|
|
body[data-dsh-sidebar-submenu] div[role="menu"] button[aria-expanded="true"] {
|
|
background: var(--dsw-alias-interactive-bg-hover);
|
|
}
|
|
|
|
/* Visual tether, part 2 — the side card hugs its parent (10px → 4px gap),
|
|
* with the ::before hover corridor narrowed to match. Ordered BEFORE the
|
|
* flip overrides below so their left/right flips still win. */
|
|
body[data-dsh-sidebar-submenu] div[role="menu"] div[role="menu"] {
|
|
left: calc(100% + 4px);
|
|
}
|
|
|
|
body[data-dsh-sidebar-submenu] div[role="menu"] div[role="menu"]::before {
|
|
left: -4px;
|
|
width: 4px;
|
|
}
|
|
|
|
body[data-dsh-sidebar-submenu~="down"] div[role="menu"] div[role="menu"] {
|
|
top: -4px;
|
|
bottom: auto;
|
|
}
|
|
|
|
body[data-dsh-sidebar-submenu~="left"] div[role="menu"] div[role="menu"] {
|
|
left: auto;
|
|
right: calc(100% + 4px);
|
|
}
|
|
|
|
/* The hover bridge follows the card to the left side of the parent row. */
|
|
body[data-dsh-sidebar-submenu~="left"] div[role="menu"] div[role="menu"]::before {
|
|
left: auto;
|
|
right: -4px;
|
|
}
|