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/667-chat-blank-gaps

Fei2411f48c6735c4c0
diff --cc ds-bot/client.js
index 894df936,2948695e..5cec1bfe
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@@ -9526,11 -9515,15 +9537,15 @@@ function TitleToggle({ hidden, onToggl
"aria-label": label,
title: label,
onClick: onToggle
- }, (0, import_react18.createElement)(SidebarIcon)), document.body);
+ }, (0, import_react19.createElement)(SidebarIcon)), document.body);
}
+ var bootHint = () => {
+ const last = clientErrors().at(-1)?.text;
+ return last === void 0 ? t("The Bot team could not start. The engine’s startup output — its console, or the app’s startup error box — has the cause.") : t("The Bot team could not start. {error}. The engine’s startup output — its console, or the app’s startup error box — has the cause.", { error: last });
+ };
function TeamSidebar(props) {
const { wide, useRoster, useUi, useSessions, actions } = props;
- const listRef = (0, import_react18.useRef)(null);
+ const listRef = (0, import_react19.useRef)(null);
const roster = useRoster((value) => value);
const markedUnread = useUi((value) => value.unread);
const uiNow = useUi((value) => value);
@@@ -9709,38 -9702,38 +9724,38 @@@
document.addEventListener("keydown", onKey, true);
return () => document.removeEventListener("keydown", onKey, true);
}, []);
- const top = wideContent ? (0, import_react18.createElement)(
+ const top = wideContent ? (0, import_react19.createElement)(
"div",
{ className: "bt-side-top" },
- (0, import_react18.createElement)("span", { className: "bt-brand" }, (0, import_react18.createElement)(BrandMark, { size: 22 }), (0, import_react18.createElement)(BrandName)),
- (0, import_react18.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
- (0, import_react18.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react18.createElement)(SearchIcon)),
- (0, import_react18.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react18.createElement)(PlusIcon)),
- (0, import_react18.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: onToggle }, (0, import_react18.createElement)(SidebarIcon))
- ) : (0, import_react18.createElement)(
+ (0, import_react19.createElement)("span", { className: "bt-brand" }, (0, import_react19.createElement)(BrandMark, { size: 22 }), (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)(
"div",
{ className: "bt-rail-top" },
- (0, import_react18.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
- (0, import_react18.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: onToggle }, (0, import_react18.createElement)(SidebarIcon)),
- main ? (0, import_react18.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react18.createElement)("div", { className: "bt-hint" }, uiNow.bootFailed ? bootHint() : t("Setting up your Main Bot…")),
- (0, import_react18.createElement)("span", { className: "bt-rail-sep", "aria-hidden": true })
+ (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" }, t("Setting up your Main Bot…")),
++ 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" }, uiNow.bootFailed ? bootHint() : t("Setting up your Main Bot…")),
+ (0, import_react19.createElement)("span", { className: "bt-rail-sep", "aria-hidden": true })
);
- const foot = wideContent ? (0, import_react18.createElement)("div", { className: "bt-leftcol-foot" }, (0, import_react18.createElement)(AccountLauncher, { seat: false, actions })) : (0, import_react18.createElement)(
+ const foot = wideContent ? (0, import_react19.createElement)("div", { className: "bt-leftcol-foot" }, (0, import_react19.createElement)(AccountLauncher, { seat: false, actions })) : (0, import_react19.createElement)(
"div",
{ className: "bt-leftcol-foot bt-leftcol-foot-rail" },
- (0, import_react18.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react18.createElement)(PlusIcon)),
- (0, import_react18.createElement)(AccountLauncher, { seat: false, actions })
+ (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 })
);
- const content = (0, import_react18.createElement)(
+ const content = (0, import_react19.createElement)(
"div",
{ className: wideContent ? "bt-side" : "bt-side bt-rail", onKeyDown: typeToSearch },
top,
- wideContent && roster.readOnly ? (0, import_react18.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null,
- (0, import_react18.createElement)(
+ wideContent && roster.readOnly ? (0, import_react19.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null,
+ (0, import_react19.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" }, t("Setting up your Main Bot…")) : null,
- wideContent ? main ? (0, import_react18.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react18.createElement)("div", { className: "bt-hint" }, uiNow.bootFailed ? bootHint() : t("Setting up your Main Bot…")) : null,
- order.map((entry) => entry.kind === "bot" ? (0, import_react18.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react18.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react18.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))
++ 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" }, uiNow.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 }))
),
foot
);
@@@ -14058,9 -14078,28 +14100,28 @@@ var VOICE_LABELS =
unsupported: "Voice chat is not available in this browser"
};
var CAPTURE_NOTES = { blocked: "Microphone access is blocked", unavailable: "Voice chat is not available in this browser", "too-long": "That was too long to recognize" };
+ function watchReply(read, watch, consume) {
+ let off = () => {
+ };
+ let consumed = false;
+ const attempt = () => {
+ if (consumed) return;
+ const text = read();
+ if (text === void 0) return;
+ consumed = true;
+ off();
+ consume(text);
+ };
+ off = watch(attempt);
+ attempt();
+ return () => {
+ consumed = true;
+ off();
+ };
+ }
function useMicLevel(enabled) {
- const [level, setLevel] = (0, import_react34.useState)(0);
- (0, import_react34.useEffect)(() => {
+ const [level, setLevel] = (0, import_react35.useState)(0);
+ (0, import_react35.useEffect)(() => {
if (!enabled || !navigator.mediaDevices?.getUserMedia) return void 0;
let stream = null;
let audio = null;
@@@ -14108,20 -14147,20 +14169,20 @@@ function VoiceMode({ sessionId, roster
const lastReply = useSessions((list) => {
const outline = list.projectionsBySession?.[sessionId]?.values?.turnOutline ?? list.byId[sessionId]?.projectionValues?.turnOutline;
const entry = Array.isArray(outline) ? outline[outline.length - 1] : void 0;
- return entry ? `${outline.length}|${entry.response ?? ""}` : "0|";
+ return entry ? `${outline.length}|${entry.turn}` : "0|";
});
- const [speech] = (0, import_react34.useState)(() => actions.speech());
- const [phase, setPhase] = (0, import_react34.useState)(speech ? "starting" : speechApi() ? "listening" : "unsupported");
- const [catalog, setCatalog] = (0, import_react34.useState)(null);
- const [heard, setHeard] = (0, import_react34.useState)("");
- const [said, setSaid] = (0, import_react34.useState)("");
- const [note, setNote] = (0, import_react34.useState)("");
- const [serviceLevel, setServiceLevel] = (0, import_react34.useState)(0);
- const [cycle, setCycle] = (0, import_react34.useState)(0);
- const waiting = (0, import_react34.useRef)(null);
- const reply = (0, import_react34.useRef)(lastReply);
+ const [speech] = (0, import_react35.useState)(() => actions.speech());
+ const [phase, setPhase] = (0, import_react35.useState)(speech ? "starting" : speechApi() ? "listening" : "unsupported");
+ const [catalog, setCatalog] = (0, import_react35.useState)(null);
+ const [heard, setHeard] = (0, import_react35.useState)("");
+ const [said, setSaid] = (0, import_react35.useState)("");
+ const [note, setNote] = (0, import_react35.useState)("");
+ const [serviceLevel, setServiceLevel] = (0, import_react35.useState)(0);
+ const [cycle, setCycle] = (0, import_react35.useState)(0);
+ const waiting = (0, import_react35.useRef)(null);
+ const reply = (0, import_react35.useRef)(lastReply);
reply.current = lastReply;
- const turn = (0, import_react34.useRef)(0);
+ const turn = (0, import_react35.useRef)(0);
const paneLeft = usePaneLeft();
const close = () => {
turn.current += 1;
@@@ -14232,27 -14271,42 +14293,42 @@@
setServiceLevel(0);
};
}, [speech, catalog, listen, cycle]);
- (0, import_react34.useEffect)(() => {
+ (0, import_react35.useEffect)(() => {
- if (phase !== "thinking" || running || waiting.current === null) return;
- const [count, text] = [lastReply.slice(0, lastReply.indexOf("|")), lastReply.slice(lastReply.indexOf("|") + 1)];
- if (count === waiting.current || !text.trim()) return;
- waiting.current = null;
- const spoken = plainSpeech(text);
- setSaid(spoken);
- setHeard("");
- if (!window.speechSynthesis || !spoken) {
- setPhase("listening");
- return;
- }
- const utterance = new SpeechSynthesisUtterance(spoken);
- utterance.lang = /[\u3400-\u9fff]/.test(spoken) ? "zh-CN" : "en-US";
- utterance.onend = () => setPhase((current) => current === "speaking" ? "listening" : current);
- utterance.onerror = utterance.onend;
- setPhase("speaking");
- window.speechSynthesis.cancel();
- window.speechSynthesis.speak(utterance);
+ if (phase !== "thinking" || running || waiting.current === null) return void 0;
+ const count = lastReply.slice(0, lastReply.indexOf("|"));
+ const turn2 = Number(lastReply.slice(lastReply.indexOf("|") + 1));
+ if (count === waiting.current) return void 0;
+ const speak = (text) => {
+ waiting.current = null;
+ const spoken = plainSpeech(text);
+ setSaid(spoken);
+ setHeard("");
+ if (!window.speechSynthesis || !spoken) {
+ setPhase("listening");
+ return;
+ }
+ const utterance = new SpeechSynthesisUtterance(spoken);
+ utterance.lang = /[\u3400-\u9fff]/.test(spoken) ? "zh-CN" : "en-US";
+ utterance.onend = () => setPhase((current) => current === "speaking" ? "listening" : current);
+ utterance.onerror = utterance.onend;
+ setPhase("speaking");
+ window.speechSynthesis.cancel();
+ window.speechSynthesis.speak(utterance);
+ };
+ return watchReply(
+ () => actions.closingReply(sessionId, turn2),
+ (listener) => actions.watchTurns(sessionId, listener),
+ (text) => {
+ if (text === null) {
+ waiting.current = null;
+ setPhase("listening");
+ return;
+ }
+ speak(text);
+ }
+ );
}, [phase, running, lastReply]);
- (0, import_react34.useEffect)(() => () => window.speechSynthesis?.cancel(), []);
+ (0, import_react35.useEffect)(() => () => window.speechSynthesis?.cancel(), []);
const micLevel = useMicLevel(!speech && phase === "listening" && dictation.listening);
const level = speech ? serviceLevel : micLevel;
const markState = phase === "thinking" || phase === "transcribing" ? "thinking" : phase === "speaking" ? "sending" : "idle";
@@@ -14266,39 -14320,85 +14342,85 @@@
window.speechSynthesis?.cancel();
setPhase("paused");
};
- const openSetup = phase === "setup" ? actions.voiceSetup() : null;
- (0, import_react34.useEffect)(() => {
++ (0, import_react35.useEffect)(() => {
+ if (phase !== "preparing" || !speech) return void 0;
+ let stopped = false;
+ let timer;
+ const tick = async () => {
+ try {
+ const { catalog: next } = await speechCatalog(speech);
+ if (stopped) return;
+ setCatalog(next);
+ const step = preparationStep(next);
+ if (step.state === "usable") {
+ setPhase("listening");
+ return;
+ }
+ if (step.state === "done") {
+ setPhase("setup");
+ if (step.failed) setNote(t("Couldn't prepare voice input"));
+ return;
+ }
+ setNote(step.pct === void 0 ? "" : t("Downloading the speech model… {pct}%", { pct: step.pct }));
+ } catch {
+ if (!stopped) {
+ setPhase("setup");
+ return;
+ }
+ }
+ timer = setTimeout(tick, 1500);
+ };
+ timer = setTimeout(tick, 800);
+ return () => {
+ stopped = true;
+ clearTimeout(timer);
+ };
+ }, [phase, speech]);
+ const openSetup = phase === "setup" ? actions.voiceSetup(catalog?.selection?.providerId) : null;
+ const startSetup = () => {
+ if (openSetup?.navigate) {
+ close();
+ openSetup.navigate();
+ return;
+ }
+ turn.current += 1;
+ setPhase("preparing");
+ void Promise.resolve(openSetup.prepare()).then((started) => {
+ if (started === false) {
+ setPhase("setup");
+ setNote(t("Couldn't prepare voice input"));
+ }
+ });
+ };
const caption = phase === "speaking" ? said : heard;
const shownNote = note || dictation.note;
- return (0, import_react34.createElement)(
+ return (0, import_react35.createElement)(
"div",
{ className: "bt-pane bt-voice-pane", style: { left: paneLeft } },
- (0, import_react34.createElement)(
+ (0, import_react35.createElement)(
"div",
{ className: "bt-voice-stage", role: "dialog", "aria-label": t("Voice chat with {name}", { name }), "data-phase": phase === "transcribing" ? "thinking" : phase },
- (0, import_react34.createElement)(
+ (0, import_react35.createElement)(
"div",
{ className: "bt-voice-orb", style: { "--bt-level": level } },
- (0, import_react34.createElement)("span", { className: "bt-voice-ring", "aria-hidden": true }),
- (0, import_react34.createElement)("span", { className: "bt-voice-ring bt-voice-ring-2", "aria-hidden": true }),
- bot ? (0, import_react34.createElement)(BotMark, { bot, size: 112, state: markState, live: true, gaze: phase === "listening" }) : room2 ? (0, import_react34.createElement)(RoomAvatar, { room: room2, roster, size: 112 }) : null
+ (0, import_react35.createElement)("span", { className: "bt-voice-ring", "aria-hidden": true }),
+ (0, import_react35.createElement)("span", { className: "bt-voice-ring bt-voice-ring-2", "aria-hidden": true }),
+ bot ? (0, import_react35.createElement)(BotMark, { bot, size: 112, state: markState, live: true, gaze: phase === "listening" }) : room2 ? (0, import_react35.createElement)(RoomAvatar, { room: room2, roster, size: 112 }) : null
),
- (0, import_react34.createElement)("div", { className: "bt-voice-name" }, name),
- (0, import_react34.createElement)(
+ (0, import_react35.createElement)("div", { className: "bt-voice-name" }, name),
+ (0, import_react35.createElement)(
"div",
{ className: "bt-voice-status", role: "status" },
- phase === "thinking" ? (0, import_react34.createElement)(Shimmer, null, t("Thinking…")) : phase === "transcribing" ? (0, import_react34.createElement)(Shimmer, null, t("Recognizing…")) : VOICE_LABELS[phase] ? t(VOICE_LABELS[phase]) : ""
+ phase === "thinking" ? (0, import_react35.createElement)(Shimmer, null, t("Thinking…")) : phase === "transcribing" ? (0, import_react35.createElement)(Shimmer, null, t("Recognizing…")) : VOICE_LABELS[phase] ? t(VOICE_LABELS[phase]) : ""
),
- (0, import_react34.createElement)("div", { className: "bt-voice-caption", key: `${phase}:${caption.slice(0, 12)}` }, caption),
- openSetup ? (0, import_react34.createElement)("button", { type: "button", className: "bt-voice-setup", onClick: startSetup }, t("Set up voice input")) : null,
- shownNote ? (0, import_react34.createElement)("div", { className: "bt-voice-note" }, shownNote) : null
+ (0, import_react35.createElement)("div", { className: "bt-voice-caption", key: `${phase}:${caption.slice(0, 12)}` }, caption),
- openSetup ? (0, import_react35.createElement)("button", { type: "button", className: "bt-voice-setup", onClick: () => {
- close();
- openSetup();
- } }, t("Set up voice input")) : null,
++ openSetup ? (0, import_react35.createElement)("button", { type: "button", className: "bt-voice-setup", onClick: startSetup }, t("Set up voice input")) : null,
+ shownNote ? (0, import_react35.createElement)("div", { className: "bt-voice-note" }, shownNote) : null
),
- (0, import_react34.createElement)(
+ (0, import_react35.createElement)(
"div",
{ className: "bt-voice-bar" },
- (0, import_react34.createElement)("button", {
+ (0, import_react35.createElement)("button", {
type: "button",
className: "bt-voice-btn",
"aria-pressed": phase === "paused",