Skip to content

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

Merge remote-tracking branch 'origin/dev' into fix/718-copy-folded-code

Fei24117ca4677565e0
diff --cc ds-bot/client.js
index cbe3ffe8,1ebac09c..a20aebef
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@@ -7377,13 -7385,11 +7413,13 @@@ function foldPreview(text, limit = FOLD
}
var stripLongNote = (text) => text.replace(/^\[A long message: \d+ characters\.[^\]\n]*\]\n/, "");
function useFold(text, { limit = FOLD_AT, whole, live = false, markdown = true } = {}) {
- const [open, setOpen] = (0, import_react14.useState)(false);
- const [read, setRead] = (0, import_react14.useState)();
+ const [open, setOpen] = (0, import_react15.useState)(false);
+ const [read, setRead] = (0, import_react15.useState)();
const cut = whole !== void 0 && whole.length > text.length;
- const view = (0, import_react14.useMemo)(() => live ? null : foldView(text, cut ? ALWAYS : limit, markdown), [text, live, limit, markdown, cut]);
- const preview = (0, import_react15.useMemo)(() => live ? null : foldPreview(text, cut ? ALWAYS : limit, markdown), [text, live, limit, markdown, cut]);
- if (preview === null) return { shown: text, control: null };
++ const view = (0, import_react15.useMemo)(() => live ? null : foldView(text, cut ? ALWAYS : limit, markdown), [text, live, limit, markdown, cut]);
+ if (view === null) return { shown: text, control: null };
+ const code = cut ? void 0 : view.code;
+ const shown = code === void 0 ? view.head : view.prose;
const count = (cut ? whole.length : text.length).toLocaleString();
if (!open) {
const show2 = async () => {
@@@ -7392,7 -7398,7 +7428,7 @@@
setRead("loading");
setRead(await whole.load() ?? { whole: false });
};
- return { shown, folded: true, code, codeHead: view.codeHead, control: (0, import_react14.createElement)("span", { className: "bt-fold" }, (0, import_react14.createElement)("button", { type: "button", className: "bt-more", onClick: show2 }, t("Show all · {count} characters", { count }))) };
- return { shown: preview, folded: true, control: (0, import_react15.createElement)("span", { className: "bt-fold" }, (0, import_react15.createElement)("button", { type: "button", className: "bt-more", onClick: show2 }, t("Show all · {count} characters", { count }))) };
++ return { shown, folded: true, code, codeHead: view.codeHead, control: (0, import_react15.createElement)("span", { className: "bt-fold" }, (0, import_react15.createElement)("button", { type: "button", className: "bt-more", onClick: show2 }, t("Show all · {count} characters", { count }))) };
}
const loaded = typeof read?.text === "string" ? read : void 0;
const note = !cut || read === void 0 || read === "loading" || loaded?.whole ? null : loaded !== void 0 && loaded.text.length > text.length ? t("Showing the first {count} characters", { count: loaded.text.length.toLocaleString() }) : t("Only the start of this message is kept here");
@@@ -7756,55 -7762,33 +7792,55 @@@ function Bubbles({ texts: texts2, roste
})
);
}
+function FoldCodeCopy({ code, actions }) {
- const [copied, setCopied] = (0, import_react16.useState)(false);
++ const [copied, setCopied] = (0, import_react17.useState)(false);
+ const copy2 = () => {
+ void (0, import_dsh_client_ui_primitives.writeClipboard)(code).then((ok) => {
+ if (!ok) {
+ actions?.reportError?.(new Error("Could not copy the code block"), "copy");
+ return;
+ }
+ setCopied(true);
+ setTimeout(() => setCopied(false), 1e3);
+ }, () => actions?.reportError?.(new Error("Could not copy the code block"), "copy"));
+ };
- return (0, import_react16.createElement)("button", { type: "button", className: "bt-tool bt-fold-copy", "aria-label": copied ? t("Copied") : t("Copy"), title: copied ? t("Copied") : t("Copy"), onClick: copy2 }, copied ? (0, import_react16.createElement)(CheckIcon) : (0, import_react16.createElement)(CopyIcon));
++ return (0, import_react17.createElement)("button", { type: "button", className: "bt-tool bt-fold-copy", "aria-label": copied ? t("Copied") : t("Copy"), title: copied ? t("Copied") : t("Copy"), onClick: copy2 }, copied ? (0, import_react17.createElement)(CheckIcon) : (0, import_react17.createElement)(CopyIcon));
+}
- var foldArea = (body, code, codeHead, actions) => code === void 0 ? body : (0, import_react16.createElement)(
++var foldArea = (body, code, codeHead, actions) => code === void 0 ? body : (0, import_react17.createElement)(
+ "div",
+ { className: "bt-fold-code" },
+ body,
- (0, import_react16.createElement)("pre", { className: "bt-fold-pre" }, (0, import_react16.createElement)("code", null, codeHead)),
- (0, import_react16.createElement)(FoldCodeCopy, { code, actions })
++ (0, import_react17.createElement)("pre", { className: "bt-fold-pre" }, (0, import_react17.createElement)("code", null, codeHead)),
++ (0, import_react17.createElement)(FoldCodeCopy, { code, actions })
+);
function Bubble({ text, index, roster, selfId, actions, sessionId, msgKey, mentions, fold, picked, live, lead, whole }) {
- const { shown, folded, control } = useFold(text, { limit: fold, whole, live });
+ const { shown, folded, control, code, codeHead } = useFold(text, { limit: fold, whole, live });
const key = msgKey ? `${msgKey}:${index}` : void 0;
- const body = shown === "" ? null : (0, import_react16.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels3(), variant: "compact", fileMentions: mentions });
- const row = (0, import_react16.useRef)(null);
- const [toolsOpen, setToolsOpen] = (0, import_react16.useState)(false);
- const body = (0, import_react17.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels3(), variant: "compact", fileMentions: mentions });
++ const body = shown === "" ? null : (0, import_react17.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels3(), variant: "compact", fileMentions: mentions });
+ const row = (0, import_react17.useRef)(null);
+ const [toolsOpen, setToolsOpen] = (0, import_react17.useState)(false);
useDismiss(toolsOpen, () => setToolsOpen(false), [row]);
const tapTools = (event) => {
if (!noHover() || event.target instanceof Element && event.target.closest("a,button,input,textarea,select,pre,code,[role=button],[role=link]")) return;
setToolsOpen((value) => !value);
};
+ const area = foldArea(body, code, codeHead, actions);
- return (0, import_react16.createElement)(
+ return (0, import_react17.createElement)(
"div",
{ ref: row, className: "bt-msg", onClick: tapTools },
- (0, import_react16.createElement)(
+ (0, import_react17.createElement)(
"div",
{ className: "bt-msg-line" },
lead,
- (0, import_react16.createElement)(
+ (0, import_react17.createElement)(
"div",
{ className: "bt-bubble", "data-folded": folded || void 0 },
- control ? (0, import_react16.createElement)("div", { className: "bt-fold-body" }, area) : area,
- control ? (0, import_react17.createElement)("div", { className: "bt-fold-body" }, body) : body,
++ control ? (0, import_react17.createElement)("div", { className: "bt-fold-body" }, area) : area,
control
),
- live ? null : (0, import_react16.createElement)(MessageTools, { text: folded ? text : shown, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(msgKey, index, emoji) : void 0, actions, open: toolsOpen })
+ live ? null : (0, import_react17.createElement)(MessageTools, { text: folded ? text : shown, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(msgKey, index, emoji) : void 0, actions, open: toolsOpen })
),
- picked.length ? (0, import_react16.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react16.createElement)("button", {
+ picked.length ? (0, import_react17.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react17.createElement)("button", {
key: emoji,
type: "button",
className: "bt-react",
@@@ -8163,16 -8147,15 +8199,16 @@@ var scrollParent = (node) =>
}
return null;
};
-function EarlierUser({ row }) {
- const { shown, folded, control } = useFold(row.text ?? "");
- const body = row.text ? (0, import_react17.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: shown, labels: mdLabels3(), variant: "compact" }) : null;
+function EarlierUser({ row, actions }) {
+ const { shown, folded, control, code, codeHead } = useFold(row.text ?? "");
- const body = row.text && shown !== "" ? (0, import_react16.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: shown, labels: mdLabels3(), variant: "compact" }) : null;
++ const body = row.text && shown !== "" ? (0, import_react17.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: shown, labels: mdLabels3(), variant: "compact" }) : null;
+ const area = foldArea(body, code, codeHead, actions);
- return (0, import_react16.createElement)("div", { className: "bt-urow" }, (0, import_react16.createElement)(
+ return (0, import_react17.createElement)("div", { className: "bt-urow" }, (0, import_react17.createElement)(
"div",
{ className: "bt-ububble", "data-folded": folded || void 0 },
- control ? (0, import_react16.createElement)("div", { className: "bt-fold-body" }, area) : area,
- control ? (0, import_react17.createElement)("div", { className: "bt-fold-body" }, body) : body,
++ control ? (0, import_react17.createElement)("div", { className: "bt-fold-body" }, area) : area,
control,
- row.images ? (0, import_react16.createElement)("span", { className: "bt-uimages" }, row.images === 1 ? t("1 image") : t("{count} images", { count: row.images })) : null
+ row.images ? (0, import_react17.createElement)("span", { className: "bt-uimages" }, row.images === 1 ? t("1 image") : t("{count} images", { count: row.images })) : null
));
}
function EarlierParts({ sessionId, roster, actions }) {
@@@ -8275,26 -8258,26 +8311,26 @@@ function ChatRows({ items, sessionId, r
function chatRow(row, key, { sessionId, selfId, roster, actions, useUi, onBtwDelete }) {
switch (row.kind) {
case "divider":
- return (0, import_react16.createElement)(PartLine, { key, time: row.time });
+ return (0, import_react17.createElement)(PartLine, { key, time: row.time });
case "user":
- return (0, import_react16.createElement)(EarlierUser, { key, row, actions });
- return (0, import_react17.createElement)(EarlierUser, { key, row });
++ return (0, import_react17.createElement)(EarlierUser, { key, row, actions });
case "answer":
- return (0, import_react16.createElement)(AnsweredReply, { key, node: { data: row } });
+ return (0, import_react17.createElement)(AnsweredReply, { key, node: { data: row } });
// A display-only view replays from the blueprint the host kept on the call.
case "view":
- return (0, import_react16.createElement)(WidgetCell, { key, sessionId, callId: row.callId, args: { text: (name) => name === "title" ? row.title : void 0, value: (name) => name === "view" ? row.view : void 0 }, done: true, isError: false, roster, actions });
+ return (0, import_react17.createElement)(WidgetCell, { key, sessionId, callId: row.callId, args: { text: (name) => name === "title" ? row.title : void 0, value: (name) => name === "view" ? row.view : void 0 }, done: true, isError: false, roster, actions });
case "bot": {
- const bubbles = (0, import_react16.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : void 0, msgKey: useUi ? `${sessionId}:${row.time}` : void 0, useUi, fold: FOLD_HUGE });
+ const bubbles = (0, import_react17.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : void 0, msgKey: useUi ? `${sessionId}:${row.time}` : void 0, useUi, fold: FOLD_HUGE });
const speaker = layoutOf(roster.prefs) === "flat" ? roster.byId[selfId] : void 0;
- return speaker ? (0, import_react16.createElement)(import_react16.Fragment, { key }, (0, import_react16.createElement)(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles;
+ return speaker ? (0, import_react17.createElement)(import_react17.Fragment, { key }, (0, import_react17.createElement)(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles;
}
case "btw":
- return (0, import_react16.createElement)(BtwCardView, { key, card: row.card, sessionId, actions, onDeleted: onBtwDelete });
+ return (0, import_react17.createElement)(BtwCardView, { key, card: row.card, sessionId, actions, onDeleted: onBtwDelete });
case "event": {
- if (row.role === "report") return (0, import_react16.createElement)(GroupEvent, { key, prefix: t("Replies from"), room: roster.roomsById[row.roomId], name: t("a group chat"), roster, actions });
+ if (row.role === "report") return (0, import_react17.createElement)(GroupEvent, { key, prefix: t("Replies from"), room: roster.roomsById[row.roomId], name: t("a group chat"), roster, actions });
const other = roster.byId[row.botId] ?? { id: row.botId, name: row.name ?? t("a Bot"), color: "gray" };
const prefix = { stopped: t("Stopped by"), reply: t("Reply from") }[row.role] ?? t("Message from");
- return (0, import_react16.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => {
+ return (0, import_react17.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => {
if (selfId && other.id) actions.openExchange(selfId, other.id);
}, whole: true });
}
diff --cc ds-bot/test/tool-cells.test.js
index 32e59bfe,2ff6da82..8e16b927
--- a/ds-bot/test/tool-cells.test.js
+++ b/ds-bot/test/tool-cells.test.js
@@@ -9,7 -9,7 +9,7 @@@ import { build } from 'esbuild
const { outputFiles } = await build({
stdin: {
contents: [
- "export { ToolCell, TriggerCell, callTree, stackReplies, Bubbles } from './src/client/cells.js'",
- "export { ToolCell, TriggerCell, callTree, stackReplies, CellEmpty } from './src/client/cells.js'",
++ "export { ToolCell, TriggerCell, callTree, stackReplies, CellEmpty, Bubbles } from './src/client/cells.js'",
"export { QuestionDock } from './src/client/questions.js'",
"export { SecretDock } from './src/client/secret-card.js'",
"export { countCards } from './src/client/sources.js'",
@@@ -36,9 -36,13 +36,16 @@@ const react =
useSyncExternalStore: (subscribe, getSnapshot) => getSnapshot(),
}
const timers = new Set()
+ // The observers CellEmpty sets on its slot, so a test can deliver a mutation.
+ const observers = []
+ class FakeObserver {
+ constructor(fn) { this.fn = fn; this.off = false; observers.push(this) }
+ observe() {}
+ disconnect() { this.off = true }
+ }
+// The markdown the host's renderer is given, and what DS Bot's copy controls write.
+const markdownTexts = []
+const copiedTexts = []
const module = { exports: {} }
runInNewContext(outputFiles[0].text, {
module, exports: module.exports,
@@@ -57,7 -56,7 +64,7 @@@
throw new Error(`Unexpected platform module ${name}`)
},
})
- const { ToolCell, TriggerCell, callTree, stackReplies, Bubbles, QuestionDock, SecretDock, countCards, ViewMenuList, WidgetView } = module.exports
-const { ToolCell, TriggerCell, callTree, stackReplies, CellEmpty, QuestionDock, SecretDock, countCards, ViewMenuList, WidgetView } = module.exports
++const { ToolCell, TriggerCell, callTree, stackReplies, CellEmpty, Bubbles, QuestionDock, SecretDock, countCards, ViewMenuList, WidgetView } = module.exports
// Runs the effects collected since the last render; returns the cleanups.
const mount = () => {