A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.
Merge dev into fix/550-legacy-btw-dismiss
Fei2411d73dd0d29e05
diff --cc ds-bot/client.jsindex 1fecfa24,f6327bbc..a6325855--- a/ds-bot/client.js+++ b/ds-bot/client.js@@@ -6927,10 -7129,9 +7131,10 @@@ function stampOf(card)const time = Number.isFinite(card.finishedAt) ? card.finishedAt : card.createdAt;return Number.isFinite(time) ? time : void 0;}-function BtwCardView({ card, compact: compact2 = false }) {+function BtwCardView({ card, compact: compact2 = false, sessionId, actions, onDeleted }) {- const [open, setOpen] = (0, import_react11.useState)(card?.status !== "answering");- const [deleting, setDeleting] = (0, import_react11.useState)(false);- (0, import_react11.useEffect)(() => {+ const [open, setOpen] = (0, import_react12.useState)(card?.status !== "answering");++ const [deleting, setDeleting] = (0, import_react12.useState)(false);+ (0, import_react12.useEffect)(() => {if (card?.status && card.status !== "answering") setOpen(true);}, [card?.status]);if (!card) return null;@@@ -6938,31 -7139,19 +7142,31 @@@const answer = typeof card.answer === "string" ? card.answer : "";const when3 = stampOf(card);const answering = card.status === "answering";+ const remove = async () => {+ if (deleting) return;+ setDeleting(true);+ try {+ const result = await actions.deleteBtw(card.partId ?? sessionId, card.id);+ if (result?.deleted) onDeleted?.(card.id);+ else setDeleting(false);+ } catch (error) {+ actions.reportError(error, "btw-delete");+ setDeleting(false);+ }+ };- return (0, import_react11.createElement)(+ return (0, import_react12.createElement)("div",{className: compact2 ? "bt-btw bt-btw-compact" : "bt-btw","data-open": open || void 0,"data-status": card.status,role: "region",- "aria-label": t("Side question")+ "aria-label": t("Side chat")},- (0, import_react11.createElement)(+ (0, import_react12.createElement)("div",{ className: "bt-btw-head" },- (0, import_react11.createElement)(+ (0, import_react12.createElement)("button",{type: "button",@@@ -6970,29 -7159,19 +7174,29 @@@"aria-expanded": open,onClick: () => setOpen((value) => !value)},- (0, import_react11.createElement)("span", { className: "bt-btw-chevron", "aria-hidden": true }),- (0, import_react11.createElement)("span", { className: "bt-btw-q" }, question)+ (0, import_react12.createElement)("span", { className: "bt-btw-chevron", "aria-hidden": true }),+ (0, import_react12.createElement)("span", { className: "bt-btw-q" }, question)),- when3 !== void 0 ? (0, import_react11.createElement)("time", { className: "bt-btw-time", dateTime: new Date(when3).toISOString() }, messageClock(when3)) : null,- answering ? (0, import_react11.createElement)("span", { className: "bt-shimmer" }, t("Answering…")) : null,- card.status === "cancelled" ? (0, import_react11.createElement)("span", { className: "bt-btw-status" }, t("Cancelled")) : null,- (0, import_react11.createElement)("button", {+ when3 !== void 0 ? (0, import_react12.createElement)("time", { className: "bt-btw-time", dateTime: new Date(when3).toISOString() }, messageClock(when3)) : null,+ answering ? (0, import_react12.createElement)("span", { className: "bt-shimmer" }, t("Answering…")) : null,- card.status === "cancelled" ? (0, import_react12.createElement)("span", { className: "bt-btw-status" }, t("Cancelled")) : null++ card.status === "cancelled" ? (0, import_react12.createElement)("span", { className: "bt-btw-status" }, t("Cancelled")) : null,++ (0, import_react12.createElement)("button", {+ type: "button",+ className: "bt-icon-btn bt-btw-delete",+ disabled: deleting,+ "aria-label": t("Delete side chat"),+ title: t("Delete side chat"),+ onClick: () => {+ void remove();+ }- }, (0, import_react11.createElement)(CloseIcon))++ }, (0, import_react12.createElement)(CloseIcon))),- (0, import_react11.createElement)("p", { className: "bt-btw-note" }, t("Answered from progress so far; nothing was run")),- open ? (0, import_react11.createElement)(+ (0, import_react12.createElement)("p", { className: "bt-btw-note" }, t("Answered from progress so far; nothing was run")),+ open ? (0, import_react12.createElement)("div",{ className: "bt-btw-body" },- card.status === "failed" ? (0, import_react11.createElement)("p", { className: "bt-btw-fail" }, failureText(card)) : null,- answer !== "" ? (0, import_react11.createElement)("div", { className: "bt-btw-answer" }, (0, import_react11.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: answer, labels: mdLabels2(), variant: "compact" })) : null+ card.status === "failed" ? (0, import_react12.createElement)("p", { className: "bt-btw-fail" }, failureText(card)) : null,+ answer !== "" ? (0, import_react12.createElement)("div", { className: "bt-btw-answer" }, (0, import_react12.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: answer, labels: mdLabels2(), variant: "compact" })) : null) : null);}@@@ -7019,14 -7198,14 +7223,14 @@@ function BtwDock({ sessionId, useRosterconst facts = useTurnFacts(sessionId, actions);const cards = dockCards(sessionCards(roster, sessionId), facts);if (cards.length === 0) return null;- return (0, import_react11.createElement)("div", { className: "bt-btw-dock" }, cards.map((card) => (0, import_react11.createElement)(BtwCardView, { key: card.id, card, compact: true, sessionId, actions })));- return (0, import_react12.createElement)("div", { className: "bt-btw-dock" }, cards.map((card) => (0, import_react12.createElement)(BtwCardView, { key: card.id, card, compact: true })));++ return (0, import_react12.createElement)("div", { className: "bt-btw-dock" }, cards.map((card) => (0, import_react12.createElement)(BtwCardView, { key: card.id, card, compact: true, sessionId, actions })));}function BtwTurnTail({ turn, sessionId, useRoster, actions }) {const roster = useRoster((value) => value);const facts = useTurnFacts(sessionId, actions);const cards = tailCards(sessionCards(roster, sessionId), turn, facts?.turns);if (cards.length === 0) return null;- return (0, import_react11.createElement)("div", { className: "bt-btw-stack" }, cards.map((card) => (0, import_react11.createElement)(BtwCardView, { key: card.id, card, sessionId, actions })));- return (0, import_react12.createElement)("div", { className: "bt-btw-stack" }, cards.map((card) => (0, import_react12.createElement)(BtwCardView, { key: card.id, card })));++ return (0, import_react12.createElement)("div", { className: "bt-btw-stack" }, cards.map((card) => (0, import_react12.createElement)(BtwCardView, { key: card.id, card, sessionId, actions })));}// src/client/cells.js@@@ -7518,25 -7697,21 +7722,25 @@@ function EarlierParts({ sessionId, rostobserver.observe(node);return () => observer.disconnect();}, [view.cursor, view.loading, view.failed]);+ const removeBtw = (cardId) => setView((current) => ({+ ...current,+ pages: current.pages.map((page) => ({ ...page, btw: page.btw.filter((card) => card?.id !== cardId) }))+ }));const items = [];for (const page of view.pages) items.push(...withBtwRows(page.items, page.btw));- return (0, import_react12.createElement)(+ return (0, import_react13.createElement)("div",{ className: "bt-earlier", role: "feed", "aria-label": t("Earlier messages"), "aria-busy": view.loading },- (0, import_react12.createElement)(+ (0, import_react13.createElement)("div",{ ref: top, className: "bt-earlier-top" },- view.loading ? (0, import_react12.createElement)(Shimmer, null, t("Loading earlier messages…")) : view.failed ? (0, import_react12.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Couldn’t load earlier messages · Retry")) : view.cursor ? (0, import_react12.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Load earlier")) : null+ view.loading ? (0, import_react13.createElement)(Shimmer, null, t("Loading earlier messages…")) : view.failed ? (0, import_react13.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Couldn’t load earlier messages · Retry")) : view.cursor ? (0, import_react13.createElement)("button", { type: "button", className: "bt-soft", onClick: () => load(view.cursor) }, t("Load earlier")) : null),- (0, import_react12.createElement)(ChatRows, { items, sessionId, roster, actions, onBtwDelete: removeBtw }),- (0, import_react12.createElement)(PartLine, { time: view.startedAt })- (0, import_react13.createElement)(ChatRows, { items, sessionId, roster, actions }),++ (0, import_react13.createElement)(ChatRows, { items, sessionId, roster, actions, onBtwDelete: removeBtw }),+ (0, import_react13.createElement)(PartLine, { time: view.startedAt }));}-function ChatRows({ items, sessionId, roster, actions, useUi, clock: clock4 = false }) {+function ChatRows({ items, sessionId, roster, actions, useUi, clock: clock4 = false, onBtwDelete }) {const selfId = roster.byId[sessionId]?.id;const rows2 = [];for (const item of items) {@@@ -7556,32 -7731,32 +7760,32 @@@}const pause = clock4 && Number.isFinite(row.time) && (before === void 0 || row.time - before >= SEPARATOR_GAP_MS);if (Number.isFinite(row.end ?? row.time)) before = row.end ?? row.time;- return pause ? [(0, import_react12.createElement)("div", { key: `${key}:clock`, className: "bt-time-sep", role: "separator" }, clockLabel(row.time)), shown] : [shown];+ return pause ? [(0, import_react13.createElement)("div", { key: `${key}:clock`, className: "bt-time-sep", role: "separator" }, clockLabel(row.time)), shown] : [shown];});}-function chatRow(row, key, { sessionId, selfId, roster, actions, useUi }) {+function chatRow(row, key, { sessionId, selfId, roster, actions, useUi, onBtwDelete }) {switch (row.kind) {case "divider":- return (0, import_react12.createElement)(PartLine, { key, time: row.time });+ return (0, import_react13.createElement)(PartLine, { key, time: row.time });case "user":- return (0, import_react12.createElement)(EarlierUser, { key, row });+ return (0, import_react13.createElement)(EarlierUser, { key, row });case "answer":- return (0, import_react12.createElement)(AnsweredReply, { key, node: { data: row } });+ return (0, import_react13.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_react12.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_react13.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_react12.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_react13.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_react12.createElement)(import_react12.Fragment, { key }, (0, import_react12.createElement)(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles;+ return speaker ? (0, import_react13.createElement)(import_react13.Fragment, { key }, (0, import_react13.createElement)(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles;}case "btw":- return (0, import_react12.createElement)(BtwCardView, { key, card: row.card, sessionId, actions, onDeleted: onBtwDelete });- return (0, import_react13.createElement)(BtwCardView, { key, card: row.card, actions });++ return (0, import_react13.createElement)(BtwCardView, { key, card: row.card, sessionId, actions, onDeleted: onBtwDelete });case "event": {- if (row.role === "report") return (0, import_react12.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_react13.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_react12.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => {+ return (0, import_react13.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => {if (selfId && other.id) actions.openExchange(selfId, other.id);}, whole: true });}@@@ -7616,12 -7791,13 +7820,13 @@@ function TriggerCell({ node, sessionIdreturn first?.turn === turn && unseenSince(visit, first.start) ? clockLabel(first.start) : "";});const body = triggerBody();- return unreadOpening ? (0, import_react12.createElement)(import_react12.Fragment, null, (0, import_react12.createElement)("div", { className: "bt-open-new" }, (0, import_react12.createElement)(NewDivider), (0, import_react12.createElement)("div", { className: "bt-time-sep", role: "separator" }, unreadOpening)), body) : body;+ return unreadOpening ? (0, import_react13.createElement)(import_react13.Fragment, null, (0, import_react13.createElement)("div", { className: "bt-open-new" }, (0, import_react13.createElement)(NewDivider), (0, import_react13.createElement)("div", { className: "bt-time-sep", role: "separator" }, unreadOpening)), body) : body;function triggerBody() {if (source.kind === "bot") {- if (source.handoff === true) return roster.roomsById[sessionId] ? null : (0, import_react12.createElement)(EarlierParts, { sessionId, roster, actions });+ if (source.handoff === true) return roster.roomsById[sessionId] ? null : (0, import_react13.createElement)(EarlierParts, { sessionId, roster, actions });if (source.role === "kickoff" || source.role === "room") return null;if (source.role === "secret" || deferred) return null;- if (source.role === "update") return (0, import_react12.createElement)("div", { className: "bt-event" }, t("Profile updated"));++ if (source.role === "update") return (0, import_react13.createElement)("div", { className: "bt-event" }, t("Profile updated"));if (source.role === "post") {if (source.logged !== void 0) return null;if (source.failed !== void 0 || source.resumed === true || source.stopped === true || source.done === true) return null;@@@ -7868,9 -8092,11 +8121,11 @@@ function GroupReplies({ sessionId, callconst pending = done || !live.speaking ? [] : [live.speaking];const speakerTool = useWork?.((work) => work.bots?.[live.speaking]?.tool) ?? void 0;const speakerDoing = useWork?.((work) => work.bots?.[live.speaking]?.tool ? workPhrase(work.bots[live.speaking]) : void 0) ?? void 0;- if (replies.length === 0 && pending.length === 0) return null;+ if (replies.length === 0 && pending.length === 0) {- return broken ? (0, import_react12.createElement)("div", { className: "bt-group-replies" }, (0, import_react12.createElement)("div", { className: "bt-event" }, t("The group replies could not be shown"))) : null;++ return broken ? (0, import_react13.createElement)("div", { className: "bt-group-replies" }, (0, import_react13.createElement)("div", { className: "bt-event" }, t("The group replies could not be shown"))) : null;+ }const room2 = roster.roomsById[sessionId];- return (0, import_react12.createElement)(+ return (0, import_react13.createElement)("div",{ className: "bt-group-replies" },stackReplies(replies).map(({ reply, index, texts: texts2, time, duration }) => {