Skip to content

A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.

Pin a thinking-level step slider at the bottom of the model menu

Fei24111c09a5c70588
diff --cc ds-bot/client.js
index 1f4ad0d4,631a4875..ea1f9fd8
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@@ -2231,12 -2351,12 +2353,12 @@@ function liveSprings(apply2)
const dt = Math.min(0.5, Math.max(1e-3, (now - last) / 1e3));
last = now;
const steps = Math.ceil(dt * 240);
- const h50 = dt / steps;
+ const h52 = dt / steps;
let moving = false;
- for (const value of values.values()) {
+ for (const [key, value] of values) {
for (let index = 0; index < steps; index += 1) {
- value.v += (-value.k * (value.x - value.to) - value.c * value.v) * h50;
- value.x += value.v * h50;
+ value.v += (-value.k * (value.x - value.to) - value.c * value.v) * h52;
+ value.x += value.v * h52;
}
if (Math.abs(value.x - value.to) < 0.05 && Math.abs(value.v) < 1) {
value.x = value.to;
@@@ -9432,13 -10052,11 +10080,13 @@@ var nameIfCut = (event) =>
else row.removeAttribute("title");
};
var useApproval = (useWork, match) => useWork ? useWork((work) => (work.approvals ?? []).some(match)) : false;
-var useGroupWork = (useWork, pick2) => useWork ? useWork((work) => JSON.stringify(pick2(work.rooms ?? {}))) : "[]";
-var workKeys = (text) => JSON.parse(text);
+var useGroupWork = (useWork, pick2) => {
+ const raw = useWork ? useWork((work) => JSON.stringify(pick2(work.rooms ?? {}))) : "[]";
- return (0, import_react19.useMemo)(() => JSON.parse(raw), [raw]);
++ return (0, import_react21.useMemo)(() => JSON.parse(raw), [raw]);
+};
var doingOf = ({ tool, said, note, target, switching }) => ({ tool, said, note, target, switching });
- var workLine = (lead, doing, more) => (0, import_react19.createElement)(Shimmer, null, `${lead} · ${workPhrase(doing)}…${more > 0 ? ` +${more}` : ""}`);
- var doingLine = (doing) => (0, import_react19.createElement)(Shimmer, null, `${workPhrase(doing)}…`);
+ var workLine = (lead, doing, more) => (0, import_react21.createElement)(Shimmer, null, `${lead} · ${workPhrase(doing)}…${more > 0 ? ` +${more}` : ""}`);
+ var doingLine = (doing) => (0, import_react21.createElement)(Shimmer, null, `${workPhrase(doing)}…`);
var waitingFor = (roster, waits) => {
const names = [...(waits?.bots ?? []).map((id) => roster.byId[id]?.name), ...(waits?.rooms ?? []).map((id) => roster.roomsById[id]?.name)].filter(Boolean);
return names.length === 0 ? "" : t("Waiting for {names}", { names: names.join(t(" and ")) });
@@@ -9461,8 -10079,7 +10109,8 @@@ function BotRow({ bot, roster, actions
const state = botState(running || away, doing, alert);
const runningLine = running && doing ? doingLine(doing) : null;
const awayLine = away ? workLine(roster.roomsById[groups[0].id]?.name ?? t("a group chat"), groups[0], groups.length - 1) : null;
- const waits = workKeys(useWork ? useWork((work) => JSON.stringify(work.waiting?.[id] ?? null)) : "null");
+ const waitsRaw = useWork ? useWork((work) => JSON.stringify(work.waiting?.[id] ?? null)) : "null";
- const waits = (0, import_react19.useMemo)(() => JSON.parse(waitsRaw), [waitsRaw]);
++ const waits = (0, import_react21.useMemo)(() => JSON.parse(waitsRaw), [waitsRaw]);
const waitsFor = state === "waiting" ? waitingFor(roster, waits) : "";
if (bot.hidden && !active && !main) return null;
const onContextMenu = (event) => {
@@@ -9629,15 -10246,13 +10277,15 @@@ function AgentRow({ agent, actions, use
running: map.get(id)?.running === true,
unread: map.get(id)?.completionUnread === true
}))));
- const sessions = (0, import_react19.useMemo)(() => {
- const statuses = Object.fromEntries(JSON.parse(statusInfo).map((entry) => [entry.id, entry]));
- const sessions = 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
- }));
++ const sessions = (0, import_react21.useMemo)(() => {
+ const statuses = Object.fromEntries(JSON.parse(statusInfo).map((entry) => [entry.id, entry]));
+ 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
+ }));
+ }, [info, statusInfo]);
const renaming = useUi((value) => value.renameAgent);
const active = sessions.some((session) => session.active);
const running = sessions.some((session) => session.running);
@@@ -9699,9 -10314,10 +10347,9 @@@
)
);
}
-var GLIDE = springEasing(1e3, 63);
function useListGlide(listRef, layout, key) {
- const tops = (0, import_react19.useRef)({ layout, map: /* @__PURE__ */ new Map() });
- (0, import_react19.useLayoutEffect)(() => {
+ const tops = (0, import_react21.useRef)({ layout, map: /* @__PURE__ */ new Map() });
+ (0, import_react21.useLayoutEffect)(() => {
const list = listRef.current;
if (!list) return;
const next = /* @__PURE__ */ new Map();
@@@ -9745,14 -10361,10 +10393,14 @@@ var bootHint = () =>
};
function TeamSidebar(props) {
const { wide, useRoster, useUi, useSessions, actions } = props;
- const listRef = (0, import_react19.useRef)(null);
+ const listRef = (0, import_react21.useRef)(null);
const roster = useRoster((value) => value);
const markedUnread = useUi((value) => value.unread);
- const uiNow = useUi((value) => value);
+ const leftDrawer = useUi((value) => value.leftDrawer === true);
+ const details = useUi((value) => value.details ?? null);
+ const view = useUi((value) => value.view ?? "details");
+ const panelYield = useUi((value) => value.panelYield === true);
+ const bootFailed = useUi((value) => value.bootFailed === true);
props.useRegistry((value) => value);
const frameSnap = props.useFrame ? props.useFrame((value) => value) : { viewport: typeof window === "undefined" ? 0 : window.innerWidth, sidebarWidth: FALLBACK_SIDEBAR_WIDTH, collapsedWidth: 0 };
const pref = props.useSidebarPref ? props.useSidebarPref((value) => value) : "open";
@@@ -9760,10 -10372,10 +10408,10 @@@
viewport: frameSnap.viewport,
sidebarWidth: frameSnap.sidebarWidth,
pref,
- drawer: uiNow.leftDrawer === true,
- panel: uiNow.details ? { view: uiNow.view, yielded: uiNow.panelYield === true } : null
+ drawer: leftDrawer,
+ panel: details ? { view, yielded: panelYield } : null
});
- const [drag, setDrag] = (0, import_react19.useState)(null);
+ const [drag, setDrag] = (0, import_react21.useState)(null);
const mode = drag?.left ?? layout.left;
const [held, leaving] = useLinger(mode === "hidden" ? null : mode, SPRING_SHAPE.duration);
const shown = held ?? mode;
@@@ -9981,38 -10594,38 +10630,38 @@@
document.addEventListener("keydown", onKey, true);
return () => document.removeEventListener("keydown", onKey, true);
}, []);
- const top = wideContent ? (0, import_react19.createElement)(
+ const top = wideContent ? (0, import_react21.createElement)(
"div",
{ className: "bt-side-top" },
- (0, import_react19.createElement)("span", { className: "bt-brand" }, (0, import_react19.createElement)(BrandName)),
- (0, import_react19.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
- (0, import_react19.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react19.createElement)(SearchIcon)),
- (0, import_react19.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react19.createElement)(PlusIcon)),
- (0, import_react19.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: onToggle }, (0, import_react19.createElement)(SidebarIcon))
- ) : (0, import_react19.createElement)(
+ (0, import_react21.createElement)("span", { className: "bt-brand" }, (0, import_react21.createElement)(BrandName)),
+ (0, import_react21.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
+ (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react21.createElement)(SearchIcon)),
+ (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react21.createElement)(PlusIcon)),
+ (0, import_react21.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: onToggle }, (0, import_react21.createElement)(SidebarIcon))
+ ) : (0, import_react21.createElement)(
"div",
{ className: "bt-rail-top" },
- (0, import_react19.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
- (0, import_react19.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: onToggle }, (0, import_react19.createElement)(SidebarIcon)),
- main ? (0, import_react19.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react19.createElement)("div", { className: "bt-hint" }, bootFailed ? bootHint() : t("Setting up your Main Bot…")),
- (0, import_react19.createElement)("span", { className: "bt-rail-sep", "aria-hidden": true })
+ (0, import_react21.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
+ (0, import_react21.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: onToggle }, (0, import_react21.createElement)(SidebarIcon)),
- main ? (0, import_react21.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react21.createElement)("div", { className: "bt-hint" }, uiNow.bootFailed ? bootHint() : t("Setting up your Main Bot…")),
++ main ? (0, import_react21.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react21.createElement)("div", { className: "bt-hint" }, bootFailed ? bootHint() : t("Setting up your Main Bot…")),
+ (0, import_react21.createElement)("span", { className: "bt-rail-sep", "aria-hidden": true })
);
- const foot = wideContent ? (0, import_react19.createElement)("div", { className: "bt-leftcol-foot" }, (0, import_react19.createElement)(AccountLauncher, { seat: false, actions })) : (0, import_react19.createElement)(
+ const foot = wideContent ? (0, import_react21.createElement)("div", { className: "bt-leftcol-foot" }, (0, import_react21.createElement)(AccountLauncher, { seat: false, actions })) : (0, import_react21.createElement)(
"div",
{ className: "bt-leftcol-foot bt-leftcol-foot-rail" },
- (0, import_react19.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react19.createElement)(PlusIcon)),
- (0, import_react19.createElement)(AccountLauncher, { seat: false, actions })
+ (0, import_react21.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react21.createElement)(PlusIcon)),
+ (0, import_react21.createElement)(AccountLauncher, { seat: false, actions })
);
- const content = (0, import_react19.createElement)(
+ const content = (0, import_react21.createElement)(
"div",
{ className: wideContent ? "bt-side" : "bt-side bt-rail", onKeyDown: typeToSearch },
top,
- wideContent && roster.readOnly ? (0, import_react19.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null,
- (0, import_react19.createElement)(
+ wideContent && roster.readOnly ? (0, import_react21.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null,
+ (0, import_react21.createElement)(
"div",
{ ref: listRef, className: "bt-list", role: "region", "aria-label": t("Bot list") },
- wideContent ? main ? (0, import_react19.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react19.createElement)("div", { className: "bt-hint" }, bootFailed ? bootHint() : t("Setting up your Main Bot…")) : null,
- order.map((entry) => entry.kind === "bot" ? (0, import_react19.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react19.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react19.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))
- wideContent ? main ? (0, import_react21.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react21.createElement)("div", { className: "bt-hint" }, uiNow.bootFailed ? bootHint() : t("Setting up your Main Bot…")) : null,
++ wideContent ? main ? (0, import_react21.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react21.createElement)("div", { className: "bt-hint" }, bootFailed ? bootHint() : t("Setting up your Main Bot…")) : null,
+ order.map((entry) => entry.kind === "bot" ? (0, import_react21.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react21.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react21.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))
),
foot
);
@@@ -10025,13 -10638,12 +10674,13 @@@
}
function UpdateButton({ useUpdate, actions }) {
const update = useUpdate((value) => value);
- const [open, setOpen] = (0, import_react19.useState)(false);
+ const [open, setOpen] = (0, import_react21.useState)(false);
+ const [shown, leaving] = useLinger(open, 120);
- const [box, setBox] = (0, import_react19.useState)(null);
- const [error, setError] = (0, import_react19.useState)("");
- const [dshError, setDshError] = (0, import_react19.useState)("");
- const button = (0, import_react19.useRef)(null);
- (0, import_react19.useEffect)(() => {
+ const [box, setBox] = (0, import_react21.useState)(null);
+ const [error, setError] = (0, import_react21.useState)("");
+ const [dshError, setDshError] = (0, import_react21.useState)("");
+ const button = (0, import_react21.useRef)(null);
+ (0, import_react21.useEffect)(() => {
if (!open) return void 0;
const onDown = (event) => {
if (event.target instanceof Element && (event.target.closest(".bt-update-pop") || button.current?.contains(event.target))) return;
@@@ -10089,21 -10701,21 +10738,21 @@@
"aria-haspopup": "dialog",
"aria-expanded": open,
onClick: toggle
- }, (0, import_react19.createElement)(CloudDownloadIcon, { done: phase === "installed" || phase === "updated" }), phase === "failed" || dshPhase === "failed" ? (0, import_react19.createElement)("span", { className: "bt-update-dot", "aria-hidden": true }) : null),
- shown && box ? (0, import_react_dom3.createPortal)((0, import_react19.createElement)(
+ }, (0, import_react21.createElement)(CloudDownloadIcon, { done: phase === "installed" || phase === "updated" }), phase === "failed" || dshPhase === "failed" ? (0, import_react21.createElement)("span", { className: "bt-update-dot", "aria-hidden": true }) : null),
- open && box ? (0, import_react_dom3.createPortal)((0, import_react21.createElement)(
++ shown && box ? (0, import_react_dom3.createPortal)((0, import_react21.createElement)(
"div",
- { className: "bt-update-pop", role: "dialog", "aria-label": update?.available || phase !== "idle" ? t("DS Bot update") : t("DSH update"), style: box },
+ { className: "bt-update-pop", role: "dialog", "aria-label": update?.available || phase !== "idle" ? t("DS Bot update") : t("DSH update"), style: box, "data-leaving": leaving || void 0 },
- update?.available || phase !== "idle" ? (0, import_react19.createElement)(
- import_react19.Fragment,
+ update?.available || phase !== "idle" ? (0, import_react21.createElement)(
+ import_react21.Fragment,
null,
- (0, import_react19.createElement)("div", { className: "bt-update-title" }, phase === "installed" || phase === "updated" ? t("Update installed") : t("DS Bot {version}", { version: update.latest })),
- (0, import_react19.createElement)("div", { className: "bt-update-text" }, phase === "installed" ? t("Restart DSH to start using DS Bot {version}.", { version: update.installed ?? update.latest }) : phase === "updated" ? t("DS Bot {version} is installed.", { version: update.installed ?? update.latest }) : t("You have {version}.", { version: update.current })),
- message ? (0, import_react19.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: message })) : null,
- (0, import_react19.createElement)(
+ (0, import_react21.createElement)("div", { className: "bt-update-title" }, phase === "installed" || phase === "updated" ? t("Update installed") : t("DS Bot {version}", { version: update.latest })),
+ (0, import_react21.createElement)("div", { className: "bt-update-text" }, phase === "installed" ? t("Restart DSH to start using DS Bot {version}.", { version: update.installed ?? update.latest }) : phase === "updated" ? t("DS Bot {version} is installed.", { version: update.installed ?? update.latest }) : t("You have {version}.", { version: update.current })),
+ message ? (0, import_react21.createElement)("div", { className: "bt-update-error", role: "alert" }, t("The update did not finish: {reason}", { reason: message })) : null,
+ (0, import_react21.createElement)(
"div",
{ className: "bt-update-actions" },
- update.notesUrl ? (0, import_react19.createElement)("a", { className: "bt-update-notes", href: update.notesUrl, target: "_blank", rel: "noopener noreferrer" }, t("What's new")) : null,
- phase === "installed" || phase === "updated" ? null : (0, import_react19.createElement)("button", {
+ update.notesUrl ? (0, import_react21.createElement)("a", { className: "bt-update-notes", href: update.notesUrl, target: "_blank", rel: "noopener noreferrer" }, t("What's new")) : null,
+ phase === "installed" || phase === "updated" ? null : (0, import_react21.createElement)("button", {
type: "button",
className: "bt-update-go",
disabled: phase === "installing",
@@@ -10210,13 -10834,12 +10871,13 @@@ function AccountLauncher({ seat = true
actions.seatAccount(true);
return () => actions.seatAccount(false);
}, [seat]);
- const [box, setBox] = (0, import_react19.useState)(null);
- const button = (0, import_react19.useRef)(null);
- const menuRef = (0, import_react19.useRef)(null);
- (0, import_react19.useEffect)(() => {
+ const [box, setBox] = (0, import_react21.useState)(null);
+ const button = (0, import_react21.useRef)(null);
++ const menuRef = (0, import_react21.useRef)(null);
+ (0, import_react21.useEffect)(() => {
if (settingsOpen) setOpen(false);
}, [settingsOpen]);
- (0, import_react19.useEffect)(() => {
+ (0, import_react21.useEffect)(() => {
if (!openSettings) return void 0;
openShellSettings = openSettings;
return () => {
@@@ -10317,27 -10942,28 +10981,28 @@@
]
];
if (signedIn) groups.push([[accountT("signOut"), SignOutIcon, askSignOut, void 0, true]]);
- return (0, import_react19.createElement)(
- import_react19.Fragment,
+ else if (signedOut) groups.push([[t("Sign in to DeepSeek"), SignInIcon, () => actions.signIn()]]);
+ return (0, import_react21.createElement)(
+ import_react21.Fragment,
null,
- (0, import_react19.createElement)(
+ (0, import_react21.createElement)(
"button",
{ ref: button, type: "button", className: "bt-account", "aria-label": t("Account"), "aria-haspopup": "menu", "aria-expanded": open, onClick: toggle },
- (0, import_react19.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react19.createElement)(GearIcon))
+ (0, import_react21.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react21.createElement)(GearIcon))
),
- open && box ? (0, import_react_dom3.createPortal)((0, import_react19.createElement)(
+ open && box ? (0, import_react_dom3.createPortal)((0, import_react21.createElement)(
"div",
- { className: "bt-menu bt-menu-up bt-account-menu", role: "menu", "aria-label": t("Account"), style: box },
+ { ref: menuRef, className: "bt-menu bt-menu-up bt-account-menu", role: "menu", "aria-label": t("Account"), style: box },
- confirm !== null ? (0, import_react19.createElement)(
+ confirm !== null ? (0, import_react21.createElement)(
"div",
{ className: "bt-confirm", role: "alertdialog", "aria-label": accountT("signOut") },
- (0, import_react19.createElement)("p", { className: "bt-confirm-text" }, accountT(confirm === "running" ? "signOutRunningDescription" : confirm === "unknown" ? "signOutUnknownDescription" : "signOutDescription")),
- signOutError !== "" ? (0, import_react19.createElement)("p", { className: "bt-confirm-error", role: "alert" }, signOutError) : null,
- (0, import_react19.createElement)(
+ (0, import_react21.createElement)("p", { className: "bt-confirm-text" }, accountT(confirm === "running" ? "signOutRunningDescription" : confirm === "unknown" ? "signOutUnknownDescription" : "signOutDescription")),
+ signOutError !== "" ? (0, import_react21.createElement)("p", { className: "bt-confirm-error", role: "alert" }, signOutError) : null,
+ (0, import_react21.createElement)(
"div",
{ className: "bt-confirm-row" },
- (0, import_react19.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: cancelSignOut }, t("Cancel")),
- (0, import_react19.createElement)("button", { type: "button", className: "bt-confirm-go", disabled: busy, onClick: () => {
+ (0, import_react21.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: cancelSignOut }, t("Cancel")),
+ (0, import_react21.createElement)("button", { type: "button", className: "bt-confirm-go", disabled: busy, onClick: () => {
void runSignOut();
} }, accountT("signOut"))
)
@@@ -11854,24 -12387,24 +12430,125 @@@ function effortRows(reasoning)
...reasoning.efforts.map((effort) => ({ effort: effort.id, label: effort.name }))
];
}
--function EffortRows({ reasoning, current, onPick }) {
++function effortStops(reasoning) {
++ const efforts = reasoning?.efforts ?? [];
++ if (efforts.length === 0) return [];
++ const hasDefault = efforts.some((effort) => effort.id === reasoning.defaultEffort);
++ return hasDefault ? efforts.map((effort) => ({ effort: effort.id, label: effort.name })) : [{ effort: void 0, label: t("Default") }, ...efforts.map((effort) => ({ effort: effort.id, label: effort.name }))];
++}
++var BoltIcon = () => (0, import_react25.createElement)(
++ "svg",
++ { width: 14, height: 14, viewBox: "0 0 16 16", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true },
++ (0, import_react25.createElement)("path", { d: "M8.8 1.8L3.5 9h4.1l-.9 5.2L12.5 7H8.4l.4-5.2z" })
++);
++var ResetIcon = () => (0, import_react25.createElement)(
++ "svg",
++ { width: 14, height: 14, viewBox: "0 0 16 16", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true },
++ (0, import_react25.createElement)("path", { d: "M2.8 6.5A5.5 5.5 0 1 1 4 11.8" }),
++ (0, import_react25.createElement)("path", { d: "M2.5 3.2v3.4h3.4" })
++);
++function EffortBar({ reasoning, current, onPick }) {
++ const stops = effortStops(reasoning);
++ const track = (0, import_react25.useRef)(null);
++ const [picked, setPicked] = (0, import_react25.useState)(current);
++ (0, import_react25.useEffect)(() => {
++ setPicked(current);
++ }, [current]);
++ if (stops.length === 0) return null;
++ const hasDefault = (reasoning?.efforts ?? []).some((effort) => effort.id === reasoning?.defaultEffort);
++ const activeEffort = picked ?? (hasDefault ? reasoning.defaultEffort : void 0);
++ const activeIndex = Math.max(0, stops.findIndex((stop) => (stop.effort ?? null) === (activeEffort ?? null)));
++ const active = stops[activeIndex];
++ const ratio = stops.length <= 1 ? 1 : activeIndex / (stops.length - 1);
++ const choose = (effort) => {
++ setPicked(effort);
++ if ((effort ?? null) !== (picked ?? null)) onPick(effort);
++ };
++ const pickAt = (clientX) => {
++ const rect = track.current?.getBoundingClientRect();
++ if (!rect || stops.length <= 1) {
++ if (stops[0]) choose(stops[0].effort);
++ return;
++ }
++ const span = Math.max(1, rect.width - 28);
++ const clamped = Math.max(0, Math.min(1, (clientX - rect.left - 14) / span));
++ const next = stops[Math.round(clamped * (stops.length - 1))];
++ if (next) choose(next.effort);
++ };
++ const onPointerDown = (event) => {
++ if (event.button !== 0) return;
++ event.preventDefault();
++ try {
++ event.currentTarget.setPointerCapture?.(event.pointerId);
++ } catch {
++ }
++ pickAt(event.clientX);
++ };
++ const onPointerMove = (event) => {
++ if (event.buttons !== 1 && !event.currentTarget.hasPointerCapture?.(event.pointerId)) return;
++ pickAt(event.clientX);
++ };
++ const onKeyDown = (event) => {
++ if (!["ArrowLeft", "ArrowDown", "ArrowRight", "ArrowUp", "Home", "End"].includes(event.key)) return;
++ event.preventDefault();
++ event.stopPropagation();
++ const nextIndex = event.key === "Home" ? 0 : event.key === "End" ? stops.length - 1 : event.key === "ArrowLeft" || event.key === "ArrowDown" ? Math.max(0, activeIndex - 1) : Math.min(stops.length - 1, activeIndex + 1);
++ const next = stops[nextIndex];
++ if (next) choose(next.effort);
++ };
return (0, import_react25.createElement)(
-- import_react25.Fragment,
-- null,
-- (0, import_react25.createElement)("div", { className: "bt-menu-sep", role: "separator" }),
-- (0, import_react25.createElement)("div", { className: "bt-model-group", role: "presentation" }, t("Thinking level")),
-- effortRows(reasoning).map((row) => (0, import_react25.createElement)(
-- "button",
-- {
-- key: row.effort ?? "default",
++ "div",
++ { className: "bt-effort-bar", role: "group", "aria-label": t("Thinking level") },
++ (0, import_react25.createElement)(
++ "div",
++ { className: "bt-effort-head" },
++ (0, import_react25.createElement)("span", { className: "bt-effort-icon" }, (0, import_react25.createElement)(BoltIcon)),
++ (0, import_react25.createElement)(
++ "div",
++ { className: "bt-effort-copy" },
++ (0, import_react25.createElement)("span", { className: "bt-effort-val" }, active.label),
++ (0, import_react25.createElement)("span", { className: "bt-effort-sub" }, picked === void 0 && hasDefault ? `${t("Thinking level")} · ${t("Default")}` : t("Thinking level"))
++ ),
++ (0, import_react25.createElement)("button", {
type: "button",
-- role: "menuitemradio",
-- "aria-checked": (row.effort ?? null) === (current ?? null),
-- onClick: () => onPick(row.effort)
++ className: "bt-effort-reset",
++ "aria-label": t("Default"),
++ title: t("Default"),
++ disabled: picked === void 0,
++ onClick: () => choose(void 0)
++ }, (0, import_react25.createElement)(ResetIcon))
++ ),
++ (0, import_react25.createElement)(
++ "div",
++ {
++ ref: track,
++ className: "bt-effort-track",
++ role: "slider",
++ tabIndex: 0,
++ "aria-label": t("Thinking level"),
++ "aria-valuemin": 0,
++ "aria-valuemax": stops.length - 1,
++ "aria-valuenow": activeIndex,
++ "aria-valuetext": active.label,
++ style: { "--bt-effort-p": ratio },
++ onPointerDown,
++ onPointerMove,
++ onKeyDown
},
-- (0, import_react25.createElement)("span", { className: "bt-menu-label" }, row.label),
-- (0, import_react25.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, (row.effort ?? null) === (current ?? null) ? (0, import_react25.createElement)(CheckIcon) : null)
-- ))
++ (0, import_react25.createElement)("span", { className: "bt-effort-fill", "aria-hidden": true }),
++ stops.map((stop, index) => {
++ const stopRatio = stops.length <= 1 ? 1 : index / (stops.length - 1);
++ return (0, import_react25.createElement)("span", {
++ key: stop.effort ?? "default",
++ className: "bt-effort-dot",
++ "data-filled": index <= activeIndex || void 0,
++ style: { "--bt-dot-p": stopRatio },
++ title: stop.label,
++ "aria-hidden": true
++ });
++ }),
++ (0, import_react25.createElement)("span", { className: "bt-effort-knob", "aria-hidden": true })
++ )
);
}
function ModelRows({ roster, current, onPick }) {
@@@ -11967,12 -12499,12 +12644,12 @@@ function ModelMenu({ bot, roster, actio
else if (ref !== current || !bot.model) void run2(actions.updateBot(bot.id, { model: ref }));
};
const pickEffort = (effort) => {
-- close();
if (onPickEffort) onPickEffort(effort);
else if (effort !== bot.effort) void run2(actions.updateBot(bot.id, { effort: effort ?? null }));
};
const models = roster.models ?? [];
const manage = manageModels(actions);
++ const hasEfforts = withEfforts && effortStops(reasoning).length > 0;
return (0, import_react25.createElement)(
import_react25.Fragment,
null,
@@@ -12000,13 -12532,13 +12677,21 @@@
shownPlace ? (0, import_react_dom6.createPortal)((0, import_react25.createElement)(
"div",
{ ref: menu, className: `bt-menu bt-model-menu${shownPlace.bottom !== void 0 ? " bt-menu-up" : ""}`, role: "menu", "aria-label": t("Model for {name}", { name: bot.name }), style: shownPlace, "data-leaving": leaving || void 0 },
-- models.length > 0 ? (0, import_react25.createElement)(ModelRows, { roster, current, onPick: pick2 }) : (0, import_react25.createElement)("div", { className: "bt-model-none" }, t("No models are set up in DeepSeek Harness yet.")),
- effortRows(reasoning).length > 0 ? (0, import_react25.createElement)(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null,
- withEfforts && effortRows(reasoning).length > 0 ? (0, import_react25.createElement)(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null,
-- manage ? (0, import_react25.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null,
-- manage ? (0, import_react25.createElement)("button", { type: "button", role: "menuitem", onClick: () => {
-- close();
-- manage();
-- } }, (0, import_react25.createElement)(SlidersIcon), (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Models and providers…"))) : null
++ (0, import_react25.createElement)(
++ "div",
++ { className: "bt-model-scroll" },
++ models.length > 0 ? (0, import_react25.createElement)(ModelRows, { roster, current, onPick: pick2 }) : (0, import_react25.createElement)("div", { className: "bt-model-none" }, t("No models are set up in DeepSeek Harness yet."))
++ ),
++ hasEfforts || manage ? (0, import_react25.createElement)(
++ "div",
++ { className: "bt-model-foot" },
++ hasEfforts ? (0, import_react25.createElement)(EffortBar, { reasoning, current: picked, onPick: pickEffort }) : null,
++ hasEfforts && manage ? (0, import_react25.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null,
++ manage ? (0, import_react25.createElement)("button", { type: "button", role: "menuitem", onClick: () => {
++ close();
++ manage();
++ } }, (0, import_react25.createElement)(SlidersIcon), (0, import_react25.createElement)("span", { className: "bt-menu-label" }, t("Models and providers…"))) : null
++ ) : null
), document.body) : null
);
}
@@@ -12143,6 -12687,6 +12840,25 @@@ var MODEL_CSS =
.bt-model-caret{flex:none;color:var(--bt-ink-3);transition:${spring(SPRING_SHAPE, "transform")}}
.bt-model-trigger[aria-expanded=true] .bt-model-caret{transform:rotate(180deg)}
.bt-model-menu{overflow-y:auto;scrollbar-width:thin}
++.bt-model-menu:not(.bt-folder-menu){padding:0;overflow:hidden;display:flex;flex-direction:column;gap:0}
++.bt-model-scroll{flex:1 1 auto;min-height:0;overflow-y:auto;scrollbar-width:thin;overscroll-behavior:contain;padding:6px;display:flex;flex-direction:column;gap:2px}
++.bt-model-foot{flex:none;display:flex;flex-direction:column;gap:2px;padding:6px;border-top:.5px solid var(--bt-line-2);background:color-mix(in srgb,var(--bt-main) 45%,transparent)}
++.bt-effort-bar{display:flex;flex-direction:column;gap:8px;padding:6px 6px 8px}
++.bt-effort-head{display:flex;align-items:center;justify-content:space-between;gap:8px}
++.bt-effort-icon,.bt-menu button.bt-effort-reset{flex:none;width:24px;height:24px;min-height:0;padding:0;display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink-3)}
++.bt-menu button.bt-effort-reset{border:0;border-radius:6px;background:none;cursor:pointer;transition:background-color .12s ease,color .12s ease,opacity .12s ease}
++.bt-menu button.bt-effort-reset:hover:not(:disabled){background:var(--bt-hover);color:var(--bt-ink)}
++.bt-menu button.bt-effort-reset:disabled{opacity:.35;cursor:default;background:none}
++.bt-menu button.bt-effort-reset:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px}
++.bt-effort-copy{flex:1;min-width:0;display:flex;flex-direction:column;align-items:center;text-align:center;gap:1px}
++.bt-effort-val{font-size:13px;line-height:17px;font-weight:600;color:var(--bt-accent);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:100%}
++.bt-effort-sub{font-size:11px;line-height:14px;color:var(--bt-ink-3);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:100%}
++.bt-effort-track{position:relative;height:28px;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:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}
++.bt-effort-fill{position:absolute;left:0;top:0;bottom:0;width:calc(28px + (100% - 28px) * var(--bt-effort-p,0));border-radius:999px;background:var(--bt-accent);transition:${spring(SPRING_TAP, "width")}}
++.bt-effort-dot{position:absolute;top:50%;left:calc(14px + (100% - 28px) * 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) 55%,transparent);pointer-events:none;transition:background-color .12s ease}
++.bt-effort-dot[data-filled]{background:color-mix(in srgb,var(--bt-accent-ink) 60%,transparent)}
++.bt-effort-knob{position:absolute;top:3px;left:calc(14px + (100% - 28px) * var(--bt-effort-p,0) - 11px);width:22px;height:22px;border-radius:50%;background:var(--bt-accent-ink);box-shadow:0 1px 4px rgba(0,0,0,.22);pointer-events:none;transition:${spring(SPRING_TAP, "left")}}
.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}
.bt-model-group:first-child{padding-top:2px}
.bt-model-tick{flex:none;width:16px;height:16px;display:inline-flex;color:var(--bt-ink-2)}
@@@ -12170,21 -12719,464 +12891,464 @@@
@keyframes bt-model-in{from{opacity:0;transform:translateY(6px)}}
.bt-model-spin{flex:none;width:14px;height:14px;border-radius:50%;border:1.5px solid var(--bt-line-2);border-top-color:var(--bt-ink-2);animation:bt-model-spin .7s linear infinite}
@keyframes bt-model-spin{to{transform:rotate(360deg)}}
--@media (prefers-reduced-motion:reduce){.bt-model-dock{animation:none}.bt-model-spin{animation-duration:2s}.bt-model-caret{transition:none}.bt-model-tick svg{animation:none}}
++@media (prefers-reduced-motion:reduce){.bt-model-dock{animation:none}.bt-model-spin{animation-duration:2s}.bt-model-caret,.bt-effort-fill,.bt-effort-knob{transition:none}.bt-model-tick svg{animation:none}}
`;
+ // src/client/turn-error.js
+ var import_react26 = require("react");
+ var OFFICIAL = "deepseek-official";
+ var ACCOUNT = "deepseek-account";
+ var TOP_UP_URL = "https://platform.deepseek.com/top_up";
+ var ACCOUNT_MODELS_WAIT_MS = 2e4;
+ var SIGNED_OUT = /* @__PURE__ */ new Set(["ACCOUNT_SIGN_IN_REQUIRED", "ACCOUNT_SIGNED_OUT", "ACCOUNT_TOKEN_INVALID"]);
+ var KEY_CODES = /* @__PURE__ */ new Set(["MISSING_CREDENTIAL", "INVALID_CREDENTIAL", "AUTH"]);
+ var CREDENTIAL_CODES = /* @__PURE__ */ new Set([...KEY_CODES, ...SIGNED_OUT]);
+ function failureText2(code, { name, provider, status }) {
+ switch (code) {
+ case "MISSING_CREDENTIAL":
+ return t("{name}'s model has no API key yet.", { name });
+ case "INVALID_CREDENTIAL":
+ return t("This API key is not in the right format.");
+ case "AUTH":
+ return status === void 0 ? t("{provider} did not accept the current API key.", { provider }) : t("{provider} did not accept the current API key ({status}).", { provider, status });
+ case "QUOTA":
+ return status === void 0 ? t("{provider} is out of balance or quota.", { provider }) : t("{provider} is out of balance or quota ({status}).", { provider, status });
+ case "ACCOUNT_QUOTA":
+ return t("The DeepSeek account balance is too low.");
+ case "ACCOUNT_SIGN_IN_REQUIRED":
+ case "ACCOUNT_SIGNED_OUT":
+ case "ACCOUNT_TOKEN_INVALID":
+ return t("The DeepSeek account sign-in has expired.");
+ case "TRANSPORT":
+ case "TIMEOUT":
+ return t("Could not reach the model service.");
+ case "RATE_LIMIT":
+ return t("Too many requests. Wait a moment, then try again.");
+ case "SERVER":
+ return t("The model service failed.");
+ case "INTERRUPTED":
+ return t("DeepSeek Harness stopped before this turn finished.");
+ default:
+ return knownFailure(code) ?? t("This turn failed.");
+ }
+ }
+ function fixesFor(code, { canSignIn, official, topUp, onAccount = false }) {
+ if (onAccount && KEY_CODES.has(code)) return [];
+ if (SIGNED_OUT.has(code)) return canSignIn ? ["sign-in-again"] : ["model"];
+ switch (code) {
+ case "MISSING_CREDENTIAL":
+ return ["key", canSignIn ? "sign-in" : null, "model"].filter(Boolean);
+ case "INVALID_CREDENTIAL":
+ return ["rekey", "model"];
+ case "AUTH":
+ return ["rekey", canSignIn ? "use-account" : null, "model"].filter(Boolean);
+ case "QUOTA":
+ return official ? ["top-up"] : [];
+ case "ACCOUNT_QUOTA":
+ return topUp ? ["top-up"] : [];
+ default:
+ return [];
+ }
+ }
+ var retryShown = (code, blocked) => !CREDENTIAL_CODES.has(code) || blocked === void 0;
+ var FIX_LABELS = {
+ key: () => t("Enter API key"),
+ rekey: () => t("Enter the key again"),
+ "sign-in": (signedIn) => signedIn ? t("Use the DeepSeek account") : t("Sign in with a DeepSeek account"),
+ "use-account": () => t("Use a DeepSeek account instead"),
+ "sign-in-again": () => t("Sign in again"),
+ model: () => t("Pick another model"),
+ "top-up": () => t("Top up ↗")
+ };
+ var NO_SUBSCRIBE2 = () => () => {
+ };
+ var NO_VIEW = () => null;
+ function useAccountView(actions) {
+ const entry = actions.signInEntry?.() ?? null;
+ const ops = (0, import_react26.useMemo)(() => entry?.inject?.() ?? {}, [entry]);
+ const source = ops.hooks?.account;
+ const read = source ? () => source.getSnapshot()?.view ?? null : NO_VIEW;
+ return (0, import_react26.useSyncExternalStore)(source?.subscribe ?? NO_SUBSCRIBE2, read, read);
+ }
+ var topUpOf = (view) => {
+ const url = view?.links?.topUpUrl;
+ return typeof url === "string" && url.startsWith("https://") ? url : void 0;
+ };
+ function accountModel(roster) {
+ const models = (roster.models ?? []).filter((model) => model.provider === ACCOUNT);
+ return (models.find((model) => model.ref === roster.defaultModel) ?? models[0])?.ref;
+ }
+ var providerOf = (bot, roster) => {
+ const ref = bot?.model ?? bot?.appliedModel;
+ if (!ref) return void 0;
+ return (roster.models ?? []).find((model) => model.ref === ref)?.provider ?? ref.split("/")[0];
+ };
+ var KNOWN_PROVIDERS = { "deepseek-official": "DeepSeek", "deepseek-account": "DeepSeek account" };
+ var providerName = (roster, provider) => provider === void 0 ? t("The model service") : (roster.models ?? []).find((model) => model.provider === provider)?.providerName ?? (KNOWN_PROVIDERS[provider] ? t(KNOWN_PROVIDERS[provider]) : provider);
+ function failureFacts(data, blocked) {
+ const facts = [];
+ if (data.code) facts.push(["Code", t("Code"), data.code]);
+ if (blocked?.status !== void 0) facts.push(["HTTP status", t("HTTP status"), String(blocked.status)]);
+ if (blocked?.requestId) facts.push(["Request ID", t("Request ID"), blocked.requestId]);
+ if (data.code !== "AUTH" && data.message) facts.push(["Message", t("Provider message"), data.message]);
+ return facts;
+ }
+ function TechnicalDetails({ facts }) {
+ const [copied, setCopied] = (0, import_react26.useState)(false);
+ if (facts.length === 0) return null;
+ const copy2 = () => {
+ const text = facts.map(([name, , value]) => `${name}: ${value}`).join("\n");
+ void navigator.clipboard?.writeText(text).then(() => {
+ setCopied(true);
+ setTimeout(() => setCopied(false), 1e3);
+ }).catch(() => {
+ });
+ };
+ return (0, import_react26.createElement)(
+ "details",
+ { className: "bt-fail-tech" },
+ (0, import_react26.createElement)("summary", null, t("Technical details")),
+ (0, import_react26.createElement)("dl", null, facts.map(([name, label, value]) => [(0, import_react26.createElement)("dt", { key: `${name}:t` }, label), (0, import_react26.createElement)("dd", { key: `${name}:d` }, value)])),
+ (0, import_react26.createElement)("button", { type: "button", className: "bt-mini bt-fail-copy", onClick: copy2 }, copied ? (0, import_react26.createElement)(CheckIcon) : (0, import_react26.createElement)(CopyIcon), copied ? t("Copied") : t("Copy"))
+ );
+ }
+ function FailureCell({ node, sessionId, useRoster, useTurnClock, actions }) {
+ const roster = useRoster((value) => value);
+ const data = node?.data ?? {};
+ const bot = roster.byId?.[sessionId];
+ const later = useTurnClock((state) => Object.keys(state[sessionId] ?? {}).some((turn) => Number(turn) > data.turn));
+ const account = useAccountView(actions);
+ const signedIn = account?.status === "credential-stored";
+ const topUp = topUpOf(account);
+ const [keying, setKeying] = (0, import_react26.useState)(false);
+ const [retry, setRetry] = (0, import_react26.useState)("idle");
+ const [error, setError] = (0, import_react26.useState)("");
+ const [joining, setJoining] = (0, import_react26.useState)(null);
+ const blocked = bot?.blocked?.code === data.code ? bot.blocked : void 0;
+ const provider = blocked?.provider ?? providerOf(bot, roster);
+ const text = failureText2(data.code, { name: bot?.name ?? t("This Bot"), provider: providerName(roster, provider), status: blocked?.status });
+ const facts = failureFacts(data, blocked);
+ const current = bot !== void 0 && currentPart(bot) === sessionId && !later;
+ const moveToAccount = () => {
+ const model = accountModel(roster);
+ if (model === void 0) {
+ actions.showDetails?.(sessionId);
+ return;
+ }
+ if (model === bot.model) return;
+ setError("");
+ void Promise.resolve(actions.updateBot(bot.id, { model })).catch((failure) => setError(hostText(failure?.message ?? String(failure))));
+ };
+ const listed = accountModel(roster);
+ (0, import_react26.useEffect)(() => {
+ if (joining === null || !signedIn) return void 0;
+ if (bot === void 0 || bot.model !== joining.from) {
+ setJoining(null);
+ return void 0;
+ }
+ if (listed !== void 0) {
+ setJoining(null);
+ moveToAccount();
+ return void 0;
+ }
+ void actions.refreshModels?.();
+ const timer = setTimeout(() => {
+ setJoining(null);
+ actions.showDetails?.(sessionId);
+ }, ACCOUNT_MODELS_WAIT_MS);
+ return () => clearTimeout(timer);
+ }, [joining, signedIn, listed]);
+ const settled = () => (0, import_react26.createElement)(
+ "div",
+ { className: "bt-fail", "data-settled": "", role: "status" },
+ (0, import_react26.createElement)("div", { className: "bt-fail-head" }, (0, import_react26.createElement)("span", { className: "bt-fail-dot", "aria-hidden": true }), (0, import_react26.createElement)("span", { className: "bt-fail-text" }, text)),
+ (0, import_react26.createElement)(TechnicalDetails, { facts })
+ );
+ if (!current) return settled();
+ const official = provider === OFFICIAL;
+ const canSignIn = typeof actions.signIn === "function" && actions.canSignIn?.() === true;
+ const keyHere = typeof actions.setProviderKey === "function" && provider !== void 0;
+ const keyElsewhere = official && actions.openHarnessOnboarding ? () => actions.openHarnessOnboarding(OFFICIAL) : manageModels(actions);
+ const viaAccount = () => {
+ if (signedIn) {
+ moveToAccount();
+ return;
+ }
+ setJoining({ from: bot.model });
+ actions.signIn();
+ };
+ const runs = {
+ key: keyHere ? () => setKeying((value) => !value) : keyElsewhere,
+ rekey: keyHere ? () => setKeying((value) => !value) : keyElsewhere,
+ "sign-in": viaAccount,
+ "use-account": viaAccount,
+ "sign-in-again": () => actions.signIn(),
+ model: actions.showDetails ? () => actions.showDetails(sessionId) : void 0
+ };
+ const fixes = fixesFor(data.code, { canSignIn, official, topUp: topUp !== void 0, onAccount: provider === ACCOUNT }).filter((fix) => fix === "top-up" || runs[fix] !== void 0);
+ const asked = isHiddenTurn(roster, sessionId, data.turn);
+ const retrying = !asked && typeof actions.resume === "function" && retryShown(data.code, blocked);
+ const retryFirst = retrying && (fixes.length === 0 || CREDENTIAL_CODES.has(data.code));
+ const resume = () => {
+ setRetry("busy");
+ setError("");
+ void Promise.resolve(actions.resume(bot.id)).then(() => setRetry("sent"), (failure) => {
+ setRetry("idle");
+ setError(hostText(failure?.message ?? String(failure)));
+ });
+ };
+ const button = (fix, primary) => {
+ const className = primary ? "bt-send bt-fail-go" : "bt-soft bt-soft-sm";
+ if (fix === "top-up") {
+ return (0, import_react26.createElement)("a", { key: fix, className: `${className} bt-fail-link`, href: data.code === "ACCOUNT_QUOTA" ? topUp : TOP_UP_URL, target: "_blank", rel: "noopener noreferrer" }, FIX_LABELS[fix]());
+ }
+ const toggles = keyHere && (fix === "key" || fix === "rekey");
+ return (0, import_react26.createElement)("button", { key: fix, type: "button", className, "aria-expanded": toggles ? keying : void 0, onClick: () => runs[fix]() }, FIX_LABELS[fix](signedIn));
+ };
+ const retryButton = (primary) => (0, import_react26.createElement)("button", { key: "retry", type: "button", className: primary ? "bt-send bt-fail-go" : "bt-soft bt-soft-sm", disabled: retry !== "idle", onClick: resume }, retry === "idle" ? t("Retry") : t("Retrying…"));
+ const row = retryFirst ? [retryButton(true), ...fixes.map((fix) => button(fix, false))] : [...fixes.map((fix, index) => button(fix, index === 0)), retrying ? retryButton(false) : null];
+ if (!row.some(Boolean)) return settled();
+ return (0, import_react26.createElement)(
+ "div",
+ { className: "bt-fail", role: "status" },
+ (0, import_react26.createElement)("div", { className: "bt-fail-head" }, (0, import_react26.createElement)("span", { className: "bt-fail-dot", "aria-hidden": true }), (0, import_react26.createElement)("span", { className: "bt-fail-text" }, text)),
+ (0, import_react26.createElement)("div", { className: "bt-fail-actions" }, row),
+ keying && keyHere ? (0, import_react26.createElement)(ModelKeyCard, { model: { provider, providerName: providerName(roster, provider) }, actions, onSaved: () => setKeying(false) }) : null,
+ error ? (0, import_react26.createElement)("div", { className: "bt-fail-error", role: "alert" }, error) : null,
+ (0, import_react26.createElement)(TechnicalDetails, { facts })
+ );
+ }
+ var TURN_ERROR_CSS = `
+ .bt-fail{display:flex;flex-direction:column;gap:10px;margin:4px 0 6px;width:max-content;max-width:min(550px,86%);padding:12px 14px;border-radius:16px;background:var(--bt-card);box-shadow:inset 0 0 0 1px var(--bt-line);box-sizing:border-box;color:var(--bt-ink);font-size:14px;line-height:20px}
+ .bt-fail[data-settled]{gap:4px;padding:2px 0;background:none;box-shadow:none;color:var(--bt-ink-2);font-size:13px;line-height:18px}
+ .bt-fail-head{display:flex;align-items:flex-start;gap:8px;min-width:0}
+ .bt-fail-dot{flex:none;width:7px;height:7px;margin-top:6.5px;border-radius:50%;background:var(--bt-danger)}
+ .bt-fail[data-settled] .bt-fail-dot{margin-top:5.5px}
+ .bt-fail-text{min-width:0;overflow-wrap:anywhere}
+ .bt-fail-actions{display:flex;flex-wrap:wrap;align-items:center;gap:8px;margin-left:15px}
+ .bt-fail-actions .bt-fail-go{height:28px;padding:0 12px;font:inherit;font-size:12px}
+ .bt-fail-link{display:inline-flex;align-items:center;box-sizing:border-box;text-decoration:none}
+ .bt-fail:has(.bt-model-key){width:min(480px,86%)}
+ .bt-fail .bt-q.bt-model-key{margin:0 0 0 15px;width:auto;padding:0;background:none;box-shadow:none;border-radius:0;animation:none}
+ .bt-fail-error{margin-left:15px;font-size:12px;line-height:17px;color:var(--bt-danger);overflow-wrap:anywhere}
+ .bt-fail-tech{margin-left:15px;font-size:12px;line-height:17px;color:var(--bt-ink-2)}
+ .bt-fail-tech summary{width:max-content;cursor:pointer;color:var(--bt-ink-3)}
+ .bt-fail-tech summary:hover{color:var(--bt-ink-2)}
+ .bt-fail-tech dl{display:grid;grid-template-columns:auto minmax(0,1fr);gap:2px 10px;margin:6px 0}
+ .bt-fail-tech dt{color:var(--bt-ink-3)}
+ .bt-fail-tech dd{margin:0;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px;overflow-wrap:anywhere;white-space:pre-wrap;user-select:text}
+ .bt-fail-copy{display:inline-flex;align-items:center;gap:4px}
+ .bt-fail-copy svg{width:13px;height:13px}
+ `;
+
+ // src/client/palette.js
+ var import_react27 = require("react");
+ var PALETTE_EXIT_MS = 160;
+ function CommandPalette({ start, token, roster, actions, useSessions }) {
+ const [query, setQuery] = (0, import_react27.useState)(start ?? "");
+ const [cursor, setCursor] = (0, import_react27.useState)(0);
+ const [leaving, setLeaving] = (0, import_react27.useState)(false);
+ const wanted = query.trim().toLowerCase();
+ const close = () => {
+ if (leaving) return;
+ setLeaving(true);
+ setTimeout(() => actions.closePalette(token), PALETTE_EXIT_MS);
+ };
+ useEscape(close);
+ const ids = [...roster.bots.map(currentPart), ...roster.rooms.map((item) => item.id)];
+ const found = useSessions((list) => {
+ if (wanted.length < 2) return "[]";
+ const hits = [];
+ for (const id of ids) {
+ const outline = list.projectionsBySession?.[id]?.values?.turnOutline ?? list.byId[id]?.projectionValues?.turnOutline;
+ if (!Array.isArray(outline)) continue;
+ const hidden = roster.exchangeTurns[id] ?? [];
+ for (let index2 = outline.length - 1; index2 >= 0 && hits.length < 30; index2 -= 1) {
+ const entry = outline[index2];
+ if (hidden.includes(entry.turn)) continue;
+ for (const raw of [entry.response, entry.prompt]) {
+ const text = stripHeader(raw ?? "").replace(/\s+/g, " ").trim();
+ const at = text.toLowerCase().indexOf(wanted);
+ if (at < 0) continue;
+ const from = Math.max(0, at - 24);
+ hits.push([id, entry.turn, (from > 0 ? "…" : "") + text.slice(from, at + wanted.length + 60)]);
+ break;
+ }
+ }
+ }
+ return JSON.stringify(hits);
+ });
+ const matchesName = (...fields) => wanted === "" || fields.some((field) => (field ?? "").toLowerCase().includes(wanted));
+ const sections = [];
+ const people = [
+ ...roster.bots.filter((bot) => matchesName(bot.name, bot.role)).map((bot) => ({
+ key: bot.id,
+ avatar: (0, import_react27.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }),
+ title: bot.name,
+ subtitle: [bot.role, isMainOf(roster, bot.id) ? t("Main Bot") : ""].filter(Boolean).join(" · "),
+ badge: bot.hidden ? t("Hidden") : void 0,
+ run: async () => {
+ if (bot.hidden) await actions.setFlags(bot.id, { hidden: false });
+ actions.openSession(bot.id);
+ }
+ })),
+ ...roster.rooms.filter((room2) => matchesName(room2.name)).map((room2) => ({
+ key: room2.id,
+ avatar: (0, import_react27.createElement)(RoomAvatar, { room: room2, roster, size: 24 }),
+ title: room2.name,
+ subtitle: t("{count} members", { count: room2.members.length }),
+ badge: room2.hidden ? t("Hidden") : void 0,
+ run: async () => {
+ if (room2.hidden) await actions.setFlags(room2.id, { hidden: false });
+ actions.openSession(room2.id);
+ }
+ }))
+ ];
+ if (people.length) sections.push([t("Bots"), people]);
+ const agents = (roster.agents ?? []).filter(() => matchesName("DSH Agent")).map((agent) => ({
+ key: agent.id,
+ avatar: (0, import_react27.createElement)("span", { className: "bt-palette-agent" }, (0, import_react27.createElement)(import_dsh_client_ui_primitives.FishLogo, { size: 18 })),
+ title: "DSH Agent",
+ subtitle: t("Plain dsh session"),
+ run: () => actions.openAgent(agent.id)
+ }));
+ if (agents.length) sections.push(["DSH Agent", agents]);
+ const messages = JSON.parse(found).map(([id, turn, snippet]) => {
+ const bot = roster.byId[id];
+ const room2 = roster.roomsById[id];
+ return {
+ key: `${id}:${turn}`,
+ title: bot?.name ?? room2?.name ?? t("Bot"),
+ subtitle: snippet,
+ avatar: bot ? (0, import_react27.createElement)(BotAvatar, { bot, size: 24, badge: false, live: false }) : (0, import_react27.createElement)(RoomAvatar, { room: room2, roster, size: 24 }),
+ run: () => actions.openSession(id)
+ };
+ });
+ if (messages.length) sections.push([t("Messages"), messages]);
+ const commands = [
+ { key: "cmd:new", icon: (0, import_react27.createElement)(PlusIcon), title: t("New chat"), run: () => actions.openNewChat("new") },
+ { key: "cmd:bot", icon: (0, import_react27.createElement)(PlusIcon), title: t("Create Bot"), run: () => actions.openNewChat("create") },
+ { key: "cmd:group", icon: (0, import_react27.createElement)(PeopleIcon), title: t("Create group chat"), run: () => actions.openNewChat("group") },
+ { key: "cmd:settings", icon: (0, import_react27.createElement)(GearIcon), title: t("Bot settings"), run: () => actions.openSettings("general") }
+ ].filter((command) => matchesName(command.title));
+ if (commands.length) sections.push([t("Commands"), commands]);
+ const rows2 = sections.flatMap(([, items]) => items);
+ const active = Math.min(cursor, Math.max(rows2.length - 1, 0));
+ const shown = rows2.map((row) => row.key).join("\n");
+ const glide = useGlide(`${active}
+ ${shown}`, { axis: "y", ...QUICK_EDGES });
+ const listRef = glide.box;
+ useFlip(listRef, shown, "[data-flip]");
+ (0, import_react27.useEffect)(() => {
+ listRef.current?.querySelector("[aria-selected=true]")?.scrollIntoView({ block: "nearest" });
+ }, [active, query]);
+ const choose = (row) => {
+ if (!row || leaving) return;
+ void Promise.resolve(row.run()).catch((error) => actions.reportError(error, "menu"));
+ close();
+ };
+ let index = -1;
+ return (0, import_react27.createElement)(
+ "div",
+ { className: "bt-palette-layer", "data-leaving": leaving || void 0 },
+ (0, import_react27.createElement)("div", { className: "bt-backdrop", onMouseDown: close }),
+ (0, import_react27.createElement)(
+ "div",
+ { className: "bt-palette", role: "dialog", "aria-label": t("Search"), "aria-modal": true },
+ (0, import_react27.createElement)(
+ "div",
+ { className: "bt-palette-head" },
+ (0, import_react27.createElement)("span", { className: "bt-palette-glyph", "aria-hidden": true }, (0, import_react27.createElement)(SearchIcon)),
+ (0, import_react27.createElement)("input", {
+ autoFocus: true,
+ value: query,
+ placeholder: t("Search Bots, chats and messages"),
+ "aria-label": t("Search"),
+ role: "combobox",
+ "aria-expanded": true,
+ "aria-controls": "bt-palette-list",
+ onChange: (event) => {
+ setQuery(event.target.value);
+ setCursor(0);
+ },
+ onKeyDown: (event) => {
+ if (event.nativeEvent.isComposing) return;
+ if (event.key === "ArrowDown") {
+ event.preventDefault();
+ setCursor(Math.min(active + 1, rows2.length - 1));
+ } else if (event.key === "ArrowUp") {
+ event.preventDefault();
+ setCursor(Math.max(active - 1, 0));
+ } else if (event.key === "Enter") {
+ event.preventDefault();
+ choose(rows2[active]);
+ }
+ }
+ }),
+ query ? (0, import_react27.createElement)("button", { type: "button", className: "bt-palette-clear", "aria-label": t("Clear search"), onClick: () => {
+ setQuery("");
+ setCursor(0);
+ } }, (0, import_react27.createElement)(CloseIcon)) : null
+ ),
+ (0, import_react27.createElement)(
+ "div",
+ { ref: listRef, id: "bt-palette-list", className: "bt-palette-list", role: "listbox", "aria-label": t("Results") },
+ (0, import_react27.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }),
+ rows2.length === 0 ? (0, import_react27.createElement)(
+ "div",
+ { className: "bt-palette-empty" },
+ (0, import_react27.createElement)("span", { className: "bt-palette-empty-icon", "aria-hidden": true }, (0, import_react27.createElement)(SearchIcon)),
+ (0, import_react27.createElement)("span", { className: "bt-palette-empty-label" }, t("No results")),
+ (0, import_react27.createElement)("span", { className: "bt-palette-empty-hint" }, t("Try a Bot name or words from a message"))
+ ) : sections.map(([title, items]) => (0, import_react27.createElement)(
+ import_react27.Fragment,
+ { key: title },
+ (0, import_react27.createElement)("div", { className: "bt-palette-section", role: "presentation", "data-flip": `section:${title}` }, title),
+ items.map((row) => {
+ index += 1;
+ const at = index;
+ return (0, import_react27.createElement)(
+ "button",
+ {
+ key: row.key,
+ type: "button",
+ role: "option",
+ className: "bt-palette-row",
+ "aria-selected": at === active,
+ "data-flip": row.key,
+ onMouseMove: () => {
+ if (cursor !== at) setCursor(at);
+ },
+ onClick: () => choose(row)
+ },
+ (0, import_react27.createElement)("span", { className: "bt-palette-lead" }, row.avatar ?? (0, import_react27.createElement)("span", { className: "bt-palette-cmd" }, row.icon)),
+ (0, import_react27.createElement)(
+ "span",
+ { className: "bt-palette-text" },
+ (0, import_react27.createElement)("span", { className: "bt-palette-title" }, row.title),
+ row.subtitle ? (0, import_react27.createElement)("span", { className: "bt-palette-sub" }, row.subtitle) : null
+ ),
+ row.badge ? (0, import_react27.createElement)("span", { className: "bt-palette-badge" }, row.badge) : null
+ );
+ })
+ ))
+ )
+ )
+ );
+ }
+
// src/client/folder-menu.js
- var import_react26 = require("react");
+ var import_react28 = require("react");
var import_react_dom7 = require("react-dom");
var folderName = (path) => String(path).replace(/[\\/]+$/, "").split(/[\\/]/).pop() || String(path);
- var Tick = ({ on }) => (0, import_react26.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, on ? (0, import_react26.createElement)(CheckIcon) : null);
+ var Tick = ({ on }) => (0, import_react28.createElement)("span", { className: "bt-model-tick", "aria-hidden": true }, on ? (0, import_react28.createElement)(CheckIcon) : null);
function FolderMenu({ value, group = false, team = false, actions, run: run2, onPick, wide = false, disabled = false }) {
const { isOpen, shownPlace, leaving, button, menu, open, close } = useAnchoredMenu();
- const [info, setInfo] = (0, import_react26.useState)(null);
- const [view, setView] = (0, import_react26.useState)("list");
- const [draft, setDraft] = (0, import_react26.useState)("");
- const [listing, setListing] = (0, import_react26.useState)(null);
- const [problem, setProblem] = (0, import_react26.useState)("");
+ const [info, setInfo] = (0, import_react28.useState)(null);
+ const [view, setView] = (0, import_react28.useState)("list");
+ const [draft, setDraft] = (0, import_react28.useState)("");
+ const [listing, setListing] = (0, import_react28.useState)(null);
+ const [problem, setProblem] = (0, import_react28.useState)("");
const fallback = group ? t("Each Bot's own folder") : t("Team workspace");
const toggle = () => {
if (isOpen) {
@@@ -12726,62 -13731,62 +13903,62 @@@ function CapabilityForm({ draft, setDra
}
};
const available = items.filter((item) => item.name !== draft.name && ["mcp", "skill"].includes(item.kind));
- return (0, import_react28.createElement)(
+ return (0, import_react30.createElement)(
"form",
- { className: "bt-connector-form", onSubmit: submit },
+ { className: "bt-set-card bt-task-form", onSubmit: submit },
- (0, import_react28.createElement)(Field, { label: "Name", value: draft.name, disabled: draft.originalName !== void 0, onChange: (value) => set("name", value), placeholder: "my-tool" }),
- (0, import_react28.createElement)(
+ (0, import_react30.createElement)(Field, { label: "Name", value: draft.name, disabled: draft.originalName !== void 0, onChange: (value) => set("name", value), placeholder: "my-tool" }),
+ (0, import_react30.createElement)(
"label",
- { className: "bt-set-row bt-bs-row bt-bs-stack" },
+ { className: "bt-set-row bt-bs-row" },
- (0, import_react28.createElement)("span", { className: "bt-set-copy" }, (0, import_react28.createElement)("span", { className: "bt-bs-label" }, t("Type"))),
- (0, import_react28.createElement)(
+ (0, import_react30.createElement)("span", { className: "bt-set-copy" }, (0, import_react30.createElement)("span", { className: "bt-bs-label" }, t("Type"))),
+ (0, import_react30.createElement)(
"select",
- { className: "bt-input", value: draft.kind, disabled: draft.originalName !== void 0, onChange: (event) => set("kind", event.target.value) },
+ { className: "bt-select bt-task-bot", value: draft.kind, disabled: draft.originalName !== void 0, onChange: (event) => set("kind", event.target.value) },
- ["mcp", "skill", "pack"].map((kind) => (0, import_react28.createElement)("option", { key: kind, value: kind }, t(kind === "mcp" ? "MCP server" : kind === "skill" ? "Skill" : "Pack")))
+ ["mcp", "skill", "pack"].map((kind) => (0, import_react30.createElement)("option", { key: kind, value: kind }, t(kind === "mcp" ? "MCP server" : kind === "skill" ? "Skill" : "Pack")))
)
),
- (0, import_react28.createElement)(Field, { label: "Description", value: draft.description, onChange: (value) => set("description", value) }),
- draft.kind === "mcp" ? (0, import_react28.createElement)(
+ (0, import_react30.createElement)(Field, { label: "Description", value: draft.description, onChange: (value) => set("description", value) }),
+ draft.kind === "mcp" ? (0, import_react30.createElement)(
"label",
- { className: "bt-set-row bt-bs-row bt-bs-stack" },
+ { className: "bt-set-row bt-bs-row" },
- (0, import_react28.createElement)("span", { className: "bt-set-copy" }, (0, import_react28.createElement)("span", { className: "bt-bs-label" }, t("Connection"))),
- (0, import_react28.createElement)(
+ (0, import_react30.createElement)("span", { className: "bt-set-copy" }, (0, import_react30.createElement)("span", { className: "bt-bs-label" }, t("Connection"))),
+ (0, import_react30.createElement)(
"select",
- { className: "bt-input", value: draft.transport, onChange: (event) => set("transport", event.target.value) },
+ { className: "bt-select bt-task-bot", value: draft.transport, onChange: (event) => set("transport", event.target.value) },
- (0, import_react28.createElement)("option", { value: "stdio" }, t("Local command")),
- (0, import_react28.createElement)("option", { value: "streamable-http" }, t("HTTP server"))
+ (0, import_react30.createElement)("option", { value: "stdio" }, t("Local command")),
+ (0, import_react30.createElement)("option", { value: "streamable-http" }, t("HTTP server"))
)
) : null,
- draft.kind === "mcp" && draft.transport === "stdio" ? (0, import_react28.createElement)(
- import_react28.Fragment,
+ draft.kind === "mcp" && draft.transport === "stdio" ? (0, import_react30.createElement)(
- "div",
++ import_react30.Fragment,
null,
- (0, import_react28.createElement)(Field, { label: "Command", value: draft.command, onChange: (value) => set("command", value) }),
- (0, import_react28.createElement)(Field, { label: "Arguments (one per line)", value: draft.argsText, onChange: (value) => set("argsText", value), multiline: true }),
- (0, import_react28.createElement)(Field, { label: "Environment (JSON)", value: draft.envText, onChange: (value) => set("envText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') })
+ (0, import_react30.createElement)(Field, { label: "Command", value: draft.command, onChange: (value) => set("command", value) }),
+ (0, import_react30.createElement)(Field, { label: "Arguments (one per line)", value: draft.argsText, onChange: (value) => set("argsText", value), multiline: true }),
+ (0, import_react30.createElement)(Field, { label: "Environment (JSON)", value: draft.envText, onChange: (value) => set("envText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') })
) : null,
- draft.kind === "mcp" && draft.transport === "streamable-http" ? (0, import_react28.createElement)(
- import_react28.Fragment,
+ draft.kind === "mcp" && draft.transport === "streamable-http" ? (0, import_react30.createElement)(
- "div",
++ import_react30.Fragment,
null,
- (0, import_react28.createElement)(Field, { label: "URL", value: draft.url, onChange: (value) => set("url", value) }),
- (0, import_react28.createElement)(Field, { label: "Headers (JSON)", value: draft.headersText, onChange: (value) => set("headersText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') })
+ (0, import_react30.createElement)(Field, { label: "URL", value: draft.url, onChange: (value) => set("url", value) }),
+ (0, import_react30.createElement)(Field, { label: "Headers (JSON)", value: draft.headersText, onChange: (value) => set("headersText", value), multiline: true, placeholder: t('{"API_KEY": "$DSH_SECRET_MY_KEY"}') })
) : null,
- draft.kind === "skill" ? (0, import_react28.createElement)(Field, { label: "Skill instructions", value: draft.content, onChange: (value) => set("content", value), multiline: true }) : null,
- draft.kind === "pack" ? (0, import_react28.createElement)(
- import_react28.Fragment,
+ draft.kind === "skill" ? (0, import_react30.createElement)(Field, { label: "Skill instructions", value: draft.content, onChange: (value) => set("content", value), multiline: true }) : null,
+ draft.kind === "pack" ? (0, import_react30.createElement)(
- "div",
- { className: "bt-set-card" },
++ import_react30.Fragment,
+ null,
- available.length === 0 ? (0, import_react28.createElement)("div", { className: "bt-set-row" }, (0, import_react28.createElement)("span", { className: "bt-set-hint" }, t("Save an MCP server or skill first."))) : available.map((item) => (0, import_react28.createElement)(
+ available.length === 0 ? (0, import_react30.createElement)("div", { className: "bt-set-row" }, (0, import_react30.createElement)("span", { className: "bt-set-hint" }, t("Save an MCP server or skill first."))) : available.map((item) => (0, import_react30.createElement)(
"label",
{ key: item.name, className: "bt-set-row bt-bs-row" },
- (0, import_react28.createElement)("span", { className: "bt-set-copy" }, (0, import_react28.createElement)("span", { className: "bt-bs-label" }, item.name)),
- (0, import_react28.createElement)("input", { type: "checkbox", checked: draft.items.includes(item.name), onChange: (event) => set("items", event.target.checked ? [...draft.items, item.name] : draft.items.filter((name) => name !== item.name)) })
+ (0, import_react30.createElement)("span", { className: "bt-set-copy" }, (0, import_react30.createElement)("span", { className: "bt-bs-label" }, item.name)),
+ (0, import_react30.createElement)("input", { type: "checkbox", checked: draft.items.includes(item.name), onChange: (event) => set("items", event.target.checked ? [...draft.items, item.name] : draft.items.filter((name) => name !== item.name)) })
))
) : null,
- error ? (0, import_react28.createElement)("div", { className: "bt-set-row" }, (0, import_react28.createElement)("span", { className: "bt-danger bt-set-hint", role: "alert" }, error)) : null,
- (0, import_react28.createElement)(
- error ? (0, import_react30.createElement)("div", { className: "bt-connector-error", role: "alert" }, error) : null,
++ error ? (0, import_react30.createElement)("div", { className: "bt-set-row" }, (0, import_react30.createElement)("span", { className: "bt-danger bt-set-hint", role: "alert" }, error)) : null,
+ (0, import_react30.createElement)(
"div",
- { className: "bt-connector-form-row" },
+ { className: "bt-set-row bt-task-foot" },
- (0, import_react28.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onClose }, t("Cancel")),
- (0, import_react28.createElement)("button", { type: "submit", className: "bt-send bt-soft-sm" }, draft.originalName ? t("Save changes") : t("Add capability"))
+ (0, import_react30.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: onClose }, t("Cancel")),
- (0, import_react30.createElement)("button", { type: "submit", className: "bt-soft bt-soft-sm" }, draft.originalName ? t("Save changes") : t("Add capability"))
++ (0, import_react30.createElement)("button", { type: "submit", className: "bt-send bt-soft-sm" }, draft.originalName ? t("Save changes") : t("Add capability"))
)
);
}
@@@ -12837,19 -13842,20 +14014,19 @@@ function CapabilitiesPage({ roster, act
setConfirming("");
void run2(actions.deleteCapability(item.name));
};
- return (0, import_react28.createElement)(
+ return (0, import_react30.createElement)(
"section",
{ className: "bt-set-section" },
- (0, import_react28.createElement)("h3", null, t("Shared capabilities")),
- draft ? (0, import_react28.createElement)(CapabilityForm, { draft, setDraft, items, actions, onClose: () => setDraft(null) }) : (0, import_react28.createElement)(
+ (0, import_react30.createElement)("h3", null, t("Shared capabilities")),
- (0, import_react30.createElement)(
++ draft ? (0, import_react30.createElement)(CapabilityForm, { draft, setDraft, items, actions, onClose: () => setDraft(null) }) : (0, import_react30.createElement)(
"div",
{ className: "bt-actions" },
- (0, import_react28.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: startNew }, t("Add capability"))
+ (0, import_react30.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: startNew }, t("Add capability"))
),
- (0, import_react28.createElement)(
- draft ? (0, import_react30.createElement)(CapabilityForm, { draft, setDraft, items, actions, onClose: () => setDraft(null) }) : null,
+ (0, import_react30.createElement)(
"div",
{ className: "bt-set-card bt-connectors-card" },
- items.length === 0 ? (0, import_react28.createElement)("div", { className: "bt-set-row" }, (0, import_react28.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react28.createElement)(CapabilityRow, {
+ items.length === 0 ? (0, import_react30.createElement)("div", { className: "bt-set-row" }, (0, import_react30.createElement)("span", { className: "bt-set-hint" }, t("No capabilities saved"))) : items.map((item) => (0, import_react30.createElement)(CapabilityRow, {
key: item.name,
item,
confirming: confirming === item.name,
@@@ -13539,15 -14642,15 +14814,15 @@@ function CharacterGrid({ look, hasPhot
title: t(capitalize(color)),
"aria-pressed": look.color === color,
onClick: () => onColor(color)
- }, (0, import_react31.createElement)("span", { style: { background: paintCss(color) } }))))
+ }, (0, import_react33.createElement)("span", { style: { background: paintCss(color) } }))))
);
}
-function AvatarEditor({ bot, actions, run: run2, onClose }) {
+function AvatarEditor({ bot, actions, run: run2, onClose, leaving = false }) {
const look = lookOf(bot);
- const [tab, setTab] = (0, import_react31.useState)(look.image ? "upload" : "bot");
- const [over, setOver] = (0, import_react31.useState)(false);
- const ref = (0, import_react31.useRef)(null);
- const fileRef = (0, import_react31.useRef)(null);
+ const [tab, setTab] = (0, import_react33.useState)(look.image ? "upload" : "bot");
+ const [over, setOver] = (0, import_react33.useState)(false);
+ const ref = (0, import_react33.useRef)(null);
+ const fileRef = (0, import_react33.useRef)(null);
const upload = (file) => {
if (file) void run2(avatarImage(file).then((image) => actions.updateBot(bot.id, { avatar: { ...bot.avatar ?? {}, image } })));
};
@@@ -13583,19 -14686,19 +14858,19 @@@
}, [tab, bot]);
const hasPhoto = Boolean(look.image);
const glide = useGlide(tab);
- return (0, import_react31.createElement)(
+ return (0, import_react33.createElement)(
"div",
- { ref, className: "bt-avedit", role: "dialog", "aria-label": t("Avatar editor") },
+ { ref, className: "bt-avedit", role: "dialog", "aria-label": t("Avatar editor"), "data-leaving": leaving || void 0 },
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
"div",
{ className: "bt-avedit-top" },
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
"div",
{ ref: glide.box, role: "tablist", "aria-label": t("Avatar source"), className: "bt-avedit-tabs" },
- (0, import_react31.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }),
- [["bot", "Bot"], ["upload", "Upload"], ["library", "Library"]].map(([id, label]) => (0, import_react31.createElement)("button", { key: id, type: "button", role: "tab", className: "bt-avedit-tab", "aria-selected": tab === id, onClick: () => setTab(id) }, t(label)))
+ (0, import_react33.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }),
+ [["bot", "Bot"], ["upload", "Upload"], ["library", "Library"]].map(([id, label]) => (0, import_react33.createElement)("button", { key: id, type: "button", role: "tab", className: "bt-avedit-tab", "aria-selected": tab === id, onClick: () => setTab(id) }, t(label)))
),
- (0, import_react31.createElement)("button", {
+ (0, import_react33.createElement)("button", {
type: "button",
className: "bt-avedit-tab bt-avedit-reset",
title: t("Reset character to default"),
@@@ -13661,11 -14764,10 +14936,11 @@@ function MemoryCard({ bot, actions })
);
}
function BotSettingsForm({ bot, roster, actions, run: run2 }) {
- const [editing, setEditing] = (0, import_react31.useState)(false);
+ const [editing, setEditing] = (0, import_react33.useState)(false);
+ const [editorShown, editorLeaving] = useLinger(editing, 120);
- const [confirming, setConfirming] = (0, import_react31.useState)(false);
- const closeEditor = (0, import_react31.useCallback)(() => setEditing(false), []);
- (0, import_react31.useEffect)(() => {
+ const [confirming, setConfirming] = (0, import_react33.useState)(false);
+ const closeEditor = (0, import_react33.useCallback)(() => setEditing(false), []);
+ (0, import_react33.useEffect)(() => {
if (!confirming) return void 0;
const timer = setTimeout(() => setConfirming(false), 4e3);
return () => clearTimeout(timer);
@@@ -13682,63 -14784,63 +14957,63 @@@
if (confirming) void run2(actions.deleteBot(bot.id));
else setConfirming(true);
};
- (0, import_react31.useEffect)(() => {
+ (0, import_react33.useEffect)(() => {
void actions.refreshModels?.();
}, [bot.id]);
- return (0, import_react31.createElement)(
+ return (0, import_react33.createElement)(
"div",
{ className: "bt-bs" },
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
"div",
{ className: "bt-bs-hero" },
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
"div",
{ className: "bt-avatar-anchor" },
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
"button",
{ type: "button", className: "bt-avatar-trigger", "aria-label": t("Edit Bot avatar"), "aria-expanded": editing, onClick: () => setEditing((value) => !value) },
- (0, import_react31.createElement)(BotMark, { bot, size: 64, live: true }),
- (0, import_react31.createElement)("span", { className: "bt-avatar-pencil", "aria-hidden": true }, (0, import_react31.createElement)(PencilIcon))
+ (0, import_react33.createElement)(BotMark, { bot, size: 64, live: true }),
+ (0, import_react33.createElement)("span", { className: "bt-avatar-pencil", "aria-hidden": true }, (0, import_react33.createElement)(PencilIcon))
),
- editorShown ? (0, import_react31.createElement)(AvatarEditor, { bot, actions, run: run2, onClose: closeEditor, leaving: editorLeaving }) : null
- editing ? (0, import_react33.createElement)(AvatarEditor, { bot, actions, run: run2, onClose: closeEditor }) : null
++ editorShown ? (0, import_react33.createElement)(AvatarEditor, { bot, actions, run: run2, onClose: closeEditor, leaving: editorLeaving }) : null
),
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
"div",
{ className: "bt-bs-who" },
- (0, import_react31.createElement)("span", { className: "bt-bs-name" }, bot.name),
- (0, import_react31.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot"))
+ (0, import_react33.createElement)("span", { className: "bt-bs-name" }, bot.name),
+ (0, import_react33.createElement)("span", { className: "bt-bs-sub" }, [bot.role, isMainBot ? t("Main Bot") : ""].filter(Boolean).join(" · ") || t("Bot"))
)
),
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
Card2,
{ title: t("Profile") },
- (0, import_react31.createElement)(Row, { label: t("Name") }, (0, import_react31.createElement)(InlineText, { label: t("Name"), value: bot.name, placeholder: "Bob", required: true, maxLength: 40, onSave: (name) => save({ name }) })),
- (0, import_react31.createElement)(Row, { label: t("Label"), hint: t("Optional. Shown under the name.") }, (0, import_react31.createElement)(InlineText, { label: t("Label"), value: bot.role, placeholder: t("Research, admin…"), maxLength: 24, onSave: (role) => save({ role }) }))
+ (0, import_react33.createElement)(Row, { label: t("Name") }, (0, import_react33.createElement)(InlineText, { label: t("Name"), value: bot.name, placeholder: "Bob", required: true, maxLength: 40, onSave: (name) => save({ name }) })),
+ (0, import_react33.createElement)(Row, { label: t("Label"), hint: t("Optional. Shown under the name.") }, (0, import_react33.createElement)(InlineText, { label: t("Label"), value: bot.role, placeholder: t("Research, admin…"), maxLength: 24, onSave: (role) => save({ role }) }))
),
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
Card2,
{ title: t("Model") },
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
"div",
{ className: "bt-set-row bt-bs-row" },
- (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Model")), (0, import_react31.createElement)("span", { className: "bt-set-hint" }, modelHint(bot, roster))),
- (0, import_react31.createElement)(ModelMenu, { bot, roster, actions, run: run2 })
+ (0, import_react33.createElement)("span", { className: "bt-set-copy" }, (0, import_react33.createElement)("span", { className: "bt-bs-label" }, t("Model")), (0, import_react33.createElement)("span", { className: "bt-set-hint" }, modelHint(bot, roster))),
+ (0, import_react33.createElement)(ModelMenu, { bot, roster, actions, run: run2 })
)
),
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
Card2,
{ title: t("Working folder") },
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
"div",
{ className: "bt-set-row bt-bs-row" },
- (0, import_react31.createElement)("span", { className: "bt-set-copy" }, (0, import_react31.createElement)("span", { className: "bt-bs-label" }, t("Folder"))),
- (0, import_react31.createElement)(FolderMenu, { value: bot.workDir, actions, run: run2, onPick: (workDir) => save({ workDir }) })
+ (0, import_react33.createElement)("span", { className: "bt-set-copy" }, (0, import_react33.createElement)("span", { className: "bt-bs-label" }, t("Folder"))),
+ (0, import_react33.createElement)(FolderMenu, { value: bot.workDir, actions, run: run2, onPick: (workDir) => save({ workDir }) })
)
),
- (0, import_react31.createElement)(
+ (0, import_react33.createElement)(
Card2,
{ title: t("Privacy") },
- (0, import_react31.createElement)(SwitchRow, {
+ (0, import_react33.createElement)(SwitchRow, {
label: t("Private"),
hint: privacyHint,
on: bot.private === true,
@@@ -16240,26 -17344,26 +17517,26 @@@ function BrowserPage({ roster, actions
}, t("Remove grant"))
))
),
- (0, import_react41.createElement)(
+ (0, import_react43.createElement)(
Section,
{ title: t("Allow an action") },
- (0, import_react41.createElement)(
+ (0, import_react43.createElement)(
"form",
{ className: "bt-browser-form", onSubmit: add },
- (0, import_react41.createElement)(
+ (0, import_react43.createElement)(
Row3,
{ label: t("Bot") },
- (0, import_react41.createElement)(
+ (0, import_react43.createElement)(
"select",
{ className: "bt-select", value: botId, onChange: (event) => setBotId(event.target.value), disabled: bots.length === 0 },
- bots.map((bot) => (0, import_react41.createElement)("option", { key: bot.id, value: bot.id }, bot.name))
+ bots.map((bot) => (0, import_react43.createElement)("option", { key: bot.id, value: bot.id }, bot.name))
)
),
- (0, import_react41.createElement)(
+ (0, import_react43.createElement)(
Row3,
{ label: t("Site") },
- (0, import_react41.createElement)("input", {
+ (0, import_react43.createElement)("input", {
- className: "bt-select bt-browser-site",
+ className: "bt-input bt-browser-site",
type: "text",
value: site,
placeholder: t("example.com — leave empty for all sites"),
@@@ -16299,12 -17403,12 +17576,12 @@@
}, t(label)))
)
),
- (0, import_react41.createElement)(
+ (0, import_react43.createElement)(
"div",
{ className: "bt-browser-form-foot" },
- (0, import_react41.createElement)("button", {
+ (0, import_react43.createElement)("button", {
type: "submit",
- className: "bt-soft",
+ className: "bt-soft bt-soft-sm",
disabled: busy || !selectedBot || kinds.length === 0
}, busy ? t("Saving…") : t("Add"))
)
@@@ -16947,26 -18051,27 +18224,27 @@@ var PROVIDERS_CSS =
.bt-provider-form .bt-secret-field{min-height:36px;align-items:center;gap:8px}
.bt-provider-pair{display:grid;grid-template-columns:1fr 1fr;gap:8px}
.bt-provider-models-head{display:flex;align-items:center;justify-content:space-between;gap:8px}
- .bt-provider-found{max-height:180px;overflow-y:auto;scrollbar-width:thin}
+ /* Room for the pills' focus rings inside the scroll box; the margin keeps them in line with the fields. */
+ .bt-provider-found{max-height:180px;overflow-y:auto;scrollbar-width:thin;padding:3px;margin:-3px}
-.bt-provider-found code{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}
+.bt-provider-found code{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}
.bt-provider-found .bt-secret-bot{padding:0 10px}
@media (prefers-reduced-motion:reduce){.bt-provider-add{animation:none}}
`;
// src/client/settings.js
- var import_react45 = require("react");
+ var import_react47 = require("react");
var capitalize2 = (word) => word[0].toUpperCase() + word.slice(1);
var SETTINGS_PAGES = [["general", "General"], ["models", "Models"], ["bots", "Bots"], ["groups", "Group chats"], ["connectors", "Connectors"], ["capabilities", "Capabilities"], ["browser", "Browser"], ["schedules", "Scheduled tasks"], ["usage", "Usage"], ["secrets", "Secrets"], ["feedback", "Feedback"], ["about", "About DS Bot"]];
-var PAGE_ICONS = { ...SETTINGS_ICONS, models: SlidersIcon, connectors: ConnectorIcon, capabilities: PlugIcon, browser: ConnectorIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon };
+var PAGE_ICONS = { ...SETTINGS_ICONS, models: SlidersIcon, connectors: ConnectorIcon, capabilities: PlugIcon, browser: GlobeIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon };
function SetSection({ title, className = "", children }) {
- return (0, import_react45.createElement)("section", { className: `bt-set-section ${className}`.trim() }, (0, import_react45.createElement)("h3", null, title), (0, import_react45.createElement)("div", { className: "bt-set-card" }, children));
+ return (0, import_react47.createElement)("section", { className: `bt-set-section ${className}`.trim() }, (0, import_react47.createElement)("h3", null, title), (0, import_react47.createElement)("div", { className: "bt-set-card" }, children));
}
function SetRow({ label, hint, children, className = "" }) {
- return (0, import_react45.createElement)(
+ return (0, import_react47.createElement)(
"div",
{ className: `bt-set-row ${className}`.trim() },
- (0, import_react45.createElement)("div", { className: "bt-set-copy" }, (0, import_react45.createElement)("span", null, label), hint ? (0, import_react45.createElement)("span", { className: "bt-set-hint" }, hint) : null),
- children ? (0, import_react45.createElement)("div", { className: "bt-set-control" }, children) : null
+ (0, import_react47.createElement)("div", { className: "bt-set-copy" }, (0, import_react47.createElement)("span", null, label), hint ? (0, import_react47.createElement)("span", { className: "bt-set-hint" }, hint) : null),
+ children ? (0, import_react47.createElement)("div", { className: "bt-set-control" }, children) : null
);
}
var LAYOUTS = [["bubble", "Bubble"], ["flat", "Flat"]];
@@@ -17338,27 -18470,20 +18643,27 @@@ function SettingsDialog({ page, id, ros
}
// src/client/context-menu.js
- var import_react46 = require("react");
+ var import_react48 = require("react");
function ContextMenu({ menu, roster, actions, leaving = false }) {
useEscape(() => actions.closeMenu());
- const ref = (0, import_react46.useRef)(null);
- (0, import_react46.useEffect)(() => {
++ const ref = (0, import_react48.useRef)(null);
+ (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);
+ };
window.addEventListener("mousedown", onDown);
- return () => window.removeEventListener("mousedown", onDown);
+ window.addEventListener("keydown", onKey, true);
+ return () => {
+ window.removeEventListener("mousedown", onDown);
+ window.removeEventListener("keydown", onKey, true);
+ };
}, []);
- const [place, setPlace] = (0, import_react46.useState)({ left: menu.x, top: menu.y });
- const ref = (0, import_react48.useRef)(null);
+ const [place, setPlace] = (0, import_react48.useState)({ left: menu.x, top: menu.y });
const tick = useViewport();
- (0, import_react46.useLayoutEffect)(() => {
+ (0, import_react48.useLayoutEffect)(() => {
const box = ref.current?.getBoundingClientRect();
if (!box) return;
setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, viewBottom() - box.height - 8)) });
@@@ -17415,17 -18540,10 +18720,17 @@@
);
}
function AgentMenu({ menu, roster, actions, leaving }) {
- const ref = (0, import_react46.useRef)(null);
- (0, import_react46.useEffect)(() => {
+ const ref = (0, import_react48.useRef)(null);
++ (0, import_react48.useEffect)(() => {
+ const onKey = (event) => {
+ stepMenuFocus(ref.current, event);
+ };
+ window.addEventListener("keydown", onKey, true);
+ return () => window.removeEventListener("keydown", onKey, true);
+ }, []);
- const [place, setPlace] = (0, import_react46.useState)({ left: menu.x, top: menu.y });
+ const [place, setPlace] = (0, import_react48.useState)({ left: menu.x, top: menu.y });
const tick = useViewport();
- (0, import_react46.useLayoutEffect)(() => {
+ (0, import_react48.useLayoutEffect)(() => {
const box = ref.current?.getBoundingClientRect();
if (!box) return;
setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, viewBottom() - box.height - 8)) });
@@@ -18089,11 -19234,13 +19421,11 @@@ var MIN_WIDTH = 360
var READ_FLASH_MS = 2400;
var EMPTY_PAGE = { url: "", title: "", favicon: null, loading: false, canGoBack: false, canGoForward: false, error: null, excerpt: "" };
var EMPTY_TABS2 = { ids: [], active: null };
-var SPRING_LEAD2 = springEasing(576, 39.4);
-var SPRING_TRAIL2 = springEasing(144, 19.7);
var icon = (paths) => function BrowserIcon() {
- return (0, import_react49.createElement)(
+ return (0, import_react51.createElement)(
"svg",
{ width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true },
- paths.map((d, index) => (0, import_react49.createElement)("path", { key: index, d }))
+ paths.map((d, index) => (0, import_react51.createElement)("path", { key: index, d }))
);
};
var GlobeIcon2 = icon(["M10 3a7 7 0 1 0 0 14 7 7 0 0 0 0-14z", "M3 10h14", "M10 3c2 2.2 2.9 4.5 2.9 7S12 14.8 10 17c-2-2.2-2.9-4.5-2.9-7S8 5.2 10 3z"]);
@@@ -18126,10 -19273,9 +19458,10 @@@ var shortAddress = (url) => String(url
var reducedMotion2 = () => typeof matchMedia === "function" && matchMedia("(prefers-reduced-motion: reduce)").matches;
var tabLabel = (page) => page.title || shortAddress(page.url) || t("New tab");
function PanelMenu({ items, className, "aria-label": label }) {
- const [open, setOpen] = (0, import_react49.useState)(false);
+ const [open, setOpen] = (0, import_react51.useState)(false);
+ const [shown, leaving] = useLinger(open, 120);
- const wrap = (0, import_react49.useRef)(null);
- (0, import_react49.useEffect)(() => {
+ const wrap = (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);
@@@ -18159,11 -19304,11 +19491,11 @@@
"aria-haspopup": "menu",
"aria-expanded": open,
onClick: () => setOpen((value) => !value)
- }, (0, import_react49.createElement)(DotsIcon)),
- shown ? (0, import_react49.createElement)(
+ }, (0, import_react51.createElement)(DotsIcon)),
- open ? (0, import_react51.createElement)(
++ shown ? (0, import_react51.createElement)(
"div",
- { className: "bt-pmenu-pop", role: "menu" },
+ { className: "bt-pmenu-pop", role: "menu", "data-leaving": leaving || void 0 },
- items.map((item, index) => item.sep ? (0, import_react49.createElement)("span", { key: `sep-${index}`, className: "bt-pmenu-sep", role: "separator" }) : (0, import_react49.createElement)("button", {
+ items.map((item, index) => item.sep ? (0, import_react51.createElement)("span", { key: `sep-${index}`, className: "bt-pmenu-sep", role: "separator" }) : (0, import_react51.createElement)("button", {
key: item.key,
type: "button",
role: "menuitem",
diff --cc ds-bot/src/client/composer.js
index 81550e74,a5dfa809..0543764f
--- a/ds-bot/src/client/composer.js
+++ b/ds-bot/src/client/composer.js
@@@ -1,9 -1,12 +1,12 @@@
import { createElement as h, Fragment, useEffect, useMemo, useRef, useState } from 'react'
import { createPortal } from 'react-dom'
- import { ChatsIcon, ClockIcon, MicIcon, PaperclipIcon, PeopleIcon, PlusIcon, WaveIcon } from './icons.js'
+ import { ChatsIcon, ClockIcon, GoalIcon, MicIcon, PaperclipIcon, PeopleIcon, PlusIcon, WaveIcon } from './icons.js'
+ import { canSetGoal } from './goal.js'
import { BotMark } from './mark.js'
-import { useLinger, useViewport, viewBottom } from './motion.js'
+import { stepMenuFocus, useLinger, useViewport, viewBottom } from './motion.js'
import { t } from './i18n.js'
+ import { insertComposerNewline, sendsOnEnter } from './enter-key.js'
+ import { enterSteers, steerable } from './enter-steer.js'
// -------------------------------------------------------------------------
// Composer: dictation mic and the voice-chat button. The shell's send
diff --cc ds-bot/src/client/model-menu.js
index 895902d4,9a8b4528..832afb23
--- a/ds-bot/src/client/model-menu.js
+++ b/ds-bot/src/client/model-menu.js
@@@ -4,7 -4,7 +4,7 @@@ import { currentPart } from './text.js
import { CheckIcon, SlidersIcon } from './icons.js'
import { BotMark } from './mark.js'
import { KeyIcon, MaskedInput } from './secret-card.js'
- import { SPRING_POP, SPRING_SHAPE, spring, stepMenuFocus, useLinger, useViewport, viewBottom } from './motion.js'
-import { SPRING_POP, SPRING_SHAPE, spring, useLinger, useViewport, viewBottom } from './motion.js'
++import { SPRING_POP, SPRING_SHAPE, SPRING_TAP, spring, stepMenuFocus, useLinger, useViewport, viewBottom } from './motion.js'
import { hostText, t } from './i18n.js'
const MENU_EXIT_MS = 120
@@@ -72,16 -72,16 +72,102 @@@ export function effortRows(reasoning)
]
}
--function EffortRows({ reasoning, current, onPick }) {
-- return h(Fragment, null,
-- h('div', { className: 'bt-menu-sep', role: 'separator' }),
-- h('div', { className: 'bt-model-group', role: 'presentation' }, t('Thinking level')),
-- effortRows(reasoning).map(row => h('button', {
-- key: row.effort ?? 'default', type: 'button', role: 'menuitemradio', 'aria-checked': (row.effort ?? null) === (current ?? null),
-- onClick: () => onPick(row.effort),
++// The stops along the thinking-level slider: when the model names its default level,
++// the stops are the levels themselves and the reset button clears back to Default;
++// otherwise Default sits at the first stop.
++export function effortStops(reasoning) {
++ const efforts = reasoning?.efforts ?? []
++ if (efforts.length === 0) return []
++ const hasDefault = efforts.some(effort => effort.id === reasoning.defaultEffort)
++ return hasDefault
++ ? efforts.map(effort => ({ effort: effort.id, label: effort.name }))
++ : [{ effort: undefined, label: t('Default') }, ...efforts.map(effort => ({ effort: effort.id, label: effort.name }))]
++}
++
++const BoltIcon = () => h('svg', { width: 14, height: 14, viewBox: '0 0 16 16', fill: 'none', stroke: 'currentColor', strokeWidth: 1.5, strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true },
++ h('path', { d: 'M8.8 1.8L3.5 9h4.1l-.9 5.2L12.5 7H8.4l.4-5.2z' }))
++
++const ResetIcon = () => h('svg', { width: 14, height: 14, viewBox: '0 0 16 16', fill: 'none', stroke: 'currentColor', strokeWidth: 1.5, strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true },
++ h('path', { d: 'M2.8 6.5A5.5 5.5 0 1 1 4 11.8' }),
++ h('path', { d: 'M2.5 3.2v3.4h3.4' }))
++
++export function EffortBar({ reasoning, current, onPick }) {
++ const stops = effortStops(reasoning)
++ const track = useRef(null)
++ const [picked, setPicked] = useState(current)
++ useEffect(() => { setPicked(current) }, [current])
++ if (stops.length === 0) return null
++ const hasDefault = (reasoning?.efforts ?? []).some(effort => effort.id === reasoning?.defaultEffort)
++ const activeEffort = picked ?? (hasDefault ? reasoning.defaultEffort : undefined)
++ const activeIndex = Math.max(0, stops.findIndex(stop => (stop.effort ?? null) === (activeEffort ?? null)))
++ const active = stops[activeIndex]
++ const ratio = stops.length <= 1 ? 1 : activeIndex / (stops.length - 1)
++ const choose = (effort) => {
++ setPicked(effort)
++ if ((effort ?? null) !== (picked ?? null)) onPick(effort)
++ }
++ const pickAt = (clientX) => {
++ const rect = track.current?.getBoundingClientRect()
++ if (!rect || stops.length <= 1) {
++ if (stops[0]) choose(stops[0].effort)
++ return
++ }
++ const span = Math.max(1, rect.width - 28)
++ const clamped = Math.max(0, Math.min(1, (clientX - rect.left - 14) / span))
++ const next = stops[Math.round(clamped * (stops.length - 1))]
++ if (next) choose(next.effort)
++ }
++ const onPointerDown = (event) => {
++ if (event.button !== 0) return
++ event.preventDefault()
++ try { event.currentTarget.setPointerCapture?.(event.pointerId) } catch {}
++ pickAt(event.clientX)
++ }
++ const onPointerMove = (event) => {
++ if (event.buttons !== 1 && !event.currentTarget.hasPointerCapture?.(event.pointerId)) return
++ pickAt(event.clientX)
++ }
++ const onKeyDown = (event) => {
++ if (!['ArrowLeft', 'ArrowDown', 'ArrowRight', 'ArrowUp', 'Home', 'End'].includes(event.key)) return
++ event.preventDefault()
++ event.stopPropagation()
++ const nextIndex = event.key === 'Home' ? 0
++ : event.key === 'End' ? stops.length - 1
++ : (event.key === 'ArrowLeft' || event.key === 'ArrowDown') ? Math.max(0, activeIndex - 1)
++ : Math.min(stops.length - 1, activeIndex + 1)
++ const next = stops[nextIndex]
++ if (next) choose(next.effort)
++ }
++ return h('div', { className: 'bt-effort-bar', role: 'group', 'aria-label': t('Thinking level') },
++ h('div', { className: 'bt-effort-head' },
++ h('span', { className: 'bt-effort-icon' }, h(BoltIcon)),
++ h('div', { className: 'bt-effort-copy' },
++ h('span', { className: 'bt-effort-val' }, active.label),
++ h('span', { className: 'bt-effort-sub' }, picked === undefined && hasDefault ? `${t('Thinking level')} · ${t('Default')}` : t('Thinking level'))),
++ h('button', {
++ type: 'button', className: 'bt-effort-reset', 'aria-label': t('Default'), title: t('Default'),
++ disabled: picked === undefined, onClick: () => choose(undefined),
++ }, h(ResetIcon))),
++ h('div', {
++ ref: track, className: 'bt-effort-track', role: 'slider', tabIndex: 0,
++ 'aria-label': t('Thinking level'), 'aria-valuemin': 0, 'aria-valuemax': stops.length - 1,
++ 'aria-valuenow': activeIndex, 'aria-valuetext': active.label,
++ style: { '--bt-effort-p': ratio },
++ onPointerDown, onPointerMove, onKeyDown,
},
-- h('span', { className: 'bt-menu-label' }, row.label),
-- h('span', { className: 'bt-model-tick', 'aria-hidden': true }, (row.effort ?? null) === (current ?? null) ? h(CheckIcon) : null))))
++ h('span', { className: 'bt-effort-fill', 'aria-hidden': true }),
++ stops.map((stop, index) => {
++ const stopRatio = stops.length <= 1 ? 1 : index / (stops.length - 1)
++ return h('span', {
++ key: stop.effort ?? 'default',
++ className: 'bt-effort-dot',
++ 'data-filled': index <= activeIndex || undefined,
++ style: { '--bt-dot-p': stopRatio },
++ title: stop.label,
++ 'aria-hidden': true,
++ })
++ }),
++ h('span', { className: 'bt-effort-knob', 'aria-hidden': true })))
}
function ModelRows({ roster, current, onPick }) {
@@@ -171,12 -169,12 +258,12 @@@ export function ModelMenu({ bot, roster
else if (ref !== current || !bot.model) void run(actions.updateBot(bot.id, { model: ref }))
}
const pickEffort = (effort) => {
-- close()
if (onPickEffort) onPickEffort(effort)
else if (effort !== bot.effort) void run(actions.updateBot(bot.id, { effort: effort ?? null }))
}
const models = roster.models ?? []
const manage = manageModels(actions)
++ const hasEfforts = withEfforts && effortStops(reasoning).length > 0
return h(Fragment, null,
h('button', {
ref: button, type: 'button', className: 'bt-model-trigger', 'data-wide': wide || undefined,
@@@ -190,11 -188,11 +277,13 @@@
: t('{provider} · not available', { provider: shown.provider })) : null),
h(Caret)),
shownPlace ? createPortal(h('div', { ref: menu, className: `bt-menu bt-model-menu${shownPlace.bottom !== undefined ? ' bt-menu-up' : ''}`, role: 'menu', 'aria-label': t('Model for {name}', { name: bot.name }), style: shownPlace, 'data-leaving': leaving || undefined },
-- models.length > 0 ? h(ModelRows, { roster, current, onPick: pick })
-- : h('div', { className: 'bt-model-none' }, t('No models are set up in DeepSeek Harness yet.')),
- effortRows(reasoning).length > 0 ? h(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null,
- withEfforts && effortRows(reasoning).length > 0 ? h(EffortRows, { reasoning, current: picked, onPick: pickEffort }) : null,
-- manage ? h('div', { className: 'bt-menu-sep', role: 'separator' }) : null,
-- manage ? h('button', { type: 'button', role: 'menuitem', onClick: () => { close(); manage() } }, h(SlidersIcon), h('span', { className: 'bt-menu-label' }, t('Models and providers…'))) : null), document.body) : null)
++ h('div', { className: 'bt-model-scroll' },
++ models.length > 0 ? h(ModelRows, { roster, current, onPick: pick })
++ : h('div', { className: 'bt-model-none' }, t('No models are set up in DeepSeek Harness yet.'))),
++ hasEfforts || manage ? h('div', { className: 'bt-model-foot' },
++ hasEfforts ? h(EffortBar, { reasoning, current: picked, onPick: pickEffort }) : null,
++ hasEfforts && manage ? h('div', { className: 'bt-menu-sep', role: 'separator' }) : null,
++ manage ? h('button', { type: 'button', role: 'menuitem', onClick: () => { close(); manage() } }, h(SlidersIcon), h('span', { className: 'bt-menu-label' }, t('Models and providers…'))) : null) : null), document.body) : null)
}
// The card a Bot's chat opens on while the Bot has no model, or has one that is no
@@@ -331,6 -335,6 +426,25 @@@ export const MODEL_CSS =
.bt-model-caret{flex:none;color:var(--bt-ink-3);transition:${spring(SPRING_SHAPE, 'transform')}}
.bt-model-trigger[aria-expanded=true] .bt-model-caret{transform:rotate(180deg)}
.bt-model-menu{overflow-y:auto;scrollbar-width:thin}
++.bt-model-menu:not(.bt-folder-menu){padding:0;overflow:hidden;display:flex;flex-direction:column;gap:0}
++.bt-model-scroll{flex:1 1 auto;min-height:0;overflow-y:auto;scrollbar-width:thin;overscroll-behavior:contain;padding:6px;display:flex;flex-direction:column;gap:2px}
++.bt-model-foot{flex:none;display:flex;flex-direction:column;gap:2px;padding:6px;border-top:.5px solid var(--bt-line-2);background:color-mix(in srgb,var(--bt-main) 45%,transparent)}
++.bt-effort-bar{display:flex;flex-direction:column;gap:8px;padding:6px 6px 8px}
++.bt-effort-head{display:flex;align-items:center;justify-content:space-between;gap:8px}
++.bt-effort-icon,.bt-menu button.bt-effort-reset{flex:none;width:24px;height:24px;min-height:0;padding:0;display:inline-flex;align-items:center;justify-content:center;color:var(--bt-ink-3)}
++.bt-menu button.bt-effort-reset{border:0;border-radius:6px;background:none;cursor:pointer;transition:background-color .12s ease,color .12s ease,opacity .12s ease}
++.bt-menu button.bt-effort-reset:hover:not(:disabled){background:var(--bt-hover);color:var(--bt-ink)}
++.bt-menu button.bt-effort-reset:disabled{opacity:.35;cursor:default;background:none}
++.bt-menu button.bt-effort-reset:focus-visible{outline:2px solid var(--bt-accent);outline-offset:1px}
++.bt-effort-copy{flex:1;min-width:0;display:flex;flex-direction:column;align-items:center;text-align:center;gap:1px}
++.bt-effort-val{font-size:13px;line-height:17px;font-weight:600;color:var(--bt-accent);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:100%}
++.bt-effort-sub{font-size:11px;line-height:14px;color:var(--bt-ink-3);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:100%}
++.bt-effort-track{position:relative;height:28px;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:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}
++.bt-effort-fill{position:absolute;left:0;top:0;bottom:0;width:calc(28px + (100% - 28px) * var(--bt-effort-p,0));border-radius:999px;background:var(--bt-accent);transition:${spring(SPRING_TAP, 'width')}}
++.bt-effort-dot{position:absolute;top:50%;left:calc(14px + (100% - 28px) * 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) 55%,transparent);pointer-events:none;transition:background-color .12s ease}
++.bt-effort-dot[data-filled]{background:color-mix(in srgb,var(--bt-accent-ink) 60%,transparent)}
++.bt-effort-knob{position:absolute;top:3px;left:calc(14px + (100% - 28px) * var(--bt-effort-p,0) - 11px);width:22px;height:22px;border-radius:50%;background:var(--bt-accent-ink);box-shadow:0 1px 4px rgba(0,0,0,.22);pointer-events:none;transition:${spring(SPRING_TAP, 'left')}}
.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}
.bt-model-group:first-child{padding-top:2px}
.bt-model-tick{flex:none;width:16px;height:16px;display:inline-flex;color:var(--bt-ink-2)}
@@@ -358,5 -367,5 +477,5 @@@
@keyframes bt-model-in{from{opacity:0;transform:translateY(6px)}}
.bt-model-spin{flex:none;width:14px;height:14px;border-radius:50%;border:1.5px solid var(--bt-line-2);border-top-color:var(--bt-ink-2);animation:bt-model-spin .7s linear infinite}
@keyframes bt-model-spin{to{transform:rotate(360deg)}}
--@media (prefers-reduced-motion:reduce){.bt-model-dock{animation:none}.bt-model-spin{animation-duration:2s}.bt-model-caret{transition:none}.bt-model-tick svg{animation:none}}
++@media (prefers-reduced-motion:reduce){.bt-model-dock{animation:none}.bt-model-spin{animation-duration:2s}.bt-model-caret,.bt-effort-fill,.bt-effort-knob{transition:none}.bt-model-tick svg{animation:none}}
`
diff --cc ds-bot/src/client/providers-page.js
index b27e46b3,adf3565e..2bd7756f
--- a/ds-bot/src/client/providers-page.js
+++ b/ds-bot/src/client/providers-page.js
@@@ -188,8 -188,9 +188,9 @@@ export const PROVIDERS_CSS =
.bt-provider-form .bt-secret-field{min-height:36px;align-items:center;gap:8px}
.bt-provider-pair{display:grid;grid-template-columns:1fr 1fr;gap:8px}
.bt-provider-models-head{display:flex;align-items:center;justify-content:space-between;gap:8px}
- .bt-provider-found{max-height:180px;overflow-y:auto;scrollbar-width:thin}
+ /* Room for the pills' focus rings inside the scroll box; the margin keeps them in line with the fields. */
+ .bt-provider-found{max-height:180px;overflow-y:auto;scrollbar-width:thin;padding:3px;margin:-3px}
-.bt-provider-found code{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11.5px}
+.bt-provider-found code{font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}
.bt-provider-found .bt-secret-bot{padding:0 10px}
@media (prefers-reduced-motion:reduce){.bt-provider-add{animation:none}}
`
diff --cc ds-bot/src/client/settings.js
index 5e90f8f9,4febdb81..8858f084
--- a/ds-bot/src/client/settings.js
+++ b/ds-bot/src/client/settings.js
@@@ -26,9 -27,9 +27,9 @@@ const capitalize = word => word[0].toUp
// Settings dialog: a 198px page list beside the page. Bots and group chats each list
// their members, and one opens on its own settings form. Usage widens the dialog.
- // Models is there only in a window without DSH's own settings, which carry the providers.
+ // Models is there wherever the host serves the model providers, beside DSH's own settings.
const SETTINGS_PAGES = [['general', 'General'], ['models', 'Models'], ['bots', 'Bots'], ['groups', 'Group chats'], ['connectors', 'Connectors'], ['capabilities', 'Capabilities'], ['browser', 'Browser'], ['schedules', 'Scheduled tasks'], ['usage', 'Usage'], ['secrets', 'Secrets'], ['feedback', 'Feedback'], ['about', 'About DS Bot']]
-const PAGE_ICONS = { ...SETTINGS_ICONS, models: SlidersIcon, connectors: ConnectorIcon, capabilities: PlugIcon, browser: ConnectorIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon }
+const PAGE_ICONS = { ...SETTINGS_ICONS, models: SlidersIcon, connectors: ConnectorIcon, capabilities: PlugIcon, browser: GlobeIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon }
function SetSection({ title, className = '', children }) {
return h('section', { className: `bt-set-section ${className}`.trim() }, h('h3', null, title), h('div', { className: 'bt-set-card' }, children))
diff --cc ds-bot/test/model-menu.test.js
index add43ae2,850de34a..b4b3cd46
--- a/ds-bot/test/model-menu.test.js
+++ b/ds-bot/test/model-menu.test.js
@@@ -18,6 -18,6 +18,7 @@@ runInNewContext(bundle.outputFiles[0].t
createElement: (type, props, ...children) => ({ type, props: props ?? {}, children: children.flat(Infinity) }),
useState: initial => [initial, () => {}],
useEffect: () => {},
++ useRef: initial => ({ current: initial }),
},
'react-dom': {},
'@deepseek-ai/dsh-client-ui-primitives': {},
@@@ -26,7 -26,7 +27,7 @@@
return platform[name]
},
})
- const { groupModels, ModelChoiceDock, effortRows } = module.exports
-const { groupModels, ModelChoiceDock, ModelKeyCard, effortRows } = module.exports
++const { groupModels, ModelChoiceDock, ModelKeyCard, effortRows, effortStops, EffortBar } = module.exports
function nodes(tree, match) {
if (!tree || typeof tree !== 'object') return []
@@@ -109,6 -109,6 +110,19 @@@ test('the Thinking section always offer
assert.deepEqual(Array.from(effortRows({ efforts, defaultEffort: 'high' }), row => row.effort), [undefined, 'low', 'high'])
assert.deepEqual(Array.from(effortRows({ efforts }), row => row.effort), [undefined, 'low', 'high'])
assert.equal(effortRows({ efforts: [] }).length, 0)
++ // Slider stops use the model's levels when defaultEffort is known (reset clears to Default),
++ // and include a leading Default stop when the provider did not name one.
++ assert.deepEqual(Array.from(effortStops({ efforts, defaultEffort: 'high' }), row => row.effort), ['low', 'high'])
++ assert.deepEqual(Array.from(effortStops({ efforts }), row => row.effort), [undefined, 'low', 'high'])
++ const picked = []
++ const bar = EffortBar({ reasoning: { efforts, defaultEffort: 'high' }, current: 'low', onPick: value => picked.push(value) })
++ const slider = nodes(bar, node => node.props.role === 'slider')[0]
++ assert.equal(slider.props['aria-valuenow'], 0)
++ assert.equal(slider.props['aria-valuetext'], 'Low')
++ slider.props.onKeyDown({ key: 'ArrowRight', preventDefault() {}, stopPropagation() {} })
++ const reset = nodes(bar, node => node.props.className === 'bt-effort-reset')[0]
++ reset.props.onClick()
++ assert.deepEqual(picked, ['high', undefined])
})
const keyless = [