Skip to content

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

Merge origin/dev into feat/612-responsive-layout

Fei241152f07c967d1e
diff --cc ds-bot/client.js
index 94609ea8,00524466..ac33b4d7
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@@ -8262,215 -8401,11 +8418,215 @@@ function showsDshRow(dsh, app)
return dsh.kind === "app" && APP_OFFER.has(app?.phase) && sameVersion(app.version, dsh.verified);
}
+// src/client/storage.js
+var STORAGE = {
+ unread: "ds-bot:unread",
+ reactions: "ds-bot:reactions",
+ seen: "ds-bot:seen",
+ prefs: "ds-bot:prefs",
+ surface: "ds-bot:surface",
+ agentSessions: "ds-bot:agent-sessions",
+ browserWidth: "ds-bot:browser-width",
+ sidebar: "ds-bot:sidebar",
+ browsers: "ds-bot.browser.v2"
+};
+var LEGACY_PREFIXES = ["dsh-bot:", "dsh-bot-team:"];
+var LEGACY_BROWSER_KEYS = ["ds-bot.browser.v1", "dsh-bot.browser.v1"];
+var LEGACY_THEMES = { grok: "mono" };
+function legacyKeys(key) {
+ if (key === STORAGE.browsers) return LEGACY_BROWSER_KEYS;
+ const name = key.slice(key.indexOf(":") + 1);
+ return LEGACY_PREFIXES.map((prefix) => `${prefix}${name}`);
+}
+var migrateBrowsers = (storage) => {
+ if (storage.getItem(STORAGE.browsers) !== null) {
+ for (const key of LEGACY_BROWSER_KEYS) storage.removeItem(key);
+ return;
+ }
+ for (const key of LEGACY_BROWSER_KEYS) {
+ try {
+ const value = storage.getItem(key);
+ if (value === null) continue;
+ const previous = JSON.parse(value) ?? {};
+ const tabs = Object.fromEntries(Object.entries(previous).filter(([, page]) => page && typeof page === "object").map(([botId, page]) => {
+ const tab = { id: `v1-${botId}`, url: page.url ?? "", title: page.title ?? "" };
+ return [botId, { tabs: [tab], active: tab.id }];
+ }));
+ storage.setItem(STORAGE.browsers, JSON.stringify(tabs));
+ for (const earlier of LEGACY_BROWSER_KEYS) storage.removeItem(earlier);
+ return;
+ } catch {
+ }
+ }
+};
+function migrateStorage(storage = globalThis.localStorage) {
+ for (const key of Object.values(STORAGE)) {
+ if (key === STORAGE.browsers) continue;
+ for (const legacy of legacyKeys(key)) {
+ try {
+ const value = storage.getItem(legacy);
+ if (value !== null && storage.getItem(key) === null) storage.setItem(key, value);
+ storage.removeItem(legacy);
+ } catch {
+ }
+ }
+ }
+ try {
+ migrateBrowsers(storage);
+ } catch {
+ }
+ try {
+ const prefs = JSON.parse(storage.getItem(STORAGE.prefs) ?? "null");
+ if (prefs && Object.hasOwn(LEGACY_THEMES, prefs.theme ?? "")) {
+ storage.setItem(STORAGE.prefs, JSON.stringify({ ...prefs, theme: LEGACY_THEMES[prefs.theme] }));
+ }
+ } catch {
+ }
+}
+
+// src/client/frame-layout.js
+var MIN_CHAT = 420;
+var RAIL_WIDTH = 88;
+var PANEL_MIN = { details: 320, browser: 360, side: 320 };
+var DSH_NARROW = 1024;
+var FALLBACK_SIDEBAR_WIDTH = 280;
+function frameLayout({ viewport, sidebarWidth, collapsedWidth = 0, pref, drawer = false, panel = null }) {
+ const fits = pref === "open" && viewport >= sidebarWidth + MIN_CHAT;
+ let left = fits ? "open" : drawer && pref === "open" ? "drawer" : "rail";
+ let occupied = left === "open" ? sidebarWidth : left === "rail" ? RAIL_WIDTH : collapsedWidth;
+ let panelState = "none";
+ if (panel !== null) {
+ const need = (PANEL_MIN[panel.view] ?? PANEL_MIN.details) + MIN_CHAT;
+ if (occupied + need <= viewport) panelState = "shown";
+ else if (panel.yielded === true) {
+ left = "rail";
+ occupied = RAIL_WIDTH;
+ panelState = RAIL_WIDTH + need <= viewport ? "shown" : "overlay";
+ } else panelState = "folded";
+ }
+ return { left, panel: panelState, room: Math.max(0, viewport - occupied) };
+}
+var dshExpandedFor = (viewport, left) => viewport >= DSH_NARROW && left === "open";
+var userSidebarToggle = ({ before, after, requested = false }) => before.collapsed !== after.collapsed && !requested && before.viewport < DSH_NARROW === after.viewport < DSH_NARROW;
+function readSidebarPref(storage = globalThis.localStorage) {
+ try {
+ return storage.getItem(STORAGE.sidebar) === "rail" ? "rail" : "open";
+ } catch {
+ return "open";
+ }
+}
+function writeSidebarPref(pref, storage = globalThis.localStorage) {
+ try {
+ storage.setItem(STORAGE.sidebar, pref === "rail" ? "rail" : "open");
+ } catch {
+ }
+}
+
+// src/client/frame-watch.js
+var sidebarTrackWidth = () => typeof document === "undefined" ? null : document.querySelector('[class*="_sidebarCol"]')?.getBoundingClientRect().width ?? null;
+var dshCollapsed = () => {
+ if (typeof document === "undefined") return null;
+ const column = document.querySelector('[class*="_sidebarCol"]');
+ return column ? column.parentElement?.hasAttribute("data-sidebar-collapsed") ?? false : null;
+};
+var collapsedTrackWidth = () => document.documentElement.hasAttribute("data-windows-titlebar") || document.documentElement.dataset.platform === "darwin" ? 0 : 56;
+var room = { rule: null, selector: "" };
+var roomRule = () => {
+ const live = room.rule?.parentStyleSheet?.ownerNode?.isConnected;
+ if (live && room.selector) return room.rule;
+ const column = document.querySelector('[class*="_centerCol"]');
+ const selector = column ? [...column.classList].filter((name) => name.includes("_centerCol")).map((name) => `.${CSS.escape(name)}`).join(",") : "";
+ if (live && !selector) return room.rule;
+ const declarations2 = room.rule?.style.cssText ?? "";
+ room.rule?.parentStyleSheet?.ownerNode?.remove();
+ const style = installStyles(`${selector || '[class*="_centerCol"]'}{${declarations2}}`, "chat-room");
+ room.rule = style.sheet.cssRules[0];
+ room.selector = selector;
+ return room.rule;
+};
+var margin = (side, width, style) => {
+ if (width === null) style.removeProperty(`margin-${side}`);
+ else style.setProperty(`margin-${side}`, `${width}px`, "important");
+};
+var roomHold = 0;
+var chatRoom = {
+ /** The margin the Bot panel takes on the right, in px, or null for the shell's own. */
+ setRight(width) {
+ margin("right", width, roomRule().style);
+ },
+ /** The margin our own left column takes while the shell sidebar is collapsed. */
+ setLeft(width) {
+ margin("left", width, roomRule().style);
+ },
+ /** While on, a margin change lands at once instead of gliding. */
+ hold(on) {
+ cancelAnimationFrame(roomHold);
+ if (on) {
+ roomRule().style.setProperty("transition", "none", "important");
+ return;
+ }
+ roomHold = requestAnimationFrame(() => {
+ roomHold = requestAnimationFrame(() => roomRule().style.removeProperty("transition"));
+ });
+ },
+ /** The columns themselves, for a drag's per-frame writes. */
+ columns() {
+ roomRule();
+ return room.selector ? [...document.querySelectorAll(room.selector)] : [];
+ }
+};
+function installFrameWatch(frame) {
+ let sidebarWidth = FALLBACK_SIDEBAR_WIDTH;
+ let collapsedWidth = collapsedTrackWidth();
+ let raf = 0;
+ const watched = /* @__PURE__ */ new Set();
+ const observer = typeof ResizeObserver === "function" ? new ResizeObserver(() => schedule()) : null;
+ const read = () => {
+ const width = sidebarTrackWidth();
+ const collapsed = dshCollapsed();
+ if (width !== null) {
+ if (collapsed === true) collapsedWidth = width;
+ else if (collapsed === false) sidebarWidth = width;
+ }
+ frame.set((state) => {
+ const next = { viewport: window.innerWidth, sidebarWidth, collapsedWidth, collapsed: collapsed === true };
+ return state.viewport === next.viewport && state.sidebarWidth === next.sidebarWidth && state.collapsedWidth === next.collapsedWidth && state.collapsed === next.collapsed ? state : next;
+ });
+ };
+ const measure = () => {
+ for (const selector of ['[class*="_sidebarCol"]', '[class*="_centerCol"]']) {
+ for (const column of document.querySelectorAll(selector)) {
+ if (!watched.has(column)) {
+ watched.add(column);
+ observer?.observe(column);
+ }
+ }
+ }
+ read();
+ };
+ const schedule = () => {
+ if (raf === 0) raf = requestAnimationFrame(() => {
+ raf = 0;
+ measure();
+ });
+ };
+ measure();
+ const mutations = new MutationObserver(schedule);
+ mutations.observe(document.documentElement, { subtree: true, childList: true, attributes: true, attributeFilter: ["data-sidebar-collapsed"] });
+ window.addEventListener("resize", schedule);
+ return () => {
+ cancelAnimationFrame(raf);
+ mutations.disconnect();
+ observer?.disconnect();
+ window.removeEventListener("resize", schedule);
+ };
+}
+
// src/client/sidebar.js
- var import_react14 = require("react");
+ var import_react15 = require("react");
var import_react_dom3 = require("react-dom");
function useMarkedUnread(id, active, marked, actions) {
- (0, import_react14.useEffect)(() => {
+ (0, import_react15.useEffect)(() => {
if (active && marked) actions.clearUnread(id);
}, [active, marked]);
}
@@@ -8542,15 -8477,15 +8698,15 @@@ function BotRow({ bot, roster, actions
onClick: () => actions.openSession(id),
onContextMenu
},
- (0, import_react14.createElement)(BotAvatar, { bot, size: wide ? 36 : 44, state, main }),
- pinned && !wide ? (0, import_react14.createElement)(PinMark) : null,
- wide ? (0, import_react14.createElement)(
- (0, import_react15.createElement)(BotAvatar, { bot, size: 36, state, main }),
++ (0, import_react15.createElement)(BotAvatar, { bot, size: wide ? 36 : 44, state, main }),
+ pinned && !wide ? (0, import_react15.createElement)(PinMark) : null,
+ wide ? (0, import_react15.createElement)(
"span",
{ className: "bt-row-body" },
- (0, import_react14.createElement)("span", { className: "bt-row-name" }, (0, import_react14.createElement)("span", { className: "bt-row-title" }, bot.name), pinned ? (0, import_react14.createElement)(PinMark) : null),
- runningLine ? (0, import_react14.createElement)("span", { className: "bt-row-preview" }, runningLine) : awayLine ? (0, import_react14.createElement)("span", { className: "bt-row-preview" }, awayLine) : waitsFor ? (0, import_react14.createElement)("span", { className: "bt-row-preview" }, waitsFor) : preview ? (0, import_react14.createElement)("span", { className: "bt-row-preview" }, preview) : null
+ (0, import_react15.createElement)("span", { className: "bt-row-name" }, (0, import_react15.createElement)("span", { className: "bt-row-title" }, bot.name), pinned ? (0, import_react15.createElement)(PinMark) : null),
+ runningLine ? (0, import_react15.createElement)("span", { className: "bt-row-preview" }, runningLine) : awayLine ? (0, import_react15.createElement)("span", { className: "bt-row-preview" }, awayLine) : waitsFor ? (0, import_react15.createElement)("span", { className: "bt-row-preview" }, waitsFor) : preview ? (0, import_react15.createElement)("span", { className: "bt-row-preview" }, preview) : null
) : null,
- wide && unread && !active ? (0, import_react14.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : !wide && !active && (alert || unread) ? (0, import_react14.createElement)("span", { className: `bt-dot${alert ? " bt-dot-wait" : ""}`, "aria-hidden": true }) : null
- wide && unread && !active ? (0, import_react15.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null
++ wide && unread && !active ? (0, import_react15.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : !wide && !active && (alert || unread) ? (0, import_react15.createElement)("span", { className: `bt-dot${alert ? " bt-dot-wait" : ""}`, "aria-hidden": true }) : null
);
}
function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useWork, wide, marked }) {
@@@ -8581,15 -8516,15 +8737,15 @@@
actions.openMenu({ kind: "room", id, x: event.clientX, y: event.clientY });
}
},
- (0, import_react14.createElement)(RoomAvatar, { room: room2, roster, size: wide ? 36 : 44 }),
- pinned && !wide ? (0, import_react14.createElement)(PinMark) : null,
- wide ? (0, import_react14.createElement)(
- (0, import_react15.createElement)(RoomAvatar, { room: room2, roster, size: 36 }),
++ (0, import_react15.createElement)(RoomAvatar, { room: room2, roster, size: wide ? 36 : 44 }),
+ pinned && !wide ? (0, import_react15.createElement)(PinMark) : null,
+ wide ? (0, import_react15.createElement)(
"span",
{ className: "bt-row-body" },
- (0, import_react14.createElement)("span", { className: "bt-row-name" }, (0, import_react14.createElement)("span", { className: "bt-row-title" }, room2.name), pinned ? (0, import_react14.createElement)(PinMark) : null),
- workingLine ? (0, import_react14.createElement)("span", { className: "bt-row-preview" }, workingLine) : preview ? (0, import_react14.createElement)("span", { className: "bt-row-preview" }, preview) : null
+ (0, import_react15.createElement)("span", { className: "bt-row-name" }, (0, import_react15.createElement)("span", { className: "bt-row-title" }, room2.name), pinned ? (0, import_react15.createElement)(PinMark) : null),
+ workingLine ? (0, import_react15.createElement)("span", { className: "bt-row-preview" }, workingLine) : preview ? (0, import_react15.createElement)("span", { className: "bt-row-preview" }, preview) : null
) : null,
- wide && approval && !active ? (0, import_react14.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react14.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : !wide && !active && (approval || unread) ? (0, import_react14.createElement)("span", { className: `bt-dot${approval ? " bt-dot-wait" : ""}`, "aria-hidden": true }) : null
- wide && approval && !active ? (0, import_react15.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react15.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null
++ wide && approval && !active ? (0, import_react15.createElement)("span", { className: "bt-unread bt-unread-wait", "aria-hidden": true }) : wide && unread && !active ? (0, import_react15.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : !wide && !active && (approval || unread) ? (0, import_react15.createElement)("span", { className: `bt-dot${approval ? " bt-dot-wait" : ""}`, "aria-hidden": true }) : null
);
}
function AgentSessionRow({ session, agent, actions, renaming, index }) {
@@@ -8699,22 -8634,22 +8855,22 @@@ function AgentRow({ agent, actions, use
actions.openMenu({ kind: "agent", id: agent.id, x: event.clientX, y: event.clientY });
}
},
- (0, import_react14.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react14.createElement)(import_dsh_client_ui_primitives.FishLogo, { size: wide ? 22 : 24 })),
- wide ? (0, import_react14.createElement)(
- (0, import_react15.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react15.createElement)(import_dsh_client_ui_primitives.FishLogo, { size: 22 })),
++ (0, import_react15.createElement)("span", { className: `bt-agent-ava${running ? " bt-run" : ""}` }, (0, import_react15.createElement)(import_dsh_client_ui_primitives.FishLogo, { size: wide ? 22 : 24 })),
+ wide ? (0, import_react15.createElement)(
"span",
{ className: "bt-row-body" },
- (0, import_react14.createElement)("span", { className: "bt-row-name" }, "DSH Agent"),
- preview ? (0, import_react14.createElement)("span", { className: "bt-row-preview" }, preview) : null
+ (0, import_react15.createElement)("span", { className: "bt-row-name" }, "DSH Agent"),
+ preview ? (0, import_react15.createElement)("span", { className: "bt-row-preview" }, preview) : null
) : null,
- wide && unread && !active ? (0, import_react14.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : !wide && unread && !active ? (0, import_react14.createElement)("span", { className: "bt-dot", "aria-hidden": true }) : null
- wide && unread && !active ? (0, import_react15.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null
++ wide && unread && !active ? (0, import_react15.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : !wide && unread && !active ? (0, import_react15.createElement)("span", { className: "bt-dot", "aria-hidden": true }) : null
),
- (0, import_react14.createElement)(
+ (0, import_react15.createElement)(
"div",
{ className: "bt-agent-sub", "data-open": open || void 0 },
- (0, import_react14.createElement)(
+ (0, import_react15.createElement)(
"div",
{ className: "bt-agent-sub-in" },
- (0, import_react14.createElement)(
+ (0, import_react15.createElement)(
"button",
{ type: "button", className: "bt-agent-sub-row bt-agent-new", style: { "--i": 0 }, onClick: () => {
void actions.newAgentSession(agent.id).catch((error) => actions.reportError(error, "agent-session"));
@@@ -8754,28 -8689,16 +8910,28 @@@ function useListGlide(listRef, layout,
tops.current = { layout, map: next };
}, [layout, key]);
}
+function LeftColumn({ mode, width, children }) {
- return (0, import_react_dom3.createPortal)((0, import_react14.createElement)("div", { className: "bt-leftcol", "data-left": mode, style: { width: `${width}px` } }, children), document.body);
++ return (0, import_react_dom3.createPortal)((0, import_react15.createElement)("div", { className: "bt-leftcol", "data-left": mode, style: { width: `${width}px` } }, children), document.body);
+}
function TeamSidebar(props) {
- const { wide, expandSidebar, useRoster, useUi, useSessions, actions } = props;
+ const { wide, useRoster, useUi, useSessions, actions } = props;
- const listRef = (0, import_react14.useRef)(null);
+ const listRef = (0, import_react15.useRef)(null);
- const closing = (0, import_react15.useRef)(false);
- (0, import_react15.useLayoutEffect)(() => {
- closing.current = false;
- });
const roster = useRoster((value) => value);
const markedUnread = useUi((value) => value.unread);
+ const uiNow = useUi((value) => value);
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";
+ const layout = frameLayout({
+ viewport: frameSnap.viewport,
+ sidebarWidth: frameSnap.sidebarWidth,
+ collapsedWidth: frameSnap.collapsedWidth ?? 0,
+ pref,
+ drawer: uiNow.leftDrawer === true,
+ panel: uiNow.details ? { view: uiNow.view, yielded: uiNow.panelYield === true } : null
+ });
+ const mode = wide ? "inline" : layout.left;
+ const wideContent = mode !== "rail";
const updated = useSessions((list) => {
const stamps = {};
for (const id of list.ids) stamps[id] = list.byId[id]?.updatedAt ?? 0;
@@@ -8792,69 -8715,15 +8948,69 @@@
return entries2.sort((a, b) => Number(Boolean(b.item.pinned)) - Number(Boolean(a.item.pinned)) || b.at - a.at);
}, [roster, updated]);
const main = roster.byId[roster.mainBotId];
- useListGlide(listRef, wide, order.map((entry) => entry.item.id).join(","));
+ useListGlide(listRef, wideContent, order.map((entry) => entry.item.id).join(","));
useLandOnMainBot(roster, useSessions, actions);
+ const ourWidth = layout.left === "rail" ? RAIL_WIDTH : frameSnap.sidebarWidth;
- (0, import_react14.useLayoutEffect)(() => {
++ (0, import_react15.useLayoutEffect)(() => {
+ if (typeof document === "undefined") return;
+ chatRoom.setLeft(mode === "inline" || mode === "drawer" ? null : Math.max(0, ourWidth - (frameSnap.collapsedWidth ?? 0)));
+ }, [mode, ourWidth, frameSnap.collapsedWidth]);
- (0, import_react14.useEffect)(() => () => {
++ (0, import_react15.useEffect)(() => () => {
+ if (typeof document !== "undefined") chatRoom.setLeft(null);
+ }, []);
- const dsh = (0, import_react14.useRef)(null);
- const requested = (0, import_react14.useRef)(false);
- (0, import_react14.useLayoutEffect)(() => {
++ const dsh = (0, import_react15.useRef)(null);
++ const requested = (0, import_react15.useRef)(false);
++ (0, import_react15.useLayoutEffect)(() => {
+ if (typeof document === "undefined" || typeof actions.toggleSidebar !== "function") return void 0;
+ const collapsed = dshCollapsed() ?? !wide;
+ const prev = dsh.current;
+ dsh.current = { collapsed, viewport: frameSnap.viewport, left: layout.left };
+ if (prev !== null && collapsed !== prev.collapsed) {
+ if (requested.current) requested.current = false;
+ else if (userSidebarToggle({ before: prev, after: { collapsed, viewport: frameSnap.viewport } })) {
+ if (prev.left === "open") actions.setSidebarPref?.("rail");
+ else {
+ actions.setSidebarPref?.("open");
+ if (frameSnap.viewport < frameSnap.sidebarWidth + MIN_CHAT) actions.setLeftDrawer?.(true);
+ }
+ actions.setPanelYield?.(false);
+ return void 0;
+ }
+ }
+ const wantOpen = dshExpandedFor(frameSnap.viewport, layout.left);
+ if (collapsed === !wantOpen) {
+ requested.current = false;
+ return void 0;
+ }
+ if (requested.current) return void 0;
+ requested.current = true;
+ actions.toggleSidebar();
+ const timer = setTimeout(() => {
+ requested.current = false;
+ }, 300);
+ return () => clearTimeout(timer);
+ }, [wide, frameSnap.viewport, frameSnap.sidebarWidth, layout.left]);
- (0, import_react14.useEffect)(() => {
++ (0, import_react15.useEffect)(() => {
+ if (mode !== "drawer") return void 0;
+ const onDown = (event) => {
+ if (event.target instanceof Element && event.target.closest(".bt-leftcol")) return;
+ actions.setLeftDrawer?.(false);
+ };
+ const onKey = (event) => {
+ if (event.key !== "Escape") return;
+ event.stopPropagation();
+ actions.setLeftDrawer?.(false);
+ };
+ window.addEventListener("mousedown", onDown);
+ window.addEventListener("keydown", onKey, true);
+ return () => {
+ window.removeEventListener("mousedown", onDown);
+ window.removeEventListener("keydown", onKey, true);
+ };
+ }, [mode]);
const navigate = (open, id) => {
const result = open(id);
- if (wide && window.innerWidth < 1024 && !closing.current) {
- closing.current = true;
- expandSidebar?.();
- actions.toggleSidebar();
- }
+ if (uiNow.leftDrawer === true) actions.setLeftDrawer?.(false);
return result;
};
const rowActions = {
@@@ -8871,51 -8740,31 +9027,51 @@@
event.preventDefault();
actions.openPalette(event.key);
};
- return (0, import_react15.createElement)(
+ const expandLeft = () => {
+ actions.setSidebarPref?.("open");
+ if (frameSnap.viewport < frameSnap.sidebarWidth + MIN_CHAT) actions.setLeftDrawer?.(true);
+ };
- const top = wideContent ? (0, import_react14.createElement)(
++ const top = wideContent ? (0, import_react15.createElement)(
"div",
- { className: wide ? "bt-side" : "bt-side bt-rail", onKeyDown: typeToSearch },
- wide ? (0, import_react15.createElement)(
- "div",
- { className: "bt-side-top" },
- (0, import_react15.createElement)("span", { className: "bt-brand" }, (0, import_react15.createElement)(BrandMark, { size: 22 }), (0, import_react15.createElement)(BrandName)),
- (0, import_react15.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
- (0, import_react15.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react15.createElement)(SearchIcon)),
- (0, import_react15.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react15.createElement)(PlusIcon)),
- (0, import_react15.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: () => actions.toggleSidebar() }, (0, import_react15.createElement)(SidebarIcon))
- ) : (0, import_react15.createElement)(
- import_react15.Fragment,
- null,
- (0, import_react15.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
- (0, import_react15.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react15.createElement)(PlusIcon))
- ),
- wide && roster.readOnly ? (0, import_react15.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null,
+ { className: "bt-side-top" },
- (0, import_react14.createElement)("span", { className: "bt-brand" }, (0, import_react14.createElement)(BrandMark, { size: 22 }), (0, import_react14.createElement)(BrandName)),
- (0, import_react14.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
- (0, import_react14.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react14.createElement)(SearchIcon)),
- (0, import_react14.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react14.createElement)(PlusIcon)),
- (0, import_react14.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: () => {
++ (0, import_react15.createElement)("span", { className: "bt-brand" }, (0, import_react15.createElement)(BrandMark, { size: 22 }), (0, import_react15.createElement)(BrandName)),
++ (0, import_react15.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
++ (0, import_react15.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Search"), title: t("Search"), onClick: () => actions.openPalette() }, (0, import_react15.createElement)(SearchIcon)),
++ (0, import_react15.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react15.createElement)(PlusIcon)),
++ (0, import_react15.createElement)("button", { type: "button", className: "bt-round bt-side-collapse", "aria-label": t("Collapse sidebar"), title: t("Collapse sidebar"), onClick: () => {
+ actions.setLeftDrawer?.(false);
+ actions.setSidebarPref?.("rail");
- } }, (0, import_react14.createElement)(SidebarIcon))
- ) : (0, import_react14.createElement)(
++ } }, (0, import_react15.createElement)(SidebarIcon))
++ ) : (0, import_react15.createElement)(
+ "div",
+ { className: "bt-rail-top" },
- (0, import_react14.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
- (0, import_react14.createElement)("button", { type: "button", className: "bt-round bt-rail-expand", "aria-label": t("Expand sidebar"), title: t("Expand sidebar"), onClick: expandLeft }, (0, import_react14.createElement)(SidebarIcon)),
- main ? (0, import_react14.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react14.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")),
- (0, import_react14.createElement)("span", { className: "bt-rail-sep", "aria-hidden": true })
++ (0, import_react15.createElement)(UpdateButton, { useUpdate: props.useUpdate, actions }),
++ (0, import_react15.createElement)("button", { type: "button", className: "bt-round bt-rail-expand", "aria-label": t("Expand sidebar"), title: t("Expand sidebar"), onClick: expandLeft }, (0, import_react15.createElement)(SidebarIcon)),
++ main ? (0, import_react15.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react15.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")),
++ (0, import_react15.createElement)("span", { className: "bt-rail-sep", "aria-hidden": true })
+ );
- const foot = mode === "inline" ? null : wideContent ? (0, import_react14.createElement)("div", { className: "bt-leftcol-foot" }, (0, import_react14.createElement)(AccountLauncher, { seat: false, actions }), (0, import_react14.createElement)(ConnectPlugins, { wide: true, actions })) : (0, import_react14.createElement)(
++ const foot = mode === "inline" ? null : wideContent ? (0, import_react15.createElement)("div", { className: "bt-leftcol-foot" }, (0, import_react15.createElement)(AccountLauncher, { seat: false, actions }), (0, import_react15.createElement)(ConnectPlugins, { wide: true, actions })) : (0, import_react15.createElement)(
+ "div",
+ { className: "bt-leftcol-foot bt-leftcol-foot-rail" },
- (0, import_react14.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react14.createElement)(PlusIcon)),
- (0, import_react14.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Connect plugins"), title: t("Connect plugins"), onClick: () => actions.selectPanel("plugins") }, (0, import_react14.createElement)(PlugIcon)),
- (0, import_react14.createElement)(AccountLauncher, { seat: false, actions })
++ (0, import_react15.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("New…"), title: t("New…"), onClick: () => actions.openNewChat("new") }, (0, import_react15.createElement)(PlusIcon)),
++ (0, import_react15.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Connect plugins"), title: t("Connect plugins"), onClick: () => actions.selectPanel("plugins") }, (0, import_react15.createElement)(PlugIcon)),
++ (0, import_react15.createElement)(AccountLauncher, { seat: false, actions })
+ );
- const content = (0, import_react14.createElement)(
++ const content = (0, import_react15.createElement)(
+ "div",
+ { className: wideContent ? "bt-side" : "bt-side bt-rail", onKeyDown: typeToSearch },
+ top,
- wideContent && roster.readOnly ? (0, import_react14.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null,
- (0, import_react14.createElement)(
++ wideContent && roster.readOnly ? (0, import_react15.createElement)("div", { className: "bt-hint bt-read-only", role: "status" }, hostText(roster.readOnly)) : null,
+ (0, import_react15.createElement)(
"div",
{ ref: listRef, className: "bt-list", role: "region", "aria-label": t("Bot list") },
- wideContent ? main ? (0, import_react14.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react14.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")) : null,
- order.map((entry) => entry.kind === "bot" ? (0, import_react14.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react14.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react14.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))
- main ? (0, import_react15.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react15.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")),
++ wideContent ? main ? (0, import_react15.createElement)(BotRow, { ...rowProps, bot: main, marked: markedUnread[main.id] === true }) : roster.ready ? null : (0, import_react15.createElement)("div", { className: "bt-hint" }, t("Setting up your Main Bot…")) : null,
+ order.map((entry) => entry.kind === "bot" ? (0, import_react15.createElement)(BotRow, { key: entry.item.id, ...rowProps, bot: entry.item, marked: markedUnread[entry.item.id] === true }) : entry.kind === "room" ? (0, import_react15.createElement)(RoomRow, { key: entry.item.id, ...rowProps, room: entry.item, marked: markedUnread[entry.item.id] === true }) : (0, import_react15.createElement)(AgentRow, { key: entry.item.id, ...rowProps, agent: entry.item, marked: markedUnread[entry.item.id] === true }))
- )
+ ),
+ foot
);
+ if (mode === "inline") return content;
- return (0, import_react14.createElement)(LeftColumn, { mode, width: ourWidth }, content);
++ return (0, import_react15.createElement)(LeftColumn, { mode, width: ourWidth }, content);
}
function UpdateButton({ useUpdate, actions }) {
const update = useUpdate((value) => value);
@@@ -17288,23 -17244,25 +17444,23 @@@ function BotPanel({ pane, leaving, room
const active = tabState.active;
const page = useBrowserPages((pages) => (active ? pages[active] : null) ?? EMPTY_PAGE);
const hold = useBrowserHolds?.((map) => bot ? map[bot.id] ?? null : null) ?? null;
- const root = (0, import_react42.useRef)(null);
- const fly = (0, import_react42.useRef)(null);
- const [landed, setLanded] = (0, import_react42.useState)(false);
- const [settling, setSettling] = (0, import_react42.useState)(false);
- const [width, setWidth] = (0, import_react42.useState)(savedWidth);
- const [dragging, setDragging] = (0, import_react42.useState)(false);
- const [resizing, setResizing] = (0, import_react42.useState)(false);
+ const root = (0, import_react43.useRef)(null);
+ const fly = (0, import_react43.useRef)(null);
+ const [landed, setLanded] = (0, import_react43.useState)(false);
+ const [settling, setSettling] = (0, import_react43.useState)(false);
+ const [width, setWidth] = (0, import_react43.useState)(savedWidth);
- const [viewport, setViewport] = (0, import_react43.useState)(() => window.innerWidth);
+ const [dragging, setDragging] = (0, import_react43.useState)(false);
+ const [resizing, setResizing] = (0, import_react43.useState)(false);
const instant = dragging || resizing;
- const [reading, setReading] = (0, import_react42.useState)(false);
+ const [reading, setReading] = (0, import_react43.useState)(false);
- const overlay = overlayAt(view, viewport);
- const panelWidth = fitWidth(width ?? (view === "browser" ? DEFAULT_WIDTH : DETAILS_WIDTH), widthRange(view, viewport));
+ const panelWidth = fitWidth(width ?? (view === "browser" ? DEFAULT_WIDTH : DETAILS_WIDTH), widthRange(view, room2));
- (0, import_react42.useLayoutEffect)(() => {
+ (0, import_react43.useLayoutEffect)(() => {
if (view === "browser" && width === null) setWidth(DEFAULT_WIDTH);
}, [view, width]);
- (0, import_react42.useLayoutEffect)(() => {
+ (0, import_react43.useLayoutEffect)(() => {
chatRoom.hold(instant);
}, [instant]);
- const [last, setLast] = (0, import_react42.useState)({ view, width: panelWidth });
+ const [last, setLast] = (0, import_react43.useState)({ view, width: panelWidth });
if (last.view !== view || last.width !== panelWidth) {
setLast({ view, width: panelWidth });
if (last.view !== view) setSettling(last.width !== panelWidth && !instant);
@@@ -17314,24 -17272,28 +17470,24 @@@
const switched = settling && shownView.current !== view;
shownView.current = view;
if (switched) chatRoom.hold(true);
- chatRoom.set(leaving || overlay ? null : panelWidth);
+ chatRoom.setRight(leaving || overlay ? null : panelWidth);
if (switched) chatRoom.hold(false);
}, [view, panelWidth, leaving, overlay]);
- (0, import_react42.useEffect)(() => () => {
+ (0, import_react43.useEffect)(() => () => {
- chatRoom.set(null);
+ chatRoom.setRight(null);
chatRoom.hold(false);
}, []);
- const mounted = (0, import_react42.useRef)(false);
- (0, import_react42.useEffect)(() => {
++ const mounted = (0, import_react43.useRef)(false);
+ (0, import_react43.useEffect)(() => {
- let timer;
- const onResize = () => {
- setResizing(true);
- setViewport(window.innerWidth);
- clearTimeout(timer);
- timer = setTimeout(() => setResizing(false), 160);
- };
- window.addEventListener("resize", onResize);
- return () => {
- clearTimeout(timer);
- window.removeEventListener("resize", onResize);
- };
- }, []);
+ if (!mounted.current) {
+ mounted.current = true;
+ return void 0;
+ }
+ setResizing(true);
+ const timer = setTimeout(() => setResizing(false), 160);
+ return () => clearTimeout(timer);
+ }, [room2]);
- (0, import_react42.useEffect)(() => {
+ (0, import_react43.useEffect)(() => {
if (!settling) return void 0;
const timer = setTimeout(() => setSettling(false), SPRING_SHAPE.duration + 40);
return () => clearTimeout(timer);
@@@ -17656,29 -17618,18 +17812,29 @@@ function Overlays({ useRoster, useUi, u
const roster = useRoster((value) => value);
const ui2 = useUi((value) => value);
useRegistry((value) => value);
+ const frameSnap = useFrame ? useFrame((value) => value) : { viewport: window.innerWidth, sidebarWidth: FALLBACK_SIDEBAR_WIDTH, collapsedWidth: 0 };
+ const pref = useSidebarPref ? useSidebarPref((value) => value) : "open";
const current = useSessions((list) => Object.values(list.byId).find((session) => (session?.retainedBy?.mainView ?? 0) > 0)?.id ?? null);
- const previous = (0, import_react43.useRef)(current);
- (0, import_react43.useEffect)(() => {
+ const previous = (0, import_react44.useRef)(current);
+ (0, import_react44.useEffect)(() => {
if (previous.current === current) return;
previous.current = current;
if (current) actions.followPanel?.(current);
}, [current]);
const open = ui2.details ? { id: ui2.details, view: ui2.view ?? "details", renaming: ui2.renaming, tab: ui2.tab, side: ui2.side } : null;
- const [kept, setKept] = (0, import_react44.useState)(open);
+ const layout = frameLayout({
+ viewport: frameSnap.viewport,
+ sidebarWidth: frameSnap.sidebarWidth,
+ collapsedWidth: frameSnap.collapsedWidth ?? 0,
+ pref,
+ drawer: ui2.leftDrawer === true,
+ panel: open ? { view: open.view, yielded: ui2.panelYield === true } : null
+ });
+ const shown = open !== null && layout.panel !== "folded" ? open : null;
- const [kept, setKept] = (0, import_react43.useState)(shown);
- (0, import_react43.useEffect)(() => {
++ const [kept, setKept] = (0, import_react44.useState)(shown);
+ (0, import_react44.useEffect)(() => {
- if (open) {
- setKept(open);
+ if (shown) {
+ setKept(shown);
return void 0;
}
const timer = setTimeout(() => setKept(null), PANEL_LINGER_MS);
@@@ -17695,17 -17646,17 +17851,17 @@@
const [memory, memoryLeaving] = useLinger(ui2.memory && memoryOwner(ui2.memory) ? ui2.memory : null, DIALOG_EXIT_MS);
const owner = memory ? memoryOwner(memory) : null;
const [menu, menuLeaving] = useLinger(ui2.menu, MENU_EXIT_MS3);
- return (0, import_react43.createElement)(
- import_react43.Fragment,
+ return (0, import_react44.createElement)(
+ import_react44.Fragment,
null,
- pane ? (0, import_react_dom9.createPortal)((0, import_react43.createElement)(BotPanel, { pane, leaving: shown === null, room: layout.room, overlay: layout.panel === "overlay", roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages, useBrowserHolds }), document.body) : null,
- ui2.newChat ? (0, import_react_dom9.createPortal)((0, import_react43.createElement)(NewChat, { key: ui2.newChat, mode: ui2.newChat, roster, actions }), document.body) : null,
- ui2.palette ? (0, import_react_dom9.createPortal)((0, import_react43.createElement)(CommandPalette, { key: ui2.palette.token, start: ui2.palette.query, token: ui2.palette.token, roster, actions, useSessions }), document.body) : null,
- ui2.exchange ? (0, import_react_dom9.createPortal)((0, import_react43.createElement)(ExchangeDialog, { pair: ui2.exchange, roster, actions }), document.body) : null,
- ui2.voice ? (0, import_react_dom9.createPortal)((0, import_react43.createElement)(VoiceMode, { key: ui2.voice, sessionId: ui2.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null,
- menu ? (0, import_react_dom9.createPortal)((0, import_react43.createElement)(ContextMenu, { key: `${menu.kind ?? ""}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null,
- settings ? (0, import_react_dom9.createPortal)((0, import_react43.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null,
- owner ? (0, import_react_dom9.createPortal)((0, import_react43.createElement)(MemoryDialog, { key: owner.id, owner, actions, leaving: memoryLeaving }), document.body) : null
- pane ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages, useBrowserHolds }), document.body) : null,
++ pane ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(BotPanel, { pane, leaving: shown === null, room: layout.room, overlay: layout.panel === "overlay", roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages, useBrowserHolds }), document.body) : null,
+ ui2.newChat ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(NewChat, { key: ui2.newChat, mode: ui2.newChat, roster, actions }), document.body) : null,
+ ui2.palette ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(CommandPalette, { key: ui2.palette.token, start: ui2.palette.query, token: ui2.palette.token, roster, actions, useSessions }), document.body) : null,
+ ui2.exchange ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(ExchangeDialog, { pair: ui2.exchange, roster, actions }), document.body) : null,
+ ui2.voice ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(VoiceMode, { key: ui2.voice, sessionId: ui2.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null,
+ menu ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(ContextMenu, { key: `${menu.kind ?? ""}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null,
+ settings ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null,
+ owner ? (0, import_react_dom9.createPortal)((0, import_react44.createElement)(MemoryDialog, { key: owner.id, owner, actions, leaving: memoryLeaving }), document.body) : null
);
}