A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.
Keep menu keyboard navigation off embedded controls
Fei2411f6e47afb92d5
diff --git a/ds-bot/client.js b/ds-bot/client.jsindex 9c417769..06bc894b 100644--- a/ds-bot/client.js+++ b/ds-bot/client.js@@ -2535,13 +2535,15 @@ function useLinger(value, ms) {}, [value]);return [value || kept, !value && Boolean(kept)];}-function stepMenuFocus(menu, event) {+function stepMenuFocus(menu, event, trigger) {if (!menu || !["ArrowDown", "ArrowUp", "Home", "End"].includes(event.key)) return false;const items = Array.from(menu.querySelectorAll('button[role^="menuitem"]:not(:disabled)'));if (items.length === 0) return false;+ const target = document.activeElement;+ const current = items.indexOf(target);+ if (current === -1 && target !== menu && target !== trigger) return false;event.preventDefault();event.stopPropagation();- const current = items.indexOf(document.activeElement);const next = event.key === "Home" ? 0 : event.key === "End" ? items.length - 1 : event.key === "ArrowDown" ? (current + 1) % items.length : current <= 0 ? items.length - 1 : current - 1;items[next]?.focus();return true;@@ -10200,6 +10202,7 @@ function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus,wide && approval && !active ? (0, import_react21.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react21.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : !wide && !active && (approval || unread) ? (0, import_react21.createElement)("span", { className: `bt-dot${approval ? " bt-dot-wait" : ""}`, "aria-hidden": true }) : null);}+var agentSessionTitle = (session) => session.title === "" ? t("New session") : session.title;function AgentSessionRow({ session, agent, actions, renaming, index }) {const input = (0, import_react21.useRef)(null);(0, import_react21.useLayoutEffect)(() => {@@ -10253,7 +10256,7 @@ function AgentSessionRow({ session, agent, actions, renaming, index }) {actions.openMenu({ kind: "agent-session", id: session.id, agentId: agent.id, x: event.clientX, y: event.clientY });}},- (0, import_react21.createElement)("span", { className: "bt-agent-sub-title" }, session.title),+ (0, import_react21.createElement)("span", { className: "bt-agent-sub-title" }, agentSessionTitle(session)),(0, import_react21.createElement)("span", { className: "bt-agent-sub-time" }, session.at > 0 ? relativeShort(session.at) : ""));}@@ -10279,8 +10282,7 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide,return JSON.parse(info).map((session) => ({...session,running: statuses[session.id]?.running ?? session.running,- unread: statuses[session.id]?.unread ?? false,- title: session.title === "" ? t("New session") : session.title+ unread: statuses[session.id]?.unread ?? false}));}, [info, statusInfo]);const renaming = useUi((value) => value.renameAgent);@@ -10288,7 +10290,7 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide,const running = sessions.some((session) => session.running);const unread = sessions.some((session) => session.unread) || marked && !active;useMarkedUnread(agent.id, active, marked, actions);- const preview = sessions[0]?.title ?? t("New session");+ const preview = sessions[0] === void 0 ? t("New session") : agentSessionTitle(sessions[0]);const label = ["DSH Agent", running ? t("Working") : "", unread ? t("Unread activity") : ""].filter(Boolean).join(", ");const open = active && wide;return (0, import_react21.createElement)(@@ -10895,7 +10897,7 @@ function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboardisetOpen(false);};const onKey = (event) => {- if (stepMenuFocus(menuRef.current, event)) return;+ if (stepMenuFocus(menuRef.current, event, button.current)) return;if (event.key === "Escape") {event.stopPropagation();setOpen(false);@@ -11642,7 +11644,7 @@ function ComposerPlus({ sessionId, inputActions, useInput, useRoster, actions })if (![button.current, menu.current].some((node) => node?.contains(event.target))) setOpen(null);};const onKey = (event) => {- if (stepMenuFocus(menu.current, event)) return;+ if (stepMenuFocus(menu.current, event, button.current)) return;if (event.key === "Escape") {event.stopPropagation();setOpen(null);@@ -12649,7 +12651,7 @@ function useAnchoredMenu() {close();};const onKey = (event) => {- if (stepMenuFocus(menu.current, event)) return;+ if (stepMenuFocus(menu.current, event, button.current)) return;if (event.key === "Escape") {event.stopPropagation();close();@@ -12907,17 +12909,21 @@ var MODEL_CSS = `.bt-effort-meta{display:inline-flex;align-items:center;gap:5px;min-width:0}.bt-effort-tag{font-size:11px;line-height:14px;color:var(--bt-ink-3)}.bt-effort-val{font-size:12px;line-height:16px;font-weight:600;color:var(--bt-accent);white-space:nowrap}-.bt-menu button.bt-effort-reset{flex:none;width:18px;height:18px;min-height:0;padding:0;border:0;border-radius:50%;background:var(--bt-hover);color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing};transition:background-color .12s ease,color .12s ease}-.bt-menu button.bt-effort-reset svg{width:11px;height:11px;margin:0}-.bt-menu button.bt-effort-reset:hover:not(:disabled){background:var(--bt-active);color:var(--bt-ink)}-.bt-menu button.bt-effort-reset:disabled{opacity:.35;cursor:default;background:none}+.bt-menu button.bt-effort-reset{flex:none;position:relative;width:28px;height:28px;min-height:0;margin:-5px;padding:0;border:0;border-radius:50%;background:transparent;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing};transition:color .12s ease}+.bt-menu button.bt-effort-reset::before{content:"";position:absolute;inset:5px;border-radius:50%;background:var(--bt-hover);transition:background-color .12s ease}+.bt-menu button.bt-effort-reset svg{position:relative;width:11px;height:11px;margin:0}+.bt-menu button.bt-effort-reset:hover:not(:disabled){color:var(--bt-ink)}+.bt-menu button.bt-effort-reset:hover:not(:disabled)::before{background:var(--bt-active)}+.bt-menu button.bt-effort-reset:disabled{opacity:.35;cursor:default}+.bt-menu button.bt-effort-reset:disabled::before{background:none}.bt-menu button.bt-effort-reset:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px}-.bt-effort-track{position:relative;height:22px;border-radius:999px;background:var(--bt-hover);box-shadow:inset 0 0 0 .5px var(--bt-line);cursor:pointer;user-select:none;touch-action:none}+.bt-effort-track{position:relative;height:28px;margin:-3px 0;border-radius:999px;cursor:pointer;user-select:none;touch-action:none}+.bt-effort-track::before{content:"";position:absolute;left:0;right:0;top:3px;bottom:3px;border-radius:999px;background:var(--bt-hover);box-shadow:inset 0 0 0 .5px var(--bt-line)}.bt-effort-track:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}-.bt-effort-fill{position:absolute;left:0;top:0;bottom:0;width:calc(22px + (100% - 22px) * var(--bt-effort-p,0));border-radius:999px;background:linear-gradient(90deg,color-mix(in srgb,var(--bt-accent) 76%,var(--bt-main)),var(--bt-accent));transition:${spring(SPRING_TAP, "width")}}+.bt-effort-fill{position:absolute;left:0;top:3px;bottom:3px;width:calc(22px + (100% - 22px) * var(--bt-effort-p,0));border-radius:999px;background:linear-gradient(90deg,color-mix(in srgb,var(--bt-accent) 76%,var(--bt-main)),var(--bt-accent));transition:${spring(SPRING_TAP, "width")}}.bt-effort-dot{position:absolute;top:50%;left:calc(11px + (100% - 22px) * var(--bt-dot-p,0));width:4px;height:4px;margin:-2px 0 0 -2px;border-radius:50%;background:color-mix(in srgb,var(--bt-ink-3) 45%,transparent);pointer-events:none;transition:background-color .12s ease}.bt-effort-dot[data-filled]{background:color-mix(in srgb,var(--bt-accent-ink) 65%,transparent)}-.bt-effort-knob{position:absolute;top:2px;left:calc(11px + (100% - 22px) * var(--bt-effort-p,0) - 9px);width:18px;height:18px;border-radius:50%;background:var(--bt-accent-ink);box-shadow:0 1px 3px rgba(0,0,0,.2),0 0 0 .5px rgba(0,0,0,.06);pointer-events:none;transition:${spring(SPRING_TAP, "left")},${spring(SPRING_TAP, "scale")}}+.bt-effort-knob{position:absolute;top:5px;left:calc(11px + (100% - 22px) * var(--bt-effort-p,0) - 9px);width:18px;height:18px;border-radius:50%;background:var(--bt-accent-ink);box-shadow:0 1px 3px rgba(0,0,0,.2),0 0 0 .5px rgba(0,0,0,.06);pointer-events:none;transition:${spring(SPRING_TAP, "left")},${spring(SPRING_TAP, "scale")}}.bt-effort-track[data-dragging] .bt-effort-fill,.bt-effort-track[data-dragging] .bt-effort-knob{transition:none}.bt-effort-track:hover .bt-effort-knob,.bt-effort-track[data-dragging] .bt-effort-knob{scale:1.08}.bt-model-group{flex:none;padding:8px 8px 2px;font-size:11px;line-height:14px;font-weight:500;color:var(--bt-ink-3);text-transform:none}@@ -14633,7 +14639,7 @@ function MemoryDialog({ owner, actions, leaving = false }) {setMenu(false);};const onKey = (event) => {- if (stepMenuFocus(menuRef.current, event)) return;+ if (stepMenuFocus(menuRef.current, event, dotsRef.current)) return;if (event.key === "Escape") {event.stopPropagation();setMenu(false);@@ -18708,12 +18714,13 @@ var import_react48 = require("react");function ContextMenu({ menu, roster, actions, leaving = false }) {useEscape(() => actions.closeMenu());const ref = (0, import_react48.useRef)(null);+ const trigger = (0, import_react48.useRef)(typeof document === "undefined" ? null : document.activeElement);(0, import_react48.useEffect)(() => {const onDown = (event) => {if (!(event.target instanceof Element) || !event.target.closest(".bt-menu")) actions.closeMenu();};const onKey = (event) => {- stepMenuFocus(ref.current, event);+ stepMenuFocus(ref.current, event, trigger.current);};window.addEventListener("mousedown", onDown);window.addEventListener("keydown", onKey, true);@@ -18782,9 +18789,10 @@ function ContextMenu({ menu, roster, actions, leaving = false }) {}function AgentMenu({ menu, roster, actions, leaving }) {const ref = (0, import_react48.useRef)(null);+ const trigger = (0, import_react48.useRef)(typeof document === "undefined" ? null : document.activeElement);(0, import_react48.useEffect)(() => {const onKey = (event) => {- stepMenuFocus(ref.current, event);+ stepMenuFocus(ref.current, event, trigger.current);};window.addEventListener("keydown", onKey, true);return () => window.removeEventListener("keydown", onKey, true);@@ -19522,13 +19530,14 @@ function PanelMenu({ items, className, "aria-label": label }) {const [open, setOpen] = (0, import_react51.useState)(false);const [shown, leaving] = useLinger(open, 120);const wrap = (0, import_react51.useRef)(null);+ const button = (0, import_react51.useRef)(null);(0, import_react51.useEffect)(() => {if (!open) return void 0;const onDown = (event) => {if (wrap.current && !wrap.current.contains(event.target)) setOpen(false);};const onKey = (event) => {- if (stepMenuFocus(wrap.current, event)) return;+ if (stepMenuFocus(wrap.current, event, button.current)) return;if (event.key !== "Escape") return;event.stopPropagation();setOpen(false);@@ -19545,6 +19554,7 @@ function PanelMenu({ items, className, "aria-label": label }) {"span",{ className: "bt-pmenu", ref: wrap },(0, import_react51.createElement)("button", {+ ref: button,type: "button",className,"aria-label": label,diff --git a/ds-bot/src/client/browser-pane.js b/ds-bot/src/client/browser-pane.jsindex c7ca4c7e..d05a7b13 100644--- a/ds-bot/src/client/browser-pane.js+++ b/ds-bot/src/client/browser-pane.js@@ -83,11 +83,12 @@ export function PanelMenu({ items, className, 'aria-label': label }) {const [open, setOpen] = useState(false)const [shown, leaving] = useLinger(open, 120)const wrap = useRef(null)+ const button = useRef(null)useEffect(() => {if (!open) return undefinedconst onDown = (event) => { if (wrap.current && !wrap.current.contains(event.target)) setOpen(false) }const onKey = (event) => {- if (stepMenuFocus(wrap.current, event)) return+ if (stepMenuFocus(wrap.current, event, button.current)) returnif (event.key !== 'Escape') returnevent.stopPropagation()setOpen(false)@@ -99,7 +100,7 @@ export function PanelMenu({ items, className, 'aria-label': label }) {if (items.length === 0) return nullreturn h('span', { className: 'bt-pmenu', ref: wrap },h('button', {- type: 'button', className, 'aria-label': label, title: label,+ ref: button, type: 'button', className, 'aria-label': label, title: label,'aria-haspopup': 'menu', 'aria-expanded': open, onClick: () => setOpen(value => !value),}, h(DotsIcon)),shown ? h('div', { className: 'bt-pmenu-pop', role: 'menu', 'data-leaving': leaving || undefined },diff --git a/ds-bot/src/client/composer.js b/ds-bot/src/client/composer.jsindex 0543764f..ee6ce285 100644--- a/ds-bot/src/client/composer.js+++ b/ds-bot/src/client/composer.js@@ -133,7 +133,7 @@ export function ComposerPlus({ sessionId, inputActions, useInput, useRoster, actif (!open) return undefinedconst onDown = (event) => { if (![button.current, menu.current].some(node => node?.contains(event.target))) setOpen(null) }const onKey = (event) => {- if (stepMenuFocus(menu.current, event)) return+ if (stepMenuFocus(menu.current, event, button.current)) returnif (event.key === 'Escape') { event.stopPropagation(); setOpen(null) }}window.addEventListener('mousedown', onDown, true)diff --git a/ds-bot/src/client/context-menu.js b/ds-bot/src/client/context-menu.jsindex d74a4dc3..66cd0af6 100644--- a/ds-bot/src/client/context-menu.js+++ b/ds-bot/src/client/context-menu.js@@ -9,9 +9,10 @@ import { t } from './i18n.js'export function ContextMenu({ menu, roster, actions, leaving = false }) {useEscape(() => actions.closeMenu())const ref = useRef(null)+ const trigger = useRef(typeof document === 'undefined' ? null : document.activeElement)useEffect(() => {const onDown = (event) => { if (!(event.target instanceof Element) || !event.target.closest('.bt-menu')) actions.closeMenu() }- const onKey = (event) => { stepMenuFocus(ref.current, event) }+ const onKey = (event) => { stepMenuFocus(ref.current, event, trigger.current) }window.addEventListener('mousedown', onDown)window.addEventListener('keydown', onKey, true)return () => { window.removeEventListener('mousedown', onDown); window.removeEventListener('keydown', onKey, true) }@@ -63,8 +64,9 @@ export function ContextMenu({ menu, roster, actions, leaving = false }) {// Menus for the DSH Agent row and its Sessions; none of the Bot entries apply.function AgentMenu({ menu, roster, actions, leaving }) {const ref = useRef(null)+ const trigger = useRef(typeof document === 'undefined' ? null : document.activeElement)useEffect(() => {- const onKey = (event) => { stepMenuFocus(ref.current, event) }+ const onKey = (event) => { stepMenuFocus(ref.current, event, trigger.current) }window.addEventListener('keydown', onKey, true)return () => window.removeEventListener('keydown', onKey, true)}, [])diff --git a/ds-bot/src/client/memory-panel.js b/ds-bot/src/client/memory-panel.jsindex 556b0a92..400c7ee8 100644--- a/ds-bot/src/client/memory-panel.js+++ b/ds-bot/src/client/memory-panel.js@@ -283,7 +283,7 @@ export function MemoryDialog({ owner, actions, leaving = false }) {setMenu(false)}const onKey = (event) => {- if (stepMenuFocus(menuRef.current, event)) return+ if (stepMenuFocus(menuRef.current, event, dotsRef.current)) returnif (event.key === 'Escape') { event.stopPropagation(); setMenu(false); dotsRef.current?.focus() }}window.addEventListener('mousedown', onDown)diff --git a/ds-bot/src/client/model-menu.js b/ds-bot/src/client/model-menu.jsindex 71a50228..f62b3f68 100644--- a/ds-bot/src/client/model-menu.js+++ b/ds-bot/src/client/model-menu.js@@ -222,7 +222,7 @@ export function useAnchoredMenu() {close()}const onKey = (event) => {- if (stepMenuFocus(menu.current, event)) return+ if (stepMenuFocus(menu.current, event, button.current)) returnif (event.key === 'Escape') { event.stopPropagation(); close(); button.current?.focus() }}const onScroll = (event) => { if (!menu.current?.contains(event.target)) close() }@@ -456,17 +456,21 @@ export const MODEL_CSS = `.bt-effort-meta{display:inline-flex;align-items:center;gap:5px;min-width:0}.bt-effort-tag{font-size:11px;line-height:14px;color:var(--bt-ink-3)}.bt-effort-val{font-size:12px;line-height:16px;font-weight:600;color:var(--bt-accent);white-space:nowrap}-.bt-menu button.bt-effort-reset{flex:none;width:18px;height:18px;min-height:0;padding:0;border:0;border-radius:50%;background:var(--bt-hover);color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing};transition:background-color .12s ease,color .12s ease}-.bt-menu button.bt-effort-reset svg{width:11px;height:11px;margin:0}-.bt-menu button.bt-effort-reset:hover:not(:disabled){background:var(--bt-active);color:var(--bt-ink)}-.bt-menu button.bt-effort-reset:disabled{opacity:.35;cursor:default;background:none}+.bt-menu button.bt-effort-reset{flex:none;position:relative;width:28px;height:28px;min-height:0;margin:-5px;padding:0;border:0;border-radius:50%;background:transparent;color:var(--bt-ink-2);display:inline-flex;align-items:center;justify-content:center;cursor:pointer;animation:bt-check-pop ${SPRING_POP.duration}ms ${SPRING_POP.easing};transition:color .12s ease}+.bt-menu button.bt-effort-reset::before{content:"";position:absolute;inset:5px;border-radius:50%;background:var(--bt-hover);transition:background-color .12s ease}+.bt-menu button.bt-effort-reset svg{position:relative;width:11px;height:11px;margin:0}+.bt-menu button.bt-effort-reset:hover:not(:disabled){color:var(--bt-ink)}+.bt-menu button.bt-effort-reset:hover:not(:disabled)::before{background:var(--bt-active)}+.bt-menu button.bt-effort-reset:disabled{opacity:.35;cursor:default}+.bt-menu button.bt-effort-reset:disabled::before{background:none}.bt-menu button.bt-effort-reset:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px}-.bt-effort-track{position:relative;height:22px;border-radius:999px;background:var(--bt-hover);box-shadow:inset 0 0 0 .5px var(--bt-line);cursor:pointer;user-select:none;touch-action:none}+.bt-effort-track{position:relative;height:28px;margin:-3px 0;border-radius:999px;cursor:pointer;user-select:none;touch-action:none}+.bt-effort-track::before{content:"";position:absolute;left:0;right:0;top:3px;bottom:3px;border-radius:999px;background:var(--bt-hover);box-shadow:inset 0 0 0 .5px var(--bt-line)}.bt-effort-track:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}-.bt-effort-fill{position:absolute;left:0;top:0;bottom:0;width:calc(22px + (100% - 22px) * var(--bt-effort-p,0));border-radius:999px;background:linear-gradient(90deg,color-mix(in srgb,var(--bt-accent) 76%,var(--bt-main)),var(--bt-accent));transition:${spring(SPRING_TAP, 'width')}}+.bt-effort-fill{position:absolute;left:0;top:3px;bottom:3px;width:calc(22px + (100% - 22px) * var(--bt-effort-p,0));border-radius:999px;background:linear-gradient(90deg,color-mix(in srgb,var(--bt-accent) 76%,var(--bt-main)),var(--bt-accent));transition:${spring(SPRING_TAP, 'width')}}.bt-effort-dot{position:absolute;top:50%;left:calc(11px + (100% - 22px) * var(--bt-dot-p,0));width:4px;height:4px;margin:-2px 0 0 -2px;border-radius:50%;background:color-mix(in srgb,var(--bt-ink-3) 45%,transparent);pointer-events:none;transition:background-color .12s ease}.bt-effort-dot[data-filled]{background:color-mix(in srgb,var(--bt-accent-ink) 65%,transparent)}-.bt-effort-knob{position:absolute;top:2px;left:calc(11px + (100% - 22px) * var(--bt-effort-p,0) - 9px);width:18px;height:18px;border-radius:50%;background:var(--bt-accent-ink);box-shadow:0 1px 3px rgba(0,0,0,.2),0 0 0 .5px rgba(0,0,0,.06);pointer-events:none;transition:${spring(SPRING_TAP, 'left')},${spring(SPRING_TAP, 'scale')}}+.bt-effort-knob{position:absolute;top:5px;left:calc(11px + (100% - 22px) * var(--bt-effort-p,0) - 9px);width:18px;height:18px;border-radius:50%;background:var(--bt-accent-ink);box-shadow:0 1px 3px rgba(0,0,0,.2),0 0 0 .5px rgba(0,0,0,.06);pointer-events:none;transition:${spring(SPRING_TAP, 'left')},${spring(SPRING_TAP, 'scale')}}.bt-effort-track[data-dragging] .bt-effort-fill,.bt-effort-track[data-dragging] .bt-effort-knob{transition:none}.bt-effort-track:hover .bt-effort-knob,.bt-effort-track[data-dragging] .bt-effort-knob{scale:1.08}.bt-model-group{flex:none;padding:8px 8px 2px;font-size:11px;line-height:14px;font-weight:500;color:var(--bt-ink-3);text-transform:none}diff --git a/ds-bot/src/client/motion.js b/ds-bot/src/client/motion.jsindex 50d5538a..da2a0172 100644--- a/ds-bot/src/client/motion.js+++ b/ds-bot/src/client/motion.js@@ -253,13 +253,15 @@ export function useLinger(value, ms) {}// Moves keyboard focus through enabled menu items on ArrowDown, ArrowUp, Home and End.-export function stepMenuFocus(menu, event) {+export function stepMenuFocus(menu, event, trigger) {if (!menu || !['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return falseconst items = Array.from(menu.querySelectorAll('button[role^="menuitem"]:not(:disabled)'))if (items.length === 0) return false+ const target = document.activeElement+ const current = items.indexOf(target)+ if (current === -1 && target !== menu && target !== trigger) return falseevent.preventDefault()event.stopPropagation()- const current = items.indexOf(document.activeElement)const next = event.key === 'Home' ? 0: event.key === 'End' ? items.length - 1: event.key === 'ArrowDown' ? (current + 1) % items.lengthdiff --git a/ds-bot/src/client/sidebar.js b/ds-bot/src/client/sidebar.jsindex 38326c8c..82ebb382 100644--- a/ds-bot/src/client/sidebar.js+++ b/ds-bot/src/client/sidebar.js@@ -144,6 +144,8 @@ function RoomRow({ room, roster, actions, useSessions, useSessionStatus, useSess: !wide && !active && (approval || unread) ? h('span', { className: `bt-dot${approval ? ' bt-dot-wait' : ''}`, 'aria-hidden': true }) : null)}+const agentSessionTitle = session => (session.title === '' ? t('New session') : session.title)+// One expanded DSH Agent Session row: title, relative stamp, rename field, and a// context menu for rename/archive.function AgentSessionRow({ session, agent, actions, renaming, index }) {@@ -187,7 +189,7 @@ function AgentSessionRow({ session, agent, actions, renaming, index }) {actions.openMenu({ kind: 'agent-session', id: session.id, agentId: agent.id, x: event.clientX, y: event.clientY })},},- h('span', { className: 'bt-agent-sub-title' }, session.title),+ h('span', { className: 'bt-agent-sub-title' }, agentSessionTitle(session)),h('span', { className: 'bt-agent-sub-time' }, session.at > 0 ? relativeShort(session.at) : ''))}@@ -214,7 +216,6 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide,...session,running: statuses[session.id]?.running ?? session.running,unread: statuses[session.id]?.unread ?? false,- title: session.title === '' ? t('New session') : session.title,}))}, [info, statusInfo])const renaming = useUi(value => value.renameAgent)@@ -222,7 +223,7 @@ function AgentRow({ agent, actions, useSessions, useSessionStatus, useUi, wide,const running = sessions.some(session => session.running)const unread = sessions.some(session => session.unread) || (marked && !active)useMarkedUnread(agent.id, active, marked, actions)- const preview = sessions[0]?.title ?? t('New session')+ const preview = sessions[0] === undefined ? t('New session') : agentSessionTitle(sessions[0])const label = ['DSH Agent', running ? t('Working') : '', unread ? t('Unread activity') : ''].filter(Boolean).join(', ')const open = active && widereturn h('div', { className: 'bt-agent' },@@ -816,7 +817,7 @@ export function AccountLauncher({ seat = true, settingsOpen, openSettings, openOsetOpen(false)}const onKey = (event) => {- if (stepMenuFocus(menuRef.current, event)) return+ if (stepMenuFocus(menuRef.current, event, button.current)) returnif (event.key === 'Escape') { event.stopPropagation(); setOpen(false); button.current?.focus() }}window.addEventListener('mousedown', onDown)diff --git a/ds-bot/test/model-menu.test.js b/ds-bot/test/model-menu.test.jsindex b4b3cd46..2a4c7347 100644--- a/ds-bot/test/model-menu.test.js+++ b/ds-bot/test/model-menu.test.js@@ -5,12 +5,16 @@ import { runInNewContext } from 'node:vm'import { build } from 'esbuild'const bundle = await build({- entryPoints: [fileURLToPath(new URL('../src/client/model-menu.js', import.meta.url))],+ stdin: {+ contents: "export * from './src/client/model-menu.js'\nexport { stepMenuFocus } from './src/client/motion.js'",+ resolveDir: fileURLToPath(new URL('..', import.meta.url)),+ },bundle: true, format: 'cjs', platform: 'node', write: false,external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'],})const module = { exports: {} }-runInNewContext(bundle.outputFiles[0].text, {+const sandbox = {+ document: { activeElement: null },module, exports: module.exports,require: name => {const platform = {@@ -26,8 +30,9 @@ runInNewContext(bundle.outputFiles[0].text, {if (!(name in platform)) throw new Error(`no platform module ${name}`)return platform[name]},-})-const { groupModels, ModelChoiceDock, ModelKeyCard, effortRows, effortStops, EffortBar } = module.exports+}+runInNewContext(bundle.outputFiles[0].text, sandbox)+const { groupModels, ModelChoiceDock, ModelKeyCard, effortRows, effortStops, EffortBar, stepMenuFocus } = module.exportsfunction nodes(tree, match) {if (!tree || typeof tree !== 'object') return []@@ -125,6 +130,40 @@ test('the Thinking section always offers Default, so a picked level can be clearassert.deepEqual(picked, ['high', undefined])})+test('menu focus stepping starts from menu items or the trigger, not other controls', () => {+ const focused = []+ const item = name => ({ name, focus: () => focused.push(name) })+ const first = item('first')+ const second = item('second')+ const slider = item('slider')+ const source = item('source')+ const menu = {+ querySelectorAll: () => [first, second],+ contains: target => [first, second, slider].includes(target),+ }+ const trigger = source+ const event = key => {+ const out = { key, prevented: false, stopped: false }+ out.preventDefault = () => { out.prevented = true }+ out.stopPropagation = () => { out.stopped = true }+ return out+ }++ sandbox.document.activeElement = slider+ const arrow = event('ArrowDown')+ assert.equal(stepMenuFocus(menu, arrow, trigger), false)+ assert.equal(arrow.prevented, false)+ assert.equal(arrow.stopped, false)++ sandbox.document.activeElement = source+ assert.equal(stepMenuFocus(menu, event('ArrowDown'), trigger), true)+ sandbox.document.activeElement = first+ assert.equal(stepMenuFocus(menu, event('ArrowDown'), trigger), true)+ sandbox.document.activeElement = item('unrelated')+ assert.equal(stepMenuFocus(menu, event('ArrowDown'), trigger), false)+ assert.deepEqual(focused, ['first', 'second'])+})+const keyless = [{ ref: 'official/flash', provider: 'official', providerName: 'DeepSeek', name: 'DeepSeek Flash', needsKey: true },{ ref: 'official/pro', provider: 'official', providerName: 'DeepSeek', name: 'DeepSeek Pro', needsKey: true },